@wavemaker/angular-codegen 11.0.0-rc.5164 → 11.0.0-rc.5175

angular-codegen/dependencies/transpilation-mobile.cjs.js

@@ -38868,6 +38868,7 @@ var Operation;
     Operation["IS_BOUND_TO_LOCALE"] = "isBoundToLocale";
     Operation["GET_DEFAULT_LOCALE"] = "getDefaultLocale";
     Operation["CANCEL"] = "cancel";
+    Operation["SET_PAGINATION"] = "setPagination";
 })(Operation || (Operation = {}));
 const DataSource = {
     Operation
@@ -41205,6 +41206,16 @@ class PaginationService {
      */
     updateFieldsOnPagination(parent, newVal) {
         let fieldDefs = parent.widgetType === 'wm-table' ? parent.gridData : parent.fieldDefs;
+        // remove the deleted row from the list
+        if (parent.widgetType === 'wm-table' && (parent.gridOptions.isNavTypeScrollOrOndemand()) && parent.gridOptions.deletedRowIndex !== -1) {
+            fieldDefs.splice(parent.gridOptions.deletedRowIndex, 1);
+            parent.gridOptions.setDeletedRowIndex(-1);
+        }
+        // reset fieldDefs if last action performed is search or sort
+        if (parent.widgetType === 'wm-table' && (parent.gridOptions.isNavTypeScrollOrOndemand()) && (parent.gridOptions.lastActionPerformed === parent.gridOptions.ACTIONS.SEARCH_OR_SORT || parent.gridOptions.lastActionPerformed === parent.gridOptions.ACTIONS.FILTER_CRITERIA)) {
+            fieldDefs = [];
+            parent.gridOptions.setCurrentPage(1);
+        }
         let currentPage = parent.currentPage;
         const dataNavigator = parent.dataNavigator;
         const pagesize = parent.pagesize;
@@ -41225,11 +41236,11 @@ class PaginationService {
                     newVal = [];
                 }
                 else if (dataNavigator.dataSize < currentPage * pagesize) {
-                    // if number of elements added to datanavigator is less than  product of currentpage and pagesize we only add elements extra elements added
+                    // if number of elements added to dataNavigator is less than  product of currentPage and pageSize we only add elements extra elements added
                     itemsLength = dataNavigator.dataSize - fieldDefs.length;
                 }
                 else {
-                    // if number of elements added to datanavigator is greater than  product of currentpage and pagesize we add elements the extra elements in newVal
+                    // if number of elements added to dataNavigator is greater than  product of currentPage and pageSize we add elements the extra elements in newVal
                     itemsLength = currentPage * pagesize - fieldDefs.length;
                     currentPage++;
                 }
@@ -41242,9 +41253,36 @@ class PaginationService {
             }
             newVal = itemsToPush;
         }
-        fieldDefs = [...fieldDefs, ...newVal];
+        // Add unique records to fieldDefs
+        if (parent.widgetType === 'wm-table' && (parent.gridOptions.lastActionPerformed === parent.gridOptions.ACTIONS.DELETE || parent.gridOptions.lastActionPerformed === parent.gridOptions.ACTIONS.EDIT)) {
+            fieldDefs = this.getUniqueRecordsInFieldDef(fieldDefs, newVal);
+        }
+        else {
+            fieldDefs = [...fieldDefs, ...newVal];
+        }
         return [fieldDefs, currentPage];
     }
+    // Add the unique records to fieldDefs
+    getUniqueRecordsInFieldDef(fieldDefs, newVal) {
+        let flag = false;
+        if (!fieldDefs.length) {
+            fieldDefs = newVal;
+        }
+        else {
+            newVal.forEach(function (newObj) {
+                flag = false;
+                fieldDefs.forEach(function (obj) {
+                    if (_.isEqual(newObj, obj)) {
+                        flag = true;
+                    }
+                });
+                if (flag === false) {
+                    fieldDefs.push(newObj);
+                }
+            });
+        }
+        return fieldDefs;
+    }
     /**
      * @description
      * This function registers scroll events on the scrollable el, if the page doesn't have a scroll el then wheel event is registered on the requested node
@@ -41287,6 +41325,9 @@ class PaginationService {
                 let scrollTop;
                 // scrollingElement is undefined for IE, safari. use body as target Element
                 target = target === document ? (target.scrollingElement || document.body) : target;
+                if (parent.widgetType === 'wm-table' && parent.gridOptions.isNavTypeScrollOrOndemand()) {
+                    evt.stopPropagation();
+                }
                 clientHeight = target.clientHeight;
                 totalHeight = target.scrollHeight;
                 scrollTop = target === document.body ? $(window).scrollTop() : target.scrollTop;
@@ -41301,6 +41342,9 @@ class PaginationService {
         else {
             // if there is no scrollable element register wheel event on ul element
             $rootEl.on('wheel.scroll_evt', e => {
+                if (parent.widgetType === 'wm-table' && parent.gridOptions.isNavTypeScrollOrOndemand()) {
+                    e.stopPropagation();
+                }
                 if (e.originalEvent.deltaY > 0) {
                     $rootEl.off('wheel.scroll_evt');
                     this.debouncedFetchNextDatasetOnScroll(dataNavigator, debounceNum, parent)();
@@ -42381,7 +42425,7 @@ var search_build$1 = /*#__PURE__*/Object.freeze({
 const tagName$1m = 'div';
 register('wm-tree', () => {
     return {
-        pre: attrs => `<${tagName$1m} wmTree redrawable ${getAttrMarkup(attrs)}>`,
+        pre: attrs => `<${tagName$1m} wmTree ${getAttrMarkup(attrs)}>`,
         post: () => `</${tagName$1m}>`
     };
 });

angular-codegen/dependencies/transpilation-web.cjs.js

@@ -38868,6 +38868,7 @@ var Operation;
     Operation["IS_BOUND_TO_LOCALE"] = "isBoundToLocale";
     Operation["GET_DEFAULT_LOCALE"] = "getDefaultLocale";
     Operation["CANCEL"] = "cancel";
+    Operation["SET_PAGINATION"] = "setPagination";
 })(Operation || (Operation = {}));
 const DataSource = {
     Operation
@@ -41205,6 +41206,16 @@ class PaginationService {
      */
     updateFieldsOnPagination(parent, newVal) {
         let fieldDefs = parent.widgetType === 'wm-table' ? parent.gridData : parent.fieldDefs;
+        // remove the deleted row from the list
+        if (parent.widgetType === 'wm-table' && (parent.gridOptions.isNavTypeScrollOrOndemand()) && parent.gridOptions.deletedRowIndex !== -1) {
+            fieldDefs.splice(parent.gridOptions.deletedRowIndex, 1);
+            parent.gridOptions.setDeletedRowIndex(-1);
+        }
+        // reset fieldDefs if last action performed is search or sort
+        if (parent.widgetType === 'wm-table' && (parent.gridOptions.isNavTypeScrollOrOndemand()) && (parent.gridOptions.lastActionPerformed === parent.gridOptions.ACTIONS.SEARCH_OR_SORT || parent.gridOptions.lastActionPerformed === parent.gridOptions.ACTIONS.FILTER_CRITERIA)) {
+            fieldDefs = [];
+            parent.gridOptions.setCurrentPage(1);
+        }
         let currentPage = parent.currentPage;
         const dataNavigator = parent.dataNavigator;
         const pagesize = parent.pagesize;
@@ -41225,11 +41236,11 @@ class PaginationService {
                     newVal = [];
                 }
                 else if (dataNavigator.dataSize < currentPage * pagesize) {
-                    // if number of elements added to datanavigator is less than  product of currentpage and pagesize we only add elements extra elements added
+                    // if number of elements added to dataNavigator is less than  product of currentPage and pageSize we only add elements extra elements added
                     itemsLength = dataNavigator.dataSize - fieldDefs.length;
                 }
                 else {
-                    // if number of elements added to datanavigator is greater than  product of currentpage and pagesize we add elements the extra elements in newVal
+                    // if number of elements added to dataNavigator is greater than  product of currentPage and pageSize we add elements the extra elements in newVal
                     itemsLength = currentPage * pagesize - fieldDefs.length;
                     currentPage++;
                 }
@@ -41242,9 +41253,36 @@ class PaginationService {
             }
             newVal = itemsToPush;
         }
-        fieldDefs = [...fieldDefs, ...newVal];
+        // Add unique records to fieldDefs
+        if (parent.widgetType === 'wm-table' && (parent.gridOptions.lastActionPerformed === parent.gridOptions.ACTIONS.DELETE || parent.gridOptions.lastActionPerformed === parent.gridOptions.ACTIONS.EDIT)) {
+            fieldDefs = this.getUniqueRecordsInFieldDef(fieldDefs, newVal);
+        }
+        else {
+            fieldDefs = [...fieldDefs, ...newVal];
+        }
         return [fieldDefs, currentPage];
     }
+    // Add the unique records to fieldDefs
+    getUniqueRecordsInFieldDef(fieldDefs, newVal) {
+        let flag = false;
+        if (!fieldDefs.length) {
+            fieldDefs = newVal;
+        }
+        else {
+            newVal.forEach(function (newObj) {
+                flag = false;
+                fieldDefs.forEach(function (obj) {
+                    if (_.isEqual(newObj, obj)) {
+                        flag = true;
+                    }
+                });
+                if (flag === false) {
+                    fieldDefs.push(newObj);
+                }
+            });
+        }
+        return fieldDefs;
+    }
     /**
      * @description
      * This function registers scroll events on the scrollable el, if the page doesn't have a scroll el then wheel event is registered on the requested node
@@ -41287,6 +41325,9 @@ class PaginationService {
                 let scrollTop;
                 // scrollingElement is undefined for IE, safari. use body as target Element
                 target = target === document ? (target.scrollingElement || document.body) : target;
+                if (parent.widgetType === 'wm-table' && parent.gridOptions.isNavTypeScrollOrOndemand()) {
+                    evt.stopPropagation();
+                }
                 clientHeight = target.clientHeight;
                 totalHeight = target.scrollHeight;
                 scrollTop = target === document.body ? $(window).scrollTop() : target.scrollTop;
@@ -41301,6 +41342,9 @@ class PaginationService {
         else {
             // if there is no scrollable element register wheel event on ul element
             $rootEl.on('wheel.scroll_evt', e => {
+                if (parent.widgetType === 'wm-table' && parent.gridOptions.isNavTypeScrollOrOndemand()) {
+                    e.stopPropagation();
+                }
                 if (e.originalEvent.deltaY > 0) {
                     $rootEl.off('wheel.scroll_evt');
                     this.debouncedFetchNextDatasetOnScroll(dataNavigator, debounceNum, parent)();
@@ -42381,7 +42425,7 @@ var search_build$1 = /*#__PURE__*/Object.freeze({
 const tagName$1m = 'div';
 register('wm-tree', () => {
     return {
-        pre: attrs => `<${tagName$1m} wmTree redrawable ${getAttrMarkup(attrs)}>`,
+        pre: attrs => `<${tagName$1m} wmTree ${getAttrMarkup(attrs)}>`,
         post: () => `</${tagName$1m}>`
     };
 });

angular-codegen/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wavemaker/angular-codegen",
-    "version": "11.0.0-rc.5164",
+    "version": "11.0.0-rc.5175",
     "description": "",
     "main": "index.js",
     "scripts": {