@eui/tools 6.3.44 → 6.3.46

package/.version.properties

@@ -1 +1 @@
-6.3.44
+6.3.46

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 6.3.46 (2023-02-21)
+
+##### Chores
+
+* **other:**
+  * added block container for dynamically handle conditional block generation for v15 remotes - MWP-9204 [MWP-9204](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-9204)  ([63126feb](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/63126feb485893f0092fc5fa9e85fe7a5215678a))
+
+* * *
+* * *
+## 6.3.45 (2023-02-21)
+
+##### Chores
+
+* **other:**
+  * addition of "," for DynamicFormsModule.forRoot(dynMapConfig) metadata MWP-9235 [MWP-9235](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-9235)  ([89050e1b](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/89050e1bf83297c559da2eb875443caff84b5f0c))
+
+* * *
+* * *
 ## 6.3.44 (2023-02-21)
 
 ##### Chores

package/package.json

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

package/scripts/csdr/init/remotes/15.x/full/options/participant/app/module.component.ts

@@ -17,7 +17,7 @@ enum ElementStatus {
             <div style="height: 100%"></div>
         </eui-block-content>
         <ng-container *ngIf="moduleStatus === ElementStatus.Loaded">
-            <@block.container.name@ [block]="block"></@block.container.name@>
+            <!-- BLOCK_CONTAINER_PLACEHOLDER -->
         </ng-container>
         <ng-container *ngIf="moduleStatus === ElementStatus.Error">
             <div class="error-container">

package/scripts/csdr/init/remotes.js

@@ -211,17 +211,28 @@ module.exports.generateVirtualRemote = (remoteName, cloneRemote = true) => {
           if (remote.skeletonConfig.options.participant) {
             tools.copy(optionParticipantPath, remoteSrcPath);
             pushContent(optionParticipantDef);
-          }
 
-          if (remote.skeletonConfig.options.participant) {
-            tools.replaceInPath(remoteSrcPath, '@block.container.name@', remote.skeletonConfig.blockContainerName);
+            let blockContainerPlaceholder = '';
+            if (remote.skeletonConfig.blockContainerName) {
+              blockContainerPlaceholder = `<${remote.skeletonConfig.blockContainerName} [block]="block"></${remote.skeletonConfig.blockContainerName}>`;
+            }
+            if (remote.skeletonConfig.blockContainerTypes) {
+              remote.skeletonConfig.blockContainerTypes.forEach((bc) => {
+                blockContainerPlaceholder += `
+                  <ng-container *ngIf="${bc.condition}">
+                      <${bc.name} [block]="block"></${bc.name}>
+                  </ng-container>
+                `;
+              });
+            }
+            tools.replaceInPath(remoteSrcPath, '<!-- BLOCK_CONTAINER_PLACEHOLDER -->', blockContainerPlaceholder);
           }
         }
 
         // 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, '// DEFINITIONS', `${definitionsContent.join() ? 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'));