@sumaris-net/ngx-components 1.15.13 → 1.16.1

package/bundles/sumaris-net.ngx-components.umd.js

@@ -11314,18 +11314,14 @@
     var HttpUtils = /** @class */ (function () {
         function HttpUtils() {
         }
-        HttpUtils.getResource = function (http, uri, opts) {
+        HttpUtils.getText = function (http, uri, opts) {
             return __awaiter(this, void 0, void 0, function () {
                 var err_1;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
                             // 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 i2$1.HttpHeaders ? opts.headers : new i2$1.HttpHeaders(opts.headers));
@@ -11336,10 +11332,8 @@
                             _a.label = 1;
                         case 1:
                             _a.trys.push([1, 3, , 4]);
-                            return [4 /*yield*/, http.get(uri, opts).toPromise()];
-                        case 2: 
-                        // Using web http client
-                        return [2 /*return*/, (_a.sent())];
+                            return [4 /*yield*/, http.get(uri, Object.assign(Object.assign({}, opts), { responseType: 'text' })).toPromise()];
+                        case 2: return [2 /*return*/, (_a.sent())];
                         case 3:
                             err_1 = _a.sent();
                             if (err_1 && err_1.message) {
@@ -11354,6 +11348,40 @@
                 });
             });
         };
+        HttpUtils.getJson = function (http, uri, opts) {
+            return __awaiter(this, void 0, void 0, function () {
+                var err_2;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            // Add headers
+                            opts = opts || {};
+                            // Force no cache
+                            if (opts.nocache === true) {
+                                opts.headers = (opts.headers instanceof i2$1.HttpHeaders ? opts.headers : new i2$1.HttpHeaders(opts.headers));
+                                opts.headers
+                                    .append('Cache-Control', 'no-cache')
+                                    .append('Pragma', 'no-cache');
+                            }
+                            _a.label = 1;
+                        case 1:
+                            _a.trys.push([1, 3, , 4]);
+                            return [4 /*yield*/, http.get(uri, Object.assign(Object.assign({}, opts), { responseType: 'json' })).toPromise()];
+                        case 2: return [2 /*return*/, (_a.sent())];
+                        case 3:
+                            err_2 = _a.sent();
+                            if (err_2 && err_2.message) {
+                                console.error("[network] Error on get request " + uri + ": " + err_2.message, err_2);
+                            }
+                            else {
+                                console.error("[network] Error on get request " + uri + ": " + (err_2 && err_2.statusText) + " - " + JSON.stringify(err_2));
+                            }
+                            throw { code: err_2.status, message: 'ERROR.UNKNOWN_NETWORK_ERROR' };
+                        case 4: return [2 /*return*/];
+                    }
+                });
+            });
+        };
         return HttpUtils;
     }());
 
@@ -11374,7 +11402,7 @@
                 if (peerUrl.endsWith('/')) {
                     peerUrl = peerUrl.substr(0, peerUrl.length - 1);
                 }
-                return [2 /*return*/, HttpUtils.getResource(http, peerUrl + '/api/node/info', opts)];
+                return [2 /*return*/, HttpUtils.getJson(http, peerUrl + '/api/node/info', opts)];
             });
         });
     }
@@ -12639,7 +12667,7 @@
                             if (opts === null || opts === void 0 ? void 0 : opts.nocache) {
                                 path += '?t=' + Date.now();
                             }
-                            return [4 /*yield*/, this.get(path, opts)];
+                            return [4 /*yield*/, this.getText(path, opts)];
                         case 1:
                             appVersion = _b.sent();
                             if (isNotNilOrBlank(appVersion))
@@ -12906,31 +12934,43 @@
             });
             this._timerSubscription.add(function () { return console.debug('[network] Refresh timer stopped'); });
         };
+        NetworkService.prototype.getText = function (path, opts) {
+            return __awaiter(this, void 0, void 0, function () {
+                var uri;
+                return __generator(this, function (_b) {
+                    uri = this.getUri(path);
+                    return [2 /*return*/, HttpUtils.getText(this.http, uri, opts)];
+                });
+            });
+        };
         NetworkService.prototype.get = function (path, opts) {
             return __awaiter(this, void 0, void 0, function () {
-                var uri, peerUrl;
+                var uri;
                 return __generator(this, function (_b) {
-                    uri = path;
-                    // If path is not an URI: prepend with peer URL
-                    if (!uri.startsWith('http://') && !uri.startsWith('https://')) {
-                        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 [2 /*return*/, HttpUtils.getResource(this.http, uri, opts)];
+                    uri = this.getUri(path);
+                    return [2 /*return*/, HttpUtils.getJson(this.http, uri, opts)];
                 });
             });
         };
         /* -- Protected methods -- */
+        NetworkService.prototype.getUri = function (path) {
+            var uri = path;
+            // If path is not an URI: prepend with peer URL
+            if (!uri.startsWith('http://') && !uri.startsWith('https://')) {
+                var 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;
+        };
         NetworkService.prototype.onDeviceConnectionChanged = function (connectionType) {
             connectionType = (connectionType || 'unknown').toLowerCase();
             if (connectionType.startsWith('cell'))
@@ -20261,51 +20301,57 @@
         };
         JobUtils.run = function (runnable, opts) {
             var progression = new rxjs.BehaviorSubject(0);
-            runnable(progression, opts)
+            runnable(Object.assign(Object.assign({}, opts), { progression: progression }))
                 .then(function () {
-                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(function (err) { return progression.error(err); });
             return progression;
         };
-        JobUtils.fetchAllPages = function (loadPageFn, progression, opts) {
+        JobUtils.fetchAllPages = function (loadPageFn, opts) {
+            var _a;
             return __awaiter(this, void 0, void 0, function () {
-                var maxProgression, total, loopCount, progressionStep, loopDataCount, fetchSize, offset, data, res, lastProgressionStep;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
+                var maxProgression, total, pageCount, progressionStep, currentPageDataCount, fetchSize, offset, data, res, actualProgression, lastProgressionStep;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
                         case 0:
                             maxProgression = opts && opts.maxProgression || undefined;
                             fetchSize = opts && opts.fetchSize || 1000;
                             offset = 0;
                             data = [];
-                            _a.label = 1;
+                            _b.label = 1;
                         case 1:
                             if (opts && opts.logPrefix)
                                 console.debug(opts.logPrefix + " Fetching page #" + offset / fetchSize + "...");
                             return [4 /*yield*/, loadPageFn(offset, fetchSize)];
                         case 2:
-                            res = _a.sent();
+                            res = _b.sent();
                             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
+                                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);
-                            _a.label = 3;
+                            _b.label = 3;
                         case 3:
-                            if (loopDataCount > 0 && ((isNil(total) && loopDataCount === fetchSize) || (isNotNil(total) && (offset < total)))) return [3 /*break*/, 1];
-                            _a.label = 4;
+                            if (currentPageDataCount > 0 && ((isNil(total) && currentPageDataCount === fetchSize) || (isNotNil(total) && (offset < total)))) return [3 /*break*/, 1];
+                            _b.label = 4;
                         case 4:
                             // Complete progression to reach progressionStep value (because of round)
                             if (isNotNil(progressionStep)) {
@@ -20313,16 +20359,16 @@
                                 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);
                                 }
-                                lastProgressionStep = opts.maxProgression - (progressionStep * loopCount);
-                                if (lastProgressionStep > 0) {
-                                    progression.next(progression.getValue() + lastProgressionStep);
+                                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 [2 /*return*/, {
                                     data: data,
@@ -29419,28 +29465,25 @@
                 });
             });
         };
-        PersonService.prototype.executeImport = function (progression, opts) {
+        PersonService.prototype.executeImport = function (filter, opts) {
             var _super = Object.create(null, {
                 loadAll: { get: function () { return _super_1.prototype.loadAll; } }
             });
             return __awaiter(this, void 0, void 0, function () {
-                var maxProgression, filter, res;
+                var maxProgression, res;
                 var _this = this;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
                             maxProgression = opts && opts.maxProgression || 100;
-                            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...');
                             return [4 /*yield*/, JobUtils.fetchAllPages(function (offset, size) { return _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 }))];
                         case 1:
                             res = _a.sent();
                             // Save result locally
@@ -29458,7 +29501,7 @@
             if (!source)
                 return undefined;
             console.debug('TODO check isInstanceOf');
-            if (!isInstanceOf(source, exports.Person)) {
+            if (!(source instanceof exports.Person)) {
                 source = exports.Person.fromObject(source);
             }
             var target = source.asObject();