@eui/tools 6.5.3 → 6.5.4

package/.version.properties

@@ -1 +1 @@
-6.5.3
+6.5.4

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 6.5.4 (2023-03-03)
+
+##### Chores
+
+* **other:**
+  * improved csdr-app and stats - EUI-7146 [EUI-7146](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-7146)  ([648274da](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/648274da492b560e6447e65812ef345d5dc00d9d))
+
+* * *
+* * *
 ## 6.5.3 (2023-03-02)
 
 ##### Chores

package/bin/eui-scripts.js

@@ -30,6 +30,7 @@ const scriptIndex = args.findIndex(
     x === 'generate-translations' ||
     x === 'test-package' ||
     x === 'csdr-app' ||
+    x === 'csdr-app-stats' ||
     x === 'csdr-init' ||
     x === 'csdr-upgrade-deps' ||
     x === 'csdr-serve-app' ||
@@ -74,6 +75,7 @@ switch (script) {
     case 'test-package':
     case 'generate-translations':
     case 'csdr-app':
+    case 'csdr-app-stats':
     case 'csdr-init':
     case 'csdr-upgrade-deps':
     case 'csdr-serve-app':

package/bin/scripts/csdr-app-stats.js

@@ -0,0 +1,16 @@
+'use strict';
+
+const tools = require('../../scripts/utils/tools');
+const initUtils = require('../../scripts/csdr/init/init-utils');
+
+Promise.resolve()
+  .then(() => {
+    return initUtils.remotes.initRemotesConfig();
+  })
+  .then(() => {
+    return tools.runScript('node ./node_modules/@eui/tools/scripts/app/server.js --prod --stats');
+  })
+  .catch((e) => {
+    console.log(e);
+    process.exit(1);
+  })

package/bin/scripts/csdr-app.js

@@ -1,10 +1,14 @@
 'use strict';
 
 const tools = require('../../scripts/utils/tools');
+const initUtils = require('../../scripts/csdr/init/init-utils');
 
 Promise.resolve()
   .then(() => {
-    return tools.runScript('node ./packages/eui-tools/scripts/app/server.js --prod');
+    return initUtils.remotes.initRemotesConfig();
+  })
+  .then(() => {
+    return tools.runScript('node ./node_modules/@eui/tools/scripts/app/server.js --prod');
   })
   .catch((e) => {
     console.log(e);

package/package.json

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

package/sandbox.js

@@ -1214,5 +1214,9 @@ const versionUtils = require('./scripts/csdr/version/version-utils');
 
 Promise.resolve()
   .then(() => {
-    return initUtils.packages.importScripts();
+    return metadataUtils.stats.getRemoteAllStats();
+  })
+  .then((stats) => {
+    // console.log(stats);
+    console.log(JSON.stringify(stats, null, 2));
   })

package/scripts/app/public/index.html

@@ -67,9 +67,15 @@
                         </form>
                     </div>
                     <div class="body-flex">
-                        <h5 class="mt-2 mb-3">
-                            Select the remote(s) you want to work with:
-                        </h5>
+                        <div class="d-flex align-items-center mt-2">
+                            <h5>Select the remote(s) you want to work with:</h5>
+                            <div class="ms-auto me-2">
+                                <button class="btn btn-light" @click="reset()">
+                                    reset
+                                </button>
+                            </div>
+                        </div>
+
                         <p class="text-warning fw-bold">
                             select at least one remote to work on
                         </p>
@@ -161,18 +167,28 @@
                         Save configuration
                     </button>
 
-                    <div class="alert alert-info mt-2">
-                        <p>
-                            Saving the configuration will generate a file called
-                            <span class="fw-bold"
-                                >./csdr/.euirc-csdr-custom.json</span
-                            >
-                        </p>
-                        <p>
-                            Execute after the
-                            <strong>npm run init -- --custom</strong> from your
-                            command line to follow progress of installation
-                        </p>
+                    <div v-if="saveConfigSubmitted" class="mt-2">
+                        <div v-if="saveConfigOK" class="alert alert-success">
+                            Configuration successfully saved
+                        </div>
+                        <div v-if="!saveConfigOK" class="alert alert-danger">
+                            Error saving configuration
+                        </div>
+
+                        <div class="alert alert-info mt-2">
+                            <p>
+                                <span class="fw-bold"
+                                    >./csdr/.euirc-csdr-custom.json</span
+                                >
+                                generated
+                            </p>
+                            <p>
+                                Execute after the
+                                <strong>npm run init -- --custom</strong> from
+                                your command line to follow progress of
+                                installation
+                            </p>
+                        </div>
                     </div>
                 </div>
             </div>
@@ -199,6 +215,8 @@
                     deps: [],
                     packages: [],
                     remotesToInstall: [],
+                    saveConfigSubmitted: false,
+                    saveConfigOK: false,
                 };
             },
             created() {
@@ -215,9 +233,7 @@
                     this.getRemotesToInstall();
                 },
                 async getConfig() {
-                    const res = await fetch(
-                        "http://localhost:3000/api/config"
-                    );
+                    const res = await fetch("http://localhost:3000/api/config");
                     const finalRes = await res.json();
                     if (finalRes.selectedRemotes) {
                         this.selectedRemotes = finalRes.selectedRemotes;
@@ -243,6 +259,7 @@
                 },
                 remoteSelected(event) {
                     this.getPackages();
+                    this.saveConfigSubmitted = false;
                 },
                 getRemotesToInstall() {
                     this.remotesToInstall = this.remotes
@@ -251,17 +268,33 @@
                             return !this.selectedRemotes.includes(r);
                         });
                 },
+                reset() {
+                    this.selectedRemotes = [];
+                    this.packages = [];
+                    this.deps = [];
+                    this.remotesToInstall = [];
+                    this.saveConfigOK = false;
+                    this.saveConfigSubmitted = false;
+                },
                 async saveConfig() {
-                    console.log('Saving configuration...');
+                    console.log("Saving configuration...");
                     const res = await fetch(
                         "http://localhost:3000/api/config",
                         getRequestBody({
                             selectedRemotes: this.selectedRemotes,
                             deps: this.deps,
                             packages: this.packages,
-                            remotesToInstall: this.remotesToInstall
+                            remotesToInstall: this.remotesToInstall,
                         })
                     );
+
+                    if (res.status !== 200) {
+                        this.saveConfigOK = false;
+                    } else {
+                        this.saveConfigOK = true;
+                    }
+                    this.saveConfigSubmitted = true;
+
                     const finalRes = await res.json();
                 },
             },

package/scripts/app/public/stats.html

@@ -14,6 +14,10 @@
                 flex-direction: column;
                 height: 100vh;
             }
+            .header-flex {
+                display: flex;
+                flex-direction: column;
+            }
             .body-flex {
                 display: flex;
                 flex-direction: column;
@@ -24,11 +28,27 @@
 
     <body>
         <div id="app" class="container-fluid">
+
+
+
             <div class="row">
                 <div class="col-4 full-height-flex">
-                    <h3 class="mt-2 mb-4">CSDR remotes stats</h3>
-                    <div class="body-flex">
-                        <h5 class="mt-2 mb-3">Select a remote:</h5>
+                    <div class="header-flex">
+                        <h3 class="mt-2 mb-4">CSDR remotes stats</h3>
+
+                        <div class="d-flex">
+                            <button class="btn me-3" :class="{ 'btn-warning': allRemotesStats }" @click="changeStatsType(true)">
+                                All remotes stats
+                            </button>
+
+                            <button class="btn me-3" :class="{ 'btn-warning': !allRemotesStats }" @click="changeStatsType(false)">
+                                Single remote stats
+                            </button>
+                        </div>
+                    </div>
+
+                    <div class="body-flex" v-if="!allRemotesStats">
+                        <h5 class="mt-3 mb-3">Select a remote:</h5>
                         <table
                             class="table table-striped"
                             v-show="remotes.length !== 0">
@@ -75,12 +95,42 @@
                 </div>
 
                 <div class="col-8">
-                    <h5 class="mt-5 mb-3">
-                        Selected remote : {{ selectedRemotes }}
-                    </h5>
-                    <div class="d-none">{{ remoteStats.versions }}</div>
-                    <div style="height: 250px">
-                        <canvas id="versions"></canvas>
+                    <div v-if="!allRemotesStats">
+                        <h5 class="mt-5 mb-3">
+                            Selected remote : {{ selectedRemotes }}
+                        </h5>
+                        <div class="d-none">{{ remoteStats.versions }}</div>
+                        <div style="height: 250px">
+                            <canvas id="versions"></canvas>
+                        </div>
+                    </div>
+
+                    <div v-if="allRemotesStats">
+                        <h5 class="mt-5 mb-3">
+                            Remotes stats per env
+                        </h5>
+                        <table class="table table-default table-sm">
+                            <thead>
+                                <th>Remotes</th>
+                                <th style="width: 5rem;">Total</th>
+                                <th style="width: 5rem;">DEV</th>
+                                <th style="width: 5rem;">TST</th>
+                                <th style="width: 5rem;">INT</th>
+                                <th style="width: 5rem;">ACC</th>
+                                <th style="width: 5rem;">TRN</th>
+                                <th style="width: 5rem;">PROD</th>
+                            </thead>
+                            <tr v-for="remote in remoteAllStats">
+                                <td>{{ remote.name }}</td>
+                                <td :class="{ 'table-danger': remote.summary.versionsCount === 0 }">{{ remote.summary.versionsCount }}</td>
+                                <td>{{ remote.summary.versionsCountEnvs.DEV }}</td>
+                                <td>{{ remote.summary.versionsCountEnvs.TST }}</td>
+                                <td>{{ remote.summary.versionsCountEnvs.INT }}</td>
+                                <td>{{ remote.summary.versionsCountEnvs.ACC }}</td>
+                                <td>{{ remote.summary.versionsCountEnvs.TRN }}</td>
+                                <td>{{ remote.summary.versionsCountEnvs.PROD }}</td>
+                            </tr>
+                        </table>
                     </div>
                 </div>
             </div>
@@ -102,15 +152,21 @@
             el: "#app",
             data() {
                 return {
+                    allRemotesStats: true,
                     remotes: [],
                     selectedRemotes: [],
                     remoteStats: {},
+                    remoteAllStats: {}
                 };
             },
             created() {
                 this.getRemotes();
+                this.getRemoteAllStats();
             },
             methods: {
+                changeStatsType(value) {
+                    this.allRemotesStats = value;
+                },
                 async getRemotes() {
                     const res = await fetch(
                         "http://localhost:3000/api/remotes"
@@ -118,8 +174,14 @@
                     const finalRes = await res.json();
                     this.remotes = finalRes;
                 },
+                async getRemoteAllStats() {
+                    const res = await fetch(
+                        "http://localhost:3000/api/remotes/stats"
+                    );
+                    const finalRes = await res.json();
+                    this.remoteAllStats = finalRes.stats;
+                },
                 remoteSelected(event) {
-                    console.log(this.selectedRemotes);
                     this.getRemoteStats();
                 },
                 async getRemoteStats() {

package/scripts/app/routes/index.js

@@ -33,6 +33,19 @@ router.get('/remotes', function (req, res) {
     })
 });
 
+router.get('/remotes/stats', function (req, res) {
+  return Promise.resolve()
+    .then(() => {
+      return metadataUtils.stats.getRemoteAllStats();
+    })
+    .then((stats) => {
+      res.send(stats);
+    })
+    .catch((e) => {
+      console.log(e);
+    })
+});
+
 router.post('/remotes/packages', function (req, res) {
   return Promise.resolve()
     .then(() => {
@@ -45,7 +58,6 @@ router.post('/remotes/packages', function (req, res) {
     })
 });
 
-
 router.post('/remotes/stats', function (req, res) {
   return Promise.resolve()
     .then(() => {
@@ -80,6 +92,9 @@ router.post('/config', function (req, res) {
     .then(() => {
       return configUtils.global.generateCustomConfig(req.body);
     })
+    .then(() => {
+      res.send({ status: 'OK'})
+    })
     .catch((e) => {
       console.log(e);
     })

package/scripts/csdr/cli/constants.js

@@ -36,11 +36,11 @@ module.exports.DEFAULT_CONFIG = {
   pkgFrontendVersion: this.CONFIG_OPTIONS.pkgFrontendVersion.EUI10,
   pkgName: 'my-package',
   pkgScope: '@zzz',
-  isRouteModule: true,
+  isRouteModule: false,
   isCsdrRepo: true,
-  isEnvTargetRemote: false,
-  isVirtualRemote: false,
-  isFullVirtualRemote: false,
+  isEnvTargetRemote: true,
+  isVirtualRemote: true,
+  isFullVirtualRemote: true,
   externalRepoName: null,
   pkgGroupId: 'eu.europa.ec.cc'
 };

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

@@ -81,7 +81,7 @@ module.exports.prompt = () => {
           message: 'Select eUI version target :',
           choices: [
             { name: 'v10', value: constants.CONFIG_OPTIONS.pkgFrontendVersion.EUI10 },
-            { name: 'v13', value: constants.CONFIG_OPTIONS.pkgFrontendVersion.EUI13 },
+            // { name: 'v13', value: constants.CONFIG_OPTIONS.pkgFrontendVersion.EUI13 },
             { name: 'v15', value: constants.CONFIG_OPTIONS.pkgFrontendVersion.EUI15 },
           ],
           default: constants.DEFAULT_CONFIG.pkgFrontendType,
@@ -114,49 +114,55 @@ module.exports.prompt = () => {
           message: 'Enter the package name :',
           default: constants.DEFAULT_CONFIG.pkgName
         },
+        // {
+        //   name: 'isRouteModule',
+        //   type: 'confirm',
+        //   message: 'Is this a ROUTE package ?',
+        //   default: constants.DEFAULT_CONFIG.isRouteModule,
+        //   when: function (answers) {
+        //     return (
+        //       answers.pkgType === constants.CONFIG_OPTIONS.pkgType.FRONTEND &&
+        //       answers.pkgFrontendType !== constants.CONFIG_OPTIONS.pkgFrontendType.REMOTE
+        //     );
+        //   }
+        // },
+        // {
+        //   name: 'isVirtualRemote',
+        //   type: 'confirm',
+        //   message: 'Is this a virtual remote ?',
+        //   default: constants.DEFAULT_CONFIG.isVirtualRemote,
+        //   when: function (answers) {
+        //     return (
+        //       answers.pkgType === constants.CONFIG_OPTIONS.pkgType.FRONTEND &&
+        //       answers.pkgFrontendType === constants.CONFIG_OPTIONS.pkgFrontendType.REMOTE &&
+        //       answers.pkgFrontendVersion === constants.CONFIG_OPTIONS.pkgFrontendVersion.EUI10
+        //     );
+        //   }
+        // },
+        // {
+        //   name: 'isFullVirtualRemote',
+        //   type: 'confirm',
+        //   message: 'Is this a virtual remote with full skeleton sources ?',
+        //   default: constants.DEFAULT_CONFIG.isFullVirtualRemote,
+        //   when: function (answers) {
+        //     return (
+        //       answers.pkgType === constants.CONFIG_OPTIONS.pkgType.FRONTEND &&
+        //       answers.pkgFrontendType === constants.CONFIG_OPTIONS.pkgFrontendType.REMOTE
+        //     );
+        //   }
+        // },
         {
-          name: 'isRouteModule',
-          type: 'confirm',
-          message: 'Is this a ROUTE package ?',
-          default: constants.DEFAULT_CONFIG.isRouteModule,
-          when: function (answers) {
-            return (
-              answers.pkgType === constants.CONFIG_OPTIONS.pkgType.FRONTEND &&
-              answers.pkgFrontendType !== constants.CONFIG_OPTIONS.pkgFrontendType.REMOTE
-            );
-          }
-        },
-        {
-          name: 'isVirtualRemote',
-          type: 'confirm',
-          message: 'Is this a virtual remote ?',
-          default: constants.DEFAULT_CONFIG.isVirtualRemote,
-          when: function (answers) {
-            return (
-              answers.pkgType === constants.CONFIG_OPTIONS.pkgType.FRONTEND &&
-              answers.pkgFrontendType === constants.CONFIG_OPTIONS.pkgFrontendType.REMOTE &&
-              answers.pkgFrontendVersion === constants.CONFIG_OPTIONS.pkgFrontendVersion.EUI10
-            );
-          }
-        },
-        {
-          name: 'isFullVirtualRemote',
+          name: 'isCsdrRepo',
           type: 'confirm',
-          message: 'Is this a virtual remote with full skeleton sources ?',
-          default: constants.DEFAULT_CONFIG.isFullVirtualRemote,
+          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.REMOTE
+              answers.pkgFrontendType === constants.CONFIG_OPTIONS.pkgFrontendType.DEFAULT
             );
           }
         },
-        {
-          name: 'isCsdrRepo',
-          type: 'confirm',
-          message: 'Is the repository within CSDR git project ?',
-          default: constants.DEFAULT_CONFIG.isCsdrRepo
-        },
         {
           name: 'externalRepoName',
           type: 'input',

package/scripts/csdr/init/remotes.js

@@ -13,6 +13,22 @@ const { skipReset } = tools.getArgs();
 
 
 
+module.exports.initRemotesConfig = () => {
+  return Promise.resolve()
+  .then(() => {
+      const pkg = configUtils.packages.getPackageByNpmPkg('@csdr/remotes-config', true);
+
+      if (!tools.isDirExists(pkg.paths.root)) {
+        return cloneRemotesConfig();
+      }
+    })
+
+    .catch((e) => {
+      throw e;
+    })
+}
+
+
 const cloneRemotesConfig = module.exports.cloneRemotesConfig = () => {
 
   tools.logTitle('Cloning global remotes config');

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

@@ -27,7 +27,15 @@ module.exports.getMetadata = (pkg) => {
     })
 }
 
+module.exports.getMetadataSync = (pkg) => {
+  const DEVOPS_METADATA_PATH = configUtils.global.getConfigOptions().DEVOPS_METADATA_PATH;
+
+  if (!DEVOPS_METADATA_PATH) {
+    throw new Error(`Devops metadata folder ${DEVOPS_METADATA_PATH} NOT FOUND`) ;
+  }
 
+  return tools.getJsonFileContent(path.join(DEVOPS_METADATA_PATH, pkg.devopsVersionsMetadataFile));
+}
 
 module.exports.storeMetadata = (pkg, pkgVersion, pkgCompositeDeps, duration, envTarget) => {
   return Promise.resolve()

package/scripts/csdr/metadata/stats.js

@@ -455,6 +455,52 @@ module.exports.getCommitsByUsers = (packages, range = 'ALL') => {
 }
 
 
+module.exports.getRemoteAllStats = () => {
+
+  let stats = [];
+
+  return Promise.resolve()
+    .then(() => {
+      if (!dryRun && !skipClone && !tools.isDirExists(path.join(process.cwd(), 'packages', 'devops-metadata'))) {
+        return metadataUtils.common.cloneMetadataRepo();
+      }
+    })
+    .then(() => {
+      let remotesArray = configUtils.remotes.getCsdrRemotesArray('my-workplace', '15.x');
+      remotesArray = tools.sortArray(remotesArray, 'name');
+
+      remotesArray.forEach((r) => {
+        const remote = configUtils.remotes.getRemote(r.name);
+        const versionsMatadata = metadataUtils.packageVersions.getMetadataSync(remote);
+        let versionsCount = 0, versionsCountEnvs = { "DEV": 0, "TST": 0, "INT": 0, "ACC": 0, "TRN": 0, "PROD": 0}, lastVersion = {};
+        if (versionsMatadata.versions) {
+          versionsCount = versionsMatadata.versions.length;
+          versionsCountEnvs['DEV'] = versionsMatadata.versions.filter(v => v.envTarget === 'DEV').length;
+          lastVersion = versionsMatadata.versions.slice(-1).pop();
+        }
+        const remoteStats = {
+          name: r.name,
+          // versions: versionsMatadata.versions,
+          lastVersion,
+          summary: {
+            versionsCount,
+            versionsCountEnvs
+          }
+        }
+        stats.push(remoteStats);
+      })
+    })
+    .then(() => {
+      return {
+        stats
+      }
+    })
+    .catch((e) => {
+      throw e;
+    })
+}
+
+
 module.exports.getRemoteStats = (remoteName) => {
   const remote = configUtils.remotes.getRemote(remoteName);
 
@@ -476,3 +522,4 @@ module.exports.getRemoteStats = (remoteName) => {
       throw e;
     })
 }
+