rez_core 6.5.56 → 6.5.58

package/package.json

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

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

@@ -23,10 +23,10 @@ export class ModuleAccessRepository {
   }
 
   async getRoles({
-                   appcode,
-                   level_type,
-                   level_id,
-                 }: {
+    appcode,
+    level_type,
+    level_id,
+  }: {
     appcode: string;
     level_type?: string;
     level_id?: number;
@@ -58,9 +58,9 @@ export class ModuleAccessRepository {
   }
 
   async getModules({
-                     appcode,
-                     loggedInUser,
-                   }: {
+    appcode,
+    loggedInUser,
+  }: {
     appcode: string;
     loggedInUser: any;
   }) {
@@ -157,15 +157,16 @@ export class ModuleAccessRepository {
           module_id: access.module_id,
           level_type: access.level_type,
           app_id: access.app_id,
-          code: access.module.module_code,
+          code: access?.module?.module_code,
           appcode: access.app.code,
         })),
     }));
   }
 
   async getAllModulesByLevel(mainModIds: string[], appcode: string, levelType) {
+
     const appMasterRepo = this.reflectionHelper.getRepoService('AppMaster');
-// TODO Permissions not getting populated
+    // TODO Permissions not getting populated
     const appMaster = await appMasterRepo.find({
       where: {
         code: appcode,
@@ -209,28 +210,25 @@ export class ModuleAccessRepository {
 
     const modules = allModules.map((m) => m.id);
 
-    const allActions: any = await this.moduleActionRepo.createQueryBuilder('action')
-      .select(['action.id', 'action.action_name', 'module.module_code'])
-      .leftJoin('action.module', 'module')
-      .where('module.module_id IN (:...modules)', { modules })
-      .getMany();
+    const allActions = await this.moduleActionRepo.find({
+      where: {
+        module_id: In(modules),
+      }
+    })
 
     // Map actions by module_code with VIEW action first
     const actionMap = allActions.reduce(
       (acc, action) => {
-        if (!acc[action.module_code]) acc[action.module_code] = [];
-
+        if (!acc[action?.module_id]) acc[action?.module_id] = [];
         const actionItem = {
           action: action.action_code,
           name: action.action_name,
         };
-
         if (action.action_code === 'VIEW') {
-          acc[action.module_code].unshift(actionItem); // ➕ Add VIEW at start
+          acc[action?.module_id].unshift(actionItem); // ➕ Add VIEW at start
         } else {
-          acc[action.module_code].push(actionItem); // ➕ Add others at end
+          acc[action?.module_id].push(actionItem); // ➕ Add others at end
         }
-
         return acc;
       },
       {} as Record<string, { action: string; name: string }[]>,
@@ -255,7 +253,7 @@ export class ModuleAccessRepository {
             name: mod.name,
             module_id: mod.id,
             code: mod.module_code,
-            permission: actionMap[mod.module_code] || [],
+            permission: actionMap[mod.id] || [],
             submod: buildHierarchy(mod.wbs_code),
           }));
 
@@ -265,7 +263,7 @@ export class ModuleAccessRepository {
           name: mod.name,
           module_id: mod.id,
           code: mod.module_code,
-          permission: actionMap[mod.module_code] || [],
+          permission: actionMap[mod.id] || [],
           submod: buildHierarchy(mod.wbs_code),
         }));