rez_core 6.5.50 → 6.5.51

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

@@ -38,9 +38,9 @@ let ModuleAccessController = class ModuleAccessController {
             loggedInUser
         });
     }
-    async getAccessListing(roleIds, queryAppcode, req) {
+    async getAccessListing(roleIds, queryAppCode, req) {
         const roleIdArray = roleIds.split(',').map(Number);
-        const appcode = queryAppcode || req.user.userData.appcode;
+        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);
@@ -55,8 +55,8 @@ let ModuleAccessController = class ModuleAccessController {
     }
     async getModuleUIConfig(moduleCode, req) {
         const userId = req.user.userData?.id;
-        const appcode = req.user.userData?.appcode;
-        const roles = await this.menuService.getUserRoles(userId, appcode);
+        const app_id = req.user.userData?.app_id;
+        const roles = await this.menuService.getUserRoles(userId, app_id);
         if (!roles || roles.length === 0) {
             throw new common_1.BadRequestException('User has no roles');
         }
@@ -68,22 +68,21 @@ let ModuleAccessController = class ModuleAccessController {
         const appcode = userData?.appcode;
         const level_type = userData?.level_type;
         const level_id = userData?.level_id;
-        const enterprise_id = userData?.enterprise_id;
-        if (!userId || !appcode || !level_type || !level_id || !enterprise_id) {
+        if (!userId || !appcode || !level_type || !level_id) {
             throw new common_1.BadRequestException('Invalid token data');
         }
         return this.moduleAccessService.getUserPermissions({
             userId,
             appcode,
             level_type,
-            level_id,
-            enterprise_id,
+            level_id
         });
     }
 };
 exports.ModuleAccessController = ModuleAccessController;
 __decorate([
     (0, common_1.Get)('roles'),
+    (0, common_1.HttpCode)(common_1.HttpStatus.OK),
     __param(0, (0, common_1.Query)('appcode')),
     __param(1, (0, common_1.Query)('include')),
     __param(2, (0, common_1.Request)()),
@@ -93,6 +92,7 @@ __decorate([
 ], ModuleAccessController.prototype, "getRoles", null);
 __decorate([
     (0, common_1.Get)('modules'),
+    (0, common_1.HttpCode)(common_1.HttpStatus.OK),
     __param(0, (0, common_1.Query)('appcode')),
     __param(1, (0, common_1.Request)()),
     __metadata("design:type", Function),
@@ -101,6 +101,7 @@ __decorate([
 ], ModuleAccessController.prototype, "getModules", null);
 __decorate([
     (0, common_1.Get)('access-listing'),
+    (0, common_1.HttpCode)(common_1.HttpStatus.OK),
     __param(0, (0, common_1.Query)('roles')),
     __param(1, (0, common_1.Query)('appcode')),
     __param(2, (0, common_1.Request)()),
@@ -110,6 +111,7 @@ __decorate([
 ], ModuleAccessController.prototype, "getAccessListing", null);
 __decorate([
     (0, common_1.Get)('menu-listing'),
+    (0, common_1.HttpCode)(common_1.HttpStatus.OK),
     __param(0, (0, common_1.Query)('mainmod')),
     __param(1, (0, common_1.Query)('appcode')),
     __param(2, (0, common_1.Request)()),
@@ -119,6 +121,7 @@ __decorate([
 ], ModuleAccessController.prototype, "getMenuListing", null);
 __decorate([
     (0, common_1.Post)('update'),
+    (0, common_1.HttpCode)(common_1.HttpStatus.OK),
     __param(0, (0, common_1.Body)()),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Array]),
@@ -126,6 +129,7 @@ __decorate([
 ], ModuleAccessController.prototype, "updateModuleAccess", null);
 __decorate([
     (0, common_1.Get)('ui-config'),
+    (0, common_1.HttpCode)(common_1.HttpStatus.OK),
     __param(0, (0, common_1.Query)('module_code')),
     __param(1, (0, common_1.Request)()),
     __metadata("design:type", Function),
@@ -134,6 +138,7 @@ __decorate([
 ], ModuleAccessController.prototype, "getModuleUIConfig", null);
 __decorate([
     (0, common_1.Get)('user-permissions'),
+    (0, common_1.HttpCode)(common_1.HttpStatus.OK),
     __param(0, (0, common_1.Request)()),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object]),

package/dist/module/module/controller/module-access.controller.js.map

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

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

@@ -1,15 +1,18 @@
+import { ModuleData } from './module.entity';
+import { AppMaster } from 'src/module/app_master/entity/app-master.entity';
 export declare class MenuData {
     id: number;
     name: string;
     module_code: string;
+    module_id: number;
+    moduleData: ModuleData;
     status: string;
     wbs_code: string;
     path: string;
     icon: string;
     module_level: string;
-    parent_id: number;
-    parent_code: string;
     ui_visible: number;
-    appcode: string;
+    app_id: number;
+    app: AppMaster;
     level_type: string;
 }

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

@@ -11,6 +11,9 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MenuData = void 0;
 const typeorm_1 = require("typeorm");
+const module_entity_1 = require("./module.entity");
+const app_master_entity_1 = require("../../app_master/entity/app-master.entity");
+const class_transformer_1 = require("class-transformer");
 let MenuData = class MenuData {
 };
 exports.MenuData = MenuData;
@@ -23,9 +26,18 @@ __decorate([
     __metadata("design:type", String)
 ], MenuData.prototype, "name", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
+    (0, class_transformer_1.Exclude)(),
     __metadata("design:type", String)
 ], MenuData.prototype, "module_code", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Number)
+], MenuData.prototype, "module_id", void 0);
+__decorate([
+    (0, typeorm_1.ManyToOne)(() => module_entity_1.ModuleData, { nullable: true, onDelete: 'SET NULL' }),
+    (0, typeorm_1.JoinColumn)({ name: 'module_id', referencedColumnName: 'id' }),
+    __metadata("design:type", module_entity_1.ModuleData)
+], MenuData.prototype, "moduleData", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
     __metadata("design:type", String)
@@ -49,19 +61,16 @@ __decorate([
 __decorate([
     (0, typeorm_1.Column)({ type: 'int', nullable: true }),
     __metadata("design:type", Number)
-], MenuData.prototype, "parent_id", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
-    __metadata("design:type", String)
-], MenuData.prototype, "parent_code", void 0);
+], MenuData.prototype, "ui_visible", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'int', nullable: true }),
     __metadata("design:type", Number)
-], MenuData.prototype, "ui_visible", void 0);
+], MenuData.prototype, "app_id", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: 'varchar', nullable: true }),
-    __metadata("design:type", String)
-], MenuData.prototype, "appcode", void 0);
+    (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)
+], MenuData.prototype, "app", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', nullable: true }),
     __metadata("design:type", String)

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

@@ -1 +1 @@
-{"version":3,"file":"menu.entity.js","sourceRoot":"","sources":["../../../../src/module/module/entity/menu.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAiE;AAG1D,IAAM,QAAQ,GAAd,MAAM,QAAQ;CAuCpB,CAAA;AAvCY,4BAAQ;AAEnB;IADC,IAAA,gCAAsB,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;;oCAC7B;AAGX;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;sCAC5C;AAGb;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;6CACrC;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;wCAC1C;AAGf;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;0CACxC;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;sCAC/B;AAGb;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;sCAC5C;AAGb;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;8CACpC;AAGrB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2CACtB;AAGlB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;6CACrC;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;4CACrB;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;yCAC5B;AAGhB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;4CACzB;mBAtCR,QAAQ;IADpB,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;GAChB,QAAQ,CAuCpB"}
+{"version":3,"file":"menu.entity.js","sourceRoot":"","sources":["../../../../src/module/module/entity/menu.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAkG;AAClG,mDAA6C;AAC7C,iFAA2E;AAC3E,yDAA4C;AAGrC,IAAM,QAAQ,GAAd,MAAM,QAAQ;CA4CpB,CAAA;AA5CY,4BAAQ;AAEnB;IADC,IAAA,gCAAsB,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;;oCAC7B;AAGX;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;sCAC5C;AAGb;IADC,IAAA,2BAAO,GAAE;;6CACS;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2CACvB;AAIjB;IAFC,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,0BAAU,EAAE,EAAC,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAC,CAAC;IACnE,IAAA,oBAAU,EAAC,EAAE,IAAI,EAAE,WAAW,EAAE,oBAAoB,EAAE,IAAI,EAAE,CAAC;8BAClD,0BAAU;4CAAC;AAGvB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;wCAC1C;AAGf;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;0CACxC;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;sCAC/B;AAGb;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;sCAC5C;AAGb;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;8CACpC;AAGrB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;4CACrB;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;wCACzB;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;qCAAC;AAGf;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;4CACzB;mBA3CR,QAAQ;IADpB,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;GAChB,QAAQ,CA4CpB"}

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

@@ -1,9 +1,23 @@
+import { ModuleData } from './module.entity';
+import { Role } from 'src/module/user/entity/role.entity';
+import { ModuleAction } from './module-action.entity';
+import { EnterpriseData } from 'src/module/enterprise/entity/enterprise.entity';
+import { AppMaster } from '../../app_master/entity/app-master.entity';
 export declare class ModuleAccess {
     id: number;
-    module_code: string;
+    module_id: number;
+    module: ModuleData;
     role_code: string;
+    role_id: number;
+    role: Role;
     access_flag: number;
     action_type: string;
+    action_id: number;
+    action: ModuleAction;
     level_type: string;
     appcode: string;
+    app_id: number;
+    app: AppMaster;
+    enterprise_id: number;
+    enterprise: EnterpriseData;
 }

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

@@ -11,6 +11,11 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ModuleAccess = void 0;
 const typeorm_1 = require("typeorm");
+const module_entity_1 = require("./module.entity");
+const role_entity_1 = require("../../user/entity/role.entity");
+const module_action_entity_1 = require("./module-action.entity");
+const enterprise_entity_1 = require("../../enterprise/entity/enterprise.entity");
+const app_master_entity_1 = require("../../app_master/entity/app-master.entity");
 let ModuleAccess = class ModuleAccess {
 };
 exports.ModuleAccess = ModuleAccess;
@@ -19,13 +24,27 @@ __decorate([
     __metadata("design:type", Number)
 ], ModuleAccess.prototype, "id", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
-    __metadata("design:type", String)
-], ModuleAccess.prototype, "module_code", void 0);
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Number)
+], ModuleAccess.prototype, "module_id", void 0);
+__decorate([
+    (0, typeorm_1.ManyToOne)(() => module_entity_1.ModuleData, { nullable: true, onDelete: 'SET NULL' }),
+    (0, typeorm_1.JoinColumn)({ name: 'module_id', referencedColumnName: 'id' }),
+    __metadata("design:type", module_entity_1.ModuleData)
+], ModuleAccess.prototype, "module", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
     __metadata("design:type", String)
 ], ModuleAccess.prototype, "role_code", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Number)
+], ModuleAccess.prototype, "role_id", void 0);
+__decorate([
+    (0, typeorm_1.ManyToOne)(() => role_entity_1.Role, { nullable: true, onDelete: 'SET NULL' }),
+    (0, typeorm_1.JoinColumn)({ name: 'role_id', referencedColumnName: 'id' }),
+    __metadata("design:type", role_entity_1.Role)
+], ModuleAccess.prototype, "role", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'int', nullable: true }),
     __metadata("design:type", Number)
@@ -34,6 +53,15 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
     __metadata("design:type", String)
 ], ModuleAccess.prototype, "action_type", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Number)
+], ModuleAccess.prototype, "action_id", void 0);
+__decorate([
+    (0, typeorm_1.ManyToOne)(() => module_action_entity_1.ModuleAction, { nullable: true, onDelete: 'SET NULL' }),
+    (0, typeorm_1.JoinColumn)({ name: 'action_id', referencedColumnName: 'id' }),
+    __metadata("design:type", module_action_entity_1.ModuleAction)
+], ModuleAccess.prototype, "action", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
     __metadata("design:type", String)
@@ -42,6 +70,24 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
     __metadata("design:type", String)
 ], ModuleAccess.prototype, "appcode", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Number)
+], ModuleAccess.prototype, "app_id", 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)
+], ModuleAccess.prototype, "app", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Number)
+], ModuleAccess.prototype, "enterprise_id", void 0);
+__decorate([
+    (0, typeorm_1.ManyToOne)(() => enterprise_entity_1.EnterpriseData, { nullable: true, onDelete: 'SET NULL' }),
+    (0, typeorm_1.JoinColumn)({ name: 'enterprise_id', referencedColumnName: 'id' }),
+    __metadata("design:type", enterprise_entity_1.EnterpriseData)
+], ModuleAccess.prototype, "enterprise", void 0);
 exports.ModuleAccess = ModuleAccess = __decorate([
     (0, typeorm_1.Entity)({ name: 'sso_module_access' })
 ], ModuleAccess);

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

@@ -1 +1 @@
-{"version":3,"file":"module-access.entity.js","sourceRoot":"","sources":["../../../../src/module/module/entity/module-access.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAiE;AAG1D,IAAM,YAAY,GAAlB,MAAM,YAAY;CAqBxB,CAAA;AArBY,oCAAY;AAEvB;IADC,IAAA,gCAAsB,GAAE;;wCACd;AAGX;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;iDACrC;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+CACvC;AAGlB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;iDACpB;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;iDACrC;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDACtC;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;6CACzC;uBApBL,YAAY;IADxB,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,mBAAmB,EAAE,CAAC;GACzB,YAAY,CAqBxB"}
+{"version":3,"file":"module-access.entity.js","sourceRoot":"","sources":["../../../../src/module/module/entity/module-access.entity.ts"],"names":[],"mappings":"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"}

package/dist/module/module/entity/module-action.entity.d.ts

@@ -1,6 +1,8 @@
+import { ModuleData } from './module.entity';
 export declare class ModuleAction {
     id: number;
-    module_code: string;
+    module_id: number;
+    module: ModuleData;
     action_name: string;
-    action_type: string;
+    action_code: string;
 }

package/dist/module/module/entity/module-action.entity.js

@@ -11,6 +11,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ModuleAction = void 0;
 const typeorm_1 = require("typeorm");
+const module_entity_1 = require("./module.entity");
 let ModuleAction = class ModuleAction {
 };
 exports.ModuleAction = ModuleAction;
@@ -19,9 +20,14 @@ __decorate([
     __metadata("design:type", Number)
 ], ModuleAction.prototype, "id", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
-    __metadata("design:type", String)
-], ModuleAction.prototype, "module_code", void 0);
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Number)
+], ModuleAction.prototype, "module_id", void 0);
+__decorate([
+    (0, typeorm_1.ManyToOne)(() => module_entity_1.ModuleData, { nullable: true, onDelete: 'SET NULL' }),
+    (0, typeorm_1.JoinColumn)({ name: 'module_id', referencedColumnName: 'id' }),
+    __metadata("design:type", module_entity_1.ModuleData)
+], ModuleAction.prototype, "module", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
     __metadata("design:type", String)
@@ -29,9 +35,8 @@ __decorate([
 __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', length: 50, nullable: true }),
     __metadata("design:type", String)
-], ModuleAction.prototype, "action_type", void 0);
+], ModuleAction.prototype, "action_code", void 0);
 exports.ModuleAction = ModuleAction = __decorate([
-    (0, typeorm_1.Entity)({ name: 'sso_module_action' }),
-    (0, typeorm_1.Unique)(['module_code', 'action_type'])
+    (0, typeorm_1.Entity)({ name: 'sso_module_ucp' })
 ], ModuleAction);
 //# sourceMappingURL=module-action.entity.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"module-action.entity.js","sourceRoot":"","sources":["../../../../src/module/module/entity/module-action.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAyE;AAIlE,IAAM,YAAY,GAAlB,MAAM,YAAY;CAYxB,CAAA;AAZY,oCAAY;AAEvB;IADC,IAAA,gCAAsB,GAAE;;wCACd;AAGX;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;iDACrC;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;iDACrC;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;iDACpC;uBAXT,YAAY;IAFxB,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,mBAAmB,EAAE,CAAC;IACrC,IAAA,gBAAM,EAAC,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;GAC1B,YAAY,CAYxB"}
+{"version":3,"file":"module-action.entity.js","sourceRoot":"","sources":["../../../../src/module/module/entity/module-action.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAwF;AACxF,mDAA6C;AAGtC,IAAM,YAAY,GAAlB,MAAM,YAAY;CAgBxB,CAAA;AAhBY,oCAAY;AAEvB;IADC,IAAA,gCAAsB,GAAE;;wCACd;AAGX;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+CACtB;AAIlB;IAFC,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,0BAAU,EAAE,EAAC,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAC,CAAC;IACnE,IAAA,oBAAU,EAAC,EAAE,IAAI,EAAE,WAAW,EAAE,oBAAoB,EAAE,IAAI,EAAE,CAAC;8BACtD,0BAAU;4CAAC;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;iDACrC;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;iDACpC;uBAfT,YAAY;IADxB,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,CAAC;GACtB,YAAY,CAgBxB"}

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

@@ -1,3 +1,4 @@
+import { AppMaster } from 'src/module/app_master/entity/app-master.entity';
 export declare class ModuleData {
     id: number;
     name: string;
@@ -5,14 +6,11 @@ export declare class ModuleData {
     wbs_code: string;
     status: string;
     module_level: string;
-    parent_id: number;
-    parent_code: string;
-    ui_visible: number;
     entity_type: string;
     title: string;
     component_name: string;
-    ui_config: JSON;
-    appcode: string;
+    app_id: number;
+    app: AppMaster;
     type: string;
     level_type: string;
 }

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

@@ -10,6 +10,7 @@ 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 {
 };
@@ -38,18 +39,6 @@ __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)
@@ -63,13 +52,14 @@ __decorate([
     __metadata("design:type", String)
 ], ModuleData.prototype, "component_name", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: 'json', nullable: true }),
-    __metadata("design:type", Object)
-], ModuleData.prototype, "ui_config", void 0);
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Number)
+], ModuleData.prototype, "app_id", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
-    __metadata("design:type", String)
-], ModuleData.prototype, "appcode", void 0);
+    (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);
 __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,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"}
+{"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"}

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

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

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.ModuleModule = void 0;
+exports.ModuleAccessModule = void 0;
 const common_1 = require("@nestjs/common");
 const typeorm_1 = require("@nestjs/typeorm");
 const module_entity_1 = require("./entity/module.entity");
@@ -23,11 +23,10 @@ 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");
-const listmaster_module_1 = require("../listmaster/listmaster.module");
-let ModuleModule = class ModuleModule {
+let ModuleAccessModule = class ModuleAccessModule {
 };
-exports.ModuleModule = ModuleModule;
-exports.ModuleModule = ModuleModule = __decorate([
+exports.ModuleAccessModule = ModuleAccessModule;
+exports.ModuleAccessModule = ModuleAccessModule = __decorate([
     (0, common_1.Module)({
         imports: [
             typeorm_1.TypeOrmModule.forFeature([
@@ -40,7 +39,6 @@ exports.ModuleModule = ModuleModule = __decorate([
             ]),
             utils_module_1.UtilsModule,
             user_module_1.UserModule,
-            listmaster_module_1.ListMasterModule,
         ],
         controllers: [menu_controller_1.MenuController, module_access_controller_1.ModuleAccessController],
         providers: [
@@ -51,5 +49,5 @@ exports.ModuleModule = ModuleModule = __decorate([
         ],
         exports: [module_access_service_1.ModuleAccessService, menu_service_1.MenuService],
     })
-], ModuleModule);
+], ModuleAccessModule);
 //# 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;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"}
+{"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"}

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, appcode: string): Promise<number[]>;
-    getAccessibleModules(roleIds: number[], appCode: string): Promise<string[]>;
-    getMenuItems(moduleCodes: string[], appcode: string, levelType: string): Promise<any[]>;
+    getUserRoles(userId: number, app_id: number): Promise<number[]>;
+    getAccessibleModules(roleIds: number[], appcode: string): Promise<number[]>;
+    getMenuItems(modules: number[], appcode: string, levelType: string): Promise<any[]>;
     resolveUserRoles(userId: number, appcode: string, levelType: string, levelId: number): Promise<number[]>;
 }