@sumaris-net/ngx-components 0.25.17 → 0.26.0

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

@@ -2700,23 +2700,22 @@ class SharedFormGroupValidators {
         };
     }
     static dateMaxDuration(startDateField, endDateField, maxDuration, durationUnit) {
+        const maxDurationError = { dateMaxDuration: true };
         return (group) => {
-            const endField = group.get(endDateField);
             const startDate = fromDateISOString(group.get(startDateField).value);
+            const endField = group.get(endDateField);
             const endDate = fromDateISOString(endField.value);
             if (isNotNil(startDate) && isNotNil(endDate) && Math.abs(startDate.diff(endDate, durationUnit)) > maxDuration) {
+                console.log('TODO error !');
                 // Update end field
-                const 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;
         };
     }
@@ -3504,8 +3503,8 @@ class FormErrorAdapter {
         }, "");
     }
     translateControlPath(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);
         }
         const i18nKey = (opts && opts.i18nPrefix || '') + changeCaseToUnderscore(path).toUpperCase();
         return this.translate.instant(i18nKey);
@@ -16464,20 +16463,21 @@ RegisterModal.propDecorators = {
 
 // eslint-disable-next-line @angular-eslint/directive-class-suffix
 class AppForm {
-    constructor(dateAdapter, form, settings) {
-        this.dateAdapter = dateAdapter;
-        this.settings = settings;
-        this._subscription = new Subscription();
+    constructor(injector, form) {
+        this.error = null;
         this._enable = false;
         this._loading = true;
-        this.error = null;
+        this.i18nFieldPrefix = null;
+        this._subscription = new Subscription();
         this.debug = false;
         this.onCancel = new EventEmitter();
         this.onSubmit = new EventEmitter();
         if (form)
             this.setForm(form);
-        this.autocompleteHelper = new MatAutocompleteConfigHolder(settings && {
-            getUserAttributes: (a, b) => settings.getFieldDisplayAttributes(a, b)
+        this.settings = injector.get(LocalSettingsService);
+        this.errorTranslator = injector.get(FormErrorAdapter);
+        this.autocompleteHelper = new MatAutocompleteConfigHolder(this.settings && {
+            getUserAttributes: (a, b) => this.settings.getFieldDisplayAttributes(a, b)
         });
         this.autocompleteFields = this.autocompleteHelper.fields;
     }
@@ -16537,6 +16537,9 @@ class AppForm {
     }
     ngOnInit() {
         this._enable ? this.enable() : this.disable();
+        this.errorTranslatorOptions = this.errorTranslatorOptions || {
+            controlPathTranslator: this
+        };
     }
     ngOnDestroy() {
         this._subscription.unsubscribe();
@@ -16645,7 +16648,18 @@ class AppForm {
         if (!opts || opts.emitEvent !== false)
             this.markForCheck();
     }
+    translateControlPath(path) {
+        return this.getFieldName(path);
+    }
     /* -- protected methods -- */
+    getFormError(form, opts) {
+        if (!form || !this.errorTranslator)
+            return undefined;
+        return this.errorTranslator.translateErrors(this.form, Object.assign({ controlPathTranslator: this }, opts));
+    }
+    getFieldName(path) {
+        return (this.i18nFieldPrefix || '') + changeCaseToUnderscore(path).toUpperCase();
+    }
     registerSubscription(sub) {
         return this._subscription.add(sub);
     }
@@ -16661,25 +16675,25 @@ AppForm.decorators = [
     { type: Directive }
 ];
 AppForm.ctorParameters = () => [
-    { type: undefined },
-    { type: FormGroup },
-    { type: LocalSettingsService }
+    { type: Injector },
+    { type: FormGroup }
 ];
 AppForm.propDecorators = {
     debug: [{ type: Input }],
     tabindex: [{ type: Input }],
+    errorTranslatorOptions: [{ type: Input }],
     form: [{ type: Input }],
     onCancel: [{ type: Output }],
     onSubmit: [{ type: Output }]
 };
 
 class AuthForm extends AppForm {
-    constructor(platform, dateAdapter, formBuilder, settings, configService, modalCtrl, network, cd, environment) {
-        super(dateAdapter, formBuilder.group({
+    constructor(injector, platform, formBuilder, settings, configService, modalCtrl, network, cd, environment) {
+        super(injector, formBuilder.group({
             username: [null, Validators.required],
             password: [null, Validators.required],
             offline: [network.offline]
-        }), settings);
+        }));
         this.configService = configService;
         this.modalCtrl = modalCtrl;
         this.network = network;
@@ -16771,8 +16785,8 @@ AuthForm.decorators = [
             },] }
 ];
 AuthForm.ctorParameters = () => [
+    { type: Injector },
     { type: PlatformService },
-    { type: DateAdapter },
     { type: FormBuilder },
     { type: LocalSettingsService },
     { type: ConfigService },
@@ -17368,9 +17382,8 @@ AccountValidatorService.ctorParameters = () => [
 ];
 
 class AccountPage extends AppForm {
-    constructor(dateAdapter, router, formBuilder, accountService, validatorService, settingsValidatorService, translate, settings, cd, locales) {
-        super(dateAdapter, validatorService.getFormGroup(accountService.account), settings);
-        this.dateAdapter = dateAdapter;
+    constructor(injector, router, formBuilder, accountService, validatorService, settingsValidatorService, translate, settings, cd, locales) {
+        super(injector, validatorService.getFormGroup(accountService.account));
         this.router = router;
         this.formBuilder = formBuilder;
         this.accountService = accountService;
@@ -17535,7 +17548,7 @@ AccountPage.decorators = [
             },] }
 ];
 AccountPage.ctorParameters = () => [
-    { type: DateAdapter },
+    { type: Injector },
     { type: Router },
     { type: FormBuilder },
     { type: AccountService },
@@ -17902,9 +17915,8 @@ LocalSettingsValidatorService.ctorParameters = () => [
 ];
 
 class SettingsPage extends AppForm {
-    constructor(dateAdapter, platform, router, validatorService, alertCtrl, translate, formBuilder, accountService, settings, cd, network, locales) {
-        super(dateAdapter, validatorService.getFormGroup(), settings);
-        this.dateAdapter = dateAdapter;
+    constructor(injector, platform, router, validatorService, alertCtrl, translate, formBuilder, accountService, settings, cd, network, locales) {
+        super(injector, validatorService.getFormGroup());
         this.platform = platform;
         this.router = router;
         this.validatorService = validatorService;
@@ -18170,7 +18182,7 @@ SettingsPage.decorators = [
             },] }
 ];
 SettingsPage.ctorParameters = () => [
-    { type: DateAdapter },
+    { type: Injector },
     { type: PlatformService },
     { type: Router },
     { type: LocalSettingsValidatorService },
@@ -18186,8 +18198,7 @@ SettingsPage.ctorParameters = () => [
 
 class AppPropertiesForm extends AppForm {
     constructor(injector, formBuilder, dateAdapter, settings, cd, formGroupDir) {
-        super(dateAdapter, null, settings);
-        this.injector = injector;
+        super(injector, null);
         this.formBuilder = formBuilder;
         this.dateAdapter = dateAdapter;
         this.settings = settings;
@@ -18299,7 +18310,7 @@ AppPropertiesForm.propDecorators = {
 
 class AppListForm extends AppForm {
     constructor(injector, formBuilder, dateAdapter, settings, cd, formGroupDir) {
-        super(dateAdapter, null, settings);
+        super(injector, null);
         this.injector = injector;
         this.formBuilder = formBuilder;
         this.dateAdapter = dateAdapter;
@@ -20058,12 +20069,10 @@ class EntitiesTableDataSource extends TableDataSource {
         this._stopWatching$.next();
     }
     waitIdle(debounceTimeMs) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return firstFalsePromise(this.loadingSubject
-                .asObservable()
-                .pipe(debounceTime(debounceTimeMs || 100) // if not started yet, wait
-            ));
-        });
+        return firstFalsePromise(this.loadingSubject
+            .asObservable()
+            .pipe(debounceTime(debounceTimeMs || 100) // if not started yet, wait
+        ));
     }
     confirmCreate(row) {
         if (!super.confirmCreate(row))
@@ -20492,7 +20501,7 @@ class AppTable {
         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.');
@@ -20698,7 +20707,7 @@ class AppTable {
         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(() => this.editRowById(event, row.id, { focusColumn: this.lastUserColumn }));
             return true;
         }
@@ -20985,31 +20994,34 @@ class AppTable {
         });
     }
     selectRowById(id) {
-        if (id === undefined)
-            return Promise.resolve(false);
-        return this.dataSource.waitIdle()
-            .then(() => this.dataSource.getRow(id))
-            .then(row => row && this.clickRow(null, row));
+        return __awaiter(this, void 0, void 0, function* () {
+            if (id === undefined)
+                return false;
+            yield this.waitIdle();
+            const row = this.dataSource.getRow(id);
+            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
      */
     selectRowByData(data) {
-        if (data === undefined)
-            return Promise.resolve(false);
-        return this.dataSource.waitIdle()
-            .then(() => this.dataSource.getRows())
-            .then(rows => rows.find(row => this.equals(row.currentData, data)))
-            .then(row => row && this.clickRow(null, row));
+        return __awaiter(this, void 0, void 0, function* () {
+            if (data === undefined)
+                return Promise.resolve(false);
+            yield this.waitIdle();
+            const row = ((yield this.dataSource.getRows()) || [])
+                .find(row => this.equals(row.currentData, data));
+            return row && this.clickRow(null, row);
+        });
     }
     clickRow(event, row) {
-        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(() => this.clickRow(event, row));
+            this.waitIdle().then(() => this.clickRow(event, row));
             return false;
         }
         // DEBUG
@@ -21035,6 +21047,9 @@ class AppTable {
     moveRow(id, direction) {
         this.dataSource.move(id, direction);
     }
+    waitIdle() {
+        return firstFalsePromise(this.loadingSubject);
+    }
     openSelectColumnsModal(event) {
         return __awaiter(this, void 0, void 0, function* () {
             // Copy current columns (deep copy)
@@ -21067,7 +21082,7 @@ class AppTable {
         // When target wait for a complete (e.g. IonRefresher)
         if ((event === null || event === void 0 ? void 0 : event.target) && event.target.complete) {
             setTimeout(() => __awaiter(this, void 0, void 0, function* () {
-                yield firstFalsePromise(this.loadingSubject);
+                yield this.waitIdle();
                 event.target.complete();
             }));
         }
@@ -21391,7 +21406,7 @@ class AppTable {
         return this._autocompleteConfigHolder.add(fieldName, options);
     }
     getI18nColumnName(columnName) {
-        return this.i18nColumnPrefix + changeCaseToUnderscore(columnName).toUpperCase();
+        return (this.i18nColumnPrefix || '') + changeCaseToUnderscore(columnName).toUpperCase();
     }
     generateTableId() {
         return this.location.path(true).replace(/[?].*$/g, '').replace(/\/[\d]+/g, '_id') + '_' + this.constructor.name;
@@ -21494,7 +21509,7 @@ class AppTable {
         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));
     }
     setError(value, opts) {
         if (this.errorSubject.value !== value) {
@@ -22215,6 +22230,7 @@ class AppEntityEditor extends AppTabEditor {
             // Default options
             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(ChangeDetectorRef);
         this.dateFormat = injector.get(DateFormatPipe);
         this.toastController = injector.get(ToastController);
@@ -22294,7 +22310,6 @@ class AppEntityEditor extends AppTabEditor {
     /**
      * Load data from the snapshot route
      *
-     * @param route
      * @protected
      */
     loadFromRoute() {
@@ -22383,7 +22398,7 @@ class AppEntityEditor extends AppTabEditor {
             const 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;
             const promiseOrVoid = this.setValue(data);
@@ -22482,7 +22497,13 @@ class AppEntityEditor extends AppTabEditor {
             return this.goBack();
         });
     }
-    save(event, options) {
+    /**
+     * Save the editor, by calling the dataService.save().
+     * Ensure that editor if valid. If not, display an error
+     * @param event
+     * @param opts
+     */
+    save(event, opts) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.loading || this.saving) {
                 console.debug('[data-editor] Skip save: editor is busy (loading or saving)');
@@ -22511,10 +22532,10 @@ class AppEntityEditor extends AppTabEditor {
                 const data = yield this.getValue();
                 this.disable();
                 // Save form
-                const updatedData = yield this.dataService.save(data, options);
+                const updatedData = yield this.dataService.save(data, opts);
                 yield this.onEntitySaved(updatedData);
                 // Update the view (e.g metadata)
-                yield this.updateView(updatedData, options);
+                yield this.updateView(updatedData, opts);
                 // Subscribe to remote changes
                 if (!this.hasRemoteListener)
                     this.startListenRemoteChanges();
@@ -22639,6 +22660,9 @@ class AppEntityEditor extends AppTabEditor {
         this.error = userMessage;
     }
     /* -- protected methods -- */
+    computeNextTabIndex() {
+        return this.selectedTabIndex + 1 < this.tabCount ? this.selectedTabIndex + 1 : undefined;
+    }
     unload() {
         return __awaiter(this, void 0, void 0, function* () {
             this.form.reset();