@unifylib/ui-lib 1.2.33 → 1.2.35

package/fesm2022/iq-ui-lib.mjs

@@ -1,5 +1,5 @@
 import * as i0 from '@angular/core';
-import { HostListener, Input, Inject, Component, EventEmitter, Output, Injectable, signal, ViewChild, forwardRef, Directive, model, computed, inject, effect } from '@angular/core';
+import { HostListener, Input, Inject, Component, EventEmitter, Output, Injectable, signal, ViewChild, forwardRef, Directive, model, computed, inject } from '@angular/core';
 import * as i1$1 from '@angular/common';
 import { CommonModule, NgForOf, NgIf, NgClass, AsyncPipe, NgSwitch, NgTemplateOutlet, KeyValuePipe, NgSwitchCase, DatePipe, CurrencyPipe, NgStyle, formatDate, NgSwitchDefault, DecimalPipe } from '@angular/common';
 import * as i1 from '@angular/material/dialog';
@@ -3536,16 +3536,12 @@ class BaseTableComponent extends BaseUtils {
         this.totalRequiredCountItem = 0;
         this.clickRoutePage = new EventEmitter();
         this.sortState = {};
+        this.initialDataLoadScheduled = false;
         this.groupNames = [];
         this.groupSpans = new Map();
         this.dataSource = new MatTableDataSource();
         this.columns = [];
         this.filterRequest = new FilterRequest();
-        effect(() => {
-            if (this.pageInfo.lazyLoadData !== true || this.enforceRefresh === true) {
-                this.loadData();
-            }
-        });
     }
     ngOnDestroy() {
     }
@@ -3617,10 +3613,16 @@ class BaseTableComponent extends BaseUtils {
         return this.columns.find(c => c.property === property);
     }
     getSortDirection(property) {
-        if (this.reportRequest?.filterRequest?.sortKey) {
-            return this.reportRequest.filterRequest.sortDirection === 'ASC' ? 'asc' : 'desc';
+        const sortKey = this.reportRequest?.filterRequest?.sortKey;
+        if (!sortKey || !this.isSortedColumn(property, sortKey)) {
+            return '';
         }
-        return '';
+        return this.reportRequest.filterRequest.sortDirection === 'ASC' ? 'asc' : 'desc';
+    }
+    isSortedColumn(property, sortKey) {
+        const column = this.getColumn(property);
+        const columnSortKey = column?.sortKey ?? property;
+        return sortKey === columnSortKey || sortKey === property;
     }
     handleSortClick(property) {
         const COLUMN = this.getColumn(property);
@@ -3695,14 +3697,18 @@ class BaseTableComponent extends BaseUtils {
             ];
         }
         this.reportRequest.filterRequest.pageSize = this.pageSize;
+        if (this.manageablePages) {
+            this.syncClientDataSource();
+            return;
+        }
         if (this.separateEndpointData || !this.pageInfo.apiUri || this.pageInfo.apiUri.length === 0) {
-            this.dataSource.data = this.separateEndpointData;
-            queueMicrotask(() => this.announceTableResults());
+            this.syncClientDataSource();
+            return;
         }
-        else if (this.reportRequest == undefined) {
+        if (this.reportRequest == undefined) {
             return;
         }
-        else if (!this.manageablePages) {
+        if (!this.manageablePages) {
             this.timer = setTimeout(() => {
                 this.reportRequest.filterRequest.pageSize = this.pageSize;
                 this.reportRequest.filterRequest.columns = this.columns?.filter(c => FRONT_END_COLUMN_TYPES.indexOf(c.type) < 0).map(c => c.property) || [];
@@ -3731,6 +3737,11 @@ class BaseTableComponent extends BaseUtils {
             }, 300);
         }
     }
+    syncClientDataSource() {
+        const rows = this.customizedData?.data ?? this.separateEndpointData ?? [];
+        this.dataSource.data = rows;
+        queueMicrotask(() => this.announceTableResults());
+    }
     announceTableResults() {
         const visible = this.dataSource?.data?.length ?? 0;
         const total = this.totalElements ?? visible;
@@ -3747,11 +3758,16 @@ class BaseTableComponent extends BaseUtils {
         return element.stateType;
     }
     ngOnChanges(changes) {
-        if (changes["customizedData"] && !changes["customizedData"].isFirstChange()) {
-            this.dataSource.data = changes["customizedData"].currentValue?.data || []; // Update data source with new data
-            this.pagesCount = this.totalPagesCount;
-            this.pageIndex = this.currentPageIndex;
-            queueMicrotask(() => this.announceTableResults());
+        if (changes["customizedData"]) {
+            const dataSource = changes["customizedData"].currentValue;
+            if (dataSource) {
+                this.dataSource = dataSource;
+            }
+            this.syncClientDataSource();
+            if (!changes["customizedData"].isFirstChange()) {
+                this.pagesCount = this.totalPagesCount;
+                this.pageIndex = this.currentPageIndex;
+            }
         }
         if (changes["enforceRefresh"] && !changes["enforceRefresh"].isFirstChange()) {
             this.loadData();
@@ -3759,6 +3775,22 @@ class BaseTableComponent extends BaseUtils {
         if (changes["isPending"] && !changes["isPending"].isFirstChange()) {
             this.loadData();
         }
+        if (changes['pageInfo'] || changes['columns']) {
+            this.scheduleInitialLoad();
+        }
+    }
+    scheduleInitialLoad() {
+        if (this.initialDataLoadScheduled || this.manageablePages) {
+            return;
+        }
+        if (this.pageInfo.lazyLoadData === true && this.enforceRefresh !== true) {
+            return;
+        }
+        if (!this.pageInfo?.apiUri && !this.separateEndpointData && !this.customizedData) {
+            return;
+        }
+        this.initialDataLoadScheduled = true;
+        queueMicrotask(() => this.loadData());
     }
     getCroppedText(elementValue, subWidth = 20) {
         return elementValue && elementValue.length > subWidth ? elementValue.substring(0, subWidth) + "..." : elementValue;
@@ -3958,6 +3990,9 @@ class BaseTableComponent extends BaseUtils {
         this.reportRequest.filterRequest.sortDirection = $event.direction === 'asc' ? 'ASC' : 'DESC';
         this.reportRequest.filterRequest.pageIndex = 0;
         this.selectedColumn.emit($event);
+        if (this.manageablePages) {
+            return;
+        }
         this.loadData();
     }
     shouldShowButton(element) {
@@ -4008,7 +4043,6 @@ class BaseTableComponent extends BaseUtils {
     }
     hasFiltersApplied() {
         return (this.advancedAppliedFilter && this.advancedAppliedFilter.length > 0) ||
-            (this.filters && this.filters.length > 0) ||
             (this.pendingFilters && this.pendingFilters.length > 0);
     }
     getDisplaySvgPath() {