@eui/tools 4.19.8 → 4.19.12

package/.version.properties

@@ -1 +1 @@
-4.19.8
+4.19.12

package/CHANGELOG.md

@@ -1,3 +1,39 @@
+## 4.19.12 (2022-02-22)
+
+##### Bug Fixes
+
+* **other:**
+  * support to support/develop back merge issue - EUI-4107 [EUI-4107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4107)  ([3ffcbe18](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/3ffcbe188c9693817745fb817213b909bb564fba))
+
+* * *
+* * *
+## 4.19.11 (2022-02-21)
+
+##### Bug Fixes
+
+* **other:**
+  * routes replacement wrong injection when ids is used - MWP-7941 [MWP-7941](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-7941)  ([1716ddd3](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/1716ddd31a49cb5c9158454491b51685e038d070))
+
+* * *
+* * *
+## 4.19.10 (2022-02-18)
+
+##### Bug Fixes
+
+* **other:**
+  * missing eui i18n path from elements generated translations - EUI-4107 [EUI-4107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4107)  ([3f359cab](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/3f359cabcc60b938538fd3ace45714439fb5d8c6))
+
+* * *
+* * *
+## 4.19.9 (2022-02-17)
+
+##### Chores
+
+* **other:**
+  * BreadcrumbsService mapping MWP-7583 [MWP-7583](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-7583)  ([730d5cbe](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/730d5cbe68e007dc1570e41d4917058e857dfcc1))
+
+* * *
+* * *
 ## 4.19.8 (2022-02-16)
 
 ##### Bug Fixes

package/package.json

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

package/sandbox.js

@@ -14,7 +14,7 @@ const injectionUtils = require('./scripts/utils/pre-build/injection/injection-ut
 const compositeUtils = require('./scripts/csdr/install/composite-utils');
 const installUtils = require('./scripts/csdr/install/install-utils');
 const notificationUtils = require('./scripts/utils/notification/notification-utils');
-
+const translationUtils = require('./scripts/utils/pre-build/translations/translation-utils');
 
 // console.log(configUtils.packages.getPackages());
 // console.log(configUtils.packages.getPackage('eui-tools'));
@@ -640,14 +640,35 @@ const notificationUtils = require('./scripts/utils/notification/notification-uti
 //   })
 
 
-const prjName = 'my-workplace';
-const prj = configUtils.projects.getCsdrProject(prjName);
+
+
+
+// const prjName = 'my-workplace';
+// const prj = configUtils.projects.getCsdrProject(prjName);
+
+// return Promise.resolve()
+//   // .then(() => {
+//   //   return injectionUtils.externals.injectExternalAppSources(prj);
+//   // })
+//   .then(() => {
+//     // return injectionUtils.externals.remapRoutesByEnvConfig(prj, 'DEV', true);
+//     return injectionUtils.routesReplacement.buildRoutes(prj, 'DEV', true);
+//   })
+
+
+
+
+
+// return Promise.resolve()
+//   .then(() => {
+//     const pkg = configUtils.packages.getPackage('opsys-result-quality-management-eui10-remote-el-ui', true);
+//     return translationUtils.elements.generate('eui,opsys', pkg)
+//   })
+
+
 
 return Promise.resolve()
-  // .then(() => {
-  //   return injectionUtils.externals.injectExternalAppSources(prj);
-  // })
   .then(() => {
-    // return injectionUtils.externals.remapRoutesByEnvConfig(prj, 'DEV', true);
-    return injectionUtils.routesReplacement.buildRoutes(prj, 'DEV', true);
+    const pkg = configUtils.packages.getPackage('eui', true);
+    console.log(pkg);
   })

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

@@ -37,7 +37,7 @@ import {
     EuiButtonModule,
     EuiLabelModule,
 } from '@eui/components-next';
-import { LanguageInterceptor, PushNotificationsService } from '@csdr/core';
+import { LanguageInterceptor, PushNotificationsService, BreadcrumbsService } from '@csdr/core';
 // TODO[REMOTE-SETUP] uncomment if zipkin is used
 // import { TRACE_LOCAL_SERVICE_NAME, ZipkinHttpInterceptor, ZipkinTraceManager } from '@csdr/zipkin-tracing';
 
@@ -195,6 +195,7 @@ export function openidConnectInterceptorFactory(config) {
             deps: [CONFIG_TOKEN, HttpClient, PLATFORM_ID, Router, StoreService, I18nService,
                 UX_SERVICE_HOST_TOKEN, UX_APP_SHELL_SERVICE_HOST_TOKEN, NG_ZONE_HOST_TOKEN],
         },
+        { provide: BreadcrumbsService, useFactory: () => window['PROVIDERS']['BreadcrumbsService'], deps: [] },
         { provide: ELEMENT_ROUTER_TOKEN, useFactory: () => window['PROVIDERS']['ELEMENT_ROUTER_TOKEN'], deps: [] },
         // TODO[REMOTE-SETUP] uncomment if zipkin is used
         // { provide: TRACE_LOCAL_SERVICE_NAME, useFactory: () => window['PROVIDERS']['TRACE_LOCAL_SERVICE_NAME'], deps: [] },

package/scripts/csdr/release/package/common.js

@@ -44,6 +44,7 @@ module.exports.getEnvTarget = () => {
 
 
 module.exports.init = (pkg) => {
+  utils.tools.logBanner('INIT');
 
   const branches = this.getBranches();
 
@@ -91,6 +92,8 @@ module.exports.init = (pkg) => {
 
 
 module.exports.preReleaseChecks = (pkg) => {
+  utils.tools.logBanner('PRE-RELEASE checks');
+
   return Promise.resolve()
 
   // GET AND CHECK DEVOPS CONFIG
@@ -121,6 +124,8 @@ module.exports.preReleaseChecks = (pkg) => {
 
 
 module.exports.commitMetadataChecks = (pkg) => {
+  utils.tools.logBanner('Commit metadata checks');
+
   utils.tools.logTitle('Checking package commit metadata');
   let pkgMetadata;
 
@@ -155,6 +160,8 @@ module.exports.commitMetadataChecks = (pkg) => {
 
 
 module.exports.preBuild = (pkg) => {
+  utils.tools.logBanner('PRE-BUILD');
+
   return Promise.resolve()
   .then(() => {
     return utils.buildPackage.preBuild(pkg);
@@ -169,6 +176,7 @@ module.exports.preBuild = (pkg) => {
 
 
 module.exports.updateVersion = (pkg, pkgMetadata) => {
+  utils.tools.logBanner('UPDATE VERSION');
 
   // getting branch flags
   const branches = this.getBranches();
@@ -207,6 +215,8 @@ module.exports.updateVersion = (pkg, pkgMetadata) => {
 
 
 module.exports.generateChangelog = (pkg, version, pkgMetadata) => {
+  utils.tools.logBanner('GENERATE CHANGELOG');
+
   return Promise.resolve()
 
   // GENERATE CHANGELOG
@@ -241,6 +251,8 @@ module.exports.generateChangelog = (pkg, version, pkgMetadata) => {
 
 
 module.exports.postBuild = (pkg, version) => {
+  utils.tools.logBanner('POST BUILD');
+
   return Promise.resolve()
   // all packages
   .then(() => {
@@ -262,6 +274,8 @@ module.exports.postBuild = (pkg, version) => {
 
 
 module.exports.storeMetadataAssets = (pkg, pkgCompositeDeps) => {
+  utils.tools.logBanner('STORE METADATA ASSETS');
+
   return Promise.resolve()
     .then(() => {
       if (pkg.remote) {
@@ -275,8 +289,10 @@ module.exports.storeMetadataAssets = (pkg, pkgCompositeDeps) => {
 }
 
 module.exports.runGitOperations = (pkg, version) => {
+  utils.tools.logBanner('RUN GIT OPERATIONS');
 
   const branches = this.getBranches();
+  console.log(branches);
 
   return Promise.resolve()
   // COMMIT and PUSH UPDATED FILES ON PACKAGE REPOSITORY
@@ -302,14 +318,16 @@ module.exports.runGitOperations = (pkg, version) => {
   // MERGE BACK ON DEVELOP for MASTER / LATEST RELEASE
   .then(() => {
     if (branches.isMaster) {
+      utils.tools.logInfo('Branch is master merge back to develop');
       return utils.git.mergeMasterToDevelop(pkg, pkg.paths.pkgDirectory, version);
     }
   })
 
   // MERGE BACK ON support/develop for support release for package that has a support/develop branch active
   .then(() => {
-    if (branches.isSupport && pkg.build && pkg.build.supportDevelopBranch) {
-      return utils.git.mergeSupportToSupportDevelop(pkg, pkg.paths.pkgDirectory, branches.branch, pkg.build.supportDevelopBranch);
+    if (branches.isSupport && pkg.build && pkg.build.supportSnapshotBranch) {
+      utils.tools.logInfo('Branch is support / supportSnapshotBranch config detected');
+      return utils.git.mergeSupportToSupportDevelop(pkg, pkg.paths.pkgDirectory, branches.branch, pkg.build.supportSnapshotBranch);
     }
   })
 
@@ -321,6 +339,8 @@ module.exports.runGitOperations = (pkg, version) => {
 
 
 module.exports.storeMetadata = (pkg, version, pkgMetadata, pkgCompositeDeps, duration) => {
+  utils.tools.logBanner('STORE METADATA');
+
   const branches = this.getBranches();
 
   return Promise.resolve()
@@ -340,6 +360,8 @@ module.exports.storeMetadata = (pkg, version, pkgMetadata, pkgCompositeDeps, dur
 
 
 module.exports.generateDiffReport = (pkg, newVersion) => {
+  utils.tools.logBanner('GENERATE DIFF REPORT');
+
   const branches = this.getBranches();
 
   return Promise.resolve()
@@ -375,6 +397,8 @@ module.exports.generateDiffReport = (pkg, newVersion) => {
 
 
 module.exports.sendSuccessNotification = (pkg, version, pkgMetadata) => {
+  utils.tools.logBanner('SEND SUCCESS NOTIFICATION');
+
   return Promise.resolve()
   .then(() => {
     utils.tools.logTitle('Sending slack success');
@@ -410,6 +434,8 @@ module.exports.sendSuccessNotification = (pkg, version, pkgMetadata) => {
 
 
 module.exports.sendErrorNotification = (pkg, exception, pkgMetadata) => {
+  utils.tools.logBanner('SEND ERROR NOTIFICATION');
+
   // console.log(pkgMetadata);
 
   return Promise.resolve()

package/scripts/utils/git-utils.js

@@ -229,14 +229,14 @@ const mergeMasterToDevelop = (pkg, folder, version) => {
 }
 
 
-const mergeSupportToSupportDevelop = (pkg, folder, supportBranch, supportDevelopBranch) => {
-  if (!supportDevelopBranch) {
-    tools.logWarning('supportDevelopBranch not found in package config...skipping');
+const mergeSupportToSupportDevelop = (pkg, folder, supportBranch, supportSnapshotBranch) => {
+  if (!supportSnapshotBranch) {
+    tools.logWarning('supportSnapshotBranch not found in package config...skipping');
     return Promise.resolve();
   }
 
-  tools.logTitle(`Merge back on ${supportDevelopBranch}`);
-  tools.logInfo(`Merging release changes into ${supportDevelopBranch} branch...`);
+  tools.logTitle(`Merge back on ${supportSnapshotBranch}`);
+  tools.logInfo(`Merging release changes into ${supportSnapshotBranch} branch...`);
 
   if (dryRun) {
     tools.logInfo('DRY-RUN: skipping merge support to supportDevelop');
@@ -252,17 +252,17 @@ const mergeSupportToSupportDevelop = (pkg, folder, supportBranch, supportDevelop
       return Promise.resolve()
         .then(() => {
           execa.shellSync(`git fetch origin`, { cwd: folder });
-          execa.shellSync(`git checkout ${supportDevelopBranch}`, { cwd: folder });
-          execa.shellSync(`git merge origin/${supportDevelopBranch}`, { cwd: folder });
+          execa.shellSync(`git checkout ${supportSnapshotBranch}`, { cwd: folder });
+          execa.shellSync(`git merge origin/${supportSnapshotBranch}`, { cwd: folder });
           execa.shellSync(`git merge -X theirs ${supportBranch}`, { cwd: folder });
-          execa.shellSync(`git push origin ${supportDevelopBranch}`, { cwd: folder });
+          execa.shellSync(`git push origin ${supportSnapshotBranch}`, { cwd: folder });
           execa.shellSync(`git checkout ${supportBranch}`, { cwd: folder });
         })
         .then(() => {
           tools.logSuccess();
         })
         .catch((e) => {
-          throw new Error(`Error trying merging ${supportBranch} to ${supportDevelopBranch} on ${folder}`);
+          throw new Error(`Error trying merging ${supportBranch} to ${supportSnapshotBranch} on ${folder}`);
         })
     }
   }

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

@@ -218,7 +218,7 @@ const replaceRoutes = (project, envTarget, build, routesFileContent) => {
             routeContent += `    id: '${route.data.id}',\n`;
           }
           if (route.data.ids) {
-            routeContent += `    ids: '${route.data.ids}',\n`;
+            routeContent += `    ids: ${route.data.ids},\n`;
           }
           if (route.data.featureName) {
             routeContent += `    featureName: '${route.data.featureName}',\n`;

package/scripts/utils/pre-build/translations/elements.js

@@ -51,7 +51,13 @@ module.exports.generate = (inputScopes = '', inputPkg) => {
           tools.logInfo(`Adding packages from scope "${scope}"`);
           const scopePath = path.resolve(nmPath, scope);
           if (tools.isDirExists(scopePath)) {
-            let files = fs.readdirSync(scopePath).map(pkg => path.resolve(nmPath,  `${scope}/${pkg}`))
+            let files = fs.readdirSync(scopePath).map((pkg) => {
+              return {
+                name: pkg,
+                scope: scope,
+                folder: path.resolve(nmPath,  `${scope}/${pkg}`)
+              }
+            });
             packages = [...packages, ...files];
           }
       });
@@ -63,7 +69,7 @@ module.exports.generate = (inputScopes = '', inputPkg) => {
     })
 
     .then(() => {
-        if (!fs.existsSync(destFolder)) {
+        if (!fs.existsSync(destFolder) && !dryRun) {
           fs.mkdirSync(destFolder);
         }
 
@@ -76,9 +82,19 @@ module.exports.generate = (inputScopes = '', inputPkg) => {
 
             // Add module translations
             packages.forEach((pkg) => {
-                // console.log('...adding translation from module "' + pkg + '".');
-                file = path.join(pkg, `assets/i18n/${lang}.json`);
-                addTranslation(file, lang)
+                let baseI18nPath = 'i18n';
+                if (pkg.scope === '@eui') {
+                  baseI18nPath = 'i18n-eui';
+                }
+                file = path.join(pkg.folder, `assets/${baseI18nPath}/${lang}.json`);
+
+                tools.logInfo(`Adding translations from ${pkg.folder}`);
+                if (tools.isFileExists(file)) {
+                  tools.logInfo(`${file} found...adding`);
+                  addTranslation(file, lang)
+                } else {
+                  tools.logInfo(`${file} not found...skipping`);
+                }
             });
 
             // Write final file