@eui/tools 6.11.5 → 6.11.7

package/.version.properties

@@ -1 +1 @@
-6.11.5
+6.11.7

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 6.11.7 (2023-04-18)
+
+##### Bug Fixes
+
+* **other:**
+  * routes replacement not overriding local config if provided - MWP-9533 [MWP-9533](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-9533)  ([931623c5](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/931623c5ce06279ab3325255bc719ea7f5074aaa))
+
+* * *
+* * *
+## 6.11.6 (2023-04-18)
+
+##### Bug Fixes
+
+* **other:**
+  * adapted virtual remotes release and msteams notifications - EUI-7121 [EUI-7121](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-7121)  ([a508f7bf](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/a508f7bf46290dafcdbaf18890e18e914a9b9ee7))
+
+* * *
+* * *
 ## 6.11.5 (2023-04-17)
 
 ##### Bug Fixes

package/package.json

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

package/sandbox.js

@@ -1224,8 +1224,8 @@ const versionUtils = require('./scripts/csdr/version/version-utils');
 
 Promise.resolve()
   .then(() => {
-    const pkgName = 'ppgms-core-eui10-remote-el-ui-not';
-    const remote = configUtils.remotes.isVirtualRemote(pkgName);
+    const pkgName = 'mapar-administration-eui15-remote-el-ui';
+    const remote = configUtils.remotes.getRemote(pkgName);
 
     console.log(remote);
   })

package/scripts/csdr/config/remotes.js

@@ -50,6 +50,15 @@ module.exports.getRemote = (remoteName) => {
     ...remoteConfig,
   }
 
+  // check notification method
+  if (remote.notification) {
+    if (remote.notification.client === 'MSTEAMS') {
+      remote.msteamsActive = true;
+    } else {
+      remote.msteamsActive = false;
+    }
+  }
+
   if (!remote.dependencies.composite) {
     throw new Error('The remote config does not contains the manadatory "composite" dependencies');
   }

package/scripts/csdr/metadata/package.js

@@ -341,7 +341,7 @@ module.exports.unlockPackage = (pkg) => {
     })
 
     .catch((e) => {
-      throw e;
+      tools.logError('Unable to unlock package => package will be auto-unlock at next build 10m after the current one');
     })
 }
 
@@ -363,11 +363,11 @@ module.exports.isPackageLocked = (pkg) => {
 
         tools.logInfo(`checking diff current date from locked date : ${diff}`);
 
-        if (diff > 15) {
-          tools.logInfo(`> 15m => ok forcing unlock`);
+        if (diff > 10) {
+          tools.logInfo(`> 10m => ok forcing unlock`);
           return false;
         } else {
-          tools.logInfo(`< 15m => keep lock`);
+          tools.logInfo(`< 10m => keep lock`);
           return true;
         }
 

package/scripts/csdr/release/package/release-ui.js

@@ -213,6 +213,7 @@ module.exports.run = () => {
           });
       })
 
+      // SEND ERROR NOTIFICATION
       .catch((e) => {
         return innerCommon.sendErrorNotification(pkg, e, pkgMetadata)
           .then(() => {

package/scripts/csdr/release/package/release-virtual-remote.js

@@ -140,15 +140,18 @@ module.exports.run = () => {
       .then(() => {
         return innerCommon.sendSuccessNotification(pkg, newVersion, pkgMetadata)
           .then(() => {
-            innerCommon.close(pkg);
+            return innerCommon.close(pkg);
           });
       })
 
+      // SEND ERROR NOTIFICATION
       .catch((e) => {
         return innerCommon.sendErrorNotification(pkg, e, pkgMetadata)
           .then(() => {
-            innerCommon.close(pkg);
+            return innerCommon.close(pkg);
+          })
+          .then(() => {
             process.exit(1);
-          });
+          })
       })
 }

package/scripts/utils/build/package/element.js

@@ -10,7 +10,7 @@ const configUtils = require('../../../csdr/config/config-utils');
 const preBuildUtils = require('../../pre-build/pre-build-utils');
 const remotesUtils = require('../../remotes/remotes-utils');
 
-let { configuration, baseHref, dryRun, statsJson, sourceMap, build } = tools.getArgs();
+let { configuration, baseHref, dryRun, statsJson, sourceMap, build, skipCompile } = tools.getArgs();
 
 
 module.exports.build = (pkg, isMaster) => {
@@ -78,8 +78,13 @@ module.exports.build = (pkg, isMaster) => {
       tools.logInfo(`running Angular BUILD with args: ${args} on`);
       console.log(pkg.paths.root);
 
-      if (!dryRun) {
-        return execa('node', args, { cwd: pkg.paths.root, stdio: 'inherit' });
+      if (!skipCompile) {
+        if (build && pkg.msteamsActive) {
+          return tools.runNodeScriptProcessOutput(args, pkg.paths.root);
+
+        } else {
+          return execa('node', args, { cwd: pkg.paths.root, stdio: 'inherit' });
+        }
       }
     })
 

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

@@ -275,6 +275,8 @@ const processRoutesConfig = (project, envTarget, build, routesFile, routesFileCo
       const euiVersionNumber = euiVersion.split('.')[0];
       const envTargetFinal = getEnvTarget(envTarget, build);
 
+      tools.logInfo(`Processing for envTarget : ${envTargetFinal}`);
+
       // getting the input file definitions of routes for replacements
       // from tokenized template in config -- allowing to control playground vs normal env (when using the MWP HOST for release)
       // format :
@@ -287,6 +289,7 @@ const processRoutesConfig = (project, envTarget, build, routesFile, routesFileCo
         throw 'ROUTES_CONFIG_V2_TEMPLATE_NOT_FOUND';
       }
 
+
       routeDefsInputFilename = project.externalRoutesSources.routesFilenameTemplate.replace('@eui.version@', euiVersionNumber);
       routeDefsInputFilename = routeDefsInputFilename.replace('@env.target@', envTargetFinal);
 
@@ -303,13 +306,40 @@ const processRoutesConfig = (project, envTarget, build, routesFile, routesFileCo
 
       const routeDefsInputJSON = require(path.join(routeDefsInputPath));
 
+      // Merging content with "local" route file defs if existing
+
+      let mergedRoutes = [];
+
+      if (envTargetFinal.indexOf('local') > -1) {
+        const localRouteDefsInputFilename = `route-defs.${envTargetFinal}.json`;
+        const localRouteDefsInputPath = path.join(projectAssetsPath, localRouteDefsInputFilename);
+
+        if (tools.isFileExists(localRouteDefsInputPath)) {
+          tools.logInfo(`Merging local configuration found : ${localRouteDefsInputFilename}`);
+          const localRouteDefsInputJSON = require(path.join(localRouteDefsInputPath));
+
+          routeDefsInputJSON.forEach((route) => {
+            const matchedRoute = localRouteDefsInputJSON.filter(newRoute => newRoute.path === route.path)[0];
+            if (matchedRoute) {
+              tools.logInfo(`-- replacing ${route.path} route entry with overriden local config`);
+              tools.logInfo(`-----> ${JSON.stringify(matchedRoute)}`);
+              mergedRoutes.push(matchedRoute);
+            } else {
+              mergedRoutes.push(route);
+            }
+          });
+        }
+      } else {
+        mergedRoutes = routeDefsInputJSON;
+      }
+
       const appRoutes = [],
         appFeatureLibs = [],
         finalRemotesDefs = [];
 
       // processing each routes found in the routeDefs entry
 
-      routeDefsInputJSON.forEach((route) => {
+      mergedRoutes.forEach((route) => {
         tools.logInfo(`Processing route : ${route.path}`);
 
         const defRoute = routeDefsBaseJSON.filter((r) => r.path === route.path)[0];