rez_core 2.1.25 → 2.1.26

package/package.json

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

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

@@ -153,16 +153,25 @@ export class FilterService {
       [user_id, entity_type],
     );
 
-    const allTabs = await this.gettab_value_counts(
-      getTableMeta.data_source,
-      tabs?.columnName,
-      baseWhere,
-    );
-
     // Extract layout preference
     const layout = layoutPreference?.[0]?.layout_json?.quick_tab || {};
     let showList = layout?.show_list?.map((val) => val.toLowerCase()) || [];
 
+    let allTabs;
+    if (layout.attribute) {
+      allTabs = await this.gettab_value_counts(
+        getTableMeta.data_source,
+        layout.attribute,
+        baseWhere,
+      );
+    } else {
+      allTabs = await this.gettab_value_counts(
+        getTableMeta.data_source,
+        tabs?.columnName,
+        baseWhere,
+      );
+    }
+
     let filteredTabs;
 
     if (showList?.length > 0) {
@@ -201,20 +210,42 @@ export class FilterService {
       filteredTabs = allTabs;
     }
 
-    // Add tab.value filter only if present
     const dataWhere = [...baseWhere];
+
     if (tabs?.columnName && tabs?.value) {
       const tabAttrMeta = attributeMetaMap[tabs.columnName];
-      const tabCondition = this.buildCondition(
-        {
-          filter_attribute: tabs.columnName,
-          filter_operator: 'equal',
-          filter_value: tabs.value,
-        },
-        tabAttrMeta,
-      );
-      if (tabCondition) {
-        if (tabs.value.toLowerCase() !== 'all') dataWhere.push(tabCondition);
+      const tabValue = tabs.value.toLowerCase();
+
+      if (tabValue === 'others') {
+        const valuesToExclude = showList.filter((v) => v !== 'all');
+        if (valuesToExclude.length > 0) {
+          valuesToExclude.forEach((value) => {
+            const tabCondition = this.buildCondition(
+              {
+                filter_attribute: tabs.columnName,
+                filter_operator: 'not_equal',
+                filter_value: value,
+              },
+              tabAttrMeta,
+            );
+            if (tabCondition) {
+              dataWhere.push(tabCondition);
+            }
+          });
+        }
+      } else if (tabValue !== 'all') {
+        // Normal case: filter by equality
+        const tabCondition = this.buildCondition(
+          {
+            filter_attribute: tabs.columnName,
+            filter_operator: 'equal',
+            filter_value: tabs.value,
+          },
+          tabAttrMeta,
+        );
+        if (tabCondition) {
+          dataWhere.push(tabCondition);
+        }
       }
     }
 

package/src/module/layout_preference/service/layout_preference.service.ts

@@ -15,6 +15,8 @@ export class LayoutPreferenceService extends EntityServiceImpl {
   }
 
   async createEntity(entityData: BaseEntity, loggedInUser: UserData | null) {
+    console.log('lap api called', entityData);
+
     const { mapped_entity_type } = entityData as any;
     const userId = loggedInUser?.id;