@sumaris-net/ngx-components 1.3.5 → 1.3.6

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

@@ -20582,37 +20582,41 @@
                         case 0:
                             if (this.saving)
                                 return [2 /*return*/];
+                            if (!!this.form.valid) return [3 /*break*/, 2];
                             return [4 /*yield*/, AppFormUtils.waitWhilePending(this.form)];
                         case 1:
                             _a.sent();
                             if (this.form.invalid) {
                                 AppFormUtils.logFormErrors(this.form);
+                                this.form.markAllAsTouched();
                                 return [2 /*return*/];
                             }
+                            _a.label = 2;
+                        case 2:
                             this.submitted = true;
                             this.saving = true;
                             this.error = undefined;
                             newAccount = exports.Account.fromObject(Object.assign(Object.assign({}, (this.accountService.account.asObject())), (this.form.value)));
                             console.debug('[account] Saving account...', newAccount);
-                            _a.label = 2;
-                        case 2:
-                            _a.trys.push([2, 4, 5, 6]);
+                            _a.label = 3;
+                        case 3:
+                            _a.trys.push([3, 5, 6, 7]);
                             this.disable();
                             return [4 /*yield*/, this.accountService.save(newAccount)];
-                        case 3:
+                        case 4:
                             _a.sent();
                             this.markAsPristine();
-                            return [3 /*break*/, 6];
-                        case 4:
+                            return [3 /*break*/, 7];
+                        case 5:
                             err_2 = _a.sent();
                             console.error(err_2);
                             this.error = err_2 && err_2.message || err_2;
-                            return [3 /*break*/, 6];
-                        case 5:
+                            return [3 /*break*/, 7];
+                        case 6:
                             this.saving = false;
                             this.enable();
                             return [7 /*endfinally*/];
-                        case 6: return [2 /*return*/];
+                        case 7: return [2 /*return*/];
                     }
                 });
             });
@@ -21199,25 +21203,33 @@
                             event === null || event === void 0 ? void 0 : event.preventDefault();
                             // Remove all empty controls
                             this.propertiesFormHelper.removeAllEmpty();
-                            if (this.form.invalid && this.debug) {
+                            if (!!this.form.valid) return [3 /*break*/, 2];
+                            return [4 /*yield*/, AppFormUtils.waitWhilePending(this.form)];
+                        case 1:
+                            _a.sent();
+                            if (this.form.invalid) {
                                 AppFormUtils.logFormErrors(this.form);
+                                this.form.markAllAsTouched();
+                                return [2 /*return*/];
                             }
+                            _a.label = 2;
+                        case 2:
                             console.debug('[settings] Saving local settings...');
                             this.saving = true;
                             this.error = undefined;
                             return [4 /*yield*/, this.getValue()];
-                        case 1:
+                        case 3:
                             data = _a.sent();
                             peerChanged = this.form.get('peerUrl').dirty;
                             // Clean page history, when peer changed
                             if (peerChanged)
                                 data.pageHistory = [];
-                            _a.label = 2;
-                        case 2:
-                            _a.trys.push([2, 4, 5, 6]);
+                            _a.label = 4;
+                        case 4:
+                            _a.trys.push([4, 6, 7, 8]);
                             this.disable();
                             return [4 /*yield*/, this.settings.apply(data)];
-                        case 3:
+                        case 5:
                             _a.sent();
                             this.data = data;
                             this.markAsPristine();
@@ -21227,19 +21239,19 @@
                                 this.network.peer = exports.Peer.parseUrl(data.peerUrl);
                             }
                             return [2 /*return*/, true];
-                        case 4:
+                        case 6:
                             err_1 = _a.sent();
                             console.error(err_1);
                             this.error = err_1 && err_1.message || err_1;
                             return [2 /*return*/, false];
-                        case 5:
+                        case 7:
                             this.enable({ emitEvent: false });
                             // Apply inheritance
                             this.setAccountInheritance(data.accountInheritance, { emitEvent: false });
                             this.saving = false;
                             this.markForCheck();
                             return [7 /*endfinally*/];
-                        case 6: return [2 /*return*/];
+                        case 8: return [2 /*return*/];
                     }
                 });
             });