@eui/tools 6.21.67 → 6.21.68

package/.version.properties

@@ -1 +1 @@
-6.21.67
+6.21.68

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 6.21.68 (2025-04-24)
+
+##### Bug Fixes
+
+* **other:**
+  * remotes extra route for unknown-user injection - EUI-10199 [EUI-10199](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-10199)  ([ee9e7e1b](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/ee9e7e1b0c9789518c1ba620b2e73a18e004d621))
+
+* * *
+* * *
 ## 6.21.67 (2025-04-24)
 
 ##### Chores

package/package.json

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

package/scripts/csdr/init/remotes.js

@@ -202,7 +202,6 @@ module.exports.generateVirtualRemote = (remoteName, cloneRemotesConfigFlag = tru
         const optionZipkinDef = tools.getJsonFileContent(path.join(fullOptionsPath, 'definitions', 'zipkin.json'));
         const optionDynatraceDef = tools.getJsonFileContent(path.join(fullOptionsPath, 'definitions', 'dynatrace.json'));
         const optionParticipantDef = tools.getJsonFileContent(path.join(fullOptionsPath, 'definitions', 'participant.json'));
-        const optionUnknownUserExtraRouteDef = tools.getJsonFileContent(path.join(fullOptionsPath, 'definitions', 'unknown-user-extra-route.json'));
         const optionDynamicFormsDef = tools.getJsonFileContent(path.join(fullOptionsPath, 'definitions', 'dynamic-forms.json'));
 
         tools.logInfo(`copying full sources skeleton : ${fullCommonPath} ==> ${remoteSrcPath}`);
@@ -298,20 +297,6 @@ module.exports.generateVirtualRemote = (remoteName, cloneRemotesConfigFlag = tru
             pushContent(optionDynamicFormsDef);
           }
 
-          // 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);
-          }
-
           // participant
           if (remote.skeletonConfig.options.participant) {
             tools.copy(optionParticipantPath, remoteSrcPath);
@@ -334,10 +319,24 @@ module.exports.generateVirtualRemote = (remoteName, cloneRemotesConfigFlag = tru
             tools.replaceInPath(remoteSrcPath, "@root.npm.pkg@", remote.skeletonConfig.rootNpmPkg);
           }
 
-          // unknow-user-extra-route
+          // extra routes
+          let extraUrlsConfigPlaceholder = "", extraUrlsRoutesPlaceholder = "", extraUrlsImportsPlaceholder = "";
+
+          if (remote.skeletonConfig.extraUrls) {
+            remote.skeletonConfig.extraUrls.forEach((url) => {
+              extraUrlsConfigPlaceholder += `${url.name}: '${url.path}', `;
+              extraUrlsRoutesPlaceholder += `{ path: appConfig.global.${url.name}, children: ${url.import} },`;
+              extraUrlsImportsPlaceholder += `${url.import},`;
+            });
+          }
+          // unknown-user extra route
           if (remote.skeletonConfig.options.unknownUserExtraRoute) {
-            pushContent(optionUnknownUserExtraRouteDef);
+            extraUrlsRoutesPlaceholder += "{ path: 'unknown-user', children: routes },";
           }
+
+          tools.replaceInPath(remoteSrcPath, "// EXTRA_URLS_CONFIG_PLACEHOLDER", extraUrlsConfigPlaceholder);
+          tools.replaceInPath(remoteSrcPath, "// EXTRA_URLS_ROUTES_PLACEHOLDER", extraUrlsRoutesPlaceholder);
+          tools.replaceInPath(remoteSrcPath, "// EXTRA_URLS_IMPORTS_PLACEHOLDER", extraUrlsImportsPlaceholder);          
         }
 
         // replace option in module.ts placeholders
@@ -348,10 +347,6 @@ module.exports.generateVirtualRemote = (remoteName, cloneRemotesConfigFlag = tru
         tools.replaceInFileSync(moduleTsPath, '// PROVIDERS', providersContent.join(',\n'));
         tools.replaceInFileSync(moduleTsPath, '// CONSTRUCTOR DECLARATIONS', constructorDeclarationsContent.join('\n'));
 
-        tools.logInfo('module.ts replaced content result : ');
-        const moduleTsContent = tools.getFileContent(moduleTsPath);
-        console.log(moduleTsContent);
-
         tools.logInfo('Replacing skeleton config tokens');
         tools.replaceInPath(remoteSrcPath, '@remote.name@', remote.name);
         tools.replaceInPath(remoteSrcPath, '@base.url@', remote.skeletonConfig.baseUrl);
@@ -372,6 +367,10 @@ module.exports.generateVirtualRemote = (remoteName, cloneRemotesConfigFlag = tru
         tools.replaceInPath(remoteSrcPath, '@root.npm.pkg@', remote.skeletonConfig.rootNpmPkg);
 
 
+        tools.logInfo('module.ts replaced content result : ');
+        const moduleTsContent = tools.getFileContent(moduleTsPath);
+        console.log(moduleTsContent);
+
         tools.logSuccess('OK => copy done - Tokens replaced');
       }
     })

package/scripts/csdr/init/remotes/19.x/full/options/definitions/unknown-user-extra-route.json

@@ -1,4 +0,0 @@
-{
-    "imports": "import { routes } from '@root.npm.pkg@';",
-    "providers": "provideSectionEntryRoutesConfig([{ path: `${appConfig.global.baseUrl}`, children: routes },{ path: `unknown-user`, children: routes }]),"
-}