@sumaris-net/ngx-components 1.19.4 → 1.19.5-rc1

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

@@ -17888,6 +17888,252 @@
     ]; };
     var templateObject_1$1, templateObject_2$1, templateObject_3$1, templateObject_4$1, templateObject_5$1;
 
+    var UploadFile = /** @class */ (function (_super) {
+        __extends(UploadFile, _super);
+        function UploadFile() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        return UploadFile;
+    }(File));
+    var FileResponse = /** @class */ (function () {
+        function FileResponse(init) {
+            this.type = i2$1.HttpEventType.Response;
+            this.body = isNotNil(init === null || init === void 0 ? void 0 : init.body) ? init.body : null;
+            this.status = (init === null || init === void 0 ? void 0 : init.status) || 0;
+            this.statusText = (init === null || init === void 0 ? void 0 : init.statusText) || 'OK';
+        }
+        return FileResponse;
+    }());
+    function isProgressEvent(event) {
+        return event && (event.type === i2$1.HttpEventType.UploadProgress
+            || event.type === i2$1.HttpEventType.DownloadProgress);
+    }
+    function isResponseEvent(event) {
+        return event && event.type === i2$1.HttpEventType.Response;
+    }
+
+    var UploadFilePopover = /** @class */ (function () {
+        function UploadFilePopover(popoverController, translate, cd) {
+            this.popoverController = popoverController;
+            this.translate = translate;
+            this.cd = cd;
+            this.uniqueFile = false;
+            this.instantUpload = false;
+            this.importing = false;
+        }
+        Object.defineProperty(UploadFilePopover.prototype, "files", {
+            get: function () {
+                return this.uploader.files;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(UploadFilePopover.prototype, "disabled", {
+            get: function () {
+                return this.importing || isEmptyArray(this.files);
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(UploadFilePopover.prototype, "valid", {
+            get: function () {
+                return isNotEmptyArray(this.files);
+            },
+            enumerable: false,
+            configurable: true
+        });
+        UploadFilePopover.prototype.onValidate = function (event) {
+            return __awaiter(this, void 0, void 0, function () {
+                var files, errors, err_1;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            event === null || event === void 0 ? void 0 : event.stopPropagation();
+                            // Avoid multiple call
+                            if (this.importing)
+                                return [2 /*return*/];
+                            console.debug('[upload-file-popover] Validate form: will upload all files...');
+                            _a.label = 1;
+                        case 1:
+                            _a.trys.push([1, , 8, 9]);
+                            this.importing = true;
+                            this.resetError();
+                            _a.label = 2;
+                        case 2:
+                            _a.trys.push([2, 6, , 7]);
+                            // Wait processing files finished
+                            return [4 /*yield*/, this.uploader.waitIdle()];
+                        case 3:
+                            // Wait processing files finished
+                            _a.sent();
+                            // upload all files
+                            return [4 /*yield*/, this.uploader.uploadFiles()];
+                        case 4:
+                            // upload all files
+                            _a.sent();
+                            files = (this.uploader.processedFiles || [])
+                                .filter(function (file) { return !file.deleting; });
+                            // Nothing to upload: close popover
+                            if (isEmptyArray(files))
+                                return [2 /*return*/, this.cancel()];
+                            errors = files.map(function (file) { return file.error; }).filter(isNotNilOrBlank);
+                            // If error: stop
+                            if (errors.length) {
+                                errors.forEach(function (error) { return console.error(error); });
+                                throw { message: 'FILE.UPLOAD.ERROR' };
+                            }
+                            // return files
+                            return [4 /*yield*/, this.popoverController.dismiss(files)];
+                        case 5:
+                            // return files
+                            _a.sent();
+                            return [3 /*break*/, 7];
+                        case 6:
+                            err_1 = _a.sent();
+                            this.error = (err_1 && err_1.message) || err_1;
+                            return [3 /*break*/, 7];
+                        case 7: return [3 /*break*/, 9];
+                        case 8:
+                            this.importing = false;
+                            this.cd.markForCheck();
+                            return [7 /*endfinally*/];
+                        case 9: return [2 /*return*/];
+                    }
+                });
+            });
+        };
+        UploadFilePopover.prototype.cancel = function () {
+            return this.popoverController.dismiss();
+        };
+        UploadFilePopover.prototype.resetError = function () {
+            if (this.error) {
+                this.error = null;
+                this.cd.markForCheck();
+            }
+        };
+        return UploadFilePopover;
+    }());
+    UploadFilePopover.decorators = [
+        { type: i0.Component, args: [{
+                    selector: 'app-upload-file-popover',
+                    template: "\n<ion-content class=\"ion-no-padding\" scrollY=\"false\">\n  <div class=\"modal-content\">\n    <app-upload-file\n      #uploader\n      [uploadFn]=\"uploadFn\"\n      [deleteFn]=\"deleteFn\"\n      [fileExtension]=\"fileExtension\"\n      [instantUpload]=\"instantUpload\"\n      [uniqueFile]=\"uniqueFile\"\n      [maxParallelUpload]=\"maxParallelUpload\"\n    ></app-upload-file>\n  </div>\n</ion-content>\n\n<ion-footer>\n  <ion-toolbar>\n    <ion-row class=\"ion-no-padding\" nowrap>\n      <ion-col>\n        <div *ngIf=\"importing\" class=\"importing-info\">\n          <ion-text color=\"medium\"><small translate>FILE.UPLOAD.IMPORTING</small></ion-text>\n          &nbsp;<ion-spinner name=\"dots\" color=\"accent\"></ion-spinner>\n        </div>\n        <ion-item *ngIf=\"error\" lines=\"none\">\n          <ion-icon color=\"danger\" slot=\"start\" name=\"alert-circle\"></ion-icon>\n          <ion-label color=\"danger\" class=\"ion-text-wrap\" [innerHTML]=\"error | translate\"></ion-label>\n        </ion-item>\n      </ion-col>\n      <ion-col size=\"auto\">\n        <ion-button fill=\"clear\" color=\"dark\" (click)=\"cancel()\">\n          <ion-label translate>COMMON.BTN_CANCEL</ion-label>\n        </ion-button>\n        <ion-button\n          [fill]=\"disabled ? 'clear' : 'solid'\"\n          (click)=\"onValidate($event)\"\n          (keyup.enter)=\"onValidate($event)\"\n          color=\"tertiary\"\n          [disabled]=\"disabled\"\n        >\n          <ion-label translate>COMMON.BTN_IMPORT</ion-label>\n        </ion-button>\n      </ion-col>\n    </ion-row>\n  </ion-toolbar>\n</ion-footer>\n",
+                    encapsulation: i0.ViewEncapsulation.None,
+                    changeDetection: i0.ChangeDetectionStrategy.OnPush,
+                    styles: [".importing-info{-webkit-padding-start:var(--ion-padding);padding-inline-start:var(--ion-padding);display:inline-flex;flex-wrap:nowrap;padding-top:8px}"]
+                },] }
+    ];
+    UploadFilePopover.ctorParameters = function () { return [
+        { type: i1$5.PopoverController },
+        { type: i1$2.TranslateService },
+        { type: i0.ChangeDetectorRef }
+    ]; };
+    UploadFilePopover.propDecorators = {
+        uploader: [{ type: i0.ViewChild, args: ['uploader', { static: true },] }],
+        fileExtension: [{ type: i0.Input }],
+        title: [{ type: i0.Input }],
+        uniqueFile: [{ type: i0.Input }],
+        instantUpload: [{ type: i0.Input }],
+        uploadFn: [{ type: i0.Input }],
+        deleteFn: [{ type: i0.Input }],
+        maxParallelUpload: [{ type: i0.Input }]
+    };
+
+    var MimeTypes = Object.freeze({
+        ANDROID_APK: 'application/vnd.android.package-archive'
+    });
+    var FilesUtils = /** @class */ (function () {
+        function FilesUtils() {
+        }
+        FilesUtils.showUploadPopover = function (popoverController, event, opts) {
+            return __awaiter(this, void 0, void 0, function () {
+                var modal, _a, data, role;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0: return [4 /*yield*/, popoverController.create({
+                                component: UploadFilePopover,
+                                componentProps: opts,
+                                backdropDismiss: false,
+                                keyboardClose: false,
+                                event: event,
+                                translucent: true,
+                                cssClass: 'popover-large',
+                            })];
+                        case 1:
+                            modal = _b.sent();
+                            return [4 /*yield*/, modal.present()];
+                        case 2:
+                            _b.sent();
+                            return [4 /*yield*/, modal.onDidDismiss()];
+                        case 3:
+                            _a = _b.sent(), data = _a.data, role = _a.role;
+                            return [2 /*return*/, {
+                                    role: role,
+                                    data: data ? data : undefined
+                                }];
+                    }
+                });
+            });
+        };
+        FilesUtils.readAsText = function (file, encoding) {
+            var $progress = new rxjs.Subject();
+            var reader = new FileReader();
+            encoding = (encoding || 'UTF-8').toLowerCase();
+            // Listen progress
+            reader.onprogress = function (e) {
+                var total = e.total || 1;
+                var loaded = e.total || 0;
+                if (loaded < total)
+                    $progress.next({ type: i2$1.HttpEventType.UploadProgress, loaded: loaded, total: total });
+            };
+            // Listen end
+            reader.onloadend = function (e) {
+                var body = reader.result;
+                if (typeof body === 'string') {
+                    $progress.next(new FileResponse({ body: body }));
+                    $progress.complete();
+                }
+                else {
+                    console.error("Cannot read file '" + file.name + "' as text");
+                    $progress.error("Cannot read file as text");
+                }
+            };
+            // Listen error
+            reader.onerror = function (event) {
+                console.error('[files] Error while reading file:', event);
+                $progress.error(event);
+            };
+            // Start reading the file
+            reader.readAsText(file, encoding);
+            return $progress.asObservable();
+        };
+        return FilesUtils;
+    }());
+    var UriUtils = /** @class */ (function () {
+        function UriUtils() {
+        }
+        /**
+         * Extract the filename, from an uri (using the last slash)
+         * @param uri
+         */
+        UriUtils.getFilename = function (uri) {
+            if (!uri)
+                return uri;
+            var filename = uri.trim();
+            // Get last part (or all string, if no '/')
+            var lastSlashIndex = filename.lastIndexOf('/');
+            if (lastSlashIndex !== -1 && lastSlashIndex !== uri.length - 1) {
+                filename = filename.substring(lastSlashIndex + 1);
+            }
+            // Remove query params
+            var queryParamIndex = filename.indexOf('?');
+            if (queryParamIndex !== -1) {
+                filename = filename.substring(0, queryParamIndex);
+            }
+            return filename;
+        };
+        return UriUtils;
+    }());
+
     var moment$4 = momentImported__namespace;
     var AndroidOsEnvironment = Object.freeze({
         DIRECTORY_DOWNLOADS: 'Download',
@@ -18083,34 +18329,48 @@
         };
         PlatformService.prototype.download = function (request) {
             var _this = this;
+            var _a, _b;
             if (!request || !request.uri)
                 throw new Error('Missing argument \'request\' or \'request.uri\'');
             if (this._android && this.downloader) {
                 // Check if not already downloading file
-                var location$ = this._downloadingJobs.get(request.uri);
-                if (location$)
-                    return location$;
-                request = Object.assign(Object.assign({ visibleInDownloadsUi: true, notificationVisibility: ngx$6.NotificationVisibility.VisibleNotifyCompleted, title: request.title || request.filename }, request), { destinationInExternalPublicDir: Object.assign({ dirType: AndroidOsEnvironment.DIRECTORY_DOWNLOADS, subPath: request.filename || request.title || '' }, request.destinationInExternalPublicDir) });
-                console.debug('[platform] Downloading, using request: ' + JSON.stringify(request));
+                var job$ = this._downloadingJobs.get(request.uri);
+                if (job$)
+                    return job$;
+                // Compute subPath (final filename)
+                var subPath = ((_a = request.destinationInExternalPublicDir) === null || _a === void 0 ? void 0 : _a.subPath) || ((_b = request.destinationInExternalFilesDir) === null || _b === void 0 ? void 0 : _b.subPath)
+                    || request.filename || UriUtils.getFilename(request.uri)
+                    || request.title || 'download';
+                subPath = subPath.toLowerCase()
+                    // Remove spaces
+                    .replace(/\s+/g, '-');
+                // Force APK to finish with '.apk'
+                if (request.mimeType === MimeTypes.ANDROID_APK && !subPath.toLowerCase().endsWith('.apk')) {
+                    subPath += '.apk';
+                }
+                var downloadRequest_1 = Object.assign(Object.assign({ visibleInDownloadsUi: true, notificationVisibility: ngx$6.NotificationVisibility.VisibleNotifyCompleted }, request), { filename: undefined, destinationInExternalPublicDir: !request.destinationInExternalFilesDir
+                        ? Object.assign(Object.assign({ dirType: AndroidOsEnvironment.DIRECTORY_DOWNLOADS }, request.destinationInExternalPublicDir), { subPath: subPath }) : undefined, destinationInExternalFilesDir: request.destinationInExternalFilesDir
+                        ? Object.assign(Object.assign({ dirType: AndroidOsEnvironment.DIRECTORY_DOWNLOADS }, request.destinationInExternalFilesDir), { subPath: subPath }) : undefined });
                 // Start download
-                location$ = rxjs.from(this.downloader.download(request));
+                console.debug('[platform] Downloading, using request: ' + JSON.stringify(downloadRequest_1));
+                job$ = rxjs.from(this.downloader.download(downloadRequest_1));
                 // Remember this request uri
-                this._downloadingJobs.set(request.uri, location$);
-                return location$
+                this._downloadingJobs.set(downloadRequest_1.uri, job$);
+                return job$
                     .pipe(operators.tap(function (location) {
                     console.info('[platform] File successfully downloaded at:' + location);
-                    // Forget the request
-                    _this._downloadingJobs.delete(request.uri);
+                    // Forget job
+                    _this._downloadingJobs.delete(downloadRequest_1.uri);
                     return location;
                 }), operators.catchError(function (err) {
                     var _a;
                     console.error('[platform] Unable to download: ' + (err && err.message || err));
                     // Forget the request
-                    _this._downloadingJobs.delete(request.uri);
+                    _this._downloadingJobs.delete(downloadRequest_1.uri);
                     // Retry with another location - issue in older Android version
-                    if (((_a = request.destinationInExternalPublicDir) === null || _a === void 0 ? void 0 : _a.dirType) === AndroidOsEnvironment.DIRECTORY_DOWNLOADS) {
-                        request.destinationInExternalPublicDir.dirType = AndroidOsEnvironment.DIRECTORY_DOWNLOADS_OLD;
-                        return _this.download(request);
+                    if (((_a = downloadRequest_1.destinationInExternalPublicDir) === null || _a === void 0 ? void 0 : _a.dirType) === AndroidOsEnvironment.DIRECTORY_DOWNLOADS) {
+                        downloadRequest_1.destinationInExternalPublicDir.dirType = AndroidOsEnvironment.DIRECTORY_DOWNLOADS_OLD;
+                        return _this.download(downloadRequest_1);
                     }
                     throw err;
                 }));
@@ -18526,30 +18786,6 @@
         { type: i1$2.TranslateService }
     ]; };
 
-    var UploadFile = /** @class */ (function (_super) {
-        __extends(UploadFile, _super);
-        function UploadFile() {
-            return _super !== null && _super.apply(this, arguments) || this;
-        }
-        return UploadFile;
-    }(File));
-    var FileResponse = /** @class */ (function () {
-        function FileResponse(init) {
-            this.type = i2$1.HttpEventType.Response;
-            this.body = isNotNil(init === null || init === void 0 ? void 0 : init.body) ? init.body : null;
-            this.status = (init === null || init === void 0 ? void 0 : init.status) || 0;
-            this.statusText = (init === null || init === void 0 ? void 0 : init.statusText) || 'OK';
-        }
-        return FileResponse;
-    }());
-    function isProgressEvent(event) {
-        return event && (event.type === i2$1.HttpEventType.UploadProgress
-            || event.type === i2$1.HttpEventType.DownloadProgress);
-    }
-    function isResponseEvent(event) {
-        return event && event.type === i2$1.HttpEventType.Response;
-    }
-
     var UploadFileComponent = /** @class */ (function () {
         function UploadFileComponent(cd, translate) {
             this.cd = cd;
@@ -18778,132 +19014,6 @@
         maxParallelUpload: [{ type: i0.Input }]
     };
 
-    var UploadFilePopover = /** @class */ (function () {
-        function UploadFilePopover(popoverController, translate, cd) {
-            this.popoverController = popoverController;
-            this.translate = translate;
-            this.cd = cd;
-            this.uniqueFile = false;
-            this.instantUpload = false;
-            this.importing = false;
-        }
-        Object.defineProperty(UploadFilePopover.prototype, "files", {
-            get: function () {
-                return this.uploader.files;
-            },
-            enumerable: false,
-            configurable: true
-        });
-        Object.defineProperty(UploadFilePopover.prototype, "disabled", {
-            get: function () {
-                return this.importing || isEmptyArray(this.files);
-            },
-            enumerable: false,
-            configurable: true
-        });
-        Object.defineProperty(UploadFilePopover.prototype, "valid", {
-            get: function () {
-                return isNotEmptyArray(this.files);
-            },
-            enumerable: false,
-            configurable: true
-        });
-        UploadFilePopover.prototype.onValidate = function (event) {
-            return __awaiter(this, void 0, void 0, function () {
-                var files, errors, err_1;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
-                        case 0:
-                            event === null || event === void 0 ? void 0 : event.stopPropagation();
-                            // Avoid multiple call
-                            if (this.importing)
-                                return [2 /*return*/];
-                            console.debug('[upload-file-popover] Validate form: will upload all files...');
-                            _a.label = 1;
-                        case 1:
-                            _a.trys.push([1, , 8, 9]);
-                            this.importing = true;
-                            this.resetError();
-                            _a.label = 2;
-                        case 2:
-                            _a.trys.push([2, 6, , 7]);
-                            // Wait processing files finished
-                            return [4 /*yield*/, this.uploader.waitIdle()];
-                        case 3:
-                            // Wait processing files finished
-                            _a.sent();
-                            // upload all files
-                            return [4 /*yield*/, this.uploader.uploadFiles()];
-                        case 4:
-                            // upload all files
-                            _a.sent();
-                            files = (this.uploader.processedFiles || [])
-                                .filter(function (file) { return !file.deleting; });
-                            // Nothing to upload: close popover
-                            if (isEmptyArray(files))
-                                return [2 /*return*/, this.cancel()];
-                            errors = files.map(function (file) { return file.error; }).filter(isNotNilOrBlank);
-                            // If error: stop
-                            if (errors.length) {
-                                errors.forEach(function (error) { return console.error(error); });
-                                throw { message: 'FILE.UPLOAD.ERROR' };
-                            }
-                            // return files
-                            return [4 /*yield*/, this.popoverController.dismiss(files)];
-                        case 5:
-                            // return files
-                            _a.sent();
-                            return [3 /*break*/, 7];
-                        case 6:
-                            err_1 = _a.sent();
-                            this.error = (err_1 && err_1.message) || err_1;
-                            return [3 /*break*/, 7];
-                        case 7: return [3 /*break*/, 9];
-                        case 8:
-                            this.importing = false;
-                            this.cd.markForCheck();
-                            return [7 /*endfinally*/];
-                        case 9: return [2 /*return*/];
-                    }
-                });
-            });
-        };
-        UploadFilePopover.prototype.cancel = function () {
-            return this.popoverController.dismiss();
-        };
-        UploadFilePopover.prototype.resetError = function () {
-            if (this.error) {
-                this.error = null;
-                this.cd.markForCheck();
-            }
-        };
-        return UploadFilePopover;
-    }());
-    UploadFilePopover.decorators = [
-        { type: i0.Component, args: [{
-                    selector: 'app-upload-file-popover',
-                    template: "\n<ion-content class=\"ion-no-padding\" scrollY=\"false\">\n  <div class=\"modal-content\">\n    <app-upload-file\n      #uploader\n      [uploadFn]=\"uploadFn\"\n      [deleteFn]=\"deleteFn\"\n      [fileExtension]=\"fileExtension\"\n      [instantUpload]=\"instantUpload\"\n      [uniqueFile]=\"uniqueFile\"\n      [maxParallelUpload]=\"maxParallelUpload\"\n    ></app-upload-file>\n  </div>\n</ion-content>\n\n<ion-footer>\n  <ion-toolbar>\n    <ion-row class=\"ion-no-padding\" nowrap>\n      <ion-col>\n        <div *ngIf=\"importing\" class=\"importing-info\">\n          <ion-text color=\"medium\"><small translate>FILE.UPLOAD.IMPORTING</small></ion-text>\n          &nbsp;<ion-spinner name=\"dots\" color=\"accent\"></ion-spinner>\n        </div>\n        <ion-item *ngIf=\"error\" lines=\"none\">\n          <ion-icon color=\"danger\" slot=\"start\" name=\"alert-circle\"></ion-icon>\n          <ion-label color=\"danger\" class=\"ion-text-wrap\" [innerHTML]=\"error | translate\"></ion-label>\n        </ion-item>\n      </ion-col>\n      <ion-col size=\"auto\">\n        <ion-button fill=\"clear\" color=\"dark\" (click)=\"cancel()\">\n          <ion-label translate>COMMON.BTN_CANCEL</ion-label>\n        </ion-button>\n        <ion-button\n          [fill]=\"disabled ? 'clear' : 'solid'\"\n          (click)=\"onValidate($event)\"\n          (keyup.enter)=\"onValidate($event)\"\n          color=\"tertiary\"\n          [disabled]=\"disabled\"\n        >\n          <ion-label translate>COMMON.BTN_IMPORT</ion-label>\n        </ion-button>\n      </ion-col>\n    </ion-row>\n  </ion-toolbar>\n</ion-footer>\n",
-                    encapsulation: i0.ViewEncapsulation.None,
-                    changeDetection: i0.ChangeDetectionStrategy.OnPush,
-                    styles: [".importing-info{-webkit-padding-start:var(--ion-padding);padding-inline-start:var(--ion-padding);display:inline-flex;flex-wrap:nowrap;padding-top:8px}"]
-                },] }
-    ];
-    UploadFilePopover.ctorParameters = function () { return [
-        { type: i1$5.PopoverController },
-        { type: i1$2.TranslateService },
-        { type: i0.ChangeDetectorRef }
-    ]; };
-    UploadFilePopover.propDecorators = {
-        uploader: [{ type: i0.ViewChild, args: ['uploader', { static: true },] }],
-        fileExtension: [{ type: i0.Input }],
-        title: [{ type: i0.Input }],
-        uniqueFile: [{ type: i0.Input }],
-        instantUpload: [{ type: i0.Input }],
-        uploadFn: [{ type: i0.Input }],
-        deleteFn: [{ type: i0.Input }],
-        maxParallelUpload: [{ type: i0.Input }]
-    };
-
     var APP_TESTING_PAGES = new i0.InjectionToken('testingPages');
     var SharedTestsPage = /** @class */ (function () {
         function SharedTestsPage(route, router, translate, pages) {
@@ -20498,74 +20608,6 @@
         return JobUtils;
     }());
 
-    var FilesUtils = /** @class */ (function () {
-        function FilesUtils() {
-        }
-        FilesUtils.showUploadPopover = function (popoverController, event, opts) {
-            return __awaiter(this, void 0, void 0, function () {
-                var modal, _a, data, role;
-                return __generator(this, function (_b) {
-                    switch (_b.label) {
-                        case 0: return [4 /*yield*/, popoverController.create({
-                                component: UploadFilePopover,
-                                componentProps: opts,
-                                backdropDismiss: false,
-                                keyboardClose: false,
-                                event: event,
-                                translucent: true,
-                                cssClass: 'popover-large',
-                            })];
-                        case 1:
-                            modal = _b.sent();
-                            return [4 /*yield*/, modal.present()];
-                        case 2:
-                            _b.sent();
-                            return [4 /*yield*/, modal.onDidDismiss()];
-                        case 3:
-                            _a = _b.sent(), data = _a.data, role = _a.role;
-                            return [2 /*return*/, {
-                                    role: role,
-                                    data: data ? data : undefined
-                                }];
-                    }
-                });
-            });
-        };
-        FilesUtils.readAsText = function (file, encoding) {
-            var $progress = new rxjs.Subject();
-            var reader = new FileReader();
-            encoding = (encoding || 'UTF-8').toLowerCase();
-            // Listen progress
-            reader.onprogress = function (e) {
-                var total = e.total || 1;
-                var loaded = e.total || 0;
-                if (loaded < total)
-                    $progress.next({ type: i2$1.HttpEventType.UploadProgress, loaded: loaded, total: total });
-            };
-            // Listen end
-            reader.onloadend = function (e) {
-                var body = reader.result;
-                if (typeof body === 'string') {
-                    $progress.next(new FileResponse({ body: body }));
-                    $progress.complete();
-                }
-                else {
-                    console.error("Cannot read file '" + file.name + "' as text");
-                    $progress.error("Cannot read file as text");
-                }
-            };
-            // Listen error
-            reader.onerror = function (event) {
-                console.error('[files] Error while reading file:', event);
-                $progress.error(event);
-            };
-            // Start reading the file
-            reader.readAsText(file, encoding);
-            return $progress.asObservable();
-        };
-        return FilesUtils;
-    }());
-
     /**
      * Define here theme colors
      */
@@ -23215,9 +23257,6 @@
         { type: i0.Injectable, args: [{ providedIn: 'root' },] }
     ];
 
-    var MimeTypes = Object.freeze({
-        ANDROID_APK: 'application/vnd.android.package-archive'
-    });
     var AppInstallUpgradeCard = /** @class */ (function () {
         function AppInstallUpgradeCard(modalCtrl, configService, toastController, alertController, translate, cd, platform, network, environment) {
             this.modalCtrl = modalCtrl;
@@ -23464,10 +23503,10 @@
                     var title = void 0;
                     var mimeType = void 0;
                     // Get file name
-                    var filename = this.getFilename(url);
+                    var filename = UriUtils.getFilename(url);
                     var version = minVersion || 'latest';
                     // OK, this is a downloadable APK file (e.g. NOT a link to a playstore)
-                    if (filename === null || filename === void 0 ? void 0 : filename.endsWith('.apk')) {
+                    if (filename === null || filename === void 0 ? void 0 : filename.toLowerCase().endsWith('.apk')) {
                         // Define mime type
                         mimeType = MimeTypes.ANDROID_APK;
                         // Get the file version (if any)
@@ -23478,11 +23517,9 @@
                             filename = (name + "-v" + version + ".apk").toLowerCase();
                             title = name + " v" + version;
                         }
-                        else {
-                            // Replace 'latest' with the app version, if present
-                            if (filename.indexOf('latest')) {
-                                filename = filename.replace('latest', version);
-                            }
+                        // Replace 'latest' with the app version, if present in the filename
+                        else if (filename.indexOf('latest') && version !== 'latest') {
+                            filename = filename.replace('latest', version);
                         }
                     }
                     result.push({ name: name, url: url, platform: 'android', version: version, filename: filename, title: title, mimeType: mimeType });
@@ -23494,18 +23531,6 @@
             //}
             return result;
         };
-        AppInstallUpgradeCard.prototype.getFilename = function (url) {
-            if (!url)
-                return;
-            // Get last part (or all string, if no '/')
-            var filename = url.substring(url.lastIndexOf('/') + 1);
-            var queryParamIndex = filename.indexOf('?');
-            if (queryParamIndex !== -1) {
-                // Remove query params
-                return filename.substring(0, queryParamIndex);
-            }
-            return filename;
-        };
         AppInstallUpgradeCard.prototype.listenDownloadJobs = function () {
             var _this = this;
             // Listening downloading promise, if exists
@@ -25266,7 +25291,7 @@
                 updateDatasource: { get: function () { return _super_1.prototype.updateDatasource; } }
             });
             return __awaiter(this, void 0, void 0, function () {
-                var res, existingData;
+                var fetchMoreFn, res, existingData;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
@@ -25276,9 +25301,9 @@
                                 console.warn('Cannot fetch more because still editing row');
                                 return [2 /*return*/];
                             }
-                            // Fetch next page
-                            this._fetchMoreFn = null; // Avoid multiple call
-                            return [4 /*yield*/, this._fetchMoreFn()];
+                            fetchMoreFn = this._fetchMoreFn;
+                            this._fetchMoreFn = null;
+                            return [4 /*yield*/, fetchMoreFn()];
                         case 1:
                             res = _a.sent();
                             // Skip if empty (no more data)
@@ -31974,6 +31999,7 @@
     exports.MessageService = MessageService;
     exports.MessageTypeList = MessageTypeList;
     exports.MessageTypes = MessageTypes;
+    exports.MimeTypes = MimeTypes;
     exports.ModalToolbarComponent = ModalToolbarComponent;
     exports.NetworkService = NetworkService;
     exports.NgInitDirective = NgInitDirective;
@@ -32058,6 +32084,7 @@
     exports.UploadFilePopover = UploadFilePopover;
     exports.UploadFileTestingModule = UploadFileTestingModule;
     exports.UploadFileTestingPage = UploadFileTestingPage;
+    exports.UriUtils = UriUtils;
     exports.UserEventFragments = UserEventFragments;
     exports.UserEventService = UserEventService;
     exports.UserEventTypes = UserEventTypes;