@rangertechnologies/ngnxt 2.1.142 → 2.1.143

package/fesm2022/rangertechnologies-ngnxt.mjs

@@ -5457,7 +5457,11 @@ class NxtDatatable {
         this.dropdownActionButton = (this.actionButtonArray?.buttonArray && this.actionButtonArray?.buttonArray?.length > 0) ? this.actionButtonArray?.buttonArray?.slice(this.actionButtonArray?.size) : [];
         this.selection = new SelectionModel(true, []);
         if (!this.totalRecords && this.data && this.isPagination) {
-            this.dataSource.data = this.data?.slice(0, this.pageSize || 10);
+            const pageIndex = Number(this.pageIndex) || 0;
+            const pageSize = Number(this.pageSize) || 10;
+            const start = (pageIndex - 1) * pageSize;
+            const end = start + pageSize;
+            this.dataSource.data = this.data?.slice(start, end) || [];
         }
         else if (!this.isPagination) {
             this.dataSource.data = this.data;
@@ -5545,7 +5549,7 @@ class NxtDatatable {
             });
             this.computeSummaryValues();
         }
-        this.searchConfigs && this.searchBoxValue ? this.emptySearch(this.searchBoxValue) : ''; // SKS17APR25 update search box value
+        this.searchConfigs && this.searchBoxValue ? this.emptySearch(this.searchBoxValue) : this.applyFilter(this.tableParams?.tableSearch, 'onChange'); // SKS17APR25 update search box value
     }
     ngOnInit() {
         this.dataSource = { data: [] }; // or use a proper data structure
@@ -5705,7 +5709,11 @@ class NxtDatatable {
         this.sFilterData = [...this.data];
         this.dataSource.data = this.originalData;
         if (!this.configPagination && this.data && this.isPagination) {
-            this.dataSource.data = this.data?.slice(0, this.pageSize || 10);
+            const pageIndex = Number(this.pageIndex) || 0;
+            const pageSize = Number(this.pageSize) || 10;
+            const start = (pageIndex - 1) * pageSize;
+            const end = start + pageSize;
+            this.dataSource.data = this.data?.slice(start, end) || [];
         }
         else if (!this.isPagination) {
             this.dataSource.data = this.data;
@@ -5839,7 +5847,11 @@ class NxtDatatable {
             });
             this.dataSource.data = this.data; // Update dataSource
             if (!this.totalRecords && this.data && this.isPagination) {
-                this.dataSource.data = this.data?.slice(0, this.pageSize || 10);
+                const pageIndex = Number(this.pageIndex) || 0;
+                const pageSize = Number(this.pageSize) || 10;
+                const start = (pageIndex - 1) * pageSize;
+                const end = start + pageSize;
+                this.dataSource.data = this.data?.slice(start, end) || [];
             }
             else if (!this.isPagination) {
                 this.dataSource.data = this.data;
@@ -5886,7 +5898,7 @@ class NxtDatatable {
         this.computeSummaryValues();
     }
     // SKS15FEB25 Custom sort function
-    sortData(column, sortingState, currentState) {
+    sortData(column, sortingState, currentState, from) {
         // Define sorting states
         const sortingStates = ['asc', 'desc', 'none'];
         if (!this.configPagination || this.dataSource.data.length === this.totalRecords) {
@@ -5946,7 +5958,11 @@ class NxtDatatable {
                 this.dataSource.data = data;
             }
             else {
-                this.dataSource.data = this.filterBoxData ? this.filterBoxData?.slice(0, this.pageSize || 10) : this.data?.slice(0, this.pageSize || 10);
+                const pageIndex = Number(this.pageIndex) || 0;
+                const pageSize = Number(this.pageSize) || 10;
+                const start = (pageIndex - 1) * pageSize;
+                const end = start + pageSize;
+                this.dataSource.data = this.filterBoxData ? this.filterBoxData?.slice(start, end) || [] : this.data?.slice(start, end) || [];
             }
         }
         else {
@@ -5963,10 +5979,13 @@ class NxtDatatable {
             }
             localStorage.setItem('NxtDataTable', JSON.stringify({ addRecord: false, pageSize: this.pageSize, pageIndex: this.pageIndex, currentSortColumn: this.currentSortColumn, currentSortDirection: this.currentSortDirection }));
             // Only sort if the direction is 'asc' or 'desc'
-            if (currentState !== true)
+            if (currentState !== true && from !== 'onChange')
                 this.NxtTableEmit.emit({ pagination: { pageSize: this.pageSize, pageIndex: this.pageIndex }, tableSearch: { fields: this.displayedColumns, value: this.searchBoxValue }, searchFilterData: this.filterDataArray, sort: { column: this.currentSortColumn, direction: this.currentSortDirection, listView: this.selectedView } });
         }
-        this.NxtTableParamsEmit.emit({ pagination: { pageSize: this.pageSize, pageIndex: this.pageIndex }, tableSearch: this.searchBoxValue, searchFilterData: this.filterDataArray, sort: { column: this.currentSortColumn, direction: this.currentSortDirection, listView: this.selectedView } });
+        if (from !== 'onChange')
+            this.NxtTableParamsEmit.emit({ pagination: { pageSize: this.pageSize, pageIndex: this.pageIndex }, tableSearch: this.searchBoxValue, searchFilterData: this.filterDataArray, sort: { column: this.currentSortColumn, direction: this.currentSortDirection, listView: this.selectedView } });
+        if (from === 'onChange')
+            this.pageParams(this.tableParams?.pagination, 'onChange');
     }
     onScroll(tableContainer) {
         this.isScrolled = tableContainer.scrollTop > 0;
@@ -5991,20 +6010,23 @@ class NxtDatatable {
         this.isResized = this.filterDataArray[this.selectedFilter]?.length > 0;
     }
     // SKS15FEB25  emitting pagr size and index to parent on paginating
-    pageParams(event) {
-        this.pageIndex = event.pageIndex;
-        this.pageSize = event.pageSize;
+    pageParams(event, from) {
+        this.pageIndex = event?.pageIndex || this.pageIndex;
+        this.pageSize = event?.pageSize || this.pageSize;
         this.filterTableNos = this.filterBoxData?.length;
         if (!this.configPagination || this.dataSource.data.length === this.totalRecords) {
-            this.applyFilter(this.searchBoxValue, 'pageParams');
-            const start = (Number(event.pageIndex) - 1) * Number(event.pageSize);
-            const end = start + Number(event.pageSize);
+            if (from !== 'onChange')
+                this.applyFilter(this.searchBoxValue, 'pageParams');
+            const start = (Number(this.pageIndex) - 1) * Number(this.pageSize);
+            const end = start + Number(this.pageSize);
             this.dataSource.data = this.filterBoxData?.slice(start, end);
         }
         else {
-            this.NxtTableEmit.emit({ pagination: { pageSize: event.pageSize, pageIndex: event.pageIndex }, tableSearch: { fields: this.displayedColumns, value: this.searchBoxValue }, searchFilterData: this.filterDataArray, sort: { column: this.currentSortColumn, direction: this.currentSortDirection, listView: this.selectedView } });
+            if (from !== 'onChange')
+                this.NxtTableEmit.emit({ pagination: { pageSize: this.pageSize, pageIndex: this.pageIndex }, tableSearch: { fields: this.displayedColumns, value: this.searchBoxValue }, searchFilterData: this.filterDataArray, sort: { column: this.currentSortColumn, direction: this.currentSortDirection, listView: this.selectedView } });
         }
-        this.NxtTableParamsEmit.emit({ pagination: { pageSize: this.pageSize, pageIndex: this.pageIndex }, tableSearch: this.searchBoxValue, searchFilterData: this.filterDataArray, sort: { column: this.currentSortColumn, direction: this.currentSortDirection, listView: this.selectedView } });
+        if (from !== 'onChange')
+            this.NxtTableParamsEmit.emit({ pagination: { pageSize: this.pageSize, pageIndex: this.pageIndex }, tableSearch: this.searchBoxValue, searchFilterData: this.filterDataArray, sort: { column: this.currentSortColumn, direction: this.currentSortDirection, listView: this.selectedView } });
     }
     // SKS15FEB25 apply search bar filter using mat
     applyFilter(event, from) {
@@ -6012,7 +6034,7 @@ class NxtDatatable {
         filterValue ? filterValue = filterValue.trim().toLowerCase() : filterValue = '';
         this.searchBoxValue = filterValue;
         if (!filterValue) {
-            this.dataSource.data = [...this.originalData]; // Reset to original data
+            this.dataSource.data = this.originalData;
         }
         else {
             this.dataSource.data = this.originalData.filter(item => this.displayedColumns.some(column => {
@@ -6020,7 +6042,7 @@ class NxtDatatable {
                 return value.includes(filterValue);
             }));
         }
-        if (from !== 'pageParams')
+        if (from !== 'pageParams' && from !== 'onChange')
             this.pageIndex = 1;
         this.sFilterData = this.dataSource.data;
         this.filterTableNos = this.sFilterData?.length;
@@ -6028,7 +6050,7 @@ class NxtDatatable {
         const start = (Number(this.pageIndex) - 1) * Number(this.pageSize);
         const end = start + Number(this.pageSize);
         this.dataSource.data = this.dataSource.data?.slice(start, end);
-        this.filterRetain(this.filterDataArray, from);
+        this.filterRetain(from === 'onChange' ? this.tableParams?.searchFilterData || this.filterDataArray : this.filterDataArray, from);
     }
     /** SKS15FEB25 Whether the number of selected elements matches the total number of rows. */
     isAllSelected() {
@@ -6075,6 +6097,14 @@ class NxtDatatable {
     tableClick(data) {
         this.tableRowClick.emit(data);
     }
+    getNestedValue(obj, path) {
+        if (!obj || !path)
+            return undefined;
+        return path
+            .replace(/\[(\d+)\]/g, '.$1') // turns "members[0]" into "members.0"
+            .split('.')
+            .reduce((acc, part) => (acc && acc[part] !== undefined) ? acc[part] : undefined, obj);
+    }
     //SKS15FEB25 Retain the filterdata
     filterRetain(filterkey, from) {
         if (filterkey && Object.keys(filterkey).length == 0) {
@@ -6094,14 +6124,17 @@ class NxtDatatable {
             else {
                 for (let key of Object.keys(filterkey)) {
                     if (filterkey[key]) {
-                        const data = this.sFilterData.filter((name) => filterkey[key]?.includes(name[key]));
+                        const data = this.sFilterData.filter((item) => {
+                            const value = this.getNestedValue(item, key);
+                            return filterkey[key].includes(value);
+                        });
                         const data1 = [...this.data, ...data];
                         this.data = this.removeDuplicates(data1);
                     }
                 }
             }
         }
-        if (from !== 'pageParams')
+        if (from !== 'pageParams' && from !== 'onChange')
             this.pageIndex = 1;
         const start = (Number(this.pageIndex) - 1) * Number(this.pageSize);
         const end = start + Number(this.pageSize);
@@ -6109,10 +6142,11 @@ class NxtDatatable {
         this.filterTableNos = this.filterBoxData?.length;
         this.dataSource.data = this.data?.slice(start, end);
         this.data = this.originalData;
-        this.sortData(this.currentSortColumn, this.currentSortDirection);
+        this.sortData(this.currentSortColumn, this.currentSortDirection, undefined, from);
     }
     // SKS15FEB25 to remove duplicate object from two arrays (safe stringify)
     removeDuplicates(objects) {
+        console.log("removeDuplicates", objects);
         const seen = new Set();
         const uniqueObjects = [];
         const safeStringify = (obj) => {
@@ -6204,7 +6238,7 @@ class NxtDatatable {
         return this.hyperLinkColumns?.includes(col) ? true : false;
     }
     // SKS15FEB25 on add record in table, the 'inlineElement' values will be assigned to the table data 
-    addTableRecord(element) {
+    addTableRecord(element, from) {
         if (!this.configPagination || this.dataSource.data.length === this.totalRecords) {
             var obj = {};
             const keys = Object.keys(element);
@@ -6263,13 +6297,15 @@ class NxtDatatable {
         else {
             const pageIndex = Math.ceil(this.totalRecords / 10);
             localStorage.setItem('NxtDataTable', JSON.stringify({ addRecord: true, pageSize: 10, pageIndex: pageIndex, currentSortColumn: this.currentSortColumn, currentSortDirection: this.currentSortDirection }));
-            this.NxtTableEmit.emit({ pagination: { pageSize: 10, pageIndex: pageIndex }, tableSearch: { fields: this.displayedColumns, value: this.searchBoxValue }, searchFilterData: this.filterDataArray, sort: { column: this.currentSortColumn, direction: this.currentSortDirection, listView: this.selectedView } });
+            if (from !== 'onChange')
+                this.NxtTableEmit.emit({ pagination: { pageSize: 10, pageIndex: pageIndex }, tableSearch: { fields: this.displayedColumns, value: this.searchBoxValue }, searchFilterData: this.filterDataArray, sort: { column: this.currentSortColumn, direction: this.currentSortDirection, listView: this.selectedView } });
         }
         if (this.from === 'formBuilder') {
             this.emitTableDataValue(this.dataSource.data);
         }
         this.computeSummaryValues();
-        this.NxtTableParamsEmit.emit({ pagination: { pageSize: this.pageSize, pageIndex: this.pageIndex }, tableSearch: this.searchBoxValue, searchFilterData: this.filterDataArray, sort: { column: this.currentSortColumn, direction: this.currentSortDirection, listView: this.selectedView } });
+        if (from !== 'onChange')
+            this.NxtTableParamsEmit.emit({ pagination: { pageSize: this.pageSize, pageIndex: this.pageIndex }, tableSearch: this.searchBoxValue, searchFilterData: this.filterDataArray, sort: { column: this.currentSortColumn, direction: this.currentSortDirection, listView: this.selectedView } });
     }
     // SKS15FEB25 Action button conditionally displayed function
     isConditionMet(element, conditions) {
@@ -6295,14 +6331,16 @@ class NxtDatatable {
         return this.timeColumns?.includes(column) ?? false;
     }
     // SKS15FEB25 config search filter box function
-    onSearch(event) {
+    onSearch(event, from) {
         this.searchBoxValue = event; // Update the displayed value in the search box
         if (this.searchConfigs || this.dataSource.data.length === this.totalRecords) {
             this.pageIndex = 1;
             this.pageSize = 10;
-            this.NxtTableEmit.emit({ pagination: { pageSize: this.pageSize, pageIndex: Number(this.pageIndex) }, tableSearch: { fields: this.displayedColumns, value: this.searchBoxValue }, searchFilterData: this.filterDataArray, sort: { column: this.currentSortColumn, direction: this.currentSortDirection, listView: this.selectedView } });
+            if (from !== 'onChange')
+                this.NxtTableEmit.emit({ pagination: { pageSize: this.pageSize, pageIndex: Number(this.pageIndex) }, tableSearch: { fields: this.displayedColumns, value: this.searchBoxValue }, searchFilterData: this.filterDataArray, sort: { column: this.currentSortColumn, direction: this.currentSortDirection, listView: this.selectedView } });
         }
-        this.NxtTableParamsEmit.emit({ pagination: { pageSize: this.pageSize, pageIndex: this.pageIndex }, tableSearch: this.searchBoxValue, searchFilterData: this.filterDataArray, sort: { column: this.currentSortColumn, direction: this.currentSortDirection, listView: this.selectedView } });
+        if (from !== 'onChange')
+            this.NxtTableParamsEmit.emit({ pagination: { pageSize: this.pageSize, pageIndex: this.pageIndex }, tableSearch: this.searchBoxValue, searchFilterData: this.filterDataArray, sort: { column: this.currentSortColumn, direction: this.currentSortDirection, listView: this.selectedView } });
     }
     // SKS15FEB25 If the value in the search box is empty, call the onSearch function automatically
     emptySearch(event) {
@@ -6339,7 +6377,7 @@ class NxtDatatable {
         }
     }
     // SKS15FEB25 for close search filter box
-    closefilter() {
+    closefilter(from) {
         this.pageSize = this.pageSize || 10;
         this.pageIndex = 1;
         this.filterDataArray[this.selectedFilter] = [];
@@ -6348,9 +6386,11 @@ class NxtDatatable {
             this.filterRetain(this.filterDataArray);
         }
         else {
-            this.NxtTableEmit.emit({ pagination: { pageSize: 10, pageIndex: 1 }, tableSearch: { fields: this.displayedColumns, value: this.searchBoxValue }, searchFilterData: this.filterDataArray, sort: { column: this.currentSortColumn, direction: this.currentSortDirection, listView: this.selectedView } });
+            if (from !== 'onChange')
+                this.NxtTableEmit.emit({ pagination: { pageSize: 10, pageIndex: 1 }, tableSearch: { fields: this.displayedColumns, value: this.searchBoxValue }, searchFilterData: this.filterDataArray, sort: { column: this.currentSortColumn, direction: this.currentSortDirection, listView: this.selectedView } });
         }
-        this.NxtTableParamsEmit.emit({ pagination: { pageSize: this.pageSize, pageIndex: this.pageIndex }, tableSearch: this.searchBoxValue, searchFilterData: this.filterDataArray, sort: { column: this.currentSortColumn, direction: this.currentSortDirection, listView: this.selectedView } });
+        if (from !== 'onChange')
+            this.NxtTableParamsEmit.emit({ pagination: { pageSize: this.pageSize, pageIndex: this.pageIndex }, tableSearch: this.searchBoxValue, searchFilterData: this.filterDataArray, sort: { column: this.currentSortColumn, direction: this.currentSortDirection, listView: this.selectedView } });
     }
     // SKS15FEB25 search filter box checkbox retain
     isSelected(event) {
@@ -6362,7 +6402,8 @@ class NxtDatatable {
         }
     }
     // SKS15FEB25 search filter box checkbox select
-    checkedData(event) {
+    checkedData(event, from) {
+        console.log("checkedData", event);
         let selectedArray = [];
         selectedArray = this.filterDataArray[this.selectedFilter] ? this.filterDataArray[this.selectedFilter] : [];
         if (selectedArray && selectedArray.includes(event)) {
@@ -6376,12 +6417,14 @@ class NxtDatatable {
         if (this.dataSource.data.length !== this.totalRecords && this.configPagination) {
             this.pageIndex = 1;
             this.pageSize = 10;
-            this.NxtTableEmit.emit({ pagination: { pageSize: this.pageSize, pageIndex: Number(this.pageIndex) }, tableSearch: { fields: this.displayedColumns, value: this.searchBoxValue }, searchFilterData: this.filterDataArray, sort: { column: this.currentSortColumn, direction: this.currentSortDirection, listView: this.selectedView } });
+            if (from !== 'onChange')
+                this.NxtTableEmit.emit({ pagination: { pageSize: this.pageSize, pageIndex: Number(this.pageIndex) }, tableSearch: { fields: this.displayedColumns, value: this.searchBoxValue }, searchFilterData: this.filterDataArray, sort: { column: this.currentSortColumn, direction: this.currentSortDirection, listView: this.selectedView } });
         }
         else {
             this.filterRetain(this.filterDataArray);
         }
-        this.NxtTableParamsEmit.emit({ pagination: { pageSize: this.pageSize, pageIndex: this.pageIndex }, tableSearch: this.searchBoxValue, searchFilterData: this.filterDataArray, sort: { column: this.currentSortColumn, direction: this.currentSortDirection, listView: this.selectedView } });
+        if (from !== 'onChange')
+            this.NxtTableParamsEmit.emit({ pagination: { pageSize: this.pageSize, pageIndex: this.pageIndex }, tableSearch: this.searchBoxValue, searchFilterData: this.filterDataArray, sort: { column: this.currentSortColumn, direction: this.currentSortDirection, listView: this.selectedView } });
     }
     // SKS15FEB25  action column dropdown buttons close
     addClickOutsideListener() {
@@ -14458,7 +14501,7 @@ const VERSION = {
     "semver": null,
     "suffix": "05a52cb-dirty",
     "semverString": null,
-    "version": "2.1.142"
+    "version": "2.1.143"
 };
 /* tslint:enable */