@sumaris-net/ngx-components 0.25.17 → 0.26.0

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

@@ -3128,23 +3128,22 @@
             };
         };
         SharedFormGroupValidators.dateMaxDuration = function (startDateField, endDateField, maxDuration, durationUnit) {
+            var maxDurationError = { dateMaxDuration: true };
             return function (group) {
-                var endField = group.get(endDateField);
                 var startDate = fromDateISOString(group.get(startDateField).value);
+                var endField = group.get(endDateField);
                 var endDate = fromDateISOString(endField.value);
                 if (isNotNil(startDate) && isNotNil(endDate) && Math.abs(startDate.diff(endDate, durationUnit)) > maxDuration) {
+                    console.log('TODO error !');
                     // Update end field
-                    var endFieldErrors = endField.errors || {};
-                    endFieldErrors['dateMaxDuration'] = true;
-                    endField.setErrors(endFieldErrors);
                     endField.markAsTouched({ onlySelf: true });
+                    endField.markAsPending();
+                    endField.setErrors(Object.assign(Object.assign({}, endField.errors), maxDurationError));
                     // Return the error (should be apply to the parent form)
-                    return { dateMaxDuration: true };
+                    return maxDurationError;
                 }
                 // OK: remove the existing on the end field
-                else {
-                    SharedValidators.clearError(endField, 'dateMaxDuration');
-                }
+                SharedValidators.clearError(endField, 'dateMaxDuration');
                 return null;
             };
         };
@@ -4019,8 +4018,8 @@
             }, "");
         };
         FormErrorAdapter.prototype.translateControlPath = function (path, opts) {
-            if (opts === null || opts === void 0 ? void 0 : opts.pathTranslateService) {
-                return opts === null || opts === void 0 ? void 0 : opts.pathTranslateService.translateControlPath(path);
+            if (opts === null || opts === void 0 ? void 0 : opts.controlPathTranslator) {
+                return opts === null || opts === void 0 ? void 0 : opts.controlPathTranslator.translateControlPath(path);
             }
             var i18nKey = (opts && opts.i18nPrefix || '') + changeCaseToUnderscore(path).toUpperCase();
             return this.translate.instant(i18nKey);
@@ -18909,20 +18908,22 @@
 
     // eslint-disable-next-line @angular-eslint/directive-class-suffix
     var AppForm = /** @class */ (function () {
-        function AppForm(dateAdapter, form, settings) {
-            this.dateAdapter = dateAdapter;
-            this.settings = settings;
-            this._subscription = new rxjs.Subscription();
+        function AppForm(injector, form) {
+            var _this = this;
+            this.error = null;
             this._enable = false;
             this._loading = true;
-            this.error = null;
+            this.i18nFieldPrefix = null;
+            this._subscription = new rxjs.Subscription();
             this.debug = false;
             this.onCancel = new i0.EventEmitter();
             this.onSubmit = new i0.EventEmitter();
             if (form)
                 this.setForm(form);
-            this.autocompleteHelper = new MatAutocompleteConfigHolder(settings && {
-                getUserAttributes: function (a, b) { return settings.getFieldDisplayAttributes(a, b); }
+            this.settings = injector.get(LocalSettingsService);
+            this.errorTranslator = injector.get(FormErrorAdapter);
+            this.autocompleteHelper = new MatAutocompleteConfigHolder(this.settings && {
+                getUserAttributes: function (a, b) { return _this.settings.getFieldDisplayAttributes(a, b); }
             });
             this.autocompleteFields = this.autocompleteHelper.fields;
         }
@@ -19022,6 +19023,9 @@
         });
         AppForm.prototype.ngOnInit = function () {
             this._enable ? this.enable() : this.disable();
+            this.errorTranslatorOptions = this.errorTranslatorOptions || {
+                controlPathTranslator: this
+            };
         };
         AppForm.prototype.ngOnDestroy = function () {
             this._subscription.unsubscribe();
@@ -19131,7 +19135,18 @@
             if (!opts || opts.emitEvent !== false)
                 this.markForCheck();
         };
+        AppForm.prototype.translateControlPath = function (path) {
+            return this.getFieldName(path);
+        };
         /* -- protected methods -- */
+        AppForm.prototype.getFormError = function (form, opts) {
+            if (!form || !this.errorTranslator)
+                return undefined;
+            return this.errorTranslator.translateErrors(this.form, Object.assign({ controlPathTranslator: this }, opts));
+        };
+        AppForm.prototype.getFieldName = function (path) {
+            return (this.i18nFieldPrefix || '') + changeCaseToUnderscore(path).toUpperCase();
+        };
         AppForm.prototype.registerSubscription = function (sub) {
             return this._subscription.add(sub);
         };
@@ -19148,13 +19163,13 @@
         { type: i0.Directive }
     ];
     AppForm.ctorParameters = function () { return [
-        { type: undefined },
-        { type: i1.FormGroup },
-        { type: LocalSettingsService }
+        { type: i0.Injector },
+        { type: i1.FormGroup }
     ]; };
     AppForm.propDecorators = {
         debug: [{ type: i0.Input }],
         tabindex: [{ type: i0.Input }],
+        errorTranslatorOptions: [{ type: i0.Input }],
         form: [{ type: i0.Input }],
         onCancel: [{ type: i0.Output }],
         onSubmit: [{ type: i0.Output }]
@@ -19162,12 +19177,12 @@
 
     var AuthForm = /** @class */ (function (_super) {
         __extends(AuthForm, _super);
-        function AuthForm(platform, dateAdapter, formBuilder, settings, configService, modalCtrl, network, cd, environment) {
-            var _this = _super.call(this, dateAdapter, formBuilder.group({
+        function AuthForm(injector, platform, formBuilder, settings, configService, modalCtrl, network, cd, environment) {
+            var _this = _super.call(this, injector, formBuilder.group({
                 username: [null, i1.Validators.required],
                 password: [null, i1.Validators.required],
                 offline: [network.offline]
-            }), settings) || this;
+            })) || this;
             _this.configService = configService;
             _this.modalCtrl = modalCtrl;
             _this.network = network;
@@ -19271,8 +19286,8 @@
                 },] }
     ];
     AuthForm.ctorParameters = function () { return [
+        { type: i0.Injector },
         { type: PlatformService },
-        { type: i1$3.DateAdapter },
         { type: i1.FormBuilder },
         { type: LocalSettingsService },
         { type: ConfigService },
@@ -19975,9 +19990,8 @@
 
     var AccountPage = /** @class */ (function (_super) {
         __extends(AccountPage, _super);
-        function AccountPage(dateAdapter, router, formBuilder, accountService, validatorService, settingsValidatorService, translate, settings, cd, locales) {
-            var _this = _super.call(this, dateAdapter, validatorService.getFormGroup(accountService.account), settings) || this;
-            _this.dateAdapter = dateAdapter;
+        function AccountPage(injector, router, formBuilder, accountService, validatorService, settingsValidatorService, translate, settings, cd, locales) {
+            var _this = _super.call(this, injector, validatorService.getFormGroup(accountService.account)) || this;
             _this.router = router;
             _this.formBuilder = formBuilder;
             _this.accountService = accountService;
@@ -20173,7 +20187,7 @@
                 },] }
     ];
     AccountPage.ctorParameters = function () { return [
-        { type: i1$3.DateAdapter },
+        { type: i0.Injector },
         { type: i3.Router },
         { type: i1.FormBuilder },
         { type: AccountService },
@@ -20572,9 +20586,8 @@
 
     var SettingsPage = /** @class */ (function (_super_1) {
         __extends(SettingsPage, _super_1);
-        function SettingsPage(dateAdapter, platform, router, validatorService, alertCtrl, translate, formBuilder, accountService, settings, cd, network, locales) {
-            var _this = _super_1.call(this, dateAdapter, validatorService.getFormGroup(), settings) || this;
-            _this.dateAdapter = dateAdapter;
+        function SettingsPage(injector, platform, router, validatorService, alertCtrl, translate, formBuilder, accountService, settings, cd, network, locales) {
+            var _this = _super_1.call(this, injector, validatorService.getFormGroup()) || this;
             _this.platform = platform;
             _this.router = router;
             _this.validatorService = validatorService;
@@ -20928,7 +20941,7 @@
                 },] }
     ];
     SettingsPage.ctorParameters = function () { return [
-        { type: i1$3.DateAdapter },
+        { type: i0.Injector },
         { type: PlatformService },
         { type: i3.Router },
         { type: LocalSettingsValidatorService },
@@ -20945,8 +20958,7 @@
     var AppPropertiesForm = /** @class */ (function (_super) {
         __extends(AppPropertiesForm, _super);
         function AppPropertiesForm(injector, formBuilder, dateAdapter, settings, cd, formGroupDir) {
-            var _this = _super.call(this, dateAdapter, null, settings) || this;
-            _this.injector = injector;
+            var _this = _super.call(this, injector, null) || this;
             _this.formBuilder = formBuilder;
             _this.dateAdapter = dateAdapter;
             _this.settings = settings;
@@ -21070,7 +21082,7 @@
     var AppListForm = /** @class */ (function (_super) {
         __extends(AppListForm, _super);
         function AppListForm(injector, formBuilder, dateAdapter, settings, cd, formGroupDir) {
-            var _this = _super.call(this, dateAdapter, null, settings) || this;
+            var _this = _super.call(this, injector, null) || this;
             _this.injector = injector;
             _this.formBuilder = formBuilder;
             _this.dateAdapter = dateAdapter;
@@ -23178,14 +23190,10 @@
             this._stopWatching$.next();
         };
         EntitiesTableDataSource.prototype.waitIdle = function (debounceTimeMs) {
-            return __awaiter(this, void 0, void 0, function () {
-                return __generator(this, function (_a) {
-                    return [2 /*return*/, firstFalsePromise(this.loadingSubject
-                            .asObservable()
-                            .pipe(operators.debounceTime(debounceTimeMs || 100) // if not started yet, wait
-                        ))];
-                });
-            });
+            return firstFalsePromise(this.loadingSubject
+                .asObservable()
+                .pipe(operators.debounceTime(debounceTimeMs || 100) // if not started yet, wait
+            ));
         };
         EntitiesTableDataSource.prototype.confirmCreate = function (row) {
             if (!_super_1.prototype.confirmCreate.call(this, row))
@@ -23719,7 +23727,7 @@
             this.saveBeforeSort = toBoolean(this.saveBeforeSort, !this.readOnly); // force to false when readonly
             this.saveBeforeFilter = toBoolean(this.saveBeforeFilter, !this.readOnly); // force to false when readonly
             this.keepEditedRowOnSave = toBoolean(this.keepEditedRowOnSave, this.inlineEdition);
-            this.translateErrorOptions = this.translateErrorOptions || { separator: ', ', pathTranslateService: this }; // Can be override in subclasses constructors
+            this.errorTranslatorOptions = this.errorTranslatorOptions || { separator: ', ', controlPathTranslator: this }; // Can be override in subclasses constructors
             // Check ask user confirmation is possible
             if (this.confirmBeforeDelete && !this.alertCtrl)
                 throw Error('Missing \'alertCtrl\' or \'injector\' in component\'s constructor.');
@@ -23936,7 +23944,7 @@
             if (previousRow && (previousRow.id === -1) && ((_a = previousRow.validator) === null || _a === void 0 ? void 0 : _a.invalid) && !((_b = previousRow.validator) === null || _b === void 0 ? void 0 : _b.dirty)) {
                 this.deleteNewRow(event, previousRow);
                 // Wait deletion is done, then edit previous row (by id, because of reloading)
-                firstFalsePromise(this.loadingSubject)
+                this.waitIdle()
                     .then(function () { return _this.editRowById(event, row.id, { focusColumn: _this.lastUserColumn }); });
                 return true;
             }
@@ -24282,34 +24290,54 @@
             });
         };
         AppTable.prototype.selectRowById = function (id) {
-            var _this = this;
-            if (id === undefined)
-                return Promise.resolve(false);
-            return this.dataSource.waitIdle()
-                .then(function () { return _this.dataSource.getRow(id); })
-                .then(function (row) { return row && _this.clickRow(null, row); });
+            return __awaiter(this, void 0, void 0, function () {
+                var row;
+                return __generator(this, function (_d) {
+                    switch (_d.label) {
+                        case 0:
+                            if (id === undefined)
+                                return [2 /*return*/, false];
+                            return [4 /*yield*/, this.waitIdle()];
+                        case 1:
+                            _d.sent();
+                            row = this.dataSource.getRow(id);
+                            return [2 /*return*/, this.clickRow(null, row)];
+                    }
+                });
+            });
         };
         /**
          * Try to select row by data. Will use dataEquals() (that call EntityUtils.equals()) to find same row's data
          * @param data
          */
         AppTable.prototype.selectRowByData = function (data) {
-            var _this = this;
-            if (data === undefined)
-                return Promise.resolve(false);
-            return this.dataSource.waitIdle()
-                .then(function () { return _this.dataSource.getRows(); })
-                .then(function (rows) { return rows.find(function (row) { return _this.equals(row.currentData, data); }); })
-                .then(function (row) { return row && _this.clickRow(null, row); });
+            return __awaiter(this, void 0, void 0, function () {
+                var row;
+                var _this = this;
+                return __generator(this, function (_d) {
+                    switch (_d.label) {
+                        case 0:
+                            if (data === undefined)
+                                return [2 /*return*/, Promise.resolve(false)];
+                            return [4 /*yield*/, this.waitIdle()];
+                        case 1:
+                            _d.sent();
+                            return [4 /*yield*/, this.dataSource.getRows()];
+                        case 2:
+                            row = ((_d.sent()) || [])
+                                .find(function (row) { return _this.equals(row.currentData, data); });
+                            return [2 /*return*/, row && this.clickRow(null, row)];
+                    }
+                });
+            });
         };
         AppTable.prototype.clickRow = function (event, row) {
             var _this = this;
-            var _a;
             if (this.loading) {
                 // Wait while loading, and loop
                 if (this.debug)
                     console.debug("[table] Waiting before apply clickRow() (datasource is busy)...");
-                (_a = this.dataSource) === null || _a === void 0 ? void 0 : _a.waitIdle().then(function () { return _this.clickRow(event, row); });
+                this.waitIdle().then(function () { return _this.clickRow(event, row); });
                 return false;
             }
             // DEBUG
@@ -24335,6 +24363,9 @@
         AppTable.prototype.moveRow = function (id, direction) {
             this.dataSource.move(id, direction);
         };
+        AppTable.prototype.waitIdle = function () {
+            return firstFalsePromise(this.loadingSubject);
+        };
         AppTable.prototype.openSelectColumnsModal = function (event) {
             return __awaiter(this, void 0, void 0, function () {
                 var columns, hasTopModal, modal, data, userColumns;
@@ -24386,7 +24417,7 @@
                 setTimeout(function () { return __awaiter(_this, void 0, void 0, function () {
                     return __generator(this, function (_d) {
                         switch (_d.label) {
-                            case 0: return [4 /*yield*/, firstFalsePromise(this.loadingSubject)];
+                            case 0: return [4 /*yield*/, this.waitIdle()];
                             case 1:
                                 _d.sent();
                                 event.target.complete();
@@ -24773,7 +24804,7 @@
             return this._autocompleteConfigHolder.add(fieldName, options);
         };
         AppTable.prototype.getI18nColumnName = function (columnName) {
-            return this.i18nColumnPrefix + changeCaseToUnderscore(columnName).toUpperCase();
+            return (this.i18nColumnPrefix || '') + changeCaseToUnderscore(columnName).toUpperCase();
         };
         AppTable.prototype.generateTableId = function () {
             return this.location.path(true).replace(/[?].*$/g, '').replace(/\/[\d]+/g, '_id') + '_' + this.constructor.name;
@@ -24892,7 +24923,7 @@
             row = row || this.editedRow;
             if (!row || !this.formErrorAdapter)
                 return undefined;
-            return this.formErrorAdapter.translateErrors(row.validator, Object.assign(Object.assign({}, this.translateErrorOptions), opts));
+            return this.formErrorAdapter.translateErrors(row.validator, Object.assign(Object.assign({}, this.errorTranslatorOptions), opts));
         };
         AppTable.prototype.setError = function (value, opts) {
             if (this.errorSubject.value !== value) {
@@ -25737,6 +25768,7 @@
                 enableListenChanges: (injector.get(ENVIRONMENT).listenRemoteChanges === true), pathIdAttribute: 'id', autoLoad: true, autoUpdateRoute: true, i18nPrefix: ''
             }, options);
             _this.settings = injector.get(LocalSettingsService);
+            _this.formErrorAdapter = injector.get(FormErrorAdapter);
             _this.cd = injector.get(i0.ChangeDetectorRef);
             _this.dateFormat = injector.get(DateFormatPipe);
             _this.toastController = injector.get(i1$5.ToastController);
@@ -25838,7 +25870,6 @@
         /**
          * Load data from the snapshot route
          *
-         * @param route
          * @protected
          */
         AppEntityEditor.prototype.loadFromRoute = function () {
@@ -25947,7 +25978,7 @@
                             idChanged = isNotNil(data.id)
                                 && this.previousDataId !== undefined // Ignore if first loading (=undefined)
                                 && this.previousDataId !== data.id;
-                            opts = Object.assign({ updateRoute: this._autoUpdateRoute && idChanged && !this.loading, openTabIndex: this._autoOpenNextTab && idChanged && isNil(this.previousDataId) && this.selectedTabIndex + 1 < this.tabCount ? this.selectedTabIndex + 1 : undefined }, opts);
+                            opts = Object.assign({ updateRoute: this._autoUpdateRoute && idChanged && !this.loading, openTabIndex: this._autoOpenNextTab && idChanged && this.computeNextTabIndex() }, opts);
                             this.data = data;
                             this.previousDataId = data.id || null;
                             promiseOrVoid = this.setValue(data);
@@ -26075,7 +26106,13 @@
                 });
             });
         };
-        AppEntityEditor.prototype.save = function (event, options) {
+        /**
+         * Save the editor, by calling the dataService.save().
+         * Ensure that editor if valid. If not, display an error
+         * @param event
+         * @param opts
+         */
+        AppEntityEditor.prototype.save = function (event, opts) {
             return __awaiter(this, void 0, void 0, function () {
                 var data, updatedData, err_2;
                 return __generator(this, function (_b) {
@@ -26113,14 +26150,14 @@
                         case 3:
                             data = _b.sent();
                             this.disable();
-                            return [4 /*yield*/, this.dataService.save(data, options)];
+                            return [4 /*yield*/, this.dataService.save(data, opts)];
                         case 4:
                             updatedData = _b.sent();
                             return [4 /*yield*/, this.onEntitySaved(updatedData)];
                         case 5:
                             _b.sent();
                             // Update the view (e.g metadata)
-                            return [4 /*yield*/, this.updateView(updatedData, options)];
+                            return [4 /*yield*/, this.updateView(updatedData, opts)];
                         case 6:
                             // Update the view (e.g metadata)
                             _b.sent();
@@ -26290,6 +26327,9 @@
             this.error = userMessage;
         };
         /* -- protected methods -- */
+        AppEntityEditor.prototype.computeNextTabIndex = function () {
+            return this.selectedTabIndex + 1 < this.tabCount ? this.selectedTabIndex + 1 : undefined;
+        };
         AppEntityEditor.prototype.unload = function () {
             return __awaiter(this, void 0, void 0, function () {
                 return __generator(this, function (_b) {