Migrating to ngrx instead of akita.

microting · May 9, 2024 · ee6b97f · ee6b97f
1 parent af9f5a7
commit ee6b97f
Show file tree

Hide file tree

Showing 140 changed files with 1,878 additions and 3,496 deletions.
diff --git a/eFormAPI/Plugins/TrashInspection.Pn/TrashInspection.Pn/EformTrashInspectionPlugin.cs b/eFormAPI/Plugins/TrashInspection.Pn/TrashInspection.Pn/EformTrashInspectionPlugin.cs
@@ -557,71 +557,71 @@ public List<PluginMenuItemModel> GetNavigationMenu(IServiceProvider serviceProvi
                                         },
                                     }
                             },
-                            new PluginMenuItemModel
-                            {
-                                Name = "Reports",
-                                E2EId = "trash-inspection-pn-reports",
-                                Link = "/plugins/trash-inspection-pn/reports",
-                                Type = MenuItemTypeEnum.Link,
-                                Position = 6,
-                                MenuTemplate = new PluginMenuTemplateModel
-                                {
-                                    Name = "Reports",
-                                    E2EId = "trash-inspection-pn-reports",
-                                    DefaultLink = "/plugins/trash-inspection-pn/reports",
-                                    Permissions = new List<PluginMenuTemplatePermissionModel>
-                                    {
-                                        new PluginMenuTemplatePermissionModel
-                                        {
-                                            ClaimName = TrashInspectionClaims.AccessReports,
-                                            PermissionName = "Obtain reports",
-                                            PermissionTypeName = "Reports",
-                                        }
-                                    },
-                                    Translations = new List<PluginMenuTranslationModel>
-                                    {
-                                        new PluginMenuTranslationModel
-                                        {
-                                            LocaleName = LocaleNames.English,
-                                            Name = "Reports",
-                                            Language = LanguageNames.English,
-                                        },
-                                        new PluginMenuTranslationModel
-                                        {
-                                            LocaleName = LocaleNames.German,
-                                            Name = "Reports",
-                                            Language = LanguageNames.German,
-                                        },
-                                        new PluginMenuTranslationModel
-                                        {
-                                            LocaleName = LocaleNames.Danish,
-                                            Name = "Rapporter",
-                                            Language = LanguageNames.Danish,
-                                        },
-                                    }
-                                },
-                                Translations = new List<PluginMenuTranslationModel>
-                                    {
-                                        new PluginMenuTranslationModel
-                                        {
-                                            LocaleName = LocaleNames.English,
-                                            Name = "Reports",
-                                            Language = LanguageNames.English,
-                                        },
-                                        new PluginMenuTranslationModel
-                                        {
-                                            LocaleName = LocaleNames.German,
-                                            Name = "Reports",
-                                            Language = LanguageNames.German,
-                                        },
-                                        new PluginMenuTranslationModel
-                                        {
-                                            LocaleName = LocaleNames.Danish,
-                                            Name = "Rapporter",
-                                            Language = LanguageNames.Danish,
-                                        },
-                                    }
-                            }
+                            // new PluginMenuItemModel
+                            // {
+                            //     Name = "Reports",
+                            //     E2EId = "trash-inspection-pn-reports",
+                            //     Link = "/plugins/trash-inspection-pn/reports",
+                            //     Type = MenuItemTypeEnum.Link,
+                            //     Position = 6,
+                            //     MenuTemplate = new PluginMenuTemplateModel
+                            //     {
+                            //         Name = "Reports",
+                            //         E2EId = "trash-inspection-pn-reports",
+                            //         DefaultLink = "/plugins/trash-inspection-pn/reports",
+                            //         Permissions = new List<PluginMenuTemplatePermissionModel>
+                            //         {
+                            //             new PluginMenuTemplatePermissionModel
+                            //             {
+                            //                 ClaimName = TrashInspectionClaims.AccessReports,
+                            //                 PermissionName = "Obtain reports",
+                            //                 PermissionTypeName = "Reports",
+                            //             }
+                            //         },
+                            //         Translations = new List<PluginMenuTranslationModel>
+                            //         {
+                            //             new PluginMenuTranslationModel
+                            //             {
+                            //                 LocaleName = LocaleNames.English,
+                            //                 Name = "Reports",
+                            //                 Language = LanguageNames.English,
+                            //             },
+                            //             new PluginMenuTranslationModel
+                            //             {
+                            //                 LocaleName = LocaleNames.German,
+                            //                 Name = "Reports",
+                            //                 Language = LanguageNames.German,
+                            //             },
+                            //             new PluginMenuTranslationModel
+                            //             {
+                            //                 LocaleName = LocaleNames.Danish,
+                            //                 Name = "Rapporter",
+                            //                 Language = LanguageNames.Danish,
+                            //             },
+                            //         }
+                            //     },
+                            //     Translations = new List<PluginMenuTranslationModel>
+                            //         {
+                            //             new PluginMenuTranslationModel
+                            //             {
+                            //                 LocaleName = LocaleNames.English,
+                            //                 Name = "Reports",
+                            //                 Language = LanguageNames.English,
+                            //             },
+                            //             new PluginMenuTranslationModel
+                            //             {
+                            //                 LocaleName = LocaleNames.German,
+                            //                 Name = "Reports",
+                            //                 Language = LanguageNames.German,
+                            //             },
+                            //             new PluginMenuTranslationModel
+                            //             {
+                            //                 LocaleName = LocaleNames.Danish,
+                            //                 Name = "Rapporter",
+                            //                 Language = LanguageNames.Danish,
+                            //             },
+                            //         }
+                            // }
                         }
                     }
             };
@@ -691,14 +691,14 @@ public MenuModel HeaderMenu(IServiceProvider serviceProvider)
                         Guards = new List<string> { TrashInspectionClaims.AccessTransporters },
                         Position = 5,
                     },
-                    new MenuItemModel
-                    {
-                        Name = localizationService.GetString("Reports"),
-                        E2EId = "trash-inspection-pn-reports",
-                        Link = "/plugins/trash-inspection-pn/reports",
-                        Guards = new List<string> { TrashInspectionClaims.AccessReports },
-                        Position = 6,
-                    }
+                    // new MenuItemModel
+                    // {
+                    //     Name = localizationService.GetString("Reports"),
+                    //     E2EId = "trash-inspection-pn-reports",
+                    //     Link = "/plugins/trash-inspection-pn/reports",
+                    //     Guards = new List<string> { TrashInspectionClaims.AccessReports },
+                    //     Position = 6,
+                    // }
                 }
             });
             return result;

diff --git a/eform-client/e2e/Page objects/trash-inspection/TrashInspection-Fraction.page.ts b/eform-client/e2e/Page objects/trash-inspection/TrashInspection-Fraction.page.ts
@@ -2,6 +2,7 @@ import Page from '../Page';
 import myEformsPage from '../MyEforms.page';
 import trashInspectionsPage from './TrashInspections.page';
 import {selectValueInNgSelector} from '../../Helpers/helper-functions';
+import { $ } from '@wdio/globals';
 
 export class TrashInspectionFractionPage extends Page {
   constructor() {

diff --git a/eform-client/e2e/Page objects/trash-inspection/TrashInspection-Installation.page.ts b/eform-client/e2e/Page objects/trash-inspection/TrashInspection-Installation.page.ts
@@ -1,5 +1,6 @@
 import Page from '../Page';
 import trashInspectionsPage from './TrashInspections.page';
+import { $ } from '@wdio/globals';
 
 export class TrashInspectionInstallationPage extends Page {
   constructor() {
@@ -110,7 +111,7 @@ export class TrashInspectionInstallationPage extends Page {
   }
 
   public async page2Object() {
-    const ele = (await $('.mat-paginator-range-label'));
+    const ele = (await $('.mat-mdc-paginator-range-label'));
     // ele.waitForDisplayed({timeout: 20000});
     // ele.waitForClickable({timeout: 20000});
     return ele;

diff --git a/eform-client/e2e/Page objects/trash-inspection/TrashInspection-Segment.page.ts b/eform-client/e2e/Page objects/trash-inspection/TrashInspection-Segment.page.ts
@@ -1,5 +1,6 @@
 import Page from '../Page';
 import trashInspectionsPage from './TrashInspections.page';
+import { $ } from '@wdio/globals';
 
 export class TrashInspectionSegmentsPage extends Page {
   constructor() {
@@ -127,6 +128,7 @@ export class TrashInspectionSegmentsPage extends Page {
     }
     await (await this.segmentnBtn()).waitForClickable({timeout: 20000});
     await (await this.segmentnBtn()).click();
+    await (await $('#spinner-animation')).waitForDisplayed({ timeout: 50000, reverse: true });
     await (await this.createSegmentBtn()).waitForClickable({timeout: 20000});
   }
 
@@ -139,6 +141,7 @@ export class TrashInspectionSegmentsPage extends Page {
   async createSegment(createModel?: CreateUpdateSegment, clickCancel = false) {
     await this.openCreateSegment(createModel);
     await this.closeCreateSegment(clickCancel);
+    await (await $('#spinner-animation')).waitForDisplayed({ timeout: 50000, reverse: true });
   }
 
   async openCreateSegment(createModel?: CreateUpdateSegment) {

diff --git a/eform-client/e2e/Page objects/trash-inspection/TrashInspectionSettings.page.ts b/eform-client/e2e/Page objects/trash-inspection/TrashInspectionSettings.page.ts
@@ -1,4 +1,5 @@
 import Page from '../Page';
+import { $ } from '@wdio/globals';
 
 export class TrashInspectionSettingsPage extends Page {
   constructor() {

diff --git a/eform-client/e2e/Page objects/trash-inspection/TrashInspections.page.ts b/eform-client/e2e/Page objects/trash-inspection/TrashInspections.page.ts
@@ -1,4 +1,5 @@
 import Page from '../Page';
+import { $ } from '@wdio/globals';
 
 export class TrashInspectionsPage extends Page {
   constructor() {

diff --git a/...client/e2e/Tests/trash-inspection-general/fractions/trash-inspection-fraction.add.spec.ts b/...client/e2e/Tests/trash-inspection-general/fractions/trash-inspection-fraction.add.spec.ts
@@ -2,6 +2,7 @@ import {expect} from 'chai';
 import loginPage from '../../../Page objects/Login.page';
 import fractionsPage from '../../../Page objects/trash-inspection/TrashInspection-Fraction.page';
 import {generateRandmString} from '../../../Helpers/helper-functions';
+import { $ } from '@wdio/globals';
 
 const createModel = {
   name: generateRandmString(),

diff --git a/...ent/e2e/Tests/trash-inspection-general/fractions/trash-inspection-fraction.delete.spec.ts b/...ent/e2e/Tests/trash-inspection-general/fractions/trash-inspection-fraction.delete.spec.ts
@@ -2,6 +2,7 @@ import {expect} from 'chai';
 import loginPage from '../../../Page objects/Login.page';
 import fractionsPage from '../../../Page objects/trash-inspection/TrashInspection-Fraction.page';
 import {generateRandmString} from '../../../Helpers/helper-functions';
+import { $ } from '@wdio/globals';
 
 const createModel = {
   name: generateRandmString(),

diff --git a/...lient/e2e/Tests/trash-inspection-general/fractions/trash-inspection-fraction.edit.spec.ts b/...lient/e2e/Tests/trash-inspection-general/fractions/trash-inspection-fraction.edit.spec.ts
@@ -3,6 +3,7 @@ import loginPage from '../../../Page objects/Login.page';
 import fractionsPage, {FractionsCreateUpdate} from '../../../Page objects/trash-inspection/TrashInspection-Fraction.page';
 import myEformsPage from '../../../Page objects/MyEforms.page';
 import {generateRandmString} from '../../../Helpers/helper-functions';
+import { $ } from '@wdio/globals';
 
 const createModel: FractionsCreateUpdate = {
   name: generateRandmString(),

diff --git a/...2e/Tests/trash-inspection-general/installations/trash-inspection-installation.add.spec.ts b/...2e/Tests/trash-inspection-general/installations/trash-inspection-installation.add.spec.ts
@@ -2,6 +2,7 @@ import {expect} from 'chai';
 import loginPage from '../../../Page objects/Login.page';
 import installationPage from '../../../Page objects/trash-inspection/TrashInspection-Installation.page';
 import {generateRandmString} from '../../../Helpers/helper-functions';
+import { $ } from '@wdio/globals';
 
 describe('Trash Inspection Plugin - Installation', function () {
   before(async () => {

diff --git a/...Tests/trash-inspection-general/installations/trash-inspection-installation.delete.spec.ts b/...Tests/trash-inspection-general/installations/trash-inspection-installation.delete.spec.ts
@@ -2,6 +2,7 @@ import installationPage from '../../../Page objects/trash-inspection/TrashInspec
 import {expect} from 'chai';
 import loginPage from '../../../Page objects/Login.page';
 import {generateRandmString} from '../../../Helpers/helper-functions';
+import { $ } from '@wdio/globals';
 
 const name = generateRandmString();
 describe('Trash Inspection Plugin - Installation', function () {

diff --git a/...e/Tests/trash-inspection-general/installations/trash-inspection-installation.edit.spec.ts b/...e/Tests/trash-inspection-general/installations/trash-inspection-installation.edit.spec.ts
@@ -2,6 +2,7 @@ import installationPage from '../../../Page objects/trash-inspection/TrashInspec
 import {expect} from 'chai';
 import loginPage from '../../../Page objects/Login.page';
 import {generateRandmString} from '../../../Helpers/helper-functions';
+import { $ } from '@wdio/globals';
 
 describe('Trash Inspection Plugin - Installation', function () {
   before(async () => {

diff --git a/.../Tests/trash-inspection-general/installations/trash-inspection-installation.multi.spec.ts b/.../Tests/trash-inspection-general/installations/trash-inspection-installation.multi.spec.ts
@@ -2,6 +2,7 @@ import {expect} from 'chai';
 import loginPage from '../../../Page objects/Login.page';
 import installationPage from '../../../Page objects/trash-inspection/TrashInspection-Installation.page';
 import {generateRandmString} from '../../../Helpers/helper-functions';
+import { $ } from '@wdio/globals';
 
 describe('Trash Inspection Plugin - Installation', function () {
   before(async () => {
@@ -14,7 +15,7 @@ describe('Trash Inspection Plugin - Installation', function () {
     for (let i = 0; i < 11; i++) {
       await installationPage.createInstallation(generateRandmString());
     }
-    expect(await (await installationPage.page2Object()).getText()).equal('1 – 10 of 11');
+    expect(await (await installationPage.page2Object()).getText()).equal('Side 1 af 2');
   });
   after(async () => {
     await loginPage.open('/');

diff --git a/...m-client/e2e/Tests/trash-inspection-general/segments/trash-inspection-segment.add.spec.ts b/...m-client/e2e/Tests/trash-inspection-general/segments/trash-inspection-segment.add.spec.ts
@@ -2,6 +2,7 @@ import {expect} from 'chai';
 import loginPage from '../../../Page objects/Login.page';
 import segmentPage, {CreateUpdateSegment} from '../../../Page objects/trash-inspection/TrashInspection-Segment.page';
 import {generateRandmString, getRandomInt} from '../../../Helpers/helper-functions';
+import { $ } from '@wdio/globals';
 
 const createModel: CreateUpdateSegment = {
   name: generateRandmString(),

diff --git a/...lient/e2e/Tests/trash-inspection-general/segments/trash-inspection-segment.delete.spec.ts b/...lient/e2e/Tests/trash-inspection-general/segments/trash-inspection-segment.delete.spec.ts
@@ -2,6 +2,7 @@ import {expect} from 'chai';
 import loginPage from '../../../Page objects/Login.page';
 import segmentPage, {CreateUpdateSegment} from '../../../Page objects/trash-inspection/TrashInspection-Segment.page';
 import {generateRandmString, getRandomInt} from '../../../Helpers/helper-functions';
+import { $ } from '@wdio/globals';
 
 describe('Trash Inspection Plugin - Segment', function () {
   before(async () => {

diff --git a/...-client/e2e/Tests/trash-inspection-general/segments/trash-inspection-segment.edit.spec.ts b/...-client/e2e/Tests/trash-inspection-general/segments/trash-inspection-segment.edit.spec.ts
@@ -2,6 +2,7 @@ import {expect} from 'chai';
 import loginPage from '../../../Page objects/Login.page';
 import segmentPage, {CreateUpdateSegment} from '../../../Page objects/trash-inspection/TrashInspection-Segment.page';
 import {generateRandmString, getRandomInt} from '../../../Helpers/helper-functions';
+import { $ } from '@wdio/globals';
 
 describe('Trash Inspection Plugin - Segment', function () {
   before(async () => {

diff --git a/eform-client/e2e/Tests/trash-inspections-settings/application-settings.plugins-page.spec.ts b/eform-client/e2e/Tests/trash-inspections-settings/application-settings.plugins-page.spec.ts
@@ -2,6 +2,7 @@ import loginPage from '../../Page objects/Login.page';
 import myEformsPage from '../../Page objects/MyEforms.page';
 import pluginPage from '../../Page objects/Plugin.page';
 import { expect } from 'chai';
+import { $ } from '@wdio/globals';
 
 
 describe('Application settings page - site header section', function () {

diff --git a/...c/app/plugins/modules/trash-inspection-pn/layouts/trash-inspection-pn-layout.component.ts b/...c/app/plugins/modules/trash-inspection-pn/layouts/trash-inspection-pn-layout.component.ts
@@ -3,7 +3,9 @@ import {TranslateService} from '@ngx-translate/core';
 import {translates} from './../i18n/translates';
 import {AuthStateService} from 'src/app/common/store';
 import {LocaleService} from 'src/app/common/services';
-import {Subscription} from 'rxjs';
+import {Subscription, take} from 'rxjs';
+import {Store} from '@ngrx/store';
+import {addPluginToVisited, selectPluginsVisitedPlugins} from 'src/app/state';
 
 @Component({
   selector: 'app-trash-inspection-pn-layout',
@@ -13,24 +15,32 @@ import {Subscription} from 'rxjs';
 export class TrashInspectionPnLayoutComponent
   implements AfterContentInit, OnInit, OnDestroy {
   currentUserLocaleAsyncSub$: Subscription;
+  private pluginName = 'trashinspection';
   constructor(
-    private localeService: LocaleService,
     private translateService: TranslateService,
-    private authStateService: AuthStateService
+    store: Store
   ) {
+    store.select(selectPluginsVisitedPlugins)
+      .pipe(take(1))
+      .subscribe(x => {
+        // check current plugin in activated plugin
+        if (x.findIndex(y => y === this.pluginName) === -1) {
+          // add all plugin translates one time
+          Object.keys(translates).forEach(locale => {
+            this.translateService.setTranslation(locale, translates[locale], true);
+          });
+          // add plugin to visited plugins
+          store.dispatch(addPluginToVisited(this.pluginName));
+        }
+      });
   }
 
   ngOnInit() {
   }
 
   ngAfterContentInit() {
-    this.currentUserLocaleAsyncSub$ = this.authStateService.currentUserLocaleAsync.subscribe(lang => {
-      const i18n = translates[lang];
-      this.translateService.setTranslation(lang, i18n, true);
-    });
   }
 
   ngOnDestroy(): void {
-    this.currentUserLocaleAsyncSub$.unsubscribe();
   }
 }
diff --git a/.../src/app/plugins/modules/trash-inspection-pn/models/producer/producer-pn-request.model.ts b/.../src/app/plugins/modules/trash-inspection-pn/models/producer/producer-pn-request.model.ts
@@ -1,6 +1,6 @@
 export class ProducerPnRequestModel {
   pageSize: number;
-  nameFilter: string;
+  //nameFilter: string;
   sort: string;
   pageIndex: number;
   isSortDsc: boolean;

diff --git a/...pp/plugins/modules/trash-inspection-pn/models/transporter/transporter-pn-request.model.ts b/...pp/plugins/modules/trash-inspection-pn/models/transporter/transporter-pn-request.model.ts
@@ -1,6 +1,6 @@
 export class TransporterPnRequestModel {
   pageSize: number;
-  nameFilter: string;
+  //nameFilter: string;
   sort: string;
   pageIndex: number;
   isSortDsc: boolean;