eservices-back-core 2.1.47 → 2.1.49
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/Server.d.ts.map +1 -1
- package/dist/Server.js +2 -4
- package/dist/Server.js.map +1 -1
- package/dist/auth/finish-tumbler-request.d.ts.map +1 -1
- package/dist/auth/finish-tumbler-request.js +2 -4
- package/dist/auth/finish-tumbler-request.js.map +1 -1
- package/dist/auth/is-expired.d.ts.map +1 -1
- package/dist/auth/is-expired.js +4 -9
- package/dist/auth/is-expired.js.map +1 -1
- package/dist/auth/reload-session-promisify.js +4 -8
- package/dist/auth/reload-session-promisify.js.map +1 -1
- package/dist/auth/start-tumbler-request.d.ts.map +1 -1
- package/dist/auth/start-tumbler-request.js +2 -4
- package/dist/auth/start-tumbler-request.js.map +1 -1
- package/dist/auth/use-auth.d.ts.map +1 -1
- package/dist/auth/use-auth.js +41 -40
- package/dist/auth/use-auth.js.map +1 -1
- package/dist/controller/close-api/metadata-controller.d.ts.map +1 -1
- package/dist/errors/metadata-error.js +1 -1
- package/dist/errors/metadata-error.js.map +1 -1
- package/dist/logger/use-logger.d.ts +16 -5
- package/dist/logger/use-logger.d.ts.map +1 -1
- package/dist/logger/use-logger.js +20 -13
- package/dist/logger/use-logger.js.map +1 -1
- package/dist/middleware/error-middleware.d.ts.map +1 -1
- package/dist/middleware/error-middleware.js +12 -34
- package/dist/middleware/error-middleware.js.map +1 -1
- package/dist/middleware/user-middleware.d.ts.map +1 -1
- package/dist/middleware/user-middleware.js +2 -5
- package/dist/middleware/user-middleware.js.map +1 -1
- package/dist/model/criterion-collector.d.ts.map +1 -1
- package/dist/model/criterion-collector.js +4 -7
- package/dist/model/criterion-collector.js.map +1 -1
- package/dist/model/criterion.d.ts.map +1 -1
- package/dist/model/criterion.js +4 -9
- package/dist/model/criterion.js.map +1 -1
- package/dist/router/close/test-close-router.d.ts.map +1 -1
- package/dist/router/close/test-close-router.js +7 -1
- package/dist/router/close/test-close-router.js.map +1 -1
- package/dist/services/list-setting-service.d.ts.map +1 -1
- package/dist/services/list-setting-service.js +7 -9
- package/dist/services/list-setting-service.js.map +1 -1
- package/dist/services/metadata-service.d.ts.map +1 -1
- package/dist/services/metadata-service.js +2 -6
- package/dist/services/metadata-service.js.map +1 -1
- package/dist/socket/connect-socket.d.ts.map +1 -1
- package/dist/socket/connect-socket.js +18 -21
- 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 +3 -9
- package/dist/socket/core-socket-server.js.map +1 -1
- package/dist/socket/events/client_read.d.ts.map +1 -1
- package/dist/socket/events/client_read.js +3 -5
- package/dist/socket/events/client_read.js.map +1 -1
- package/dist/socket/events/communication-message_create.d.ts +2 -2
- package/dist/socket/events/communication-message_create.d.ts.map +1 -1
- package/dist/socket/events/communication-message_create.js.map +1 -1
- package/dist/socket/events/communication-message_read.d.ts +2 -2
- package/dist/socket/events/communication-message_read.d.ts.map +1 -1
- package/dist/socket/events/communication-message_read.js.map +1 -1
- package/dist/socket/events/communication_create.d.ts +2 -2
- package/dist/socket/events/communication_create.d.ts.map +1 -1
- package/dist/socket/events/communication_create.js.map +1 -1
- package/dist/socket/events/communication_read.d.ts +2 -2
- package/dist/socket/events/communication_read.d.ts.map +1 -1
- package/dist/socket/events/communication_read.js.map +1 -1
- package/dist/socket/events/dashboard_read-licenses.d.ts +2 -2
- package/dist/socket/events/dashboard_read-licenses.d.ts.map +1 -1
- package/dist/socket/events/dashboard_read-licenses.js.map +1 -1
- package/dist/socket/events/entity_count.d.ts +2 -2
- package/dist/socket/events/entity_count.d.ts.map +1 -1
- package/dist/socket/events/entity_count.js +2 -4
- package/dist/socket/events/entity_count.js.map +1 -1
- package/dist/socket/events/entity_create.d.ts +2 -2
- package/dist/socket/events/entity_create.d.ts.map +1 -1
- package/dist/socket/events/entity_create.js +1 -4
- package/dist/socket/events/entity_create.js.map +1 -1
- package/dist/socket/events/entity_delete.d.ts +2 -2
- package/dist/socket/events/entity_delete.d.ts.map +1 -1
- package/dist/socket/events/entity_delete.js +1 -4
- package/dist/socket/events/entity_delete.js.map +1 -1
- package/dist/socket/events/entity_read.d.ts.map +1 -1
- package/dist/socket/events/entity_read.js +4 -7
- package/dist/socket/events/entity_read.js.map +1 -1
- package/dist/socket/events/history_read.d.ts.map +1 -1
- package/dist/socket/events/history_read.js +2 -4
- package/dist/socket/events/history_read.js.map +1 -1
- package/dist/socket/events/interface_navigation.d.ts.map +1 -1
- package/dist/socket/events/interface_navigation.js +4 -6
- package/dist/socket/events/interface_navigation.js.map +1 -1
- package/dist/socket/events/interface_notification.d.ts.map +1 -1
- package/dist/socket/events/interface_notification.js +0 -3
- package/dist/socket/events/interface_notification.js.map +1 -1
- package/dist/socket/events/list-setting_fix.d.ts +2 -2
- package/dist/socket/events/list-setting_fix.d.ts.map +1 -1
- package/dist/socket/events/list-setting_fix.js.map +1 -1
- package/dist/socket/events/list-setting_read.d.ts +2 -2
- package/dist/socket/events/list-setting_read.d.ts.map +1 -1
- package/dist/socket/events/list-setting_read.js.map +1 -1
- package/dist/socket/events/metadata-field_treat.d.ts +2 -2
- package/dist/socket/events/metadata-field_treat.d.ts.map +1 -1
- package/dist/socket/events/metadata-field_treat.js.map +1 -1
- package/dist/socket/events/metadata-list_read.d.ts +2 -2
- package/dist/socket/events/metadata-list_read.d.ts.map +1 -1
- package/dist/socket/events/metadata-list_read.js.map +1 -1
- package/dist/socket/events/metadata_read.d.ts +2 -2
- package/dist/socket/events/metadata_read.d.ts.map +1 -1
- package/dist/socket/events/metadata_read.js.map +1 -1
- package/dist/socket/events/tool-list_read.d.ts +2 -2
- package/dist/socket/events/tool-list_read.d.ts.map +1 -1
- package/dist/socket/events/tool-list_read.js.map +1 -1
- package/dist/socket/events/tool_execute.d.ts +2 -2
- package/dist/socket/events/tool_execute.d.ts.map +1 -1
- package/dist/socket/events/tool_execute.js +1 -4
- package/dist/socket/events/tool_execute.js.map +1 -1
- package/dist/socket/events/tool_read.d.ts +2 -2
- package/dist/socket/events/tool_read.d.ts.map +1 -1
- package/dist/socket/events/tool_read.js +2 -4
- package/dist/socket/events/tool_read.js.map +1 -1
- package/dist/socket/events/tool_task-parameters.d.ts.map +1 -1
- package/dist/socket/events/tool_task-parameters.js +0 -2
- package/dist/socket/events/tool_task-parameters.js.map +1 -1
- package/dist/socket/events/usage-context_read.d.ts +2 -2
- package/dist/socket/events/usage-context_read.d.ts.map +1 -1
- package/dist/socket/events/usage-context_read.js +1 -4
- package/dist/socket/events/usage-context_read.js.map +1 -1
- package/dist/store/list-store.d.ts.map +1 -1
- package/dist/store/list-store.js +1 -4
- package/dist/store/list-store.js.map +1 -1
- package/dist/store/metadata-store.d.ts.map +1 -1
- package/dist/store/metadata-store.js +8 -10
- package/dist/store/metadata-store.js.map +1 -1
- package/dist/types/auth-type.d.ts +1 -0
- package/dist/types/auth-type.d.ts.map +1 -1
- package/dist/utils/get-usage-context.js +3 -4
- package/dist/utils/get-usage-context.js.map +1 -1
- package/dist/utils/index.d.ts +0 -4
- package/dist/utils/index.d.ts.map +1 -1
- package/dist/utils/index.js +5 -13
- package/dist/utils/index.js.map +1 -1
- package/dist/utils/nodeFetch.d.ts.map +1 -1
- package/dist/utils/nodeFetch.js +10 -17
- package/dist/utils/nodeFetch.js.map +1 -1
- package/dist/utils/parse-custom-required-attribute-values.d.ts.map +1 -1
- package/dist/utils/parse-custom-required-attribute-values.js +3 -5
- package/dist/utils/parse-custom-required-attribute-values.js.map +1 -1
- package/dist/utils/use-config.js +1 -1
- package/dist/utils/use-config.js.map +1 -1
- package/package.json +1 -1
|
@@ -13,47 +13,25 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
const use_logger_1 = require("../logger/use-logger");
|
|
16
|
-
const debug_1 = __importDefault(require("debug"));
|
|
17
|
-
const utils_1 = require("../utils");
|
|
18
16
|
const constants_1 = require("../constants");
|
|
19
17
|
const dto_error_1 = __importDefault(require("../dtos/dto-error"));
|
|
20
|
-
const
|
|
18
|
+
const render_response_template_1 = require("../utils/render-response-template");
|
|
21
19
|
exports.default = (err, req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
|
|
22
20
|
try {
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
console.log(req.is('text/*'));
|
|
27
|
-
console.log(req.is('html/*'));
|
|
21
|
+
// Получаем заголовок Accept
|
|
22
|
+
const acceptHeader = req.get('Accept');
|
|
23
|
+
use_logger_1.Logger.debug(err);
|
|
28
24
|
const parsedError = (0, dto_error_1.default)(err);
|
|
29
25
|
use_logger_1.Logger.error('%d "%s" %s %s', parsedError.status, parsedError.error, parsedError.stack || '', parsedError.details || []);
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
return void res.status(500).json({
|
|
38
|
-
message: err.displayMessage,
|
|
39
|
-
date: new Date().getTime(),
|
|
40
|
-
stack: err.stack,
|
|
41
|
-
error: err.message
|
|
42
|
-
})
|
|
26
|
+
const isHtmlRequest = acceptHeader && acceptHeader.includes('text/html');
|
|
27
|
+
if (isHtmlRequest) {
|
|
28
|
+
return (0, render_response_template_1.renderResponseTemplate)(res, 'error', {
|
|
29
|
+
title: "Something's broken, try again later",
|
|
30
|
+
pageTitle: "Try again later",
|
|
31
|
+
message: parsedError.message
|
|
32
|
+
});
|
|
43
33
|
}
|
|
44
|
-
|
|
45
|
-
if (err instanceof ApiError)
|
|
46
|
-
return void res
|
|
47
|
-
.status(err.status)
|
|
48
|
-
.json(errorResponseDto(err.message, err.status));
|
|
49
|
-
|
|
50
|
-
if (err instanceof Error)
|
|
51
|
-
return void res.status(400).json(errorResponseDto(err.message, 400));
|
|
52
|
-
|
|
53
|
-
res.status(500);
|
|
54
|
-
res.send(DEFAULT_ERROR_MESSAGE)
|
|
55
|
-
|
|
56
|
-
*/
|
|
34
|
+
return res.status(parsedError.status).json(parsedError);
|
|
57
35
|
}
|
|
58
36
|
catch (e) {
|
|
59
37
|
res.status(500);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"error-middleware.js","sourceRoot":"","sources":["../../src/middleware/error-middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AACA,qDAA4C;AAC5C,
|
|
1
|
+
{"version":3,"file":"error-middleware.js","sourceRoot":"","sources":["../../src/middleware/error-middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AACA,qDAA4C;AAC5C,4CAAmD;AACnD,kEAAyC;AACzC,gFAAyE;AAGzE,kBAAe,CAAO,GAAG,EAAE,GAAY,EAAE,GAAa,EAAE,IAAI,EAAE,EAAE;IAC/D,IAAI,CAAC;QAEJ,4BAA4B;QAC5B,MAAM,YAAY,GAAG,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACvC,mBAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAClB,MAAM,WAAW,GAAG,IAAA,mBAAQ,EAAC,GAAG,CAAC,CAAC;QAClC,mBAAM,CAAC,KAAK,CAAC,eAAe,EAAE,WAAW,CAAC,MAAM,EAAE,WAAW,CAAC,KAAK,EAAE,WAAW,CAAC,KAAK,IAAI,EAAE,EAAE,WAAW,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC;QAEzH,MAAM,aAAa,GAAG,YAAY,IAAI,YAAY,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QAEzE,IAAI,aAAa,EAAE,CAAC;YACnB,OAAO,IAAA,iDAAsB,EAAC,GAAG,EAAE,OAAO,EAAE;gBAC3C,KAAK,EAAE,qCAAqC;gBAC5C,SAAS,EAAE,iBAAiB;gBAC5B,OAAO,EAAE,WAAW,CAAC,OAAO;aAC5B,CAAC,CAAA;QACH,CAAC;QAED,OAAO,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAEzD,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACZ,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAChB,GAAG,CAAC,IAAI,CAAC,iCAAqB,CAAC,CAAA;IAChC,CAAC;AACF,CAAC,CAAA,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user-middleware.d.ts","sourceRoot":"","sources":["../../src/middleware/user-middleware.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,OAAO,EAAC,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"user-middleware.d.ts","sourceRoot":"","sources":["../../src/middleware/user-middleware.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,OAAO,EAAC,MAAM,SAAS,CAAC;AAQhC;;;;;;GAMG;8BACwB,OAAO;AAAlC,wBAqBC"}
|
|
@@ -13,14 +13,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
const get_current_context_from_request_1 = __importDefault(require("../utils/get-current-context-from-request"));
|
|
16
|
-
const debug_1 = __importDefault(require("debug"));
|
|
17
16
|
const use_auth_1 = require("../auth/use-auth");
|
|
18
|
-
const utils_1 = require("../utils");
|
|
19
17
|
const use_logger_1 = require("../logger/use-logger");
|
|
20
18
|
const get_auth_state_form_request_1 = require("../auth/get-auth-state-form-request");
|
|
21
19
|
const core_error_1 = __importDefault(require("../errors/core-error"));
|
|
22
20
|
const load_customer_info_by_external_1 = __importDefault(require("../utils/load-customer-info-by-external"));
|
|
23
|
-
const debug = (0, debug_1.default)((0, utils_1.getCoreDebugMark)('user-info'));
|
|
24
21
|
/**
|
|
25
22
|
* @description Middleware предназначен для сохранения информации о пользователи в request для дальнейшего
|
|
26
23
|
* использования.
|
|
@@ -32,7 +29,7 @@ exports.default = (req, _res, next) => __awaiter(void 0, void 0, void 0, functio
|
|
|
32
29
|
try {
|
|
33
30
|
req.infoAccessToken = (0, use_auth_1.getFullAccessToken)(req);
|
|
34
31
|
const externalId = (0, get_auth_state_form_request_1.getAuthStateFormRequest)(req).claims.sub;
|
|
35
|
-
debug('Using externalID %s', externalId);
|
|
32
|
+
use_logger_1.Logger.debug('Using externalID %s', externalId);
|
|
36
33
|
const customerData = yield (0, load_customer_info_by_external_1.default)(req.infoAccessToken, externalId);
|
|
37
34
|
if (!customerData.userId)
|
|
38
35
|
throw core_error_1.default.UserNotFound(externalId);
|
|
@@ -42,7 +39,7 @@ exports.default = (req, _res, next) => __awaiter(void 0, void 0, void 0, functio
|
|
|
42
39
|
next();
|
|
43
40
|
}
|
|
44
41
|
catch (e) {
|
|
45
|
-
debug('Getting user info is rejected. %O', e);
|
|
42
|
+
use_logger_1.Logger.debug('Getting user info is rejected. %O', e);
|
|
46
43
|
use_logger_1.Logger.error(e);
|
|
47
44
|
req.infoUserId = null;
|
|
48
45
|
req.infoAccessToken = null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user-middleware.js","sourceRoot":"","sources":["../../src/middleware/user-middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,iHAAqF;AAErF
|
|
1
|
+
{"version":3,"file":"user-middleware.js","sourceRoot":"","sources":["../../src/middleware/user-middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,iHAAqF;AAErF,+CAAoD;AACpD,qDAA4C;AAC5C,qFAA4E;AAC5E,sEAA6C;AAC7C,6GAAiF;AAGjF;;;;;;GAMG;AACH,kBAAe,CAAO,GAAY,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE;IAEjD,IAAI,CAAC;QACJ,GAAG,CAAC,eAAe,GAAG,IAAA,6BAAkB,EAAC,GAAG,CAAC,CAAC;QAC9C,MAAM,UAAU,GAAG,IAAA,qDAAuB,EAAC,GAAG,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC;QAC3D,mBAAM,CAAC,KAAK,CAAC,qBAAqB,EAAE,UAAU,CAAC,CAAC;QAEhD,MAAM,YAAY,GAAG,MAAM,IAAA,wCAA0B,EAAC,GAAG,CAAC,eAAe,EAAE,UAAU,CAAC,CAAC;QACvF,IAAI,CAAC,YAAY,CAAC,MAAM;YAAE,MAAM,oBAAS,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;QAEnE,GAAG,CAAC,UAAU,GAAG,YAAY,CAAC,MAAM,CAAA;QACpC,GAAG,CAAC,YAAY,GAAG,YAAY,CAAC,QAAQ,CAAA;QACxC,GAAG,CAAC,oBAAoB,GAAG,IAAA,0CAA4B,EAAC,GAAG,CAAC,CAAC;QAC7D,IAAI,EAAE,CAAC;IACR,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACZ,mBAAM,CAAC,KAAK,CAAC,mCAAmC,EAAE,CAAC,CAAC,CAAC;QACrD,mBAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAChB,GAAG,CAAC,UAAU,GAAG,IAAI,CAAC;QACtB,GAAG,CAAC,eAAe,GAAG,IAAI,CAAC;QAC3B,IAAI,CAAC,CAAC,CAAC,CAAC;IACT,CAAC;AACF,CAAC,CAAA,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
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;
|
|
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;AAGjF;;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;IAoCJ;;;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"}
|
|
@@ -5,10 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.CriterionCollector = void 0;
|
|
7
7
|
const data_service_1 = __importDefault(require("../services/data-service"));
|
|
8
|
-
const debug_1 = __importDefault(require("debug"));
|
|
9
|
-
const utils_1 = require("../utils");
|
|
10
8
|
const index_1 = require("../index");
|
|
11
|
-
const debug = (0, debug_1.default)((0, utils_1.getCoreDebugMark)('criterion-collector'));
|
|
12
9
|
/**
|
|
13
10
|
* @description Класс используется для хранения набора executors для дальнейшего построения criterion.
|
|
14
11
|
*/
|
|
@@ -71,10 +68,10 @@ class CriterionCollector {
|
|
|
71
68
|
*/
|
|
72
69
|
load() {
|
|
73
70
|
const dataService = new data_service_1.default(this.accessToken);
|
|
74
|
-
debug('Entities: %O', this.entities);
|
|
71
|
+
index_1.Logger.debug('Entities: %O', this.entities);
|
|
75
72
|
return Promise.allSettled([
|
|
76
73
|
...Array.from(this.entities).map(([entity, data]) => {
|
|
77
|
-
debug('Reading %s:%d. Fields: %o', entity, data.id, data.fields);
|
|
74
|
+
index_1.Logger.debug('Reading %s:%d. Fields: %o', entity, data.id, data.fields);
|
|
78
75
|
return dataService.getById(entity, data.id, {
|
|
79
76
|
fields: data.fields.join(" ")
|
|
80
77
|
})
|
|
@@ -88,7 +85,7 @@ class CriterionCollector {
|
|
|
88
85
|
...Array.from(this.entitiesInclude).map(([strConfig]) => {
|
|
89
86
|
const config = JSON.parse(strConfig);
|
|
90
87
|
const filter = (0, index_1.Filter)(config.filters);
|
|
91
|
-
debug('Get Count %s:%O.', config.entity, filter);
|
|
88
|
+
index_1.Logger.debug('Get Count %s:%O.', config.entity, filter);
|
|
92
89
|
return dataService.getCount(config.entity, {
|
|
93
90
|
filter
|
|
94
91
|
})
|
|
@@ -132,7 +129,7 @@ class CriterionCollector {
|
|
|
132
129
|
isIncludes(entity, filters) {
|
|
133
130
|
const key = JSON.stringify({ entity, filters });
|
|
134
131
|
const count = this.entitiesInclude.get(key);
|
|
135
|
-
debug('count %s, %d', key, count);
|
|
132
|
+
index_1.Logger.debug('count %s, %d', key, count);
|
|
136
133
|
return Number.isInteger(count) && count !== 0;
|
|
137
134
|
}
|
|
138
135
|
addGroup(data) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"criterion-collector.js","sourceRoot":"","sources":["../../src/model/criterion-collector.ts"],"names":[],"mappings":";;;;;;AAAA,4EAAmD;AAEnD,
|
|
1
|
+
{"version":3,"file":"criterion-collector.js","sourceRoot":"","sources":["../../src/model/criterion-collector.ts"],"names":[],"mappings":"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"}
|
|
@@ -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;AAKzD,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
|
@@ -8,9 +8,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
-
};
|
|
14
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
12
|
/**
|
|
16
13
|
* @description Дай Всемогущий тебе сил для понимания того, что здесь происходит.
|
|
@@ -24,10 +21,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
24
21
|
* 5. Сборка collector
|
|
25
22
|
*/
|
|
26
23
|
const criterion_collector_1 = require("./criterion-collector");
|
|
27
|
-
const debug_1 = __importDefault(require("debug"));
|
|
28
|
-
const utils_1 = require("../utils");
|
|
29
24
|
const constants_1 = require("../constants");
|
|
30
|
-
const
|
|
25
|
+
const use_logger_1 = require("../logger/use-logger");
|
|
31
26
|
class Criterion {
|
|
32
27
|
/**
|
|
33
28
|
* @description Конфигурация принимает массив критериев. Обратите внимание, что Критерии первого уровня, будут соединены
|
|
@@ -61,9 +56,9 @@ class Criterion {
|
|
|
61
56
|
});
|
|
62
57
|
}
|
|
63
58
|
this.collectExtendedInformation();
|
|
64
|
-
debug('Primary Entity: %s', this.primaryEntity);
|
|
65
|
-
debug('Collected array: %O', JSON.stringify(this.array));
|
|
66
|
-
debug('Master Entities collection: %O', this.masterEntities);
|
|
59
|
+
use_logger_1.Logger.debug('Primary Entity: %s', this.primaryEntity);
|
|
60
|
+
use_logger_1.Logger.debug('Collected array: %O', JSON.stringify(this.array));
|
|
61
|
+
use_logger_1.Logger.debug('Master Entities collection: %O', this.masterEntities);
|
|
67
62
|
}
|
|
68
63
|
/**
|
|
69
64
|
* @description Метод получает начальные критерии(переданные в конструктор) и возвращает обработанный двумерный
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"criterion.js","sourceRoot":"","sources":["../../src/model/criterion.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"criterion.js","sourceRoot":"","sources":["../../src/model/criterion.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":";
|
|
1
|
+
{"version":3,"file":"test-close-router.d.ts","sourceRoot":"","sources":["../../../src/router/close/test-close-router.ts"],"names":[],"mappings":";AAQA,wBAmDC"}
|
|
@@ -18,6 +18,7 @@ const criterion_1 = __importDefault(require("../../model/criterion"));
|
|
|
18
18
|
const get_criterion_config_1 = __importDefault(require("../../utils/get-criterion-config"));
|
|
19
19
|
const get_criterion_preset_1 = require("../../utils/get-criterion-preset");
|
|
20
20
|
const convert_master_entity_1 = __importDefault(require("../../utils/convert-master-entity"));
|
|
21
|
+
const render_response_template_1 = require("../../utils/render-response-template");
|
|
21
22
|
exports.default = () => {
|
|
22
23
|
const TestCloseRouter = express_1.default.Router();
|
|
23
24
|
TestCloseRouter.get('/', (req, res) => {
|
|
@@ -29,12 +30,17 @@ exports.default = () => {
|
|
|
29
30
|
TestCloseRouter.get('/cookies', (req, res) => {
|
|
30
31
|
res.json(req.cookies);
|
|
31
32
|
});
|
|
33
|
+
TestCloseRouter.get('/render-error', (req, res) => {
|
|
34
|
+
(0, render_response_template_1.renderResponseTemplate)(res, 'error', {
|
|
35
|
+
title: "Page not found",
|
|
36
|
+
message: "Perhaps you'll find what you're looking for in the Reports section."
|
|
37
|
+
});
|
|
38
|
+
});
|
|
32
39
|
TestCloseRouter.use((0, index_1.default)());
|
|
33
40
|
TestCloseRouter.get('/criterion/:entity', (req, res) => __awaiter(void 0, void 0, void 0, function* () {
|
|
34
41
|
const entity = req.params.entity;
|
|
35
42
|
const primaryKey = req.query.primaryKey;
|
|
36
43
|
const masterEntities = (0, convert_master_entity_1.default)(JSON.parse(req.query.masterEntities));
|
|
37
|
-
console.log(req.infoAccessToken);
|
|
38
44
|
const criterionObject = new criterion_1.default(yield (0, get_criterion_config_1.default)(entity, "criterion"), {
|
|
39
45
|
accessToken: req.infoAccessToken,
|
|
40
46
|
masterEntities,
|
|
@@ -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,sEAA8C;AAC9C,4FAAkE;AAClE,2EAA+E;AAC/E,8FAAoE;
|
|
1
|
+
{"version":3,"file":"test-close-router.js","sourceRoot":"","sources":["../../../src/router/close/test-close-router.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,sDAAmD;AACnD,oDAAkC;AAClC,sEAA8C;AAC9C,4FAAkE;AAClE,2EAA+E;AAC/E,8FAAoE;AACpE,mFAA4E;AAE5E,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,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,eAAe,EAAE,CAAC,GAAY,EAAE,GAAa,EAAE,EAAE;QACjE,IAAA,iDAAsB,EAAC,GAAG,EAAE,OAAO,EAAE;YACjC,KAAK,EAAE,gBAAgB;YACvB,OAAO,EAAE,qEAAqE;SACjF,CAAC,CAAA;IACN,CAAC,CAAC,CAAA;IAGF,eAAe,CAAC,GAAG,CAAC,IAAA,eAAW,GAAE,CAAC,CAAC;IAEnC,eAAe,CAAC,GAAG,CAAC,oBAAoB,EAAE,CAAO,GAAY,EAAE,GAAa,EAAE,EAAE;QAE5E,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC;QACjC,MAAM,UAAU,GAAG,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC;QACxC,MAAM,cAAc,GAAG,IAAA,+BAAmB,EAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,cAAwB,CAAC,CAAC,CAAC;QAE3F,MAAM,eAAe,GAAG,IAAI,mBAAS,CACjC,MAAM,IAAA,8BAAkB,EAAC,MAAM,EAAE,WAAW,CAAC,EAAE;YAC3C,WAAW,EAAE,GAAG,CAAC,eAAe;YAChC,cAAc;YACd,aAAa,EAAE,MAAM;YACrB,aAAa;YACb,SAAS,EAAE,UAAU;YACrB,MAAM,EAAE,IAAA,oDAA6B,EAAC,GAAG,CAAC;SAC7C,CACJ,CAAA;QACD,MAAM,SAAS,GAAG,MAAM,eAAe,CAAC,QAAQ,EAAE,CAAC;QAEnD,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACxB,CAAC,CAAA,CAAC,CAAA;IAEF,eAAe,CAAC,GAAG,CAAC,eAAe,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;QAC9C,GAAG,CAAC,IAAI,CAAC;YACL,KAAK,EAAE,GAAG,CAAC,eAAe;SAC7B,CAAC,CAAA;IACN,CAAC,CAAC,CAAA;IAIF,OAAO,eAAe,CAAC;AAC3B,CAAC,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list-setting-service.d.ts","sourceRoot":"","sources":["../../src/services/list-setting-service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"list-setting-service.d.ts","sourceRoot":"","sources":["../../src/services/list-setting-service.ts"],"names":[],"mappings":"AAWA,MAAM,CAAC,OAAO,OAAO,kBAAkB;IAEtC;;;;OAIG;IACG,eAAe,CAAC,IAAI,EAAE,OAAO;IAYnC;;;OAGG;IACH,2BAA2B,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO;;;;;;;;;;;IAkEhF;;;OAGG;IACH,WAAW,CAAC,KAAK,EAAE,OAAO;IAiB1B,OAAO,CAAC,uBAAuB;IAmB/B;;;OAGG;IACH,6BAA6B,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM;;;;;;;;;;;IA2DhE;;;OAGG;IACH,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO;IAY9C;;;OAGG;IACH,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO;IAkD9C,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAK9C;;;;;;OAMG;IAEH;;OAEG;IACH,OAAO,CAAC,sBAAsB;IAI9B,OAAO,CAAC,0BAA0B;IAIlC,OAAO,CAAC,gBAAgB;CAaxB;AAED,MAAM,WAAW,2BAA2B;IAC3C,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACzB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,GAAG,QAAQ,GAAG,OAAO,CAAC;IAC1C,MAAM,CAAC,EAAE,MAAM,CAAA;CACf;AACD,MAAM,WAAW,iBAAiB;IACjC,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,aAAa,EAAE,GAAG,EAAE,CAAA;CACpB"}
|
|
@@ -13,8 +13,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
const list_settings_error_1 = __importDefault(require("../errors/list-settings-error"));
|
|
16
|
-
const debug_1 = __importDefault(require("debug"));
|
|
17
|
-
const utils_1 = require("../utils");
|
|
18
16
|
const metadata_service_1 = __importDefault(require("./metadata-service"));
|
|
19
17
|
const entity_error_1 = __importDefault(require("../errors/entity-error"));
|
|
20
18
|
const value_list_format_1 = require("../utils/value-list-format");
|
|
@@ -22,7 +20,7 @@ const constants_1 = require("../constants");
|
|
|
22
20
|
const Server_1 = __importDefault(require("../Server"));
|
|
23
21
|
const metadata_store_1 = __importDefault(require("../store/metadata-store"));
|
|
24
22
|
const dto_list_setting_1 = __importDefault(require("../dtos/dto-list-setting"));
|
|
25
|
-
const
|
|
23
|
+
const use_logger_1 = require("../logger/use-logger");
|
|
26
24
|
class ListSettingService {
|
|
27
25
|
/**
|
|
28
26
|
* @description Метод используется для того, чтобы исправить настройку списка. Настройку можно передать любую,
|
|
@@ -123,13 +121,13 @@ class ListSettingService {
|
|
|
123
121
|
const config = listSettings.config;
|
|
124
122
|
if (!Array.isArray(config))
|
|
125
123
|
throw list_settings_error_1.default.ConfigMustBeArray(config);
|
|
126
|
-
debug('Start checking entity(%s) with config.length %d', listSettings.entity, config.length);
|
|
124
|
+
use_logger_1.Logger.debug('Start checking entity(%s) with config.length %d', listSettings.entity, config.length);
|
|
127
125
|
return config.map(cell => {
|
|
128
126
|
try {
|
|
129
127
|
return this.modifyConfigCell(entity, cell);
|
|
130
128
|
}
|
|
131
129
|
catch (e) {
|
|
132
|
-
debug(e);
|
|
130
|
+
use_logger_1.Logger.debug(e);
|
|
133
131
|
return null;
|
|
134
132
|
}
|
|
135
133
|
}).filter(item => !!item);
|
|
@@ -192,7 +190,7 @@ class ListSettingService {
|
|
|
192
190
|
*/
|
|
193
191
|
modifyFilterCell(entity, cell) {
|
|
194
192
|
if (!this.checkTypeForConfigCell(cell)) {
|
|
195
|
-
debug('Inside listSettings found cell with wrong type. %o', cell);
|
|
193
|
+
use_logger_1.Logger.debug('Inside listSettings found cell with wrong type. %o', cell);
|
|
196
194
|
return null;
|
|
197
195
|
}
|
|
198
196
|
const cellName = cell.name;
|
|
@@ -209,7 +207,7 @@ class ListSettingService {
|
|
|
209
207
|
*/
|
|
210
208
|
modifyConfigCell(entity, cell) {
|
|
211
209
|
if (!this.checkTypeForConfigCell(cell)) {
|
|
212
|
-
debug('Inside listSettings found cell with wrong type. %o', cell);
|
|
210
|
+
use_logger_1.Logger.debug('Inside listSettings found cell with wrong type. %o', cell);
|
|
213
211
|
return null;
|
|
214
212
|
}
|
|
215
213
|
if (cell.entity === 'self')
|
|
@@ -240,12 +238,12 @@ class ListSettingService {
|
|
|
240
238
|
cell.label = this.getCellLabel(entity, cellName);
|
|
241
239
|
}
|
|
242
240
|
else {
|
|
243
|
-
debug('Type of name is incorrect: %o', cell.name);
|
|
241
|
+
use_logger_1.Logger.debug('Type of name is incorrect: %o', cell.name);
|
|
244
242
|
delete cell.name;
|
|
245
243
|
}
|
|
246
244
|
}
|
|
247
245
|
if (cell.self) {
|
|
248
|
-
debug(`Self was detected for list-settings with entity %s`, entity);
|
|
246
|
+
use_logger_1.Logger.debug(`Self was detected for list-settings with entity %s`, entity);
|
|
249
247
|
Object.assign(cell, this.getCellReferenceInformation(entity, null, !!cell.displayMode));
|
|
250
248
|
delete cell.self;
|
|
251
249
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list-setting-service.js","sourceRoot":"","sources":["../../src/services/list-setting-service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,wFAA8D;AAC9D,
|
|
1
|
+
{"version":3,"file":"list-setting-service.js","sourceRoot":"","sources":["../../src/services/list-setting-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metadata-service.d.ts","sourceRoot":"","sources":["../../src/services/metadata-service.ts"],"names":[],"mappings":"AAAA,OAAO,oBAAoB,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"metadata-service.d.ts","sourceRoot":"","sources":["../../src/services/metadata-service.ts"],"names":[],"mappings":"AAAA,OAAO,oBAAoB,MAAM,0BAA0B,CAAC;AAI5D,OAAO,EAAC,iBAAiB,EAAE,sBAAsB,EAAE,SAAS,EAAC,MAAM,wBAAwB,CAAC;AAM5F;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,oBAAoB;IAChE,MAAM,KAAK,QAAQ,WAElB;IACD;;OAEG;IACH,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,iBAAiB;IAmCjD,MAAM,CAAC,yBAAyB,CAAC,MAAM,EAAE,MAAM;IAI/C;;;;OAIG;IACH,MAAM,CAAC,kBAAkB,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO;IAInE;;;;OAIG;IACH,MAAM,CAAC,mBAAmB,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,GAAG,IAAI,GAAG,sBAAsB;IAyB1F;;;OAGG;WACU,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAkBlF;;OAEG;WACU,QAAQ,IAAI,OAAO,CAAC,iBAAiB,EAAE,CAAC;CAwBrD"}
|
|
@@ -15,13 +15,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
15
15
|
const interface_auth_service_1 = __importDefault(require("./interface-auth-service"));
|
|
16
16
|
const Server_1 = __importDefault(require("../Server"));
|
|
17
17
|
const nodeFetch_1 = __importDefault(require("../utils/nodeFetch"));
|
|
18
|
-
const create_debug_1 = __importDefault(require("../utils/create-debug"));
|
|
19
18
|
const utils_1 = require("../utils");
|
|
20
19
|
const metadata_store_1 = __importDefault(require("../store/metadata-store"));
|
|
21
20
|
const constants_1 = require("../constants");
|
|
22
21
|
const use_logger_1 = require("../logger/use-logger");
|
|
23
22
|
const metadata_error_1 = __importDefault(require("../errors/metadata-error"));
|
|
24
|
-
const debug = (0, create_debug_1.default)('metadata');
|
|
25
23
|
/**
|
|
26
24
|
* @description Сервис для работы с метаданными. Единственный доступный метод - чтение всех метаданных.
|
|
27
25
|
*/
|
|
@@ -57,8 +55,7 @@ class MetadataService extends interface_auth_service_1.default {
|
|
|
57
55
|
catch (e) {
|
|
58
56
|
use_logger_1.Logger.error(`Entity ${metadata.name}, field: ${fieldMetadata.name}`);
|
|
59
57
|
use_logger_1.Logger.error(e);
|
|
60
|
-
debug('Can`t extent metadata-field for field %s and own entity %s', fieldMetadata.name, fieldMetadata.ownerEntity);
|
|
61
|
-
debug(e);
|
|
58
|
+
use_logger_1.Logger.debug('Can`t extent metadata-field for field %s and own entity %s', fieldMetadata.name, fieldMetadata.ownerEntity);
|
|
62
59
|
}
|
|
63
60
|
metadata.fieldsByName[fieldMetadata.name] = fieldMetadata;
|
|
64
61
|
});
|
|
@@ -84,7 +81,7 @@ class MetadataService extends interface_auth_service_1.default {
|
|
|
84
81
|
static getFieldInformation(entity, field) {
|
|
85
82
|
var _a;
|
|
86
83
|
if (typeof entity !== "string" || typeof field !== 'string') {
|
|
87
|
-
debug(`getFieldInformation: Entity "%s", Field "%s".`, entity, field);
|
|
84
|
+
use_logger_1.Logger.debug(`getFieldInformation: Entity "%s", Field "%s".`, entity, field);
|
|
88
85
|
return null;
|
|
89
86
|
}
|
|
90
87
|
// Получаем метаданные для текущей сущности
|
|
@@ -144,7 +141,6 @@ class MetadataService extends interface_auth_service_1.default {
|
|
|
144
141
|
arr.push(v.value);
|
|
145
142
|
return arr;
|
|
146
143
|
}, []));
|
|
147
|
-
// return Promise.all(arrayMetadata.map(metadata => MetadataService.read(metadata.name)));
|
|
148
144
|
});
|
|
149
145
|
}
|
|
150
146
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metadata-service.js","sourceRoot":"","sources":["../../src/services/metadata-service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,sFAA4D;AAC5D,uDAA+B;AAC/B,mEAA2C;AAC3C,
|
|
1
|
+
{"version":3,"file":"metadata-service.js","sourceRoot":"","sources":["../../src/services/metadata-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connect-socket.d.ts","sourceRoot":"","sources":["../../src/socket/connect-socket.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAC,MAAM,IAAI,CAAC;AAC7B,OAAO,MAAM,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"connect-socket.d.ts","sourceRoot":"","sources":["../../src/socket/connect-socket.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAC,MAAM,IAAI,CAAC;AAC7B,OAAO,MAAM,MAAM,WAAW,CAAC;AAmB/B;;;GAGG;AACH,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,SAAS,EAAE,MAAM,QA2HtD;AAkBD;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAAC,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,SAAS,GAAE,MAAU,QAMhG"}
|