rez_core 6.5.46 → 6.5.50

package/dist/module/module/entity/module.entity.js

@@ -10,7 +10,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ModuleData = void 0;
-const app_master_entity_1 = require("../../app_master/entity/app-master.entity");
 const typeorm_1 = require("typeorm");
 let ModuleData = class ModuleData {
 };
@@ -39,6 +38,18 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
     __metadata("design:type", String)
 ], ModuleData.prototype, "module_level", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Number)
+], ModuleData.prototype, "parent_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
+    __metadata("design:type", String)
+], ModuleData.prototype, "parent_code", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Number)
+], ModuleData.prototype, "ui_visible", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
     __metadata("design:type", String)
@@ -52,14 +63,13 @@ __decorate([
     __metadata("design:type", String)
 ], ModuleData.prototype, "component_name", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
-    __metadata("design:type", Number)
-], ModuleData.prototype, "app_id", void 0);
+    (0, typeorm_1.Column)({ type: 'json', nullable: true }),
+    __metadata("design:type", Object)
+], ModuleData.prototype, "ui_config", void 0);
 __decorate([
-    (0, typeorm_1.ManyToOne)(() => app_master_entity_1.AppMaster, { nullable: true, onDelete: 'SET NULL' }),
-    (0, typeorm_1.JoinColumn)({ name: 'app_id', referencedColumnName: 'id' }),
-    __metadata("design:type", app_master_entity_1.AppMaster)
-], ModuleData.prototype, "app", void 0);
+    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
+    __metadata("design:type", String)
+], ModuleData.prototype, "appcode", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
     __metadata("design:type", String)

package/dist/module/module/entity/module.entity.js.map

@@ -1 +1 @@
-{"version":3,"file":"module.entity.js","sourceRoot":"","sources":["../../../../src/module/module/entity/module.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,iFAA2E;AAC3E,qCAAwF;AAGjF,IAAM,UAAU,GAAhB,MAAM,UAAU;CAwCtB,CAAA;AAxCY,gCAAU;AAErB;IADC,IAAA,gCAAsB,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;;sCAC7B;AAGX;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;wCAC5C;AAGb;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+CACrC;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;4CACxC;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;0CAC1C;AAGf;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDACpC;AAGrB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+CACrC;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;yCAC3C;AAGd;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;kDAClC;AAGvB;IADC,IAAA,gBAAM,EAAC,EAAC,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAC,CAAC;;0CACvB;AAIf;IAFC,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,6BAAS,EAAE,EAAC,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAC,CAAC;IAClE,IAAA,oBAAU,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,oBAAoB,EAAE,IAAI,EAAE,CAAC;8BACtD,6BAAS;uCAAC;AAGf;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;wCAC5C;AAGb;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;8CACtC;qBAvCR,UAAU;IADtB,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC;GAClB,UAAU,CAwCtB"}
+{"version":3,"file":"module.entity.js","sourceRoot":"","sources":["../../../../src/module/module/entity/module.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAiE;AAG1D,IAAM,UAAU,GAAhB,MAAM,UAAU;CAgDtB,CAAA;AAhDY,gCAAU;AAErB;IADC,IAAA,gCAAsB,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;;sCAC7B;AAGX;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;wCAC5C;AAGb;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+CACrC;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;4CACxC;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;0CAC1C;AAGf;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDACpC;AAGrB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;6CACtB;AAGlB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+CACrC;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;8CACrB;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+CACrC;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;yCAC3C;AAGd;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;kDAClC;AAGvB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;6CACzB;AAGhB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2CACzC;AAGhB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;wCAC5C;AAGb;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;8CACtC;qBA/CR,UAAU;IADtB,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC;GAClB,UAAU,CAgDtB"}

package/dist/module/module/module.module.d.ts

@@ -1,2 +1,2 @@
-export declare class ModuleAccessModule {
+export declare class ModuleModule {
 }

package/dist/module/module/module.module.js

@@ -6,7 +6,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ModuleAccessModule = void 0;
+exports.ModuleModule = void 0;
 const common_1 = require("@nestjs/common");
 const typeorm_1 = require("@nestjs/typeorm");
 const module_entity_1 = require("./entity/module.entity");
@@ -23,10 +23,11 @@ const user_role_mapping_entity_1 = require("../user/entity/user-role-mapping.ent
 const user_module_1 = require("../user/user.module");
 const role_entity_1 = require("../user/entity/role.entity");
 const module_access_entity_1 = require("./entity/module-access.entity");
-let ModuleAccessModule = class ModuleAccessModule {
+const listmaster_module_1 = require("../listmaster/listmaster.module");
+let ModuleModule = class ModuleModule {
 };
-exports.ModuleAccessModule = ModuleAccessModule;
-exports.ModuleAccessModule = ModuleAccessModule = __decorate([
+exports.ModuleModule = ModuleModule;
+exports.ModuleModule = ModuleModule = __decorate([
     (0, common_1.Module)({
         imports: [
             typeorm_1.TypeOrmModule.forFeature([
@@ -39,6 +40,7 @@ exports.ModuleAccessModule = ModuleAccessModule = __decorate([
             ]),
             utils_module_1.UtilsModule,
             user_module_1.UserModule,
+            listmaster_module_1.ListMasterModule,
         ],
         controllers: [menu_controller_1.MenuController, module_access_controller_1.ModuleAccessController],
         providers: [
@@ -49,5 +51,5 @@ exports.ModuleAccessModule = ModuleAccessModule = __decorate([
         ],
         exports: [module_access_service_1.ModuleAccessService, menu_service_1.MenuService],
     })
-], ModuleAccessModule);
+], ModuleModule);
 //# sourceMappingURL=module.module.js.map

package/dist/module/module/module.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"module.module.js","sourceRoot":"","sources":["../../../src/module/module/module.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,6CAAgD;AAChD,0DAAoD;AACpD,2DAAuD;AACvD,wEAA6D;AAC7D,2EAAsE;AACtE,kEAA8D;AAC9D,yDAAqD;AACrD,kEAA8D;AAC9D,sDAAgD;AAChD,oFAA+E;AAC/E,oFAA+E;AAC/E,sFAA0E;AAC1E,qDAAiD;AACjD,4DAAkD;AAClD,wEAA6D;AAwBtD,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;CAC9B,CAAA;AADY,gDAAkB;6BAAlB,kBAAkB;IAtB9B,IAAA,eAAM,EAAC;QACN,OAAO,EAAE;YACP,uBAAa,CAAC,UAAU,CAAC;gBACvB,0BAAU;gBACV,mCAAY;gBACZ,mCAAY;gBACZ,sBAAQ;gBACR,0CAAe;gBACf,kBAAI;aACL,CAAC;YACF,0BAAW;YACX,wBAAU;SACX;QACD,WAAW,EAAE,CAAC,gCAAc,EAAE,iDAAsB,CAAC;QACrD,SAAS,EAAE;YACT,2CAAmB;YACnB,0BAAW;YACX,gCAAc;YACd,iDAAsB;SACvB;QACD,OAAO,EAAE,CAAC,2CAAmB,EAAC,0BAAW,CAAC;KAC3C,CAAC;GACW,kBAAkB,CAC9B"}
+{"version":3,"file":"module.module.js","sourceRoot":"","sources":["../../../src/module/module/module.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,6CAAgD;AAChD,0DAAoD;AACpD,2DAAuD;AACvD,wEAA6D;AAC7D,2EAAsE;AACtE,kEAA8D;AAC9D,yDAAqD;AACrD,kEAA8D;AAC9D,sDAAgD;AAChD,oFAA+E;AAC/E,oFAA+E;AAC/E,sFAA0E;AAC1E,qDAAiD;AACjD,4DAAkD;AAClD,wEAA6D;AAC7D,uEAAmE;AAyB5D,IAAM,YAAY,GAAlB,MAAM,YAAY;CAAG,CAAA;AAAf,oCAAY;uBAAZ,YAAY;IAvBxB,IAAA,eAAM,EAAC;QACN,OAAO,EAAE;YACP,uBAAa,CAAC,UAAU,CAAC;gBACvB,0BAAU;gBACV,mCAAY;gBACZ,mCAAY;gBACZ,sBAAQ;gBACR,0CAAe;gBACf,kBAAI;aACL,CAAC;YACF,0BAAW;YACX,wBAAU;YACV,oCAAgB;SACjB;QACD,WAAW,EAAE,CAAC,gCAAc,EAAE,iDAAsB,CAAC;QACrD,SAAS,EAAE;YACT,2CAAmB;YACnB,0BAAW;YACX,gCAAc;YACd,iDAAsB;SACvB;QACD,OAAO,EAAE,CAAC,2CAAmB,EAAC,0BAAW,CAAC;KAC3C,CAAC;GACW,YAAY,CAAG"}

package/dist/module/module/repository/menu.repository.d.ts

@@ -8,8 +8,8 @@ export declare class MenuRepository extends Repository<MenuData> {
     private readonly reflectionHelper;
     private readonly moduleAccessRepo;
     constructor(dataSource: DataSource, menuData: Repository<MenuData>, reflectionHelper: ReflectionHelper, moduleAccessRepo: Repository<ModuleAccess>);
-    getUserRoles(userId: number, app_id: number): Promise<number[]>;
-    getAccessibleModules(roleIds: number[], appcode: string): Promise<number[]>;
-    getMenuItems(modules: number[], appcode: string, levelType: string): Promise<any[]>;
+    getUserRoles(userId: number, appcode: string): Promise<number[]>;
+    getAccessibleModules(roleIds: number[], appCode: string): Promise<string[]>;
+    getMenuItems(moduleCodes: string[], appcode: string, levelType: string): Promise<any[]>;
     resolveUserRoles(userId: number, appcode: string, levelType: string, levelId: number): Promise<number[]>;
 }

package/dist/module/module/repository/menu.repository.js

@@ -27,68 +27,59 @@ let MenuRepository = class MenuRepository extends typeorm_1.Repository {
         this.reflectionHelper = reflectionHelper;
         this.moduleAccessRepo = moduleAccessRepo;
     }
-    async getUserRoles(userId, app_id) {
+    async getUserRoles(userId, appcode) {
         const userRoleMappingRepo = this.reflectionHelper.getRepoService('UserRoleMapping');
         const roles = await userRoleMappingRepo
             .createQueryBuilder('urm')
             .innerJoin('sso_role', 'role', 'role.id = urm.role_id')
             .select('urm.role_id', 'role_id')
             .where('urm.user_id = :userId', { userId })
-            .andWhere('role.app_id = :app_id', { app_id })
+            .andWhere('role.appcode = :appcode', { appcode })
             .getRawMany();
         return roles.map((r) => r.role_id);
     }
-    async getAccessibleModules(roleIds, appcode) {
-        const appMasterRepo = this.reflectionHelper.getRepoService('AppMaster');
-        const appMaster = await appMasterRepo.findOne({
-            where: {
-                code: appcode
-            }
-        });
+    async getAccessibleModules(roleIds, appCode) {
+        const roleRepo = this.reflectionHelper.getRepoService('Role');
+        const roleCodes = await roleRepo
+            .createQueryBuilder('role')
+            .select('role.code', 'code')
+            .where('role.id IN (:...roleIds)', { roleIds })
+            .getRawMany();
+        const codes = roleCodes.map((r) => r.code);
+        if (codes.length === 0)
+            return [];
         const modules = await this.moduleAccessRepo
             .createQueryBuilder('moduleAccess')
-            .select('moduleAccess.module_id')
-            .where('moduleAccess.role_id IN (:...roleIds)', { roleIds })
+            .select('moduleAccess.module_code')
+            .where('moduleAccess.role_code IN (:...codes)', { codes })
             .andWhere('moduleAccess.access_flag > 0')
-            .andWhere('moduleAccess.app_id = :app_id', { app_id: appMaster.id })
+            .andWhere('LOWER(moduleAccess.appcode) = LOWER(:appCode)', { appCode })
             .getMany();
-        return Array.from(new Set(modules.map((module) => module.module_id)));
+        return Array.from(new Set(modules.map((module) => module.module_code)));
     }
-    async getMenuItems(modules, appcode, levelType) {
-        const appMasterRepo = this.reflectionHelper.getRepoService('AppMaster');
-        const appMaster = await appMasterRepo.findOne({
-            where: {
-                code: appcode
-            }
-        });
+    async getMenuItems(moduleCodes, appcode, levelType) {
         return await this.menuData
             .createQueryBuilder('menu')
             .leftJoin('sso_module', 'module', `
-          menu.module_id = module.id
-          AND menu.app_id = module.app_id
+          menu.module_code = module.module_code
+          AND LOWER(menu.appcode) = LOWER(module.appcode)
           AND menu.level_type = module.level_type
         `)
-            .where('menu.module_id IN (:...modules)', { modules: modules })
-            .andWhere('menu.app_id = :app_id', { app_id: appMaster.id })
+            .where('menu.module_code IN (:...moduleCodes)', { moduleCodes })
+            .andWhere('LOWER(menu.appcode) = LOWER(:appcode)', { appcode })
             .andWhere('menu.level_type = :levelType', { levelType })
             .andWhere('menu.ui_visible = 1')
             .select([
             'menu.*',
-            'module.module_code AS module_code',
             'module.component_name AS component',
             'module.title AS title',
             'module.entity_type AS entity_type',
-            'module.type AS type'
+            'module.type AS type',
+            'module.ui_config AS ui_config',
         ])
             .getRawMany();
     }
     async resolveUserRoles(userId, appcode, levelType, levelId) {
-        const appMasterRepo = this.reflectionHelper.getRepoService('AppMaster');
-        const appMaster = await appMasterRepo.findOne({
-            where: {
-                code: appcode
-            }
-        });
         const repo = this.reflectionHelper.getRepoService('UserRoleMapping');
         if (userId) {
             const userRepo = this.reflectionHelper.getRepoService('UserData');
@@ -100,9 +91,7 @@ let MenuRepository = class MenuRepository extends typeorm_1.Repository {
             const getUserUrm = await repo.findOne({
                 where: {
                     user_id: userId,
-                    app: {
-                        code: appcode
-                    },
+                    appcode: appcode,
                 },
             });
             if (getUserDetails &&
@@ -118,7 +107,7 @@ let MenuRepository = class MenuRepository extends typeorm_1.Repository {
             .where('urm.user_id = :userId', { userId: userId })
             .andWhere('urm.level_type = :levelType', { levelType })
             .andWhere('urm.level_id = :levelId', { levelId: levelId })
-            .andWhere('role.app_id = :app_id', { app_id: appMaster.id })
+            .andWhere('role.appcode = :appcode', { appcode })
             .getRawMany();
         if (roles.length)
             return roles.map((r) => r.urm_role_id);
@@ -139,7 +128,7 @@ let MenuRepository = class MenuRepository extends typeorm_1.Repository {
                     .where('urm.user_id = :userId', { userId })
                     .andWhere('urm.level_type = :levelType', { levelType: 'BRN' })
                     .andWhere('urm.level_id = :levelId', { levelId: brandId })
-                    .andWhere('role.app_id = :app_id', { app_id: appMaster.id })
+                    .andWhere('role.appcode = :appcode', { appcode })
                     .getRawMany();
                 if (roles.length)
                     return roles.map((r) => r.urm_role_id);
@@ -152,7 +141,7 @@ let MenuRepository = class MenuRepository extends typeorm_1.Repository {
                     .where('urm.user_id = :userId', { userId })
                     .andWhere('urm.level_type = :levelType', { levelType: 'ORG' })
                     .andWhere('urm.level_id = :levelId', { levelId: orgId })
-                    .andWhere('role.app_id = :app_id', { app_id: appMaster.id })
+                    .andWhere('role.appcode = :appcode', { appcode })
                     .getRawMany();
                 if (roles.length)
                     return roles.map((r) => r.urm_role_id);

package/dist/module/module/repository/menu.repository.js.map

@@ -1 +1 @@
-{"version":3,"file":"menu.repository.js","sourceRoot":"","sources":["../../../../src/module/module/repository/menu.repository.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"menu.repository.js","sourceRoot":"","sources":["../../../../src/module/module/repository/menu.repository.ts"],"names":[],"mappings":"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"}

package/dist/module/module/repository/module-access.repository.d.ts

@@ -1,23 +1,22 @@
-import { Repository } from 'typeorm';
+import { Repository, DataSource } from 'typeorm';
 import { Role } from 'src/module/user/entity/role.entity';
 import { ModuleAccess } from '../entity/module-access.entity';
 import { ModuleAction } from '../entity/module-action.entity';
 import { ModuleData } from '../entity/module.entity';
-import { ReflectionHelper } from '../../../utils/service/reflection-helper.service';
 export declare class ModuleAccessRepository {
     private readonly roleRepo;
     private readonly moduleRepo;
     private readonly moduleAccessRepo;
     private readonly moduleActionRepo;
-    private readonly reflectionHelper;
-    constructor(roleRepo: Repository<Role>, moduleRepo: Repository<ModuleData>, moduleAccessRepo: Repository<ModuleAccess>, moduleActionRepo: Repository<ModuleAction>, reflectionHelper: ReflectionHelper);
+    private readonly dataSource;
+    constructor(roleRepo: Repository<Role>, moduleRepo: Repository<ModuleData>, moduleAccessRepo: Repository<ModuleAccess>, moduleActionRepo: Repository<ModuleAction>, dataSource: DataSource);
     getRoles({ appcode, level_type, level_id, }: {
         appcode: string;
         level_type?: string;
         level_id?: number;
     }): Promise<{
-        label: string;
-        value: number;
+        label: any;
+        value: any;
     }[]>;
     getModules({ appcode, loggedInUser, }: {
         appcode: string;
@@ -40,6 +39,7 @@ export declare class ModuleAccessRepository {
     getModuleUIConfig(moduleCode: string, roleIds: number[]): Promise<{
         entity_type: string;
         title: string;
+        ui_config: JSON;
         action: string[];
     }>;
     getModuleAccessByRoles(roleIds: number[], appcode: string): Promise<{

package/dist/module/module/repository/module-access.repository.js

@@ -20,32 +20,30 @@ const role_entity_1 = require("../../user/entity/role.entity");
 const module_access_entity_1 = require("../entity/module-access.entity");
 const module_action_entity_1 = require("../entity/module-action.entity");
 const module_entity_1 = require("../entity/module.entity");
-const reflection_helper_service_1 = require("../../../utils/service/reflection-helper.service");
 let ModuleAccessRepository = class ModuleAccessRepository {
-    constructor(roleRepo, moduleRepo, moduleAccessRepo, moduleActionRepo, reflectionHelper) {
+    constructor(roleRepo, moduleRepo, moduleAccessRepo, moduleActionRepo, dataSource) {
         this.roleRepo = roleRepo;
         this.moduleRepo = moduleRepo;
         this.moduleAccessRepo = moduleAccessRepo;
         this.moduleActionRepo = moduleActionRepo;
-        this.reflectionHelper = reflectionHelper;
+        this.dataSource = dataSource;
     }
     async getRoles({ appcode, level_type, level_id, }) {
-        const where = {
-            app: {
-                code: appcode,
-            },
-            is_factory: (0, typeorm_2.Or)((0, typeorm_2.IsNull)(), (0, typeorm_2.Not)(1)),
-        };
+        const query = this.dataSource
+            .createQueryBuilder()
+            .select('*')
+            .from('sso_role', 'role')
+            .where('role.appcode = :appcode', { appcode })
+            .andWhere('(role.is_factory IS NULL OR role.is_factory != 1)');
         if (level_type) {
-            where.level_type = level_type;
+            query.andWhere('role.level_type = :level_type', { level_type });
         }
         if (level_id !== undefined) {
-            where.level_id = String(level_id);
+            query.andWhere('role.level_id = :level_id', {
+                level_id: String(level_id),
+            });
         }
-        const roles = await this.roleRepo.find({
-            where,
-            select: ['id', 'name'],
-        });
+        const roles = await query.getRawMany();
         return roles.map((role) => ({
             label: role.name,
             value: role.id,
@@ -55,22 +53,12 @@ let ModuleAccessRepository = class ModuleAccessRepository {
         let modules;
         if (loggedInUser.level_type == 'SCH') {
             modules = await this.moduleRepo.find({
-                where: {
-                    module_level: 'MAINMOD',
-                    app: {
-                        code: appcode,
-                    },
-                    level_type: 'SCH',
-                },
+                where: { module_level: 'MAINMOD', appcode, level_type: 'SCH' },
             });
         }
         else {
             modules = await this.moduleRepo.find({
-                where: {
-                    module_level: 'MAINMOD', app: {
-                        code: appcode,
-                    },
-                },
+                where: { module_level: 'MAINMOD', appcode },
             });
         }
         return modules
@@ -93,9 +81,7 @@ let ModuleAccessRepository = class ModuleAccessRepository {
             roles = await this.roleRepo.find({
                 where: {
                     id: (0, typeorm_2.In)(fetchedRoleIds),
-                    app: {
-                        code: appcode,
-                    },
+                    appcode,
                 },
             });
         }
@@ -103,59 +89,40 @@ let ModuleAccessRepository = class ModuleAccessRepository {
             roles = await this.roleRepo.find({
                 where: {
                     id: (0, typeorm_2.In)(roleIds.map((id) => Number(id))),
-                    app: {
-                        code: appcode,
-                    },
+                    appcode,
                 },
             });
         }
         if (!roles.length)
             return [];
+        const roleCodes = roles.map((role) => role.code);
         const moduleAccesses = await this.moduleAccessRepo.find({
             where: {
-                role_id: (0, typeorm_2.In)(roles.map((role) => role.id)),
-                app: {
-                    code: appcode,
-                },
-                level_type: levelType,
-            },
-            relations: {
-                app: true,
-                module: true,
+                role_code: (0, typeorm_2.In)(roleCodes),
+                appcode,
             },
         });
         return roles.map((role) => ({
-            role_id: role.id,
+            role_code: role.code,
             name: role.name,
             permission: moduleAccesses
-                .filter((access) => access.role_id === role.id)
+                .filter((access) => access.role_code === role.code)
                 .map((access) => ({
                 action: access.action_type,
                 access: access.access_flag,
-                module_id: access.module_id,
+                code: access.module_code,
                 level_type: access.level_type,
-                app_id: access.app_id,
-                code: access.module.module_code,
-                appcode: access.app.code,
+                appcode: access.appcode,
             })),
         }));
     }
     async getAllModulesByLevel(mainModIds, appcode, levelType) {
-        const appMasterRepo = this.reflectionHelper.getRepoService('AppMaster');
-        const appMaster = await appMasterRepo.find({
-            where: {
-                code: appcode,
-            },
-        });
-        if (!appMaster) {
-            return {};
-        }
         const mainModules = mainModIds.length === 1 && mainModIds[0] === '-1'
             ? await this.moduleRepo.find({
-                where: { module_level: 'MAINMOD', app_id: appMaster[0].id },
+                where: { module_level: 'MAINMOD', appcode },
             })
             : await this.moduleRepo.find({
-                where: { id: (0, typeorm_2.In)(mainModIds), module_level: 'MAINMOD', app: { code: appcode } },
+                where: { id: (0, typeorm_2.In)(mainModIds), module_level: 'MAINMOD', appcode },
             });
         if (!mainModules.length)
             return {};
@@ -165,28 +132,28 @@ let ModuleAccessRepository = class ModuleAccessRepository {
             .where(wbsCodes
             .map((code) => `module.wbs_code LIKE :code${code}`)
             .join(' OR '), Object.fromEntries(wbsCodes.map((code) => [`code${code}`, `${code}%`])))
-            .andWhere('module.app_id = :app_id', { app_id: appMaster[0].id })
+            .andWhere('module.appcode = :appcode', { appcode })
             .andWhere('module.module_code != :excludedCode', {
             excludedCode: 'all_organization_adm_org',
         })
             .getMany();
         allModules = allModules.filter((mod) => mod.module_code != 'all_organization_adm_org');
-        const modules = allModules.map((m) => m.id);
+        const moduleCodes = allModules.map((m) => m.module_code);
         const allActions = await this.moduleActionRepo.find({
-            where: { module_id: (0, typeorm_2.In)(modules) },
+            where: { module_code: (0, typeorm_2.In)(moduleCodes) },
         });
         const actionMap = allActions.reduce((acc, action) => {
-            if (!acc[action.module_id])
-                acc[action.module_id] = [];
+            if (!acc[action.module_code])
+                acc[action.module_code] = [];
             const actionItem = {
-                action: action.action_code,
+                action: action.action_type,
                 name: action.action_name,
             };
-            if (action.action_code === 'VIEW') {
-                acc[action.module_id].unshift(actionItem);
+            if (action.action_type === 'VIEW') {
+                acc[action.module_code].unshift(actionItem);
             }
             else {
-                acc[action.module_id].push(actionItem);
+                acc[action.module_code].push(actionItem);
             }
             return acc;
         }, {});
@@ -200,7 +167,6 @@ let ModuleAccessRepository = class ModuleAccessRepository {
                     parentWbs.split('.').length + 1)
                 .map((mod) => ({
                 name: mod.name,
-                module_id: mod.id,
                 code: mod.module_code,
                 permission: actionMap[mod.module_code] || [],
                 submod: buildHierarchy(mod.wbs_code),
@@ -209,7 +175,6 @@ let ModuleAccessRepository = class ModuleAccessRepository {
                 .filter((mod) => mod.level_type === lvl)
                 .map((mod) => ({
                 name: mod.name,
-                module_id: mod.id,
                 code: mod.module_code,
                 permission: actionMap[mod.module_code] || [],
                 submod: buildHierarchy(mod.wbs_code),
@@ -225,16 +190,10 @@ let ModuleAccessRepository = class ModuleAccessRepository {
             for (const access of accessList) {
                 const existing = await this.moduleAccessRepo.findOne({
                     where: {
-                        role: {
-                            code: access.role_code,
-                        },
-                        module: {
-                            module_code: access.module_code,
-                        },
+                        role_code: access.role_code,
+                        module_code: access.module_code,
                         action_type: access.action_type,
-                        app: {
-                            code: access.appcode,
-                        },
+                        appcode: access.appcode,
                         level_type: access.level_type,
                     },
                 });
@@ -243,7 +202,7 @@ let ModuleAccessRepository = class ModuleAccessRepository {
                     await this.moduleAccessRepo.save(existing);
                 }
                 else {
-                    await this.moduleAccessRepo.save(this.moduleAccessRepo.create(access));
+                    await this.moduleAccessRepo.save(await this.moduleAccessRepo.create(access));
                 }
             }
             return true;
@@ -259,10 +218,12 @@ let ModuleAccessRepository = class ModuleAccessRepository {
         });
         if (!module)
             throw new common_1.BadRequestException('Module not found');
+        const roles = await this.roleRepo.find({ where: { id: (0, typeorm_2.In)(roleIds) } });
+        const roleCodes = roles.map((role) => role.code);
         const actions = await this.moduleAccessRepo.find({
             where: {
-                module_id: module.id,
-                role_id: (0, typeorm_2.In)(roleIds),
+                module_code: moduleCode,
+                role_code: (0, typeorm_2.In)(roleCodes),
                 access_flag: 1,
             },
         });
@@ -270,6 +231,7 @@ let ModuleAccessRepository = class ModuleAccessRepository {
         return {
             entity_type: module.entity_type,
             title: module.title,
+            ui_config: module.ui_config || {},
             action: uniqueActions,
         };
     }
@@ -277,34 +239,24 @@ let ModuleAccessRepository = class ModuleAccessRepository {
         const roles = await this.roleRepo.find({
             where: {
                 id: (0, typeorm_2.In)(roleIds),
-                app: {
-                    code: appcode,
-                },
+                appcode,
             },
             select: ['id', 'code'],
         });
         const roleCodes = roles.map((r) => r.code);
         if (!roleCodes.length)
             return [];
-        const appMasterRepo = this.reflectionHelper.getRepoService('AppMaster');
-        const appMaster = await appMasterRepo.findOne({
-            where: {
-                code: appcode,
-            },
-        });
         const accessRecords = await this.moduleAccessRepo
             .createQueryBuilder('access')
             .select([
-            'access.module_id AS module_id',
-            'm.module_code AS module_code',
+            'access.module_code AS module_code',
             'access.action_type AS action_type',
             'access.access_flag AS access_flag',
             'access.level_type AS level_type',
             'access.appcode AS appcode',
         ])
-            .innerJoin('sso_module', 'm', 'm.id = access.module_id')
             .where('access.role_code IN (:...roleCodes)', { roleCodes })
-            .andWhere('access.app_id = :app_id', { app_id: appMaster.id })
+            .andWhere('access.appcode = :appcode', { appcode })
             .getRawMany();
         return accessRecords.map((record) => ({
             action: record.action_type,
@@ -326,6 +278,6 @@ exports.ModuleAccessRepository = ModuleAccessRepository = __decorate([
         typeorm_2.Repository,
         typeorm_2.Repository,
         typeorm_2.Repository,
-        reflection_helper_service_1.ReflectionHelper])
+        typeorm_2.DataSource])
 ], ModuleAccessRepository);
 //# sourceMappingURL=module-access.repository.js.map