@wavemaker/app-ng-runtime 11.4.0-next.24565 → 11.4.0-next.24569

app-ng-runtime/components/data/table/fesm2015/index.js

@@ -151,6 +151,7 @@ class TableComponent extends StylableComponent {
         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);
@@ -838,6 +839,10 @@ class TableComponent extends StylableComponent {
     }
     set gridData(newValue) {
         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
@@ -1306,6 +1311,10 @@ class TableComponent extends StylableComponent {
     }
     setGridData(serverData) {
         const 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);
@@ -1609,10 +1618,8 @@ class TableComponent extends StylableComponent {
                     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) {