rez_core 2.0.13 → 2.0.14

package/package.json

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

package/src/module/module/entity/module.entity.ts

@@ -40,7 +40,10 @@ export class ModuleData {
 
   @Column({ type: 'json', nullable: true })
   ui_config: JSON;
-  
+
   @Column({ type: 'varchar', length: 100, nullable: true })
   appcode: string;
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  type: string;
 }

package/src/module/module/repository/menu.repository.ts

@@ -23,55 +23,61 @@ export class MenuRepository extends Repository<MenuData> {
       .where('urm.user_id = :userId', { userId })
       .andWhere('role.appcode = :appcode', { appcode })
       .getRawMany();
-  
-    return roles. map((r) => r.urm_role_id);
+
+    return roles.map((r) => r.urm_role_id);
   }
-  
 
   /**
    * Get module codes that the user has access to based on their role IDs.
-   */async getAccessibleModules(roleIds: number[], appCode: string): Promise<string[]> {
-  // Get role codes from role IDs
-  const roleCodes = await this.dataSource
-  .getRepository(Role)
-  .createQueryBuilder('role')
-  .select('role.code')
-  .where('role.id IN (:...roleIds)', { roleIds })
-  .getMany();
-
-const codes = roleCodes.map((role) => role.code);
+   */ async getAccessibleModules(
+    roleIds: number[],
+    appCode: string,
+  ): Promise<string[]> {
+    // Get role codes from role IDs
+    const roleCodes = await this.dataSource
+      .getRepository(Role)
+      .createQueryBuilder('role')
+      .select('role.code')
+      .where('role.id IN (:...roleIds)', { roleIds })
+      .getMany();
 
-if (codes.length === 0) {
-  return [];
-}
+    const codes = roleCodes.map((role) => role.code);
 
-// Get accessible modules using role codes and appCode
-const modules = await this.dataSource
-  .getRepository(ModuleAccess)
-  .createQueryBuilder('moduleAccess')
-  .select('moduleAccess.module_code')
-  .where('moduleAccess.role_code IN (:...codes)', { codes })
-  .andWhere('moduleAccess.access_flag > 0')
-  .andWhere('LOWER(moduleAccess.appcode) = LOWER(:appCode)', { appCode }) // case-insensitive
-  .getMany();
+    if (codes.length === 0) {
+      return [];
+    }
 
-return modules.map((module) => module.module_code);
-}
+    // Get accessible modules using role codes and appCode
+    const modules = await this.dataSource
+      .getRepository(ModuleAccess)
+      .createQueryBuilder('moduleAccess')
+      .select('moduleAccess.module_code')
+      .where('moduleAccess.role_code IN (:...codes)', { codes })
+      .andWhere('moduleAccess.access_flag > 0')
+      .andWhere('LOWER(moduleAccess.appcode) = LOWER(:appCode)', { appCode }) // case-insensitive
+      .getMany();
 
-async getMenuItems(moduleCodes: string[], appcode: string): Promise<MenuData[]> {
-  const menuItems = await this.createQueryBuilder('menu')
-    .leftJoin('cr_module', 'module', 'menu.module_code = module.module_code')
-    .where('menu.module_code IN (:...moduleCodes)', { moduleCodes })
-    .andWhere('LOWER(module.appcode) = LOWER(:appcode)', { appcode }) // appcode filter
-    .select([
-      'menu.*',
-      'module.component_name AS component',
-      'module.title AS title',
-      'module.entity_type AS entity_type',
-    ])
-    .getRawMany();
+    return modules.map((module) => module.module_code);
+  }
 
-  return menuItems;
-}
+  async getMenuItems(
+    moduleCodes: string[],
+    appcode: string,
+  ): Promise<MenuData[]> {
+    const menuItems = await this.createQueryBuilder('menu')
+      .leftJoin('cr_module', 'module', 'menu.module_code = module.module_code')
+      .where('menu.module_code IN (:...moduleCodes)', { moduleCodes })
+      .andWhere('LOWER(module.appcode) = LOWER(:appcode)', { appcode }) // appcode filter
+      .select([
+        'menu.*',
+        'module.component_name AS component',
+        'module.title AS title',
+        'module.entity_type AS entity_type',
+        'module.type AS type',
+        'module.ui_config AS ui_config',
+      ])
+      .getRawMany();
 
+    return menuItems;
+  }
 }