[ADF-1711] Task Attachment list - Fix the TaskService dependency (#2752)

* Fix the TaskService dependency

* Improve doc and remove unused dep
This commit is contained in:
Maurizio Vitale 2017-11-29 12:06:52 +00:00 committed by Eugenio Romano
parent 820763ba0e
commit 18dc0711f9
11 changed files with 55 additions and 29 deletions

View File

@ -72,7 +72,8 @@
"REPORTS-TAB": "Reports", "REPORTS-TAB": "Reports",
"START-TASK": "Start task", "START-TASK": "Start task",
"START-PROCESS": "Start process", "START-PROCESS": "Start process",
"AUDIT-LOG": "Process Audit log" "PROCESS-AUDIT-LOG": "Process Audit log",
"TASK-AUDIT-LOG": "Task Audit log"
}, },
"FORM-LIST": { "FORM-LIST": {
"STORE": "Store", "STORE": "Store",

View File

@ -17,13 +17,16 @@
import { Component, Input, OnChanges, OnInit, ViewChild } from '@angular/core'; import { Component, Input, OnChanges, OnInit, ViewChild } from '@angular/core';
import { ProcessInstance, ProcessService , import { ProcessInstance, ProcessService ,
ProcessAttachmentListComponent } from '@alfresco/adf-process-services'; ProcessAttachmentListComponent, ProcessUploadService } from '@alfresco/adf-process-services';
import { UploadService } from '@alfresco/adf-core'; import { UploadService } from '@alfresco/adf-core';
@Component({ @Component({
selector: 'app-process-attachments', selector: 'app-process-attachments',
templateUrl: './process-attachments.component.html', templateUrl: './process-attachments.component.html',
styleUrls: ['./process-attachments.component.css'] styleUrls: ['./process-attachments.component.css'],
providers: [
{ provide: UploadService, useClass: ProcessUploadService }
]
}) })
export class ProcessAttachmentsComponent implements OnInit, OnChanges { export class ProcessAttachmentsComponent implements OnInit, OnChanges {

View File

@ -73,7 +73,7 @@
</adf-task-details> </adf-task-details>
<hr> <hr>
<div *ngIf="currentTaskId"> <div *ngIf="currentTaskId">
{{'PS-TAB.AUDIT-LOG' | translate}} {{'PS-TAB.TASK-AUDIT-LOG' | translate}}
<button <button
adf-task-audit adf-task-audit
[task-id]="currentTaskId" [task-id]="currentTaskId"
@ -158,7 +158,7 @@
</adf-process-instance-details> </adf-process-instance-details>
<hr> <hr>
<div *ngIf="currentProcessInstanceId"> <div *ngIf="currentProcessInstanceId">
{{'PS-TAB.AUDIT-LOG' | translate}} {{'PS-TAB.PROCESS-AUDIT-LOG' | translate}}
<button adf-process-audit <button adf-process-audit
[process-id]="currentProcessInstanceId" [process-id]="currentProcessInstanceId"
[download]="true" mat-icon-button [download]="true" mat-icon-button

View File

@ -49,11 +49,10 @@ import {
TaskDetailsEvent, TaskDetailsEvent,
TaskFiltersComponent, TaskFiltersComponent,
TaskListComponent, TaskListComponent,
TaskListService, TaskListService
ProcessUploadService
} from '@alfresco/adf-process-services'; } from '@alfresco/adf-process-services';
import { LogService } from '@alfresco/adf-core'; import { LogService } from '@alfresco/adf-core';
import { AlfrescoApiService, UploadService } from '@alfresco/adf-core'; import { AlfrescoApiService } from '@alfresco/adf-core';
import { import {
DataSorting, DataSorting,
ObjectDataRow, ObjectDataRow,
@ -70,9 +69,6 @@ const currentTaskIdNew = '__NEW__';
selector: 'app-process-service', selector: 'app-process-service',
templateUrl: './process-service.component.html', templateUrl: './process-service.component.html',
styleUrls: ['./process-service.component.scss'], styleUrls: ['./process-service.component.scss'],
providers: [
{ provide: UploadService, useClass: ProcessUploadService }
],
encapsulation: ViewEncapsulation.None encapsulation: ViewEncapsulation.None
}) })
export class ProcessServiceComponent implements AfterViewInit, OnDestroy, OnInit { export class ProcessServiceComponent implements AfterViewInit, OnDestroy, OnInit {

View File

@ -16,13 +16,16 @@
*/ */
import { Component, Input, OnChanges, OnInit, ViewChild } from '@angular/core'; import { Component, Input, OnChanges, OnInit, ViewChild } from '@angular/core';
import { TaskListService, TaskAttachmentListComponent, TaskDetailsModel } from '@alfresco/adf-process-services'; import { TaskListService, TaskAttachmentListComponent, TaskDetailsModel, TaskUploadService } from '@alfresco/adf-process-services';
import { UploadService } from '@alfresco/adf-core'; import { UploadService } from '@alfresco/adf-core';
@Component({ @Component({
selector: 'app-task-attachments', selector: 'app-task-attachments',
templateUrl: './task-attachments.component.html', templateUrl: './task-attachments.component.html',
styleUrls: ['./task-attachments.component.css'] styleUrls: ['./task-attachments.component.css'],
providers: [
{ provide: UploadService, useClass: TaskUploadService }
]
}) })
export class TaskAttachmentsComponent implements OnInit, OnChanges { export class TaskAttachmentsComponent implements OnInit, OnChanges {

View File

@ -11,6 +11,23 @@ Displays attached documents on a specified process instance
</adf-process-attachment-list> </adf-process-attachment-list>
``` ```
Make sure to override the UploadService with the ProcessUploadService
```ts
import { UploadService } from '@alfresco/adf-core';
import { ProcessUploadService } from '@alfresco/adf-process-services';
@Component({
selector: 'my-custom-process-attachment',
providers: [
{ provide: UploadService, useClass: ProcessUploadService }
]
})
export class MyCustomProcessAttachmentComponent {
constructor() {}
}
```
### Properties ### Properties
| Name | Type | Description | | Name | Type | Description |

View File

@ -37,6 +37,22 @@ If we want user to be able to upload attachments for empty lists, We can wrap ou
</adf-upload-drag-area> </adf-upload-drag-area>
``` ```
import { UploadService } from '@alfresco/adf-core';
import { TaskUploadService } from '@alfresco/adf-process-services';
Make sure to override the UploadService with the TaskUploadService
```ts
@Component({
selector: 'my-custom-task-attachment',
providers: [
{ provide: UploadService, useClass: TaskUploadService }
]
})
export class MyCustomTaskAttachmentComponent {
constructor() {}
}
```
[Upload Drag Area Component](./upload-drag-area.component.md) [Upload Drag Area Component](./upload-drag-area.component.md)
If the List is empty, the custom no-content template we passed is displayed. If the List is empty, the custom no-content template we passed is displayed.

View File

@ -25,7 +25,6 @@ import { TaskAttachmentListComponent } from './task-attachment-list.component';
import { ProcessAttachmentListComponent } from './process-attachment-list.component'; import { ProcessAttachmentListComponent } from './process-attachment-list.component';
import { CreateProcessAttachmentComponent } from './create-process-attachment.component'; import { CreateProcessAttachmentComponent } from './create-process-attachment.component';
import { AttachmentComponent } from './create-task-attachment.component'; import { AttachmentComponent } from './create-task-attachment.component';
import { ProcessUploadService } from '../task-list/services/process-upload.service';
@NgModule({ @NgModule({
imports: [ imports: [
@ -36,9 +35,6 @@ import { ProcessUploadService } from '../task-list/services/process-upload.servi
TranslateModule, TranslateModule,
DirectiveModule DirectiveModule
], ],
providers: [
ProcessUploadService
],
declarations: [ declarations: [
TaskAttachmentListComponent, TaskAttachmentListComponent,
ProcessAttachmentListComponent, ProcessAttachmentListComponent,

View File

@ -17,16 +17,12 @@
import { ContentService, ThumbnailService } from '@alfresco/adf-core'; import { ContentService, ThumbnailService } from '@alfresco/adf-core';
import { Component, EventEmitter, Input, NgZone, OnChanges, Output, SimpleChanges } from '@angular/core'; import { Component, EventEmitter, Input, NgZone, OnChanges, Output, SimpleChanges } from '@angular/core';
import { ProcessContentService, UploadService } from '@alfresco/adf-core'; import { ProcessContentService } from '@alfresco/adf-core';
import { ProcessUploadService } from '../task-list/services/process-upload.service';
@Component({ @Component({
selector: 'adf-process-attachment-list', selector: 'adf-process-attachment-list',
styleUrls: ['./process-attachment-list.component.scss'], styleUrls: ['./process-attachment-list.component.scss'],
templateUrl: './process-attachment-list.component.html', templateUrl: './process-attachment-list.component.html'
providers: [
{ provide: UploadService, useClass: ProcessUploadService }
]
}) })
export class ProcessAttachmentListComponent implements OnChanges { export class ProcessAttachmentListComponent implements OnChanges {

View File

@ -17,17 +17,13 @@
import { ContentService, ThumbnailService, EmptyListComponent } from '@alfresco/adf-core'; import { ContentService, ThumbnailService, EmptyListComponent } from '@alfresco/adf-core';
import { AfterContentInit, ContentChild, Component, ElementRef, EventEmitter, Input, NgZone, OnChanges, Output, SimpleChanges, ViewChild, ViewEncapsulation } from '@angular/core'; import { AfterContentInit, ContentChild, Component, ElementRef, EventEmitter, Input, NgZone, OnChanges, Output, SimpleChanges, ViewChild, ViewEncapsulation } from '@angular/core';
import { ProcessContentService, UploadService } from '@alfresco/adf-core'; import { ProcessContentService } from '@alfresco/adf-core';
import { TaskUploadService } from '../task-list/services/task-upload.service';
@Component({ @Component({
selector: 'adf-task-attachment-list', selector: 'adf-task-attachment-list',
styleUrls: ['./task-attachment-list.component.scss'], styleUrls: ['./task-attachment-list.component.scss'],
templateUrl: './task-attachment-list.component.html', templateUrl: './task-attachment-list.component.html',
encapsulation: ViewEncapsulation.None, encapsulation: ViewEncapsulation.None
providers: [
{ provide: UploadService, useClass: TaskUploadService }
]
}) })
export class TaskAttachmentListComponent implements OnChanges, AfterContentInit { export class TaskAttachmentListComponent implements OnChanges, AfterContentInit {

View File

@ -27,6 +27,7 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { MaterialModule } from '../material.module'; import { MaterialModule } from '../material.module';
import { PeopleModule } from '../people/people.module'; import { PeopleModule } from '../people/people.module';
import { CommentsModule } from '../comments/comments.module'; import { CommentsModule } from '../comments/comments.module';
import { TaskUploadService } from './services/task-upload.service';
import { ProcessUploadService } from './services/process-upload.service'; import { ProcessUploadService } from './services/process-upload.service';
import { TaskListService } from './services/tasklist.service'; import { TaskListService } from './services/tasklist.service';
import { TaskFilterService } from './services/task-filter.service'; import { TaskFilterService } from './services/task-filter.service';
@ -70,6 +71,7 @@ import { TaskListComponent } from './components/task-list.component';
providers: [ providers: [
TaskListService, TaskListService,
TaskFilterService, TaskFilterService,
TaskUploadService,
ProcessUploadService, ProcessUploadService,
DatePipe DatePipe
], ],