hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-07 18:14:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

updated with latest changes

Browse Source
This commit is contained in:
Giuseppe Digilio
2018-06-13 11:28:11 +02:00
parent 98f79a7f67
commit 6b8330fee1
12 changed files with 150 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/app/shared/form/form.component.ts
View File

@@ -8,6 +8,7 @@ import {
DynamicFormGroupModel, DynamicFormLayout,
} from '@ng-dynamic-forms/core';
import { Store } from '@ngrx/store';
import { findIndex } from 'lodash';
import { AppState } from '../../app.reducer';
import {
@@ -37,6 +38,7 @@ import { isEmpty } from 'lodash';
})
export class FormComponent implements OnDestroy, OnInit {
private formErrors: FormError[] = [];
private formValid: boolean;
/**
@@ -44,6 +46,11 @@ export class FormComponent implements OnDestroy, OnInit {
*/
@Input() displaySubmit = true;
/**
* A boolean that indicate if to emit a form change event
*/
@Input() emitChange = true;
/**
* The form unique ID
*/
@@ -154,7 +161,9 @@ export class FormComponent implements OnDestroy, OnInit {
.subscribe((errors: FormError[]) => {
const {formGroup, formModel} = this;
errors.forEach((error: FormError) => {
errors
.filter((error: FormError) => findIndex(this.formErrors, {fieldId: error.fieldId}) === -1)
.forEach((error: FormError) => {
const {fieldId} = error;
let field: AbstractControl;
if (!!this.parentFormModel) {
@@ -166,9 +175,29 @@ export class FormComponent implements OnDestroy, OnInit {
if (field) {
const model: DynamicFormControlModel = this.formBuilderService.findById(fieldId, formModel);
this.formService.addErrorToField(field, model, error.message);
// this.formService.validateAllFormFields(formGroup);
this.changeDetectorRef.detectChanges();
}
});
this.formErrors
.filter((error: FormError) => findIndex(errors, {fieldId: error.fieldId}) === -1)
.forEach((error: FormError) => {
const {fieldId} = error;
let field: AbstractControl;
if (!!this.parentFormModel) {
field = this.formBuilderService.getFormControlById(fieldId, formGroup.parent as FormGroup, formModel);
} else {
field = this.formBuilderService.getFormControlById(fieldId, formGroup, formModel);
}
if (field) {
const model: DynamicFormControlModel = this.formBuilderService.findById(fieldId, formModel);
this.formService.removeErrorFromField(field, model, error.message);
}
});
this.formErrors = errors;
this.changeDetectorRef.detectChanges();
})
);
@@ -217,10 +246,11 @@ export class FormComponent implements OnDestroy, OnInit {
this.store.dispatch(action);
this.formGroup.markAsPristine();
this.change.emit(event);
const control: FormControl = event.control;
if (this.emitChange) {
this.change.emit(event);
}
// control.setErrors(null);
const control: FormControl = event.control;
if (control.valid) {
this.store.dispatch(new FormRemoveErrorAction(this.formId, event.model.id));
}