rez_core 2.0.0 → 2.0.2
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/enterprise/entity/enterprise.entity.d.ts +1 -1
- package/dist/module/enterprise/entity/enterprise.entity.js +2 -2
- package/dist/module/enterprise/entity/enterprise.entity.js.map +1 -1
- package/dist/module/enterprise/entity/organization.entity.d.ts +1 -1
- package/dist/module/enterprise/entity/organization.entity.js +2 -2
- package/dist/module/enterprise/entity/organization.entity.js.map +1 -1
- package/dist/module/filter/entity/saved-filter-master.entity.d.ts +0 -1
- package/dist/module/filter/entity/saved-filter-master.entity.js +0 -4
- package/dist/module/filter/entity/saved-filter-master.entity.js.map +1 -1
- package/dist/module/master/service/master.service.js +31 -15
- package/dist/module/master/service/master.service.js.map +1 -1
- package/dist/module/meta/controller/entity.controller.d.ts +1 -1
- package/dist/module/meta/controller/entity.controller.js +14 -11
- package/dist/module/meta/controller/entity.controller.js.map +1 -1
- package/dist/module/meta/entity/entity-table-column.entity.d.ts +0 -1
- package/dist/module/meta/entity/entity-table-column.entity.js +0 -4
- package/dist/module/meta/entity/entity-table-column.entity.js.map +1 -1
- package/dist/module/meta/entity/entity-table.entity.d.ts +0 -1
- package/dist/module/meta/entity/entity-table.entity.js +0 -4
- package/dist/module/meta/entity/entity-table.entity.js.map +1 -1
- package/dist/module/meta/service/entity-list.service.d.ts +2 -2
- package/dist/module/meta/service/entity-list.service.js +18 -7
- package/dist/module/meta/service/entity-list.service.js.map +1 -1
- package/dist/module/meta/service/entity-service-impl.service.d.ts +3 -3
- package/dist/module/meta/service/entity-service-impl.service.js +4 -4
- package/dist/module/meta/service/entity-service-impl.service.js.map +1 -1
- package/dist/module/meta/service/entity.service.d.ts +2 -2
- package/dist/module/module/controller/menu.controller.js +2 -1
- package/dist/module/module/controller/menu.controller.js.map +1 -1
- package/dist/module/module/controller/module-access.controller.d.ts +5 -5
- package/dist/module/module/controller/module-access.controller.js +30 -17
- package/dist/module/module/controller/module-access.controller.js.map +1 -1
- package/dist/module/module/entity/menu.entity.d.ts +1 -0
- package/dist/module/module/entity/menu.entity.js +4 -0
- package/dist/module/module/entity/menu.entity.js.map +1 -1
- package/dist/module/module/entity/module-access.entity.d.ts +1 -1
- package/dist/module/module/entity/module-access.entity.js +1 -1
- package/dist/module/module/entity/module-access.entity.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/module/module/repository/menu.repository.d.ts +3 -3
- package/dist/module/module/repository/menu.repository.js +12 -8
- package/dist/module/module/repository/menu.repository.js.map +1 -1
- package/dist/module/module/repository/module-access.repository.d.ts +10 -6
- package/dist/module/module/repository/module-access.repository.js +45 -29
- package/dist/module/module/repository/module-access.repository.js.map +1 -1
- package/dist/module/module/service/menu.service.d.ts +1 -1
- package/dist/module/module/service/menu.service.js +4 -4
- package/dist/module/module/service/menu.service.js.map +1 -1
- package/dist/module/module/service/module-access.service.d.ts +9 -5
- package/dist/module/module/service/module-access.service.js +12 -10
- package/dist/module/module/service/module-access.service.js.map +1 -1
- package/dist/module/user/dto/create-user.dto.d.ts +1 -0
- package/dist/module/user/dto/create-user.dto.js.map +1 -1
- package/dist/module/user/entity/role.entity.d.ts +0 -1
- package/dist/module/user/entity/role.entity.js +0 -4
- package/dist/module/user/entity/role.entity.js.map +1 -1
- package/dist/module/user/entity/user-role-mapping.entity.d.ts +1 -0
- package/dist/module/user/entity/user-role-mapping.entity.js +4 -0
- package/dist/module/user/entity/user-role-mapping.entity.js.map +1 -1
- package/dist/module/user/service/role.service.d.ts +1 -1
- package/dist/module/user/service/role.service.js +6 -3
- package/dist/module/user/service/role.service.js.map +1 -1
- package/dist/module/user/service/user.service.d.ts +1 -1
- package/dist/module/user/service/user.service.js +4 -1
- package/dist/module/user/service/user.service.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/module/enterprise/entity/enterprise.entity.ts +2 -2
- package/src/module/enterprise/entity/organization.entity.ts +2 -2
- package/src/module/filter/entity/saved-filter-master.entity.ts +0 -3
- package/src/module/master/service/master.service.ts +31 -15
- package/src/module/meta/controller/entity.controller.ts +27 -12
- package/src/module/meta/entity/entity-table-column.entity.ts +1 -2
- package/src/module/meta/entity/entity-table.entity.ts +0 -2
- package/src/module/meta/service/entity-list.service.ts +29 -7
- package/src/module/meta/service/entity-service-impl.service.ts +29 -17
- package/src/module/meta/service/entity.service.ts +2 -1
- package/src/module/module/controller/menu.controller.ts +2 -1
- package/src/module/module/controller/module-access.controller.ts +49 -22
- package/src/module/module/entity/menu.entity.ts +3 -0
- package/src/module/module/entity/module-access.entity.ts +1 -1
- package/src/module/module/entity/module.entity.ts +3 -0
- package/src/module/module/repository/menu.repository.ts +48 -43
- package/src/module/module/repository/module-access.repository.ts +69 -50
- package/src/module/module/service/menu.service.ts +4 -4
- package/src/module/module/service/module-access.service.ts +15 -13
- package/src/module/user/dto/create-user.dto.ts +1 -0
- package/src/module/user/entity/role.entity.ts +0 -3
- package/src/module/user/entity/user-role-mapping.entity.ts +3 -0
- package/src/module/user/service/role.service.ts +7 -3
- package/src/module/user/service/user.service.ts +4 -0
|
@@ -51,9 +51,9 @@ __decorate([
|
|
|
51
51
|
__metadata("design:type", Date)
|
|
52
52
|
], EnterpriseData.prototype, "modified_date", void 0);
|
|
53
53
|
__decorate([
|
|
54
|
-
(0, typeorm_1.Column)({ name: '
|
|
54
|
+
(0, typeorm_1.Column)({ name: 'appcode', type: 'varchar', nullable: true, length: 50 }),
|
|
55
55
|
__metadata("design:type", String)
|
|
56
|
-
], EnterpriseData.prototype, "
|
|
56
|
+
], EnterpriseData.prototype, "appcode", void 0);
|
|
57
57
|
__decorate([
|
|
58
58
|
(0, typeorm_1.Column)({ name: 'app_url_name', type: 'varchar', nullable: true, length: 50 }),
|
|
59
59
|
__metadata("design:type", String)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"enterprise.entity.js","sourceRoot":"","sources":["../../../../src/module/enterprise/entity/enterprise.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAiE;AAG1D,IAAM,cAAc,GAApB,MAAM,cAAc;CAiC1B,CAAA;AAjCY,wCAAc;AAEzB;IADC,IAAA,gCAAsB,EAAC,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;;0CAC5C;AAGX;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;;mDACzD;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;;4CACzD;AAGb;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;;4CACzD;AAGb;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;;8CACzD;AAGf;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;kDACzC;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mDACzC;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACrD,IAAI;oDAAC;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACrD,IAAI;qDAAC;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"enterprise.entity.js","sourceRoot":"","sources":["../../../../src/module/enterprise/entity/enterprise.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAiE;AAG1D,IAAM,cAAc,GAApB,MAAM,cAAc;CAiC1B,CAAA;AAjCY,wCAAc;AAEzB;IADC,IAAA,gCAAsB,EAAC,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;;0CAC5C;AAGX;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;;mDACzD;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;;4CACzD;AAGb;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;;4CACzD;AAGb;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;;8CACzD;AAGf;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;kDACzC;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mDACzC;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACrD,IAAI;oDAAC;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACrD,IAAI;qDAAC;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;;+CACzD;AAGhB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;;oDACzD;yBAhCV,cAAc;IAD1B,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,eAAe,EAAE,CAAC;GACrB,cAAc,CAiC1B"}
|
|
@@ -27,9 +27,9 @@ __decorate([
|
|
|
27
27
|
__metadata("design:type", String)
|
|
28
28
|
], OrganizationData.prototype, "code", void 0);
|
|
29
29
|
__decorate([
|
|
30
|
-
(0, typeorm_1.Column)({ name: '
|
|
30
|
+
(0, typeorm_1.Column)({ name: 'appcode', nullable: true }),
|
|
31
31
|
__metadata("design:type", String)
|
|
32
|
-
], OrganizationData.prototype, "
|
|
32
|
+
], OrganizationData.prototype, "appcode", void 0);
|
|
33
33
|
__decorate([
|
|
34
34
|
(0, typeorm_1.Column)({ name: 'name', nullable: true }),
|
|
35
35
|
__metadata("design:type", String)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"organization.entity.js","sourceRoot":"","sources":["../../../../src/module/enterprise/entity/organization.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAiE;AAG1D,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;CA4E5B,CAAA;AA5EY,4CAAgB;AAE3B;IADC,IAAA,gCAAsB,EAAC,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;;4CACzC;AAGX;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;;uDACzB;AAGtB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;8CAC5B;AAGb;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"organization.entity.js","sourceRoot":"","sources":["../../../../src/module/enterprise/entity/organization.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAiE;AAG1D,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;CA4E5B,CAAA;AA5EY,4CAAgB;AAE3B;IADC,IAAA,gCAAsB,EAAC,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;;4CACzC;AAGX;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;;uDACzB;AAGtB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;8CAC5B;AAGb;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;iDAC5B;AAGhB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;8CAC5B;AAGb;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDAC7C;AAGf;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDAC5B;AAGf;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,YAAY,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;oDAC5B;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,aAAa,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;qDAC5B;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,cAAc,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACnC,IAAI;sDAAC;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mDAC5B;AAGlB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,eAAe,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACnC,IAAI;uDAAC;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;wDAC5B;AAGvB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;iDAC1B;AAGhB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,aAAa,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;qDAC5B;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,sBAAsB,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;8DAC5B;AAG7B;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;iDAC5B;AAGhB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+CAC5B;AAGd;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,oBAAoB,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;4DAC5B;AAG3B;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,oBAAoB,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;4DAC5B;AAG3B;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,mBAAmB,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2DAC5B;AAG1B;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,wBAAwB,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;8DAC9B;AAG7B;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,qBAAqB,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gEACzB;AAO/B;IALC,IAAA,gBAAM,EAAC;QACN,IAAI,EAAE,mBAAmB;QACzB,IAAI,EAAE,SAAS;QACf,QAAQ,EAAE,IAAI;KACf,CAAC;;2DACwB;2BA3Ef,gBAAgB;IAD5B,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,iBAAiB,EAAE,CAAC;GACvB,gBAAgB,CA4E5B"}
|
|
@@ -20,10 +20,6 @@ let SavedFilterMaster = class SavedFilterMaster extends base_entity_entity_1.Bas
|
|
|
20
20
|
}
|
|
21
21
|
};
|
|
22
22
|
exports.SavedFilterMaster = SavedFilterMaster;
|
|
23
|
-
__decorate([
|
|
24
|
-
(0, typeorm_1.Column)({ length: 50, type: 'varchar', nullable: true }),
|
|
25
|
-
__metadata("design:type", String)
|
|
26
|
-
], SavedFilterMaster.prototype, "app_code", void 0);
|
|
27
23
|
__decorate([
|
|
28
24
|
(0, typeorm_1.Column)({ length: 50, type: 'varchar', nullable: true }),
|
|
29
25
|
__metadata("design:type", String)
|
|
@@ -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;CAUF,CAAA;AAdY,8CAAiB;AAO5B;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;4BAbT,iBAAiB;IAD7B,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,wBAAwB,EAAE,CAAC;;GAC9B,iBAAiB,CAc7B"}
|
|
@@ -219,17 +219,27 @@ let MasterService = class MasterService {
|
|
|
219
219
|
});
|
|
220
220
|
continue;
|
|
221
221
|
}
|
|
222
|
+
const existingError = errors.find((e) => e.row === i + 1);
|
|
222
223
|
if (refData[0].organization_id !== loggedInUser.organization_id) {
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
{
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
224
|
+
if (existingError) {
|
|
225
|
+
existingError.errors.push({
|
|
226
|
+
field: attr.name,
|
|
227
|
+
message: `Reference entity not found for code: ${row[attr.attribute_key]} does not belong to the organization`,
|
|
228
|
+
});
|
|
229
|
+
continue;
|
|
230
|
+
}
|
|
231
|
+
else {
|
|
232
|
+
errors.push({
|
|
233
|
+
row: i + 1,
|
|
234
|
+
errors: [
|
|
235
|
+
{
|
|
236
|
+
field: attr.name,
|
|
237
|
+
message: `Reference entity with code ${row[attr.attribute_key]} does not belong to the organization`,
|
|
238
|
+
},
|
|
239
|
+
],
|
|
240
|
+
});
|
|
241
|
+
continue;
|
|
242
|
+
}
|
|
233
243
|
}
|
|
234
244
|
row[attr.attribute_key] = refData[0].id;
|
|
235
245
|
}
|
|
@@ -313,18 +323,24 @@ let MasterService = class MasterService {
|
|
|
313
323
|
row.entity_type = entityType;
|
|
314
324
|
row.organization_id = loggedInUser.organization_id;
|
|
315
325
|
const rowErrors = await this.entityValidationService.validateExcelEntityData(row, entityMaster);
|
|
326
|
+
const existingError = errors.find((e) => e.row === i + 1);
|
|
316
327
|
if (rowErrors?.length > 0) {
|
|
317
|
-
|
|
318
|
-
|
|
319
|
-
|
|
320
|
-
|
|
328
|
+
if (existingError) {
|
|
329
|
+
existingError.errors.push(...rowErrors);
|
|
330
|
+
}
|
|
331
|
+
else {
|
|
332
|
+
errors.push({
|
|
333
|
+
row: i + 1,
|
|
334
|
+
errors: rowErrors,
|
|
335
|
+
});
|
|
336
|
+
}
|
|
321
337
|
}
|
|
322
338
|
}
|
|
323
339
|
if (errors.length > 0) {
|
|
324
340
|
throw new common_1.BadRequestException({
|
|
325
341
|
status: false,
|
|
326
342
|
message: `Validation errors found in the uploaded data.`,
|
|
327
|
-
|
|
343
|
+
error: errors,
|
|
328
344
|
});
|
|
329
345
|
}
|
|
330
346
|
for (const row of data) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"master.service.js","sourceRoot":"","sources":["../../../../src/module/master/service/master.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"master.service.js","sourceRoot":"","sources":["../../../../src/module/master/service/master.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,6 +15,6 @@ export declare class EntityController {
|
|
|
15
15
|
update(id: number, entityData: BaseEntity, entityType: string, response: Response, req: Request & {
|
|
16
16
|
user: any;
|
|
17
17
|
}): Promise<Response<any, Record<string, any>> | undefined>;
|
|
18
|
-
getFilterDataWithTabs(entityType: string, listType: string, res: Response, filters?: Record<string, any>, sortColumn?: string, sortOrder?: string, page?: number, size?: number, tabColumn?: string, tabValue?: string): Promise<Response<any, Record<string, any>>>;
|
|
18
|
+
getFilterDataWithTabs(entityType: string, listType: string, res: Response, req: any, filters?: Record<string, any>, sortColumn?: string, sortOrder?: string, page?: number, size?: number, tabColumn?: string, tabValue?: string): Promise<Response<any, Record<string, any>>>;
|
|
19
19
|
downloadExcel(entityType: string, listEntityType: string, displayType: string, sampleExport: boolean, filterCriteria: Record<string, any>, res: Response): Promise<Response<any, Record<string, any>> | undefined>;
|
|
20
20
|
}
|
|
@@ -40,6 +40,7 @@ let EntityController = class EntityController {
|
|
|
40
40
|
}
|
|
41
41
|
async create(entityData, entityType, res, req) {
|
|
42
42
|
let requestedUser = req.user;
|
|
43
|
+
let appcode = requestedUser.appcode;
|
|
43
44
|
let loggedInUser = await this.entityService.getEntityData(global_constant_1.ENTITYTYPE_USER, requestedUser.userId);
|
|
44
45
|
if (!entityType) {
|
|
45
46
|
throw new common_1.BadRequestException('Query parameter "entity_type" is required');
|
|
@@ -49,7 +50,7 @@ let EntityController = class EntityController {
|
|
|
49
50
|
if (entityService) {
|
|
50
51
|
return res
|
|
51
52
|
.status(common_1.HttpStatus.OK)
|
|
52
|
-
.json(await entityService.createEntity(entityData, loggedInUser));
|
|
53
|
+
.json(await entityService.createEntity(entityData, loggedInUser, null, appcode));
|
|
53
54
|
}
|
|
54
55
|
}
|
|
55
56
|
async update(id, entityData, entityType, response, req) {
|
|
@@ -68,10 +69,11 @@ let EntityController = class EntityController {
|
|
|
68
69
|
return response.status(common_1.HttpStatus.OK).json(entityData);
|
|
69
70
|
}
|
|
70
71
|
}
|
|
71
|
-
async getFilterDataWithTabs(entityType, listType, res, filters = {}, sortColumn, sortOrder, page = 0, size = 1, tabColumn, tabValue) {
|
|
72
|
+
async getFilterDataWithTabs(entityType, listType, res, req, filters = {}, sortColumn, sortOrder, page = 0, size = 1, tabColumn, tabValue) {
|
|
73
|
+
const appcode = req.user.appcode;
|
|
72
74
|
return res
|
|
73
75
|
.status(common_1.HttpStatus.OK)
|
|
74
|
-
.json(await this.entityService.getFilterDataWithTabs(entityType, listType, filters, sortColumn, sortOrder, page, size, tabColumn, tabValue));
|
|
76
|
+
.json(await this.entityService.getFilterDataWithTabs(entityType, listType, filters, sortColumn, sortOrder, page, size, tabColumn, tabValue, appcode));
|
|
75
77
|
}
|
|
76
78
|
async downloadExcel(entityType, listEntityType, displayType, sampleExport, filterCriteria, res) {
|
|
77
79
|
try {
|
|
@@ -128,15 +130,16 @@ __decorate([
|
|
|
128
130
|
__param(0, (0, common_1.Param)('entity_type')),
|
|
129
131
|
__param(1, (0, common_1.Query)('list_type')),
|
|
130
132
|
__param(2, (0, common_1.Res)()),
|
|
131
|
-
__param(3, (0, common_1.
|
|
132
|
-
__param(4, (0, common_1.
|
|
133
|
-
__param(5, (0, common_1.Query)('
|
|
134
|
-
__param(6, (0, common_1.Query)('
|
|
135
|
-
__param(7, (0, common_1.Query)('
|
|
136
|
-
__param(8, (0, common_1.Query)('
|
|
137
|
-
__param(9, (0, common_1.Query)('
|
|
133
|
+
__param(3, (0, common_1.Request)()),
|
|
134
|
+
__param(4, (0, common_1.Body)()),
|
|
135
|
+
__param(5, (0, common_1.Query)('sort_column')),
|
|
136
|
+
__param(6, (0, common_1.Query)('sort_order')),
|
|
137
|
+
__param(7, (0, common_1.Query)('page')),
|
|
138
|
+
__param(8, (0, common_1.Query)('size')),
|
|
139
|
+
__param(9, (0, common_1.Query)('tab_column')),
|
|
140
|
+
__param(10, (0, common_1.Query)('tab_value')),
|
|
138
141
|
__metadata("design:type", Function),
|
|
139
|
-
__metadata("design:paramtypes", [String, String, Object, Object, String, String, Number, Number, String, String]),
|
|
142
|
+
__metadata("design:paramtypes", [String, String, Object, Object, Object, String, String, Number, Number, String, String]),
|
|
140
143
|
__metadata("design:returntype", Promise)
|
|
141
144
|
], EntityController.prototype, "getFilterDataWithTabs", null);
|
|
142
145
|
__decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entity.controller.js","sourceRoot":"","sources":["../../../../src/module/meta/controller/entity.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"entity.controller.js","sourceRoot":"","sources":["../../../../src/module/meta/controller/entity.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,10 +20,6 @@ let EntityTableColumn = class EntityTableColumn extends base_entity_entity_1.Bas
|
|
|
20
20
|
}
|
|
21
21
|
};
|
|
22
22
|
exports.EntityTableColumn = EntityTableColumn;
|
|
23
|
-
__decorate([
|
|
24
|
-
(0, typeorm_1.Column)({ name: 'app_code', nullable: true }),
|
|
25
|
-
__metadata("design:type", String)
|
|
26
|
-
], EntityTableColumn.prototype, "app_code", void 0);
|
|
27
23
|
__decorate([
|
|
28
24
|
(0, typeorm_1.Column)({ name: 'mapped_entity_type', nullable: true }),
|
|
29
25
|
__metadata("design:type", String)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entity-table-column.entity.js","sourceRoot":"","sources":["../../../../src/module/meta/entity/entity-table-column.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uEAAiF;AACjF,qCAAyC;AACzC,6DAAkD;AAG3C,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":"entity-table-column.entity.js","sourceRoot":"","sources":["../../../../src/module/meta/entity/entity-table-column.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uEAAiF;AACjF,qCAAyC;AACzC,6DAAkD;AAG3C,IAAM,iBAAiB,GAAvB,MAAM,iBAAkB,SAAQ,+BAAU;IAC/C;QACE,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,WAAW,GAAG,8CAA4B,CAAC;IAClD,CAAC;CA4CF,CAAA;AAhDY,8CAAiB;AAS5B;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,oBAAoB,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;6DAC5B;AAG3B;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;oDAC5B;AAGlB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,YAAY,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;qDAC5B;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,cAAc,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;uDAC5B;AAGrB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mDAC5B;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,YAAY,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;qDAC5B;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,eAAe,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;wDAC5B;AAGtB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;oDAC5B;AAGlB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;oDAC5B;AAQlB;IANC,IAAA,gBAAM,EAAC;QACN,IAAI,EAAE,kBAAkB;QACxB,IAAI,EAAE,SAAS;QACf,QAAQ,EAAE,IAAI;QACd,MAAM,EAAE,EAAE;KACX,CAAC;;2DACuB;AAGzB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,iBAAiB,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;0DAC7C;AAGxB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;kDAC5B;4BA/CL,iBAAiB;IAD7B,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,wBAAwB,EAAE,CAAC;;GAC9B,iBAAiB,CAgD7B"}
|
|
@@ -20,10 +20,6 @@ let EntityTable = class EntityTable extends base_entity_entity_1.BaseEntity {
|
|
|
20
20
|
}
|
|
21
21
|
};
|
|
22
22
|
exports.EntityTable = EntityTable;
|
|
23
|
-
__decorate([
|
|
24
|
-
(0, typeorm_1.Column)({ name: 'app_code', nullable: true }),
|
|
25
|
-
__metadata("design:type", String)
|
|
26
|
-
], EntityTable.prototype, "app_code", void 0);
|
|
27
23
|
__decorate([
|
|
28
24
|
(0, typeorm_1.Column)({ name: 'mapped_entity_type', nullable: true }),
|
|
29
25
|
__metadata("design:type", String)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entity-table.entity.js","sourceRoot":"","sources":["../../../../src/module/meta/entity/entity-table.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAyC;AACzC,6DAAkD;AAClD,uEAA2E;AAGpE,IAAM,WAAW,GAAjB,MAAM,WAAY,SAAQ,+BAAU;IACzC;QACE,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,WAAW,GAAG,wCAAsB,CAAC;IAC5C,CAAC;
|
|
1
|
+
{"version":3,"file":"entity-table.entity.js","sourceRoot":"","sources":["../../../../src/module/meta/entity/entity-table.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAyC;AACzC,6DAAkD;AAClD,uEAA2E;AAGpE,IAAM,WAAW,GAAjB,MAAM,WAAY,SAAQ,+BAAU;IACzC;QACE,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,WAAW,GAAG,wCAAsB,CAAC;IAC5C,CAAC;CAyCF,CAAA;AA7CY,kCAAW;AAQtB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,oBAAoB,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;uDAC5B;AAG3B;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;8CAC5B;AAGlB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;6CAC5B;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,YAAY,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+CAC5B;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,eAAe,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;kDAC5B;AAGtB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mDAC5B;AAGvB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,aAAa,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDAC5B;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,aAAa,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDAC5B;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,YAAY,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+CAC5B;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;8CAC5B;AAGlB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,aAAa,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDAC5B;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;4CAC5B;AAGhB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,cAAc,EAAE,QAAQ,EAAE,IAAI,EAAC,CAAC;;iDAC3B;sBA5CV,WAAW;IADvB,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,iBAAiB,EAAE,CAAC;;GACvB,WAAW,CA6CvB"}
|
|
@@ -8,8 +8,8 @@ export declare class EntityListService {
|
|
|
8
8
|
private entityTableColumnService;
|
|
9
9
|
private entityManager;
|
|
10
10
|
constructor(entityTableService: EntityTableService, entityTableColumnService: EntityTableColumnService, entityManager: EntityManager);
|
|
11
|
-
getFilterDataWithTabs(entityType: string, listType: string, filters: Record<string, any>, sortColumn: string | undefined, sortOrder: string | undefined, pageNumber: number, pageSize: number, tabColumn?: string, tabValue?: string): Promise<EntityListData>;
|
|
12
|
-
getFilteredList(entityTable: EntityTable, filters: Record<string, any>, sortColumn: string | undefined, sortOrder: string | undefined, pageNumber: number | undefined, pageSize: number | undefined): Promise<any>;
|
|
11
|
+
getFilterDataWithTabs(entityType: string, listType: string, filters: Record<string, any>, sortColumn: string | undefined, sortOrder: string | undefined, pageNumber: number, pageSize: number, tabColumn?: string, tabValue?: string, appcode?: string): Promise<EntityListData>;
|
|
12
|
+
getFilteredList(entityTable: EntityTable, filters: Record<string, any>, sortColumn: string | undefined, sortOrder: string | undefined, pageNumber: number | undefined, pageSize: number | undefined, appcode?: string): Promise<any>;
|
|
13
13
|
private getTotalCount;
|
|
14
14
|
private getQuery;
|
|
15
15
|
private getWhereClause;
|
|
@@ -26,22 +26,25 @@ let EntityListService = class EntityListService {
|
|
|
26
26
|
this.entityTableColumnService = entityTableColumnService;
|
|
27
27
|
this.entityManager = entityManager;
|
|
28
28
|
}
|
|
29
|
-
async getFilterDataWithTabs(entityType, listType, filters, sortColumn, sortOrder, pageNumber, pageSize, tabColumn, tabValue) {
|
|
29
|
+
async getFilterDataWithTabs(entityType, listType, filters, sortColumn, sortOrder, pageNumber, pageSize, tabColumn, tabValue, appcode) {
|
|
30
30
|
let entityListData = new entity_list_data_dto_1.EntityListData();
|
|
31
31
|
let entityTable = await this.entityTableService.findByEntityTypeAndListType(entityType, listType);
|
|
32
32
|
if (entityTable) {
|
|
33
33
|
if (1 != entityTable.is_proc) {
|
|
34
|
-
let totalCount = await this.getTotalCount(entityTable, filters);
|
|
34
|
+
let totalCount = await this.getTotalCount(entityTable, filters, appcode);
|
|
35
35
|
entityListData.entity_tabs = totalCount;
|
|
36
36
|
if (tabColumn && tabValue) {
|
|
37
37
|
filters[tabColumn] = tabValue;
|
|
38
38
|
}
|
|
39
|
-
entityListData.entity_list = await this.getFilteredList(entityTable, filters, sortColumn, sortOrder, pageNumber, pageSize);
|
|
39
|
+
entityListData.entity_list = await this.getFilteredList(entityTable, filters, sortColumn, sortOrder, pageNumber, pageSize, appcode);
|
|
40
40
|
}
|
|
41
41
|
}
|
|
42
42
|
return entityListData;
|
|
43
43
|
}
|
|
44
|
-
async getFilteredList(entityTable, filters, sortColumn, sortOrder, pageNumber, pageSize) {
|
|
44
|
+
async getFilteredList(entityTable, filters, sortColumn, sortOrder, pageNumber, pageSize, appcode) {
|
|
45
|
+
if (appcode) {
|
|
46
|
+
filters = { ...filters, appcode };
|
|
47
|
+
}
|
|
45
48
|
let query = this.getQuery(entityTable.data_source, null);
|
|
46
49
|
let whereClause = await this.getWhereClause(entityTable, filters);
|
|
47
50
|
if (whereClause.query) {
|
|
@@ -53,9 +56,9 @@ let EntityListService = class EntityListService {
|
|
|
53
56
|
query += ` LIMIT ${pageSize} OFFSET ${pageNumber * pageSize}`;
|
|
54
57
|
return await this.entityManager.query(query, whereClause.argumentList);
|
|
55
58
|
}
|
|
56
|
-
async getTotalCount(entityTable, filters) {
|
|
59
|
+
async getTotalCount(entityTable, filters, appcode) {
|
|
57
60
|
let query = this.getQuery(entityTable.data_source, entityTable.tab_column);
|
|
58
|
-
let whereClause = await this.getWhereClause(entityTable, filters);
|
|
61
|
+
let whereClause = await this.getWhereClause(entityTable, filters, appcode);
|
|
59
62
|
if (whereClause.query) {
|
|
60
63
|
query += whereClause.query;
|
|
61
64
|
}
|
|
@@ -83,7 +86,7 @@ let EntityListService = class EntityListService {
|
|
|
83
86
|
FROM ${source}`;
|
|
84
87
|
}
|
|
85
88
|
}
|
|
86
|
-
async getWhereClause(entityTable, filterCriteria) {
|
|
89
|
+
async getWhereClause(entityTable, filterCriteria, appcode) {
|
|
87
90
|
let query = ' WHERE 1=1 ';
|
|
88
91
|
const argsObjectList = [];
|
|
89
92
|
const attributeMap = await this.entityTableColumnService.getAttributeJson(entityTable.id, entityTable.entity_type);
|
|
@@ -112,6 +115,14 @@ let EntityListService = class EntityListService {
|
|
|
112
115
|
}
|
|
113
116
|
}
|
|
114
117
|
}
|
|
118
|
+
if (appcode) {
|
|
119
|
+
query += ` AND appcode = ?`;
|
|
120
|
+
argsObjectList.push(appcode);
|
|
121
|
+
}
|
|
122
|
+
else if (filterCriteria && filterCriteria.appcode) {
|
|
123
|
+
query += ` AND appcode = ?`;
|
|
124
|
+
argsObjectList.push(filterCriteria.appcode);
|
|
125
|
+
}
|
|
115
126
|
return { query, argumentList: argsObjectList };
|
|
116
127
|
}
|
|
117
128
|
async getMaxSequenceNumber(tableName, parentType, parentId) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entity-list.service.js","sourceRoot":"","sources":["../../../../src/module/meta/service/entity-list.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,iEAA4D;AAC5D,sEAA6D;AAE7D,6CAAsD;AACtD,qCAAwC;AACxC,0DAAkD;AAClD,+EAAyE;AAGlE,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAC5B,YACU,kBAAsC,EACtC,wBAAkD,EAC3B,aAA4B;QAFnD,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,6BAAwB,GAAxB,wBAAwB,CAA0B;QAC3B,kBAAa,GAAb,aAAa,CAAe;IAC1D,CAAC;IAEJ,KAAK,CAAC,qBAAqB,CACzB,UAAkB,EAClB,QAAgB,EAChB,OAA4B,EAC5B,UAA8B,EAC9B,SAA6B,EAC7B,UAAkB,EAClB,QAAgB,EAChB,SAAkB,EAClB,QAAiB;
|
|
1
|
+
{"version":3,"file":"entity-list.service.js","sourceRoot":"","sources":["../../../../src/module/meta/service/entity-list.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,13 +18,13 @@ export declare class EntityServiceImpl implements EntityService<BaseEntity> {
|
|
|
18
18
|
protected readonly entityListService: EntityListService;
|
|
19
19
|
protected readonly loggingService: LoggingService;
|
|
20
20
|
protected readonly entityValidationService: EntityValidationService;
|
|
21
|
-
createEntity(entityData: BaseEntity, loggedInUser: UserData | null, manager?: EntityManager): Promise<any>;
|
|
21
|
+
createEntity(entityData: BaseEntity, loggedInUser: UserData | null, manager?: EntityManager | null, appcode?: string): Promise<any>;
|
|
22
22
|
deleteEntity(entityType: string, entityId: number, loggedInUserData: UserData): void;
|
|
23
23
|
findByCode(entityType: string, code: string): Promise<BaseEntity>;
|
|
24
24
|
getEntityData(entityType: string, id: number): Promise<BaseEntity | null>;
|
|
25
25
|
getEntityList(entityType: string, filters?: Record<string, any>): Promise<BaseEntity[]>;
|
|
26
|
-
updateEntity(entityData: BaseEntity, loggedInUser: UserData | null): Promise<BaseEntity>;
|
|
27
|
-
getFilterDataWithTabs(entityType: string, listType: string, filters: Record<string, any>, sortColumn: string | undefined, sortOrder: string | undefined, pageNumber: number, pageSize: number, tabColumn?: string, tabValue?: string): Promise<EntityListData>;
|
|
26
|
+
updateEntity(entityData: BaseEntity, loggedInUser: UserData | null, appcode?: string): Promise<BaseEntity>;
|
|
27
|
+
getFilterDataWithTabs(entityType: string, listType: string, filters: Record<string, any>, sortColumn: string | undefined, sortOrder: string | undefined, pageNumber: number, pageSize: number, tabColumn?: string, tabValue?: string, appcode?: string): Promise<EntityListData>;
|
|
28
28
|
generateExcelReport(entityType: string, filterCriteria: Record<string, any>, listEntityType: string, displayType: string, sampleExport: boolean): Promise<string | null>;
|
|
29
29
|
private populateExcelData;
|
|
30
30
|
private getMaxSequenceNumber;
|
|
@@ -24,7 +24,7 @@ const entity_table_column_service_1 = require("./entity-table-column.service");
|
|
|
24
24
|
const global_constant_1 = require("../../../constant/global.constant");
|
|
25
25
|
const entity_validation_service_1 = require("./entity-validation.service");
|
|
26
26
|
let EntityServiceImpl = class EntityServiceImpl {
|
|
27
|
-
async createEntity(entityData, loggedInUser, manager) {
|
|
27
|
+
async createEntity(entityData, loggedInUser, manager, appcode) {
|
|
28
28
|
if (!entityData.entity_type) {
|
|
29
29
|
throw new common_1.BadRequestException(`EntityType is missing`);
|
|
30
30
|
}
|
|
@@ -89,7 +89,7 @@ let EntityServiceImpl = class EntityServiceImpl {
|
|
|
89
89
|
});
|
|
90
90
|
return result;
|
|
91
91
|
}
|
|
92
|
-
async updateEntity(entityData, loggedInUser) {
|
|
92
|
+
async updateEntity(entityData, loggedInUser, appcode) {
|
|
93
93
|
const entityMaster = await this.entityMasterService.getEntityData(entityData.entity_type);
|
|
94
94
|
const repoService = this.reflectionHelper.getRepoService(entityMaster.entity_data_class);
|
|
95
95
|
if (!repoService) {
|
|
@@ -106,8 +106,8 @@ let EntityServiceImpl = class EntityServiceImpl {
|
|
|
106
106
|
await repoService.update(entityData.id, entityData);
|
|
107
107
|
return await repoService.findOne({ where: { id: entityData.id } });
|
|
108
108
|
}
|
|
109
|
-
async getFilterDataWithTabs(entityType, listType, filters, sortColumn, sortOrder, pageNumber, pageSize, tabColumn, tabValue) {
|
|
110
|
-
return await this.entityListService.getFilterDataWithTabs(entityType, listType, filters, sortColumn, sortOrder, pageNumber, pageSize, tabColumn, tabValue);
|
|
109
|
+
async getFilterDataWithTabs(entityType, listType, filters, sortColumn, sortOrder, pageNumber, pageSize, tabColumn, tabValue, appcode) {
|
|
110
|
+
return await this.entityListService.getFilterDataWithTabs(entityType, listType, filters, sortColumn, sortOrder, pageNumber, pageSize, tabColumn, tabValue, appcode);
|
|
111
111
|
}
|
|
112
112
|
async generateExcelReport(entityType, filterCriteria, listEntityType, displayType, sampleExport) {
|
|
113
113
|
let fileName;
|
|
@@ -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;
|
|
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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"}
|
|
@@ -3,10 +3,10 @@ import { BaseEntity } from '../entity/base-entity.entity';
|
|
|
3
3
|
import { EntityListData } from '../dto/entity-list-data.dto';
|
|
4
4
|
import { EntityManager } from 'typeorm';
|
|
5
5
|
export interface EntityService<T extends BaseEntity> {
|
|
6
|
-
createEntity(entityData: T, loggedInUser: UserData, manager?: EntityManager): Promise<BaseEntity>;
|
|
6
|
+
createEntity(entityData: T, loggedInUser: UserData, manager?: EntityManager, appcode?: string): Promise<BaseEntity>;
|
|
7
7
|
getEntityData(entityType: string, entityId: number): Promise<BaseEntity | null>;
|
|
8
8
|
getEntityList(entityType: string): Promise<BaseEntity[]>;
|
|
9
|
-
updateEntity(entityData: T, loggedInUserData: UserData): Promise<BaseEntity>;
|
|
9
|
+
updateEntity(entityData: T, loggedInUserData: UserData, app_code?: string): Promise<BaseEntity>;
|
|
10
10
|
deleteEntity(entityType: string, entityId: number, loggedInUserData: UserData): void;
|
|
11
11
|
findByCode(entityType: string, code: string): 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>;
|
|
@@ -22,7 +22,8 @@ let MenuController = class MenuController {
|
|
|
22
22
|
}
|
|
23
23
|
async getMenu(req) {
|
|
24
24
|
const userId = req.user.userId;
|
|
25
|
-
|
|
25
|
+
const appcode = req.user.appcode;
|
|
26
|
+
return this.menuService.getUserMenu(userId, appcode);
|
|
26
27
|
}
|
|
27
28
|
};
|
|
28
29
|
exports.MenuController = MenuController;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"menu.controller.js","sourceRoot":"","sources":["../../../../src/module/module/controller/menu.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAqE;AACrE,0DAAsD;AACtD,2DAAgE;AAGzD,IAAM,cAAc,GAApB,MAAM,cAAc;IACzB,YAA6B,WAAwB;QAAxB,gBAAW,GAAX,WAAW,CAAa;IAAG,CAAC;IAInD,AAAN,KAAK,CAAC,OAAO,CAAY,GAAG;QAC1B,MAAM,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC;QAC/B,OAAO,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"menu.controller.js","sourceRoot":"","sources":["../../../../src/module/module/controller/menu.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAqE;AACrE,0DAAsD;AACtD,2DAAgE;AAGzD,IAAM,cAAc,GAApB,MAAM,cAAc;IACzB,YAA6B,WAAwB;QAAxB,gBAAW,GAAX,WAAW,CAAa;IAAG,CAAC;IAInD,AAAN,KAAK,CAAC,OAAO,CAAY,GAAG;QAC1B,MAAM,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC;QAC/B,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC;QACjC,OAAO,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,MAAM,EAAC,OAAO,CAAC,CAAC;IACtD,CAAC;CACF,CAAA;AAVY,wCAAc;AAKnB;IAFL,IAAA,kBAAS,EAAC,wBAAY,CAAC;IACvB,IAAA,YAAG,GAAE;IACS,WAAA,IAAA,gBAAO,GAAE,CAAA;;;;6CAIvB;yBATU,cAAc;IAD1B,IAAA,mBAAU,EAAC,MAAM,CAAC;qCAEyB,0BAAW;GAD1C,cAAc,CAU1B"}
|