Adress code review

azerothcore · Dec 21, 2024 · 6ad59f0 · 6ad59f0
1 parent 079cf0e
commit 6ad59f0
Show file tree

Hide file tree

Showing 13 changed files with 30 additions and 33 deletions.
diff --git a/...text/acore-string-handler.service.spec.ts → ...ring/acore-string-handler.service.spec.ts b/...text/acore-string-handler.service.spec.ts → ...ring/acore-string-handler.service.spec.ts
diff --git a/...core-text/acore-string-handler.service.ts → ...re-string/acore-string-handler.service.ts b/...core-text/acore-string-handler.service.ts → ...re-string/acore-string-handler.service.ts
diff --git a/...rc/acore-text/acore-string.component.html → .../acore-string/acore-string.component.html b/...rc/acore-text/acore-string.component.html → .../acore-string/acore-string.component.html
diff --git a/.../src/acore-text/acore-string.component.ts → ...rc/acore-string/acore-string.component.ts b/.../src/acore-text/acore-string.component.ts → ...rc/acore-string/acore-string.component.ts
diff --git a/...ore-text/acore-string.integration.spec.ts → ...e-string/acore-string.integration.spec.ts b/...ore-text/acore-string.integration.spec.ts → ...e-string/acore-string.integration.spec.ts
@@ -56,7 +56,7 @@ describe('Acore String integration tests', () => {
     fixture.autoDetectChanges(true);
     fixture.detectChanges();
 
-    return { originalEntity, handlerService, queryService, querySpy, fixture, component, page: page };
+    return { originalEntity, handlerService, queryService, querySpy, fixture, component, page };
   }
 
   describe('Creating new', () => {

diff --git a/...c/acore-text/acore-string.service.spec.ts → ...acore-string/acore-string.service.spec.ts b/...c/acore-text/acore-string.service.spec.ts → ...acore-string/acore-string.service.spec.ts
diff --git a/...ts/src/acore-text/acore-string.service.ts → .../src/acore-string/acore-string.service.ts b/...ts/src/acore-text/acore-string.service.ts → .../src/acore-string/acore-string.service.ts
diff --git a/...e-text/select-acore-string.component.html → ...string/select-acore-string.component.html b/...e-text/select-acore-string.component.html → ...string/select-acore-string.component.html
@@ -53,8 +53,8 @@
           [selectionType]="DTCFG.selectionType"
           (select)="selectService.onSelect($event)"
         >
-          <ngx-datatable-column name="entry" prop="entry" [minWidth]="80"></ngx-datatable-column>
-          <ngx-datatable-column name="content_default" prop="content_default" [minWidth]="400"></ngx-datatable-column>
+          <ngx-datatable-column name="entry" prop="entry" [minWidth]="80" />
+          <ngx-datatable-column name="content_default" prop="content_default" [minWidth]="400" />
         </ngx-datatable>
       </div>
     }

diff --git a/...ore-text/select-acore-string.component.ts → ...e-string/select-acore-string.component.ts b/...ore-text/select-acore-string.component.ts → ...e-string/select-acore-string.component.ts
diff --git a/...t/select-acore-string.integration.spec.ts → ...g/select-acore-string.integration.spec.ts b/...t/select-acore-string.integration.spec.ts → ...g/select-acore-string.integration.spec.ts
@@ -39,51 +39,51 @@ describe(`${SelectAcoreStringComponent.name} integration tests`, () => {
     fixture.autoDetectChanges(true);
     fixture.detectChanges();
 
-    return { component, fixture, selectService, broadcast: page, queryService, querySpy, navigateSpy };
+    return { component, fixture, selectService, acoreStrings: page, queryService, querySpy, navigateSpy };
   }
 
   it('should correctly initialise', waitForAsync(async () => {
-    const { fixture, broadcast, querySpy, component } = setup();
+    const { fixture, acoreStrings, querySpy, component } = setup();
 
     await fixture.whenStable();
-    expect(broadcast.createInput.value).toEqual(`${component.customStartingId}`);
-    broadcast.expectNewEntityFree();
+    expect(acoreStrings.createInput.value).toEqual(`${component.customStartingId}`);
+    acoreStrings.expectNewEntityFree();
     expect(querySpy).toHaveBeenCalledWith('SELECT MAX(entry) AS max FROM acore_string;');
-    expect(broadcast.queryWrapper.innerText).toContain('SELECT * FROM `acore_string` LIMIT 50');
+    expect(acoreStrings.queryWrapper.innerText).toContain('SELECT * FROM `acore_string` LIMIT 50');
   }));
 
   it('should correctly behave when inserting and selecting free entry', waitForAsync(async () => {
-    const { fixture, broadcast, querySpy, navigateSpy } = setup();
+    const { fixture, acoreStrings, querySpy, navigateSpy } = setup();
 
     await fixture.whenStable();
     querySpy.calls.reset();
     querySpy.and.returnValue(of([]));
 
-    broadcast.setInputValue(broadcast.createInput, value);
+    acoreStrings.setInputValue(acoreStrings.createInput, value);
 
     expect(querySpy).toHaveBeenCalledTimes(1);
     expect(querySpy).toHaveBeenCalledWith(`SELECT * FROM \`acore_string\` WHERE (entry = ${value})`);
-    broadcast.expectNewEntityFree();
+    acoreStrings.expectNewEntityFree();
 
-    broadcast.clickElement(broadcast.selectNewBtn);
+    acoreStrings.clickElement(acoreStrings.selectNewBtn);
 
     expect(navigateSpy).toHaveBeenCalledTimes(1);
     expect(navigateSpy).toHaveBeenCalledWith([expectedRoute]);
-    broadcast.expectTopBarCreatingNew(value);
+    acoreStrings.expectTopBarCreatingNew(value);
   }));
 
   it('should correctly behave when inserting an existing entity', waitForAsync(async () => {
-    const { fixture, broadcast, querySpy } = setup();
+    const { fixture, acoreStrings, querySpy } = setup();
 
     await fixture.whenStable();
     querySpy.calls.reset();
     querySpy.and.returnValue(of([{}]));
 
-    broadcast.setInputValue(broadcast.createInput, value);
+    acoreStrings.setInputValue(acoreStrings.createInput, value);
 
     expect(querySpy).toHaveBeenCalledTimes(1);
     expect(querySpy).toHaveBeenCalledWith(`SELECT * FROM \`acore_string\` WHERE (entry = ${value})`);
-    broadcast.expectEntityAlreadyInUse();
+    acoreStrings.expectEntityAlreadyInUse();
   }));
 
   for (const { id, entry, limit, expectedQuery } of [
@@ -95,46 +95,43 @@ describe(`${SelectAcoreStringComponent.name} integration tests`, () => {
     },
   ]) {
     it(`searching an existing entity should correctly work [${id}]`, () => {
-      const { broadcast, querySpy } = setup();
+      const { acoreStrings, querySpy } = setup();
 
       querySpy.calls.reset();
       if (entry) {
-        broadcast.setInputValue(broadcast.searchIdInput, entry);
+        acoreStrings.setInputValue(acoreStrings.searchIdInput, entry);
       }
-      broadcast.setInputValue(broadcast.searchLimitInput, limit);
+      acoreStrings.setInputValue(acoreStrings.searchLimitInput, limit);
 
-      expect(broadcast.queryWrapper.innerText).toContain(expectedQuery);
+      expect(acoreStrings.queryWrapper.innerText).toContain(expectedQuery);
 
-      broadcast.clickElement(broadcast.searchBtn);
+      acoreStrings.clickElement(acoreStrings.searchBtn);
 
       expect(querySpy).toHaveBeenCalledTimes(1);
       expect(querySpy).toHaveBeenCalledWith(expectedQuery);
     });
   }
 
   it('searching and selecting an existing entity from the datatable should correctly work', () => {
-    const { navigateSpy, broadcast, querySpy } = setup();
+    const { navigateSpy, acoreStrings, querySpy } = setup();
 
     const results = [{ entry: 1 }, { entry: 2 }, { entry: 3 }];
     querySpy.calls.reset();
     querySpy.and.returnValue(of(results));
 
-    broadcast.clickElement(broadcast.searchBtn);
+    acoreStrings.clickElement(acoreStrings.searchBtn);
 
-    const row0 = broadcast.getDatatableRow(0);
-    const row1 = broadcast.getDatatableRow(1);
-    const row2 = broadcast.getDatatableRow(2);
+    const row0 = acoreStrings.getDatatableRow(0);
+    const row1 = acoreStrings.getDatatableRow(1);
+    const row2 = acoreStrings.getDatatableRow(2);
 
     expect(row0.innerText).toContain(String(results[0].entry));
     expect(row1.innerText).toContain(String(results[1].entry));
     expect(row2.innerText).toContain(String(results[2].entry));
 
-    broadcast.clickElement(broadcast.getDatatableCell(0, 0));
+    acoreStrings.clickElement(acoreStrings.getDatatableCell(0, 0));
 
     expect(navigateSpy).toHaveBeenCalledTimes(1);
     expect(navigateSpy).toHaveBeenCalledWith([expectedRoute]);
-    // TODO: check this
-    // Note: this is different than in other editors
-    // expect(broadcast.topBar.innerText).toContain(`Editing: broadcast_text (${results[0].ID})`);
   });
 });
diff --git a/...-text/select-acore-string.service.spec.ts → ...tring/select-acore-string.service.spec.ts b/...-text/select-acore-string.service.spec.ts → ...tring/select-acore-string.service.spec.ts
diff --git a/...acore-text/select-acore-string.service.ts → ...ore-string/select-acore-string.service.ts b/...acore-text/select-acore-string.service.ts → ...ore-string/select-acore-string.service.ts
diff --git a/libs/features/texts/src/index.ts b/libs/features/texts/src/index.ts
@@ -10,6 +10,6 @@ export { NpcTextHandlerService } from './npc-text/npc-text-handler.service';
 export { SelectNpcTextComponent } from './npc-text/select-npc-text.component';
 export { NpcTextComponent } from './npc-text/npc-text.component';
 
-export { AcoreStringHandlerService } from './acore-text/acore-string-handler.service';
-export { SelectAcoreStringComponent } from './acore-text/select-acore-string.component';
-export { AcoreStringComponent } from './acore-text/acore-string.component';
+export { AcoreStringHandlerService } from './acore-string/acore-string-handler.service';
+export { SelectAcoreStringComponent } from './acore-string/select-acore-string.component';
+export { AcoreStringComponent } from './acore-string/acore-string.component';