rez_core 2.1.43 → 2.1.45

package/package.json

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

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

@@ -210,6 +210,22 @@ export class FilterService {
         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') {
+        const orderMap = new Map<string, number>(
+          showList.map((val, index) => [val.toLowerCase(), index]),
+        );
+
+        filteredTabs.sort((a, b) => {
+          const aIndex = orderMap.has(a.tab_value.toLowerCase())
+            ? orderMap.get(a.tab_value.toLowerCase())!
+            : Infinity;
+
+          const bIndex = orderMap.has(b.tab_value.toLowerCase())
+            ? orderMap.get(b.tab_value.toLowerCase())!
+            : Infinity;
+
+          return aIndex - bIndex;
+        });
       }
 
       // Re-insert 'all' at the beginning

package/src/module/listmaster/service/list-master.service.ts

@@ -82,12 +82,18 @@ export class ListMasterService {
         // Skip level filter for certain entities
         if (!this.skipLevelFilterEntities.includes(sourceList)) {
           qb.andWhere(
-            `${tableName}.level_type = :levelType AND ${tableName}.level_id = :levelId`,
+            `${tableName}.level_type = :levelType AND ${tableName}.level_id = :levelId AND ${tableName}.organization_id = :organization_id`,
             {
               levelType: loggedInUser.level_type,
               levelId: loggedInUser.level_id,
+              organization_id: loggedInUser.organization_id,
             },
           );
+        } else {
+          // IN the case of BRN, we don't filter by level
+          qb.andWhere(`${tableName}.organization_id = :organization_id`, {
+            organization_id: loggedInUser.organization_id,
+          });
         }
       }
 

package/src/module/module/controller/module-access.controller.ts

@@ -25,9 +25,15 @@ export class ModuleAccessController {
 
   @Get('roles')
   async getRoles(@Query('appcode') appcode: string, @Request() req) {
-    let level_type= req.user.userData.level_type
-    let level_id= req.user.userData.level_id
-    return this.moduleAccessService.getRoles({ appcode,level_type, level_id });
+    let level_type = req.user.userData.level_type;
+    let level_id = req.user.userData.level_id;
+    let organization_id = req.user.userData.organization_id;
+    return this.moduleAccessService.getRoles({
+      appcode,
+      level_type,
+      level_id,
+      organization_id,
+    });
   }
 
   @Get('modules')
@@ -45,9 +51,14 @@ export class ModuleAccessController {
   ) {
     const roleIdArray = roleIds.split(',').map(Number);
     const appcode = queryAppcode || req.user.userData.appcode;
-    const level_type =  req.user.userData.level_type;
-    const level_id =  req.user.userData.level_id;
-    return this.moduleAccessService.getAccessListing(roleIdArray, appcode, level_type, level_id);
+    const level_type = req.user.userData.level_type;
+    const level_id = req.user.userData.level_id;
+    return this.moduleAccessService.getAccessListing(
+      roleIdArray,
+      appcode,
+      level_type,
+      level_id,
+    );
   }
 
   @Get('menu-listing')
@@ -68,9 +79,7 @@ export class ModuleAccessController {
 
   @Post('update')
   async updateModuleAccess(@Body() moduleAccessData: any[], @Request() req) {
-    return this.moduleAccessService.updateModuleAccess(
-      moduleAccessData
-    );
+    return this.moduleAccessService.updateModuleAccess(moduleAccessData);
   }
 
   // src/module/module-access/controller/module-access.controller.ts
@@ -97,16 +106,16 @@ export class ModuleAccessController {
   @Get('user-permissions')
   async getUserPermissions(@Request() req) {
     const userData = req.user.userData;
-  
+
     const userId = userData?.id;
     const appcode = userData?.appcode;
     const level_type = userData?.level_type;
     const level_id = userData?.level_id;
-  
+
     if (!userId || !appcode || !level_type || !level_id) {
       throw new BadRequestException('Invalid token data');
     }
-  
+
     return this.moduleAccessService.getUserPermissions({
       userId,
       appcode,
@@ -114,6 +123,4 @@ export class ModuleAccessController {
       level_id,
     });
   }
-  
-
 }

package/src/module/module/service/module-access.service.ts

@@ -15,7 +15,6 @@ export class ModuleAccessService {
     private readonly menuRepository: MenuRepository,
     private readonly dataSource: DataSource,
   ) {}
-  
 
   async getModules({ appcode }: { appcode: string }) {
     return this.moduleAccessRepository.getModules({
@@ -23,15 +22,16 @@ export class ModuleAccessService {
     });
   }
 
-  
   async getRoles({
     appcode,
     level_type,
     level_id,
+    organization_id,
   }: {
     appcode: string;
     level_type?: string;
     level_id?: number;
+    organization_id?: number;
   }) {
     const query = this.dataSource
       .createQueryBuilder()
@@ -39,24 +39,31 @@ export class ModuleAccessService {
       .from('cr_role', 'role')
       .where('role.appcode = :appcode', { appcode })
       .andWhere('(role.is_factory IS NULL OR role.is_factory != 1)');
-  
-      
+
     if (level_type) {
       query.andWhere('role.level_type = :level_type', { level_type });
     }
-  
+
+    if (organization_id) {
+      query.andWhere('role.organization_id = :organization_id', {
+        organization_id,
+      });
+    }
+
     if (level_id !== undefined) {
-      query.andWhere('role.level_id = :level_id', { level_id: String(level_id) });
+      query.andWhere('role.level_id = :level_id', {
+        level_id: String(level_id),
+      });
     }
-  
+
     const roles = await query.getRawMany(); // use getRawMany since you're selecting from a raw table
-  
+
     return roles.map((role) => ({
       label: role.name,
       value: role.id,
     }));
   }
-  
+
   async getAccessListing(
     roleIds: number[],
     appcode: string,
@@ -67,7 +74,7 @@ export class ModuleAccessService {
       roleIds,
       appcode,
       levelType,
-      level_id
+      level_id,
     );
   }
 
@@ -101,9 +108,8 @@ export class ModuleAccessService {
       return { success: false, msg: 'No data provided' };
     }
 
-    const result = await this.moduleAccessRepository.updateModuleAccess(
-      moduleAccessData,
-    );
+    const result =
+      await this.moduleAccessRepository.updateModuleAccess(moduleAccessData);
 
     if (result) {
       return { success: true, msg: 'Module access updated successfully' };
@@ -136,40 +142,36 @@ export class ModuleAccessService {
       level_type,
       level_id,
     );
-  
+
     if (!roleCodes || roleCodes.length === 0) {
       return [];
     }
-  
+
     const roleIds = roleCodes.map(Number);
-  
+
     // Step 2: Get full permissions
-    const allPermissions = await this.moduleAccessRepository.getModuleAccessByRoles(
-      roleIds,
-      appcode,
-    );
-  
+    const allPermissions =
+      await this.moduleAccessRepository.getModuleAccessByRoles(
+        roleIds,
+        appcode,
+      );
+
     // Step 3: If level_type is SCH, check school status using raw query
     if (level_type === 'SCH') {
       const result = await this.dataSource.query(
         `SELECT * FROM cr_school WHERE id = ${level_id}`,
         [level_id],
       );
-  
+
       const school = result?.[0];
-  
-      if (!school || school.status === "INACTIVE") {
+
+      if (!school || school.status === 'INACTIVE') {
         // Return only VIEW permissions
-        return allPermissions.filter(
-          (perm) => perm.action === 'VIEW'
-        );
+        return allPermissions.filter((perm) => perm.action === 'VIEW');
       }
     }
-  
+
     // Step 4: Return all permissions normally
     return allPermissions;
   }
-  
-  
-  
 }