rez_core 2.1.75 → 2.1.77
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/constant/global.constant.d.ts +2 -2
- package/dist/constant/global.constant.js +2 -2
- package/dist/constant/global.constant.js.map +1 -1
- package/dist/module/filter/service/filter.service.d.ts +1 -5
- package/dist/module/filter/service/filter.service.js +4 -10
- package/dist/module/filter/service/filter.service.js.map +1 -1
- package/dist/module/filter/service/saved-filter.service.d.ts +1 -1
- package/dist/module/filter/service/saved-filter.service.js +3 -3
- package/dist/module/filter/service/saved-filter.service.js.map +1 -1
- package/dist/module/layout_preference/controller/layout_preference.controller.js +2 -2
- package/dist/module/layout_preference/controller/layout_preference.controller.js.map +1 -1
- package/dist/module/layout_preference/service/layout_preference.service.d.ts +2 -2
- package/dist/module/layout_preference/service/layout_preference.service.js +2 -2
- package/dist/module/layout_preference/service/layout_preference.service.js.map +1 -1
- package/dist/module/listmaster/repository/list-master-items.repository.d.ts +2 -1
- package/dist/module/listmaster/repository/list-master-items.repository.js +14 -2
- package/dist/module/listmaster/repository/list-master-items.repository.js.map +1 -1
- package/dist/module/listmaster/repository/list-master.repository.d.ts +1 -1
- package/dist/module/listmaster/repository/list-master.repository.js +7 -2
- package/dist/module/listmaster/repository/list-master.repository.js.map +1 -1
- package/dist/module/listmaster/service/list-master.service.d.ts +3 -2
- package/dist/module/listmaster/service/list-master.service.js +13 -5
- package/dist/module/listmaster/service/list-master.service.js.map +1 -1
- package/dist/module/master/controller/master.controller.d.ts +3 -1
- package/dist/module/master/controller/master.controller.js +5 -3
- package/dist/module/master/controller/master.controller.js.map +1 -1
- package/dist/module/master/service/master.service.d.ts +1 -1
- package/dist/module/master/service/master.service.js +5 -5
- package/dist/module/master/service/master.service.js.map +1 -1
- package/dist/module/meta/controller/entity.controller.d.ts +3 -1
- package/dist/module/meta/controller/entity.controller.js +13 -11
- package/dist/module/meta/controller/entity.controller.js.map +1 -1
- package/dist/module/meta/controller/media.controller.d.ts +5 -1
- package/dist/module/meta/controller/media.controller.js +12 -8
- package/dist/module/meta/controller/media.controller.js.map +1 -1
- package/dist/module/meta/controller/meta.controller.js +2 -2
- package/dist/module/meta/controller/meta.controller.js.map +1 -1
- package/dist/module/meta/repository/attribute-master.repository.d.ts +1 -1
- package/dist/module/meta/repository/attribute-master.repository.js +2 -1
- package/dist/module/meta/repository/attribute-master.repository.js.map +1 -1
- package/dist/module/meta/repository/entity-table.repository.d.ts +2 -2
- package/dist/module/meta/repository/entity-table.repository.js +16 -6
- package/dist/module/meta/repository/entity-table.repository.js.map +1 -1
- package/dist/module/meta/service/attribute-master.service.d.ts +1 -1
- package/dist/module/meta/service/attribute-master.service.js +2 -2
- package/dist/module/meta/service/attribute-master.service.js.map +1 -1
- package/dist/module/meta/service/entity-master.service.d.ts +1 -1
- package/dist/module/meta/service/entity-master.service.js +5 -2
- package/dist/module/meta/service/entity-master.service.js.map +1 -1
- package/dist/module/meta/service/entity-service-impl.service.d.ts +5 -5
- package/dist/module/meta/service/entity-service-impl.service.js +16 -16
- package/dist/module/meta/service/entity-service-impl.service.js.map +1 -1
- package/dist/module/meta/service/entity-table.service.d.ts +4 -4
- package/dist/module/meta/service/entity-table.service.js +11 -10
- package/dist/module/meta/service/entity-table.service.js.map +1 -1
- package/dist/module/meta/service/entity-validation.service.d.ts +0 -1
- package/dist/module/meta/service/entity-validation.service.js +1 -7
- package/dist/module/meta/service/entity-validation.service.js.map +1 -1
- package/dist/module/meta/service/entity.service.d.ts +3 -3
- package/dist/module/meta/service/field-group.service.d.ts +1 -1
- package/dist/module/meta/service/field-group.service.js +1 -1
- package/dist/module/meta/service/field-group.service.js.map +1 -1
- package/dist/module/meta/service/media-data.service.d.ts +2 -2
- package/dist/module/meta/service/media-data.service.js +4 -4
- package/dist/module/meta/service/media-data.service.js.map +1 -1
- package/dist/module/meta/service/section-master.service.d.ts +1 -1
- package/dist/module/meta/service/section-master.service.js +1 -1
- package/dist/module/meta/service/section-master.service.js.map +1 -1
- package/dist/module/meta/service/view-master.service.d.ts +1 -1
- package/dist/module/meta/service/view-master.service.js +1 -1
- package/dist/module/meta/service/view-master.service.js.map +1 -1
- package/dist/module/module/controller/module-access.controller.js +3 -1
- package/dist/module/module/controller/module-access.controller.js.map +1 -1
- package/dist/module/module/module.module.js +2 -0
- package/dist/module/module/module.module.js.map +1 -1
- package/dist/module/module/service/module-access.service.d.ts +5 -2
- package/dist/module/module/service/module-access.service.js +13 -4
- package/dist/module/module/service/module-access.service.js.map +1 -1
- package/dist/module/user/service/login.service.d.ts +3 -1
- package/dist/module/user/service/login.service.js +10 -3
- package/dist/module/user/service/login.service.js.map +1 -1
- package/dist/module/user/service/role.service.d.ts +3 -1
- package/dist/module/user/service/role.service.js +12 -7
- package/dist/module/user/service/role.service.js.map +1 -1
- package/dist/module/user/service/user.service.d.ts +4 -2
- package/dist/module/user/service/user.service.js +10 -5
- package/dist/module/user/service/user.service.js.map +1 -1
- package/dist/module/user/user.module.js +2 -0
- package/dist/module/user/user.module.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/constant/global.constant.ts +3 -4
- package/src/module/filter/service/filter.service.ts +5 -3
- package/src/module/filter/service/saved-filter.service.ts +6 -3
- package/src/module/layout_preference/controller/layout_preference.controller.ts +2 -1
- package/src/module/layout_preference/service/layout_preference.service.ts +3 -1
- package/src/module/listmaster/repository/list-master-items.repository.ts +18 -2
- package/src/module/listmaster/repository/list-master.repository.ts +7 -2
- package/src/module/listmaster/service/list-master.service.ts +39 -8
- package/src/module/master/controller/master.controller.ts +19 -11
- package/src/module/master/service/master.service.ts +5 -1
- package/src/module/meta/controller/entity.controller.ts +33 -12
- package/src/module/meta/controller/media.controller.ts +16 -5
- package/src/module/meta/controller/meta.controller.ts +2 -2
- package/src/module/meta/repository/attribute-master.repository.ts +5 -3
- package/src/module/meta/repository/entity-table.repository.ts +20 -5
- package/src/module/meta/service/attribute-master.service.ts +2 -1
- package/src/module/meta/service/entity-master.service.ts +9 -3
- package/src/module/meta/service/entity-service-impl.service.ts +38 -11
- package/src/module/meta/service/entity-table.service.ts +12 -6
- package/src/module/meta/service/entity-validation.service.ts +14 -13
- package/src/module/meta/service/entity.service.ts +11 -2
- package/src/module/meta/service/field-group.service.ts +2 -1
- package/src/module/meta/service/media-data.service.ts +13 -6
- package/src/module/meta/service/section-master.service.ts +2 -1
- package/src/module/meta/service/view-master.service.ts +2 -1
- package/src/module/module/controller/module-access.controller.ts +3 -1
- package/src/module/module/module.module.ts +2 -0
- package/src/module/module/service/module-access.service.ts +15 -2
- package/src/module/user/service/login.service.ts +13 -1
- package/src/module/user/service/role.service.ts +19 -5
- package/src/module/user/service/user.service.ts +15 -2
- package/src/module/user/user.module.ts +2 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entity-service-impl.service.js","sourceRoot":"","sources":["../../../../src/module/meta/service/entity-service-impl.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,2CAAyE;AAEzE,mEAA8D;AAC9D,gGAAoF;AAEpF,oFAA4E;AAE5E,+DAA0D;AAE1D,sEAA8D;AAC9D,yBAAyB;AACzB,6BAA6B;AAC7B,sFAA0E;AAE1E,iEAA4D;AAC5D,+EAAyE;AACzE,uEAA4E;AAC5E,2EAAsE;AAG/D,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAW5B,KAAK,CAAC,YAAY,CAChB,UAAsB,EACtB,YAA6B,EAC7B,OAA8B,EAC9B,OAAgB;QAEhB,IAAI,CAAC,UAAU,CAAC,WAAW,EAAE,CAAC;YAC5B,MAAM,IAAI,4BAAmB,CAAC,uBAAuB,CAAC,CAAC;QACzD,CAAC;QACD,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,aAAa,CAC/D,UAAU,CAAC,WAAW,
|
|
1
|
+
{"version":3,"file":"entity-service-impl.service.js","sourceRoot":"","sources":["../../../../src/module/meta/service/entity-service-impl.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,9 +9,9 @@ export declare class EntityTableService {
|
|
|
9
9
|
private readonly listMasterService;
|
|
10
10
|
private readonly savedFilterRepoService;
|
|
11
11
|
constructor(entityTableRepository: EntityTableRepository, entityTableColumnRepository: EntityTableColumnRepository, listMasterService: ListMasterService, savedFilterRepoService: SavedFilterRepositoryService);
|
|
12
|
-
getEntityData(mappedEntityType: string | null): Promise<import("../entity/entity-table.entity").EntityTable>;
|
|
12
|
+
getEntityData(mappedEntityType: string | null, loggedInUser: any): Promise<import("../entity/entity-table.entity").EntityTable>;
|
|
13
13
|
findByEntityTypeAndListType(entityType: string, listType: string): Promise<import("../entity/entity-table.entity").EntityTable | null>;
|
|
14
|
-
findByEntityTypeAndListTypeAndDisplayType(entityType: string, listType: string, displayType: string): Promise<import("../entity/entity-table.entity").EntityTable | null>;
|
|
15
|
-
getTableMetaDataForListing(entityType: string, listType: string,
|
|
16
|
-
getTableMetaData(entityType: string, listType: string, displayType: string,
|
|
14
|
+
findByEntityTypeAndListTypeAndDisplayType(entityType: string, listType: string, displayType: string, organization_id?: number | null): Promise<import("../entity/entity-table.entity").EntityTable | null>;
|
|
15
|
+
getTableMetaDataForListing(entityType: string, listType: string, loggedInUser: any): Promise<EntityTableDto>;
|
|
16
|
+
getTableMetaData(entityType: string, listType: string, displayType: string, loggedInUser: any): Promise<EntityTableDto>;
|
|
17
17
|
}
|
|
@@ -26,9 +26,10 @@ let EntityTableService = class EntityTableService {
|
|
|
26
26
|
this.listMasterService = listMasterService;
|
|
27
27
|
this.savedFilterRepoService = savedFilterRepoService;
|
|
28
28
|
}
|
|
29
|
-
async getEntityData(mappedEntityType) {
|
|
29
|
+
async getEntityData(mappedEntityType, loggedInUser) {
|
|
30
|
+
console.log(mappedEntityType, loggedInUser, " loggedInUser in getEntityData");
|
|
30
31
|
if (mappedEntityType) {
|
|
31
|
-
const tableMaster = await this.entityTableRepository.findByMappedEntityType(mappedEntityType);
|
|
32
|
+
const tableMaster = await this.entityTableRepository.findByMappedEntityType(mappedEntityType, loggedInUser.organization_id);
|
|
32
33
|
if (!tableMaster) {
|
|
33
34
|
throw new Error(`Entity with mappedEntityType "${mappedEntityType}" not found.`);
|
|
34
35
|
}
|
|
@@ -41,14 +42,14 @@ let EntityTableService = class EntityTableService {
|
|
|
41
42
|
async findByEntityTypeAndListType(entityType, listType) {
|
|
42
43
|
return await this.entityTableRepository.findByEntityTypeAndListType(entityType, listType);
|
|
43
44
|
}
|
|
44
|
-
async findByEntityTypeAndListTypeAndDisplayType(entityType, listType, displayType) {
|
|
45
|
-
return await this.entityTableRepository.findByEntityTypeAndListTypeAndDisplayType(entityType, listType, displayType);
|
|
45
|
+
async findByEntityTypeAndListTypeAndDisplayType(entityType, listType, displayType, organization_id = null) {
|
|
46
|
+
return await this.entityTableRepository.findByEntityTypeAndListTypeAndDisplayType(entityType, listType, displayType, organization_id ? organization_id : null);
|
|
46
47
|
}
|
|
47
|
-
async getTableMetaDataForListing(entityType, listType,
|
|
48
|
-
return await this.getTableMetaData(entityType, listType, global_constant_1.DISPLAY_LIST,
|
|
48
|
+
async getTableMetaDataForListing(entityType, listType, loggedInUser) {
|
|
49
|
+
return await this.getTableMetaData(entityType, listType, global_constant_1.DISPLAY_LIST, loggedInUser);
|
|
49
50
|
}
|
|
50
|
-
async getTableMetaData(entityType, listType, displayType,
|
|
51
|
-
let entityTable = await this.findByEntityTypeAndListTypeAndDisplayType(entityType, listType, displayType);
|
|
51
|
+
async getTableMetaData(entityType, listType, displayType, loggedInUser) {
|
|
52
|
+
let entityTable = await this.findByEntityTypeAndListTypeAndDisplayType(entityType, listType, displayType, loggedInUser?.organization_id);
|
|
52
53
|
let entityTableDto = entityTable;
|
|
53
54
|
if (entityTable) {
|
|
54
55
|
entityTableDto.column_list =
|
|
@@ -63,9 +64,9 @@ let EntityTableService = class EntityTableService {
|
|
|
63
64
|
};
|
|
64
65
|
entityTableDto.default_filter =
|
|
65
66
|
await this.savedFilterRepoService.getDefaultFilterByEntityType(entityTable.list_type);
|
|
66
|
-
if (
|
|
67
|
+
if (loggedInUser.id) {
|
|
67
68
|
entityTableDto.saved_filter =
|
|
68
|
-
await this.savedFilterRepoService.getSavedFiltersByUserIdAndEntityType(
|
|
69
|
+
await this.savedFilterRepoService.getSavedFiltersByUserIdAndEntityType(loggedInUser.id, entityTable.list_type);
|
|
69
70
|
}
|
|
70
71
|
}
|
|
71
72
|
return entityTableDto;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entity-table.service.js","sourceRoot":"","sources":["../../../../src/module/meta/service/entity-table.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAgE;AAChE,mFAA8E;AAC9E,iGAA2F;AAE3F,uEAAiE;AACjE,sFAAsF;AAEtF,6FAAoG;
|
|
1
|
+
{"version":3,"file":"entity-table.service.js","sourceRoot":"","sources":["../../../../src/module/meta/service/entity-table.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,6 @@ export declare class EntityValidationService {
|
|
|
15
15
|
validateUniqueFields(entityData: Record<string, any>, attributeData: AttributeMaster[], entityType: string, db_table_name: string, loggedInUser: any): Promise<ValidationError[]>;
|
|
16
16
|
validateRegexFields(entityData: Record<string, any>, attributeData: AttributeMaster[]): Promise<ValidationError[]>;
|
|
17
17
|
validateEntityData(entityData: Record<string, any>, entityMaster: any, loggedInUser: any): Promise<ValidationError[]>;
|
|
18
|
-
validateExcelEntityData(entityData: Record<string, any>, entityMaster: any): Promise<ValidationError[]>;
|
|
19
18
|
private hasValidValue;
|
|
20
19
|
}
|
|
21
20
|
export {};
|
|
@@ -83,18 +83,12 @@ let EntityValidationService = class EntityValidationService {
|
|
|
83
83
|
return errors;
|
|
84
84
|
}
|
|
85
85
|
async validateEntityData(entityData, entityMaster, loggedInUser) {
|
|
86
|
-
const attributes = await this.attributeMasterService.findAttributesByMappedEntityType(entityData.entity_type);
|
|
86
|
+
const attributes = await this.attributeMasterService.findAttributesByMappedEntityType(entityData.entity_type, loggedInUser.organization_id);
|
|
87
87
|
const requiredErrors = this.validateRequiredFields(entityData, attributes);
|
|
88
88
|
const uniqueErrors = await this.validateUniqueFields(entityData, attributes, entityData.entity_type, entityMaster.db_table_name, loggedInUser);
|
|
89
89
|
const regexErros = await this.validateRegexFields(entityData, attributes);
|
|
90
90
|
return [...requiredErrors, ...uniqueErrors, ...regexErros];
|
|
91
91
|
}
|
|
92
|
-
async validateExcelEntityData(entityData, entityMaster) {
|
|
93
|
-
const attributes = await this.attributeMasterService.findAttributesByMappedEntityType(entityData.entity_type);
|
|
94
|
-
const requiredErrors = this.validateRequiredFields(entityData, attributes);
|
|
95
|
-
const regexErros = await this.validateRegexFields(entityData, attributes);
|
|
96
|
-
return [...requiredErrors, ...regexErros];
|
|
97
|
-
}
|
|
98
92
|
hasValidValue(value) {
|
|
99
93
|
if (value === null || value === undefined)
|
|
100
94
|
return false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entity-validation.service.js","sourceRoot":"","sources":["../../../../src/module/meta/service/entity-validation.service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"entity-validation.service.js","sourceRoot":"","sources":["../../../../src/module/meta/service/entity-validation.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,11 +4,11 @@ import { EntityListData } from '../dto/entity-list-data.dto';
|
|
|
4
4
|
import { EntityManager } from 'typeorm';
|
|
5
5
|
export interface EntityService<T extends BaseEntity> {
|
|
6
6
|
createEntity(entityData: T, loggedInUser: UserData, manager?: EntityManager): Promise<BaseEntity>;
|
|
7
|
-
getEntityData(entityType: string, entityId: number): Promise<BaseEntity | null>;
|
|
8
|
-
getEntityList(entityType: string): Promise<BaseEntity[]>;
|
|
7
|
+
getEntityData(entityType: string, entityId: number, loggedInUser: UserData): Promise<BaseEntity | null>;
|
|
8
|
+
getEntityList(entityType: string, loggedInUser: UserData, filters?: Record<string, any>): Promise<BaseEntity[]>;
|
|
9
9
|
updateEntity(entityData: T, loggedInUserData: UserData, app_code?: string): Promise<BaseEntity>;
|
|
10
10
|
deleteEntity(entityType: string, entityId: number, loggedInUserData: UserData): void;
|
|
11
|
-
findByCode(entityType: string, code: string): Promise<BaseEntity>;
|
|
11
|
+
findByCode(entityType: string, code: string, loggedInUser: UserData): Promise<BaseEntity>;
|
|
12
12
|
getFilterDataWithTabs(entityType: string, listType: string, filters: Record<string, any>, sortColumn: string | undefined, sortOrder: string | undefined, pageNumber: number, pageSize: number): Promise<EntityListData>;
|
|
13
13
|
generateExcelReport(entityType: string, filterCriteria: Record<string, any>, listEntityType: string, displayType: string, sampleExport: boolean): Promise<string | null>;
|
|
14
14
|
}
|
|
@@ -5,7 +5,7 @@ import { EntityManager } from 'typeorm';
|
|
|
5
5
|
import { ViewMaster } from '../entity/view-master.entity';
|
|
6
6
|
export declare class FieldGroupService extends EntityServiceImpl {
|
|
7
7
|
constructor();
|
|
8
|
-
createEntity(entityData: BaseEntity, loggedInUser: UserData
|
|
8
|
+
createEntity(entityData: BaseEntity, loggedInUser: UserData, manager?: EntityManager): Promise<BaseEntity>;
|
|
9
9
|
updateEntity(entityData: ViewMaster, loggedInUserData: UserData | null): Promise<BaseEntity>;
|
|
10
10
|
parseLayout(layoutJson: any): {
|
|
11
11
|
stepType: string;
|
|
@@ -17,7 +17,7 @@ let FieldGroupService = class FieldGroupService extends entity_service_impl_serv
|
|
|
17
17
|
super();
|
|
18
18
|
}
|
|
19
19
|
async createEntity(entityData, loggedInUser, manager) {
|
|
20
|
-
const entityMaster = await this.entityMasterService.getEntityData(entityData.entity_type);
|
|
20
|
+
const entityMaster = await this.entityMasterService.getEntityData(entityData.entity_type, loggedInUser);
|
|
21
21
|
entityData.parent_id = entityMaster.id;
|
|
22
22
|
entityData.parent_type = entityMaster.entity_type;
|
|
23
23
|
const savedEntity = await super.createEntity(entityData, loggedInUser, manager);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"field-group.service.js","sourceRoot":"","sources":["../../../../src/module/meta/service/field-group.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,+EAAkE;AAO3D,IAAM,iBAAiB,GAAvB,MAAM,iBAAkB,SAAQ,+CAAiB;IACtD;QACE,KAAK,EAAE,CAAC;IACV,CAAC;IAED,KAAK,CAAC,YAAY,CAChB,UAAsB,EACtB,
|
|
1
|
+
{"version":3,"file":"field-group.service.js","sourceRoot":"","sources":["../../../../src/module/meta/service/field-group.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,7 @@ export declare class MediaDataService extends EntityServiceImpl {
|
|
|
12
12
|
s3Region: any;
|
|
13
13
|
bucketName: string | undefined;
|
|
14
14
|
s3: S3;
|
|
15
|
-
generateMediaUploadDetails(fileName: string, mappedAttributeKey: string, mappedEntityType?: string, mappedEntityId?: number): Promise<{
|
|
15
|
+
generateMediaUploadDetails(fileName: string, mappedAttributeKey: string, loggedInUser: any, mappedEntityType?: string, mappedEntityId?: number): Promise<{
|
|
16
16
|
id: any;
|
|
17
17
|
path: string;
|
|
18
18
|
uploadUrl: string;
|
|
@@ -21,7 +21,7 @@ export declare class MediaDataService extends EntityServiceImpl {
|
|
|
21
21
|
findByMappedEntityIdAndMappedEntityType(mappedEntityId: number, mappedEntityType: string): Promise<MediaData[]>;
|
|
22
22
|
deleteByAttributeKeyAndMappedEntityIdAndMappedEntityType(attributeKey: string, mappedEntityId: number, mappedEntityType: string): Promise<import("typeorm").DeleteResult>;
|
|
23
23
|
private getContentType;
|
|
24
|
-
getMediaDownloadUrl(id: number): Promise<{
|
|
24
|
+
getMediaDownloadUrl(id: number, loggedInUser: any): Promise<{
|
|
25
25
|
signedUrl: string;
|
|
26
26
|
fileName: string;
|
|
27
27
|
id: number;
|
|
@@ -34,7 +34,7 @@ let MediaDataService = class MediaDataService extends entity_service_impl_servic
|
|
|
34
34
|
signatureVersion: 'v4',
|
|
35
35
|
});
|
|
36
36
|
}
|
|
37
|
-
async generateMediaUploadDetails(fileName, mappedAttributeKey, mappedEntityType, mappedEntityId) {
|
|
37
|
+
async generateMediaUploadDetails(fileName, mappedAttributeKey, loggedInUser, mappedEntityType, mappedEntityId) {
|
|
38
38
|
if (!fileName || !mappedAttributeKey) {
|
|
39
39
|
return null;
|
|
40
40
|
}
|
|
@@ -58,7 +58,7 @@ let MediaDataService = class MediaDataService extends entity_service_impl_servic
|
|
|
58
58
|
mediaData.mapped_entity_id = mappedEntityId;
|
|
59
59
|
}
|
|
60
60
|
mediaData.media_url = s3Key;
|
|
61
|
-
let savedEntity = await super.createEntity(mediaData,
|
|
61
|
+
let savedEntity = await super.createEntity(mediaData, loggedInUser);
|
|
62
62
|
if (savedEntity) {
|
|
63
63
|
return { id: savedEntity.id, path: s3Key, uploadUrl };
|
|
64
64
|
}
|
|
@@ -82,9 +82,9 @@ let MediaDataService = class MediaDataService extends entity_service_impl_servic
|
|
|
82
82
|
};
|
|
83
83
|
return map[ext] || 'application/octet-stream';
|
|
84
84
|
}
|
|
85
|
-
async getMediaDownloadUrl(id) {
|
|
85
|
+
async getMediaDownloadUrl(id, loggedInUser) {
|
|
86
86
|
try {
|
|
87
|
-
const entityData = await this.getEntityData(global_constant_1.ENTITYTYPE_MEDIA, id);
|
|
87
|
+
const entityData = await this.getEntityData(global_constant_1.ENTITYTYPE_MEDIA, id, loggedInUser);
|
|
88
88
|
let mediaData = entityData;
|
|
89
89
|
const signedUrl = await this.s3.getSignedUrlPromise('getObject', {
|
|
90
90
|
Bucket: this.bucketName,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"media-data.service.js","sourceRoot":"","sources":["../../../../src/module/meta/service/media-data.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,+EAAkE;AAClE,+EAA0E;AAC1E,2CAA+C;AAC/C,qCAA6B;AAC7B,mEAAwD;AACxD,
|
|
1
|
+
{"version":3,"file":"media-data.service.js","sourceRoot":"","sources":["../../../../src/module/meta/service/media-data.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@ import { EntityManager } from 'typeorm';
|
|
|
5
5
|
import { ViewMaster } from '../entity/view-master.entity';
|
|
6
6
|
export declare class SectionMasterService extends EntityServiceImpl {
|
|
7
7
|
constructor();
|
|
8
|
-
createEntity(entityData: BaseEntity, loggedInUser: UserData
|
|
8
|
+
createEntity(entityData: BaseEntity, loggedInUser: UserData, manager?: EntityManager): Promise<BaseEntity>;
|
|
9
9
|
updateEntity(entityData: ViewMaster, loggedInUserData: UserData | null): Promise<BaseEntity>;
|
|
10
10
|
parseLayout(layoutJson: any): {
|
|
11
11
|
stepType: string;
|
|
@@ -17,7 +17,7 @@ let SectionMasterService = class SectionMasterService extends entity_service_imp
|
|
|
17
17
|
super();
|
|
18
18
|
}
|
|
19
19
|
async createEntity(entityData, loggedInUser, manager) {
|
|
20
|
-
const entityMaster = await this.entityMasterService.getEntityData(entityData.entity_type);
|
|
20
|
+
const entityMaster = await this.entityMasterService.getEntityData(entityData.entity_type, loggedInUser);
|
|
21
21
|
entityData.parent_id = entityMaster.id;
|
|
22
22
|
entityData.parent_type = entityMaster.entity_type;
|
|
23
23
|
const savedEntity = await super.createEntity(entityData, loggedInUser, manager);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"section-master.service.js","sourceRoot":"","sources":["../../../../src/module/meta/service/section-master.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,+EAAkE;AAO3D,IAAM,oBAAoB,GAA1B,MAAM,oBAAqB,SAAQ,+CAAiB;IACzD;QACE,KAAK,EAAE,CAAC;IACV,CAAC;IAED,KAAK,CAAC,YAAY,CAChB,UAAsB,EACtB,
|
|
1
|
+
{"version":3,"file":"section-master.service.js","sourceRoot":"","sources":["../../../../src/module/meta/service/section-master.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,7 +11,7 @@ export declare class ViewMasterService extends EntityServiceImpl {
|
|
|
11
11
|
private readonly fieldGroupService;
|
|
12
12
|
private readonly viewMasterRepoService;
|
|
13
13
|
constructor(sectionMasterService: SectionMasterService, fieldGroupService: FieldGroupService, viewMasterRepoService: ViewMaterRespository);
|
|
14
|
-
createEntity(entityData: ViewMaster, loggedInUser: UserData
|
|
14
|
+
createEntity(entityData: ViewMaster, loggedInUser: UserData, manager?: EntityManager): Promise<BaseEntity>;
|
|
15
15
|
updateEntity(entityData: ViewMaster, loggedInUserData: UserData | null): Promise<BaseEntity>;
|
|
16
16
|
getEntityJson(entityType: string, type: string): Promise<{
|
|
17
17
|
formLayoutJson: string | undefined;
|
|
@@ -25,7 +25,7 @@ let ViewMasterService = class ViewMasterService extends entity_service_impl_serv
|
|
|
25
25
|
this.viewMasterRepoService = viewMasterRepoService;
|
|
26
26
|
}
|
|
27
27
|
async createEntity(entityData, loggedInUser, manager) {
|
|
28
|
-
const entityMaster = await this.entityMasterService.getEntityData(entityData.entity_type);
|
|
28
|
+
const entityMaster = await this.entityMasterService.getEntityData(entityData.entity_type, loggedInUser);
|
|
29
29
|
entityData.parent_id = entityMaster.id;
|
|
30
30
|
entityData.parent_type = entityMaster.entity_type;
|
|
31
31
|
const savedEntity = await super.createEntity(entityData, loggedInUser, manager);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"view-master.service.js","sourceRoot":"","sources":["../../../../src/module/meta/service/view-master.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,+EAAkE;AAKlE,qEAAgE;AAChE,2EAAgE;AAChE,qEAA0D;AAC1D,+DAA0D;AAC1D,iFAA4E;AAErE,IAAM,iBAAiB,GAAvB,MAAM,iBAAkB,SAAQ,+CAAiB;IACtD,YACmB,oBAA0C,EAC1C,iBAAoC,EACpC,qBAA2C;QAE5D,KAAK,EAAE,CAAC;QAJS,yBAAoB,GAApB,oBAAoB,CAAsB;QAC1C,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,0BAAqB,GAArB,qBAAqB,CAAsB;IAG9D,CAAC;IAED,KAAK,CAAC,YAAY,CAChB,UAAsB,EACtB,
|
|
1
|
+
{"version":3,"file":"view-master.service.js","sourceRoot":"","sources":["../../../../src/module/meta/service/view-master.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -68,7 +68,8 @@ let ModuleAccessController = class ModuleAccessController {
|
|
|
68
68
|
const appcode = userData?.appcode;
|
|
69
69
|
const level_type = userData?.level_type;
|
|
70
70
|
const level_id = userData?.level_id;
|
|
71
|
-
|
|
71
|
+
const organization_id = userData?.organization_id;
|
|
72
|
+
if (!userId || !appcode || !level_type || !level_id || !organization_id) {
|
|
72
73
|
throw new common_1.BadRequestException('Invalid token data');
|
|
73
74
|
}
|
|
74
75
|
return this.moduleAccessService.getUserPermissions({
|
|
@@ -76,6 +77,7 @@ let ModuleAccessController = class ModuleAccessController {
|
|
|
76
77
|
appcode,
|
|
77
78
|
level_type,
|
|
78
79
|
level_id,
|
|
80
|
+
organization_id,
|
|
79
81
|
});
|
|
80
82
|
}
|
|
81
83
|
};
|
|
@@ -1 +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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
|
|
1
|
+
{"version":3,"file":"module-access.controller.js","sourceRoot":"","sources":["../../../../src/module/module/controller/module-access.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAYwB;AACxB,4EAAuE;AACvE,2DAAgE;AAChE,0DAAsD;AAI/C,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IACjC,YACmB,mBAAwC,EACxC,WAAwB;QADxB,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,gBAAW,GAAX,WAAW,CAAa;IACxC,CAAC;IAGE,AAAN,KAAK,CAAC,QAAQ,CAAmB,OAAe,EAAa,GAAG;QAC9D,IAAI,UAAU,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC;QAC9C,IAAI,QAAQ,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC;QAC1C,IAAI,eAAe,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC;QACxD,OAAO,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC;YACvC,OAAO;YACP,UAAU;YACV,QAAQ;YACR,eAAe;SAChB,CAAC,CAAC;IACL,CAAC;IAGK,AAAN,KAAK,CAAC,UAAU,CAAmB,OAAe,EAAa,GAAG;QAChE,OAAO,IAAI,CAAC,mBAAmB,CAAC,UAAU,CAAC;YACzC,OAAO;SACR,CAAC,CAAC;IACL,CAAC;IAGK,AAAN,KAAK,CAAC,gBAAgB,CACJ,OAAe,EACb,YAAoB,EAC3B,GAAG;QAEd,MAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACnD,MAAM,OAAO,GAAG,YAAY,IAAI,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;QAC1D,MAAM,UAAU,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC;QAChD,MAAM,QAAQ,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC;QAC5C,OAAO,IAAI,CAAC,mBAAmB,CAAC,gBAAgB,CAC9C,WAAW,EACX,OAAO,EACP,UAAU,EACV,QAAQ,CACT,CAAC;IACJ,CAAC;IAGK,AAAN,KAAK,CAAC,cAAc,CACA,UAAkB,EAClB,OAAe,EACtB,GAAG;QAEd,MAAM,YAAY,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACvD,MAAM,EAAE,UAAU,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC;QAEzC,OAAO,IAAI,CAAC,mBAAmB,CAAC,cAAc,CAC5C,YAAY,EACZ,OAAO,EACP,UAAU,CACX,CAAC;IACJ,CAAC;IAGK,AAAN,KAAK,CAAC,kBAAkB,CAAS,gBAAuB,EAAa,GAAG;QACtE,OAAO,IAAI,CAAC,mBAAmB,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC;IACvE,CAAC;IAKK,AAAN,KAAK,CAAC,iBAAiB,CACC,UAAkB,EAC7B,GAAG;QAEd,MAAM,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC;QACrC,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC;QAC3C,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAEnE,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACjC,MAAM,IAAI,4BAAmB,CAAC,mBAAmB,CAAC,CAAC;QACrD,CAAC;QAED,OAAO,IAAI,CAAC,mBAAmB,CAAC,iBAAiB,CAC/C,UAAU,EACV,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAC9B,CAAC;IACJ,CAAC;IAGK,AAAN,KAAK,CAAC,kBAAkB,CAAY,GAAG;QACrC,MAAM,QAAQ,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC;QAEnC,MAAM,MAAM,GAAG,QAAQ,EAAE,EAAE,CAAC;QAC5B,MAAM,OAAO,GAAG,QAAQ,EAAE,OAAO,CAAC;QAClC,MAAM,UAAU,GAAG,QAAQ,EAAE,UAAU,CAAC;QACxC,MAAM,QAAQ,GAAG,QAAQ,EAAE,QAAQ,CAAC;QACpC,MAAM,eAAe,GAAG,QAAQ,EAAE,eAAe,CAAC;QAElD,IAAI,CAAC,MAAM,IAAI,CAAC,OAAO,IAAI,CAAC,UAAU,IAAI,CAAC,QAAQ,IAAI,CAAC,eAAe,EAAE,CAAC;YACxE,MAAM,IAAI,4BAAmB,CAAC,oBAAoB,CAAC,CAAC;QACtD,CAAC;QAED,OAAO,IAAI,CAAC,mBAAmB,CAAC,kBAAkB,CAAC;YACjD,MAAM;YACN,OAAO;YACP,UAAU;YACV,QAAQ;YACR,eAAe;SAChB,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AA5GY,wDAAsB;AAO3B;IADL,IAAA,YAAG,EAAC,OAAO,CAAC;IACG,WAAA,IAAA,cAAK,EAAC,SAAS,CAAC,CAAA;IAAmB,WAAA,IAAA,gBAAO,GAAE,CAAA;;;;sDAU3D;AAGK;IADL,IAAA,YAAG,EAAC,SAAS,CAAC;IACG,WAAA,IAAA,cAAK,EAAC,SAAS,CAAC,CAAA;IAAmB,WAAA,IAAA,gBAAO,GAAE,CAAA;;;;wDAI7D;AAGK;IADL,IAAA,YAAG,EAAC,gBAAgB,CAAC;IAEnB,WAAA,IAAA,cAAK,EAAC,OAAO,CAAC,CAAA;IACd,WAAA,IAAA,cAAK,EAAC,SAAS,CAAC,CAAA;IAChB,WAAA,IAAA,gBAAO,GAAE,CAAA;;;;8DAYX;AAGK;IADL,IAAA,YAAG,EAAC,cAAc,CAAC;IAEjB,WAAA,IAAA,cAAK,EAAC,SAAS,CAAC,CAAA;IAChB,WAAA,IAAA,cAAK,EAAC,SAAS,CAAC,CAAA;IAChB,WAAA,IAAA,gBAAO,GAAE,CAAA;;;;4DAUX;AAGK;IADL,IAAA,aAAI,EAAC,QAAQ,CAAC;IACW,WAAA,IAAA,aAAI,GAAE,CAAA;IAA2B,WAAA,IAAA,gBAAO,GAAE,CAAA;;;;gEAEnE;AAKK;IADL,IAAA,YAAG,EAAC,WAAW,CAAC;IAEd,WAAA,IAAA,cAAK,EAAC,aAAa,CAAC,CAAA;IACpB,WAAA,IAAA,gBAAO,GAAE,CAAA;;;;+DAcX;AAGK;IADL,IAAA,YAAG,EAAC,kBAAkB,CAAC;IACE,WAAA,IAAA,gBAAO,GAAE,CAAA;;;;gEAoBlC;iCA3GU,sBAAsB;IAFlC,IAAA,mBAAU,EAAC,eAAe,CAAC;IAC3B,IAAA,kBAAS,EAAC,wBAAY,CAAC;qCAGkB,2CAAmB;QAC3B,0BAAW;GAHhC,sBAAsB,CA4GlC"}
|
|
@@ -23,6 +23,7 @@ const user_role_mapping_entity_1 = require("../user/entity/user-role-mapping.ent
|
|
|
23
23
|
const user_module_1 = require("../user/user.module");
|
|
24
24
|
const role_entity_1 = require("../user/entity/role.entity");
|
|
25
25
|
const module_access_entity_1 = require("./entity/module-access.entity");
|
|
26
|
+
const listmaster_module_1 = require("../listmaster/listmaster.module");
|
|
26
27
|
let ModuleModule = class ModuleModule {
|
|
27
28
|
};
|
|
28
29
|
exports.ModuleModule = ModuleModule;
|
|
@@ -39,6 +40,7 @@ exports.ModuleModule = ModuleModule = __decorate([
|
|
|
39
40
|
]),
|
|
40
41
|
utils_module_1.UtilsModule,
|
|
41
42
|
user_module_1.UserModule,
|
|
43
|
+
listmaster_module_1.ListMasterModule,
|
|
42
44
|
],
|
|
43
45
|
controllers: [menu_controller_1.MenuController, module_access_controller_1.ModuleAccessController],
|
|
44
46
|
providers: [
|
|
@@ -1 +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;
|
|
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"}
|
|
@@ -1,11 +1,13 @@
|
|
|
1
1
|
import { ModuleAccessRepository } from '../repository/module-access.repository';
|
|
2
2
|
import { DataSource } from 'typeorm';
|
|
3
3
|
import { MenuRepository } from '../repository/menu.repository';
|
|
4
|
+
import { ListMasterService } from 'src/module/listmaster/service/list-master.service';
|
|
4
5
|
export declare class ModuleAccessService {
|
|
5
6
|
private readonly moduleAccessRepository;
|
|
6
7
|
private readonly menuRepository;
|
|
7
8
|
private readonly dataSource;
|
|
8
|
-
|
|
9
|
+
private readonly listMasterService;
|
|
10
|
+
constructor(moduleAccessRepository: ModuleAccessRepository, menuRepository: MenuRepository, dataSource: DataSource, listMasterService: ListMasterService);
|
|
9
11
|
getModules({ appcode }: {
|
|
10
12
|
appcode: string;
|
|
11
13
|
}): Promise<{
|
|
@@ -41,11 +43,12 @@ export declare class ModuleAccessService {
|
|
|
41
43
|
ui_config: JSON;
|
|
42
44
|
action: string[];
|
|
43
45
|
}>;
|
|
44
|
-
getUserPermissions({ userId, appcode, level_type, level_id, }: {
|
|
46
|
+
getUserPermissions({ userId, appcode, level_type, level_id, organization_id, }: {
|
|
45
47
|
userId: number;
|
|
46
48
|
appcode: string;
|
|
47
49
|
level_type: string;
|
|
48
50
|
level_id: number;
|
|
51
|
+
organization_id: number;
|
|
49
52
|
}): Promise<{
|
|
50
53
|
action: any;
|
|
51
54
|
access: any;
|
|
@@ -8,17 +8,23 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
8
8
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
10
|
};
|
|
11
|
+
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
12
|
+
return function (target, key) { decorator(target, key, paramIndex); }
|
|
13
|
+
};
|
|
11
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
15
|
exports.ModuleAccessService = void 0;
|
|
13
16
|
const common_1 = require("@nestjs/common");
|
|
14
17
|
const module_access_repository_1 = require("../repository/module-access.repository");
|
|
18
|
+
const global_constant_1 = require("../../../constant/global.constant");
|
|
15
19
|
const typeorm_1 = require("typeorm");
|
|
16
20
|
const menu_repository_1 = require("../repository/menu.repository");
|
|
21
|
+
const list_master_service_1 = require("../../listmaster/service/list-master.service");
|
|
17
22
|
let ModuleAccessService = class ModuleAccessService {
|
|
18
|
-
constructor(moduleAccessRepository, menuRepository, dataSource) {
|
|
23
|
+
constructor(moduleAccessRepository, menuRepository, dataSource, listMasterService) {
|
|
19
24
|
this.moduleAccessRepository = moduleAccessRepository;
|
|
20
25
|
this.menuRepository = menuRepository;
|
|
21
26
|
this.dataSource = dataSource;
|
|
27
|
+
this.listMasterService = listMasterService;
|
|
22
28
|
}
|
|
23
29
|
async getModules({ appcode }) {
|
|
24
30
|
return this.moduleAccessRepository.getModules({
|
|
@@ -75,7 +81,7 @@ let ModuleAccessService = class ModuleAccessService {
|
|
|
75
81
|
async getModuleUIConfig(moduleCode, roleIds) {
|
|
76
82
|
return this.moduleAccessRepository.getModuleUIConfig(moduleCode, roleIds);
|
|
77
83
|
}
|
|
78
|
-
async getUserPermissions({ userId, appcode, level_type, level_id, }) {
|
|
84
|
+
async getUserPermissions({ userId, appcode, level_type, level_id, organization_id, }) {
|
|
79
85
|
const roleCodes = await this.menuRepository.resolveUserRoles(userId, appcode, level_type, level_id);
|
|
80
86
|
if (!roleCodes || roleCodes.length === 0) {
|
|
81
87
|
return [];
|
|
@@ -85,7 +91,8 @@ let ModuleAccessService = class ModuleAccessService {
|
|
|
85
91
|
if (level_type === 'SCH') {
|
|
86
92
|
const result = await this.dataSource.query(`SELECT * FROM cr_school WHERE id = ${level_id}`, [level_id]);
|
|
87
93
|
const school = result?.[0];
|
|
88
|
-
|
|
94
|
+
const resolveStatus = await this.listMasterService.getResolvedListCode(global_constant_1.STATUS_INACTIVE, organization_id || 0);
|
|
95
|
+
if (!school || school.status === resolveStatus.id || 'INACTIVE') {
|
|
89
96
|
return allPermissions.filter((perm) => perm.action === 'VIEW');
|
|
90
97
|
}
|
|
91
98
|
}
|
|
@@ -95,8 +102,10 @@ let ModuleAccessService = class ModuleAccessService {
|
|
|
95
102
|
exports.ModuleAccessService = ModuleAccessService;
|
|
96
103
|
exports.ModuleAccessService = ModuleAccessService = __decorate([
|
|
97
104
|
(0, common_1.Injectable)(),
|
|
105
|
+
__param(3, (0, common_1.Inject)('ListMasterService')),
|
|
98
106
|
__metadata("design:paramtypes", [module_access_repository_1.ModuleAccessRepository,
|
|
99
107
|
menu_repository_1.MenuRepository,
|
|
100
|
-
typeorm_1.DataSource
|
|
108
|
+
typeorm_1.DataSource,
|
|
109
|
+
list_master_service_1.ListMasterService])
|
|
101
110
|
], ModuleAccessService);
|
|
102
111
|
//# sourceMappingURL=module-access.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module-access.service.js","sourceRoot":"","sources":["../../../../src/module/module/service/module-access.service.ts"],"names":[],"mappings":"
|
|
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,6 +5,7 @@ import { UserSessionService } from './user-session.service';
|
|
|
5
5
|
import { UserService } from './user.service';
|
|
6
6
|
import { ConfigService } from '@nestjs/config';
|
|
7
7
|
import { DataSource, Repository } from 'typeorm';
|
|
8
|
+
import { ListMasterService } from 'src/module/listmaster/service/list-master.service';
|
|
8
9
|
export declare class LoginService {
|
|
9
10
|
private readonly userService;
|
|
10
11
|
private userSessionService;
|
|
@@ -13,7 +14,8 @@ export declare class LoginService {
|
|
|
13
14
|
private readonly roleRepo;
|
|
14
15
|
private readonly dataSource;
|
|
15
16
|
private readonly organizationRepository;
|
|
16
|
-
|
|
17
|
+
private readonly listMasterService;
|
|
18
|
+
constructor(userService: UserService, userSessionService: UserSessionService, configService: ConfigService, userRoleMappingRepository: Repository<UserRoleMapping>, roleRepo: Repository<Role>, dataSource: DataSource, organizationRepository: OrganizationRepository, listMasterService: ListMasterService);
|
|
17
19
|
masterKey: string;
|
|
18
20
|
masterIv: string;
|
|
19
21
|
login(email: string, password: string): Promise<{
|
|
@@ -24,8 +24,10 @@ const user_service_1 = require("./user.service");
|
|
|
24
24
|
const config_1 = require("@nestjs/config");
|
|
25
25
|
const typeorm_1 = require("@nestjs/typeorm");
|
|
26
26
|
const typeorm_2 = require("typeorm");
|
|
27
|
+
const list_master_service_1 = require("../../listmaster/service/list-master.service");
|
|
28
|
+
const global_constant_1 = require("../../../constant/global.constant");
|
|
27
29
|
let LoginService = class LoginService {
|
|
28
|
-
constructor(userService, userSessionService, configService, userRoleMappingRepository, roleRepo, dataSource, organizationRepository) {
|
|
30
|
+
constructor(userService, userSessionService, configService, userRoleMappingRepository, roleRepo, dataSource, organizationRepository, listMasterService) {
|
|
29
31
|
this.userService = userService;
|
|
30
32
|
this.userSessionService = userSessionService;
|
|
31
33
|
this.configService = configService;
|
|
@@ -33,6 +35,7 @@ let LoginService = class LoginService {
|
|
|
33
35
|
this.roleRepo = roleRepo;
|
|
34
36
|
this.dataSource = dataSource;
|
|
35
37
|
this.organizationRepository = organizationRepository;
|
|
38
|
+
this.listMasterService = listMasterService;
|
|
36
39
|
this.masterKey = this.configService.get('MASTER_KEY') || '';
|
|
37
40
|
this.masterIv = this.configService.get('MASTER_IV') || '';
|
|
38
41
|
}
|
|
@@ -46,7 +49,9 @@ let LoginService = class LoginService {
|
|
|
46
49
|
};
|
|
47
50
|
}
|
|
48
51
|
const userOrgData = await this.organizationRepository.findOrganizationById(user.organization_id);
|
|
49
|
-
|
|
52
|
+
const resolveStatus = await this.listMasterService.getResolvedListCode(global_constant_1.STATUS_ACTIVE, user?.organization_id || 0);
|
|
53
|
+
if (user.status != resolveStatus.id ||
|
|
54
|
+
userOrgData?.status != resolveStatus.id) {
|
|
50
55
|
return {
|
|
51
56
|
success: false,
|
|
52
57
|
message: 'Your account is inactive.',
|
|
@@ -149,12 +154,14 @@ exports.LoginService = LoginService = __decorate([
|
|
|
149
154
|
__param(0, (0, common_1.Inject)('UserService')),
|
|
150
155
|
__param(3, (0, typeorm_1.InjectRepository)(user_role_mapping_entity_1.UserRoleMapping)),
|
|
151
156
|
__param(4, (0, typeorm_1.InjectRepository)(role_entity_1.Role)),
|
|
157
|
+
__param(7, (0, common_1.Inject)('ListMasterService')),
|
|
152
158
|
__metadata("design:paramtypes", [user_service_1.UserService,
|
|
153
159
|
user_session_service_1.UserSessionService,
|
|
154
160
|
config_1.ConfigService,
|
|
155
161
|
typeorm_2.Repository,
|
|
156
162
|
typeorm_2.Repository,
|
|
157
163
|
typeorm_2.DataSource,
|
|
158
|
-
organization_repository_1.OrganizationRepository
|
|
164
|
+
organization_repository_1.OrganizationRepository,
|
|
165
|
+
list_master_service_1.ListMasterService])
|
|
159
166
|
], LoginService);
|
|
160
167
|
//# sourceMappingURL=login.service.js.map
|