eservices-back-core 1.6.83 → 1.6.85
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/constants.d.ts +2 -0
- package/dist/constants.d.ts.map +1 -1
- package/dist/constants.js +3 -1
- package/dist/constants.js.map +1 -1
- package/dist/controller/close-api/view-controller.d.ts +0 -1
- package/dist/controller/close-api/view-controller.d.ts.map +1 -1
- package/dist/controller/close-api/view-controller.js +0 -26
- package/dist/controller/close-api/view-controller.js.map +1 -1
- package/dist/errors/api-error.d.ts +6 -1
- package/dist/errors/api-error.d.ts.map +1 -1
- package/dist/errors/api-error.js +8 -5
- package/dist/errors/api-error.js.map +1 -1
- package/dist/model/criterion-collector.d.ts +11 -1
- package/dist/model/criterion-collector.d.ts.map +1 -1
- package/dist/model/criterion-collector.js +52 -9
- package/dist/model/criterion-collector.js.map +1 -1
- package/dist/model/criterion.d.ts +8 -0
- package/dist/model/criterion.d.ts.map +1 -1
- package/dist/model/criterion.js +12 -2
- package/dist/model/criterion.js.map +1 -1
- package/dist/router/close/index.d.ts.map +1 -1
- package/dist/router/close/index.js +0 -2
- package/dist/router/close/index.js.map +1 -1
- package/dist/router/close/test-close-router.d.ts.map +1 -1
- package/dist/router/close/test-close-router.js +0 -2
- package/dist/router/close/test-close-router.js.map +1 -1
- package/dist/router/close/view-router.d.ts.map +1 -1
- package/dist/router/close/view-router.js +0 -1
- package/dist/router/close/view-router.js.map +1 -1
- package/dist/services/action-service.js +1 -1
- package/dist/services/action-service.js.map +1 -1
- package/dist/socket/connect-socket.js +1 -1
- package/dist/socket/connect-socket.js.map +1 -1
- package/dist/socket/core-socket-server.d.ts.map +1 -1
- package/dist/socket/core-socket-server.js +5 -1
- package/dist/socket/core-socket-server.js.map +1 -1
- package/dist/socket/events/configuration_read.d.ts.map +1 -1
- package/dist/socket/events/configuration_read.js +1 -2
- package/dist/socket/events/configuration_read.js.map +1 -1
- package/dist/socket/events/interface_navigation.d.ts +3 -0
- package/dist/socket/events/interface_navigation.d.ts.map +1 -0
- package/dist/socket/events/interface_navigation.js +107 -0
- package/dist/socket/events/interface_navigation.js.map +1 -0
- package/dist/socket/events/interface_notification.d.ts +3 -0
- package/dist/socket/events/interface_notification.d.ts.map +1 -0
- package/dist/socket/events/interface_notification.js +26 -0
- package/dist/socket/events/interface_notification.js.map +1 -0
- package/dist/socket/events/tool_execute.js +1 -1
- package/dist/socket/events/tool_execute.js.map +1 -1
- package/dist/socket/events/tool_read.d.ts.map +1 -1
- package/dist/socket/events/tool_read.js.map +1 -1
- package/dist/store/Store.d.ts +1 -8
- package/dist/store/Store.d.ts.map +1 -1
- package/dist/store/Store.js +2 -20
- package/dist/store/Store.js.map +1 -1
- package/dist/store/interface-store.d.ts +30 -0
- package/dist/store/interface-store.d.ts.map +1 -0
- package/dist/store/interface-store.js +7 -0
- package/dist/store/interface-store.js.map +1 -0
- package/dist/types/action-type.d.ts +2 -0
- package/dist/types/action-type.d.ts.map +1 -1
- package/dist/utils/nodeFetch.js +13 -7
- package/dist/utils/nodeFetch.js.map +1 -1
- package/dist/utils/use-config.d.ts.map +1 -1
- package/dist/utils/use-config.js +3 -2
- package/dist/utils/use-config.js.map +1 -1
- package/dist/utils/value-list-format.js.map +1 -1
- package/package.json +1 -1
- package/dist/auth/auth-manager.d.ts +0 -9
- package/dist/auth/auth-manager.d.ts.map +0 -1
- package/dist/auth/auth-manager.js +0 -9
- package/dist/auth/auth-manager.js.map +0 -1
- package/dist/router/close/client-router.d.ts +0 -3
- package/dist/router/close/client-router.d.ts.map +0 -1
- package/dist/router/close/client-router.js +0 -11
- package/dist/router/close/client-router.js.map +0 -1
- package/dist/socket/configuration-read-socket.d.ts +0 -2
- package/dist/socket/configuration-read-socket.d.ts.map +0 -1
- package/dist/socket/configuration-read-socket.js +0 -18
- package/dist/socket/configuration-read-socket.js.map +0 -1
- package/dist/socket/entity-count-socket.d.ts +0 -7
- package/dist/socket/entity-count-socket.d.ts.map +0 -1
- package/dist/socket/entity-count-socket.js +0 -40
- package/dist/socket/entity-count-socket.js.map +0 -1
- package/dist/socket/entity-read-socket.d.ts +0 -10
- package/dist/socket/entity-read-socket.d.ts.map +0 -1
- package/dist/socket/entity-read-socket.js +0 -57
- package/dist/socket/entity-read-socket.js.map +0 -1
- package/dist/socket/metadata-read-socket.d.ts +0 -10
- package/dist/socket/metadata-read-socket.d.ts.map +0 -1
- package/dist/socket/metadata-read-socket.js +0 -63
- package/dist/socket/metadata-read-socket.js.map +0 -1
- package/dist/store/metadata-store.d.ts +0 -6
- package/dist/store/metadata-store.d.ts.map +0 -1
- package/dist/store/metadata-store.js +0 -57
- package/dist/store/metadata-store.js.map +0 -1
package/dist/constants.d.ts
CHANGED
|
@@ -20,4 +20,6 @@ export declare const STATIC_SERVER_RESOURCE_FOLDER = "static-folder";
|
|
|
20
20
|
*/
|
|
21
21
|
export declare const SOCKET_EVENT_ERROR = "request-error";
|
|
22
22
|
export declare const OBJECT_TYPE_NAME_FIELD = "Distinguisher";
|
|
23
|
+
export declare const DEFAULT_CRITERION_VALUE = "*";
|
|
24
|
+
export declare const DEFAULT_ERROR_MESSAGE = "Sorry, we experience difficulties here.\n Please try again later or submit a feedback if problem doesn't go.";
|
|
23
25
|
//# sourceMappingURL=constants.d.ts.map
|
package/dist/constants.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,sBAAsB,IAAI,CAAC;AACxC,eAAO,MAAM,wBAAwB,OAAQ,CAAC;AAE9C,eAAO,MAAM,cAAc,UAAU,CAAC;AACtC,eAAO,MAAM,eAAe,YAAY,CAAA;AAExC,eAAO,MAAM,uBAAuB,aAAa,CAAA;AAEjD;;;GAGG;AACH,eAAO,MAAM,oBAAoB,QAAS,CAAC;AAE3C,eAAO,MAAM,gBAAgB,SAAS,CAAC;AACvC,eAAO,MAAM,eAAe,SAAS,CAAA;AAGrC;;GAEG;AACH,eAAO,MAAM,wBAAwB,KAAK,CAAA;AAE1C,eAAO,MAAM,6BAA6B,kBAAkB,CAAA;AAE5D;;GAEG;AACH,eAAO,MAAM,kBAAkB,kBAAkB,CAAC;AAElD,eAAO,MAAM,sBAAsB,kBAAkB,CAAA"}
|
|
1
|
+
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,sBAAsB,IAAI,CAAC;AACxC,eAAO,MAAM,wBAAwB,OAAQ,CAAC;AAE9C,eAAO,MAAM,cAAc,UAAU,CAAC;AACtC,eAAO,MAAM,eAAe,YAAY,CAAA;AAExC,eAAO,MAAM,uBAAuB,aAAa,CAAA;AAEjD;;;GAGG;AACH,eAAO,MAAM,oBAAoB,QAAS,CAAC;AAE3C,eAAO,MAAM,gBAAgB,SAAS,CAAC;AACvC,eAAO,MAAM,eAAe,SAAS,CAAA;AAGrC;;GAEG;AACH,eAAO,MAAM,wBAAwB,KAAK,CAAA;AAE1C,eAAO,MAAM,6BAA6B,kBAAkB,CAAA;AAE5D;;GAEG;AACH,eAAO,MAAM,kBAAkB,kBAAkB,CAAC;AAElD,eAAO,MAAM,sBAAsB,kBAAkB,CAAA;AAErD,eAAO,MAAM,uBAAuB,MAAM,CAAA;AAE1C,eAAO,MAAM,qBAAqB,yHAA0H,CAAA"}
|
package/dist/constants.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.OBJECT_TYPE_NAME_FIELD = exports.SOCKET_EVENT_ERROR = exports.STATIC_SERVER_RESOURCE_FOLDER = exports.AUTH_WAIT_PARALLEL_DELAY = exports.AUTH_DEBUG_MARK = exports.AUTH_SESSION_KEY = exports.AUTH_REQUEST_TIMEOUT = exports.FILE_NAME_BUILD_VERSION = exports.AUTH_LOGOUT_URI = exports.AUTH_LOGIN_URI = exports.SOCKET_HEARTBEAT_TIMEOUT = exports.SOCKET_HEARTBEAT_VALUE = void 0;
|
|
3
|
+
exports.DEFAULT_ERROR_MESSAGE = exports.DEFAULT_CRITERION_VALUE = exports.OBJECT_TYPE_NAME_FIELD = exports.SOCKET_EVENT_ERROR = exports.STATIC_SERVER_RESOURCE_FOLDER = exports.AUTH_WAIT_PARALLEL_DELAY = exports.AUTH_DEBUG_MARK = exports.AUTH_SESSION_KEY = exports.AUTH_REQUEST_TIMEOUT = exports.FILE_NAME_BUILD_VERSION = exports.AUTH_LOGOUT_URI = exports.AUTH_LOGIN_URI = exports.SOCKET_HEARTBEAT_TIMEOUT = exports.SOCKET_HEARTBEAT_VALUE = void 0;
|
|
4
4
|
exports.SOCKET_HEARTBEAT_VALUE = 1;
|
|
5
5
|
exports.SOCKET_HEARTBEAT_TIMEOUT = 5000;
|
|
6
6
|
exports.AUTH_LOGIN_URI = '/auth';
|
|
@@ -23,4 +23,6 @@ exports.STATIC_SERVER_RESOURCE_FOLDER = 'static-folder';
|
|
|
23
23
|
*/
|
|
24
24
|
exports.SOCKET_EVENT_ERROR = 'request-error';
|
|
25
25
|
exports.OBJECT_TYPE_NAME_FIELD = "Distinguisher";
|
|
26
|
+
exports.DEFAULT_CRITERION_VALUE = '*';
|
|
27
|
+
exports.DEFAULT_ERROR_MESSAGE = 'Sorry, we experience difficulties here.\n Please try again later or submit a feedback if problem doesn\'t go.';
|
|
26
28
|
//# sourceMappingURL=constants.js.map
|
package/dist/constants.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":";;;AACa,QAAA,sBAAsB,GAAG,CAAC,CAAC;AAC3B,QAAA,wBAAwB,GAAG,IAAK,CAAC;AAEjC,QAAA,cAAc,GAAG,OAAO,CAAC;AACzB,QAAA,eAAe,GAAG,SAAS,CAAA;AAE3B,QAAA,uBAAuB,GAAG,UAAU,CAAA;AAEjD;;;GAGG;AACU,QAAA,oBAAoB,GAAG,KAAM,CAAC;AAE9B,QAAA,gBAAgB,GAAG,MAAM,CAAC;AAC1B,QAAA,eAAe,GAAG,MAAM,CAAA;AAGrC;;GAEG;AACU,QAAA,wBAAwB,GAAG,EAAE,CAAA;AAE7B,QAAA,6BAA6B,GAAG,eAAe,CAAA;AAE5D;;GAEG;AACU,QAAA,kBAAkB,GAAG,eAAe,CAAC;AAErC,QAAA,sBAAsB,GAAG,eAAe,CAAA"}
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":";;;AACa,QAAA,sBAAsB,GAAG,CAAC,CAAC;AAC3B,QAAA,wBAAwB,GAAG,IAAK,CAAC;AAEjC,QAAA,cAAc,GAAG,OAAO,CAAC;AACzB,QAAA,eAAe,GAAG,SAAS,CAAA;AAE3B,QAAA,uBAAuB,GAAG,UAAU,CAAA;AAEjD;;;GAGG;AACU,QAAA,oBAAoB,GAAG,KAAM,CAAC;AAE9B,QAAA,gBAAgB,GAAG,MAAM,CAAC;AAC1B,QAAA,eAAe,GAAG,MAAM,CAAA;AAGrC;;GAEG;AACU,QAAA,wBAAwB,GAAG,EAAE,CAAA;AAE7B,QAAA,6BAA6B,GAAG,eAAe,CAAA;AAE5D;;GAEG;AACU,QAAA,kBAAkB,GAAG,eAAe,CAAC;AAErC,QAAA,sBAAsB,GAAG,eAAe,CAAA;AAExC,QAAA,uBAAuB,GAAG,GAAG,CAAA;AAE7B,QAAA,qBAAqB,GAAG,uHAAuH,CAAA"}
|
|
@@ -6,6 +6,5 @@ export default class ViewController {
|
|
|
6
6
|
static getPresentationStatuses(req: Request, res: Response, next: any): void;
|
|
7
7
|
static getRequiredDocuments(req: Request, res: Response, next: any): Promise<void>;
|
|
8
8
|
static getListSettings(req: Request, res: Response, next: any): Promise<void>;
|
|
9
|
-
static getNavigation(req: Request, res: Response, next: any): Promise<void>;
|
|
10
9
|
}
|
|
11
10
|
//# 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;
|
|
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;AAO1C,MAAM,CAAC,OAAO,OAAO,cAAc;WAErB,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;WAUtD,eAAe,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,KAAA;CAkB9D"}
|
|
@@ -17,9 +17,6 @@ const store_1 = require("../../store");
|
|
|
17
17
|
const api_error_1 = __importDefault(require("../../errors/api-error"));
|
|
18
18
|
const get_usage_context_1 = __importDefault(require("../../utils/get-usage-context"));
|
|
19
19
|
const Store_1 = __importDefault(require("../../store/Store"));
|
|
20
|
-
const get_master_entities_1 = __importDefault(require("../../utils/get-master-entities"));
|
|
21
|
-
const criterion_1 = __importDefault(require("../../model/criterion"));
|
|
22
|
-
const get_criterion_preset_1 = require("../../utils/get-criterion-preset");
|
|
23
20
|
class ViewController {
|
|
24
21
|
static getProcessWizard(req, res, next) {
|
|
25
22
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -115,29 +112,6 @@ class ViewController {
|
|
|
115
112
|
}
|
|
116
113
|
});
|
|
117
114
|
}
|
|
118
|
-
static getNavigation(req, res, next) {
|
|
119
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
120
|
-
try {
|
|
121
|
-
const navigation = Store_1.default.viewNavigation;
|
|
122
|
-
const n = yield Promise.all(navigation.map(item => {
|
|
123
|
-
if (!item.criterion)
|
|
124
|
-
return item;
|
|
125
|
-
const criterionObject = new criterion_1.default(item.criterion, {
|
|
126
|
-
primaryEntity: "Customer", primaryId: req.infoCurrentContextId, preset: (0, get_criterion_preset_1.getCriterionPresetFromRequest)(req),
|
|
127
|
-
masterEntities: (0, get_master_entities_1.default)(req), accessToken: req.infoAccessToken
|
|
128
|
-
});
|
|
129
|
-
return criterionObject.generate()
|
|
130
|
-
.then(result => {
|
|
131
|
-
return result === null ? null : item;
|
|
132
|
-
});
|
|
133
|
-
}));
|
|
134
|
-
res.json(n.filter(a => a !== null));
|
|
135
|
-
}
|
|
136
|
-
catch (e) {
|
|
137
|
-
next(e);
|
|
138
|
-
}
|
|
139
|
-
});
|
|
140
|
-
}
|
|
141
115
|
}
|
|
142
116
|
exports.default = ViewController;
|
|
143
117
|
//# 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":";;;;;;;;;;;;;;AACA,mGAAyE;AACzE,uCAAkC;AAClC,uEAA8C;AAC9C,sFAA4D;AAC5D,8DAAsC;
|
|
1
|
+
{"version":3,"file":"view-controller.js","sourceRoot":"","sources":["../../../src/controller/close-api/view-controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,8 +14,13 @@ export default class ApiError extends Error {
|
|
|
14
14
|
*/
|
|
15
15
|
static ItemNotFoundOrNotAccessible(): ApiError;
|
|
16
16
|
static NotFound(data: any): ApiError;
|
|
17
|
+
/**
|
|
18
|
+
* @description Ошибка используется в случае, когда с AppServer пришла не обработанное исключение. В таком случае
|
|
19
|
+
* сообщения имеет значение по умолчанию. Однако в деталях хранится информация переданная с AppServer.
|
|
20
|
+
* @param {string[]} details Любая возможная информация, которая будет добавлена в ошибку.
|
|
21
|
+
* @constructor
|
|
22
|
+
*/
|
|
17
23
|
static AppServerError(details?: string[] | string): ApiError;
|
|
18
|
-
static AppServerInvalidResponse(): ApiError;
|
|
19
24
|
static BadRequest(message?: string): ApiError;
|
|
20
25
|
static InvalidAccess(message?: string): ApiError;
|
|
21
26
|
static UsageContextNotFounded(url: string): ApiError;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-error.d.ts","sourceRoot":"","sources":["../../src/errors/api-error.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"api-error.d.ts","sourceRoot":"","sources":["../../src/errors/api-error.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,OAAO,OAAO,QAAS,SAAQ,KAAK;IAGV,MAAM,EAAE,MAAM;IAD9C,OAAO,EAAE,GAAG,CAAA;gBACA,GAAG,EAAE,MAAM,EAAS,MAAM,GAAE,MAAY,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE;IAKxE,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE;IAIlE,MAAM,CAAC,YAAY;IAInB,MAAM,CAAC,kBAAkB,CAAC,QAAQ,CAAC,EAAE,MAAM;IAG3C,MAAM,CAAC,eAAe;IAGtB,MAAM,CAAC,2BAA2B;IAGlC;;;;OAIG;IACH,MAAM,CAAC,2BAA2B;IAIlC,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,GAAG;IAIzB;;;;;OAKG;IACH,MAAM,CAAC,cAAc,CAAC,OAAO,GAAE,MAAM,EAAE,GAAG,MAAW;IAKrD,MAAM,CAAC,UAAU,CAAC,OAAO,GAAE,MAAsB;IAGjD,MAAM,CAAC,aAAa,CAAC,OAAO,GAAE,MAA0G;IAGxI,MAAM,CAAC,sBAAsB,CAAC,GAAG,EAAE,MAAM;IAGzC,MAAM,CAAC,WAAW;IAGlB,MAAM,CAAC,2BAA2B;IAGlC,MAAM,CAAC,iBAAiB;IAGxB,MAAM,CAAC,oCAAoC;IAI3C,MAAM,CAAC,oBAAoB,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG;IAKlD,MAAM,CAAC,sBAAsB,CAAC,OAAO,KAAA;IAGrC,MAAM,CAAC,6BAA6B,CAAC,OAAO,KAAA;IAI5C,MAAM,CAAC,mBAAmB,CAAC,MAAM,EAAE,OAAO;IAG1C,MAAM,CAAC,sBAAsB,CAAC,MAAM,EAAE,OAAO;CAG7C"}
|
package/dist/errors/api-error.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const constants_1 = require("../constants");
|
|
3
4
|
class ApiError extends Error {
|
|
4
5
|
constructor(msg, status = 500, details) {
|
|
5
6
|
super(msg);
|
|
@@ -32,14 +33,16 @@ class ApiError extends Error {
|
|
|
32
33
|
static NotFound(data) {
|
|
33
34
|
return new ApiError('Object not found', 404);
|
|
34
35
|
}
|
|
36
|
+
/**
|
|
37
|
+
* @description Ошибка используется в случае, когда с AppServer пришла не обработанное исключение. В таком случае
|
|
38
|
+
* сообщения имеет значение по умолчанию. Однако в деталях хранится информация переданная с AppServer.
|
|
39
|
+
* @param {string[]} details Любая возможная информация, которая будет добавлена в ошибку.
|
|
40
|
+
* @constructor
|
|
41
|
+
*/
|
|
35
42
|
static AppServerError(details = []) {
|
|
36
43
|
if (typeof details === 'string')
|
|
37
44
|
details = [details];
|
|
38
|
-
return new ApiError(
|
|
39
|
-
Please try again later or submit a feedback if problem doesn't go.`, 500, details);
|
|
40
|
-
}
|
|
41
|
-
static AppServerInvalidResponse() {
|
|
42
|
-
return new ApiError(`Server response does not contain readable information.`, 500);
|
|
45
|
+
return new ApiError(constants_1.DEFAULT_ERROR_MESSAGE, 400, details);
|
|
43
46
|
}
|
|
44
47
|
static BadRequest(message = 'Bad Request') {
|
|
45
48
|
return new ApiError(message, 400);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-error.js","sourceRoot":"","sources":["../../src/errors/api-error.ts"],"names":[],"mappings":";;AAAA,MAAqB,QAAS,SAAQ,KAAK;IAG1C,YAAY,GAAW,EAAS,SAAiB,GAAG,EAAE,OAAkB;QACvE,KAAK,CAAC,GAAG,CAAC,CAAC;QADoB,WAAM,GAAN,MAAM,CAAc;QAEnD,IAAI,CAAC,OAAO,GAAG,OAAO,IAAI,EAAE,CAAC;IAC9B,CAAC;IAED,MAAM,CAAC,OAAO,CAAC,MAAc,EAAE,OAAe,EAAE,OAAkB;QACjE,OAAO,IAAI,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;IAC9C,CAAC;IAED,MAAM,CAAC,YAAY;QAClB,OAAO,IAAI,QAAQ,CAAC,4RAA4R,EAAE,GAAG,CAAC,CAAA;IACvT,CAAC;IAED,MAAM,CAAC,kBAAkB,CAAC,QAAiB;QAC1C,OAAO,IAAI,QAAQ,CAAC,qBAAqB,GAAG,QAAQ,CAAA,CAAC,CAAC,OAAO,QAAQ,GAAG,CAAA,CAAC,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;IACpF,CAAC;IACD,MAAM,CAAC,eAAe;QACrB,OAAO,IAAI,QAAQ,CAAC,8BAA8B,EAAE,GAAG,CAAC,CAAC;IAC1D,CAAC;IACD,MAAM,CAAC,2BAA2B;QACjC,OAAO,IAAI,QAAQ,CAAC,uCAAuC,EAAE,GAAG,CAAC,CAAC;IACnE,CAAC;IACD;;;;OAIG;IACH,MAAM,CAAC,2BAA2B;QACjC,OAAO,IAAI,QAAQ,CAAC,4CAA4C,EAAE,GAAG,CAAC,CAAC;IACxE,CAAC;IAED,MAAM,CAAC,QAAQ,CAAC,IAAS;QACxB,OAAO,IAAI,QAAQ,CAAC,kBAAkB,EAAE,GAAG,CAAC,CAAC;IAC9C,CAAC;
|
|
1
|
+
{"version":3,"file":"api-error.js","sourceRoot":"","sources":["../../src/errors/api-error.ts"],"names":[],"mappings":";;AAAA,4CAAmD;AAEnD,MAAqB,QAAS,SAAQ,KAAK;IAG1C,YAAY,GAAW,EAAS,SAAiB,GAAG,EAAE,OAAkB;QACvE,KAAK,CAAC,GAAG,CAAC,CAAC;QADoB,WAAM,GAAN,MAAM,CAAc;QAEnD,IAAI,CAAC,OAAO,GAAG,OAAO,IAAI,EAAE,CAAC;IAC9B,CAAC;IAED,MAAM,CAAC,OAAO,CAAC,MAAc,EAAE,OAAe,EAAE,OAAkB;QACjE,OAAO,IAAI,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;IAC9C,CAAC;IAED,MAAM,CAAC,YAAY;QAClB,OAAO,IAAI,QAAQ,CAAC,4RAA4R,EAAE,GAAG,CAAC,CAAA;IACvT,CAAC;IAED,MAAM,CAAC,kBAAkB,CAAC,QAAiB;QAC1C,OAAO,IAAI,QAAQ,CAAC,qBAAqB,GAAG,QAAQ,CAAA,CAAC,CAAC,OAAO,QAAQ,GAAG,CAAA,CAAC,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;IACpF,CAAC;IACD,MAAM,CAAC,eAAe;QACrB,OAAO,IAAI,QAAQ,CAAC,8BAA8B,EAAE,GAAG,CAAC,CAAC;IAC1D,CAAC;IACD,MAAM,CAAC,2BAA2B;QACjC,OAAO,IAAI,QAAQ,CAAC,uCAAuC,EAAE,GAAG,CAAC,CAAC;IACnE,CAAC;IACD;;;;OAIG;IACH,MAAM,CAAC,2BAA2B;QACjC,OAAO,IAAI,QAAQ,CAAC,4CAA4C,EAAE,GAAG,CAAC,CAAC;IACxE,CAAC;IAED,MAAM,CAAC,QAAQ,CAAC,IAAS;QACxB,OAAO,IAAI,QAAQ,CAAC,kBAAkB,EAAE,GAAG,CAAC,CAAC;IAC9C,CAAC;IAED;;;;;OAKG;IACH,MAAM,CAAC,cAAc,CAAC,UAA6B,EAAE;QACpD,IAAI,OAAO,OAAO,KAAK,QAAQ;YAAE,OAAO,GAAG,CAAC,OAAO,CAAC,CAAC;QACrD,OAAO,IAAI,QAAQ,CAAC,iCAAqB,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;IAC1D,CAAC;IAED,MAAM,CAAC,UAAU,CAAC,UAAkB,aAAa;QAChD,OAAO,IAAI,QAAQ,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IACnC,CAAC;IACD,MAAM,CAAC,aAAa,CAAC,UAAkB,iGAAiG;QACvI,OAAO,IAAI,QAAQ,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IACnC,CAAC;IACD,MAAM,CAAC,sBAAsB,CAAC,GAAW;QACxC,OAAO,IAAI,QAAQ,CAAC,mCAAmC,GAAG,IAAI,EAAE,GAAG,CAAC,CAAC;IACtE,CAAC;IACD,MAAM,CAAC,WAAW;QACjB,OAAO,IAAI,QAAQ,CAAC,kCAAkC,CAAC,CAAA;IACxD,CAAC;IACD,MAAM,CAAC,2BAA2B;QACjC,OAAO,IAAI,QAAQ,CAAC,yEAAyE,CAAC,CAAA;IAC/F,CAAC;IACD,MAAM,CAAC,iBAAiB;QACvB,OAAO,IAAI,QAAQ,CAAC,iDAAiD,CAAC,CAAA;IACvE,CAAC;IACD,MAAM,CAAC,oCAAoC;QAC1C,OAAO,IAAI,QAAQ,CAAC,qCAAqC,CAAC,CAAA;IAC3D,CAAC;IAED,MAAM,CAAC,oBAAoB,CAAC,MAAW,EAAE,IAAS;QACjD,OAAO,IAAI,QAAQ,CAAC,uCAAuC,MAAM,aAAa,IAAI,EAAE,CAAC,CAAC;IACvF,CAAC;IAGD,MAAM,CAAC,sBAAsB,CAAC,OAAO;QACpC,OAAO,IAAI,QAAQ,CAAC,kCAAkC,OAAO,EAAE,CAAC,CAAA;IACjE,CAAC;IACD,MAAM,CAAC,6BAA6B,CAAC,OAAO;QAC3C,OAAO,IAAI,QAAQ,CAAC,uCAAuC,EAAE,OAAO,CAAC,CAAC;IACvE,CAAC;IAED,MAAM,CAAC,mBAAmB,CAAC,MAAe;QACzC,OAAO,IAAI,QAAQ,CAAC,6BAA6B,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAA;IAC5E,CAAC;IACD,MAAM,CAAC,sBAAsB,CAAC,MAAe;QAC5C,OAAO,IAAI,QAAQ,CAAC,iCAAiC,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAA;IAChF,CAAC;CACD;AAzFD,2BAyFC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { CriterionReferenceValue } from "./criterion";
|
|
1
|
+
import { CriterionReferenceValue, ICriterionExpressionInclude } from "./criterion";
|
|
2
2
|
/**
|
|
3
3
|
* @description Класс используется для хранения набора executors для дальнейшего построения criterion.
|
|
4
4
|
*/
|
|
@@ -17,6 +17,10 @@ export declare class CriterionCollector {
|
|
|
17
17
|
* @description Набор сущностей, которые используются для вычисления критериев.
|
|
18
18
|
*/
|
|
19
19
|
entities: Map<string, ICriterionEntityInfo>;
|
|
20
|
+
/**
|
|
21
|
+
* @description Набор сущностей используемых для проверки на наличие
|
|
22
|
+
*/
|
|
23
|
+
entitiesInclude: Map<string, number>;
|
|
20
24
|
/**
|
|
21
25
|
* @description AccessToken пользователя для будущих запросов
|
|
22
26
|
*/
|
|
@@ -37,6 +41,10 @@ export declare class CriterionCollector {
|
|
|
37
41
|
* @description Функция используется для коллекционирования(соединения в кучу) всех полей для всех сущностей.
|
|
38
42
|
*/
|
|
39
43
|
private collectFields;
|
|
44
|
+
private collectIncludes;
|
|
45
|
+
convertObjectWithPreset(object: Record<string, unknown>): {
|
|
46
|
+
[k: string]: unknown;
|
|
47
|
+
};
|
|
40
48
|
constructor(options: ICriterionCollectorOptions);
|
|
41
49
|
/**
|
|
42
50
|
* @description Метод для загрузки данных. После того как все используемые поля были собраны - их необходимо
|
|
@@ -50,10 +58,12 @@ export declare class CriterionCollector {
|
|
|
50
58
|
generate(): string;
|
|
51
59
|
private getValue;
|
|
52
60
|
private getExpression;
|
|
61
|
+
private isIncludes;
|
|
53
62
|
addGroup(data: ICriterionCollectorExecutor[]): void;
|
|
54
63
|
addFields(entity: string, fields: string[]): () => string;
|
|
55
64
|
addMasterEntityFields(entity: string, fields: string[]): () => string;
|
|
56
65
|
addEqualExpress(expressionName: string, entity: string, fieldName: string, value: unknown): () => string;
|
|
66
|
+
addIncludeExpression(expressionName: string, entity: string, filters: ICriterionExpressionInclude['include'][1]): () => string;
|
|
57
67
|
static isReferenceValue(value: unknown): value is CriterionReferenceValue;
|
|
58
68
|
}
|
|
59
69
|
type ICriterionCollectorExecutor = (collector: CriterionCollector) => string | null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"criterion-collector.d.ts","sourceRoot":"","sources":["../../src/model/criterion-collector.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,uBAAuB,EAAC,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"criterion-collector.d.ts","sourceRoot":"","sources":["../../src/model/criterion-collector.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,uBAAuB,EAAE,2BAA2B,EAAC,MAAM,aAAa,CAAC;AAOjF;;GAEG;AACH,qBAAa,kBAAkB;IAC9B;;;OAGG;IACH,MAAM,CAAC,qBAAqB,SAAO;IAEnC;;;OAGG;IACH,MAAM,CAAC,qBAAqB,SAAO;IAEnC;;OAEG;IACH,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAY;IACvD;;OAEG;IACH,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa;IAEjD;;OAEG;IACH,WAAW,EAAE,MAAM,CAAA;IAEnB;;OAEG;IACH,cAAc,EAAE,0BAA0B,CAAC,UAAU,CAAC,CAAC;IAEvD;;OAEG;IACH,KAAK,EAAE,2BAA2B,EAAE,EAAE,CAAK;IAG3C;;OAEG;IACH,MAAM,EAAE,0BAA0B,CAAC,QAAQ,CAAC,CAAA;IAE5C;;OAEG;IACH,OAAO,CAAC,aAAa;IAoBrB,OAAO,CAAC,eAAe;IAIvB,uBAAuB,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;;;gBAU3C,OAAO,EAAE,0BAA0B;IAO/C;;;OAGG;IACH,IAAI;IAgCJ;;;OAGG;IACH,QAAQ;IAWR,OAAO,CAAC,QAAQ;IAYhB,OAAO,CAAC,aAAa;IAKrB,OAAO,CAAC,UAAU;IAMlB,QAAQ,CAAC,IAAI,EAAE,2BAA2B,EAAE;IAI5C,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE;IAM1C,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE;IAKtD,eAAe,CAAC,cAAc,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO;IAOzF,oBAAoB,CAAC,cAAc,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,2BAA2B,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IAO/G,MAAM,CAAC,gBAAgB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,uBAAuB;CAGzE;AAED,KAAK,2BAA2B,GAAG,CAAC,SAAS,EAAE,kBAAkB,KAAK,MAAM,GAAG,IAAI,CAAA;AAEnF,UAAU,oBAAoB;IAC7B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAChC;AACD,UAAU,0BAA0B;IACnC,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAChC"}
|
|
@@ -6,7 +6,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.CriterionCollector = void 0;
|
|
7
7
|
const data_service_1 = __importDefault(require("../services/data-service"));
|
|
8
8
|
const debug_1 = __importDefault(require("debug"));
|
|
9
|
-
const
|
|
9
|
+
const utils_1 = require("../utils");
|
|
10
|
+
const index_1 = require("../index");
|
|
11
|
+
const debug = (0, debug_1.default)((0, utils_1.getCoreDebugMark)('criterion-collector'));
|
|
10
12
|
/**
|
|
11
13
|
* @description Класс используется для хранения набора executors для дальнейшего построения criterion.
|
|
12
14
|
*/
|
|
@@ -35,11 +37,26 @@ class CriterionCollector {
|
|
|
35
37
|
if (Array.isArray(fields))
|
|
36
38
|
store.fields.push(...fields);
|
|
37
39
|
}
|
|
40
|
+
collectIncludes(entity, filters) {
|
|
41
|
+
this.entitiesInclude.set(JSON.stringify({ entity, filters }), 0);
|
|
42
|
+
}
|
|
43
|
+
convertObjectWithPreset(object) {
|
|
44
|
+
return Object.fromEntries(Object.entries(object)
|
|
45
|
+
.map(([fieldName, value]) => {
|
|
46
|
+
if (typeof value === 'string' && value.startsWith('@'))
|
|
47
|
+
value = this.preset[value];
|
|
48
|
+
return [fieldName, value];
|
|
49
|
+
}));
|
|
50
|
+
}
|
|
38
51
|
constructor(options) {
|
|
39
52
|
/**
|
|
40
53
|
* @description Набор сущностей, которые используются для вычисления критериев.
|
|
41
54
|
*/
|
|
42
55
|
this.entities = new Map();
|
|
56
|
+
/**
|
|
57
|
+
* @description Набор сущностей используемых для проверки на наличие
|
|
58
|
+
*/
|
|
59
|
+
this.entitiesInclude = new Map();
|
|
43
60
|
/**
|
|
44
61
|
* @description Двумерный массив executors. Первый слов является группами, второй единичными элементами группы.
|
|
45
62
|
*/
|
|
@@ -54,14 +71,29 @@ class CriterionCollector {
|
|
|
54
71
|
*/
|
|
55
72
|
load() {
|
|
56
73
|
const dataService = new data_service_1.default(this.accessToken);
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
74
|
+
debug('Entities: %O', this.entities);
|
|
75
|
+
return Promise.allSettled([
|
|
76
|
+
...Array.from(this.entities).map(([entity, data]) => {
|
|
77
|
+
debug('Reading %s:%d. Fields: %o', entity, data.id, data.fields);
|
|
78
|
+
return dataService.getById(entity, data.id, {
|
|
79
|
+
fields: data.fields.join(" ")
|
|
80
|
+
}).then(values => {
|
|
81
|
+
this.entities.get(entity).values = values;
|
|
82
|
+
});
|
|
83
|
+
}),
|
|
84
|
+
...Array.from(this.entitiesInclude).map(([strConfig]) => {
|
|
85
|
+
const config = JSON.parse(strConfig);
|
|
86
|
+
const filter = (0, index_1.Filter)(config.filters);
|
|
87
|
+
debug('Get Count %s:%O.', config.entity, filter);
|
|
88
|
+
return dataService.getCount(config.entity, {
|
|
89
|
+
filter
|
|
90
|
+
})
|
|
91
|
+
.then(res => {
|
|
92
|
+
console.log(res);
|
|
93
|
+
this.entitiesInclude.set(strConfig, res.count);
|
|
94
|
+
});
|
|
95
|
+
})
|
|
96
|
+
]);
|
|
65
97
|
}
|
|
66
98
|
/**
|
|
67
99
|
* @description Метод генерирует текстовое представление criterion. Проходясь по ранее созданному массиву, запуская
|
|
@@ -94,6 +126,12 @@ class CriterionCollector {
|
|
|
94
126
|
return value; // Убираем StatusCode
|
|
95
127
|
return name + '=' + value;
|
|
96
128
|
}
|
|
129
|
+
isIncludes(entity, filters) {
|
|
130
|
+
const key = JSON.stringify({ entity, filters });
|
|
131
|
+
const count = this.entitiesInclude.get(key);
|
|
132
|
+
debug('count %s, %d', key, count);
|
|
133
|
+
return Number.isInteger(count) && count !== 0;
|
|
134
|
+
}
|
|
97
135
|
addGroup(data) {
|
|
98
136
|
this.array.push(data);
|
|
99
137
|
}
|
|
@@ -110,6 +148,11 @@ class CriterionCollector {
|
|
|
110
148
|
this.collectFields(entity, value);
|
|
111
149
|
return () => this.getValue(entity, fieldName) === this.getValue(entity, value) ? expressionName : null;
|
|
112
150
|
}
|
|
151
|
+
addIncludeExpression(expressionName, entity, filters) {
|
|
152
|
+
const convertedFilters = this.convertObjectWithPreset(filters);
|
|
153
|
+
this.collectIncludes(entity, convertedFilters);
|
|
154
|
+
return () => this.isIncludes(entity, convertedFilters) ? expressionName : null;
|
|
155
|
+
}
|
|
113
156
|
static isReferenceValue(value) {
|
|
114
157
|
return !!value && typeof value === 'object' && Object.prototype.hasOwnProperty.call(value, "value");
|
|
115
158
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"criterion-collector.js","sourceRoot":"","sources":["../../src/model/criterion-collector.ts"],"names":[],"mappings":";;;;;;AAAA,4EAAmD;AAEnD,kDAAgC;AAEhC,MAAM,KAAK,GAAG,IAAA,eAAW,EAAC,qBAAqB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"criterion-collector.js","sourceRoot":"","sources":["../../src/model/criterion-collector.ts"],"names":[],"mappings":"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"}
|
|
@@ -60,6 +60,7 @@ export default class Criterion {
|
|
|
60
60
|
static isMasterCriterion(item: unknown): item is IMasterCriterion;
|
|
61
61
|
static isNamedCriterion(item: unknown): item is INamedCriterion;
|
|
62
62
|
static isEqualCriterion(item: INamedCriterion): item is INamedCriterion<ICriterionExpressionEqual>;
|
|
63
|
+
static isIncludeCriterion(item: INamedCriterion): item is INamedCriterion<ICriterionExpressionInclude>;
|
|
63
64
|
}
|
|
64
65
|
/**
|
|
65
66
|
* @description Точечный элемент описания критериев.
|
|
@@ -100,6 +101,13 @@ type INamedCriterion<T = unknown> = {
|
|
|
100
101
|
type ICriterionExpressionEqual = {
|
|
101
102
|
equal: [fieldName: string, equalValue: CriterionExpressionValue] | [entityName: string, fieldName: string, equalValue: CriterionExpressionValue];
|
|
102
103
|
};
|
|
104
|
+
/**
|
|
105
|
+
* @description Выражение описывает наличие определённой сущности по заданным критериям. Например: наличие записи в
|
|
106
|
+
* подтверждённом реестре.
|
|
107
|
+
*/
|
|
108
|
+
export type ICriterionExpressionInclude = {
|
|
109
|
+
include: [entityName: string, filters: Record<string, CriterionExpressionValue>];
|
|
110
|
+
};
|
|
103
111
|
type CriterionExpressionValue = string | CriterionReferenceValue;
|
|
104
112
|
export type CriterionReferenceValue = {
|
|
105
113
|
value: unknown;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"criterion.d.ts","sourceRoot":"","sources":["../../src/model/criterion.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AACH,OAAO,EAAC,kBAAkB,EAAC,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"criterion.d.ts","sourceRoot":"","sources":["../../src/model/criterion.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AACH,OAAO,EAAC,kBAAkB,EAAC,MAAM,uBAAuB,CAAC;AAOzD,MAAM,CAAC,OAAO,OAAO,SAAS;IAE7B;;OAEG;IACH,KAAK,EAAE,cAAc,EAAE,EAAE,CAAM;IAE/B;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAQ;IAEtC;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA4B;IAE3D;;;;;OAKG;IACH,SAAS,EAAE,kBAAkB,CAAA;IAE7B;;;;OAIG;gBACS,aAAa,EAAE,CAAC,cAAc,GAAG,cAAc,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,iBAAiB;IAyB5F;;;;OAIG;IACH,OAAO,CAAC,cAAc;IAWtB;;;OAGG;IACH,OAAO,CAAC,sBAAsB;IAG9B;;;OAGG;IACH,OAAO,CAAC,0BAA0B;IAsBlC;;OAEG;IACU,QAAQ;IAMrB,MAAM,CAAC,gBAAgB,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI,IAAI,eAAe;IAI/D,MAAM,CAAC,iBAAiB,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI,IAAI,gBAAgB;IAIjE,MAAM,CAAC,gBAAgB,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI,IAAI,eAAe;IAI/D,MAAM,CAAC,gBAAgB,CAAC,IAAI,EAAE,eAAe,GAAG,IAAI,IAAI,eAAe,CAAC,yBAAyB,CAAC;IAGlG,MAAM,CAAC,kBAAkB,CAAC,IAAI,EAAE,eAAe,GAAG,IAAI,IAAI,eAAe,CAAC,2BAA2B,CAAC;CAMtG;AAGD;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG,eAAe,GAAG,gBAAgB,GAAG,eAAe,CAAA;AAGjF;;;;GAIG;AACH,KAAK,eAAe,GAAG,MAAM,CAAA;AAE7B;;;GAGG;AACH,KAAK,gBAAgB,GAAG;IACvB;;OAEG;IACH,YAAY,EAAE,MAAM,CAAC;IACrB;;OAEG;IACH,MAAM,EAAE,MAAM,EAAE,CAAA;CAChB,CAAA;AAED;;;GAGG;AACH,KAAK,eAAe,CAAC,CAAC,GAAG,OAAO,IAAI;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,CAAC,CAAA;CACb,CAAA;AAOD;;;GAGG;AACH,KAAK,yBAAyB,GAAG;IAChC,KAAK,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,wBAAwB,CAAC,GAAG,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,wBAAwB,CAAC,CAAA;CAChJ,CAAA;AAED;;;GAGG;AACH,MAAM,MAAM,2BAA2B,GAAG;IACzC,OAAO,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAAC,CAAA;CAChF,CAAA;AAED,KAAK,wBAAwB,GAAG,MAAM,GAAG,uBAAuB,CAAA;AAEhE,MAAM,MAAM,uBAAuB,GAAG;IAAE,KAAK,EAAE,OAAO,CAAA;CAAE,CAAA;AAGxD,UAAU,iBAAiB;IAC1B;;OAEG;IACH,aAAa,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,cAAc,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;IAEpC,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;CAC5B"}
|
package/dist/model/criterion.js
CHANGED
|
@@ -26,6 +26,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
26
26
|
const criterion_collector_1 = require("./criterion-collector");
|
|
27
27
|
const debug_1 = __importDefault(require("debug"));
|
|
28
28
|
const utils_1 = require("../utils");
|
|
29
|
+
const constants_1 = require("../constants");
|
|
29
30
|
const debug = (0, debug_1.default)((0, utils_1.getCoreDebugMark)('criterion'));
|
|
30
31
|
class Criterion {
|
|
31
32
|
/**
|
|
@@ -61,7 +62,7 @@ class Criterion {
|
|
|
61
62
|
}
|
|
62
63
|
this.collectExtendedInformation();
|
|
63
64
|
debug('Primary Entity: %s', this.primaryEntity);
|
|
64
|
-
debug('Collected array: %O', this.array);
|
|
65
|
+
debug('Collected array: %O', JSON.stringify(this.array));
|
|
65
66
|
debug('Master Entities collection: %O', this.masterEntities);
|
|
66
67
|
}
|
|
67
68
|
/**
|
|
@@ -105,6 +106,9 @@ class Criterion {
|
|
|
105
106
|
equal.unshift(this.primaryEntity); // Приводим к единому виду
|
|
106
107
|
return this.collector.addEqualExpress(item.name, ...equal);
|
|
107
108
|
}
|
|
109
|
+
if (Criterion.isIncludeCriterion(item)) {
|
|
110
|
+
return this.collector.addIncludeExpression(item.name, item.expression.include[0], item.expression.include[1]);
|
|
111
|
+
}
|
|
108
112
|
}
|
|
109
113
|
});
|
|
110
114
|
this.collector.addGroup(executors);
|
|
@@ -117,7 +121,7 @@ class Criterion {
|
|
|
117
121
|
return __awaiter(this, void 0, void 0, function* () {
|
|
118
122
|
yield this.collector.load();
|
|
119
123
|
const result = this.collector.generate();
|
|
120
|
-
return result.trim().length === 0 ?
|
|
124
|
+
return result.trim().length === 0 ? constants_1.DEFAULT_CRITERION_VALUE : result;
|
|
121
125
|
});
|
|
122
126
|
}
|
|
123
127
|
static isFieldCriterion(item) {
|
|
@@ -132,6 +136,12 @@ class Criterion {
|
|
|
132
136
|
static isEqualCriterion(item) {
|
|
133
137
|
return !!item.expression && typeof item.expression === 'object' && Array.isArray(item.expression.equal);
|
|
134
138
|
}
|
|
139
|
+
static isIncludeCriterion(item) {
|
|
140
|
+
return !!item.expression
|
|
141
|
+
&& typeof item.expression === 'object'
|
|
142
|
+
&& Array.isArray(item.expression.include)
|
|
143
|
+
&& item.expression.include.length === 2;
|
|
144
|
+
}
|
|
135
145
|
}
|
|
136
146
|
exports.default = Criterion;
|
|
137
147
|
//# sourceMappingURL=criterion.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"criterion.js","sourceRoot":"","sources":["../../src/model/criterion.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA;;;;;;;;;;GAUG;AACH,+DAAyD;AACzD,kDAAgC;AAChC,oCAA0C;
|
|
1
|
+
{"version":3,"file":"criterion.js","sourceRoot":"","sources":["../../src/model/criterion.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/router/close/index.ts"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/router/close/index.ts"],"names":[],"mappings":";AAmBA,wBA+DE"}
|
|
@@ -18,7 +18,6 @@ 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"));
|
|
22
21
|
const utils_1 = require("../../utils");
|
|
23
22
|
exports.default = () => {
|
|
24
23
|
const server = Server_1.default.getServer();
|
|
@@ -29,7 +28,6 @@ exports.default = () => {
|
|
|
29
28
|
closeRouter.get('/client-content', close_api_controller_1.getUserContent);
|
|
30
29
|
closeRouter.use('/metadata', metadata_route_1.default);
|
|
31
30
|
closeRouter.use('/views', view_router_1.default);
|
|
32
|
-
closeRouter.use('/client', client_router_1.default);
|
|
33
31
|
closeRouter.use('/actions', actions_route_1.default);
|
|
34
32
|
closeRouter.use('/audits', audit_router_1.default);
|
|
35
33
|
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,gFAAqE;AAErE,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;AAC/C,
|
|
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,
|
|
1
|
+
{"version":3,"file":"test-close-router.d.ts","sourceRoot":"","sources":["../../../src/router/close/test-close-router.ts"],"names":[],"mappings":";AAaA,wBA+FC"}
|
|
@@ -33,8 +33,6 @@ exports.default = () => {
|
|
|
33
33
|
});
|
|
34
34
|
TestCloseRouter.get('/store', (req, res) => {
|
|
35
35
|
res.json({
|
|
36
|
-
notification: Store_1.default.viewNotification,
|
|
37
|
-
navigation: Store_1.default.viewNavigation,
|
|
38
36
|
listSettings: Store_1.default.listSettings,
|
|
39
37
|
metadata: Object.values(metadata_service_1.default.store)
|
|
40
38
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test-close-router.js","sourceRoot":"","sources":["../../../src/router/close/test-close-router.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,sDAAmD;AACnD,oDAAkC;AAClC,yFAAgE;AAChE,uCAAkC;AAClC,iDAAiD;AACjD,uFAA8D;AAC9D,8DAAsC;AACtC,0DAAkC;AAClC,gEAA2D;AAC3D,sEAA8C;AAC9C,uFAA8D;AAG9D,kBAAe,GAAG,EAAE;IAChB,MAAM,eAAe,GAAG,iBAAO,CAAC,MAAM,EAAE,CAAC;IACzC,eAAe,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,GAAY,EAAE,GAAa,EAAE,EAAE;QACrD,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,CAAA;IAC3B,CAAC,CAAC,CAAA;IACF,eAAe,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,GAAY,EAAE,GAAa,EAAE,EAAE;QAC5D,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;IACzB,CAAC,CAAC,CAAA;IACF,eAAe,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,GAAY,EAAE,GAAa,EAAE,EAAE;QAC1D,GAAG,CAAC,IAAI,CAAC;YACL,YAAY,EAAE,eAAK,CAAC,
|
|
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;
|
|
1
|
+
{"version":3,"file":"view-router.d.ts","sourceRoot":"","sources":["../../../src/router/close/view-router.ts"],"names":[],"mappings":"AAEA,QAAA,MAAM,SAAS,4CAAmB,CAAC;AAanC,eAAe,SAAS,CAAC"}
|
|
@@ -14,6 +14,5 @@ WizardRouter.route("/process-wizard/:process/:entity")
|
|
|
14
14
|
ViewRoute.use(WizardRouter);
|
|
15
15
|
ViewRoute.get('/required-documents', view_controller_1.default.getRequiredDocuments);
|
|
16
16
|
ViewRoute.get('/list/configs', view_controller_1.default.getListSettings);
|
|
17
|
-
ViewRoute.get('/navigation', view_controller_1.default.getNavigation);
|
|
18
17
|
exports.default = ViewRoute;
|
|
19
18
|
//# 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;AAE7B,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;AAC5B,SAAS,CAAC,GAAG,CAAC,qBAAqB,EAAE,yBAAc,CAAC,oBAAoB,CAAC,CAAA;AACzE,SAAS,CAAC,GAAG,CAAC,eAAe,EAAE,yBAAc,CAAC,eAAe,CAAC,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;AAE7B,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;AAC5B,SAAS,CAAC,GAAG,CAAC,qBAAqB,EAAE,yBAAc,CAAC,oBAAoB,CAAC,CAAA;AACzE,SAAS,CAAC,GAAG,CAAC,eAAe,EAAE,yBAAc,CAAC,eAAe,CAAC,CAAC;AAE/D,kBAAe,SAAS,CAAC"}
|
|
@@ -21,7 +21,7 @@ class ActionService extends interface_auth_service_1.default {
|
|
|
21
21
|
const params = new URLSearchParams();
|
|
22
22
|
if (criterion)
|
|
23
23
|
params.append('ruleCriterion', criterion);
|
|
24
|
-
const url = `${Server_1.default.instance.params.apiUrl}/api/
|
|
24
|
+
const url = `${Server_1.default.instance.params.apiUrl}/api/UsageContext/${context}/Tools?${params.toString()}`;
|
|
25
25
|
const result = yield (0, nodeFetch_1.default)(url, {
|
|
26
26
|
method: 'GET',
|
|
27
27
|
headers: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"action-service.js","sourceRoot":"","sources":["../../src/services/action-service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,sFAA4D;AAC5D,mEAA2C;AAE3C,uDAA+B;AAE/B,MAAqB,aAAc,SAAQ,gCAAoB;IACxD,GAAG,CAAC,EAAC,OAAO,EAAE,SAAS,EAAC;;YAE7B,MAAM,MAAM,GAAG,IAAI,eAAe,EAAE,CAAC;YACrC,IAAI,SAAS;gBAAE,MAAM,CAAC,MAAM,CAAC,eAAe,EAAE,SAAS,CAAC,CAAC;YAEzD,MAAM,GAAG,GAAG,GAAG,gBAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"action-service.js","sourceRoot":"","sources":["../../src/services/action-service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,sFAA4D;AAC5D,mEAA2C;AAE3C,uDAA+B;AAE/B,MAAqB,aAAc,SAAQ,gCAAoB;IACxD,GAAG,CAAC,EAAC,OAAO,EAAE,SAAS,EAAC;;YAE7B,MAAM,MAAM,GAAG,IAAI,eAAe,EAAE,CAAC;YACrC,IAAI,SAAS;gBAAE,MAAM,CAAC,MAAM,CAAC,eAAe,EAAE,SAAS,CAAC,CAAC;YAEzD,MAAM,GAAG,GAAG,GAAG,gBAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,qBAAqB,OAAO,UAAU,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAA;YAErG,MAAM,MAAM,GAAyB,MAAM,IAAA,mBAAS,EAAC,GAAG,EAAE;gBACzD,MAAM,EAAE,KAAK;gBACb,OAAO,EAAE;oBACR,cAAc,EAAE,kBAAkB;oBAClC,aAAa,EAAE,IAAI,CAAC,KAAK;iBACzB;aACD,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAA;YAEtB,OAAO,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;gBACxB,IAAI,CAAC,GAAG,GAAG,sBAAsB,IAAI,CAAC,IAAI,EAAE,CAAA;gBAC5C,OAAO,IAAI,CAAC;YACb,CAAC,CAAC,CAAA;QAEH,CAAC;KAAA;IAED,OAAO,CAAC,EAAC,YAAY,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAC;QAC5C,MAAM,GAAG,GAAG,GAAG,gBAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,mCAAmC,YAAY,SAAS,IAAI,EAAE,CAAA;QAE1G,OAAO,IAAA,mBAAS,EAAC,GAAG,EAAE;YACrB,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACR,cAAc,EAAE,kBAAkB;gBAClC,aAAa,EAAE,IAAI,CAAC,KAAK;aACzB;YACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;gBACpB,cAAc,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,aAAa;gBACnD,cAAc,EAAE,IAAI,CAAC,SAAS,iBAAE,WAAW,EAAE,SAAS,IAAK,IAAI,EAAE;aACjE,CAAC;SACF,CAAC;aACD,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAA;IACzB,CAAC;CACD;AAvCD,gCAuCC"}
|
|
@@ -88,7 +88,7 @@ function connectSocket(webServer) {
|
|
|
88
88
|
debug('UserId:%d RequestId:%d Event: %s event was handled(-)', userId, info.requestId, info.event);
|
|
89
89
|
}
|
|
90
90
|
catch (err) {
|
|
91
|
-
use_logger_1.Logger.
|
|
91
|
+
use_logger_1.Logger.error(`Socket request error. UserId %d. RequestId %d %o`, userId, info.requestId, err);
|
|
92
92
|
sendWSError(ws, err, info.requestId);
|
|
93
93
|
}
|
|
94
94
|
});
|