@sumaris-net/ngx-components 1.11.8 → 1.11.11

package/esm2015/src/app/shared/upload-file/upload-file.model.js

@@ -10,4 +10,4 @@ export class FileResponse {
         this.statusText = (init === null || init === void 0 ? void 0 : init.statusText) || 'OK';
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXBsb2FkLWZpbGUubW9kZWwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBwL3NoYXJlZC91cGxvYWQtZmlsZS91cGxvYWQtZmlsZS5tb2RlbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUMsYUFBYSxFQUFrQyxNQUFNLHNCQUFzQixDQUFDO0FBQ3BGLE9BQU8sRUFBQyxRQUFRLEVBQUMsTUFBTSxjQUFjLENBQUM7QUFFdEMsTUFBTSxPQUFPLFVBQWMsU0FBUSxJQUFJO0NBTXRDO0FBV0QsTUFBTSxPQUFPLFlBQVk7SUFLdkIsWUFBWSxJQUE0RDtRQUgvRCxTQUFJLEdBQUcsYUFBYSxDQUFDLFFBQVEsQ0FBQztRQUlyQyxJQUFJLENBQUMsSUFBSSxHQUFHLFFBQVEsQ0FBQyxJQUFJLGFBQUosSUFBSSx1QkFBSixJQUFJLENBQUUsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQztRQUNwRCxJQUFJLENBQUMsTUFBTSxHQUFHLENBQUEsSUFBSSxhQUFKLElBQUksdUJBQUosSUFBSSxDQUFFLE1BQU0sS0FBSSxDQUFDLENBQUM7UUFDaEMsSUFBSSxDQUFDLFVBQVUsR0FBRyxDQUFBLElBQUksYUFBSixJQUFJLHVCQUFKLElBQUksQ0FBRSxVQUFVLEtBQUksSUFBSSxDQUFDO0lBQzdDLENBQUM7Q0FDRiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7T2JzZXJ2YWJsZX0gZnJvbSAncnhqcyc7XG5pbXBvcnQge0h0dHBFdmVudFR5cGUsIEh0dHBQcm9ncmVzc0V2ZW50LCBIdHRwUmVzcG9uc2V9IGZyb20gJ0Bhbmd1bGFyL2NvbW1vbi9odHRwJztcbmltcG9ydCB7aXNOb3ROaWx9IGZyb20gJy4uL2Z1bmN0aW9ucyc7XG5cbmV4cG9ydCBjbGFzcyBVcGxvYWRGaWxlPFQ+IGV4dGVuZHMgRmlsZSB7XG4gIHByb2dyZXNzPzogbnVtYmVyO1xuICBkZWxldGluZz86IGJvb2xlYW47XG4gIGVycm9yPzogc3RyaW5nO1xuXG4gIGJvZHk/OiBUO1xufVxuXG5leHBvcnQgdHlwZSBGaWxlVXBsb2FkRm48VD4gPSAoZmlsZTogRmlsZSkgPT4gT2JzZXJ2YWJsZTxGaWxlRXZlbnQ8VD4+O1xuZXhwb3J0IHR5cGUgRmlsZURlbGV0ZUZuPFQ+ID0gKGZpbGU6IFVwbG9hZEZpbGU8VD4pID0+IFByb21pc2U8Ym9vbGVhbj47XG5cbmV4cG9ydCBpbnRlcmZhY2UgRmlsZVByb2dyZXNzRXZlbnQge1xuICB0eXBlOiBIdHRwRXZlbnRUeXBlO1xuICBsb2FkZWQ6IG51bWJlcjtcbiAgdG90YWw/OiBudW1iZXI7XG4gIHN0YXR1c1RleHQ/OiBzdHJpbmc7XG59XG5leHBvcnQgY2xhc3MgRmlsZVJlc3BvbnNlPFQ+IHtcbiAgcmVhZG9ubHkgYm9keTogVHxudWxsO1xuICByZWFkb25seSB0eXBlID0gSHR0cEV2ZW50VHlwZS5SZXNwb25zZTtcbiAgcmVhZG9ubHkgc3RhdHVzOiBudW1iZXI7XG4gIHJlYWRvbmx5IHN0YXR1c1RleHQ6IHN0cmluZztcbiAgY29uc3RydWN0b3IoaW5pdD86IHtib2R5PzogVHxudWxsOyBzdGF0dXNUZXh0Pzogc3RyaW5nOyBzdGF0dXM/OiBudW1iZXJ9KSB7XG4gICAgdGhpcy5ib2R5ID0gaXNOb3ROaWwoaW5pdD8uYm9keSkgPyBpbml0LmJvZHkgOiBudWxsO1xuICAgIHRoaXMuc3RhdHVzID0gaW5pdD8uc3RhdHVzIHx8IDA7XG4gICAgdGhpcy5zdGF0dXNUZXh0ID0gaW5pdD8uc3RhdHVzVGV4dCB8fCAnT0snO1xuICB9XG59XG5cbmV4cG9ydCBkZWNsYXJlIHR5cGUgRmlsZUV2ZW50PFQ+ID0gSHR0cFByb2dyZXNzRXZlbnQgfCBIdHRwUmVzcG9uc2U8VD4gfCBGaWxlUHJvZ3Jlc3NFdmVudCB8IEZpbGVSZXNwb25zZTxUPiA7XG4iXX0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXBsb2FkLWZpbGUubW9kZWwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBwL3NoYXJlZC91cGxvYWQtZmlsZS91cGxvYWQtZmlsZS5tb2RlbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUMsYUFBYSxFQUFrQyxNQUFNLHNCQUFzQixDQUFDO0FBQ3BGLE9BQU8sRUFBQyxRQUFRLEVBQUMsTUFBTSxjQUFjLENBQUM7QUFFdEMsTUFBTSxPQUFPLFVBQWMsU0FBUSxJQUFJO0NBTXRDO0FBV0QsTUFBTSxPQUFPLFlBQVk7SUFLdkIsWUFBWSxJQUE0RDtRQUgvRCxTQUFJLEdBQUcsYUFBYSxDQUFDLFFBQVEsQ0FBQztRQUlyQyxJQUFJLENBQUMsSUFBSSxHQUFHLFFBQVEsQ0FBQyxJQUFJLGFBQUosSUFBSSx1QkFBSixJQUFJLENBQUUsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQztRQUNwRCxJQUFJLENBQUMsTUFBTSxHQUFHLENBQUEsSUFBSSxhQUFKLElBQUksdUJBQUosSUFBSSxDQUFFLE1BQU0sS0FBSSxDQUFDLENBQUM7UUFDaEMsSUFBSSxDQUFDLFVBQVUsR0FBRyxDQUFBLElBQUksYUFBSixJQUFJLHVCQUFKLElBQUksQ0FBRSxVQUFVLEtBQUksSUFBSSxDQUFDO0lBQzdDLENBQUM7Q0FDRiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7T2JzZXJ2YWJsZX0gZnJvbSAncnhqcyc7XG5pbXBvcnQge0h0dHBFdmVudFR5cGUsIEh0dHBQcm9ncmVzc0V2ZW50LCBIdHRwUmVzcG9uc2V9IGZyb20gJ0Bhbmd1bGFyL2NvbW1vbi9odHRwJztcbmltcG9ydCB7aXNOb3ROaWx9IGZyb20gJy4uL2Z1bmN0aW9ucyc7XG5cbmV4cG9ydCBjbGFzcyBVcGxvYWRGaWxlPFQ+IGV4dGVuZHMgRmlsZSB7XG4gIHByb2dyZXNzPzogbnVtYmVyO1xuICBkZWxldGluZz86IGJvb2xlYW47XG4gIGVycm9yPzogc3RyaW5nO1xuXG4gIHJlc3BvbnNlPzogRmlsZVJlc3BvbnNlPFQ+IHwgSHR0cFJlc3BvbnNlPFQ+O1xufVxuXG5leHBvcnQgdHlwZSBGaWxlVXBsb2FkRm48VD4gPSAoZmlsZTogRmlsZSkgPT4gT2JzZXJ2YWJsZTxGaWxlRXZlbnQ8VD4+O1xuZXhwb3J0IHR5cGUgRmlsZURlbGV0ZUZuPFQ+ID0gKGZpbGU6IFVwbG9hZEZpbGU8VD4pID0+IFByb21pc2U8Ym9vbGVhbj47XG5cbmV4cG9ydCBpbnRlcmZhY2UgRmlsZVByb2dyZXNzRXZlbnQge1xuICB0eXBlOiBIdHRwRXZlbnRUeXBlO1xuICBsb2FkZWQ6IG51bWJlcjtcbiAgdG90YWw/OiBudW1iZXI7XG4gIHN0YXR1c1RleHQ/OiBzdHJpbmc7XG59XG5leHBvcnQgY2xhc3MgRmlsZVJlc3BvbnNlPFQ+IHtcbiAgcmVhZG9ubHkgYm9keTogVHxudWxsO1xuICByZWFkb25seSB0eXBlID0gSHR0cEV2ZW50VHlwZS5SZXNwb25zZTtcbiAgcmVhZG9ubHkgc3RhdHVzOiBudW1iZXI7XG4gIHJlYWRvbmx5IHN0YXR1c1RleHQ6IHN0cmluZztcbiAgY29uc3RydWN0b3IoaW5pdD86IHtib2R5PzogVHxudWxsOyBzdGF0dXNUZXh0Pzogc3RyaW5nOyBzdGF0dXM/OiBudW1iZXJ9KSB7XG4gICAgdGhpcy5ib2R5ID0gaXNOb3ROaWwoaW5pdD8uYm9keSkgPyBpbml0LmJvZHkgOiBudWxsO1xuICAgIHRoaXMuc3RhdHVzID0gaW5pdD8uc3RhdHVzIHx8IDA7XG4gICAgdGhpcy5zdGF0dXNUZXh0ID0gaW5pdD8uc3RhdHVzVGV4dCB8fCAnT0snO1xuICB9XG59XG5cbmV4cG9ydCBkZWNsYXJlIHR5cGUgRmlsZUV2ZW50PFQ+ID0gSHR0cFByb2dyZXNzRXZlbnQgfCBIdHRwUmVzcG9uc2U8VD4gfCBGaWxlUHJvZ3Jlc3NFdmVudCB8IEZpbGVSZXNwb25zZTxUPiA7XG4iXX0=

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

@@ -15831,20 +15831,20 @@ class UploadFileComponent {
             // Start uploading
             switchMap(file => this.uploadFn(file)
                 .pipe(map((event) => {
-                var _a, _b, _c;
                 // Progress event
                 if ((event === null || event === void 0 ? void 0 : event.type) === HttpEventType.UploadProgress || event.type === HttpEventType.User) {
-                    const total = event.total || 1;
-                    const loaded = event.loaded || 0;
-                    file.progress = Math.min(1, loaded / total);
+                    if (isNotNil(event.loaded) && event.loaded >= 0) {
+                        file.progress = Math.min(1, event.loaded / (event.total || 1));
+                    }
+                    else {
+                        file.progress = -1; // Indeterminate progression
+                    }
                 }
                 // Response event
                 else if (event instanceof HttpResponse || event instanceof FileResponse) {
-                    file.body = event.body;
                     file.progress = 1;
-                    const message = ((_a = file.body) === null || _a === void 0 ? void 0 : _a.message) || event.statusText || 'OK';
-                    console.debug(`[upload-file] ${file.name}: ${message}`
-                        + (((_b = file.body) === null || _b === void 0 ? void 0 : _b.finalName) ? ` (finalName: ${(_c = file.body) === null || _c === void 0 ? void 0 : _c.finalName})` : ''));
+                    file.response = event;
+                    console.debug(`[upload-file] ${file.name}: ${event.statusText || 'OK'}`, file.response);
                 }
                 // Other events
                 else {
@@ -15873,7 +15873,7 @@ class UploadFileComponent {
 UploadFileComponent.decorators = [
     { type: Component, args: [{
                 selector: 'app-upload-file',
-                template: "<div *ngIf=\"!uniqueFile || files.length === 0\"\n     class=\"container\"\n     appDragAndDrop (fileDropped)=\"onFileDropped($event)\">\n  <input\n    type=\"file\"\n    #fileDropRef\n    id=\"fileDropRef\"\n    multiple\n    [accept]=\"fileExtension\"\n    (change)=\"fileBrowseHandler($any($event.target).files)\"\n  />\n  <mat-icon style=\"font-size: xx-large\" color=\"accent\">file_upload</mat-icon>\n  <ion-label\n    [innerHTML]=\"\n      'FILE.UPLOAD.DRAG_AND_DROP' | translate: { extension: !fileExtension ? '' : ' (' + fileExtension + ')' }\n    \"\n  ></ion-label>\n  <ion-button>{{ 'FILE.UPLOAD.BROWSE' | translate }}</ion-button>\n</div>\n<div class=\"files-list\">\n  <div *ngFor=\"let file of files; index as i\"\n       class=\"single-file\"\n       [class.deleting]=\"file.deleting\">\n    <mat-icon>description</mat-icon>\n    <div class=\"info\">\n      <h4 class=\"name\">\n        {{ file.name }}\n      </h4>\n      <p class=\"size\">\n        {{ file.size | fileSize }}\n      </p>\n      <ion-progress-bar *ngIf=\"!file.error\"\n                        [value]=\"file.progress||0\"\n                        [type]=\"file.deleting ? 'indeterminate' : 'determinate'\"></ion-progress-bar>\n      <ion-label *ngIf=\"file.error\" color=\"danger\" [innerHTML]=\"file.error | translate\"></ion-label>\n    </div>\n    <!-- remote from list (before importation) -->\n    <button *ngIf=\"!(file.progress) || file.error\" mat-icon-button (click)=\"deleteFile(i)\">\n      <mat-icon>clear</mat-icon>\n    </button>\n    <!-- delete file (remotely - after importation) -->\n    <button *ngIf=\"file.progress === 1 && !!deleteFn && !file.deleting\" mat-icon-button (click)=\"deleteFile(i)\">\n      <mat-icon>clear</mat-icon>\n    </button>\n  </div>\n</div>\n",
+                template: "<div *ngIf=\"!uniqueFile || files.length === 0\"\n     class=\"container\"\n     appDragAndDrop (fileDropped)=\"onFileDropped($event)\">\n  <input\n    type=\"file\"\n    #fileDropRef\n    id=\"fileDropRef\"\n    multiple\n    [accept]=\"fileExtension\"\n    (change)=\"fileBrowseHandler($any($event.target).files)\"\n  />\n  <mat-icon style=\"font-size: xx-large\" color=\"accent\">file_upload</mat-icon>\n  <ion-label\n    [innerHTML]=\"\n      'FILE.UPLOAD.DRAG_AND_DROP' | translate: { extension: !fileExtension ? '' : ' (' + fileExtension + ')' }\n    \"\n  ></ion-label>\n  <ion-button>{{ 'FILE.UPLOAD.BROWSE' | translate }}</ion-button>\n</div>\n<div class=\"files-list\">\n  <div *ngFor=\"let file of files; index as i\"\n       class=\"single-file\"\n       [class.deleting]=\"file.deleting\">\n    <mat-icon>description</mat-icon>\n    <div class=\"info\">\n      <h4 class=\"name\">\n        {{ file.name }}\n      </h4>\n      <p class=\"size\">\n        {{ file.size | fileSize }}\n      </p>\n      <ion-progress-bar *ngIf=\"!file.error\"\n                        [value]=\"file.progress||0\"\n                        [type]=\"(file.deleting || file.progress === -1) ? 'indeterminate' : 'determinate'\"></ion-progress-bar>\n      <ion-label *ngIf=\"file.error\" color=\"danger\" [innerHTML]=\"file.error | translate\"></ion-label>\n    </div>\n    <!-- remote from list (before importation) -->\n    <button *ngIf=\"!(file.progress) || file.error\" mat-icon-button (click)=\"deleteFile(i)\">\n      <mat-icon>clear</mat-icon>\n    </button>\n    <!-- delete file (remotely - after importation) -->\n    <button *ngIf=\"file.progress === 1 && !!deleteFn && !file.deleting\" mat-icon-button (click)=\"deleteFile(i)\">\n      <mat-icon>clear</mat-icon>\n    </button>\n  </div>\n</div>\n",
                 styles: [".container{width:calc(100% - 3rem);min-height:200px;padding:2rem;text-align:center;border:1px dashed #979797;position:relative;margin:1.5rem}.container input{opacity:0;position:absolute;z-index:2;width:100%;height:100%;top:0;left:0;cursor:pointer}.container ion-label{display:block;font-size:20px;font-weight:600;color:#38424c}.container label{display:inline-block;color:#fff;width:183px;height:44px;border-radius:21.5px;background-color:#db202f;padding:8px 16px}.fileover{-webkit-animation:shake 1s;animation:shake 1s;-webkit-animation-iteration-count:infinite;animation-iteration-count:infinite}.files-list{max-height:300px;overflow:auto}.files-list .single-file{display:flex;flex-grow:1;padding:.5rem;justify-content:space-between;align-items:center;border:1px dashed #979797;margin-bottom:1rem}.files-list .single-file.deleting .name{color:grey!important;font-style:italic!important}.files-list .single-file .name{font-size:14px;font-weight:500;color:#353f4a;margin:0}.files-list .single-file .size{font-size:12px;font-weight:500;color:#a4a4a4;margin:0 0 .25rem}.files-list .single-file .info{width:100%}@-webkit-keyframes shake{0%{transform:translate(1px,1px) rotate(0deg)}10%{transform:translate(-1px,-2px) rotate(-1deg)}20%{transform:translate(-3px) rotate(1deg)}30%{transform:translate(3px,2px) rotate(0deg)}40%{transform:translate(1px,-1px) rotate(1deg)}50%{transform:translate(-1px,2px) rotate(-1deg)}60%{transform:translate(-3px,1px) rotate(0deg)}70%{transform:translate(3px,1px) rotate(-1deg)}80%{transform:translate(-1px,-1px) rotate(1deg)}90%{transform:translate(1px,2px) rotate(0deg)}to{transform:translate(1px,-2px) rotate(-1deg)}}@keyframes shake{0%{transform:translate(1px,1px) rotate(0deg)}10%{transform:translate(-1px,-2px) rotate(-1deg)}20%{transform:translate(-3px) rotate(1deg)}30%{transform:translate(3px,2px) rotate(0deg)}40%{transform:translate(1px,-1px) rotate(1deg)}50%{transform:translate(-1px,2px) rotate(-1deg)}60%{transform:translate(-3px,1px) rotate(0deg)}70%{transform:translate(3px,1px) rotate(-1deg)}80%{transform:translate(-1px,-1px) rotate(1deg)}90%{transform:translate(1px,2px) rotate(0deg)}to{transform:translate(1px,-2px) rotate(-1deg)}}"]
             },] }
 ];
@@ -15936,7 +15936,7 @@ class UploadFilePopover {
                         errors.forEach((error) => console.error(error));
                         throw { message: 'FILE.UPLOAD.ERROR' };
                     }
-                    // return filenames
+                    // return files
                     yield this.popoverController.dismiss(files);
                 }
                 catch (err) {
@@ -23622,12 +23622,15 @@ class AppEntityEditor extends AppTabEditor {
             }
         });
     }
+    canUserWrite(data, opts) {
+        return this.dataService.canUserWrite(data, opts);
+    }
     startListenRemoteChanges() {
         // Skip if disable, or already listening
         if (this._listenChangesSubscription || !this._enableListenChanges || this.isNewData)
             return;
         // Listen for changes on server
-        this._listenChangesSubscription = this.dataService.listenChanges(this.data.id, { interval: this._listenIntervalInSeconds })
+        this._listenChangesSubscription = this.listenChanges(this.data.id, { interval: this._listenIntervalInSeconds })
             .pipe(filter(isNotNil))
             .subscribe((data) => {
             if (data.updateDate && data.updateDate.isAfter(this.data.updateDate)) {
@@ -23889,6 +23892,16 @@ class AppEntityEditor extends AppTabEditor {
             yield this.load(this.data && this.data.id);
         });
     }
+    unload() {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.stopListenRemoteChanges();
+            this.form.reset();
+            this.registerForms();
+            this._dirty = false;
+            this.data = null;
+            this.saving = false;
+        });
+    }
     goBack(event) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
@@ -23935,10 +23948,6 @@ class AppEntityEditor extends AppTabEditor {
         if (!opts || opts.emitEvent !== false)
             this.markForCheck();
     }
-    /* -- public abstract methods (to override) -- */
-    canUserWrite(data, opts) {
-        return this.dataService.canUserWrite(data, opts);
-    }
     /* -- protected methods -- */
     /**
      * Return undefined to keep same tab
@@ -23948,16 +23957,6 @@ class AppEntityEditor extends AppTabEditor {
         const nextTabIndex = this.selectedTabIndex + 1;
         return nextTabIndex < this.tabCount ? nextTabIndex : undefined;
     }
-    unload() {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.stopListenRemoteChanges();
-            this.form.reset();
-            this.registerForms();
-            this._dirty = false;
-            this.data = null;
-            this.saving = false;
-        });
-    }
     onBeforeEntityLoad() {
         return __awaiter(this, void 0, void 0, function* () {
             // can be overwritten by subclasses
@@ -24049,6 +24048,9 @@ class AppEntityEditor extends AppTabEditor {
         }
         return parentUrl;
     }
+    listenChanges(id, opts) {
+        return this.dataService.listenChanges(this.data.id, opts);
+    }
     markForCheck() {
         this.cd.markForCheck();
     }
@@ -25898,20 +25900,9 @@ class UploadFileTestingPage {
     }
     showPopover(event, opts) {
         return __awaiter(this, void 0, void 0, function* () {
-            const modal = yield this.popoverController.create({
-                component: UploadFilePopover,
-                componentProps: Object.assign({ title: 'modalTitle', uploadFn: (file) => this.uploadFile(file), deleteFn: (file) => this.deleteFile(file) }, opts),
-                backdropDismiss: false,
-                keyboardClose: false,
-                event,
-                translucent: true,
-                cssClass: 'popover-large',
-            });
-            yield modal.present();
-            const { data } = yield modal.onDidDismiss();
-            if (data) {
-                console.info('Popover result: ', data);
-            }
+            const { data } = yield FilesUtils.showUploadPopover(this.popoverController, event, Object.assign({ uploadFn: (file) => this.uploadFile(file), deleteFn: (file) => this.deleteFile(file) }, opts));
+            const filenames = (data || []).map(file => { var _a, _b; return (_b = (_a = file.response) === null || _a === void 0 ? void 0 : _a.body) === null || _b === void 0 ? void 0 : _b.finalName; });
+            console.info('Popover result: ', filenames);
         });
     }
     /**
@@ -25927,7 +25918,8 @@ class UploadFileTestingPage {
             loaded += loadStep;
             // Return progression
             if (loaded < file.size) {
-                return { type: HttpEventType.UploadProgress, total: file.size, loaded };
+                //return {type: HttpEventType.UploadProgress, total: file.size, loaded };
+                return { type: HttpEventType.UploadProgress, loaded: -1 };
             }
             // Stop the timer
             setTimeout(() => $stop.next(), 100);