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-4782] VisibilityConditions - fix chaining conditions (#4971)

Browse Source 
* [ADF-4782] VisibilityConditions - fix chaining conditions

* add return types
This commit is contained in:
Silviu Popa
2019-08-07 01:39:45 +03:00
committed by Eugenio Romano
parent 0bca6607a9
commit bf828b6389
5 changed files with 155 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/core/form/services/widget-visibility-cloud.service.spec.ts
View File

@@ -34,7 +34,7 @@ import { AlfrescoApiServiceMock } from '../../mock/alfresco-api.service.mock';
import {
fakeFormJson, fakeTaskProcessVariableModels,
formTest, formValues, complexVisibilityJsonVisible,
complexVisibilityJsonNotVisible } from 'core/mock/form/widget-visibility-cloud.service.mock';
nextConditionForm, complexVisibilityJsonNotVisible } from 'core/mock/form/widget-visibility-cloud.service.mock';
declare let jasmine: any;
@@ -187,6 +187,23 @@ describe('WidgetVisibilityCloudService', () => {
booleanResult = service.evaluateCondition(null, null, undefined);
expect(booleanResult).toBeUndefined();
});
it('should evaluate true visibility condition with next condition operator', (done) => {
const myForm = new FormModel(nextConditionForm);
service.refreshVisibility(myForm);
const nextConditionFormVIsibility = myForm.getFieldById('Text4');
expect(nextConditionFormVIsibility.isVisible).toBeTruthy();
done();
});
it('should evaluate false visibility condition with next condition operator', (done) => {
const myForm = new FormModel(nextConditionForm);
myForm.getFieldById('Text3').value = 'wrong value';
service.refreshVisibility(myForm);
const nextConditionFormVIsibility = myForm.getFieldById('Text4');
expect(nextConditionFormVIsibility.isVisible).toBeFalsy();
done();
});
});
describe('should retrieve the process variables', () => {

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

@@ -190,11 +190,12 @@ describe('WidgetVisibilityService', () => {
});
describe('should retrieve the process variables', () => {
let fakeFormWithField = new FormModel(fakeFormJson);
let fakeFormWithField: FormModel;
let visibilityObjTest: WidgetVisibilityModel;
const chainedVisibilityObj = new WidgetVisibilityModel({});
beforeEach(() => {
fakeFormWithField = new FormModel(fakeFormJson);
visibilityObjTest = new WidgetVisibilityModel({});
fakeFormWithField = new FormModel(fakeFormJson);
});
@@ -342,7 +343,8 @@ describe('WidgetVisibilityService', () => {
describe('should return the value of the field', () => {
let visibilityObjTest: WidgetVisibilityModel;
let fakeFormWithField = new FormModel(fakeFormJson);
let fakeFormWithField: FormModel;
const jsonFieldFake = {
id: 'FAKE_FORM_FIELD_ID',
value: 'FAKE_FORM_FIELD_VALUE',
@@ -358,6 +360,7 @@ describe('WidgetVisibilityService', () => {
});
beforeEach(() => {
fakeFormWithField = new FormModel(fakeFormJson);
visibilityObjTest = new WidgetVisibilityModel();
fakeFormWithField = new FormModel(fakeFormJson);
formTest.values = formValues;
@@ -925,13 +928,14 @@ describe('WidgetVisibilityService', () => {
describe('Visibility based on form variables', () => {
const fakeFormWithVariables = new FormModel(fakeFormJson);
let fakeFormWithVariables = new FormModel(fakeFormJson);
const complexVisibilityModel = new FormModel(complexVisibilityJsonVisible);
const complexVisibilityJsonNotVisibleModel = new FormModel(complexVisibilityJsonNotVisible);
let visibilityObjTest: WidgetVisibilityModel;
beforeEach(() => {
visibilityObjTest = new WidgetVisibilityModel();
fakeFormWithVariables = new FormModel(fakeFormJson);
});
it('should set visibility to true when validation for string variables succeeds', () => {
@@ -986,7 +990,7 @@ describe('WidgetVisibilityService', () => {
it('should set visibility to true when validation for date variables succeeds', () => {
visibilityObjTest.leftRestResponseId = 'dob';
visibilityObjTest.operator = '==';
visibilityObjTest.rightValue = '2019-05-13';
visibilityObjTest.rightValue = '2019-05-13T00:00:00.000Z';
const isVisible = service.isFieldVisible(fakeFormWithVariables, visibilityObjTest);
expect(isVisible).toBeTruthy();
@@ -995,7 +999,7 @@ describe('WidgetVisibilityService', () => {
it('should set visibility to false when validation for date variables fails', () => {
visibilityObjTest.leftRestResponseId = 'dob';
visibilityObjTest.operator = '==';
visibilityObjTest.rightValue = '2019-05-15';
visibilityObjTest.rightValue = '2019-05-15T00:00:00.000Z';
const isVisible = service.isFieldVisible(fakeFormWithVariables, visibilityObjTest);
expect(isVisible).toBeFalsy();
@@ -1004,7 +1008,7 @@ describe('WidgetVisibilityService', () => {
it('should validate visiblity for form fields by finding the field with id', () => {
visibilityObjTest.leftRestResponseId = '0207b649-ff07-4f3a-a589-d10afa507b9b';
visibilityObjTest.operator = '==';
visibilityObjTest.rightValue = '2019-05-13';
visibilityObjTest.rightValue = '2019-05-13T00:00:00.000Z';
const isVisible = service.isFieldVisible(fakeFormWithVariables, visibilityObjTest);
expect(isVisible).toBeTruthy();

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

@@ -67,14 +67,17 @@ export class WidgetVisibilityService {
const leftValue = this.getLeftValue(form, visibilityObj);
const rightValue = this.getRightValue(form, visibilityObj);
const actualResult = this.evaluateCondition(leftValue, rightValue, visibilityObj.operator);
accumulator.push({ value: actualResult, operator: visibilityObj.nextConditionOperator });
if (visibilityObj.nextCondition) {
result = this.isFieldVisible(form, visibilityObj.nextCondition, accumulator);
} else {
result = accumulator[0].value ? accumulator[0].value : result;
if (this.isValidOperator(visibilityObj.nextConditionOperator)) {
accumulator.push({ value: actualResult, operator: visibilityObj.nextConditionOperator });
}
if (this.isValidCondition(visibilityObj.nextCondition)) {
result = this.isFieldVisible(form, visibilityObj.nextCondition, accumulator);
} else if (accumulator[0] !== undefined) {
result = accumulator[0].value;
for (let i = 1; i < accumulator.length; i++) {
if (accumulator[i - 1].operator && accumulator[i].value) {
if (accumulator[i] !== undefined) {
result = this.evaluateLogicalOperation(
accumulator[i - 1].operator,
result,
@@ -82,6 +85,8 @@ export class WidgetVisibilityService {
);
}
}
} else {
result = actualResult;
}
return !!result;
@@ -287,6 +292,14 @@ export class WidgetVisibilityService {
return res || {};
}
private isValidOperator(operator: string): boolean {
return operator !== undefined;
}
private isValidCondition(condition: WidgetVisibilityModel): boolean {
return !!(condition && condition.operator);
}
private handleError(err) {
this.logService.error('Error while performing a call');
return throwError('Error while performing a call - Server error');