eservices-back-core 2.1.118 → 2.1.120
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/configuration.json +9 -8
- package/dist/services/account-service.d.ts +1 -0
- package/dist/services/account-service.d.ts.map +1 -1
- package/dist/services/account-service.js +3 -2
- package/dist/services/account-service.js.map +1 -1
- package/dist/socket/events/entity_count.js +1 -1
- package/dist/socket/events/entity_count.js.map +1 -1
- package/dist/socket/events/entity_read.js +1 -1
- package/dist/socket/events/entity_read.js.map +1 -1
- package/dist/types/client.d.ts +4 -0
- package/dist/types/client.d.ts.map +1 -1
- package/dist/utils/get-extend-customer-filters.d.ts +2 -1
- package/dist/utils/get-extend-customer-filters.d.ts.map +1 -1
- package/dist/utils/get-extend-customer-filters.js +28 -5
- package/dist/utils/get-extend-customer-filters.js.map +1 -1
- package/package.json +1 -1
package/dist/configuration.json
CHANGED
|
@@ -1,13 +1,14 @@
|
|
|
1
1
|
{
|
|
2
|
-
"TYPE": "
|
|
3
|
-
"NAME": "
|
|
4
|
-
"PORT": 3000,
|
|
2
|
+
"TYPE": "front",
|
|
3
|
+
"NAME": "front",
|
|
5
4
|
"FRONTEND_FOLDER": "frontend",
|
|
6
|
-
"
|
|
7
|
-
"
|
|
8
|
-
"
|
|
9
|
-
"
|
|
10
|
-
"
|
|
5
|
+
"LOG_PATH": "C:\\Logs\\CST\\WS-PRV",
|
|
6
|
+
"API_URL": "https://cst.eservices.dev:17060",
|
|
7
|
+
"OIDC_ISSUE": "https://id.eservices.dev",
|
|
8
|
+
"OIDC_CLIENT_ID": "AppRegister.CST.BSN.Dev",
|
|
9
|
+
"OIDC_SECRET": "59f83079-a805-4db1-bebc-f8a7d2d1b591",
|
|
10
|
+
"OIDC_SCOPE": "openid profile offline_access",
|
|
11
|
+
"PORT": 3000,
|
|
11
12
|
"BASE_URL": "http://localhost:3000",
|
|
12
13
|
"WEBSERVER_SESSION_SECRET": "123",
|
|
13
14
|
"MODE": "DEVELOPMENT",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"account-service.d.ts","sourceRoot":"","sources":["../../src/services/account-service.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,MAAM,qBAAqB,CAAC;AAMlD,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,eAAe;IAC1D,oBAAoB,CAAC,cAAc,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM;IAiBvF,cAAc,CAAC,YAAY,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO;IAcnE;;;OAGG;IACH,4BAA4B,CAAC,QAAQ,EAAE,MAAM
|
|
1
|
+
{"version":3,"file":"account-service.d.ts","sourceRoot":"","sources":["../../src/services/account-service.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,MAAM,qBAAqB,CAAC;AAMlD,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,eAAe;IAC1D,oBAAoB,CAAC,cAAc,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM;IAiBvF,cAAc,CAAC,YAAY,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO;IAcnE;;;OAGG;IACH,4BAA4B,CAAC,QAAQ,EAAE,MAAM;;;;;;;;CAkB7C"}
|
|
@@ -45,7 +45,7 @@ class AccountService extends service_with_auth_1.default {
|
|
|
45
45
|
getOrganizationListForPerson(PersonId) {
|
|
46
46
|
const dataService = new data_service_1.default(this.token);
|
|
47
47
|
return dataService.getList('OrganizationPerson', {
|
|
48
|
-
fields: "Organization.Id Organization.Name Organization.RegId RelatedRole.Name RelatedRole.Code",
|
|
48
|
+
fields: "Organization.Id Organization.Name Organization.RegId Organization.StatusCode RelatedRole.Name RelatedRole.Code",
|
|
49
49
|
filter: (0, Filter_1.default)({
|
|
50
50
|
PersonId,
|
|
51
51
|
RelatedStatusCode: 'A'
|
|
@@ -55,7 +55,8 @@ class AccountService extends service_with_auth_1.default {
|
|
|
55
55
|
id: elem["Organization.Id"],
|
|
56
56
|
role: elem["RelatedRole.Name"],
|
|
57
57
|
roleCode: elem["RelatedRole.Code"],
|
|
58
|
-
registrationId: elem["Organization.RegId"]
|
|
58
|
+
registrationId: elem["Organization.RegId"],
|
|
59
|
+
statusCode: elem["Organization.StatusCode"]
|
|
59
60
|
})));
|
|
60
61
|
}
|
|
61
62
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"account-service.js","sourceRoot":"","sources":["../../src/services/account-service.ts"],"names":[],"mappings":";;;;;AAAA,4EAAkD;AAClD,uDAA+B;AAC/B,mEAA2C;AAC3C,kEAAyC;AACzC,6DAAqC;AAErC,MAAqB,cAAe,SAAQ,2BAAe;IAC1D,oBAAoB,CAAC,cAAsB,EAAE,SAAiB,EAAE,eAAuB;QACtF,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC;YAClC,cAAc,EAAE,MAAM,CAAC,cAAc,CAAC;YACtC,SAAS;YACT,eAAe,EAAE,MAAM,CAAC,eAAe,CAAC;SACxC,CAAC,CAAA;QACF,MAAM,GAAG,GAAG,GAAG,gBAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,6CAA6C,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC;QAC7G,OAAO,IAAA,mBAAS,EAAC,GAAG,EAAE;YACrB,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACR,cAAc,EAAE,kBAAkB;gBAClC,aAAa,EAAE,IAAI,CAAC,KAAK;aACzB;SACD,CAAC;aACD,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAA;IACnC,CAAC;IAED,cAAc,CAAC,YAAoB,EAAE,OAAe,EAAE,IAAa;QAClE,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC;YAClC,YAAY,EAAE,MAAM,CAAC,YAAY,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC;SAC5D,CAAC,CAAA;QACF,MAAM,GAAG,GAAG,GAAG,gBAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,kBAAkB,IAAI,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC,CAAC,yBAAyB,IAAI,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC;QACjJ,OAAO,IAAA,mBAAS,EAAC,GAAG,EAAE;YACrB,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACR,cAAc,EAAE,kBAAkB;gBAClC,aAAa,EAAE,IAAI,CAAC,KAAK;aACzB;SACD,CAAC,CAAA;IACH,CAAC;IAED;;;OAGG;IACH,4BAA4B,CAAC,QAAgB;QAC5C,MAAM,WAAW,GAAG,IAAI,sBAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAEhD,OAAO,WAAW,CAAC,OAAO,CAAC,oBAAoB,EAAE;YAChD,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"account-service.js","sourceRoot":"","sources":["../../src/services/account-service.ts"],"names":[],"mappings":";;;;;AAAA,4EAAkD;AAClD,uDAA+B;AAC/B,mEAA2C;AAC3C,kEAAyC;AACzC,6DAAqC;AAErC,MAAqB,cAAe,SAAQ,2BAAe;IAC1D,oBAAoB,CAAC,cAAsB,EAAE,SAAiB,EAAE,eAAuB;QACtF,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC;YAClC,cAAc,EAAE,MAAM,CAAC,cAAc,CAAC;YACtC,SAAS;YACT,eAAe,EAAE,MAAM,CAAC,eAAe,CAAC;SACxC,CAAC,CAAA;QACF,MAAM,GAAG,GAAG,GAAG,gBAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,6CAA6C,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC;QAC7G,OAAO,IAAA,mBAAS,EAAC,GAAG,EAAE;YACrB,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACR,cAAc,EAAE,kBAAkB;gBAClC,aAAa,EAAE,IAAI,CAAC,KAAK;aACzB;SACD,CAAC;aACD,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAA;IACnC,CAAC;IAED,cAAc,CAAC,YAAoB,EAAE,OAAe,EAAE,IAAa;QAClE,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC;YAClC,YAAY,EAAE,MAAM,CAAC,YAAY,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC;SAC5D,CAAC,CAAA;QACF,MAAM,GAAG,GAAG,GAAG,gBAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,kBAAkB,IAAI,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC,CAAC,yBAAyB,IAAI,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC;QACjJ,OAAO,IAAA,mBAAS,EAAC,GAAG,EAAE;YACrB,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACR,cAAc,EAAE,kBAAkB;gBAClC,aAAa,EAAE,IAAI,CAAC,KAAK;aACzB;SACD,CAAC,CAAA;IACH,CAAC;IAED;;;OAGG;IACH,4BAA4B,CAAC,QAAgB;QAC5C,MAAM,WAAW,GAAG,IAAI,sBAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAEhD,OAAO,WAAW,CAAC,OAAO,CAAC,oBAAoB,EAAE;YAChD,MAAM,EAAE,gHAAgH;YACxH,MAAM,EAAE,IAAA,gBAAM,EAAC;gBACd,QAAQ;gBACR,iBAAiB,EAAE,GAAG;aACtB,CAAC;SACF,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAC/B,IAAI,EAAE,IAAI,CAAC,mBAAmB,CAAC;YAC/B,EAAE,EAAE,IAAI,CAAC,iBAAiB,CAAC;YAC3B,IAAI,EAAE,IAAI,CAAC,kBAAkB,CAAC;YAC9B,QAAQ,EAAE,IAAI,CAAC,kBAAkB,CAAC;YAClC,cAAc,EAAE,IAAI,CAAC,oBAAoB,CAAC;YAC1C,UAAU,EAAE,IAAI,CAAC,yBAAyB,CAAC;SAC3C,CAAC,CAAC,CAAC,CAAA;IACL,CAAC;CACD;AAtDD,iCAsDC"}
|
|
@@ -25,7 +25,7 @@ function getCountEntitySocket(options, data) {
|
|
|
25
25
|
const dataService = new data_service_1.default(options.token);
|
|
26
26
|
let filter = "";
|
|
27
27
|
if (Server_1.default.instance.type === 'front')
|
|
28
|
-
filter = yield (0, get_extend_customer_filters_1.joinExtendCustomerFilters)(data.filter, options.contextId, data.entity);
|
|
28
|
+
filter = yield (0, get_extend_customer_filters_1.joinExtendCustomerFilters)(data.filter, options.contextId, data.entity, options.token);
|
|
29
29
|
use_logger_1.Logger.debug(`For entity "%s" result filter %s`, data.entity, filter);
|
|
30
30
|
return dataService.getCount(data.entity, {
|
|
31
31
|
filter
|
|
@@ -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,CAAC,CAAC;
|
|
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"}
|
|
@@ -41,7 +41,7 @@ function readEntity(options, data) {
|
|
|
41
41
|
}
|
|
42
42
|
let filter = data.filter || "";
|
|
43
43
|
if (Server_1.default.instance.type === 'front' && data.useContextFilter !== false)
|
|
44
|
-
filter = yield (0, get_extend_customer_filters_1.joinExtendCustomerFilters)(filter, options.contextId, data.entity);
|
|
44
|
+
filter = yield (0, get_extend_customer_filters_1.joinExtendCustomerFilters)(filter, options.contextId, data.entity, options.token);
|
|
45
45
|
if (data.customFilters && Array.isArray(data.customFilters)) {
|
|
46
46
|
use_logger_1.Logger.debug('Custom filters(%s): %o', data.entity, data.customFilters);
|
|
47
47
|
const generatedCustomFilters = yield Promise.all(data.customFilters.map((customFilterInfo) => __awaiter(this, void 0, void 0, function* () {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entity_read.js","sourceRoot":"","sources":["../../../src/socket/events/entity_read.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,uEAA8C;AAC9C,+EAAsD;AACtD,0DAAkC;AAClC,yFAA+F;AAC/F,yDAAwC;AACxC,0EAAiD;AAEjD,4FAAkE;AAClE,wDAA+C;AAC/C,8GAAmF;AAEnF,kHAAsF;AACtF,uCAA8C;AAE9C,SAAsB,UAAU,CAAC,OAA6B,EAAE,IAAa;;QAC5E,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC;YAAE,MAAM,mBAAQ,CAAC,oBAAoB,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QAExF,MAAM,WAAW,GAAG,IAAI,sBAAW,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAEnD,IAAI,IAAI,CAAC,EAAE,EAAE,CAAC;YACb,mBAAM,CAAC,IAAI,CAAC,yDAAyD,CAAC,CAAC;YACvE,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,EAAE,CAAC;QAC3B,CAAC;QAED,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACrB,IAAI,CAAC,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,OAAO,IAAI,CAAC,UAAU,CAAC;gBAAE,MAAM,mBAAQ,CAAC,iBAAiB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAE9G,MAAM,YAAY,GAAG,MAAM,WAAW,CAAC,eAAe,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;YAC3F,OAAO,YAAY,CAAC,IAAI,EAAE,YAAY,CAAC,CAAA;QACxC,CAAC;QAED,IAAI,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,EAAE,CAAC;QAC/B,IAAI,gBAAM,CAAC,QAAQ,CAAC,IAAI,KAAK,OAAO,IAAI,IAAI,CAAC,gBAAgB,KAAK,KAAK;YACtE,MAAM,GAAG,MAAM,IAAA,uDAAyB,EAAC,MAAM,EAAE,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"entity_read.js","sourceRoot":"","sources":["../../../src/socket/events/entity_read.ts"],"names":[],"mappings":"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"}
|
package/dist/types/client.d.ts
CHANGED
|
@@ -38,6 +38,10 @@ export interface IOrganizationContent {
|
|
|
38
38
|
* @description Строковое название организации
|
|
39
39
|
*/
|
|
40
40
|
name: string;
|
|
41
|
+
/**
|
|
42
|
+
* @description Статус в котором находится организация.
|
|
43
|
+
*/
|
|
44
|
+
statusCode: string;
|
|
41
45
|
/**
|
|
42
46
|
* @description Строковое название роли текущей персоны в организации
|
|
43
47
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/types/client.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,cAAc;IAC9B;;;OAGG;IACH,EAAE,EAAE,MAAM,CAAC;IAEX;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,aAAa,EAAE,oBAAoB,EAAE,CAAC;IACtC;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;;;OAIG;IACH,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IAE9B;;;OAGG;IACH,iBAAiB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IAEjC,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAA;CAC5B;AAED,MAAM,WAAW,oBAAoB;IACpC;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC;IAEX;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAC;IAEjB;;OAEG;IACH,cAAc,EAAE,GAAG,CAAA;CACnB"}
|
|
1
|
+
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/types/client.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,cAAc;IAC9B;;;OAGG;IACH,EAAE,EAAE,MAAM,CAAC;IAEX;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,aAAa,EAAE,oBAAoB,EAAE,CAAC;IACtC;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;;;OAIG;IACH,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IAE9B;;;OAGG;IACH,iBAAiB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IAEjC,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAA;CAC5B;AAED,MAAM,WAAW,oBAAoB;IACpC;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC;IAEX;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,UAAU,EAAE,MAAM,CAAA;IAElB;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAC;IAEjB;;OAEG;IACH,cAAc,EAAE,GAAG,CAAA;CACnB"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
* @description Функция соединяет фильтр и расширенный фильтр по текущем контексту пользователя. Важно помнить, что
|
|
3
3
|
* в данном методе нет проверок на то, является ли сервер front или back. Данную проверку нужно производить выше!
|
|
4
4
|
*/
|
|
5
|
-
export declare function joinExtendCustomerFilters(filters: any, contextId: any, entity: string): Promise<string>;
|
|
5
|
+
export declare function joinExtendCustomerFilters(filters: any, contextId: any, entity: string, token: string): Promise<string>;
|
|
6
6
|
export declare function joinFilters(...filters: unknown[]): string;
|
|
7
|
+
export declare function loadChildrenOrganizations(parentId: any, token: string): Promise<number[]>;
|
|
7
8
|
//# sourceMappingURL=get-extend-customer-filters.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-extend-customer-filters.d.ts","sourceRoot":"","sources":["../../src/utils/get-extend-customer-filters.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"get-extend-customer-filters.d.ts","sourceRoot":"","sources":["../../src/utils/get-extend-customer-filters.ts"],"names":[],"mappings":"AAuBA;;;GAGG;AACH,wBAAsB,yBAAyB,CAAC,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,mBAG1G;AAED,wBAAgB,WAAW,CAAC,GAAG,OAAO,EAAE,OAAO,EAAE,UAKhD;AAED,wBAAsB,yBAAyB,CAAC,QAAQ,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,qBAY3E"}
|
|
@@ -12,24 +12,32 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
12
12
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
-
exports.joinFilters = exports.joinExtendCustomerFilters = void 0;
|
|
15
|
+
exports.loadChildrenOrganizations = exports.joinFilters = exports.joinExtendCustomerFilters = void 0;
|
|
16
16
|
const metadata_service_1 = __importDefault(require("../services/metadata-service"));
|
|
17
17
|
const Server_1 = __importDefault(require("../Server"));
|
|
18
|
-
|
|
18
|
+
const data_service_1 = __importDefault(require("../services/data-service"));
|
|
19
|
+
const Filter_1 = __importDefault(require("../model/Filter"));
|
|
20
|
+
function getExtendCustomerFilters(contextId, entity, token) {
|
|
19
21
|
return __awaiter(this, void 0, void 0, function* () {
|
|
20
22
|
const CUSTOMER_FIELDS = Server_1.default.instance.configuration.customerFieldsForFilter || [];
|
|
21
23
|
const fieldsCheck = CUSTOMER_FIELDS.map(name => metadata_service_1.default.checkFieldInEntity(entity, name));
|
|
22
24
|
const fieldsForFilter = CUSTOMER_FIELDS.filter((field, index) => fieldsCheck[index]);
|
|
23
|
-
|
|
25
|
+
const children = yield loadChildrenOrganizations(contextId, token);
|
|
26
|
+
const identifiers = [...children, contextId];
|
|
27
|
+
return identifiers
|
|
28
|
+
.flatMap(id => {
|
|
29
|
+
return fieldsForFilter.map(name => `@${name} eq ${id}`);
|
|
30
|
+
})
|
|
31
|
+
.join(' or ');
|
|
24
32
|
});
|
|
25
33
|
}
|
|
26
34
|
/**
|
|
27
35
|
* @description Функция соединяет фильтр и расширенный фильтр по текущем контексту пользователя. Важно помнить, что
|
|
28
36
|
* в данном методе нет проверок на то, является ли сервер front или back. Данную проверку нужно производить выше!
|
|
29
37
|
*/
|
|
30
|
-
function joinExtendCustomerFilters(filters, contextId, entity) {
|
|
38
|
+
function joinExtendCustomerFilters(filters, contextId, entity, token) {
|
|
31
39
|
return __awaiter(this, void 0, void 0, function* () {
|
|
32
|
-
const extendStringFilter = yield getExtendCustomerFilters(contextId, entity);
|
|
40
|
+
const extendStringFilter = yield getExtendCustomerFilters(contextId, entity, token);
|
|
33
41
|
return joinFilters(filters, extendStringFilter);
|
|
34
42
|
});
|
|
35
43
|
}
|
|
@@ -41,4 +49,19 @@ function joinFilters(...filters) {
|
|
|
41
49
|
.join(` and `);
|
|
42
50
|
}
|
|
43
51
|
exports.joinFilters = joinFilters;
|
|
52
|
+
function loadChildrenOrganizations(parentId, token) {
|
|
53
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
54
|
+
if (!parentId)
|
|
55
|
+
return [];
|
|
56
|
+
if (!metadata_service_1.default.checkFieldInEntity("Organization", "ParentId"))
|
|
57
|
+
return [];
|
|
58
|
+
const dataService = new data_service_1.default(token);
|
|
59
|
+
const organizations = yield dataService.getList("Organization", {
|
|
60
|
+
fields: "Id",
|
|
61
|
+
filter: Filter_1.default.eqString("ParentId", parentId)
|
|
62
|
+
});
|
|
63
|
+
return organizations.map(item => item.Id);
|
|
64
|
+
});
|
|
65
|
+
}
|
|
66
|
+
exports.loadChildrenOrganizations = loadChildrenOrganizations;
|
|
44
67
|
//# sourceMappingURL=get-extend-customer-filters.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-extend-customer-filters.js","sourceRoot":"","sources":["../../src/utils/get-extend-customer-filters.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,oFAA2D;AAC3D,uDAA+B;
|
|
1
|
+
{"version":3,"file":"get-extend-customer-filters.js","sourceRoot":"","sources":["../../src/utils/get-extend-customer-filters.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,oFAA2D;AAC3D,uDAA+B;AAC/B,4EAAmD;AACnD,6DAAqC;AAGrC,SAAe,wBAAwB,CAAC,SAAc,EAAE,MAAc,EAAE,KAAa;;QACjF,MAAM,eAAe,GAAa,gBAAM,CAAC,QAAQ,CAAC,aAAa,CAAC,uBAAuB,IAAI,EAAE,CAAC;QAE9F,MAAM,WAAW,GAAG,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,0BAAe,CAAC,kBAAkB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC;QAClG,MAAM,eAAe,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;QAErF,MAAM,QAAQ,GAAG,MAAM,yBAAyB,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;QACnE,MAAM,WAAW,GAAG,CAAC,GAAG,QAAQ,EAAE,SAAS,CAAC,CAAC;QAG7C,OAAO,WAAW;aACjB,OAAO,CAAC,EAAE,CAAC,EAAE;YACV,OAAO,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,IAAI,OAAO,EAAE,EAAE,CAAC,CAAA;QAC3D,CAAC,CAAC;aACD,IAAI,CAAC,MAAM,CAAC,CAAC;IAClB,CAAC;CAAA;AAED;;;GAGG;AACH,SAAsB,yBAAyB,CAAC,OAAY,EAAE,SAAc,EAAE,MAAc,EAAE,KAAa;;QACvG,MAAM,kBAAkB,GAAG,MAAM,wBAAwB,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;QACpF,OAAO,WAAW,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC;IACpD,CAAC;CAAA;AAHD,8DAGC;AAED,SAAgB,WAAW,CAAC,GAAG,OAAkB;IAC7C,OAAO,OAAO;SACb,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,CAAC;SAC7D,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,MAAM,GAAG,CAAC;SAC5B,IAAI,CAAC,OAAO,CAAC,CAAC;AACnB,CAAC;AALD,kCAKC;AAED,SAAsB,yBAAyB,CAAC,QAAa,EAAE,KAAa;;QACxE,IAAI,CAAC,QAAQ;YAAE,OAAO,EAAE,CAAA;QACxB,IAAI,CAAC,0BAAe,CAAC,kBAAkB,CAAC,cAAc,EAAE,UAAU,CAAC;YAAE,OAAO,EAAE,CAAC;QAE/E,MAAM,WAAW,GAAG,IAAI,sBAAW,CAAC,KAAK,CAAC,CAAA;QAE1C,MAAM,aAAa,GAAG,MAAM,WAAW,CAAC,OAAO,CAAe,cAAc,EAAE;YAC1E,MAAM,EAAE,IAAI;YACZ,MAAM,EAAE,gBAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,QAAQ,CAAC;SAChD,CAAC,CAAA;QAEF,OAAO,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC9C,CAAC;CAAA;AAZD,8DAYC"}
|