@eui/tools 5.3.40 → 5.3.43

package/.version.properties

@@ -1 +1 @@
-5.3.40
+5.3.43

package/CHANGELOG.md

@@ -1,3 +1,31 @@
+## 5.3.43 (2022-09-07)
+
+##### Chores
+
+* **other:**
+  * adapted CSDR file replacement for config files for v14 replacement feature of CSDR apps - EUI-6398 [EUI-6398](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-6398)  ([5a11343b](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/5a11343b53dd6ff2e6c25e8bea173e0983a0a6ce))
+
+* * *
+* * *
+## 5.3.42 (2022-09-06)
+
+##### Bug Fixes
+
+* **other:**
+  * v14 csdr angular generation for development with source maps - EUI-6398 [EUI-6398](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-6398)  ([666ef173](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/666ef17395f0529051a53f28d2c1c04e686319fa))
+
+* * *
+* * *
+## 5.3.41 (2022-09-06)
+
+##### Chores
+
+* **other:**
+  * minor changes MWP-8671 [MWP-8671](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-8671)  ([940f42b9](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/940f42b96083d42ca15bb5bc6f3da975d8504013))
+  * improve lifecycle of elements loaded in iframes and better centralization of code MWP-8671 [MWP-8671](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-8671)  ([7a4b08a6](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/7a4b08a6504cf0ac386c355f75d6b83529e860ed))
+
+* * *
+* * *
 ## 5.3.40 (2022-08-08)
 
 ##### Bug Fixes

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@eui/tools",
-    "version": "5.3.40",
+    "version": "5.3.43",
     "tag": "latest",
     "license": "EUPL-1.1",
     "description": "eUI common tools and scripts",

package/scripts/csdr/cli/skeletons/package/frontend-remote-eui10/src/app/module.component.ts

@@ -1,12 +1,9 @@
-import { Component, OnInit, Inject } from '@angular/core';
-import { Router } from '@angular/router';
+import { Component, OnInit, Inject, ElementRef, OnDestroy } from '@angular/core';
 
 import { take } from 'rxjs/operators';
 
 import { CONFIG_TOKEN } from '@eui/core';
-import { ELEMENT_ROUTER_TOKEN, IRouterService, ElementSetupService } from '@csdr/integration/element';
-
-import { appConfig } from '../config/index';
+import { ElementSetupService, ElementLifeCycleService } from '@csdr/integration/element';
 
 enum ElementStatus {
     Loading = 'loading',
@@ -49,21 +46,28 @@ enum ElementStatus {
         }
     `],
 })
-export class ModuleComponent implements OnInit {
+export class ModuleComponent implements OnInit, OnDestroy {
+    remoteId: string;
+
     ElementStatus = ElementStatus;
     moduleStatus: ElementStatus;
 
-    constructor(private router: Router,
-                @Inject(ELEMENT_ROUTER_TOKEN) private routerService: IRouterService,
+    constructor(private elRef: ElementRef,
                 @Inject(CONFIG_TOKEN) public config: any,
+                private elementLifeCycleService: ElementLifeCycleService,
                 private elementSetupService: ElementSetupService) {
     }
 
-    public ngOnInit() {
-        this.router.navigateByUrl(this.routerService.getUrl(), { replaceUrl: true });
+    ngOnInit() {
+        this.remoteId = this.elRef.nativeElement.remoteId;
+        this.elementLifeCycleService.setup(this.remoteId);
         this.loadData();
     }
 
+    ngOnDestroy(): void {
+        this.elementLifeCycleService.cleanup();
+    }
+
     private loadData() {
         this.setStatus(ElementStatus.Loading);
         try {
@@ -72,7 +76,7 @@ export class ModuleComponent implements OnInit {
                 .subscribe((loadStatus: { success: boolean, error?: string }) => {
                     if (!loadStatus.success) {
                         this.setStatus(ElementStatus.Error);
-                        console.error(`[ELEMENT: ${appConfig.global.elementName}] `, loadStatus.error);
+                        console.error(`[ELEMENT: ${this.config.global.elementName}] `, loadStatus.error);
                     } else {
                         this.setStatus(ElementStatus.Loaded);
                     }

package/scripts/csdr/cli/skeletons/package/frontend-remote-eui10/src/app/routing.module.ts

@@ -1,16 +1,14 @@
-import { NgModule, NgZone, Inject } from '@angular/core';
-import { RouterModule, Routes, Router, NavigationStart } from '@angular/router';
-import { Subscription } from 'rxjs';
-import { filter, distinctUntilChanged } from 'rxjs/operators';
+import { NgModule } from '@angular/core';
+import { RouterModule, Routes } from '@angular/router';
 
-import { CCRoute, ELEMENT_ROUTER_TOKEN, IRouterService } from '@csdr/integration/element';
+import { ELEMENT_ROUTES_TOKEN } from '@csdr/integration/element';
 
 import { routes } from '@module.scope@/@module.name@';
 import { appConfig } from '../config/index';
 import { FallbackComponent } from './fallback.component';
 import { ModuleComponent } from './module.component';
 
-const prefixedRoutes: Routes = [
+const elementRoutes: Routes = [
     { path: '', component: ModuleComponent },
     {
         path: appConfig.global.baseUrl,
@@ -22,32 +20,14 @@ const prefixedRoutes: Routes = [
 // @dynamic
 @NgModule({
     imports: [
-        RouterModule.forRoot(prefixedRoutes),
+        RouterModule.forRoot(elementRoutes),
+    ],
+    providers: [
+        { provide: ELEMENT_ROUTES_TOKEN, useValue: elementRoutes },
     ],
     exports: [
         RouterModule,
     ],
 })
 export class RoutingModule {
-    private routes: CCRoute[] = prefixedRoutes.map(route => route as CCRoute);
-
-    private navigationStartSubscription: Subscription;
-
-    constructor(private router: Router,
-                private ngZone: NgZone,
-                @Inject(ELEMENT_ROUTER_TOKEN) private routerService: IRouterService) {
-
-        this.routerService.registerSubRouter(appConfig.global.baseUrl, (url: string) => {
-            this.ngZone.run(() => router.navigateByUrl(url));
-        }, this.routes);
-
-        this.navigationStartSubscription = this.router.events
-            .pipe(
-                filter(event => event instanceof NavigationStart),
-                distinctUntilChanged((prev, curr) => prev['url'] === curr['url']),
-            )
-            .subscribe((data: NavigationStart) => {
-                this.routerService.subrouterEvent(appConfig.global.baseUrl, data);
-            });
-    }
 }

package/scripts/csdr/cli/skeletons/package/frontend-remote-eui10/src/config/modules.ts

@@ -1,3 +1,3 @@
 import { ModulesConfig } from '@eui/core';
 
-export const MODULES: ModulesConfig = window['PROVIDERS']['CONFIG_TOKEN'].modules;
+export const MODULES: ModulesConfig = JSON.parse(JSON.stringify(window['PROVIDERS']['CONFIG_TOKEN'].modules));

package/scripts/csdr/config/angular.js

@@ -1010,6 +1010,12 @@ const angularProjectDefFullSkeletonV14 = {
 
 
 const angularProjectDefConfiguration = {
+  "buildOptimizer": false,
+  "optimization": false,
+  "vendorChunk": true,
+  "extractLicenses": false,
+  "sourceMap": true,
+  "namedChunks": true,
   "fileReplacements": [
     {
       "replace": "apps/@project.name@/src/assets/openid-login-config.json",
@@ -1034,6 +1040,23 @@ const angularProjectDefConfiguration = {
   ]
 };
 
+
+const angularProjectDefConfigurationLight = {
+  "buildOptimizer": false,
+  "optimization": false,
+  "vendorChunk": true,
+  "extractLicenses": false,
+  "sourceMap": true,
+  "namedChunks": true,
+  "fileReplacements": [
+    {
+      "replace": "apps/@project.name@/src/environments/environment.ts",
+      "with": "apps/@project.name@/src/environments/environment.@config.key@.ts"
+    }
+  ]
+};
+
+
 const angularProjectDefConfigurationOptimized = {
   "fileReplacements": [
     {
@@ -1076,6 +1099,31 @@ const angularProjectDefConfigurationOptimized = {
 }
 
 
+const angularProjectDefConfigurationOptimizedLight = {
+  "fileReplacements": [
+    {
+      "replace": "apps/@project.name@/src/environments/environment.ts",
+      "with": "apps/@project.name@/src/environments/environment.@config.key@.ts"
+    }
+  ],
+  "optimization": true,
+  "outputHashing": "all",
+  "sourceMap": false,
+  "extractCss": true,
+  "namedChunks": true,
+  "aot": true,
+  "extractLicenses": true,
+  "vendorChunk": false,
+  "buildOptimizer": true,
+  "budgets": [
+      {
+          "type": "initial",
+          "maximumWarning": "2mb",
+          "maximumError": "7mb"
+      }
+  ]
+};
+
 const angularPackageDef = {
   "root": "@path@/@module.name@",
   "sourceRoot": "@path@/@module.name@/src",
@@ -1497,8 +1545,17 @@ module.exports.registerAngularProjectDef = (project, build = false) => {
       // replacing custom configurations if provided
       if (angularConfigFile.configurations && angularConfigFile.configurations.length > 0) {
         tools.logInfo('Processing configurations injection');
-        const configurationDef = JSON.stringify(angularProjectDefConfiguration);
-        const configurationDefOptimized = JSON.stringify(angularProjectDefConfigurationOptimized);
+
+        let configurationDef, configurationDefOptimized;
+        if (project.build && project.build.csdrFileReplacement) {
+          tools.logInfo('Injecting light angular configuration - file replacement is handled by CSDR');
+          configurationDef = JSON.stringify(angularProjectDefConfigurationLight);
+          configurationDefOptimized = JSON.stringify(angularProjectDefConfigurationOptimizedLight);
+        } else {
+          tools.logInfo('Injecting angular configuration file replacement');
+          configurationDef = JSON.stringify(angularProjectDefConfiguration);
+          configurationDefOptimized = JSON.stringify(angularProjectDefConfigurationOptimized);
+        }
 
         angularConfigFile.configurations.forEach((conf) => {
           const confKey = Object.keys(conf)[0];