@eui/tools 4.17.4 → 4.17.8

package/.version.properties

@@ -1 +1 @@
-4.17.4
+4.17.8

package/CHANGELOG.md

@@ -1,3 +1,39 @@
+## 4.17.8 (2021-12-02)
+
+##### Chores
+
+* **other:**
+  * added back yarn.lock removal on sync - add devops-metadata sync feature to prevent new package overlap and merge issues - EUI-4107 [EUI-4107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4107)  ([f115a19f](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/f115a19f31b3d473576a122405d45e0c4f83bc83))
+
+* * *
+* * *
+## 4.17.7 (2021-12-02)
+
+##### Chores
+
+* **other:**
+  * updated handlebars to 4.7.7 in v13 resolutions - enabled back UI auditing - fixed teams display on init - EUI-4107 [EUI-4107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4107)  ([bd101f2d](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/bd101f2d6466308c21bd4bdc57a504a5cdc810a6))
+
+* * *
+* * *
+## 4.17.6 (2021-11-30)
+
+##### Bug Fixes
+
+* **other:**
+  * package history for remote on first release - EUI-4107 [EUI-4107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4107)  ([eb197f5f](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/eb197f5faaa17c8aa00e9df33d2d09ffce65f095))
+
+* * *
+* * *
+## 4.17.5 (2021-11-25)
+
+##### Chores
+
+* **other:**
+  * eui10 element creation adaptation MWP-7583 [MWP-7583](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-7583)  ([0165130e](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/0165130e42ff83aa343bedb98da13c1c608f442f))
+
+* * *
+* * *
 ## 4.17.4 (2021-11-24)
 
 ##### Chores

package/package.json

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

package/sandbox.js

@@ -15,6 +15,7 @@ const compositeUtils = require('./scripts/csdr/install/composite-utils');
 const installUtils = require('./scripts/csdr/install/install-utils');
 const notificationUtils = require('./scripts/utils/notification/notification-utils');
 
+
 // console.log(configUtils.packages.getPackages());
 // console.log(configUtils.packages.getPackage('eui-tools'));
 
@@ -597,24 +598,24 @@ const notificationUtils = require('./scripts/utils/notification/notification-uti
 //                 });
 //     console.log(tools.sortArray(a, 'name'));
 //   })
-return Promise.resolve()
-  .then(() => {
-    console.log('t1')
-    console.log(new Date());
+// return Promise.resolve()
+//   .then(() => {
+//     console.log('t1')
+//     console.log(new Date());
 
-    return new Promise((resolve) => {
-      setTimeout(resolve, 8000);
-    });
-  })
+//     return new Promise((resolve) => {
+//       setTimeout(resolve, 8000);
+//     });
+//   })
 
-  .then(() => {
-    console.log('t2')
-    console.log(new Date());
-  })
+//   .then(() => {
+//     console.log('t2')
+//     console.log(new Date());
+//   })
 
-  .then(() => {
-    console.log('T3')
-  })
+//   .then(() => {
+//     console.log('T3')
+//   })
 
 // return Promise.resolve()
 //   .then(() => {
@@ -630,3 +631,7 @@ return Promise.resolve()
 //     tools.logBanner('this is the content of the banner');
 //   })
 
+return Promise.resolve()
+  .then(() => {
+    return metadataUtils.package.syncDevopsMetadata();
+  })

package/scripts/csdr/audit/audit-utils.js

@@ -50,7 +50,7 @@ module.exports.audit = (pkg) => {
     .then(() => {
       return Promise.resolve()
         .then(() => {
-          return execa.shellSync('yarn audit --level moderate', { cwd: process.cwd(), stdio: 'inherit' });
+          return execa.shellSync('yarn audit --level high', { cwd: process.cwd(), stdio: 'inherit' });
         })
         .catch((e) => {}) // it can fail
     })
@@ -61,7 +61,7 @@ module.exports.audit = (pkg) => {
         .then(() => {
           const auditFile = path.join(process.cwd(), 'audit.json');
           tools.logInfo(`Creating audit file`)
-          return execa.shellSync(`yarn audit --level moderate --json > ${auditFile}`, { cwd: process.cwd(), stdio: 'inherit' });
+          return execa.shellSync(`yarn audit --level high --json > ${auditFile}`, { cwd: process.cwd(), stdio: 'inherit' });
         })
         .then(() => {
           tools.logSuccess();

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

@@ -46,6 +46,7 @@ import {
     USER_SERVICE_HOST_TOKEN,
     UserMapping,
     UX_SERVICE_HOST_TOKEN,
+    UX_APP_SHELL_SERVICE_HOST_TOKEN,
     UxAppShellServiceMapping,
 } from '@csdr/integration';
 import { RoutingModule } from './routing.module';
@@ -84,7 +85,7 @@ export function openidConnectInterceptorFactory(config) {
         reducerProvider,
         {
             provide: EUI_CONFIG_TOKEN,
-            useValue: { appConfig, environment },
+            useValue: { appConfig: { ...appConfig, ...environment }, environment },
         },
         {
             provide: HTTP_INTERCEPTORS,
@@ -123,6 +124,7 @@ export function openidConnectInterceptorFactory(config) {
         // used in the el-mappers
         { provide: USER_SERVICE_HOST_TOKEN, useFactory: () => window['PROVIDERS']['UserService'] },
         { provide: UX_SERVICE_HOST_TOKEN, useFactory: () => window['PROVIDERS']['UxService'] },
+        { provide: UX_APP_SHELL_SERVICE_HOST_TOKEN, useFactory: () => window['PROVIDERS']['UxAppShellService'] },
 
         {
             provide: PushNotificationsService,
@@ -143,9 +145,11 @@ export function openidConnectInterceptorFactory(config) {
                 router: Router,
                 storeService: StoreService,
                 iI18nService: I18nService,
-                hostUserService: any) => new UxAppShellServiceMapping(
-                    config, http, platformId, router, storeService, iI18nService, hostUserService),
-            deps: [CONFIG_TOKEN, HttpClient, PLATFORM_ID, Router, StoreService, I18nService, UX_SERVICE_HOST_TOKEN],
+                hostUxService: any,
+                hostUxAppShellService: any) => new UxAppShellServiceMapping(
+                    config, http, platformId, router, storeService, iI18nService, hostUxService, hostUxAppShellService),
+            deps: [CONFIG_TOKEN, HttpClient, PLATFORM_ID, Router, StoreService, I18nService,
+                UX_SERVICE_HOST_TOKEN, UX_APP_SHELL_SERVICE_HOST_TOKEN],
         },
         { provide: ELEMENT_ROUTER_TOKEN, useFactory: () => window['PROVIDERS']['ELEMENT_ROUTER_TOKEN'], deps: [] },
         // TODO[REMOTE-SETUP] uncomment if zipkin is used

package/scripts/csdr/init/prompt.js

@@ -17,7 +17,9 @@ module.exports.start = () => {
         type: "list",
         name: "project",
         message: "Which app / project do you work on?",
-        choices: csdrProjects.map(p => ({ name: p.name, value: p.name }))
+        choices: csdrProjects.filter((p) => {
+          return p.initListVisible === true;
+        }).map(p => ({ name: p.name, value: p.name }))
       });
 
       const answersTeam = await inquirer.prompt({

package/scripts/csdr/init/resources/13.x/resolutions.json

@@ -1,6 +1,6 @@
 {
     "lodash": ">=4.17.21",
-    "handlebars": ">=4.5.3",
+    "handlebars": ">=4.7.7",
     "mem": ">=4.3.0 <=8.1.1",
     "https-proxy-agent": ">=2.2.3",
     "minimatch": ">=3.0.4",

package/scripts/csdr/metadata/package-history.js

@@ -126,6 +126,11 @@ const getDiffBetweenBuildVersions = (pkg, fromBuildMetadata, toBuildMetadata) =>
 
   const DEVOPS_METADATA_PATH = configUtils.global.getConfigOptions().DEVOPS_METADATA_PATH;
 
+  if (!fromBuildMetadata) {
+    tools.logWarning('No previous metadata found for package...skipping');
+    return {};
+  }
+
   return Promise.resolve()
     .then(() => {
       return innerCommon.getDevopsMetadata();

package/scripts/csdr/metadata/package.js

@@ -596,3 +596,99 @@ module.exports.isPackageLocked = (pkg) => {
 
   return false;
 }
+
+
+
+module.exports.syncDevopsMetadata = () => {
+  return Promise.resolve()
+    .then(() => {
+      const pkgsObject = configUtils.packages.getCsdrPackages();
+      const pkgs = Object.keys(pkgsObject);
+
+      const metadataFile = path.join(process.cwd(), 'packages', 'devops-metadata', '.devops-metadata.json');
+      const metadata = require(metadataFile);
+
+      let packages = metadata.packages;
+      let packagesLatestTag = metadata.packagesLatestTag;
+      let packagesNextTag = metadata.packagesNextTag;
+      let packagesPrevTag = metadata.packagesPrevTag;
+      let packagesPrevSnapshotsTag = metadata.packagesPrevSnapshotsTag;
+
+      const getMissingPackages = (inArray) => {
+        let outArray = [];
+
+        pkgs.forEach((p) => {
+          const pkgIdx = inArray.findIndex(item => item.name === p);
+          if (pkgIdx === -1) {
+            outArray.push(p);
+          }
+        });
+
+        return outArray;
+      }
+
+      const addPackages = (inArray, pkgsToAdd) => {
+        const outArray = inArray;
+        pkgsToAdd.forEach((p) => {
+          outArray.push({
+            name: p,
+            version: null,
+            date: require('moment')(new Date()).format("YYYYMMDD-HH:mm"),
+            status: 'INITIALIZED',
+            npmPkg: null
+          });
+        })
+
+        return outArray;
+      }
+
+      console.log('processing packages');
+      let packagesToAdd = [] = getMissingPackages(packages);
+      let packagesLatestTagToAdd = [] = getMissingPackages(packagesLatestTag);
+      let packagesNextTagToAdd = [] = getMissingPackages(packagesNextTag);
+      let packagesPrevTagToAdd = [] = getMissingPackages(packagesPrevTag);
+      let packagesPrevSnapshotsTagToAdd = [] = getMissingPackages(packagesPrevSnapshotsTag);
+
+      console.log(packagesToAdd.length);
+      console.log(packagesLatestTagToAdd.length);
+      console.log(packagesNextTagToAdd.length);
+      console.log(packagesPrevTagToAdd.length);
+      console.log(packagesPrevSnapshotsTagToAdd.length);
+
+      console.log(`packages before : ${packages.length}`);
+      packages = addPackages(packages, packagesToAdd);
+      console.log(`packages after : ${packages.length}`);
+
+      console.log(`packages before : ${packagesLatestTag.length}`);
+      packagesLatestTag = addPackages(packagesLatestTag, packagesLatestTagToAdd);
+      console.log(`packages after : ${packagesLatestTag.length}`);
+
+      console.log(`packages before : ${packagesNextTag.length}`);
+      packagesNextTag = addPackages(packagesNextTag, packagesNextTagToAdd);
+      console.log(`packages after : ${packagesNextTag.length}`);
+
+      console.log(`packages before : ${packagesPrevTag.length}`);
+      packagesPrevTag = addPackages(packagesPrevTag, packagesPrevTagToAdd);
+      console.log(`packages after : ${packagesPrevTag.length}`);
+
+      console.log(`packages before : ${packagesPrevSnapshotsTag.length}`);
+      packagesPrevSnapshotsTag = addPackages(packagesPrevSnapshotsTag, packagesPrevSnapshotsTagToAdd);
+      console.log(`packages after : ${packagesPrevSnapshotsTag.length}`);
+
+      metadata.packages = packages;
+      metadata.packagesLatestTag = packagesLatestTag;
+      metadata.packagesPrevTag = packagesPrevTag;
+      metadata.packagesNextTag = packagesNextTag;
+      metadata.packagesPrevSnapshotsTag = packagesPrevSnapshotsTag;
+
+      if (!dryRun) {
+        tools.writeJsonFileSync(metadataFile, metadata);
+      } else {
+        tools.logInfo(`Write metadata on ${metadataFile}`);
+      }
+    })
+
+    .catch((e) => {
+      throw e;
+    })
+}

package/scripts/csdr/metadata/stats.js

@@ -10,7 +10,7 @@ const configUtils = require('../config/config-utils');
 const metadataUtils = require('../metadata/metadata-utils');
 
 // FETCH ARGS
-const { dryRun } = tools.getArgs();
+const { dryRun, skipClone } = tools.getArgs();
 
 
 const groupBy = (xs, f) => {
@@ -29,7 +29,7 @@ module.exports.run = () => {
 
   return Promise.resolve()
     .then(() => {
-      if (!dryRun) {
+      if (!dryRun && !skipClone) {
         return metadataUtils.common.cloneMetadataRepo();
       }
     })
@@ -45,6 +45,8 @@ module.exports.run = () => {
 
       // Accumulating all packages metadata in one single object
       packages.forEach((p) => {
+        console.log(`Processing package : ${p.name}`);
+
         const metadataRoot = path.join(process.cwd(), 'packages', 'devops-metadata');
         const pkgMetadata = tools.getJsonFileContent(path.join(metadataRoot, p.devopsMetadataFile));
         const pkgMetadataVersions = tools.getJsonFileContent(path.join(metadataRoot, p.devopsVersionsMetadataFile));
@@ -52,9 +54,11 @@ module.exports.run = () => {
         const gitCommits = [];
         if (pkgMetadata.versions) {
           pkgMetadata.versions.forEach((v) => {
-            v.gitMetadata.commits.forEach((c) => {
-              gitCommits.push(c);
-            });
+            if (v.gitMetadata.commits) {
+              v.gitMetadata.commits.forEach((c) => {
+                gitCommits.push(c);
+              });
+            }
           });
         }
 

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

@@ -32,9 +32,9 @@ module.exports.install = (pkg, isMaster) => {
 
 
   // AUDIT DEPENDENCIES
-  // .then(() => {
-  //   return auditUtils.audit(pkg);
-  // })
+  .then(() => {
+    return auditUtils.audit(pkg);
+  })
 
 
   .catch((e) => {

package/scripts/csdr/sync/sync-utils.js

@@ -16,10 +16,10 @@ module.exports.sync = () => {
     tools.logInfo('Resetting package.json');
     return tools.copy(path.join(process.cwd(), '.csdr', 'package.json.reset'), path.join(process.cwd(), 'package.json'));
   })
-  // .then(() => {
-  //   tools.logInfo('Removing yarn.lock');
-  //   return tools.remove(path.join(process.cwd(), 'yarn.lock'));
-  // })
+  .then(() => {
+    tools.logInfo('Removing yarn.lock');
+    return tools.remove(path.join(process.cwd(), 'yarn.lock'));
+  })
   .then(() => {
     tools.logSuccess();
   })