diff --git a/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts b/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts index 7d2cc90d5f..9e60fd8242 100644 --- a/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts +++ b/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts @@ -16,7 +16,7 @@ */ import { Component, AfterViewChecked, ViewChild, Input } from '@angular/core'; -import { ALFRESCO_TASKLIST_DIRECTIVES } from 'ng2-activiti-tasklist'; +import { ALFRESCO_TASKLIST_DIRECTIVES, TaskQueryRequestRepresentationModel } from 'ng2-activiti-tasklist'; import { ACTIVITI_PROCESSLIST_DIRECTIVES } from 'ng2-activiti-processlist'; import { ActivitiForm } from 'ng2-activiti-form'; import { ActivatedRoute } from '@angular/router'; @@ -96,7 +96,14 @@ export class ActivitiDemoComponent implements AfterViewChecked { onTaskFilterClick(event: any) { this.taskFilter = event; - this.activititasklist.load(this.taskFilter.filter); + let requestNode = {appDefinitionId: this.taskFilter.appId, + processDefinitionId: this.taskFilter.filter.processDefinitionId, + text: this.taskFilter.filter.name, + assignment: this.taskFilter.filter.assignment, + state: this.taskFilter.filter.state, + sort: this.taskFilter.filter.sort, + }; + this.activititasklist.load(new TaskQueryRequestRepresentationModel(requestNode)); } onSuccessTaskList(event: any) { diff --git a/ng2-components/ng2-activiti-tasklist/index.ts b/ng2-components/ng2-activiti-tasklist/index.ts index 486f892126..9b2dc696b0 100644 --- a/ng2-components/ng2-activiti-tasklist/index.ts +++ b/ng2-components/ng2-activiti-tasklist/index.ts @@ -22,5 +22,6 @@ import { NoTaskDetailsTemplateComponent } from './src/components/no-task-detail- export * from './src/components/activiti-tasklist.component'; export * from './src/services/activiti-tasklist.service'; +export * from './src/models/filter.model'; export const ALFRESCO_TASKLIST_DIRECTIVES: [any] = [NoTaskDetailsTemplateComponent, ActivitiFilters, ActivitiTaskList, ActivitiTaskDetails]; diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.spec.ts index d1663d2596..04c5783015 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.spec.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.spec.ts @@ -25,15 +25,15 @@ import { import { ActivitiFilters } from './activiti-filters.component'; import { ActivitiTaskListService } from '../services/activiti-tasklist.service'; import { Observable } from 'rxjs/Rx'; -import { FilterModel } from '../models/filter.model'; +import { FilterRepresentationModel } from '../models/filter.model'; describe('ActivitiFilters', () => { let filterList: ActivitiFilters; let fakeGlobalFilter = []; - fakeGlobalFilter.push(new FilterModel('FakeInvolvedTasks', false, 'glyphicon-align-left', '', 'open', 'fake-involved')); - fakeGlobalFilter.push(new FilterModel('FakeMyTasks', false, 'glyphicon-align-left', '', 'open', 'fake-assignee')); + fakeGlobalFilter.push(new FilterRepresentationModel({name: 'FakeInvolvedTasks', filter: { state: 'open', assignment: 'fake-involved'}})); + fakeGlobalFilter.push(new FilterRepresentationModel({name: 'FakeMyTasks', filter: { state: 'open', assignment: 'fake-assignee'}})); let fakeGlobalFilterPromise = new Promise(function (resolve, reject) { resolve(fakeGlobalFilter); @@ -100,9 +100,9 @@ describe('ActivitiFilters', () => { }); it('should emit an event when a filter is selected', (done) => { - let currentFilter = new FilterModel('FakeInvolvedTasks', false, 'glyphicon-align-left', '', 'open', 'fake-involved'); + let currentFilter = new FilterRepresentationModel({filter: { state: 'open', assignment: 'fake-involved'}}); - filterList.filterClick.subscribe((filter: FilterModel) => { + filterList.filterClick.subscribe((filter: FilterRepresentationModel) => { expect(filter).toBeDefined(); expect(filter).toEqual(currentFilter); expect(filterList.currentFilter).toEqual(currentFilter); diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.ts index 9dff5f1289..26138a813c 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.ts @@ -18,7 +18,7 @@ import { Component, Output, EventEmitter, OnInit, Input } from '@angular/core'; import { AlfrescoTranslationService, AlfrescoAuthenticationService, AlfrescoPipeTranslate } from 'ng2-alfresco-core'; import { ActivitiTaskListService } from './../services/activiti-tasklist.service'; -import { FilterModel } from '../models/filter.model'; +import { FilterRepresentationModel } from '../models/filter.model'; import { Observer } from 'rxjs/Observer'; import { Observable } from 'rxjs/Observable'; @@ -37,7 +37,7 @@ declare let __moduleName: string; export class ActivitiFilters implements OnInit { @Output() - filterClick: EventEmitter = new EventEmitter(); + filterClick: EventEmitter = new EventEmitter(); @Output() onSuccess: EventEmitter = new EventEmitter(); @@ -51,12 +51,12 @@ export class ActivitiFilters implements OnInit { @Input() appName: string; - private filterObserver: Observer; - filter$: Observable; + private filterObserver: Observer; + filter$: Observable; - currentFilter: FilterModel; + currentFilter: FilterRepresentationModel; - filters: FilterModel [] = []; + filters: FilterRepresentationModel [] = []; /** * Constructor @@ -67,7 +67,7 @@ export class ActivitiFilters implements OnInit { constructor(private auth: AlfrescoAuthenticationService, private translate: AlfrescoTranslationService, public activiti: ActivitiTaskListService) { - this.filter$ = new Observable(observer => this.filterObserver = observer).share(); + this.filter$ = new Observable(observer => this.filterObserver = observer).share(); if (translate) { translate.addTranslationFolder('node_modules/ng2-activiti-tasklist/src'); @@ -75,7 +75,7 @@ export class ActivitiFilters implements OnInit { } ngOnInit() { - this.filter$.subscribe((filter: FilterModel) => { + this.filter$.subscribe((filter: FilterRepresentationModel) => { this.filters.push(filter); }); @@ -96,7 +96,7 @@ export class ActivitiFilters implements OnInit { private filterByAppId(appId) { this.activiti.getTaskListFilters(appId).subscribe( - (res: FilterModel[]) => { + (res: FilterRepresentationModel[]) => { res.forEach((filter) => { this.filterObserver.next(filter); }); @@ -124,7 +124,7 @@ export class ActivitiFilters implements OnInit { * Pass the selected filter as next * @param filter */ - public selectFilter(filter: FilterModel) { + public selectFilter(filter: FilterRepresentationModel) { this.currentFilter = filter; this.filterClick.emit(filter); } diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.html b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.html index c447fabcad..cd52a0fe3c 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.html +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.html @@ -1,4 +1,4 @@ -
+