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-4790] [ADF-4791] - fix visibility condition for text/checkbox and variable/value (#4978)

Browse Source 
* [ADF-4790] [ADF-4791] - fix visibility condition for empty string and checkbox - value/variable

* reset package-lock

* reset package-lock.json

* fix lint and change return type
This commit is contained in:
Silviu Popa
2019-08-09 00:51:10 +03:00
committed by Eugenio Romano
parent f04c135377
commit cb988b0145
4 changed files with 201 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -98,8 +98,9 @@ export class WidgetVisibilityService {
leftValue = this.getVariableValue(form, visibilityObj.leftValue, this.processVarList);
} else if (visibilityObj.leftType && visibilityObj.leftType === WidgetTypeEnum.field) {
leftValue = this.getFormValue(form, visibilityObj.leftValue);
if (this.isInvalidValue(leftValue)) {
leftValue = this.getVariableValue(form, visibilityObj.leftValue, this.processVarList);
if (leftValue === undefined || leftValue === '') {
const variableValue = this.getVariableValue(form, visibilityObj.leftValue, this.processVarList);
leftValue = !this.isInvalidValue(variableValue) ? variableValue : leftValue;
}
}
return leftValue;
@@ -124,7 +125,7 @@ export class WidgetVisibilityService {
getFormValue(form: FormModel, fieldId: string): any {
let value = this.getFieldValue(form.values, fieldId);
if (!value) {
if (this.isInvalidValue(value)) {
value = this.searchValueInForm(form, fieldId);
}
return value;
@@ -146,7 +147,7 @@ export class WidgetVisibilityService {
}
private isInvalidValue(value: any): boolean {
return value === undefined || value === '';
return value === undefined || value === null;
}
searchValueInForm(form: FormModel, fieldId: string): string {
@@ -157,13 +158,12 @@ export class WidgetVisibilityService {
if (!fieldValue) {
if (formField.value && formField.value.id) {
fieldValue = formField.value.id;
} else {
} else if (!this.isInvalidValue(formField.value)) {
fieldValue = formField.value;
}
}
}
});
return fieldValue;
}
@@ -195,11 +195,12 @@ export class WidgetVisibilityService {
}
getVariableValue(form: FormModel, name: string, processVarList: TaskProcessVariableModel[]): string {
return this.getFormVariableValue(form, name) ||
this.getProcessVariableValue(name, processVarList);
const processVariableValue = this.getProcessVariableValue(name, processVarList);
const variableDefaultValue = this.getFormVariableDefaultValue(form, name);
return (processVariableValue === undefined) ? variableDefaultValue : processVariableValue;
}
private getFormVariableValue(form: FormModel, identifier: string): string {
private getFormVariableDefaultValue(form: FormModel, identifier: string): string {
const variables = this.getFormVariables(form);
if (variables) {
const formVariable = variables.find((formVar) => {
@@ -213,7 +214,6 @@ export class WidgetVisibilityService {
value += 'T00:00:00.000Z';
}
}
return value;
}
}
@@ -229,6 +229,7 @@ export class WidgetVisibilityService {
return processVariable.value;
}
}
}
evaluateLogicalOperation(logicOp, previousValue, newValue): boolean {