cat-qw-lib 2.5.21 → 2.5.23

package/fesm2022/cat-qw-lib.mjs

@@ -2397,6 +2397,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.5", ngImpor
                 type: Input
             }] } });
 
+// Constant for unassigned underwriter filter value
+const UNASSIGNED_UNDERWRITER_ID = 'unassigned';
 /**
  *
  */
@@ -2616,7 +2618,20 @@ class QueueFilterDropdownService extends BaseService {
             filterParams['pendingDays'] = filters.pendingDays.toString();
         }
         if (filters.assignedUnderwriter && filters.assignedUnderwriter.length > 0) {
-            filterParams['underwriterId'] = filters.assignedUnderwriter.join(',');
+            // Separate approach: Use unassigned boolean param and underwriterId for actual IDs
+            const hasUnassigned = filters.assignedUnderwriter.includes(UNASSIGNED_UNDERWRITER_ID);
+            const realUnderwriterIds = filters.assignedUnderwriter.filter(id => id !== UNASSIGNED_UNDERWRITER_ID);
+            // Set unassigned parameter if "unassigned" is selected
+            if (hasUnassigned) {
+                filterParams['unassigned'] = 'true';
+            }
+            else {
+                filterParams['unassigned'] = 'false';
+            }
+            // Set underwriterId parameter only if there are real IDs (excluding "unassigned")
+            if (realUnderwriterIds.length > 0) {
+                filterParams['underwriterId'] = realUnderwriterIds.join(',');
+            }
         }
         return new URLSearchParams(filterParams).toString();
     }
@@ -7269,7 +7284,7 @@ class QueueFilterDropdownComponent {
             return this.filterService.getUnderwritersList(searchKey || SHARED.EMPTY);
         })).subscribe((underwriters) => {
             // Add "Unassigned" option at the beginning of the list
-            const unassignedOption = { id: 'unassigned', name: 'Unassigned' };
+            const unassignedOption = { id: UNASSIGNED_UNDERWRITER_ID, name: 'Unassigned' };
             this.underwriterOptions = [unassignedOption, ...underwriters];
             this.loadingUnderwriters = false;
         });
@@ -7286,10 +7301,13 @@ class QueueFilterDropdownComponent {
         if (!this.showDropdown) {
             // Store current state when opening dropdown (this will be the applied filters)
             this.originalFilters = this.filterService.getFilters();
-            // Load initial underwriter list when opening dropdown
-            if (this.underwriterOptions.length === 0) {
-                this.loadInitialUnderwriters();
-            }
+            // Reset loading state and reload underwriter list every time dropdown opens
+            this.loadingUnderwriters = false;
+            this.loadInitialUnderwriters();
+        }
+        else {
+            // Reset loading state when closing dropdown
+            this.loadingUnderwriters = false;
         }
         this.showDropdown = !this.showDropdown;
         this.skipNextDocumentClick = true;
@@ -7349,11 +7367,12 @@ class QueueFilterDropdownComponent {
     }
     applyFilters() {
         const filterData = this.filterService.getFilters();
-        if (this.filterService.hasFilters()) {
-            this.filterApplied.emit(filterData);
-            this.filtersApplied = true; // Mark that filters have been applied
-        }
+        // Always emit filterApplied event to trigger API call, even if no filters
+        // This ensures the list API is called every time Apply Filters is clicked
+        this.filterApplied.emit(filterData);
+        this.filtersApplied = true; // Mark that filters have been applied
         this.showDropdown = false;
+        this.loadingUnderwriters = false; // Reset loading state when closing
         this.originalFilters = null; // Clear stored state after applying
         this.filters = this.filterService.getFilters();
     }
@@ -7397,6 +7416,7 @@ class QueueFilterDropdownComponent {
             // Only restore original filters if no filters have been applied yet
             this.filterService.setAllFilters(this.originalFilters);
         }
+        this.loadingUnderwriters = false; // Reset loading state when closing without applying
         this.originalFilters = null;
     }
     onDocumentClick(event) {