inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-05-19 17:14:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added some improvements, and fixed some name in the specs

Browse Source
This commit is contained in:
Vito Albano 2016-09-20 17:39:48 +01:00
parent bb4ed53d3a
commit 8f6a9fb03b
2 changed files with 35 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ng2-components/ng2-activiti-form/src/services/widget-visibility.service.spec.ts
View File

@ -209,7 +209,8 @@ describe('WidgetVisibilityService', () => {
it('should be able to retrieve the value of a process variable', (done) => { it('should be able to retrieve the value of a process variable', (done) => {
service.getTaskProcessVariableModelsForTask(9999).subscribe( service.getTaskProcessVariableModelsForTask(9999).subscribe(
(res: TaskProcessVariableModel[]) => { (res: TaskProcessVariableModel[]) => {
let varValue = service.getValueFromVariable(formTest, 'TEST_VAR_1'); expect(res).toBeDefined();
let varValue = service.getValueFromVariable(formTest, 'TEST_VAR_1', res);
expect(varValue).not.toBeUndefined(); expect(varValue).not.toBeUndefined();
expect(varValue).toBe('test_value_1'); expect(varValue).toBe('test_value_1');
done(); done();
@ -228,7 +229,7 @@ describe('WidgetVisibilityService', () => {
type: 'string', type: 'string',
value: 'form_value_test' } value: 'form_value_test' }
]}); ]});
let varValue = service.getValueFromVariable(fakeForm, 'FORM_VARIABLE_TEST'); let varValue = service.getValueFromVariable(fakeForm, 'FORM_VARIABLE_TEST', null);
expect(varValue).not.toBeUndefined(); expect(varValue).not.toBeUndefined();
expect(varValue).toBe('form_value_test'); expect(varValue).toBe('form_value_test');
@ -238,7 +239,7 @@ describe('WidgetVisibilityService', () => {
it('should return null if the variable does not exist', (done) => { it('should return null if the variable does not exist', (done) => {
service.getTaskProcessVariableModelsForTask(9999).subscribe( service.getTaskProcessVariableModelsForTask(9999).subscribe(
(res: TaskProcessVariableModel[]) => { (res: TaskProcessVariableModel[]) => {
let varValue = service.getValueFromVariable(formTest, 'TEST_MYSTERY_VAR'); let varValue = service.getValueFromVariable(formTest, 'TEST_MYSTERY_VAR', res);
expect(varValue).toBeNull(); expect(varValue).toBeNull();
done(); done();
} }
@ -360,7 +361,7 @@ describe('WidgetVisibilityService', () => {
expect(rightValue).toBeNull(); expect(rightValue).toBeNull();
}); });
it('should retrieve the value for the left field when it is a process variable', (variableUpdated) => { it('should retrieve the value for the left field when it is a process variable', (done) => {
service.getTaskProcessVariableModelsForTask(9999).subscribe( service.getTaskProcessVariableModelsForTask(9999).subscribe(
(res: TaskProcessVariableModel[]) => { (res: TaskProcessVariableModel[]) => {
let visibilityObjTest = new WidgetVisibilityModel(); let visibilityObjTest = new WidgetVisibilityModel();
@ -370,7 +371,7 @@ describe('WidgetVisibilityService', () => {
expect(rightValue).not.toBeNull(); expect(rightValue).not.toBeNull();
expect(rightValue).toBe('test_value_2'); expect(rightValue).toBe('test_value_2');
variableUpdated(); done();
} }
); );
jasmine.Ajax.requests.mostRecent().respondWith({ jasmine.Ajax.requests.mostRecent().respondWith({
@ -462,7 +463,7 @@ describe('WidgetVisibilityService', () => {
expect(isVisible).toBeTruthy(); expect(isVisible).toBeTruthy();
}); });
it('should evaluate the visibility for the field between form value and process var', (varReady) => { it('should evaluate the visibility for the field between form value and process var', (done) => {
service.getTaskProcessVariableModelsForTask(9999).subscribe( service.getTaskProcessVariableModelsForTask(9999).subscribe(
(res: TaskProcessVariableModel[]) => { (res: TaskProcessVariableModel[]) => {
let fakeFormWithField = new FormModel(fakeFormJson); let fakeFormWithField = new FormModel(fakeFormJson);
@ -474,7 +475,7 @@ describe('WidgetVisibilityService', () => {
let isVisible = service.evaluateVisibilityForField(fakeFormWithField, visibilityObjTest); let isVisible = service.evaluateVisibilityForField(fakeFormWithField, visibilityObjTest);
expect(isVisible).toBeTruthy(); expect(isVisible).toBeTruthy();
varReady(); done();
} }
); );
jasmine.Ajax.requests.mostRecent().respondWith({ jasmine.Ajax.requests.mostRecent().respondWith({
@ -485,7 +486,7 @@ describe('WidgetVisibilityService', () => {
}); });
it('should evaluate visibility with multiple conditions', (ready) => { it('should evaluate visibility with multiple conditions', (done) => {
service.getTaskProcessVariableModelsForTask(9999).subscribe( service.getTaskProcessVariableModelsForTask(9999).subscribe(
(res: TaskProcessVariableModel[]) => { (res: TaskProcessVariableModel[]) => {
let fakeFormWithField = new FormModel(fakeFormJson); let fakeFormWithField = new FormModel(fakeFormJson);
@ -502,7 +503,7 @@ describe('WidgetVisibilityService', () => {
let isVisible = service.evaluateVisibilityForField(fakeFormWithField, visibilityObjTest); let isVisible = service.evaluateVisibilityForField(fakeFormWithField, visibilityObjTest);
expect(isVisible).toBeTruthy(); expect(isVisible).toBeTruthy();
ready(); done();
} }
); );
jasmine.Ajax.requests.mostRecent().respondWith({ jasmine.Ajax.requests.mostRecent().respondWith({

39
ng2-components/ng2-activiti-form/src/services/widget-visibility.service.ts
View File

@ -81,7 +81,7 @@ export class WidgetVisibilityService {
private getLeftValue(form: FormModel, visibilityObj: WidgetVisibilityModel) { private getLeftValue(form: FormModel, visibilityObj: WidgetVisibilityModel) {
if ( visibilityObj.leftRestResponseId ) { if ( visibilityObj.leftRestResponseId ) {
return this.getValueFromVariable(form, visibilityObj.leftRestResponseId); return this.getValueFromVariable(form, visibilityObj.leftRestResponseId, this.processVarList);
} }
return this.getValueOField(form, visibilityObj.leftFormFieldId); return this.getValueOField(form, visibilityObj.leftFormFieldId);
} }
@ -89,7 +89,7 @@ export class WidgetVisibilityService {
private getRightValue(form: FormModel, visibilityObj: WidgetVisibilityModel) { private getRightValue(form: FormModel, visibilityObj: WidgetVisibilityModel) {
let valueFound = null; let valueFound = null;
if ( visibilityObj.rightRestResponseId ) { if ( visibilityObj.rightRestResponseId ) {
valueFound = this.getValueFromVariable(form, visibilityObj.rightRestResponseId); valueFound = this.getValueFromVariable(form, visibilityObj.rightRestResponseId, this.processVarList);
}else if ( visibilityObj.rightFormFieldId ) { }else if ( visibilityObj.rightFormFieldId ) {
valueFound = this.getValueOField(form, visibilityObj.rightFormFieldId); valueFound = this.getValueOField(form, visibilityObj.rightFormFieldId);
}else { }else {
@ -119,18 +119,29 @@ export class WidgetVisibilityService {
return null; return null;
} }
private getValueFromVariable(form: FormModel, name: string) { private getValueFromVariable( form: FormModel, name: string, processVarList: TaskProcessVariableModel[] ) {
let formVariable; return this.getFormVariableValue(form, name) ||
if ( form.json.variables ) { this.getProcessVariableValue(name, processVarList);
formVariable = form.json.variables.find(formVar => formVar.name === name); }
}
if ( !formVariable && this.processVarList ) { private getFormVariableValue(form: FormModel, name: string ) {
formVariable = this.processVarList.find(variable => variable.id === name); if ( form.json.variables) {
} let variableFromForm = form.json.variables.find(formVar => formVar.name === name);
if ( formVariable ) { if ( variableFromForm ) {
return formVariable.value; return variableFromForm.value;
} }
return null; }
return null;
}
private getProcessVariableValue(name: string, processVarList: TaskProcessVariableModel[]) {
if ( this.processVarList ) {
let variableFromProcess = this.processVarList.find(variable => variable.id === name);
if ( variableFromProcess ) {
return variableFromProcess.value;
}
}
return null;
} }
private evaluateLogicalOperation(logicOp, previousValue, newValue): boolean { private evaluateLogicalOperation(logicOp, previousValue, newValue): boolean {