From 23a533e42fed47467d3002e7c6c16b178fe20f9b Mon Sep 17 00:00:00 2001 From: Exitare Date: Fri, 20 Dec 2024 12:21:14 -0800 Subject: [PATCH] Rename files to match table --- apps/keira/src/app/routes.ts | 12 ++++++------ ...ts => acore-string-handler.service.spec.ts} | 8 ++++---- ...vice.ts => acore-string-handler.service.ts} | 2 +- ...ponent.html => acore-string.component.html} | 0 ....component.ts => acore-string.component.ts} | 16 ++++++++-------- ...pec.ts => acore-string.integration.spec.ts} | 12 ++++++------ .../acore-text/acore-string.service.spec.ts | 17 +++++++++++++++++ ...text.service.ts => acore-string.service.ts} | 6 +++--- .../src/acore-text/acore-text.service.spec.ts | 17 ----------------- ...html => select-acore-string.component.html} | 0 ...ent.ts => select-acore-string.component.ts} | 18 +++++++++--------- ...=> select-acore-string.integration.spec.ts} | 18 +++++++++--------- ....ts => select-acore-string.service.spec.ts} | 12 ++++++------ ...rvice.ts => select-acore-string.service.ts} | 6 +++--- 14 files changed, 72 insertions(+), 72 deletions(-) rename libs/features/texts/src/acore-text/{acore-text-handler.service.spec.ts => acore-string-handler.service.spec.ts} (73%) rename libs/features/texts/src/acore-text/{acore-text-handler.service.ts => acore-string-handler.service.ts} (85%) rename libs/features/texts/src/acore-text/{acore-text.component.html => acore-string.component.html} (100%) rename libs/features/texts/src/acore-text/{acore-text.component.ts => acore-string.component.ts} (52%) rename libs/features/texts/src/acore-text/{acore-text.integration.spec.ts => acore-string.integration.spec.ts} (94%) create mode 100644 libs/features/texts/src/acore-text/acore-string.service.spec.ts rename libs/features/texts/src/acore-text/{acore-text.service.ts => acore-string.service.ts} (68%) delete mode 100644 libs/features/texts/src/acore-text/acore-text.service.spec.ts rename libs/features/texts/src/acore-text/{select-acore-text.component.html => select-acore-string.component.html} (100%) rename libs/features/texts/src/acore-text/{select-acore-text.component.ts => select-acore-string.component.ts} (71%) rename libs/features/texts/src/acore-text/{select-acore-text.integration.spec.ts => select-acore-string.integration.spec.ts} (88%) rename libs/features/texts/src/acore-text/{select-acore-text.service.spec.ts => select-acore-string.service.spec.ts} (53%) rename libs/features/texts/src/acore-text/{select-acore-text.service.ts => select-acore-string.service.ts} (75%) diff --git a/apps/keira/src/app/routes.ts b/apps/keira/src/app/routes.ts index 50919b8b5b..47a3213c80 100644 --- a/apps/keira/src/app/routes.ts +++ b/apps/keira/src/app/routes.ts @@ -89,9 +89,9 @@ import { SelectNpcTextComponent, SelectPageTextComponent, } from 'texts'; -import { AcoreTextComponent } from '../../../../libs/features/texts/src/acore-text/acore-text.component'; -import { AcoreTextHandlerService } from '../../../../libs/features/texts/src/acore-text/acore-text-handler.service'; -import { SelectAcoreTextComponent } from '../../../../libs/features/texts/src/acore-text/select-acore-text.component'; +import { AcoreStringComponent } from '../../../../libs/features/texts/src/acore-text/acore-string.component'; +import { AcoreStringHandlerService } from '../../../../libs/features/texts/src/acore-text/acore-string-handler.service'; +import { SelectAcoreStringComponent } from '../../../../libs/features/texts/src/acore-text/select-acore-string.component'; export const KEIRA_ROUTES: Routes = [ { @@ -411,12 +411,12 @@ export const KEIRA_ROUTES: Routes = [ }, { path: 'acore-string', - component: AcoreTextComponent, - canActivate: [AcoreTextHandlerService], + component: AcoreStringComponent, + canActivate: [AcoreStringHandlerService], }, { path: 'select-acore-string', - component: SelectAcoreTextComponent, + component: SelectAcoreStringComponent, }, ], }, diff --git a/libs/features/texts/src/acore-text/acore-text-handler.service.spec.ts b/libs/features/texts/src/acore-text/acore-string-handler.service.spec.ts similarity index 73% rename from libs/features/texts/src/acore-text/acore-text-handler.service.spec.ts rename to libs/features/texts/src/acore-text/acore-string-handler.service.spec.ts index ab577b6e9d..7547cdc8cc 100644 --- a/libs/features/texts/src/acore-text/acore-text-handler.service.spec.ts +++ b/libs/features/texts/src/acore-text/acore-string-handler.service.spec.ts @@ -1,16 +1,16 @@ import { TestBed } from '@angular/core/testing'; -import { AcoreTextHandlerService } from './acore-text-handler.service'; +import { AcoreStringHandlerService } from './acore-string-handler.service'; import { ACORE_STRING_TABLE } from '@keira/shared/acore-world-model'; -describe(AcoreTextHandlerService.name, () => { +describe(AcoreStringHandlerService.name, () => { beforeEach(() => TestBed.configureTestingModule({ - providers: [AcoreTextHandlerService], + providers: [AcoreStringHandlerService], }), ); const setup = () => { - const service = TestBed.inject(AcoreTextHandlerService); + const service = TestBed.inject(AcoreStringHandlerService); return { service }; }; diff --git a/libs/features/texts/src/acore-text/acore-text-handler.service.ts b/libs/features/texts/src/acore-text/acore-string-handler.service.ts similarity index 85% rename from libs/features/texts/src/acore-text/acore-text-handler.service.ts rename to libs/features/texts/src/acore-text/acore-string-handler.service.ts index 6bcab2d6b7..449cd10376 100644 --- a/libs/features/texts/src/acore-text/acore-text-handler.service.ts +++ b/libs/features/texts/src/acore-text/acore-string-handler.service.ts @@ -5,7 +5,7 @@ import { ACORE_STRING_TABLE, AcoreString } from '@keira/shared/acore-world-model @Injectable({ providedIn: 'root', }) -export class AcoreTextHandlerService extends HandlerService { +export class AcoreStringHandlerService extends HandlerService { protected readonly mainEditorRoutePath = 'texts/acore-string'; get isUnsaved(): boolean { diff --git a/libs/features/texts/src/acore-text/acore-text.component.html b/libs/features/texts/src/acore-text/acore-string.component.html similarity index 100% rename from libs/features/texts/src/acore-text/acore-text.component.html rename to libs/features/texts/src/acore-text/acore-string.component.html diff --git a/libs/features/texts/src/acore-text/acore-text.component.ts b/libs/features/texts/src/acore-text/acore-string.component.ts similarity index 52% rename from libs/features/texts/src/acore-text/acore-text.component.ts rename to libs/features/texts/src/acore-text/acore-string.component.ts index 4e9ebba6ee..77edf02a25 100644 --- a/libs/features/texts/src/acore-text/acore-text.component.ts +++ b/libs/features/texts/src/acore-text/acore-string.component.ts @@ -2,19 +2,19 @@ import { ChangeDetectionStrategy, Component, inject } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; import { AcoreString } from '@keira/shared/acore-world-model'; import { SingleRowEditorComponent } from '@keira/shared/base-abstract-classes'; -import { QueryOutputComponent, TopBarComponent } from '@keira/shared/base-editor-components'; import { TranslateModule } from '@ngx-translate/core'; import { TooltipModule } from 'ngx-bootstrap/tooltip'; -import { AcoreTextHandlerService } from './acore-text-handler.service'; -import { AcoreTextService } from './acore-text.service'; +import { AcoreStringHandlerService } from './acore-string-handler.service'; +import { AcoreStringService } from './acore-string.service'; +import { QueryOutputComponent, TopBarComponent } from '@keira/shared/base-editor-components'; @Component({ changeDetection: ChangeDetectionStrategy.OnPush, - templateUrl: './acore-text.component.html', + templateUrl: './acore-string.component.html', standalone: true, - imports: [TopBarComponent, TranslateModule, QueryOutputComponent, ReactiveFormsModule, TooltipModule], + imports: [TranslateModule, ReactiveFormsModule, TooltipModule, QueryOutputComponent, TopBarComponent], }) -export class AcoreTextComponent extends SingleRowEditorComponent { - override readonly editorService = inject(AcoreTextService); - protected override readonly handlerService = inject(AcoreTextHandlerService); +export class AcoreStringComponent extends SingleRowEditorComponent { + override readonly editorService = inject(AcoreStringService); + protected override readonly handlerService = inject(AcoreStringHandlerService); } diff --git a/libs/features/texts/src/acore-text/acore-text.integration.spec.ts b/libs/features/texts/src/acore-text/acore-string.integration.spec.ts similarity index 94% rename from libs/features/texts/src/acore-text/acore-text.integration.spec.ts rename to libs/features/texts/src/acore-text/acore-string.integration.spec.ts index c4c957de93..e07e43ec82 100644 --- a/libs/features/texts/src/acore-text/acore-text.integration.spec.ts +++ b/libs/features/texts/src/acore-text/acore-string.integration.spec.ts @@ -7,11 +7,11 @@ import { ToastrModule } from 'ngx-toastr'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { of } from 'rxjs'; import { KEIRA_APP_CONFIG_TOKEN, KEIRA_MOCK_CONFIG } from '@keira/shared/config'; -import { AcoreTextComponent } from './acore-text.component'; -import { AcoreTextHandlerService } from './acore-text-handler.service'; +import { AcoreStringComponent } from './acore-string.component'; +import { AcoreStringHandlerService } from './acore-string-handler.service'; describe('Acore String integration tests', () => { - class Page extends EditorPageObject {} + class Page extends EditorPageObject {} const entry = 1234; const expectedFullCreateQuery = @@ -35,13 +35,13 @@ describe('Acore String integration tests', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ - imports: [BrowserAnimationsModule, ToastrModule.forRoot(), ModalModule.forRoot(), AcoreTextComponent, TranslateTestingModule], + imports: [BrowserAnimationsModule, ToastrModule.forRoot(), ModalModule.forRoot(), AcoreStringComponent, TranslateTestingModule], providers: [{ provide: KEIRA_APP_CONFIG_TOKEN, useValue: KEIRA_MOCK_CONFIG }], }).compileComponents(); })); function setup(creatingNew: boolean) { - const handlerService = TestBed.inject(AcoreTextHandlerService); + const handlerService = TestBed.inject(AcoreStringHandlerService); handlerService['_selected'] = `${entry}`; handlerService.isNew = creatingNew; @@ -50,7 +50,7 @@ describe('Acore String integration tests', () => { spyOn(queryService, 'selectAll').and.returnValue(of(creatingNew ? [] : [originalEntity])); - const fixture = TestBed.createComponent(AcoreTextComponent); + const fixture = TestBed.createComponent(AcoreStringComponent); const component = fixture.componentInstance; const page = new Page(fixture); fixture.autoDetectChanges(true); diff --git a/libs/features/texts/src/acore-text/acore-string.service.spec.ts b/libs/features/texts/src/acore-text/acore-string.service.spec.ts new file mode 100644 index 0000000000..b8632f9269 --- /dev/null +++ b/libs/features/texts/src/acore-text/acore-string.service.spec.ts @@ -0,0 +1,17 @@ +import { TestBed } from '@angular/core/testing'; +import { AcoreStringService } from './acore-string.service'; +import { AcoreStringHandlerService } from './acore-string-handler.service'; +import { instance, mock } from 'ts-mockito'; +import { ToastrService } from 'ngx-toastr'; + +describe(AcoreStringService.name, () => { + beforeEach(() => + TestBed.configureTestingModule({ + providers: [AcoreStringHandlerService, { provide: ToastrService, useValue: instance(mock(ToastrService)) }], + }), + ); + + it('should be created', () => { + expect(TestBed.inject(AcoreStringService)).toBeTruthy(); + }); +}); diff --git a/libs/features/texts/src/acore-text/acore-text.service.ts b/libs/features/texts/src/acore-text/acore-string.service.ts similarity index 68% rename from libs/features/texts/src/acore-text/acore-text.service.ts rename to libs/features/texts/src/acore-text/acore-string.service.ts index 7cb110166f..e2cef4b0cd 100644 --- a/libs/features/texts/src/acore-text/acore-text.service.ts +++ b/libs/features/texts/src/acore-text/acore-string.service.ts @@ -1,14 +1,14 @@ import { Injectable } from '@angular/core'; import { SingleRowEditorService } from '@keira/shared/base-abstract-classes'; -import { AcoreTextHandlerService } from './acore-text-handler.service'; +import { AcoreStringHandlerService } from './acore-string-handler.service'; import { ACORE_STRING_DEFAULT, ACORE_STRING_ENTRY, ACORE_STRING_TABLE, AcoreString } from '@keira/shared/acore-world-model'; @Injectable({ providedIn: 'root', }) -export class AcoreTextService extends SingleRowEditorService { +export class AcoreStringService extends SingleRowEditorService { /* istanbul ignore next */ // because of: https://github.com/gotwarlost/istanbul/issues/690 - constructor(protected override handlerService: AcoreTextHandlerService) { + constructor(protected override handlerService: AcoreStringHandlerService) { super(AcoreString, ACORE_STRING_TABLE, ACORE_STRING_ENTRY, ACORE_STRING_DEFAULT, true, handlerService); } } diff --git a/libs/features/texts/src/acore-text/acore-text.service.spec.ts b/libs/features/texts/src/acore-text/acore-text.service.spec.ts deleted file mode 100644 index d9144800c3..0000000000 --- a/libs/features/texts/src/acore-text/acore-text.service.spec.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { TestBed } from '@angular/core/testing'; -import { AcoreTextService } from './acore-text.service'; -import { AcoreTextHandlerService } from './acore-text-handler.service'; -import { instance, mock } from 'ts-mockito'; -import { ToastrService } from 'ngx-toastr'; - -describe(AcoreTextService.name, () => { - beforeEach(() => - TestBed.configureTestingModule({ - providers: [AcoreTextHandlerService, { provide: ToastrService, useValue: instance(mock(ToastrService)) }], - }), - ); - - it('should be created', () => { - expect(TestBed.inject(AcoreTextService)).toBeTruthy(); - }); -}); diff --git a/libs/features/texts/src/acore-text/select-acore-text.component.html b/libs/features/texts/src/acore-text/select-acore-string.component.html similarity index 100% rename from libs/features/texts/src/acore-text/select-acore-text.component.html rename to libs/features/texts/src/acore-text/select-acore-string.component.html diff --git a/libs/features/texts/src/acore-text/select-acore-text.component.ts b/libs/features/texts/src/acore-text/select-acore-string.component.ts similarity index 71% rename from libs/features/texts/src/acore-text/select-acore-text.component.ts rename to libs/features/texts/src/acore-text/select-acore-string.component.ts index c35124e3d1..c0d1865892 100644 --- a/libs/features/texts/src/acore-text/select-acore-text.component.ts +++ b/libs/features/texts/src/acore-text/select-acore-string.component.ts @@ -4,28 +4,28 @@ import { ACORE_STRING_CUSTOM_STARTING_ID, ACORE_STRING_ENTRY, ACORE_STRING_TABLE import { NgxDatatableModule } from '@siemens/ngx-datatable'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { TranslateModule } from '@ngx-translate/core'; +import { SelectAcoreStringService } from './select-acore-string.service'; +import { AcoreStringHandlerService } from './acore-string-handler.service'; import { CreateComponent, HighlightjsWrapperComponent, TopBarComponent } from '@keira/shared/base-editor-components'; -import { SelectAcoreTextService } from './select-acore-text.service'; -import { AcoreTextHandlerService } from './acore-text-handler.service'; @Component({ changeDetection: ChangeDetectionStrategy.OnPush, - templateUrl: './select-acore-text.component.html', + templateUrl: './select-acore-string.component.html', standalone: true, imports: [ - TopBarComponent, - CreateComponent, TranslateModule, FormsModule, ReactiveFormsModule, - HighlightjsWrapperComponent, NgxDatatableModule, + TopBarComponent, + CreateComponent, + HighlightjsWrapperComponent, ], }) -export class SelectAcoreTextComponent extends SelectComponent { +export class SelectAcoreStringComponent extends SelectComponent { readonly entityTable = ACORE_STRING_TABLE; readonly entityIdField = ACORE_STRING_ENTRY; readonly customStartingId = ACORE_STRING_CUSTOM_STARTING_ID; - readonly selectService = inject(SelectAcoreTextService); - readonly handlerService = inject(AcoreTextHandlerService); + readonly selectService = inject(SelectAcoreStringService); + readonly handlerService = inject(AcoreStringHandlerService); } diff --git a/libs/features/texts/src/acore-text/select-acore-text.integration.spec.ts b/libs/features/texts/src/acore-text/select-acore-string.integration.spec.ts similarity index 88% rename from libs/features/texts/src/acore-text/select-acore-text.integration.spec.ts rename to libs/features/texts/src/acore-text/select-acore-string.integration.spec.ts index b47d536226..1b43380373 100644 --- a/libs/features/texts/src/acore-text/select-acore-text.integration.spec.ts +++ b/libs/features/texts/src/acore-text/select-acore-string.integration.spec.ts @@ -7,12 +7,12 @@ import { ModalModule } from 'ngx-bootstrap/modal'; import { ToastrModule } from 'ngx-toastr'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { of } from 'rxjs'; -import { SelectAcoreTextComponent } from './select-acore-text.component'; -import { AcoreTextHandlerService } from './acore-text-handler.service'; -import { SelectAcoreTextService } from './select-acore-text.service'; +import { SelectAcoreStringComponent } from './select-acore-string.component'; +import { AcoreStringHandlerService } from './acore-string-handler.service'; +import { SelectAcoreStringService } from './select-acore-string.service'; -describe(`${SelectAcoreTextComponent.name} integration tests`, () => { - class Page extends SelectPageObject { +describe(`${SelectAcoreStringComponent.name} integration tests`, () => { + class Page extends SelectPageObject { override ID_FIELD = ACORE_STRING_ENTRY; } @@ -21,8 +21,8 @@ describe(`${SelectAcoreTextComponent.name} integration tests`, () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ - imports: [BrowserAnimationsModule, ToastrModule.forRoot(), ModalModule.forRoot(), SelectAcoreTextComponent, TranslateTestingModule], - providers: [AcoreTextHandlerService], + imports: [BrowserAnimationsModule, ToastrModule.forRoot(), ModalModule.forRoot(), SelectAcoreStringComponent, TranslateTestingModule], + providers: [AcoreStringHandlerService], }).compileComponents(); })); @@ -31,9 +31,9 @@ describe(`${SelectAcoreTextComponent.name} integration tests`, () => { const queryService = TestBed.inject(MysqlQueryService); const querySpy = spyOn(queryService, 'query').and.returnValue(of([{ max: 1 }])); - const selectService = TestBed.inject(SelectAcoreTextService); + const selectService = TestBed.inject(SelectAcoreStringService); - const fixture = TestBed.createComponent(SelectAcoreTextComponent); + const fixture = TestBed.createComponent(SelectAcoreStringComponent); const page = new Page(fixture); const component = fixture.componentInstance; fixture.autoDetectChanges(true); diff --git a/libs/features/texts/src/acore-text/select-acore-text.service.spec.ts b/libs/features/texts/src/acore-text/select-acore-string.service.spec.ts similarity index 53% rename from libs/features/texts/src/acore-text/select-acore-text.service.spec.ts rename to libs/features/texts/src/acore-text/select-acore-string.service.spec.ts index 586ad42015..dbf98e05d2 100644 --- a/libs/features/texts/src/acore-text/select-acore-text.service.spec.ts +++ b/libs/features/texts/src/acore-text/select-acore-string.service.spec.ts @@ -2,21 +2,21 @@ import { TestBed } from '@angular/core/testing'; import { MysqlQueryService } from '@keira/shared/db-layer'; import { instance, mock } from 'ts-mockito'; -import { SelectAcoreTextService } from './select-acore-text.service'; -import { AcoreTextHandlerService } from './acore-text-handler.service'; +import { SelectAcoreStringService } from './select-acore-string.service'; +import { AcoreStringHandlerService } from './acore-string-handler.service'; -describe(SelectAcoreTextService.name, () => { +describe(SelectAcoreStringService.name, () => { beforeEach(() => TestBed.configureTestingModule({ providers: [ { provide: MysqlQueryService, useValue: instance(mock(MysqlQueryService)) }, - SelectAcoreTextService, - AcoreTextHandlerService, + SelectAcoreStringService, + AcoreStringHandlerService, ], }), ); it('should be created', () => { - expect(TestBed.inject(SelectAcoreTextService)).toBeTruthy(); + expect(TestBed.inject(SelectAcoreStringService)).toBeTruthy(); }); }); diff --git a/libs/features/texts/src/acore-text/select-acore-text.service.ts b/libs/features/texts/src/acore-text/select-acore-string.service.ts similarity index 75% rename from libs/features/texts/src/acore-text/select-acore-text.service.ts rename to libs/features/texts/src/acore-text/select-acore-string.service.ts index bfcc4d5cea..4064d17873 100644 --- a/libs/features/texts/src/acore-text/select-acore-text.service.ts +++ b/libs/features/texts/src/acore-text/select-acore-string.service.ts @@ -8,16 +8,16 @@ import { ACORE_STRING_TABLE, AcoreString, } from '@keira/shared/acore-world-model'; -import { AcoreTextHandlerService } from './acore-text-handler.service'; +import { AcoreStringHandlerService } from './acore-string-handler.service'; @Injectable({ providedIn: 'root', }) -export class SelectAcoreTextService extends SelectService { +export class SelectAcoreStringService extends SelectService { /* istanbul ignore next */ // because of: https://github.com/gotwarlost/istanbul/issues/690 constructor( override readonly queryService: MysqlQueryService, - public override readonly handlerService: AcoreTextHandlerService, + public override readonly handlerService: AcoreStringHandlerService, ) { super(queryService, handlerService, ACORE_STRING_TABLE, ACORE_STRING_ENTRY, ACORE_STRING_DEFAULT, ACORE_STRING_SEARCH_FIELDS); }