@sumaris-net/ngx-components 1.23.17 → 1.23.19

package/fesm2015/sumaris-net.ngx-components.js

@@ -22410,15 +22410,15 @@ class BaseEntityService extends BaseGraphqlService {
             console.warn(`${this.constructor.name}.listenChanges() not implemented yet. Will empty observable`);
             return of();
         }
-        const variables = opts && opts.variables || {
+        const variables = (opts === null || opts === void 0 ? void 0 : opts.variables) || {
             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,
             error: {
                 code: ErrorCodes.SUBSCRIBE_DATA_ERROR,
@@ -22427,8 +22427,7 @@ class BaseEntityService extends BaseGraphqlService {
         })
             .pipe(map(({ data }) => {
             const 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`);
@@ -22573,7 +22572,8 @@ class EntitiesTableDataSource extends TableDataSource {
      */
     close() {
         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();
@@ -22588,10 +22588,10 @@ class EntitiesTableDataSource extends TableDataSource {
         return this.dataService.watchAll(offset, size, sortBy, sortDirection, filter, this.serviceOptions)
             .pipe(catchError(err => this.handleError(err, 'ERROR.LOAD_DATA_ERROR')), map((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 || []));
@@ -22609,22 +22609,22 @@ class EntitiesTableDataSource extends TableDataSource {
         // 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.updateDatasourceFromRows(rows);
         }
         else {
-            console.debug('[table-datasource] Skipping datasourceSubject update (not used yet).');
+            console.debug('[entities-table-datasource] Skipping datasourceSubject update (not used yet).');
         }
     }
     save() {
         return __awaiter(this, void 0, void 0, function* () {
             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 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 false;
             }
             this._saving = true;
@@ -22632,7 +22632,7 @@ class EntitiesTableDataSource extends TableDataSource {
             const onlyDirtyRows = this.config.saveOnlyDirtyRows;
             try {
                 if (this._debug)
-                    console.debug(`[table-datasource] Saving ${this._entityName} rows... {onlyDirtyRows: ${onlyDirtyRows}}`);
+                    console.debug(`[entities-table-datasource] Saving ${this._entityName} rows... {onlyDirtyRows: ${onlyDirtyRows}}`);
                 // Get all rows
                 const rows = this.getRows();
                 // Finish editing all rows
@@ -22641,7 +22641,7 @@ class EntitiesTableDataSource extends TableDataSource {
                 if (invalidRows.length) {
                     // log errors
                     if (this._debug)
-                        invalidRows.forEach(row => AppTableUtils.logRowErrors(row, `[table-datasource] ${this._entityName} row #${row.id}`));
+                        invalidRows.forEach(row => 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' };
                 }
@@ -22669,21 +22669,21 @@ class EntitiesTableDataSource extends TableDataSource {
                 // If no data to save: exit
                 if (onlyDirtyRows && !dataToSave.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 false;
                 }
                 if (this._debug)
-                    console.debug(`[table-datasource] Asking service to save this ${this._entityName} data:`, dataToSave);
+                    console.debug(`[entities-table-datasource] Asking service to save this ${this._entityName} data:`, dataToSave);
                 yield this.dataService.saveAll(dataToSave, this.serviceOptions);
                 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 true;
             }
             catch (error) {
                 if (this._debug)
-                    console.error('[table-datasource] Error while saving: ' + error && error.message || error);
+                    console.error('[entities-table-datasource] Error while saving: ' + error && error.message || error);
                 throw error;
             }
             finally {
@@ -22694,7 +22694,7 @@ class EntitiesTableDataSource extends TableDataSource {
     }
     updateDatasource(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.updateDatasource(data, opts);
         if (!opts || opts.emitEvent !== false) {
             this.markAsLoaded();
@@ -22706,7 +22706,8 @@ class EntitiesTableDataSource extends TableDataSource {
         return super.connect(collectionViewer);
     }
     disconnect(collectionViewer) {
-        console.debug('[table-datasource] Disconnecting...');
+        if (this._debug)
+            console.debug('[entities-table-datasource] Disconnecting...');
         super.disconnect(collectionViewer);
         this.close();
     }
@@ -22720,7 +22721,7 @@ class EntitiesTableDataSource extends TableDataSource {
         if (!super.confirmCreate(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;
@@ -22729,7 +22730,7 @@ class EntitiesTableDataSource extends TableDataSource {
         if (!super.confirmEdit(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;
@@ -22738,19 +22739,19 @@ class EntitiesTableDataSource extends TableDataSource {
         if (!super.startEdit(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 });
         }
     }
     handleError(error, message) {
         const 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);
     }
     handleServiceError(error) {
         const 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;
     }
@@ -22761,7 +22762,7 @@ class EntitiesTableDataSource extends TableDataSource {
         }
         const 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();
@@ -22792,7 +22793,7 @@ class EntitiesTableDataSource extends TableDataSource {
                 // In this case, apply missing deletion using the super.delete() function
                 const rowNotDeleted = this.getRows().filter(row => 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((a, b) => a.id > b.id ? -1 : 1)
@@ -23637,8 +23638,10 @@ class AppTable {
             if (this.saveBeforeDelete) {
                 // Exclude invalid rows (because of save() will fail, when exists some invalid rows)
                 tempRows = tempRows.filter(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();
@@ -23650,7 +23653,7 @@ class AppTable {
                         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*/ });