@eui/tools 6.12.28 → 6.12.29

package/.version.properties

@@ -1 +1 @@
-6.12.28
+6.12.29

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 6.12.29 (2023-07-19)
+
+##### Bug Fixes
+
+* **other:**
+  * stats and lock custom install for v16 remotes - EUI-7121 [EUI-7121](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-7121)  ([a4736428](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/a4736428e3c4d843c67a58608a3c4818e37a980d))
+
+* * *
+* * *
 ## 6.12.28 (2023-07-19)
 
 ##### Chores

package/package.json

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

package/scripts/app/public/index.html

@@ -44,7 +44,7 @@
                                 <label class="col-sm-2 col-form-label">eUI Version</label>
                                 <div class="col-sm-10">
                                     <select dis abled class="form-select" v-model="selectedEuiVersion">
-                                        <option value="15.x">eUI 15</option>
+                                        <option value="16.x">eUI 16</option>
                                     </select>
                                 </div>
                             </div>

package/scripts/app/public/index.js

@@ -13,7 +13,7 @@ new Vue({
     data() {
         return {
             selectedProject: "my-workplace-host-playground-custom",
-            selectedEuiVersion: "15.x",
+            selectedEuiVersion: "16.x",
             remotes: [],
             selectedRemotes: [],
             selectedInstalledRemotes: [],
@@ -29,7 +29,7 @@ new Vue({
     },
     methods: {
         async getRemotes() {
-            const res = await fetch("http://localhost:3000/api/remotes");
+            const res = await fetch("http://localhost:3000/api/remotesForConfig");
             const finalRes = await res.json();
             this.remotes = finalRes;
         },

package/scripts/app/routes/index.js

@@ -17,7 +17,38 @@ const handlerError = (res, e) => {
 router.get('/remotes', function (req, res) {
   return Promise.resolve()
     .then(() => {
-      return configUtils.remotes.getCsdrRemotesArray('my-workplace', '15.x');
+      return [
+      ...configUtils.remotes.getCsdrRemotesArray('my-workplace', '15.x'),
+      ...configUtils.remotes.getCsdrRemotesArray('my-workplace', '16.x'),
+      ];
+    })
+    .then((fetchedRemotes) => {
+      let remotes = tools.sortArray(fetchedRemotes, 'name');
+      remotes = remotes.filter((r) => {
+        let participant = false;
+        if (r.fullSkeletonSources) {
+          if (r.skeletonConfig.options && r.skeletonConfig.options.participant) {
+            participant = true;
+          }
+        }
+
+        if (r.fullSkeletonSources && !participant) {
+          return true;
+        }
+      })
+      res.send(remotes);
+    })
+    .catch((e) => {
+      handlerError(res, e);
+    })
+});
+
+router.get('/remotesForConfig', function (req, res) {
+  return Promise.resolve()
+    .then(() => {
+      return [
+      ...configUtils.remotes.getCsdrRemotesArray('my-workplace', '16.x'),
+      ];
     })
     .then((fetchedRemotes) => {
       let remotes = tools.sortArray(fetchedRemotes, 'name');

package/scripts/csdr/metadata/stats.js

@@ -466,33 +466,39 @@ module.exports.getRemoteAllStats = () => {
       }
     })
     .then(() => {
-      let remotesArray = configUtils.remotes.getCsdrRemotesArray('my-workplace', '15.x');
+      let remotesArray = [
+        ...configUtils.remotes.getCsdrRemotesArray('my-workplace', '16.x'),
+        ...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;
-          versionsCountEnvs['TST'] = versionsMatadata.versions.filter(v => v.envTarget === 'TST').length;
-          versionsCountEnvs['INT'] = versionsMatadata.versions.filter(v => v.envTarget === 'INT').length;
-          versionsCountEnvs['ACC'] = versionsMatadata.versions.filter(v => v.envTarget === 'ACC').length;
-          versionsCountEnvs['TRN'] = versionsMatadata.versions.filter(v => v.envTarget === 'TRN').length;
-          versionsCountEnvs['PROD'] = versionsMatadata.versions.filter(v => v.envTarget === 'PROD').length;
-          lastVersion = versionsMatadata.versions.slice(-1).pop();
-        }
-        const remoteStats = {
-          name: r.name,
-          // versions: versionsMatadata.versions,
-          lastVersion,
-          summary: {
-            versionsCount,
-            versionsCountEnvs
+        try {
+          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;
+            versionsCountEnvs['TST'] = versionsMatadata.versions.filter(v => v.envTarget === 'TST').length;
+            versionsCountEnvs['INT'] = versionsMatadata.versions.filter(v => v.envTarget === 'INT').length;
+            versionsCountEnvs['ACC'] = versionsMatadata.versions.filter(v => v.envTarget === 'ACC').length;
+            versionsCountEnvs['TRN'] = versionsMatadata.versions.filter(v => v.envTarget === 'TRN').length;
+            versionsCountEnvs['PROD'] = versionsMatadata.versions.filter(v => v.envTarget === 'PROD').length;
+            lastVersion = versionsMatadata.versions.slice(-1).pop();
           }
-        }
-        stats.push(remoteStats);
+          const remoteStats = {
+            name: r.name,
+            // versions: versionsMatadata.versions,
+            lastVersion,
+            summary: {
+              versionsCount,
+              versionsCountEnvs
+            }
+          }
+          stats.push(remoteStats);
+        } catch(e) {}
       })
     })
     .then(() => {