@sumaris-net/ngx-components 1.23.0-rc3 → 1.23.0-rc6

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

@@ -20829,7 +20829,7 @@
             _this.debug = false;
             _this.dirty = false;
             _this._saving = false;
-            _this._onChange = new rxjs.BehaviorSubject(true);
+            _this.dataSubject = new rxjs.BehaviorSubject(null);
             options = Object.assign({ onSort: _this.sort }, options);
             _this._sortFn = options.onSort;
             _this._onLoad = options.onLoad;
@@ -20850,7 +20850,7 @@
         }
         Object.defineProperty(InMemoryEntitiesService.prototype, "value", {
             get: function () {
-                return this.data;
+                return this.dataSubject.getValue();
             },
             set: function (data) {
                 this.setValue(data);
@@ -20861,56 +20861,49 @@
         InMemoryEntitiesService.prototype.ngOnDestroy = function () {
             if (this.debug)
                 console.debug('[memory-data-service] Destroying...');
-            this._onChange.complete();
-            this._onChange.unsubscribe();
+            this.dataSubject.complete();
+            this.dataSubject.unsubscribe();
         };
-        InMemoryEntitiesService.prototype.setValue = function (data, opts) {
-            if (this.data !== data) {
+        InMemoryEntitiesService.prototype.setValue = function (data) {
+            if (this.dataSubject.value !== data) {
                 this._hiddenData = [];
-                this.data = data;
-                // Send to observers
-                if (!opts || opts.emitEvent !== false) {
-                    this._onChange.next(true);
-                }
+                this.dataSubject.next(data);
             }
             this.dirty = false;
         };
         InMemoryEntitiesService.prototype.loadAll = function (offset, size, sortBy, sortDirection, filter, opts) {
             return __awaiter(this, void 0, void 0, function () {
-                var excludedDataByFilter, excludedDataByPagination, data, total, res, nextOffset_1;
+                var originalData, excludedDataByFilter, excludedDataByPagination, data, total, res, nextOffset_1;
                 var _this = this;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
                             offset = offset >= 0 ? offset : 0;
                             size = size >= 0 ? size : -1;
-                            if (!!this.data) return [3 /*break*/, 2];
-                            console.warn('[memory-data-service] Waiting value to be set...');
-                            return [4 /*yield*/, firstNotNilPromise(this._onChange)];
+                            originalData = this.dataSubject.value;
+                            if (isNil(originalData)) {
+                                console.warn('[memory-data-service] Cannot load all: no value set. Will return empty result');
+                            }
+                            if (!this._saving) return [3 /*break*/, 2];
+                            return [4 /*yield*/, waitFor(function () { return !_this._saving; })];
                         case 1:
                             _b.sent();
                             _b.label = 2;
                         case 2:
-                            if (!this._saving) return [3 /*break*/, 4];
-                            return [4 /*yield*/, waitFor(function () { return !_this._saving; })];
-                        case 3:
-                            _b.sent();
-                            _b.label = 4;
-                        case 4:
                             excludedDataByFilter = [];
-                            _b.label = 5;
-                        case 5:
-                            _b.trys.push([5, , 8, 9]);
-                            if (!this.data.length) {
+                            _b.label = 3;
+                        case 3:
+                            _b.trys.push([3, , 6, 7]);
+                            if (isEmptyArray(originalData)) {
                                 return [2 /*return*/, { data: [], total: 0 }];
                             }
-                            data = this._sortFn(this.data || [], sortBy, sortDirection);
-                            if (!this._onLoad) return [3 /*break*/, 7];
+                            data = this._sortFn(originalData, sortBy, sortDirection);
+                            if (!this._onLoad) return [3 /*break*/, 5];
                             return [4 /*yield*/, this._onLoad(data)];
-                        case 6:
+                        case 4:
                             data = _b.sent();
-                            _b.label = 7;
-                        case 7:
+                            _b.label = 5;
+                        case 5:
                             // Apply filter (will update hiddenData)
                             data = this.filter(data, filter, excludedDataByFilter);
                             total = data.length;
@@ -20927,16 +20920,16 @@
                                     data = [];
                                 }
                                 else {
-                                    excludedDataByPagination = (size > 0 && ((offset + size) < data.length)) ?
+                                    excludedDataByPagination = (size > 0 && ((offset + size) < data.length))
                                         // Slice using limit to size
-                                        data.slice(0, offset - 1).concat(data.slice(offset + size)) :
+                                        ? data.slice(0, offset - 1).concat(data.slice(offset + size))
                                         // Slice without limit
-                                        data.slice(0, offset - 1);
-                                    data = (size > 0 && ((offset + size) < data.length)) ?
+                                        : data.slice(0, offset - 1);
+                                    data = (size > 0 && ((offset + size) < data.length))
                                         // Slice using limit to size
-                                        data.slice(offset, offset + size) :
+                                        ? data.slice(offset, offset + size)
                                         // Slice without limit
-                                        data.slice(offset);
+                                        : data.slice(offset);
                                 }
                             }
                             // Apply a limit
@@ -20950,7 +20943,7 @@
                             }
                             // /!\ If already observed, then always create a copy of the original array
                             // Because datasource will only update if the array changed
-                            if (data === this.data) {
+                            if (data === originalData) {
                                 data = data.slice();
                             }
                             res = { data: data, total: total };
@@ -20967,13 +20960,13 @@
                                 }); };
                             }
                             return [2 /*return*/, res];
-                        case 8:
+                        case 6:
                             // Remember hidden data
                             if (offset === 0) {
                                 this._hiddenData = !excludedDataByPagination ? excludedDataByFilter : excludedDataByFilter.concat.apply(excludedDataByFilter, __spread(excludedDataByPagination));
                             }
                             return [7 /*endfinally*/];
-                        case 9: return [2 /*return*/];
+                        case 7: return [2 /*return*/];
                     }
                 });
             });
@@ -20982,11 +20975,10 @@
             var _this = this;
             offset = offset >= 0 ? offset : 0;
             size = size >= 0 ? size : -1;
-            if (!this.data) {
-                console.warn('[memory-data-service] Waiting value to be set...');
-            }
-            return this._onChange
-                .pipe(operators.filter(isNotNil), operators.mergeMap(function (_) { return _this.loadAll(offset, size, sortBy, sortDirection, filterData, options); }));
+            return this.dataSubject
+                .pipe(
+            // Warn if waiting value to be set
+            operators.tap(function (data) { return !data && console.warn('[memory-data-service] Waiting value to be set...'); }), operators.filter(isNotNil), operators.mergeMap(function (_) { return _this.loadAll(offset, size, sortBy, sortDirection, filterData, options); }));
         };
         InMemoryEntitiesService.prototype.saveAll = function (data, options) {
             return __awaiter(this, void 0, void 0, function () {
@@ -20994,7 +20986,7 @@
                 return __generator(this, function (_c) {
                     switch (_c.label) {
                         case 0:
-                            if (!this.data)
+                            if (!this.dataSubject.value)
                                 throw new Error('[memory-service] Could not save, because value not set');
                             this.markAsSaving();
                             _c.label = 1;
@@ -21017,9 +21009,9 @@
                             data = _b;
                             _c.label = 5;
                         case 5:
-                            this.data = data;
+                            this.dataSubject.next(data);
                             this.dirty = true;
-                            return [2 /*return*/, this.data];
+                            return [2 /*return*/, data];
                         case 6:
                             this.markAsSaved();
                             return [7 /*endfinally*/];
@@ -21030,20 +21022,21 @@
         };
         InMemoryEntitiesService.prototype.deleteAll = function (dataToRemove, options) {
             return __awaiter(this, void 0, void 0, function () {
-                var updatedData, deleteCount;
+                var data, updatedData, deleteCount;
                 var _this = this;
                 return __generator(this, function (_b) {
-                    if (!this.data)
+                    data = this.dataSubject.value;
+                    if (!data)
                         throw new Error('[memory-service] Could not delete, because value not set');
-                    updatedData = this.data.filter(function (entity) {
+                    updatedData = data.filter(function (entity) {
                         var removed = dataToRemove.findIndex(function (entityToRemove) { return _this.equals(entityToRemove, entity); }) !== -1;
                         return !removed;
                     });
-                    deleteCount = this.data.length - updatedData.length;
+                    deleteCount = data.length - updatedData.length;
                     if (deleteCount > 0) {
-                        this.data = updatedData;
+                        data = updatedData;
                         this.dirty = true;
-                        this._onChange.next(true);
+                        this.dataSubject.next(data);
                     }
                     return [2 /*return*/];
                 });
@@ -21073,7 +21066,7 @@
              */
             get: function () {
                 var _a;
-                return (((_a = this.data) === null || _a === void 0 ? void 0 : _a.length) || 0);
+                return (((_a = this.dataSubject.value) === null || _a === void 0 ? void 0 : _a.length) || 0);
             },
             enumerable: false,
             configurable: true
@@ -21104,9 +21097,8 @@
             return data;
         };
         InMemoryEntitiesService.prototype.connect = function () {
-            var _this = this;
-            return this._onChange.pipe(operators.map(function (_) {
-                var data = _this.data || [];
+            return this.dataSubject.pipe(operators.map(function (data) {
+                data = data || [];
                 var total = data.length;
                 return { data: data, total: total };
             }));
@@ -22903,7 +22895,7 @@
     FormButtonsBarComponent.decorators = [
         { type: i0.Component, args: [{
                     selector: 'app-form-buttons-bar',
-                    template: "\n<ion-toolbar [class]=\"classList\">\n  <ion-row class=\"ion-no-padding\" nowrap>\n    <!-- show menu button -->\n    <ion-col size=\"auto\" class=\"hidden-xs hidden-sm\">\n      <ion-menu-toggle>\n        <button\n          mat-icon-button\n          color=\"accent\"\n          [title]=\"'COMMON.BTN_SHOW_MENU' | translate\"\n          (click)=\"menu.toggleSplitPaneWhen()\">\n          <mat-icon><span>&#xbb;</span></mat-icon>\n        </button>\n      </ion-menu-toggle>\n    </ion-col>\n\n    <ion-col>\n      <ng-content></ng-content>\n    </ion-col>\n\n    <ion-col size=\"auto\">\n\n      <ng-content select=\"[slot=end]\"></ng-content>\n\n      <!-- close (go back) -->\n      <ion-button fill=\"clear\" color=\"dark\" (click)=\"onBack.emit($event)\"\n                  (keyup.enter)=\"onBack.emit($event)\"\n                  *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)\"\n                  (keyup.enter)=\"onCancel.emit($event)\"\n                  [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'\"\n                  (click)=\"onSave.emit($event)\"\n                  (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",
+                    template: "\n<ion-toolbar [class]=\"classList\">\n  <ion-row class=\"ion-no-padding\" nowrap>\n    <!-- show menu button -->\n    <ion-col size=\"auto\" class=\"hidden-xs hidden-sm\">\n      <ion-menu-toggle>\n        <button\n          mat-icon-button\n          color=\"accent\"\n          [title]=\"'COMMON.BTN_SHOW_MENU' | translate\"\n          (click)=\"menu.toggleSplitPaneWhen()\">\n          <mat-icon><span>&#xbb;</span></mat-icon>\n        </button>\n      </ion-menu-toggle>\n    </ion-col>\n\n    <ion-col class=\"app-form-buttons-bar-content\">\n      <ng-content></ng-content>\n    </ion-col>\n\n    <ion-col size=\"auto\">\n\n      <ng-content select=\"[slot=end]\"></ng-content>\n\n      <!-- close (go back) -->\n      <ion-button fill=\"clear\" color=\"dark\" (click)=\"onBack.emit($event)\"\n                  (keyup.enter)=\"onBack.emit($event)\"\n                  *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)\"\n                  (keyup.enter)=\"onCancel.emit($event)\"\n                  [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'\"\n                  (click)=\"onSave.emit($event)\"\n                  (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 }
                     ],
@@ -25825,8 +25817,9 @@
          * @param config Additional configuration for table.
          */
         function EntitiesTableDataSource(dataType, dataService, validatorService, options) {
-            var _this = _super_1.call(this, [], dataType, validatorService, Object.assign({ dataServiceOptions: {}, debug: (options === null || options === void 0 ? void 0 : options.suppressErrors) === false, keepOriginalDataAfterConfirm: false }, options)) || this;
+            var _this = _super_1.call(this, [], dataType, validatorService, Object.assign({ keepOriginalDataAfterConfirm: false, readOnly: false, saveOnlyDirtyRows: false, dataServiceOptions: {} }, options)) || this;
             _this.dataService = dataService;
+            _this._debug = false;
             _this._creating = false;
             _this._saving = false;
             _this._stopWatching$ = new rxjs.Subject();
@@ -25834,18 +25827,47 @@
             _this._fetchMoreFn = null;
             _this.loadingSubject = new rxjs.BehaviorSubject(undefined);
             _this._entityName = removeEnd((new dataType()).__typename || 'UnknownVO', 'VO');
+            _this._debug = (options === null || options === void 0 ? void 0 : options.suppressErrors) === false && !environment.production;
             return _this;
         }
         Object.defineProperty(EntitiesTableDataSource.prototype, "serviceOptions", {
+            /**
+             * @deprecated Use watchAllOptions or saveAllOptions
+             */
             get: function () {
-                return this.config.dataServiceOptions;
+                return this.config.dataServiceOptions
+                    || Object.assign(Object.assign({}, this.watchAllOptions), this.saveAllOptions);
             },
+            /**
+             * @deprecated Use watchAllOptions or saveAllOptions
+             */
             set: function (value) {
+                console.warn('dataSource.serviceOptions is deprecated! Please use \'watchAllOptions\' or \'saveAllOptions\' instead');
                 this.config.dataServiceOptions = value;
             },
             enumerable: false,
             configurable: true
         });
+        Object.defineProperty(EntitiesTableDataSource.prototype, "watchAllOptions", {
+            get: function () {
+                return this.config.watchAllOptions;
+            },
+            set: function (value) {
+                this.config.watchAllOptions = value;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(EntitiesTableDataSource.prototype, "saveAllOptions", {
+            get: function () {
+                return this.config.saveAllOptions;
+            },
+            set: function (value) {
+                this.config.saveAllOptions = value;
+            },
+            enumerable: false,
+            configurable: true
+        });
         Object.defineProperty(EntitiesTableDataSource.prototype, "loaded", {
             get: function () {
                 return this.loadingSubject.value === false; // Should be false when undefined (initial state)
@@ -25911,8 +25933,8 @@
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
-                            if (toBoolean(this.serviceOptions.readOnly, false)) {
-                                console.error('[table-datasource] Enable to save, because serviceOptions.readOnly=true');
+                            if (this.config.readOnly) {
+                                console.error('[table-datasource] Enable to save, because config.readOnly=true');
                                 return [2 /*return*/, false];
                             }
                             // Saving twice (should never occur)
@@ -25922,18 +25944,18 @@
                             }
                             this._saving = true;
                             this.markAsLoading();
-                            onlyDirtyRows = toBoolean(this.serviceOptions.saveOnlyDirtyRows, false);
+                            onlyDirtyRows = this.config.saveOnlyDirtyRows;
                             _b.label = 1;
                         case 1:
                             _b.trys.push([1, 3, 4, 5]);
-                            if (this.config.debug)
-                                console.debug("[table-datasource] Saving " + this._entityName + " rows... {onlyDirty: " + onlyDirtyRows + "}");
+                            if (this._debug)
+                                console.debug("[table-datasource] Saving " + this._entityName + " rows... {onlyDirtyRows: " + onlyDirtyRows + "}");
                             rows = this.getRows();
                             invalidRows = rows.filter(function (row) { return row.editing && !row.confirmEditCreate(); });
                             // Cannot finish some rows: error
                             if (invalidRows.length) {
                                 // log errors
-                                if (this.config.debug)
+                                if (this._debug)
                                     invalidRows.forEach(function (row) { return AppTableUtils.logRowErrors(row, "[table-datasource] " + _this._entityName + " row #" + row.id); });
                                 // Stop with an error
                                 throw { code: ErrorCodes.TABLE_INVALID_ROW_ERROR, message: 'ERROR.TABLE_INVALID_ROW_ERROR' };
@@ -25961,23 +25983,23 @@
                             }
                             // If no data to save: exit
                             if (onlyDirtyRows && !dataToSave_1.length) {
-                                if (this.config.debug)
+                                if (this._debug)
                                     console.debug("[table-datasource] No " + this._entityName + " data to save. Skip");
                                 return [2 /*return*/, false];
                             }
-                            if (this.config.debug)
+                            if (this._debug)
                                 console.debug("[table-datasource] Asking service to save this " + this._entityName + " data:", dataToSave_1);
                             return [4 /*yield*/, this.dataService.saveAll(dataToSave_1, this.serviceOptions)];
                         case 2:
                             _b.sent();
-                            if (this.config.debug)
+                            if (this._debug)
                                 console.debug("[table-datasource] Saving " + this._entityName + " data [OK]");
                             // LP 23/03/2021: update datasource is necessary but can be changed to a refetch() on QueryRef (must be created and registered in GraphqlService.watchQuery)
                             this.updateDatasource(data, { emitEvent: false });
                             return [2 /*return*/, true];
                         case 3:
                             error_1 = _b.sent();
-                            if (this.config.debug)
+                            if (this._debug)
                                 console.error('[table-datasource] Error while saving: ' + error_1 && error_1.message || error_1);
                             throw error_1;
                         case 4:
@@ -25990,7 +26012,7 @@
             });
         };
         EntitiesTableDataSource.prototype.updateDatasource = function (data, opts) {
-            if (this.config.debug)
+            if (this._debug)
                 console.debug("[table-datasource] Updating datasource with data:", data);
             _super_1.prototype.updateDatasource.call(this, data, opts);
             if (!opts || opts.emitEvent !== false) {
@@ -33906,8 +33928,7 @@
             if (isNil(this.data)) {
                 this.data = this.generateData(0, TableTestPage.maxRowCount);
             }
-            this.dataService.setValue(this.data, { emitEvent: false });
-            this.onRefresh.emit();
+            this.dataService.value = this.data;
         };
         TableTestPage.prototype.fetchMore = function (event) {
             return __awaiter(this, void 0, void 0, function () {
@@ -33920,9 +33941,12 @@
                         case 1:
                             fetched = _a.sent();
                             if (!(fetched && (event === null || event === void 0 ? void 0 : event.target) && event.target.complete)) return [3 /*break*/, 3];
+                            // Wait end of load
                             return [4 /*yield*/, this.waitIdle()];
                         case 2:
+                            // Wait end of load
                             _a.sent();
+                            // Mark target event as completed (e.g. IonRefresher)
                             event.target.complete();
                             _a.label = 3;
                         case 3: return [2 /*return*/];