@wavemaker/app-ng-runtime 11.4.0-next.140425 → 11.4.0-next.140972

app-ng-runtime/components/data/table/bundles/index.umd.js

@@ -460,6 +460,7 @@
             _this.rowDef = {};
             _this.rowInstance = {};
             _this.fullFieldDefs = [];
+            _this.variableInflight = true;
             _this.applyProps = new Map();
             _this.redraw = _.debounce(_this._redraw, 150);
             _this.debouncedHandleLoading = _.debounce(_this.handleLoading, 350);
@@ -1160,6 +1161,10 @@
             set: function (newValue) {
                 var _a;
                 this.isDataLoading = false;
+                // Fix for [WMS-24012]: hide no datafound msg when variableInflight is true and dataset is empty
+                if (this.variableInflight && _.isEmpty(newValue)) {
+                    return;
+                }
                 this.variableInflight = false;
                 if (this.gridOptions.isNavTypeScrollOrOndemand()) {
                     // update the _gridData field with the next set of items and modify the current page
@@ -1639,6 +1644,10 @@
         };
         TableComponent.prototype.setGridData = function (serverData) {
             var data = this.filternullrecords ? this.removeEmptyRecords(serverData) : serverData;
+            // fix for [WMS-24012] set variableinflight flag to false for static variables
+            if (_.get(this.datasource, 'category') === 'wm.Variable') {
+                this.variableInflight = false;
+            }
             if (!this.variableInflight) {
                 if (data && (data.length) === 0) {
                     this.callDataGridMethod('setStatus', 'nodata', this.nodatamessage);
@@ -1961,10 +1970,8 @@
                         this.variableInflight = false;
                         this.callDataGridMethod('setStatus', 'nodata', this.nodatamessage);
                     }
-                    if (this.dataset) {
-                        this.watchVariableDataSet(this.dataset);
-                        this.onDataSourceChange();
-                    }
+                    this.watchVariableDataSet(this.dataset);
+                    this.onDataSourceChange();
                     break;
                 case 'dataset':
                     if (this.gridOptions.isNavTypeScrollOrOndemand() && this.gridOptions.getCurrentPage() === 1) {