@wavemaker/app-runtime-wm-build 11.3.3-next.25051 → 11.3.3-next.25053

app-runtime-wm-build/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wavemaker/app-runtime-wm-build",
-    "version": "11.3.3-next.25051",
+    "version": "11.3.3-next.25053",
     "description": "All modules required for a wavemaker application.",
     "main": "index.js",
     "scripts": {

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

@@ -166185,12 +166185,11 @@ $.widget("wm.datatable", {
         }
     },
     _getGridTemplate: function() {
-        var self = this, preparedData, $tbody, tbodyExists, pageStartIndex = self.getPageStartIndex(), startRowIndex = self.options.startRowIndex, isScrollorOnDemand = self.options.isNavTypeScrollOrOndemand();
+        var self = this, preparedData, $tbody, pageStartIndex = self.getPageStartIndex(), startRowIndex = self.options.startRowIndex, isScrollorOnDemand = self.options.isNavTypeScrollOrOndemand();
         if (isScrollorOnDemand) {
             $tbody = this.gridElement;
         } else {
-            tbodyExists = this.gridElement.find("tbody").length;
-            $tbody = tbodyExists > 0 ? this.gridElement.find("tbody:first") : this.gridElement.empty();
+            $tbody = this.gridElement.empty();
         }
         if (isScrollorOnDemand) {
             this._handleCRUDForInfiniteScroll($tbody);
@@ -166908,6 +166907,9 @@ $.widget("wm.datatable", {
             break;
 
           case "data":
+            if (!this.isResetSortIconsDone) {
+                this.setSortIconDefault();
+            }
             this.refreshGridData();
             break;
 
@@ -167666,6 +167668,7 @@ $.widget("wm.datatable", {
         }));
     },
     resetSortIcons: function($el) {
+        this.isResetSortIconsDone = true;
         var $sortContainer;
         if (!$el && this.gridHeaderElement) {
             $sortContainer = this.gridHeaderElement.find(".sort-buttons-container.active");
@@ -167674,12 +167677,22 @@ $.widget("wm.datatable", {
         }
         $el.removeClass("desc asc").removeClass(this.options.cssClassNames.descIcon).removeClass(this.options.cssClassNames.ascIcon);
     },
+    setSortIconDefault: function() {
+        const sortInfo = this.options.sortInfo, $e = this.tableContainer, $th = $e.find("[data-col-field='" + sortInfo.field + "']"), $sortContainer = $th.find(".sort-buttons-container"), $sortIcon = $sortContainer.find("i.sort-icon"), direction = sortInfo.direction;
+        if (direction === "asc") {
+            $sortIcon.addClass(direction + " " + this.options.cssClassNames.ascIcon);
+            $sortContainer.addClass("active");
+        } else if (direction === "desc") {
+            $sortIcon.addClass(direction + " " + this.options.cssClassNames.descIcon);
+            $sortContainer.addClass("active");
+        }
+    },
     sortHandler: function(e) {
         e.stopImmediatePropagation();
         if ($(e.target).hasClass("header-data") && this.options.enableColumnSelection) {
             this.headerClickHandler(e);
         }
-        var $e = $(e.target), $th = $e.closest("th.app-datagrid-header-cell"), id = $th.attr("data-col-id"), $sortContainer = $th.find(".sort-buttons-container"), $sortIcon = $sortContainer.find("i.sort-icon"), direction = $sortIcon.hasClass("asc") ? "desc" : $sortIcon.hasClass("desc") ? "" : "asc", sortInfo = this.options.sortInfo, $previousSortMarker = this.gridHeaderElement.find(".sort-buttons-container.active"), field = $th.attr("data-col-field"), $previousSortedColumn, $previousSortIcon, colId, colDef;
+        var $e = $(e.target), $th = $e.closest("th.app-datagrid-header-cell"), id = $th.attr("data-col-id"), $sortContainer = $th.find(".sort-buttons-container"), $sortIcon = $sortContainer.find("i.sort-icon"), direction = $sortIcon.hasClass("asc") ? "desc" : "asc", sortInfo = this.options.sortInfo, $previousSortMarker = this.gridHeaderElement.find(".sort-buttons-container.active"), field = $th.attr("data-col-field"), $previousSortedColumn, $previousSortIcon, colId, colDef;
         this.resetSortIcons($sortIcon);
         $sortIcon.addClass(direction);
         if (direction === "asc") {
@@ -168150,6 +168163,9 @@ $.widget("wm.datatable", {
                 }
             });
         }
+        if (!this.isResetSortIconsDone) {
+            this.setSortIconDefault();
+        }
     },
     addOrRemoveScroll: function() {
         var gridContent = this.gridContainer.find("tbody"), gridHeader = this.gridContainer.find(".table-header");
@@ -184186,7 +184202,7 @@ window.requestAnimationFrame = function() {
                     _.forEach(options.filterFields, (function(value, key) {
                         value.fieldName = key;
                         value.type = _util_variable_live_variable_utils__WEBPACK_IMPORTED_MODULE_3__.LiveVariableUtils.getFieldType(columnName, variable, key);
-                        if (value.filterCondition === _constants_variables_constants__WEBPACK_IMPORTED_MODULE_5__.DB_CONSTANTS.DATABASE_MATCH_MODES["in"].toLowerCase() || value.filterCondition === _constants_variables_constants__WEBPACK_IMPORTED_MODULE_5__.DB_CONSTANTS.DATABASE_MATCH_MODES.between.toLowerCase()) {
+                        if (value.filterCondition === _constants_variables_constants__WEBPACK_IMPORTED_MODULE_5__.DB_CONSTANTS.DATABASE_MATCH_MODES.in.toLowerCase() || value.filterCondition === _constants_variables_constants__WEBPACK_IMPORTED_MODULE_5__.DB_CONSTANTS.DATABASE_MATCH_MODES.between.toLowerCase()) {
                             value.value = value.value.split(",");
                         }
                         filterFields.push(value);
@@ -187525,7 +187541,7 @@ window.requestAnimationFrame = function() {
                     if (_.includes(_constants_variables_constants__WEBPACK_IMPORTED_MODULE_1__.DB_CONSTANTS.DATABASE_RANGE_MATCH_MODES, filterCondition)) {
                         return filterCondition;
                     }
-                    return _constants_variables_constants__WEBPACK_IMPORTED_MODULE_1__.DB_CONSTANTS.DATABASE_MATCH_MODES.exact;
+                    return _constants_variables_constants__WEBPACK_IMPORTED_MODULE_1__.DB_CONSTANTS.DATABASE_MATCH_MODES["exact"];
                 };
                 LiveVariableUtils.getFilterOption = function(variable, fieldOptions, options) {
                     var attributeName, fieldValue = fieldOptions.value, filterOption, filterCondition;
@@ -187719,7 +187735,7 @@ window.requestAnimationFrame = function() {
                                 LiveVariableUtils.processFilterFields(rule.rules, variable, options);
                             } else {
                                 if (!_.isNull(rule.target)) {
-                                    var value = rule.matchMode.toLowerCase() === _constants_variables_constants__WEBPACK_IMPORTED_MODULE_1__.DB_CONSTANTS.DATABASE_MATCH_MODES.between.toLowerCase() ? _.isArray(rule.value) ? rule.value : [ rule.value, rule.secondvalue ] : rule.matchMode.toLowerCase() === _constants_variables_constants__WEBPACK_IMPORTED_MODULE_1__.DB_CONSTANTS.DATABASE_MATCH_MODES["in"].toLowerCase() || rule.matchMode.toLowerCase() === _constants_variables_constants__WEBPACK_IMPORTED_MODULE_1__.DB_CONSTANTS.DATABASE_MATCH_MODES.notin.toLowerCase() ? _.isArray(rule.value) ? rule.value : rule.value ? rule.value.split(",").map((function(val) {
+                                    var value = rule.matchMode.toLowerCase() === _constants_variables_constants__WEBPACK_IMPORTED_MODULE_1__.DB_CONSTANTS.DATABASE_MATCH_MODES.between.toLowerCase() ? _.isArray(rule.value) ? rule.value : [ rule.value, rule.secondvalue ] : rule.matchMode.toLowerCase() === _constants_variables_constants__WEBPACK_IMPORTED_MODULE_1__.DB_CONSTANTS.DATABASE_MATCH_MODES.in.toLowerCase() || rule.matchMode.toLowerCase() === _constants_variables_constants__WEBPACK_IMPORTED_MODULE_1__.DB_CONSTANTS.DATABASE_MATCH_MODES.notin.toLowerCase() ? _.isArray(rule.value) ? rule.value : rule.value ? rule.value.split(",").map((function(val) {
                                         return val.trim();
                                     })) : "" : rule.value;
                                     rules[index] = LiveVariableUtils.getFilterOption(variable, {