@wavemaker-ai/app-ng-runtime 1.0.0-rc.312 → 1.0.0-rc.317

package/components/data/form/index.d.ts

@@ -459,7 +459,7 @@ declare class LiveFormDirective implements OnDestroy {
     onFieldDefaultValueChange(field: any, nv: any): void;
     onFieldValueChange(field: any, nv: any): void;
     getBlobURL(dataObj: any, key: any, value: any): string;
-    setFormData(dataObj: any, formFields?: any): void;
+    setFormData(dataObj: any, formFields?: any, formData?: any): void;
     onDataSourceUpdate(response: any, newForm: any, updateMode: any): void;
     savePrevformFields(): void;
     getPrevformFields(): void;

package/components/data/table/bundles/index.umd.js

@@ -595,7 +595,8 @@
                 },
                 afterRowUpdate: (row, e, callBack, options) => {
                     i2.muteWatchers();
-                    this.updateRecord(lodashEs.extend({}, options, { row, 'prevData': options.rowindex ? options.rowindex : this.prevData, 'event': e, 'callBack': callBack }));
+                    const v = lodashEs.get(this.datasource, 'category') === 'wm.Variable' && options && options.rowindex != null;
+                    this.updateRecord(lodashEs.extend({}, options, { row, prevData: v ? options.rowindex : this.prevData, event: e, callBack }));
                     setTimeout(() => {
                         i2.unMuteWatchers();
                     }, 10);
@@ -677,7 +678,7 @@
                 },
                 generateCustomExpressions: (rowData, index, summaryRow) => {
                     const row = this.getClonedRowObject(rowData);
-                    const compileTemplate = (tmpl, tmplIndex) => {
+                    const compileTemplate = (tmpl) => {
                         if (!tmpl) {
                             return;
                         }
@@ -687,8 +688,7 @@
                             colDef
                         };
                         this.addEventsToContext(context);
-                        const injectorKey = `customExpr_${tmplIndex ?? 'x'}_${index}`;
-                        const customExprView = this.customExprViewRef.createEmbeddedView(tmpl, context, { injector: this.createCustomInjector(injectorKey, context) });
+                        const customExprView = this.customExprViewRef.createEmbeddedView(tmpl, context);
                         const rootNode = customExprView.rootNodes[0];
                         const fieldName = rootNode.getAttribute('data-col-identifier');
                         lodashEs.extend(colDef, this.columns[fieldName]);
@@ -701,19 +701,18 @@
                     };
                     if (this.isdynamictable) {
                         this.fieldDefs.forEach(col => {
-                            compileTemplate(col.customExprTmpl, col?.field ? String(col.field) : undefined);
+                            compileTemplate(col.customExprTmpl);
                         });
                         return;
                     }
                     // For all the columns inside the table, generate the custom expression
-                    this.customExprTmpl.forEach((tmpl, tmplIndex) => compileTemplate(tmpl, tmplIndex));
+                    this.customExprTmpl.forEach(compileTemplate.bind(this));
                 },
                 generateRowExpansionCell: (rowData, index) => {
                     const row = this.getClonedRowObject(rowData);
                     // For all the columns inside the table, generate the inline widget
                     this.rowExpansionActionTmpl.forEach((tmpl) => {
-                        const context = { row };
-                        this.rowExpansionActionTl[index] = this.rowExpansionActionViewRef.createEmbeddedView(tmpl, context, { injector: this.createCustomInjector(`rowExpansionAction_${index}`, context) }).rootNodes;
+                        this.rowExpansionActionTl[index] = this.rowExpansionActionViewRef.createEmbeddedView(tmpl, { row }).rootNodes;
                     });
                 },
                 getRowExpansionAction: (index) => {
@@ -755,7 +754,7 @@
                             }, 500);
                         }
                     };
-                    const rootNode = this.rowDetailViewRef.createEmbeddedView(this.rowExpansionTmpl, context, { injector: this.createCustomInjector(`rowDetail_${rowId}`, context) }).rootNodes[0];
+                    const rootNode = this.rowDetailViewRef.createEmbeddedView(this.rowExpansionTmpl, context).rootNodes[0];
                     $target[0].appendChild(rootNode);
                     i2.$appDigest();
                 },
@@ -786,8 +785,7 @@
                     this.rowActionsCompiledTl[index] = [];
                     // For all the columns inside the table, generate the inline widget
                     this.rowActionTmpl.forEach((tmpl) => {
-                        const context = { row };
-                        this.rowActionsCompiledTl[index].push(...this.rowActionsViewRef.createEmbeddedView(tmpl, context, { injector: this.createCustomInjector(`rowActions_${index}`, context) }).rootNodes);
+                        this.rowActionsCompiledTl[index].push(...this.rowActionsViewRef.createEmbeddedView(tmpl, { row }).rootNodes);
                     });
                 },
                 getRowAction: (index) => {
@@ -814,7 +812,7 @@
                                     return this.columns[fieldName] && this.columns[fieldName].showPendingSpinnerNew;
                                 }
                             };
-                            const rootNode = this.inlineEditNewViewRef.createEmbeddedView(tmpl, context, { injector: this.createCustomInjector(`inlineNew_${this.widgetId}`, context) }).rootNodes[0];
+                            const rootNode = this.inlineEditNewViewRef.createEmbeddedView(tmpl, context).rootNodes[0];
                             fieldName = rootNode.getAttribute('data-col-identifier');
                             this.inlineNewCompliedTl[fieldName] = rootNode;
                         });
@@ -840,7 +838,7 @@
                                 return this.columns[fieldName] && this.columns[fieldName].showPendingSpinner;
                             }
                         };
-                        const rootNode = this.inlineEditViewRef.createEmbeddedView(tmpl, context, { injector: this.createCustomInjector(`inline_${this.widgetId}`, context) }).rootNodes[0];
+                        const rootNode = this.inlineEditViewRef.createEmbeddedView(tmpl, context).rootNodes[0];
                         fieldName = rootNode.getAttribute('data-col-identifier');
                         this.inlineCompliedTl[fieldName] = rootNode;
                     });
@@ -900,7 +898,7 @@
                                 return this.emptyMatchModes.indexOf(this.rowFilter[fieldName] && this.rowFilter[fieldName].matchMode) > -1;
                             }
                         };
-                        const rootNode = this.filterViewRef.createEmbeddedView(tmpl, context, { injector: this.createCustomInjector(`filter_${this.widgetId}`, context) }).rootNodes[0];
+                        const rootNode = this.filterViewRef.createEmbeddedView(tmpl, context).rootNodes[0];
                         this.rowFilterCompliedTl[rootNode.getAttribute('data-col-identifier')] = rootNode;
                     });
                 },
@@ -1542,6 +1540,7 @@
             row.$isLast = this.gridData.length === row.$index;
             delete row.$$index;
             delete row.$$pk;
+            delete row.$$wmSourceListIndex;
             return row;
         }
         handleLoading(data) {
@@ -1786,6 +1785,14 @@
             // Apply filter and sort, if data is refreshed through Refresh data method
             if (!this.isNavigationEnabled() && this._isClientSearch) {
                 data = i2.getClonedObject(serviceData);
+                if (lodashEs.isObject(data) && !lodashEs.isArray(data)) {
+                    data = [data];
+                }
+                if (lodashEs.get(this.datasource, 'category') === 'wm.Variable' && lodashEs.isArray(data)) {
+                    for (let i = 0; i < data.length; i++) {
+                        data[i].$$wmSourceListIndex = i;
+                    }
+                }
                 data = this.getSearchResult(data, this.filterInfo);
                 data = this.getSortResult(data, this.sortInfo);
                 this.serverData = data;
@@ -2382,6 +2389,11 @@
                 if (lodashEs.isObject(data) && !lodashEs.isArray(data)) {
                     data = [data];
                 }
+                if (lodashEs.get(this.datasource, 'category') === 'wm.Variable' && lodashEs.isArray(data)) {
+                    for (let i = 0; i < data.length; i++) {
+                        data[i].$$wmSourceListIndex = i;
+                    }
+                }
                 data = this.getSearchResult(data, this.filterInfo);
                 data = this.getSortResult(data, this.sortInfo);
                 return data;
@@ -2809,7 +2821,11 @@
             if (dataSource.execute(i2.DataSource.Operation.SUPPORTS_CRUD) || !dataSource.execute(i2.DataSource.Operation.IS_API_AWARE) || dataSource.category === 'wm.CrudVariable') {
                 if (!dataSource.execute(i2.DataSource.Operation.IS_API_AWARE)) {
                     const extraOptions = this.generatePath(this.table.binddataset);
-                    dataSource.execute(i2.DataSource.Operation.SET_ITEM, { prevItem: options.prevData, item: options.row, path: extraOptions.path, parentIndex: extraOptions.index });
+                    const item = options.row;
+                    if (dataSource.category === 'wm.Variable' && item) {
+                        delete item['$$wmSourceListIndex'];
+                    }
+                    dataSource.execute(i2.DataSource.Operation.SET_ITEM, { prevItem: options.prevData, item, path: extraOptions.path, parentIndex: extraOptions.index });
                     this.updateSuccessHandler(options.row, options);
                     return;
                 }
@@ -2892,7 +2908,14 @@
             if (dataSource.execute(i2.DataSource.Operation.SUPPORTS_CRUD) || !dataSource.execute(i2.DataSource.Operation.IS_API_AWARE) || this.table._isDependent || dataSource.category === 'wm.CrudVariable') {
                 if (!dataSource.execute(i2.DataSource.Operation.IS_API_AWARE)) {
                     const extraOptions = this.generatePath(this.table.binddataset);
-                    dataSource.execute(i2.DataSource.Operation.REMOVE_ITEM, { item: options.row, path: extraOptions.path, parentIndex: extraOptions.index });
+                    let item = options.row;
+                    if (dataSource.category === 'wm.Variable' && options.rowindex != null) {
+                        item = options.rowindex;
+                    }
+                    else if (dataSource.category === 'wm.Variable' && item) {
+                        delete item['$$wmSourceListIndex'];
+                    }
+                    dataSource.execute(i2.DataSource.Operation.REMOVE_ITEM, { item, path: extraOptions.path, parentIndex: extraOptions.index });
                     this.deleteSuccessHandler(options.row, undefined, options.evt, options.callBack);
                     return;
                 }
@@ -3432,6 +3455,11 @@
             if (lodashEs.isObject(data) && !lodashEs.isArray(data)) {
                 data = [data];
             }
+            if (lodashEs.get(this.table.datasource, 'category') === 'wm.Variable' && lodashEs.isArray(data)) {
+                for (let i = 0; i < data.length; i++) {
+                    data[i].$$wmSourceListIndex = i;
+                }
+            }
             /*Both the functions return same 'data' if arguments are undefined*/
             data = this.getSearchResult(data, this.table.filterInfo);
             data = this.getSortResult(data, this.table.sortInfo);

package/components/data/table/fesm2022/index.mjs

@@ -15,7 +15,7 @@ import { register, PROP_BOOLEAN, PROP_STRING, PROP_NUMBER, PROP_ANY, StylableCom
 import { PaginationComponent } from '@wm/components/data/pagination';
 import * as i3 from '@wm/components/data/list';
 import { debounceTime } from 'rxjs/operators';
-import { isEmpty, floor, debounce, isUndefined, isNaN as isNaN$1, extend, pullAllWith, isEqual, get, remove, findIndex, some, set, forEach, isArray, isObject, indexOf, keys, find, toNumber, includes, split, startsWith, omitBy, values, map, parseInt as parseInt$1, last, toString, isNull, filter, range, endsWith, toLower, head, orderBy, round, sum, max, min, mean, cloneDeep } from 'lodash-es';
+import { isEmpty, floor, debounce, isUndefined, isNaN as isNaN$1, extend, get, pullAllWith, isEqual, remove, findIndex, some, set, forEach, isArray, isObject, indexOf, keys, find, toNumber, includes, split, startsWith, omitBy, values, map, parseInt as parseInt$1, last, toString, isNull, filter, range, endsWith, toLower, head, orderBy, round, sum, max, min, mean, cloneDeep } from 'lodash-es';
 import * as i6 from 'ngx-bootstrap/dropdown';
 import { BsDropdownModule } from 'ngx-bootstrap/dropdown';
 import * as momentLib from 'moment';
@@ -585,7 +585,8 @@ class TableComponent extends StylableComponent {
             },
             afterRowUpdate: (row, e, callBack, options) => {
                 muteWatchers();
-                this.updateRecord(extend({}, options, { row, 'prevData': options.rowindex ? options.rowindex : this.prevData, 'event': e, 'callBack': callBack }));
+                const v = get(this.datasource, 'category') === 'wm.Variable' && options && options.rowindex != null;
+                this.updateRecord(extend({}, options, { row, prevData: v ? options.rowindex : this.prevData, event: e, callBack }));
                 setTimeout(() => {
                     unMuteWatchers();
                 }, 10);
@@ -667,7 +668,7 @@ class TableComponent extends StylableComponent {
             },
             generateCustomExpressions: (rowData, index, summaryRow) => {
                 const row = this.getClonedRowObject(rowData);
-                const compileTemplate = (tmpl, tmplIndex) => {
+                const compileTemplate = (tmpl) => {
                     if (!tmpl) {
                         return;
                     }
@@ -677,8 +678,7 @@ class TableComponent extends StylableComponent {
                         colDef
                     };
                     this.addEventsToContext(context);
-                    const injectorKey = `customExpr_${tmplIndex ?? 'x'}_${index}`;
-                    const customExprView = this.customExprViewRef.createEmbeddedView(tmpl, context, { injector: this.createCustomInjector(injectorKey, context) });
+                    const customExprView = this.customExprViewRef.createEmbeddedView(tmpl, context);
                     const rootNode = customExprView.rootNodes[0];
                     const fieldName = rootNode.getAttribute('data-col-identifier');
                     extend(colDef, this.columns[fieldName]);
@@ -691,19 +691,18 @@ class TableComponent extends StylableComponent {
                 };
                 if (this.isdynamictable) {
                     this.fieldDefs.forEach(col => {
-                        compileTemplate(col.customExprTmpl, col?.field ? String(col.field) : undefined);
+                        compileTemplate(col.customExprTmpl);
                     });
                     return;
                 }
                 // For all the columns inside the table, generate the custom expression
-                this.customExprTmpl.forEach((tmpl, tmplIndex) => compileTemplate(tmpl, tmplIndex));
+                this.customExprTmpl.forEach(compileTemplate.bind(this));
             },
             generateRowExpansionCell: (rowData, index) => {
                 const row = this.getClonedRowObject(rowData);
                 // For all the columns inside the table, generate the inline widget
                 this.rowExpansionActionTmpl.forEach((tmpl) => {
-                    const context = { row };
-                    this.rowExpansionActionTl[index] = this.rowExpansionActionViewRef.createEmbeddedView(tmpl, context, { injector: this.createCustomInjector(`rowExpansionAction_${index}`, context) }).rootNodes;
+                    this.rowExpansionActionTl[index] = this.rowExpansionActionViewRef.createEmbeddedView(tmpl, { row }).rootNodes;
                 });
             },
             getRowExpansionAction: (index) => {
@@ -745,7 +744,7 @@ class TableComponent extends StylableComponent {
                         }, 500);
                     }
                 };
-                const rootNode = this.rowDetailViewRef.createEmbeddedView(this.rowExpansionTmpl, context, { injector: this.createCustomInjector(`rowDetail_${rowId}`, context) }).rootNodes[0];
+                const rootNode = this.rowDetailViewRef.createEmbeddedView(this.rowExpansionTmpl, context).rootNodes[0];
                 $target[0].appendChild(rootNode);
                 $appDigest();
             },
@@ -776,8 +775,7 @@ class TableComponent extends StylableComponent {
                 this.rowActionsCompiledTl[index] = [];
                 // For all the columns inside the table, generate the inline widget
                 this.rowActionTmpl.forEach((tmpl) => {
-                    const context = { row };
-                    this.rowActionsCompiledTl[index].push(...this.rowActionsViewRef.createEmbeddedView(tmpl, context, { injector: this.createCustomInjector(`rowActions_${index}`, context) }).rootNodes);
+                    this.rowActionsCompiledTl[index].push(...this.rowActionsViewRef.createEmbeddedView(tmpl, { row }).rootNodes);
                 });
             },
             getRowAction: (index) => {
@@ -804,7 +802,7 @@ class TableComponent extends StylableComponent {
                                 return this.columns[fieldName] && this.columns[fieldName].showPendingSpinnerNew;
                             }
                         };
-                        const rootNode = this.inlineEditNewViewRef.createEmbeddedView(tmpl, context, { injector: this.createCustomInjector(`inlineNew_${this.widgetId}`, context) }).rootNodes[0];
+                        const rootNode = this.inlineEditNewViewRef.createEmbeddedView(tmpl, context).rootNodes[0];
                         fieldName = rootNode.getAttribute('data-col-identifier');
                         this.inlineNewCompliedTl[fieldName] = rootNode;
                     });
@@ -830,7 +828,7 @@ class TableComponent extends StylableComponent {
                             return this.columns[fieldName] && this.columns[fieldName].showPendingSpinner;
                         }
                     };
-                    const rootNode = this.inlineEditViewRef.createEmbeddedView(tmpl, context, { injector: this.createCustomInjector(`inline_${this.widgetId}`, context) }).rootNodes[0];
+                    const rootNode = this.inlineEditViewRef.createEmbeddedView(tmpl, context).rootNodes[0];
                     fieldName = rootNode.getAttribute('data-col-identifier');
                     this.inlineCompliedTl[fieldName] = rootNode;
                 });
@@ -890,7 +888,7 @@ class TableComponent extends StylableComponent {
                             return this.emptyMatchModes.indexOf(this.rowFilter[fieldName] && this.rowFilter[fieldName].matchMode) > -1;
                         }
                     };
-                    const rootNode = this.filterViewRef.createEmbeddedView(tmpl, context, { injector: this.createCustomInjector(`filter_${this.widgetId}`, context) }).rootNodes[0];
+                    const rootNode = this.filterViewRef.createEmbeddedView(tmpl, context).rootNodes[0];
                     this.rowFilterCompliedTl[rootNode.getAttribute('data-col-identifier')] = rootNode;
                 });
             },
@@ -1532,6 +1530,7 @@ class TableComponent extends StylableComponent {
         row.$isLast = this.gridData.length === row.$index;
         delete row.$$index;
         delete row.$$pk;
+        delete row.$$wmSourceListIndex;
         return row;
     }
     handleLoading(data) {
@@ -1776,6 +1775,14 @@ class TableComponent extends StylableComponent {
         // Apply filter and sort, if data is refreshed through Refresh data method
         if (!this.isNavigationEnabled() && this._isClientSearch) {
             data = getClonedObject(serviceData);
+            if (isObject(data) && !isArray(data)) {
+                data = [data];
+            }
+            if (get(this.datasource, 'category') === 'wm.Variable' && isArray(data)) {
+                for (let i = 0; i < data.length; i++) {
+                    data[i].$$wmSourceListIndex = i;
+                }
+            }
             data = this.getSearchResult(data, this.filterInfo);
             data = this.getSortResult(data, this.sortInfo);
             this.serverData = data;
@@ -2372,6 +2379,11 @@ class TableComponent extends StylableComponent {
             if (isObject(data) && !isArray(data)) {
                 data = [data];
             }
+            if (get(this.datasource, 'category') === 'wm.Variable' && isArray(data)) {
+                for (let i = 0; i < data.length; i++) {
+                    data[i].$$wmSourceListIndex = i;
+                }
+            }
             data = this.getSearchResult(data, this.filterInfo);
             data = this.getSortResult(data, this.sortInfo);
             return data;
@@ -2799,7 +2811,11 @@ class TableCUDDirective {
         if (dataSource.execute(DataSource.Operation.SUPPORTS_CRUD) || !dataSource.execute(DataSource.Operation.IS_API_AWARE) || dataSource.category === 'wm.CrudVariable') {
             if (!dataSource.execute(DataSource.Operation.IS_API_AWARE)) {
                 const extraOptions = this.generatePath(this.table.binddataset);
-                dataSource.execute(DataSource.Operation.SET_ITEM, { prevItem: options.prevData, item: options.row, path: extraOptions.path, parentIndex: extraOptions.index });
+                const item = options.row;
+                if (dataSource.category === 'wm.Variable' && item) {
+                    delete item['$$wmSourceListIndex'];
+                }
+                dataSource.execute(DataSource.Operation.SET_ITEM, { prevItem: options.prevData, item, path: extraOptions.path, parentIndex: extraOptions.index });
                 this.updateSuccessHandler(options.row, options);
                 return;
             }
@@ -2882,7 +2898,14 @@ class TableCUDDirective {
         if (dataSource.execute(DataSource.Operation.SUPPORTS_CRUD) || !dataSource.execute(DataSource.Operation.IS_API_AWARE) || this.table._isDependent || dataSource.category === 'wm.CrudVariable') {
             if (!dataSource.execute(DataSource.Operation.IS_API_AWARE)) {
                 const extraOptions = this.generatePath(this.table.binddataset);
-                dataSource.execute(DataSource.Operation.REMOVE_ITEM, { item: options.row, path: extraOptions.path, parentIndex: extraOptions.index });
+                let item = options.row;
+                if (dataSource.category === 'wm.Variable' && options.rowindex != null) {
+                    item = options.rowindex;
+                }
+                else if (dataSource.category === 'wm.Variable' && item) {
+                    delete item['$$wmSourceListIndex'];
+                }
+                dataSource.execute(DataSource.Operation.REMOVE_ITEM, { item, path: extraOptions.path, parentIndex: extraOptions.index });
                 this.deleteSuccessHandler(options.row, undefined, options.evt, options.callBack);
                 return;
             }
@@ -3423,6 +3446,11 @@ class TableFilterSortDirective {
         if (isObject(data) && !isArray(data)) {
             data = [data];
         }
+        if (get(this.table.datasource, 'category') === 'wm.Variable' && isArray(data)) {
+            for (let i = 0; i < data.length; i++) {
+                data[i].$$wmSourceListIndex = i;
+            }
+        }
         /*Both the functions return same 'data' if arguments are undefined*/
         data = this.getSearchResult(data, this.table.filterInfo);
         data = this.getSortResult(data, this.table.sortInfo);