@wavemaker/app-ng-runtime 11.14.1-22.647589 → 11.14.1-23.647643

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

@@ -129,6 +129,19 @@
     };
     class TableComponent extends i4.StylableComponent {
         static { this.initializeProps = registerProps$5(); }
+        /** wm.Variable + inline or quickedit (editmode is string from markup; normalize case). */
+        isModelVariableInlineOrQuickEdit() {
+            if (lodashEs.get(this.datasource, 'category') !== 'wm.Variable') {
+                return false;
+            }
+            const em = String(this.editmode || '').toLowerCase();
+            return em === 'quickedit' || em === 'inline';
+        }
+        /** True while an inline/quickedit row save is updating the grid (incl. delayed navigator emit). */
+        shouldSoftRefreshAfterModelVarRowSave() {
+            return this.isModelVariableInlineOrQuickEdit()
+                && (this._isInlineEditSave || this._modelVarEditSoftRefreshActiveUntil > Date.now());
+        }
         set gridData(newValue) {
             this.isDataLoading = false;
             // Fix for [WMS-24012]: hide no datafound msg when variableInflight is true and dataset is empty
@@ -196,7 +209,14 @@
                         console.warn('Error in beforedatarender event callback, continuing with table rendering:', error);
                     }
                 }
-                this.setDataGridOption('data', i2.getClonedObject(this._gridData));
+                if (this.shouldSoftRefreshAfterModelVarRowSave()) {
+                    const clonedData = i2.getClonedObject(this._gridData);
+                    this.gridOptions.data = clonedData;
+                    this.callDataGridMethod('softRefreshData', clonedData);
+                }
+                else {
+                    this.setDataGridOption('data', i2.getClonedObject(this._gridData));
+                }
             }
         }
         get gridData() {
@@ -249,6 +269,8 @@
             this.formfields = {};
             this.enablesort = true;
             this.showviewlessbutton = false;
+            /** Covers async navigator/dataset updates after inline/quickedit save (wm.Variable). */
+            this._modelVarEditSoftRefreshActiveUntil = 0;
             this.primaryKey = [];
             this.selectedItems = [];
             this.selectedItemChange = new rxjs.Subject();
@@ -587,10 +609,24 @@
                     this.prevData = i2.getClonedObject(row);
                 },
                 afterRowUpdate: (row, e, callBack, options) => {
+                    const isModelVarInlineOrQuick = this.isModelVariableInlineOrQuickEdit();
+                    if (isModelVarInlineOrQuick) {
+                        this._isInlineEditSave = true;
+                        // Inline save triggers navigatePage / dataset emit asynchronously; a
+                        // microtask timeout cleared the flag before gridData ran → full rerender.
+                        this._modelVarEditSoftRefreshActiveUntil = Date.now() + 550;
+                    }
                     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();
+                        if (isModelVarInlineOrQuick) {
+                            setTimeout(() => {
+                                this._isInlineEditSave = false;
+                                this._modelVarEditSoftRefreshActiveUntil = 0;
+                            }, 520);
+                        }
                     }, 10);
                 },
                 onBeforeRowUpdate: (row, e, options) => {
@@ -663,11 +699,67 @@
                     this.customExprCompiledTl = {};
                     this.customExprCompiledSummaryTl = {};
                 },
+                updateCustomExpressionContexts: (preparedData) => {
+                    const viewCount = this.customExprViewRef.length;
+                    for (let i = 0; i < viewCount; i++) {
+                        const viewRef = this.customExprViewRef.get(i);
+                        if (!viewRef || !viewRef.context || !viewRef.context.row || viewRef.context.row.$index === undefined) {
+                            continue;
+                        }
+                        const existingRow = viewRef.context.row;
+                        const rowIndex = existingRow.$index - 1;
+                        const dataRow = preparedData[rowIndex];
+                        if (!dataRow) {
+                            continue;
+                        }
+                        Object.keys(dataRow).forEach(key => {
+                            if (key !== '$$index' && key !== '$$pk') {
+                                existingRow[key] = dataRow[key];
+                            }
+                        });
+                        existingRow.$isFirst = existingRow.$index === 1;
+                        existingRow.$isLast = this.gridData.length === existingRow.$index;
+                        viewRef.markForCheck();
+                    }
+                },
                 clearRowDetailExpression: () => {
                     this.rowDetailViewRef.clear();
                     this.rowDefMap = {};
                     this.rowDefInstances = {};
                 },
+                invalidateRowDetailCache: (preparedData) => {
+                    this.rowDefMap = {};
+                    this.rowDefInstances = {};
+                    // Update existing row detail view contexts in-place so currently
+                    // expanded partials pick up the new row data via change detection.
+                    const viewCount = this.rowDetailViewRef.length;
+                    for (let i = 0; i < viewCount; i++) {
+                        const viewRef = this.rowDetailViewRef.get(i);
+                        if (!viewRef || !viewRef.context || !viewRef.context.row) {
+                            continue;
+                        }
+                        const existingRow = viewRef.context.row;
+                        const rowIndex = existingRow.$index - 1;
+                        const dataRow = preparedData[rowIndex];
+                        if (!dataRow) {
+                            continue;
+                        }
+                        Object.keys(dataRow).forEach(key => {
+                            if (key !== '$$index' && key !== '$$pk') {
+                                existingRow[key] = dataRow[key];
+                            }
+                        });
+                        viewRef.markForCheck();
+                    }
+                },
+                refreshSelectedItems: () => {
+                    const selectedRows = this.callDataGridMethod('getSelectedRows');
+                    if (selectedRows.length) {
+                        this.items.length = 0;
+                        selectedRows.forEach(row => this.items.push(row));
+                        this.selectedItemChange.next(selectedRows);
+                    }
+                },
                 generateCustomExpressions: (rowData, index, summaryRow) => {
                     const row = this.getClonedRowObject(rowData);
                     const compileTemplate = (tmpl) => {
@@ -1355,6 +1447,8 @@
             }
         }
         ngOnDestroy() {
+            this._modelVarEditSoftRefreshActiveUntil = 0;
+            this._isInlineEditSave = false;
             // MEMORY LEAK FIX: Remove document click listener
             document.removeEventListener('click', this.documentClickBind);
             // MEMORY LEAK FIX: Unsubscribe from navigator watches
@@ -1527,6 +1621,7 @@
             row.$isLast = this.gridData.length === row.$index;
             delete row.$$index;
             delete row.$$pk;
+            delete row.$$wmSourceListIndex;
             return row;
         }
         handleLoading(data) {
@@ -1768,6 +1863,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;
@@ -2268,6 +2371,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;
@@ -2695,7 +2803,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;
                 }
@@ -2778,7 +2890,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;
                 }
@@ -3241,9 +3360,15 @@
         }
         // Function that checks if a given string is a valid date and returns the timestamp if it is, or NaN if it's not.
         parseDateString(dateString) {
+            if (typeof dateString !== 'string') {
+                return NaN;
+            }
+            const trimmed = dateString.trim();
+            if (!trimmed) {
+                return NaN;
+            }
             const timestamp = Date.parse(dateString);
             // handling case when string starts with string and end with number
-            const trimmed = dateString.trim();
             const monthRegex = /\b(?:Jan(?:uary)?|Feb(?:ruary)?|Mar(?:ch)?|Apr(?:il)?|May|Jun(?:e)?|Jul(?:y)?|Aug(?:ust)?|Sep(?:t(?:ember)?)?|Oct(?:ober)?|Nov(?:ember)?|Dec(?:ember)?)\b/i;
             if (/^[A-Za-z]+/.test(trimmed) && /\d+$/.test(trimmed) && !monthRegex.test(trimmed)) {
                 return NaN;
@@ -3259,20 +3384,38 @@
         // Returns data sorted using sortObj
         getSortResult(data, sortObj) {
             if (sortObj && sortObj.direction) {
-                const fieldValue = lodashEs.get(lodashEs.find(data, sortObj.field), sortObj.field);
+                const sampleItem = lodashEs.find(data, (item) => {
+                    const v = lodashEs.get(item, sortObj.field);
+                    return typeof v === 'string' && !!v.trim();
+                });
+                const fieldValue = sampleItem ? lodashEs.get(sampleItem, sortObj.field) : undefined;
                 const isValidDateString = typeof fieldValue === 'string' ? this.parseDateString(fieldValue) : NaN;
                 if (!isNaN(isValidDateString)) { // if the field is a date string
-                    data = lodashEs.orderBy(data, [(item) => this.parseDateString(lodashEs.get(item, sortObj.field))], [sortObj.direction]);
+                    data = lodashEs.orderBy(data, [
+                        (item) => {
+                            const v = lodashEs.get(item, sortObj.field);
+                            return v === null || v === undefined || v === '' ? 1 : 0;
+                        },
+                        (item) => {
+                            const ts = this.parseDateString(lodashEs.get(item, sortObj.field));
+                            return isNaN(ts) ? 1 : 0;
+                        },
+                        (item) => this.parseDateString(lodashEs.get(item, sortObj.field))
+                    ], ['asc', 'asc', sortObj.direction]);
                 }
                 else if (sortObj.sortBy ? this.table.columns[sortObj.sortBy]?.caseinsensitive : this.table.columns[sortObj.field]?.caseinsensitive) {
                     //Fix for [WMS-27505]: Added case-insensitive sorting so that uppercase and lowercase letters are treated the same when sorting.
                     data = lodashEs.orderBy(data, [
+                        (item) => {
+                            const val = lodashEs.get(item, sortObj.field);
+                            return val === null || val === undefined || val === '' ? 1 : 0;
+                        },
                         (item) => {
                             const val = lodashEs.get(item, sortObj.field);
                             return typeof val === 'string' ? val.toLowerCase() : val;
                         },
                         (item) => lodashEs.get(item, sortObj.field) // fallback to original value
-                    ], [sortObj.direction, sortObj.direction]);
+                    ], ['asc', sortObj.direction, sortObj.direction]);
                 }
                 else {
                     data = lodashEs.orderBy(data, sortObj.field, sortObj.direction);
@@ -3294,6 +3437,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);
@@ -4493,7 +4641,7 @@
                     this.defaultvalue = i4.getDefaultValue(this.defaultvalue, this.type, this.editWidgetType);
                     break;
                 case 'show':
-                    this.table.redraw(true);
+                    this.table.redraw(false);
                     this.showinfilter = this.nativeElement.hasAttribute('showinfilter') ? this.nativeElement.getAttribute('showinfilter') : nv;
                     break;
                 case 'filterdataset':