bx-rest 1.4.0 → 1.5.1
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/CHANGELOG.md +126 -0
- package/README.en.md +3 -3
- package/README.md +3 -3
- package/esm2022/functions/errors.mjs +2 -1
- package/esm2022/functions/mapResult.mjs +4 -2
- package/esm2022/map/disk.mjs +13 -0
- package/esm2022/map/im/recent.mjs +1 -9
- package/esm2022/map/task.mjs +11 -5
- package/esm2022/map/tasks/task.mjs +3 -3
- package/esm2022/map/tasks.mjs +4 -3
- package/esm2022/map/user.mjs +5 -4
- package/esm2022/public-api.mjs +1 -1
- package/esm2022/request-navvy/bizproc.mjs +2 -2
- package/esm2022/request-navvy/crm/item.mjs +1 -1
- package/esm2022/request-navvy/crm/type.mjs +1 -1
- package/esm2022/request-navvy/pull/config.mjs +1 -3
- package/esm2022/request-navvy/task/operation/elapseditem.mjs +8 -65
- package/esm2022/rest/map.mjs +3 -3
- package/esm2022/services/base.mjs +7 -4
- package/esm2022/services/http/HttpBX.mjs +8 -3
- package/esm2022/services/navvy/extends/navvy-pag-base.mjs +78 -9
- package/esm2022/services/navvy/navvy-alternative-pagination-navigation.mjs +21 -71
- package/esm2022/services/navvy/navvy-pag-nav-result-key-object.mjs +12 -52
- package/esm2022/services/navvy/navvy-pag-nav-result-key.mjs +15 -71
- package/esm2022/services/navvy/navvy-pag-nav-tasks.mjs +5 -76
- package/esm2022/services/navvy/navvy-pag-nav-with-useless-key.mjs +10 -76
- package/esm2022/services/navvy/navvy-pag.mjs +7 -65
- package/esm2022/typification/rest/crm/universal.mjs +1 -1
- package/esm2022/typification/rest/settings.mjs +1 -1
- package/esm2022/typification/rest/user/user.mjs +1 -1
- package/fesm2022/bx-rest.mjs +507 -1653
- package/fesm2022/bx-rest.mjs.map +1 -1
- package/functions/errors.d.ts +1 -0
- package/map/disk.d.ts +10 -0
- package/map/task.d.ts +3 -3
- package/map/tasks/task.d.ts +1 -1
- package/map/tasks.d.ts +1 -1
- package/package.json +8 -2
- package/public-api.d.ts +5 -2
- package/request-navvy/crm/item.d.ts +6 -6
- package/request-navvy/crm/type.d.ts +6 -6
- package/request-navvy/pull/config.d.ts +0 -2
- package/rest/map.d.ts +2 -2
- package/services/navvy/extends/navvy-pag-base.d.ts +21 -1
- package/services/navvy/navvy-alternative-pagination-navigation.d.ts +5 -2
- package/services/navvy/navvy-pag-nav-result-key-object.d.ts +0 -2
- package/services/navvy/navvy-pag-nav-result-key.d.ts +1 -4
- package/services/navvy/navvy-pag-nav-tasks.d.ts +5 -9
- package/services/navvy/navvy-pag-nav-with-useless-key.d.ts +0 -2
- package/services/navvy/navvy-pag.d.ts +0 -2
- package/typification/rest/crm/universal.d.ts +116 -0
- package/typification/rest/settings.d.ts +1 -0
- package/typification/rest/user/user.d.ts +3 -3
|
@@ -1,10 +1,7 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { mergeMap, shareReplay } from 'rxjs';
|
|
2
2
|
import clone from 'just-clone';
|
|
3
|
-
import {
|
|
4
|
-
import { instanceOfiBXRestAnswerSuccess } from '../../functions/mapResult';
|
|
3
|
+
import { map } from 'rxjs/operators';
|
|
5
4
|
import { NavvyPagBase } from './extends/navvy-pag-base';
|
|
6
|
-
import { serializeBitrixParams } from '../../functions/serializeBitrixParams';
|
|
7
|
-
import { BXRest } from '../../rest/base';
|
|
8
5
|
/**
|
|
9
6
|
* Класс-прослойка-обработчик для методов работающих на альтернативной постраничной навигации тика как методы по
|
|
10
7
|
* затраченному времени на задачи https://dev.1c-bitrix.ru/rest_help/tasks/task/elapseditem/index.php
|
|
@@ -13,72 +10,25 @@ import { BXRest } from '../../rest/base';
|
|
|
13
10
|
*/
|
|
14
11
|
export class NavvyAlterPagNav extends NavvyPagBase {
|
|
15
12
|
resAll() {
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
.
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
return save;
|
|
23
|
-
}), last(), shareReplay(1));
|
|
13
|
+
return this.resFirstPage().pipe(mergeMap(first => this.resPages(first.next ? this.pageParams(first.total) : []).pipe(map(pages => {
|
|
14
|
+
const items = [first.result ?? [], ...pages].flat();
|
|
15
|
+
return ((this.map ? this.map(items) : items) ?? []);
|
|
16
|
+
}))),
|
|
17
|
+
// refCount: без подписчиков оставшиеся страницы запрашивать незачем
|
|
18
|
+
shareReplay({ bufferSize: 1, refCount: true }));
|
|
24
19
|
}
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
const batchRequests = chunks.map(chunk => {
|
|
38
|
-
return BXRestClass.batch({
|
|
39
|
-
halt: 1,
|
|
40
|
-
cmd: chunk.map(i => {
|
|
41
|
-
const param = clone(this.param);
|
|
42
|
-
if (!param.PARAMS) {
|
|
43
|
-
param.PARAMS = {
|
|
44
|
-
NAV_PARAMS: {
|
|
45
|
-
iNumPage: 0,
|
|
46
|
-
nPageSize: 50
|
|
47
|
-
}
|
|
48
|
-
};
|
|
49
|
-
}
|
|
50
|
-
// Устанавливаем start в зависимости от индекса
|
|
51
|
-
param.PARAMS.NAV_PARAMS.iNumPage = i + 2; // первая страница уже есть, старт со второй
|
|
52
|
-
// Формируем строку запроса
|
|
53
|
-
return this.http.getNameMethod(this.url)
|
|
54
|
-
+ '?' + serializeBitrixParams(param);
|
|
55
|
-
})
|
|
56
|
-
}, this.requestHeaders);
|
|
57
|
-
});
|
|
58
|
-
return from(batchRequests).pipe(concatMap(request => request), // Выполняет запросы по очереди
|
|
59
|
-
toArray(), // Собирает все результаты в массив
|
|
60
|
-
map(results => {
|
|
61
|
-
const res = items.result;
|
|
62
|
-
for (let result of results) {
|
|
63
|
-
if (result && instanceOfiBXRestAnswerSuccess(result) && result.result && result.result.result) {
|
|
64
|
-
res.push(...result.result.result.map(i => i).flat());
|
|
65
|
-
}
|
|
66
|
-
}
|
|
67
|
-
return (this.map) ?
|
|
68
|
-
this.map(res)
|
|
69
|
-
: res;
|
|
70
|
-
}));
|
|
71
|
-
}
|
|
72
|
-
}
|
|
73
|
-
return this.mapResultForGetAll(items);
|
|
74
|
-
}), catchError(err => {
|
|
75
|
-
// this.snackBar.error("Проблемы с поточным получение затреканого времени")
|
|
76
|
-
console.error(err);
|
|
77
|
-
return throwError(() => err);
|
|
78
|
-
}));
|
|
79
|
-
}
|
|
80
|
-
mapResultForGetAll(items) {
|
|
81
|
-
return (instanceOfiBXRestAnswerSuccess(items)) ? from([items.result]).pipe(map(v => (v && this.map) ? this.map(v) : v)) : from([]);
|
|
20
|
+
/**
|
|
21
|
+
* Параметры остальных страниц. Размер страницы берётся из запроса: портал ограничивает
|
|
22
|
+
* его 50 записями, но вызывающий код может попросить и меньше.
|
|
23
|
+
*/
|
|
24
|
+
pageParams(total = 0) {
|
|
25
|
+
const nav = this.param.PARAMS?.NAV_PARAMS;
|
|
26
|
+
const nPageSize = Math.min(nav?.nPageSize || this.pageSize, this.pageSize);
|
|
27
|
+
const pages = [];
|
|
28
|
+
for (let iNumPage = (nav?.iNumPage || 1) + 1; iNumPage <= Math.ceil(total / nPageSize); iNumPage++) {
|
|
29
|
+
pages.push({ ...clone(this.param), PARAMS: { ...this.param.PARAMS, NAV_PARAMS: { ...nav, nPageSize, iNumPage } } });
|
|
30
|
+
}
|
|
31
|
+
return pages;
|
|
82
32
|
}
|
|
83
33
|
}
|
|
84
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"navvy-alternative-pagination-navigation.js","sourceRoot":"","sources":["../../../../../projects/bx-rest/src/services/navvy/navvy-alternative-pagination-navigation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,MAAM,CAAA;AAExF,OAAO,KAAK,MAAM,YAAY,CAAA;AAC9B,OAAO,EAAE,UAAU,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAA;AAGhD,OAAO,EAAE,8BAA8B,EAAE,MAAM,2BAA2B,CAAA;AAC1E,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AACvD,OAAO,EAAE,qBAAqB,EAAE,MAAM,uCAAuC,CAAA;AAC7E,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AAExC;;;;;GAKG;AACH,MAAM,OAAO,gBAA+D,SAAQ,YAAyB;IAE3G,MAAM;QACJ,IAAI,IAAI,GAA4B,EAAE,CAAA;QACtC,OAAO,IAAI,CAAC,YAAY,EAAE;aACvB,IAAI,CACH,GAAG,CAAC,CAAC,CAAC,EAAE;YACJ,IAAI,CAAC,EAAE,CAAC;gBACN,IAAI,CAAC,IAAI,CAAC,GAAG,CAA4B,CAAC,CAAA;YAC5C,CAAC;YACD,OAAO,IAAI,CAAA;QACb,CAAC,CACF,EACD,IAAI,EAAE,EACN,WAAW,CAAC,CAAC,CAAC,CACf,CAAA;IACL,CAAC;IAEO,YAAY;QAClB,IAAI,WAAW,GAAG,IAAI,MAAM,EAAE,CAAA;QAC9B,uDAAuD;QACvD,OAAO,IAAI,CAAC,UAAU,EAAE,CAAC,IAAI,CAC3B,QAAQ,CACN,KAAK,CAAC,EAAE;YACN,IAAI,KAAK,IAAI,8BAA8B,CAAC,KAAK,CAAC,EAAE,CAAC;gBACnD,IAAI,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC;oBAC9B,MAAM,KAAK,GAAG,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAA;oBAExE,4BAA4B;oBAC5B,MAAM,MAAM,GAAG,EAAE,CAAA;oBAEjB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;wBACrD,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAA;oBAChD,CAAC;oBAED,MAAM,aAAa,GAAG,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;wBACvC,OAAO,WAAW,CAAC,KAAK,CAAQ;4BAC9B,IAAI,EAAE,CAAC;4BACP,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;gCACjB,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;gCAE/B,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;oCAClB,KAAK,CAAC,MAAM,GAAG;wCACb,UAAU,EAAE;4CACV,QAAQ,EAAE,CAAC;4CACX,SAAS,EAAE,EAAE;yCACd;qCACF,CAAA;gCACH,CAAC;gCAED,+CAA+C;gCAC/C,KAAK,CAAC,MAAO,CAAC,UAAU,CAAC,QAAQ,GAAG,CAAC,GAAG,CAAC,CAAA,CAAC,4CAA4C;gCAEtF,2BAA2B;gCAC3B,OAAO,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC;sCACpC,GAAG,GAAG,qBAAqB,CAAC,KAAK,CAAC,CAAA;4BACxC,CAAC,CAAC;yBACH,EAAE,IAAI,CAAC,cAAc,CAAC,CAAA;oBACzB,CAAC,CAAC,CAAA;oBAEF,OAAO,IAAI,CAAC,aAAa,CAAC,CAAC,IAAI,CAC7B,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE,+BAA+B;oBAC9D,OAAO,EAAE,EAAE,mCAAmC;oBAC9C,GAAG,CAAC,OAAO,CAAC,EAAE;wBACZ,MAAM,GAAG,GAAG,KAAK,CAAC,MAAa,CAAA;wBAC/B,KAAK,IAAI,MAAM,IAAI,OAAO,EAAE,CAAC;4BAC3B,IAAI,MAAM,IAAI,8BAA8B,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;gCAC9F,GAAG,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAA;4BACtD,CAAC;wBACH,CAAC;wBAED,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;4BACjB,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;4BACb,CAAC,CAAC,GAAG,CAAA;oBACT,CAAC,CAAC,CACH,CAAA;gBACH,CAAC;YACH,CAAC;YAED,OAAO,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAA;QACvC,CAAC,CACF,EACD,UAAU,CAAC,GAAG,CAAC,EAAE;YACf,2EAA2E;YAC3E,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAClB,OAAO,UAAU,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAA;QAC9B,CAAC,CAAC,CACH,CAAA;IACH,CAAC;IAEO,kBAAkB,CAAC,KAAqC;QAC9D,OAAO,CAAC,8BAA8B,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CACxE,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAC5C,CAAC,CAAC,CAAC,IAAI,CAAC,EAA6B,CAAC,CAAA;IACzC,CAAC;CACF","sourcesContent":["import { concatMap, from, last, mergeMap, shareReplay, throwError, toArray } from 'rxjs'\nimport { iBXRestAnswer } from '../../typification/rest/base/answer'\nimport clone from 'just-clone'\nimport { catchError, map } from 'rxjs/operators'\nimport { ReturnTypeNavvy } from './navvy-support'\nimport { iBXRestAlternativePagination } from '../../typification/rest/base/api-pagination-bx'\nimport { instanceOfiBXRestAnswerSuccess } from '../../functions/mapResult'\nimport { NavvyPagBase } from './extends/navvy-pag-base'\nimport { serializeBitrixParams } from '../../functions/serializeBitrixParams'\nimport { BXRest } from '../../rest/base'\n\n/**\n * Класс-прослойка-обработчик для методов работающих на альтернативной постраничной навигации тика как методы по\n * затраченному времени на задачи https://dev.1c-bitrix.ru/rest_help/tasks/task/elapseditem/index.php\n *\n * не завершенный класс, работаем от частного к общему\n */\nexport class NavvyAlterPagNav<T, R, P extends iBXRestAlternativePagination> extends NavvyPagBase<T[], R[], P> {\n\n  resAll() {\n    let save: ReturnTypeNavvy<T, R>[] = []\n    return this.resultAllEnd()\n      .pipe(\n        map(v => {\n            if (v) {\n              save.push(...v as ReturnTypeNavvy<T, R>[])\n            }\n            return save\n          }\n        ),\n        last(),\n        shareReplay(1)\n      )\n  }\n\n  private resultAllEnd() {\n    let BXRestClass = new BXRest()\n    // return  this.mapForVanillaEnd(this.func, this.param)\n    return this.resVanilla().pipe(\n      mergeMap(\n        items => {\n          if (items && instanceOfiBXRestAnswerSuccess(items)) {\n            if (items.total && items.next) {\n              const count = [...Array(Math.floor(items.total / this.pageSize)).keys()]\n\n              // Разделяем массив на блоки\n              const chunks = []\n\n              for (let i = 0; i < count.length; i += this.pageSize) {\n                chunks.push(count.slice(i, i + this.pageSize))\n              }\n\n              const batchRequests = chunks.map(chunk => {\n                return BXRestClass.batch<T[][]>({\n                  halt: 1,\n                  cmd: chunk.map(i => {\n                    const param = clone(this.param)\n\n                    if (!param.PARAMS) {\n                      param.PARAMS = {\n                        NAV_PARAMS: {\n                          iNumPage: 0,\n                          nPageSize: 50\n                        }\n                      }\n                    }\n\n                    // Устанавливаем start в зависимости от индекса\n                    param.PARAMS!.NAV_PARAMS.iNumPage = i + 2 // первая страница уже есть, старт со второй\n\n                    // Формируем строку запроса\n                    return this.http.getNameMethod(this.url)\n                      + '?' + serializeBitrixParams(param)\n                  })\n                }, this.requestHeaders)\n              })\n\n              return from(batchRequests).pipe(\n                concatMap(request => request), // Выполняет запросы по очереди\n                toArray(), // Собирает все результаты в массив\n                map(results => {\n                  const res = items.result as T[]\n                  for (let result of results) {\n                    if (result && instanceOfiBXRestAnswerSuccess(result) && result.result && result.result.result) {\n                      res.push(...result.result.result.map(i => i).flat())\n                    }\n                  }\n\n                  return (this.map) ?\n                    this.map(res)\n                    : res\n                })\n              )\n            }\n          }\n\n          return this.mapResultForGetAll(items)\n        }\n      ),\n      catchError(err => {\n        // this.snackBar.error(\"Проблемы с поточным получение затреканого времени\")\n        console.error(err)\n        return throwError(() => err)\n      })\n    )\n  }\n\n  private mapResultForGetAll(items: iBXRestAnswer<T[]> | undefined) {\n    return (instanceOfiBXRestAnswerSuccess(items)) ? from([items.result]).pipe(\n      map(v => (v && this.map) ? this.map(v) : v)\n    ) : from([] as ReturnTypeNavvy<T, R>[])\n  }\n}\n"]}
|
|
34
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibmF2dnktYWx0ZXJuYXRpdmUtcGFnaW5hdGlvbi1uYXZpZ2F0aW9uLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvYngtcmVzdC9zcmMvc2VydmljZXMvbmF2dnkvbmF2dnktYWx0ZXJuYXRpdmUtcGFnaW5hdGlvbi1uYXZpZ2F0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxRQUFRLEVBQUUsV0FBVyxFQUFFLE1BQU0sTUFBTSxDQUFBO0FBQzVDLE9BQU8sS0FBSyxNQUFNLFlBQVksQ0FBQTtBQUM5QixPQUFPLEVBQUUsR0FBRyxFQUFFLE1BQU0sZ0JBQWdCLENBQUE7QUFHcEMsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDBCQUEwQixDQUFBO0FBRXZEOzs7OztHQUtHO0FBQ0gsTUFBTSxPQUFPLGdCQUErRCxTQUFRLFlBQXlCO0lBRTNHLE1BQU07UUFDSixPQUFPLElBQUksQ0FBQyxZQUFZLEVBQUUsQ0FBQyxJQUFJLENBQzdCLFFBQVEsQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQU0sS0FBSyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FDdkYsR0FBRyxDQUFDLEtBQUssQ0FBQyxFQUFFO1lBQ1YsTUFBTSxLQUFLLEdBQUcsQ0FBQyxLQUFLLENBQUMsTUFBTSxJQUFJLEVBQUUsRUFBRSxHQUFHLEtBQUssQ0FBQyxDQUFDLElBQUksRUFBUyxDQUFBO1lBQzFELE9BQU8sQ0FBQyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxJQUFJLEVBQUUsQ0FBNEIsQ0FBQTtRQUNoRixDQUFDLENBQUMsQ0FDSCxDQUFDO1FBQ0Ysb0VBQW9FO1FBQ3BFLFdBQVcsQ0FBQyxFQUFFLFVBQVUsRUFBRSxDQUFDLEVBQUUsUUFBUSxFQUFFLElBQUksRUFBRSxDQUFDLENBQy9DLENBQUE7SUFDSCxDQUFDO0lBRUQ7OztPQUdHO0lBQ0ssVUFBVSxDQUFDLEtBQUssR0FBRyxDQUFDO1FBQzFCLE1BQU0sR0FBRyxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsTUFBTSxFQUFFLFVBQVUsQ0FBQTtRQUN6QyxNQUFNLFNBQVMsR0FBRyxJQUFJLENBQUMsR0FBRyxDQUFDLEdBQUcsRUFBRSxTQUFTLElBQUksSUFBSSxDQUFDLFFBQVEsRUFBRSxJQUFJLENBQUMsUUFBUSxDQUFDLENBQUE7UUFDMUUsTUFBTSxLQUFLLEdBQVEsRUFBRSxDQUFBO1FBRXJCLEtBQUssSUFBSSxRQUFRLEdBQUcsQ0FBQyxHQUFHLEVBQUUsUUFBUSxJQUFJLENBQUMsQ0FBQyxHQUFHLENBQUMsRUFBRSxRQUFRLElBQUksSUFBSSxDQUFDLElBQUksQ0FBQyxLQUFLLEdBQUcsU0FBUyxDQUFDLEVBQUUsUUFBUSxFQUFFLEVBQUUsQ0FBQztZQUNuRyxLQUFLLENBQUMsSUFBSSxDQUFDLEVBQUUsR0FBRyxLQUFLLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxFQUFFLE1BQU0sRUFBRSxFQUFFLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxNQUFNLEVBQUUsVUFBVSxFQUFFLEVBQUUsR0FBRyxHQUFHLEVBQUUsU0FBUyxFQUFFLFFBQVEsRUFBRSxFQUFFLEVBQUUsQ0FBQyxDQUFBO1FBQ3JILENBQUM7UUFDRCxPQUFPLEtBQUssQ0FBQTtJQUNkLENBQUM7Q0FDRiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IG1lcmdlTWFwLCBzaGFyZVJlcGxheSB9IGZyb20gJ3J4anMnXG5pbXBvcnQgY2xvbmUgZnJvbSAnanVzdC1jbG9uZSdcbmltcG9ydCB7IG1hcCB9IGZyb20gJ3J4anMvb3BlcmF0b3JzJ1xuaW1wb3J0IHsgUmV0dXJuVHlwZU5hdnZ5IH0gZnJvbSAnLi9uYXZ2eS1zdXBwb3J0J1xuaW1wb3J0IHsgaUJYUmVzdEFsdGVybmF0aXZlUGFnaW5hdGlvbiB9IGZyb20gJy4uLy4uL3R5cGlmaWNhdGlvbi9yZXN0L2Jhc2UvYXBpLXBhZ2luYXRpb24tYngnXG5pbXBvcnQgeyBOYXZ2eVBhZ0Jhc2UgfSBmcm9tICcuL2V4dGVuZHMvbmF2dnktcGFnLWJhc2UnXG5cbi8qKlxuICog0JrQu9Cw0YHRgS3Qv9GA0L7RgdC70L7QudC60LAt0L7QsdGA0LDQsdC+0YLRh9C40Log0LTQu9GPINC80LXRgtC+0LTQvtCyINGA0LDQsdC+0YLQsNGO0YnQuNGFINC90LAg0LDQu9GM0YLQtdGA0L3QsNGC0LjQstC90L7QuSDQv9C+0YHRgtGA0LDQvdC40YfQvdC+0Lkg0L3QsNCy0LjQs9Cw0YbQuNC4INGC0LjQutCwINC60LDQuiDQvNC10YLQvtC00Ysg0L/QvlxuICog0LfQsNGC0YDQsNGH0LXQvdC90L7QvNGDINCy0YDQtdC80LXQvdC4INC90LAg0LfQsNC00LDRh9C4IGh0dHBzOi8vZGV2LjFjLWJpdHJpeC5ydS9yZXN0X2hlbHAvdGFza3MvdGFzay9lbGFwc2VkaXRlbS9pbmRleC5waHBcbiAqXG4gKiDQvdC1INC30LDQstC10YDRiNC10L3QvdGL0Lkg0LrQu9Cw0YHRgSwg0YDQsNCx0L7RgtCw0LXQvCDQvtGCINGH0LDRgdGC0L3QvtCz0L4g0Log0L7QsdGJ0LXQvNGDXG4gKi9cbmV4cG9ydCBjbGFzcyBOYXZ2eUFsdGVyUGFnTmF2PFQsIFIsIFAgZXh0ZW5kcyBpQlhSZXN0QWx0ZXJuYXRpdmVQYWdpbmF0aW9uPiBleHRlbmRzIE5hdnZ5UGFnQmFzZTxUW10sIFJbXSwgUD4ge1xuXG4gIHJlc0FsbCgpIHtcbiAgICByZXR1cm4gdGhpcy5yZXNGaXJzdFBhZ2UoKS5waXBlKFxuICAgICAgbWVyZ2VNYXAoZmlyc3QgPT4gdGhpcy5yZXNQYWdlczxUW10+KGZpcnN0Lm5leHQgPyB0aGlzLnBhZ2VQYXJhbXMoZmlyc3QudG90YWwpIDogW10pLnBpcGUoXG4gICAgICAgIG1hcChwYWdlcyA9PiB7XG4gICAgICAgICAgY29uc3QgaXRlbXMgPSBbZmlyc3QucmVzdWx0ID8/IFtdLCAuLi5wYWdlc10uZmxhdCgpIGFzIFRbXVxuICAgICAgICAgIHJldHVybiAoKHRoaXMubWFwID8gdGhpcy5tYXAoaXRlbXMpIDogaXRlbXMpID8/IFtdKSBhcyBSZXR1cm5UeXBlTmF2dnk8VCwgUj5bXVxuICAgICAgICB9KVxuICAgICAgKSksXG4gICAgICAvLyByZWZDb3VudDog0LHQtdC3INC/0L7QtNC/0LjRgdGH0LjQutC+0LIg0L7RgdGC0LDQstGI0LjQtdGB0Y8g0YHRgtGA0LDQvdC40YbRiyDQt9Cw0L/RgNCw0YjQuNCy0LDRgtGMINC90LXQt9Cw0YfQtdC8XG4gICAgICBzaGFyZVJlcGxheSh7IGJ1ZmZlclNpemU6IDEsIHJlZkNvdW50OiB0cnVlIH0pXG4gICAgKVxuICB9XG5cbiAgLyoqXG4gICAqINCf0LDRgNCw0LzQtdGC0YDRiyDQvtGB0YLQsNC70YzQvdGL0YUg0YHRgtGA0LDQvdC40YYuINCg0LDQt9C80LXRgCDRgdGC0YDQsNC90LjRhtGLINCx0LXRgNGR0YLRgdGPINC40Lcg0LfQsNC/0YDQvtGB0LA6INC/0L7RgNGC0LDQuyDQvtCz0YDQsNC90LjRh9C40LLQsNC10YJcbiAgICog0LXQs9C+IDUwINC30LDQv9C40YHRj9C80LgsINC90L4g0LLRi9C30YvQstCw0Y7RidC40Lkg0LrQvtC0INC80L7QttC10YIg0L/QvtC/0YDQvtGB0LjRgtGMINC4INC80LXQvdGM0YjQtS5cbiAgICovXG4gIHByaXZhdGUgcGFnZVBhcmFtcyh0b3RhbCA9IDApOiBQW10ge1xuICAgIGNvbnN0IG5hdiA9IHRoaXMucGFyYW0uUEFSQU1TPy5OQVZfUEFSQU1TXG4gICAgY29uc3QgblBhZ2VTaXplID0gTWF0aC5taW4obmF2Py5uUGFnZVNpemUgfHwgdGhpcy5wYWdlU2l6ZSwgdGhpcy5wYWdlU2l6ZSlcbiAgICBjb25zdCBwYWdlczogUFtdID0gW11cblxuICAgIGZvciAobGV0IGlOdW1QYWdlID0gKG5hdj8uaU51bVBhZ2UgfHwgMSkgKyAxOyBpTnVtUGFnZSA8PSBNYXRoLmNlaWwodG90YWwgLyBuUGFnZVNpemUpOyBpTnVtUGFnZSsrKSB7XG4gICAgICBwYWdlcy5wdXNoKHsgLi4uY2xvbmUodGhpcy5wYXJhbSksIFBBUkFNUzogeyAuLi50aGlzLnBhcmFtLlBBUkFNUywgTkFWX1BBUkFNUzogeyAuLi5uYXYsIG5QYWdlU2l6ZSwgaU51bVBhZ2UgfSB9IH0pXG4gICAgfVxuICAgIHJldHVybiBwYWdlc1xuICB9XG59XG4iXX0=
|
|
@@ -1,60 +1,20 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
import
|
|
4
|
-
import { instanceOfiBXRestAnswerSuccess } from '../../functions/mapResult';
|
|
5
|
-
import { serializeBitrixParams } from '../../functions/serializeBitrixParams';
|
|
6
|
-
import { BXRest } from '../../rest/base';
|
|
7
|
-
import { NavvyPagBase } from './extends/navvy-pag-base';
|
|
1
|
+
import { mergeMap, shareReplay } from 'rxjs';
|
|
2
|
+
import { map } from 'rxjs/operators';
|
|
3
|
+
import { NavvyPagBase, offsetPageParams } from './extends/navvy-pag-base';
|
|
8
4
|
/** Пагинация для методов, возвращающих коллекцию как объект с идентификаторами в ключах. */
|
|
9
5
|
export class NavvyPagNavResultKeyObject extends NavvyPagBase {
|
|
10
6
|
constructor(url, param, key, mapResult) {
|
|
11
|
-
|
|
7
|
+
// Без своего map результат — значения объекта по ключу, как и обещают типы `.res()` и `.resAll()`.
|
|
8
|
+
super(url, param, mapResult ?? (result => Object.values(result?.[key] ?? {})));
|
|
12
9
|
this.key = key;
|
|
13
10
|
}
|
|
14
11
|
resAll() {
|
|
15
|
-
return this.
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
return from([]);
|
|
22
|
-
}
|
|
23
|
-
if (!items.total || items.total <= this.pageSize) {
|
|
24
|
-
return this.mapResult(items);
|
|
25
|
-
}
|
|
26
|
-
const pageCount = Math.ceil(items.total / this.pageSize);
|
|
27
|
-
const commands = Array.from({ length: pageCount - 1 }, (_, index) => {
|
|
28
|
-
const param = clone(this.param);
|
|
29
|
-
param.start = (index + 1) * this.pageSize;
|
|
30
|
-
return bxRest.batch({
|
|
31
|
-
halt: 1,
|
|
32
|
-
cmd: [this.http.getNameMethod(this.url) + '?' + serializeBitrixParams(param)]
|
|
33
|
-
}, this.requestHeaders);
|
|
34
|
-
});
|
|
35
|
-
return from(commands).pipe(concatMap(request => request), toArray(), mergeMap(results => {
|
|
36
|
-
const merged = { ...(items.result?.[this.key] ?? {}) };
|
|
37
|
-
for (const result of results) {
|
|
38
|
-
if (result && instanceOfiBXRestAnswerSuccess(result)) {
|
|
39
|
-
for (const page of result.result?.result ?? []) {
|
|
40
|
-
Object.assign(merged, page?.[this.key] ?? {});
|
|
41
|
-
}
|
|
42
|
-
}
|
|
43
|
-
}
|
|
44
|
-
return this.mapResult({ [this.key]: merged });
|
|
45
|
-
}));
|
|
46
|
-
}), catchError(error => {
|
|
47
|
-
console.error(error);
|
|
48
|
-
return throwError(() => error);
|
|
49
|
-
}));
|
|
50
|
-
}
|
|
51
|
-
mapResult(items) {
|
|
52
|
-
if (!instanceOfiBXRestAnswerSuccess(items)) {
|
|
53
|
-
return from([]);
|
|
54
|
-
}
|
|
55
|
-
return from([items.result]).pipe(map(value => this.map
|
|
56
|
-
? this.map(value)
|
|
57
|
-
: Object.values(value?.[this.key] ?? {})));
|
|
12
|
+
return this.resFirstPage().pipe(mergeMap(first => this.resPages(offsetPageParams(this.param, first.total, this.pageSize)).pipe(map(pages => {
|
|
13
|
+
const merged = Object.assign({}, first.result?.[this.key], ...pages.map(page => page[this.key]));
|
|
14
|
+
return this.map?.({ ...first.result, [this.key]: merged });
|
|
15
|
+
}))),
|
|
16
|
+
// refCount: без подписчиков оставшиеся страницы запрашивать незачем
|
|
17
|
+
shareReplay({ bufferSize: 1, refCount: true }));
|
|
58
18
|
}
|
|
59
19
|
}
|
|
60
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
20
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibmF2dnktcGFnLW5hdi1yZXN1bHQta2V5LW9iamVjdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL2J4LXJlc3Qvc3JjL3NlcnZpY2VzL25hdnZ5L25hdnZ5LXBhZy1uYXYtcmVzdWx0LWtleS1vYmplY3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFFBQVEsRUFBRSxXQUFXLEVBQUUsTUFBTSxNQUFNLENBQUE7QUFDNUMsT0FBTyxFQUFFLEdBQUcsRUFBRSxNQUFNLGdCQUFnQixDQUFBO0FBRXBDLE9BQU8sRUFBRSxZQUFZLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQTtBQUl6RSw0RkFBNEY7QUFDNUYsTUFBTSxPQUFPLDBCQUtYLFNBQVEsWUFBNkM7SUFDckQsWUFDRSxHQUFhLEVBQ2IsS0FBUSxFQUNTLEdBQU0sRUFDdkIsU0FBMkU7UUFFM0UsbUdBQW1HO1FBQ25HLEtBQUssQ0FBQyxHQUFHLEVBQUUsS0FBSyxFQUFFLFNBQVMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxNQUFNLEVBQUUsQ0FBQyxHQUFHLENBQUMsSUFBSSxFQUFFLENBQW1CLENBQUMsQ0FBQyxDQUFBO1FBSi9FLFFBQUcsR0FBSCxHQUFHLENBQUc7SUFLekIsQ0FBQztJQUVELE1BQU07UUFDSixPQUFPLElBQUksQ0FBQyxZQUFZLEVBQUUsQ0FBQyxJQUFJLENBQzdCLFFBQVEsQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQTBCLGdCQUFnQixDQUFDLElBQUksQ0FBQyxLQUFLLEVBQUUsS0FBSyxDQUFDLEtBQUssRUFBRSxJQUFJLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQ3JILEdBQUcsQ0FBQyxLQUFLLENBQUMsRUFBRTtZQUNWLE1BQU0sTUFBTSxHQUFHLE1BQU0sQ0FBQyxNQUFNLENBQUMsRUFBRSxFQUFFLEtBQUssQ0FBQyxNQUFNLEVBQUUsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLEVBQUUsR0FBRyxLQUFLLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUE7WUFDaEcsT0FBTyxJQUFJLENBQUMsR0FBRyxFQUFFLENBQUMsRUFBRSxHQUFHLEtBQUssQ0FBQyxNQUFNLEVBQUUsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLEVBQUUsTUFBTSxFQUE2QixDQUFDLENBQUE7UUFDdkYsQ0FBQyxDQUFDLENBQ0gsQ0FBQztRQUNGLG9FQUFvRTtRQUNwRSxXQUFXLENBQUMsRUFBRSxVQUFVLEVBQUUsQ0FBQyxFQUFFLFFBQVEsRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUMvQyxDQUFBO0lBQ0gsQ0FBQztDQUNGIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgbWVyZ2VNYXAsIHNoYXJlUmVwbGF5IH0gZnJvbSAncnhqcydcbmltcG9ydCB7IG1hcCB9IGZyb20gJ3J4anMvb3BlcmF0b3JzJ1xuaW1wb3J0IHsgaUJYUmVzdFBhZ2luYXRpb24gfSBmcm9tICcuLi8uLi90eXBpZmljYXRpb24vcmVzdC9iYXNlL2FwaS1wYWdpbmF0aW9uLWJ4J1xuaW1wb3J0IHsgTmF2dnlQYWdCYXNlLCBvZmZzZXRQYWdlUGFyYW1zIH0gZnJvbSAnLi9leHRlbmRzL25hdnZ5LXBhZy1iYXNlJ1xuXG50eXBlIEtleWVkT2JqZWN0UmVzdWx0PEsgZXh0ZW5kcyBzdHJpbmcsIFQ+ID0gUmVjb3JkPEssIFJlY29yZDxzdHJpbmcsIFQ+IHwgdW5kZWZpbmVkPlxuXG4vKiog0J/QsNCz0LjQvdCw0YbQuNGPINC00LvRjyDQvNC10YLQvtC00L7Qsiwg0LLQvtC30LLRgNCw0YnQsNGO0YnQuNGFINC60L7Qu9C70LXQutGG0LjRjiDQutCw0Log0L7QsdGK0LXQutGCINGBINC40LTQtdC90YLQuNGE0LjQutCw0YLQvtGA0LDQvNC4INCyINC60LvRjtGH0LDRhS4gKi9cbmV4cG9ydCBjbGFzcyBOYXZ2eVBhZ05hdlJlc3VsdEtleU9iamVjdDxcbiAgVCxcbiAgUixcbiAgUCBleHRlbmRzIGlCWFJlc3RQYWdpbmF0aW9uLFxuICBLIGV4dGVuZHMgc3RyaW5nXG4+IGV4dGVuZHMgTmF2dnlQYWdCYXNlPEtleWVkT2JqZWN0UmVzdWx0PEssIFQ+LCBSW10sIFA+IHtcbiAgY29uc3RydWN0b3IoXG4gICAgdXJsOiBzdHJpbmdbXSxcbiAgICBwYXJhbTogUCxcbiAgICBwcml2YXRlIHJlYWRvbmx5IGtleTogSyxcbiAgICBtYXBSZXN1bHQ/OiAocGFyYW06IEtleWVkT2JqZWN0UmVzdWx0PEssIFQ+IHwgdW5kZWZpbmVkKSA9PiBSW10gfCB1bmRlZmluZWRcbiAgKSB7XG4gICAgLy8g0JHQtdC3INGB0LLQvtC10LPQviBtYXAg0YDQtdC30YPQu9GM0YLQsNGCIOKAlCDQt9C90LDRh9C10L3QuNGPINC+0LHRitC10LrRgtCwINC/0L4g0LrQu9GO0YfRgywg0LrQsNC6INC4INC+0LHQtdGJ0LDRjtGCINGC0LjQv9GLIGAucmVzKClgINC4IGAucmVzQWxsKClgLlxuICAgIHN1cGVyKHVybCwgcGFyYW0sIG1hcFJlc3VsdCA/PyAocmVzdWx0ID0+IE9iamVjdC52YWx1ZXMocmVzdWx0Py5ba2V5XSA/PyB7fSkgYXMgdW5rbm93biBhcyBSW10pKVxuICB9XG5cbiAgcmVzQWxsKCkge1xuICAgIHJldHVybiB0aGlzLnJlc0ZpcnN0UGFnZSgpLnBpcGUoXG4gICAgICBtZXJnZU1hcChmaXJzdCA9PiB0aGlzLnJlc1BhZ2VzPEtleWVkT2JqZWN0UmVzdWx0PEssIFQ+PihvZmZzZXRQYWdlUGFyYW1zKHRoaXMucGFyYW0sIGZpcnN0LnRvdGFsLCB0aGlzLnBhZ2VTaXplKSkucGlwZShcbiAgICAgICAgbWFwKHBhZ2VzID0+IHtcbiAgICAgICAgICBjb25zdCBtZXJnZWQgPSBPYmplY3QuYXNzaWduKHt9LCBmaXJzdC5yZXN1bHQ/Llt0aGlzLmtleV0sIC4uLnBhZ2VzLm1hcChwYWdlID0+IHBhZ2VbdGhpcy5rZXldKSlcbiAgICAgICAgICByZXR1cm4gdGhpcy5tYXA/Lih7IC4uLmZpcnN0LnJlc3VsdCwgW3RoaXMua2V5XTogbWVyZ2VkIH0gYXMgS2V5ZWRPYmplY3RSZXN1bHQ8SywgVD4pXG4gICAgICAgIH0pXG4gICAgICApKSxcbiAgICAgIC8vIHJlZkNvdW50OiDQsdC10Lcg0L/QvtC00L/QuNGB0YfQuNC60L7QsiDQvtGB0YLQsNCy0YjQuNC10YHRjyDRgdGC0YDQsNC90LjRhtGLINC30LDQv9GA0LDRiNC40LLQsNGC0Ywg0L3QtdC30LDRh9C10LxcbiAgICAgIHNoYXJlUmVwbGF5KHsgYnVmZmVyU2l6ZTogMSwgcmVmQ291bnQ6IHRydWUgfSlcbiAgICApXG4gIH1cbn1cbiJdfQ==
|
|
@@ -1,77 +1,21 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
import
|
|
4
|
-
import { instanceOfiBXRestAnswerSuccess } from '../../functions/mapResult';
|
|
5
|
-
import { NavvyPagBase } from './extends/navvy-pag-base';
|
|
6
|
-
import { serializeBitrixParams } from '../../functions/serializeBitrixParams';
|
|
7
|
-
import { BXRest } from '../../rest/base';
|
|
1
|
+
import { mergeMap, shareReplay } from 'rxjs';
|
|
2
|
+
import { map } from 'rxjs/operators';
|
|
3
|
+
import { NavvyPagBase, offsetPageParams } from './extends/navvy-pag-base';
|
|
8
4
|
export class NavvyPagNavResultKey extends NavvyPagBase {
|
|
9
|
-
constructor(url, param, key, map) {
|
|
10
|
-
|
|
5
|
+
constructor(url, param, key, map, restApi) {
|
|
6
|
+
// Без своего map результат — массив по ключу, как и обещают типы `.res()` и `.resAll()`.
|
|
7
|
+
// Иначе `.res()` отдал бы весь объект `{ items: [...] }`.
|
|
8
|
+
super(url, param, map ?? (result => (result?.[key] ?? [])), restApi);
|
|
11
9
|
this.key = key;
|
|
12
|
-
this.save = [];
|
|
13
10
|
}
|
|
14
11
|
resAll() {
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
.
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
}), last(), shareReplay(1));
|
|
23
|
-
}
|
|
24
|
-
resultAllEnd() {
|
|
25
|
-
let BXRestClass = new BXRest();
|
|
26
|
-
return this.resVanilla().pipe(mergeMap(items => {
|
|
27
|
-
if (items && instanceOfiBXRestAnswerSuccess(items)) {
|
|
28
|
-
this.save = [];
|
|
29
|
-
if (items.total && items.total > 50) {
|
|
30
|
-
const mathFloor = Math.floor(items.total / this.pageSize);
|
|
31
|
-
const count = (mathFloor === items.total / this.pageSize)
|
|
32
|
-
? [...Array(mathFloor - 1).keys()]
|
|
33
|
-
: [...Array(mathFloor).keys()];
|
|
34
|
-
const chunks = [];
|
|
35
|
-
for (let i = 0; i < count.length; i += this.pageSize) {
|
|
36
|
-
chunks.push(count.slice(i, i + this.pageSize));
|
|
37
|
-
}
|
|
38
|
-
const batchRequests = chunks.map(chunk => {
|
|
39
|
-
return BXRestClass.batch({
|
|
40
|
-
halt: 1,
|
|
41
|
-
cmd: chunk.map(i => {
|
|
42
|
-
const param = clone(this.param);
|
|
43
|
-
param.start = (i + 1) * this.pageSize;
|
|
44
|
-
return this.http.getNameMethod(this.url)
|
|
45
|
-
+ '?' + serializeBitrixParams(param);
|
|
46
|
-
})
|
|
47
|
-
}, this.requestHeaders);
|
|
48
|
-
});
|
|
49
|
-
return from(batchRequests).pipe(concatMap(request => request), toArray(), map(results => {
|
|
50
|
-
const firstPage = items.result?.[this.key];
|
|
51
|
-
if (firstPage) {
|
|
52
|
-
const res = firstPage;
|
|
53
|
-
for (let result of results) {
|
|
54
|
-
if (result && instanceOfiBXRestAnswerSuccess(result) && result.result && result.result.result) {
|
|
55
|
-
res.push(...result.result.result.filter(i => i).map(i => i[this.key]).flat());
|
|
56
|
-
}
|
|
57
|
-
}
|
|
58
|
-
return (this.map) ?
|
|
59
|
-
this.map({ [this.key]: res })
|
|
60
|
-
: res;
|
|
61
|
-
}
|
|
62
|
-
throw new Error('wrong batch');
|
|
63
|
-
}));
|
|
64
|
-
}
|
|
65
|
-
return this.mapResForGetAll(items);
|
|
66
|
-
}
|
|
67
|
-
return this.mapResForGetAll(items);
|
|
68
|
-
}), catchError(err => {
|
|
69
|
-
console.error(err);
|
|
70
|
-
return throwError(() => err);
|
|
71
|
-
}));
|
|
72
|
-
}
|
|
73
|
-
mapResForGetAll(items) {
|
|
74
|
-
return (instanceOfiBXRestAnswerSuccess(items)) ? from([items.result]).pipe(map(v => (v && this.map) ? this.map(v) : v)) : from([]);
|
|
12
|
+
return this.resFirstPage().pipe(mergeMap(first => this.resPages(offsetPageParams(this.param, first.total, this.pageSize)).pipe(map(pages => {
|
|
13
|
+
const items = [first.result, ...pages].flatMap(page => page?.[this.key] ?? []);
|
|
14
|
+
const joined = { ...first.result, [this.key]: items };
|
|
15
|
+
return (this.map?.(joined) ?? []);
|
|
16
|
+
}))),
|
|
17
|
+
// refCount: без подписчиков оставшиеся страницы запрашивать незачем
|
|
18
|
+
shareReplay({ bufferSize: 1, refCount: true }));
|
|
75
19
|
}
|
|
76
20
|
}
|
|
77
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"navvy-pag-nav-result-key.js","sourceRoot":"","sources":["../../../../../projects/bx-rest/src/services/navvy/navvy-pag-nav-result-key.ts"],"names":[],"mappings":"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","sourcesContent":["import { concatMap, from, last, mergeMap, shareReplay, throwError, toArray } from 'rxjs'\nimport { catchError, map } from 'rxjs/operators'\nimport clone from 'just-clone'\nimport { iBXRestPagination } from '../../typification/rest/base/api-pagination-bx'\nimport { ReturnTypeNavvy } from './navvy-support'\nimport { iBXRestAnswer } from '../../typification/rest/base/answer'\nimport { instanceOfiBXRestAnswerSuccess } from '../../functions/mapResult'\nimport { NavvyPagBase } from './extends/navvy-pag-base'\nimport { serializeBitrixParams } from '../../functions/serializeBitrixParams'\nimport { BXRest } from '../../rest/base'\n\ntype KeyedResult<K extends string, T> = Record<K, T[] | undefined>\n\nexport class NavvyPagNavResultKey<T, R, P extends iBXRestPagination, K extends string>\n  extends NavvyPagBase<KeyedResult<K, T>, R[], P> {\n\n  save: ReturnTypeNavvy<T, R>[] = []\n\n  constructor(\n    url: string[],\n    param: P,\n    private readonly key: K,\n    map?: (param: KeyedResult<K, T> | undefined) => R[] | undefined\n  ) {\n    super(url, param, map)\n  }\n\n  resAll() {\n    let save: ReturnTypeNavvy<T, R>[] = []\n    return this.resultAllEnd()\n      .pipe(\n        map(v => {\n            if (v) {\n              save.push(...v as ReturnTypeNavvy<T, R>[])\n            }\n            return save\n          }\n        ),\n        last(),\n        shareReplay(1)\n      )\n  }\n\n  private resultAllEnd() {\n    let BXRestClass = new BXRest()\n    return this.resVanilla().pipe(\n      mergeMap(\n        items => {\n          if (items && instanceOfiBXRestAnswerSuccess(items)) {\n            this.save = []\n            if (items.total && items.total > 50) {\n              const mathFloor = Math.floor(items.total / this.pageSize)\n              const count = (mathFloor === items.total / this.pageSize)\n                ? [...Array(mathFloor - 1).keys()]\n                : [...Array(mathFloor).keys()]\n              const chunks = []\n\n              for (let i = 0; i < count.length; i += this.pageSize) {\n                chunks.push(count.slice(i, i + this.pageSize))\n              }\n\n              const batchRequests = chunks.map(chunk => {\n                return BXRestClass.batch<KeyedResult<K, T>[]>({\n                  halt: 1,\n                  cmd: chunk.map(i => {\n                    const param = clone(this.param)\n                    param.start = (i + 1) * this.pageSize\n\n                    return this.http.getNameMethod(this.url)\n                      + '?' + serializeBitrixParams(param)\n                  })\n                }, this.requestHeaders)\n              })\n\n              return from(batchRequests).pipe(\n                concatMap(request => request),\n                toArray(),\n                map(results => {\n                  const firstPage = items.result?.[this.key]\n                  if (firstPage) {\n                    const res = firstPage as T[]\n\n                    for (let result of results) {\n                      if (result && instanceOfiBXRestAnswerSuccess(result) && result.result && result.result.result) {\n                        res.push(...result.result.result.filter(i => i).map(i => i[this.key]).flat() as T[])\n                      }\n                    }\n\n                    return (this.map) ?\n                      this.map({ [this.key]: res } as KeyedResult<K, T>)\n                      : res\n                  }\n\n                  throw new Error('wrong batch')\n                })\n              )\n            }\n\n            return this.mapResForGetAll(items)\n          }\n          return this.mapResForGetAll(items)\n        }\n      ),\n      catchError(err => {\n        console.error(err)\n        return throwError(() => err)\n      })\n    )\n  }\n\n  private mapResForGetAll(items: iBXRestAnswer<KeyedResult<K, T>> | undefined) {\n    return (instanceOfiBXRestAnswerSuccess(items)) ? from([items.result]).pipe(\n      map(v => (v && this.map) ? this.map(v) : v)\n    ) : from([])\n  }\n}\n"]}
|
|
21
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibmF2dnktcGFnLW5hdi1yZXN1bHQta2V5LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvYngtcmVzdC9zcmMvc2VydmljZXMvbmF2dnkvbmF2dnktcGFnLW5hdi1yZXN1bHQta2V5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxRQUFRLEVBQUUsV0FBVyxFQUFFLE1BQU0sTUFBTSxDQUFBO0FBQzVDLE9BQU8sRUFBRSxHQUFHLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQTtBQUdwQyxPQUFPLEVBQUUsWUFBWSxFQUFFLGdCQUFnQixFQUFFLE1BQU0sMEJBQTBCLENBQUE7QUFJekUsTUFBTSxPQUFPLG9CQUNYLFNBQVEsWUFBdUM7SUFFL0MsWUFDRSxHQUFhLEVBQ2IsS0FBUSxFQUNTLEdBQU0sRUFDdkIsR0FBK0QsRUFDL0QsT0FBaUI7UUFFakIseUZBQXlGO1FBQ3pGLDBEQUEwRDtRQUMxRCxLQUFLLENBQUMsR0FBRyxFQUFFLEtBQUssRUFBRSxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLENBQUMsTUFBTSxFQUFFLENBQUMsR0FBRyxDQUFDLElBQUksRUFBRSxDQUFtQixDQUFDLEVBQUUsT0FBTyxDQUFDLENBQUE7UUFOckUsUUFBRyxHQUFILEdBQUcsQ0FBRztJQU96QixDQUFDO0lBRUQsTUFBTTtRQUNKLE9BQU8sSUFBSSxDQUFDLFlBQVksRUFBRSxDQUFDLElBQUksQ0FDN0IsUUFBUSxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBb0IsZ0JBQWdCLENBQUMsSUFBSSxDQUFDLEtBQUssRUFBRSxLQUFLLENBQUMsS0FBSyxFQUFFLElBQUksQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FDL0csR0FBRyxDQUFDLEtBQUssQ0FBQyxFQUFFO1lBQ1YsTUFBTSxLQUFLLEdBQUcsQ0FBQyxLQUFLLENBQUMsTUFBTSxFQUFFLEdBQUcsS0FBSyxDQUFDLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsSUFBSSxFQUFFLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxJQUFJLEVBQUUsQ0FBUSxDQUFBO1lBQ3JGLE1BQU0sTUFBTSxHQUFHLEVBQUUsR0FBRyxLQUFLLENBQUMsTUFBTSxFQUFFLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFLEtBQUssRUFBdUIsQ0FBQTtZQUMxRSxPQUFPLENBQUMsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDLE1BQU0sQ0FBQyxJQUFJLEVBQUUsQ0FBNEIsQ0FBQTtRQUM5RCxDQUFDLENBQUMsQ0FDSCxDQUFDO1FBQ0Ysb0VBQW9FO1FBQ3BFLFdBQVcsQ0FBQyxFQUFFLFVBQVUsRUFBRSxDQUFDLEVBQUUsUUFBUSxFQUFFLElBQUksRUFBRSxDQUFDLENBQy9DLENBQUE7SUFDSCxDQUFDO0NBQ0YiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBtZXJnZU1hcCwgc2hhcmVSZXBsYXkgfSBmcm9tICdyeGpzJ1xuaW1wb3J0IHsgbWFwIH0gZnJvbSAncnhqcy9vcGVyYXRvcnMnXG5pbXBvcnQgeyBpQlhSZXN0UGFnaW5hdGlvbiB9IGZyb20gJy4uLy4uL3R5cGlmaWNhdGlvbi9yZXN0L2Jhc2UvYXBpLXBhZ2luYXRpb24tYngnXG5pbXBvcnQgeyBSZXR1cm5UeXBlTmF2dnkgfSBmcm9tICcuL25hdnZ5LXN1cHBvcnQnXG5pbXBvcnQgeyBOYXZ2eVBhZ0Jhc2UsIG9mZnNldFBhZ2VQYXJhbXMgfSBmcm9tICcuL2V4dGVuZHMvbmF2dnktcGFnLWJhc2UnXG5cbnR5cGUgS2V5ZWRSZXN1bHQ8SyBleHRlbmRzIHN0cmluZywgVD4gPSBSZWNvcmQ8SywgVFtdIHwgdW5kZWZpbmVkPlxuXG5leHBvcnQgY2xhc3MgTmF2dnlQYWdOYXZSZXN1bHRLZXk8VCwgUiwgUCBleHRlbmRzIGlCWFJlc3RQYWdpbmF0aW9uLCBLIGV4dGVuZHMgc3RyaW5nPlxuICBleHRlbmRzIE5hdnZ5UGFnQmFzZTxLZXllZFJlc3VsdDxLLCBUPiwgUltdLCBQPiB7XG5cbiAgY29uc3RydWN0b3IoXG4gICAgdXJsOiBzdHJpbmdbXSxcbiAgICBwYXJhbTogUCxcbiAgICBwcml2YXRlIHJlYWRvbmx5IGtleTogSyxcbiAgICBtYXA/OiAocGFyYW06IEtleWVkUmVzdWx0PEssIFQ+IHwgdW5kZWZpbmVkKSA9PiBSW10gfCB1bmRlZmluZWQsXG4gICAgcmVzdEFwaT86IGJvb2xlYW5cbiAgKSB7XG4gICAgLy8g0JHQtdC3INGB0LLQvtC10LPQviBtYXAg0YDQtdC30YPQu9GM0YLQsNGCIOKAlCDQvNCw0YHRgdC40LIg0L/QviDQutC70Y7Rh9GDLCDQutCw0Log0Lgg0L7QsdC10YnQsNGO0YIg0YLQuNC/0YsgYC5yZXMoKWAg0LggYC5yZXNBbGwoKWAuXG4gICAgLy8g0JjQvdCw0YfQtSBgLnJlcygpYCDQvtGC0LTQsNC7INCx0Ysg0LLQtdGB0Ywg0L7QsdGK0LXQutGCIGB7IGl0ZW1zOiBbLi4uXSB9YC5cbiAgICBzdXBlcih1cmwsIHBhcmFtLCBtYXAgPz8gKHJlc3VsdCA9PiAocmVzdWx0Py5ba2V5XSA/PyBbXSkgYXMgdW5rbm93biBhcyBSW10pLCByZXN0QXBpKVxuICB9XG5cbiAgcmVzQWxsKCkge1xuICAgIHJldHVybiB0aGlzLnJlc0ZpcnN0UGFnZSgpLnBpcGUoXG4gICAgICBtZXJnZU1hcChmaXJzdCA9PiB0aGlzLnJlc1BhZ2VzPEtleWVkUmVzdWx0PEssIFQ+PihvZmZzZXRQYWdlUGFyYW1zKHRoaXMucGFyYW0sIGZpcnN0LnRvdGFsLCB0aGlzLnBhZ2VTaXplKSkucGlwZShcbiAgICAgICAgbWFwKHBhZ2VzID0+IHtcbiAgICAgICAgICBjb25zdCBpdGVtcyA9IFtmaXJzdC5yZXN1bHQsIC4uLnBhZ2VzXS5mbGF0TWFwKHBhZ2UgPT4gcGFnZT8uW3RoaXMua2V5XSA/PyBbXSkgYXMgVFtdXG4gICAgICAgICAgY29uc3Qgam9pbmVkID0geyAuLi5maXJzdC5yZXN1bHQsIFt0aGlzLmtleV06IGl0ZW1zIH0gYXMgS2V5ZWRSZXN1bHQ8SywgVD5cbiAgICAgICAgICByZXR1cm4gKHRoaXMubWFwPy4oam9pbmVkKSA/PyBbXSkgYXMgUmV0dXJuVHlwZU5hdnZ5PFQsIFI+W11cbiAgICAgICAgfSlcbiAgICAgICkpLFxuICAgICAgLy8gcmVmQ291bnQ6INCx0LXQtyDQv9C+0LTQv9C40YHRh9C40LrQvtCyINC+0YHRgtCw0LLRiNC40LXRgdGPINGB0YLRgNCw0L3QuNGG0Ysg0LfQsNC/0YDQsNGI0LjQstCw0YLRjCDQvdC10LfQsNGH0LXQvFxuICAgICAgc2hhcmVSZXBsYXkoeyBidWZmZXJTaXplOiAxLCByZWZDb3VudDogdHJ1ZSB9KVxuICAgIClcbiAgfVxufVxuIl19
|
|
@@ -1,78 +1,7 @@
|
|
|
1
|
-
import {
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
import { NavvyPagBase } from './extends/navvy-pag-base';
|
|
6
|
-
import { serializeBitrixParams } from '../../functions/serializeBitrixParams';
|
|
7
|
-
import { BXRest } from '../../rest/base';
|
|
8
|
-
export class NavvyPagNavTasks extends NavvyPagBase {
|
|
9
|
-
constructor() {
|
|
10
|
-
super(...arguments);
|
|
11
|
-
this.save = [];
|
|
12
|
-
}
|
|
13
|
-
resAll() {
|
|
14
|
-
let save = [];
|
|
15
|
-
return this.resultAllEnd()
|
|
16
|
-
.pipe(map(v => {
|
|
17
|
-
if (v) {
|
|
18
|
-
save.push(...v);
|
|
19
|
-
}
|
|
20
|
-
return save;
|
|
21
|
-
}), last(), shareReplay(1));
|
|
22
|
-
}
|
|
23
|
-
resultAllEnd() {
|
|
24
|
-
let BXRestClass = new BXRest();
|
|
25
|
-
return this.resVanilla().pipe(mergeMap(items => {
|
|
26
|
-
if (items && instanceOfiBXRestAnswerSuccess(items)) {
|
|
27
|
-
this.save = [];
|
|
28
|
-
// TODO: проверить будет ли быстрее работать метод в случаях когда total < 100 (то есть можно обойтись двумя прямыми запросами)
|
|
29
|
-
if (items.total && items.total > 50) {
|
|
30
|
-
const count = [...Array(Math.floor(items.total / this.pageSize)).keys()];
|
|
31
|
-
// Разделяем массив на блоки
|
|
32
|
-
const chunks = [];
|
|
33
|
-
for (let i = 0; i < count.length; i += this.pageSize) {
|
|
34
|
-
chunks.push(count.slice(i, i + this.pageSize));
|
|
35
|
-
}
|
|
36
|
-
const batchRequests = chunks.map(chunk => {
|
|
37
|
-
return BXRestClass.batch({
|
|
38
|
-
halt: 1,
|
|
39
|
-
cmd: chunk.map(i => {
|
|
40
|
-
const param = clone(this.param);
|
|
41
|
-
// Устанавливаем start в зависимости от индекса
|
|
42
|
-
param.start = (i + 1) * this.pageSize;
|
|
43
|
-
// Формируем строку запроса
|
|
44
|
-
return this.http.getNameMethod(this.url)
|
|
45
|
-
+ '?' + serializeBitrixParams(param);
|
|
46
|
-
})
|
|
47
|
-
}, this.requestHeaders);
|
|
48
|
-
});
|
|
49
|
-
return from(batchRequests).pipe(concatMap(request => request), // Выполняет запросы по очереди
|
|
50
|
-
toArray(), // Собирает все результаты в массив
|
|
51
|
-
map(results => {
|
|
52
|
-
if (items.result && items.result.tasks) {
|
|
53
|
-
const res = items.result.tasks;
|
|
54
|
-
for (let result of results) {
|
|
55
|
-
if (result && instanceOfiBXRestAnswerSuccess(result) && result.result && result.result.result) {
|
|
56
|
-
res.push(...result.result.result.filter(i => i).map(i => i.tasks).flat());
|
|
57
|
-
}
|
|
58
|
-
}
|
|
59
|
-
return (this.map) ?
|
|
60
|
-
this.map({ tasks: res })
|
|
61
|
-
: res;
|
|
62
|
-
}
|
|
63
|
-
throw new Error('wrong batch');
|
|
64
|
-
}));
|
|
65
|
-
}
|
|
66
|
-
return this.mapResForGetAll(items);
|
|
67
|
-
}
|
|
68
|
-
return this.mapResForGetAll(items);
|
|
69
|
-
}), catchError(err => {
|
|
70
|
-
console.error(err);
|
|
71
|
-
return throwError(() => err);
|
|
72
|
-
}));
|
|
73
|
-
}
|
|
74
|
-
mapResForGetAll(items) {
|
|
75
|
-
return (instanceOfiBXRestAnswerSuccess(items)) ? from([items.result]).pipe(map(v => (v && this.map) ? this.map(v) : v)) : from([]);
|
|
1
|
+
import { NavvyPagNavResultKey } from './navvy-pag-nav-result-key';
|
|
2
|
+
export class NavvyPagNavTasks extends NavvyPagNavResultKey {
|
|
3
|
+
constructor(url, param, map, restApi) {
|
|
4
|
+
super(url, param, 'tasks', map, restApi);
|
|
76
5
|
}
|
|
77
6
|
}
|
|
78
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"navvy-pag-nav-tasks.js","sourceRoot":"","sources":["../../../../../projects/bx-rest/src/services/navvy/navvy-pag-nav-tasks.ts"],"names":[],"mappings":"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","sourcesContent":["import { concatMap, from, last, mergeMap, shareReplay, throwError, toArray } from 'rxjs'\nimport { catchError, map } from 'rxjs/operators'\nimport clone from 'just-clone'\nimport { iBXRestPagination } from '../../typification/rest/base/api-pagination-bx'\nimport { ReturnTypeNavvy } from './navvy-support'\nimport { iBXRestAnswer } from '../../typification/rest/base/answer'\nimport { instanceOfiBXRestAnswerSuccess } from '../../functions/mapResult'\nimport { NavvyPagBase } from './extends/navvy-pag-base'\nimport { serializeBitrixParams } from '../../functions/serializeBitrixParams'\nimport { BXRest } from '../../rest/base'\n\nexport class NavvyPagNavTasks<T, R, P extends iBXRestPagination> extends NavvyPagBase<{tasks: T[] | undefined}, R[], P> {\n\n  save: ReturnTypeNavvy<T, R>[] = []\n  resAll() {\n    let save: ReturnTypeNavvy<T, R>[] = []\n    return this.resultAllEnd()\n      .pipe(\n        map(v => {\n            if (v) {\n              save.push(...v as ReturnTypeNavvy<T, R>[])\n            }\n            return save\n          }\n        ),\n        last(),\n        shareReplay(1)\n      )\n  }\n\n  private resultAllEnd() {\n    let BXRestClass = new BXRest()\n    return this.resVanilla().pipe(\n      mergeMap(\n        items => {\n          if (items && instanceOfiBXRestAnswerSuccess(items)) {\n            this.save = []\n            // TODO: проверить будет ли быстрее работать метод в случаях когда total < 100 (то есть можно обойтись двумя прямыми запросами)\n            if (items.total && items.total > 50) {\n              const count = [...Array(Math.floor(items.total / this.pageSize)).keys()]\n\n              // Разделяем массив на блоки\n              const chunks = []\n\n              for (let i = 0; i < count.length; i += this.pageSize) {\n                chunks.push(count.slice(i, i + this.pageSize))\n              }\n\n              const batchRequests = chunks.map(chunk => {\n                return BXRestClass.batch<{tasks: T[] | undefined}[]>({\n                  halt: 1,\n                  cmd: chunk.map(i => {\n                    const param = clone(this.param)\n                    // Устанавливаем start в зависимости от индекса\n                    param.start = (i + 1) * this.pageSize\n\n                    // Формируем строку запроса\n                    return this.http.getNameMethod(this.url)\n                      + '?' + serializeBitrixParams(param)\n                  })\n                }, this.requestHeaders)\n              })\n\n              return from(batchRequests).pipe(\n                concatMap(request => request), // Выполняет запросы по очереди\n                toArray(), // Собирает все результаты в массив\n                map(results => {\n                  if(items.result && items.result.tasks) {\n                    const res = items.result.tasks as T[]\n\n                    for (let result of results) {\n                      if (result && instanceOfiBXRestAnswerSuccess(result) && result.result && result.result.result) {\n                        res.push(...result.result.result.filter(i => i).map(i => i.tasks).flat() as T[])\n                      }\n                    }\n\n                    return (this.map) ?\n                      this.map({tasks: res})\n                      : res\n                  }\n\n                  throw new Error('wrong batch')\n                })\n              )\n            }\n\n            return this.mapResForGetAll(items)\n          }\n          return this.mapResForGetAll(items)\n        }\n      ),\n      catchError(err => {\n        console.error(err)\n        return throwError(() => err)\n      })\n    )\n  }\n\n  private mapResForGetAll(items: iBXRestAnswer<{tasks: T[] | undefined}> | undefined){\n    return (instanceOfiBXRestAnswerSuccess(items)) ? from([items.result]).pipe(\n      map(v => (v && this.map) ? this.map(v) : v)\n    ) : from([])\n  }\n}\n"]}
|
|
7
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibmF2dnktcGFnLW5hdi10YXNrcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL2J4LXJlc3Qvc3JjL3NlcnZpY2VzL25hdnZ5L25hdnZ5LXBhZy1uYXYtdGFza3MudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sNEJBQTRCLENBQUE7QUFFakUsTUFBTSxPQUFPLGdCQUFvRCxTQUFRLG9CQUFzQztJQUU3RyxZQUNFLEdBQWEsRUFDYixLQUFRLEVBQ1IsR0FBd0UsRUFDeEUsT0FBaUI7UUFFakIsS0FBSyxDQUFDLEdBQUcsRUFBRSxLQUFLLEVBQUUsT0FBTyxFQUFFLEdBQUcsRUFBRSxPQUFPLENBQUMsQ0FBQTtJQUMxQyxDQUFDO0NBQ0YiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBpQlhSZXN0UGFnaW5hdGlvbiB9IGZyb20gJy4uLy4uL3R5cGlmaWNhdGlvbi9yZXN0L2Jhc2UvYXBpLXBhZ2luYXRpb24tYngnXG5pbXBvcnQgeyBOYXZ2eVBhZ05hdlJlc3VsdEtleSB9IGZyb20gJy4vbmF2dnktcGFnLW5hdi1yZXN1bHQta2V5J1xuXG5leHBvcnQgY2xhc3MgTmF2dnlQYWdOYXZUYXNrczxULCBSLCBQIGV4dGVuZHMgaUJYUmVzdFBhZ2luYXRpb24+IGV4dGVuZHMgTmF2dnlQYWdOYXZSZXN1bHRLZXk8VCwgUiwgUCwgJ3Rhc2tzJz4ge1xuXG4gIGNvbnN0cnVjdG9yKFxuICAgIHVybDogc3RyaW5nW10sXG4gICAgcGFyYW06IFAsXG4gICAgbWFwPzogKHBhcmFtOiB7IHRhc2tzOiBUW10gfCB1bmRlZmluZWQgfSB8IHVuZGVmaW5lZCkgPT4gUltdIHwgdW5kZWZpbmVkLFxuICAgIHJlc3RBcGk/OiBib29sZWFuXG4gICkge1xuICAgIHN1cGVyKHVybCwgcGFyYW0sICd0YXNrcycsIG1hcCwgcmVzdEFwaSlcbiAgfVxufVxuIl19
|
|
@@ -1,81 +1,15 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
import
|
|
4
|
-
import { instanceOfiBXRestAnswerSuccess } from '../../functions/mapResult';
|
|
5
|
-
import { NavvyPagBase } from './extends/navvy-pag-base';
|
|
6
|
-
import { serializeBitrixParams } from '../../functions/serializeBitrixParams';
|
|
7
|
-
import { BXRest } from '../../rest/base';
|
|
1
|
+
import { map } from 'rxjs/operators';
|
|
2
|
+
import { mergeMap } from 'rxjs';
|
|
3
|
+
import { NavvyPagBase, offsetPageParams } from './extends/navvy-pag-base';
|
|
8
4
|
export class NavvyPagNavWithUselessKey extends NavvyPagBase {
|
|
9
|
-
constructor() {
|
|
10
|
-
super(...arguments);
|
|
11
|
-
this.save = [];
|
|
12
|
-
}
|
|
13
5
|
resAll() {
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
const chunks = [];
|
|
21
|
-
for (let i = 0; i < count.length; i += this.pageSize) {
|
|
22
|
-
chunks.push(count.slice(i, i + this.pageSize));
|
|
23
|
-
}
|
|
24
|
-
const batchRequests = chunks.map(chunk => {
|
|
25
|
-
return BXRestClass.batch({
|
|
26
|
-
halt: 1,
|
|
27
|
-
cmd: chunk.map(i => {
|
|
28
|
-
const param = clone(this.param);
|
|
29
|
-
// Устанавливаем start в зависимости от индекса
|
|
30
|
-
param.start = (i + 1) * this.pageSize;
|
|
31
|
-
// Формируем строку запроса
|
|
32
|
-
return this.http.getNameMethod(this.url)
|
|
33
|
-
+ '?' + serializeBitrixParams(param);
|
|
34
|
-
})
|
|
35
|
-
}, this.requestHeaders).pipe(map(v => {
|
|
36
|
-
if (v && instanceOfiBXRestAnswerSuccess(v) && v.result && v.result.result && items.result) {
|
|
37
|
-
return Object.assign({}, items.result, v.result.result);
|
|
38
|
-
}
|
|
39
|
-
throw new Error('wrong batch');
|
|
40
|
-
}));
|
|
41
|
-
});
|
|
42
|
-
return from(batchRequests).pipe(concatMap(request => request), // Выполняет запросы по очереди
|
|
43
|
-
toArray()); // Собирает все результаты в массив
|
|
44
|
-
/*
|
|
45
|
-
return this.getAllTaskElapsedItem(func, param).pipe(
|
|
46
|
-
map(vEnd => {
|
|
47
|
-
if (vEnd && vEnd.result && items.result) {
|
|
48
|
-
return merge(clone(vEnd), {result: [...items.result, ...vEnd.result]})
|
|
49
|
-
}
|
|
50
|
-
return items
|
|
51
|
-
})
|
|
52
|
-
)
|
|
53
|
-
*/
|
|
54
|
-
}
|
|
55
|
-
else {
|
|
56
|
-
return of([items.result]);
|
|
57
|
-
}
|
|
58
|
-
}
|
|
59
|
-
return of(undefined);
|
|
60
|
-
// return from([BXRestMapResult(items)])
|
|
61
|
-
// as ReturnType<Observable<T | undefined>, Observable<R | undefined>>
|
|
62
|
-
}), map(v => {
|
|
63
|
-
if (v) {
|
|
64
|
-
const mergedObject = v.reduce((acc, obj) => {
|
|
65
|
-
return { ...acc, ...obj };
|
|
66
|
-
}, {});
|
|
67
|
-
if (this.map) {
|
|
68
|
-
return this.map(mergedObject);
|
|
69
|
-
}
|
|
70
|
-
this.save.push(...v);
|
|
71
|
-
return this.save;
|
|
72
|
-
}
|
|
73
|
-
return v;
|
|
74
|
-
}), catchError(err => {
|
|
75
|
-
// this.snackBar.error("Проблемы с поточным получение затреканого времени")
|
|
76
|
-
console.error(err);
|
|
77
|
-
return throwError(() => err);
|
|
6
|
+
return this.resFirstPage().pipe(mergeMap(first => {
|
|
7
|
+
const params = first.next ? offsetPageParams(this.param, first.total, this.pageSize) : [];
|
|
8
|
+
return this.resPages(params).pipe(map(pages => {
|
|
9
|
+
const merged = Object.assign({}, first.result, ...pages);
|
|
10
|
+
return (this.map ? this.map(merged) : [merged]);
|
|
11
|
+
}));
|
|
78
12
|
}));
|
|
79
13
|
}
|
|
80
14
|
}
|
|
81
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
15
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibmF2dnktcGFnLW5hdi13aXRoLXVzZWxlc3Mta2V5LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvYngtcmVzdC9zcmMvc2VydmljZXMvbmF2dnkvbmF2dnktcGFnLW5hdi13aXRoLXVzZWxlc3Mta2V5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxHQUFHLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQTtBQUNwQyxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sTUFBTSxDQUFBO0FBQy9CLE9BQU8sRUFBRSxZQUFZLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQTtBQUd6RSxNQUFNLE9BQU8seUJBQTZELFNBQVEsWUFBdUM7SUFFdkgsTUFBTTtRQUNKLE9BQU8sSUFBSSxDQUFDLFlBQVksRUFBRSxDQUFDLElBQUksQ0FDN0IsUUFBUSxDQUFDLEtBQUssQ0FBQyxFQUFFO1lBQ2YsTUFBTSxNQUFNLEdBQUcsS0FBSyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsZ0JBQWdCLENBQUMsSUFBSSxDQUFDLEtBQUssRUFBRSxLQUFLLENBQUMsS0FBSyxFQUFFLElBQUksQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFBO1lBRXpGLE9BQU8sSUFBSSxDQUFDLFFBQVEsQ0FBb0IsTUFBTSxDQUFDLENBQUMsSUFBSSxDQUNsRCxHQUFHLENBQUMsS0FBSyxDQUFDLEVBQUU7Z0JBQ1YsTUFBTSxNQUFNLEdBQXNCLE1BQU0sQ0FBQyxNQUFNLENBQUMsRUFBRSxFQUFFLEtBQUssQ0FBQyxNQUFNLEVBQUUsR0FBRyxLQUFLLENBQUMsQ0FBQTtnQkFDM0UsT0FBTyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsTUFBTSxDQUFDLENBQXdELENBQUE7WUFDeEcsQ0FBQyxDQUFDLENBQ0gsQ0FBQTtRQUNILENBQUMsQ0FBQyxDQUNILENBQUE7SUFDSCxDQUFDO0NBQ0YiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBpQlhSZXN0UGFnaW5hdGlvbiB9IGZyb20gJy4uLy4uL3R5cGlmaWNhdGlvbi9yZXN0L2Jhc2UvYXBpLXBhZ2luYXRpb24tYngnXG5pbXBvcnQgeyBtYXAgfSBmcm9tICdyeGpzL29wZXJhdG9ycydcbmltcG9ydCB7IG1lcmdlTWFwIH0gZnJvbSAncnhqcydcbmltcG9ydCB7IE5hdnZ5UGFnQmFzZSwgb2Zmc2V0UGFnZVBhcmFtcyB9IGZyb20gJy4vZXh0ZW5kcy9uYXZ2eS1wYWctYmFzZSdcbmltcG9ydCB7IFJldHVyblR5cGVOYXZ2eSB9IGZyb20gJy4vbmF2dnktc3VwcG9ydCdcblxuZXhwb3J0IGNsYXNzIE5hdnZ5UGFnTmF2V2l0aFVzZWxlc3NLZXk8VCwgUiwgUCBleHRlbmRzIGlCWFJlc3RQYWdpbmF0aW9uPiBleHRlbmRzIE5hdnZ5UGFnQmFzZTxSZWNvcmQ8c3RyaW5nLCBUPiwgUltdLCBQPiB7XG5cbiAgcmVzQWxsKCkge1xuICAgIHJldHVybiB0aGlzLnJlc0ZpcnN0UGFnZSgpLnBpcGUoXG4gICAgICBtZXJnZU1hcChmaXJzdCA9PiB7XG4gICAgICAgIGNvbnN0IHBhcmFtcyA9IGZpcnN0Lm5leHQgPyBvZmZzZXRQYWdlUGFyYW1zKHRoaXMucGFyYW0sIGZpcnN0LnRvdGFsLCB0aGlzLnBhZ2VTaXplKSA6IFtdXG5cbiAgICAgICAgcmV0dXJuIHRoaXMucmVzUGFnZXM8UmVjb3JkPHN0cmluZywgVD4+KHBhcmFtcykucGlwZShcbiAgICAgICAgICBtYXAocGFnZXMgPT4ge1xuICAgICAgICAgICAgY29uc3QgbWVyZ2VkOiBSZWNvcmQ8c3RyaW5nLCBUPiA9IE9iamVjdC5hc3NpZ24oe30sIGZpcnN0LnJlc3VsdCwgLi4ucGFnZXMpXG4gICAgICAgICAgICByZXR1cm4gKHRoaXMubWFwID8gdGhpcy5tYXAobWVyZ2VkKSA6IFttZXJnZWRdKSBhcyBSZXR1cm5UeXBlTmF2dnk8UmVjb3JkPHN0cmluZywgVD4sIFJbXT4gfCB1bmRlZmluZWRcbiAgICAgICAgICB9KVxuICAgICAgICApXG4gICAgICB9KVxuICAgIClcbiAgfVxufVxuIl19
|