inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-24 17:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ADF-1968] [IE11] The login page is not loading and import fix (#2679)

Browse Source 
* fix viewer script
export insights and diagram
remove requires svg
fix new data adapter path
dist working with diagrams commented out
change use of minimatch
fix unused import
remove unused component
fix test
new import moment es6 and throw rxjs
fix import analytics test
fix imports rxjs
new pacakging

* fix after rebase

* fix test upload services

* exclude temporarily button event test

* restore commented demo shell files

* fix process spy
This commit is contained in:
Eugenio Romano
2017-11-22 10:33:56 +00:00
committed by GitHub
parent 39737b3df6
commit f629f48d16
316 changed files with 1548 additions and 1678 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/process-services/app-list/apps-list.component.spec.ts
View File

@@ -19,7 +19,7 @@ import { DebugElement } from '@angular/core';
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { By } from '@angular/platform-browser';
import { AppsProcessService, CoreModule } from '@alfresco/adf-core';
import { Observable } from 'rxjs/Rx';
import { Observable } from 'rxjs/Observable';
import { MaterialModule } from '../material.module';
import { defaultApp, deployedApps, nonDeployedApps } from '../mock/apps-list.mock';

2
lib/process-services/app-list/public-api.ts
View File

@@ -16,5 +16,3 @@
*/
export * from './apps-list.component';
export * from './apps-list.module';

2
lib/process-services/attachment/create-process-attachment.component.spec.ts
View File

@@ -26,7 +26,6 @@ declare let jasmine: any;
describe('Activiti Process Create Attachment', () => {
let service: ProcessContentService;
let component: CreateProcessAttachmentComponent;
let fixture: ComponentFixture<CreateProcessAttachmentComponent>;
let element: HTMLElement;
@@ -67,7 +66,6 @@ describe('Activiti Process Create Attachment', () => {
beforeEach(() => {
fixture = TestBed.createComponent(CreateProcessAttachmentComponent);
component = fixture.componentInstance;
service = fixture.debugElement.injector.get(ProcessContentService);
element = fixture.nativeElement;
component.processInstanceId = '9999';

2
lib/process-services/attachment/create-task-attachment.component.spec.ts
View File

@@ -18,7 +18,7 @@
import { SimpleChange } from '@angular/core';
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { MaterialModule } from '../material.module';
import { Observable } from 'rxjs/Rx';
import { Observable } from 'rxjs/Observable';
import { ProcessContentService } from '@alfresco/adf-core';
import { AttachmentComponent } from './create-task-attachment.component';

9
lib/process-services/attachment/process-attachment-list.component.spec.ts
View File

@@ -21,7 +21,7 @@ import { MatProgressSpinnerModule } from '@angular/material';
import { By } from '@angular/platform-browser';
import { TranslateService } from '@ngx-translate/core';
import { ProcessContentService } from '@alfresco/adf-core';
import { Observable } from 'rxjs/Rx';
import { Observable } from 'rxjs/Observable';
import { ProcessAttachmentListComponent } from './process-attachment-list.component';
@@ -31,8 +31,6 @@ describe('ProcessAttachmentListComponent', () => {
let component: ProcessAttachmentListComponent;
let fixture: ComponentFixture<ProcessAttachmentListComponent>;
let getProcessRelatedContentSpy: jasmine.Spy;
let deleteContentSpy: jasmine.Spy;
let getFileRawContentSpy: jasmine.Spy;
let mockAttachment: any;
beforeEach(async(() => {
@@ -109,11 +107,10 @@ describe('ProcessAttachmentListComponent', () => {
};
getProcessRelatedContentSpy = spyOn(service, 'getProcessRelatedContent').and.returnValue(Observable.of(mockAttachment));
deleteContentSpy = spyOn(service, 'deleteRelatedContent').and.returnValue(Observable.of({successCode: true}));
spyOn(service, 'deleteRelatedContent').and.returnValue(Observable.of({successCode: true}));
let blobObj = new Blob();
getFileRawContentSpy = spyOn(service, 'getFileRawContent').and.returnValue(Observable.of(
spyOn(service, 'getFileRawContent').and.returnValue(Observable.of(
blobObj
));
});

4
lib/process-services/attachment/process-attachment-list.component.ts
View File

@@ -19,8 +19,6 @@ import { ContentService, ThumbnailService } from '@alfresco/adf-core';
import { Component, EventEmitter, Input, NgZone, OnChanges, Output, SimpleChanges } from '@angular/core';
import { ProcessContentService } from '@alfresco/adf-core';
declare var require: any;
@Component({
selector: 'adf-process-attachment-list',
styleUrls: ['./process-attachment-list.component.scss'],
@@ -44,7 +42,7 @@ export class ProcessAttachmentListComponent implements OnChanges {
error: EventEmitter<any> = new EventEmitter<any>();
@Input()
emptyListImageUrl: string = require('../assets/images/empty_doc_lib.svg');
emptyListImageUrl: string = './assets/images/empty_doc_lib.svg';
attachments: any[] = [];
isLoading: boolean = true;

2
lib/process-services/attachment/public-api.ts
View File

@@ -19,5 +19,3 @@ export * from './task-attachment-list.component';
export * from './process-attachment-list.component';
export * from './create-process-attachment.component';
export * from './create-task-attachment.component';
export * from './attachment.module';

51
lib/process-services/attachment/task-attachment-list.component.spec.ts
View File

@@ -19,7 +19,7 @@ import { SimpleChange } from '@angular/core';
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { By } from '@angular/platform-browser';
import { MaterialModule } from '../material.module';
import { Observable } from 'rxjs/Rx';
import { Observable } from 'rxjs/Observable';
import { TaskAttachmentListComponent } from './task-attachment-list.component';
import { ProcessContentService } from '@alfresco/adf-core';
@@ -29,9 +29,9 @@ describe('TaskAttachmentList', () => {
let fixture: ComponentFixture<TaskAttachmentListComponent>;
let service: ProcessContentService;
let getTaskRelatedContentSpy: jasmine.Spy;
let mockAttachment: any;
let deleteContentSpy: jasmine.Spy;
let getFileRawContentSpy: jasmine.Spy;
let mockAttachment: any;
beforeEach(async(() => {
TestBed.configureTestingModule({
@@ -64,7 +64,7 @@ describe('TaskAttachmentList', () => {
id: 8,
name: 'fake.zip',
created: 1494595697381,
createdBy: {id: 2, firstName: 'user', lastName: 'user', email: 'user@user.com'},
createdBy: { id: 2, firstName: 'user', lastName: 'user', email: 'user@user.com' },
relatedContent: true,
contentAvailable: true,
link: false,
@@ -77,7 +77,7 @@ describe('TaskAttachmentList', () => {
id: 9,
name: 'fake.jpg',
created: 1494595655381,
createdBy: {id: 2, firstName: 'user', lastName: 'user', email: 'user@user.com'},
createdBy: { id: 2, firstName: 'user', lastName: 'user', email: 'user@user.com' },
relatedContent: true,
contentAvailable: true,
link: false,
@@ -97,14 +97,13 @@ describe('TaskAttachmentList', () => {
let blobObj = new Blob();
getFileRawContentSpy = spyOn(service, 'getFileRawContent').and.returnValue(Observable.of(
blobObj
));
blobObj;
});
it('should load attachments when taskId specified', () => {
let change = new SimpleChange(null, '123', true);
component.ngOnChanges({'taskId': change});
component.ngOnChanges({ 'taskId': change });
expect(getTaskRelatedContentSpy).toHaveBeenCalled();
});
@@ -112,7 +111,7 @@ describe('TaskAttachmentList', () => {
let emitSpy = spyOn(component.error, 'emit');
getTaskRelatedContentSpy.and.returnValue(Observable.throw({}));
let change = new SimpleChange(null, '123', true);
component.ngOnChanges({'taskId': change});
component.ngOnChanges({ 'taskId': change });
expect(emitSpy).toHaveBeenCalled();
});
@@ -123,7 +122,7 @@ describe('TaskAttachmentList', () => {
expect(attachments[0].id).toEqual(mockAttachment.data[0].id);
});
component.ngOnChanges({'taskId': change});
component.ngOnChanges({ 'taskId': change });
});
it('should not attach when no taskId is specified', () => {
@@ -133,7 +132,7 @@ describe('TaskAttachmentList', () => {
it('should display attachments when the task has attachments', async(() => {
let change = new SimpleChange(null, '123', true);
component.ngOnChanges({'taskId': change});
component.ngOnChanges({ 'taskId': change });
fixture.whenStable().then(() => {
fixture.detectChanges();
@@ -159,38 +158,38 @@ describe('TaskAttachmentList', () => {
'total': 0,
'start': 0,
'data': []
}));
}));
let change = new SimpleChange(null, '123', true);
component.ngOnChanges({'taskId': change});
component.ngOnChanges({ 'taskId': change });
component.disabled = false;
fixture.whenStable().then(() => {
fixture.detectChanges();
expect(fixture.nativeElement.querySelector('.adf-custom-empty-template')).not.toBeNull();
});
});
}));
it('should not show the empty list drag and drop component when is disabled', async(() => {
getTaskRelatedContentSpy.and.returnValue(Observable.of({
'size': 0,
'total': 0,
'start': 0,
'data': []
'size': 0,
'total': 0,
'start': 0,
'data': []
}));
let change = new SimpleChange(null, '123', true);
component.ngOnChanges({'taskId': change});
component.ngOnChanges({ 'taskId': change });
component.disabled = true;
fixture.whenStable().then(() => {
fixture.detectChanges();
expect(fixture.nativeElement.querySelector('.adf-custom-empty-template')).toBeNull();
expect(fixture.nativeElement.querySelector('div[adf-empty-list-header]').innerText.trim()).toEqual('ADF_TASK_LIST.ATTACHMENT.EMPTY.HEADER');
});
});
}));
it('should display all actions if attachments are not read only', () => {
let change = new SimpleChange(null, '123', true);
component.ngOnChanges({'taskId': change});
component.ngOnChanges({ 'taskId': change });
fixture.detectChanges();
let actionButton = fixture.debugElement.nativeElement.querySelector('[data-automation-id="action_menu_0"]');
@@ -206,7 +205,7 @@ describe('TaskAttachmentList', () => {
it('should not display remove action if attachments are read only', () => {
let change = new SimpleChange(null, '123', true);
component.ngOnChanges({'taskId': change});
component.ngOnChanges({ 'taskId': change });
component.disabled = true;
fixture.detectChanges();
@@ -229,7 +228,7 @@ describe('TaskAttachmentList', () => {
'data': []
}));
let change = new SimpleChange(null, '123', true);
component.ngOnChanges({'taskId': change});
component.ngOnChanges({ 'taskId': change });
fixture.whenStable().then(() => {
fixture.detectChanges();
@@ -245,7 +244,7 @@ describe('TaskAttachmentList', () => {
'data': []
}));
let change = new SimpleChange(null, '123', true);
component.ngOnChanges({'taskId': change});
component.ngOnChanges({ 'taskId': change });
component.disabled = true;
fixture.whenStable().then(() => {
@@ -257,7 +256,7 @@ describe('TaskAttachmentList', () => {
it('should not show the empty list component when the attachments list is not empty for completed task', async(() => {
getTaskRelatedContentSpy.and.returnValue(Observable.of(mockAttachment));
let change = new SimpleChange(null, '123', true);
component.ngOnChanges({'taskId': change});
component.ngOnChanges({ 'taskId': change });
component.disabled = true;
fixture.whenStable().then(() => {
@@ -279,7 +278,7 @@ describe('TaskAttachmentList', () => {
}));
it('should fetch new attachments when taskId changed', () => {
component.ngOnChanges({'taskId': change});
component.ngOnChanges({ 'taskId': change });
expect(getTaskRelatedContentSpy).toHaveBeenCalledWith('456');
});
@@ -289,7 +288,7 @@ describe('TaskAttachmentList', () => {
});
it('should NOT fetch new attachments when taskId changed to null', () => {
component.ngOnChanges({'taskId': nullChange});
component.ngOnChanges({ 'taskId': nullChange });
expect(getTaskRelatedContentSpy).not.toHaveBeenCalled();
});
});

4
lib/process-services/comments/comments.component.spec.ts
View File

@@ -17,7 +17,7 @@
import { SimpleChange } from '@angular/core';
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { Observable } from 'rxjs/Rx';
import { Observable } from 'rxjs/Observable';
import { FormModule } from '@alfresco/adf-core';
import { CommentProcessService } from '@alfresco/adf-core';
@@ -31,7 +31,6 @@ import { CommentsComponent } from './comments.component';
describe('CommentsComponent', () => {
let service: TaskListService;
let component: CommentsComponent;
let fixture: ComponentFixture<CommentsComponent>;
let getCommentsSpy: jasmine.Spy;
@@ -61,7 +60,6 @@ describe('CommentsComponent', () => {
beforeEach(() => {
fixture = TestBed.createComponent(CommentsComponent);
component = fixture.componentInstance;
service = fixture.debugElement.injector.get(TaskListService);
commentProcessService = fixture.debugElement.injector.get(CommentProcessService);
getCommentsSpy = spyOn(commentProcessService, 'getTaskComments').and.returnValue(Observable.of([

3
lib/process-services/comments/comments.component.ts
View File

@@ -17,7 +17,8 @@
import { CommentProcessModel, CommentProcessService } from '@alfresco/adf-core';
import { Component, EventEmitter, Input, OnChanges, Output, SimpleChanges } from '@angular/core';
import { Observable, Observer } from 'rxjs/Rx';
import { Observable } from 'rxjs/Observable';
import { Observer } from 'rxjs/Observer';
@Component({
selector: 'adf-comments',

2
lib/process-services/comments/process-comments.component.spec.ts
View File

@@ -19,7 +19,7 @@ import { DatePipe } from '@angular/common';
import { SimpleChange } from '@angular/core';
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { MatInputModule } from '@angular/material';
import { Observable } from 'rxjs/Rx';
import { Observable } from 'rxjs/Observable';
import { CommentListComponent, CommentsComponent } from '../index';
import { CommentProcessService, PeopleProcessService } from '@alfresco/adf-core';

3
lib/process-services/comments/process-comments.component.ts
View File

@@ -17,7 +17,8 @@
import { CommentProcessModel, CommentProcessService } from '@alfresco/adf-core';
import { Component, EventEmitter, Input, OnChanges, Output, SimpleChanges } from '@angular/core';
import { Observable, Observer } from 'rxjs/Rx';
import { Observable } from 'rxjs/Observable';
import { Observer } from 'rxjs/Observer';
@Component({
selector: 'adf-process-instance-comments',

2
lib/process-services/comments/public-api.ts
View File

@@ -18,5 +18,3 @@
export * from './process-comments.component';
export * from './comment-list.component';
export * from './comments.component';
export * from './comments.module';

11
lib/process-services/index.ts
View File

@@ -15,11 +15,18 @@
* limitations under the License.
*/
export * from './process.module';
export * from './process-list/process-list.module';
export * from './task-list/task-list.module';
export * from './app-list/apps-list.module';
export * from './attachment/attachment.module';
export * from './comments/comments.module';
export * from './people/people.module';
export * from './process-list';
export * from './task-list';
export * from './app-list';
export * from './attachment';
export * from './comments';
export * from './people';
export * from './process.module';

2
lib/process-services/mock/process/process.service.mock.ts
View File

@@ -36,7 +36,7 @@ export let fakeEmptyFilters = {
data: []
};
export let fakeError = {
export let mockError = {
message: null,
messageKey: 'GENERAL.ERROR.FORBIDDEN'
};

2
lib/process-services/mock/task/tasklist-service.mock.ts
View File

@@ -108,7 +108,7 @@ export let secondFakeTaskList = {
]
};
export let fakeErrorTaskList = {
export let mockErrorTaskList = {
error: 'wrong request'
};

2
lib/process-services/people/people-list.component.spec.ts
View File

@@ -32,7 +32,6 @@ describe('PeopleListComponent', () => {
let peopleListComponent: PeopleListComponent;
let fixture: ComponentFixture<PeopleListComponent>;
let element: HTMLElement;
beforeEach(async(() => {
TestBed.configureTestingModule({
@@ -46,7 +45,6 @@ describe('PeopleListComponent', () => {
fixture = TestBed.createComponent(PeopleListComponent);
peopleListComponent = fixture.componentInstance;
element = fixture.nativeElement;
fixture.detectChanges();
});
}));

3
lib/process-services/people/people.component.ts
View File

@@ -18,7 +18,8 @@
import { LogService, UserProcessModel } from '@alfresco/adf-core';
import { PeopleProcessService } from '@alfresco/adf-core';
import { AfterViewInit, Component, Input, OnInit, ViewChild } from '@angular/core';
import { Observable, Observer } from 'rxjs/Rx';
import { Observable } from 'rxjs/Observable';
import { Observer } from 'rxjs/Observer';
import { UserEventModel } from '../task-list/models/user-event.model';
import { PeopleSearchComponent } from './people-search.component';

2
lib/process-services/people/public-api.ts
View File

@@ -18,5 +18,3 @@
export * from './people.component';
export * from './people-list.component';
export * from './people-search.component';
export * from './people.module';

2
lib/process-services/process-list/components/process-audit.directive.spec.ts
View File

@@ -17,7 +17,7 @@
import { Component } from '@angular/core';
import { async, ComponentFixture, fakeAsync, TestBed } from '@angular/core/testing';
import { Observable } from 'rxjs/Rx';
import { Observable } from 'rxjs/Observable';
import { ProcessService } from './../services/process.service';
import { ProcessAuditDirective } from './process-audit.directive';

12
lib/process-services/process-list/components/process-filters.component.spec.ts
View File

@@ -17,7 +17,7 @@
import { SimpleChange } from '@angular/core';
import { AppsProcessService } from '@alfresco/adf-core';
import { Observable } from 'rxjs/Rx';
import { Observable } from 'rxjs/Observable';
import { FilterProcessRepresentationModel } from '../models/filter-process.model';
import { ProcessFilterService } from '../services/process-filter.service';
import { ProcessFiltersComponent } from './process-filters.component';
@@ -47,12 +47,12 @@ describe('ActivitiFilters', () => {
resolve(fakeGlobalFilter);
});
let fakeErrorFilterList = {
let mockErrorFilterList = {
error: 'wrong request'
};
let fakeErrorFilterPromise = new Promise(function (resolve, reject) {
reject(fakeErrorFilterList);
let mockErrorFilterPromise = new Promise(function (resolve, reject) {
reject(mockErrorFilterList);
});
beforeEach(() => {
@@ -120,7 +120,7 @@ describe('ActivitiFilters', () => {
});
it('should emit an error with a bad response', (done) => {
spyOn(processFilterService, 'getProcessFilters').and.returnValue(Observable.fromPromise(fakeErrorFilterPromise));
spyOn(processFilterService, 'getProcessFilters').and.returnValue(Observable.fromPromise(mockErrorFilterPromise));
const appId = '1';
let change = new SimpleChange(null, appId, true);
@@ -135,7 +135,7 @@ describe('ActivitiFilters', () => {
});
it('should emit an error with a bad response', (done) => {
spyOn(appsProcessService, 'getDeployedApplicationsByName').and.returnValue(Observable.fromPromise(fakeErrorFilterPromise));
spyOn(appsProcessService, 'getDeployedApplicationsByName').and.returnValue(Observable.fromPromise(mockErrorFilterPromise));
const appId = 'fake-app';
let change = new SimpleChange(null, appId, true);

3
lib/process-services/process-list/components/process-filters.component.ts
View File

@@ -18,7 +18,8 @@
import { AppsProcessService } from '@alfresco/adf-core';
import { Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges } from '@angular/core';
import { ProcessInstanceFilterRepresentation } from 'alfresco-js-api';
import { Observable, Observer } from 'rxjs/Rx';
import { Observable } from 'rxjs/Observable';
import { Observer } from 'rxjs/Observer';
import { FilterProcessRepresentationModel } from '../models/filter-process.model';
import { ProcessFilterService } from './../services/process-filter.service';

8
lib/process-services/process-list/components/process-instance-details.component.spec.ts
View File

@@ -19,10 +19,10 @@ import { DebugElement, NO_ERRORS_SCHEMA, SimpleChange } from '@angular/core';
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { MaterialModule } from '../../material.module';
import { By } from '@angular/platform-browser';
import { Observable } from 'rxjs/Rx';
import { Observable } from 'rxjs/Observable';
import { FormModule, FormService } from '@alfresco/adf-core';
import { TaskListModule } from '../../task-list';
import { FormModule } from '@alfresco/adf-core';
import { TaskListModule } from '../../task-list/task-list.module';
import { ProcessInstance } from '../models/process-instance.model';
import { exampleProcess, exampleProcessNoName } from './../../mock';
@@ -32,7 +32,6 @@ import { ProcessInstanceDetailsComponent } from './process-instance-details.comp
describe('ProcessInstanceDetailsComponent', () => {
let service: ProcessService;
let formService: FormService;
let component: ProcessInstanceDetailsComponent;
let fixture: ComponentFixture<ProcessInstanceDetailsComponent>;
let getProcessSpy: jasmine.Spy;
@@ -59,7 +58,6 @@ describe('ProcessInstanceDetailsComponent', () => {
fixture = TestBed.createComponent(ProcessInstanceDetailsComponent);
component = fixture.componentInstance;
service = fixture.debugElement.injector.get(ProcessService);
formService = fixture.debugElement.injector.get(FormService);
getProcessSpy = spyOn(service, 'getProcess').and.returnValue(Observable.of(exampleProcess));
});

3
lib/process-services/process-list/components/process-instance-header.component.spec.ts
View File

@@ -26,7 +26,6 @@ import { ProcessInstanceHeaderComponent } from './process-instance-header.compon
describe('ProcessInstanceHeaderComponent', () => {
let service: ProcessService;
let component: ProcessInstanceHeaderComponent;
let fixture: ComponentFixture<ProcessInstanceHeaderComponent>;
@@ -46,10 +45,8 @@ describe('ProcessInstanceHeaderComponent', () => {
}));
beforeEach(() => {
fixture = TestBed.createComponent(ProcessInstanceHeaderComponent);
component = fixture.componentInstance;
service = TestBed.get(ProcessService);
component.processInstance = new ProcessInstance(exampleProcess);
});

6
lib/process-services/process-list/components/process-instance-tasks.component.spec.ts
View File

@@ -15,10 +15,10 @@
* limitations under the License.
*/
import { DebugElement, NO_ERRORS_SCHEMA, SimpleChange } from '@angular/core';
import { NO_ERRORS_SCHEMA, SimpleChange } from '@angular/core';
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { By } from '@angular/platform-browser';
import { Observable } from 'rxjs/Rx';
import { Observable } from 'rxjs/Observable';
import { TaskDetailsModel } from '../../task-list';
@@ -31,7 +31,6 @@ describe('ProcessInstanceTasksComponent', () => {
let component: ProcessInstanceTasksComponent;
let fixture: ComponentFixture<ProcessInstanceTasksComponent>;
let debugElement: DebugElement;
let service: ProcessService;
let getProcessTasksSpy: jasmine.Spy;
@@ -54,7 +53,6 @@ describe('ProcessInstanceTasksComponent', () => {
fixture = TestBed.createComponent(ProcessInstanceTasksComponent);
component = fixture.componentInstance;
debugElement = fixture.debugElement;
service = fixture.debugElement.injector.get(ProcessService);
getProcessTasksSpy = spyOn(service, 'getProcessTasks').and.returnValue(Observable.of([new TaskDetailsModel(taskDetailsMock)]));

3
lib/process-services/process-list/components/process-instance-tasks.component.ts
View File

@@ -19,7 +19,8 @@ import { LogService } from '@alfresco/adf-core';
import { DatePipe } from '@angular/common';
import { Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges, ViewChild } from '@angular/core';
import { MatDialog } from '@angular/material';
import { Observable, Observer } from 'rxjs/Rx';
import { Observable } from 'rxjs/Observable';
import { Observer } from 'rxjs/Observer';
import { TaskDetailsEvent, TaskDetailsModel } from '../../task-list';
import { ProcessInstance } from '../models/process-instance.model';
import { ProcessService } from './../services/process.service';

8
lib/process-services/process-list/components/process-list.component.spec.ts
View File

@@ -18,7 +18,7 @@
import { SimpleChange } from '@angular/core';
import { async, ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
import { MatProgressSpinnerModule } from '@angular/material';
import { Observable } from 'rxjs/Rx';
import { Observable } from 'rxjs/Observable';
import { ProcessInstanceListComponent } from './process-list.component';
import { AppConfigService } from '@alfresco/adf-core';
@@ -281,13 +281,13 @@ describe('ProcessInstanceListComponent', () => {
it('should throw an exception when the response is wrong', fakeAsync(() => {
let emitSpy: jasmine.Spy = spyOn(component.error, 'emit');
let fakeError = 'Fake server error';
getProcessInstancesSpy.and.returnValue(Observable.throw(fakeError));
let mockError = 'Fake server error';
getProcessInstancesSpy.and.returnValue(Observable.throw(mockError));
component.appId = 1;
component.state = 'open';
fixture.detectChanges();
tick();
expect(emitSpy).toHaveBeenCalledWith(fakeError);
expect(emitSpy).toHaveBeenCalledWith(mockError);
}));
it('should emit onSuccess event when reload() called', fakeAsync(() => {

6
lib/process-services/process-list/components/start-process.component.spec.ts
View File

@@ -15,7 +15,7 @@
* limitations under the License.
*/
import { DebugElement, SimpleChange } from '@angular/core';
import { SimpleChange } from '@angular/core';
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import {
MatButtonModule,
@@ -24,7 +24,7 @@ import {
MatSelectModule
} from '@angular/material';
import { FormModule, FormService } from '@alfresco/adf-core';
import { Observable } from 'rxjs/Rx';
import { Observable } from 'rxjs/Observable';
import { ProcessInstanceVariable } from '../models/process-instance-variable.model';
import { ProcessService } from '../services/process.service';
@@ -40,7 +40,6 @@ describe('StartProcessInstanceComponent', () => {
let getDefinitionsSpy: jasmine.Spy;
let getStartFormDefinitionSpy: jasmine.Spy;
let startProcessSpy: jasmine.Spy;
let debugElement: DebugElement;
beforeEach(async(() => {
TestBed.configureTestingModule({
@@ -65,7 +64,6 @@ describe('StartProcessInstanceComponent', () => {
fixture = TestBed.createComponent(StartProcessInstanceComponent);
component = fixture.componentInstance;
debugElement = fixture.debugElement;
processService = fixture.debugElement.injector.get(ProcessService);
formService = fixture.debugElement.injector.get(FormService);

6
lib/process-services/process-list/process-list.module.ts
View File

@@ -24,9 +24,9 @@ import { FormModule } from '@alfresco/adf-core';
import { MaterialModule } from '../material.module';
import { CardViewModule, CardViewUpdateService, DataColumnModule, DataTableModule, DirectiveModule, PipeModule } from '@alfresco/adf-core';
import { TaskListModule } from '../task-list';
import { PeopleModule } from '../people';
import { CommentsModule } from '../comments';
import { TaskListModule } from '../task-list/task-list.module';
import { PeopleModule } from '../people/people.module';
import { CommentsModule } from '../comments/comments.module';
import { ProcessAuditDirective } from './components/process-audit.directive';
import { ProcessFiltersComponent } from './components/process-filters.component';

2
lib/process-services/process-list/public-api.ts
View File

@@ -34,5 +34,3 @@ export * from './models/process-definition.model';
export * from './models/process-instance.model';
export * from './models/process-instance-filter.model';
export * from './models/process-instance-variable.model';
export * from './process-list.module';

10
lib/process-services/process-list/services/process-filter.service.spec.ts
View File

@@ -19,7 +19,7 @@ import { TestBed } from '@angular/core/testing';
import { async } from '@angular/core/testing';
import { AlfrescoApi } from 'alfresco-js-api';
import { AlfrescoApiService } from '@alfresco/adf-core';
import { fakeError, fakeProcessFilters } from '../../mock';
import { mockError, fakeProcessFilters } from '../../mock';
import { FilterProcessRepresentationModel } from '../models/filter-process.model';
import { ProcessFilterService } from './process-filter.service';
@@ -116,12 +116,12 @@ describe('Process filter', () => {
});
it('should pass on any error that is returned by the API', async(() => {
getFilters = getFilters.and.returnValue(Promise.reject(fakeError));
getFilters = getFilters.and.returnValue(Promise.reject(mockError));
service.getProcessFilters(null).subscribe(
() => {},
(res) => {
expect(res).toBe(fakeError);
expect(res).toBe(mockError);
}
);
}));
@@ -144,12 +144,12 @@ describe('Process filter', () => {
}));
it('should pass on any error that is returned by the API', async(() => {
createFilter = createFilter.and.returnValue(Promise.reject(fakeError));
createFilter = createFilter.and.returnValue(Promise.reject(mockError));
service.addProcessFilter(filter).subscribe(
() => {},
(res) => {
expect(res).toBe(fakeError);
expect(res).toBe(mockError);
}
);
}));

1
lib/process-services/process-list/services/process-filter.service.ts
View File

@@ -19,6 +19,7 @@ import { AlfrescoApiService, LogService } from '@alfresco/adf-core';
import { Injectable } from '@angular/core';
import { Observable } from 'rxjs/Observable';
import { FilterProcessRepresentationModel } from '../models/filter-process.model';
import 'rxjs/add/observable/throw';
@Injectable()
export class ProcessFilterService {

38
lib/process-services/process-list/services/process.service.spec.ts
View File

@@ -20,7 +20,7 @@ import { async } from '@angular/core/testing';
import { AlfrescoApi } from 'alfresco-js-api';
import { AlfrescoApiService } from '@alfresco/adf-core';
import { exampleProcess, fakeProcessInstances } from '../../mock';
import { fakeError, fakeProcessDef, fakeTasksList } from '../../mock';
import { mockError, fakeProcessDef, fakeTasksList } from '../../mock';
import { ProcessFilterParamRepresentationModel } from '../models/filter-process.model';
import { ProcessInstanceVariable } from '../models/process-instance-variable.model';
import { ProcessService } from './process.service';
@@ -101,11 +101,11 @@ describe('ProcessService', () => {
});
it('should pass on any error that is returned by the API', async(() => {
getProcessInstances = getProcessInstances.and.returnValue(Promise.reject(fakeError));
getProcessInstances = getProcessInstances.and.returnValue(Promise.reject(mockError));
service.getProcessInstances(null).subscribe(
() => {},
(res) => {
expect(res).toBe(fakeError);
expect(res).toBe(mockError);
}
);
}));
@@ -152,11 +152,11 @@ describe('ProcessService', () => {
});
it('should pass on any error that is returned by the API', async(() => {
getProcessInstance = getProcessInstance.and.returnValue(Promise.reject(fakeError));
getProcessInstance = getProcessInstance.and.returnValue(Promise.reject(mockError));
service.getProcess(null).subscribe(
() => {},
(res) => {
expect(res).toBe(fakeError);
expect(res).toBe(mockError);
}
);
}));
@@ -215,12 +215,12 @@ describe('ProcessService', () => {
}));
it('should pass on any error that is returned by the API', async(() => {
startNewProcessInstance = startNewProcessInstance.and.returnValue(Promise.reject(fakeError));
startNewProcessInstance = startNewProcessInstance.and.returnValue(Promise.reject(mockError));
service.startProcess(processDefId, processName).subscribe(
() => {},
(res) => {
expect(res).toBe(fakeError);
expect(res).toBe(mockError);
}
);
}));
@@ -265,11 +265,11 @@ describe('ProcessService', () => {
});
it('should pass on any error that is returned by the API', async(() => {
deleteProcessInstance = deleteProcessInstance.and.returnValue(Promise.reject(fakeError));
deleteProcessInstance = deleteProcessInstance.and.returnValue(Promise.reject(mockError));
service.cancelProcess(null).subscribe(
() => {},
(res) => {
expect(res).toBe(fakeError);
expect(res).toBe(mockError);
}
);
}));
@@ -327,11 +327,11 @@ describe('ProcessService', () => {
});
it('should pass on any error that is returned by the API', async(() => {
getProcessDefinitions = getProcessDefinitions.and.returnValue(Promise.reject(fakeError));
getProcessDefinitions = getProcessDefinitions.and.returnValue(Promise.reject(mockError));
service.getProcessDefinitions().subscribe(
() => {},
(res) => {
expect(res).toBe(fakeError);
expect(res).toBe(mockError);
}
);
}));
@@ -396,11 +396,11 @@ describe('ProcessService', () => {
});
it('should pass on any error that is returned by the API', async(() => {
listTasks = listTasks.and.returnValue(Promise.reject(fakeError));
listTasks = listTasks.and.returnValue(Promise.reject(mockError));
service.getProcessTasks(processId).subscribe(
() => {},
(res) => {
expect(res).toBe(fakeError);
expect(res).toBe(mockError);
}
);
}));
@@ -447,11 +447,11 @@ describe('ProcessService', () => {
});
it('should pass on any error that is returned by the API', async(() => {
getVariablesSpy = getVariablesSpy.and.returnValue(Promise.reject(fakeError));
getVariablesSpy = getVariablesSpy.and.returnValue(Promise.reject(mockError));
service.getProcessInstanceVariables(null).subscribe(
() => {},
(res) => {
expect(res).toBe(fakeError);
expect(res).toBe(mockError);
}
);
}));
@@ -484,11 +484,11 @@ describe('ProcessService', () => {
});
it('should pass on any error that is returned by the API', async(() => {
createOrUpdateProcessInstanceVariablesSpy = createOrUpdateProcessInstanceVariablesSpy.and.returnValue(Promise.reject(fakeError));
createOrUpdateProcessInstanceVariablesSpy = createOrUpdateProcessInstanceVariablesSpy.and.returnValue(Promise.reject(mockError));
service.createOrUpdateProcessInstanceVariables('123', updatedVariables).subscribe(
() => {},
(res) => {
expect(res).toBe(fakeError);
expect(res).toBe(mockError);
}
);
}));
@@ -513,11 +513,11 @@ describe('ProcessService', () => {
});
it('should pass on any error that is returned by the API', async(() => {
deleteProcessInstanceVariableSpy = deleteProcessInstanceVariableSpy.and.returnValue(Promise.reject(fakeError));
deleteProcessInstanceVariableSpy = deleteProcessInstanceVariableSpy.and.returnValue(Promise.reject(mockError));
service.deleteProcessInstanceVariable('123', 'myVar').subscribe(
() => {},
(res) => {
expect(res).toBe(fakeError);
expect(res).toBe(mockError);
}
);
}));

1
lib/process-services/process-list/services/process.service.ts
View File

@@ -23,6 +23,7 @@ import { ProcessFilterParamRepresentationModel } from '../models/filter-process.
import { ProcessDefinitionRepresentation } from '../models/process-definition.model';
import { ProcessInstanceVariable } from '../models/process-instance-variable.model';
import { ProcessInstance } from '../models/process-instance.model';
import 'rxjs/add/observable/throw';
declare let moment: any;

17
lib/process-services/process.module.ts
View File

@@ -23,12 +23,12 @@ import { CoreModule, TRANSLATION_PROVIDER } from '@alfresco/adf-core';
import { MaterialModule } from './material.module';
import { ProcessListModule } from './process-list';
import { TaskListModule } from './task-list';
import { AppsListModule } from './app-list';
import { CommentsModule } from './comments';
import { AttachmentModule } from './attachment';
import { PeopleModule } from './people';
import { ProcessListModule } from './process-list/process-list.module';
import { TaskListModule } from './task-list/task-list.module';
import { AppsListModule } from './app-list/apps-list.module';
import { CommentsModule } from './comments/comments.module';
import { AttachmentModule } from './attachment/attachment.module';
import { PeopleModule } from './people/people.module';
@NgModule({
imports: [
@@ -56,18 +56,17 @@ import { PeopleModule } from './people';
}
],
exports: [
CoreModule,
CommonModule,
CommentsModule,
FormsModule,
ReactiveFormsModule,
BrowserAnimationsModule,
MaterialModule,
ProcessListModule,
TaskListModule,
AppsListModule,
AttachmentModule,
PeopleModule
PeopleModule,
MaterialModule
]
})
export class ProcessModule {

18
lib/process-services/public-api.ts Normal file
View File

@@ -0,0 +1,18 @@
/*!
* @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.
*/
export * from './index';

5
lib/process-services/task-list/components/checklist.component.spec.ts
View File

@@ -35,7 +35,7 @@ describe('ChecklistComponent', () => {
let checklistComponent: ChecklistComponent;
let fixture: ComponentFixture<ChecklistComponent>;
let element: HTMLElement;
let showChecklistDialog, closeCheckDialogButton;
let showChecklistDialog;
beforeEach(async(() => {
TestBed.configureTestingModule({
@@ -77,7 +77,6 @@ describe('ChecklistComponent', () => {
fixture.detectChanges();
showChecklistDialog = <HTMLElement> element.querySelector('#add-checklist');
closeCheckDialogButton = <HTMLElement> element.querySelector('#close-check-dialog');
});
it('should NOT show add checklist button', () => {
@@ -98,7 +97,6 @@ describe('ChecklistComponent', () => {
fixture.detectChanges();
showChecklistDialog = <HTMLElement> element.querySelector('#add-checklist');
closeCheckDialogButton = <HTMLElement> element.querySelector('#close-check-dialog');
});
it('should show add checklist button', () => {
@@ -118,7 +116,6 @@ describe('ChecklistComponent', () => {
fixture.detectChanges();
showChecklistDialog = <HTMLElement> element.querySelector('#add-checklist');
closeCheckDialogButton = <HTMLElement> element.querySelector('#close-check-dialog');
});
it('should show dialog when clicked on add', () => {

3
lib/process-services/task-list/components/checklist.component.ts
View File

@@ -17,7 +17,8 @@
import { Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges, ViewChild } from '@angular/core';
import { MatDialog } from '@angular/material';
import { Observable, Observer } from 'rxjs/Rx';
import { Observable } from 'rxjs/Observable';
import { Observer } from 'rxjs/Observer';
import { TaskDetailsModel } from '../models/task-details.model';
import { TaskListService } from './../services/tasklist.service';

8
lib/process-services/task-list/components/start-task.component.spec.ts
View File

@@ -18,7 +18,7 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { MaterialModule } from '../../material.module';
import { PeopleProcessService } from '@alfresco/adf-core';
import { Observable } from 'rxjs/Rx';
import { Observable } from 'rxjs/Observable';
import { startTaskMock } from '../../mock';
import { StartTaskModel } from '../models/start-task.model';
import { TaskListService } from '../services/tasklist.service';
@@ -35,8 +35,6 @@ describe('StartTaskComponent', () => {
let getFormlistSpy: jasmine.Spy;
let getWorkflowUsersSpy: jasmine.Spy;
let createNewTaskSpy: jasmine.Spy;
let attachFormSpy: jasmine.Spy;
let assignUserSpy: jasmine.Spy;
let fakeForms = [
{
id: 123,
@@ -173,7 +171,7 @@ describe('StartTaskComponent', () => {
assignee: null
}
));
attachFormSpy = spyOn(service, 'attachFormToATask').and.returnValue(Observable.of(
spyOn(service, 'attachFormToATask').and.returnValue(Observable.of(
{
id: 91,
name: 'fakeName',
@@ -234,7 +232,7 @@ describe('StartTaskComponent', () => {
assignee: null
}
));
assignUserSpy = spyOn(service, 'assignTaskByUserId').and.returnValue(Observable.of(
spyOn(service, 'assignTaskByUserId').and.returnValue(Observable.of(
{
id: 91,
name: 'fakeName',

29
lib/process-services/task-list/components/start-task.component.ts
View File

@@ -15,13 +15,13 @@
* limitations under the License.
*/
import { LogService, MOMENT_DATE_FORMATS,
MomentDateAdapter, PeopleProcessService, UserPreferencesService, UserProcessModel } from '@alfresco/adf-core';
import { LogService, PeopleProcessService, UserPreferencesService, UserProcessModel } from '@alfresco/adf-core';
import { Component, EventEmitter, Input, OnInit, Output, ViewEncapsulation } from '@angular/core';
import { DateAdapter, MAT_DATE_FORMATS } from '@angular/material';
import * as moment from 'moment';
import { DateAdapter, MAT_DATE_FORMATS } from '@angular/material/core';
import { MOMENT_DATE_FORMATS, MomentDateAdapter } from '@alfresco/adf-core';
import moment from 'moment-es6';
import { Moment } from 'moment';
import { Observable } from 'rxjs/Rx';
import { Observable } from 'rxjs/Observable';
import { Form } from '../models/form.model';
import { StartTaskModel } from '../models/start-task.model';
import { TaskDetailsModel } from '../models/task-details.model';
@@ -32,13 +32,13 @@ import { TaskListService } from './../services/tasklist.service';
templateUrl: './start-task.component.html',
styleUrls: ['./start-task.component.scss'],
providers: [
{provide: DateAdapter, useClass: MomentDateAdapter},
{provide: MAT_DATE_FORMATS, useValue: MOMENT_DATE_FORMATS}],
{ provide: DateAdapter, useClass: MomentDateAdapter },
{ provide: MAT_DATE_FORMATS, useValue: MOMENT_DATE_FORMATS }],
encapsulation: ViewEncapsulation.None
})
export class StartTaskComponent implements OnInit {
public FORMAT_DATE: string = 'DD/MM/YYYY';
public FORMAT_DATE: string = 'DD/MM/YYYY';
@Input()
appId: number;
@@ -72,16 +72,15 @@ export class StartTaskComponent implements OnInit {
* @param translate
* @param taskService
*/
constructor(
private taskService: TaskListService,
private peopleService: PeopleProcessService,
private dateAdapter: DateAdapter<Moment>,
private preferences: UserPreferencesService,
private logService: LogService) {
constructor(private taskService: TaskListService,
private peopleService: PeopleProcessService,
private dateAdapter: DateAdapter<Moment>,
private preferences: UserPreferencesService,
private logService: LogService) {
}
ngOnInit() {
this.preferences.locale$.subscribe( (locale) => {
this.preferences.locale$.subscribe((locale) => {
this.dateAdapter.setLocale(locale);
});
this.loadFormsTask();

2
lib/process-services/task-list/components/task-audit.directive.spec.ts
View File

@@ -22,7 +22,7 @@ import {
fakeAsync,
TestBed
} from '@angular/core/testing';
import { Observable } from 'rxjs/Rx';
import { Observable } from 'rxjs/Observable';
import { TaskListService } from './../services/tasklist.service';
import { TaskAuditDirective } from './task-audit.directive';

8
lib/process-services/task-list/components/task-details.component.spec.ts
View File

@@ -19,7 +19,7 @@ import { NO_ERRORS_SCHEMA, SimpleChange } from '@angular/core';
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { MatButtonModule, MatInputModule } from '@angular/material';
import { By } from '@angular/platform-browser';
import { Observable } from 'rxjs/Rx';
import { Observable } from 'rxjs/Observable';
import { FormModule, FormModel, FormOutcomeEvent, FormOutcomeModel, FormService } from '@alfresco/adf-core';
import { CommentProcessService, LogService } from '@alfresco/adf-core';
@@ -47,10 +47,8 @@ describe('TaskDetailsComponent', () => {
let component: TaskDetailsComponent;
let fixture: ComponentFixture<TaskDetailsComponent>;
let getTaskDetailsSpy: jasmine.Spy;
let getFormSpy: jasmine.Spy;
let getTasksSpy: jasmine.Spy;
let assignTaskSpy: jasmine.Spy;
let getFormTaskSpy: jasmine.Spy;
let completeTaskSpy: jasmine.Spy;
let logService: LogService;
let commentProcessService: CommentProcessService;
@@ -87,9 +85,9 @@ describe('TaskDetailsComponent', () => {
commentProcessService = TestBed.get(CommentProcessService);
getTaskDetailsSpy = spyOn(service, 'getTaskDetails').and.returnValue(Observable.of(taskDetailsMock));
getFormSpy = spyOn(formService, 'getTaskForm').and.returnValue(Observable.of(taskFormMock));
spyOn(formService, 'getTaskForm').and.returnValue(Observable.of(taskFormMock));
taskDetailsMock.processDefinitionId = null;
getFormTaskSpy = spyOn(formService, 'getTask').and.returnValue(Observable.of(taskDetailsMock));
spyOn(formService, 'getTask').and.returnValue(Observable.of(taskDetailsMock));
getTasksSpy = spyOn(service, 'getTasks').and.returnValue(Observable.of(tasksMock));
assignTaskSpy = spyOn(service, 'assignTask').and.returnValue(Observable.of(fakeUser));

3
lib/process-services/task-list/components/task-details.component.ts
View File

@@ -28,7 +28,8 @@ import { Component,
ViewChild
} from '@angular/core';
import { MatDialog, MatDialogRef } from '@angular/material';
import { Observable, Observer } from 'rxjs/Rx';
import { Observable } from 'rxjs/Observable';
import { Observer } from 'rxjs/Observer';
import { ContentLinkModel, FormFieldValidator, FormModel, FormOutcomeEvent } from '@alfresco/adf-core';
import { TaskQueryRequestRepresentationModel } from '../models/filter.model';
import { TaskDetailsModel } from '../models/task-details.model';

10
lib/process-services/task-list/components/task-filters.component.spec.ts
View File

@@ -18,7 +18,7 @@
import { SimpleChange } from '@angular/core';
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { AppConfigService, AppsProcessService } from '@alfresco/adf-core';
import { Observable } from 'rxjs/Rx';
import { Observable } from 'rxjs/Observable';
import { FilterParamsModel, FilterRepresentationModel } from '../models/filter.model';
import { TaskListService } from '../services/tasklist.service';
import { TaskFilterService } from '../services/task-filter.service';
@@ -52,12 +52,12 @@ describe('TaskFiltersComponent', () => {
resolve(fakeGlobalFilter);
});
let fakeErrorFilterList = {
let mockErrorFilterList = {
error: 'wrong request'
};
let fakeErrorFilterPromise = new Promise(function (resolve, reject) {
reject(fakeErrorFilterList);
let mockErrorFilterPromise = new Promise(function (resolve, reject) {
reject(mockErrorFilterList);
});
let component: TaskFiltersComponent;
@@ -92,7 +92,7 @@ describe('TaskFiltersComponent', () => {
});
it('should emit an error with a bad response', (done) => {
spyOn(taskFilterService, 'getTaskListFilters').and.returnValue(Observable.fromPromise(fakeErrorFilterPromise));
spyOn(taskFilterService, 'getTaskListFilters').and.returnValue(Observable.fromPromise(mockErrorFilterPromise));
const appId = '1';
let change = new SimpleChange(null, appId, true);

3
lib/process-services/task-list/components/task-filters.component.ts
View File

@@ -17,7 +17,8 @@
import { AppsProcessService } from '@alfresco/adf-core';
import { Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges } from '@angular/core';
import { Observable, Observer } from 'rxjs/Rx';
import { Observable } from 'rxjs/Observable';
import { Observer } from 'rxjs/Observer';
import { FilterParamsModel, FilterRepresentationModel } from '../models/filter.model';
import { TaskFilterService } from './../services/task-filter.service';
import { TaskListService } from './../services/tasklist.service';

8
lib/process-services/task-list/components/task-header.component.spec.ts
View File

@@ -15,13 +15,12 @@
* limitations under the License.
*/
import { DebugElement } from '@angular/core';
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { By } from '@angular/platform-browser';
import { CardViewUpdateService, UserProcessModel } from '@alfresco/adf-core';
import { BpmUserService } from '@alfresco/adf-core';
import { MaterialModule } from '../../material.module';
import { Observable } from 'rxjs/Rx';
import { Observable } from 'rxjs/Observable';
import {
completedTaskDetailsMock,
taskDetailsMock,
@@ -39,9 +38,7 @@ describe('TaskHeaderComponent', () => {
let service: TaskListService;
let component: TaskHeaderComponent;
let fixture: ComponentFixture<TaskHeaderComponent>;
let debugElement: DebugElement;
let userBpmService: BpmUserService;
let getCurrentUserInfoSpy: jasmine.Spy;
let fakeBpmAssignedUser = {
id: 1001,
@@ -78,8 +75,7 @@ describe('TaskHeaderComponent', () => {
component = fixture.componentInstance;
service = TestBed.get(TaskListService);
userBpmService = TestBed.get(BpmUserService);
debugElement = fixture.debugElement;
getCurrentUserInfoSpy = spyOn(userBpmService, 'getCurrentUserInfo').and.returnValue(Observable.of(fakeBpmAssignedUser));
spyOn(userBpmService, 'getCurrentUserInfo').and.returnValue(Observable.of(fakeBpmAssignedUser));
component.taskDetails = new TaskDetailsModel(taskDetailsMock);
});

6
lib/process-services/task-list/components/task-list.component.spec.ts
View File

@@ -78,7 +78,7 @@ describe('TaskListComponent', () => {
]
};
let fakeErrorTaskList = {
let mockErrorTaskList = {
error: 'wrong request'
};
@@ -124,7 +124,6 @@ describe('TaskListComponent', () => {
let component: TaskListComponent;
let fixture: ComponentFixture<TaskListComponent>;
let taskListService: TaskListService;
let appConfig: AppConfigService;
beforeEach(async(() => {
@@ -149,7 +148,6 @@ describe('TaskListComponent', () => {
fixture = TestBed.createComponent(TaskListComponent);
component = fixture.componentInstance;
taskListService = TestBed.get(TaskListService);
appConfig.config = Object.assign(appConfig.config, {
'adf-task-list': {
'presets': {
@@ -385,7 +383,7 @@ describe('TaskListComponent', () => {
jasmine.Ajax.requests.mostRecent().respondWith({
'status': 404,
contentType: 'application/json',
responseText: JSON.stringify(fakeErrorTaskList)
responseText: JSON.stringify(mockErrorTaskList)
});
});

2
lib/process-services/task-list/components/task-list.component.ts
View File

@@ -18,7 +18,7 @@
import { DataColumn, DataRowEvent, DataTableAdapter, ObjectDataColumn, ObjectDataRow, ObjectDataTableAdapter } from '@alfresco/adf-core';
import { AppConfigService, DataColumnListComponent } from '@alfresco/adf-core';
import { AfterContentInit, Component, ContentChild, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges } from '@angular/core';
import { Observable } from 'rxjs/Rx';
import { Observable } from 'rxjs/Observable';
import { TaskQueryRequestRepresentationModel } from '../models/filter.model';
import { TaskListModel } from '../models/task-list.model';
import { taskPresetsDefaultModel } from '../models/task-preset.model';

2
lib/process-services/task-list/public-api.ts
View File

@@ -33,5 +33,3 @@ export * from './models/task-details.model';
export * from './models/task-details.event';
export * from './models/user-event.model';
export * from './models/start-task.model';
export * from './task-list.module';

3
lib/process-services/task-list/services/process-upload.service.ts
View File

@@ -17,7 +17,8 @@
import { AlfrescoApiService, AppConfigService, UploadService } from '@alfresco/adf-core';
import { Injectable } from '@angular/core';
import { Observable } from 'rxjs/Rx';
import { Observable } from 'rxjs/Observable';
import 'rxjs/add/observable/throw';
@Injectable()
export class ProcessUploadService extends UploadService {

4
lib/process-services/task-list/services/task-filter.service.ts
View File

@@ -17,9 +17,11 @@
import { AlfrescoApiService, LogService } from '@alfresco/adf-core';
import { Injectable } from '@angular/core';
import { Observable, Subject } from 'rxjs/Rx';
import { Observable } from 'rxjs/Observable';
import { Subject } from 'rxjs/Subject';
import { FilterRepresentationModel } from '../models/filter.model';
import { TaskListModel } from '../models/task-list.model';
import 'rxjs/add/observable/throw';
@Injectable()
export class TaskFilterService {

6
lib/process-services/task-list/services/tasklist.service.spec.ts
View File

@@ -17,10 +17,10 @@
import { async, TestBed } from '@angular/core/testing';
import { UserProcessModel } from '@alfresco/adf-core';
import { Observable } from 'rxjs/Rx';
import { Observable } from 'rxjs/Observable';
import {
fakeCompletedTaskList,
fakeErrorTaskList,
mockErrorTaskList,
fakeFilter,
fakeFormList,
fakeOpenTaskList,
@@ -125,7 +125,7 @@ xdescribe('Activiti TaskList Service', () => {
jasmine.Ajax.requests.mostRecent().respondWith({
'status': 404,
contentType: 'application/json',
responseText: JSON.stringify(fakeErrorTaskList)
responseText: JSON.stringify(mockErrorTaskList)
});
});

4
lib/process-services/task-list/services/tasklist.service.ts
View File

@@ -17,11 +17,13 @@
import { AlfrescoApiService, LogService } from '@alfresco/adf-core';
import { Injectable } from '@angular/core';
import { Observable, Subject } from 'rxjs/Rx';
import { Observable } from 'rxjs/Observable';
import { Subject } from 'rxjs/Subject';
import { FilterRepresentationModel, TaskQueryRequestRepresentationModel } 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 'rxjs/add/observable/throw';
@Injectable()
export class TaskListService {

4
lib/process-services/task-list/task-list.module.ts
View File

@@ -25,8 +25,8 @@ import { CardViewModule, DataColumnModule, DataTableModule, DirectiveModule, In
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { MaterialModule } from '../material.module';
import { PeopleModule } from '../people';
import { CommentsModule } from '../comments';
import { PeopleModule } from '../people/people.module';
import { CommentsModule } from '../comments/comments.module';
import { ProcessUploadService } from './services/process-upload.service';
import { TaskListService } from './services/tasklist.service';
import { TaskFilterService } from './services/task-filter.service';