@sumaris-net/ngx-components 1.23.17 → 1.23.19

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

@@ -25928,15 +25928,15 @@
                 console.warn(this.constructor.name + ".listenChanges() not implemented yet. Will empty observable");
                 return rxjs.of();
             }
-            var variables = opts && opts.variables || {
+            var variables = (opts === null || opts === void 0 ? void 0 : opts.variables) || {
                 id: id,
                 interval: toNumber(opts && opts.interval, 0) // no timer by default
             };
             if (this._debug)
                 console.debug(this._logPrefix + ("[WS] Listening for changes on " + this._logTypeName + " {" + id + "}..."));
             return this.graphql.subscribe({
-                query: opts && opts.query || this.subscriptions.listenChanges,
-                fetchPolicy: opts && opts.fetchPolicy || 'no-cache',
+                query: (opts === null || opts === void 0 ? void 0 : opts.query) || this.subscriptions.listenChanges,
+                fetchPolicy: (opts === null || opts === void 0 ? void 0 : opts.fetchPolicy) || 'no-cache',
                 variables: variables,
                 error: {
                     code: ErrorCodes.SUBSCRIBE_DATA_ERROR,
@@ -25946,8 +25946,7 @@
                 .pipe(operators.map(function (_b) {
                 var data = _b.data;
                 var entity = (!opts || opts.toEntity !== false) ? data && _this.fromObject(data) : data;
-                if (entity && _this._debug)
-                    console.debug(_this._logPrefix + ("[WS] Received changes on " + _this._logTypeName + " {" + id + "}"), entity);
+                //if (entity && this._debug) console.debug(this._logPrefix + `[WS] Received changes on ${this._logTypeName} {${id}}`, entity);
                 // TODO: missing = deleted ?
                 if (!entity)
                     console.warn(_this._logPrefix + ("[WS] Received deletion on " + _this._logTypeName + " {" + id + "} - TODO check implementation"));
@@ -26121,7 +26120,8 @@
          */
         EntitiesTableDataSource.prototype.close = function () {
             if (!this._stopWatchSubject.closed) {
-                console.debug('[table-datasource] Closing...');
+                if (this._debug)
+                    console.debug('[entities-table-datasource] Closing...');
                 this._stopWatchSubject.next();
                 this._stopWatchSubject.complete();
                 this._stopWatchSubject.unsubscribe();
@@ -26137,10 +26137,10 @@
             return this.dataService.watchAll(offset, size, sortBy, sortDirection, filter, this.serviceOptions)
                 .pipe(operators.catchError(function (err) { return _this.handleError(err, 'ERROR.LOAD_DATA_ERROR'); }), operators.map(function (res) {
                 if (_this._saving) {
-                    console.info("[table-datasource] Received " + _this._entityName + " data (from service), but still saving: skip");
+                    console.info("[entities-table-datasource] Received " + _this._entityName + " data (from service), but still saving: skip");
                 }
                 else if (_this.hasSomeEditingRow()) {
-                    console.warn("[table-datasource] Received " + _this._entityName + " data, while some row still editing: skip; Please check save() implementation in the table!");
+                    console.warn("[entities-table-datasource] Received " + _this._entityName + " data, while some row still editing: skip; Please check save() implementation in the table!");
                 }
                 else {
                     _this.updateDatasource((res.data || []));
@@ -26158,11 +26158,11 @@
             // Avoid to update dataSourceSubject, when not need
             if ((_a = this.datasourceSubject.observers) === null || _a === void 0 ? void 0 : _a.length) {
                 if (!this.config.suppressErrors)
-                    console.warn('[table-datasource] Update datasource subject. Please prefer using \'rowsSubject\' instead of \'datasourceSubject\'');
+                    console.warn('[entities-table-datasource] Update datasource subject. Please prefer using \'rowsSubject\' instead of \'datasourceSubject\'');
                 _super_1.prototype.updateDatasourceFromRows.call(this, rows);
             }
             else {
-                console.debug('[table-datasource] Skipping datasourceSubject update (not used yet).');
+                console.debug('[entities-table-datasource] Skipping datasourceSubject update (not used yet).');
             }
         };
         EntitiesTableDataSource.prototype.save = function () {
@@ -26173,12 +26173,12 @@
                     switch (_b.label) {
                         case 0:
                             if (this.config.readOnly) {
-                                console.error('[table-datasource] Enable to save, because config.readOnly=true');
+                                console.error('[entities-table-datasource] Enable to save, because config.readOnly=true');
                                 return [2 /*return*/, false];
                             }
                             // Saving twice (should never occur)
                             if (this._saving) {
-                                console.warn("[table-datasource] Trying to save " + this._entityName + " rows twice. Skip");
+                                console.warn("[entities-table-datasource] Trying to save " + this._entityName + " rows twice. Skip");
                                 return [2 /*return*/, false];
                             }
                             this._saving = true;
@@ -26188,14 +26188,14 @@
                         case 1:
                             _b.trys.push([1, 3, 4, 5]);
                             if (this._debug)
-                                console.debug("[table-datasource] Saving " + this._entityName + " rows... {onlyDirtyRows: " + onlyDirtyRows + "}");
+                                console.debug("[entities-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._debug)
-                                    invalidRows.forEach(function (row) { return AppTableUtils.logRowErrors(row, "[table-datasource] " + _this._entityName + " row #" + row.id); });
+                                    invalidRows.forEach(function (row) { return AppTableUtils.logRowErrors(row, "[entities-table-datasource] " + _this._entityName + " row #" + row.id); });
                                 // Stop with an error
                                 throw { code: ErrorCodes.TABLE_INVALID_ROW_ERROR, message: 'ERROR.TABLE_INVALID_ROW_ERROR' };
                             }
@@ -26222,23 +26222,23 @@
                             // If no data to save: exit
                             if (onlyDirtyRows && !dataToSave_1.length) {
                                 if (this._debug)
-                                    console.debug("[table-datasource] No " + this._entityName + " data to save. Skip");
+                                    console.debug("[entities-table-datasource] No " + this._entityName + " data to save. Skip");
                                 return [2 /*return*/, false];
                             }
                             if (this._debug)
-                                console.debug("[table-datasource] Asking service to save this " + this._entityName + " data:", dataToSave_1);
+                                console.debug("[entities-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._debug)
-                                console.debug("[table-datasource] Saving " + this._entityName + " data [OK]");
+                                console.debug("[entities-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._debug)
-                                console.error('[table-datasource] Error while saving: ' + error_1 && error_1.message || error_1);
+                                console.error('[entities-table-datasource] Error while saving: ' + error_1 && error_1.message || error_1);
                             throw error_1;
                         case 4:
                             this._saving = false;
@@ -26251,7 +26251,7 @@
         };
         EntitiesTableDataSource.prototype.updateDatasource = function (data, opts) {
             if (this._debug)
-                console.debug("[table-datasource] Updating datasource with data:", data);
+                console.debug("[entities-table-datasource] Updating datasource with data:", data);
             _super_1.prototype.updateDatasource.call(this, data, opts);
             if (!opts || opts.emitEvent !== false) {
                 this.markAsLoaded();
@@ -26263,7 +26263,8 @@
             return _super_1.prototype.connect.call(this, collectionViewer);
         };
         EntitiesTableDataSource.prototype.disconnect = function (collectionViewer) {
-            console.debug('[table-datasource] Disconnecting...');
+            if (this._debug)
+                console.debug('[entities-table-datasource] Disconnecting...');
             _super_1.prototype.disconnect.call(this, collectionViewer);
             this.close();
         };
@@ -26277,7 +26278,7 @@
             if (!_super_1.prototype.confirmCreate.call(this, row))
                 return false;
             if (row.editing && row.validator) {
-                console.warn('[table-datasource] Row still has {editing: true} after confirmCreate()! Force editing to false');
+                console.warn('[entities-table-datasource] Row still has {editing: true} after confirmCreate()! Force editing to false');
                 row.validator.disable({ onlySelf: true, emitEvent: false });
             }
             return true;
@@ -26286,7 +26287,7 @@
             if (!_super_1.prototype.confirmEdit.call(this, row))
                 return false;
             if (row.editing && row.validator) {
-                console.warn('[table-datasource] Row still has {editing: true} after confirmEdit()! Force editing to false');
+                console.warn('[entities-table-datasource] Row still has {editing: true} after confirmEdit()! Force editing to false');
                 row.validator.disable({ onlySelf: true, emitEvent: false });
             }
             return true;
@@ -26295,19 +26296,19 @@
             if (!_super_1.prototype.startEdit.call(this, row))
                 return false;
             if (!row.editing && row.validator) {
-                console.warn('[table-datasource] Row still has {editing: false} after startEdit()! Force editing');
+                console.warn('[entities-table-datasource] Row still has {editing: false} after startEdit()! Force editing');
                 row.validator.enable({ onlySelf: true, emitEvent: false });
             }
         };
         EntitiesTableDataSource.prototype.handleError = function (error, message) {
             var errorMsg = error && error.message || error;
-            console.error("[table-datasource] Service " + this._entityName + " sent error: " + errorMsg, error);
+            console.error("[entities-table-datasource] Service " + this._entityName + " sent error: " + errorMsg, error);
             this.markAsLoaded();
             throw new Error(message || errorMsg);
         };
         EntitiesTableDataSource.prototype.handleServiceError = function (error) {
             var errorMsg = error && error.message || error;
-            console.error("[table-datasource] Service " + this._entityName + " sent error: " + errorMsg, error);
+            console.error("[entities-table-datasource] Service " + this._entityName + " sent error: " + errorMsg, error);
             this.markAsLoaded();
             throw error;
         };
@@ -26319,7 +26320,7 @@
             }
             var row = this.getRow(id);
             if (!row) {
-                console.error("[table-datasource] Row to delete with id=" + id + " not found");
+                console.error("[entities-table-datasource] Row to delete with id=" + id + " not found");
                 return;
             }
             this.markAsLoading();
@@ -26357,7 +26358,7 @@
                             _b.sent();
                             rowNotDeleted = this.getRows().filter(function (row) { return rows.includes(row); });
                             if (isNotEmptyArray(rowNotDeleted)) {
-                                console.warn("[table-datasource] Force deletion of " + rowNotDeleted.length + " rows! Please check that data service update the cache, after deletion");
+                                console.warn("[entities-table-datasource] Force deletion of " + rowNotDeleted.length + " rows! Please check that data service update the cache, after deletion");
                                 rowNotDeleted
                                     // Start at the end
                                     .sort(function (a, b) { return a.id > b.id ? -1 : 1; })
@@ -27365,8 +27366,10 @@
                             if (!this.saveBeforeDelete) return [3 /*break*/, 3];
                             // Exclude invalid rows (because of save() will fail, when exists some invalid rows)
                             tempRows = tempRows.filter(function (row) {
-                                // Delete the row, if newly created row (id = -1), or if invalid and not editing (= not cancellable)
-                                if (row.id === -1 || (!row.valid && !row.editing)) {
+                                // Delete the row :
+                                // - if newly created row (id = -1),
+                                // - or if invalid and not editing (= not cancellable)
+                                if (row.id === -1 || (!row.editing && row.invalid)) {
                                     if (_this.debug)
                                         console.debug("[table] Delete row #" + row.id);
                                     row.delete();
@@ -27378,7 +27381,7 @@
                                     return false; // Exclude from the list to delete using the service
                                 }
                                 // Cancel the row (and mark as pristine), when not valid but in edition
-                                else if (!row.valid && row.editing) {
+                                else if (row.editing && !row.valid) {
                                     row.cancel();
                                     // Mark row as pristine (if possible)
                                     _this.checkIfRowPristine(row, { emitEvent: false, onlySelf: true /*avoid propagation to table*/ });