rez_core 1.0.88 → 1.0.89
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/module/filter/controller/filter.controller.d.ts +13 -6
- package/dist/module/filter/controller/filter.controller.js +6 -2
- package/dist/module/filter/controller/filter.controller.js.map +1 -1
- package/dist/module/filter/dto/filter-request.dto.d.ts +2 -0
- package/dist/module/filter/entity/saved-filter-master.entity.d.ts +3 -0
- package/dist/module/filter/entity/saved-filter-master.entity.js +12 -0
- package/dist/module/filter/entity/saved-filter-master.entity.js.map +1 -1
- package/dist/module/filter/filter.module.js +1 -1
- package/dist/module/filter/filter.module.js.map +1 -1
- package/dist/module/filter/repository/saved-filter.repository.d.ts +8 -0
- package/dist/module/filter/repository/saved-filter.repository.js +24 -0
- package/dist/module/filter/repository/saved-filter.repository.js.map +1 -1
- package/dist/module/filter/service/filter.service.d.ts +20 -7
- package/dist/module/filter/service/filter.service.js +57 -16
- package/dist/module/filter/service/filter.service.js.map +1 -1
- package/dist/module/filter/service/saved-filter.service.js.map +1 -1
- package/dist/module/listmaster/listmaster.module.js +3 -2
- package/dist/module/listmaster/listmaster.module.js.map +1 -1
- package/dist/module/listmaster/service/list-master.service.d.ts +4 -3
- package/dist/module/listmaster/service/list-master.service.js +5 -4
- package/dist/module/listmaster/service/list-master.service.js.map +1 -1
- package/dist/module/meta/controller/meta.controller.d.ts +3 -1
- package/dist/module/meta/controller/meta.controller.js +6 -3
- package/dist/module/meta/controller/meta.controller.js.map +1 -1
- package/dist/module/meta/dto/entity-table.dto.d.ts +6 -0
- package/dist/module/meta/dto/entity-table.dto.js.map +1 -1
- package/dist/module/meta/entity.module.js +14 -4
- package/dist/module/meta/entity.module.js.map +1 -1
- package/dist/module/meta/repository/entity-table-column.repository.d.ts +1 -1
- package/dist/module/meta/repository/entity-table-column.repository.js +5 -5
- package/dist/module/meta/repository/entity-table-column.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.map +1 -1
- package/dist/module/meta/service/entity-table-column.service.d.ts +1 -1
- package/dist/module/meta/service/entity-table-column.service.js +2 -2
- package/dist/module/meta/service/entity-table-column.service.js.map +1 -1
- package/dist/module/meta/service/entity-table.service.d.ts +7 -3
- package/dist/module/meta/service/entity-table.service.js +22 -5
- package/dist/module/meta/service/entity-table.service.js.map +1 -1
- package/dist/module/module/entity/module.entity.d.ts +1 -0
- package/dist/module/module/entity/module.entity.js +4 -0
- package/dist/module/module/entity/module.entity.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/module/filter/controller/filter.controller.ts +8 -2
- package/src/module/filter/dto/filter-request.dto.ts +2 -0
- package/src/module/filter/entity/saved-filter-master.entity.ts +9 -0
- package/src/module/filter/filter.module.ts +2 -2
- package/src/module/filter/repository/saved-filter.repository.ts +33 -0
- package/src/module/filter/service/filter.service.ts +81 -15
- package/src/module/filter/service/saved-filter.service.ts +2 -0
- package/src/module/listmaster/listmaster.module.ts +4 -3
- package/src/module/listmaster/service/list-master.service.ts +3 -2
- package/src/module/meta/controller/meta.controller.ts +6 -3
- package/src/module/meta/dto/entity-table.dto.ts +4 -0
- package/src/module/meta/entity.module.ts +15 -6
- package/src/module/meta/repository/entity-table-column.repository.ts +9 -5
- package/src/module/meta/service/attribute-master.service.ts +9 -9
- package/src/module/meta/service/entity-table-column.service.ts +6 -1
- package/src/module/meta/service/entity-table.service.ts +24 -4
- package/src/module/module/entity/module.entity.ts +3 -1
|
@@ -2,18 +2,25 @@ import { FilterService } from '../service/filter.service';
|
|
|
2
2
|
export declare class FilterController {
|
|
3
3
|
private readonly filterService;
|
|
4
4
|
constructor(filterService: FilterService);
|
|
5
|
-
applyFilter(body: any): Promise<{
|
|
5
|
+
applyFilter(body: any, page?: number, size?: number): Promise<{
|
|
6
6
|
success: boolean;
|
|
7
7
|
data: {
|
|
8
8
|
entity_tabs: ({
|
|
9
|
-
|
|
10
|
-
|
|
9
|
+
tab_value: any;
|
|
10
|
+
tab_value_count: number;
|
|
11
11
|
} | {
|
|
12
|
-
|
|
13
|
-
|
|
12
|
+
tab_value: string;
|
|
13
|
+
tab_value_count: any;
|
|
14
14
|
})[];
|
|
15
15
|
entity_list: import("typeorm").ObjectLiteral[];
|
|
16
|
-
pagination:
|
|
16
|
+
pagination: {
|
|
17
|
+
total: number;
|
|
18
|
+
page: number;
|
|
19
|
+
size: number;
|
|
20
|
+
totalPages: number;
|
|
21
|
+
hasNextPage: boolean;
|
|
22
|
+
hasPreviousPage: boolean;
|
|
23
|
+
};
|
|
17
24
|
};
|
|
18
25
|
}>;
|
|
19
26
|
}
|
|
@@ -19,7 +19,7 @@ let FilterController = class FilterController {
|
|
|
19
19
|
constructor(filterService) {
|
|
20
20
|
this.filterService = filterService;
|
|
21
21
|
}
|
|
22
|
-
async applyFilter(body) {
|
|
22
|
+
async applyFilter(body, page = 1, size = 10) {
|
|
23
23
|
const { entity_type, quickFilter, savedFilterCode, attributeFilter, tabs, sortby, } = body;
|
|
24
24
|
return this.filterService.applyFilter({
|
|
25
25
|
entity_type,
|
|
@@ -28,6 +28,8 @@ let FilterController = class FilterController {
|
|
|
28
28
|
attributeFilter,
|
|
29
29
|
tabs,
|
|
30
30
|
sortby,
|
|
31
|
+
page,
|
|
32
|
+
size,
|
|
31
33
|
});
|
|
32
34
|
}
|
|
33
35
|
};
|
|
@@ -35,8 +37,10 @@ exports.FilterController = FilterController;
|
|
|
35
37
|
__decorate([
|
|
36
38
|
(0, common_1.Post)(),
|
|
37
39
|
__param(0, (0, common_1.Body)()),
|
|
40
|
+
__param(1, (0, common_1.Query)('page', common_1.ParseIntPipe)),
|
|
41
|
+
__param(2, (0, common_1.Query)('size', common_1.ParseIntPipe)),
|
|
38
42
|
__metadata("design:type", Function),
|
|
39
|
-
__metadata("design:paramtypes", [Object]),
|
|
43
|
+
__metadata("design:paramtypes", [Object, Number, Number]),
|
|
40
44
|
__metadata("design:returntype", Promise)
|
|
41
45
|
], FilterController.prototype, "applyFilter", null);
|
|
42
46
|
exports.FilterController = FilterController = __decorate([
|
|
@@ -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,2CAA6E;AAC7E,8DAA0D;AAGnD,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAC3B,YAA6B,aAA4B;QAA5B,kBAAa,GAAb,aAAa,CAAe;IAAG,CAAC;IAGvD,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;CACF,CAAA;AA7BY,4CAAgB;AAIrB;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;2BA5BU,gBAAgB;IAD5B,IAAA,mBAAU,EAAC,QAAQ,CAAC;qCAEyB,8BAAa;GAD9C,gBAAgB,CA6B5B"}
|
|
@@ -24,6 +24,18 @@ __decorate([
|
|
|
24
24
|
(0, typeorm_1.Column)({ length: 50, type: 'varchar', nullable: true }),
|
|
25
25
|
__metadata("design:type", String)
|
|
26
26
|
], SavedFilterMaster.prototype, "app_code", void 0);
|
|
27
|
+
__decorate([
|
|
28
|
+
(0, typeorm_1.Column)({ length: 50, type: 'varchar', nullable: true }),
|
|
29
|
+
__metadata("design:type", String)
|
|
30
|
+
], SavedFilterMaster.prototype, "mapped_entity_type", void 0);
|
|
31
|
+
__decorate([
|
|
32
|
+
(0, typeorm_1.Column)({ type: 'int', nullable: true }),
|
|
33
|
+
__metadata("design:type", Number)
|
|
34
|
+
], SavedFilterMaster.prototype, "user_id", void 0);
|
|
35
|
+
__decorate([
|
|
36
|
+
(0, typeorm_1.Column)({ type: 'boolean', default: false }),
|
|
37
|
+
__metadata("design:type", Boolean)
|
|
38
|
+
], SavedFilterMaster.prototype, "is_default", void 0);
|
|
27
39
|
exports.SavedFilterMaster = SavedFilterMaster = __decorate([
|
|
28
40
|
(0, typeorm_1.Entity)({ name: 'cr_saved_filter_master' }),
|
|
29
41
|
__metadata("design:paramtypes", [])
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"saved-filter-master.entity.js","sourceRoot":"","sources":["../../../../src/module/filter/entity/saved-filter-master.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uEAA4E;AAC5E,6EAAuE;AACvE,qCAAyC;AAGlC,IAAM,iBAAiB,GAAvB,MAAM,iBAAkB,SAAQ,+BAAU;IAC/C;QACE,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,WAAW,GAAG,8CAA4B,CAAC;IAClD,CAAC;
|
|
1
|
+
{"version":3,"file":"saved-filter-master.entity.js","sourceRoot":"","sources":["../../../../src/module/filter/entity/saved-filter-master.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uEAA4E;AAC5E,6EAAuE;AACvE,qCAAyC;AAGlC,IAAM,iBAAiB,GAAvB,MAAM,iBAAkB,SAAQ,+BAAU;IAC/C;QACE,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,WAAW,GAAG,8CAA4B,CAAC;IAClD,CAAC;CAaF,CAAA;AAjBY,8CAAiB;AAO5B;IADC,IAAA,gBAAM,EAAC,EAAE,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mDACvC;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAE,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;6DAC7B;AAG3B;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;kDACxB;AAGhB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;;qDACxB;4BAhBT,iBAAiB;IAD7B,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,wBAAwB,EAAE,CAAC;;GAC9B,iBAAiB,CAiB7B"}
|
|
@@ -21,7 +21,7 @@ let FilterModule = class FilterModule {
|
|
|
21
21
|
exports.FilterModule = FilterModule;
|
|
22
22
|
exports.FilterModule = FilterModule = __decorate([
|
|
23
23
|
(0, common_1.Module)({
|
|
24
|
-
imports: [typeorm_1.TypeOrmModule.forFeature([saved_filter_detail_entity_1.SavedFilterDetail, saved_filter_master_entity_1.SavedFilterMaster]), entity_module_1.EntityModule],
|
|
24
|
+
imports: [typeorm_1.TypeOrmModule.forFeature([saved_filter_detail_entity_1.SavedFilterDetail, saved_filter_master_entity_1.SavedFilterMaster]), (0, common_1.forwardRef)(() => entity_module_1.EntityModule)],
|
|
25
25
|
controllers: [filter_controller_1.FilterController],
|
|
26
26
|
providers: [
|
|
27
27
|
{ provide: 'SavedFilterService', useClass: saved_filter_service_1.SavedFilterService },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filter.module.js","sourceRoot":"","sources":["../../../src/module/filter/filter.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"filter.module.js","sourceRoot":"","sources":["../../../src/module/filter/filter.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAoD;AACpD,6CAAgD;AAChD,yEAAoE;AACpE,oFAAwE;AACxE,oFAAwE;AACxE,kFAAoF;AACpF,yDAAqD;AACrD,6DAAyD;AACzD,sEAAkE;AAY3D,IAAM,YAAY,GAAlB,MAAM,YAAY;CAAG,CAAA;AAAf,oCAAY;uBAAZ,YAAY;IAVxB,IAAA,eAAM,EAAC;QACN,OAAO,EAAE,CAAC,uBAAa,CAAC,UAAU,CAAC,CAAC,8CAAiB,EAAC,8CAAiB,CAAC,CAAC,EAAC,IAAA,mBAAU,EAAC,GAAG,EAAE,CAAC,4BAAY,CAAC,CAAC;QACzG,WAAW,EAAE,CAAC,oCAAgB,CAAC;QAC/B,SAAS,EAAE;YACT,EAAE,OAAO,EAAE,oBAAoB,EAAE,QAAQ,EAAE,yCAAkB,EAAE;YAChE,sDAA4B;YAC5B,8BAAa;SACb;QACD,OAAO,EAAE,CAAC,oBAAoB,EAAE,sDAA4B,CAAC;KAC9D,CAAC;GACW,YAAY,CAAG"}
|
|
@@ -10,4 +10,12 @@ export declare class SavedFilterRepositoryService {
|
|
|
10
10
|
deleteDetailsByCode(code: string): Promise<void>;
|
|
11
11
|
saveDetails(details: Partial<SavedFilterDetail>[]): Promise<void>;
|
|
12
12
|
updateCode(id: number, code: string): Promise<void>;
|
|
13
|
+
getDefaultFilterByEntityType(entityType: string): Promise<{
|
|
14
|
+
label: string;
|
|
15
|
+
value: number;
|
|
16
|
+
} | null>;
|
|
17
|
+
getSavedFiltersByUserIdAndEntityType(userId: number, entityType: string): Promise<{
|
|
18
|
+
label: string;
|
|
19
|
+
value: number;
|
|
20
|
+
}[]>;
|
|
13
21
|
}
|
|
@@ -50,6 +50,30 @@ let SavedFilterRepositoryService = class SavedFilterRepositoryService {
|
|
|
50
50
|
async updateCode(id, code) {
|
|
51
51
|
await this.savedFilterMasterRepo.update(id, { code });
|
|
52
52
|
}
|
|
53
|
+
async getDefaultFilterByEntityType(entityType) {
|
|
54
|
+
const filter = await this.savedFilterMasterRepo.findOne({
|
|
55
|
+
where: {
|
|
56
|
+
mapped_entity_type: entityType,
|
|
57
|
+
is_default: true,
|
|
58
|
+
},
|
|
59
|
+
});
|
|
60
|
+
return filter ? { label: filter.name, value: filter.id } : null;
|
|
61
|
+
}
|
|
62
|
+
async getSavedFiltersByUserIdAndEntityType(userId, entityType) {
|
|
63
|
+
const filters = await this.savedFilterMasterRepo.find({
|
|
64
|
+
where: {
|
|
65
|
+
user_id: userId,
|
|
66
|
+
mapped_entity_type: entityType,
|
|
67
|
+
},
|
|
68
|
+
order: {
|
|
69
|
+
modified_date: 'DESC',
|
|
70
|
+
},
|
|
71
|
+
});
|
|
72
|
+
return filters.map(filter => ({
|
|
73
|
+
label: filter.name,
|
|
74
|
+
value: filter.id,
|
|
75
|
+
}));
|
|
76
|
+
}
|
|
53
77
|
};
|
|
54
78
|
exports.SavedFilterRepositoryService = SavedFilterRepositoryService;
|
|
55
79
|
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;
|
|
1
|
+
{"version":3,"file":"saved-filter.repository.js","sourceRoot":"","sources":["../../../../src/module/filter/repository/saved-filter.repository.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,25 +3,36 @@ import { EntityMasterService } from 'src/module/meta/service/entity-master.servi
|
|
|
3
3
|
import { DataSource } from 'typeorm';
|
|
4
4
|
import { SavedFilterService } from './saved-filter.service';
|
|
5
5
|
import { FilterRequestDto } from '../dto/filter-request.dto';
|
|
6
|
+
import { EntityTableService } from 'src/module/meta/service/entity-table.service';
|
|
7
|
+
import { EntityTableColumnService } from 'src/module/meta/service/entity-table-column.service';
|
|
6
8
|
export declare class FilterService {
|
|
7
9
|
private dataSource;
|
|
8
10
|
private readonly entityMasterService;
|
|
9
11
|
private readonly attributeMasterService;
|
|
12
|
+
private readonly entityTableService;
|
|
13
|
+
private readonly entityTableColumnService;
|
|
10
14
|
private readonly savedFilterService;
|
|
11
|
-
constructor(dataSource: DataSource, entityMasterService: EntityMasterService, attributeMasterService: AttributeMasterService, savedFilterService: SavedFilterService);
|
|
12
|
-
private
|
|
15
|
+
constructor(dataSource: DataSource, entityMasterService: EntityMasterService, attributeMasterService: AttributeMasterService, entityTableService: EntityTableService, entityTableColumnService: EntityTableColumnService, savedFilterService: SavedFilterService);
|
|
16
|
+
private gettab_value_counts;
|
|
13
17
|
applyFilter(dto: FilterRequestDto): Promise<{
|
|
14
18
|
success: boolean;
|
|
15
19
|
data: {
|
|
16
20
|
entity_tabs: ({
|
|
17
|
-
|
|
18
|
-
|
|
21
|
+
tab_value: any;
|
|
22
|
+
tab_value_count: number;
|
|
19
23
|
} | {
|
|
20
|
-
|
|
21
|
-
|
|
24
|
+
tab_value: string;
|
|
25
|
+
tab_value_count: any;
|
|
22
26
|
})[];
|
|
23
27
|
entity_list: import("typeorm").ObjectLiteral[];
|
|
24
|
-
pagination:
|
|
28
|
+
pagination: {
|
|
29
|
+
total: number;
|
|
30
|
+
page: number;
|
|
31
|
+
size: number;
|
|
32
|
+
totalPages: number;
|
|
33
|
+
hasNextPage: boolean;
|
|
34
|
+
hasPreviousPage: boolean;
|
|
35
|
+
};
|
|
25
36
|
};
|
|
26
37
|
}>;
|
|
27
38
|
private parseFilters;
|
|
@@ -31,4 +42,6 @@ export declare class FilterService {
|
|
|
31
42
|
private buildTextCondition;
|
|
32
43
|
private buildNumberCondition;
|
|
33
44
|
private buildDateCondition;
|
|
45
|
+
private buildSelectCondition;
|
|
46
|
+
private buildMultiSelectCondition;
|
|
34
47
|
}
|
|
@@ -18,30 +18,34 @@ const attribute_master_service_1 = require("../../meta/service/attribute-master.
|
|
|
18
18
|
const entity_master_service_1 = require("../../meta/service/entity-master.service");
|
|
19
19
|
const typeorm_1 = require("typeorm");
|
|
20
20
|
const saved_filter_service_1 = require("./saved-filter.service");
|
|
21
|
+
const entity_table_service_1 = require("../../meta/service/entity-table.service");
|
|
22
|
+
const entity_table_column_service_1 = require("../../meta/service/entity-table-column.service");
|
|
21
23
|
let FilterService = class FilterService {
|
|
22
|
-
constructor(dataSource, entityMasterService, attributeMasterService, savedFilterService) {
|
|
24
|
+
constructor(dataSource, entityMasterService, attributeMasterService, entityTableService, entityTableColumnService, savedFilterService) {
|
|
23
25
|
this.dataSource = dataSource;
|
|
24
26
|
this.entityMasterService = entityMasterService;
|
|
25
27
|
this.attributeMasterService = attributeMasterService;
|
|
28
|
+
this.entityTableService = entityTableService;
|
|
29
|
+
this.entityTableColumnService = entityTableColumnService;
|
|
26
30
|
this.savedFilterService = savedFilterService;
|
|
27
31
|
}
|
|
28
|
-
async
|
|
32
|
+
async gettab_value_counts(tableName, column, whereClauses) {
|
|
29
33
|
if (!column)
|
|
30
34
|
return [];
|
|
31
35
|
const qb = this.dataSource
|
|
32
36
|
.getRepository(tableName)
|
|
33
37
|
.createQueryBuilder('e')
|
|
34
|
-
.select(`e.${column}`, '
|
|
35
|
-
.addSelect('COUNT(*)', '
|
|
38
|
+
.select(`e.${column}`, 'tab_value')
|
|
39
|
+
.addSelect('COUNT(*)', 'tab_value_count')
|
|
36
40
|
.groupBy(`e.${column}`);
|
|
37
41
|
whereClauses.forEach((clause) => qb.andWhere(clause.query, clause.params));
|
|
38
42
|
const rows = await qb.getRawMany();
|
|
39
|
-
const total = rows.reduce((sum, r) => sum + parseInt(r.
|
|
43
|
+
const total = rows.reduce((sum, r) => sum + parseInt(r.tab_value_count), 0);
|
|
40
44
|
return [
|
|
41
|
-
{
|
|
45
|
+
{ tab_value: 'All', tab_value_count: total },
|
|
42
46
|
...rows.map((r) => ({
|
|
43
|
-
|
|
44
|
-
|
|
47
|
+
tab_value: r.tab_value || 'UNKNOWN',
|
|
48
|
+
tab_value_count: parseInt(r.tab_value_count),
|
|
45
49
|
})),
|
|
46
50
|
];
|
|
47
51
|
}
|
|
@@ -51,8 +55,12 @@ let FilterService = class FilterService {
|
|
|
51
55
|
const tableName = entityMeta?.db_table_name;
|
|
52
56
|
if (!tableName)
|
|
53
57
|
throw new common_1.BadRequestException(`Invalid entity_type: ${entity_type}`);
|
|
54
|
-
const
|
|
55
|
-
|
|
58
|
+
const getTableMeta = await this.entityTableService.findByEntityTypeAndListTypeAndDisplayType(entity_type, entity_type, 'LIST');
|
|
59
|
+
if (!getTableMeta) {
|
|
60
|
+
throw new common_1.BadRequestException(`Table meta not found for entity_type: ${entity_type}`);
|
|
61
|
+
}
|
|
62
|
+
const getTableColumnMeta = await this.entityTableColumnService.findByParentIdAndParentType(getTableMeta.id, getTableMeta.entity_type, true);
|
|
63
|
+
const attributeMetaMap = getTableColumnMeta.reduce((acc, attr) => {
|
|
56
64
|
acc[attr.attribute_key] = attr;
|
|
57
65
|
return acc;
|
|
58
66
|
}, {});
|
|
@@ -63,7 +71,7 @@ let FilterService = class FilterService {
|
|
|
63
71
|
...(attributeFilter || []),
|
|
64
72
|
];
|
|
65
73
|
const baseWhere = this.buildWhereClauses(baseFilters, attributeMetaMap);
|
|
66
|
-
const allTabs = await this.
|
|
74
|
+
const allTabs = await this.gettab_value_counts(tableName, tabs?.columnName, baseWhere);
|
|
67
75
|
const dataWhere = [...baseWhere];
|
|
68
76
|
if (tabs?.columnName && tabs?.value) {
|
|
69
77
|
const tabAttrMeta = attributeMetaMap[tabs.columnName];
|
|
@@ -83,13 +91,23 @@ let FilterService = class FilterService {
|
|
|
83
91
|
qb.addOrderBy(`e.${sortColum}`, sortType.toUpperCase() === 'DSC' ? 'DESC' : 'ASC');
|
|
84
92
|
});
|
|
85
93
|
}
|
|
86
|
-
const
|
|
94
|
+
const page = dto.page && dto.page > 0 ? dto.page : 1;
|
|
95
|
+
const size = dto.size && dto.size > 0 ? dto.size : 10;
|
|
96
|
+
qb.skip((page - 1) * size).take(size);
|
|
97
|
+
const [entity_list, total] = await qb.getManyAndCount();
|
|
87
98
|
return {
|
|
88
99
|
success: true,
|
|
89
100
|
data: {
|
|
90
101
|
entity_tabs: allTabs,
|
|
91
102
|
entity_list,
|
|
92
|
-
pagination:
|
|
103
|
+
pagination: {
|
|
104
|
+
total,
|
|
105
|
+
page,
|
|
106
|
+
size,
|
|
107
|
+
totalPages: Math.ceil(total / size),
|
|
108
|
+
hasNextPage: page * size < total,
|
|
109
|
+
hasPreviousPage: page > 1,
|
|
110
|
+
},
|
|
93
111
|
},
|
|
94
112
|
};
|
|
95
113
|
}
|
|
@@ -129,13 +147,17 @@ let FilterService = class FilterService {
|
|
|
129
147
|
const val = filter.filter_value;
|
|
130
148
|
const op = filter.filter_operator;
|
|
131
149
|
const key = `param_${attr}_${Math.random().toString(36).substring(2, 8)}`;
|
|
132
|
-
switch (meta.
|
|
133
|
-
case '
|
|
150
|
+
switch (meta.data_type) {
|
|
151
|
+
case 'text':
|
|
134
152
|
return this.buildTextCondition(attr, op, val, key);
|
|
135
153
|
case 'number':
|
|
136
154
|
return this.buildNumberCondition(attr, op, val, key);
|
|
137
155
|
case 'date':
|
|
138
156
|
return this.buildDateCondition(attr, op, val, key);
|
|
157
|
+
case 'select':
|
|
158
|
+
return this.buildSelectCondition(attr, op, val, key);
|
|
159
|
+
case 'multiselect':
|
|
160
|
+
return this.buildMultiSelectCondition(attr, val, key);
|
|
139
161
|
default:
|
|
140
162
|
return null;
|
|
141
163
|
}
|
|
@@ -197,14 +219,33 @@ let FilterService = class FilterService {
|
|
|
197
219
|
throw new common_1.BadRequestException(`Unsupported operator for date: ${op}`);
|
|
198
220
|
}
|
|
199
221
|
}
|
|
222
|
+
buildSelectCondition(attr, op, val, key) {
|
|
223
|
+
switch (op) {
|
|
224
|
+
case 'equal':
|
|
225
|
+
return { query: `e.${attr} = :${key}`, params: { [key]: val } };
|
|
226
|
+
default:
|
|
227
|
+
throw new common_1.BadRequestException(`Unsupported operator for select: ${op}`);
|
|
228
|
+
}
|
|
229
|
+
}
|
|
230
|
+
buildMultiSelectCondition(attr, val, key) {
|
|
231
|
+
if (!Array.isArray(val)) {
|
|
232
|
+
throw new common_1.BadRequestException(`Expected array for multiselect: ${attr}`);
|
|
233
|
+
}
|
|
234
|
+
return {
|
|
235
|
+
query: `e.${attr} IN (:...${key})`,
|
|
236
|
+
params: { [key]: val },
|
|
237
|
+
};
|
|
238
|
+
}
|
|
200
239
|
};
|
|
201
240
|
exports.FilterService = FilterService;
|
|
202
241
|
exports.FilterService = FilterService = __decorate([
|
|
203
242
|
(0, common_1.Injectable)(),
|
|
204
|
-
__param(
|
|
243
|
+
__param(5, (0, common_1.Inject)('SavedFilterService')),
|
|
205
244
|
__metadata("design:paramtypes", [typeorm_1.DataSource,
|
|
206
245
|
entity_master_service_1.EntityMasterService,
|
|
207
246
|
attribute_master_service_1.AttributeMasterService,
|
|
247
|
+
entity_table_service_1.EntityTableService,
|
|
248
|
+
entity_table_column_service_1.EntityTableColumnService,
|
|
208
249
|
saved_filter_service_1.SavedFilterService])
|
|
209
250
|
], FilterService);
|
|
210
251
|
//# sourceMappingURL=filter.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filter.service.js","sourceRoot":"","sources":["../../../../src/module/filter/service/filter.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAyE;AACzE,0FAA0F;AAC1F,oFAAoF;AACpF,qCAAqC;AACrC,iEAA4D;
|
|
1
|
+
{"version":3,"file":"filter.service.js","sourceRoot":"","sources":["../../../../src/module/filter/service/filter.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -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":"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"}
|
|
@@ -23,9 +23,10 @@ let ListMasterModule = class ListMasterModule {
|
|
|
23
23
|
exports.ListMasterModule = ListMasterModule;
|
|
24
24
|
exports.ListMasterModule = ListMasterModule = __decorate([
|
|
25
25
|
(0, common_1.Module)({
|
|
26
|
-
imports: [typeorm_1.TypeOrmModule.forFeature([list_master_entity_1.ListMasterData, list_master_items_entity_1.ListMasterItems]), entity_module_1.EntityModule, third_party_module_1.ThirdPartyModule, axios_1.HttpModule],
|
|
26
|
+
imports: [typeorm_1.TypeOrmModule.forFeature([list_master_entity_1.ListMasterData, list_master_items_entity_1.ListMasterItems]), (0, common_1.forwardRef)(() => entity_module_1.EntityModule), third_party_module_1.ThirdPartyModule, axios_1.HttpModule],
|
|
27
27
|
providers: [list_master_repository_1.ListMasterRepository, list_master_items_repository_1.ListMasterItemsRepository, list_master_service_1.ListMasterService],
|
|
28
|
-
controllers: [list_master_controller_1.ListMasterController]
|
|
28
|
+
controllers: [list_master_controller_1.ListMasterController],
|
|
29
|
+
exports: [list_master_service_1.ListMasterService]
|
|
29
30
|
})
|
|
30
31
|
], ListMasterModule);
|
|
31
32
|
//# sourceMappingURL=listmaster.module.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"listmaster.module.js","sourceRoot":"","sources":["../../../src/module/listmaster/listmaster.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"listmaster.module.js","sourceRoot":"","sources":["../../../src/module/listmaster/listmaster.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAoD;AACpD,6CAAgD;AAChD,oEAA6D;AAC7D,gFAAoE;AACpE,gFAA2E;AAC3E,4FAAsF;AACtF,uEAAkE;AAClE,yDAAqD;AACrD,gFAA2E;AAC3E,iFAA4E;AAC5E,yCAA2C;AAQpC,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;CAAG,CAAA;AAAnB,4CAAgB;2BAAhB,gBAAgB;IAN5B,IAAA,eAAM,EAAC;QACN,OAAO,EAAE,CAAC,uBAAa,CAAC,UAAU,CAAC,CAAC,mCAAc,EAAE,0CAAe,CAAC,CAAC,EAAC,IAAA,mBAAU,EAAC,GAAG,EAAE,CAAC,4BAAY,CAAC,EAAE,qCAAgB,EAAE,kBAAU,CAAC;QACnI,SAAS,EAAE,CAAC,6CAAoB,EAAE,wDAAyB,EAAE,uCAAiB,CAAC;QAC/E,WAAW,EAAE,CAAC,6CAAoB,CAAC;QACnC,OAAO,EAAC,CAAC,uCAAiB,CAAC;KAC5B,CAAC;GACW,gBAAgB,CAAG"}
|
|
@@ -1,16 +1,17 @@
|
|
|
1
|
-
import { EntityServiceImpl } from '../../meta/service/entity-service-impl.service';
|
|
2
1
|
import { ListMasterItemsRepository } from '../repository/list-master-items.repository';
|
|
3
2
|
import { ListMasterRepository } from '../repository/list-master.repository';
|
|
4
3
|
import { ApiRegistryService } from '../../third-party-module/service/api-registry.service';
|
|
5
4
|
import { HttpService } from '@nestjs/axios';
|
|
6
5
|
import { EntityManager } from 'typeorm';
|
|
7
|
-
|
|
6
|
+
import { EntityMasterService } from 'src/module/meta/service/entity-master.service';
|
|
7
|
+
export declare class ListMasterService {
|
|
8
8
|
private readonly entityManager;
|
|
9
|
+
private readonly entityMasterService;
|
|
9
10
|
private readonly listMasterRepo;
|
|
10
11
|
private readonly listItemsRepo;
|
|
11
12
|
private readonly apiRegistryService;
|
|
12
13
|
private readonly httpService;
|
|
13
|
-
constructor(entityManager: EntityManager, listMasterRepo: ListMasterRepository, listItemsRepo: ListMasterItemsRepository, apiRegistryService: ApiRegistryService, httpService: HttpService);
|
|
14
|
+
constructor(entityManager: EntityManager, entityMasterService: EntityMasterService, listMasterRepo: ListMasterRepository, listItemsRepo: ListMasterItemsRepository, apiRegistryService: ApiRegistryService, httpService: HttpService);
|
|
14
15
|
getDropdownOptions(type: string, params: Record<string, string>): Promise<{
|
|
15
16
|
label: any;
|
|
16
17
|
value: any;
|
|
@@ -10,7 +10,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.ListMasterService = void 0;
|
|
13
|
-
const entity_service_impl_service_1 = require("../../meta/service/entity-service-impl.service");
|
|
14
13
|
const common_1 = require("@nestjs/common");
|
|
15
14
|
const list_master_items_repository_1 = require("../repository/list-master-items.repository");
|
|
16
15
|
const list_master_repository_1 = require("../repository/list-master.repository");
|
|
@@ -18,10 +17,11 @@ const api_registry_service_1 = require("../../third-party-module/service/api-reg
|
|
|
18
17
|
const rxjs_1 = require("rxjs");
|
|
19
18
|
const axios_1 = require("@nestjs/axios");
|
|
20
19
|
const typeorm_1 = require("typeorm");
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
20
|
+
const entity_master_service_1 = require("../../meta/service/entity-master.service");
|
|
21
|
+
let ListMasterService = class ListMasterService {
|
|
22
|
+
constructor(entityManager, entityMasterService, listMasterRepo, listItemsRepo, apiRegistryService, httpService) {
|
|
24
23
|
this.entityManager = entityManager;
|
|
24
|
+
this.entityMasterService = entityMasterService;
|
|
25
25
|
this.listMasterRepo = listMasterRepo;
|
|
26
26
|
this.listItemsRepo = listItemsRepo;
|
|
27
27
|
this.apiRegistryService = apiRegistryService;
|
|
@@ -108,6 +108,7 @@ exports.ListMasterService = ListMasterService;
|
|
|
108
108
|
exports.ListMasterService = ListMasterService = __decorate([
|
|
109
109
|
(0, common_1.Injectable)(),
|
|
110
110
|
__metadata("design:paramtypes", [typeorm_1.EntityManager,
|
|
111
|
+
entity_master_service_1.EntityMasterService,
|
|
111
112
|
list_master_repository_1.ListMasterRepository,
|
|
112
113
|
list_master_items_repository_1.ListMasterItemsRepository,
|
|
113
114
|
api_registry_service_1.ApiRegistryService,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list-master.service.js","sourceRoot":"","sources":["../../../../src/module/listmaster/service/list-master.service.ts"],"names":[],"mappings":";;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"list-master.service.js","sourceRoot":"","sources":["../../../../src/module/listmaster/service/list-master.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,5 +3,7 @@ import { Response } from 'express';
|
|
|
3
3
|
export declare class MetaController {
|
|
4
4
|
private readonly entityTableService;
|
|
5
5
|
constructor(entityTableService: EntityTableService);
|
|
6
|
-
getTableMetaData(entityType: string, listType: string, response: Response
|
|
6
|
+
getTableMetaData(entityType: string, listType: string, response: Response, req: Request & {
|
|
7
|
+
user: any;
|
|
8
|
+
}): Promise<Response<any, Record<string, any>>>;
|
|
7
9
|
}
|
|
@@ -20,8 +20,10 @@ let MetaController = class MetaController {
|
|
|
20
20
|
constructor(entityTableService) {
|
|
21
21
|
this.entityTableService = entityTableService;
|
|
22
22
|
}
|
|
23
|
-
async getTableMetaData(entityType, listType, response) {
|
|
24
|
-
|
|
23
|
+
async getTableMetaData(entityType, listType, response, req) {
|
|
24
|
+
const userId = req.user.userId;
|
|
25
|
+
console.log(userId);
|
|
26
|
+
let entityTableDto = await this.entityTableService.getTableMetaDataForListing(entityType, listType, userId);
|
|
25
27
|
return response.status(common_1.HttpStatus.OK).json({
|
|
26
28
|
success: true,
|
|
27
29
|
data: entityTableDto,
|
|
@@ -35,8 +37,9 @@ __decorate([
|
|
|
35
37
|
__param(0, (0, common_1.Query)('entity_type')),
|
|
36
38
|
__param(1, (0, common_1.Query)('list_type')),
|
|
37
39
|
__param(2, (0, common_1.Res)()),
|
|
40
|
+
__param(3, (0, common_1.Req)()),
|
|
38
41
|
__metadata("design:type", Function),
|
|
39
|
-
__metadata("design:paramtypes", [String, String, Object]),
|
|
42
|
+
__metadata("design:paramtypes", [String, String, Object, Object]),
|
|
40
43
|
__metadata("design:returntype", Promise)
|
|
41
44
|
], MetaController.prototype, "getTableMetaData", null);
|
|
42
45
|
exports.MetaController = MetaController = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"meta.controller.js","sourceRoot":"","sources":["../../../../src/module/meta/controller/meta.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"meta.controller.js","sourceRoot":"","sources":["../../../../src/module/meta/controller/meta.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA0F;AAC1F,0EAAqE;AAErE,2DAA2D;AAIpD,IAAM,cAAc,GAApB,MAAM,cAAc;IACzB,YAA6B,kBAAsC;QAAtC,uBAAkB,GAAlB,kBAAkB,CAAoB;IAAG,CAAC;IAGjE,AAAN,KAAK,CAAC,gBAAgB,CAAuB,UAAkB,EACpB,QAAgB,EAC7B,QAAkB,EACnB,GAA4B;QACjC,MAAM,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC;QAC/B,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;QACzC,IAAI,cAAc,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,0BAA0B,CAAC,UAAU,EAAE,QAAQ,EAAC,MAAM,CAAC,CAAC;QAC3G,OAAO,QAAQ,CAAC,MAAM,CAAC,mBAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC;YACzC,OAAO,EAAE,IAAI;YACb,IAAI,EAAE,cAAc;YACpB,OAAO,EAAE,0BAA0B;SACpC,CAAC,CAAA;IACJ,CAAC;CACF,CAAA;AAjBY,wCAAc;AAInB;IADL,IAAA,aAAI,EAAC,gBAAgB,CAAC;IACC,WAAA,IAAA,cAAK,EAAC,aAAa,CAAC,CAAA;IACpB,WAAA,IAAA,cAAK,EAAC,WAAW,CAAC,CAAA;IAClB,WAAA,IAAA,YAAG,GAAE,CAAA;IACN,WAAA,IAAA,YAAG,GAAE,CAAA;;;;sDAS3B;yBAhBU,cAAc;IAF1B,IAAA,mBAAU,EAAC,MAAM,CAAC;IAClB,IAAA,kBAAS,EAAC,wBAAY,CAAC;qCAE2B,yCAAkB;GADxD,cAAc,CAiB1B"}
|
|
@@ -2,4 +2,10 @@ import { EntityTable } from '../entity/entity-table.entity';
|
|
|
2
2
|
import { EntityTableColumn } from '../entity/entity-table-column.entity';
|
|
3
3
|
export declare class EntityTableDto extends EntityTable {
|
|
4
4
|
column_list: EntityTableColumn[];
|
|
5
|
+
operation_list: {};
|
|
6
|
+
default_filter: {} | null;
|
|
7
|
+
saved_filter: {
|
|
8
|
+
label: string;
|
|
9
|
+
value: number;
|
|
10
|
+
}[] | null;
|
|
5
11
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entity-table.dto.js","sourceRoot":"","sources":["../../../../src/module/meta/dto/entity-table.dto.ts"],"names":[],"mappings":";;;AAAA,uEAA4D;AAG5D,MAAa,cAAe,SAAQ,iCAAW;
|
|
1
|
+
{"version":3,"file":"entity-table.dto.js","sourceRoot":"","sources":["../../../../src/module/meta/dto/entity-table.dto.ts"],"names":[],"mappings":";;;AAAA,uEAA4D;AAG5D,MAAa,cAAe,SAAQ,iCAAW;CAM9C;AAND,wCAMC"}
|