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

Merge pull request #1322 from Alfresco/dev-valbano-1301

Browse Source 
#1301 - Improve the process variables evaluation
This commit is contained in:
Mario Romano 2016-12-16 17:42:10 +00:00 committed by GitHub
commit c712cc2c82
11 changed files with 90 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
ng2-components/ng2-activiti-form/src/components/activiti-form.component.spec.ts
View File

@ -28,18 +28,17 @@ describe('ActivitiForm', () => {
let componentHandler: any;
let formService: FormService;
let formComponent: ActivitiForm;
let visibilityService: WidgetVisibilityService;
let visibilityService: WidgetVisibilityService;
let nodeService: NodeService;
beforeEach(() => {
componentHandler = jasmine.createSpyObj('componentHandler', [
'upgradeAllRegistered'
]);
visibilityService = jasmine.createSpyObj('WidgetVisibilityService', [
'refreshVisibility', 'getTaskProcessVariable'
]);
window['componentHandler'] = componentHandler;
visibilityService = new WidgetVisibilityService(null);
spyOn(visibilityService, 'refreshVisibility').and.stub();
formService = new FormService(null, null);
nodeService = new NodeService(null, null);
formComponent = new ActivitiForm(formService, visibilityService, null, nodeService);
@ -139,6 +138,7 @@ describe('ActivitiForm', () => {
it('should get form by task id on load', () => {
spyOn(formComponent, 'getFormByTaskId').and.stub();
spyOn(visibilityService, 'getTaskProcessVariable').and.returnValue(Observable.of({}));
const taskId = '123';
formComponent.taskId = taskId;
@ -218,7 +218,7 @@ describe('ActivitiForm', () => {
spyOn(formComponent, 'getFormDefinitionByFormId').and.stub();
spyOn(formComponent, 'getFormDefinitionByFormName').and.stub();
formComponent.ngOnChanges({ 'tag': new SimpleChange(null, 'hello world')});
formComponent.ngOnChanges({ 'tag': new SimpleChange(null, 'hello world') });
expect(formComponent.getFormByTaskId).not.toHaveBeenCalled();
expect(formComponent.getFormDefinitionByFormId).not.toHaveBeenCalled();
@ -521,10 +521,10 @@ describe('ActivitiForm', () => {
it('should complete form form and raise corresponding event', () => {
spyOn(formService, 'completeTaskForm').and.callFake(() => {
return Observable.create(observer => {
observer.next();
observer.complete();
});
return Observable.create(observer => {
observer.next();
observer.complete();
});
});
const outcome = 'complete';
@ -572,17 +572,17 @@ describe('ActivitiForm', () => {
});
/*
it('should update the visibility when the container raise the change event', (valueChanged) => {
spyOn(formComponent, 'checkVisibility').and.callThrough();
let widget = new ContainerWidget();
let fakeForm = new FormModel();
let fakeField = new FormFieldModel(fakeForm, {id: 'fakeField', value: 'fakeValue'});
widget.formValueChanged.subscribe(field => { valueChanged(); });
widget.fieldChanged(fakeField);
it('should update the visibility when the container raise the change event', (valueChanged) => {
spyOn(formComponent, 'checkVisibility').and.callThrough();
let widget = new ContainerWidget();
let fakeForm = new FormModel();
let fakeField = new FormFieldModel(fakeForm, {id: 'fakeField', value: 'fakeValue'});
widget.formValueChanged.subscribe(field => { valueChanged(); });
widget.fieldChanged(fakeField);
expect(formComponent.checkVisibility).toHaveBeenCalledWith(fakeField);
});
*/
expect(formComponent.checkVisibility).toHaveBeenCalledWith(fakeField);
});
*/
it('should prevent default outcome execution', () => {

4
ng2-components/ng2-activiti-form/src/components/activiti-form.component.ts
View File

@ -280,7 +280,7 @@ export class ActivitiForm implements OnInit, AfterViewChecked, OnChanges {
loadForm() {
if (this.taskId) {
this.getFormByTaskId(this.taskId);
this.visibilityService.getTaskProcessVariable(this.taskId);
this.visibilityService.getTaskProcessVariable(this.taskId).subscribe();
return;
}
@ -411,7 +411,7 @@ export class ActivitiForm implements OnInit, AfterViewChecked, OnChanges {
*/
getFormDefinitionOutcomes(form: FormModel): FormOutcomeModel[] {
return [
new FormOutcomeModel(form, {id: '$custom', name: FormOutcomeModel.SAVE_ACTION, isSystem: true})
new FormOutcomeModel(form, { id: '$custom', name: FormOutcomeModel.SAVE_ACTION, isSystem: true })
];
}

2
ng2-components/ng2-activiti-form/src/components/widgets/display-value/display-value.widget.spec.ts
View File

@ -38,7 +38,7 @@ describe('DisplayValueWidget', () => {
beforeEach(() => {
settingsService = new AlfrescoSettingsService();
formService = new FormService(null, null);
visibilityService = new WidgetVisibilityService(null, null, null);
visibilityService = new WidgetVisibilityService(null);
widget = new DisplayValueWidget(formService, visibilityService, settingsService);
});

2
ng2-components/ng2-activiti-form/src/components/widgets/dropdown/dropdown.widget.spec.ts
View File

@ -34,7 +34,7 @@ describe('DropdownWidget', () => {
beforeEach(() => {
formService = new FormService(null, null);
visibilityService = new WidgetVisibilityService(null, null, null);
visibilityService = new WidgetVisibilityService(null);
widget = new DropdownWidget(formService, visibilityService);
widget.field = new FormFieldModel(new FormModel());
});

2
ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/dynamic-table.widget.spec.ts
View File

@ -28,7 +28,7 @@ describe('DynamicTableWidget', () => {
beforeEach(() => {
table = new DynamicTableModel(null);
visibilityService = new WidgetVisibilityService(null, null, null);
visibilityService = new WidgetVisibilityService(null);
widget = new DynamicTableWidget(null, visibilityService);
widget.content = table;
});

2
ng2-components/ng2-activiti-form/src/components/widgets/radio-buttons/radio-buttons.widget.spec.ts
View File

@ -36,7 +36,7 @@ describe('RadioButtonsWidget', () => {
beforeEach(() => {
formService = new FormService(null, null);
visibilityService = new WidgetVisibilityService(null, null, null);
visibilityService = new WidgetVisibilityService(null);
widget = new RadioButtonsWidget(formService, visibilityService);
widget.field = new FormFieldModel(new FormModel(), { restUrl: '<url>' });
});

2
ng2-components/ng2-activiti-form/src/components/widgets/typeahead/typeahead.widget.spec.ts
View File

@ -35,7 +35,7 @@ describe('TypeaheadWidget', () => {
beforeEach(() => {
formService = new FormService(null, null);
visibilityService = new WidgetVisibilityService(null, null, null);
visibilityService = new WidgetVisibilityService(null);
widget = new TypeaheadWidget(formService, visibilityService);
widget.field = new FormFieldModel(new FormModel({ taskId: 'task-id' }));
});

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

@ -15,8 +15,8 @@
* limitations under the License.
*/
import { HttpModule } from '@angular/http';
import { TestBed } from '@angular/core/testing';
import { ReflectiveInjector } from '@angular/core';
import { AlfrescoApi } from 'alfresco-js-api';
import {
formTest,
fakeTaskProcessVariableModels,
@ -24,31 +24,41 @@ import {
fakeFormJson
} from './assets/widget-visibility.service.mock';
import { WidgetVisibilityService } from './widget-visibility.service';
import { CoreModule } from 'ng2-alfresco-core';
import {
AlfrescoAuthenticationService,
AlfrescoSettingsService,
AlfrescoApiService,
StorageService
} from 'ng2-alfresco-core';
import { TaskProcessVariableModel } from '../models/task-process-variable.model';
import { WidgetVisibilityModel } from '../models/widget-visibility.model';
import { FormModel, FormFieldModel, TabModel, ContainerModel, FormFieldTypes } from '../components/widgets/core/index';
import { FormService } from './form.service';
declare let jasmine: any;
describe('WidgetVisibilityService', () => {
let service: WidgetVisibilityService;
let service, injector;
let authenticationService: AlfrescoAuthenticationService;
let apiService: AlfrescoApiService;
let alfrescoApi: AlfrescoApi;
let booleanResult: boolean;
let stubFormWithFields = new FormModel(fakeFormJson);
beforeAll(() => {
TestBed.configureTestingModule({
imports: [ HttpModule, CoreModule ],
providers: [
WidgetVisibilityService,
FormService
]
});
service = TestBed.get(WidgetVisibilityService);
beforeEach(() => {
injector = ReflectiveInjector.resolveAndCreate([
WidgetVisibilityService,
AlfrescoSettingsService,
AlfrescoApiService,
AlfrescoAuthenticationService,
StorageService
]);
});
beforeEach(() => {
service = injector.get(WidgetVisibilityService);
authenticationService = injector.get(AlfrescoAuthenticationService);
apiService = injector.get(AlfrescoApiService);
alfrescoApi = apiService.getInstance();
jasmine.Ajax.install();
});
@ -193,7 +203,7 @@ describe('WidgetVisibilityService', () => {
it('should return the process variables for task', (done) => {
service.getTaskProcessVariable('9999').subscribe(
(res: TaskProcessVariableModel[]) => {
(res) => {
expect(res).toBeDefined();
expect(res.length).toEqual(3);
expect(res[0].id).toEqual('TEST_VAR_1');
@ -444,11 +454,10 @@ describe('WidgetVisibilityService', () => {
expect(leftValue).toBe('value_2');
});
it('should return empty string for a value that is not on variable or form', () => {
it('should return undefined for a value that is not on variable or form', () => {
let leftValue = service.getLeftValue(fakeFormWithField, visibilityObjTest);
expect(leftValue).not.toBeUndefined();
expect(leftValue).toBe('');
expect(leftValue).toBeUndefined();
});
it('should evaluate the visibility for the field with single visibility condition between two field values', () => {
@ -620,30 +629,30 @@ describe('WidgetVisibilityService', () => {
});
/*
it('should refresh the visibility for field', () => {
visibilityObjTest.leftFormFieldId = 'FIELD_TEST';
visibilityObjTest.operator = '!=';
visibilityObjTest.rightFormFieldId = 'RIGHT_FORM_FIELD_ID';
it('should refresh the visibility for field', () => {
visibilityObjTest.leftFormFieldId = 'FIELD_TEST';
visibilityObjTest.operator = '!=';
visibilityObjTest.rightFormFieldId = 'RIGHT_FORM_FIELD_ID';
let container = <ContainerModel> fakeFormWithField.fields[0];
let column0 = container.columns[0];
let column1 = container.columns[1];
let container = <ContainerModel> fakeFormWithField.fields[0];
let column0 = container.columns[0];
let column1 = container.columns[1];
column0.fields[0].visibilityCondition = visibilityObjTest;
service.refreshVisibility(fakeFormWithField);
column0.fields[0].visibilityCondition = visibilityObjTest;
service.refreshVisibility(fakeFormWithField);
expect(column0.fields[0].isVisible).toBeFalsy();
expect(column0.fields[1].isVisible).toBeTruthy();
expect(column0.fields[2].isVisible).toBeTruthy();
expect(column1.fields[0].isVisible).toBeTruthy();
});
*/
expect(column0.fields[0].isVisible).toBeFalsy();
expect(column0.fields[1].isVisible).toBeTruthy();
expect(column0.fields[2].isVisible).toBeTruthy();
expect(column1.fields[0].isVisible).toBeTruthy();
});
*/
it('should refresh the visibility for tab in forms', () => {
visibilityObjTest.leftFormFieldId = 'FIELD_TEST';
visibilityObjTest.operator = '!=';
visibilityObjTest.rightFormFieldId = 'RIGHT_FORM_FIELD_ID';
let tab = new TabModel(fakeFormWithField, {id: 'fake-tab-id', title: 'fake-tab-title', isVisible: true});
let tab = new TabModel(fakeFormWithField, { id: 'fake-tab-id', title: 'fake-tab-title', isVisible: true });
tab.visibilityCondition = visibilityObjTest;
fakeFormWithField.tabs.push(tab);
service.refreshVisibility(fakeFormWithField);
@ -655,7 +664,7 @@ describe('WidgetVisibilityService', () => {
visibilityObjTest.leftFormFieldId = 'FIELD_TEST';
visibilityObjTest.operator = '!=';
visibilityObjTest.rightFormFieldId = 'RIGHT_FORM_FIELD_ID';
let tab = new TabModel(fakeFormWithField, {id: 'fake-tab-id', title: 'fake-tab-title', isVisible: true});
let tab = new TabModel(fakeFormWithField, { id: 'fake-tab-id', title: 'fake-tab-title', isVisible: true });
tab.visibilityCondition = visibilityObjTest;
service.refreshEntityVisibility(tab);

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

@ -16,9 +16,8 @@
*/
import { Injectable } from '@angular/core';
import { Response, Http, Headers, RequestOptions } from '@angular/http';
import { Observable } from 'rxjs/Rx';
import { AlfrescoSettingsService, AlfrescoAuthenticationService } from 'ng2-alfresco-core';
import { AlfrescoApiService } from 'ng2-alfresco-core';
import {
FormModel,
FormFieldModel,
@ -35,9 +34,7 @@ export class WidgetVisibilityService {
private processVarList: TaskProcessVariableModel[];
constructor(private http: Http,
private alfrescoSettingsService: AlfrescoSettingsService,
private authService: AlfrescoAuthenticationService) {
constructor(private apiService: AlfrescoApiService) {
}
public refreshVisibility(form: FormModel) {
@ -80,10 +77,14 @@ export class WidgetVisibilityService {
}
getLeftValue(form: FormModel, visibilityObj: WidgetVisibilityModel) {
let leftValue = '';
if (visibilityObj.leftRestResponseId && visibilityObj.leftRestResponseId !== 'null') {
return this.getVariableValue(form, visibilityObj.leftRestResponseId, this.processVarList);
leftValue = this.getVariableValue(form, visibilityObj.leftRestResponseId, this.processVarList);
} else {
leftValue = this.getFormValue(form, visibilityObj.leftFormFieldId);
leftValue = leftValue ? leftValue : this.getVariableValue(form, visibilityObj.leftFormFieldId, this.processVarList);
}
return this.getFormValue(form, visibilityObj.leftFormFieldId);
return leftValue;
}
getRightValue(form: FormModel, visibilityObj: WidgetVisibilityModel) {
@ -231,29 +232,21 @@ export class WidgetVisibilityService {
}
getTaskProcessVariable(taskId: string): Observable<TaskProcessVariableModel[]> {
let url = `${this.alfrescoSettingsService.getBPMApiBaseUrl()}/app/rest/task-forms/${taskId}/variables`;
let options = this.getRequestOptions();
return this.http
.get(url, options)
.map((response: Response) => this.processVarList = <TaskProcessVariableModel[]> response.json())
return Observable.fromPromise(this.apiService.getInstance().activiti.taskFormsApi.getTaskFormVariables(taskId))
.map(res => {
let jsonRes = this.toJson(res);
this.processVarList = <TaskProcessVariableModel[]>jsonRes;
return jsonRes;
})
.catch(this.handleError);
}
private getHeaders(): Headers {
return new Headers({
'Accept': 'application/json',
'Content-Type': 'application/json',
'Authorization': this.authService.getTicketBpm()
});
toJson(res: any) {
return res || {};
}
private getRequestOptions(): RequestOptions {
let headers = this.getHeaders();
return new RequestOptions({headers: headers});
}
private handleError(error: Response) {
console.error(error);
return Observable.throw(error.json().error || 'Server error');
private handleError() {
console.error('Error while performing a call');
return Observable.throw('Error while performing a call - Server error');
}
}

1
ng2-components/ng2-alfresco-core/ts-node/f6ba8d7b15d27fe97737b60b41fb5fdda5bf0070/2d80de9f3391a75a650ffc7cab54d80d0a017e2a.js.map Normal file
View File

File diff suppressed because one or more lines are too long

1
ng2-components/ng2-alfresco-userinfo/src/services/bpm-user.service.spec.ts
View File

@ -17,7 +17,6 @@
import { ReflectiveInjector } from '@angular/core';
import { BpmUserService } from '../services/bpm-user.service';
// import { BpmUserModel } from '../models/bpm-user.model';
import { AlfrescoAuthenticationService, AlfrescoApiService, AlfrescoSettingsService, StorageService } from 'ng2-alfresco-core';
import { fakeBpmUser } from '../assets/fake-bpm-user.service.mock';