@eui/tools 6.3.40 → 6.3.42

package/.version.properties

@@ -1 +1 @@
-6.3.40
+6.3.42

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 6.3.42 (2023-02-21)
+
+##### Chores
+
+* **other:**
+  * add filtered list of jira issues exported to gitlab based on configuration for remote - MWP-9325 [MWP-9325](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-9325)  ([695ac86d](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/695ac86d4580c15c7c078c6f1bbfc04fe688f0b5))
+
+* * *
+* * *
+## 6.3.41 (2023-02-20)
+
+##### Bug Fixes
+
+* **other:**
+  * remotes injection issue when no options set - add skipReset not regenerating remote locally for debugging - MWP-9204 [MWP-9204](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-9204)  ([b15687c9](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/b15687c9bd33c8e6762ca77eefecd40f9f734bbb))
+
+* * *
+* * *
 ## 6.3.40 (2023-02-20)
 
 ##### Chores

package/package.json

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

package/scripts/csdr/init/remotes/15.x/full/options/definitions/dynamic-forms.json

@@ -1,4 +1,4 @@
 {
-    "imports": "import { DynamicFormsModule } from '@eui/dynamic-forms';",
-    "definitions": "DynamicFormsModule.forRoot({ componentMap: {}, rulesMap: {}, validationsMap: {}, valMessagesMap: {}, })"
+    "imports": "import { DynamicFormsModule } from '@eui/dynamic-forms'; import { dynMapConfig } from '@root.npm.pkg@'; ",
+    "definitions": "DynamicFormsModule.forRoot(dynMapConfig)"
 }

package/scripts/csdr/init/remotes.js

@@ -8,6 +8,9 @@ const tools = require('../../utils/tools');
 const configUtils = require('../config/config-utils');
 const gitUtils = require('../../utils/git-utils');
 
+// ARGS
+const { skipReset } = tools.getArgs();
+
 
 
 const cloneRemotesConfig = module.exports.cloneRemotesConfig = () => {
@@ -41,6 +44,11 @@ module.exports.generateVirtualRemote = (remoteName, cloneRemote = true) => {
 
   let remote, remotePath, remoteSrcPath, remoteSkeletonRootPath, remoteSkeletonPath;
 
+  // checking if reset has to bypassed, in that case no-regeneration occurs
+  if (skipReset) {
+    return;
+  }
+
   return Promise.resolve()
     // clone remotes config if first init
     .then(() => {
@@ -151,14 +159,23 @@ module.exports.generateVirtualRemote = (remoteName, cloneRemote = true) => {
         tools.logInfo(`copying full sources skeleton : ${fullCommonPath} ==> ${remoteSrcPath}`);
         tools.copy(fullCommonPath, remoteSrcPath);
 
+        // initializing dynamic contents, filled based on options provided in config metadata
+        let importsContent = [];
+        let definitionsContent = [];
+        let declarationsContent = [];
+        let providersContent = [];
+        let constructorDeclarationsContent = [];
+
         // checking options
-        if (remote.skeletonConfig.options) {
-          let importsContent = [];
-          let definitionsContent = [];
-          let declarationsContent = [];
-          let providersContent = [];
-          let constructorDeclarationsContent = [];
 
+        // if no options found, we inject default modules defs
+        if (!remote.skeletonConfig.options) {
+          definitionsContent.push('StoreModule.forRoot(TOKEN, { metaReducers })');
+          definitionsContent.push(`StoreRouterConnectingModule.forRoot({ stateKey: 'router', serializer: CustomSerializer })`);
+
+
+        // if options, all options are checked and default modules defs are injected following certain conditions
+        } else {
           const pushContent = (obj) => {
             if (obj.imports) importsContent.push(obj.imports);
             if (obj.definitions) definitionsContent.push(obj.definitions);
@@ -199,19 +216,19 @@ module.exports.generateVirtualRemote = (remoteName, cloneRemote = true) => {
             definitionsContent.push(`StoreRouterConnectingModule.forRoot({ stateKey: 'router', serializer: CustomSerializer })`);
           }
 
-          // replace option in module.ts placeholders
-          const moduleTsPath = path.join(remoteSrcPath, 'app', 'module.ts');
-          tools.replaceInFileSync(moduleTsPath, '// IMPORTS', importsContent.join('\n'));
-          tools.replaceInFileSync(moduleTsPath, '// DEFINITIONS', definitionsContent.join(',\n'));
-          tools.replaceInFileSync(moduleTsPath, '// DECLARATIONS', declarationsContent.join('\n'));
-          tools.replaceInFileSync(moduleTsPath, '// PROVIDERS', providersContent.join(',\n'));
-          tools.replaceInFileSync(moduleTsPath, '// CONSTRUCTOR DECLARATIONS', constructorDeclarationsContent.join('\n'));
-
           if (remote.skeletonConfig.options.participant) {
             tools.replaceInPath(remoteSrcPath, '@block.container.name@', remote.skeletonConfig.blockContainerName);
           }
         }
 
+        // replace option in module.ts placeholders
+        const moduleTsPath = path.join(remoteSrcPath, 'app', 'module.ts');
+        tools.replaceInFileSync(moduleTsPath, '// IMPORTS', importsContent.join('\n'));
+        tools.replaceInFileSync(moduleTsPath, '// DEFINITIONS', definitionsContent.join(',\n'));
+        tools.replaceInFileSync(moduleTsPath, '// DECLARATIONS', declarationsContent.join('\n'));
+        tools.replaceInFileSync(moduleTsPath, '// PROVIDERS', providersContent.join(',\n'));
+        tools.replaceInFileSync(moduleTsPath, '// CONSTRUCTOR DECLARATIONS', constructorDeclarationsContent.join('\n'));
+
         tools.logInfo('Replacing skeleton config tokens');
         tools.replaceInPath(remoteSrcPath, '@remote.name@', remote.name);
         tools.replaceInPath(remoteSrcPath, '@base.url@', remote.skeletonConfig.baseUrl);

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

@@ -41,17 +41,19 @@ const getMetadata = (pkg) => {
 
 
 const storeMetadata = (pkg, diffMetadata, newVersion) => {
-  tools.logInfo('Storing pkg history metadata');
+  tools.logTitle('Storing pkg history metadata');
 
   const DEVOPS_METADATA_PATH = configUtils.global.getConfigOptions().DEVOPS_METADATA_PATH;
 
-  let flatJiraList = [];
+  let flatJiraList = [], filteredFlatJiraList = [];
   let historyMetadata = {};
 
   return Promise.resolve()
 
     // flatten jira key list from diffMetadata extracted
     .then(() => {
+
+      // full jira issues list
       diffMetadata.forEach((pkg) => {
         pkg.gitMetadata.forEach((gitMetadata) => {
           gitMetadata.forEach((v) => {
@@ -61,6 +63,20 @@ const storeMetadata = (pkg, diffMetadata, newVersion) => {
       })
 
       flatJiraList = tools.removeArrayDuplicates(flatJiraList);
+
+      // filtered only issues where package is considered "linkedPackage" defined in the configuration, to not push all the issues list
+      // coming from dependencies of a particular remote to the release note generated after CI
+      diffMetadata.forEach((pkg) => {
+        if (pkg.packageLinked) {
+          pkg.gitMetadata.forEach((gitMetadata) => {
+            gitMetadata.forEach((v) => {
+              if (v.issue) filteredFlatJiraList.push(v.issue);
+            })
+          })
+        }
+      })
+
+      filteredFlatJiraList = tools.removeArrayDuplicates(filteredFlatJiraList);
     })
 
     // store the history file
@@ -77,7 +93,8 @@ const storeMetadata = (pkg, diffMetadata, newVersion) => {
       versions.push({
         name: newVersion,
         diffs: diffMetadata,
-        issues: flatJiraList
+        issues: flatJiraList,
+        filteredIssues: filteredFlatJiraList
       });
 
       historyMetadata.versions = versions;
@@ -87,11 +104,20 @@ const storeMetadata = (pkg, diffMetadata, newVersion) => {
 
     // storing issuesList gathered into gitlab variables for post CI processing
     .then(() => {
+      tools.logInfo('Extracting Jira issues list to gitlab variables');
+
       if (!flatJiraList) {
         tools.logWarning('No issues found for this release');
 
       } else {
-        const issuesList = flatJiraList.join(',');
+        let issuesList;
+        if (filteredFlatJiraList.length > 0) {
+          tools.logInfo('Taking into account filter issues list from allowed packages in configuration');
+          issuesList = filteredFlatJiraList.join(',');
+        } else {
+          tools.logInfo('Taking into account full Jira issues list extracted');
+          issuesList = flatJiraList.join(',');
+        }
         tools.logInfo(`Unique issues found for this version : ${issuesList}`);
 
         if (!dryRun) {
@@ -152,18 +178,31 @@ const getDiffBetweenBuildVersions = (pkg, fromBuildMetadata, toBuildMetadata) =>
 
         tools.logInfo(`parsing item : ${item.package}`);
 
-        const pkg = configUtils.packages.getPackageByNpmPkg(item.package, true);
+        const pkgItem = configUtils.packages.getPackageByNpmPkg(item.package, true);
         let pkgName;
-        if (pkg) {
-          pkgName = pkg.name;
+        if (pkgItem) {
+          pkgName = pkgItem.name;
 
-          if (pkg.child) {
-            pkgName = pkg.parentPkg;
+          if (pkgItem.child) {
+            pkgName = pkgItem.parentPkg;
           }
         }
 
         tools.logInfo('checking package : ' + pkgName);
 
+        let isPackageLinked = true;
+
+        // checking if package is part of the known linkedPackage of the remote to parse
+        if (pkg.linkedPackages && pkg.linkedPackages.filter(p => p === item.package).length === 0) {
+            tools.logInfo(`package ${pkgName} is not part of "linkedPackages" defined for ${pkg.name}`)
+            tools.logInfo('It will be excluded from Jira issues list generation for release note');
+            isPackageLinked = false;
+
+        } else {
+          tools.logInfo(`${pkg.name} has no linkedPackages defined OR linkedPackage is present in the allowed package list`);
+          tools.logInfo('Gathering package metadata history information');
+        }
+
         // getting package file metadata
         const packageMetadataFile = path.join(DEVOPS_METADATA_PATH, pkgName + '-build-metadata.json');
 
@@ -187,7 +226,7 @@ const getDiffBetweenBuildVersions = (pkg, fromBuildMetadata, toBuildMetadata) =>
             return acc;
           }, []);
 
-          return { name: pkgName, old: item.old, new: item.new, gitMetadata: accGitMetadata };
+          return { name: pkgName, old: item.old, new: item.new, gitMetadata: accGitMetadata, packageLinked: isPackageLinked };
         }
       })