npm - @sumaris-net/ngx-components - Versions diffs - 1.15.13 → 1.16.1 - Mend

@sumaris-net/ngx-components 1.15.13 → 1.16.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.

Files changed (19) hide show

package/bundles/sumaris-net.ngx-components.umd.js +105 -62
package/bundles/sumaris-net.ngx-components.umd.js.map +1 -1
package/bundles/sumaris-net.ngx-components.umd.min.js +2 -2
package/bundles/sumaris-net.ngx-components.umd.min.js.map +1 -1
package/doc/changelog.md +3 -0
package/esm2015/src/app/admin/services/person.service.js +5 -9
package/esm2015/src/app/core/services/network.service.js +28 -19
package/esm2015/src/app/core/services/network.utils.js +2 -2
package/esm2015/src/app/shared/http/http.utils.js +31 -9
package/esm2015/src/app/shared/services/job.utils.js +28 -21
package/fesm2015/sumaris-net.ngx-components.js +88 -53
package/fesm2015/sumaris-net.ngx-components.js.map +1 -1
package/package.json +1 -1
package/src/app/admin/services/person.service.d.ts +2 -1
package/src/app/core/services/network.service.d.ts +8 -0
package/src/app/core/services/network.utils.d.ts +1 -0
package/src/app/shared/http/http.utils.d.ts +13 -1
package/src/app/shared/services/job.utils.d.ts +4 -2
package/sumaris-net.ngx-components.metadata.json +1 -1

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

@@ -1,6 +1,6 @@
 import { __awaiter } from "tslib";
 import { BehaviorSubject, defer } from 'rxjs';
-import { isNil, isNotNil } from '../functions';
+import { isNil, isNotNil, toNumber } from '../functions';
 // @dynamic
 export class JobUtils {
     static defers(runnableList, opts) {
@@ -11,22 +11,24 @@ export class JobUtils {
     }
     static run(runnable, opts) {
         const progression = new BehaviorSubject(0);
-        runnable(progression, opts)
+        runnable(Object.assign(Object.assign({}, opts), { progression }))
             .then(() => {
-            if (opts && opts.maxProgression)
+            if (opts === null || opts === void 0 ? void 0 : opts.maxProgression)
                 progression.next(opts.maxProgression);
-            progression.complete();
+            if (opts === null || opts === void 0 ? void 0 : opts.progression)
+                opts.progression.complete();
         })
             .catch(err => progression.error(err));
         return progression;
     }
-    static fetchAllPages(loadPageFn, progression, opts) {
+    static fetchAllPages(loadPageFn, opts) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const maxProgression = opts && opts.maxProgression || undefined;
             let total;
-            let loopCount;
+            let pageCount;
             let progressionStep;
-            let loopDataCount;
+            let currentPageDataCount;
             const fetchSize = opts && opts.fetchSize || 1000;
             let offset = 0;
             let data = [];
@@ -36,37 +38,42 @@ export class JobUtils {
                 // Get some items, using paging
                 const res = yield loadPageFn(offset, fetchSize);
                 data = data.concat(res.data);
-                loopDataCount = res.data && res.data.length || 0;
-                offset += loopDataCount;
+                currentPageDataCount = res.data && res.data.length || 0;
+                offset += currentPageDataCount;
                 // Set total count (only if not already set)
                 if (isNil(total) && isNotNil(res.total)) {
                     total = res.total;
-                    loopCount = Math.round(res.total / fetchSize + 0.5); // Round to next integer
-                    progressionStep = maxProgression ? maxProgression / loopCount : undefined /*if 0 reset to undefined*/;
+                    // 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*/;
                 }
                 // Increment progression on each iteration (if possible)
-                if (isNotNil(progressionStep)) {
-                    progression.next(progression.getValue() + progressionStep);
+                if (opts && opts.progression && isNotNil(progressionStep)) {
+                    opts.progression.next(opts.progression.value + progressionStep);
                 }
                 if (opts && opts.onPageLoaded)
                     opts.onPageLoaded(res);
-            } while (loopDataCount > 0 && ((isNil(total) && loopDataCount === fetchSize) || (isNotNil(total) && (offset < total))));
+            } while (currentPageDataCount > 0 && ((isNil(total) && currentPageDataCount === fetchSize) || (isNotNil(total) && (offset < total))));
             // Complete progression to reach progressionStep value (because of round)
             if (isNotNil(progressionStep)) {
                 // If total return by loadAll was bad !
                 if (isNotNil(total) && data.length < total) {
                     console.warn(`A function loadAll() returned a bad total (less than all page's data)! Expected ${total} but fetch ${data.length}`);
                     total = data.length;
-                    loopCount = Math.round(data.length / fetchSize + 0.5);
+                    pageCount = Math.round(data.length / fetchSize + 0.5);
                 }
-                const lastProgressionStep = opts.maxProgression - (progressionStep * loopCount);
-                if (lastProgressionStep > 0) {
-                    progression.next(progression.getValue() + lastProgressionStep);
+                const lastProgressionStep = opts.maxProgression - (progressionStep * pageCount);
+                if (opts && opts.progression && lastProgressionStep > 0) {
+                    opts.progression.next(opts.progression.value + lastProgressionStep);
                 }
             }
             // Or increment once
-            else if (opts.maxProgression) {
-                progression.next(progression.getValue() + opts.maxProgression);
+            else if (opts && opts.progression && opts.maxProgression) {
+                opts.progression.next(opts.maxProgression);
             }
             return {
                 data,
@@ -75,4 +82,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, Subject} from 'rxjs';\nimport {isNil, isNotNil} from '../functions';\nimport {LoadResult, LoadResultByPageFn} from './entity-service.class';\n\nexport type CallableWithProgressionFn<O extends CallableWithProgressionOptions> = (progression: BehaviorSubject<number>, opts?: O) => Promise<void>;\nexport interface CallableWithProgressionOptions {\n  maxProgression?: 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(progression, opts)\n      .then(() => {\n        if (opts && 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    progression: BehaviorSubject<number>,\n    opts?: {\n      maxProgression?: 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 loopCount; let progressionStep; let loopDataCount: 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      loopDataCount = res.data && res.data.length || 0;\n      offset += loopDataCount;\n\n      // Set total count (only if not already set)\n      if (isNil(total) && isNotNil(res.total)) {\n        total = res.total;\n        loopCount = Math.round(res.total / fetchSize + 0.5); // Round to next integer\n        progressionStep = maxProgression ? maxProgression / loopCount : undefined /*if 0 reset to undefined*/;\n      }\n\n      // Increment progression on each iteration (if possible)\n      if (isNotNil(progressionStep)) {\n        progression.next(progression.getValue() + progressionStep);\n      }\n\n      if (opts && opts.onPageLoaded) opts.onPageLoaded(res);\n\n    } while (loopDataCount > 0 && ((isNil(total) && loopDataCount === 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        loopCount = Math.round(data.length / fetchSize + 0.5);\n      }\n\n      const lastProgressionStep = opts.maxProgression - (progressionStep * loopCount);\n      if (lastProgressionStep > 0) {\n        progression.next(progression.getValue() + lastProgressionStep);\n      }\n    }\n    // Or increment once\n    else if (opts.maxProgression) {\n      progression.next(progression.getValue() + 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        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"]}

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

@@ -10084,14 +10084,36 @@ trigger('slideUpDownAnimation', [
 ]);
 class HttpUtils {
-    static getResource(http, uri, opts) {
+    static getText(http, uri, opts) {
         return __awaiter(this, void 0, void 0, function* () {
             // Add headers
-            opts = Object.assign({}, opts
-            //headers: new HttpHeaders(),
-            //.append('X-App-Name', environment.name)
-            //.append('X-App-Version', environment.version),
-            );
+            opts = opts || { responseType: 'text' };
+            // Force no cache
+            if (opts.nocache === true) {
+                opts.headers = (opts.headers instanceof HttpHeaders ? opts.headers : new HttpHeaders(opts.headers));
+                opts.headers
+                    .append('Cache-Control', 'no-cache')
+                    .append('Pragma', 'no-cache');
+            }
+            // Use web http client
+            try {
+                return (yield http.get(uri, Object.assign(Object.assign({}, opts), { responseType: 'text' })).toPromise());
+            }
+            catch (err) {
+                if (err && err.message) {
+                    console.error(`[network] Error on get request ${uri}: ${err.message}`, err);
+                }
+                else {
+                    console.error(`[network] Error on get request ${uri}: ${err && err.statusText} - ${JSON.stringify(err)}`);
+                }
+                throw { code: err.status, message: 'ERROR.UNKNOWN_NETWORK_ERROR' };
+            }
+        });
+    }
+    static getJson(http, uri, opts) {
+        return __awaiter(this, void 0, void 0, function* () {
+            // Add headers
+            opts = opts || {};
             // Force no cache
             if (opts.nocache === true) {
                 opts.headers = (opts.headers instanceof HttpHeaders ? opts.headers : new HttpHeaders(opts.headers));
@@ -10099,9 +10121,9 @@ class HttpUtils {
                     .append('Cache-Control', 'no-cache')
                     .append('Pragma', 'no-cache');
             }
+            // Use web http client
             try {
-                // Using web http client
-                return (yield http.get(uri, opts).toPromise());
+                return (yield http.get(uri, Object.assign(Object.assign({}, opts), { responseType: 'json' })).toPromise());
             }
             catch (err) {
                 if (err && err.message) {
@@ -10128,7 +10150,7 @@ function getNodeInfo(http, peer, opts) {
         if (peerUrl.endsWith('/')) {
             peerUrl = peerUrl.substr(0, peerUrl.length - 1);
         }
-        return HttpUtils.getResource(http, peerUrl + '/api/node/info', opts);
+        return HttpUtils.getJson(http, peerUrl + '/api/node/info', opts);
     });
 }
@@ -11171,7 +11193,7 @@ class NetworkService extends StartableService {
                 if (opts === null || opts === void 0 ? void 0 : opts.nocache) {
                     path += '?t=' + Date.now();
                 }
-                const appVersion = yield this.get(path, opts);
+                const appVersion = yield this.getText(path, opts);
                 if (isNotNilOrBlank(appVersion))
                     return appVersion;
             }
@@ -11379,28 +11401,37 @@ class NetworkService extends StartableService {
         });
         this._timerSubscription.add(() => console.debug('[network] Refresh timer stopped'));
     }
+    getText(path, opts) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let uri = this.getUri(path);
+            return HttpUtils.getText(this.http, uri, opts);
+        });
+    }
     get(path, opts) {
         return __awaiter(this, void 0, void 0, function* () {
-            let uri = path;
-            // If path is not an URI: prepend with peer URL
-            if (!uri.startsWith('http://') && !uri.startsWith('https://')) {
-                let peerUrl = (this.peer && this.peer.url);
-                // Remove trailing slash
-                if (peerUrl.endsWith('/')) {
-                    peerUrl = peerUrl.substr(0, peerUrl.length - 1);
-                }
-                // Add first path
-                if (!path.startsWith('/')) {
-                    path = '/' + path;
-                }
-                // Create the URI: concat peer URL and path
-                uri = peerUrl + path;
-            }
-            // Execute the request
-            return HttpUtils.getResource(this.http, uri, opts);
+            let uri = this.getUri(path);
+            return HttpUtils.getJson(this.http, uri, opts);
         });
     }
     /* -- Protected methods -- */
+    getUri(path) {
+        let uri = path;
+        // If path is not an URI: prepend with peer URL
+        if (!uri.startsWith('http://') && !uri.startsWith('https://')) {
+            let peerUrl = (this.peer && this.peer.url);
+            // Remove trailing slash
+            if (peerUrl.endsWith('/')) {
+                peerUrl = peerUrl.substr(0, peerUrl.length - 1);
+            }
+            // Add first path
+            if (!path.startsWith('/')) {
+                path = '/' + path;
+            }
+            // Create the URI: concat peer URL and path
+            uri = peerUrl + path;
+        }
+        return uri;
+    }
     onDeviceConnectionChanged(connectionType) {
         connectionType = (connectionType || 'unknown').toLowerCase();
         if (connectionType.startsWith('cell'))
@@ -17654,22 +17685,24 @@ class JobUtils {
     }
     static run(runnable, opts) {
         const progression = new BehaviorSubject(0);
-        runnable(progression, opts)
+        runnable(Object.assign(Object.assign({}, opts), { progression }))
             .then(() => {
-            if (opts && opts.maxProgression)
+            if (opts === null || opts === void 0 ? void 0 : opts.maxProgression)
                 progression.next(opts.maxProgression);
-            progression.complete();
+            if (opts === null || opts === void 0 ? void 0 : opts.progression)
+                opts.progression.complete();
         })
             .catch(err => progression.error(err));
         return progression;
     }
-    static fetchAllPages(loadPageFn, progression, opts) {
+    static fetchAllPages(loadPageFn, opts) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const maxProgression = opts && opts.maxProgression || undefined;
             let total;
-            let loopCount;
+            let pageCount;
             let progressionStep;
-            let loopDataCount;
+            let currentPageDataCount;
             const fetchSize = opts && opts.fetchSize || 1000;
             let offset = 0;
             let data = [];
@@ -17679,37 +17712,42 @@ class JobUtils {
                 // Get some items, using paging
                 const res = yield loadPageFn(offset, fetchSize);
                 data = data.concat(res.data);
-                loopDataCount = res.data && res.data.length || 0;
-                offset += loopDataCount;
+                currentPageDataCount = res.data && res.data.length || 0;
+                offset += currentPageDataCount;
                 // Set total count (only if not already set)
                 if (isNil(total) && isNotNil(res.total)) {
                     total = res.total;
-                    loopCount = Math.round(res.total / fetchSize + 0.5); // Round to next integer
-                    progressionStep = maxProgression ? maxProgression / loopCount : undefined /*if 0 reset to undefined*/;
+                    // 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*/;
                 }
                 // Increment progression on each iteration (if possible)
-                if (isNotNil(progressionStep)) {
-                    progression.next(progression.getValue() + progressionStep);
+                if (opts && opts.progression && isNotNil(progressionStep)) {
+                    opts.progression.next(opts.progression.value + progressionStep);
                 }
                 if (opts && opts.onPageLoaded)
                     opts.onPageLoaded(res);
-            } while (loopDataCount > 0 && ((isNil(total) && loopDataCount === fetchSize) || (isNotNil(total) && (offset < total))));
+            } while (currentPageDataCount > 0 && ((isNil(total) && currentPageDataCount === fetchSize) || (isNotNil(total) && (offset < total))));
             // Complete progression to reach progressionStep value (because of round)
             if (isNotNil(progressionStep)) {
                 // If total return by loadAll was bad !
                 if (isNotNil(total) && data.length < total) {
                     console.warn(`A function loadAll() returned a bad total (less than all page's data)! Expected ${total} but fetch ${data.length}`);
                     total = data.length;
-                    loopCount = Math.round(data.length / fetchSize + 0.5);
+                    pageCount = Math.round(data.length / fetchSize + 0.5);
                 }
-                const lastProgressionStep = opts.maxProgression - (progressionStep * loopCount);
-                if (lastProgressionStep > 0) {
-                    progression.next(progression.getValue() + lastProgressionStep);
+                const lastProgressionStep = opts.maxProgression - (progressionStep * pageCount);
+                if (opts && opts.progression && lastProgressionStep > 0) {
+                    opts.progression.next(opts.progression.value + lastProgressionStep);
                 }
             }
             // Or increment once
-            else if (opts.maxProgression) {
-                progression.next(progression.getValue() + opts.maxProgression);
+            else if (opts && opts.progression && opts.maxProgression) {
+                opts.progression.next(opts.maxProgression);
             }
             return {
                 data,
@@ -25399,23 +25437,20 @@ class PersonService extends BaseEntityService {
             return this.loadAll(0, !value ? 30 : 10, sortBy, sortDirection, Object.assign(Object.assign({}, filter), { searchText: value, statusIds: filter && filter.statusIds || [StatusIds.ENABLE], userProfiles: filter && filter.userProfiles }), { withTotal: true /* need by autocomplete */ });
         });
     }
-    executeImport(progression, opts) {
+    executeImport(filter, opts) {
         const _super = Object.create(null, {
             loadAll: { get: () => super.loadAll }
         });
         return __awaiter(this, void 0, void 0, function* () {
             const maxProgression = opts && opts.maxProgression || 100;
-            const filter = {
-                statusIds: [StatusIds.ENABLE, StatusIds.TEMPORARY],
-                userProfiles: ['SUPERVISOR', 'USER', 'GUEST']
-            };
+            filter = Object.assign(Object.assign({}, filter), { statusIds: [StatusIds.ENABLE, StatusIds.TEMPORARY], userProfiles: ['SUPERVISOR', 'USER', 'GUEST'] });
             console.info('[person-service] Importing persons...');
             const res = yield JobUtils.fetchAllPages((offset, size) => _super.loadAll.call(this, offset, size, 'id', null, filter, {
                 debug: false,
                 fetchPolicy: 'network-only',
                 withTotal: (offset === 0),
                 toEntity: false
-            }), progression, { maxProgression: maxProgression * 0.9 });
+            }), Object.assign(Object.assign({}, opts), { maxProgression: maxProgression * 0.9 }));
             // Save result locally
             yield this.entities.saveAll(res.data, { entityName: 'PersonVO', reset: true });
         });
@@ -25425,7 +25460,7 @@ class PersonService extends BaseEntityService {
         if (!source)
             return undefined;
         console.debug('TODO check isInstanceOf');
-        if (!isInstanceOf(source, Person)) {
+        if (!(source instanceof Person)) {
             source = Person.fromObject(source);
         }
         const target = source.asObject();