rez_core 2.1.10 → 2.1.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/dtos/response.d.ts +5 -0
- package/dist/dtos/response.js +3 -0
- package/dist/dtos/response.js.map +1 -0
- package/dist/module/filter/controller/filter.controller.js +1 -0
- package/dist/module/filter/controller/filter.controller.js.map +1 -1
- package/dist/module/filter/dto/filter-request.dto.d.ts +1 -0
- package/dist/module/filter/service/filter.service.js +8 -2
- package/dist/module/filter/service/filter.service.js.map +1 -1
- package/dist/module/listmaster/controller/list-master.controller.d.ts +1 -1
- package/dist/module/listmaster/controller/list-master.controller.js +12 -4
- package/dist/module/listmaster/controller/list-master.controller.js.map +1 -1
- package/dist/module/listmaster/service/list-master.service.d.ts +2 -1
- package/dist/module/listmaster/service/list-master.service.js +53 -13
- package/dist/module/listmaster/service/list-master.service.js.map +1 -1
- package/dist/module/meta/controller/entity.controller.d.ts +2 -2
- package/dist/module/meta/controller/entity.controller.js +71 -20
- package/dist/module/meta/controller/entity.controller.js.map +1 -1
- package/dist/module/module/controller/module-access.controller.js +3 -4
- package/dist/module/module/controller/module-access.controller.js.map +1 -1
- package/dist/module/module/repository/module-access.repository.d.ts +6 -5
- package/dist/module/module/repository/module-access.repository.js +22 -18
- package/dist/module/module/repository/module-access.repository.js.map +1 -1
- package/dist/module/module/service/module-access.service.d.ts +8 -8
- package/dist/module/module/service/module-access.service.js +7 -7
- package/dist/module/module/service/module-access.service.js.map +1 -1
- package/dist/module/user/service/role.service.d.ts +3 -2
- package/dist/module/user/service/role.service.js +22 -10
- package/dist/module/user/service/role.service.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/dtos/response.ts +5 -0
- package/src/module/filter/controller/filter.controller.ts +1 -0
- package/src/module/filter/dto/filter-request.dto.ts +1 -0
- package/src/module/filter/service/filter.service.ts +9 -1
- package/src/module/listmaster/controller/list-master.controller.ts +32 -3
- package/src/module/listmaster/service/list-master.service.ts +93 -13
- package/src/module/meta/controller/entity.controller.ts +101 -47
- package/src/module/module/controller/module-access.controller.ts +3 -5
- package/src/module/module/repository/module-access.repository.ts +25 -16
- package/src/module/module/service/module-access.service.ts +12 -9
- package/src/module/user/service/role.service.ts +25 -14
|
@@ -21,22 +21,27 @@ const module_access_entity_1 = require("../entity/module-access.entity");
|
|
|
21
21
|
const module_action_entity_1 = require("../entity/module-action.entity");
|
|
22
22
|
const module_entity_1 = require("../entity/module.entity");
|
|
23
23
|
let ModuleAccessRepository = class ModuleAccessRepository {
|
|
24
|
-
constructor(roleRepo, moduleRepo, moduleAccessRepo, moduleActionRepo) {
|
|
24
|
+
constructor(roleRepo, moduleRepo, moduleAccessRepo, moduleActionRepo, dataSource) {
|
|
25
25
|
this.roleRepo = roleRepo;
|
|
26
26
|
this.moduleRepo = moduleRepo;
|
|
27
27
|
this.moduleAccessRepo = moduleAccessRepo;
|
|
28
28
|
this.moduleActionRepo = moduleActionRepo;
|
|
29
|
+
this.dataSource = dataSource;
|
|
29
30
|
}
|
|
30
31
|
async getRoles({ appcode, level_type, level_id, }) {
|
|
31
|
-
const
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
if (
|
|
38
|
-
|
|
39
|
-
|
|
32
|
+
const query = this.dataSource
|
|
33
|
+
.createQueryBuilder()
|
|
34
|
+
.select('*')
|
|
35
|
+
.from('cr_role', 'role')
|
|
36
|
+
.where('role.appcode = :appcode', { appcode })
|
|
37
|
+
.andWhere('(role.is_factory IS NULL OR role.is_factory != 1)');
|
|
38
|
+
if (level_type) {
|
|
39
|
+
query.andWhere('role.level_type = :level_type', { level_type });
|
|
40
|
+
}
|
|
41
|
+
if (level_id !== undefined) {
|
|
42
|
+
query.andWhere('role.level_id = :level_id', { level_id: String(level_id) });
|
|
43
|
+
}
|
|
44
|
+
const roles = await query.getRawMany();
|
|
40
45
|
return roles.map((role) => ({
|
|
41
46
|
label: role.name,
|
|
42
47
|
value: role.id,
|
|
@@ -56,7 +61,7 @@ let ModuleAccessRepository = class ModuleAccessRepository {
|
|
|
56
61
|
}
|
|
57
62
|
async getAccessListing(roleIds, appcode, levelType, levelId) {
|
|
58
63
|
let roles;
|
|
59
|
-
if (roleIds.length === 1 && roleIds[0] ===
|
|
64
|
+
if (roleIds.length === 1 && roleIds[0] === -1) {
|
|
60
65
|
const fetchedRoles = await this.getRoles({
|
|
61
66
|
appcode,
|
|
62
67
|
level_type: levelType,
|
|
@@ -97,6 +102,7 @@ let ModuleAccessRepository = class ModuleAccessRepository {
|
|
|
97
102
|
access: access.access_flag,
|
|
98
103
|
code: access.module_code,
|
|
99
104
|
level_type: access.level_type,
|
|
105
|
+
appcode: access.appcode,
|
|
100
106
|
})),
|
|
101
107
|
}));
|
|
102
108
|
}
|
|
@@ -159,7 +165,7 @@ let ModuleAccessRepository = class ModuleAccessRepository {
|
|
|
159
165
|
}
|
|
160
166
|
return groupedByLevel;
|
|
161
167
|
}
|
|
162
|
-
async updateModuleAccess(accessList
|
|
168
|
+
async updateModuleAccess(accessList) {
|
|
163
169
|
try {
|
|
164
170
|
for (const access of accessList) {
|
|
165
171
|
const existing = await this.moduleAccessRepo.findOne({
|
|
@@ -167,7 +173,7 @@ let ModuleAccessRepository = class ModuleAccessRepository {
|
|
|
167
173
|
role_code: access.role_code,
|
|
168
174
|
module_code: access.module_code,
|
|
169
175
|
action_type: access.action_type,
|
|
170
|
-
appcode: access.appcode
|
|
176
|
+
appcode: access.appcode,
|
|
171
177
|
level_type: access.level_type,
|
|
172
178
|
},
|
|
173
179
|
});
|
|
@@ -176,10 +182,7 @@ let ModuleAccessRepository = class ModuleAccessRepository {
|
|
|
176
182
|
await this.moduleAccessRepo.save(existing);
|
|
177
183
|
}
|
|
178
184
|
else {
|
|
179
|
-
await this.moduleAccessRepo.save(this.moduleAccessRepo.create(
|
|
180
|
-
...access,
|
|
181
|
-
appcode: access.appcode || appcode,
|
|
182
|
-
}));
|
|
185
|
+
await this.moduleAccessRepo.save(await this.moduleAccessRepo.create(access));
|
|
183
186
|
}
|
|
184
187
|
}
|
|
185
188
|
return true;
|
|
@@ -223,6 +226,7 @@ exports.ModuleAccessRepository = ModuleAccessRepository = __decorate([
|
|
|
223
226
|
__metadata("design:paramtypes", [typeorm_2.Repository,
|
|
224
227
|
typeorm_2.Repository,
|
|
225
228
|
typeorm_2.Repository,
|
|
226
|
-
typeorm_2.Repository
|
|
229
|
+
typeorm_2.Repository,
|
|
230
|
+
typeorm_2.DataSource])
|
|
227
231
|
], ModuleAccessRepository);
|
|
228
232
|
//# sourceMappingURL=module-access.repository.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module-access.repository.js","sourceRoot":"","sources":["../../../../src/module/module/repository/module-access.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAiE;AACjE,6CAAmD;AACnD,
|
|
1
|
+
{"version":3,"file":"module-access.repository.js","sourceRoot":"","sources":["../../../../src/module/module/repository/module-access.repository.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,13 @@ export declare class ModuleAccessService {
|
|
|
6
6
|
private readonly menuRepository;
|
|
7
7
|
private readonly dataSource;
|
|
8
8
|
constructor(moduleAccessRepository: ModuleAccessRepository, menuRepository: MenuRepository, dataSource: DataSource);
|
|
9
|
+
getModules({ appcode }: {
|
|
10
|
+
appcode: string;
|
|
11
|
+
}): Promise<{
|
|
12
|
+
label: string;
|
|
13
|
+
value: number;
|
|
14
|
+
group: string;
|
|
15
|
+
}[]>;
|
|
9
16
|
getRoles({ appcode, level_type, level_id, }: {
|
|
10
17
|
appcode: string;
|
|
11
18
|
level_type?: string;
|
|
@@ -14,13 +21,6 @@ export declare class ModuleAccessService {
|
|
|
14
21
|
label: any;
|
|
15
22
|
value: any;
|
|
16
23
|
}[]>;
|
|
17
|
-
getModules({ appcode }: {
|
|
18
|
-
appcode: string;
|
|
19
|
-
}): Promise<{
|
|
20
|
-
label: string;
|
|
21
|
-
value: number;
|
|
22
|
-
group: string;
|
|
23
|
-
}[]>;
|
|
24
24
|
getAccessListing(roleIds: number[], appcode: string, levelType: string, level_id?: number): Promise<any>;
|
|
25
25
|
getMenuListing(mainModIds: string[], appcode: string, levelType: string): Promise<Record<string, any[]>>;
|
|
26
26
|
updateModuleAccess(moduleAccessData: {
|
|
@@ -30,7 +30,7 @@ export declare class ModuleAccessService {
|
|
|
30
30
|
access_flag: number;
|
|
31
31
|
appcode: string;
|
|
32
32
|
level_type: string;
|
|
33
|
-
}[]
|
|
33
|
+
}[]): Promise<{
|
|
34
34
|
success: boolean;
|
|
35
35
|
msg: string;
|
|
36
36
|
}>;
|
|
@@ -20,6 +20,11 @@ let ModuleAccessService = class ModuleAccessService {
|
|
|
20
20
|
this.menuRepository = menuRepository;
|
|
21
21
|
this.dataSource = dataSource;
|
|
22
22
|
}
|
|
23
|
+
async getModules({ appcode }) {
|
|
24
|
+
return this.moduleAccessRepository.getModules({
|
|
25
|
+
appcode,
|
|
26
|
+
});
|
|
27
|
+
}
|
|
23
28
|
async getRoles({ appcode, level_type, level_id, }) {
|
|
24
29
|
const query = this.dataSource
|
|
25
30
|
.createQueryBuilder()
|
|
@@ -39,11 +44,6 @@ let ModuleAccessService = class ModuleAccessService {
|
|
|
39
44
|
value: role.id,
|
|
40
45
|
}));
|
|
41
46
|
}
|
|
42
|
-
async getModules({ appcode }) {
|
|
43
|
-
return this.moduleAccessRepository.getModules({
|
|
44
|
-
appcode,
|
|
45
|
-
});
|
|
46
|
-
}
|
|
47
47
|
async getAccessListing(roleIds, appcode, levelType, level_id) {
|
|
48
48
|
return this.moduleAccessRepository.getAccessListing(roleIds, appcode, levelType, level_id);
|
|
49
49
|
}
|
|
@@ -53,11 +53,11 @@ let ModuleAccessService = class ModuleAccessService {
|
|
|
53
53
|
}
|
|
54
54
|
return this.moduleAccessRepository.getAllModulesByLevel(mainModIds, appcode, levelType);
|
|
55
55
|
}
|
|
56
|
-
async updateModuleAccess(moduleAccessData
|
|
56
|
+
async updateModuleAccess(moduleAccessData) {
|
|
57
57
|
if (!moduleAccessData || moduleAccessData.length === 0) {
|
|
58
58
|
return { success: false, msg: 'No data provided' };
|
|
59
59
|
}
|
|
60
|
-
const result = await this.moduleAccessRepository.updateModuleAccess(moduleAccessData
|
|
60
|
+
const result = await this.moduleAccessRepository.updateModuleAccess(moduleAccessData);
|
|
61
61
|
if (result) {
|
|
62
62
|
return { success: true, msg: 'Module access updated successfully' };
|
|
63
63
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module-access.service.js","sourceRoot":"","sources":["../../../../src/module/module/service/module-access.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAyE;AACzE,qFAAgF;AAKhF,qCAAoD;AAEpD,mEAA+D;AAGxD,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAC9B,YACmB,sBAA8C,EAC9C,cAA8B,EAC9B,UAAsB;QAFtB,2BAAsB,GAAtB,sBAAsB,CAAwB;QAC9C,mBAAc,GAAd,cAAc,CAAgB;QAC9B,eAAU,GAAV,UAAU,CAAY;IACtC,CAAC;
|
|
1
|
+
{"version":3,"file":"module-access.service.js","sourceRoot":"","sources":["../../../../src/module/module/service/module-access.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,13 +5,14 @@ import { Role } from '../entity/role.entity';
|
|
|
5
5
|
import { RoleRepository } from '../repository/role.repository';
|
|
6
6
|
import { EntityManager, Repository } from 'typeorm';
|
|
7
7
|
import { ModuleAccess } from '../../module/entity/module-access.entity';
|
|
8
|
+
import { ServiceResult } from 'src/dtos/response';
|
|
8
9
|
export declare class RoleService extends EntityServiceImpl {
|
|
9
10
|
private readonly roleRepository;
|
|
10
11
|
private readonly entityManager;
|
|
11
12
|
private readonly moduleAccessRepo;
|
|
12
13
|
constructor(roleRepository: RoleRepository, entityManager: EntityManager, moduleAccessRepo: Repository<ModuleAccess>);
|
|
13
|
-
createEntity(entityData: BaseEntity, loggedInUser: UserData): Promise<BaseEntity
|
|
14
|
-
updateEntity(entityData: BaseEntity, loggedInUser: UserData | null): Promise<BaseEntity
|
|
14
|
+
createEntity(entityData: BaseEntity, loggedInUser: UserData): Promise<ServiceResult<BaseEntity>>;
|
|
15
|
+
updateEntity(entityData: BaseEntity, loggedInUser: UserData | null): Promise<ServiceResult<BaseEntity>>;
|
|
15
16
|
getDefaultRole(data: {
|
|
16
17
|
is_factory?: boolean;
|
|
17
18
|
level_id?: number;
|
|
@@ -38,13 +38,13 @@ let RoleService = class RoleService extends entity_service_impl_service_1.Entity
|
|
|
38
38
|
level_id: parseInt(entityData.level_id) ||
|
|
39
39
|
parseInt(loggedInUser?.level_id || '', 10),
|
|
40
40
|
})) {
|
|
41
|
-
|
|
41
|
+
return { success: false, error: 'Role code already exists.' };
|
|
42
42
|
}
|
|
43
43
|
const sourceRole = role.copy_from_role_id
|
|
44
44
|
? await this.getEntityData(global_constant_1.ENTITYTYPE_ROLE, role.copy_from_role_id)
|
|
45
45
|
: null;
|
|
46
46
|
if (role.copy_from_role_id && !sourceRole) {
|
|
47
|
-
|
|
47
|
+
return { success: false, error: 'Source role not found.' };
|
|
48
48
|
}
|
|
49
49
|
const savedRole = await super.createEntity(role, loggedInUser);
|
|
50
50
|
if (sourceRole) {
|
|
@@ -61,17 +61,17 @@ let RoleService = class RoleService extends entity_service_impl_service_1.Entity
|
|
|
61
61
|
}));
|
|
62
62
|
await this.moduleAccessRepo.save(clonedPermissions);
|
|
63
63
|
}
|
|
64
|
-
return savedRole;
|
|
64
|
+
return { success: true, data: savedRole };
|
|
65
65
|
}
|
|
66
66
|
async updateEntity(entityData, loggedInUser) {
|
|
67
67
|
if (!entityData.name) {
|
|
68
|
-
|
|
68
|
+
return { success: false, error: 'Role name is required' };
|
|
69
69
|
}
|
|
70
70
|
const role = entityData;
|
|
71
71
|
if (entityData.status === 'INACTIVE') {
|
|
72
72
|
const existingRole = await this.getEntityData(global_constant_1.ENTITYTYPE_ROLE, entityData.id);
|
|
73
73
|
if (!existingRole) {
|
|
74
|
-
|
|
74
|
+
return { success: false, error: 'Role not found' };
|
|
75
75
|
}
|
|
76
76
|
const associatedUsers = await this.entityManager.query(`SELECT map.*
|
|
77
77
|
FROM cr_user_role_mapping map
|
|
@@ -79,24 +79,36 @@ let RoleService = class RoleService extends entity_service_impl_service_1.Entity
|
|
|
79
79
|
WHERE usr.status = 'ACTIVE'
|
|
80
80
|
and map.role_id = ${existingRole?.id}`);
|
|
81
81
|
if (associatedUsers.length > 0) {
|
|
82
|
-
|
|
82
|
+
return {
|
|
83
|
+
success: false,
|
|
84
|
+
error: 'Cannot deactivate role as it is associated with active users',
|
|
85
|
+
};
|
|
83
86
|
}
|
|
84
87
|
if (role.is_system === 1) {
|
|
85
|
-
|
|
88
|
+
return {
|
|
89
|
+
success: false,
|
|
90
|
+
error: 'Cannot deactivate system role',
|
|
91
|
+
};
|
|
86
92
|
}
|
|
87
93
|
}
|
|
88
94
|
if (await this.roleRepository.isRoleNameExists(entityData.name, {
|
|
89
95
|
excludeRoleId: entityData.id,
|
|
90
96
|
organization_id: loggedInUser?.organization_id,
|
|
91
97
|
})) {
|
|
92
|
-
|
|
98
|
+
return {
|
|
99
|
+
success: false,
|
|
100
|
+
error: 'Role name already exists.',
|
|
101
|
+
};
|
|
93
102
|
}
|
|
94
103
|
const { copy_from_role_id, ...persistableData } = role;
|
|
95
104
|
const updatedRole = await super.updateEntity(persistableData, loggedInUser);
|
|
96
105
|
if (role.copy_from_role_id) {
|
|
97
106
|
const sourceRole = await this.getEntityData(global_constant_1.ENTITYTYPE_ROLE, role.copy_from_role_id);
|
|
98
107
|
if (!sourceRole) {
|
|
99
|
-
|
|
108
|
+
return {
|
|
109
|
+
success: false,
|
|
110
|
+
error: 'Source role not found',
|
|
111
|
+
};
|
|
100
112
|
}
|
|
101
113
|
await this.moduleAccessRepo.delete({ role_code: role.code });
|
|
102
114
|
const sourcePermissions = await this.moduleAccessRepo.find({
|
|
@@ -112,7 +124,7 @@ let RoleService = class RoleService extends entity_service_impl_service_1.Entity
|
|
|
112
124
|
}));
|
|
113
125
|
await this.moduleAccessRepo.save(clonedPermissions);
|
|
114
126
|
}
|
|
115
|
-
return updatedRole;
|
|
127
|
+
return { success: true, data: updatedRole };
|
|
116
128
|
}
|
|
117
129
|
async getDefaultRole(data) {
|
|
118
130
|
return await this.roleRepository.find(data);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"role.service.js","sourceRoot":"","sources":["../../../../src/module/user/service/role.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAiE;AACjE,gGAAmF;AAInF,uEAA+D;AAC/D,mEAA+D;AAC/D,qCAAoD;AACpD,6CAAmD;AACnD,mFAAwE;
|
|
1
|
+
{"version":3,"file":"role.service.js","sourceRoot":"","sources":["../../../../src/module/user/service/role.service.ts"],"names":[],"mappings":"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"}
|