@sumaris-net/ngx-components 1.17.0 → 1.17.1

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

@@ -9988,12 +9988,13 @@
     ]; };
 
     var Hotkeys = /** @class */ (function () {
-        function Hotkeys(eventManager, dialog, document, modalController) {
+        function Hotkeys(eventManager, dialog, document, modalController, popoverController) {
             var _this = this;
             this.eventManager = eventManager;
             this.dialog = dialog;
             this.document = document;
             this.modalController = modalController;
+            this.popoverController = popoverController;
             this._debug = false;
             this._hotkeys = new Map();
             this._defaults = {
@@ -10022,15 +10023,24 @@
             }
             return new rxjs.Observable(function (observer) {
                 var handler = function (e) { return __awaiter(_this, void 0, void 0, function () {
-                    var top;
-                    return __generator(this, function (_a) {
-                        switch (_a.label) {
+                    var top, _a;
+                    return __generator(this, function (_b) {
+                        switch (_b.label) {
                             case 0: return [4 /*yield*/, this.modalController.getTop()];
                             case 1:
-                                top = _a.sent();
+                                _a = (_b.sent());
+                                if (_a) return [3 /*break*/, 3];
+                                return [4 /*yield*/, this.popoverController.getTop()];
+                            case 2:
+                                _a = (_b.sent());
+                                _b.label = 3;
+                            case 3:
+                                top = _a;
                                 // If modal present, check its component name against hotkey element name (fix #181)
-                                if (top && top.component['name'] !== merged.elementName)
+                                if (top && top.component['name'] !== merged.elementName) {
+                                    e.preventDefault();
                                     return [2 /*return*/];
+                                }
                                 if (e instanceof KeyboardEvent && e.repeat)
                                     return [2 /*return*/]; // skip when repeated
                                 if (merged.preventDefault)
@@ -10057,7 +10067,7 @@
         };
         return Hotkeys;
     }());
-    Hotkeys.ɵprov = i0.ɵɵdefineInjectable({ factory: function Hotkeys_Factory() { return new Hotkeys(i0.ɵɵinject(i1$6.EventManager), i0.ɵɵinject(i2.MatDialog), i0.ɵɵinject(i1$4.DOCUMENT), i0.ɵɵinject(i1$5.ModalController)); }, token: Hotkeys, providedIn: "root" });
+    Hotkeys.ɵprov = i0.ɵɵdefineInjectable({ factory: function Hotkeys_Factory() { return new Hotkeys(i0.ɵɵinject(i1$6.EventManager), i0.ɵɵinject(i2.MatDialog), i0.ɵɵinject(i1$4.DOCUMENT), i0.ɵɵinject(i1$5.ModalController), i0.ɵɵinject(i1$5.PopoverController)); }, token: Hotkeys, providedIn: "root" });
     Hotkeys.decorators = [
         { type: i0.Injectable, args: [{
                     providedIn: 'root'
@@ -10067,7 +10077,8 @@
         { type: i1$6.EventManager },
         { type: i2.MatDialog },
         { type: undefined, decorators: [{ type: i0.Inject, args: [i1$4.DOCUMENT,] }] },
-        { type: i1$5.ModalController }
+        { type: i1$5.ModalController },
+        { type: i1$5.PopoverController }
     ]; };
 
     var SharedHotkeysModule = /** @class */ (function () {
@@ -10911,6 +10922,9 @@
         EntityUtils.isLocalId = function (id) {
             return isNotNil(id) && +id < 0;
         };
+        EntityUtils.isRemoteId = function (id) {
+            return isNotNil(id) && +id >= 0;
+        };
         return EntityUtils;
     }());
 
@@ -19773,7 +19787,7 @@
     TextForm.decorators = [
         { type: i0.Component, args: [{
                     selector: 'app-text-form',
-                    template: "<form class=\"form-container\" [formGroup]=\"form\" (ngSubmit)=\"doSubmit($event)\">\n  <mat-form-field *ngIf=\"multiline; else monoline\">\n    <textarea\n      #textArea\n      matInput\n      [formControl]=\"control\"\n      [placeholder]=\"placeholder\"\n      [readonly]=\"control.disabled\"\n      [class.fixed-height]=\"!autoHeight\"\n      [cdkTextareaAutosize]=\"autoHeight\"\n      (keyup)=\"textAreaChanged($event)\"\n      (keydown.control.enter)=\"onSubmit.emit($event)\"\n      [autofocus]=\"autofocus\"\n    ></textarea>\n    <mat-error *ngIf=\"control.hasError('maxlength')\">\n      {{ 'ERROR.FIELD_MAX_LENGTH' | translate: control.errors['maxlength'] }}\n    </mat-error>\n    <mat-hint *ngIf=\"maxLength\" align=\"end\">\n      {{ 'INFO.TEXT_PROGRESS' | translate: { current: textArea.value?.length || 0, max: maxLength } }}\n    </mat-hint>\n  </mat-form-field>\n  <ng-template #monoline>\n    <mat-form-field>\n      <input\n        #textInput\n        matInput\n        [formControl]=\"control\"\n        [placeholder]=\"placeholder\"\n        [readonly]=\"disabled\"\n        [appAutofocus]=\"autofocus\"\n      />\n      <mat-error *ngIf=\"control.hasError('maxlength')\">\n        {{ 'ERROR.FIELD_MAX_LENGTH' | translate: control.errors['maxlength'] }}\n      </mat-error>\n      <mat-hint *ngIf=\"maxLength\" align=\"end\">\n        {{ 'INFO.TEXT_PROGRESS' | translate: { current: textInput.value?.length || 0, max: maxLength } }}\n      </mat-hint>\n    </mat-form-field>\n  </ng-template>\n</form>\n",
+                    template: "<form class=\"form-container\" [formGroup]=\"form\" (ngSubmit)=\"doSubmit($event)\">\n  <mat-form-field *ngIf=\"multiline; else monoline\">\n    <textarea\n      #textArea\n      matInput\n      [formControl]=\"control\"\n      [placeholder]=\"placeholder\"\n      [readonly]=\"control.disabled\"\n      [class.fixed-height]=\"!autoHeight\"\n      [cdkTextareaAutosize]=\"autoHeight\"\n      (keyup)=\"textAreaChanged($event)\"\n      (keydown.control.enter)=\"onSubmit.emit($event)\"\n      [autofocus]=\"autofocus\"\n    ></textarea>\n    <mat-error *ngIf=\"control.hasError('maxlength')\">\n      {{ 'ERROR.FIELD_MAX_LENGTH' | translate: control.errors['maxlength'] }}\n    </mat-error>\n    <mat-hint *ngIf=\"maxLength\" align=\"end\">\n      {{ 'INFO.TEXT_PROGRESS' | translate: { current: textArea.value?.length || 0, max: maxLength } }}\n    </mat-hint>\n  </mat-form-field>\n  <ng-template #monoline>\n    <mat-form-field>\n      <input\n        #textInput\n        matInput\n        [formControl]=\"control\"\n        [placeholder]=\"placeholder\"\n        [readonly]=\"disabled\"\n        [appAutofocus]=\"autofocus\"\n        (keydown.control.enter)=\"onSubmit.emit($event)\"\n      />\n      <mat-error *ngIf=\"control.hasError('maxlength')\">\n        {{ 'ERROR.FIELD_MAX_LENGTH' | translate: control.errors['maxlength'] }}\n      </mat-error>\n      <mat-hint *ngIf=\"maxLength\" align=\"end\">\n        {{ 'INFO.TEXT_PROGRESS' | translate: { current: textInput.value?.length || 0, max: maxLength } }}\n      </mat-hint>\n    </mat-form-field>\n  </ng-template>\n</form>\n",
                     styles: ["textarea.fixed-height{height:11.5em}"]
                 },] }
     ];
@@ -19893,7 +19907,7 @@
     TextPopover.decorators = [
         { type: i0.Component, args: [{
                     selector: 'app-text-popover',
-                    template: "\n<ion-content class=\"ion-padding\" cdkTrapFocus [cdkTrapFocusAutoCapture]=\"true\">\n  <ion-item *ngIf=\"form.error\" visible-xs visible-sm visible-mobile lines=\"none\">\n    <ion-icon color=\"danger\" slot=\"start\" name=\"alert-circle\"></ion-icon>\n    <ion-label color=\"danger\" class=\"error\" [innerHTML]=\"form.error|translate\"></ion-label>\n  </ion-item>\n\n  <app-text-form #form [placeholder]=\"placeholder\"\n                 [multiline]=\"multiline\"\n                 [maxLength]=\"maxLength\"\n                 [autofocus]=\"editing && autofocus\"\n                 (onSubmit)=\"onValidate($event)\"\n  ></app-text-form>\n</ion-content>\n\n<ion-footer>\n  <ion-toolbar>\n    <ion-row class=\"ion-no-padding\" nowrap>\n      <ion-col>\n\n      </ion-col>\n\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_VALIDATE</ion-label>\n        </ion-button>\n      </ion-col>\n    </ion-row>\n  </ion-toolbar>\n</ion-footer>\n"
+                    template: "\n<ion-content class=\"ion-padding\" cdkTrapFocus [cdkTrapFocusAutoCapture]=\"true\">\n  <ion-item *ngIf=\"form.error\" visible-xs visible-sm visible-mobile lines=\"none\">\n    <ion-icon color=\"danger\" slot=\"start\" name=\"alert-circle\"></ion-icon>\n    <ion-label color=\"danger\" class=\"error\" [innerHTML]=\"form.error|translate\"></ion-label>\n  </ion-item>\n\n  <app-text-form #form [placeholder]=\"placeholder\"\n                 [multiline]=\"multiline\"\n                 [maxLength]=\"maxLength\"\n                 [autofocus]=\"editing && autofocus\"\n                 (onSubmit)=\"onValidate($event)\"\n  ></app-text-form>\n</ion-content>\n\n<ion-footer>\n  <ion-toolbar>\n    <ion-row class=\"ion-no-padding\" nowrap>\n      <ion-col>\n\n      </ion-col>\n\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          [title]=\"'COMMON.BTN_VALIDATE_WITH_SHORTCUT_HELP'|translate\">\n          <ion-label translate>COMMON.BTN_VALIDATE</ion-label>\n        </ion-button>\n      </ion-col>\n    </ion-row>\n  </ion-toolbar>\n</ion-footer>\n"
                 },] }
     ];
     TextPopover.ctorParameters = function () { return [
@@ -20281,53 +20295,59 @@
                 .then(function () {
                 if (opts === null || opts === void 0 ? void 0 : opts.maxProgression)
                     progression.next(opts.maxProgression);
-                if (opts === null || opts === void 0 ? void 0 : opts.progression)
-                    opts.progression.complete();
+                progression.complete();
             })
                 .catch(function (err) { return progression.error(err); });
             return progression;
         };
         JobUtils.fetchAllPages = function (loadPageFn, opts) {
-            var _a;
             return __awaiter(this, void 0, void 0, function () {
-                var maxProgression, total, pageCount, progressionStep, currentPageDataCount, fetchSize, offset, data, res, actualProgression, lastProgressionStep;
-                return __generator(this, function (_b) {
-                    switch (_b.label) {
+                var maxProgression, progression, total, pageCount, progressionStep, currentPageDataCount, fetchSize, offset, data, res;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
                         case 0:
-                            maxProgression = opts && opts.maxProgression || undefined;
-                            fetchSize = opts && opts.fetchSize || 1000;
+                            maxProgression = toNumber(opts === null || opts === void 0 ? void 0 : opts.maxProgression, 100);
+                            progression = opts === null || opts === void 0 ? void 0 : opts.progression;
+                            fetchSize = toNumber(opts === null || opts === void 0 ? void 0 : opts.fetchSize, 1000);
+                            if (fetchSize <= 0)
+                                throw new Error('Unable to fetch pages: invalid fetchSize: ' + fetchSize);
                             offset = 0;
                             data = [];
-                            _b.label = 1;
+                            _a.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 = _b.sent();
+                            res = _a.sent();
+                            // Concat to previous result
                             data = data.concat(res.data);
+                            // Compute variables, for next loop
                             currentPageDataCount = res.data && res.data.length || 0;
                             offset += currentPageDataCount;
-                            // Set total count (only if not already set)
+                            // Set total count (only once)
                             if (isNil(total) && isNotNil(res.total)) {
                                 total = res.total;
                                 // Compute the number of page
                                 pageCount = Math.round(res.total / fetchSize + 0.5); // Round to HALF_UP integer
-                                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*/;
+                                // Compute step, by dividing maxProgression by number of page
+                                if (progression) {
+                                    progressionStep = maxProgression / pageCount;
+                                    // DEBUG
+                                    if (opts && opts.logPrefix)
+                                        console.debug(opts.logPrefix + " {pageCount: " + pageCount + ", progression: " + progression.value + ", pageProgressionStep: " + progressionStep + "}");
+                                }
                             }
                             // Increment progression on each iteration (if possible)
-                            if (opts && opts.progression && isNotNil(progressionStep)) {
-                                opts.progression.next(opts.progression.value + progressionStep);
+                            if (isNotNil(progressionStep)) {
+                                progression.next(progression.value + progressionStep);
                             }
-                            if (opts && opts.onPageLoaded)
+                            if (opts === null || opts === void 0 ? void 0 : opts.onPageLoaded)
                                 opts.onPageLoaded(res);
-                            _b.label = 3;
+                            _a.label = 3;
                         case 3:
                             if (currentPageDataCount > 0 && ((isNil(total) && currentPageDataCount === fetchSize) || (isNotNil(total) && (offset < total)))) return [3 /*break*/, 1];
-                            _b.label = 4;
+                            _a.label = 4;
                         case 4:
                             // Complete progression to reach progressionStep value (because of round)
                             if (isNotNil(progressionStep)) {
@@ -20337,14 +20357,19 @@
                                     total = data.length;
                                     pageCount = Math.round(data.length / fetchSize + 0.5);
                                 }
-                                lastProgressionStep = opts.maxProgression - (progressionStep * pageCount);
-                                if (opts && opts.progression && lastProgressionStep > 0) {
-                                    opts.progression.next(opts.progression.value + lastProgressionStep);
-                                }
+                                // Compute final increment, using the real page count
+                                progressionStep = Math.max(0, maxProgression - (progressionStep * pageCount));
                             }
-                            // Or increment once
-                            else if (opts && opts.progression && opts.maxProgression) {
-                                opts.progression.next(opts.progression.value + opts.maxProgression);
+                            // Or increment once (e.g. when total is not known, in received LoadResult)
+                            else if (progression) {
+                                progressionStep = maxProgression;
+                            }
+                            // DEBUG
+                            if (opts && opts.logPrefix)
+                                console.debug(opts.logPrefix + " All pages fetched - {progression: " + progression.value + ", lastProgressionStep: " + progressionStep);
+                            // Final increment
+                            if (progression && progressionStep > 0) {
+                                progression.next(progression.value + progressionStep);
                             }
                             return [2 /*return*/, {
                                     data: data,
@@ -23683,12 +23708,7 @@
             this.appVersion = this.environment.version;
             this.side = 'left';
             this._debug = !environment.production;
-            this.onResize();
         }
-        MenuComponent.prototype.onResize = function (event) {
-            this._screenWidth = window.innerWidth;
-            console.debug('[menu] Screen size (px): ' + this._screenWidth);
-        };
         MenuComponent.prototype.ngOnInit = function () {
             return __awaiter(this, void 0, void 0, function () {
                 var _this = this;
@@ -23985,8 +24005,7 @@
         appName: [{ type: i0.Input }],
         appVersion: [{ type: i0.Input }],
         side: [{ type: i0.Input }],
-        splitPane: [{ type: i0.ViewChild, args: ['splitPane', { static: true },] }],
-        onResize: [{ type: i0.HostListener, args: ['window:resize', ['$event'],] }]
+        splitPane: [{ type: i0.ViewChild, args: ['splitPane', { static: true },] }]
     };
 
     var AppMenuModule = /** @class */ (function () {
@@ -29459,7 +29478,7 @@
                                     fetchPolicy: 'network-only',
                                     withTotal: (offset === 0),
                                     toEntity: false
-                                }); }, Object.assign(Object.assign({}, opts), { maxProgression: maxProgression * 0.9 }))];
+                                }); }, { progression: opts === null || opts === void 0 ? void 0 : opts.progression, maxProgression: maxProgression * 0.9 })];
                         case 1:
                             res = _a.sent();
                             // Save result locally