@eui/tools 4.19.7 → 4.19.11

package/.version.properties

@@ -1 +1 @@
-4.19.7
+4.19.11

package/CHANGELOG.md

@@ -1,3 +1,39 @@
+## 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
+
+* **other:**
+  * routes replacement for local-dev not taken into account - MWP-7941 [MWP-7941](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-7941)  ([18a42cee](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/18a42ceeeb32aacf72fb2d441059ec91b6cef055))
+
+* * *
+* * *
 ## 4.19.7 (2022-02-13)
 
 ##### Chores

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@eui/tools",
-    "version": "4.19.7",
+    "version": "4.19.11",
     "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,6 +640,9 @@ const notificationUtils = require('./scripts/utils/notification/notification-uti
 //   })
 
 
+
+
+
 const prjName = 'my-workplace';
 const prj = configUtils.projects.getCsdrProject(prjName);
 
@@ -649,5 +652,15 @@ return Promise.resolve()
   // })
   .then(() => {
     // return injectionUtils.externals.remapRoutesByEnvConfig(prj, 'DEV', true);
-    return injectionUtils.routesReplacement.buildRoutes(prj, 'DEV', false);
+    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)
+//   })

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/utils/pre-build/injection/routes-replacement.js

@@ -7,6 +7,29 @@ const tools = require('../../tools');
 const configUtils = require('../../../csdr/config/config-utils');
 
 
+const getEnvTarget = (envTarget, build) => {
+  let envTargetFinal = envTarget.toLowerCase();
+
+  if (build) {
+    // dirty fix as openid files do not respect envTarget names
+    if (envTargetFinal === 'tst') {
+      envTargetFinal = 'test';
+    }
+
+  // serve configuration based
+  } else {
+    if (envTarget.indexOf('local') > -1) {
+      envTargetFinal = envTarget.replace('-openid', '');
+    } else {
+      envTargetFinal = 'local-' + envTargetFinal;
+    }
+  }
+
+  return envTargetFinal;
+}
+
+
+
 const getEnvConfig = (project, envTarget, build) => {
   tools.logInfo(`Getting config file for env : ${envTarget}`);
 
@@ -14,25 +37,8 @@ const getEnvConfig = (project, envTarget, build) => {
     .then(() => {
       // getting config file
       const projectAssetsPath = path.join(process.cwd(), project.folder, 'src', 'assets');
-      let configFile;
-
-      // build - envTarget based
-      if (build) {
-        let envTargetFinal = envTarget.toLowerCase();
-        // dirty fix as openid files do not respect envTarget names
-        if (envTargetFinal === 'tst') {
-          envTargetFinal = 'test';
-        }
-        configFile = path.join(projectAssetsPath, 'openid-login-config.' + envTargetFinal + '.json');
-
-      // serve configuration based
-      } else {
-        if (envTarget.indexOf('local') > -1) {
-          configFile = path.join(projectAssetsPath, 'openid-login-config.' + envTarget.replace('-openid', '') + '.json');
-        } else {
-          configFile = path.join(projectAssetsPath, 'openid-login-config.local-' + envTarget + '.json');
-        }
-      }
+      const envTargetFinal = getEnvTarget(envTarget, build);
+      const configFile = path.join(projectAssetsPath, 'openid-login-config.' + envTargetFinal + '.json');
 
       tools.logInfo(`checking ${configFile}`);
       if (!tools.isFileExists(configFile)) {
@@ -178,15 +184,15 @@ const replaceRoutes = (project, envTarget, build, routesFileContent) => {
 
       // getting env route defs content if build mode (not serve)
       let envRouteDefsPath, envRouteDefsJSON = [];
-      if (build) {
-        envRouteDefsPath = path.join(projectAssetsPath, 'route-defs.' + envTarget.toLowerCase() + '.json');
+      const envTargetFinal = getEnvTarget(envTarget, build);
 
-        if (!tools.isFileExists(envRouteDefsPath)) {
-          tools.logError(`${envRouteDefsPath} File NOT FOUND`);
-          throw 'ENV_ROUTE_DEFS_FILE_NOT_FOUND';
-        }
-        envRouteDefsJSON = require(envRouteDefsPath);
+      envRouteDefsPath = path.join(projectAssetsPath, 'route-defs.' + envTargetFinal + '.json');
+
+      if (!tools.isFileExists(envRouteDefsPath)) {
+        tools.logError(`${envRouteDefsPath} File NOT FOUND`);
+        throw 'ENV_ROUTE_DEFS_FILE_NOT_FOUND';
       }
+      envRouteDefsJSON = require(envRouteDefsPath);
 
       // merging content of base + env
       tools.logInfo(`Merging ${baseRouteDefsPath} with ${envRouteDefsPath}`);
@@ -212,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