rez_core 2.0.98 → 2.0.100

package/package.json

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

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

@@ -155,36 +155,42 @@ export class FilterService {
     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');
-      }
-    }
+    let filteredTabs;
 
-    // Filter `allTabs` using showList (case-insensitive)
-    const filteredTabs = allTabs.filter((tab) =>
-      showList.includes(tab.tab_value.toLowerCase()),
-    );
+    if (showList?.length > 0) {
+      // If 'All' is selected, include 'all'
+      if (layout?.isAllSelected) {
+        if (!showList.includes('all')) {
+          showList.push('all');
+        }
+      }
 
-    // If combine other is enabled
-    if (layout?.isCombineOther) {
-      const allTab = allTabs.find(
-        (tab) => tab.tab_value.toLowerCase() === 'all',
+      // Filter `allTabs` using showList (case-insensitive)
+      filteredTabs = allTabs.filter((tab) =>
+        showList.includes(tab.tab_value.toLowerCase()),
       );
-      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);
+      // 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;
+        const othersCount = allCount - knownTabCountSum;
 
-      filteredTabs.push({
-        tab_value: 'OTHERS',
-        tab_value_count: othersCount < 0 ? 0 : othersCount, // safe fallback
-      });
+        filteredTabs.push({
+          tab_value: 'OTHERS',
+          tab_value_count: othersCount < 0 ? 0 : othersCount, // safe fallback
+        });
+      }
+    } else {
+      filteredTabs = allTabs;
     }
 
     // Add tab.value filter only if present
@@ -215,15 +221,6 @@ export class FilterService {
       qb.andWhere(clause.query, clause.params);
     });
 
-    //prefernec.sort_by.length>0 if()
-
-    // "sortby": [
-    //     {
-    //         "order": "asc",
-    //         "column": "customer_name"
-    //     }
-    // ],
-
     if (Array.isArray(sortby)) {
       // Optional sorting
       sortby.forEach(({ sortColum, sortType }) => {

package/src/module/user/controller/login.controller.ts

@@ -71,8 +71,11 @@ export class LoginController {
     const currentUser = req.user.userData;
     const currentAppcode = currentUser.appcode;
 
+    console.log(currentUser, 'DEBUG USER', data);
+
     // If appcode is changing, validate the new level_id/level_type
     if (data.appcode !== currentAppcode) {
+      console.log('inside if', data.appcode, currentAppcode);
       const isValidAccess = await this.userSessionService.checkIfUserHasMapping(
         currentUser.id,
         data.appcode,
@@ -80,6 +83,8 @@ export class LoginController {
         data.level_id,
       );
 
+      console.log('isValidAccess', isValidAccess);
+
       if (!isValidAccess) {
         // If not valid, fetch the default one
         const userMapping =
@@ -97,6 +102,11 @@ export class LoginController {
         data.level_type = userMapping.level_type;
         data.level_id = userMapping.level_id;
       }
+      console.log(
+        data.level_type,
+        data.level_id,
+        'data.level_type, data.level_id',
+      );
     }
 
     return await this.userSessionService.switchCurrentLevelService(

package/src/module/user/service/role.service.ts

@@ -29,6 +29,7 @@ export class RoleService extends EntityServiceImpl {
     // if level_type and level_id are not provided, use loggedInUser's values
     role.level_type = entityData.level_type || loggedInUser.level_type;
     role.level_id = entityData.level_id || loggedInUser.level_id;
+    role.appcode = entityData.appcode || loggedInUser.appcode;
 
     if (
       await this.roleRepository.isRoleNameWithLevelExists(role.name, {
@@ -62,6 +63,7 @@ export class RoleService extends EntityServiceImpl {
           module_code: perm.module_code,
           action_type: perm.action_type,
           access_flag: perm.access_flag,
+          level_type: perm.level_type,
           appcode: perm.appcode,
         }),
       );
@@ -143,6 +145,7 @@ export class RoleService extends EntityServiceImpl {
           action_type: perm.action_type,
           access_flag: perm.access_flag,
           appcode: perm.appcode,
+          level_type: perm.level_type,
         }),
       );