@sumaris-net/ngx-components 1.16.2 → 1.16.3

package/esm2015/src/app/shared/services/job.utils.js

@@ -15,47 +15,52 @@ export class JobUtils {
             .then(() => {
             if (opts === null || opts === void 0 ? void 0 : opts.maxProgression)
                 progression.next(opts.maxProgression);
-            if (opts === null || opts === void 0 ? void 0 : opts.progression)
-                opts.progression.complete();
+            progression.complete();
         })
             .catch(err => progression.error(err));
         return progression;
     }
     static fetchAllPages(loadPageFn, opts) {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const maxProgression = opts && opts.maxProgression || undefined;
+            const maxProgression = toNumber(opts === null || opts === void 0 ? void 0 : opts.maxProgression, 100);
+            const progression = opts === null || opts === void 0 ? void 0 : opts.progression;
             let total;
             let pageCount;
             let progressionStep;
             let currentPageDataCount;
-            const fetchSize = opts && opts.fetchSize || 1000;
+            const fetchSize = toNumber(opts === null || opts === void 0 ? void 0 : opts.fetchSize, 1000);
+            if (fetchSize <= 0)
+                throw new Error('Unable to fetch pages: invalid fetchSize: ' + fetchSize);
             let offset = 0;
             let data = [];
             do {
                 if (opts && opts.logPrefix)
                     console.debug(`${opts.logPrefix} Fetching page #${offset / fetchSize}...`);
-                // Get some items, using paging
+                // Fetch a page
                 const res = yield loadPageFn(offset, fetchSize);
+                // Concat to previous result
                 data = data.concat(res.data);
+                // Compute variables, for next loop
                 currentPageDataCount = res.data && res.data.length || 0;
                 offset += currentPageDataCount;
-                // Set total count (only if not already set)
+                // Set total count (only once)
                 if (isNil(total) && isNotNil(res.total)) {
                     total = res.total;
                     // Compute the number of page
                     pageCount = Math.round(res.total / fetchSize + 0.5); // Round to HALF_UP integer
                     // Compute step, by dividing maxProgression by number of page
-                    const actualProgression = Math.max(0, toNumber(opts && ((_a = opts.progression) === null || _a === void 0 ? void 0 : _a.value), 0));
-                    progressionStep = maxProgression
-                        ? (maxProgression - actualProgression) / pageCount
-                        : undefined /*if 0 reset to undefined*/;
+                    if (progression) {
+                        progressionStep = maxProgression / pageCount;
+                        // DEBUG
+                        if (opts && opts.logPrefix)
+                            console.debug(`${opts.logPrefix} {pageCount: ${pageCount}, progression: ${progression.value}, pageProgressionStep: ${progressionStep}}`);
+                    }
                 }
                 // Increment progression on each iteration (if possible)
-                if (opts && opts.progression && isNotNil(progressionStep)) {
-                    opts.progression.next(opts.progression.value + progressionStep);
+                if (isNotNil(progressionStep)) {
+                    progression.next(progression.value + progressionStep);
                 }
-                if (opts && opts.onPageLoaded)
+                if (opts === null || opts === void 0 ? void 0 : opts.onPageLoaded)
                     opts.onPageLoaded(res);
             } while (currentPageDataCount > 0 && ((isNil(total) && currentPageDataCount === fetchSize) || (isNotNil(total) && (offset < total))));
             // Complete progression to reach progressionStep value (because of round)
@@ -66,14 +71,19 @@ export class JobUtils {
                     total = data.length;
                     pageCount = Math.round(data.length / fetchSize + 0.5);
                 }
-                const lastProgressionStep = opts.maxProgression - (progressionStep * pageCount);
-                if (opts && opts.progression && lastProgressionStep > 0) {
-                    opts.progression.next(opts.progression.value + lastProgressionStep);
-                }
+                // Compute final increment, using the real page count
+                progressionStep = Math.max(0, maxProgression - (progressionStep * pageCount));
+            }
+            // Or increment once (e.g. when total is not known, in received LoadResult)
+            else if (progression) {
+                progressionStep = maxProgression;
             }
-            // Or increment once
-            else if (opts && opts.progression && opts.maxProgression) {
-                opts.progression.next(opts.maxProgression);
+            // DEBUG
+            if (opts && opts.logPrefix)
+                console.debug(`${opts.logPrefix} All pages fetched - {progression: ${progression.value}, lastProgressionStep: ${progressionStep}`);
+            // Final increment
+            if (progression && progressionStep > 0) {
+                progression.next(progression.value + progressionStep);
             }
             return {
                 data,
@@ -82,4 +92,4 @@ export class JobUtils {
         });
     }
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"job.utils.js","sourceRoot":"","sources":["../../../../../../src/app/shared/services/job.utils.ts"],"names":[],"mappings":"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","sourcesContent":["import { BehaviorSubject, defer, Observable } from 'rxjs';\nimport { isNil, isNotNil, toNumber } from '../functions';\nimport { LoadResult, LoadResultByPageFn } from './entity-service.class';\n\nexport type CallableWithProgressionFn<O extends CallableWithProgressionOptions> = (opts?: O) => Promise<void>;\nexport interface CallableWithProgressionOptions {\n  maxProgression?: number;\n  progression?: BehaviorSubject<number>;\n  [key: string]: any;\n}\n\n// @dynamic\nexport class JobUtils {\n\n  static defers<O extends CallableWithProgressionOptions>(runnableList: CallableWithProgressionFn<O>[], opts?: O): Observable<number>[] {\n    return runnableList.map(runnable => JobUtils.defer(runnable, opts));\n  }\n\n  static defer<O extends CallableWithProgressionOptions>(runnable: CallableWithProgressionFn<O>, opts?: O): Observable<number> {\n    return defer<Observable<number>>(() => JobUtils.run(runnable, opts));\n  }\n\n  static run<O extends CallableWithProgressionOptions>(runnable: CallableWithProgressionFn<O>, opts: O): Observable<number> {\n\n    const progression = new BehaviorSubject<number>(0);\n    runnable({...opts, progression})\n      .then(() => {\n        if (opts?.maxProgression) progression.next(opts.maxProgression);\n        if (opts?.progression) opts.progression.complete();\n      })\n      .catch(err => progression.error(err));\n    return progression;\n  }\n\n  static async fetchAllPages<T>(\n    loadPageFn: LoadResultByPageFn<T>,\n    opts?: {\n      maxProgression?: number;\n      progression?: BehaviorSubject<number>;\n      onPageLoaded?: (pageResult: LoadResult<T>) => any;\n      logPrefix?: string;\n      fetchSize?: number;\n    }): Promise<LoadResult<T>> {\n\n    const maxProgression = opts && opts.maxProgression || undefined;\n    let total; let pageCount; let progressionStep; let currentPageDataCount: number;\n    const fetchSize = opts && opts.fetchSize || 1000;\n    let offset = 0;\n    let data: T[] = [];\n    do {\n\n      if (opts && opts.logPrefix) console.debug(`${opts.logPrefix} Fetching page #${offset / fetchSize}...`);\n\n      // Get some items, using paging\n      const res = await loadPageFn(offset, fetchSize);\n      data = data.concat(res.data);\n      currentPageDataCount = res.data && res.data.length || 0;\n      offset += currentPageDataCount;\n\n      // Set total count (only if not already set)\n      if (isNil(total) && isNotNil(res.total)) {\n        total = res.total;\n        // Compute the number of page\n        pageCount = Math.round(res.total / fetchSize + 0.5); // Round to HALF_UP integer\n        // Compute step, by dividing maxProgression by number of page\n        const actualProgression = Math.max(0, toNumber(opts && opts.progression?.value, 0));\n        progressionStep = maxProgression\n          ? (maxProgression - actualProgression) / pageCount\n          : undefined /*if 0 reset to undefined*/;\n      }\n\n      // Increment progression on each iteration (if possible)\n      if (opts && opts.progression && isNotNil(progressionStep)) {\n        opts.progression.next(opts.progression.value + progressionStep);\n      }\n\n      if (opts && opts.onPageLoaded) opts.onPageLoaded(res);\n\n    } while (currentPageDataCount > 0 && ((isNil(total) && currentPageDataCount === fetchSize) || (isNotNil(total) && (offset < total))));\n\n    // Complete progression to reach progressionStep value (because of round)\n    if (isNotNil(progressionStep)) {\n\n      // If total return by loadAll was bad !\n      if (isNotNil(total) && data.length < total) {\n        console.warn(`A function loadAll() returned a bad total (less than all page's data)! Expected ${total} but fetch ${data.length}`);\n        total = data.length;\n        pageCount = Math.round(data.length / fetchSize + 0.5);\n      }\n\n      const lastProgressionStep = opts.maxProgression - (progressionStep * pageCount);\n      if (opts && opts.progression && lastProgressionStep > 0) {\n        opts.progression.next(opts.progression.value + lastProgressionStep);\n      }\n    }\n    // Or increment once\n    else if (opts && opts.progression && opts.maxProgression) {\n      opts.progression.next(opts.maxProgression);\n    }\n\n    return {\n      data,\n      total\n    };\n  }\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"job.utils.js","sourceRoot":"","sources":["../../../../../../src/app/shared/services/job.utils.ts"],"names":[],"mappings":"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","sourcesContent":["import { BehaviorSubject, defer, Observable } from 'rxjs';\nimport { isNil, isNotNil, toNumber } from '../functions';\nimport { LoadResult, LoadResultByPageFn } from './entity-service.class';\n\nexport type CallableWithProgressionFn<O extends CallableWithProgressionOptions> = (opts?: O) => Promise<void>;\nexport interface CallableWithProgressionOptions {\n  maxProgression?: number;\n  progression?: BehaviorSubject<number>;\n  [key: string]: any;\n}\n\n// @dynamic\nexport class JobUtils {\n\n  static defers<O extends CallableWithProgressionOptions>(runnableList: CallableWithProgressionFn<O>[], opts?: O): Observable<number>[] {\n    return runnableList.map(runnable => JobUtils.defer(runnable, opts));\n  }\n\n  static defer<O extends CallableWithProgressionOptions>(runnable: CallableWithProgressionFn<O>, opts?: O): Observable<number> {\n    return defer<Observable<number>>(() => JobUtils.run(runnable, opts));\n  }\n\n  static run<O extends CallableWithProgressionOptions>(runnable: CallableWithProgressionFn<O>, opts: O): Observable<number> {\n\n    const progression = new BehaviorSubject<number>(0);\n    runnable({...opts, progression})\n      .then(() => {\n        if (opts?.maxProgression) progression.next(opts.maxProgression);\n        progression.complete();\n      })\n      .catch(err => progression.error(err));\n    return progression;\n  }\n\n  static async fetchAllPages<T>(\n    loadPageFn: LoadResultByPageFn<T>,\n    opts?: {\n      progression?: BehaviorSubject<number>;\n      maxProgression?: number;\n      onPageLoaded?: (pageResult: LoadResult<T>) => any;\n      logPrefix?: string;\n      fetchSize?: number;\n    }): Promise<LoadResult<T>> {\n\n    const maxProgression = toNumber(opts?.maxProgression, 100);\n    const progression = opts?.progression;\n    let total; let pageCount; let progressionStep; let currentPageDataCount: number;\n    const fetchSize = toNumber(opts?.fetchSize, 1000);\n    if (fetchSize <= 0) throw new Error('Unable to fetch pages: invalid fetchSize: ' + fetchSize);\n    let offset = 0;\n    let data: T[] = [];\n    do {\n\n      if (opts && opts.logPrefix) console.debug(`${opts.logPrefix} Fetching page #${offset / fetchSize}...`);\n\n      // Fetch a page\n      const res = await loadPageFn(offset, fetchSize);\n\n      // Concat to previous result\n      data = data.concat(res.data);\n\n      // Compute variables, for next loop\n      currentPageDataCount = res.data && res.data.length || 0;\n      offset += currentPageDataCount;\n\n      // Set total count (only once)\n      if (isNil(total) && isNotNil(res.total)) {\n        total = res.total;\n        // Compute the number of page\n        pageCount = Math.round(res.total / fetchSize + 0.5); // Round to HALF_UP integer\n        // Compute step, by dividing maxProgression by number of page\n        if (progression) {\n          progressionStep = maxProgression / pageCount;\n          // DEBUG\n          if (opts && opts.logPrefix) console.debug(`${opts.logPrefix} {pageCount: ${pageCount}, progression: ${progression.value}, pageProgressionStep: ${progressionStep}}`);\n        }\n      }\n\n      // Increment progression on each iteration (if possible)\n      if (isNotNil(progressionStep)) {\n        progression.next(progression.value + progressionStep);\n      }\n\n      if (opts?.onPageLoaded) opts.onPageLoaded(res);\n\n    } while (currentPageDataCount > 0 && ((isNil(total) && currentPageDataCount === fetchSize) || (isNotNil(total) && (offset < total))));\n\n    // Complete progression to reach progressionStep value (because of round)\n    if (isNotNil(progressionStep)) {\n\n      // If total return by loadAll was bad !\n      if (isNotNil(total) && data.length < total) {\n        console.warn(`A function loadAll() returned a bad total (less than all page's data)! Expected ${total} but fetch ${data.length}`);\n        total = data.length;\n        pageCount = Math.round(data.length / fetchSize + 0.5);\n      }\n\n      // Compute final increment, using the real page count\n      progressionStep = Math.max(0, maxProgression - (progressionStep * pageCount));\n\n    }\n\n    // Or increment once (e.g. when total is not known, in received LoadResult)\n    else if (progression) {\n      progressionStep = maxProgression;\n    }\n\n    // DEBUG\n    if (opts && opts.logPrefix) console.debug(`${opts.logPrefix} All pages fetched - {progression: ${progression.value}, lastProgressionStep: ${progressionStep}`);\n\n    // Final increment\n    if (progression && progressionStep > 0) {\n      progression.next(progression.value + progressionStep);\n    }\n\n    return {\n      data,\n      total\n    };\n  }\n}\n"]}

package/fesm2015/sumaris-net.ngx-components.js

@@ -17692,47 +17692,52 @@ class JobUtils {
             .then(() => {
             if (opts === null || opts === void 0 ? void 0 : opts.maxProgression)
                 progression.next(opts.maxProgression);
-            if (opts === null || opts === void 0 ? void 0 : opts.progression)
-                opts.progression.complete();
+            progression.complete();
         })
             .catch(err => progression.error(err));
         return progression;
     }
     static fetchAllPages(loadPageFn, opts) {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const maxProgression = opts && opts.maxProgression || undefined;
+            const maxProgression = toNumber(opts === null || opts === void 0 ? void 0 : opts.maxProgression, 100);
+            const progression = opts === null || opts === void 0 ? void 0 : opts.progression;
             let total;
             let pageCount;
             let progressionStep;
             let currentPageDataCount;
-            const fetchSize = opts && opts.fetchSize || 1000;
+            const fetchSize = toNumber(opts === null || opts === void 0 ? void 0 : opts.fetchSize, 1000);
+            if (fetchSize <= 0)
+                throw new Error('Unable to fetch pages: invalid fetchSize: ' + fetchSize);
             let offset = 0;
             let data = [];
             do {
                 if (opts && opts.logPrefix)
                     console.debug(`${opts.logPrefix} Fetching page #${offset / fetchSize}...`);
-                // Get some items, using paging
+                // Fetch a page
                 const res = yield loadPageFn(offset, fetchSize);
+                // Concat to previous result
                 data = data.concat(res.data);
+                // Compute variables, for next loop
                 currentPageDataCount = res.data && res.data.length || 0;
                 offset += currentPageDataCount;
-                // Set total count (only if not already set)
+                // Set total count (only once)
                 if (isNil(total) && isNotNil(res.total)) {
                     total = res.total;
                     // Compute the number of page
                     pageCount = Math.round(res.total / fetchSize + 0.5); // Round to HALF_UP integer
                     // Compute step, by dividing maxProgression by number of page
-                    const actualProgression = Math.max(0, toNumber(opts && ((_a = opts.progression) === null || _a === void 0 ? void 0 : _a.value), 0));
-                    progressionStep = maxProgression
-                        ? (maxProgression - actualProgression) / pageCount
-                        : undefined /*if 0 reset to undefined*/;
+                    if (progression) {
+                        progressionStep = maxProgression / pageCount;
+                        // DEBUG
+                        if (opts && opts.logPrefix)
+                            console.debug(`${opts.logPrefix} {pageCount: ${pageCount}, progression: ${progression.value}, pageProgressionStep: ${progressionStep}}`);
+                    }
                 }
                 // Increment progression on each iteration (if possible)
-                if (opts && opts.progression && isNotNil(progressionStep)) {
-                    opts.progression.next(opts.progression.value + progressionStep);
+                if (isNotNil(progressionStep)) {
+                    progression.next(progression.value + progressionStep);
                 }
-                if (opts && opts.onPageLoaded)
+                if (opts === null || opts === void 0 ? void 0 : opts.onPageLoaded)
                     opts.onPageLoaded(res);
             } while (currentPageDataCount > 0 && ((isNil(total) && currentPageDataCount === fetchSize) || (isNotNil(total) && (offset < total))));
             // Complete progression to reach progressionStep value (because of round)
@@ -17743,14 +17748,19 @@ class JobUtils {
                     total = data.length;
                     pageCount = Math.round(data.length / fetchSize + 0.5);
                 }
-                const lastProgressionStep = opts.maxProgression - (progressionStep * pageCount);
-                if (opts && opts.progression && lastProgressionStep > 0) {
-                    opts.progression.next(opts.progression.value + lastProgressionStep);
-                }
+                // Compute final increment, using the real page count
+                progressionStep = Math.max(0, maxProgression - (progressionStep * pageCount));
+            }
+            // Or increment once (e.g. when total is not known, in received LoadResult)
+            else if (progression) {
+                progressionStep = maxProgression;
             }
-            // Or increment once
-            else if (opts && opts.progression && opts.maxProgression) {
-                opts.progression.next(opts.maxProgression);
+            // DEBUG
+            if (opts && opts.logPrefix)
+                console.debug(`${opts.logPrefix} All pages fetched - {progression: ${progression.value}, lastProgressionStep: ${progressionStep}`);
+            // Final increment
+            if (progression && progressionStep > 0) {
+                progression.next(progression.value + progressionStep);
             }
             return {
                 data,