@eui/tools 6.3.35 → 6.3.37

package/.version.properties

@@ -1 +1 @@
-6.3.35
+6.3.37

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 6.3.37 (2023-02-17)
+
+##### Chores
+
+* **other:**
+  * added dynamic forms for full remote skeleton injection - MWP-9204 [MWP-9204](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-9204)  ([22d0cd8a](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/22d0cd8adbde4fd2422eb73bfd99e4c30dfa8736))
+
+* * *
+* * *
+## 6.3.36 (2023-02-15)
+
+##### Bug Fixes
+
+* **other:**
+  * remotes initialisation issues - MWP-9204 [MWP-9204](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-9204)  ([bac59a6c](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/bac59a6c5e1b9329d01373b5cee1be1c8b613d3b))
+
+* * *
+* * *
 ## 6.3.35 (2023-02-15)
 
 ##### Bug Fixes

package/package.json

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

package/sandbox.js

@@ -1134,18 +1134,6 @@ const versionUtils = require('./scripts/csdr/version/version-utils');
 //     console.log(e);
 //   })
 
-// const prj = configUtils.projects.getCsdrProject('my-workplace-host-playground');
-
-// Promise.resolve()
-//   .then(() => {
-//     return installUtils.projects.getLocalProjectRemoteDeps(prj);
-//   })
-//   .then((deps) => {
-//     return installUtils.projects.importLocalProjectRemotes(prj, deps);
-//   })
-//   .then(() => {
-//   })
-
 
 // Promise.resolve()
 //   .then(() => {
@@ -1165,11 +1153,31 @@ const versionUtils = require('./scripts/csdr/version/version-utils');
 //   .then(() => {
 //     console.log('ok');
 //   })
+// Promise.resolve()
+//   .then(() => {
+//     const pkg = configUtils.packages.getPackage('mywp-eusearch-eui10-remote-el-ui');
+//     const euiVersion = configUtils.packages.getPackageEuiVersion(pkg, true);
+//     console.log(euiVersion);
+//   })
+// Promise.resolve()
+//   .then(() => {
+//     // const packages = configUtils.packages.getCsdrPackages();
+//     // console.log(packages);
+//     const remotes = configUtils.remotes.getCsdrRemotes();
+//     console.log(remotes);
+//   })
+
+const prj = configUtils.projects.getCsdrProject('my-workplace-host-playground');
+
+
 Promise.resolve()
   .then(() => {
-    const pkg = configUtils.packages.getPackage('mywp-eusearch-eui10-remote-el-ui');
-    const euiVersion = configUtils.packages.getPackageEuiVersion(pkg, true);
-    console.log(euiVersion);
+    return installUtils.projects.getLocalProjectRemoteDeps(prj);
+  })
+  .then((deps) => {
+    return installUtils.projects.importLocalProjectRemotes(prj, deps);
+  })
+  .then(() => {
   })
 
 

package/scripts/csdr/config/init.js

@@ -27,7 +27,7 @@ module.exports.run = (args) => {
       }
 
       if (args.remote) {
-        const remote = innerRemotes.getRemote(args.remote);
+        const remote = innerRemotes.getCsdrRemotes()[args.remote];
         if (remote) {
           remotes.push(args.remote);
         }

package/scripts/csdr/config/remotes.js

@@ -91,24 +91,35 @@ module.exports.getCsdrRemotes = (hostName, euiVersion) => {
   }
 
   const remotesConfig = require(path.join(process.cwd(), '.csdr', '.euirc-csdr-remotes.json'));
-  const remotesArray = Object.keys(remotesConfig).map((r) => {
+  let remotesArray = Object.keys(remotesConfig).map((r) => {
     const remote = remotesConfig[r];
     remote.name = r;
     return remote;
   });
 
-  let outRemotes = remotesArray;
-
   if (hostName) {
-    outRemotes = outRemotes.filter(r => hostNameFilterFn(r));
+    remotesArray = remotesArray.filter(r => hostNameFilterFn(r));
   }
   if (euiVersion) {
-    outRemotes = outRemotes.filter(r => r.euiVersion === euiVersion);
+    remotesArray = remotesArray.filter(r => r.euiVersion === euiVersion);
   }
 
+  const outRemotes = {};
+  remotesArray.forEach((r) => {
+    outRemotes[r.name] = r;
+  })
+
   return outRemotes;
 }
 
+module.exports.getCsdrRemotesArray = (hostName, euiVersion) => {
+  const remotes = this.getCsdrRemotes(hostName, euiVersion);
+
+  return Object.keys(remotes).map((r) => {
+    return remotes[r];
+  })
+}
+
 
 module.exports.getRemotes = () => {
   const remotes = innerGlobal.getConfig().remotes;
@@ -125,7 +136,7 @@ module.exports.getRemoteByNpmPkg = (npmPkg, fromCsdrConfig) => {
   let remotes;
 
   if (fromCsdrConfig) {
-    remotes = this.getCsdrRemotes();
+    remotes = this.getCsdrRemotesArray();
 
   } else {
     remotes = this.getRemotes();

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

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

package/scripts/csdr/init/remotes.js

@@ -146,6 +146,7 @@ module.exports.generateVirtualRemote = (remoteName, cloneRemote = true) => {
         const optionZipkinDef = tools.getJsonFileContent(path.join(fullOptionsPath, 'definitions', 'zipkin.json'));
         const optionDynatraceDef = tools.getJsonFileContent(path.join(fullOptionsPath, 'definitions', 'dynatrace.json'));
         const optionParticipantDef = tools.getJsonFileContent(path.join(fullOptionsPath, 'definitions', 'participant.json'));
+        const optionDynamicFormsDef = tools.getJsonFileContent(path.join(fullOptionsPath, 'definitions', 'dynamic-forms.json'));
 
         tools.logInfo(`copying full sources skeleton : ${fullCommonPath} ==> ${remoteSrcPath}`);
         tools.copy(fullCommonPath, remoteSrcPath);
@@ -185,6 +186,11 @@ module.exports.generateVirtualRemote = (remoteName, cloneRemote = true) => {
             pushContent(optionDynatraceDef);
           }
 
+          // dynamic-forms
+          if (remote.skeletonConfig.options.dynamicForms) {
+            pushContent(optionDynamicFormsDef);
+          }
+
           // participant
           if (remote.skeletonConfig.options.participant) {
             tools.copy(optionParticipantPath, remoteSrcPath);

package/scripts/csdr/install/projects.js

@@ -194,7 +194,7 @@ const getLocalProjectRemoteDeps = module.exports.getLocalProjectRemoteDeps = (pr
     tools.logTitle(`Detecting remotes deps for project : ${prj.name}`);
 
     const euiVersion = configUtils.global.getLocalEuiVersion();
-    const remotes = configUtils.remotes.getCsdrRemotes(prj.hostName, euiVersion);
+    const remotes = configUtils.remotes.getCsdrRemotesArray(prj.hostName, euiVersion);
 
     let remoteDeps = {};
     remotes