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

[ADF-1309] Task List Pagination (#2255)

Browse Source 
* Basic version

* Fix pagination errors

* Fix error on complete task

* Add error

* Fix unit test

* Remove the external paginator component

* Rollback unit test about error event
This commit is contained in:
Maurizio Vitale 2017-08-29 14:28:27 +01:00 committed by Mario Romano
parent 8e3d84504a
commit 5d22e78bb7
28 changed files with 646 additions and 367 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
demo-shell-ng2/app/components/activiti/activiti-demo.component.html
View File

@ -27,6 +27,8 @@
*ngIf="taskFilter && !isStartTaskMode()">
<activiti-tasklist
[appId]="taskFilter?.appId"
[page]="taskPage"
[size]="taskPagination.maxItems"
[processDefinitionKey]="taskFilter?.filter?.processDefinitionKey"
[name]="taskFilter?.filter?.name"
[assignment]="taskFilter?.filter?.assignment"
@ -47,6 +49,15 @@
</data-columns>
-->
</activiti-tasklist>
<adf-pagination
(changePageNumber)="onChangePageNumber($event)"
(changePageSize)="onChangePageSize($event)"
(nextPage)="onNextPage($event)"
(prevPage)="onPrevPage($event)"
[pagination]="taskPagination"
[supportedPageSizes]="[2, 4, 6, 8, 10, 12]">
</adf-pagination>
</div>
<div class="activiti-demo-grid-item activiti-demo-tasks-details" *ngIf="!isStartTaskMode()"
[class.mdl-cell--7-col]="taskFilter && !isStartTaskMode()"

55
demo-shell-ng2/app/components/activiti/activiti-demo.component.ts
View File

@ -18,6 +18,7 @@
// tslint:disable-next-line:adf-file-name
import { AfterViewInit, Component, ElementRef, Input, OnDestroy, OnInit, ViewChild } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { Pagination } from 'alfresco-js-api';
import { AnalyticsReportListComponent } from 'ng2-activiti-analytics';
import { FORM_FIELD_VALIDATORS, FormEvent, FormFieldEvent, FormRenderingService, FormService } from 'ng2-activiti-form';
import {
@ -34,7 +35,8 @@ import {
TaskDetailsComponent,
TaskDetailsEvent,
TaskFiltersComponent,
TaskListComponent
TaskListComponent,
TaskListService
} from 'ng2-activiti-tasklist';
import { AlfrescoApiService } from 'ng2-alfresco-core';
import {
@ -96,6 +98,12 @@ export class ActivitiDemoComponent implements AfterViewInit, OnDestroy, OnInit {
currentProcessInstanceId: string;
taskSchemaColumns: any [] = [];
taskPagination: Pagination = {
skipCount: 0,
maxItems: 2,
totalItems: 0
};
taskPage: number = 0;
processSchemaColumns: any [] = [];
activeTab: string = 'tasks'; // tasks|processes|reports
@ -119,6 +127,7 @@ export class ActivitiDemoComponent implements AfterViewInit, OnDestroy, OnInit {
constructor(private elementRef: ElementRef,
private route: ActivatedRoute,
private router: Router,
private taskListService: TaskListService,
private apiService: AlfrescoApiService,
formRenderingService: FormRenderingService,
formService: FormService) {
@ -157,7 +166,43 @@ export class ActivitiDemoComponent implements AfterViewInit, OnDestroy, OnInit {
*/
}
onPrevPage(pagination: Pagination): void {
this.taskPagination.skipCount = pagination.skipCount;
this.taskPage--;
}
onNextPage(pagination: Pagination): void {
this.taskPagination.skipCount = pagination.skipCount;
this.taskPage++;
}
onChangePageSize(pagination: Pagination): void {
const { skipCount, maxItems } = pagination;
this.taskPage = this.currentPage(skipCount, maxItems);
this.taskPagination.maxItems = maxItems;
this.taskPagination.skipCount = skipCount;
}
onChangePageNumber(pagination: Pagination): void {
const { maxItems, skipCount } = pagination;
this.taskPage = this.currentPage(skipCount, maxItems);
this.taskPagination.maxItems = maxItems;
this.taskPagination.skipCount = skipCount;
}
currentPage(skipCount: number, maxItems: number): number {
return (skipCount && maxItems) ? Math.floor(skipCount / maxItems) : 0;
}
ngOnInit() {
this.taskListService.tasksList$.subscribe(
(tasks) => {
this.taskPagination = {count: tasks.data.length, maxItems: this.taskPagination.maxItems, skipCount: this.taskPagination.skipCount, totalItems: tasks.total};
console.log({count: tasks.data.length, maxItems: this.taskPagination.maxItems, skipCount: this.taskPagination.skipCount, totalItems: tasks.total});
}, (err) => {
console.log('err');
});
if (this.router.url.includes('processes') ) {
this.activeTab = 'processes';
}
@ -288,8 +333,14 @@ export class ActivitiDemoComponent implements AfterViewInit, OnDestroy, OnInit {
}
onFormCompleted(form): void {
this.taskList.reload();
this.currentTaskId = null;
this.taskPagination.totalItems--;
const { skipCount, maxItems, totalItems } = this.taskPagination;
if (totalItems > 0 && (skipCount >= totalItems)) {
this.taskPagination.skipCount -= maxItems;
}
this.taskPage = this.currentPage(this.taskPagination.skipCount, maxItems);
this.taskList.reload();
}
onFormContentClick(content: any): void {

5
ng2-components/ng2-activiti-tasklist/karma.conf.js
View File

@ -10,14 +10,9 @@ module.exports = function (config) {
'./node_modules/hammerjs/hammer.js',
{pattern: './node_modules/@angular/material/prebuilt-themes/indigo-pink.css', included: true, watched: false},
//diagrams
'./node_modules/chart.js/dist/Chart.js',
'./node_modules/alfresco-js-api/dist/alfresco-js-api.js',
'./node_modules/raphael/raphael.js',
'./node_modules/moment/min/moment.min.js',
{pattern: './node_modules/ng2-translate/**/*.js', included: false, watched: false},
{pattern: './node_modules/ng2-charts/**/*.js', included: false, served: true, watched: false},
{pattern: './node_modules/moment/**/*.js', included: false, served: true, watched: false},
{pattern: 'karma-test-shim.js', watched: false},

30
ng2-components/ng2-activiti-tasklist/src/assets/app-config.service.mock.ts Normal file
View File

@ -0,0 +1,30 @@
/*!
* @license
* Copyright 2016 Alfresco Software, Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { Injectable } from '@angular/core';
@Injectable()
export class AppConfigServiceMock {
constructor() { }
/** @override */
get(key: string) { }
load(resource: string, values?: {}) { }
}

2
ng2-components/ng2-activiti-tasklist/src/assets/tasklist-service.mock.ts
View File

@ -84,7 +84,7 @@ export let fakeTaskList = {
};
export let fakeTaskListDifferentProcessDefinitionKey = {
size: 1, total: 1, start: 0,
size: 2, total: 1, start: 0,
data: [
{
id: '1', name: 'FakeNameTask', description: null, category: null,

28
ng2-components/ng2-activiti-tasklist/src/assets/translation.service.mock.ts Normal file
View File

@ -0,0 +1,28 @@
/*!
* @license
* Copyright 2016 Alfresco Software, Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { Observable } from 'rxjs/Rx';
export class TranslationMock {
public get(key: string|Array<string>, interpolateParams?: Object): Observable<string|any> {
return Observable.of(key);
}
addTranslationFolder() {
}
}

9
ng2-components/ng2-activiti-tasklist/src/components/apps-list.component.spec.ts
View File

@ -18,9 +18,10 @@
import { DebugElement } from '@angular/core';
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { By } from '@angular/platform-browser';
import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core';
import { CoreModule, TranslationService } from 'ng2-alfresco-core';
import { Observable } from 'rxjs/Rx';
import { TranslationMock } from '../assets/translation.service.mock';
import { defaultApp, deployedApps, nonDeployedApps } from './../assets/apps-list.mock';
import { TaskListService } from './../services/tasklist.service';
import { AppsListComponent } from './apps-list.component';
@ -43,13 +44,11 @@ describe('AppsListComponent', () => {
AppsListComponent
],
providers: [
TaskListService
TaskListService,
{ provide: TranslationService, useClass: TranslationMock }
]
}).compileComponents();
let translateService = TestBed.get(AlfrescoTranslationService);
spyOn(translateService, 'addTranslationFolder').and.stub();
spyOn(translateService, 'get').and.callFake((key) => { return Observable.of(key); });
}));
beforeEach(() => {

15
ng2-components/ng2-activiti-tasklist/src/components/checklist.component.spec.ts
View File

@ -17,8 +17,9 @@
import { SimpleChange } from '@angular/core';
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core';
import { Observable } from 'rxjs/Rx';
import { AppConfigService, CoreModule, TranslationService } from 'ng2-alfresco-core';
import { AppConfigServiceMock } from '../assets/app-config.service.mock';
import { TranslationMock } from '../assets/translation.service.mock';
import { TaskDetailsModel } from '../models/task-details.model';
import { TaskListService } from '../services/tasklist.service';
import { ChecklistComponent } from './checklist.component';
@ -46,15 +47,11 @@ describe('ChecklistComponent', () => {
ChecklistComponent
],
providers: [
TaskListService
TaskListService,
{ provide: AppConfigService, useClass: AppConfigServiceMock },
{ provide: TranslationService, useClass: TranslationMock }
]
}).compileComponents().then(() => {
let translateService = TestBed.get(AlfrescoTranslationService);
spyOn(translateService, 'addTranslationFolder').and.stub();
spyOn(translateService.translate, 'get').and.callFake((key) => {
return Observable.of(key);
});
fixture = TestBed.createComponent(ChecklistComponent);
checklistComponent = fixture.componentInstance;
element = fixture.nativeElement;

8
ng2-components/ng2-activiti-tasklist/src/components/comment-list.component.spec.ts
View File

@ -17,8 +17,10 @@
import { DatePipe } from '@angular/common';
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { CoreModule } from 'ng2-alfresco-core';
import { AppConfigService, CoreModule, TranslationService } from 'ng2-alfresco-core';
import { DataRowEvent, DataTableModule, ObjectDataRow } from 'ng2-alfresco-datatable';
import { AppConfigServiceMock } from '../assets/app-config.service.mock';
import { TranslationMock } from '../assets/translation.service.mock';
import { Comment } from '../models/comment.model';
import { User } from '../models/user.model';
import { CommentListComponent } from './comment-list.component';
@ -51,7 +53,9 @@ describe('CommentListComponent', () => {
CommentListComponent
],
providers: [
DatePipe
DatePipe,
{ provide: AppConfigService, useClass: AppConfigServiceMock },
{ provide: TranslationService, useClass: TranslationMock }
]
}).compileComponents().then(() => {

11
ng2-components/ng2-activiti-tasklist/src/components/comments.component.spec.ts
View File

@ -20,7 +20,9 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { Observable } from 'rxjs/Rx';
import { ActivitiFormModule } from 'ng2-activiti-form';
import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core';
import { AppConfigService, CoreModule, TranslationService } from 'ng2-alfresco-core';
import { AppConfigServiceMock } from '../assets/app-config.service.mock';
import { TranslationMock } from '../assets/translation.service.mock';
import { DatePipe } from '@angular/common';
import { MdInputModule } from '@angular/material';
@ -54,13 +56,12 @@ describe('CommentsComponent', () => {
providers: [
TaskListService,
DatePipe,
PeopleService
PeopleService,
{ provide: TranslationService, useClass: TranslationMock },
{ provide: AppConfigService, useClass: AppConfigServiceMock }
]
}).compileComponents();
let translateService = TestBed.get(AlfrescoTranslationService);
spyOn(translateService, 'addTranslationFolder').and.stub();
spyOn(translateService, 'get').and.callFake((key) => { return Observable.of(key); });
}));
beforeEach(() => {

8
ng2-components/ng2-activiti-tasklist/src/components/create-task-attachment.component.spec.ts
View File

@ -20,8 +20,9 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { Observable } from 'rxjs/Rx';
import { ActivitiContentService } from 'ng2-activiti-form';
import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core';
import { AppConfigService, CoreModule, TranslationService } from 'ng2-alfresco-core';
import { AppConfigServiceMock } from '../assets/app-config.service.mock';
import { TranslationMock } from '../assets/translation.service.mock';
import { AttachmentComponent } from './create-task-attachment.component';
describe('Activiti Task Create Attachment', () => {
@ -41,7 +42,8 @@ describe('Activiti Task Create Attachment', () => {
AttachmentComponent
],
providers: [
{provide: AlfrescoTranslationService},
{ provide: AppConfigService, useClass: AppConfigServiceMock },
{ provide: TranslationService, useClass: TranslationMock },
ActivitiContentService
]
}).compileComponents();

15
ng2-components/ng2-activiti-tasklist/src/components/people-list.component.spec.ts
View File

@ -16,9 +16,10 @@
*/
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core';
import { AppConfigService, CoreModule, TranslationService } from 'ng2-alfresco-core';
import { DataRowActionEvent, DataRowEvent, DataTableModule, ObjectDataRow } from 'ng2-alfresco-datatable';
import { Observable } from 'rxjs/Observable';
import { AppConfigServiceMock } from '../assets/app-config.service.mock';
import { TranslationMock } from '../assets/translation.service.mock';
import { UserEventModel } from '../models/user-event.model';
import { User } from '../models/user.model';
import { PeopleListComponent } from './people-list.component';
@ -47,15 +48,13 @@ describe('PeopleListComponent', () => {
],
declarations: [
PeopleListComponent
],
providers: [
{ provide: AppConfigService, useClass: AppConfigServiceMock },
{ provide: TranslationService, useClass: TranslationMock }
]
}).compileComponents().then(() => {
let translateService = TestBed.get(AlfrescoTranslationService);
spyOn(translateService, 'addTranslationFolder').and.stub();
spyOn(translateService.translate, 'get').and.callFake((key) => {
return Observable.of(key);
});
fixture = TestBed.createComponent(PeopleListComponent);
peopleListComponent = fixture.componentInstance;
element = fixture.nativeElement;

12
ng2-components/ng2-activiti-tasklist/src/components/people-search.component.spec.ts
View File

@ -17,9 +17,11 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { MdButtonModule, MdInputModule } from '@angular/material';
import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core';
import { AppConfigService, CoreModule, TranslationService } from 'ng2-alfresco-core';
import { DataTableModule } from 'ng2-alfresco-datatable';
import { Observable } from 'rxjs/Observable';
import { AppConfigServiceMock } from '../assets/app-config.service.mock';
import { TranslationMock } from '../assets/translation.service.mock';
import { User } from '../models/user.model';
import { PeopleListComponent } from './people-list.component';
import { PeopleSearchComponent } from './people-search.component';
@ -60,13 +62,13 @@ describe('PeopleSearchComponent', () => {
declarations: [
PeopleSearchComponent,
PeopleListComponent
],
providers: [
{ provide: AppConfigService, useClass: AppConfigServiceMock },
{ provide: TranslationService, useClass: TranslationMock }
]
}).compileComponents().then(() => {
let translateService = TestBed.get(AlfrescoTranslationService);
spyOn(translateService, 'addTranslationFolder').and.stub();
spyOn(translateService.translate, 'get').and.callFake((key) => { return Observable.of(key); });
fixture = TestBed.createComponent(PeopleSearchComponent);
peopleSearchComponent = fixture.componentInstance;
element = fixture.nativeElement;

14
ng2-components/ng2-activiti-tasklist/src/components/people.component.spec.ts
View File

@ -18,9 +18,10 @@
import { NO_ERRORS_SCHEMA } from '@angular/core';
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { MdButtonModule, MdInputModule } from '@angular/material';
import { AlfrescoTranslationService, CoreModule, LogService } from 'ng2-alfresco-core';
import { AppConfigService, CoreModule, LogService, TranslationService } from 'ng2-alfresco-core';
import { DataTableModule } from 'ng2-alfresco-datatable';
import { Observable } from 'rxjs/Observable';
import { AppConfigServiceMock } from '../assets/app-config.service.mock';
import { TranslationMock } from '../assets/translation.service.mock';
import { User } from '../models/user.model';
import { PeopleService } from '../services/people.service';
import { PeopleListComponent } from './people-list.component';
@ -66,17 +67,14 @@ describe('PeopleComponent', () => {
PeopleComponent
],
providers: [
PeopleService
PeopleService,
{ provide: TranslationService, useClass: TranslationMock },
{ provide: AppConfigService, useClass: AppConfigServiceMock }
],
schemas: [ NO_ERRORS_SCHEMA ]
}).compileComponents().then(() => {
logService = TestBed.get(LogService);
let translateService = TestBed.get(AlfrescoTranslationService);
spyOn(translateService, 'addTranslationFolder').and.stub();
spyOn(translateService.translate, 'get').and.callFake((key) => { return Observable.of(key); });
fixture = TestBed.createComponent(PeopleComponent);
activitiPeopleComponent = fixture.componentInstance;
element = fixture.nativeElement;

11
ng2-components/ng2-activiti-tasklist/src/components/start-task.component.spec.ts
View File

@ -17,8 +17,10 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { MdButtonModule, MdDatepickerModule, MdGridListModule, MdIconModule, MdInputModule, MdNativeDateModule, MdSelectModule } from '@angular/material';
import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core';
import { AppConfigService, CoreModule, TranslationService } from 'ng2-alfresco-core';
import { Observable } from 'rxjs/Rx';
import { AppConfigServiceMock } from '../assets/app-config.service.mock';
import { TranslationMock } from '../assets/translation.service.mock';
import { StartTaskModel } from '../models/start-task.model';
import { PeopleService } from '../services/people.service';
import { TaskListService } from '../services/tasklist.service';
@ -65,12 +67,11 @@ describe('StartTaskComponent', () => {
],
providers: [
TaskListService,
PeopleService
PeopleService,
{ provide: AppConfigService, useClass: AppConfigServiceMock },
{ provide: TranslationService, useClass: TranslationMock }
]
}).compileComponents().then(() => {
let translateService = TestBed.get(AlfrescoTranslationService);
spyOn(translateService, 'addTranslationFolder').and.stub();
spyOn(translateService.translate, 'get').and.callFake((key) => { return Observable.of(key); });
fixture = TestBed.createComponent(StartTaskComponent);
component = fixture.componentInstance;

19
ng2-components/ng2-activiti-tasklist/src/components/task-attachment-list.component.spec.ts
View File

@ -19,11 +19,12 @@ import { CUSTOM_ELEMENTS_SCHEMA, SimpleChange } from '@angular/core';
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { MdProgressSpinnerModule } from '@angular/material';
import { By } from '@angular/platform-browser';
import { TranslateService } from '@ngx-translate/core';
import { ActivitiContentService } from 'ng2-activiti-form';
import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core';
import { AppConfigService, CoreModule, TranslationService } from 'ng2-alfresco-core';
import { DataTableModule } from 'ng2-alfresco-datatable';
import { Observable } from 'rxjs/Rx';
import { AppConfigServiceMock } from '../assets/app-config.service.mock';
import { TranslationMock } from '../assets/translation.service.mock';
import { TaskAttachmentListComponent } from './task-attachment-list.component';
declare let jasmine: any;
@ -50,21 +51,13 @@ describe('TaskAttachmentList', () => {
TaskAttachmentListComponent
],
providers: [
ActivitiContentService
ActivitiContentService,
{ provide: AppConfigService, useClass: AppConfigServiceMock },
{ provide: TranslationService, useClass: TranslationMock }
],
schemas: [CUSTOM_ELEMENTS_SCHEMA]
}).compileComponents();
let translateService: AlfrescoTranslationService = TestBed.get(AlfrescoTranslationService);
spyOn(translateService, 'addTranslationFolder').and.stub();
spyOn(translateService, 'get').and.callFake((key) => {
return Observable.of(key);
});
let nativeTranslateService: TranslateService = TestBed.get(TranslateService);
spyOn(nativeTranslateService, 'get').and.callFake((key) => {
return Observable.of(key);
});
}));
beforeEach(() => {

12
ng2-components/ng2-activiti-tasklist/src/components/task-details.component.spec.ts
View File

@ -22,8 +22,10 @@ import { By } from '@angular/platform-browser';
import { Observable } from 'rxjs/Rx';
import { ActivitiFormModule, FormModel, FormOutcomeEvent, FormOutcomeModel, FormService } from 'ng2-activiti-form';
import { AlfrescoTranslationService, CoreModule, LogService } from 'ng2-alfresco-core';
import { AppConfigService, CoreModule, LogService, TranslationService } from 'ng2-alfresco-core';
import { AppConfigServiceMock } from '../assets/app-config.service.mock';
import { TranslationMock } from '../assets/translation.service.mock';
import { TaskDetailsModel } from '../models/task-details.model';
import { User } from '../models/user.model';
import { noDataMock, taskDetailsMock, taskFormMock, tasksMock } from './../assets/task-details.mock';
@ -70,15 +72,15 @@ describe('TaskDetailsComponent', () => {
],
providers: [
TaskListService,
PeopleService
PeopleService,
{ provide: TranslationService, useClass: TranslationMock },
{ provide: AppConfigService, useClass: AppConfigServiceMock }
],
schemas: [ NO_ERRORS_SCHEMA ]
}).compileComponents();
logService = TestBed.get(LogService);
let translateService = TestBed.get(AlfrescoTranslationService);
spyOn(translateService, 'addTranslationFolder').and.stub();
spyOn(translateService.translate, 'get').and.callFake((key) => { return Observable.of(key); });
}));
beforeEach(() => {

2
ng2-components/ng2-activiti-tasklist/src/components/task-details.component.ts
View File

@ -288,7 +288,7 @@ export class TaskDetailsComponent implements OnInit, OnChanges {
onFormCompleted(form: FormModel): void {
this.formCompleted.emit(form);
if (this.showNextTask) {
if (this.showNextTask && (this.taskDetails.processInstanceId || this.taskDetails.processDefinitionId)) {
this.loadNextTask(this.taskDetails.processInstanceId, this.taskDetails.processDefinitionId);
}
}

240
ng2-components/ng2-activiti-tasklist/src/components/task-filters.component.spec.ts
View File

@ -16,18 +16,19 @@
*/
import { SimpleChange } from '@angular/core';
import { async } from '@angular/core/testing';
import { LogServiceMock } from 'ng2-alfresco-core';
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { AppConfigModule, AppConfigService, CoreModule, TranslationService } from 'ng2-alfresco-core';
import { Observable } from 'rxjs/Rx';
import { AppConfigServiceMock } from '../assets/app-config.service.mock';
import { TranslationMock } from '../assets/translation.service.mock';
import { FilterParamsModel, FilterRepresentationModel } from '../models/filter.model';
import { TaskListService } from '../services/tasklist.service';
import { TaskFiltersComponent } from './task-filters.component';
describe('TaskFiltersComponent', () => {
let filterList: TaskFiltersComponent;
let activitiService: TaskListService;
let logService: LogServiceMock;
let fakeGlobalFilter = [];
fakeGlobalFilter.push(new FilterRepresentationModel({
@ -63,29 +64,81 @@ describe('TaskFiltersComponent', () => {
reject(fakeErrorFilterList);
});
let component: TaskFiltersComponent;
let fixture: ComponentFixture<TaskFiltersComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
imports: [
CoreModule.forRoot(),
AppConfigModule.forRoot('app.config.json', {
bpmHost: 'http://localhost:9876/bpm'
})
],
declarations: [
TaskFiltersComponent
],
providers: [
TaskListService,
{ provide: TranslationService, useClass: TranslationMock },
{ provide: AppConfigService, useClass: AppConfigServiceMock }
]
}).compileComponents();
}));
beforeEach(() => {
logService = new LogServiceMock();
activitiService = new TaskListService(null, logService);
filterList = new TaskFiltersComponent(activitiService);
fixture = TestBed.createComponent(TaskFiltersComponent);
component = fixture.componentInstance;
activitiService = TestBed.get(TaskListService);
});
it('should emit an error with a bad response', (done) => {
spyOn(activitiService, 'getTaskListFilters').and.returnValue(Observable.fromPromise(fakeErrorFilterPromise));
const appId = '1';
let change = new SimpleChange(null, appId, true);
component.ngOnChanges({ 'appId': change });
component.onError.subscribe((err) => {
expect(err).toBeDefined();
done();
});
});
it('should emit an error with a bad response', (done) => {
spyOn(activitiService, 'getDeployedApplications').and.returnValue(Observable.fromPromise(fakeErrorFilterPromise));
const appId = 'fake-app';
let change = new SimpleChange(null, appId, true);
component.ngOnChanges({ 'appName': change });
component.onError.subscribe((err) => {
expect(err).toBeDefined();
done();
});
});
it('should return the filter task list', (done) => {
spyOn(activitiService, 'getTaskListFilters').and.returnValue(Observable.fromPromise(fakeGlobalFilterPromise));
const appId = '1';
let change = new SimpleChange(null, appId, true);
filterList.ngOnChanges({ 'appId': change });
component.ngOnChanges({ 'appId': change });
filterList.onSuccess.subscribe((res) => {
component.onSuccess.subscribe((res) => {
expect(res).toBeDefined();
expect(filterList.filters).toBeDefined();
expect(filterList.filters.length).toEqual(3);
expect(filterList.filters[0].name).toEqual('FakeInvolvedTasks');
expect(filterList.filters[1].name).toEqual('FakeMyTasks1');
expect(filterList.filters[2].name).toEqual('FakeMyTasks2');
expect(component.filters).toBeDefined();
expect(component.filters.length).toEqual(3);
expect(component.filters[0].name).toEqual('FakeInvolvedTasks');
expect(component.filters[1].name).toEqual('FakeMyTasks1');
expect(component.filters[2].name).toEqual('FakeMyTasks2');
done();
});
filterList.ngOnInit();
component.ngOnInit();
});
it('should return the filter task list, filtered By Name', (done) => {
@ -98,46 +151,16 @@ describe('TaskFiltersComponent', () => {
spyOn(activitiService, 'getTaskListFilters').and.returnValue(Observable.fromPromise(fakeGlobalFilterPromise));
let change = new SimpleChange(null, 'test', true);
filterList.ngOnChanges({ 'appName': change });
component.ngOnChanges({ 'appName': change });
filterList.onSuccess.subscribe((res) => {
component.onSuccess.subscribe((res) => {
let deployApp: any = activitiService.getDeployedApplications;
expect(deployApp.calls.count()).toEqual(1);
expect(res).toBeDefined();
done();
});
filterList.ngOnInit();
});
it('should emit an error with a bad response', (done) => {
spyOn(activitiService, 'getTaskListFilters').and.returnValue(Observable.fromPromise(fakeErrorFilterPromise));
const appId = '1';
let change = new SimpleChange(null, appId, true);
filterList.ngOnChanges({ 'appId': change });
filterList.onError.subscribe((err) => {
expect(err).toBeDefined();
done();
});
filterList.ngOnInit();
});
it('should emit an error with a bad response', (done) => {
spyOn(activitiService, 'getDeployedApplications').and.returnValue(Observable.fromPromise(fakeErrorFilterPromise));
const appId = 'fake-app';
let change = new SimpleChange(null, appId, true);
filterList.ngOnChanges({ 'appName': change });
filterList.onError.subscribe((err) => {
expect(err).toBeDefined();
done();
});
filterList.ngOnInit();
component.ngOnInit();
});
it('should select the first filter as default', (done) => {
@ -145,135 +168,139 @@ describe('TaskFiltersComponent', () => {
const appId = '1';
let change = new SimpleChange(null, appId, true);
filterList.ngOnChanges({ 'appId': change });
filterList.onSuccess.subscribe((res) => {
fixture.detectChanges();
component.ngOnChanges({ 'appId': change });
component.onSuccess.subscribe((res) => {
expect(res).toBeDefined();
expect(filterList.currentFilter).toBeDefined();
expect(filterList.currentFilter.name).toEqual('FakeInvolvedTasks');
expect(component.currentFilter).toBeDefined();
expect(component.currentFilter.name).toEqual('FakeInvolvedTasks');
done();
});
filterList.ngOnInit();
});
it('should select the task filter based on the input by name param', (done) => {
spyOn(activitiService, 'getTaskListFilters').and.returnValue(Observable.fromPromise(fakeGlobalFilterPromise));
filterList.filterParam = new FilterParamsModel({name: 'FakeMyTasks1'});
component.filterParam = new FilterParamsModel({name: 'FakeMyTasks1'});
const appId = '1';
let change = new SimpleChange(null, appId, true);
filterList.ngOnChanges({ 'appId': change });
filterList.onSuccess.subscribe((res) => {
fixture.detectChanges();
component.ngOnChanges({ 'appId': change });
component.onSuccess.subscribe((res) => {
expect(res).toBeDefined();
expect(filterList.currentFilter).toBeDefined();
expect(filterList.currentFilter.name).toEqual('FakeMyTasks1');
expect(component.currentFilter).toBeDefined();
expect(component.currentFilter.name).toEqual('FakeMyTasks1');
done();
});
filterList.ngOnInit();
});
it('should select the default task filter if filter input does not exist', (done) => {
spyOn(activitiService, 'getTaskListFilters').and.returnValue(Observable.fromPromise(fakeGlobalFilterPromise));
filterList.filterParam = new FilterParamsModel({name: 'UnexistableFilter'});
component.filterParam = new FilterParamsModel({name: 'UnexistableFilter'});
const appId = '1';
let change = new SimpleChange(null, appId, true);
filterList.ngOnChanges({ 'appId': change });
filterList.onSuccess.subscribe((res) => {
fixture.detectChanges();
component.ngOnChanges({ 'appId': change });
component.onSuccess.subscribe((res) => {
expect(res).toBeDefined();
expect(filterList.currentFilter).toBeDefined();
expect(filterList.currentFilter.name).toEqual('FakeInvolvedTasks');
expect(component.currentFilter).toBeDefined();
expect(component.currentFilter.name).toEqual('FakeInvolvedTasks');
done();
});
filterList.ngOnInit();
});
it('should select the task filter based on the input by index param', (done) => {
spyOn(activitiService, 'getTaskListFilters').and.returnValue(Observable.fromPromise(fakeGlobalFilterPromise));
filterList.filterParam = new FilterParamsModel({index: 2});
component.filterParam = new FilterParamsModel({index: 2});
const appId = '1';
let change = new SimpleChange(null, appId, true);
filterList.ngOnChanges({ 'appId': change });
filterList.onSuccess.subscribe((res) => {
fixture.detectChanges();
component.ngOnChanges({ 'appId': change });
component.onSuccess.subscribe((res) => {
expect(res).toBeDefined();
expect(filterList.currentFilter).toBeDefined();
expect(filterList.currentFilter.name).toEqual('FakeMyTasks2');
expect(component.currentFilter).toBeDefined();
expect(component.currentFilter.name).toEqual('FakeMyTasks2');
done();
});
filterList.ngOnInit();
});
it('should select the task filter based on the input by id param', (done) => {
spyOn(activitiService, 'getTaskListFilters').and.returnValue(Observable.fromPromise(fakeGlobalFilterPromise));
filterList.filterParam = new FilterParamsModel({id: 10});
component.filterParam = new FilterParamsModel({id: 10});
const appId = '1';
let change = new SimpleChange(null, appId, true);
filterList.ngOnChanges({ 'appId': change });
filterList.onSuccess.subscribe((res) => {
fixture.detectChanges();
component.ngOnChanges({ 'appId': change });
component.onSuccess.subscribe((res) => {
expect(res).toBeDefined();
expect(filterList.currentFilter).toBeDefined();
expect(filterList.currentFilter.name).toEqual('FakeInvolvedTasks');
expect(component.currentFilter).toBeDefined();
expect(component.currentFilter.name).toEqual('FakeInvolvedTasks');
done();
});
filterList.ngOnInit();
});
it('should emit an event when a filter is selected', (done) => {
let currentFilter = new FilterRepresentationModel({ filter: { state: 'open', assignment: 'fake-involved' } });
filterList.filterClick.subscribe((filter: FilterRepresentationModel) => {
component.filterClick.subscribe((filter: FilterRepresentationModel) => {
expect(filter).toBeDefined();
expect(filter).toEqual(currentFilter);
expect(filterList.currentFilter).toEqual(currentFilter);
expect(component.currentFilter).toEqual(currentFilter);
done();
});
filterList.selectFilter(currentFilter);
component.selectFilter(currentFilter);
});
it('should reload filters by appId on binding changes', () => {
spyOn(filterList, 'getFiltersByAppId').and.stub();
spyOn(component, 'getFiltersByAppId').and.stub();
const appId = '1';
let change = new SimpleChange(null, appId, true);
filterList.ngOnChanges({ 'appId': change });
component.ngOnChanges({ 'appId': change });
expect(filterList.getFiltersByAppId).toHaveBeenCalledWith(appId);
expect(component.getFiltersByAppId).toHaveBeenCalledWith(appId);
});
it('should reload filters by appId null on binding changes', () => {
spyOn(filterList, 'getFiltersByAppId').and.stub();
spyOn(component, 'getFiltersByAppId').and.stub();
const appId = null;
let change = new SimpleChange(null, appId, true);
filterList.ngOnChanges({ 'appId': change });
component.ngOnChanges({ 'appId': change });
expect(filterList.getFiltersByAppId).toHaveBeenCalledWith(appId);
expect(component.getFiltersByAppId).toHaveBeenCalledWith(appId);
});
it('should reload filters by app name on binding changes', () => {
spyOn(filterList, 'getFiltersByAppName').and.stub();
spyOn(component, 'getFiltersByAppName').and.stub();
const appName = 'fake-app-name';
let change = new SimpleChange(null, appName, true);
filterList.ngOnChanges({ 'appName': change });
component.ngOnChanges({ 'appName': change });
expect(filterList.getFiltersByAppName).toHaveBeenCalledWith(appName);
expect(component.getFiltersByAppName).toHaveBeenCalledWith(appName);
});
it('should return the current filter after one is selected', () => {
@ -281,27 +308,32 @@ describe('TaskFiltersComponent', () => {
name: 'FakeMyTasks',
filter: { state: 'open', assignment: 'fake-assignee' }
});
expect(filterList.currentFilter).toBeUndefined();
filterList.selectFilter(filter);
expect(filterList.getCurrentFilter()).toBe(filter);
expect(component.currentFilter).toBeUndefined();
component.selectFilter(filter);
expect(component.getCurrentFilter()).toBe(filter);
});
it('should load Default list when no appid or taskid are provided', () => {
spyOn(filterList, 'getFiltersByAppId').and.stub();
spyOn(component, 'getFiltersByAppId').and.stub();
let change = new SimpleChange(null, null, true);
filterList.ngOnChanges({ 'appName': change });
component.ngOnChanges({ 'appName': change });
expect(filterList.getFiltersByAppId).toHaveBeenCalled();
expect(component.getFiltersByAppId).toHaveBeenCalled();
});
it('should change the current filter if a filter with taskid is found', async(() => {
spyOn(activitiService, 'isTaskRelatedToFilter').and.returnValue(Observable.of(fakeFilter));
filterList.filters = fakeGlobalFilter;
filterList.selectFilterWithTask('111');
component.filters = fakeGlobalFilter;
component.selectFilterWithTask('111');
fixture.detectChanges();
fixture.whenStable().then(() => {
fixture.detectChanges();
expect(component.currentFilter.landingTaskId).toBeDefined();
expect(component.currentFilter.landingTaskId).toBe('111');
});
expect(filterList.currentFilter.landingTaskId).toBeDefined();
expect(filterList.currentFilter.landingTaskId).toBe('111');
}));
it('should not change the current filter if no filter with taskid is found', async(() => {
@ -309,11 +341,11 @@ describe('TaskFiltersComponent', () => {
name: 'FakeMyTasks',
filter: { state: 'open', assignment: 'fake-assignee' }
});
filterList.filters = fakeGlobalFilter;
filterList.currentFilter = filter;
component.filters = fakeGlobalFilter;
component.currentFilter = filter;
spyOn(activitiService, 'isTaskRelatedToFilter').and.returnValue(Observable.of(null));
filterList.selectFilterWithTask('111');
component.selectFilterWithTask('111');
expect(filterList.currentFilter).toBe(filter);
expect(component.currentFilter).toBe(filter);
}));
});

3
ng2-components/ng2-activiti-tasklist/src/components/task-filters.component.ts
View File

@ -23,8 +23,7 @@ import { TaskListService } from './../services/tasklist.service';
@Component({
selector: 'adf-filters, activiti-filters',
templateUrl: './task-filters.component.html',
styleUrls: ['task-filters.component.scss'],
providers: [TaskListService]
styleUrls: ['task-filters.component.scss']
})
export class TaskFiltersComponent implements OnInit, OnChanges {

12
ng2-components/ng2-activiti-tasklist/src/components/task-header.component.spec.ts
View File

@ -18,8 +18,9 @@
import { DebugElement } from '@angular/core';
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { By } from '@angular/platform-browser';
import { AlfrescoTranslationService, CardViewUpdateService, CoreModule } from 'ng2-alfresco-core';
import { Observable } from 'rxjs/Rx';
import { AppConfigService, CardViewUpdateService, CoreModule, TranslationService } from 'ng2-alfresco-core';
import { AppConfigServiceMock } from '../assets/app-config.service.mock';
import { TranslationMock } from '../assets/translation.service.mock';
import { TaskDetailsModel } from '../models/task-details.model';
import { taskDetailsMock } from './../assets/task-details.mock';
@ -44,13 +45,12 @@ describe('TaskHeaderComponent', () => {
],
providers: [
TaskListService,
CardViewUpdateService
CardViewUpdateService,
{ provide: AppConfigService, useClass: AppConfigServiceMock },
{ provide: TranslationService, useClass: TranslationMock }
]
}).compileComponents();
let translateService = TestBed.get(AlfrescoTranslationService);
spyOn(translateService, 'addTranslationFolder').and.stub();
spyOn(translateService.translate, 'get').and.callFake((key) => { return Observable.of(key); });
}));
beforeEach(() => {

141
ng2-components/ng2-activiti-tasklist/src/components/tasklist.component.spec.ts
View File

@ -18,16 +18,23 @@
import { SimpleChange } from '@angular/core';
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { MdProgressSpinnerModule } from '@angular/material';
import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core';
import { AppConfigModule, AppConfigService, CoreModule, TranslationService } from 'ng2-alfresco-core';
import { DataTableModule } from 'ng2-alfresco-datatable';
import { DataRowEvent, ObjectDataRow, ObjectDataTableAdapter } from 'ng2-alfresco-datatable';
import { Observable } from 'rxjs/Rx';
import { AppConfigServiceMock } from '../assets/app-config.service.mock';
import { TranslationMock } from '../assets/translation.service.mock';
import { TaskListService } from '../services/tasklist.service';
import { TaskListComponent } from './tasklist.component';
declare let jasmine: any;
describe('TaskListComponent', () => {
let fakeGlobalTask = [
let fakeGlobalTask = {
size: 2,
start: 0,
total: 2,
data: [
{
id: 14, name: 'nameFake1',
description: 'descriptionFake1',
@ -71,11 +78,7 @@ describe('TaskListComponent', () => {
dueDate: '2017-04-02T12:25:17.189+0000',
endDate: null
}
];
let fakeGlobalTotalTasks = {
size: 2, total: 2, start: 0,
data: []
]
};
let fakeErrorTaskList = {
@ -91,6 +94,9 @@ describe('TaskListComponent', () => {
TestBed.configureTestingModule({
imports: [
CoreModule.forRoot(),
AppConfigModule.forRoot('app.config.json', {
bpmHost: 'http://localhost:9876/bpm'
}),
DataTableModule,
MdProgressSpinnerModule
],
@ -98,13 +104,12 @@ describe('TaskListComponent', () => {
TaskListComponent
],
providers: [
TaskListService
TaskListService,
{provide: TranslationService, useClass: TranslationMock},
{provide: AppConfigService, useClass: AppConfigServiceMock}
]
}).compileComponents();
let translateService = TestBed.get(AlfrescoTranslationService);
spyOn(translateService, 'addTranslationFolder').and.stub();
spyOn(translateService, 'get').and.callFake((key) => { return Observable.of(key); });
}));
beforeEach(() => {
@ -121,6 +126,14 @@ describe('TaskListComponent', () => {
window['componentHandler'] = componentHandler;
});
beforeEach(() => {
jasmine.Ajax.install();
});
afterEach(() => {
jasmine.Ajax.uninstall();
});
it('should use the default schemaColumn as default', () => {
component.ngAfterContentInit();
expect(component.data.getColumns()).toBeDefined();
@ -147,9 +160,6 @@ describe('TaskListComponent', () => {
});
it('should return the filtered task list when the input parameters are passed', (done) => {
spyOn(taskListService, 'getTotalTasks').and.returnValue(Observable.of(fakeGlobalTotalTasks));
spyOn(taskListService, 'getTasks').and.returnValue(Observable.of(fakeGlobalTask));
let state = new SimpleChange(null, 'open', true);
let processDefinitionKey = new SimpleChange(null, null, true);
let assignment = new SimpleChange(null, 'fake-assignee', true);
@ -185,12 +195,15 @@ describe('TaskListComponent', () => {
component.ngAfterContentInit();
component.ngOnChanges({'state': state, 'processDefinitionKey': processDefinitionKey, 'assignment': assignment});
fixture.detectChanges();
jasmine.Ajax.requests.mostRecent().respondWith({
'status': 200,
contentType: 'application/json',
responseText: JSON.stringify(fakeGlobalTask)
});
});
it('should return the filtered task list by processDefinitionKey', (done) => {
spyOn(taskListService, 'getTotalTasks').and.returnValue(Observable.of(fakeGlobalTotalTasks));
spyOn(taskListService, 'getTasks').and.returnValue(Observable.of(fakeGlobalTask));
let state = new SimpleChange(null, 'open', true);
let processDefinitionKey = new SimpleChange(null, 'fakeprocess', true);
let assignment = new SimpleChange(null, 'fake-assignee', true);
@ -207,12 +220,15 @@ describe('TaskListComponent', () => {
component.ngAfterContentInit();
component.ngOnChanges({'state': state, 'processDefinitionKey': processDefinitionKey, 'assignment': assignment});
fixture.detectChanges();
jasmine.Ajax.requests.mostRecent().respondWith({
'status': 200,
contentType: 'application/json',
responseText: JSON.stringify(fakeGlobalTask)
});
});
it('should return the filtered task list by processInstanceId', (done) => {
spyOn(taskListService, 'getTotalTasks').and.returnValue(Observable.of(fakeGlobalTotalTasks));
spyOn(taskListService, 'getTasks').and.returnValue(Observable.of(fakeGlobalTask));
let state = new SimpleChange(null, 'open', true);
let processInstanceId = new SimpleChange(null, 'fakeprocessId', true);
let assignment = new SimpleChange(null, 'fake-assignee', true);
@ -230,12 +246,15 @@ describe('TaskListComponent', () => {
component.ngAfterContentInit();
component.ngOnChanges({'state': state, 'processInstanceId': processInstanceId, 'assignment': assignment});
fixture.detectChanges();
jasmine.Ajax.requests.mostRecent().respondWith({
'status': 200,
contentType: 'application/json',
responseText: JSON.stringify(fakeGlobalTask)
});
});
it('should return the filtered task list for all state', (done) => {
spyOn(taskListService, 'getTotalTasks').and.returnValue(Observable.of(fakeGlobalTotalTasks));
spyOn(taskListService, 'getTasks').and.returnValue(Observable.of(fakeGlobalTask));
let state = new SimpleChange(null, 'all', true);
let processInstanceId = new SimpleChange(null, 'fakeprocessId', true);
@ -255,6 +274,12 @@ describe('TaskListComponent', () => {
component.ngAfterContentInit();
component.ngOnChanges({'state': state, 'processInstanceId': processInstanceId});
fixture.detectChanges();
jasmine.Ajax.requests.mostRecent().respondWith({
'status': 200,
contentType: 'application/json',
responseText: JSON.stringify(fakeGlobalTask)
});
});
it('should return a currentId null when the taskList is empty', () => {
@ -263,8 +288,6 @@ describe('TaskListComponent', () => {
});
it('should throw an exception when the response is wrong', (done) => {
spyOn(taskListService, 'getTotalTasks').and.returnValue(Observable.throw(fakeErrorTaskList));
let state = new SimpleChange(null, 'open', true);
let assignment = new SimpleChange(null, 'fake-assignee', true);
@ -275,13 +298,17 @@ describe('TaskListComponent', () => {
});
component.ngAfterContentInit();
component.ngOnChanges({'state': state, 'assignment': assignment});
fixture.detectChanges();
component.ngOnChanges({'state': state, 'assignment': assignment});
jasmine.Ajax.requests.mostRecent().respondWith({
'status': 404,
contentType: 'application/json',
responseText: JSON.stringify(fakeErrorTaskList)
});
});
it('should reload tasks when reload() is called', (done) => {
spyOn(taskListService, 'getTotalTasks').and.returnValue(Observable.of(fakeGlobalTotalTasks));
spyOn(taskListService, 'getTasks').and.returnValue(Observable.of(fakeGlobalTask));
component.state = 'open';
component.assignment = 'fake-assignee';
component.ngAfterContentInit();
@ -293,7 +320,14 @@ describe('TaskListComponent', () => {
expect(component.data.getRows()[0].getValue('name')).toEqual('nameFake1');
done();
});
fixture.detectChanges();
component.reload();
jasmine.Ajax.requests.mostRecent().respondWith({
'status': 200,
contentType: 'application/json',
responseText: JSON.stringify(fakeGlobalTask)
});
});
it('should emit row click event', (done) => {
@ -314,15 +348,14 @@ describe('TaskListComponent', () => {
describe('component changes', () => {
beforeEach(() => {
spyOn(taskListService, 'getTotalTasks').and.returnValue(Observable.of(fakeGlobalTotalTasks));
spyOn(taskListService, 'getTasks').and.returnValue(Observable.of(fakeGlobalTask));
component.data = new ObjectDataTableAdapter(
[],
[
{type: 'text', key: 'fake-id', title: 'Name'}
]
);
fixture.detectChanges();
});
it('should NOT reload the tasks if the loadingTaskId is the same of the current task', () => {
@ -341,7 +374,6 @@ describe('TaskListComponent', () => {
const landingTaskId = '999';
let change = new SimpleChange(null, landingTaskId, true);
component.ngOnChanges({'landingTaskId': change});
expect(component.reload).not.toHaveBeenCalled();
expect(component.data.getRows().length).toEqual(1);
@ -371,6 +403,12 @@ describe('TaskListComponent', () => {
});
component.ngOnChanges({'landingTaskId': change});
jasmine.Ajax.requests.mostRecent().respondWith({
'status': 200,
contentType: 'application/json',
responseText: JSON.stringify(fakeGlobalTask)
});
});
it('should NOT reload the process list when no parameters changed', () => {
@ -391,8 +429,13 @@ describe('TaskListComponent', () => {
expect(component.data.getRows()[1].getValue('name')).toEqual('No name');
done();
});
component.ngOnChanges({'appId': change});
jasmine.Ajax.requests.mostRecent().respondWith({
'status': 200,
contentType: 'application/json',
responseText: JSON.stringify(fakeGlobalTask)
});
});
it('should reload the list when the processDefinitionKey parameter changes', (done) => {
@ -409,6 +452,12 @@ describe('TaskListComponent', () => {
});
component.ngOnChanges({'processDefinitionKey': change});
jasmine.Ajax.requests.mostRecent().respondWith({
'status': 200,
contentType: 'application/json',
responseText: JSON.stringify(fakeGlobalTask)
});
});
it('should reload the list when the state parameter changes', (done) => {
@ -425,6 +474,12 @@ describe('TaskListComponent', () => {
});
component.ngOnChanges({'state': change});
jasmine.Ajax.requests.mostRecent().respondWith({
'status': 200,
contentType: 'application/json',
responseText: JSON.stringify(fakeGlobalTask)
});
});
it('should reload the list when the sort parameter changes', (done) => {
@ -441,6 +496,12 @@ describe('TaskListComponent', () => {
});
component.ngOnChanges({'sort': change});
jasmine.Ajax.requests.mostRecent().respondWith({
'status': 200,
contentType: 'application/json',
responseText: JSON.stringify(fakeGlobalTask)
});
});
it('should reload the process list when the name parameter changes', (done) => {
@ -457,6 +518,12 @@ describe('TaskListComponent', () => {
});
component.ngOnChanges({'name': change});
jasmine.Ajax.requests.mostRecent().respondWith({
'status': 200,
contentType: 'application/json',
responseText: JSON.stringify(fakeGlobalTask)
});
});
it('should reload the list when the assignment parameter changes', (done) => {
@ -473,6 +540,12 @@ describe('TaskListComponent', () => {
});
component.ngOnChanges({'assignment': change});
jasmine.Ajax.requests.mostRecent().respondWith({
'status': 200,
contentType: 'application/json',
responseText: JSON.stringify(fakeGlobalTask)
});
});
});
});

80
ng2-components/ng2-activiti-tasklist/src/components/tasklist.component.ts
View File

@ -15,20 +15,21 @@
* limitations under the License.
*/
import { AfterContentInit, Component, ContentChild, EventEmitter, Input, OnChanges, Output, SimpleChanges } from '@angular/core';
import { AfterContentInit, Component, ContentChild, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges } from '@angular/core';
import { DataColumnListComponent } from 'ng2-alfresco-core';
import { DataColumn, DataRowEvent, DataTableAdapter, ObjectDataRow, ObjectDataTableAdapter } from 'ng2-alfresco-datatable';
import { Observable } from 'rxjs/Rx';
import { TaskQueryRequestRepresentationModel } from '../models/filter.model';
import { TaskDetailsModel } from '../models/task-details.model';
import { TaskListModel } from '../models/task-list.model';
import { TaskListService } from './../services/tasklist.service';
const DEFAULT_SIZE = 5;
@Component({
selector: 'adf-tasklist, activiti-tasklist',
templateUrl: './tasklist.component.html',
styleUrls: ['./tasklist.component.css']
})
export class TaskListComponent implements OnChanges, AfterContentInit {
export class TaskListComponent implements OnChanges, OnInit, AfterContentInit {
requestNode: TaskQueryRequestRepresentationModel;
@ -72,6 +73,12 @@ export class TaskListComponent implements OnChanges, AfterContentInit {
currentInstanceId: string;
@Input()
page: number = 0;
@Input()
size: number = DEFAULT_SIZE;
isLoading: boolean = true;
/**
@ -92,6 +99,23 @@ export class TaskListComponent implements OnChanges, AfterContentInit {
constructor(private taskListService: TaskListService) {
}
ngOnInit() {
if (this.data === undefined) {
this.data = new ObjectDataTableAdapter();
}
this.taskListService.tasksList$.subscribe(
(tasks) => {
let instancesRow = this.createDataRow(tasks.data);
this.renderInstances(instancesRow);
this.selectTask(this.landingTaskId);
this.onSuccess.emit(tasks);
this.isLoading = false;
}, (error) => {
this.onError.emit(error);
this.isLoading = false;
});
}
ngAfterContentInit() {
this.setupSchema();
}
@ -132,32 +156,11 @@ export class TaskListComponent implements OnChanges, AfterContentInit {
}
private isPropertyChanged(changes: SimpleChanges): boolean {
let changed: boolean = false;
let changed: boolean = true;
let appId = changes['appId'];
let processInstanceId = changes['processInstanceId'];
let processDefinitionKey = changes['processDefinitionKey'];
let state = changes['state'];
let sort = changes['sort'];
let name = changes['name'];
let assignment = changes['assignment'];
let landingTaskId = changes['landingTaskId'];
if (appId && appId.currentValue) {
changed = true;
} else if (processInstanceId && processInstanceId.currentValue) {
changed = true;
} else if (processDefinitionKey && processDefinitionKey.currentValue) {
changed = true;
} else if (state && state.currentValue) {
changed = true;
} else if (sort && sort.currentValue) {
changed = true;
} else if (name && name.currentValue) {
changed = true;
} else if (assignment && assignment.currentValue) {
changed = true;
} else if (landingTaskId && landingTaskId.currentValue && !this.isEqualToCurrentId(landingTaskId.currentValue)) {
changed = true;
if (landingTaskId && landingTaskId.currentValue && this.isEqualToCurrentId(landingTaskId.currentValue)) {
changed = false;
}
return changed;
}
@ -171,24 +174,15 @@ export class TaskListComponent implements OnChanges, AfterContentInit {
private load(requestNode: TaskQueryRequestRepresentationModel) {
this.isLoading = true;
this.loadTasksByState().subscribe(
(response) => {
let instancesRow = this.createDataRow(response);
this.renderInstances(instancesRow);
this.selectTask(requestNode.landingTaskId);
this.onSuccess.emit(response);
this.isLoading = false;
}, (error) => {
this.onError.emit(error);
this.isLoading = false;
});
this.loadTasksByState().subscribe();
}
private loadTasksByState(): Observable<TaskDetailsModel[]> {
private loadTasksByState(): Observable<TaskListModel> {
return this.requestNode.state === 'all'
? this.taskListService.findAllTasksWhitoutState(this.requestNode)
: this.taskListService.findAllTaskByState(this.requestNode);
: this.taskListService.findTasksByState(this.requestNode);
}
/**
* Create an array of ObjectDataRow
* @param instances
@ -281,6 +275,7 @@ export class TaskListComponent implements OnChanges, AfterContentInit {
}
private createRequestNode() {
let requestNode = {
appDefinitionId: this.appId,
processInstanceId: this.processInstanceId,
@ -289,7 +284,10 @@ export class TaskListComponent implements OnChanges, AfterContentInit {
assignment: this.assignment,
state: this.state,
sort: this.sort,
landingTaskId: this.landingTaskId
landingTaskId: this.landingTaskId,
page: this.page,
size: this.size,
start: 0
};
return new TaskQueryRequestRepresentationModel(requestNode);
}

2
ng2-components/ng2-activiti-tasklist/src/models/filter.model.ts
View File

@ -143,6 +143,7 @@ export class TaskQueryRequestRepresentationModel {
text: string;
assignment: string;
state: string;
start: string;
sort: string;
page: number;
size: number;
@ -157,6 +158,7 @@ export class TaskQueryRequestRepresentationModel {
this.text = obj.text || null;
this.assignment = obj.assignment || null;
this.state = obj.state || null;
this.start = obj.start || null;
this.sort = obj.sort || null;
this.page = obj.page || 0;
this.size = obj.size || 25;

27
ng2-components/ng2-activiti-tasklist/src/models/task-list.model.ts Normal file
View File

@ -0,0 +1,27 @@
/*!
* @license
* Copyright 2016 Alfresco Software, Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { TaskDetailsModel } from './task-details.model';
export interface TaskListModel {
size: number;
total: number;
start: number;
length: number;
data: TaskDetailsModel [];
}

6
ng2-components/ng2-activiti-tasklist/src/services/people.service.spec.ts
View File

@ -16,7 +16,8 @@
*/
import { TestBed } from '@angular/core/testing';
import { CoreModule } from 'ng2-alfresco-core';
import { AppConfigService, CoreModule } from 'ng2-alfresco-core';
import { AppConfigServiceMock } from '../assets/app-config.service.mock';
import { User } from '../models/user.model';
import { PeopleService } from './people.service';
@ -48,7 +49,8 @@ describe('PeopleService', () => {
CoreModule.forRoot()
],
providers: [
PeopleService
PeopleService,
{ provide: AppConfigService, useClass: AppConfigServiceMock }
]
});
service = TestBed.get(PeopleService);

115
ng2-components/ng2-activiti-tasklist/src/services/tasklist.service.spec.ts
View File

@ -16,8 +16,9 @@
*/
import { async, TestBed } from '@angular/core/testing';
import { CoreModule } from 'ng2-alfresco-core';
import { AppConfigService, CoreModule, TranslationService } from 'ng2-alfresco-core';
import { Observable } from 'rxjs/Rx';
import { AppConfigServiceMock } from '../assets/app-config.service.mock';
import {
fakeAppFilter,
fakeAppPromise,
@ -38,6 +39,7 @@ import {
fakeUser2,
secondFakeTaskList
} from '../assets/tasklist-service.mock';
import { TranslationMock } from '../assets/translation.service.mock';
import { Comment } from '../models/comment.model';
import { FilterRepresentationModel, TaskQueryRequestRepresentationModel } from '../models/filter.model';
import { TaskDetailsModel } from '../models/task-details.model';
@ -56,7 +58,9 @@ describe('Activiti TaskList Service', () => {
CoreModule.forRoot()
],
providers: [
TaskListService
TaskListService,
{ provide: AppConfigService, useClass: AppConfigServiceMock },
{ provide: TranslationService, useClass: TranslationMock }
]
}).compileComponents();
}));
@ -167,11 +171,14 @@ describe('Activiti TaskList Service', () => {
service.getTasks(<TaskQueryRequestRepresentationModel> fakeFilter).subscribe(
res => {
expect(res).toBeDefined();
expect(res.length).toEqual(1);
expect(res[0].name).toEqual('FakeNameTask');
expect(res[0].assignee.email).toEqual('fake-email@dom.com');
expect(res[0].assignee.firstName).toEqual('firstName');
expect(res[0].assignee.lastName).toEqual('lastName');
expect(res.size).toEqual(1);
expect(res.start).toEqual(0);
expect(res.data).toBeDefined();
expect(res.data.length).toEqual(1);
expect(res.data[0].name).toEqual('FakeNameTask');
expect(res.data[0].assignee.email).toEqual('fake-email@dom.com');
expect(res.data[0].assignee.firstName).toEqual('firstName');
expect(res.data[0].assignee.lastName).toEqual('lastName');
done();
}
);
@ -187,12 +194,15 @@ describe('Activiti TaskList Service', () => {
service.getTasks(<TaskQueryRequestRepresentationModel> fakeFilterWithProcessDefinitionKey).subscribe(
res => {
expect(res).toBeDefined();
expect(res.length).toEqual(1);
expect(res[0].name).toEqual('FakeNameTask');
expect(res[0].assignee.email).toEqual('fake-email@dom.com');
expect(res[0].assignee.firstName).toEqual('firstName');
expect(res[0].assignee.lastName).toEqual('lastName');
expect(res[0].processDefinitionKey).toEqual('1');
expect(res.size).toEqual(2);
expect(res.start).toEqual(0);
expect(res.data).toBeDefined();
expect(res.data.length).toEqual(2);
expect(res.data[0].name).toEqual('FakeNameTask');
expect(res.data[0].assignee.email).toEqual('fake-email@dom.com');
expect(res.data[0].assignee.firstName).toEqual('firstName');
expect(res.data[0].assignee.lastName).toEqual('lastName');
expect(res.data[0].processDefinitionKey).toEqual('1');
done();
}
);
@ -221,34 +231,41 @@ describe('Activiti TaskList Service', () => {
});
it('should return the task list with all tasks filtered by state', (done) => {
spyOn(service, 'getTasks').and.returnValue(Observable.of(fakeTaskList.data));
spyOn(service, 'getTasks').and.returnValue(Observable.of(fakeTaskList));
spyOn(service, 'getTotalTasks').and.returnValue(Observable.of(fakeTaskList));
service.findAllTaskByState(<TaskQueryRequestRepresentationModel> fakeFilter, 'open').subscribe(
res => {
expect(res).toBeDefined();
expect(res.length).toEqual(1);
expect(res[0].name).toEqual('FakeNameTask');
expect(res[0].assignee.email).toEqual('fake-email@dom.com');
expect(res[0].assignee.firstName).toEqual('firstName');
expect(res[0].assignee.lastName).toEqual('lastName');
expect(res.size).toEqual(1);
expect(res.start).toEqual(0);
expect(res.data).toBeDefined();
expect(res.data.length).toEqual(1);
expect(res.data[0].name).toEqual('FakeNameTask');
expect(res.data[0].assignee.email).toEqual('fake-email@dom.com');
expect(res.data[0].assignee.firstName).toEqual('firstName');
expect(res.data[0].assignee.lastName).toEqual('lastName');
done();
}
);
});
it('should return the task list with all tasks filtered', (done) => {
spyOn(service, 'getTasks').and.returnValue(Observable.of(fakeTaskList.data));
spyOn(service, 'getTasks').and.returnValue(Observable.of(fakeTaskList));
spyOn(service, 'getTotalTasks').and.returnValue(Observable.of(fakeTaskList));
service.findAllTaskByState(<TaskQueryRequestRepresentationModel> fakeFilter).subscribe(
res => {
expect(res).toBeDefined();
expect(res.length).toEqual(1);
expect(res[0].name).toEqual('FakeNameTask');
expect(res[0].assignee.email).toEqual('fake-email@dom.com');
expect(res[0].assignee.firstName).toEqual('firstName');
expect(res[0].assignee.lastName).toEqual('lastName');
expect(res.size).toEqual(1);
expect(res.start).toEqual(0);
expect(res.data).toBeDefined();
expect(res.data.length).toEqual(1);
expect(res.data[0].name).toEqual('FakeNameTask');
expect(res.data[0].assignee.email).toEqual('fake-email@dom.com');
expect(res.data[0].assignee.firstName).toEqual('firstName');
expect(res.data[0].assignee.lastName).toEqual('lastName');
done();
}
);
@ -258,11 +275,14 @@ describe('Activiti TaskList Service', () => {
service.findTasksByState(<TaskQueryRequestRepresentationModel> fakeFilter, 'open').subscribe(
res => {
expect(res).toBeDefined();
expect(res.length).toEqual(1);
expect(res[0].name).toEqual('FakeNameTask');
expect(res[0].assignee.email).toEqual('fake-email@dom.com');
expect(res[0].assignee.firstName).toEqual('firstName');
expect(res[0].assignee.lastName).toEqual('lastName');
expect(res.size).toEqual(1);
expect(res.start).toEqual(0);
expect(res.data).toBeDefined();
expect(res.data.length).toEqual(1);
expect(res.data[0].name).toEqual('FakeNameTask');
expect(res.data[0].assignee.email).toEqual('fake-email@dom.com');
expect(res.data[0].assignee.firstName).toEqual('firstName');
expect(res.data[0].assignee.lastName).toEqual('lastName');
done();
}
);
@ -277,12 +297,14 @@ describe('Activiti TaskList Service', () => {
it('should return the task list filtered', (done) => {
service.findTasksByState(<TaskQueryRequestRepresentationModel> fakeFilter).subscribe(
res => {
expect(res).toBeDefined();
expect(res.length).toEqual(1);
expect(res[0].name).toEqual('FakeNameTask');
expect(res[0].assignee.email).toEqual('fake-email@dom.com');
expect(res[0].assignee.firstName).toEqual('firstName');
expect(res[0].assignee.lastName).toEqual('lastName');
expect(res.size).toEqual(1);
expect(res.start).toEqual(0);
expect(res.data).toBeDefined();
expect(res.data.length).toEqual(1);
expect(res.data[0].name).toEqual('FakeNameTask');
expect(res.data[0].assignee.email).toEqual('fake-email@dom.com');
expect(res.data[0].assignee.firstName).toEqual('firstName');
expect(res.data[0].assignee.lastName).toEqual('lastName');
done();
}
);
@ -295,22 +317,23 @@ describe('Activiti TaskList Service', () => {
});
it('should return the task list with all tasks filtered without state', (done) => {
spyOn(service, 'getTasks').and.returnValue(Observable.of(fakeTaskList.data));
spyOn(service, 'getTasks').and.returnValue(Observable.of(fakeTaskList));
spyOn(service, 'getTotalTasks').and.returnValue(Observable.of(fakeTaskList));
service.findAllTasksWhitoutState(<TaskQueryRequestRepresentationModel> fakeFilter).subscribe(
res => {
expect(res).toBeDefined();
expect(res.length).toEqual(2);
expect(res[0].name).toEqual('FakeNameTask');
expect(res[0].assignee.email).toEqual('fake-email@dom.com');
expect(res[0].assignee.firstName).toEqual('firstName');
expect(res[0].assignee.lastName).toEqual('lastName');
expect(res.data).toBeDefined();
expect(res.data.length).toEqual(2);
expect(res.data[0].name).toEqual('FakeNameTask');
expect(res.data[0].assignee.email).toEqual('fake-email@dom.com');
expect(res.data[0].assignee.firstName).toEqual('firstName');
expect(res.data[0].assignee.lastName).toEqual('lastName');
expect(res[1].name).toEqual('FakeNameTask');
expect(res[1].assignee.email).toEqual('fake-email@dom.com');
expect(res[1].assignee.firstName).toEqual('firstName');
expect(res[1].assignee.lastName).toEqual('lastName');
expect(res.data[1].name).toEqual('FakeNameTask');
expect(res.data[1].assignee.email).toEqual('fake-email@dom.com');
expect(res.data[1].assignee.firstName).toEqual('firstName');
expect(res.data[1].assignee.lastName).toEqual('lastName');
done();
}
);

36
ng2-components/ng2-activiti-tasklist/src/services/tasklist.service.ts
View File

@ -17,7 +17,7 @@
import { Injectable } from '@angular/core';
import { AlfrescoApiService, LogService } from 'ng2-alfresco-core';
import { Observable } from 'rxjs/Rx';
import { Observable, Subject } from 'rxjs/Rx';
import { Comment } from '../models/comment.model';
import {
FilterRepresentationModel,
@ -25,10 +25,14 @@ import {
} from '../models/filter.model';
import { Form } from '../models/form.model';
import { TaskDetailsModel } from '../models/task-details.model';
import { TaskListModel } from '../models/task-list.model';
import { User } from '../models/user.model';
@Injectable()
export class TaskListService {
private tasksListSubject = new Subject<TaskListModel>();
public tasksList$: Observable<TaskListModel> = this.tasksListSubject.asObservable();
constructor(private apiService: AlfrescoApiService,
private logService: LogService) {
@ -149,15 +153,12 @@ export class TaskListService {
* @param filter - TaskFilterRepresentationModel
* @returns {any}
*/
getTasks(requestNode: TaskQueryRequestRepresentationModel): Observable<TaskDetailsModel[]> {
getTasks(requestNode: TaskQueryRequestRepresentationModel): Observable<TaskListModel> {
return Observable.fromPromise(this.callApiTasksFiltered(requestNode))
.map((res: any) => {
if (requestNode.processDefinitionKey) {
return res.data.filter(p => p.processDefinitionKey === requestNode.processDefinitionKey);
} else {
return res.data;
}
}).catch(err => this.handleError(err));
this.tasksListSubject.next(res);
return res;
}).catch(err => this.handleTasksError(err));
}
/**
@ -165,7 +166,7 @@ export class TaskListService {
* @param filter - TaskFilterRepresentationModel
* @returns {any}
*/
findTasksByState(requestNode: TaskQueryRequestRepresentationModel, state?: string): Observable<TaskDetailsModel[]> {
findTasksByState(requestNode: TaskQueryRequestRepresentationModel, state?: string): Observable<TaskListModel> {
if (state) {
requestNode.state = state;
}
@ -177,7 +178,7 @@ export class TaskListService {
* @param filter - TaskFilterRepresentationModel
* @returns {any}
*/
findAllTaskByState(requestNode: TaskQueryRequestRepresentationModel, state?: string): Observable<TaskDetailsModel[]> {
findAllTaskByState(requestNode: TaskQueryRequestRepresentationModel, state?: string): Observable<TaskListModel> {
if (state) {
requestNode.state = state;
}
@ -193,12 +194,15 @@ export class TaskListService {
* @param filter - TaskFilterRepresentationModel
* @returns {any}
*/
findAllTasksWhitoutState(requestNode: TaskQueryRequestRepresentationModel): Observable<TaskDetailsModel[]> {
findAllTasksWhitoutState(requestNode: TaskQueryRequestRepresentationModel): Observable<TaskListModel> {
return Observable.forkJoin(
this.findTasksByState(requestNode, 'open'),
this.findAllTaskByState(requestNode, 'completed'),
(activeTasks: any, completedTasks: any) => {
return activeTasks.concat(completedTasks);
(activeTasks: TaskListModel, completedTasks: TaskListModel) => {
const tasks = Object.assign({}, activeTasks);
tasks.total += completedTasks.total;
tasks.data = tasks.data.concat(completedTasks.data);
return tasks;
}
);
}
@ -519,9 +523,15 @@ export class TaskListService {
private handleError(error: any) {
this.logService.error(error);
this.tasksListSubject.error(error);
return Observable.throw(error || 'Server error');
}
private handleTasksError(error: any) {
this.tasksListSubject.error(error.response.body);
return this.handleError(error);
}
/**
* Return a static Involved filter instance
* @param appId