inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-24 17:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ADF-4787] Invalid value of number field is parsed and fields with visibility conditions based on the number field are visible (#5255)

Browse Source 
* add another field visibility condition

* * Fixed failing unit tests
This commit is contained in:
Mercy Chrysolite
2019-11-16 16:41:44 +05:30
committed by Eugenio Romano
parent 173a160ee9
commit 7ca2f5d1e9
3 changed files with 65 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
lib/core/form/services/widget-visibility.service.ts
View File

@@ -122,14 +122,23 @@ export class WidgetVisibilityService {
}
getFormValue(form: FormModel, fieldId: string): any {
let value = this.getFieldValue(form.values, fieldId);
const formField = this.getFormFieldById(form, fieldId);
let value = undefined;
if (this.isInvalidValue(value)) {
value = this.searchValueInForm(form, fieldId);
if (this.isFormFieldValid(formField)) {
value = this.getFieldValue(form.values, fieldId);
if (this.isInvalidValue(value)) {
value = this.searchValueInForm(formField, fieldId);
}
}
return value;
}
isFormFieldValid(formField: FormFieldModel): boolean {
return formField && formField.isValid;
}
getFieldValue(valueList: any, fieldId: string): any {
let dropDownFilterByName, valueFound;
if (fieldId && fieldId.indexOf('_LABEL') > 0) {
@@ -149,20 +158,25 @@ export class WidgetVisibilityService {
return value === undefined || value === null;
}
searchValueInForm(form: FormModel, fieldId: string): string {
getFormFieldById(form: FormModel, fieldId: string): FormFieldModel {
return form.getFormFields().
find( (formField: FormFieldModel) => this.isSearchedField(formField, fieldId));
}
searchValueInForm(formField: FormFieldModel, fieldId: string): string {
let fieldValue = '';
form.getFormFields().forEach((formField: FormFieldModel) => {
if (this.isSearchedField(formField, fieldId)) {
fieldValue = this.getObjectValue(formField, fieldId);
if (!fieldValue) {
if (formField.value && formField.value.id) {
fieldValue = formField.value.id;
} else if (!this.isInvalidValue(formField.value)) {
fieldValue = formField.value;
}
if (formField) {
fieldValue = this.getObjectValue(formField, fieldId);
if (!fieldValue) {
if (formField.value && formField.value.id) {
fieldValue = formField.value.id;
} else if (!this.isInvalidValue(formField.value)) {
fieldValue = formField.value;
}
}
});
}
return fieldValue;
}