cat-qw-lib 1.0.11 → 1.0.12

package/fesm2022/cat-qw-lib.mjs

@@ -5504,13 +5504,116 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.5", ngImpor
             args: [{ providedIn: "root" }]
         }], ctorParameters: () => [{ type: QueueStore }, { type: i1$1.HttpClient }, { type: AppConfigService }, { type: ListService }] });
 
+class QueueFilterDropdownService {
+    filter = {
+        riskRating: null,
+        applicationType: null,
+        purchaseType: null,
+        taskStatus: null,
+        financeMin: null,
+        financeMax: null,
+        pendingDays: null
+    };
+    setRiskRating(rating) {
+        this.filter.riskRating = this.filter.riskRating === rating ? null : rating;
+    }
+    setApplicationType(type) {
+        this.filter.applicationType = this.filter.applicationType === type ? null : type;
+    }
+    setPurchaseType(type) {
+        this.filter.purchaseType = this.filter.purchaseType === type ? null : type;
+    }
+    setTaskStatus(status) {
+        this.filter.taskStatus = this.filter.taskStatus === status ? null : status;
+    }
+    setFinanceMin(min) {
+        this.filter.financeMin = min;
+    }
+    setFinanceMax(max) {
+        this.filter.financeMax = max;
+    }
+    setPendingDays(days) {
+        this.filter.pendingDays = days;
+    }
+    setAllFilters(filters) {
+        this.filter = { ...filters };
+    }
+    getFilters() {
+        return { ...this.filter };
+    }
+    hasFilters() {
+        return Object.values(this.filter).some(value => value !== null);
+    }
+    getFilterCount() {
+        return Object.values(this.filter).filter(value => value !== null).length;
+    }
+    clearAll() {
+        this.filter = {
+            riskRating: null,
+            applicationType: null,
+            purchaseType: null,
+            taskStatus: null,
+            financeMin: null,
+            financeMax: null,
+            pendingDays: null
+        };
+    }
+    /**
+     * Builds a query string for API calls based on the current filter values.
+     * Maps UI filter values to API parameters.
+     */
+    buildFilterQueryString(filters) {
+        if (!filters || Object.keys(filters).length === 0) {
+            return '';
+        }
+        const filterParams = {};
+        // Map filter properties to API parameters
+        if (filters.riskRating) {
+            filterParams['risk'] = filters.riskRating; // risk=Low/Medium/High
+        }
+        if (filters.applicationType) {
+            filterParams['lendingType'] = filters.applicationType; // lendingType=HPP/BTL
+        }
+        if (filters.purchaseType) {
+            filterParams['purchaseType'] = filters.purchaseType; // purchaseType=Purchase/Refinance
+        }
+        // Add mapping for taskStatus UI values to API values
+        const taskStatusMap = {
+            'Not Started': 'notStarted',
+            'In-progress': 'inProgress',
+            'Completed': 'completed'
+        };
+        if (filters.taskStatus) {
+            filterParams['taskStatus'] = taskStatusMap[filters.taskStatus] || filters.taskStatus;
+        }
+        if (filters.financeMin !== null && filters.financeMin !== undefined) {
+            filterParams['minFinanace'] = filters.financeMin.toString(); // minFinanace=50000
+        }
+        if (filters.financeMax !== null && filters.financeMax !== undefined) {
+            filterParams['maxFinanace'] = filters.financeMax.toString(); // maxFinanace=50000
+        }
+        if (filters.pendingDays !== null && filters.pendingDays !== undefined) {
+            filterParams['pendingDays'] = filters.pendingDays.toString(); // pendingDays=120
+        }
+        return new URLSearchParams(filterParams).toString();
+    }
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.5", ngImport: i0, type: QueueFilterDropdownService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
+    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.2.5", ngImport: i0, type: QueueFilterDropdownService, providedIn: 'root' });
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.5", ngImport: i0, type: QueueFilterDropdownService, decorators: [{
+            type: Injectable,
+            args: [{ providedIn: 'root' }]
+        }] });
+
 class QueueBusinessService {
     router;
     sessionService;
+    queueFilterDropdownService;
     destroy$ = new Subject();
-    constructor(router, sessionService) {
+    constructor(router, sessionService, queueFilterDropdownService) {
         this.router = router;
         this.sessionService = sessionService;
+        this.queueFilterDropdownService = queueFilterDropdownService;
     }
     filterQueuesByStatus(queues, status) {
         if (!queues)
@@ -5559,35 +5662,6 @@ class QueueBusinessService {
         const filteredQueryParams = Object.fromEntries(Object.entries(queryParams).filter(([_, value]) => value));
         return new URLSearchParams(filteredQueryParams).toString();
     }
-    buildFilterQueryString(filters) {
-        if (!filters || Object.keys(filters).length === 0) {
-            return '';
-        }
-        const filterParams = {};
-        // Map filter properties to API parameters
-        if (filters['riskRating']) {
-            filterParams['risk'] = filters['riskRating']; // risk=Low/Medium/High
-        }
-        if (filters['applicationType']) {
-            filterParams['lendingType'] = filters['applicationType']; // lendingType=HPP/BTL
-        }
-        if (filters['purchaseType']) {
-            filterParams['purchaseType'] = filters['purchaseType']; // purchaseType=Purchase/Refinance
-        }
-        if (filters['taskStatus']) {
-            filterParams['taskStatus'] = filters['taskStatus'];
-        }
-        if (filters['financeMin']) {
-            filterParams['minFinanace'] = filters['financeMin'].toString(); // minFinanace=50000
-        }
-        if (filters['financeMax']) {
-            filterParams['maxFinanace'] = filters['financeMax'].toString(); // maxFinanace=50000
-        }
-        if (filters['pendingDays']) {
-            filterParams['pendingDays'] = filters['pendingDays'].toString(); // pendingDays=120
-        }
-        return new URLSearchParams(filterParams).toString();
-    }
     calculatePagination(event) {
         return {
             page: (event.first / event.rows) + 1,
@@ -5607,7 +5681,7 @@ class QueueBusinessService {
         this.destroy$.next();
         this.destroy$.complete();
     }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.5", ngImport: i0, type: QueueBusinessService, deps: [{ token: i3$4.Router }, { token: SessionService }], target: i0.ɵɵFactoryTarget.Injectable });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.5", ngImport: i0, type: QueueBusinessService, deps: [{ token: i3$4.Router }, { token: SessionService }, { token: QueueFilterDropdownService }], target: i0.ɵɵFactoryTarget.Injectable });
     static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.2.5", ngImport: i0, type: QueueBusinessService, providedIn: 'root' });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.5", ngImport: i0, type: QueueBusinessService, decorators: [{
@@ -5615,7 +5689,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.5", ngImpor
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: () => [{ type: i3$4.Router }, { type: SessionService }] });
+        }], ctorParameters: () => [{ type: i3$4.Router }, { type: SessionService }, { type: QueueFilterDropdownService }] });
 
 class QueueRecordTableBuilderService extends TableBuilder {
     buildSecondaryTable(records, headerWidths, editPermission, deletePermission) {
@@ -5735,11 +5809,11 @@ class QueueSearchComponent {
         return !!this.searchText;
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.5", ngImport: i0, type: QueueSearchComponent, deps: [], target: i0.ɵɵFactoryTarget.Component });
-    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "19.2.5", type: QueueSearchComponent, isStandalone: false, selector: "queue-search", inputs: { searchText: "searchText", placeholder: "placeholder", debounceTime: "debounceTime" }, outputs: { searchInputChanged: "searchInputChanged", searchRequested: "searchRequested", searchCleared: "searchCleared" }, ngImport: i0, template: "<div class=\"flex mt-5 xl:mt-0 xl:justify-content-between align-items-center\" style=\"border: 1px solid #e0e4ea; border-radius: 8px; height: 44px;\">\r\n    <div class=\"p-field m-0 p-0 w-full bg-white border-round\" >\r\n        <div class=\"p-inputgroup border-round bg-white\" style=\"height: 100%;\">\r\n            <span class=\"p-inputgroup-addon bg-white\" style=\"height: 100%; display: flex; align-items: center;\">\r\n              <i class=\"pi pi-search\"></i>\r\n            </span>\r\n            <input \r\n              type=\"text\"  \r\n              [(ngModel)]=\"searchText\"  \r\n              class=\"border-none p-0 border-noround-right bg-white w-full outline-none\" \r\n              style=\"height: 100%; border-radius: 8px;\" \r\n              pInputText \r\n              [placeholder]=\"placeholder\" \r\n              (input)=\"onSearchInputChange()\"\r\n              (keydown.enter)=\"onSearch()\"  \r\n            />\r\n            <button \r\n              *ngIf=\"hasSearchText\" \r\n              type=\"button\" \r\n              class=\"p-inputgroup-addon bg-white border-none cursor-pointer\" \r\n              (click)=\"onClearSearch()\"\r\n              pButton \r\n              icon=\"pi pi-times\"\r\n              [text]=\"true\"\r\n              style=\"height: 100%; display: flex; align-items: center; border-radius: 8px;\"\r\n            ></button>\r\n        </div>\r\n    </div>\r\n  </div>\r\n  ", styles: [".p-inputgroup{width:100%}.bg-primary{background-color:#d9d9d9}::ng-deep .left-arrow-dropdown .p-dropdown{direction:rtl;width:100%;height:44px;border-top-left-radius:0;border-bottom-left-radius:0}::ng-deep .left-arrow-dropdown .p-dropdown-label{display:flex;align-items:center}.h-44{height:44px}@media screen and (min-width: 1200px){.vh-100{height:calc(100vh - 170px)}}.bg-while{background-color:#fff}\n"], dependencies: [{ kind: "directive", type: i1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "directive", type: i3$1.DefaultValueAccessor, selector: "input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]" }, { kind: "directive", type: i3$1.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { kind: "directive", type: i3$1.NgModel, selector: "[ngModel]:not([formControlName]):not([formControl])", inputs: ["name", "disabled", "ngModel", "ngModelOptions"], outputs: ["ngModelChange"], exportAs: ["ngModel"] }, { kind: "directive", type: i3$3.ButtonDirective, selector: "[pButton]", inputs: ["iconPos", "loadingIcon", "label", "icon", "loading", "severity", "raised", "rounded", "text", "outlined", "size", "plain"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush });
+    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "19.2.5", type: QueueSearchComponent, isStandalone: false, selector: "queue-search", inputs: { searchText: "searchText", placeholder: "placeholder", debounceTime: "debounceTime" }, outputs: { searchInputChanged: "searchInputChanged", searchRequested: "searchRequested", searchCleared: "searchCleared" }, ngImport: i0, template: "<div class=\"flex mt-5 xl:mt-0 xl:justify-content-between align-items-center bg-white\" style=\"border: 1px solid #e0e4ea; border-radius: 8px; height: 44px;\">\r\n    <div class=\"p-field m-0 p-0 w-full bg-white border-round\" >\r\n        <div class=\"p-inputgroup border-round bg-white\" style=\"height: 100%;\">\r\n            <span class=\"p-inputgroup-addon bg-white\" style=\"height: 100%; display: flex; align-items: center;\">\r\n              <i class=\"pi pi-search\"></i>\r\n            </span>\r\n            <input \r\n              type=\"text\"  \r\n              [(ngModel)]=\"searchText\"  \r\n              class=\"border-none p-0 border-noround-right bg-white w-full outline-none\" \r\n              style=\"height: 100%; border-radius: 8px;\" \r\n              pInputText \r\n              [placeholder]=\"placeholder\" \r\n              (input)=\"onSearchInputChange()\"\r\n              (keydown.enter)=\"onSearch()\"  \r\n            />\r\n            <button \r\n              *ngIf=\"hasSearchText\" \r\n              type=\"button\" \r\n              class=\"p-inputgroup-addon bg-white border-none cursor-pointer\" \r\n              (click)=\"onClearSearch()\"\r\n              pButton \r\n              icon=\"pi pi-times\"\r\n              [text]=\"true\"\r\n              style=\"height: 100%; display: flex; align-items: center; border-radius: 8px;\"\r\n            ></button>\r\n        </div>\r\n    </div>\r\n  </div>\r\n  ", styles: [".p-inputgroup{width:100%;display:flex;align-items:center;height:44px}.p-inputgroup-addon{display:flex;align-items:center;height:100%}input[type=text],input.p-inputtext{height:100%;display:flex;align-items:center;padding-top:0;padding-bottom:0;box-sizing:border-box}button.p-inputgroup-addon{display:flex;align-items:center;height:100%}.bg-primary{background-color:#d9d9d9}::ng-deep .left-arrow-dropdown .p-dropdown{direction:rtl;width:100%;height:44px;border-top-left-radius:0;border-bottom-left-radius:0}::ng-deep .left-arrow-dropdown .p-dropdown-label{display:flex;align-items:center}.h-44{height:44px}@media screen and (min-width: 1200px){.vh-100{height:calc(100vh - 170px)}}.bg-while{background-color:#fff}\n"], dependencies: [{ kind: "directive", type: i1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "directive", type: i3$1.DefaultValueAccessor, selector: "input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]" }, { kind: "directive", type: i3$1.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { kind: "directive", type: i3$1.NgModel, selector: "[ngModel]:not([formControlName]):not([formControl])", inputs: ["name", "disabled", "ngModel", "ngModelOptions"], outputs: ["ngModelChange"], exportAs: ["ngModel"] }, { kind: "directive", type: i3$3.ButtonDirective, selector: "[pButton]", inputs: ["iconPos", "loadingIcon", "label", "icon", "loading", "severity", "raised", "rounded", "text", "outlined", "size", "plain"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.5", ngImport: i0, type: QueueSearchComponent, decorators: [{
             type: Component,
-            args: [{ selector: 'queue-search', standalone: false, changeDetection: ChangeDetectionStrategy.OnPush, template: "<div class=\"flex mt-5 xl:mt-0 xl:justify-content-between align-items-center\" style=\"border: 1px solid #e0e4ea; border-radius: 8px; height: 44px;\">\r\n    <div class=\"p-field m-0 p-0 w-full bg-white border-round\" >\r\n        <div class=\"p-inputgroup border-round bg-white\" style=\"height: 100%;\">\r\n            <span class=\"p-inputgroup-addon bg-white\" style=\"height: 100%; display: flex; align-items: center;\">\r\n              <i class=\"pi pi-search\"></i>\r\n            </span>\r\n            <input \r\n              type=\"text\"  \r\n              [(ngModel)]=\"searchText\"  \r\n              class=\"border-none p-0 border-noround-right bg-white w-full outline-none\" \r\n              style=\"height: 100%; border-radius: 8px;\" \r\n              pInputText \r\n              [placeholder]=\"placeholder\" \r\n              (input)=\"onSearchInputChange()\"\r\n              (keydown.enter)=\"onSearch()\"  \r\n            />\r\n            <button \r\n              *ngIf=\"hasSearchText\" \r\n              type=\"button\" \r\n              class=\"p-inputgroup-addon bg-white border-none cursor-pointer\" \r\n              (click)=\"onClearSearch()\"\r\n              pButton \r\n              icon=\"pi pi-times\"\r\n              [text]=\"true\"\r\n              style=\"height: 100%; display: flex; align-items: center; border-radius: 8px;\"\r\n            ></button>\r\n        </div>\r\n    </div>\r\n  </div>\r\n  ", styles: [".p-inputgroup{width:100%}.bg-primary{background-color:#d9d9d9}::ng-deep .left-arrow-dropdown .p-dropdown{direction:rtl;width:100%;height:44px;border-top-left-radius:0;border-bottom-left-radius:0}::ng-deep .left-arrow-dropdown .p-dropdown-label{display:flex;align-items:center}.h-44{height:44px}@media screen and (min-width: 1200px){.vh-100{height:calc(100vh - 170px)}}.bg-while{background-color:#fff}\n"] }]
+            args: [{ selector: 'queue-search', standalone: false, changeDetection: ChangeDetectionStrategy.OnPush, template: "<div class=\"flex mt-5 xl:mt-0 xl:justify-content-between align-items-center bg-white\" style=\"border: 1px solid #e0e4ea; border-radius: 8px; height: 44px;\">\r\n    <div class=\"p-field m-0 p-0 w-full bg-white border-round\" >\r\n        <div class=\"p-inputgroup border-round bg-white\" style=\"height: 100%;\">\r\n            <span class=\"p-inputgroup-addon bg-white\" style=\"height: 100%; display: flex; align-items: center;\">\r\n              <i class=\"pi pi-search\"></i>\r\n            </span>\r\n            <input \r\n              type=\"text\"  \r\n              [(ngModel)]=\"searchText\"  \r\n              class=\"border-none p-0 border-noround-right bg-white w-full outline-none\" \r\n              style=\"height: 100%; border-radius: 8px;\" \r\n              pInputText \r\n              [placeholder]=\"placeholder\" \r\n              (input)=\"onSearchInputChange()\"\r\n              (keydown.enter)=\"onSearch()\"  \r\n            />\r\n            <button \r\n              *ngIf=\"hasSearchText\" \r\n              type=\"button\" \r\n              class=\"p-inputgroup-addon bg-white border-none cursor-pointer\" \r\n              (click)=\"onClearSearch()\"\r\n              pButton \r\n              icon=\"pi pi-times\"\r\n              [text]=\"true\"\r\n              style=\"height: 100%; display: flex; align-items: center; border-radius: 8px;\"\r\n            ></button>\r\n        </div>\r\n    </div>\r\n  </div>\r\n  ", styles: [".p-inputgroup{width:100%;display:flex;align-items:center;height:44px}.p-inputgroup-addon{display:flex;align-items:center;height:100%}input[type=text],input.p-inputtext{height:100%;display:flex;align-items:center;padding-top:0;padding-bottom:0;box-sizing:border-box}button.p-inputgroup-addon{display:flex;align-items:center;height:100%}.bg-primary{background-color:#d9d9d9}::ng-deep .left-arrow-dropdown .p-dropdown{direction:rtl;width:100%;height:44px;border-top-left-radius:0;border-bottom-left-radius:0}::ng-deep .left-arrow-dropdown .p-dropdown-label{display:flex;align-items:center}.h-44{height:44px}@media screen and (min-width: 1200px){.vh-100{height:calc(100vh - 170px)}}.bg-while{background-color:#fff}\n"] }]
         }], propDecorators: { searchText: [{
                 type: Input
             }], placeholder: [{
@@ -5911,68 +5985,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.5", ngImpor
                 type: Output
             }] } });
 
-class QueueFilterDropdownService {
-    filter = {
-        riskRating: null,
-        applicationType: null,
-        purchaseType: null,
-        taskStatus: null,
-        financeMin: null,
-        financeMax: null,
-        pendingDays: null
-    };
-    setRiskRating(rating) {
-        this.filter.riskRating = this.filter.riskRating === rating ? null : rating;
-    }
-    setApplicationType(type) {
-        this.filter.applicationType = this.filter.applicationType === type ? null : type;
-    }
-    setPurchaseType(type) {
-        this.filter.purchaseType = this.filter.purchaseType === type ? null : type;
-    }
-    setTaskStatus(status) {
-        this.filter.taskStatus = this.filter.taskStatus === status ? null : status;
-    }
-    setFinanceMin(min) {
-        this.filter.financeMin = min;
-    }
-    setFinanceMax(max) {
-        this.filter.financeMax = max;
-    }
-    setPendingDays(days) {
-        this.filter.pendingDays = days;
-    }
-    setAllFilters(filters) {
-        this.filter = { ...filters };
-    }
-    getFilters() {
-        return { ...this.filter };
-    }
-    hasFilters() {
-        return Object.values(this.filter).some(value => value !== null);
-    }
-    getFilterCount() {
-        return Object.values(this.filter).filter(value => value !== null).length;
-    }
-    clearAll() {
-        this.filter = {
-            riskRating: null,
-            applicationType: null,
-            purchaseType: null,
-            taskStatus: null,
-            financeMin: null,
-            financeMax: null,
-            pendingDays: null
-        };
-    }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.5", ngImport: i0, type: QueueFilterDropdownService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.2.5", ngImport: i0, type: QueueFilterDropdownService, providedIn: 'root' });
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.5", ngImport: i0, type: QueueFilterDropdownService, decorators: [{
-            type: Injectable,
-            args: [{ providedIn: 'root' }]
-        }] });
-
 class QueueFilterDropdownComponent {
     filterService;
     showDropdown = false;
@@ -6107,6 +6119,7 @@ class QueueContainerComponent extends BaseContainerComponent {
     baseStore;
     queueBusinessService;
     tableBuilder;
+    queueFilterDropdownService;
     destroy$ = new Subject();
     searchSubject = new Subject();
     queueList = [];
@@ -6145,13 +6158,14 @@ class QueueContainerComponent extends BaseContainerComponent {
     assignmentDataReady = new EventEmitter();
     rowClick = new EventEmitter();
     selectionChange = new EventEmitter();
-    constructor(queueStore, queueService, baseStore, queueBusinessService, tableBuilder) {
+    constructor(queueStore, queueService, baseStore, queueBusinessService, tableBuilder, queueFilterDropdownService) {
         super(queueService);
         this.queueStore = queueStore;
         this.queueService = queueService;
         this.baseStore = baseStore;
         this.queueBusinessService = queueBusinessService;
         this.tableBuilder = tableBuilder;
+        this.queueFilterDropdownService = queueFilterDropdownService;
     }
     ngOnInit() {
         this.initializeComponent();
@@ -6267,7 +6281,7 @@ class QueueContainerComponent extends BaseContainerComponent {
             next: (res) => {
                 this.queueList = Array.isArray(res) ? res : (res.data || res);
                 this.baseStore.setQueueList(this.queueList);
-                this.filterQueues();
+                this.restoreOrFilterQueues();
                 this.loading = false;
             },
             error: (err) => {
@@ -6277,6 +6291,33 @@ class QueueContainerComponent extends BaseContainerComponent {
             }
         });
     }
+    /**
+     * Tries to restore the selected queue from sessionStorage. If not found or invalid, falls back to filterQueues (first queue).
+     */
+    restoreOrFilterQueues() {
+        const storedQueueStr = sessionStorage.getItem(SHARED.selectedQueue);
+        let restoredQueueId = null;
+        if (storedQueueStr) {
+            try {
+                const storedQueue = JSON.parse(storedQueueStr);
+                // Check if the stored queue exists in the current queue list
+                if (storedQueue && storedQueue._id) {
+                    const found = this.queueList.find((q) => q._id === storedQueue._id);
+                    if (found) {
+                        restoredQueueId = found._id;
+                    }
+                }
+            }
+            catch (e) { }
+        }
+        if (restoredQueueId) {
+            this.selectedQueueId = restoredQueueId;
+            this.handleQueueId(restoredQueueId);
+        }
+        else {
+            this.filterQueues();
+        }
+    }
     handleQueueId(queueId) {
         const newQueue = this.queueList.find((i) => i._id == queueId);
         if (newQueue) {
@@ -6298,9 +6339,12 @@ class QueueContainerComponent extends BaseContainerComponent {
     filterQueues() {
         this.filteredQueueData = this.queueBusinessService.filterQueuesByStatus(this.queueList, this.selectedStatus);
         if (this.filteredQueueData.length > 0) {
-            this.selectedQueueId = this.queueBusinessService.getFirstQueueId(this.filteredQueueData);
-            if (this.selectedQueueId) {
-                this.handleQueueId(this.selectedQueueId);
+            // Only select the first queue if not already set (restored)
+            if (!this.selectedQueueId || !this.filteredQueueData.some(q => q._id === this.selectedQueueId)) {
+                this.selectedQueueId = this.queueBusinessService.getFirstQueueId(this.filteredQueueData);
+                if (this.selectedQueueId) {
+                    this.handleQueueId(this.selectedQueueId);
+                }
             }
         }
     }
@@ -6314,7 +6358,7 @@ class QueueContainerComponent extends BaseContainerComponent {
         // Build filter query string
         let filterQueryString = this.queryString;
         if (this.appliedFilters && Object.keys(this.appliedFilters).length > 0) {
-            const filterQuery = this.queueBusinessService.buildFilterQueryString(this.appliedFilters);
+            const filterQuery = this.queueFilterDropdownService.buildFilterQueryString(this.appliedFilters);
             // Combine existing query string with filter parameters
             const existingParams = new URLSearchParams(filterQueryString);
             const filterParams = new URLSearchParams(filterQuery);
@@ -6382,7 +6426,7 @@ class QueueContainerComponent extends BaseContainerComponent {
     }
     onAssignmentComplete(event) {
         if (event.success) {
-            this.getAllQueueList();
+            this.getQueueRecordsData();
         }
         this.assignmentComplete.emit(event);
     }
@@ -6392,13 +6436,13 @@ class QueueContainerComponent extends BaseContainerComponent {
     isAssignButtonEnabled() {
         return this.selectedRows && this.selectedRows.length > 0;
     }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.5", ngImport: i0, type: QueueContainerComponent, deps: [{ token: QueueStore }, { token: QueueService }, { token: BaseStore }, { token: QueueBusinessService }, { token: QueueRecordTableBuilderService }], target: i0.ɵɵFactoryTarget.Component });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.5", ngImport: i0, type: QueueContainerComponent, deps: [{ token: QueueStore }, { token: QueueService }, { token: BaseStore }, { token: QueueBusinessService }, { token: QueueRecordTableBuilderService }, { token: QueueFilterDropdownService }], target: i0.ɵɵFactoryTarget.Component });
     static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "19.2.5", type: QueueContainerComponent, isStandalone: false, selector: "lib-queue-container", inputs: { tableHeight: "tableHeight", placeholder: "placeholder", selectedRowsInput: "selectedRowsInput" }, outputs: { assignmentComplete: "assignmentComplete", userAssigned: "userAssigned", selectedRowsData: "selectedRowsData", assignmentDataReady: "assignmentDataReady", rowClick: "rowClick", selectionChange: "selectionChange" }, viewQueries: [{ propertyName: "filterDropdown", first: true, predicate: ["filterDropdown"], descendants: true }], usesInheritance: true, ngImport: i0, template: "<div class=\"container grid m-0 h-full\">\r\n    <div class=\"col-12 xl:col-2 md:col-12 py-0 h-full\">\r\n      <app-queue-list\r\n        [queueData]=\"filteredQueueData\"\r\n        [selectedQueueId]=\"selectedQueueId\"\r\n        [selectedStatus]=\"selectedStatus\"\r\n        [userRole]=\"userRole\"\r\n        [showQueueDataForm]=\"true\"\r\n        (queueSelected)=\"onQueueSelected($event)\"\r\n        (statusChanged)=\"onStatusChanged($event)\"\r\n        (insertQueueRequested)=\"onInsertQueueRequested()\"\r\n      ></app-queue-list>\r\n    </div>\r\n    <div class=\"col-12 xl:col-10 md:col-12 py-0 h-full\">\r\n    \r\n      @if(selectedQueue){\r\n      <div class=\"flex justify-content-between align-items-center mb-3\">\r\n          <div class=\"col-8 p-0 flex align-items-center \" >\r\n            <div class=\"col-6 p-0 mr-3\">\r\n              <queue-search \r\n                [placeholder]=\"placeholder\"\r\n                [searchText]=\"searchText\"\r\n                (searchInputChanged)=\"onSearchInputChanged($event)\"\r\n                (searchRequested)=\"onSearchRequested($event)\"\r\n                (searchCleared)=\"onSearchCleared()\">\r\n              </queue-search>\r\n            </div>\r\n            <div>\r\n              <lib-queue-filter-dropdown \r\n                #filterDropdown\r\n                [appliedFilters]=\"appliedFilters\"\r\n                (filterApplied)=\"onFilterDropdownApplied($event)\"\r\n                (filtersCleared)=\"onFiltersCleared()\">\r\n              </lib-queue-filter-dropdown>\r\n            </div>\r\n            <div>\r\n              <button \r\n                class=\"clear-filters-btn\"\r\n                type=\"button\"\r\n                (click)=\"onClearAllFilters()\">\r\n                Clear <i class=\"pi pi-times ml-2\"></i>\r\n              </button>\r\n            </div>\r\n          </div>\r\n          \r\n          <div class=\"d-flex align-items-center gap-3 justify-content-end\">\r\n            <ng-content select=\"[user-dropdown]\"></ng-content>\r\n          </div>\r\n      </div>\r\n\r\n      <div class=\"animation-duration-500 associated-list h-full card mb-0 p-0\">\r\n        <app-queue-record-table\r\n          [table]=\"table\"\r\n          [metaData]=\"metaData\"\r\n          [loading]=\"loading\"\r\n          [selectedRows]=\"selectedRows\"\r\n          (selectionChange)=\"onTableSelectionChange($event)\"\r\n          (selectedRowsData)=\"onTableSelectionChange($event)\"\r\n          (assignmentDataReady)=\"onAssignmentDataReady($event)\"\r\n          (rowClick)=\"onTableRowClick($event)\"\r\n          (paginationChanged)=\"onPaginationChanged($event)\"\r\n          (filterApplied)=\"onFilterApplied($event)\"\r\n          (sortApplied)=\"onSortApplied($event)\">\r\n        </app-queue-record-table>\r\n    </div>\r\n\r\n      }\r\n    </div>\r\n\r\n  </div>", styles: [".custom-scroll{overflow-y:hidden}.custom-scroll:hover{overflow-y:auto}.clear-filters-btn{background:none;border:none;color:#2196f3;font-size:1.1rem;cursor:pointer;margin-left:.5rem;display:inline-flex;align-items:center;padding:0}.clear-filters-btn .clear-x{font-size:1.2rem;margin-left:.2rem;line-height:1}\n"], dependencies: [{ kind: "component", type: QueueSearchComponent, selector: "queue-search", inputs: ["searchText", "placeholder", "debounceTime"], outputs: ["searchInputChanged", "searchRequested", "searchCleared"] }, { kind: "component", type: QueueListComponent, selector: "app-queue-list", inputs: ["queueData", "selectedQueueId", "selectedStatus", "userRole", "showQueueDataForm"], outputs: ["queueSelected", "statusChanged", "insertQueueRequested"] }, { kind: "component", type: QueueRecordTableComponent, selector: "app-queue-record-table", inputs: ["table", "metaData", "loading", "selectedRows", "tableHeight"], outputs: ["selectionChange", "selectedRowsData", "assignmentDataReady", "rowClick", "paginationChanged", "filterApplied", "sortApplied"] }, { kind: "component", type: QueueFilterDropdownComponent, selector: "lib-queue-filter-dropdown", inputs: ["appliedFilters"], outputs: ["filterApplied", "filtersCleared"] }] });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.5", ngImport: i0, type: QueueContainerComponent, decorators: [{
             type: Component,
             args: [{ selector: 'lib-queue-container', standalone: false, template: "<div class=\"container grid m-0 h-full\">\r\n    <div class=\"col-12 xl:col-2 md:col-12 py-0 h-full\">\r\n      <app-queue-list\r\n        [queueData]=\"filteredQueueData\"\r\n        [selectedQueueId]=\"selectedQueueId\"\r\n        [selectedStatus]=\"selectedStatus\"\r\n        [userRole]=\"userRole\"\r\n        [showQueueDataForm]=\"true\"\r\n        (queueSelected)=\"onQueueSelected($event)\"\r\n        (statusChanged)=\"onStatusChanged($event)\"\r\n        (insertQueueRequested)=\"onInsertQueueRequested()\"\r\n      ></app-queue-list>\r\n    </div>\r\n    <div class=\"col-12 xl:col-10 md:col-12 py-0 h-full\">\r\n    \r\n      @if(selectedQueue){\r\n      <div class=\"flex justify-content-between align-items-center mb-3\">\r\n          <div class=\"col-8 p-0 flex align-items-center \" >\r\n            <div class=\"col-6 p-0 mr-3\">\r\n              <queue-search \r\n                [placeholder]=\"placeholder\"\r\n                [searchText]=\"searchText\"\r\n                (searchInputChanged)=\"onSearchInputChanged($event)\"\r\n                (searchRequested)=\"onSearchRequested($event)\"\r\n                (searchCleared)=\"onSearchCleared()\">\r\n              </queue-search>\r\n            </div>\r\n            <div>\r\n              <lib-queue-filter-dropdown \r\n                #filterDropdown\r\n                [appliedFilters]=\"appliedFilters\"\r\n                (filterApplied)=\"onFilterDropdownApplied($event)\"\r\n                (filtersCleared)=\"onFiltersCleared()\">\r\n              </lib-queue-filter-dropdown>\r\n            </div>\r\n            <div>\r\n              <button \r\n                class=\"clear-filters-btn\"\r\n                type=\"button\"\r\n                (click)=\"onClearAllFilters()\">\r\n                Clear <i class=\"pi pi-times ml-2\"></i>\r\n              </button>\r\n            </div>\r\n          </div>\r\n          \r\n          <div class=\"d-flex align-items-center gap-3 justify-content-end\">\r\n            <ng-content select=\"[user-dropdown]\"></ng-content>\r\n          </div>\r\n      </div>\r\n\r\n      <div class=\"animation-duration-500 associated-list h-full card mb-0 p-0\">\r\n        <app-queue-record-table\r\n          [table]=\"table\"\r\n          [metaData]=\"metaData\"\r\n          [loading]=\"loading\"\r\n          [selectedRows]=\"selectedRows\"\r\n          (selectionChange)=\"onTableSelectionChange($event)\"\r\n          (selectedRowsData)=\"onTableSelectionChange($event)\"\r\n          (assignmentDataReady)=\"onAssignmentDataReady($event)\"\r\n          (rowClick)=\"onTableRowClick($event)\"\r\n          (paginationChanged)=\"onPaginationChanged($event)\"\r\n          (filterApplied)=\"onFilterApplied($event)\"\r\n          (sortApplied)=\"onSortApplied($event)\">\r\n        </app-queue-record-table>\r\n    </div>\r\n\r\n      }\r\n    </div>\r\n\r\n  </div>", styles: [".custom-scroll{overflow-y:hidden}.custom-scroll:hover{overflow-y:auto}.clear-filters-btn{background:none;border:none;color:#2196f3;font-size:1.1rem;cursor:pointer;margin-left:.5rem;display:inline-flex;align-items:center;padding:0}.clear-filters-btn .clear-x{font-size:1.2rem;margin-left:.2rem;line-height:1}\n"] }]
-        }], ctorParameters: () => [{ type: QueueStore }, { type: QueueService }, { type: BaseStore }, { type: QueueBusinessService }, { type: QueueRecordTableBuilderService }], propDecorators: { tableHeight: [{
+        }], ctorParameters: () => [{ type: QueueStore }, { type: QueueService }, { type: BaseStore }, { type: QueueBusinessService }, { type: QueueRecordTableBuilderService }, { type: QueueFilterDropdownService }], propDecorators: { tableHeight: [{
                 type: Input
             }], placeholder: [{
                 type: Input