rez_core 4.0.106 → 4.0.108

package/package.json

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

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

@@ -390,7 +390,11 @@ export class FilterService {
       const tabValue = tabs.value.toLowerCase();
 
       if (tabValue === 'others') {
-        const valuesToExclude = showList.filter((v) => v !== 'all');
+        // Extract 'value' (IDs) from showList, ignore 'all'
+        const valuesToExclude = showList
+          .filter((v) => v.label.toLowerCase() !== 'all')
+          .map((v) => v.value);
+
         if (valuesToExclude.length > 0) {
           for (const value of valuesToExclude) {
             const resolvedId = await this.resolverService.getResolvedId(
@@ -556,53 +560,72 @@ export class FilterService {
     let filteredTabs: any[] = [];
 
     if (showList?.length > 0) {
-      const isAllNeeded = layout?.isAllSelected && !showList.includes('all');
-      if (isAllNeeded) showList.push('all');
+      // Extract tab IDs (values)
+      const showValues = showList.map((item) =>
+        item.value?.toString().toLowerCase(),
+      );
+
+      // Handle "all" logic
+      const isAllNeeded = layout?.isAllSelected && !showValues.includes('all');
+      if (isAllNeeded) {
+        showList.push({ label: 'All', value: 'all' });
+        showValues.push('all');
+      }
 
+      // Filter by value IDs (not labels)
       filteredTabs = allTabs.filter((tab) =>
-        showList.includes(tab.tab_value.toLowerCase()),
+        showValues.includes(tab.tab_value?.toString().toLowerCase()),
       );
 
+      // Handle "all" tab
       const allTab = filteredTabs.find(
-        (tab) => tab.tab_value?.toLowerCase() === 'all',
+        (tab) => tab.tab_value?.toString().toLowerCase() === 'all',
       );
       filteredTabs = filteredTabs.filter(
-        (tab) => tab.tab_value?.toLowerCase() !== 'all',
+        (tab) => tab.tab_value?.toString().toLowerCase() !== 'all',
       );
 
       // SORTING LOGIC
       if (layout.sorting === 'asc') {
         filteredTabs.sort((a, b) =>
-          a.tab_value.toLowerCase().localeCompare(b.tab_value.toLowerCase()),
+          a.tab_value.toString().localeCompare(b.tab_value.toString()),
         );
       } else if (layout.sorting === 'dsc') {
         filteredTabs.sort((a, b) =>
-          b.tab_value.toLowerCase().localeCompare(a.tab_value.toLowerCase()),
+          b.tab_value.toString().localeCompare(a.tab_value.toString()),
         );
       } 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);
       } else if (layout.sorting === 'custom') {
+        // Keep order same as showList
         const orderMap = new Map<string, number>(
-          showList.map((val, index) => [val.toLowerCase(), index]),
+          showList.map((item, index) => [
+            item.value?.toString().toLowerCase(),
+            index,
+          ]),
         );
         filteredTabs.sort((a, b) => {
-          const aIndex = orderMap.get(a.tab_value.toLowerCase()) ?? Infinity;
-          const bIndex = orderMap.get(b.tab_value.toLowerCase()) ?? Infinity;
+          const aIndex =
+            orderMap.get(a.tab_value?.toString().toLowerCase()) ?? Infinity;
+          const bIndex =
+            orderMap.get(b.tab_value?.toString().toLowerCase()) ?? Infinity;
           return aIndex - bIndex;
         });
       }
 
+      // Re-add "all" tab at beginning if needed
       if (allTab) filteredTabs.unshift(allTab);
 
+      // Combine others if enabled
       if (layout?.isCombineOther) {
         const originalAllTab = allTabs.find(
-          (tab) => tab.tab_value.toLowerCase() === 'all',
+          (tab) => tab.tab_value?.toString().toLowerCase() === 'all',
         );
         const allCount = originalAllTab?.tab_value_count ?? 0;
         const knownTabCountSum = filteredTabs
-          .filter((tab) => tab.tab_value.toLowerCase() !== 'all')
+          .filter((tab) => tab.tab_value?.toString().toLowerCase() !== 'all')
           .reduce((acc, tab) => acc + tab.tab_value_count, 0);
 
         const othersCount = allCount - knownTabCountSum;