rez_core 2.0.89 → 2.0.90

package/package.json

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

package/src/module/filter/controller/filter.controller.ts

@@ -49,6 +49,7 @@ export class FilterController {
       sortby,
       page,
       size,
+      user_id: userData.id,
       level_type: userData.level_type,
       level_id: userData.level_id,
     });

package/src/module/filter/dto/filter-request.dto.ts

@@ -23,6 +23,7 @@ export interface FilterRequestDto {
   tabs?: TabsConfig;
   page?: number;
   size?: number;
+  user_id?: string | null;
   level_type?: string | null;
   level_id?: string | null;
 }

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

@@ -19,7 +19,7 @@ export class FilterService {
     @Inject('SavedFilterService')
     private readonly savedFilterService: SavedFilterService,
   ) {}
-  private readonly skipLevelFilterEntities = ['USR','UPR'];
+  private readonly skipLevelFilterEntities = ['USR', 'UPR'];
 
   private async gettab_value_counts(
     tableName: string,
@@ -77,6 +77,7 @@ export class FilterService {
       attributeFilter,
       tabs,
       sortby,
+      user_id,
       level_type,
       level_id,
     } = dto;
@@ -142,13 +143,55 @@ export class FilterService {
       });
     }
 
-    // Build query for tab counts (no tab.value filter here)
+    const layoutPreference = await this.dataSource.query(
+      `SELECT layout_json
+   FROM cr_layout_preference
+   WHERE user_id = ? AND mapped_entity_type = ?`,
+      [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()) || [];
+
+    // If 'All' is selected, include 'all'
+    if (layout?.isAllSelected) {
+      if (!showList.includes('all')) {
+        showList.push('all');
+      }
+    }
+
+    // Filter `allTabs` using showList (case-insensitive)
+    const filteredTabs = allTabs.filter((tab) =>
+      showList.includes(tab.tab_value.toLowerCase()),
+    );
+
+    // If combine other is enabled
+    if (layout?.isCombineOther) {
+      const allTab = allTabs.find(
+        (tab) => tab.tab_value.toLowerCase() === 'all',
+      );
+      const allCount = allTab?.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;
+
+      filteredTabs.push({
+        tab_value: 'OTHERS',
+        tab_value_count: othersCount < 0 ? 0 : othersCount, // safe fallback
+      });
+    }
+
     // Add tab.value filter only if present
     const dataWhere = [...baseWhere];
     if (tabs?.columnName && tabs?.value) {
@@ -177,8 +220,17 @@ export class FilterService {
       qb.andWhere(clause.query, clause.params);
     });
 
-    // Optional sorting
+    //prefernec.sort_by.length>0 if()
+
+    // "sortby": [
+    //     {
+    //         "order": "asc",
+    //         "column": "customer_name"
+    //     }
+    // ],
+
     if (Array.isArray(sortby)) {
+      // Optional sorting
       sortby.forEach(({ sortColum, sortType }) => {
         qb.addOrderBy(
           `e.${sortColum}`,
@@ -187,6 +239,20 @@ export class FilterService {
       });
     }
 
+    if (layoutPreference[0]?.layout_json.sorting.sortby.length > 0) {
+      if (Array.isArray(layoutPreference[0]?.layout_json.sorting.sortby)) {
+        // Optional sorting
+        layoutPreference[0]?.layout_json.sorting.sortby.forEach(
+          ({ column, order }) => {
+            qb.addOrderBy(
+              `e.${column}`,
+              order?.toUpperCase() === 'DSC' ? 'DESC' : 'ASC',
+            );
+          },
+        );
+      }
+    }
+
     // Pagination
     const page = dto.page && dto.page > 0 ? dto.page : 1;
     const size = dto.size && dto.size > 0 ? dto.size : 10;
@@ -209,7 +275,7 @@ export class FilterService {
     return {
       success: true,
       data: {
-        entity_tabs: allTabs,
+        entity_tabs: filteredTabs,
         entity_list,
         pagination: {
           total,
@@ -295,7 +361,7 @@ export class FilterService {
       case 'contains':
         return {
           query: `LOWER(e.${attr}) LIKE :${key}`,
-          params: { [key]: `%${val?val.toLowerCase():""}%` },
+          params: { [key]: `%${val ? val.toLowerCase() : ''}%` },
         };
       case 'equal':
         return {
@@ -369,7 +435,7 @@ export class FilterService {
         throw new BadRequestException(`Unsupported operator for date: ${op}`);
     }
   }
-  
+
   private buildSelectCondition(
     attr: string,
     op: string,

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

@@ -22,6 +22,8 @@ export class LayoutPreferenceService extends EntityServiceImpl {
       throw new Error('User ID is required to create layout preference.');
     }
 
+    console.log('userId', userId);
+
     const existingLayoutPreference =
       await this.layoutPreferenceRepository.findByEntityUserId(
         mapped_entity_type,

package/src/module/module/service/menu.service.ts

@@ -21,17 +21,21 @@ export class MenuService {
   ): Promise<{ menu: any[] }> {
     // Step 1: Resolve roles (with fallback logic inside)
     const roleCodes = await this.menuRepository.resolveUserRoles(userId, appcode, levelType, levelId);
+    console.log(roleCodes)
     if (!roleCodes.length) return { menu: [] };
   
     // Step 2: Get accessible modules
     const moduleCodes = await this.menuRepository.getAccessibleModules(roleCodes, appcode);
+    console.log(moduleCodes)
     if (!moduleCodes.length) return { menu: [] };
   
     // Step 3: Get menu items for the given level type
     const menuItems = await this.menuRepository.getMenuItems(moduleCodes, appcode, levelType);
+    console.log(menuItems)
   
     // Step 4: Build hierarchy
     const menuTree = this.buildMenuHierarchy(menuItems);
+  
     return { menu: menuTree };
   }