rez_core 2.1.41 → 2.1.42

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rez_core",
-  "version": "2.1.41",
+  "version": "2.1.42",
   "description": "",
   "author": "", 
   "private": false,

package/src/module/filter/service/filter.service.ts

@@ -157,6 +157,7 @@ export class FilterService {
 
     // Extract layout preference
     const layout = layoutPreference?.[0]?.layout_json?.quick_tab || {};
+
     let showList = layout?.show_list?.map((val) => val.toLowerCase()) || [];
 
     let allTabs;
@@ -177,35 +178,62 @@ export class FilterService {
     let filteredTabs;
 
     if (showList?.length > 0) {
-      // If 'All' is selected, include 'all'
-      if (layout?.isAllSelected) {
-        if (!showList.includes('all')) {
-          showList.push('all');
-        }
+      // Add 'all' if needed
+      const isAllNeeded = layout?.isAllSelected && !showList.includes('all');
+      if (isAllNeeded) {
+        showList.push('all');
       }
 
-      // Filter `allTabs` using showList (case-insensitive)
+      // Filter tabs based on showList (case-insensitive)
       filteredTabs = allTabs.filter((tab) =>
         showList.includes(tab.tab_value.toLowerCase()),
       );
 
+      // Separate out 'all' tab before sorting
+      const allTab = filteredTabs.find(
+        (tab) => tab.tab_value.toLowerCase() === 'all',
+      );
+      filteredTabs = filteredTabs.filter(
+        (tab) => tab.tab_value.toLowerCase() !== 'all',
+      );
+
+      // 🔽 SORTING LOGIC
+      if (layout.sorting === 'asc') {
+        filteredTabs.sort((a, b) =>
+          a.tab_value.toLowerCase().localeCompare(b.tab_value.toLowerCase()),
+        );
+      } else if (layout.sorting === 'dsc') {
+        filteredTabs.sort((a, b) =>
+          b.tab_value.toLowerCase().localeCompare(a.tab_value.toLowerCase()),
+        );
+      } else if (layout.sorting === 'count_asc') {
+        filteredTabs.sort((a, b) => a.tab_value_count - b.tab_value_count);
+      } else if (layout.sorting === 'count_dsc') {
+        filteredTabs.sort((a, b) => b.tab_value_count - a.tab_value_count);
+      }
+
+      // Re-insert 'all' at the beginning
+      if (allTab) {
+        filteredTabs.unshift(allTab);
+      }
+
       // If combine other is enabled
       if (layout?.isCombineOther) {
-        const allTab = allTabs.find(
+        const originalAllTab = allTabs.find(
           (tab) => tab.tab_value.toLowerCase() === 'all',
         );
-        const allCount = allTab?.tab_value_count ?? 0;
+        const allCount = originalAllTab?.tab_value_count ?? 0;
 
-        // Calculate sum of filtered (excluding 'All')
         const knownTabCountSum = filteredTabs
           .filter((tab) => tab.tab_value.toLowerCase() !== 'all')
           .reduce((acc, tab) => acc + tab.tab_value_count, 0);
 
         const othersCount = allCount - knownTabCountSum;
 
+        // Append 'OTHERS' at the end
         filteredTabs.push({
           tab_value: 'OTHERS',
-          tab_value_count: othersCount < 0 ? 0 : othersCount, // safe fallback
+          tab_value_count: othersCount < 0 ? 0 : othersCount,
         });
       }
     } else {
@@ -300,8 +328,8 @@ export class FilterService {
           },
         );
       }
-    } 
-    
+    }
+
     qb.addOrderBy('e.created_date', 'DESC');
 
     // Pagination