rez_core 2.0.93 → 2.0.94

package/package.json

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

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

@@ -62,7 +62,6 @@ export class ModuleAccessRepository {
     }));
   }
 
-
   async getAllModulesByLevel(mainModIds: string[], appcode: string, levelType) {
     const mainModules =
       mainModIds.length === 1 && mainModIds[0] === '-1'
@@ -84,6 +83,23 @@ export class ModuleAccessRepository {
       .andWhere('module.appcode = :appcode', { appcode })
       .getMany();
   
+    const moduleCodes = allModules.map((m) => m.module_code);
+  
+    const allActions = await this.moduleActionRepo.find({
+      where: { module_code: In(moduleCodes) },
+    });
+  
+    // Map actions by module_code with full permission object
+    const actionMap = allActions.reduce((acc, action) => {
+      if (!acc[action.module_code]) acc[action.module_code] = [];
+      acc[action.module_code].push({
+        action: action.action_type,
+        name: action.action_name,
+        // You can also include action_type here if needed
+      });
+      return acc;
+    }, {} as Record<string, { action: string; name: string }[]>);
+  
     const levelsToReturn = levelType === 'ORG' ? ['ORG', 'SCH'] : ['SCH'];
   
     const groupedByLevel: Record<string, any[]> = {};
@@ -101,7 +117,7 @@ export class ModuleAccessRepository {
           .map((mod) => ({
             name: mod.name,
             code: mod.module_code,
-            permission: [], // No actions, since you're not using role filtering
+            permission: actionMap[mod.module_code] || [],
             submod: buildHierarchy(mod.wbs_code),
           }));
   
@@ -110,7 +126,7 @@ export class ModuleAccessRepository {
         .map((mod) => ({
           name: mod.name,
           code: mod.module_code,
-          permission: [],
+          permission: actionMap[mod.module_code] || [],
           submod: buildHierarchy(mod.wbs_code),
         }));
   
@@ -118,10 +134,9 @@ export class ModuleAccessRepository {
         groupedByLevel[lvl] = levelModules;
       }
     }
-  
     return groupedByLevel;
   }
-
+  
 
   async updateModuleAccess(
     accessList: {