feat(angular-migration): migrate to angular 10 (#841)

* feat(gossip-menu-option): add preview in gossip menu option editor and npc-text-selector * feat(gossip-menu-option-preview): add preview in the gossip menu option editor * chore(gossip-menu): minor improvements * chore(gossip-preview): minor improvements * refactor(angular): prepare migrating to angular 10 * chore(angular-migration): prepare migration to angular 10 * chore(angular-migration): prepare migration to angular 10 WIP * wip * chore(angular-migration): angular 10 WIP * chore(angular-migration): update highlight.js * chore(angular-migration): update ngx-highlightjs * fix(test): revert last 2 commits
azerothcore · Aug 20, 2020 · 1568e55 · 1568e55
1 parent cb05160
commit 1568e55
Show file tree

Hide file tree

Showing 35 changed files with 856 additions and 835 deletions.
diff --git a/e2e/tsconfig.e2e.json b/e2e/tsconfig.e2e.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../tsconfig.json",
+  "extends": "../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "../out-tsc/e2e",
     "module": "commonjs",

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -34,7 +34,7 @@
   },
   "dependencies": {
     "mysql": "2.18.1",
-    "ngx-toastr": "12.1.0",
+    "ngx-toastr": "13.0.0",
     "ngx-ui-switch": "10.0.2",
     "serialize-javascript": "4.0.0",
     "sqlite3": "5.0.0",
@@ -43,17 +43,17 @@
   },
   "devDependencies": {
     "@angular-builders/custom-webpack": "10.0.0",
-    "@angular-devkit/build-angular": "0.901.11",
-    "@angular/animations": "9.1.12",
-    "@angular/cli": "9.1.11",
-    "@angular/common": "9.1.12",
-    "@angular/compiler": "9.1.12",
-    "@angular/compiler-cli": "9.1.12",
-    "@angular/core": "9.1.12",
-    "@angular/forms": "9.1.12",
-    "@angular/platform-browser": "9.1.12",
-    "@angular/platform-browser-dynamic": "9.1.12",
-    "@angular/router": "9.1.12",
+    "@angular-devkit/build-angular": "0.1000.6",
+    "@angular/animations": "10.0.11",
+    "@angular/cli": "10.0.6",
+    "@angular/common": "10.0.11",
+    "@angular/compiler": "10.0.11",
+    "@angular/compiler-cli": "10.0.11",
+    "@angular/core": "10.0.11",
+    "@angular/forms": "10.0.11",
+    "@angular/platform-browser": "10.0.11",
+    "@angular/platform-browser-dynamic": "10.0.11",
+    "@angular/router": "10.0.11",
     "@fortawesome/fontawesome-free": "5.14.0",
     "@swimlane/ngx-datatable": "17.1.0",
     "@types/jasmine": "3.5.12",
@@ -65,7 +65,7 @@
     "@types/sqlstring": "2.2.1",
     "bootstrap": "4.5.2",
     "chai": "4.2.0",
-    "codelyzer": "6.0.0",
+    "codelyzer": "^6.0.0",
     "conventional-changelog-cli": "2.1.0",
     "coveralls": "3.1.0",
     "cross-env": "7.0.2",
@@ -94,7 +94,7 @@
     "ts-mockito": "2.6.1",
     "ts-node": "8.10.2",
     "tslint": "6.1.3",
-    "typescript": "3.8.3",
+    "typescript": "3.9.7",
     "wait-on": "5.2.0",
     "webdriver-manager": "12.1.7",
     "zone.js": "0.11.1"

diff --git a/src/app/main/app.component.spec.ts b/src/app/main/app.component.spec.ts
@@ -67,7 +67,8 @@ describe('AppComponent', () => {
     it('should correctly react on connectionLost$ [connection lost]', () => {
       const { fixture, toastrService, connectionLostSubject } = setup();
       fixture.detectChanges();
-      spyOnAllFunctions(toastrService);
+      spyOn(toastrService, 'success');
+      spyOn(toastrService, 'error');
 
       connectionLostSubject.next(false);
       connectionLostSubject.next(false);
@@ -81,7 +82,8 @@ describe('AppComponent', () => {
     it('should correctly react on connectionLost$ [reconnected]', () => {
       const { fixture, connectionLostSubject, toastrService } = setup();
       fixture.detectChanges();
-      spyOnAllFunctions(toastrService);
+      spyOn(toastrService, 'success');
+      spyOn(toastrService, 'error');
 
       connectionLostSubject.next(true);
 

diff --git a/src/app/main/main-window/sidebar/logout-btn/logout-btn.component.spec.ts b/src/app/main/main-window/sidebar/logout-btn/logout-btn.component.spec.ts
@@ -10,7 +10,6 @@ import { closeModalsAfterEach } from '@keira-testing/test-helpers';
 
 @NgModule({
   declarations: [ ModalConfirmComponent ],
-  entryComponents: [ ModalConfirmComponent ],
   imports: [ ],
 })
 class TestModule {}

diff --git a/src/app/main/main-window/sidebar/sidebar.module.ts b/src/app/main/main-window/sidebar/sidebar.module.ts
@@ -7,17 +7,13 @@ import { TooltipModule } from 'ngx-bootstrap/tooltip';
 
 import { SidebarComponent } from './sidebar.component';
 import { LogoutBtnComponent } from './logout-btn/logout-btn.component';
-import { ModalConfirmComponent } from '@keira-shared/modules/modal-confirm/modal-confirm.component';
 import { ModalConfirmModule } from '@keira-shared/modules/modal-confirm/modal-confirm.module';
 import { UnsavedIconComponent } from './unsaved-icon/unsaved-icon.component';
 const DEFAULT_PERFECT_SCROLLBAR_CONFIG: PerfectScrollbarConfigInterface = {
   suppressScrollX: true
 };
 
 @NgModule({
-  entryComponents: [
-    ModalConfirmComponent
-  ],
   declarations: [
     SidebarComponent,
     LogoutBtnComponent,

diff --git a/src/app/shared/abstract/components/editors/editor.component.spec.ts b/src/app/shared/abstract/components/editors/editor.component.spec.ts
@@ -2,7 +2,9 @@ import { EditorComponent } from './editor.component';
 import { MockEntity } from '@keira-testing/mock-services';
 import { EditorService } from '../../service/editors/editor.service';
 import { HandlerService } from '../../service/handlers/handler.service';
+import { Component } from '@angular/core';
 
+@Component({})
 class MockComponent extends EditorComponent<MockEntity> {}
 
 describe('EditorComponent', () => {

diff --git a/src/app/shared/abstract/components/editors/editor.component.ts b/src/app/shared/abstract/components/editors/editor.component.ts
@@ -1,11 +1,12 @@
-import { OnInit } from '@angular/core';
+import { OnInit, Component } from '@angular/core';
 
 import { TableRow } from '@keira-types/general';
 import { WIKI_BASE_URL } from '@keira-constants/general';
 import { HandlerService } from '../../service/handlers/handler.service';
 import { EditorService } from '../../service/editors/editor.service';
 import { SubscriptionHandler } from '../../../utils/subscription-handler/subscription-handler';
 
+@Component({ template: '' })
 export abstract class EditorComponent<T extends TableRow> extends SubscriptionHandler implements OnInit {
   public readonly WIKI_BASE_URL = WIKI_BASE_URL;
   public get docUrl(): string {

diff --git a/src/app/shared/abstract/components/editors/loot-template/loot-template-id.component.ts b/src/app/shared/abstract/components/editors/loot-template/loot-template-id.component.ts
@@ -1,4 +1,4 @@
-import { OnInit } from '@angular/core';
+import { OnInit, Component } from '@angular/core';
 import { MysqlError } from 'mysql';
 
 import { LootTemplate } from '@keira-types/loot-template.type';
@@ -7,6 +7,7 @@ import { LootEditorIdService } from '../../../service/editors/loot-editor-id.ser
 import { LootTemplateComponent } from '@keira-abstract/components/editors/loot-template/loot-template.component';
 
 // Extended only by the loot tables that require a template loot id
+@Component({ template: '' })
 export abstract class LootTemplateIdComponent<T extends LootTemplate> extends LootTemplateComponent<T> implements OnInit {
 
   protected _lootId: number;

diff --git a/src/app/shared/abstract/components/editors/loot-template/loot-template.component.ts b/src/app/shared/abstract/components/editors/loot-template/loot-template.component.ts
@@ -1,5 +1,7 @@
 import { LootTemplate } from '@keira-types/loot-template.type';
 import { MultiRowEditorComponent } from '../multi-row-editor.component';
+import { Component } from '@angular/core';
 
 /* istanbul ignore next */ // TODO: for some reason the next line gives coverage issues...
+@Component({ template: '' })
 export abstract class LootTemplateComponent<T extends LootTemplate> extends MultiRowEditorComponent<T> {}
diff --git a/src/app/shared/abstract/components/editors/multi-row-editor.component.ts b/src/app/shared/abstract/components/editors/multi-row-editor.component.ts
@@ -3,7 +3,9 @@ import { HandlerService } from '../../service/handlers/handler.service';
 import { EditorComponent } from './editor.component';
 import { MultiRowEditorService } from '../../service/editors/multi-row-editor.service';
 import { DTCFG } from '@keira-config/datatable.config';
+import { Component } from '@angular/core';
 
+@Component({ template: '' })
 export abstract class MultiRowEditorComponent<T extends TableRow> extends EditorComponent<T> {
 
   public readonly DTCFG = DTCFG;

diff --git a/src/app/shared/abstract/components/editors/single-row-editor.component.ts b/src/app/shared/abstract/components/editors/single-row-editor.component.ts
@@ -2,7 +2,9 @@ import { TableRow } from '@keira-types/general';
 import { SingleRowEditorService } from '../../service/editors/single-row-editor.service';
 import { HandlerService } from '../../service/handlers/handler.service';
 import { EditorComponent } from './editor.component';
+import { Component } from '@angular/core';
 
+@Component({ template: '' })
 export abstract class SingleRowEditorComponent<T extends TableRow> extends EditorComponent<T> {
 
   /* istanbul ignore next */ // because of: https://github.com/gotwarlost/istanbul/issues/690

diff --git a/src/app/shared/modules/selectors/area-selector/area-selector.module.ts b/src/app/shared/modules/selectors/area-selector/area-selector.module.ts
@@ -11,9 +11,6 @@ import { ModalModule } from 'ngx-bootstrap/modal';
 import { SearchButtonsModule } from '@keira-shared/modules/search-button/search-buttons.module';
 
 @NgModule({
-  entryComponents: [
-    AreaSelectorModalComponent,
-  ],
   declarations: [
     AreaSelectorBtnComponent,
     AreaSelectorModalComponent,

diff --git a/src/app/shared/modules/selectors/base-selector/base-selector-btn.component.spec.ts b/src/app/shared/modules/selectors/base-selector/base-selector-btn.component.spec.ts
@@ -18,7 +18,6 @@ import { closeModalsAfterEach } from '@keira-testing/test-helpers';
 
 @NgModule({
   declarations: [ ItemSelectorModalComponent ],
-  entryComponents: [ ItemSelectorModalComponent ],
   imports: [
     CommonModule,
     BrowserModule,

diff --git a/src/app/shared/modules/selectors/creature-selector/creature-selector.module.ts b/src/app/shared/modules/selectors/creature-selector/creature-selector.module.ts
@@ -11,9 +11,6 @@ import { ModalModule } from 'ngx-bootstrap/modal';
 import { SearchButtonsModule } from '@keira-shared/modules/search-button/search-buttons.module';
 
 @NgModule({
-  entryComponents: [
-    CreatureSelectorModalComponent,
-  ],
   declarations: [
     CreatureSelectorBtnComponent,
     CreatureSelectorModalComponent,

diff --git a/src/app/shared/modules/selectors/faction-selector/faction-selector.module.ts b/src/app/shared/modules/selectors/faction-selector/faction-selector.module.ts
@@ -11,9 +11,6 @@ import { ModalModule } from 'ngx-bootstrap/modal';
 import { SearchButtonsModule } from '@keira-shared/modules/search-button/search-buttons.module';
 
 @NgModule({
-  entryComponents: [
-    FactionSelectorModalComponent,
-  ],
   declarations: [
     FactionSelectorBtnComponent,
     FactionSelectorModalComponent,

diff --git a/src/app/shared/modules/selectors/flags-selector/flags-selector.module.ts b/src/app/shared/modules/selectors/flags-selector/flags-selector.module.ts
@@ -8,9 +8,6 @@ import { FlagsSelectorBtnComponent } from './flags-selector-btn.component';
 import { uiSwitchConfig } from '@keira-config/ui-switch.config';
 
 @NgModule({
-  entryComponents: [
-    FlagsSelectorModalComponent,
-  ],
   declarations: [
     FlagsSelectorModalComponent,
     FlagsSelectorBtnComponent,

diff --git a/src/app/shared/modules/selectors/gameobject-selector/gameobject-selector.module.ts b/src/app/shared/modules/selectors/gameobject-selector/gameobject-selector.module.ts
@@ -11,9 +11,6 @@ import { ModalModule } from 'ngx-bootstrap/modal';
 import { SearchButtonsModule } from '@keira-shared/modules/search-button/search-buttons.module';
 
 @NgModule({
-  entryComponents: [
-    GameobjectSelectorModalComponent,
-  ],
   declarations: [
     GameobjectSelectorBtnComponent,
     GameobjectSelectorModalComponent,

diff --git a/src/app/shared/modules/selectors/holiday-selector/holiday-selector.module.ts b/src/app/shared/modules/selectors/holiday-selector/holiday-selector.module.ts
@@ -11,9 +11,6 @@ import { ModalModule } from 'ngx-bootstrap/modal';
 import { SearchButtonsModule } from '@keira-shared/modules/search-button/search-buttons.module';
 
 @NgModule({
-  entryComponents: [
-    HolidaySelectorModalComponent,
-  ],
   declarations: [
     HolidaySelectorBtnComponent,
     HolidaySelectorModalComponent,

diff --git a/...pp/shared/modules/selectors/item-enchantment-selector/item-enchantment-selector.module.ts b/...pp/shared/modules/selectors/item-enchantment-selector/item-enchantment-selector.module.ts
@@ -11,9 +11,6 @@ import { ModalModule } from 'ngx-bootstrap/modal';
 import { SearchButtonsModule } from '@keira-shared/modules/search-button/search-buttons.module';
 
 @NgModule({
-  entryComponents: [
-    ItemEnchantmentSelectorModalComponent,
-  ],
   declarations: [
     ItemEnchantmentSelectorBtnComponent,
     ItemEnchantmentSelectorModalComponent,

diff --git a/...hared/modules/selectors/item-extended-cost-selector/item-extended-cost-selector.module.ts b/...hared/modules/selectors/item-extended-cost-selector/item-extended-cost-selector.module.ts
@@ -11,9 +11,6 @@ import { ModalModule } from 'ngx-bootstrap/modal';
 import { SearchButtonsModule } from '@keira-shared/modules/search-button/search-buttons.module';
 
 @NgModule({
-  entryComponents: [
-    ItemExtendedCostSelectorModalComponent,
-  ],
   declarations: [
     ItemExtendedCostSelectorBtnComponent,
     ItemExtendedCostSelectorModalComponent,

diff --git a/...red/modules/selectors/item-limit-category-selector/item-limit-category-selector.module.ts b/...red/modules/selectors/item-limit-category-selector/item-limit-category-selector.module.ts
@@ -11,9 +11,6 @@ import { ModalModule } from 'ngx-bootstrap/modal';
 import { SearchButtonsModule } from '@keira-shared/modules/search-button/search-buttons.module';
 
 @NgModule({
-  entryComponents: [
-    ItemLimitCategorySelectorModalComponent,
-  ],
   declarations: [
     ItemLimitCategorySelectorBtnComponent,
     ItemLimitCategorySelectorModalComponent,

diff --git a/src/app/shared/modules/selectors/item-selector/item-selector.module.ts b/src/app/shared/modules/selectors/item-selector/item-selector.module.ts
@@ -12,9 +12,6 @@ import { IconModule } from '@keira-shared/modules/icon/icon.module';
 import { SearchButtonsModule } from '@keira-shared/modules/search-button/search-buttons.module';
 
 @NgModule({
-  entryComponents: [
-    ItemSelectorModalComponent,
-  ],
   declarations: [
     ItemSelectorBtnComponent,
     ItemSelectorModalComponent,

diff --git a/src/app/shared/modules/selectors/language-selector/language-selector.module.ts b/src/app/shared/modules/selectors/language-selector/language-selector.module.ts
@@ -11,9 +11,6 @@ import { ModalModule } from 'ngx-bootstrap/modal';
 import { SearchButtonsModule } from '@keira-shared/modules/search-button/search-buttons.module';
 
 @NgModule({
-  entryComponents: [
-    LanguageSelectorModalComponent,
-  ],
   declarations: [
     LanguageSelectorBtnComponent,
     LanguageSelectorModalComponent,

diff --git a/src/app/shared/modules/selectors/map-selector/map-selector.module.ts b/src/app/shared/modules/selectors/map-selector/map-selector.module.ts
@@ -11,9 +11,6 @@ import { ModalModule } from 'ngx-bootstrap/modal';
 import { SearchButtonsModule } from '@keira-shared/modules/search-button/search-buttons.module';
 
 @NgModule({
-  entryComponents: [
-    MapSelectorModalComponent,
-  ],
   declarations: [
     MapSelectorBtnComponent,
     MapSelectorModalComponent,

diff --git a/src/app/shared/modules/selectors/npc-text-selector/npc-text-selector.module.ts b/src/app/shared/modules/selectors/npc-text-selector/npc-text-selector.module.ts
@@ -12,9 +12,6 @@ import { IconModule } from '@keira-shared/modules/icon/icon.module';
 import { SearchButtonsModule } from '@keira-shared/modules/search-button/search-buttons.module';
 
 @NgModule({
-  entryComponents: [
-    NpcTextSelectorModalComponent,
-  ],
   declarations: [
     NpcTextSelectorBtnComponent,
     NpcTextSelectorModalComponent,

diff --git a/src/app/shared/modules/selectors/quest-selector/quest-selector.module.ts b/src/app/shared/modules/selectors/quest-selector/quest-selector.module.ts
@@ -11,9 +11,6 @@ import { ModalModule } from 'ngx-bootstrap/modal';
 import { SearchButtonsModule } from '@keira-shared/modules/search-button/search-buttons.module';
 
 @NgModule({
-  entryComponents: [
-    QuestSelectorModalComponent,
-  ],
   declarations: [
     QuestSelectorBtnComponent,
     QuestSelectorModalComponent,

diff --git a/src/app/shared/modules/selectors/single-value-selector/single-value-selector.module.ts b/src/app/shared/modules/selectors/single-value-selector/single-value-selector.module.ts
@@ -7,9 +7,6 @@ import { SingleValueSelectorModalComponent } from './single-value-selector-modal
 import { SingleValueSelectorBtnComponent } from './single-value-selector-btn.component';
 
 @NgModule({
-  entryComponents: [
-    SingleValueSelectorModalComponent,
-  ],
   declarations: [
     SingleValueSelectorModalComponent,
     SingleValueSelectorBtnComponent,

diff --git a/src/app/shared/modules/selectors/skill-selector/skill-selector.module.ts b/src/app/shared/modules/selectors/skill-selector/skill-selector.module.ts
@@ -11,9 +11,6 @@ import { ModalModule } from 'ngx-bootstrap/modal';
 import { SearchButtonsModule } from '@keira-shared/modules/search-button/search-buttons.module';
 
 @NgModule({
-  entryComponents: [
-    SkillSelectorModalComponent,
-  ],
   declarations: [
     SkillSelectorBtnComponent,
     SkillSelectorModalComponent,

diff --git a/src/app/shared/modules/selectors/spell-selector/spell-selector.module.ts b/src/app/shared/modules/selectors/spell-selector/spell-selector.module.ts
@@ -11,9 +11,6 @@ import { ModalModule } from 'ngx-bootstrap/modal';
 import { SearchButtonsModule } from '@keira-shared/modules/search-button/search-buttons.module';
 
 @NgModule({
-  entryComponents: [
-    SpellSelectorModalComponent,
-  ],
   declarations: [
     SpellSelectorBtnComponent,
     SpellSelectorModalComponent,

diff --git a/src/app/shared/utils/subscription-handler/subscription-handler.ts b/src/app/shared/utils/subscription-handler/subscription-handler.ts
@@ -1,10 +1,11 @@
-import { OnDestroy } from '@angular/core';
+import { OnDestroy, Injectable } from '@angular/core';
 import { Subscription } from 'rxjs';
 
+@Injectable()
 export abstract class SubscriptionHandler implements OnDestroy {
   protected subscriptions: Subscription[] = [];
 
-  ngOnDestroy() {
+  ngOnDestroy(): void {
     this.subscriptions.forEach((subscription) => subscription.unsubscribe());
   }
 }
diff --git a/src/tsconfig.app.json b/src/tsconfig.app.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../tsconfig.json",
+  "extends": "../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "../out-tsc/app",
     "baseUrl": "",

diff --git a/src/tsconfig.spec.json b/src/tsconfig.spec.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../tsconfig.json",
+  "extends": "../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "../out-tsc/spec",
     "types": [