@eui/tools 6.13.16 → 6.14.1

package/.version.properties

@@ -1 +1 @@
-6.13.16
+6.14.1

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 6.14.1 (2023-12-04)
+
+##### Bug Fixes
+
+* **other:**
+  * generate config when only projects array exists - EUI-7121 [EUI-7121](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-7121)  ([df74f311](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/df74f311008a71a6c7d93b30db397ecc57c68421))
+
+* * *
+* * *
+## 6.14.0 (2023-12-04)
+
+##### New Features
+
+* **other:**
+  * enable projects group release feature - EUI-7121 [EUI-7121](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-7121)  ([5bcce1af](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/5bcce1afa8b2e4bef28fa8e6d77e2b9f887edfb0))
+
+* * *
+* * *
 ## 6.13.16 (2023-11-29)
 
 ##### Bug Fixes

package/bin/eui-scripts.js

@@ -6,7 +6,8 @@ const chalk = require('chalk');
 const args = process.argv.slice(2);
 
 const scriptIndex = args.findIndex(
-    x => x === 'clean-package' ||
+  (x) =>
+    x === 'clean-package' ||
     x === 'clean-all' ||
     x === 'audit-package' ||
     x === 'build-package' ||
@@ -38,6 +39,7 @@ const scriptIndex = args.findIndex(
     x === 'release-package' ||
     x === 'release-backend' ||
     x === 'release-app' ||
+    x === 'release-app-group' ||
     x === 'generate-translations' ||
     x === 'csdr-sync' ||
     x === 'csdr-cli' ||

package/bin/scripts/release-app-group.js

@@ -0,0 +1,5 @@
+'use strict';
+
+const releaseApp = require('../../scripts/csdr/release/app/release-app-group');
+
+releaseApp.run();

package/package.json

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

package/scripts/csdr/cli/package-prompt.js

@@ -1,100 +1,101 @@
 'use strict';
 
-// GLOBAL
-const inquirer = require('inquirer');
-
-// CONSTANTS
-const constants = require('./constants');
-
-
 module.exports.prompt = () => {
+  console.log(
+    'WARNING: discontinued, use init-interactive for creating PKG / REMOTES, note that this should be executed by SUPPORT TEAM ONLY!'
+  );
+  throw new Error('SCRIPT_DISCONTINUED');
+};
 
-  return Promise.resolve()
-    .then(() => {
-      return inquirer.prompt([
-        {
-          type: 'list',
-          name: 'pkgType',
-          message: 'Select a package type :',
-          choices: [
-            { name: 'Frontend - Angular library', value: constants.CONFIG_OPTIONS.pkgType.FRONTEND },
-            { name: 'Backend - SpringBoot micro-service', value: constants.CONFIG_OPTIONS.pkgType.BACKEND },
-          ],
-          default: constants.DEFAULT_CONFIG.pkgType,
-          validate: function (value) {
-            if (value.length) {
-              return true;
-            }
-          }
-        },
-        {
-          name: 'pkgGroupId',
-          type: 'input',
-          message: 'Enter the Maven groupId :',
-          default: constants.DEFAULT_CONFIG.pkgGroupId,
-          when: function (answers) {
-            return (answers.pkgType === constants.CONFIG_OPTIONS.pkgType.BACKEND);
-          }
-        },
-        {
-          type: 'list',
-          name: 'pkgFrontendType',
-          message: 'Select a frontend type :',
-          choices: [
-            { name: 'Default Angular library', value: constants.CONFIG_OPTIONS.pkgFrontendType.DEFAULT },
-            { name: 'Remote element micro-frontend', value: constants.CONFIG_OPTIONS.pkgFrontendType.REMOTE },
-          ],
-          default: constants.DEFAULT_CONFIG.pkgFrontendType,
-          when: function (answers) {
-            return (answers.pkgType === constants.CONFIG_OPTIONS.pkgType.FRONTEND);
-          },
-          validate: function (value) {
-            if (value.length) {
-              return true;
-            }
-          }
-        },
+// module.exports.prompt = () => {
 
-        {
-          name: 'pkgScope',
-          type: 'input',
-          message: 'Enter the package scope :',
-          default: constants.DEFAULT_CONFIG.pkgScope
-        },
-        {
-          name: 'pkgName',
-          type: 'input',
-          message: 'Enter the package name :',
-          default: constants.DEFAULT_CONFIG.pkgName
-        },
-        {
-          name: 'isCsdrRepo',
-          type: 'confirm',
-          message: 'Is the repository within CSDR git project ?',
-          default: constants.DEFAULT_CONFIG.isCsdrRepo,
-          when: function (answers) {
-            return (
-              answers.pkgType === constants.CONFIG_OPTIONS.pkgType.FRONTEND &&
-              answers.pkgFrontendType === constants.CONFIG_OPTIONS.pkgFrontendType.DEFAULT
-            );
-          }
-        },
-        {
-          name: 'externalRepoName',
-          type: 'input',
-          message: 'Enter the project CITnet project name where the repository is located :',
-          default: constants.DEFAULT_CONFIG.externalRepoName,
-          when: function (answers) {
-            return (
-              answers.isCsdrRepo === false
-            );
-          }
-        },
-      ]);
-    })
+//   const inquirer = require('inquirer');
+//   const constants = require('./constants');
+//   return Promise.resolve()
+//     .then(() => {
+//       return inquirer.prompt([
+//         {
+//           type: 'list',
+//           name: 'pkgType',
+//           message: 'Select a package type :',
+//           choices: [
+//             { name: 'Frontend - Angular library', value: constants.CONFIG_OPTIONS.pkgType.FRONTEND },
+//             { name: 'Backend - SpringBoot micro-service', value: constants.CONFIG_OPTIONS.pkgType.BACKEND },
+//           ],
+//           default: constants.DEFAULT_CONFIG.pkgType,
+//           validate: function (value) {
+//             if (value.length) {
+//               return true;
+//             }
+//           }
+//         },
+//         {
+//           name: 'pkgGroupId',
+//           type: 'input',
+//           message: 'Enter the Maven groupId :',
+//           default: constants.DEFAULT_CONFIG.pkgGroupId,
+//           when: function (answers) {
+//             return (answers.pkgType === constants.CONFIG_OPTIONS.pkgType.BACKEND);
+//           }
+//         },
+//         {
+//           type: 'list',
+//           name: 'pkgFrontendType',
+//           message: 'Select a frontend type :',
+//           choices: [
+//             { name: 'Default Angular library', value: constants.CONFIG_OPTIONS.pkgFrontendType.DEFAULT },
+//             { name: 'Remote element micro-frontend', value: constants.CONFIG_OPTIONS.pkgFrontendType.REMOTE },
+//           ],
+//           default: constants.DEFAULT_CONFIG.pkgFrontendType,
+//           when: function (answers) {
+//             return (answers.pkgType === constants.CONFIG_OPTIONS.pkgType.FRONTEND);
+//           },
+//           validate: function (value) {
+//             if (value.length) {
+//               return true;
+//             }
+//           }
+//         },
 
-    .catch((e) => {
-      throw e;
-    })
-}
+//         {
+//           name: 'pkgScope',
+//           type: 'input',
+//           message: 'Enter the package scope :',
+//           default: constants.DEFAULT_CONFIG.pkgScope
+//         },
+//         {
+//           name: 'pkgName',
+//           type: 'input',
+//           message: 'Enter the package name :',
+//           default: constants.DEFAULT_CONFIG.pkgName
+//         },
+//         {
+//           name: 'isCsdrRepo',
+//           type: 'confirm',
+//           message: 'Is the repository within CSDR git project ?',
+//           default: constants.DEFAULT_CONFIG.isCsdrRepo,
+//           when: function (answers) {
+//             return (
+//               answers.pkgType === constants.CONFIG_OPTIONS.pkgType.FRONTEND &&
+//               answers.pkgFrontendType === constants.CONFIG_OPTIONS.pkgFrontendType.DEFAULT
+//             );
+//           }
+//         },
+//         {
+//           name: 'externalRepoName',
+//           type: 'input',
+//           message: 'Enter the project CITnet project name where the repository is located :',
+//           default: constants.DEFAULT_CONFIG.externalRepoName,
+//           when: function (answers) {
+//             return (
+//               answers.isCsdrRepo === false
+//             );
+//           }
+//         },
+//       ]);
+//     })
 
+//     .catch((e) => {
+//       throw e;
+//     })
+// }

package/scripts/csdr/config/global.js

@@ -102,30 +102,32 @@ const getGeneratedConfig = (euircBaseFile) => {
   })
 
   // remapping projects against csdr packages config
-  configContent.packages.forEach((p) => {
-    genConfig.packages[p] = globalConfig.packages[p];
+  if (configContent.packages) {
+    configContent.packages.forEach((p) => {
+      genConfig.packages[p] = globalConfig.packages[p];
 
-    // checking if package has config override in its own folder
-    const pkgCsdrConfig = path.join(process.cwd(), 'packages', p, '.csdr-config.json');
+      // checking if package has config override in its own folder
+      const pkgCsdrConfig = path.join(process.cwd(), 'packages', p, '.csdr-config.json');
 
-    if (tools.isFileExists(pkgCsdrConfig)) {
-      const pkgCsdrConfigJson = require(pkgCsdrConfig);
-      genConfig.packages[p] = pkgCsdrConfigJson;
-    }
-  })
+      if (tools.isFileExists(pkgCsdrConfig)) {
+        const pkgCsdrConfigJson = require(pkgCsdrConfig);
+        genConfig.packages[p] = pkgCsdrConfigJson;
+      }
+    })
 
-  // treating parent / children packages
-  Object.keys(genConfig.packages).forEach((p) => {
-    // getting package
-    const pkg = genConfig.packages[p];
+    // treating parent / children packages
+    Object.keys(genConfig.packages).forEach((p) => {
+      // getting package
+      const pkg = genConfig.packages[p];
 
-    // insert children packages if any
-    if (pkg && pkg.parent) {
-      Object.keys(pkg.packages).forEach((pc) => {
-        genConfig.packages[pc] = pkg.packages[pc];
-      })
-    }
-  })
+      // insert children packages if any
+      if (pkg && pkg.parent) {
+        Object.keys(pkg.packages).forEach((pc) => {
+          genConfig.packages[pc] = pkg.packages[pc];
+        })
+      }
+    })
+  }
 
   // remapping remotes
   if (configContent.remotes) {
@@ -168,7 +170,7 @@ module.exports.getConfig = () => {
 
 
 
-module.exports.updateConfig = (args = { project, packages, packagesBranches, remotes, reset}) => {
+module.exports.updateConfig = (args = { project, projects, packages, packagesBranches, remotes, reset}) => {
   tools.logInfo('Updating euirc config');
   console.log(args);
 
@@ -178,40 +180,51 @@ module.exports.updateConfig = (args = { project, packages, packagesBranches, rem
 
   if (!tools.isFileExists(configFile) || args.reset) {
     newConfig.projects = [];
-    if (args.project && args.project !== 'NONE') {
-      newConfig.projects.push(args.project);
-    }
-    newConfig.packages = [];
-    if (args.packages) {
-      newConfig.packages = args.packages;
-    }
-    newConfig.packagesBranches = [];
-    if (args.packagesBranches) {
-      newConfig.packagesBranches = args.packagesBranches;
-    }
-    newConfig.remotes = [];
-    if (args.remotes) {
-      newConfig.remotes = args.remotes;
+
+    if (args.projects) {
+      newConfig.projects = args.projects;
+
+    } else {
+      if (args.project && args.project !== 'NONE') {
+        newConfig.projects.push(args.project);
+      }
+      newConfig.packages = [];
+      if (args.packages) {
+        newConfig.packages = args.packages;
+      }
+      newConfig.packagesBranches = [];
+      if (args.packagesBranches) {
+        newConfig.packagesBranches = args.packagesBranches;
+      }
+      newConfig.remotes = [];
+      if (args.remotes) {
+        newConfig.remotes = args.remotes;
+      }
     }
 
   } else {
     newConfig = require(configFile);
 
-    if (args.project && args.project !== 'NONE') {
-      if (newConfig.projects.indexOf(args.project) < 0) {
-        newConfig.projects.push(args.project);
+    if (args.projects) {
+      newConfig.projects = args.projects;
+
+    } else {
+      if (args.project && args.project !== 'NONE') {
+        if (newConfig.projects.indexOf(args.project) < 0) {
+          newConfig.projects.push(args.project);
+        }
       }
-    }
 
-    if (args.packages) {
-      newConfig.packages = tools.removeArrayDuplicates([...newConfig.packages || [], ...args.packages]);
-    }
-    if (args.packagesBranches) {
-      newConfig.packagesBranches = tools.removeArrayDuplicates([...newConfig.packagesBranches || [], ...args.packagesBranches]);
-    }
+      if (args.packages) {
+        newConfig.packages = tools.removeArrayDuplicates([...newConfig.packages || [], ...args.packages]);
+      }
+      if (args.packagesBranches) {
+        newConfig.packagesBranches = tools.removeArrayDuplicates([...newConfig.packagesBranches || [], ...args.packagesBranches]);
+      }
 
-    if (args.remotes) {
-      newConfig.remotes = tools.removeArrayDuplicates([...newConfig.remotes || [], ...args.remotes]);
+      if (args.remotes) {
+        newConfig.remotes = tools.removeArrayDuplicates([...newConfig.remotes || [], ...args.remotes]);
+      }
     }
   }
 

package/scripts/csdr/config/init.js

@@ -12,14 +12,13 @@ const innerPackages = require('./packages');
 const innerRemotes = require('./remotes');
 const innerGlobal = require('./global');
 
-
-
 module.exports.run = (args) => {
   return Promise.resolve()
     .then(() => {
       if (args.custom) {
         return initConfigCustom(args);
-
+      } else if (args.projectsGroup) {
+        return initConfigProjectsGroup(args.projectsGroup, args.euiVersion);
       } else {
         return initConfigCore(args);
       }
@@ -27,9 +26,8 @@ module.exports.run = (args) => {
 
     .catch((e) => {
       throw e;
-    })
-}
-
+    });
+};
 
 const initConfigCustom = (args) => {
   return Promise.resolve()
@@ -47,24 +45,24 @@ const initConfigCustom = (args) => {
 
       return innerGlobal.updateConfig({
         project: customConfig.project,
-        packages: [...defaultPackages, ...customConfig.packages.map(p => p.name)],
+        packages: [...defaultPackages, ...customConfig.packages.map((p) => p.name)],
         packagesBranches: customConfig.packages,
         remotes: customConfig.remotes,
-        reset: true
+        reset: true,
       });
     })
     .catch((e) => {
       throw e;
-    })
-}
-
+    });
+};
 
 const initConfigCore = (args) => {
   return Promise.resolve()
     .then(() => {
-      tools.logInfo('Updating local configuration')
+      tools.logInfo('Updating local configuration');
 
-      let packages = [], remotes = [];
+      let packages = [],
+        remotes = [];
       if (args.project || args.pkg) {
         packages = getInputPackages(args.project, args.pkg, args.team, args.prjOnly, args.containerOnly);
         tools.logInfo('Found packages : ');
@@ -73,7 +71,7 @@ const initConfigCore = (args) => {
 
       if (args.remote) {
         const remote = innerRemotes.getCsdrRemotes()[args.remote];
-      if (remote) {
+        if (remote) {
           remotes.push(args.remote);
         }
       }
@@ -82,19 +80,27 @@ const initConfigCore = (args) => {
     })
     .catch((e) => {
       throw e;
-    })
-}
-
-
-
+    });
+};
 
+const initConfigProjectsGroup = (projectsGroup, euiVersion) => {
+  return Promise.resolve()
+    .then(() => {
+      tools.logInfo('Updating local configuration');
 
+      const projects = innerProjects.getCsdrProjectsGroupForEuiVersion(projectsGroup, euiVersion);
 
+      return innerGlobal.updateConfig({ projects });
+    })
+    .catch((e) => {
+      throw e;
+    });
+};
 
 const getInputPackages = (project, pkg, team, prjOnly, containerOnly) => {
   tools.logInfo('Gathering team packages');
 
-  var packages = [];
+  let packages = [];
 
   // when package is provided, we initialize this package only
   if (pkg) {
@@ -131,10 +137,12 @@ const getInputPackages = (project, pkg, team, prjOnly, containerOnly) => {
     }
 
     const csdrPackage = innerPackages.getCsdrPackages()[p];
-    if (typeof team === 'undefined' ||
+    if (
+      typeof team === 'undefined' ||
       team === 'all' ||
-      csdrPackage.teams && (csdrPackage.teams.indexOf(team) >= 0 ||  csdrPackage.teams.indexOf('all') >= 0)) {
+      (csdrPackage.teams && (csdrPackage.teams.indexOf(team) >= 0 || csdrPackage.teams.indexOf('all') >= 0))
+    ) {
       packages.push(p);
     }
   }
-}
+};