@eui/tools 4.17.7 → 4.17.8

package/.version.properties

@@ -1 +1 @@
-4.17.7
+4.17.8

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@eui/tools",
-    "version": "4.17.7",
+    "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'));
 
@@ -632,15 +633,5 @@ const notificationUtils = require('./scripts/utils/notification/notification-uti
 
 return Promise.resolve()
   .then(() => {
-    const csdrProjects = configUtils.projects.getCsdrProjects().filter((p) => {
-      return p.initListVisible === true;
-    }).map(p => ({ name: p.name, value: p.name }));
-    console.log(csdrProjects);
-
-    const teams = configUtils.projects.getTeamsProject(csdrProjects, answersProject.project)
-    .map(t => ({ name: getLabelTeam(t), value: t }))
-    .sort((a, b) => a.name > b.name ? 1 : a.name < b.name ? -1 : 0)
-    .concat([{ name: '* Install all packages', value: 'all' }]);
-
-    console.log(teams);
+    return metadataUtils.package.syncDevopsMetadata();
   })

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/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();
   })