@eui/tools 6.15.7 → 6.15.9

package/.version.properties

@@ -1 +1 @@
-6.15.7
+6.15.9

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 6.15.9 (2024-01-17)
+
+##### Chores
+
+* **other:**
+  * add extraUrls options for remote skeleton config v16 - EUI-7121 [EUI-7121](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-7121)  ([d019d9fa](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/d019d9fa8b2a898d4ea92e5f2028f844d8e278d9))
+
+* * *
+* * *
+## 6.15.8 (2024-01-17)
+
+##### Chores
+
+* **other:**
+  * removal of useless code MWP-10441 [MWP-10441](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-10441)  ([ed31c546](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/ed31c546e19d2c40970a4c0f3d69a5a2eb3a309f))
+
+* * *
+* * *
 ## 6.15.7 (2024-01-11)
 
 ##### Chores

package/package.json

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

package/scripts/csdr/init/remotes/16.x/full/common/app/routing.module.ts

@@ -3,7 +3,11 @@ import { RouterModule, Routes } from '@angular/router';
 
 import { ELEMENT_ROUTES_TOKEN } from '@csdr/integration/element';
 
-import { routes } from '@root.npm.pkg@';
+import {
+    routes,
+    // EXTRA_URLS_IMPORTS_PLACEHOLDER
+ } from '@root.npm.pkg@';
+
 // DON'T PAY ATTENTION TO IMPORT ERRORS HERE, those files are injected at serve/build time
 import { appConfig } from '../config/index';
 import { FallbackComponent } from './fallback.component';
@@ -15,6 +19,7 @@ const elementRoutes: Routes = [
         path: `${appConfig.global.baseUrl}@sub.route.url@`,
         children: routes,
     },
+    // EXTRA_URLS_ROUTES_PLACEHOLDER
     { path: '**', component: FallbackComponent },
 ];
 

package/scripts/csdr/init/remotes/16.x/full/common/config/global.ts

@@ -106,6 +106,7 @@ const localeConfig: LocaleServiceConfig = {
 export const GLOBAL: GlobalConfig = {
     /* URL that needs to be used in the appRouting of the MWP */
     baseUrl: '@base.url@',
+    // EXTRA_URLS_CONFIG_PLACEHOLDER
     /* Element tag name that needs to be unique - make sure it doesn't collide with any other MWP element */
     elementName: '@element.name@',
     /* in case you are using NgRx give it a unique name (mostly for debugging) */

package/scripts/csdr/init/remotes/17.x/full/common/app/routing.module.ts

@@ -1,8 +1,6 @@
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 
-import { ELEMENT_ROUTES_TOKEN } from '@csdr/integration/element';
-
 import { routes } from '@root.npm.pkg@';
 // DON'T PAY ATTENTION TO IMPORT ERRORS HERE, those files are injected at serve/build time
 import { appConfig } from '../config/index';
@@ -23,9 +21,6 @@ const elementRoutes: Routes = [
     imports: [
         RouterModule.forRoot(elementRoutes),
     ],
-    providers: [
-        { provide: ELEMENT_ROUTES_TOKEN, useValue: elementRoutes },
-    ],
     exports: [
         RouterModule,
     ],

package/scripts/csdr/init/remotes/17.x/full/options/participant/app/routing.module.ts

@@ -1,8 +1,6 @@
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 
-import { ELEMENT_ROUTES_TOKEN } from '@csdr/integration/element';
-
 import { appConfig } from '../config/index'; // tslint:disable-line
 import { FallbackComponent } from './fallback.component'; // tslint:disable-line
 import { ModuleComponent } from './module.component';
@@ -15,9 +13,6 @@ const elementRoutes: Routes = [
     imports: [
         RouterModule.forRoot(elementRoutes),
     ],
-    providers: [
-        { provide: ELEMENT_ROUTES_TOKEN, useValue: elementRoutes },
-    ],
     exports: [
         RouterModule,
     ],

package/scripts/csdr/init/remotes.js

@@ -215,6 +215,22 @@ module.exports.generateVirtualRemote = (remoteName, cloneRemote = true) => {
           }
         }
 
+
+        // extra routes
+        if (remote.skeletonConfig.extraUrls) {
+          let extraUrlsConfigPlaceholder = '', extraUrlsRoutesPlaceholder = '', extraUrlsImportsPlaceholder = '';
+          remote.skeletonConfig.extraUrls.forEach((url) => {
+            extraUrlsConfigPlaceholder += `${url.name}: '${url.path}', `;
+            extraUrlsRoutesPlaceholder += `{ path: appConfig.global.${url.name}, children: ${url.import} },`;
+            extraUrlsImportsPlaceholder += `${url.import},`;
+          });
+
+          tools.replaceInPath(remoteSrcPath, '// EXTRA_URLS_CONFIG_PLACEHOLDER', extraUrlsConfigPlaceholder);
+          tools.replaceInPath(remoteSrcPath, '// EXTRA_URLS_ROUTES_PLACEHOLDER', extraUrlsRoutesPlaceholder);
+          tools.replaceInPath(remoteSrcPath, '// EXTRA_URLS_IMPORTS_PLACEHOLDER', extraUrlsImportsPlaceholder);
+        }
+
+
         // checking options
 
         // if no options found, we inject default modules defs