@wavemaker/app-ng-runtime 11.15.2-rc.64737 → 11.15.4-rc.250

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

@@ -1342,6 +1342,7 @@ class TableComponent extends StylableComponent {
         }
         if (newVal) {
             this.populateGridData(newVal);
+            this.refreshRowFilterDataFromDataset();
         }
         // when select widget options are loaded in search filter then initializing it
         const widgetState = this.statePersistence.getWidgetState(this);
@@ -2139,6 +2140,14 @@ class TableComponent extends StylableComponent {
             triggerFn(col.onDataSourceChange && col.onDataSourceChange.bind(col));
         });
     }
+    refreshRowFilterDataFromDataset() {
+        if (this.filtermode !== 'multicolumn') {
+            return;
+        }
+        this.fieldDefs.forEach(col => {
+            triggerFn(col.loadFilterData && col.loadFilterData.bind(col));
+        });
+    }
     clearActionRowVars() {
         this.actionRowIndex = undefined;
         this.actionRowPage = undefined;
@@ -3225,9 +3234,15 @@ class TableFilterSortDirective {
     }
     // 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;
@@ -3244,20 +3259,38 @@ class TableFilterSortDirective {
     // Returns data sorted using sortObj
     getSortResult(data, sortObj) {
         if (sortObj && sortObj.direction) {
-            const fieldValue = get(find(data, sortObj.field), sortObj.field);
+            const sampleItem = find(data, (item) => {
+                const v = get(item, sortObj.field);
+                return typeof v === 'string' && !!v.trim();
+            });
+            const fieldValue = sampleItem ? 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 = orderBy(data, [(item) => this.parseDateString(get(item, sortObj.field))], [sortObj.direction]);
+                data = orderBy(data, [
+                    (item) => {
+                        const v = get(item, sortObj.field);
+                        return v === null || v === undefined || v === '' ? 1 : 0;
+                    },
+                    (item) => {
+                        const ts = this.parseDateString(get(item, sortObj.field));
+                        return isNaN(ts) ? 1 : 0;
+                    },
+                    (item) => this.parseDateString(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 = orderBy(data, [
+                    (item) => {
+                        const val = get(item, sortObj.field);
+                        return val === null || val === undefined || val === '' ? 1 : 0;
+                    },
                     (item) => {
                         const val = get(item, sortObj.field);
                         return typeof val === 'string' ? val.toLowerCase() : val;
                     },
                     (item) => get(item, sortObj.field) // fallback to original value
-                ], [sortObj.direction, sortObj.direction]);
+                ], ['asc', sortObj.direction, sortObj.direction]);
             }
             else {
                 data = orderBy(data, sortObj.field, sortObj.direction);