@eui/tools 6.3.40 → 6.3.41

package/.version.properties

@@ -1 +1 @@
-6.3.40
+6.3.41

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 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.41",
     "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);