rez_core 1.0.90 → 1.0.95
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/main.js +1 -1
- package/dist/module/filter/controller/filter.controller.d.ts +8 -1
- package/dist/module/filter/controller/filter.controller.js +16 -2
- package/dist/module/filter/controller/filter.controller.js.map +1 -1
- package/dist/module/filter/repository/saved-filter.repository.d.ts +5 -0
- package/dist/module/filter/repository/saved-filter.repository.js +16 -1
- package/dist/module/filter/repository/saved-filter.repository.js.map +1 -1
- package/dist/module/filter/service/saved-filter.service.d.ts +5 -0
- package/dist/module/filter/service/saved-filter.service.js +3 -0
- package/dist/module/filter/service/saved-filter.service.js.map +1 -1
- package/dist/module/listmaster/service/list-master.service.js +2 -1
- package/dist/module/listmaster/service/list-master.service.js.map +1 -1
- package/dist/module/module/repository/menu.repository.js +10 -2
- package/dist/module/module/repository/menu.repository.js.map +1 -1
- package/dist/module/user/service/role.service.js +1 -1
- 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/module/filter/controller/filter.controller.ts +21 -2
- package/src/module/filter/repository/saved-filter.repository.ts +36 -11
- package/src/module/filter/service/saved-filter.service.ts +11 -9
- package/src/module/listmaster/service/list-master.service.ts +28 -17
- package/src/module/module/repository/menu.repository.ts +11 -5
- package/src/module/user/service/role.service.ts +1 -1
package/dist/main.js
CHANGED
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
import { FilterService } from '../service/filter.service';
|
|
2
|
+
import { SavedFilterService } from '../service/saved-filter.service';
|
|
2
3
|
export declare class FilterController {
|
|
3
4
|
private readonly filterService;
|
|
4
|
-
|
|
5
|
+
private readonly savedFilterService;
|
|
6
|
+
constructor(filterService: FilterService, savedFilterService: SavedFilterService);
|
|
5
7
|
applyFilter(body: any, page?: number, size?: number): Promise<{
|
|
6
8
|
success: boolean;
|
|
7
9
|
data: {
|
|
@@ -23,4 +25,9 @@ export declare class FilterController {
|
|
|
23
25
|
};
|
|
24
26
|
};
|
|
25
27
|
}>;
|
|
28
|
+
getFilterById(id: string): Promise<{
|
|
29
|
+
filter_attribute: string;
|
|
30
|
+
filter_operator: string;
|
|
31
|
+
filter_value: string;
|
|
32
|
+
}[]>;
|
|
26
33
|
}
|
|
@@ -15,9 +15,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
15
15
|
exports.FilterController = void 0;
|
|
16
16
|
const common_1 = require("@nestjs/common");
|
|
17
17
|
const filter_service_1 = require("../service/filter.service");
|
|
18
|
+
const saved_filter_service_1 = require("../service/saved-filter.service");
|
|
18
19
|
let FilterController = class FilterController {
|
|
19
|
-
constructor(filterService) {
|
|
20
|
+
constructor(filterService, savedFilterService) {
|
|
20
21
|
this.filterService = filterService;
|
|
22
|
+
this.savedFilterService = savedFilterService;
|
|
21
23
|
}
|
|
22
24
|
async applyFilter(body, page = 1, size = 10) {
|
|
23
25
|
const { entity_type, quickFilter, savedFilterCode, attributeFilter, tabs, sortby, } = body;
|
|
@@ -32,6 +34,9 @@ let FilterController = class FilterController {
|
|
|
32
34
|
size,
|
|
33
35
|
});
|
|
34
36
|
}
|
|
37
|
+
async getFilterById(id) {
|
|
38
|
+
return this.savedFilterService.getFilterById(Number(id));
|
|
39
|
+
}
|
|
35
40
|
};
|
|
36
41
|
exports.FilterController = FilterController;
|
|
37
42
|
__decorate([
|
|
@@ -43,8 +48,17 @@ __decorate([
|
|
|
43
48
|
__metadata("design:paramtypes", [Object, Number, Number]),
|
|
44
49
|
__metadata("design:returntype", Promise)
|
|
45
50
|
], FilterController.prototype, "applyFilter", null);
|
|
51
|
+
__decorate([
|
|
52
|
+
(0, common_1.Get)(':id'),
|
|
53
|
+
__param(0, (0, common_1.Param)('id')),
|
|
54
|
+
__metadata("design:type", Function),
|
|
55
|
+
__metadata("design:paramtypes", [String]),
|
|
56
|
+
__metadata("design:returntype", Promise)
|
|
57
|
+
], FilterController.prototype, "getFilterById", null);
|
|
46
58
|
exports.FilterController = FilterController = __decorate([
|
|
47
59
|
(0, common_1.Controller)('filter'),
|
|
48
|
-
|
|
60
|
+
__param(1, (0, common_1.Inject)('SavedFilterService')),
|
|
61
|
+
__metadata("design:paramtypes", [filter_service_1.FilterService,
|
|
62
|
+
saved_filter_service_1.SavedFilterService])
|
|
49
63
|
], FilterController);
|
|
50
64
|
//# sourceMappingURL=filter.controller.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filter.controller.js","sourceRoot":"","sources":["../../../../src/module/filter/controller/filter.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"filter.controller.js","sourceRoot":"","sources":["../../../../src/module/filter/controller/filter.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CASwB;AACxB,8DAA0D;AAC1D,0EAAqE;AAG9D,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAC3B,YACmB,aAA4B,EAE5B,kBAAsC;QAFtC,kBAAa,GAAb,aAAa,CAAe;QAE5B,uBAAkB,GAAlB,kBAAkB,CAAoB;IACtD,CAAC;IAGE,AAAN,KAAK,CAAC,WAAW,CACP,IAAS,EACY,OAAe,CAAC,EAChB,OAAe,EAAE;QAE9C,MAAM,EACJ,WAAW,EACX,WAAW,EACX,eAAe,EACf,eAAe,EACf,IAAI,EACJ,MAAM,GACP,GAAG,IAAI,CAAC;QAET,OAAO,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC;YACpC,WAAW;YACX,WAAW;YACX,eAAe;YACf,eAAe;YACf,IAAI;YACJ,MAAM;YACN,IAAI;YACJ,IAAI;SACL,CAAC,CAAC;IACL,CAAC;IAGK,AAAN,KAAK,CAAC,aAAa,CAAc,EAAU;QACzC,OAAO,IAAI,CAAC,kBAAkB,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;IAC3D,CAAC;CACF,CAAA;AAtCY,4CAAgB;AAQrB;IADL,IAAA,aAAI,GAAE;IAEJ,WAAA,IAAA,aAAI,GAAE,CAAA;IACN,WAAA,IAAA,cAAK,EAAC,MAAM,EAAE,qBAAY,CAAC,CAAA;IAC3B,WAAA,IAAA,cAAK,EAAC,MAAM,EAAE,qBAAY,CAAC,CAAA;;;;mDAqB7B;AAGK;IADL,IAAA,YAAG,EAAC,KAAK,CAAC;IACU,WAAA,IAAA,cAAK,EAAC,IAAI,CAAC,CAAA;;;;qDAE/B;2BArCU,gBAAgB;IAD5B,IAAA,mBAAU,EAAC,QAAQ,CAAC;IAIhB,WAAA,IAAA,eAAM,EAAC,oBAAoB,CAAC,CAAA;qCADG,8BAAa;QAER,yCAAkB;GAJ9C,gBAAgB,CAsC5B"}
|
|
@@ -69,11 +69,26 @@ let SavedFilterRepositoryService = class SavedFilterRepositoryService {
|
|
|
69
69
|
modified_date: 'DESC',
|
|
70
70
|
},
|
|
71
71
|
});
|
|
72
|
-
return filters.map(filter => ({
|
|
72
|
+
return filters.map((filter) => ({
|
|
73
73
|
label: filter.name,
|
|
74
74
|
value: filter.id,
|
|
75
75
|
}));
|
|
76
76
|
}
|
|
77
|
+
async getFilterById(id) {
|
|
78
|
+
const saveFilterMasterData = await this.savedFilterMasterRepo.findOne({
|
|
79
|
+
where: { id },
|
|
80
|
+
});
|
|
81
|
+
if (!saveFilterMasterData)
|
|
82
|
+
return [];
|
|
83
|
+
const filterDetails = await this.savedFilterDetailRepo.find({
|
|
84
|
+
where: { mapped_filter_code: saveFilterMasterData.code },
|
|
85
|
+
});
|
|
86
|
+
return filterDetails.map((detail) => ({
|
|
87
|
+
filter_attribute: detail.filter_attribute,
|
|
88
|
+
filter_operator: detail.filter_operator,
|
|
89
|
+
filter_value: detail.filter_value,
|
|
90
|
+
}));
|
|
91
|
+
}
|
|
77
92
|
};
|
|
78
93
|
exports.SavedFilterRepositoryService = SavedFilterRepositoryService;
|
|
79
94
|
exports.SavedFilterRepositoryService = SavedFilterRepositoryService = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"saved-filter.repository.js","sourceRoot":"","sources":["../../../../src/module/filter/repository/saved-filter.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,6CAAmD;AACnD,qCAA0C;AAC1C,qFAAyE;AACzE,qFAAyE;AAGlE,IAAM,4BAA4B,GAAlC,MAAM,4BAA4B;IACvC,YAEmB,qBAAoD,EAEpD,qBAAoD;QAFpD,0BAAqB,GAArB,qBAAqB,CAA+B;QAEpD,0BAAqB,GAArB,qBAAqB,CAA+B;IACpE,CAAC;IAEJ,KAAK,CAAC,kBAAkB,CACtB,IAAY,EACZ,KAAa,EACb,KAAa,EACb,SAAkB;QAElB,MAAM,KAAK,GAAQ;YACjB,IAAI;YACJ,eAAe,EAAE,KAAK;YACtB,aAAa,EAAE,KAAK;SACrB,CAAC;QACF,IAAI,SAAS,EAAE,CAAC;YACd,KAAK,CAAC,EAAE,GAAG,IAAA,aAAG,EAAC,SAAS,CAAC,CAAC;QAC5B,CAAC;QAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;QACrE,OAAO,CAAC,CAAC,QAAQ,CAAC;IACpB,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,IAAY;QACjC,OAAO,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC;YACrC,KAAK,EAAE,EAAE,kBAAkB,EAAE,IAAI,EAAE;SACpC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,IAAY;QACpC,MAAM,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,EAAE,kBAAkB,EAAE,IAAI,EAAE,CAAC,CAAC;IACxE,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,OAAqC;QACrD,MAAM,QAAQ,GAAG,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAC5D,MAAM,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAClD,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,EAAU,EAAE,IAAY;QACvC,MAAM,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;IACxD,CAAC;IAED,KAAK,CAAC,4BAA4B,
|
|
1
|
+
{"version":3,"file":"saved-filter.repository.js","sourceRoot":"","sources":["../../../../src/module/filter/repository/saved-filter.repository.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,4 +9,9 @@ export declare class SavedFilterService extends EntityServiceImpl {
|
|
|
9
9
|
createEntity(entityData: BaseEntity, loggedInUser: UserData | null): Promise<BaseEntity>;
|
|
10
10
|
updateEntity(entityData: BaseEntity, loggedInUser: UserData | null): Promise<BaseEntity>;
|
|
11
11
|
getDetailsByCode(code: string): Promise<SavedFilterDetail[]>;
|
|
12
|
+
getFilterById(id: number): Promise<{
|
|
13
|
+
filter_attribute: string;
|
|
14
|
+
filter_operator: string;
|
|
15
|
+
filter_value: string;
|
|
16
|
+
}[]>;
|
|
12
17
|
}
|
|
@@ -64,6 +64,9 @@ let SavedFilterService = class SavedFilterService extends entity_service_impl_se
|
|
|
64
64
|
async getDetailsByCode(code) {
|
|
65
65
|
return this.savedFilterRepo.getDetailsByCode(code);
|
|
66
66
|
}
|
|
67
|
+
async getFilterById(id) {
|
|
68
|
+
return this.savedFilterRepo.getFilterById(id);
|
|
69
|
+
}
|
|
67
70
|
};
|
|
68
71
|
exports.SavedFilterService = SavedFilterService;
|
|
69
72
|
exports.SavedFilterService = SavedFilterService = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"saved-filter.service.js","sourceRoot":"","sources":["../../../../src/module/filter/service/saved-filter.service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"saved-filter.service.js","sourceRoot":"","sources":["../../../../src/module/filter/service/saved-filter.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAiE;AACjE,gGAAmF;AAKnF,uEAA4E;AAC5E,mFAAqF;AAG9E,IAAM,kBAAkB,GAAxB,MAAM,kBAAmB,SAAQ,+CAAiB;IACvD,YAA6B,eAA6C;QACxE,KAAK,EAAE,CAAC;QADmB,oBAAe,GAAf,eAAe,CAA8B;IAE1E,CAAC;IAED,KAAK,CAAC,YAAY,CAChB,UAAsB,EACtB,YAA6B;QAE7B,MAAM,MAAM,GAAG,UAA+B,CAAC;QAE/C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,kBAAkB,CAC1D,MAAM,CAAC,IAAI,EACX,MAAM,CAAC,eAAe,EACtB,MAAM,CAAC,aAAa,CACrB,CAAC;QAEF,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,IAAI,4BAAmB,CAAC,mCAAmC,CAAC,CAAC;QACrE,CAAC;QAGD,MAAM,WAAW,GAAG,MAAM,KAAK,CAAC,YAAY,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;QAGnE,MAAM,IAAI,GAAG,MAAM,WAAW,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC;QAGhE,WAAW,CAAC,IAAI,GAAG,IAAI,CAAC;QACxB,MAAM,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QAG5D,MAAM,OAAO,GAAI,UAAkB,CAAC,aAAa,IAAI,EAAE,CAAC;QACxD,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;YACnB,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,MAAW,EAAE,EAAE,CAAC,CAAC;gBAC7C,GAAG,MAAM;gBACT,kBAAkB,EAAE,WAAW,CAAC,IAAI;aACrC,CAAC,CAAC,CAAC;YAEJ,MAAM,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QACnD,CAAC;QAED,OAAO,WAAW,CAAC;IACrB,CAAC;IAED,KAAK,CAAC,YAAY,CAChB,UAAsB,EACtB,YAA6B;QAE7B,MAAM,MAAM,GAAG,UAA+B,CAAC;QAE/C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,aAAa,CACvC,8CAA4B,EAC5B,MAAM,CAAC,EAAE,CACV,CAAC;QACF,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,MAAM,IAAI,4BAAmB,CAAC,yBAAyB,CAAC,CAAC;QAC3D,CAAC;QAED,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,kBAAkB,CAC9D,MAAM,CAAC,IAAI,EACX,MAAM,CAAC,eAAe,EACtB,MAAM,CAAC,aAAa,EACpB,MAAM,CAAC,EAAE,CACV,CAAC;QAEF,IAAI,UAAU,EAAE,CAAC;YACf,MAAM,IAAI,4BAAmB,CAAC,mCAAmC,CAAC,CAAC;QACrE,CAAC;QAED,MAAM,EAAE,aAAa,EAAE,GAAG,eAAe,EAAE,GAAG,MAAa,CAAC;QAC5D,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,YAAY,CAAC,eAAe,EAAE,YAAY,CAAC,CAAC;QAExE,IAAI,aAAa,EAAE,MAAM,EAAE,CAAC;YAC1B,MAAM,IAAI,CAAC,eAAe,CAAC,mBAAmB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YAE7D,MAAM,QAAQ,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,MAAW,EAAE,EAAE,CAAC,CAAC;gBACnD,GAAG,MAAM;gBACT,kBAAkB,EAAE,OAAO,CAAC,IAAI;aACjC,CAAC,CAAC,CAAC;YAEJ,MAAM,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QACnD,CAAC;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,IAAY;QACjC,OAAO,IAAI,CAAC,eAAe,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;IACrD,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,EAAU;QAC5B,OAAO,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;IAChD,CAAC;CACF,CAAA;AA9FY,gDAAkB;6BAAlB,kBAAkB;IAD9B,IAAA,mBAAU,GAAE;qCAEmC,sDAA4B;GAD/D,kBAAkB,CA8F9B"}
|
|
@@ -53,7 +53,7 @@ let ListMasterService = class ListMasterService {
|
|
|
53
53
|
argsObjectList.push(params[paramsKey]);
|
|
54
54
|
}
|
|
55
55
|
let results = await this.entityManager.query(query, argsObjectList);
|
|
56
|
-
results.forEach(r => {
|
|
56
|
+
results.forEach((r) => {
|
|
57
57
|
result.push({ label: r['name'], value: r['id'] });
|
|
58
58
|
});
|
|
59
59
|
}
|
|
@@ -64,6 +64,7 @@ let ListMasterService = class ListMasterService {
|
|
|
64
64
|
if (!apiRegistry)
|
|
65
65
|
return [];
|
|
66
66
|
const url = `${apiRegistry.base_url}${apiRegistry.endpoint.replace(/{{(.*?)}}/g, (_, key) => params?.[key.trim()] || '')}`;
|
|
67
|
+
console.log(url);
|
|
67
68
|
const payload = this.injectDynamicParams(apiRegistry.request_payload_schema, params);
|
|
68
69
|
const response = await (0, rxjs_1.firstValueFrom)(this.httpService.request({
|
|
69
70
|
url,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list-master.service.js","sourceRoot":"","sources":["../../../../src/module/listmaster/service/list-master.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,2CAIwB;AACxB,6FAAuF;AACvF,iFAA4E;AAC5E,gGAA2F;AAC3F,+BAAsC;AACtC,yCAA4C;AAC5C,qCAAwC;AACxC,oFAAoF;AAG7E,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAC5B,YACmB,aAA4B,EAC5B,mBAAwC,EACxC,cAAoC,EACpC,aAAwC,EACxC,kBAAsC,EACtC,WAAwB;QALxB,kBAAa,GAAb,aAAa,CAAe;QAC5B,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,mBAAc,GAAd,cAAc,CAAsB;QACpC,kBAAa,GAAb,aAAa,CAA2B;QACxC,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,gBAAW,GAAX,WAAW,CAAa;
|
|
1
|
+
{"version":3,"file":"list-master.service.js","sourceRoot":"","sources":["../../../../src/module/listmaster/service/list-master.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -51,9 +51,17 @@ let MenuRepository = class MenuRepository extends typeorm_1.Repository {
|
|
|
51
51
|
return modules.map((module) => module.module_code);
|
|
52
52
|
}
|
|
53
53
|
async getMenuItems(moduleCodes) {
|
|
54
|
-
|
|
54
|
+
const menuItems = await this.createQueryBuilder('menu')
|
|
55
|
+
.leftJoin('cr_module', 'module', 'menu.module_code = module.module_code')
|
|
55
56
|
.where('menu.module_code IN (:...moduleCodes)', { moduleCodes })
|
|
56
|
-
.
|
|
57
|
+
.select([
|
|
58
|
+
'menu.*',
|
|
59
|
+
'module.component_name AS component',
|
|
60
|
+
'module.title AS title',
|
|
61
|
+
'module.entity_type AS entity_type',
|
|
62
|
+
])
|
|
63
|
+
.getRawMany();
|
|
64
|
+
return menuItems;
|
|
57
65
|
}
|
|
58
66
|
};
|
|
59
67
|
exports.MenuRepository = MenuRepository;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"menu.repository.js","sourceRoot":"","sources":["../../../../src/module/module/repository/menu.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,qCAAiD;AACjD,uDAAiD;AACjD,yEAA8D;AAC9D,yFAAkF;AAClF,+DAA0D;AAGnD,IAAM,cAAc,GAApB,MAAM,cAAe,SAAQ,oBAAoB;IACtD,YAA6B,UAAsB;QACjD,KAAK,CAAC,sBAAQ,EAAE,UAAU,CAAC,mBAAmB,EAAE,CAAC,CAAC;QADvB,eAAU,GAAV,UAAU,CAAY;IAEnD,CAAC;IAKD,KAAK,CAAC,YAAY,CAAC,MAAc;QAC/B,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,UAAU;aAChC,aAAa,CAAC,0CAAe,CAAC;aAC9B,kBAAkB,CAAC,iBAAiB,CAAC;aACrC,MAAM,CAAC,yBAAyB,CAAC;aACjC,KAAK,CAAC,mCAAmC,EAAE,EAAE,MAAM,EAAE,CAAC;aACtD,OAAO,EAAE,CAAC;QAEb,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC3C,CAAC;IAKD,KAAK,CAAC,oBAAoB,CAAC,OAAiB;QAE1C,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,UAAU;aACpC,aAAa,CAAC,kBAAI,CAAC;aACnB,kBAAkB,CAAC,MAAM,CAAC;aAC1B,MAAM,CAAC,WAAW,CAAC;aACnB,KAAK,CAAC,0BAA0B,EAAE,EAAE,OAAO,EAAE,CAAC;aAC9C,OAAO,EAAE,CAAC;QAEb,MAAM,KAAK,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEjD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACvB,OAAO,EAAE,CAAC;QACZ,CAAC;QAGD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU;aAClC,aAAa,CAAC,mCAAY,CAAC;aAC3B,kBAAkB,CAAC,cAAc,CAAC;aAClC,MAAM,CAAC,0BAA0B,CAAC;aAClC,KAAK,CAAC,uCAAuC,EAAE,EAAE,KAAK,EAAE,CAAC;aACzD,QAAQ,CAAC,8BAA8B,CAAC;aACxC,OAAO,EAAE,CAAC;QAEb,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IACrD,CAAC;
|
|
1
|
+
{"version":3,"file":"menu.repository.js","sourceRoot":"","sources":["../../../../src/module/module/repository/menu.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,qCAAiD;AACjD,uDAAiD;AACjD,yEAA8D;AAC9D,yFAAkF;AAClF,+DAA0D;AAGnD,IAAM,cAAc,GAApB,MAAM,cAAe,SAAQ,oBAAoB;IACtD,YAA6B,UAAsB;QACjD,KAAK,CAAC,sBAAQ,EAAE,UAAU,CAAC,mBAAmB,EAAE,CAAC,CAAC;QADvB,eAAU,GAAV,UAAU,CAAY;IAEnD,CAAC;IAKD,KAAK,CAAC,YAAY,CAAC,MAAc;QAC/B,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,UAAU;aAChC,aAAa,CAAC,0CAAe,CAAC;aAC9B,kBAAkB,CAAC,iBAAiB,CAAC;aACrC,MAAM,CAAC,yBAAyB,CAAC;aACjC,KAAK,CAAC,mCAAmC,EAAE,EAAE,MAAM,EAAE,CAAC;aACtD,OAAO,EAAE,CAAC;QAEb,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC3C,CAAC;IAKD,KAAK,CAAC,oBAAoB,CAAC,OAAiB;QAE1C,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,UAAU;aACpC,aAAa,CAAC,kBAAI,CAAC;aACnB,kBAAkB,CAAC,MAAM,CAAC;aAC1B,MAAM,CAAC,WAAW,CAAC;aACnB,KAAK,CAAC,0BAA0B,EAAE,EAAE,OAAO,EAAE,CAAC;aAC9C,OAAO,EAAE,CAAC;QAEb,MAAM,KAAK,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEjD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACvB,OAAO,EAAE,CAAC;QACZ,CAAC;QAGD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU;aAClC,aAAa,CAAC,mCAAY,CAAC;aAC3B,kBAAkB,CAAC,cAAc,CAAC;aAClC,MAAM,CAAC,0BAA0B,CAAC;aAClC,KAAK,CAAC,uCAAuC,EAAE,EAAE,KAAK,EAAE,CAAC;aACzD,QAAQ,CAAC,8BAA8B,CAAC;aACxC,OAAO,EAAE,CAAC;QAEb,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IACrD,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,WAAqB;QACtC,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC;aACpD,QAAQ,CAAC,WAAW,EAAE,QAAQ,EAAE,uCAAuC,CAAC;aACxE,KAAK,CAAC,uCAAuC,EAAE,EAAE,WAAW,EAAE,CAAC;aAC/D,MAAM,CAAC;YACN,QAAQ;YACR,oCAAoC;YACpC,uBAAuB;YACvB,mCAAmC;SACpC,CAAC;aACD,UAAU,EAAE,CAAC;QAEhB,OAAO,SAAS,CAAC;IACnB,CAAC;CACF,CAAA;AA/DY,wCAAc;yBAAd,cAAc;IAD1B,IAAA,mBAAU,GAAE;qCAE8B,oBAAU;GADxC,cAAc,CA+D1B"}
|
|
@@ -76,7 +76,7 @@ let RoleService = class RoleService extends entity_service_impl_service_1.Entity
|
|
|
76
76
|
throw new common_1.BadRequestException('Cannot deactivate system role');
|
|
77
77
|
}
|
|
78
78
|
}
|
|
79
|
-
if (await this.roleRepository.isRoleNameExists(entityData.name, { excludeRoleId: entityData.id })) {
|
|
79
|
+
if (await this.roleRepository.isRoleNameExists(entityData.name, { excludeRoleId: entityData.id, organization_id: loggedInUser?.organization_id })) {
|
|
80
80
|
throw new common_1.BadRequestException('Role name already exists.');
|
|
81
81
|
}
|
|
82
82
|
const { copy_from_role_id, ...persistableData } = role;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"role.service.js","sourceRoot":"","sources":["../../../../src/module/user/service/role.service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"role.service.js","sourceRoot":"","sources":["../../../../src/module/user/service/role.service.ts"],"names":[],"mappings":"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"}
|