@eui/tools 6.12.20 → 6.12.22

package/.version.properties

@@ -1 +1 @@
-6.12.20
+6.12.22

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 6.12.22 (2023-06-26)
+
+##### Bug Fixes
+
+* **other:**
+  * ag-grid license injection race condition - EUI-7121 [EUI-7121](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-7121)  ([7337d6ed](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/7337d6eddba6419f0aa6405abef3a2e03cd4ffdf))
+
+* * *
+* * *
+## 6.12.21 (2023-06-26)
+
+##### Chores
+
+* **other:**
+  * disable non-existing route for playground - EUI-7121 [EUI-7121](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-7121)  ([62f8497d](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/62f8497d3cdc4fbc5d558c28510aef639f7c8618))
+
+* * *
+* * *
 ## 6.12.20 (2023-06-25)
 
 ##### Chores

package/package.json

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

package/scripts/csdr/init/remotes.js

@@ -196,6 +196,30 @@ module.exports.generateVirtualRemote = (remoteName, cloneRemote = true) => {
           // license token is replaced at post-install, we get it from the remote root UI pkg assets at specific location
           if (remote.skeletonConfig.aggridLicenseInjection) {
             tools.copy(optionAgGridPath, remoteSrcPath);
+
+            const rootPkgLicensePath = path.join(
+              remote.paths.repoNodeModules,
+              remote.skeletonConfig.rootNpmPkg,
+              'assets', 'ag-grid-license', 'license.json'
+            );
+
+            if (!tools.isFileExists(rootPkgLicensePath)) {
+              throw 'NO_LICENSE_FILE_FOUND';
+            }
+
+            const licenseJSON = tools.getJsonFileContent(rootPkgLicensePath);
+            const license = licenseJSON.license;
+            tools.logInfo(`license key found : ${license}`);
+
+            const mainTsPath = path.join(remote.paths.src, 'main.ts');
+            console.log(`replacing in ${mainTsPath}`);
+            tools.replaceInFileSync(mainTsPath, 'LICENSE_KEY_VALUE', license);
+
+            tools.logInfo('main.ts content after replacement : ');
+            const mainTsContent = tools.getFileContent(mainTsPath);
+            console.log(mainTsContent);
+
+            tools.logSuccess('OK => main.ts replaced');
           }
 
         // if options, all options are checked and default modules defs are injected following certain conditions

package/scripts/csdr/install/build-package.js

@@ -39,10 +39,6 @@ module.exports.installRemote = (pkg, envTarget, compositeType) => {
       deps = outputDeps;
     })
 
-    .then(() => {
-      return innerRemotes.postInstall(pkg);
-    })
-
     // returning metadata dependencies
     .then(() => {
       return deps;

package/scripts/csdr/install/remotes.js

@@ -171,49 +171,3 @@ module.exports.installDeps = (pkg, envTarget, compositeType) => {
       throw e;
     })
   }
-
-
-  module.exports.postInstall = (pkg) => {
-    tools.logTitle('Executing post-install for remote skeleton replacement fetched from root UI package');
-
-    if (!pkg.fullSkeletonSources) {
-      return;
-    }
-
-    if (!pkg.skeletonConfig) {
-      return;
-    }
-
-    if (pkg.skeletonConfig.aggridLicenseInjection) {
-      return Promise.resolve()
-      .then(() => {
-        const rootPkgLicensePath = path.join(
-          pkg.paths.repoNodeModules,
-          pkg.skeletonConfig.rootNpmPkg,
-          'assets', 'ag-grid-license', 'license.json'
-        );
-
-        if (!tools.isFileExists(rootPkgLicensePath)) {
-          throw 'NO_LICENSE_FILE_FOUND';
-        }
-
-        const licenseJSON = tools.getJsonFileContent(rootPkgLicensePath);
-        const license = licenseJSON.license;
-        tools.logInfo(`license key found : ${license}`);
-
-        const mainTsPath = path.join(pkg.paths.src, 'main.ts');
-        console.log(`replacing in ${mainTsPath}`);
-        tools.replaceInFileSync(mainTsPath, 'LICENSE_KEY_VALUE', license);
-
-        tools.logInfo('main.ts content after replacement : ');
-        const mainTsContent = tools.getFileContent(mainTsPath);
-        console.log(mainTsContent);
-
-        tools.logSuccess('OK => main.ts replaced');
-      })
-
-      .catch((e) => {
-        throw e;
-      })
-    }
-  }

package/scripts/utils/pre-build/injection/routes-replacement.js

@@ -496,6 +496,25 @@ const processRoutesConfig = (project, envTarget, build, routesFile, routesFileCo
         return routeDef;
       };
 
+      const getRouteDefFromMenuLink = (link) => {
+        let routeDef = null;
+
+        if (link.url) {
+          routeDefsBaseJSON.forEach((r) => {
+            if (r.menuLinkDefs && r.menuLinkDefs.length > 0) {
+              r.menuLinkDefs.forEach((md) => {
+                if (md.url === link.url) {
+                  routeDef = r;
+                  return;
+                }
+              });
+            }
+          });
+        }
+
+        return routeDef;
+      };
+
       // inner method for checking based on the "allowedEnvs" option provided on the links definition if the link has to be added
       // to the links list
 
@@ -567,7 +586,62 @@ const processRoutesConfig = (project, envTarget, build, routesFile, routesFileCo
 
       tools.logInfo(`Links generated : ${linksGenerated.length} found`);
 
-      tools.writeJsonFileSync(path.join(projectAssetsPath, 'route-defs-links.json'), linksGenerated);
+      // checking if in playground route mode (local dev), in this case we mark the non-existing routes
+      // as disabled locally
+      let finalLinksGenerated = [];
+      if (project.externalRoutesSources.routesFilenameTemplate.indexOf('playground') > 0) {
+        tools.logInfo('Disabling non-active routes for playground');
+
+        linksGenerated.forEach((link) => {
+          let newLink = link;
+
+          if (link.parentId) {
+            let newLinkChildren = [];
+
+            link.children.forEach((subLink) => {
+              const defRoute = getRouteDefFromMenuLink(subLink);
+
+              if (defRoute) {
+                const routePathInInputRoutes = mergedRoutes.filter(r => r.path === defRoute.path)[0];
+
+                if (!routePathInInputRoutes) {
+                  subLink.disabled = true;
+
+                } else {
+                  tools.logInfo(`[${subLink.url}] --> route found in input routes - enabled`);
+                }
+              }
+              newLinkChildren.push(subLink);
+            });
+            newLink.children = newLinkChildren;
+
+            const enabledChildren = newLink.children.filter(c => !c.disabled);
+            if (enabledChildren.length === 0) {
+              newLink.disabled = true;
+            }
+
+          } else {
+            const defRoute = getRouteDefFromMenuLink(link);
+
+            if (defRoute) {
+              const routePathInInputRoutes = mergedRoutes.filter(r => r.path === defRoute.path)[0];
+
+              if (!routePathInInputRoutes) {
+                newLink.disabled = true;
+              } else {
+                tools.logInfo(`[${link.url}] --> route found in input routes - enabled`);
+              }
+            }
+          }
+
+          finalLinksGenerated.push(newLink);
+        });
+
+      } else {
+        finalLinksGenerated = linksGenerated;
+      }
+
+      tools.writeJsonFileSync(path.join(projectAssetsPath, 'route-defs-links.json'), finalLinksGenerated);
 
       // getting routes content for replacement