eservices-back-core 1.2.80 → 1.2.82

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.
Files changed (33) hide show
  1. package/dist/controller/close-api/view-controller.d.ts +1 -0
  2. package/dist/controller/close-api/view-controller.d.ts.map +1 -1
  3. package/dist/controller/close-api/view-controller.js +33 -0
  4. package/dist/controller/close-api/view-controller.js.map +1 -1
  5. package/dist/middleware/test-middleware.d.ts.map +1 -1
  6. package/dist/middleware/test-middleware.js +3 -1
  7. package/dist/middleware/test-middleware.js.map +1 -1
  8. package/dist/router/close/client-router.d.ts +3 -0
  9. package/dist/router/close/client-router.d.ts.map +1 -0
  10. package/dist/router/close/client-router.js +11 -0
  11. package/dist/router/close/client-router.js.map +1 -0
  12. package/dist/router/close/index.d.ts.map +1 -1
  13. package/dist/router/close/index.js +2 -0
  14. package/dist/router/close/index.js.map +1 -1
  15. package/dist/router/close/test-close-router.d.ts.map +1 -1
  16. package/dist/router/close/test-close-router.js +2 -1
  17. package/dist/router/close/test-close-router.js.map +1 -1
  18. package/dist/router/close/view-router.d.ts.map +1 -1
  19. package/dist/router/close/view-router.js +1 -0
  20. package/dist/router/close/view-router.js.map +1 -1
  21. package/dist/services/criterion-service.d.ts +20 -4
  22. package/dist/services/criterion-service.d.ts.map +1 -1
  23. package/dist/services/criterion-service.js +131 -37
  24. package/dist/services/criterion-service.js.map +1 -1
  25. package/dist/store/Store.d.ts +1 -0
  26. package/dist/store/Store.d.ts.map +1 -1
  27. package/dist/types/main.d.ts +23 -8
  28. package/dist/types/main.d.ts.map +1 -1
  29. package/dist/utils/Filter.d.ts +44 -0
  30. package/dist/utils/Filter.d.ts.map +1 -0
  31. package/dist/utils/Filter.js +110 -0
  32. package/dist/utils/Filter.js.map +1 -0
  33. package/package.json +1 -1
@@ -7,5 +7,6 @@ export default class ViewController {
7
7
  static getPresentationStatuses(req: Request, res: Response, next: any): void;
8
8
  static getRequiredDocuments(req: Request, res: Response, next: any): Promise<Response<any, Record<string, any>>>;
9
9
  static getListSettings(req: Request, res: Response, next: any): Promise<void>;
10
+ static getNavigation(req: Request, res: Response, next: any): Promise<void>;
10
11
  }
11
12
  //# sourceMappingURL=view-controller.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"view-controller.d.ts","sourceRoot":"","sources":["../../../src/controller/close-api/view-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAC,MAAM,SAAS,CAAC;AAS1C,MAAM,CAAC,OAAO,OAAO,cAAc;WAErB,UAAU,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,KAAA;WAe5C,gBAAgB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,KAAA;WAYlD,YAAY,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,KAAA;WAW9C,OAAO,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,KAAA;IAatD,MAAM,CAAC,uBAAuB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,KAAA;WA+BnD,oBAAoB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,KAAA;WA0BtD,eAAe,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,KAAA;CAkB9D"}
1
+ {"version":3,"file":"view-controller.d.ts","sourceRoot":"","sources":["../../../src/controller/close-api/view-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAC,MAAM,SAAS,CAAC;AAW1C,MAAM,CAAC,OAAO,OAAO,cAAc;WAErB,UAAU,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,KAAA;WAe5C,gBAAgB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,KAAA;WAYlD,YAAY,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,KAAA;WAW9C,OAAO,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,KAAA;IAatD,MAAM,CAAC,uBAAuB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,KAAA;WA+BnD,oBAAoB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,KAAA;WA0BtD,eAAe,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,KAAA;WAkBjD,aAAa,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,KAAA;CAkC5D"}
@@ -19,6 +19,8 @@ const api_error_1 = __importDefault(require("../../errors/api-error"));
19
19
  const get_usage_context_1 = __importDefault(require("../../utils/get-usage-context"));
20
20
  const rules_validation_service_1 = __importDefault(require("../../services/rules-validation-service"));
21
21
  const Store_1 = __importDefault(require("../../store/Store"));
22
+ const criterion_service_1 = __importDefault(require("../../services/criterion-service"));
23
+ const get_master_entities_1 = __importDefault(require("../../utils/get-master-entities"));
22
24
  class ViewController {
23
25
  static getDefault(req, res, next) {
24
26
  return __awaiter(this, void 0, void 0, function* () {
@@ -140,6 +142,37 @@ class ViewController {
140
142
  }
141
143
  });
142
144
  }
145
+ static getNavigation(req, res, next) {
146
+ return __awaiter(this, void 0, void 0, function* () {
147
+ try {
148
+ const navigation = Store_1.default.viewNavigation;
149
+ const cs = new criterion_service_1.default(req.__token);
150
+ const n = yield Promise.all(navigation.map(item => {
151
+ if (!item.criterion)
152
+ return item;
153
+ return cs.get({
154
+ entity: "Customer",
155
+ // @ts-ignore
156
+ id: req.currentContextId,
157
+ criterion: item.criterion,
158
+ preset: {
159
+ // @ts-ignore
160
+ currentContextId: req.currentContextId
161
+ },
162
+ masterEntities: (0, get_master_entities_1.default)(req)
163
+ })
164
+ .then(result => {
165
+ return result === null ? null : item;
166
+ });
167
+ }));
168
+ res.json(n.filter(a => a !== null));
169
+ }
170
+ catch (e) {
171
+ console.log(e);
172
+ next(e);
173
+ }
174
+ });
175
+ }
143
176
  }
144
177
  exports.default = ViewController;
145
178
  //# sourceMappingURL=view-controller.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"view-controller.js","sourceRoot":"","sources":["../../../src/controller/close-api/view-controller.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"view-controller.js","sourceRoot":"","sources":["../../../src/controller/close-api/view-controller.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"test-middleware.d.ts","sourceRoot":"","sources":["../../src/middleware/test-middleware.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAC,MAAM,SAAS,CAAC;8BAKrB,OAAO,OAAO,QAAQ;AAA3C,wBAkBC"}
1
+ {"version":3,"file":"test-middleware.d.ts","sourceRoot":"","sources":["../../src/middleware/test-middleware.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAC,MAAM,SAAS,CAAC;8BAKrB,OAAO,OAAO,QAAQ;AAA3C,wBAoBC"}
@@ -11,7 +11,9 @@ exports.default = (req, res, next) => {
11
11
  const state = store_1.store.getState();
12
12
  const accessToken = req.__token = state.token;
13
13
  const payload = (0, jwt_decode_1.default)(accessToken);
14
- req.session.currentContextId = (0, get_current_context_from_request_1.default)(req);
14
+ req.session.currentContextId = (0, get_current_context_from_request_1.default)(req) || Number(payload["AppRegister.Claim.PersonId"]);
15
+ // @ts-ignore
16
+ req.currentContextId = (0, get_current_context_from_request_1.default)(req) || Number(payload["AppRegister.Claim.PersonId"]);
15
17
  // @ts-ignore
16
18
  req.oidc = {
17
19
  user: payload
@@ -1 +1 @@
1
- {"version":3,"file":"test-middleware.js","sourceRoot":"","sources":["../../src/middleware/test-middleware.ts"],"names":[],"mappings":";;;;;AAKA,4DAAmC;AACnC,oCAA+B;AAC/B,iHAAqF;AAErF,kBAAe,CAAC,GAAY,EAAE,GAAa,EAAE,IAAI,EAAE,EAAE;IACpD,IAAI;QACH,MAAM,KAAK,GAAG,aAAK,CAAC,QAAQ,EAAE,CAAC;QAE/B,MAAM,WAAW,GAAG,GAAG,CAAC,OAAO,GAAG,KAAK,CAAC,KAAK,CAAC;QAC9C,MAAM,OAAO,GAAG,IAAA,oBAAS,EAAC,WAAW,CAAC,CAAC;QACvC,GAAG,CAAC,OAAO,CAAC,gBAAgB,GAAG,IAAA,0CAA4B,EAAC,GAAG,CAAC,CAAC;QACjE,aAAa;QACb,GAAG,CAAC,IAAI,GAAG;YACV,IAAI,EAAE,OAAO;SACb,CAAA;QACD,GAAG,CAAC,OAAO,CAAC,WAAW,GAAI,WAAW,CAAC;QACvC,GAAG,CAAC,OAAO,CAAC,MAAM,GAAS,OAAO,CAAC,0BAA0B,CAAC,CAAC;QAC/D,GAAG,CAAC,OAAO,CAAC,QAAQ,GAAO,OAAO,CAAC,4BAA4B,CAAC,CAAC;QACjE,IAAI,EAAE,CAAC;KACP;IAAC,OAAO,CAAC,EAAE;QACX,IAAI,CAAC,CAAC,CAAC,CAAC;KACR;AACF,CAAC,CAAA"}
1
+ {"version":3,"file":"test-middleware.js","sourceRoot":"","sources":["../../src/middleware/test-middleware.ts"],"names":[],"mappings":";;;;;AAKA,4DAAmC;AACnC,oCAA+B;AAC/B,iHAAqF;AAErF,kBAAe,CAAC,GAAY,EAAE,GAAa,EAAE,IAAI,EAAE,EAAE;IACpD,IAAI;QACH,MAAM,KAAK,GAAG,aAAK,CAAC,QAAQ,EAAE,CAAC;QAE/B,MAAM,WAAW,GAAG,GAAG,CAAC,OAAO,GAAG,KAAK,CAAC,KAAK,CAAC;QAC9C,MAAM,OAAO,GAAG,IAAA,oBAAS,EAAC,WAAW,CAAC,CAAC;QACvC,GAAG,CAAC,OAAO,CAAC,gBAAgB,GAAG,IAAA,0CAA4B,EAAC,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,4BAA4B,CAAC,CAAC,CAAC;QAClH,aAAa;QACb,GAAG,CAAC,gBAAgB,GAAG,IAAA,0CAA4B,EAAC,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,4BAA4B,CAAC,CAAC,CAAC;QAC1G,aAAa;QACb,GAAG,CAAC,IAAI,GAAG;YACV,IAAI,EAAE,OAAO;SACb,CAAA;QACD,GAAG,CAAC,OAAO,CAAC,WAAW,GAAI,WAAW,CAAC;QACvC,GAAG,CAAC,OAAO,CAAC,MAAM,GAAS,OAAO,CAAC,0BAA0B,CAAC,CAAC;QAC/D,GAAG,CAAC,OAAO,CAAC,QAAQ,GAAO,OAAO,CAAC,4BAA4B,CAAC,CAAC;QACjE,IAAI,EAAE,CAAC;KACP;IAAC,OAAO,CAAC,EAAE;QACX,IAAI,CAAC,CAAC,CAAC,CAAC;KACR;AACF,CAAC,CAAA"}
@@ -0,0 +1,3 @@
1
+ declare const ClientRouter: import("express-serve-static-core").Router;
2
+ export default ClientRouter;
3
+ //# sourceMappingURL=client-router.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"client-router.d.ts","sourceRoot":"","sources":["../../../src/router/close/client-router.ts"],"names":[],"mappings":"AAEA,QAAA,MAAM,YAAY,4CAAmB,CAAC;AAItC,eAAe,YAAY,CAAC"}
@@ -0,0 +1,11 @@
1
+ "use strict";
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
4
+ };
5
+ Object.defineProperty(exports, "__esModule", { value: true });
6
+ const express_1 = __importDefault(require("express"));
7
+ const view_controller_1 = __importDefault(require("../../controller/close-api/view-controller"));
8
+ const ClientRouter = express_1.default.Router();
9
+ ClientRouter.get("/navigation", view_controller_1.default.getNavigation);
10
+ exports.default = ClientRouter;
11
+ //# sourceMappingURL=client-router.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"client-router.js","sourceRoot":"","sources":["../../../src/router/close/client-router.ts"],"names":[],"mappings":";;;;;AAAA,sDAA8B;AAC9B,iGAAwE;AACxE,MAAM,YAAY,GAAG,iBAAO,CAAC,MAAM,EAAE,CAAC;AAEtC,YAAY,CAAC,GAAG,CAAC,aAAa,EAAE,yBAAc,CAAC,aAAa,CAAC,CAAA;AAE7D,kBAAe,YAAY,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/router/close/index.ts"],"names":[],"mappings":";AAkBA,wBA2DE"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/router/close/index.ts"],"names":[],"mappings":";AAmBA,wBA4DE"}
@@ -18,6 +18,7 @@ const Server_1 = __importDefault(require("../../Server"));
18
18
  const rules_validator_router_1 = __importDefault(require("./rules-validator-router"));
19
19
  const audit_router_1 = __importDefault(require("./audit-router"));
20
20
  const executors_route_1 = __importDefault(require("./executors-route"));
21
+ const client_router_1 = __importDefault(require("./client-router"));
21
22
  exports.default = () => {
22
23
  const server = Server_1.default.getServer();
23
24
  const closeRouter = express_1.default.Router();
@@ -31,6 +32,7 @@ exports.default = () => {
31
32
  closeRouter.get("/graph", close_api_controller_1.default.request);
32
33
  closeRouter.use('/metadata', metadata_route_1.default);
33
34
  closeRouter.use('/views', view_router_1.default);
35
+ closeRouter.use('/client', client_router_1.default);
34
36
  closeRouter.use('/actions', actions_route_1.default);
35
37
  closeRouter.use('/audits', audit_router_1.default);
36
38
  closeRouter.use('/communications', communication_router_1.default);
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/router/close/index.ts"],"names":[],"mappings":";;;;;AAAA,sDAA8B;AAC9B,iGAAuE;AAEvE,iEAA2D;AAC3D,sEAA6C;AAC7C,oEAA2C;AAC3C,gEAAuC;AAEvC,kFAAyD;AACzD,gEAAsC;AACtC,gFAAuD;AACvD,sEAA6C;AAC7C,oEAA2C;AAC3C,0DAAkC;AAClC,sFAA4D;AAC5D,kEAAyC;AACzC,wEAA+C;AAE/C,kBAAe,GAAG,EAAE;IACnB,MAAM,MAAM,GAAG,gBAAM,CAAC,SAAS,EAAE,CAAC;IAClC,MAAM,WAAW,GAAG,iBAAO,CAAC,MAAM,EAAE,CAAC;IAErC,WAAW,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;QACjC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IACvB,CAAC,CAAC,CAAA;IAEF,WAAW,CAAC,GAAG,CAAC,iBAAiB,EAAE,8BAAkB,CAAC,cAAc,CAAC,CAAA;IACrE,WAAW,CAAC,GAAG,CAAC,iBAAiB,EAAE,8BAAkB,CAAC,cAAc,CAAC,CAAA;IAGrE,WAAW,CAAC,IAAI,CAAC,SAAS,EAAE,8BAAkB,CAAC,OAAO,CAAC,CAAC;IACxD,WAAW,CAAC,IAAI,CAAC,QAAQ,EAAE,8BAAkB,CAAC,OAAO,CAAC,CAAC;IACvD,WAAW,CAAC,GAAG,CAAC,QAAQ,EAAE,8BAAkB,CAAC,OAAO,CAAC,CAAC;IAEtD,WAAW,CAAC,GAAG,CAAC,WAAW,EAAE,wBAAa,CAAC,CAAC;IAC5C,WAAW,CAAC,GAAG,CAAC,QAAQ,EAAE,qBAAS,CAAC,CAAC;IAErC,WAAW,CAAC,GAAG,CAAC,UAAU,EAAG,uBAAY,CAAC,CAAC;IAC3C,WAAW,CAAC,GAAG,CAAC,SAAS,EAAG,sBAAW,CAAC,CAAC;IACzC,WAAW,CAAC,GAAG,CAAC,iBAAiB,EAAE,8BAAmB,CAAC,CAAC;IACxD,WAAW,CAAC,GAAG,CAAC,mBAAmB,EAAE,gCAAoB,CAAC,CAAC;IAE3D,WAAW,CAAC,GAAG,CAAC,YAAY,EAAE,yBAAc,CAAC,CAAA;IAE7C,WAAW,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAA,6CAAqB,EAAC;QAC/C,MAAM,EAAE,GAAG,MAAM,CAAC,MAAM,YAAY;QACpC,YAAY,EAAE,IAAI;QAClB,WAAW,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE;YAC1B,OAAO,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;QACvC,CAAC;QACD,UAAU,EAAE,CAAC,CAAC,QAAQ,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;YACnC,aAAa;YACb,QAAQ,CAAC,SAAS,CAAC,eAAe,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;YACjD,QAAQ,CAAC,SAAS,CAAC,QAAQ,EAAE,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAClD,CAAC,CAAC;KACF,CAAC,CAAC,CAAA;IAEH,WAAW,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAA,6CAAqB,EAAC;QAC/C,MAAM,EAAE,GAAG,MAAM,CAAC,MAAM,MAAM;QAC9B,YAAY,EAAE,IAAI;QAClB,WAAW,EAAE,CAAC,IAAI,EAAE,EAAE;YACrB,OAAO,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;QACvC,CAAC;QACD,UAAU,EAAE,CAAC,CAAC,QAAQ,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;YACnC,aAAa;YACb,QAAQ,CAAC,SAAS,CAAC,eAAe,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;YACjD,QAAQ,CAAC,SAAS,CAAC,QAAQ,EAAE,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAClD,CAAC,CAAC;KACF,CAAC,CAAC,CAAA;IAEH,WAAW,CAAC,GAAG,CAAC,OAAO,EAAE,qBAAU,CAAC,CAAC;IAErC,WAAW,CAAC,GAAG,CAAC,eAAe,EAAE,6BAAkB,CAAC,CAAC;IACrD,WAAW,CAAC,GAAG,CAAC,UAAU,EAAE,wBAAa,CAAC,CAAC;IAC3C,WAAW,CAAC,GAAG,CAAC,WAAW,EAAE,uBAAY,CAAC,CAAC;IAE3C,OAAO,WAAW,CAAC;AACpB,CAAC,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/router/close/index.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"test-close-router.d.ts","sourceRoot":"","sources":["../../../src/router/close/test-close-router.ts"],"names":[],"mappings":";AAaA,wBAyFC"}
1
+ {"version":3,"file":"test-close-router.d.ts","sourceRoot":"","sources":["../../../src/router/close/test-close-router.ts"],"names":[],"mappings":";AAaA,wBA2FC"}
@@ -77,7 +77,8 @@ exports.default = () => {
77
77
  id: Number.parseInt(id, 10),
78
78
  criterion: Store_1.default.getMetadataSettingsForEntity(entity)[parsedType],
79
79
  preset: {
80
- currentContextId: req.session.currentContextId
80
+ // @ts-ignore
81
+ currentContextId: req.currentContextId
81
82
  },
82
83
  masterEntities: (0, get_master_entities_1.default)(req)
83
84
  });
@@ -1 +1 @@
1
- {"version":3,"file":"test-close-router.js","sourceRoot":"","sources":["../../../src/router/close/test-close-router.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"test-close-router.js","sourceRoot":"","sources":["../../../src/router/close/test-close-router.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"view-router.d.ts","sourceRoot":"","sources":["../../../src/router/close/view-router.ts"],"names":[],"mappings":"AAEA,QAAA,MAAM,SAAS,4CAAmB,CAAC;AAgBnC,eAAe,SAAS,CAAC"}
1
+ {"version":3,"file":"view-router.d.ts","sourceRoot":"","sources":["../../../src/router/close/view-router.ts"],"names":[],"mappings":"AAEA,QAAA,MAAM,SAAS,4CAAmB,CAAC;AAkBnC,eAAe,SAAS,CAAC"}
@@ -15,5 +15,6 @@ ViewRoute.use(WizardRouter);
15
15
  ViewRoute.get('/required-documents', view_controller_1.default.getRequiredDocuments);
16
16
  // ViewRoute.get('/:entity' , ViewController.getDefault);
17
17
  ViewRoute.get('/list/configs', view_controller_1.default.getListSettings);
18
+ ViewRoute.get('/navigation', view_controller_1.default.getNavigation);
18
19
  exports.default = ViewRoute;
19
20
  //# sourceMappingURL=view-router.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"view-router.js","sourceRoot":"","sources":["../../../src/router/close/view-router.ts"],"names":[],"mappings":";;;;;AAAA,sDAA8B;AAC9B,iGAAwE;AACxE,MAAM,SAAS,GAAG,iBAAO,CAAC,MAAM,EAAE,CAAC;AAEnC,MAAM,YAAY,GAAG,iBAAO,CAAC,MAAM,EAAE,CAAC;AAEtC,YAAY,CAAC,KAAK,CAAC,kCAAkC,CAAC;KACpD,GAAG,CAAC,yBAAc,CAAC,gBAAgB,CAAC;KACpC,IAAI,CAAC,yBAAc,CAAC,YAAY,CAAC;KACjC,GAAG,CAAC,yBAAc,CAAC,OAAO,CAAC,CAAA;AAG7B,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;AAE5B,SAAS,CAAC,GAAG,CAAC,qBAAqB,EAAE,yBAAc,CAAC,oBAAoB,CAAC,CAAA;AACzE,2DAA2D;AAC3D,SAAS,CAAC,GAAG,CAAC,eAAe,EAAE,yBAAc,CAAC,eAAe,CAAC,CAAA;AAE9D,kBAAe,SAAS,CAAC"}
1
+ {"version":3,"file":"view-router.js","sourceRoot":"","sources":["../../../src/router/close/view-router.ts"],"names":[],"mappings":";;;;;AAAA,sDAA8B;AAC9B,iGAAwE;AACxE,MAAM,SAAS,GAAG,iBAAO,CAAC,MAAM,EAAE,CAAC;AAEnC,MAAM,YAAY,GAAG,iBAAO,CAAC,MAAM,EAAE,CAAC;AAEtC,YAAY,CAAC,KAAK,CAAC,kCAAkC,CAAC;KACpD,GAAG,CAAC,yBAAc,CAAC,gBAAgB,CAAC;KACpC,IAAI,CAAC,yBAAc,CAAC,YAAY,CAAC;KACjC,GAAG,CAAC,yBAAc,CAAC,OAAO,CAAC,CAAA;AAG7B,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;AAE5B,SAAS,CAAC,GAAG,CAAC,qBAAqB,EAAE,yBAAc,CAAC,oBAAoB,CAAC,CAAA;AACzE,2DAA2D;AAC3D,SAAS,CAAC,GAAG,CAAC,eAAe,EAAE,yBAAc,CAAC,eAAe,CAAC,CAAC;AAE/D,SAAS,CAAC,GAAG,CAAC,aAAa,EAAE,yBAAc,CAAC,aAAa,CAAC,CAAA;AAE1D,kBAAe,SAAS,CAAC"}
@@ -1,5 +1,5 @@
1
1
  import InterfaceAuthService from "./interface-auth-service";
2
- import { CriterionGroup, RefCriterionItem } from "../types/main";
2
+ import { CriterionGroup, CriterionItem, EqualCriterionExpression, FieldCriterionItem, IncludeCriterionExpression, NamedCriterionExpression, RefCriterionItem } from "../types/main";
3
3
  /**
4
4
  * @description Класс предназначен для получения, парсинг criterion.
5
5
  */
@@ -17,12 +17,16 @@ export default class CriterionService extends InterfaceAuthService {
17
17
  * критерий.
18
18
  */
19
19
  private generateCriterionArray;
20
+ /**
21
+ * @description Метод используется только для уточнения нахождения записи с заданными критериями в БД. Используется
22
+ * для include в criterion expression.
23
+ */
24
+ private loadExistenceEntities;
20
25
  /**
21
26
  * @description Приведённая в единый вид функция для получения значения. По умолчанию используется для получения значения
22
27
  * по имени из значений или переданного preset.
23
28
  */
24
29
  private getValue;
25
- isRefCriterionItem(item: unknown): item is RefCriterionItem;
26
30
  /**
27
31
  * @description Метод возвращает сгенерированный ОДИНОЧНый критерий.
28
32
  */
@@ -39,10 +43,14 @@ export default class CriterionService extends InterfaceAuthService {
39
43
  /**
40
44
  * @description Собирает все поля для сущностей, которые используются в конфигурации criterion
41
45
  */
42
- private parseFieldsFromCriterion;
46
+ parseFieldsFromCriterion(parsedCriterion: ParsedEntityCriterion, entities: MasterEntity[]): ParsedEntity[];
43
47
  private isNamedCriterion;
44
48
  private isFieldsCriterion;
45
49
  private isMasterCriterion;
50
+ isRefCriterionItem(item: unknown): item is RefCriterionItem;
51
+ isFieldCriterionItem(item: unknown): item is FieldCriterionItem;
52
+ isExpressionEqual(item: NamedCriterionExpression): item is EqualCriterionExpression;
53
+ isExpressionInclude(item: NamedCriterionExpression): item is IncludeCriterionExpression;
46
54
  /**
47
55
  * @description Функция проверяет, является ли предоставленное поле - константным значением. Константное значение
48
56
  * или preset должно начинаться со знака @ или $, также является не регистрозависисмым.
@@ -58,7 +66,7 @@ export default class CriterionService extends InterfaceAuthService {
58
66
  * ]
59
67
  * В будущем будет иметь вид X&Y&Z, что на AppServer будет хранится как [X][Y][Z]
60
68
  */
61
- private parseCriterion;
69
+ parseCriterion(criterion: CriterionGroup): ParsedEntityCriterion;
62
70
  private parseStringCriterion;
63
71
  }
64
72
  interface CriterionGetParams {
@@ -74,6 +82,14 @@ interface CriterionGetParams {
74
82
  masterEntities: MasterEntity[];
75
83
  preset: Record<string, any>;
76
84
  }
85
+ declare type ParsedEntityCriterion = CriterionItem[][];
86
+ declare type ParsedEntity = {
87
+ entity: string;
88
+ id?: number;
89
+ fields: string[];
90
+ filters?: Record<string, any>;
91
+ filtersHash?: string;
92
+ };
77
93
  declare type MasterEntity = [entityName: string, id: number];
78
94
  export {};
79
95
  //# sourceMappingURL=criterion-service.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"criterion-service.d.ts","sourceRoot":"","sources":["../../src/services/criterion-service.ts"],"names":[],"mappings":"AAAA,OAAO,oBAAoB,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EACN,cAAc,EAGd,gBAAgB,EAChB,MAAM,eAAe,CAAC;AAIvB;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,oBAAoB;IACjE,MAAM,CAAC,QAAQ,CAAC,YAAY,OAAM;IAElC;;;OAGG;IACH,MAAM,CAAC,QAAQ,CAAC,aAAa,OAAO;IAE9B,GAAG,CAAC,MAAM,EAAE,kBAAkB;YAWtB,iBAAiB;IAyB/B;;;OAGG;IACH,OAAO,CAAC,sBAAsB;IAsD9B;;;OAGG;IACH,OAAO,CAAC,QAAQ;IAKT,kBAAkB,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI,IAAI,gBAAgB;IAKlE;;OAEG;IACH,OAAO,CAAC,aAAa;IAIrB;;;OAGG;IACH,OAAO,CAAC,cAAc;IAatB;;OAEG;YACW,oBAAoB;IAelC;;OAEG;IACH,OAAO,CAAC,wBAAwB;IAqDhC,OAAO,CAAC,gBAAgB;IAKxB,OAAO,CAAC,iBAAiB;IAMzB,OAAO,CAAC,iBAAiB;IAOzB;;;OAGG;IACH,OAAO,CAAC,aAAa;IAIrB,OAAO,CAAC,aAAa;IAIrB;;;;;;;;OAQG;IACH,OAAO,CAAC,cAAc;IAStB,OAAO,CAAC,oBAAoB;CAG5B;AAED,UAAU,kBAAkB;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,cAAc,CAAC;IAC1B;;;;;OAKG;IACH,cAAc,EAAE,YAAY,EAAE,CAAA;IAC9B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;CAC3B;AAWD,aAAK,YAAY,GAAG,CAAC,UAAU,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,CAAC,CAAA"}
1
+ {"version":3,"file":"criterion-service.d.ts","sourceRoot":"","sources":["../../src/services/criterion-service.ts"],"names":[],"mappings":"AAAA,OAAO,oBAAoB,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EACN,cAAc,EACd,aAAa,EAAE,wBAAwB,EAAE,kBAAkB,EAAmB,0BAA0B,EACjE,wBAAwB,EAC/D,gBAAgB,EAChB,MAAM,eAAe,CAAC;AAKvB;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,oBAAoB;IACjE,MAAM,CAAC,QAAQ,CAAC,YAAY,OAAM;IAElC;;;OAGG;IACH,MAAM,CAAC,QAAQ,CAAC,aAAa,OAAO;IAE9B,GAAG,CAAC,MAAM,EAAE,kBAAkB;YAWtB,iBAAiB;IA2B/B;;;OAGG;IACH,OAAO,CAAC,sBAAsB;IAyE9B;;;OAGG;IACH,OAAO,CAAC,qBAAqB;IAmD7B;;;OAGG;IACH,OAAO,CAAC,QAAQ;IAehB;;OAEG;IACH,OAAO,CAAC,aAAa;IAIrB;;;OAGG;IACH,OAAO,CAAC,cAAc;IAatB;;OAEG;YACW,oBAAoB;IAelC;;OAEG;IACH,wBAAwB,CAAC,eAAe,EAAE,qBAAqB,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,YAAY,EAAE;IAqF1G,OAAO,CAAC,gBAAgB;IAKxB,OAAO,CAAC,iBAAiB;IAKzB,OAAO,CAAC,iBAAiB;IAMlB,kBAAkB,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI,IAAI,gBAAgB;IAK3D,oBAAoB,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI,IAAI,kBAAkB;IAM/D,iBAAiB,CAAC,IAAI,EAAE,wBAAwB,GAAG,IAAI,IAAI,wBAAwB;IAGnF,mBAAmB,CAAC,IAAI,EAAE,wBAAwB,GAAG,IAAI,IAAI,0BAA0B;IAG9F;;;OAGG;IACH,OAAO,CAAC,aAAa;IAIrB,OAAO,CAAC,aAAa;IAIrB;;;;;;;;OAQG;IACI,cAAc,CAAC,SAAS,EAAE,cAAc,GAAG,qBAAqB;IAOvE,OAAO,CAAC,oBAAoB;CAG5B;AAED,UAAU,kBAAkB;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,cAAc,CAAC;IAC1B;;;;;OAKG;IACH,cAAc,EAAE,YAAY,EAAE,CAAA;IAC9B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;CAC3B;AACD,aAAK,qBAAqB,GAAG,aAAa,EAAE,EAAE,CAAA;AAE9C,aAAK,YAAY,GAAG;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9B,WAAW,CAAC,EAAE,MAAM,CAAA;CACpB,CAAA;AAID,aAAK,YAAY,GAAG,CAAC,UAAU,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,CAAC,CAAA"}
@@ -15,6 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
15
15
  const interface_auth_service_1 = __importDefault(require("./interface-auth-service"));
16
16
  const data_service_1 = __importDefault(require("./data-service"));
17
17
  const winston_1 = require("winston");
18
+ const Filter_1 = __importDefault(require("../utils/Filter"));
18
19
  /**
19
20
  * @description Класс предназначен для получения, парсинг criterion.
20
21
  */
@@ -32,21 +33,21 @@ class CriterionService extends interface_auth_service_1.default {
32
33
  generateCriterion(parsedCriterion, preset, entities) {
33
34
  return __awaiter(this, void 0, void 0, function* () {
34
35
  const criterion = winston_1.loggers.get('criterion');
35
- // 1. Пройтись по parsedCriterion - выбрать все поля для сущностей.
36
- // Record<string, string[]>
36
+ // 1. Пройтись по parsedCriterion - выбрать все поля для идентифицированных сущностей.
37
37
  const fieldsStore = this.parseFieldsFromCriterion(parsedCriterion, entities);
38
38
  // 2. Загрузка значений с сервера для полученных полей
39
39
  const entitiesValues = yield this.loadValueForEntities(fieldsStore);
40
- if (entitiesValues.length === 0)
41
- throw new Error(`In current version you must provide least one entity to get criterion.`);
40
+ const existenceStore = yield this.loadExistenceEntities(parsedCriterion, preset);
41
+ console.log('Existence Store', existenceStore);
42
42
  criterion.info({
43
43
  entitiesValues,
44
44
  parsedCriterion,
45
- preset
45
+ preset,
46
+ existenceStore
46
47
  });
47
48
  // 3. На данном шаге у нас есть значения всех полей, теперь мы можем просто пройтись по конфигурации и составить
48
49
  // итоговый criterion.
49
- const result = this.generateCriterionArray(parsedCriterion, preset, entitiesValues, entities[0][0]);
50
+ const result = this.generateCriterionArray(parsedCriterion, preset, entitiesValues, existenceStore, entities[0][0]);
50
51
  return result;
51
52
  });
52
53
  }
@@ -54,7 +55,7 @@ class CriterionService extends interface_auth_service_1.default {
54
55
  * Продумать: если в момент получения значения для критерия нужной сущности - нет. В таком случае нужно пропускать
55
56
  * критерий.
56
57
  */
57
- generateCriterionArray(parsedCriterion, preset, entityValues, mainEntity) {
58
+ generateCriterionArray(parsedCriterion, preset, entityValues, existenceStore, mainEntity) {
58
59
  const parseArray = (array, separator, entity) => {
59
60
  const result = array
60
61
  .map(data => parse.call(this, data, entity))
@@ -81,7 +82,6 @@ class CriterionService extends interface_auth_service_1.default {
81
82
  entity = this.isMasterCriterion(elem) ? elem.masterEntity : entity;
82
83
  if (!checkEntity(entity)) {
83
84
  console.log(`[criterion-service]: Entity ${entity} hasn't treated. Please check that entity or id for current entity was provided.`);
84
- return null;
85
85
  }
86
86
  if (typeof elem === 'string')
87
87
  return this.getExpression(parseName(elem, entity), this.getValueByName(elem, getValuesByEntity(entity), preset));
@@ -89,30 +89,85 @@ class CriterionService extends interface_auth_service_1.default {
89
89
  return parse.call(this, elem.fields, entity);
90
90
  if (this.isNamedCriterion(elem)) {
91
91
  const expression = elem.expression;
92
- const equal = expression.equal;
93
- const values = getValuesByEntity(entity);
94
- if (this.getValue(equal[0], { values, preset }) === this.getValue(equal[1], { values, preset }))
95
- return elem.name;
92
+ if (this.isExpressionEqual(expression)) {
93
+ const equal = expression.equal;
94
+ if (equal.length === 2)
95
+ equal.unshift(entity);
96
+ const values = getValuesByEntity(equal[0]);
97
+ if (this.getValue({ field: equal[1] }, { values, preset }) === this.getValue(equal[2], { values, preset }))
98
+ return elem.name;
99
+ }
100
+ if (this.isExpressionInclude(expression)) {
101
+ const existenceItem = existenceStore.find(item => item.hashFilters === JSON.stringify(expression.include[1]));
102
+ console.log(JSON.stringify(expression.include[1]));
103
+ if (!existenceItem)
104
+ throw new Error(`For Include can't found item in existenceStore.`);
105
+ if (existenceItem.count > 0)
106
+ return elem.name;
107
+ }
108
+ return null;
96
109
  }
97
- return null;
110
+ throw new Error(`Unknown criterion type for item: ${JSON.stringify(elem)}`);
98
111
  }
99
112
  return parseArray(parsedCriterion, '&', mainEntity);
100
113
  }
114
+ /**
115
+ * @description Метод используется только для уточнения нахождения записи с заданными критериями в БД. Используется
116
+ * для include в criterion expression.
117
+ */
118
+ loadExistenceEntities(parsedCriterion, preset) {
119
+ const store = [];
120
+ parsedCriterion.forEach(criterionItem => {
121
+ criterionItem.forEach(item => {
122
+ if (!this.isNamedCriterion(item))
123
+ return;
124
+ const expression = item.expression;
125
+ if (!this.isExpressionInclude(expression))
126
+ return;
127
+ const include = expression.include;
128
+ const entity = include[0];
129
+ const hashFilters = JSON.stringify(include[1]);
130
+ const filters = JSON.parse(hashFilters);
131
+ Object.keys(filters).forEach(key => {
132
+ const value = filters[key];
133
+ // @ts-ignore
134
+ filters[key] = this.getValue(value, { preset });
135
+ });
136
+ store.push({
137
+ entity,
138
+ filters,
139
+ hashFilters
140
+ });
141
+ });
142
+ });
143
+ const dataService = new data_service_1.default(this.token);
144
+ return Promise.all(store.map(item => {
145
+ console.log({
146
+ filter: (0, Filter_1.default)(item.filters)
147
+ });
148
+ return dataService.getCount(item.entity, { filter: (0, Filter_1.default)(item.filters) });
149
+ })).then(result => {
150
+ result.forEach((data, index) => {
151
+ store[index].count = data.count;
152
+ });
153
+ })
154
+ .then(() => store);
155
+ }
101
156
  /**
102
157
  * @description Приведённая в единый вид функция для получения значения. По умолчанию используется для получения значения
103
158
  * по имени из значений или переданного preset.
104
159
  */
105
- getValue(fields, options) {
106
- if (this.isRefCriterionItem(fields))
107
- return fields.value;
108
- return this.getValueByName(fields, options.values, options.preset);
109
- }
110
- isRefCriterionItem(item) {
111
- if (typeof item !== "object" || item === null)
112
- return false;
113
- if (Object.prototype.hasOwnProperty.call(item, "value"))
114
- return true;
115
- return false;
160
+ getValue(data, options) {
161
+ if (this.isPresetField(data))
162
+ return this.getValueByName(data, {}, options.preset);
163
+ if (typeof data === 'string')
164
+ return data;
165
+ if (this.isRefCriterionItem(data))
166
+ return data.value;
167
+ if (this.isFieldCriterionItem(data)) {
168
+ return this.getValueByName(data.field, options.values, options.preset);
169
+ }
170
+ throw new Error(`Unknown date. Type: ${typeof data}. Data: ${data}`);
116
171
  }
117
172
  /**
118
173
  * @description Метод возвращает сгенерированный ОДИНОЧНый критерий.
@@ -128,7 +183,7 @@ class CriterionService extends interface_auth_service_1.default {
128
183
  */
129
184
  getValueByName(name, values, preset) {
130
185
  // IS PRESET NAME, Started with @ or $
131
- const resultExecForPreset = /[@$](.+)/.exec(name);
186
+ const resultExecForPreset = /^[@$](.+)/.exec(name);
132
187
  if (resultExecForPreset) {
133
188
  const presetName = resultExecForPreset[1].toLowerCase();
134
189
  if (['cci', 'currentContextId'].includes(presetName))
@@ -173,21 +228,40 @@ class CriterionService extends interface_auth_service_1.default {
173
228
  store.get(entityName).fields.push(...names);
174
229
  };
175
230
  const parseObject = (data) => {
231
+ var _a, _b;
232
+ const entity = this.isMasterCriterion(data) ? data.masterEntity : null;
176
233
  if (this.isFieldsCriterion(data))
177
- return data.fields;
234
+ return add(entity, ...data.fields);
178
235
  if (this.isNamedCriterion(data)) {
179
- const answer = [];
180
236
  // В данном случае поля expression в объекте не присутствует. Это значит, что метка будет добавлена без
181
237
  // проверки. Возвращаем пустой массив полей.
182
238
  if (!Object.prototype.hasOwnProperty.call(data, 'expression'))
183
239
  return [];
184
- // В данной реализации полей expression может хранить лишь один объект: equal.
185
- const equal = data.expression.equal;
186
- if (this.isEntityField(equal[0]))
187
- answer.push(equal[0]);
188
- if (this.isEntityField(equal[1]))
189
- answer.push(equal[1]);
190
- return answer;
240
+ if (this.isExpressionEqual(data.expression)) {
241
+ const fields = [];
242
+ const equal = data.expression.equal;
243
+ // Если у нас в массиве два элемента, то за сущность к которой относятся эти поля отвечает родительс
244
+ // кий элемент
245
+ if (equal.length === 2)
246
+ equal.unshift(entity);
247
+ // В первому случае, основное значение является именно строка как название поля
248
+ if (this.isEntityField(equal[1]))
249
+ fields.push(equal[1]);
250
+ // Во втором случае, основным значение, является именно значение.
251
+ // @ts-ignore
252
+ if ((_a = equal[2]) === null || _a === void 0 ? void 0 : _a.field)
253
+ fields.push((_b = equal[2]) === null || _b === void 0 ? void 0 : _b.field);
254
+ add(equal[0], ...fields);
255
+ }
256
+ if (this.isExpressionInclude(data.expression)) {
257
+ console.log('Found include. ');
258
+ return;
259
+ /*
260
+ const include = data.expression.include;
261
+ add(include[0], ...Object.keys(include[1]))
262
+ */
263
+ }
264
+ return;
191
265
  }
192
266
  console.log('[criterion-service] error to parse fields. Unknown object.', data);
193
267
  return [];
@@ -196,7 +270,7 @@ class CriterionService extends interface_auth_service_1.default {
196
270
  item.forEach(criterion => {
197
271
  if (typeof criterion === 'string')
198
272
  return add(null, criterion);
199
- add(this.isMasterCriterion(criterion) ? criterion.masterEntity : null, ...parseObject(criterion));
273
+ parseObject(criterion);
200
274
  });
201
275
  });
202
276
  const result = [];
@@ -220,7 +294,27 @@ class CriterionService extends interface_auth_service_1.default {
220
294
  isMasterCriterion(data) {
221
295
  if (typeof data !== 'object' || data === null)
222
296
  return false;
223
- return (Object.prototype.hasOwnProperty.call(data, 'entity'));
297
+ return (Object.prototype.hasOwnProperty.call(data, 'masterEntity'));
298
+ }
299
+ isRefCriterionItem(item) {
300
+ if (typeof item !== "object" || item === null)
301
+ return false;
302
+ if (Object.prototype.hasOwnProperty.call(item, "value"))
303
+ return true;
304
+ return false;
305
+ }
306
+ isFieldCriterionItem(item) {
307
+ if (typeof item !== "object" || item === null)
308
+ return false;
309
+ if (Object.prototype.hasOwnProperty.call(item, "field"))
310
+ return true;
311
+ return false;
312
+ }
313
+ isExpressionEqual(item) {
314
+ return Object.prototype.hasOwnProperty.call(item, 'equal');
315
+ }
316
+ isExpressionInclude(item) {
317
+ return Object.prototype.hasOwnProperty.call(item, 'include');
224
318
  }
225
319
  /**
226
320
  * @description Функция проверяет, является ли предоставленное поле - константным значением. Константное значение
@@ -229,7 +323,7 @@ class CriterionService extends interface_auth_service_1.default {
229
323
  isPresetField(fieldName) {
230
324
  if (typeof fieldName !== 'string')
231
325
  return false;
232
- return !!(/[@$](.+)/.exec(fieldName));
326
+ return !!(/^[@$](.+)/.exec(fieldName));
233
327
  }
234
328
  isEntityField(fieldName) {
235
329
  if (typeof fieldName !== 'string')
@@ -1 +1 @@
1
- {"version":3,"file":"criterion-service.js","sourceRoot":"","sources":["../../src/services/criterion-service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"criterion-service.js","sourceRoot":"","sources":["../../src/services/criterion-service.ts"],"names":[],"mappings":"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"}
@@ -44,6 +44,7 @@ export interface IViewNavigationConfig {
44
44
  */
45
45
  hide?: boolean;
46
46
  hash: string;
47
+ criterion?: any;
47
48
  }
48
49
  export interface IListSetting {
49
50
  label?: string;
@@ -1 +1 @@
1
- {"version":3,"file":"Store.d.ts","sourceRoot":"","sources":["../../src/store/Store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,EAAiB,mBAAmB,EAAE,QAAQ,EAAE,aAAa,EAAC,MAAM,eAAe,CAAC;AAK1G,cAAM,KAAK;;;IAYP,mBAAmB,CAAC,MAAM,EAAC,MAAM,EAAE,IAAI,EAAE,GAAG;IAG5C,4BAA4B,CAAC,MAAM,EAAE,MAAM;;;;;IAI3C,IAAI,YAAY,mBAEf;IAGD,IAAI,aAAa,IACO,GAAG,CADuB;IAClD,IAAI,aAAa,CAAC,IAAI,EAAE,GAAG,EAE1B;IAEK,eAAe,CAAC,KAAK,EAAE,YAAY,EAAE;IA2B3C,OAAO,CAAC,QAAQ,CAAmC;IACnD;;OAEG;IACG,YAAY,CAAC,MAAM,EAAE,MAAM;IAW3B,WAAW,CAAC,MAAM,EAAE,MAAM;IAYhC,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAY7C,IAAI,cAAc,4BAAkC;IACpD,IAAI,cAAc,CAAC,MAAM,yBAAA,EAAmC;IAI5D,IAAI,gBAAgB,gCAYnB;IACD,IAAI,oBAAoB,CAAC,OAAO,EAAE,mBAAmB,EAAE,EAEtD;CAGJ;;AACD,wBAA2B;AAE3B,MAAM,WAAW,qBAAqB;IAClC,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAG,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,qBAAqB,EAAE,CAAC;IAClC;;OAEG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;;OAEG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB;;OAEG;IACH,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,IAAI,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,YAAY;IACzB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE;QACL,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;QACzB,IAAI,CAAC,EAAE,IAAI,CAAC;QACZ,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,IAAI,CAAC,EAAE,aAAa,CAAC,UAAU,CAAC,CAAC;QACjC,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,KAAK,CAAC,EAAE,MAAM,CAAA;KACjB,EAAE,CAAC;IACJ,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,KAAK,CAAC,CAAC;IAC5C,OAAO,EAAE,GAAG,EAAE,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;CACnC;AAED,aAAK,yBAAyB,GAAG;IAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;CAAC,GAAG,mBAAmB,CAAC"}
1
+ {"version":3,"file":"Store.d.ts","sourceRoot":"","sources":["../../src/store/Store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,EAAiB,mBAAmB,EAAE,QAAQ,EAAE,aAAa,EAAC,MAAM,eAAe,CAAC;AAK1G,cAAM,KAAK;;;IAYP,mBAAmB,CAAC,MAAM,EAAC,MAAM,EAAE,IAAI,EAAE,GAAG;IAG5C,4BAA4B,CAAC,MAAM,EAAE,MAAM;;;;;IAI3C,IAAI,YAAY,mBAEf;IAGD,IAAI,aAAa,IACO,GAAG,CADuB;IAClD,IAAI,aAAa,CAAC,IAAI,EAAE,GAAG,EAE1B;IAEK,eAAe,CAAC,KAAK,EAAE,YAAY,EAAE;IA2B3C,OAAO,CAAC,QAAQ,CAAmC;IACnD;;OAEG;IACG,YAAY,CAAC,MAAM,EAAE,MAAM;IAW3B,WAAW,CAAC,MAAM,EAAE,MAAM;IAYhC,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAY7C,IAAI,cAAc,4BAAkC;IACpD,IAAI,cAAc,CAAC,MAAM,yBAAA,EAAmC;IAI5D,IAAI,gBAAgB,gCAYnB;IACD,IAAI,oBAAoB,CAAC,OAAO,EAAE,mBAAmB,EAAE,EAEtD;CAGJ;;AACD,wBAA2B;AAE3B,MAAM,WAAW,qBAAqB;IAClC,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAG,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,qBAAqB,EAAE,CAAC;IAClC;;OAEG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;;OAEG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB;;OAEG;IACH,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,GAAG,CAAA;CAClB;AAED,MAAM,WAAW,YAAY;IACzB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE;QACL,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;QACzB,IAAI,CAAC,EAAE,IAAI,CAAC;QACZ,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,IAAI,CAAC,EAAE,aAAa,CAAC,UAAU,CAAC,CAAC;QACjC,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,KAAK,CAAC,EAAE,MAAM,CAAA;KACjB,EAAE,CAAC;IACJ,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,KAAK,CAAC,CAAC;IAC5C,OAAO,EAAE,GAAG,EAAE,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;CACnC;AAED,aAAK,yBAAyB,GAAG;IAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;CAAC,GAAG,mBAAmB,CAAC"}
@@ -12,7 +12,7 @@ export interface IRequestCreateResult {
12
12
  version: number;
13
13
  }
14
14
  export interface IRequestCountResult {
15
- Count: number;
15
+ count: number;
16
16
  }
17
17
  export interface INotificationConfig {
18
18
  label: string;
@@ -105,22 +105,37 @@ export declare type MetadataResponse = Metadata & {
105
105
  };
106
106
  export interface NamedCriterion {
107
107
  name: string;
108
- "expression"?: {
109
- "equal"?: [CustomCriterionEqualItem, CustomCriterionEqualItem];
110
- };
108
+ "expression"?: NamedCriterionExpression;
111
109
  }
110
+ export declare type NamedCriterionExpression = EqualCriterionExpression | IncludeCriterionExpression;
112
111
  export declare type MasterNamedCriterion = NamedCriterion & MasterEntityCriterion;
113
112
  export interface FieldsCriterion {
114
113
  fields: string[];
115
114
  }
116
115
  export declare type MasterFieldsCriterion = FieldsCriterion & MasterEntityCriterion;
117
- export declare type CustomCriterionEqualItem = string | RefCriterionItem;
118
- export declare type RefCriterionItem = {
119
- value: string | number | null;
120
- };
121
116
  export interface MasterEntityCriterion {
122
117
  masterEntity: string;
123
118
  }
119
+ /**
120
+ * @description Тип используется для указателя в expression на поля в сущности.
121
+ */
122
+ export declare type CriterionExpressionField = string;
123
+ /**
124
+ * @description Тип используется для значения в выражениях критериев.
125
+ */
126
+ export declare type CriterionExpressionValue = CriterionExpressionField | RefCriterionItem;
127
+ export declare type RefCriterionItem = {
128
+ value: string | number | null;
129
+ };
130
+ export declare type FieldCriterionItem = {
131
+ field: string;
132
+ };
124
133
  export declare type CriterionItem = string | NamedCriterion | MasterNamedCriterion | FieldsCriterion | MasterFieldsCriterion;
125
134
  export declare type CriterionGroup = (CriterionItem | CriterionItem[])[];
135
+ export declare type EqualCriterionExpression = {
136
+ equal: [field: CriterionExpressionField, value: CriterionExpressionValue] | [entityName: string, fieldName: CriterionExpressionField, equalValue: CriterionExpressionValue];
137
+ };
138
+ export declare type IncludeCriterionExpression = {
139
+ include: [entityName: string, filters: Record<CriterionExpressionField, CriterionExpressionValue>];
140
+ };
126
141
  //# sourceMappingURL=main.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../src/types/main.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../src/types/main.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,44 @@
1
+ export interface IFilters {
2
+ [filterName: string]: IFilterDate | IFilterString | IFilterEnum | number | null;
3
+ }
4
+ /**
5
+ * @description Generate filter's string by provided input data.
6
+ * Eq,
7
+ * Nq,
8
+ * Gt,
9
+ * Ge,
10
+ * Lt,
11
+ * Le,
12
+ * And,
13
+ * Or,
14
+ * Is,
15
+ * Null,
16
+ * Not,
17
+ * In,
18
+ * Between,
19
+ * Contains,
20
+ * Like,
21
+ * BeginWith,
22
+ * EndWith
23
+ * */
24
+ declare function Filter(filters: IFilters): string;
25
+ declare namespace Filter {
26
+ export var includes: (name: string, value: string) => string;
27
+ export var beginWith: (name: string, value: string) => string;
28
+ export var notEq: (name: string, values: string | number) => string;
29
+ export var eq: (name: string, values: string | number | IFilterEnum) => string;
30
+ var _a: (name: string, values: IFilterEnum) => string;
31
+ export var and: (...expressions: string[]) => string;
32
+ export var is: (name: string, value: string) => string;
33
+ export var or: (...expressions: string[]) => string;
34
+ export { _a as in };
35
+ }
36
+ export default Filter;
37
+ export declare type IFilterNumber = number;
38
+ export declare type IFilterString = string;
39
+ export declare type IFilterEnum = Array<number | string>;
40
+ export declare type IFilterDate = {
41
+ start?: string;
42
+ end?: string;
43
+ };
44
+ //# sourceMappingURL=Filter.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"Filter.d.ts","sourceRoot":"","sources":["../../src/utils/Filter.ts"],"names":[],"mappings":"AAYA,MAAM,WAAW,QAAQ;IACrB,CAAC,UAAU,EAAE,MAAM,GAAG,WAAW,GAAG,aAAa,GAAG,WAAW,GAAG,MAAM,GAAG,IAAI,CAAA;CAClF;AACD;;;;;;;;;;;;;;;;;;;KAmBK;AACL,iBAAwB,MAAM,CAAC,OAAO,EAAE,QAAQ,UAyC/C;kBAzCuB,MAAM;;;;;;;;;;;eAAN,MAAM;AAgF9B,oBAAY,aAAa,GAAG,MAAM,CAAC;AACnC,oBAAY,aAAa,GAAG,MAAM,CAAC;AACnC,oBAAY,WAAW,GAAG,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC;AACjD,oBAAY,WAAW,GAAG;IACtB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAA;CACf,CAAA"}
@@ -0,0 +1,110 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ /**
4
+ * @description Function check provided value for data filter format.
5
+ * @example {start: '2022-10-10'}
6
+ * @example {end: '2022-10-10'}
7
+ * @example {start: '2022-10-10', end: '2022-12-10'}
8
+ */
9
+ function instanceOfDate(value) {
10
+ if (typeof value !== 'object' || value === null)
11
+ return false;
12
+ if (value.hasOwnProperty('start') || value.hasOwnProperty('end'))
13
+ return true;
14
+ return false;
15
+ }
16
+ /**
17
+ * @description Generate filter's string by provided input data.
18
+ * Eq,
19
+ * Nq,
20
+ * Gt,
21
+ * Ge,
22
+ * Lt,
23
+ * Le,
24
+ * And,
25
+ * Or,
26
+ * Is,
27
+ * Null,
28
+ * Not,
29
+ * In,
30
+ * Between,
31
+ * Contains,
32
+ * Like,
33
+ * BeginWith,
34
+ * EndWith
35
+ * */
36
+ function Filter(filters) {
37
+ return Object.keys(filters).reduce((arrayFilter, name) => {
38
+ const values = filters[name];
39
+ // Enum
40
+ if (Array.isArray(values)) {
41
+ const parsedValues = values.map(elem => {
42
+ if (typeof elem === 'string')
43
+ return `'${elem}'`;
44
+ return elem;
45
+ }).join(', ');
46
+ if (values.length)
47
+ arrayFilter.push(`@${name} in (${parsedValues})`);
48
+ return arrayFilter;
49
+ }
50
+ // Date
51
+ if (instanceOfDate(values)) {
52
+ function parseDate(data) {
53
+ var _a;
54
+ return ((_a = data.match(/([^Z]*)/)) === null || _a === void 0 ? void 0 : _a[0]) + '0000Z';
55
+ }
56
+ if (values.start)
57
+ arrayFilter.push(`@${name} ge ${parseDate(values.start)}`);
58
+ if (values.end)
59
+ arrayFilter.push(`@${name} le ${parseDate(values.end)}`);
60
+ return arrayFilter;
61
+ }
62
+ // String
63
+ if (typeof values === 'number') {
64
+ arrayFilter.push(`@${name} eq ${values}`);
65
+ return arrayFilter;
66
+ }
67
+ if (typeof values === 'string') {
68
+ if (values.length !== 0)
69
+ arrayFilter.push(`@${name} eq '${values}'`);
70
+ return arrayFilter;
71
+ }
72
+ if (values === null) {
73
+ arrayFilter.push(Filter.is(name, values));
74
+ return arrayFilter;
75
+ }
76
+ return arrayFilter;
77
+ }, []).join(" and ");
78
+ }
79
+ exports.default = Filter;
80
+ function wrapString(str) {
81
+ return typeof str === 'string' ? `'${str}'` : `${str}`;
82
+ }
83
+ Filter.includes = function includes(name, value) {
84
+ return `@${name} Contains ${wrapString(value)}`;
85
+ };
86
+ Filter.beginWith = function beginWith(name, value) {
87
+ return `@${name} BeginWith ${wrapString(value)}`;
88
+ };
89
+ Filter.notEq = function notEqual(name, values) {
90
+ return `@${name} nq ${wrapString(values)}`;
91
+ };
92
+ Filter.eq = function equal(name, values) {
93
+ if (Array.isArray(values))
94
+ return Filter.in(name, values);
95
+ return `@${name} eq ${wrapString(values)}`;
96
+ };
97
+ Filter.in = function include(name, values) {
98
+ const parsedValues = values.map(wrapString).join(', ');
99
+ return `@${name} in (${parsedValues})`;
100
+ };
101
+ Filter.and = function and(...expressions) {
102
+ return expressions.join(' and ');
103
+ };
104
+ Filter.is = function is(name, value) {
105
+ return `@${name} is ${value}`;
106
+ };
107
+ Filter.or = function or(...expressions) {
108
+ return expressions.join(' or ');
109
+ };
110
+ //# sourceMappingURL=Filter.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"Filter.js","sourceRoot":"","sources":["../../src/utils/Filter.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "eservices-back-core",
3
- "version": "1.2.80",
3
+ "version": "1.2.82",
4
4
  "description": "",
5
5
  "main": "dist/Server.js",
6
6
  "scripts": {