@eui/tools 6.9.3 → 6.9.4

package/.version.properties

@@ -1 +1 @@
-6.9.3
+6.9.4

package/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 6.9.4 (2023-03-16)
+
+##### Chores
+
+* **other:**
+  * adapted default frontend package skeleton sources - MWP-9204 [MWP-9204](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-9204)  ([19ca8394](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/19ca839438396da824803dd7538fbedd71279784))
+  * adapted ms-teams notifications payload and format - EUI-7146 [EUI-7146](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-7146)  ([c99a6094](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/c99a6094414366a4ef098c9841780618d2956331))
+
+* * *
+* * *
 ## 6.9.3 (2023-03-15)
 
 ##### Bug Fixes

package/package.json

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

package/scripts/csdr/audit/yarn.js

@@ -67,8 +67,6 @@ const getVulnerabilitiesList = () => {
 
 
 module.exports.audit = (pkg) => {
-  if (dryRun) return;
-
   tools.logTitle('Yarn auditing package');
 
   let outReport;

package/scripts/csdr/cli/skeletons/package/frontend/15.x/default/dependencies-composite.json

@@ -1,3 +1,4 @@
 {
-    "@eui/deps-base": "^15.0.0"
+    "@eui/deps-base": "^15.0.0",
+    "@csdr/core": "^4.0.0"
 }

package/scripts/csdr/cli/skeletons/package/frontend/15.x/default/src/lib/components/main.component.html

@@ -26,22 +26,7 @@
                 </eui-page-column-body>
             </eui-page-column>
 
-            <eui-page-column>
-
-                <eui-page-column-header-left-content>
-                    <div class="eui-page-column__header-left-content-label">{{ '@module.scope-name@.SEARCH_RESULT' | translate }}</div>
-                </eui-page-column-header-left-content>
-
-                <eui-page-column-header-right-content>
-                    <div class="eui-u-flex">
-                        <button
-                            euiButton
-                            euiSecondary>
-                            <span euiIcon iconClass="eui-icon-refresh"></span>
-                            <span euiLabel>{{ '@module.scope-name@.CREATE_DOSSIER' | translate }}</span>
-                        </button>
-                    </div>
-                </eui-page-column-header-right-content>
+            <eui-page-column label="{{ '@module.scope-name@.SEARCH_RESULT' | translate }}">
 
                 <eui-page-column-header-body>
                 </eui-page-column-header-body>

package/scripts/csdr/cli/skeletons/package/frontend/15.x/default/src/lib/module.ts

@@ -8,7 +8,11 @@ import { TranslateModule } from '@ngx-translate/core';
 import { EuiButtonModule } from '@eui/components/eui-button';
 import { EuiPageModule } from '@eui/components/eui-page';
 
-import { CcSharedModule } from '@cc/shared';
+// -- eUI module imports specific (recommended for treeshakability)
+const EUI_MODULES = [
+    EuiButtonModule,
+    EuiPageModule,
+];
 
 // -- Components --
 import { @module.class.name@Component } from './components/main.component';
@@ -48,10 +52,7 @@ import { RoutingModule } from './routing-module';
         // EffectsModule.forFeature(EFFECTS),
         TranslateModule,
 
-        EuiButtonModule,
-        EuiPageModule,
-
-        CcSharedModule,
+        ...EUI_MODULES,
     ],
     declarations: [
         ...COMPONENTS,

package/scripts/csdr/config/packages.js

@@ -133,6 +133,15 @@ module.exports.getPackage = (pkgName, fromCsdrConfig, optional) => {
     pkg.npmPkgName = pkg.npmPkg.substr(pkg.npmPkg.indexOf('/') + 1);
   }
 
+  // check notification method
+  if (pkg.notification) {
+    if (pkg.notification.client === 'MSTEAMS') {
+      pkg.msteamsActive = true;
+    } else {
+      pkg.msteamsActive = false;
+    }
+  }
+
   return pkg;
 }
 

package/scripts/csdr/metadata/package.js

@@ -83,7 +83,12 @@ const storeBuildMetadata = (pkg, pkgVersion, pkgMetadata, envTarget) => {
       generatedMetadata.versions = versions;
 
       tools.logInfo(`Write metadata on ${pkgMetadataFile}`);
-      tools.writeJsonFileSync(pkgMetadataFile, generatedMetadata);
+      if (dryRun) {
+        tools.logInfo('DRY-RUN...');
+        console.log(generatedMetadata);
+      } else {
+        tools.writeJsonFileSync(pkgMetadataFile, generatedMetadata);
+      }
     })
 
     .catch((e) => {

package/scripts/csdr/release/package/build-pr-scan.js

@@ -43,7 +43,7 @@ module.exports.run = () => {
 
       // INSTALL dependencies by type
       .then(() => {
-        return innerUi.installOnly(pkg);
+        return innerUi.install(pkg);
       })
 
       // BUILD PACKAGE

package/scripts/csdr/release/package/release-package.js

@@ -15,7 +15,7 @@ module.exports.run = () => {
   // npm run pkg:release mywp-dashboard-eui15-remote-el-ui -- --dryRun --branch master --remoteBuild true --virtual true --envTarget DEV --skipInstall
 
   // normal UI package / old style remote
-  // npm run pkg:release eui-tools -- --dryRun --branch develop --skipInstall --skipCompile --skipTest --skipDoc --skipClone
+  // npm run pkg:release eui-tools -- --dryRun --branch develop --skipLint --skipInstall --skipTest --skipDoc --skipClone --debug --build
 
 
   return Promise.resolve()

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

@@ -9,6 +9,7 @@ const utils = require('../../../utils');
 // CSDR RELATED
 const configUtils = require('../../config/config-utils');
 const metadataUtils = require('../../metadata/metadata-utils');
+const auditUtils = require('../../audit/audit-utils');
 
 // INNER MODULES
 const innerCommon = require('./common');
@@ -85,16 +86,39 @@ module.exports.run = () => {
       // INSTALL dependencies by type
       .then(() => {
         if (pkg.remote) {
-          return innerRemote.install(pkg, envTarget, compositeType);
+          return Promise.resolve()
+            .then(() => {
+              return innerRemote.install(pkg, envTarget, compositeType);
+            })
+            .then((compositeDeps) => {
+              // storing for later use
+              pkgCompositeDeps = compositeDeps;
+            })
+            .catch((e) => {
+              throw e;
+            })
 
         } else {
-          return innerUi.install(pkg, branches.isMaster);
+          return Promise.resolve()
+            .then(() => {
+              return innerUi.install(pkg, branches.isMaster);
+            })
+            // CHECK STYLES USAGE
+            .then(() => {
+              if (!pkg.build || (pkg.build && !pkg.build.skipAudit)) {
+                return auditUtils.styles.audit(pkg);
+              }
+            })
+
+            // AUDIT DEPENDENCIES
+            .then(() => {
+              return auditUtils.yarn.audit(pkg);
+            })
+            .catch((e) => {
+              throw e;
+            })
         }
       })
-      .then((compositeDeps) => {
-        // storing for later use
-        pkgCompositeDeps = compositeDeps;
-      })
 
 
       // BUILD PACKAGE

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

@@ -1,13 +1,8 @@
 'use strict';
 
-// GLOBAL
-const path = require('path');
-const glob = require('glob');
-
 // LOCAL
 const installUtils = require('../../install/install-utils');
 const configUtils = require('../../config/config-utils');
-const auditUtils = require('../../audit/audit-utils');
 const tools = require('../../../utils/tools');
 
 // ARGS
@@ -32,39 +27,6 @@ module.exports.install = (pkg, isMaster) => {
     return installUtils.buildPackage.installPackage(prj, pkg, isMaster);
   })
 
-  // CHECK STYLES USAGE
-  .then(() => {
-    if (!pkg.build || (pkg.build && !pkg.build.skipAudit)) {
-      return auditUtils.styles.audit(pkg);
-    }
-  })
-
-  // AUDIT DEPENDENCIES
-  .then(() => {
-    return auditUtils.yarn.audit(pkg);
-  })
-
-
-  .catch((e) => {
-    throw e;
-  })
-}
-
-
-module.exports.installOnly = (pkg) => {
-  tools.logBanner('INSTALL');
-
-  return Promise.resolve()
-
-  // FETCHING CURRENT PACKAGES & INSTALL
-  .then(() => {
-    // fetch related project if passed as arguments
-    const prj = configUtils.projects.getProject();
-
-    // install the dependencies for current package build
-    return installUtils.buildPackage.installPackage(prj, pkg, false);
-  })
-
   .catch((e) => {
     throw e;
   })

package/scripts/utils/build/package/angular.js

@@ -16,7 +16,7 @@ module.exports.build = (pkg, isMaster) => {
   const ng = path.resolve(process.cwd(), 'node_modules', '@angular', 'cli', 'bin', 'ng');
 
   // FETCH ARGS
-  let { deps, skipClean, skipLint, skipTest, skipCompile, skipDoc } = pkg.build? {...pkg.build, ...tools.getArgs()} : tools.getArgs();
+  let { deps, skipClean, skipLint, skipTest, skipCompile, skipDoc, build } = pkg.build? {...pkg.build, ...tools.getArgs()} : tools.getArgs();
 
   return Promise.resolve()
     .then(() => {
@@ -34,6 +34,7 @@ module.exports.build = (pkg, isMaster) => {
     .then(() => {
       if (!skipLint) {
         tools.logInfo('Linting...');
+
         const tsLintPath = path.join(pkg.paths.root, 'tslint.json');
         const esLintPath = path.join(pkg.paths.root, '.eslintrc.json');
 
@@ -43,10 +44,19 @@ module.exports.build = (pkg, isMaster) => {
           const script = `tslint -c ${tsLintPath} -p ${pkg.paths.tsConfig} -t verbose`
           tools.logInfo(`running ${script}`);
           return tools.runScript(script);
+
         } else if(tools.isFileExists(esLintPath)) {
           // the project path information are located inside the .eslintrc.json
           tools.logInfo(`running ng lint ${pkg.name}`);
-          return tools.runScript(`ng lint ${pkg.name}`);
+
+          if (build && pkg.msteamsActive) {
+            let args = ['--max_old_space_size=8096', ng, 'lint', pkg.name];
+            return tools.runNodeScriptProcessOutput(args, pkg.paths.root);
+
+          } else {
+            return tools.runScript(`ng lint ${pkg.name}`);
+          }
+
         } else {
           tools.logError(`No ESLint or TSLint configuration found for the project`);
         }
@@ -59,10 +69,17 @@ module.exports.build = (pkg, isMaster) => {
 
       if (!skipTest) {
         tools.logInfo('Testing...');
+
         let args = ['--max_old_space_size=8096', ng, 'test', pkg.name];
         args.push('--code-coverage');
         tools.logInfo(`running ng test : with args: ${args} on folder : ${pkg.paths.root}`);
-        return execa('node', args, { cwd: pkg.paths.root, stdio: 'inherit' });
+
+        if (build && pkg.msteamsActive) {
+          return tools.runNodeScriptProcessOutput(args, pkg.paths.root);
+
+        } else {
+          return execa('node', args, { cwd: pkg.paths.root, stdio: 'inherit' });
+        }
       }
     })
     .then(() => {
@@ -74,7 +91,13 @@ module.exports.build = (pkg, isMaster) => {
         let args = ['--max_old_space_size=8096', ng, 'build', pkg.name];
 
         tools.logInfo(`running ng build : with args: ${args} on folder : ${pkg.paths.root}`);
-        return execa('node', args, { cwd: pkg.paths.root, stdio: 'inherit' });
+
+        if (build && pkg.msteamsActive) {
+          return tools.runNodeScriptProcessOutput(args, pkg.paths.root);
+
+        } else {
+          return execa('node', args, { cwd: pkg.paths.root, stdio: 'inherit' });
+        }
       }
     })
     .then(() => {

package/scripts/utils/git-utils.js

@@ -11,7 +11,7 @@ const { getPackageConfig } = require('./notification/config');
 // const versionUtils = require('./version-utils');
 
 // FETCH ARGS
-const { dryRun, git, debug } = tools.getArgs();
+const { dryRun, git, debug, build } = tools.getArgs();
 
 
 const getLastTag = (folder) => {
@@ -298,6 +298,9 @@ const cloneRepo = (repoUri, folder, forced = false, shallow = false, externalRep
       tools.logSuccess();
     })
     .catch((e) => {
+      if (!build) {
+        console.log(e);
+      }
       throw new Error(`Error trying to clone ${repoUri} into ${folder}`);
     })
 }
@@ -334,6 +337,9 @@ const checkout = (branch, folder, shallow = false) => {
         });
     })
     .catch((e) => {
+      if (!build) {
+        console.log(e);
+      }
       throw new Error(`Error trying to checkout ${branch} on ${folder}`);
     })
 }

package/scripts/utils/notification/common.js

@@ -89,9 +89,18 @@ module.exports.getMessage = (options) => {
 
       default:
         message.detailTitle = 'GENERAL ERROR!';
-        try {
-          message.detailTextArray = options.exception.stack.split('\n');
-        } catch (e) {};
+        if (options.exception.stderr) {
+          try {
+            message.detailTextArray = options.exception.stderr.split('\n');
+            if (options.exception.stdout) {
+              message.detailTextArray = [...message.detailTextArray, ...options.exception.stdout.split('\n')];
+            }
+          } catch (e) {}
+        } else {
+          try {
+            message.detailTextArray = options.exception.stack.split('\n');
+          } catch (e) {};
+        }
     };
 
     message.detailText = message.detailTextArray.join('\n');

package/scripts/utils/notification/package.js

@@ -12,7 +12,7 @@ const innerConfig = require('./config');
 const innerMessageStack = require('./message-stack');
 
 // ARGS
-const { debug } = tools.getArgs();
+const { debug, debugNotification} = tools.getArgs();
 
 
 module.exports.sendPackageMessage = (options) => {
@@ -20,7 +20,7 @@ module.exports.sendPackageMessage = (options) => {
 
   const message = innerCommon.getMessage(options);
 
-  if (debug) {
+  if (debug && debugNotification) {
     tools.logInfo('Message content :');
     console.log(message);
   }

package/scripts/utils/notification/project.js

@@ -12,7 +12,7 @@ const innerConfig = require('./config');
 const innerMessageStack = require('./message-stack');
 
 // ARGS
-const { debug } = tools.getArgs();
+const { debug, debugNotification } = tools.getArgs();
 
 
 module.exports.sendProjectMessage = (options) => {
@@ -21,7 +21,7 @@ module.exports.sendProjectMessage = (options) => {
 
   const message = innerCommon.getMessage(options);
 
-  if (debug) {
+  if (debug && debugNotification) {
     tools.logInfo('Message content :');
     console.log(message);
   }

package/scripts/utils/notification/slack-utils.js

@@ -9,7 +9,7 @@ const HttpsProxyAgent = require('https-proxy-agent');
 const tools = require('../tools');
 
 // FETCH COMMAND-LINE ARGS
-let { dryRun, slackFeedback, debug } = tools.getArgs();
+let { dryRun, slackFeedback, debug, debugNotification } = tools.getArgs();
 
 
 const PROXY = process.env.http_proxy;
@@ -46,7 +46,7 @@ const sendMessageCore = (hook, channel, attachments, text = null) => {
     if (dryRun || !slackFeedback) {
       tools.logInfo('No notifications config found...skipping');
 
-      if (debug) {
+      if (debug && debugNotification) {
         console.log(JSON.stringify(payload, null, 4));
       }
 
@@ -57,7 +57,7 @@ const sendMessageCore = (hook, channel, attachments, text = null) => {
       tools.logInfo(`Slack hook: ${hook}`);
       tools.logInfo(`Slack channel: ${channel}`);
 
-      if (debug) {
+      if (debug && debugNotification) {
         console.log(JSON.stringify(payload, null, 4));
       }
 
@@ -71,7 +71,7 @@ const sendMessageCore = (hook, channel, attachments, text = null) => {
           tools.logInfo('statusCode: ' + res.statusCode);
           tools.logInfo('statusMessage: ' + res.statusMessage);
 
-          if (debug) {
+          if (debug && debugNotification) {
             console.log(util.inspect(res));
           }
         }

package/scripts/utils/notification/teams-utils.js

@@ -6,7 +6,7 @@ const apiUtils = require('../api-utils');
 const configUtils = require('../../csdr/config/config-utils');
 
 // ARGS
-const { dryRun, debug} = tools.getArgs();
+const { dryRun, debug, debugNotification } = tools.getArgs();
 
 
 const getChannelHook = module.exports.getChannelHook = (channelName) => {
@@ -31,8 +31,9 @@ const getChannelHook = module.exports.getChannelHook = (channelName) => {
 const createPayload = (messageContent) => {
   const emojis = {
     rocket: "🚀",
+    warning: "⚠",
     sucess: "✅",
-    failure: "❌"
+    failure: "❌",
   };
 
   const statuses = {
@@ -70,37 +71,76 @@ const createPayload = (messageContent) => {
 
   // set release sections
   const publications = messageContent.buffer.filter(m => m.text !== null && m.text.indexOf(':rocket:') > -1);
+  const stylesReport = messageContent.buffer.filter(m => m.text !== null && m.text.indexOf('STYLES AUDIT REPORT') > -1)[0];
+  const dependenciesReport = messageContent.buffer.filter(m => m.text !== null && m.text.indexOf('Dependencies audit') > -1)[0];
 
-  let sections = publications.map((p) => {
-    return {
-      "activityTitle": version,
-      "facts": [],
-      "activityText": p.text.replace(':rocket:', emojis.rocket).replace('- *VERSION*', '')
-    }
-  });
+  let sections = [];
 
-  if (commitHistory.length > 0) {
+  if (status === statuses.success) {
     sections.push({
       "startGroup": true,
-      "activityTitle": "Commit history since last release tag"
+      "activityTitle": `${emojis.sucess} PACKAGE BUILD SUCCESS !! ${emojis.sucess}`
     });
-    commitHistory.slice(0, 5).forEach((commit) => {
+
+    publications.forEach((p) => {
       sections.push({
-        "activityText": commit
+        "activityTitle": `package published : ${version}`,
+        "facts": [],
+        "activityText": p.text.replace(':rocket:', emojis.rocket).replace('- *VERSION*', '')
       });
     });
-  }
 
-  if (exceptionDetails.length > 0) {
-    sections.push({
-      "startGroup": true,
-      "activityTitle": finalMessage.detailTitle
-    });
-    exceptionDetails.slice(0, 2).forEach((exd) => {
+    if (dependenciesReport && dependenciesReport.text) {
+      sections.push({
+        "startGroup": true,
+        "activityTitle": "Dependencies vulnerabilities audit",
+        "activityText": dependenciesReport.text.replace('"Dependencies audit detected vulnerabilities :', ''),
+      });
+    }
+
+    if (stylesReport && stylesReport.text) {
+      let stylesReportCleanup;
+      stylesReportCleanup = tools.replaceAll(stylesReport.text, ':no_entry:', `${emojis.failure} - INVALID : `);
+      stylesReportCleanup = tools.replaceAll(stylesReportCleanup, ':large_green_circle:', `${emojis.sucess} - OK : `);
+      stylesReportCleanup = tools.replaceAll(stylesReportCleanup, ':warning:',  `${emojis.warning} - WARNING : `);
+      stylesReportCleanup = tools.replaceAll(stylesReportCleanup, '\n', '\n\n');
+
       sections.push({
-        "activityText": exd
+        "startGroup": true,
+        "activityTitle": "Styles report",
+        "activityText": stylesReportCleanup
       });
+    }
+
+    if (commitHistory.length > 0) {
+      sections.push({
+        "activityTitle": "Commit history since last release tag",
+        "activityText": commitHistory.slice(0, 25).join(' --- ').substr(0, 7500)
+      });
+    }
+
+
+
+  } else {
+    sections.push({
+      "startGroup": true,
+      "activityTitle": `${emojis.failure} PACKAGE BUILD ERROR !! ${emojis.failure}`,
     });
+
+    if (exceptionDetails.length > 0) {
+      if (finalMessage.detailText) {
+        let exceptionCleanup;
+        exceptionCleanup = tools.replaceAll(finalMessage.detailText.substr(0, 7500), '\r', '');
+        exceptionCleanup = tools.replaceAll(exceptionCleanup, '\n', ' ---- ');
+        exceptionCleanup = tools.replaceAll(exceptionCleanup, '~', '');
+        exceptionCleanup = tools.replaceAll(exceptionCleanup, '--', '');
+
+        sections.push({
+          "activityTitle": `${finalMessage.detailTitle}`,
+          "activityText": exceptionCleanup,
+        });
+      }
+    }
   }
 
   sections.push({
@@ -136,7 +176,7 @@ module.exports.sendMessage = (config, messageContent) => {
 
   const payload = createPayload(messageContent);
 
-  if (debug) {
+  if (debug && debugNotification) {
     console.log(JSON.stringify(messageContent, null, 2));
     console.log(JSON.parse(JSON.stringify(payload, null, 2)));
   }

package/scripts/utils/tools.js

@@ -39,6 +39,14 @@ function runScript(_args, cwdFolder) {
     });
 }
 
+async function runNodeScriptProcessOutput(_args, cwdFolder) {
+  const { error, stdout, stderr } = await execa('node', _args, { cwd: cwdFolder });
+
+  return {
+    error, stdout, stderr
+  };
+}
+
 function getPackages(rootFolder) {
     if (!rootFolder) {
         rootFolder = 'src/packages';
@@ -817,6 +825,7 @@ module.exports.remove = remove;
 module.exports.move = move;
 module.exports.getPackages = getPackages;
 module.exports.runScript = runScript;
+module.exports.runNodeScriptProcessOutput = runNodeScriptProcessOutput;
 module.exports.writeJsonFile = writeJsonFile;
 module.exports.writeJsonFileSync = writeJsonFileSync;
 module.exports.getJsonFileContent = getJsonFileContent;