@wavemaker/app-runtime-wm-build 11.3.6-rc.111 → 11.3.6-rc.113

app-runtime-wm-build/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wavemaker/app-runtime-wm-build",
-    "version": "11.3.6-rc.111",
+    "version": "11.3.6-rc.113",
     "description": "All modules required for a wavemaker application.",
     "main": "index.js",
     "scripts": {

app-runtime-wm-build/wmapp/scripts/wm-loader.js

@@ -36444,15 +36444,21 @@
             var subscriptions = [ _this.bsModal.onShown.subscribe((function(_a) {
                 var id = _a.id;
                 var ref = _this.dialogService.getLastOpenedDialog();
-                if (ref === _this) {
+                if (ref === _this && !_this.dialogId) {
                     invokeOpenedCallback(ref);
                     _this.dialogId = id;
                 }
             })), _this.bsModal.onShow.subscribe((function() {
                 focusTrapObj.activeElement = document.activeElement;
             })), _this.bsModal.onHidden.subscribe((function(closeReason) {
-                var ref = closeReason === "esc" || closeReason === "backdrop-click" || _this.dialogId && (closeReason === null || closeReason === void 0 ? void 0 : closeReason.id) === _this.dialogId ? _this.dialogService.getLastOpenedDialog() : _this.dialogService.getDialogRefFromClosedDialogs();
+                var ref = _this.dialogService.getDialogRefFromClosedDialogs();
+                if (_this.dialogId && (closeReason === null || closeReason === void 0 ? void 0 : closeReason.id) === _this.dialogId) {
+                    ref = _this;
+                } else if (closeReason === "esc" || closeReason === "backdrop-click") {
+                    ref = _this.dialogService.getLastOpenedDialog();
+                }
                 if (ref === _this) {
+                    _this.dialogId = null;
                     _this.dialogService.removeFromOpenedDialogs(ref);
                     _this.dialogService.removeFromClosedDialogs(ref);
                     invokeClosedCallback(ref);
@@ -46490,6 +46496,11 @@
                     return;
                 }
                 this.variableInflight = false;
+                if (newValue && newValue.length === 0) {
+                    this.callDataGridMethod("setStatus", "nodata", this.nodatamessage);
+                } else {
+                    this.callDataGridMethod("setStatus", "ready");
+                }
                 if (this.gridOptions.isNavTypeScrollOrOndemand()) {
                     _a = __read(this.paginationService.updateFieldsOnPagination(this, newValue), 2), 
                     this._gridData = _a[0], this.currentPage = _a[1];