@sumaris-net/ngx-components 0.12.0 → 0.13.2

package/fesm2015/ngx-sumaris-components.js

@@ -10913,6 +10913,9 @@ class GraphqlService {
     get cache() {
         return this.apollo.client.cache;
     }
+    get defaultFetchPolicy() {
+        return this._defaultFetchPolicy;
+    }
     ready() {
         if (this._started)
             return Promise.resolve();
@@ -11635,7 +11638,15 @@ class BaseGraphqlService {
         this._logPrefix = `[base-graphql-service] `;
     }
     mutableWatchQuery(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
@@ -11649,8 +11660,9 @@ class BaseGraphqlService {
             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) {
@@ -11665,6 +11677,7 @@ class BaseGraphqlService {
                 queryRef,
                 variables: opts.variables,
                 arrayFieldName: opts.arrayFieldName,
+                totalFieldName: opts.totalFieldName,
                 insertFilterFn: opts.insertFilterFn,
                 sortFn: opts.sortFn,
                 counter: 1
@@ -11687,6 +11700,7 @@ class BaseGraphqlService {
                         query: query.query,
                         variables: query.variables,
                         arrayFieldName: query.arrayFieldName,
+                        totalFieldName: query.totalFieldName,
                         sortFn: query.sortFn,
                         data
                     });
@@ -11700,6 +11714,7 @@ class BaseGraphqlService {
                     query: query.query,
                     variables: query.variables,
                     arrayFieldName: query.arrayFieldName,
+                    totalFieldName: query.totalFieldName,
                     sortFn: query.sortFn,
                     data: opts.data
                 });
@@ -11717,6 +11732,7 @@ class BaseGraphqlService {
                     query: query.query,
                     variables: query.variables,
                     arrayFieldName: query.arrayFieldName,
+                    totalFieldName: query.totalFieldName,
                     ids: opts.ids
                 });
             }
@@ -11725,6 +11741,7 @@ class BaseGraphqlService {
                     query: query.query,
                     variables: query.variables,
                     arrayFieldName: query.arrayFieldName,
+                    totalFieldName: query.totalFieldName,
                     ids: opts.ids
                 }) ? 1 : 0;
             }
@@ -17142,7 +17159,7 @@ class FormButtonsBarComponent {
 FormButtonsBarComponent.decorators = [
     { type: 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 }
                 ],
@@ -20152,14 +20169,14 @@ class AppTable {
         return true;
     }
     save(opts) {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
+            opts = Object.assign({ keepEditing: this.keepEditedRowOnSave }, opts);
             if (this.readOnly) {
                 throw { code: ErrorCodes$2.TABLE_READ_ONLY, message: 'ERROR.TABLE_READ_ONLY' };
             }
             this.resetError();
             // Keep edited row id (should be done BEFORE confirmEditCreate() )
-            const 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;
+            const 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' };
             }
@@ -20361,7 +20378,7 @@ class AppTable {
             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)
@@ -21093,6 +21110,9 @@ class AppTabEditor {
             this.registerSubscription(this.formButtonsBar.onBack.subscribe(event => this.onBackClick(event)));
         }
     }
+    ngAfterViewInit() {
+        // Can be override by subclasses
+    }
     ngOnDestroy() {
         this._subscription.unsubscribe();
     }
@@ -21592,6 +21612,7 @@ class AppEntityEditor extends AppTabEditor {
         this.disable();
     }
     ngAfterViewInit() {
+        super.ngAfterViewInit();
         // Load data
         if (this._autoLoad) {
             setTimeout(() => this.loadFromRoute(), this._autoLoadDelay);