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

Disable the attachment component when the task/process is completed (#2351)

Browse Source
This commit is contained in:
Maurizio Vitale
2017-09-19 13:36:05 +01:00
committed by Eugenio Romano
parent d7bd9aa50b
commit 7a31a16178
6 changed files with 61 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
demo-shell-ng2/app/components/activiti/activiti-process-attachments.component.html
View File

@@ -6,13 +6,14 @@
[showNotificationBar]="false">
<adf-process-attachment-list #processAttachList
*ngIf="processId"
[disabled]="isCompletedProcess()"
[processInstanceId]="processId"
(attachmentClick)="onAttachmentClick($event)">
</adf-process-attachment-list>
</adf-upload-drag-area>
<adf-create-process-attachment
*ngIf="isRunning()"
*ngIf="!isCompletedProcess()"
[processInstanceId]="processId"
(success)="onFileUploadComplete($event)">
</adf-create-process-attachment>

4
demo-shell-ng2/app/components/activiti/activiti-process-attachments.component.ts
View File

@@ -67,8 +67,8 @@ export class ActivitiProcessAttachmentsComponent implements OnInit, OnChanges {
this.contentName = content.name;
}
isRunning(): boolean {
return this.processInstance && !this.processInstance.ended;
isCompletedProcess(): boolean {
return this.processInstance && this.processInstance.ended !== undefined && this.processInstance.ended !== null;
}
}

2
demo-shell-ng2/app/components/activiti/activiti-task-attachments.component.html
View File

@@ -7,11 +7,13 @@
<adf-task-attachment-list #taskAttachList
*ngIf="taskId"
[taskId]="taskId"
[disabled]="isCompletedTask()"
(attachmentClick)="onAttachmentClick($event)">
</adf-task-attachment-list>
</adf-upload-drag-area>
<adf-create-task-attachment
*ngIf="!isCompletedTask()"
[taskId]="taskId"
(success)="onFileUploadComplete($event)">
</adf-create-task-attachment>

22
demo-shell-ng2/app/components/activiti/activiti-task-attachments.component.ts
View File

@@ -15,8 +15,9 @@
* limitations under the License.
*/
import { Component, Input, OnInit, ViewChild } from '@angular/core';
import { Component, Input, OnChanges, OnInit, ViewChild } from '@angular/core';
import { ProcessUploadService, TaskAttachmentListComponent } from 'ng2-activiti-tasklist';
import { ActivitiTaskListService } from 'ng2-activiti-tasklist';
import { UploadService } from 'ng2-alfresco-core';
@Component({
@@ -28,7 +29,7 @@ import { UploadService } from 'ng2-alfresco-core';
]
})
export class ActivitiTaskAttachmentsComponent implements OnInit {
export class ActivitiTaskAttachmentsComponent implements OnInit, OnChanges {
@Input()
taskId: string;
@@ -40,7 +41,10 @@ export class ActivitiTaskAttachmentsComponent implements OnInit {
content: Blob;
contentName: string;
constructor(private uploadService: UploadService) {
taskDetails: any;
constructor(private uploadService: UploadService,
private activitiTaskList: ActivitiTaskListService) {
}
@@ -48,6 +52,15 @@ export class ActivitiTaskAttachmentsComponent implements OnInit {
this.uploadService.fileUploadComplete.subscribe(value => this.onFileUploadComplete(value.data));
}
ngOnChanges() {
if (this.taskId) {
this.activitiTaskList.getTaskDetails(this.taskId).map((res) => res).subscribe(
(res: any) => {
this.taskDetails = res;
});
}
}
onFileUploadComplete(content: any) {
this.taskAttachList.add(content);
}
@@ -58,4 +71,7 @@ export class ActivitiTaskAttachmentsComponent implements OnInit {
this.contentName = content.name;
}
isCompletedTask(): boolean {
return this.taskDetails && this.taskDetails.endDate !== undefined && this.taskDetails.endDate !== null;
}
}

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

@@ -231,6 +231,24 @@ describe('ProcessAttachmentListComponent', () => {
});
}));
it('should not show the empty list drag and drop component when is disabled', async(() => {
getProcessRelatedContentSpy.and.returnValue(Observable.of({
'size': 0,
'total': 0,
'start': 0,
'data': []
}));
let change = new SimpleChange(null, '123', true);
component.ngOnChanges({'processInstanceId': change});
component.disabled = true;
fixture.whenStable().then(() => {
fixture.detectChanges();
expect(fixture.nativeElement.querySelector('adf-empty-list .adf-empty-list-drag_drop')).toBeNull();
expect(fixture.nativeElement.querySelector('div[adf-empty-list-header]').innerText.trim()).toEqual('PROCESS-ATTACHMENT.EMPTY.HEADER');
});
}));
it('should show the empty list component when the attachments list is empty for completed process', async(() => {
getProcessRelatedContentSpy.and.returnValue(Observable.of({
'size': 0,

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

@@ -222,6 +222,24 @@ describe('TaskAttachmentList', () => {
});
}));
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': []
}));
let change = new SimpleChange(null, '123', true);
component.ngOnChanges({'taskId': change});
component.disabled = true;
fixture.whenStable().then(() => {
fixture.detectChanges();
expect(fixture.nativeElement.querySelector('adf-empty-list .adf-empty-list-drag_drop')).toBeNull();
expect(fixture.nativeElement.querySelector('div[adf-empty-list-header]').innerText.trim()).toEqual('TASK-ATTACHMENT.EMPTY.HEADER');
});
}));
it('should show the empty list component when the attachments list is empty for completed task', async(() => {
getTaskRelatedContentSpy.and.returnValue(Observable.of({
'size': 0,