@magic-xpa/cli 4.1300.0-dev4130.24 → 4.1300.0-dev4130.240

package/templates/themes/material/radio.ejs

@@ -1,22 +1,39 @@
-<mat-radio-group
-        (change)="task.mgOnRadioSelectionChanged(<%- ctrl.props.enum_id %>)"
-
+<%# Wrap in a row-specific formGroup if this radio control is child of a table %>
+<div <% if (ctrl.props.is_table_child && (typeof ctrl.props.web_style === "undefined" || ctrl.props.web_style === TableWebStyle.MatGrid)) { %>
+  [formGroup]="mg.getFormGroupByRow(row.rowId)"
+  <%}%>
+>
+  <%# Render radio buttons group if in edit mode, otherwise render a static display label %>
+  <% if (ctrl.props.is_table_child) { %>
+  @if (mg.isRowInRowEditing(row)) {
+  <% } %>
+  <mat-radio-group
+        (change)="task.mgOnRadioSelectionChanged(<%- ctrl.props.enum_id %><% if(ctrl.props.is_table_child){ %>, row.rowId<%}%>)"
         <%- include('../../attributes/common/base_attributes', {ctrl : ctrl}) %>
-        <%- include('../../attributes/common/base/id', {ctrl : ctrl}) %>
         <%- include('../../attributes/common/base/formControlName', {ctrl : ctrl}) %>
 
         <% if (ctrl.props.must_input && !ctrl.props.must_input.has_exp) { %>
         required
         <% } %>
->
-    <mat-radio-button
-            *ngFor="let o of mg.getItemListValues(<%- ctrl.props.enum_id %>);"
-            [value] = "o.index"   >
+  >
+  <%# Get the options and display values, passing the row.rowId if it is a table control %>
+    @for (o of mg.getItemListValues(<%- ctrl.props.enum_id %><% if(ctrl.props.is_table_child){ %>, row.rowId<%}%>); track $index) {
+    <mat-radio-button [value] = "o.index"   >
         {{o.displayValue}}
     </mat-radio-button >
+    }
 
-</mat-radio-group>
+  </mat-radio-group>
+  <% if (ctrl.props.is_table_child) { %>
+  }
+  @if (!mg.isRowInRowEditing(row)) {
+  <label <%- include('../../attributes/common/base_attributes', {ctrl : ctrl}) %>>
+      {{ mg.getDisplayValue(<%- ctrl.props.enum_id %>, row.rowId) }}
+  </label>
+  }
+  <% } %>
 
-<% if (ctrl.props.must_input || ctrl.props.validator != null) { %>
-  <mgError [magic]=<%- ctrl.props.directive_id %>> </mgError>
-<% } %>
+  <% if (ctrl.props.must_input || ctrl.props.validator != null) { %>
+    <mgError [magic]=<%- ctrl.props.directive_id %>> </mgError>
+  <% } %>
+</div>

package/templates/themes/material/tab.ejs

@@ -5,13 +5,15 @@
   [selectedIndex]="mg.getTabSelectedIndex(<%- ctrl.props.enum_id %>)"
 >
   <%# extra div to add the tab style%>
-  <mat-tab *ngFor="let o of mg.getItemListValues(<%- ctrl.props.enum_id %>)"
+  @for (o of mg.getItemListValues(<%- ctrl.props.enum_id %>); track $index) {
+  <mat-tab
     <% if (ctrl.props.enabled){ %>
            [disabled]="mg.isDisabled(<%- ctrl.props.enum_id %>)"
     <% } %>
            [label]="mg.getTabpageText(<%- ctrl.props.enum_id %>, o.index)"
   >
   </mat-tab>
+  }
 </mat-tab-group>
 <%# add tab pages after adding the buttons, so the buttons are at the top%>
 <%- include(`../container`, {child: ctrl}) %>

package/templates/themes/table/HTMLTable/table.ejs

@@ -19,8 +19,10 @@
            <% ctrl.children.forEach(child =>{ %>
               <% child.props.no_modifiable_descendants = ctrl.props.no_modifiable_descendants; %>
         <%})} %>
-        <ng-container *ngFor="let row of task.Records.list">
-            <tr *ngIf="mg.ifRowCreated(row) && !mg.isDataviewEmpty()"  id="row"
+        @for (row of task.Records.list; track $index) {
+            <ng-container>
+            @if (mg.ifRowCreated(row) && !mg.isDataviewEmpty()) {
+            <tr id="row"
                 <%if (typeof ctrl.props.no_modifiable_descendants === "undefined") {%>
                    [formGroup]="mg.getFormGroupByRow(row.rowId)"
                 <%}%>
@@ -32,6 +34,8 @@
             >
                 <%- include(`../../container`, {ctrl: ctrl}) %>
             </tr>
-        </ng-container>
+            }
+            </ng-container>
+        }
     </table>
 </div>

package/templates/themes/table/repeatable/table.ejs

@@ -9,8 +9,10 @@
      [scrollWindow]="false"
         <%}%>
 >
-    <div *ngFor="let row of task.Records.list">
-        <div *ngIf="mg.ifRowCreated(row) && !mg.isDataviewEmpty()" id="row"
+    @for (row of task.Records.list; track $index) {
+        <div>
+        @if (mg.ifRowCreated(row) && !mg.isDataviewEmpty()) {
+        <div id="row"
                 <% if(magicConfig.allow_testing) { %>
              MgControlType="MgRow"
                 <% } %>
@@ -24,5 +26,7 @@
              [magicRow]="row?.rowId">
             <%- include(`../../container`, {ctrl: ctrl}) %>
         </div>
-    </div>
+        }
+        </div>
+    }
 </div>

package/tsconfig.json

@@ -6,6 +6,8 @@
     "target": "es6",
     "module": "commonjs",
     "moduleResolution": "node",
+    "ignoreDeprecations": "6.0",
+    "strict": false,
 
     "noEmitOnError"       : false,
     "skipLibCheck"        : true,