@sumaris-net/ngx-components 1.20.0-rc2 → 1.20.0-rc5

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

@@ -21603,6 +21603,10 @@ class EntitiesTableDataSource extends TableDataSource {
     get loading() {
         return this.loadingSubject.value !== false; // Should be true when undefined (initial state)
     }
+    connect(collectionViewer) {
+        // DEBUG console.debug("[entities-datasource] connect");
+        return super.connect(collectionViewer);
+    }
     disconnect(collectionViewer) {
         super.disconnect(collectionViewer);
         this._stopWatching$.next();
@@ -21880,7 +21884,7 @@ class EntitiesTableDataSource extends TableDataSource {
     getRows() {
         return this.rowsSubject.toPromise();
     }
-    asyncCreateNew(insertAt) {
+    createNew(insertAt) {
         const _super = Object.create(null, {
             createNew: { get: () => super.createNew }
         });
@@ -21888,22 +21892,39 @@ class EntitiesTableDataSource extends TableDataSource {
             if (this._creating)
                 return; // Avoid multiple call (should never occur)
             this._creating = true;
-            _super.createNew.call(this, insertAt);
-            const row = this.getRow(-1);
-            if (row && this.config.onRowCreated) {
-                const res = this.config.onRowCreated(row);
-                // If async function, wait the end before ending
-                if (res instanceof Promise) {
-                    try {
-                        yield res;
-                    }
-                    catch (err) {
-                        console.error(err && err.message || err, err);
-                    }
+            const done = yield _super.createNew.call(this, insertAt);
+            if (done && this.config.onRowCreated) {
+                const row = this.getRow(-1);
+                try {
+                    yield this.config.onRowCreated(row);
+                }
+                catch (err) {
+                    console.error(err && err.message || err, err);
+                    // Continue
                 }
             }
-            this._editingRowCount++;
+            if (done)
+                this._editingRowCount++;
             this._creating = false;
+            return done;
+        });
+    }
+    createRowValidator() {
+        const _super = Object.create(null, {
+            createRowValidator: { get: () => super.createRowValidator }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            const validator = yield _super.createRowValidator.call(this);
+            if (validator && this.config.onRowValidator) {
+                try {
+                    yield this.config.onRowValidator(validator);
+                }
+                catch (err) {
+                    console.error(err && err.message || err, err);
+                    // Continue
+                }
+            }
+            return validator;
         });
     }
     getData() {
@@ -22471,13 +22492,15 @@ class AppTable {
         return true;
     }
     confirmAndForward(event, row) {
-        row = row || this.editedRow;
-        if (!this.confirmEditCreate(event, row)) {
-            return false;
-        }
-        // Edit next row
-        this.editRowById(event, row.id + 1, { focusColumn: this.firstUserColumn });
-        return true;
+        return __awaiter(this, void 0, void 0, function* () {
+            row = row || this.editedRow;
+            const done = yield this.confirmEditCreate(event, row);
+            if (done) {
+                // Edit next row
+                this.editRowById(event, row.id + 1, { focusColumn: this.firstUserColumn });
+            }
+            return done;
+        });
     }
     editRowById(event, id, opts) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -22501,48 +22524,44 @@ class AppTable {
      */
     confirmEditCreate(event, row) {
         var _a;
-        row = row || this.editedRow;
-        if (!row || !row.editing)
-            return true; // no row to confirm
-        // Stop event
-        event === null || event === void 0 ? void 0 : event.stopPropagation();
-        // Confirmation edition or creation
-        const confirmed = row.confirmEditCreate();
-        if (confirmed) {
-            // If edit finished, forget edited row
-            if (row === this.editedRow) {
-                this.editedRow = undefined;
-            }
-            // Mark table as dirty (if row is dirty)
-            if ((_a = row.validator) === null || _a === void 0 ? void 0 : _a.dirty) {
-                this.markAsDirty({ emitEvent: false /* because of resetError() */ });
-            }
-            // Clear error
-            this.resetError();
-            // Emit the confirm event
-            this.onConfirmEditCreateRow.next(row);
-            return true; // Continue
-        }
-        if (row.validator) {
-            // If pending: Wait end of validation, then loop
-            if (row.validator.pending) {
-                AppFormUtils.waitWhilePending(row.validator).then(() => this.confirmEditCreate(event, row));
-                return false;
-            }
-            // NOT confirmed = row has error
-            if (this.debug) {
-                console.warn('[table] Cannot confirm row, because invalid');
-                AppFormUtils.logFormErrors(row.validator, '[table] ');
-            }
-            // fix: mark all controls as touched to show errors
-            row.validator.markAllAsTouched();
-            // Compute row error, and propagate to table's error
-            if (this.propagateRowError) {
-                const error = this.getRowError(row);
-                this.setError(error);
+        return __awaiter(this, void 0, void 0, function* () {
+            row = row || this.editedRow;
+            if (!row || !row.editing)
+                return true; // no row to confirm
+            // Stop event
+            event === null || event === void 0 ? void 0 : event.stopPropagation();
+            // Confirmation edition or creation
+            const done = yield row.confirmEditCreate();
+            if (done) {
+                // If edit finished, forget edited row
+                if (row === this.editedRow) {
+                    this.editedRow = undefined;
+                }
+                // Mark table as dirty (if row is dirty)
+                if ((_a = row.validator) === null || _a === void 0 ? void 0 : _a.dirty) {
+                    this.markAsDirty({ emitEvent: false /* because of resetError() */ });
+                }
+                // Clear error
+                this.resetError();
+                // Emit the confirm event
+                this.onConfirmEditCreateRow.next(row);
+            }
+            else if (row.validator) {
+                // NOT confirmed = row has error
+                if (this.debug) {
+                    console.warn('[table] Cannot confirm row, because invalid');
+                    AppFormUtils.logFormErrors(row.validator, '[table] ');
+                }
+                // fix: mark all controls as touched to show errors
+                row.validator.markAllAsTouched();
+                // Compute row error, and propagate to table's error
+                if (this.propagateRowError) {
+                    const error = this.getRowError(row);
+                    this.setError(error);
+                }
             }
-        }
-        return false;
+            return done;
+        });
     }
     cancelOrDelete(event, row, opts) {
         // Delete new row
@@ -23242,7 +23261,9 @@ class AppTable {
     addRowToTable(insertAt) {
         return __awaiter(this, void 0, void 0, function* () {
             this.focusFirstColumn = true;
-            yield this._dataSource.asyncCreateNew(insertAt);
+            const done = yield this._dataSource.createNew(insertAt);
+            if (!done)
+                return undefined;
             this.editedRow = this._dataSource.getRow(-1);
             // Emit start editing event
             this.onStartEditingRow.emit(this.editedRow);
@@ -23373,53 +23394,58 @@ class AppTable {
         }
     }
     deleteNewRow(event, row) {
-        if (row.id !== -1)
-            throw new Error('Row must have id = -1');
-        event === null || event === void 0 ? void 0 : event.stopPropagation();
-        this.selection.clear();
-        this.editedRow = undefined; // unselect row
-        this._dataSource.cancelOrDelete(row);
-        this.onCancelOrDeleteRow.next(row);
-        this.resetError();
-        this.totalRowCount--;
-        this.visibleRowCount--;
+        return __awaiter(this, void 0, void 0, function* () {
+            if (row.id !== -1)
+                throw new Error('Row must have id = -1');
+            event === null || event === void 0 ? void 0 : event.stopPropagation();
+            this.selection.clear();
+            this.editedRow = undefined; // unselect row
+            const done = yield this._dataSource.cancelOrDelete(row);
+            if (done) {
+                this.onCancelOrDeleteRow.next(row);
+                this.resetError();
+                this.totalRowCount--;
+                this.visibleRowCount--;
+            }
+            return done;
+        });
     }
     deleteExistingRow(event, row, opts) {
         // Make sure row will be cancelled, and NOT deleted
         if (row.id === -1)
             throw new Error('Row must have an id');
         if (event === null || event === void 0 ? void 0 : event.defaultPrevented)
-            return 0; // SKip
+            return Promise.resolve(false); // SKip
         event === null || event === void 0 ? void 0 : event.preventDefault();
-        this.deleteRow(null, row, opts);
+        return this.deleteRow(null, row, opts);
     }
     cancelExistingRow(event, row, opts) {
         var _a;
-        // Make sure row will be cancelled, and NOT deleted
-        if (row.id === -1 || !row.editing)
-            throw new Error('Row cannot be canceling, but only deleting');
-        const confirmed = (!opts || opts.interactive !== false);
-        // Ask user confirmation, if cancel
-        if (!confirmed && ((_a = row.validator) === null || _a === void 0 ? void 0 : _a.dirty) && (this.confirmBeforeCancel || this.onBeforeCancelRows.observers.length > 0)) {
-            event.stopPropagation();
-            this.canCancelRows([row], opts)
-                .then(confirm => {
-                // If confirmed, loop
-                if (confirm)
-                    this.cancelExistingRow(event, row, { interactive: false });
-            });
-            return;
-        }
-        const keepEditing = row.editing && (!opts || opts.keepEditing !== false);
-        this.editedRow = undefined; // unselect row
-        this._dataSource.cancelOrDelete(row);
-        this.onCancelOrDeleteRow.next(row);
-        // Mark row as pristine
-        this.checkIfRowPristine(row);
-        // Restore editing state
-        if (keepEditing) {
-            this.editRow(undefined, row);
-        }
+        return __awaiter(this, void 0, void 0, function* () {
+            // Make sure row will be cancelled, and NOT deleted
+            if (row.id === -1 || !row.editing)
+                throw new Error('Row cannot be canceling, but only deleting');
+            const confirmed = (!opts || opts.interactive !== false);
+            // Ask user confirmation, if cancel
+            if (!confirmed && ((_a = row.validator) === null || _a === void 0 ? void 0 : _a.dirty) && (this.confirmBeforeCancel || this.onBeforeCancelRows.observers.length > 0)) {
+                event.stopPropagation();
+                const confirm = yield this.canCancelRows([row], opts);
+                // If not confirmed: stop
+                if (!confirm)
+                    return false;
+            }
+            const keepEditing = row.editing && (!opts || opts.keepEditing !== false);
+            this.editedRow = undefined; // unselect row
+            this._dataSource.cancelOrDelete(row);
+            this.onCancelOrDeleteRow.next(row);
+            // Mark row as pristine
+            this.checkIfRowPristine(row);
+            // Restore editing state
+            if (keepEditing) {
+                this.editRow(undefined, row);
+            }
+            return true;
+        });
     }
     checkIfRowPristine(row, opts) {
         var _a, _b;