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

fix thumbnail task process list (#1951)

Browse Source
This commit is contained in:
Eugenio Romano
2017-06-09 18:17:25 +01:00
parent 5f9132fa49
commit 7aa3426c2f
3 changed files with 45 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ng2-components/ng2-activiti-processlist/src/components/adf-process-attachment-list.component.html
View File

@@ -8,7 +8,7 @@
(showRowActionsMenu)="onShowRowActionsMenu($event)" (showRowActionsMenu)="onShowRowActionsMenu($event)"
(executeRowAction)="onExecuteRowAction($event)"> (executeRowAction)="onExecuteRowAction($event)">
<data-columns> <data-columns>
<data-column key="icon" type="image" class="icon-cell" srTitle="Thumbnail" [sortable]="false"></data-column> <data-column key="icon" type="icon" srTitle="Thumbnail" [sortable]="false"></data-column>
<data-column key="name" type="text" title="Name" class="full-width ellipsis-cell" [sortable]="true"></data-column> <data-column key="name" type="text" title="Name" class="full-width ellipsis-cell" [sortable]="true"></data-column>
<data-column key="created" type="date" format="shortDate" title="Created On"></data-column> <data-column key="created" type="date" format="shortDate" title="Created On"></data-column>
</data-columns> </data-columns>

62
ng2-components/ng2-activiti-processlist/src/components/adf-process-attachment-list.component.spec.ts
View File

@@ -36,6 +36,7 @@ describe('Activiti Process Instance Attachment List', () => {
let getProcessRelatedContentSpy: jasmine.Spy; let getProcessRelatedContentSpy: jasmine.Spy;
let deleteContentSpy: jasmine.Spy; let deleteContentSpy: jasmine.Spy;
let getFileRawContentSpy: jasmine.Spy; let getFileRawContentSpy: jasmine.Spy;
let mockAttachment: any;
beforeEach(async(() => { beforeEach(async(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
@@ -59,31 +60,30 @@ describe('Activiti Process Instance Attachment List', () => {
component = fixture.componentInstance; component = fixture.componentInstance;
service = fixture.debugElement.injector.get(ActivitiContentService); service = fixture.debugElement.injector.get(ActivitiContentService);
getProcessRelatedContentSpy = spyOn(service, 'getProcessRelatedContent').and.returnValue(Observable.of( mockAttachment = {
{ 'size': 2,
'size': 2, 'total': 2,
'total': 2, 'start': 0,
'start': 0, 'data': [{
'data': [{ 'id': 4001,
'id': 4001, 'name': 'Invoice01.pdf',
'name': 'Invoice01.pdf', 'created': '2017-05-12T12:50:05.522+0000',
'created': '2017-05-12T12:50:05.522+0000', 'createdBy': {
'createdBy': { 'id': 1,
'id': 1, 'firstName': 'Apps',
'firstName': 'Apps', 'lastName': 'Administrator',
'lastName': 'Administrator', 'email': 'admin@app.activiti.com',
'email': 'admin@app.activiti.com', 'company': 'Alfresco.com',
'company': 'Alfresco.com', 'pictureId': 3003
'pictureId': 3003
},
'relatedContent': true,
'contentAvailable': true,
'link': false,
'mimeType': 'application/pdf',
'simpleType': 'pdf',
'previewStatus': 'created',
'thumbnailStatus': 'created'
}, },
'relatedContent': true,
'contentAvailable': true,
'link': false,
'mimeType': 'application/pdf',
'simpleType': 'pdf',
'previewStatus': 'created',
'thumbnailStatus': 'created'
},
{ {
'id': 4002, 'id': 4002,
'name': 'Invoice02.pdf', 'name': 'Invoice02.pdf',
@@ -104,7 +104,9 @@ describe('Activiti Process Instance Attachment List', () => {
'previewStatus': 'created', 'previewStatus': 'created',
'thumbnailStatus': 'created' 'thumbnailStatus': 'created'
}] }]
})); };
getProcessRelatedContentSpy = spyOn(service, 'getProcessRelatedContent').and.returnValue(Observable.of(mockAttachment));
deleteContentSpy = spyOn(service, 'deleteRelatedContent').and.returnValue(Observable.of({successCode: true})); deleteContentSpy = spyOn(service, 'deleteRelatedContent').and.returnValue(Observable.of({successCode: true}));
@@ -134,6 +136,16 @@ describe('Activiti Process Instance Attachment List', () => {
expect(emitSpy).toHaveBeenCalled(); expect(emitSpy).toHaveBeenCalled();
}); });
it('should emit a success event when the attachments are loaded', () => {
let change = new SimpleChange(null, '123', true);
component.success.subscribe((attachments) => {
expect(attachments[0].name).toEqual(mockAttachment.data[0].name);
expect(attachments[0].id).toEqual(mockAttachment.data[0].id);
});
component.ngOnChanges({'taskId': change});
});
it('should not attach when no processInstanceId is specified', () => { it('should not attach when no processInstanceId is specified', () => {
fixture.detectChanges(); fixture.detectChanges();
expect(getProcessRelatedContentSpy).not.toHaveBeenCalled(); expect(getProcessRelatedContentSpy).not.toHaveBeenCalled();

13
ng2-components/ng2-activiti-processlist/src/components/adf-process-attachment-list.component.ts
View File

@@ -32,6 +32,9 @@ export class ActivitiProcessAttachmentListComponent implements OnChanges {
@Output() @Output()
attachmentClick = new EventEmitter(); attachmentClick = new EventEmitter();
@Output()
success = new EventEmitter();
@Output() @Output()
error: EventEmitter<any> = new EventEmitter<any>(); error: EventEmitter<any> = new EventEmitter<any>();
@@ -42,14 +45,13 @@ export class ActivitiProcessAttachmentListComponent implements OnChanges {
private contentService: ContentService) { private contentService: ContentService) {
if (translateService) { if (translateService) {
translateService.addTranslationFolder('ng2-activiti-processlist', 'node_modules/ng2-activiti-processlist/src'); translateService.addTranslationFolder('ng2-activiti-processlist', 'assets/ng2-activiti-processlist');
} }
} }
ngOnChanges(changes: SimpleChanges) { ngOnChanges(changes: SimpleChanges) {
if (changes['processInstanceId'] && changes['processInstanceId'].currentValue) { if (changes['processInstanceId'] && changes['processInstanceId'].currentValue) {
this.processInstanceId = changes['processInstanceId'].currentValue; this.loadAttachmentsByProcessInstanceId(changes['processInstanceId'].currentValue);
this.loadAttachmentsByProcessInstanceId(this.processInstanceId);
} }
} }
@@ -71,7 +73,7 @@ export class ActivitiProcessAttachmentListComponent implements OnChanges {
icon: this.activitiContentService.getMimeTypeIcon(content.mimeType) icon: this.activitiContentService.getMimeTypeIcon(content.mimeType)
}); });
}); });
this.success.emit(this.attachments);
}, },
(err) => { (err) => {
this.error.emit(err); this.error.emit(err);
@@ -149,9 +151,6 @@ export class ActivitiProcessAttachmentListComponent implements OnChanges {
); );
} }
/**
* Invoke content download.
*/
downloadContent(content: any): void { downloadContent(content: any): void {
this.activitiContentService.getFileRawContent(content.id).subscribe( this.activitiContentService.getFileRawContent(content.id).subscribe(
(blob: Blob) => this.contentService.downloadBlob(blob, content.name), (blob: Blob) => this.contentService.downloadBlob(blob, content.name),