eservices-back-core 2.1.125 → 2.1.126

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/app.js CHANGED
@@ -43,7 +43,7 @@ Object.assign(process.env, configuration_json_1.default || {});
43
43
  saveUninitialized: false, // Не сохранять пустые сессии
44
44
  },
45
45
  pathToInternationalizationFolder: "",
46
- //testAvailableEntities: ["AsyncActionsActionEntry", "NewOperatingLicenseApplication", "ApplicationStatus"],
46
+ testAvailableEntities: ["AsyncActionsActionEntry", "NewOperatingLicenseApplication", "ApplicationStatus", "OperatingLicenseApplication", "Application"],
47
47
  handleResolveUsageContext(path) {
48
48
  if (path === '/')
49
49
  return 'OperatingLicense:List';
package/dist/app.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"entity_count.d.ts","sourceRoot":"","sources":["../../../src/socket/events/entity_count.ts"],"names":[],"mappings":"AAKA,OAAO,EAAC,oBAAoB,EAAC,MAAM,kBAAkB,CAAC;AAGtD,wBAAsB,oBAAoB,CAAC,OAAO,EAAE,oBAAoB,EAAE,IAAI,EAAE,OAAO,uEActF"}
1
+ {"version":3,"file":"entity_count.d.ts","sourceRoot":"","sources":["../../../src/socket/events/entity_count.ts"],"names":[],"mappings":"AAKA,OAAO,EAAC,oBAAoB,EAAC,MAAM,kBAAkB,CAAC;AAItD,wBAAsB,oBAAoB,CAAC,OAAO,EAAE,oBAAoB,EAAE,IAAI,EAAE,OAAO,uEAkBtF"}
@@ -18,6 +18,7 @@ const data_service_1 = __importDefault(require("../../services/data-service"));
18
18
  const get_extend_customer_filters_1 = require("../../utils/get-extend-customer-filters");
19
19
  const Server_1 = __importDefault(require("../../Server"));
20
20
  const use_logger_1 = require("../../logger/use-logger");
21
+ const generate_custom_filters_1 = __importDefault(require("../../utils/generate-custom-filters"));
21
22
  function getCountEntitySocket(options, data) {
22
23
  return __awaiter(this, void 0, void 0, function* () {
23
24
  if (!isEntityCountParams(data))
@@ -27,6 +28,9 @@ function getCountEntitySocket(options, data) {
27
28
  if (Server_1.default.instance.type === 'front')
28
29
  filter = yield (0, get_extend_customer_filters_1.joinExtendCustomerFilters)(data.filter, options.contextId, data.entity, options.token);
29
30
  use_logger_1.Logger.debug(`For entity "%s" result filter %s`, data.entity, filter);
31
+ if (data.customFilters && Array.isArray(data.customFilters)) {
32
+ filter = (0, get_extend_customer_filters_1.joinFilters)(filter, ...yield (0, generate_custom_filters_1.default)(data.entity, data.customFilters, options));
33
+ }
30
34
  return dataService.getCount(data.entity, {
31
35
  filter
32
36
  });
@@ -1 +1 @@
1
- {"version":3,"file":"entity_count.js","sourceRoot":"","sources":["../../../src/socket/events/entity_count.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,uEAA8C;AAC9C,+EAAsD;AACtD,yFAAkF;AAClF,0DAAkC;AAGlC,wDAA+C;AAE/C,SAAsB,oBAAoB,CAAC,OAA6B,EAAE,IAAa;;QACnF,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC;YAAE,MAAM,mBAAQ,CAAC,oBAAoB,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QAEzF,MAAM,WAAW,GAAG,IAAI,sBAAW,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAEnD,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,IAAI,gBAAM,CAAC,QAAQ,CAAC,IAAI,KAAK,OAAO;YAChC,MAAM,GAAG,MAAM,IAAA,uDAAyB,EAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;QAEzG,mBAAM,CAAC,KAAK,CAAC,kCAAkC,EAAE,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAEtE,OAAO,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE;YACrC,MAAM;SACT,CAAC,CAAA;IACN,CAAC;CAAA;AAdD,oDAcC;AAED,MAAM,mBAAmB,GAAG,CAAC,KAAc,EACX,EAAE,CAC9B,CAAC,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ;IACpC,QAAQ,IAAI,KAAK,IAAI,OAAQ,KAA4B,CAAC,MAAM,KAAK,QAAQ,CAAA"}
1
+ {"version":3,"file":"entity_count.js","sourceRoot":"","sources":["../../../src/socket/events/entity_count.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,uEAA8C;AAC9C,+EAAsD;AACtD,yFAA+F;AAC/F,0DAAkC;AAGlC,wDAA+C;AAC/C,kGAAwE;AAExE,SAAsB,oBAAoB,CAAC,OAA6B,EAAE,IAAa;;QACnF,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC;YAAE,MAAM,mBAAQ,CAAC,oBAAoB,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QAEzF,MAAM,WAAW,GAAG,IAAI,sBAAW,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAEnD,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,IAAI,gBAAM,CAAC,QAAQ,CAAC,IAAI,KAAK,OAAO;YAChC,MAAM,GAAG,MAAM,IAAA,uDAAyB,EAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;QAEzG,mBAAM,CAAC,KAAK,CAAC,kCAAkC,EAAE,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAEtE,IAAI,IAAI,CAAC,aAAa,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC;YAC1D,MAAM,GAAG,IAAA,yCAAW,EAAC,MAAM,EAAE,GAAG,MAAM,IAAA,iCAAqB,EAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC,CAAC;QAC3G,CAAC;QAED,OAAO,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE;YACrC,MAAM;SACT,CAAC,CAAA;IACN,CAAC;CAAA;AAlBD,oDAkBC;AAED,MAAM,mBAAmB,GAAG,CAAC,KAAc,EACX,EAAE,CAC9B,CAAC,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ;IACpC,QAAQ,IAAI,KAAK,IAAI,OAAQ,KAA4B,CAAC,MAAM,KAAK,QAAQ,CAAA"}
@@ -1 +1 @@
1
- {"version":3,"file":"entity_read.d.ts","sourceRoot":"","sources":["../../../src/socket/events/entity_read.ts"],"names":[],"mappings":"AAMA,OAAO,EAAC,oBAAoB,EAAC,MAAM,kBAAkB,CAAC;AAItD,OAAO,EAAC,iBAAiB,EAAC,MAAM,+BAA+B,CAAC;AAIhE,wBAAsB,UAAU,CAAC,OAAO,EAAE,oBAAoB,EAAE,IAAI,EAAE,OAAO,oBAyE5E;AAOD,MAAM,WAAW,iBAAiB;IACjC,MAAM,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,EAAE,CAAC,EAAE,GAAG,CAAC;IACT,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB;;OAEG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB;;;OAGG;IACH,aAAa,CAAC,EAAE,iBAAiB,EAAE,CAAC;IACpC,QAAQ,CAAC,EAAE,MAAM,CAAA;CACjB"}
1
+ {"version":3,"file":"entity_read.d.ts","sourceRoot":"","sources":["../../../src/socket/events/entity_read.ts"],"names":[],"mappings":"AAMA,OAAO,EAAC,oBAAoB,EAAC,MAAM,kBAAkB,CAAC;AAEtD,OAAO,EAAC,iBAAiB,EAAC,MAAM,+BAA+B,CAAC;AAKhE,wBAAsB,UAAU,CAAC,OAAO,EAAE,oBAAoB,EAAE,IAAI,EAAE,OAAO,oBAqD5E;AAOD,MAAM,WAAW,iBAAiB;IACjC,MAAM,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,EAAE,CAAC,EAAE,GAAG,CAAC;IACT,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB;;OAEG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB;;;OAGG;IACH,aAAa,CAAC,EAAE,iBAAiB,EAAE,CAAC;IACpC,QAAQ,CAAC,EAAE,MAAM,CAAA;CACjB"}
@@ -19,11 +19,10 @@ const Server_1 = __importDefault(require("../../Server"));
19
19
  const get_extend_customer_filters_1 = require("../../utils/get-extend-customer-filters");
20
20
  const jenesius_vue_form_1 = require("jenesius-vue-form");
21
21
  const parse_order_1 = __importDefault(require("../../utils/parse-order"));
22
- const custom_filters_store_1 = __importDefault(require("../../store/custom-filters-store"));
23
22
  const use_logger_1 = require("../../logger/use-logger");
24
- const get_required_attribute_values_1 = __importDefault(require("../../utils/get-required-attribute-values"));
25
23
  const iterate_entity_value_with_hooks_1 = __importDefault(require("../../utils/iterate-entity-value-with-hooks"));
26
24
  const index_1 = require("../../index");
25
+ const generate_custom_filters_1 = __importDefault(require("../../utils/generate-custom-filters"));
27
26
  function readEntity(options, data) {
28
27
  return __awaiter(this, void 0, void 0, function* () {
29
28
  if (!isEntityReadParams(data))
@@ -43,21 +42,7 @@ function readEntity(options, data) {
43
42
  if (Server_1.default.instance.type === 'front' && data.useContextFilter !== false)
44
43
  filter = yield (0, get_extend_customer_filters_1.joinExtendCustomerFilters)(filter, options.contextId, data.entity, options.token);
45
44
  if (data.customFilters && Array.isArray(data.customFilters)) {
46
- use_logger_1.Logger.debug('Custom filters(%s): %o', data.entity, data.customFilters);
47
- const generatedCustomFilters = yield Promise.all(data.customFilters.map((customFilterInfo) => __awaiter(this, void 0, void 0, function* () {
48
- const customFilterName = typeof customFilterInfo === 'string' ? customFilterInfo : customFilterInfo.name;
49
- const customerFilterAttributes = typeof customFilterInfo === 'string' ? {} : (customFilterInfo.arguments || {});
50
- const filterConfig = custom_filters_store_1.default.get(customFilterName);
51
- if (!filterConfig) {
52
- use_logger_1.Logger.error('Filter "%s" not found.', customFilterName);
53
- return null;
54
- }
55
- const insideValue = yield (0, get_required_attribute_values_1.default)(filterConfig, options, customerFilterAttributes);
56
- use_logger_1.Logger.debug(JSON.stringify(insideValue));
57
- return filterConfig.generate(insideValue);
58
- })));
59
- use_logger_1.Logger.debug('Result Custom filters: %s', generatedCustomFilters);
60
- filter = (0, get_extend_customer_filters_1.joinFilters)(filter, ...generatedCustomFilters.filter(item => !!item));
45
+ filter = (0, get_extend_customer_filters_1.joinFilters)(filter, ...yield (0, generate_custom_filters_1.default)(data.entity, data.customFilters, options));
61
46
  }
62
47
  use_logger_1.Logger.debug(`For entity "%s" result filter %s`, data.entity, filter);
63
48
  return dataService.getList(data.entity, Object.assign(Object.assign({}, data), { filter, order: (0, parse_order_1.default)(data.order) }))
@@ -1 +1 @@
1
- {"version":3,"file":"entity_read.js","sourceRoot":"","sources":["../../../src/socket/events/entity_read.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"entity_read.js","sourceRoot":"","sources":["../../../src/socket/events/entity_read.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,8 @@
1
+ import { IListCustomFilter } from "./list-setting-type";
1
2
  export interface IEntityCountParams {
2
3
  entity: string;
3
4
  filter?: string;
5
+ customFilters: IListCustomFilter[];
4
6
  }
5
7
  export interface IEntityCountResult {
6
8
  count: number;
@@ -1 +1 @@
1
- {"version":3,"file":"entity-count-type.d.ts","sourceRoot":"","sources":["../../src/types/entity-count-type.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,kBAAkB;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAA;CACf;AACD,MAAM,WAAW,kBAAkB;IAClC,KAAK,EAAE,MAAM,CAAA;CACb"}
1
+ {"version":3,"file":"entity-count-type.d.ts","sourceRoot":"","sources":["../../src/types/entity-count-type.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,iBAAiB,EAAC,MAAM,qBAAqB,CAAC;AAEtD,MAAM,WAAW,kBAAkB;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,iBAAiB,EAAE,CAAA;CAClC;AACD,MAAM,WAAW,kBAAkB;IAClC,KAAK,EAAE,MAAM,CAAA;CACb"}
@@ -0,0 +1,4 @@
1
+ import { IListCustomFilter } from "../types/list-setting-type";
2
+ import { ICustomerRequestInfo } from "../types/main";
3
+ export default function generateCustomFilters(entityName: string, customFilters: IListCustomFilter[], options: ICustomerRequestInfo): Promise<string[]>;
4
+ //# sourceMappingURL=generate-custom-filters.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"generate-custom-filters.d.ts","sourceRoot":"","sources":["../../src/utils/generate-custom-filters.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,iBAAiB,EAAC,MAAM,4BAA4B,CAAC;AAC7D,OAAO,EAAC,oBAAoB,EAAC,MAAM,eAAe,CAAC;AAEnD,wBAA8B,qBAAqB,CAAC,UAAU,EAAE,MAAM,EAAE,aAAa,EAAE,iBAAiB,EAAE,EAAE,OAAO,EAAE,oBAAoB,qBAsBxI"}
@@ -0,0 +1,38 @@
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
+ var __importDefault = (this && this.__importDefault) || function (mod) {
12
+ return (mod && mod.__esModule) ? mod : { "default": mod };
13
+ };
14
+ Object.defineProperty(exports, "__esModule", { value: true });
15
+ const use_logger_1 = require("../logger/use-logger");
16
+ const custom_filters_store_1 = __importDefault(require("../store/custom-filters-store"));
17
+ const get_required_attribute_values_1 = __importDefault(require("./get-required-attribute-values"));
18
+ function generateCustomFilters(entityName, customFilters, options) {
19
+ return __awaiter(this, void 0, void 0, function* () {
20
+ use_logger_1.Logger.debug('Custom filters(%s): %o', entityName, customFilters);
21
+ const generatedCustomFilters = yield Promise.all(customFilters.map((customFilterInfo) => __awaiter(this, void 0, void 0, function* () {
22
+ const customFilterName = typeof customFilterInfo === 'string' ? customFilterInfo : customFilterInfo.name;
23
+ const customerFilterAttributes = typeof customFilterInfo === 'string' ? {} : (customFilterInfo.arguments || {});
24
+ const filterConfig = custom_filters_store_1.default.get(customFilterName);
25
+ if (!filterConfig) {
26
+ use_logger_1.Logger.error('Filter "%s" not found.', customFilterName);
27
+ return null;
28
+ }
29
+ const insideValue = yield (0, get_required_attribute_values_1.default)(filterConfig, options, customerFilterAttributes);
30
+ use_logger_1.Logger.debug(JSON.stringify(insideValue));
31
+ return filterConfig.generate(insideValue);
32
+ })));
33
+ use_logger_1.Logger.debug('Result Custom filters: %s', generatedCustomFilters);
34
+ return generatedCustomFilters;
35
+ });
36
+ }
37
+ exports.default = generateCustomFilters;
38
+ //# sourceMappingURL=generate-custom-filters.js.map
@@ -0,0 +1 @@
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;AAIzE,SAA8B,qBAAqB,CAAC,UAAkB,EAAE,aAAkC,EAAE,OAA6B;;QACrI,mBAAM,CAAC,KAAK,CAAC,wBAAwB,EAAE,UAAU,EAAE,aAAa,CAAC,CAAA;QACjE,MAAM,sBAAsB,GAAG,MAAM,OAAO,CAAC,GAAG,CAC5C,aAAa,CAAC,GAAG,CACb,CAAO,gBAAgB,EAAE,EAAE;YACvB,MAAM,gBAAgB,GAAG,OAAO,gBAAgB,KAAK,QAAQ,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC;YACzG,MAAM,wBAAwB,GAAG,OAAO,gBAAgB,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC;YAEhH,MAAM,YAAY,GAAG,8BAAkB,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;YAC9D,IAAI,CAAC,YAAY,EAAE,CAAC;gBAChB,mBAAM,CAAC,KAAK,CAAC,wBAAwB,EAAE,gBAAgB,CAAC,CAAA;gBACxD,OAAO,IAAI,CAAC;YAChB,CAAC;YAED,MAAM,WAAW,GAAG,MAAM,IAAA,uCAA0B,EAAC,YAAY,EAAE,OAAO,EAAE,wBAAwB,CAAC,CAAC;YACtG,mBAAM,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC;YAC1C,OAAO,YAAY,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QAC9C,CAAC,CAAA,CACJ,CACJ,CAAA;QACD,mBAAM,CAAC,KAAK,CAAC,2BAA2B,EAAE,sBAAsB,CAAC,CAAA;QACjE,OAAO,sBAAsB,CAAC;IAClC,CAAC;CAAA;AAtBD,wCAsBC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "eservices-back-core",
3
- "version": "2.1.125",
3
+ "version": "2.1.126",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "scripts": {