basesite-shared-grid-lib 15.10.225 → 15.10.237

package/fesm2022/basesite-shared-grid-lib.mjs

@@ -792,12 +792,7 @@ class OdataProvider {
         }
         Promise.race([me.cancelPromice.promise, me.callApi(query)]).then(async (x) => {
             if (!x) {
-                if (isServerMode) {
-                    params.fail();
-                }
-                else {
-                    params.failCallback();
-                }
+                // params.failCallback();
                 return;
             }
             else {
@@ -883,13 +878,7 @@ class OdataProvider {
                 }
             }
         }, (err) => {
-            console.error('OdataProvider getRows error:', err);
-            if (isServerMode) {
-                params.fail();
-            }
-            else {
-                params.failCallback();
-            }
+            me.setResult(params, isServerMode, [], 0);
             if (this.setError) {
                 this.setError(err, params);
             }
@@ -1249,7 +1238,12 @@ class GridLibraryComponent {
     }
     onSortChangedEvent(e) {
         this.gridColumnState = this.gridAPI.getState();
-        this.onSaveGridColumnState(e);
+        this.saveGridState(e);
+    }
+    saveGridState(e) {
+        if (!this.overrideColumnDefs) {
+            setTimeout(() => { this.onSaveGridColumnState(e); }, 2000);
+        }
     }
     ngOnInit() {
         this._tokenSharingService.updateToken(this.token);
@@ -1271,14 +1265,7 @@ class GridLibraryComponent {
     }
     configureDataState() {
         if (this.isOverride) {
-            // Ensure we have valid override data
-            if (this.overrideColumnDefs) {
-                this.overrideGridState(this.overrideColumnDefs);
-            }
-            else {
-                console.warn('Override column definitions are not available');
-                this.handleGridLoadingState(false);
-            }
+            this.overrideGridState(this.overrideColumnDefs);
         }
         else {
             this.gridAPI.resetColumnState();
@@ -1286,88 +1273,16 @@ class GridLibraryComponent {
             //setTimeout(() => { this.setGridState(); }, 2000);
         }
     }
-    // Add method to handle loading state during grid operations
-    handleGridLoadingState(showLoading = true) {
-        if (this.enableServerSidePaging && this.gridAPI) {
-            if (showLoading) {
-                this.gridAPI.showLoadingOverlay();
-            }
-            else {
-                // Use setTimeout to ensure the loading state is properly managed
-                setTimeout(() => {
-                    this.gridAPI.hideOverlay();
-                }, 100);
-            }
-        }
-    }
-    // Add method to validate grid state before applying
-    validateGridState(state) {
-        if (!state)
-            return false;
-        // Check if state has valid structure
-        const hasValidStructure = state && typeof state === 'object';
-        // Check if grid API is available
-        const hasGridAPI = this.gridAPI && typeof this.gridAPI.applyColumnState === 'function';
-        // Check if columns are available
-        const columns = this.gridAPI?.getColumns();
-        const hasColumns = columns && columns.length > 0;
-        console.log('Grid state validation:', {
-            hasValidStructure,
-            hasGridAPI,
-            hasColumns,
-            stateKeys: state ? Object.keys(state) : []
-        });
-        return hasValidStructure && hasGridAPI && hasColumns;
-    }
-    // Add method to ensure grid is ready before applying state
-    ensureGridReady() {
-        if (!this.isGridReady || !this.gridAPI) {
-            console.warn('Grid is not ready yet');
-            return false;
-        }
-        // Check if columns are defined
-        if (!this.columnDefs || this.columnDefs.length === 0) {
-            console.warn('Column definitions are not available');
-            return false;
-        }
-        return true;
-    }
-    // Add method to ensure grid has data and is properly configured
-    ensureGridDataReady() {
-        // Check if we have row data or if server-side paging is enabled
-        if (this.enableServerSidePaging) {
-            return true; // Server-side paging will handle data loading
-        }
-        // For client-side, check if we have row data
-        if (!this.rowData || (Array.isArray(this.rowData) && this.rowData.length === 0)) {
-            console.warn('No row data available for client-side grid');
-            return false;
-        }
-        return true;
-    }
     ngOnChanges(changes) {
         this.gridStateLoaded = false;
-        // Show loading state when changes occur
-        this.handleGridLoadingState(true);
         if (changes['userRoles']?.currentValue) {
             if (this.initialColumnDef?.length > 0 && this.userRoles?.length > 0) {
                 this.columnDefs = this._mapColumnDef(this.initialColumnDef, this.userRoles);
             }
         }
-        // Handle override column definitions changes
-        if (changes['overrideColumnDefs']?.currentValue) {
-            console.log('Override column definitions changed:', changes['overrideColumnDefs'].currentValue);
-            if (this.isGridReady) {
-                this.configureDataState();
-            }
-        }
         if (this.isGridReady) {
             this.configureDataState();
         }
-        // Hide loading state after a short delay to allow grid to process changes
-        setTimeout(() => {
-            this.handleGridLoadingState(false);
-        }, 500);
     }
     getColDef() {
         if (this.gridId && this.loggedInUser) {
@@ -1382,9 +1297,6 @@ class GridLibraryComponent {
                     this.exportColumnsList = response.result;
                     //changes done by raghav
                     if (this.isOverride) {
-                        // Set column definitions first, then apply override state
-                        this.columnDefs = coldef;
-                        this.gridColumns = coldef;
                         this.overrideGridState(this.overrideColumnDefs);
                     }
                     else {
@@ -1396,19 +1308,11 @@ class GridLibraryComponent {
                 }
                 else {
                     console.log('ColDef Read Error=>', response.message);
-                    // Ensure loading state is cleared on error
-                    this.handleGridLoadingState(false);
                 }
-            }, (error) => {
-                console.error('Error loading column definitions:', error);
-                // Ensure loading state is cleared on error
-                this.handleGridLoadingState(false);
             });
         }
         else {
             console.log('Please pass valid GridId and loggedIn user Id');
-            // Ensure loading state is cleared when required parameters are missing
-            this.handleGridLoadingState(false);
         }
     }
     _getColumnVisiblityStatus(column, userRoles) {
@@ -1733,256 +1637,59 @@ class GridLibraryComponent {
         this.isGridReady = true;
     }
     setGridState() {
-        try {
-            if (this.gridColumns && this.gridColumns.length > 0) {
-                var arrIndex = this.gridColumns.findIndex((x) => x.field == "createDac");
-                if (this.gridId == 1 && !this.canCreateDac(this.userRoles, "createDac")) {
-                    if (arrIndex > -1)
-                        this.gridColumns.splice(arrIndex, 1);
-                    var dacStatusIndex = this.gridColumns.findIndex((x) => x.field == "dacStatus");
-                    if (dacStatusIndex > -1)
-                        this.gridColumns.splice(dacStatusIndex, 1);
-                    this.columnDefs = this.gridColumns;
-                }
-                if (this.gridId == 1 && this.canCreateDac(this.userRoles, "createDac")) {
-                    this.gridColumns[arrIndex].hide = false;
-                }
+        if (this.gridColumns && this.gridColumns.length > 0) {
+            var arrIndex = this.gridColumns.findIndex((x) => x.field == "createDac");
+            if (this.gridId == 1 && !this.canCreateDac(this.userRoles, "createDac")) {
+                if (arrIndex > -1)
+                    this.gridColumns.splice(arrIndex, 1);
+                var dacStatusIndex = this.gridColumns.findIndex((x) => x.field == "dacStatus");
+                if (dacStatusIndex > -1)
+                    this.gridColumns.splice(dacStatusIndex, 1);
                 this.columnDefs = this.gridColumns;
             }
-            if (this.gridColumnState && this.gridAPI) {
-                // Apply column sizing if available
-                if (this.gridColumnState.columnSizing?.columnSizingModel) {
-                    try {
-                        this.gridAPI.applyColumnState({
-                            state: this.gridColumnState.columnSizing.columnSizingModel,
-                            applyOrder: true
-                        });
-                    }
-                    catch (error) {
-                        console.warn('Error applying column sizing state:', error);
-                    }
-                }
-                // Apply sorting if available
-                if (this.gridColumnState.sort?.sortModel) {
-                    try {
-                        this.gridAPI.applyColumnState({
-                            state: this.gridColumnState.sort.sortModel
-                        });
-                    }
-                    catch (error) {
-                        console.warn('Error applying sort state:', error);
-                    }
-                }
-                // Apply filters if available
-                if (this.gridColumnState.filter?.filterModel) {
-                    try {
-                        var filterModel = this.gridColumnState.filter.filterModel;
-                        this.gridAPI.setFilterModel(filterModel);
-                    }
-                    catch (error) {
-                        console.warn('Error applying filter state:', error);
-                    }
-                }
-                // Apply column visibility if available
-                if (this.gridColumnState.columnVisibility?.hiddenColIds) {
-                    try {
-                        var hiddenColumns = this.gridColumnState.columnVisibility.hiddenColIds;
-                        this.gridAPI.setColumnsVisible(hiddenColumns, false);
-                    }
-                    catch (error) {
-                        console.warn('Error applying column visibility state:', error);
-                    }
-                }
-            }
-            else {
-                // Fallback: apply basic column sizing
-                var columns = this.gridAPI?.getColumns();
-                if (columns && columns.length > 0) {
-                    if (columns.length > 15) {
-                        const allColumnIds = [];
-                        this.gridAPI.getColumns().forEach((column) => {
-                            allColumnIds.push(column.getId());
-                        });
-                        this.gridAPI.autoSizeColumns(allColumnIds, false);
-                    }
-                    else {
-                        this.gridAPI.sizeColumnsToFit();
-                    }
-                }
+            if (this.gridId == 1 && this.canCreateDac(this.userRoles, "createDac")) {
+                this.gridColumns[arrIndex].hide = false;
             }
+            this.columnDefs = this.gridColumns;
         }
-        catch (error) {
-            console.error('Error in setGridState:', error);
-            // Ensure loading state is cleared on error
-            this.handleGridLoadingState(false);
-        }
-    }
-    overrideGridState(overrideStateData) {
-        try {
-            console.log('Applying override grid state:', overrideStateData);
-            // Debug grid state
-            this.debugGridState();
-            // Ensure grid is ready before applying state
-            if (!this.ensureGridReady()) {
-                console.warn('Grid is not ready, deferring override state application');
-                // Defer the application until grid is ready
-                setTimeout(() => {
-                    this.overrideGridState(overrideStateData);
-                }, 500);
-                return;
+        if (this.gridColumnState) {
+            this.gridAPI?.applyColumnState({ state: this.gridColumnState.columnSizing?.columnSizingModel, applyOrder: true });
+            if (this.gridColumnState.sort) {
+                this.gridAPI?.applyColumnState({ state: this.gridColumnState.sort.sortModel });
             }
-            // Ensure column definitions are set in the grid
-            if (this.columnDefs && this.columnDefs.length > 0 && this.gridAPI) {
-                // Set column definitions in the grid if not already set
-                const currentColDefs = this.gridAPI.getColumnDefs();
-                if (!currentColDefs || currentColDefs.length === 0) {
-                    console.log('Setting column definitions in grid before applying override state');
-                    this.gridAPI.setColumnDefs(this.columnDefs);
-                    // Wait a bit for the columns to be set
-                    setTimeout(() => {
-                        this.applyOverrideState(overrideStateData);
-                    }, 100);
-                    return;
-                }
+            if (this.gridColumnState.filter) {
+                var filterModel = this.gridColumnState.filter.filterModel;
+                this.gridAPI?.setFilterModel(filterModel);
             }
-            // Ensure grid has data ready
-            if (!this.ensureGridDataReady()) {
-                console.warn('Grid data is not ready, deferring override state application');
-                setTimeout(() => {
-                    this.overrideGridState(overrideStateData);
-                }, 1000);
-                return;
+            if (this.gridColumnState.columnVisibility) {
+                var hiddenColumns = this.gridColumnState.columnVisibility.hiddenColIds;
+                this.gridAPI?.setColumnsVisible(hiddenColumns, false);
             }
-            // Apply the override state
-            this.applyOverrideState(overrideStateData);
         }
-        catch (error) {
-            console.error('Error in overrideGridState:', error);
-            this.handleGridLoadingState(false);
-        }
-    }
-    // Separate method to apply the actual override state
-    applyOverrideState(overrideStateData) {
-        try {
-            // Parse the override state data
-            const parsedState = JSON.parse(overrideStateData);
-            // Validate the state before applying
-            if (!this.validateGridState(parsedState)) {
-                console.warn('Invalid grid state, skipping override');
-                this.handleGridLoadingState(false);
-                return;
-            }
-            // Store the override state
-            this.gridColumnState = parsedState;
-            // Apply the state without resetting column state first
-            if (parsedState) {
-                // Apply column sizing if available
-                if (parsedState.columnSizing?.columnSizingModel) {
-                    try {
-                        this.gridAPI?.applyColumnState({
-                            state: parsedState.columnSizing.columnSizingModel,
-                            applyOrder: true
-                        });
-                    }
-                    catch (error) {
-                        console.warn('Error applying column sizing in override:', error);
-                    }
-                }
-                // Apply sorting if available
-                if (parsedState.sort?.sortModel) {
-                    try {
-                        this.gridAPI?.applyColumnState({
-                            state: parsedState.sort.sortModel
-                        });
-                    }
-                    catch (error) {
-                        console.warn('Error applying sort in override:', error);
-                    }
-                }
-                // Apply filters if available
-                if (parsedState.filter?.filterModel) {
-                    try {
-                        this.gridAPI?.setFilterModel(parsedState.filter.filterModel);
-                    }
-                    catch (error) {
-                        console.warn('Error applying filter in override:', error);
-                    }
+        else {
+            var columns = this.gridAPI.getColumns();
+            if (columns && columns.length > 0) {
+                if (columns.length > 15) {
+                    const allColumnIds = [];
+                    this.gridAPI.getColumns().forEach((column) => {
+                        allColumnIds.push(column.getId());
+                    });
+                    this.gridAPI.autoSizeColumns(allColumnIds, false);
                 }
-                // Apply column visibility if available
-                if (parsedState.columnVisibility?.hiddenColIds) {
-                    try {
-                        this.gridAPI?.setColumnsVisible(parsedState.columnVisibility.hiddenColIds, false);
-                    }
-                    catch (error) {
-                        console.warn('Error applying column visibility in override:', error);
-                    }
+                else {
+                    this.gridAPI.sizeColumnsToFit();
                 }
             }
-            // Refresh grid after state is applied
-            setTimeout(() => {
-                this.refreshGridAfterStateChange();
-                this.handleGridLoadingState(false);
-            }, 100);
-        }
-        catch (error) {
-            console.error('Error applying override grid state:', error);
-            this.handleGridLoadingState(false);
-            // Fallback: refresh grid
-            setTimeout(() => {
-                this.refreshGridAfterStateChange();
-            }, 100);
         }
     }
-    // Add method to refresh grid after state changes
-    refreshGridAfterStateChange() {
-        if (this.gridAPI) {
-            // Force grid to refresh
-            this.gridAPI.refreshCells();
-            this.gridAPI.redrawRows();
-            // Ensure overlay is hidden
-            this.gridAPI.hideOverlay();
-            // Auto-size columns
-            setTimeout(() => {
-                this.gridAPI.autoSizeAllColumns();
-            }, 200);
-        }
-    }
-    // Add method to ensure grid is properly initialized with data
-    ensureGridInitialized() {
-        if (!this.gridAPI)
-            return false;
-        // Check if grid has columns
-        const columns = this.gridAPI.getColumns();
-        if (!columns || columns.length === 0) {
-            console.warn('Grid has no columns, cannot apply override state');
-            return false;
-        }
-        // For client-side grids, ensure we have data
-        if (!this.enableServerSidePaging) {
-            if (!this.rowData || (Array.isArray(this.rowData) && this.rowData.length === 0)) {
-                console.warn('Client-side grid has no data');
-                return false;
-            }
-        }
-        return true;
-    }
-    // Add debug method to help troubleshoot white screen issues
-    debugGridState() {
-        console.log('=== Grid Debug Info ===');
-        console.log('isGridReady:', this.isGridReady);
-        console.log('gridAPI exists:', !!this.gridAPI);
-        console.log('columnDefs length:', this.columnDefs?.length);
-        console.log('gridColumns length:', this.gridColumns?.length);
-        console.log('rowData length:', this.rowData?.length);
-        console.log('enableServerSidePaging:', this.enableServerSidePaging);
-        console.log('isOverride:', this.isOverride);
-        console.log('overrideColumnDefs:', this.overrideColumnDefs);
-        if (this.gridAPI) {
-            const columns = this.gridAPI.getColumns();
-            console.log('Grid columns count:', columns?.length);
-            console.log('Grid column definitions:', this.gridAPI.getColumnDefs()?.length);
-        }
-        console.log('========================');
+    overrideGridState(overrideStateData) {
+        this.gridAPI.showLoadingOverlay();
+        this.gridAPI.resetColumnState();
+        this.gridColumnState = JSON.parse(overrideStateData);
+        this.setGridState();
+        this.gridAPI.autoSizeAllColumns();
+        setTimeout(() => { this.gridAPI.autoSizeAllColumns(); }, 2000);
+        setTimeout(() => { this.gridAPI.hideOverlay(); }, 500);
     }
     getGridState() {
         this.gridStateLoaded = false;
@@ -1996,13 +1703,10 @@ class GridLibraryComponent {
                     response.result.gridConfig) {
                     this.defaultGridState = JSON.parse(response.result.gridConfig);
                     if (!this.isOverride) {
+                        this.gridAPI.showLoadingOverlay();
                         this.gridColumnState = JSON.parse(response.result.gridConfig);
                         this.setGridState();
-                        setTimeout(() => {
-                            this.gridStateLoaded = true;
-                            // Ensure loading state is properly managed after grid state is loaded
-                            this.handleGridLoadingState(false);
-                        }, 3000);
+                        setTimeout(() => { this.gridStateLoaded = true; this.gridAPI.hideOverlay(); }, 1000);
                         //let manualEvent = { type: 'columnResized' };
                         //this.onSaveGridColumnState(manualEvent);
                     }
@@ -2010,13 +1714,7 @@ class GridLibraryComponent {
                 else {
                     //this.setGridState();
                     console.log('Error while loading grid state');
-                    // Ensure loading state is cleared even on error
-                    this.handleGridLoadingState(false);
                 }
-            }, (error) => {
-                console.error('Error loading grid state:', error);
-                // Ensure loading state is cleared on error
-                this.handleGridLoadingState(false);
             });
         }
     }
@@ -2117,7 +1815,7 @@ class GridLibraryComponent {
         this.selectionChanged.emit(e);
     }
     onFilterChanged(e) {
-        this.onSaveGridColumnState(e);
+        this.saveGridState(e);
         this.filterChanged.emit(e);
     }
     onFirstDataRendered(e) {
@@ -2207,10 +1905,6 @@ class GridLibraryComponent {
     //custom pagination ends...
     //destroy all associated subscriptions on component destroy
     ngOnDestroy() {
-        // Ensure loading state is cleared when component is destroyed
-        if (this.gridAPI) {
-            this.gridAPI.hideOverlay();
-        }
         this.unsubscribe$.next();
         this.unsubscribe$.complete();
     }
@@ -2235,10 +1929,10 @@ class GridLibraryComponent {
       [cacheBlockSize]="cacheBlockSize"
       [maxConcurrentDatasourceRequests]="1"
       [blockLoadDebounceMillis]="100"
-      (columnVisible)="onSaveGridColumnState($event)"
-      (columnPinned)="onSaveGridColumnState($event)"
-      (columnResized)="onSaveGridColumnState($event)"
-      (columnMoved)="onSaveGridColumnState($event)"
+      (columnVisible)="saveGridState($event)"
+      (columnPinned)="saveGridState($event)"
+      (columnResized)="saveGridState($event)"
+      (columnMoved)="saveGridState($event)"
       (sortChanged)="onSortChangedEvent($event)"
       [rowMultiSelectWithClick]="rowMultiSelectWithClick"
       [getContextMenuItems]="getContextMenuItems"
@@ -2317,10 +2011,10 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.0.5", ngImpor
       [cacheBlockSize]="cacheBlockSize"
       [maxConcurrentDatasourceRequests]="1"
       [blockLoadDebounceMillis]="100"
-      (columnVisible)="onSaveGridColumnState($event)"
-      (columnPinned)="onSaveGridColumnState($event)"
-      (columnResized)="onSaveGridColumnState($event)"
-      (columnMoved)="onSaveGridColumnState($event)"
+      (columnVisible)="saveGridState($event)"
+      (columnPinned)="saveGridState($event)"
+      (columnResized)="saveGridState($event)"
+      (columnMoved)="saveGridState($event)"
       (sortChanged)="onSortChangedEvent($event)"
       [rowMultiSelectWithClick]="rowMultiSelectWithClick"
       [getContextMenuItems]="getContextMenuItems"