@servicemind.tis/tis-smart-table-viewer 2.3.5 → 2.3.7

package/fesm2022/servicemind.tis-tis-smart-table-viewer.mjs

@@ -89,14 +89,12 @@ class ApiDataSource {
         this.loadingSubject.next(true);
         this.apiSubs = this.apiService.getList(url, (pageIndex + 1), pageSize, search, { filter }, { sortFilter }).pipe(catchError(() => of([])), finalize(() => this.loadingSubject.next(false))).subscribe(r => {
             console.log(`DataSource: Url: ${url}, Reply:`, r);
-            if (r?.data?.length > 0) {
-                this.totalDataLength.next(r?.total);
-            }
-            else {
-                this.totalDataLength.next(0);
-            }
-            this.apiSubject.next(r?.data);
-            this.extraDataSubject.next(r?.extraData);
+            // ✅ FIX: Ensure we always emit an array (even if empty) to prevent undefined issues
+            const data = r?.data || [];
+            const total = (Array.isArray(data) && data.length > 0) ? (r?.total || data.length) : 0;
+            this.totalDataLength.next(total);
+            this.apiSubject.next(data);
+            this.extraDataSubject.next(r?.extraData || null);
         });
     }
     loadWithCancellation(url, pageIndex, pageSize, search, filter, sortFilter, cancelSubject) {
@@ -111,14 +109,12 @@ class ApiDataSource {
         }
         this.apiSubs = apiCall$.subscribe(r => {
             console.log(`DataSource: Url: ${url}, Reply:`, r);
-            if (r?.data?.length > 0) {
-                this.totalDataLength.next(r?.total);
-            }
-            else {
-                this.totalDataLength.next(0);
-            }
-            this.apiSubject.next(r?.data);
-            this.extraDataSubject.next(r?.extraData);
+            // ✅ FIX: Ensure we always emit an array (even if empty) to prevent undefined issues
+            const data = r?.data || [];
+            const total = (Array.isArray(data) && data.length > 0) ? (r?.total || data.length) : 0;
+            this.totalDataLength.next(total);
+            this.apiSubject.next(data);
+            this.extraDataSubject.next(r?.extraData || null);
         });
     }
 }
@@ -2096,12 +2092,18 @@ class TisSmartTableViewerComponent {
         }
         if (changes['loadDataApiBaseUrl']) {
             if (changes['loadDataApiBaseUrl'].currentValue) {
+                // Clean up existing subscriptions
                 if (this.loadingSubscription) {
                     this.loadingSubscription.unsubscribe();
                 }
                 if (this.dataLengthSubscription) {
                     this.dataLengthSubscription.unsubscribe();
                 }
+                // ✅ FIX: Disconnect previous dataSource to prevent memory leaks
+                if (this.dataSource) {
+                    this.dataSource.disconnect({});
+                }
+                // Create new ApiDataSource
                 this.dataSource = new ApiDataSource(this.apiService);
                 this.loadingSubscription = this.dataSource.loading$.subscribe(loading => {
                     if (!loading) {
@@ -2109,11 +2111,14 @@ class TisSmartTableViewerComponent {
                             this._paginator.pageIndex = this.pageIndex;
                             this._paginator.pageSize = this.pageSize;
                         }
+                        // ✅ FIX: Always clear caches when new data arrives (even if empty)
                         // Clear background cache when new data arrives
                         this.clearRowBackgroundCache();
                         // Pre-compute all row backgrounds for optimal performance
                         this.computeAllRowBackgrounds();
+                        // ✅ FIX: Ensure selection state is updated even when data changes from empty to populated
                         this.checkAllRowsSelected();
+                        // ✅ FIX: Force change detection by emitting events
                         this.onDataLoaded.emit(true);
                         this.onSetExtraData.emit(this.dataSource.extraDataSubject.value);
                         // if (this.selectedRowIds && this.selectedRowIds.length) {
@@ -2136,8 +2141,12 @@ class TisSmartTableViewerComponent {
             if (this.filterFormGroupSubscription) {
                 this.filterFormGroupSubscription.unsubscribe();
             }
+            // ✅ FIX: Use custom comparator for distinctUntilChanged to properly detect form value changes
             this.filterFormGroupSubscription = this.filterFormGroup.valueChanges
-                .pipe(takeUntil(this._onDestroy), distinctUntilChanged()).subscribe(val => {
+                .pipe(takeUntil(this._onDestroy), distinctUntilChanged((prev, curr) => {
+                // Custom comparator: deep compare form values
+                return JSON.stringify(prev) === JSON.stringify(curr);
+            })).subscribe(val => {
                 this.filterHasNonEmptyValue = ValidationHelper.hasNonEmptyValue(val);
             });
         }
@@ -2283,11 +2292,21 @@ class TisSmartTableViewerComponent {
     }
     // Compute all row backgrounds when data changes (runs once per data load)
     computeAllRowBackgrounds() {
-        if (!this.dataSource?.apiSubject.value || !this.rowsConfig.backgroundApplyFunction) {
+        // ✅ FIX: Always clear the cache first to ensure fresh computation
+        this.computedRowBackgrounds.clear();
+        // ✅ FIX: Safely check if we have data and a background function
+        if (!this.dataSource?.apiSubject?.value ||
+            !Array.isArray(this.dataSource.apiSubject.value) ||
+            !this.rowsConfig.backgroundApplyFunction) {
+            return;
+        }
+        // ✅ FIX: Only compute backgrounds if we have actual data
+        if (this.dataSource.apiSubject.value.length === 0) {
             return;
         }
-        this.computedRowBackgrounds.clear();
         this.dataSource.apiSubject.value.forEach((row) => {
+            if (!row)
+                return; // Skip null/undefined rows
             const rowId = row?.id || row?.[this.selectedRowKey] || JSON.stringify(row);
             try {
                 const background = this.rowsConfig.backgroundApplyFunction(row);
@@ -2376,6 +2395,8 @@ class TisSmartTableViewerComponent {
         this.isAllExpanded = false;
         // Clear expansion state when loading new data to avoid stale expansion state
         CollectionHelper.clearSet(this.expandedRowIds);
+        // ✅ FIX: Clear row background cache before loading new data to prevent stale computed backgrounds
+        this.clearRowBackgroundCache();
         const filterFormData = this.filterFormGroup?.value;
         this.filterHasNonEmptyValue = ValidationHelper.hasFormData(filterFormData);
         // Build query string using helper
@@ -2436,6 +2457,10 @@ class TisSmartTableViewerComponent {
         UrlHelper.safeNavigate(this.router, url);
     }
     toggleSelection(status, row) {
+        // ✅ Add null guards to prevent crashes
+        if (!row || !ValidationHelper.hasRowKey(row, this.selectedRowKey)) {
+            return;
+        }
         if (this.onlySingleSelection && status.checked) {
             this.selection.clear();
         }
@@ -2445,16 +2470,29 @@ class TisSmartTableViewerComponent {
         this.checkAllRowsSelected();
     }
     checkAllRowsSelected() {
+        // ✅ Add comprehensive null guards to prevent crashes
+        if (!this.dataSource?.apiSubject?.value || !Array.isArray(this.dataSource.apiSubject.value)) {
+            this.isAllRowsSelected = false;
+            this.allRowsSelectedChange.emit(this.isAllRowsSelected);
+            return;
+        }
         this.isAllRowsSelected = this.selection.selected.length === this.dataSource.apiSubject.value.length;
         this.allRowsSelectedChange.emit(this.isAllRowsSelected);
     }
     toggleAllRows() {
+        // ✅ Add comprehensive null guards
+        if (!this.dataSource?.apiSubject?.value || !Array.isArray(this.dataSource.apiSubject.value)) {
+            return;
+        }
         if (this.isAllRowsSelected) {
             this.selection.clear();
         }
         else {
             this.dataSource.apiSubject.value.forEach(row => {
-                this.selection.select(row);
+                // ✅ Validate each row before selecting
+                if (row && ValidationHelper.hasRowKey(row, this.selectedRowKey)) {
+                    this.selection.select(row);
+                }
             });
         }
         this.selectedRows = this.selection.selected;
@@ -2465,8 +2503,13 @@ class TisSmartTableViewerComponent {
         $event.stopPropagation();
     }
     isChecked(row) {
-        return ValidationHelper.hasRowKey(row, this.selectedRowKey) &&
-            this.selectedIds.has(row[this.selectedRowKey]);
+        // ✅ Add comprehensive null guards
+        if (!row ||
+            !ValidationHelper.hasRowKey(row, this.selectedRowKey) ||
+            !this.selectedIds) {
+            return false;
+        }
+        return this.selectedIds.has(row[this.selectedRowKey]);
     }
     getQueryParams(url) {
         return QueryParamsHelper.parseQueryParams(url);
@@ -2525,6 +2568,10 @@ class TisSmartTableViewerComponent {
         return this.computedRowBackgrounds.get(rowId) || null;
     }
     drop(event) {
+        // ✅ Add null guards to prevent crashes
+        if (!this.dataSource?.apiSubject?.value || !Array.isArray(this.dataSource.apiSubject.value)) {
+            return;
+        }
         // Ignore if the item was dropped at the same index
         if (event.previousIndex === event.currentIndex) {
             return;
@@ -2548,14 +2595,28 @@ class TisSmartTableViewerComponent {
         UrlHelper.handleSecondaryButtonClick(this.router, config);
     }
     setSelectedRows() {
+        // ✅ Add null guards to prevent crashes
+        if (!this.dataSource?.apiSubject?.value ||
+            !Array.isArray(this.dataSource.apiSubject.value) ||
+            !this.selectedRowIds) {
+            this.selection.clear();
+            this.selectedRows = [];
+            this.selectedRowsChange.emit(this.selectedRows);
+            return;
+        }
         this.selection.clear();
+        // ✅ FIX: Convert array to Set for O(1) lookup instead of O(n) indexOf
+        const selectedIdsSet = new Set(this.selectedRowIds);
         this.dataSource.apiSubject.value.forEach(row => {
-            if (this.selectedRowIds.indexOf(row[this.selectedRowKey]) != -1) {
+            if (row &&
+                ValidationHelper.hasRowKey(row, this.selectedRowKey) &&
+                selectedIdsSet.has(row[this.selectedRowKey])) {
                 this.selection.select(row);
             }
         });
         this.selectedRows = this.selection.selected;
         this.selectedRowsChange.emit(this.selectedRows);
+        this.checkAllRowsSelected();
     }
     resetSelectedRows() {
         this.isAllRowsSelected = false;