eservices-back-core 2.1.140 → 2.1.142
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.js +120 -92
- package/dist/Server.js.map +1 -1
- package/dist/app.js +1 -1
- package/dist/app.js.map +1 -1
- package/dist/auth/async-manager.js +2 -3
- package/dist/auth/async-manager.js.map +1 -1
- package/dist/auth/authorization-client.js +110 -103
- package/dist/auth/authorization-client.js.map +1 -1
- package/dist/classes/client-error-generator.js +4 -0
- package/dist/classes/client-error-generator.js.map +1 -1
- package/dist/constants.js +2 -2
- package/dist/constants.js.map +1 -1
- package/dist/controller/close-api/account-controller.js +20 -33
- package/dist/controller/close-api/account-controller.js.map +1 -1
- package/dist/controller/close-api/billing-controller.js +37 -54
- package/dist/controller/close-api/billing-controller.js.map +1 -1
- package/dist/controller/close-api/data-controller.js +10 -18
- package/dist/controller/close-api/data-controller.js.map +1 -1
- package/dist/controller/close-api/document-builder-controller.js +38 -49
- package/dist/controller/close-api/document-builder-controller.js.map +1 -1
- package/dist/controller/close-api/executors-controller.js +54 -66
- package/dist/controller/close-api/executors-controller.js.map +1 -1
- package/dist/controller/close-api/internationalization-controller.js +8 -19
- package/dist/controller/close-api/internationalization-controller.js.map +1 -1
- package/dist/controller/close-api/metadata-controller.js +33 -48
- package/dist/controller/close-api/metadata-controller.js.map +1 -1
- package/dist/controller/close-api/view-controller.js +21 -35
- package/dist/controller/close-api/view-controller.js.map +1 -1
- package/dist/controller/open-api/data-controller.js +18 -31
- package/dist/controller/open-api/data-controller.js.map +1 -1
- package/dist/dtos/dto-list-setting.js +5 -3
- package/dist/dtos/dto-list-setting.js.map +1 -1
- package/dist/dtos/dto-print-form.js +4 -1
- package/dist/dtos/dto-print-form.js.map +1 -1
- package/dist/errors/api-error.js +5 -0
- package/dist/errors/api-error.js.map +1 -1
- package/dist/errors/app-server-error.js +4 -0
- package/dist/errors/app-server-error.js.map +1 -1
- package/dist/errors/core-error.js +2 -1
- package/dist/errors/core-error.js.map +1 -1
- package/dist/export-data/export-data.service.d.ts.map +1 -1
- package/dist/export-data/export-data.service.js +22 -31
- package/dist/export-data/export-data.service.js.map +1 -1
- package/dist/export-data/export-data.watcher.js +68 -71
- package/dist/export-data/export-data.watcher.js.map +1 -1
- package/dist/logger/use-logger.js +2 -0
- package/dist/logger/use-logger.js.map +1 -1
- package/dist/middleware/error-middleware.js +1 -2
- package/dist/middleware/error-middleware.js.map +1 -1
- package/dist/middleware/session-middleware.js +4 -1
- package/dist/middleware/session-middleware.js.map +1 -1
- package/dist/middleware/user-middleware.js +3 -12
- package/dist/middleware/user-middleware.js.map +1 -1
- package/dist/model/Filter.js +10 -10
- package/dist/model/Filter.js.map +1 -1
- package/dist/model/criterion-collector.js +35 -24
- package/dist/model/criterion-collector.js.map +1 -1
- package/dist/model/criterion.js +31 -30
- package/dist/model/criterion.js.map +1 -1
- package/dist/notification/notify.controller.js +2 -0
- package/dist/notification/notify.controller.js.map +1 -1
- package/dist/rabbitmq/connect-rabbit.js +58 -71
- package/dist/rabbitmq/connect-rabbit.js.map +1 -1
- package/dist/router/close/file-route.js +6 -15
- package/dist/router/close/file-route.js.map +1 -1
- package/dist/router/close/test-close-router.js +4 -13
- package/dist/router/close/test-close-router.js.map +1 -1
- package/dist/services/action-service.js +23 -38
- package/dist/services/action-service.js.map +1 -1
- package/dist/services/billing-service.js +1 -4
- package/dist/services/billing-service.js.map +1 -1
- package/dist/services/communication-service.js +17 -23
- package/dist/services/communication-service.js.map +1 -1
- package/dist/services/data-service.js +129 -155
- package/dist/services/data-service.js.map +1 -1
- package/dist/services/history-service.js +13 -3
- package/dist/services/history-service.js.map +1 -1
- package/dist/services/list-setting-service.js +13 -26
- package/dist/services/list-setting-service.js.map +1 -1
- package/dist/services/metadata-service.js +46 -62
- package/dist/services/metadata-service.js.map +1 -1
- package/dist/services/process-wizard-service.js +4 -1
- package/dist/services/process-wizard-service.js.map +1 -1
- package/dist/services/rules-validation-service.js +1 -4
- package/dist/services/rules-validation-service.js.map +1 -1
- package/dist/services/service-with-auth.js +1 -0
- package/dist/services/service-with-auth.js.map +1 -1
- package/dist/services/version-service.js +15 -28
- package/dist/services/version-service.js.map +1 -1
- package/dist/socket/connect-socket.js +54 -65
- package/dist/socket/connect-socket.js.map +1 -1
- package/dist/socket/core-socket-server.js +13 -11
- package/dist/socket/core-socket-server.js.map +1 -1
- package/dist/socket/events/batch_delete.js +17 -28
- package/dist/socket/events/batch_delete.js.map +1 -1
- package/dist/socket/events/batch_update.js +18 -29
- package/dist/socket/events/batch_update.js.map +1 -1
- package/dist/socket/events/client_read.js +21 -32
- package/dist/socket/events/client_read.js.map +1 -1
- package/dist/socket/events/communication-message_create.js +5 -16
- package/dist/socket/events/communication-message_create.js.map +1 -1
- package/dist/socket/events/communication-message_read.js +15 -27
- package/dist/socket/events/communication-message_read.js.map +1 -1
- package/dist/socket/events/communication_create.js +5 -16
- package/dist/socket/events/communication_create.js.map +1 -1
- package/dist/socket/events/communication_read.js +5 -16
- package/dist/socket/events/communication_read.js.map +1 -1
- package/dist/socket/events/configuration_read.js +2 -13
- package/dist/socket/events/configuration_read.js.map +1 -1
- package/dist/socket/events/dashboard_read-licenses.js +5 -16
- package/dist/socket/events/dashboard_read-licenses.js.map +1 -1
- package/dist/socket/events/dev_test-progress.js +16 -27
- package/dist/socket/events/dev_test-progress.js.map +1 -1
- package/dist/socket/events/dictionary_read.js +5 -16
- package/dist/socket/events/dictionary_read.js.map +1 -1
- package/dist/socket/events/entity_count.js +13 -24
- package/dist/socket/events/entity_count.js.map +1 -1
- package/dist/socket/events/entity_create.js +13 -24
- package/dist/socket/events/entity_create.js.map +1 -1
- package/dist/socket/events/entity_delete.js +15 -26
- package/dist/socket/events/entity_delete.js.map +1 -1
- package/dist/socket/events/entity_read.js +46 -55
- package/dist/socket/events/entity_read.js.map +1 -1
- package/dist/socket/events/entity_resolve.js +8 -19
- package/dist/socket/events/entity_resolve.js.map +1 -1
- package/dist/socket/events/entity_update.js +15 -26
- package/dist/socket/events/entity_update.js.map +1 -1
- package/dist/socket/events/enum_read.js +4 -15
- package/dist/socket/events/enum_read.js.map +1 -1
- package/dist/socket/events/export-configuration_read.js +4 -15
- package/dist/socket/events/export-configuration_read.js.map +1 -1
- package/dist/socket/events/export-data.event.js +21 -24
- package/dist/socket/events/export-data.event.js.map +1 -1
- package/dist/socket/events/history_read.js +13 -24
- package/dist/socket/events/history_read.js.map +1 -1
- package/dist/socket/events/interface_navigation.js +57 -64
- package/dist/socket/events/interface_navigation.js.map +1 -1
- package/dist/socket/events/interface_notification.js +9 -20
- package/dist/socket/events/interface_notification.js.map +1 -1
- package/dist/socket/events/list-setting_fix.js +3 -14
- package/dist/socket/events/list-setting_fix.js.map +1 -1
- package/dist/socket/events/list-setting_read.js +10 -21
- package/dist/socket/events/list-setting_read.js.map +1 -1
- package/dist/socket/events/metadata-field_treat.js +6 -17
- package/dist/socket/events/metadata-field_treat.js.map +1 -1
- package/dist/socket/events/tool_execute.js +30 -41
- package/dist/socket/events/tool_execute.js.map +1 -1
- package/dist/socket/events/tool_read.js +15 -26
- package/dist/socket/events/tool_read.js.map +1 -1
- package/dist/socket/events/tool_task-parameters.js +10 -21
- package/dist/socket/events/tool_task-parameters.js.map +1 -1
- package/dist/socket/events/usage-context_read-mandatory-fields.js +15 -26
- package/dist/socket/events/usage-context_read-mandatory-fields.js.map +1 -1
- package/dist/socket/events/usage-context_read.js +15 -26
- package/dist/socket/events/usage-context_read.js.map +1 -1
- package/dist/socket/events/wizard.js +17 -32
- package/dist/socket/events/wizard.js.map +1 -1
- package/dist/store/customer-configuration-store.js +13 -19
- package/dist/store/customer-configuration-store.js.map +1 -1
- package/dist/store/enum-store.js +6 -17
- package/dist/store/enum-store.js.map +1 -1
- package/dist/store/export-configuration-store.js +1 -3
- package/dist/store/export-configuration-store.js.map +1 -1
- package/dist/store/list-store.js +13 -26
- package/dist/store/list-store.js.map +1 -1
- package/dist/store/message-template.store.d.ts +22 -0
- package/dist/store/message-template.store.d.ts.map +1 -1
- package/dist/store/message-template.store.js +46 -5
- package/dist/store/message-template.store.js.map +1 -1
- package/dist/store/metadata-criterion-store.js +1 -2
- package/dist/store/metadata-criterion-store.js.map +1 -1
- package/dist/store/metadata-store.js +55 -70
- package/dist/store/metadata-store.js.map +1 -1
- package/dist/store/template-store.js +36 -47
- package/dist/store/template-store.js.map +1 -1
- package/dist/utils/Filter.js +1 -2
- package/dist/utils/Filter.js.map +1 -1
- package/dist/utils/generate-custom-filters.js +16 -27
- package/dist/utils/generate-custom-filters.js.map +1 -1
- package/dist/utils/get-criterion-config.js +6 -17
- package/dist/utils/get-criterion-config.js.map +1 -1
- package/dist/utils/get-extend-customer-filters.js +24 -39
- package/dist/utils/get-extend-customer-filters.js.map +1 -1
- package/dist/utils/get-required-attribute-values.js +27 -38
- package/dist/utils/get-required-attribute-values.js.map +1 -1
- package/dist/utils/get-trigger-progress.js +1 -1
- package/dist/utils/get-trigger-progress.js.map +1 -1
- package/dist/utils/get-usage-context.js +1 -1
- package/dist/utils/get-usage-context.js.map +1 -1
- package/dist/utils/iterate-entity-value-with-hooks.js +64 -77
- package/dist/utils/iterate-entity-value-with-hooks.js.map +1 -1
- package/dist/utils/load-customer-info-by-external.js +20 -31
- package/dist/utils/load-customer-info-by-external.js.map +1 -1
- package/dist/utils/nodeFetch.js +34 -45
- package/dist/utils/nodeFetch.js.map +1 -1
- package/dist/utils/parse-custom-required-attribute-values.js +18 -29
- package/dist/utils/parse-custom-required-attribute-values.js.map +1 -1
- package/dist/utils/translate.js +1 -2
- package/dist/utils/translate.js.map +1 -1
- package/dist/utils/use-config.js +24 -37
- package/dist/utils/use-config.js.map +1 -1
- package/dist/utils/value-hooks.js +2 -3
- package/dist/utils/value-hooks.js.map +1 -1
- package/package.json +1 -1
- package/tsconfig.json +1 -1
|
@@ -1,15 +1,56 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.MessageTemplateStore = void 0;
|
|
4
|
+
/**
|
|
5
|
+
* Хранилище шаблонов сообщений с поддержкой локализации.
|
|
6
|
+
* Позволяет получить готовое сообщение по имени шаблона, языку и параметрам.
|
|
7
|
+
*/
|
|
4
8
|
class MessageTemplateStore {
|
|
9
|
+
defaultLang;
|
|
10
|
+
constructor(
|
|
11
|
+
/** Язык по умолчанию, если запрошенный не найден */
|
|
12
|
+
defaultLang) {
|
|
13
|
+
this.defaultLang = defaultLang;
|
|
14
|
+
}
|
|
15
|
+
/**
|
|
16
|
+
* Строит сообщение по шаблону, языку и параметрам.
|
|
17
|
+
*
|
|
18
|
+
* @param templateName - имя шаблона (например, "export-data:success")
|
|
19
|
+
* @param lang - код языка (например, "en", "ru", "ar")
|
|
20
|
+
* @param params - объект с параметрами для подстановки в шаблон
|
|
21
|
+
* @returns готовая строка сообщения
|
|
22
|
+
*/
|
|
5
23
|
build(templateName, lang, params) {
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
24
|
+
// Получаем шаблон для указанного имени
|
|
25
|
+
const templateVariants = this.templates[templateName];
|
|
26
|
+
// Если шаблон не найден – возвращаем сообщение по умолчанию
|
|
27
|
+
if (!templateVariants) {
|
|
28
|
+
return 'New notification!';
|
|
10
29
|
}
|
|
11
|
-
|
|
30
|
+
// Определяем язык: если запрошенный отсутствует, используем язык по умолчанию
|
|
31
|
+
const selectedLang = templateVariants[lang] ? lang : this.defaultLang;
|
|
32
|
+
let message = templateVariants[selectedLang];
|
|
33
|
+
// Заменяем все плейсхолдеры вида {key} на значения из params
|
|
34
|
+
Object.entries(params).forEach(([key, value]) => {
|
|
35
|
+
const placeholder = `{${key}}`;
|
|
36
|
+
message = message.replace(new RegExp(placeholder, 'g'), String(value));
|
|
37
|
+
});
|
|
38
|
+
return message;
|
|
12
39
|
}
|
|
40
|
+
/**
|
|
41
|
+
* Словарь сообщений: для каждого шаблона и языка хранится строка с placeholder.
|
|
42
|
+
* Placeholder вида {paramName} будут заменены на значения из params.
|
|
43
|
+
*/
|
|
44
|
+
templates = {
|
|
45
|
+
'export-data:success': {
|
|
46
|
+
en: 'Download [{filename}](?{link}).',
|
|
47
|
+
ar: '.[{filename}](?{link}) قم بتنزيل الملف',
|
|
48
|
+
},
|
|
49
|
+
'test:notify': {
|
|
50
|
+
en: 'Test, {username}! Notification.',
|
|
51
|
+
ru: 'Тест, {username}! Уведомление.'
|
|
52
|
+
}
|
|
53
|
+
};
|
|
13
54
|
}
|
|
14
55
|
exports.MessageTemplateStore = MessageTemplateStore;
|
|
15
56
|
//# sourceMappingURL=message-template.store.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message-template.store.js","sourceRoot":"","sources":["../../src/store/message-template.store.ts"],"names":[],"mappings":";;;AAAA,MAAa,oBAAoB;
|
|
1
|
+
{"version":3,"file":"message-template.store.js","sourceRoot":"","sources":["../../src/store/message-template.store.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,MAAa,oBAAoB;IAId;IAFlB;IACC,oDAAoD;IACnC,WAAmB;QAAnB,gBAAW,GAAX,WAAW,CAAQ;IAClC,CAAC;IAEJ;;;;;;;OAOG;IACI,KAAK,CAAC,YAAoB,EAAE,IAAY,EAAE,MAA2B;QAC3E,uCAAuC;QACvC,MAAM,gBAAgB,GAAG,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;QAEtD,4DAA4D;QAC5D,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACvB,OAAO,mBAAmB,CAAC;QAC5B,CAAC;QAED,8EAA8E;QAC9E,MAAM,YAAY,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC;QACtE,IAAI,OAAO,GAAG,gBAAgB,CAAC,YAAY,CAAC,CAAC;QAE7C,6DAA6D;QAC7D,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;YAC/C,MAAM,WAAW,GAAG,IAAI,GAAG,GAAG,CAAC;YAC/B,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,WAAW,EAAE,GAAG,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QACxE,CAAC,CAAC,CAAC;QAEH,OAAO,OAAO,CAAC;IAChB,CAAC;IAED;;;OAGG;IACc,SAAS,GAA2C;QACpE,qBAAqB,EAAE;YACtB,EAAE,EAAE,iCAAiC;YACrC,EAAE,EAAE,wCAAwC;SAC5C;QACD,aAAa,EAAE;YACd,EAAE,EAAE,iCAAiC;YACrC,EAAE,EAAE,gCAAgC;SACpC;KACD,CAAC;CAEF;AApDD,oDAoDC"}
|
|
@@ -9,8 +9,7 @@ exports.default = (function MetadataCriterionStore() {
|
|
|
9
9
|
state = newState;
|
|
10
10
|
}
|
|
11
11
|
function get(entity, criterionType) {
|
|
12
|
-
|
|
13
|
-
return (_a = state.find(item => item.entity === entity)) === null || _a === void 0 ? void 0 : _a[criterionType];
|
|
12
|
+
return state.find(item => item.entity === entity)?.[criterionType];
|
|
14
13
|
}
|
|
15
14
|
return {
|
|
16
15
|
save,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metadata-criterion-store.js","sourceRoot":"","sources":["../../src/store/metadata-criterion-store.ts"],"names":[],"mappings":";;AAEA;;GAEG;AACH,kBAAe,CAAC,SAAS,sBAAsB;IAE9C,IAAI,KAAK,GAIH,EAAE,CAAA;IACR,SAAS,IAAI,CAAC,QAAsB;QACnC,KAAK,GAAG,QAAQ,CAAA;IACjB,CAAC;IACD,SAAS,GAAG,CAAC,MAAc,EAAE,aAAiD
|
|
1
|
+
{"version":3,"file":"metadata-criterion-store.js","sourceRoot":"","sources":["../../src/store/metadata-criterion-store.ts"],"names":[],"mappings":";;AAEA;;GAEG;AACH,kBAAe,CAAC,SAAS,sBAAsB;IAE9C,IAAI,KAAK,GAIH,EAAE,CAAA;IACR,SAAS,IAAI,CAAC,QAAsB;QACnC,KAAK,GAAG,QAAQ,CAAA;IACjB,CAAC;IACD,SAAS,GAAG,CAAC,MAAc,EAAE,aAAiD;QAC7E,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,KAAK,MAAM,CAAC,EAAE,CAAC,aAAa,CAAC,CAAC;IACpE,CAAC;IAED,OAAO;QACN,IAAI;QACJ,IAAI,KAAK;YACR,OAAO,KAAK,CAAC;QACd,CAAC;QACD,GAAG;KACH,CAAA;AACF,CAAC,CAAC,EAAE,CAAA"}
|
|
@@ -1,13 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
2
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
4
|
};
|
|
@@ -30,75 +21,69 @@ exports.default = (function MetadataStore() {
|
|
|
30
21
|
let attempts = 0;
|
|
31
22
|
const store = new Map();
|
|
32
23
|
// Инициализация списка сущностей и их статусов
|
|
33
|
-
function initializeEntitiesList() {
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
attempt: 0
|
|
43
|
-
});
|
|
24
|
+
async function initializeEntitiesList() {
|
|
25
|
+
const entities = await metadata_service_1.default.readSummaryList();
|
|
26
|
+
entityStatuses.clear();
|
|
27
|
+
entityNames = entities.map(entity => entity.name);
|
|
28
|
+
entities.forEach(entity => {
|
|
29
|
+
entityStatuses.set(entity.name, {
|
|
30
|
+
entityName: entity.name,
|
|
31
|
+
status: MetadataStoreEntityStatus.Draft,
|
|
32
|
+
attempt: 0
|
|
44
33
|
});
|
|
45
|
-
use_logger_1.Logger.debug(`${entities.length} entities were loaded with basic information.`);
|
|
46
|
-
yield runPackageUpload();
|
|
47
|
-
yield extendAndStoreMetadata();
|
|
48
34
|
});
|
|
35
|
+
use_logger_1.Logger.debug(`${entities.length} entities were loaded with basic information.`);
|
|
36
|
+
await runPackageUpload();
|
|
37
|
+
await extendAndStoreMetadata();
|
|
49
38
|
}
|
|
50
39
|
// Расширение метаданных и обновление хранилища
|
|
51
|
-
function extendAndStoreMetadata() {
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
}
|
|
61
|
-
});
|
|
62
|
-
arrayExtendedMetadata.forEach(metadata => store.set(metadata.name, metadata));
|
|
63
|
-
use_logger_1.Logger.debug('Metadata initialization and extension process was successful!');
|
|
40
|
+
async function extendAndStoreMetadata() {
|
|
41
|
+
const arrayExtendedMetadata = Array.from(store.values()).map(metadata => {
|
|
42
|
+
try {
|
|
43
|
+
return metadata_service_1.default.extendMetadata(metadata);
|
|
44
|
+
}
|
|
45
|
+
catch (e) {
|
|
46
|
+
use_logger_1.Logger.error(`Error extending metadata for entity ${metadata.name}: %o`, e);
|
|
47
|
+
return metadata;
|
|
48
|
+
}
|
|
64
49
|
});
|
|
50
|
+
arrayExtendedMetadata.forEach(metadata => store.set(metadata.name, metadata));
|
|
51
|
+
use_logger_1.Logger.debug('Metadata initialization and extension process was successful!');
|
|
65
52
|
}
|
|
66
53
|
// Загрузка метаданных по пакетам с учетом попыток
|
|
67
|
-
function runPackageUpload() {
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
const
|
|
72
|
-
|
|
73
|
-
return entityStatus.status !== MetadataStoreEntityStatus.Done && entityStatus.attempt < attempts;
|
|
74
|
-
});
|
|
75
|
-
const groupsToLoad = splitArrayIntoGroups(entitiesToLoad, LIMIT_PER_PACKAGE);
|
|
76
|
-
for (const group of groupsToLoad) {
|
|
77
|
-
const promises = group.map(name => metadata_service_1.default.read(name));
|
|
78
|
-
const result = yield Promise.allSettled(promises);
|
|
79
|
-
result.forEach((item, index) => {
|
|
80
|
-
const entityName = group[index];
|
|
81
|
-
const entityStatus = entityStatuses.get(entityName);
|
|
82
|
-
if (item.status === "rejected") {
|
|
83
|
-
entityStatus.status = MetadataStoreEntityStatus.Failed;
|
|
84
|
-
entityStatus.attempt++;
|
|
85
|
-
use_logger_1.Logger.error(`Failed to load metadata for entity '${entityName}'`);
|
|
86
|
-
}
|
|
87
|
-
else {
|
|
88
|
-
store.set(entityName, item.value);
|
|
89
|
-
entityStatuses.delete(entityName);
|
|
90
|
-
}
|
|
91
|
-
});
|
|
92
|
-
}
|
|
93
|
-
// Проверка на завершение попыток
|
|
94
|
-
if (attempts < COUNT_ATTEMPTS && entityStatuses.size > 0) {
|
|
95
|
-
yield runPackageUpload(); // Попробуем снова
|
|
96
|
-
}
|
|
97
|
-
else if (entityStatuses.size > 0) {
|
|
98
|
-
const failedEntities = Array.from(entityStatuses.values()).map(item => item.entityName);
|
|
99
|
-
throw new Error(`Failed to fully initialize metadata. Entities were not loaded: ${failedEntities}`);
|
|
100
|
-
}
|
|
54
|
+
async function runPackageUpload() {
|
|
55
|
+
attempts++;
|
|
56
|
+
use_logger_1.Logger.debug(`Package uploading metadata (attempt: ${attempts}).`);
|
|
57
|
+
const entitiesToLoad = entityNames.filter(name => {
|
|
58
|
+
const entityStatus = entityStatuses.get(name);
|
|
59
|
+
return entityStatus.status !== MetadataStoreEntityStatus.Done && entityStatus.attempt < attempts;
|
|
101
60
|
});
|
|
61
|
+
const groupsToLoad = splitArrayIntoGroups(entitiesToLoad, LIMIT_PER_PACKAGE);
|
|
62
|
+
for (const group of groupsToLoad) {
|
|
63
|
+
const promises = group.map(name => metadata_service_1.default.read(name));
|
|
64
|
+
const result = await Promise.allSettled(promises);
|
|
65
|
+
result.forEach((item, index) => {
|
|
66
|
+
const entityName = group[index];
|
|
67
|
+
const entityStatus = entityStatuses.get(entityName);
|
|
68
|
+
if (item.status === "rejected") {
|
|
69
|
+
entityStatus.status = MetadataStoreEntityStatus.Failed;
|
|
70
|
+
entityStatus.attempt++;
|
|
71
|
+
use_logger_1.Logger.error(`Failed to load metadata for entity '${entityName}'`);
|
|
72
|
+
}
|
|
73
|
+
else {
|
|
74
|
+
store.set(entityName, item.value);
|
|
75
|
+
entityStatuses.delete(entityName);
|
|
76
|
+
}
|
|
77
|
+
});
|
|
78
|
+
}
|
|
79
|
+
// Проверка на завершение попыток
|
|
80
|
+
if (attempts < COUNT_ATTEMPTS && entityStatuses.size > 0) {
|
|
81
|
+
await runPackageUpload(); // Попробуем снова
|
|
82
|
+
}
|
|
83
|
+
else if (entityStatuses.size > 0) {
|
|
84
|
+
const failedEntities = Array.from(entityStatuses.values()).map(item => item.entityName);
|
|
85
|
+
throw new Error(`Failed to fully initialize metadata. Entities were not loaded: ${failedEntities}`);
|
|
86
|
+
}
|
|
102
87
|
}
|
|
103
88
|
// Метод для получения метаданных по имени сущности
|
|
104
89
|
function get(entity) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metadata-store.js","sourceRoot":"","sources":["../../src/store/metadata-store.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"metadata-store.js","sourceRoot":"","sources":["../../src/store/metadata-store.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
2
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
4
|
};
|
|
@@ -25,45 +16,43 @@ exports.default = (function TemplateStore() {
|
|
|
25
16
|
* будут использоваться в качестве template.
|
|
26
17
|
* @param paths
|
|
27
18
|
*/
|
|
28
|
-
function init(paths) {
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
const
|
|
43
|
-
|
|
44
|
-
if (path_1.default.extname(filename) !== '.html')
|
|
45
|
-
return acc;
|
|
46
|
-
const name = path_1.default.parse(filename).name;
|
|
47
|
-
const fn = fs_1.default.promises.readFile(path_1.default.join(dirent.path, filename), { encoding: 'utf8' })
|
|
48
|
-
.then(source => ({
|
|
49
|
-
name, source
|
|
50
|
-
}));
|
|
51
|
-
acc.push(fn);
|
|
52
|
-
return acc;
|
|
53
|
-
}, []);
|
|
54
|
-
const loadedData = yield Promise.all(arrayPromises);
|
|
55
|
-
Object.assign(data, loadedData.reduce((acc, item) => {
|
|
56
|
-
acc[item.name] = item.source;
|
|
19
|
+
async function init(paths) {
|
|
20
|
+
try {
|
|
21
|
+
const data = {};
|
|
22
|
+
const result = (await Promise.allSettled(paths.map(location => typeof location === 'string' ? fs_1.default.promises.readdir(location, {
|
|
23
|
+
encoding: 'utf8',
|
|
24
|
+
withFileTypes: true
|
|
25
|
+
}) : (Promise.resolve([]))))).reduce((acc, item) => {
|
|
26
|
+
if (item.status === 'fulfilled')
|
|
27
|
+
acc.push(...item.value);
|
|
28
|
+
return acc;
|
|
29
|
+
}, []);
|
|
30
|
+
use_logger_1.Logger.info("Template store read result:");
|
|
31
|
+
use_logger_1.Logger.info(result.map(item => item.path).join(", "));
|
|
32
|
+
const arrayPromises = result.reduce((acc, dirent) => {
|
|
33
|
+
const filename = dirent.name;
|
|
34
|
+
if (path_1.default.extname(filename) !== '.html')
|
|
57
35
|
return acc;
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
}
|
|
66
|
-
|
|
36
|
+
const name = path_1.default.parse(filename).name;
|
|
37
|
+
const fn = fs_1.default.promises.readFile(path_1.default.join(dirent.path, filename), { encoding: 'utf8' })
|
|
38
|
+
.then(source => ({
|
|
39
|
+
name, source
|
|
40
|
+
}));
|
|
41
|
+
acc.push(fn);
|
|
42
|
+
return acc;
|
|
43
|
+
}, []);
|
|
44
|
+
const loadedData = await Promise.all(arrayPromises);
|
|
45
|
+
Object.assign(data, loadedData.reduce((acc, item) => {
|
|
46
|
+
acc[item.name] = item.source;
|
|
47
|
+
return acc;
|
|
48
|
+
}, {}));
|
|
49
|
+
Object.values(data).forEach(source => mustache_1.default.parse(source));
|
|
50
|
+
use_logger_1.Logger.info(`The templates generated successfully: ${Object.keys(data).join(", ")}`);
|
|
51
|
+
state = data;
|
|
52
|
+
}
|
|
53
|
+
catch (e) {
|
|
54
|
+
use_logger_1.Logger.error('Template store init Error:', e);
|
|
55
|
+
}
|
|
67
56
|
}
|
|
68
57
|
function render(name, data) {
|
|
69
58
|
if (!state[name]) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"template-store.js","sourceRoot":"","sources":["../../src/store/template-store.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"template-store.js","sourceRoot":"","sources":["../../src/store/template-store.ts"],"names":[],"mappings":"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"}
|
package/dist/utils/Filter.js
CHANGED
|
@@ -79,8 +79,7 @@ function Filter(filters) {
|
|
|
79
79
|
// Date
|
|
80
80
|
if (instanceOfDate(values)) {
|
|
81
81
|
function parseDate(data) {
|
|
82
|
-
|
|
83
|
-
return ((_a = data.match(/([^Z]*)/)) === null || _a === void 0 ? void 0 : _a[0]) + '0000Z';
|
|
82
|
+
return data.match(/([^Z]*)/)?.[0] + '0000Z';
|
|
84
83
|
}
|
|
85
84
|
if (values.start)
|
|
86
85
|
arrayFilter.push(`@${name} ge ${parseDate(values.start)}`);
|
package/dist/utils/Filter.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Filter.js","sourceRoot":"","sources":["../../src/utils/Filter.ts"],"names":[],"mappings":";;;;;;AAAA,wDAA+B;AAE/B;;;;;GAKG;AACH,SAAS,cAAc,CAAC,KAAc;IAClC,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI;QAAE,OAAO,KAAK,CAAC;IAC9D,IAAI,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,IAAI,KAAK,CAAC,cAAc,CAAC,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IAC9E,OAAO,KAAK,CAAC;AACjB,CAAC;AAKD;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,SAAS,MAAM,CAAC,OAAiB;IAC7B,OAAO,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,WAAqB,EAAE,IAAY,EAAE,EAAE;QACvE,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;QAE7B,OAAO;QACP,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YACxB,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAA;YACzC,OAAO,WAAW,CAAC;YACnB;;;;;;iCAMqB;QACzB,CAAC;QAED,IAAI,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC;YAC5B,mBAAmB;YACnB,8BAA8B;YAC9B,IAAI,OAAO,MAAM,CAAC,GAAG,KAAK,QAAQ;gBAAE,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,CAAA;YACjF,IAAI,OAAO,MAAM,CAAC,GAAG,KAAK,QAAQ;gBAAG,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,CAAA;QACtF,CAAC;QAED,IAAI,kBAAkB,CAAC,MAAM,CAAC,EAAE,CAAC;YAC7B,IAAI,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;gBAChB,MAAM,iBAAiB,GAAG,CAAC,MAAc,EAAE,EAAE;oBACzC,QAAQ,MAAM,EAAE,CAAC;wBACb,KAAK,KAAK,CAAC,CAAC,OAAO,MAAM,CAAC,OAAO,CAAC;wBAClC,KAAK,OAAO,CAAC,CAAC,OAAO,MAAM,CAAC,SAAS,CAAC;wBACtC,OAAO,CAAC,CAAC,OAAO,MAAM,CAAC,QAAQ,CAAA;oBACnC,CAAC;gBACL,CAAC,CAAA;gBACD,MAAM,EAAE,GAAG,iBAAiB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;gBAC3C,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAA;YAC3C,CAAC;YACD,OAAO,WAAW,CAAC;QACvB,CAAC;QAGD,OAAO;QACP,IAAI,cAAc,CAAC,MAAM,CAAC,EAAE,CAAC;YACzB,SAAS,SAAS,CAAC,IAAY
|
|
1
|
+
{"version":3,"file":"Filter.js","sourceRoot":"","sources":["../../src/utils/Filter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
2
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
4
|
};
|
|
@@ -15,24 +6,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
15
6
|
const use_logger_1 = require("../logger/use-logger");
|
|
16
7
|
const custom_filters_store_1 = __importDefault(require("../store/custom-filters-store"));
|
|
17
8
|
const get_required_attribute_values_1 = __importDefault(require("./get-required-attribute-values"));
|
|
18
|
-
function generateCustomFilters(entityName, customFilters, options) {
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
const
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
return generatedCustomFilters;
|
|
35
|
-
});
|
|
9
|
+
async function generateCustomFilters(entityName, customFilters, options) {
|
|
10
|
+
use_logger_1.Logger.debug('Custom filters(%s): %o', entityName, customFilters);
|
|
11
|
+
const generatedCustomFilters = await Promise.all(customFilters.map(async (customFilterInfo) => {
|
|
12
|
+
const customFilterName = typeof customFilterInfo === 'string' ? customFilterInfo : customFilterInfo.name;
|
|
13
|
+
const customerFilterAttributes = typeof customFilterInfo === 'string' ? {} : (customFilterInfo.arguments || {});
|
|
14
|
+
const filterConfig = custom_filters_store_1.default.get(customFilterName);
|
|
15
|
+
if (!filterConfig) {
|
|
16
|
+
use_logger_1.Logger.error('Filter "%s" not found.', customFilterName);
|
|
17
|
+
return null;
|
|
18
|
+
}
|
|
19
|
+
const insideValue = await (0, get_required_attribute_values_1.default)(filterConfig, options, customerFilterAttributes);
|
|
20
|
+
use_logger_1.Logger.debug(JSON.stringify(insideValue));
|
|
21
|
+
return filterConfig.generate(insideValue);
|
|
22
|
+
}));
|
|
23
|
+
use_logger_1.Logger.debug('Result Custom filters: %s', generatedCustomFilters);
|
|
24
|
+
return generatedCustomFilters;
|
|
36
25
|
}
|
|
37
26
|
exports.default = generateCustomFilters;
|
|
38
27
|
//# sourceMappingURL=generate-custom-filters.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-custom-filters.js","sourceRoot":"","sources":["../../src/utils/generate-custom-filters.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"generate-custom-filters.js","sourceRoot":"","sources":["../../src/utils/generate-custom-filters.ts"],"names":[],"mappings":";;;;;AAAA,qDAA4C;AAC5C,yFAA+D;AAC/D,oGAAyE;AAI1D,KAAK,UAAU,qBAAqB,CAAC,UAAkB,EAAE,aAAkC,EAAE,OAA6B;IACrI,mBAAM,CAAC,KAAK,CAAC,wBAAwB,EAAE,UAAU,EAAE,aAAa,CAAC,CAAA;IACjE,MAAM,sBAAsB,GAAG,MAAM,OAAO,CAAC,GAAG,CAC5C,aAAa,CAAC,GAAG,CACb,KAAK,EAAE,gBAAgB,EAAE,EAAE;QACvB,MAAM,gBAAgB,GAAG,OAAO,gBAAgB,KAAK,QAAQ,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC;QACzG,MAAM,wBAAwB,GAAG,OAAO,gBAAgB,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC;QAEhH,MAAM,YAAY,GAAG,8BAAkB,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;QAC9D,IAAI,CAAC,YAAY,EAAE,CAAC;YAChB,mBAAM,CAAC,KAAK,CAAC,wBAAwB,EAAE,gBAAgB,CAAC,CAAA;YACxD,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,MAAM,WAAW,GAAG,MAAM,IAAA,uCAA0B,EAAC,YAAY,EAAE,OAAO,EAAE,wBAAwB,CAAC,CAAC;QACtG,mBAAM,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC;QAC1C,OAAO,YAAY,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IAC9C,CAAC,CACJ,CACJ,CAAA;IACD,mBAAM,CAAC,KAAK,CAAC,2BAA2B,EAAE,sBAAsB,CAAC,CAAA;IACjE,OAAO,sBAAsB,CAAC;AAClC,CAAC;AAtBD,wCAsBC"}
|
|
@@ -1,13 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
2
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
4
|
};
|
|
@@ -20,14 +11,12 @@ const metadata_criterion_store_1 = __importDefault(require("../store/metadata-cr
|
|
|
20
11
|
* @param {string} entity Название сущности, для которой вызывает критерии
|
|
21
12
|
* @param {string} type Тип критериев (criterion, criterionForAction)
|
|
22
13
|
*/
|
|
23
|
-
function getCriterionConfig(entity, type = 'criterion') {
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
return metadata_service_1.default.checkFieldInEntity(entity, DEFAULT_NAME) ? [DEFAULT_NAME] : [];
|
|
30
|
-
});
|
|
14
|
+
async function getCriterionConfig(entity, type = 'criterion') {
|
|
15
|
+
const DEFAULT_NAME = 'StatusCode';
|
|
16
|
+
const storeConfig = metadata_criterion_store_1.default.get(entity, type);
|
|
17
|
+
if (storeConfig)
|
|
18
|
+
return storeConfig;
|
|
19
|
+
return metadata_service_1.default.checkFieldInEntity(entity, DEFAULT_NAME) ? [DEFAULT_NAME] : [];
|
|
31
20
|
}
|
|
32
21
|
exports.default = getCriterionConfig;
|
|
33
22
|
//# sourceMappingURL=get-criterion-config.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-criterion-config.js","sourceRoot":"","sources":["../../src/utils/get-criterion-config.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"get-criterion-config.js","sourceRoot":"","sources":["../../src/utils/get-criterion-config.ts"],"names":[],"mappings":";;;;;AAAA,oFAA2D;AAC3D,iGAAuE;AAEvE;;;;;GAKG;AACY,KAAK,UAAU,kBAAkB,CAAC,MAAc,EAAE,OAA2C,WAAW;IACtH,MAAM,YAAY,GAAG,YAAY,CAAC;IAElC,MAAM,WAAW,GAAG,kCAAsB,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC7D,IAAI,WAAW;QAAE,OAAO,WAAW,CAAC;IAEpC,OAAO,0BAAe,CAAC,kBAAkB,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;AACtF,CAAC;AAPD,qCAOC"}
|
|
@@ -1,13 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
2
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
4
|
};
|
|
@@ -17,29 +8,25 @@ const metadata_service_1 = __importDefault(require("../services/metadata-service
|
|
|
17
8
|
const Server_1 = __importDefault(require("../Server"));
|
|
18
9
|
const data_service_1 = __importDefault(require("../services/data-service"));
|
|
19
10
|
const Filter_1 = __importDefault(require("../model/Filter"));
|
|
20
|
-
function getExtendCustomerFilters(contextId, entity, token) {
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
.join(' or ');
|
|
32
|
-
});
|
|
11
|
+
async function getExtendCustomerFilters(contextId, entity, token) {
|
|
12
|
+
const CUSTOMER_FIELDS = Server_1.default.instance.configuration.customerFieldsForFilter || [];
|
|
13
|
+
const fieldsCheck = CUSTOMER_FIELDS.map(name => metadata_service_1.default.checkFieldInEntity(entity, name));
|
|
14
|
+
const fieldsForFilter = CUSTOMER_FIELDS.filter((field, index) => fieldsCheck[index]);
|
|
15
|
+
const children = await loadChildrenOrganizations(contextId, token);
|
|
16
|
+
const identifiers = [...children, contextId];
|
|
17
|
+
return identifiers
|
|
18
|
+
.flatMap(id => {
|
|
19
|
+
return fieldsForFilter.map(name => `@${name} eq ${id}`);
|
|
20
|
+
})
|
|
21
|
+
.join(' or ');
|
|
33
22
|
}
|
|
34
23
|
/**
|
|
35
24
|
* @description Функция соединяет фильтр и расширенный фильтр по текущем контексту пользователя. Важно помнить, что
|
|
36
25
|
* в данном методе нет проверок на то, является ли сервер front или back. Данную проверку нужно производить выше!
|
|
37
26
|
*/
|
|
38
|
-
function joinExtendCustomerFilters(filters, contextId, entity, token) {
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
return joinFilters(filters, extendStringFilter);
|
|
42
|
-
});
|
|
27
|
+
async function joinExtendCustomerFilters(filters, contextId, entity, token) {
|
|
28
|
+
const extendStringFilter = await getExtendCustomerFilters(contextId, entity, token);
|
|
29
|
+
return joinFilters(filters, extendStringFilter);
|
|
43
30
|
}
|
|
44
31
|
exports.joinExtendCustomerFilters = joinExtendCustomerFilters;
|
|
45
32
|
function joinFilters(...filters) {
|
|
@@ -49,19 +36,17 @@ function joinFilters(...filters) {
|
|
|
49
36
|
.join(` and `);
|
|
50
37
|
}
|
|
51
38
|
exports.joinFilters = joinFilters;
|
|
52
|
-
function loadChildrenOrganizations(parentId, token) {
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
filter: Filter_1.default.eqString("ParentId", parentId)
|
|
62
|
-
});
|
|
63
|
-
return organizations.map(item => item.Id);
|
|
39
|
+
async function loadChildrenOrganizations(parentId, token) {
|
|
40
|
+
if (!parentId)
|
|
41
|
+
return [];
|
|
42
|
+
if (!metadata_service_1.default.checkFieldInEntity("Organization", "ParentId"))
|
|
43
|
+
return [];
|
|
44
|
+
const dataService = new data_service_1.default(token);
|
|
45
|
+
const organizations = await dataService.getList("Organization", {
|
|
46
|
+
fields: "Id",
|
|
47
|
+
filter: Filter_1.default.eqString("ParentId", parentId)
|
|
64
48
|
});
|
|
49
|
+
return organizations.map(item => item.Id);
|
|
65
50
|
}
|
|
66
51
|
exports.loadChildrenOrganizations = loadChildrenOrganizations;
|
|
67
52
|
//# sourceMappingURL=get-extend-customer-filters.js.map
|