@eui/tools 4.19.13 → 4.19.16

package/.version.properties

@@ -1 +1 @@
-4.19.13
+4.19.16

package/CHANGELOG.md

@@ -1,3 +1,30 @@
+## 4.19.16 (2022-03-09)
+
+##### Chores
+
+* **other:**
+  * adapted openid vs normal injection env config - EUI-4107 [EUI-4107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4107)  ([c2a5d816](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/c2a5d81641a566bc3b1036644fac1b5a504d0c1e))
+
+* * *
+* * *
+## 4.19.15 (2022-03-07)
+
+##### Chores
+
+* **other:**
+  * updated resolutions for v13 - EUI-4107 [EUI-4107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4107)  ([a76d7cae](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/a76d7cae87e74c31665b29f6863163043ae4875a))
+
+* * *
+* * *
+## 4.19.14 (2022-02-22)
+
+##### Chores
+
+* **other:**
+  * minor changes MWP-7583 [MWP-7583](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-7583)  ([2a344a9d](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/2a344a9d5af0f60eedddf265c54acb54b76d4dfd))
+
+* * *
+* * *
 ## 4.19.13 (2022-02-22)
 
 ##### Chores

package/package.json

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

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

@@ -0,0 +1,11 @@
+import { Component } from '@angular/core';
+
+@Component({
+    template: `
+        <eui-block-content [isBlocked]="true">
+            <div style="height: 100%"></div>
+        </eui-block-content>
+    `,
+})
+export class FallbackComponent{
+}

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

@@ -61,7 +61,7 @@ export class ModuleComponent implements OnInit {
     }
 
     public ngOnInit() {
-        this.router.navigate([this.routerService.getUrl()], { replaceUrl: true });
+        this.router.navigateByUrl(this.routerService.getUrl(), { replaceUrl: true });
         this.loadData();
     }
 

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

@@ -64,6 +64,7 @@ import {
 } from '@csdr/integration';
 import { RoutingModule } from './routing.module';
 
+import { FallbackComponent } from './fallback.component';
 import { ModuleComponent } from './module.component';
 
 export function openidConnectInterceptorFactory(config) {
@@ -92,9 +93,11 @@ export function openidConnectInterceptorFactory(config) {
         RoutingModule,
     ],
     declarations: [
+        FallbackComponent,
         ModuleComponent,
     ],
     entryComponents: [
+        FallbackComponent,
         ModuleComponent,
     ],
     providers: [

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

@@ -8,15 +8,17 @@ import { CCRoute, ELEMENT_ROUTER_TOKEN, IRouterService } from '@csdr/integration
 // TODO[REMOTE-SETUP] adapt to wrapped package import
 // import { routes } from '@cc/task-manager';
 import { appConfig } from '../config/index';
+import { FallbackComponent } from './fallback.component';
 import { ModuleComponent } from './module.component';
 
 const prefixedRoutes: Routes = [
+    { path: '', component: ModuleComponent },
     {
         path: appConfig.global.baseUrl,
         // TODO[REMOTE-SETUP] adapt to wrapped package import
         // children: routes,
     },
-    { path: '**', component: ModuleComponent },
+    { path: '**', component: FallbackComponent },
 ];
 
 // @dynamic

package/scripts/csdr/init/resources/13.x/resolutions.json

@@ -1,15 +1,5 @@
 {
-    "lodash": ">=4.17.21",
-    "handlebars": ">=4.7.7",
-    "mem": ">=4.3.0 <=8.1.1",
-    "https-proxy-agent": ">=2.2.3",
-    "minimatch": ">=3.0.4",
-    "acorn-globals": ">=6.0.0",
-    "open": ">=7.0.3",
-    "dot-prop": "6.0.1",
-    "serialize-javascript": ">=3.1.0",
-    "socket.io": ">=2.4.0",
-    "ssri": ">=8.0.1",
     "@types/node": ">=14.14.10",
-    "hosted-git-info": ">=3.0.8"
+    "https-proxy-agent": ">=2.2.3",
+    "mem": ">=4.3.0 <=8.1.1"
 }

package/scripts/utils/pre-build/projects.js

@@ -136,8 +136,15 @@ module.exports.injectAppConfig = (project, configEnvTarget) => {
       }
 
       let rootTargetFolder = 'src';
-      tools.logInfo(`Replacing default ${rootTargetFolder}/assets/openid-login-config.json file by ${envFilePath} content`);
-      tools.copy(envFilePath, path.join(project.paths.angularPath, `${rootTargetFolder}/assets/openid-login-config.json`));
+      let replacedFile;
+
+      if ((project.build && project.build.openid) || openid) {
+        replacedFile = `${rootTargetFolder}/assets/openid-login-config.json`;
+      } else {
+        replacedFile = `${rootTargetFolder}/assets/env-json-config.json`;
+      }
+      tools.logInfo(`Replacing default ${replacedFile} file by ${envFilePath} content`);
+      tools.copy(envFilePath, path.join(project.paths.angularPath, `${replacedFile}`));
 
       tools.logSuccess();
     })