@sumaris-net/ngx-components 0.12.0 → 0.13.2

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

@@ -12552,6 +12552,13 @@
             enumerable: false,
             configurable: true
         });
+        Object.defineProperty(GraphqlService.prototype, "defaultFetchPolicy", {
+            get: function () {
+                return this._defaultFetchPolicy;
+            },
+            enumerable: false,
+            configurable: true
+        });
         GraphqlService.prototype.ready = function () {
             if (this._started)
                 return Promise.resolve();
@@ -13353,7 +13360,15 @@
             this._logPrefix = "[base-graphql-service] ";
         }
         BaseGraphqlService.prototype.mutableWatchQuery = function (opts) {
+            opts.fetchPolicy = opts.fetchPolicy || this.graphql.defaultFetchPolicy;
+            // Standard query (no cache)
+            if (opts.fetchPolicy === 'no-cache') {
+                return this.graphql.watchQuery(opts);
+            }
+            // No arrayFieldName
             if (!opts.arrayFieldName) {
+                if (this._debug)
+                    console.warn(this._logPrefix + '̀Missing \'opts.arrayFieldName\' : unable to create a mutable watch query');
                 return this.graphql.watchQuery(opts);
             }
             // Create the query id
@@ -13367,8 +13382,9 @@
                 queryRef = mutableQuery.queryRef;
                 if (this._debug)
                     console.debug(this._logPrefix + ("Find same mutable watch query (same variables) {" + queryId + "}. Skip register"));
-                // Refetch if need
-                if (opts.fetchPolicy && (opts.fetchPolicy === 'network-only' || opts.fetchPolicy === 'no-cache' || opts.fetchPolicy === 'cache-and-network')) {
+                // Refetch if need data from network
+                if (opts.fetchPolicy === 'network-only' || opts.fetchPolicy === 'cache-and-network') {
+                    console.warn(this._logPrefix + ' Mutable query already exists, and fetchPolicy=' + opts.fetchPolicy + '. Force refetch query...');
                     queryRef.refetch(mutableQuery.variables);
                 }
                 //if (mutableQuery.counter > 3) {
@@ -13383,6 +13399,7 @@
                     queryRef: queryRef,
                     variables: opts.variables,
                     arrayFieldName: opts.arrayFieldName,
+                    totalFieldName: opts.totalFieldName,
                     insertFilterFn: opts.insertFilterFn,
                     sortFn: opts.sortFn,
                     counter: 1
@@ -13406,6 +13423,7 @@
                             query: query.query,
                             variables: query.variables,
                             arrayFieldName: query.arrayFieldName,
+                            totalFieldName: query.totalFieldName,
                             sortFn: query.sortFn,
                             data: data
                         });
@@ -13419,6 +13437,7 @@
                         query: query.query,
                         variables: query.variables,
                         arrayFieldName: query.arrayFieldName,
+                        totalFieldName: query.totalFieldName,
                         sortFn: query.sortFn,
                         data: opts.data
                     });
@@ -13437,6 +13456,7 @@
                         query: query.query,
                         variables: query.variables,
                         arrayFieldName: query.arrayFieldName,
+                        totalFieldName: query.totalFieldName,
                         ids: opts.ids
                     });
                 }
@@ -13445,6 +13465,7 @@
                         query: query.query,
                         variables: query.variables,
                         arrayFieldName: query.arrayFieldName,
+                        totalFieldName: query.totalFieldName,
                         ids: opts.ids
                     }) ? 1 : 0;
                 }
@@ -19691,7 +19712,7 @@
     FormButtonsBarComponent.decorators = [
         { type: i0.Component, args: [{
                     selector: 'app-form-buttons-bar',
-                    template: "<ion-toolbar [class]=\"classList\">\n  <ion-row class=\"ion-no-padding\" nowrap>\n    <ion-col>\n      <ng-content></ng-content>\n    </ion-col>\n\n    <ion-col size=\"auto\">\n\n      <ion-button fill=\"clear\" color=\"dark\" (click)=\"onBack.emit($event)\" (keyup.enter)=\"onBack.emit($event)\" *ngIf=\"onBack.observers.length\">\n        <ion-label translate>COMMON.BTN_CLOSE</ion-label>\n      </ion-button>\n\n      <ion-button fill=\"clear\" color=\"dark\" (click)=\"onCancel.emit($event)\" (keyup.enter)=\"onCancel.emit($event)\" [disabled]=\"disabledCancel\">\n        <ion-icon slot=\"start\" name=\"refresh\"></ion-icon>\n        <ion-label translate>COMMON.BTN_RESET</ion-label>\n      </ion-button>\n\n\n      <ion-button fill=\"solid\" (click)=\"onNext.emit($event)\" (keyup.enter)=\"onNext.emit($event)\" *ngIf=\"onNext.observers.length\">\n        <ion-label translate>COMMON.BTN_NEXT</ion-label>\n        <ion-icon slot=\"end\" name=\"arrow-forward\"></ion-icon>\n      </ion-button>\n\n      <ion-button [fill]=\"disabled? 'clear' : 'solid'\" (click)=\"onSave.emit($event)\" (keyup.enter)=\"onSave.emit($event)\" color=\"danger\" [disabled]=\"disabled\">\n        <ion-label [innerHTML]=\"'COMMON.BTN_SAVE_WITH_SHORTCUT'|translate\" [title]=\"'COMMON.BTN_SAVE_WITH_SHORTCUT_HELP'|translate\"></ion-label>\n      </ion-button>\n    </ion-col>\n  </ion-row>\n</ion-toolbar>\n",
+                    template: "<ion-toolbar [class]=\"classList\">\n  <ion-row class=\"ion-no-padding\" nowrap>\n    <ion-col>\n      <ng-content></ng-content>\n    </ion-col>\n\n    <ion-col size=\"auto\">\n\n      <!-- close (go back) -->\n      <ion-button fill=\"clear\" color=\"dark\" (click)=\"onBack.emit($event)\" (keyup.enter)=\"onBack.emit($event)\" *ngIf=\"onBack.observers | isNotEmptyArray\">\n        <ion-label translate>COMMON.BTN_CLOSE</ion-label>\n      </ion-button>\n\n      <!-- reload -->\n      <ion-button fill=\"clear\" color=\"dark\" (click)=\"onCancel.emit($event)\" (keyup.enter)=\"onCancel.emit($event)\" [disabled]=\"disabledCancel\">\n        <ion-icon slot=\"start\" name=\"refresh\"></ion-icon>\n        <ion-label translate>COMMON.BTN_RESET</ion-label>\n      </ion-button>\n\n      <!-- next -->\n      <ion-button fill=\"solid\" (click)=\"onNext.emit($event)\" (keyup.enter)=\"onNext.emit($event)\" *ngIf=\"onNext.observers | isNotEmptyArray\">\n        <ion-label translate>COMMON.BTN_NEXT</ion-label>\n        <ion-icon slot=\"end\" name=\"arrow-forward\"></ion-icon>\n      </ion-button>\n\n      <!-- save -->\n      <ion-button [fill]=\"disabled ? 'clear' : 'solid'\" (click)=\"onSave.emit($event)\" (keyup.enter)=\"onSave.emit($event)\" color=\"danger\"\n                  [disabled]=\"disabled\">\n        <ion-label [innerHTML]=\"'COMMON.BTN_SAVE_WITH_SHORTCUT'|translate\" [title]=\"'COMMON.BTN_SAVE_WITH_SHORTCUT_HELP'|translate\"></ion-label>\n      </ion-button>\n    </ion-col>\n  </ion-row>\n</ion-toolbar>\n",
                     providers: [
                         { provide: FormButtonsBarToken, useExisting: FormButtonsBarComponent }
                     ],
@@ -23241,18 +23262,18 @@
             return true;
         };
         AppTable.prototype.save = function (opts) {
-            var _a;
             return __awaiter(this, void 0, void 0, function () {
                 var editedRowId, isOK, err_1;
                 var _this = this;
                 return __generator(this, function (_d) {
                     switch (_d.label) {
                         case 0:
+                            opts = Object.assign({ keepEditing: this.keepEditedRowOnSave }, opts);
                             if (this.readOnly) {
                                 throw { code: ErrorCodes$2.TABLE_READ_ONLY, message: 'ERROR.TABLE_READ_ONLY' };
                             }
                             this.resetError();
-                            editedRowId = toBoolean(opts === null || opts === void 0 ? void 0 : opts.keepEditing, this.keepEditedRowOnSave) && ((_a = this.editedRow) === null || _a === void 0 ? void 0 : _a.editing) && this.editedRow.id;
+                            editedRowId = opts.keepEditing && this.editedRow && this.editedRow.editing && this.editedRow.id;
                             if (!this.confirmEditCreate()) {
                                 throw { code: ErrorCodes$2.TABLE_INVALID_ROW_ERROR, message: 'ERROR.TABLE_INVALID_ROW_ERROR' };
                             }
@@ -23499,7 +23520,7 @@
                 return false;
             }
             // DEBUG
-            console.debug("[table] Detect click on row");
+            //console.debug("[table] Detect click on row");
             if (row.id === -1 || row.editing)
                 return true; // Already in edition
             if (event === null || event === void 0 ? void 0 : event.defaultPrevented)
@@ -24371,6 +24392,9 @@
                 this.registerSubscription(this.formButtonsBar.onBack.subscribe(function (event) { return _this.onBackClick(event); }));
             }
         };
+        AppTabEditor.prototype.ngAfterViewInit = function () {
+            // Can be override by subclasses
+        };
         AppTabEditor.prototype.ngOnDestroy = function () {
             this._subscription.unsubscribe();
         };
@@ -24965,6 +24989,7 @@
         };
         AppEntityEditor.prototype.ngAfterViewInit = function () {
             var _this = this;
+            _super.prototype.ngAfterViewInit.call(this);
             // Load data
             if (this._autoLoad) {
                 setTimeout(function () { return _this.loadFromRoute(); }, this._autoLoadDelay);