From d486e4b90afa455db19a9ef8da00eee70662ac55 Mon Sep 17 00:00:00 2001 From: siva kumar Date: Tue, 15 Aug 2017 19:21:06 +0530 Subject: [PATCH] [ADF-1346] Attachment list component is shown for completed tasks/processes. (#2194) * Added ng-content to adf-empty-list compoent. * Updated css to scss. * Added 'CUSTOM_ELEMENTS_SCHEMA' to allow non-angular elements. * Updated readme.mg file --- .../ng2-activiti-processlist/README.md | 7 +- .../docs/assets/process-attachment-list.png | Bin 16319 -> 0 bytes .../ng2-activiti-processlist/index.ts | 5 +- .../src/assets/images/empty_doc_lib.svg | 208 ++++++++++++++++++ .../process-attachment-list.component.css | 13 -- .../process-attachment-list.component.html | 34 +-- .../process-attachment-list.component.scss | 52 +++++ .../process-attachment-list.component.spec.ts | 72 +++++- .../process-attachment-list.component.ts | 17 +- ...ocess-instance-variables.component.spec.ts | 8 - .../ng2-activiti-processlist/src/i18n/en.json | 12 + .../ng2-activiti-tasklist/README.md | 1 + .../src/assets/images/empty_doc_lib.svg | 208 ++++++++++++++++++ .../task-attachment-list.component.css | 13 -- .../task-attachment-list.component.html | 32 ++- .../task-attachment-list.component.scss} | 26 ++- .../task-attachment-list.component.spec.ts | 73 +++++- .../task-attachment-list.component.ts | 17 +- .../ng2-activiti-tasklist/src/i18n/en.json | 12 + .../ng2-alfresco-datatable/README.md | 14 +- .../datatable/empty-list.component.html | 12 +- .../datatable/empty-list.component.scss | 5 + .../datatable/empty-list.component.spec.ts | 18 +- .../datatable/empty-list.component.ts | 22 +- .../ng2-alfresco-documentlist/index.ts | 5 +- .../content-node-selector.component.spec.ts | 5 +- .../components/document-list.component.css | 10 + .../components/document-list.component.html | 6 +- .../document-list.component.spec.ts | 5 +- 29 files changed, 773 insertions(+), 139 deletions(-) delete mode 100644 ng2-components/ng2-activiti-processlist/docs/assets/process-attachment-list.png create mode 100644 ng2-components/ng2-activiti-processlist/src/assets/images/empty_doc_lib.svg delete mode 100644 ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.css create mode 100644 ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.scss create mode 100644 ng2-components/ng2-activiti-tasklist/src/assets/images/empty_doc_lib.svg delete mode 100644 ng2-components/ng2-activiti-tasklist/src/components/task-attachment-list.component.css rename ng2-components/{ng2-alfresco-datatable/src/components/datatable/empty-list.component.css => ng2-activiti-tasklist/src/components/task-attachment-list.component.scss} (62%) create mode 100644 ng2-components/ng2-alfresco-datatable/src/components/datatable/empty-list.component.scss diff --git a/ng2-components/ng2-activiti-processlist/README.md b/ng2-components/ng2-activiti-processlist/README.md index 285d32e15d..cdcf46ac51 100644 --- a/ng2-components/ng2-activiti-processlist/README.md +++ b/ng2-components/ng2-activiti-processlist/README.md @@ -300,10 +300,10 @@ Displays comments associated with a particular process instance and allows the u This component displays attached documents on a specified process instance ```html - - + (attachmentClick)="YOUR_ATTACHMENT_CLICK_EMITTER_HANDLER"> + ``` ![process-attachment-list-sample](docs/assets/process-attachment-list.png) @@ -312,6 +312,7 @@ This component displays attached documents on a specified process instance | Name | Type | Description | | --- | --- | -- | | processInstanceId | string | (**required**): The ID of the process instance to display | +| disabled | boolean | false | Disable/Enable read only mode for attachement list | ### Events diff --git a/ng2-components/ng2-activiti-processlist/docs/assets/process-attachment-list.png b/ng2-components/ng2-activiti-processlist/docs/assets/process-attachment-list.png deleted file mode 100644 index 23d902bfb4de586ecd665756581208184f7d75cd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16319 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

I4rP^FRHTDU#p$EO zZ&_czenpc}ixe&f)P5U5aZUcc_F^jm{AjT@8@7r%BJY8ArP=p@2R zu2lQ()aCsXmU{6d#KqY;TF_h`U<3h>ev#;sCX16sXI_~G;kSrXR%g%dOPg5m*$7{N zzmAgzeQADn7XIIShSnV!!REVYl>|aRqO}lfePI?7KJ@nbD>7C89bG$2ap1tWsJDjt zpZcAnrH>)2H@mQKMA~06YpK4m(K@edzV->+wc!~r?7K+E+sBPa&qEi}*3w$QzuMY+ zprn3LIZ)fx<&Dzaaq}m#d6+@-v#**&CnqK(y#5>|Sk&A*jPzX!v36|mw5TZPAH?O$ z*$Qc0dH@=}SY&0ZF&z=pRpbwR{%`PPqD>Qz z4Yj^a{lxQE-LtI$1nf9CBl%OocKx0`oBTt^w37gn z2zGr1S2)!bW8((1Ttg$H@gijyaR@2H`anxSEF3T^+qmLuzw?hDKmO4jKl~KiRGt5M zbI+Uk9mds}Br!{QWo6%Cp=7qfV!~NOLuU#5)aq|o;S;HS4Nu}wp;O`b;|Uthh>NMs zNK3`GK0~KMm>`;$^UyW45(7QGi>cdDEu>yn9Yn~1z6I0PkTvm^>{ayiKT14s-~h9j z^SN}*Y`wg|sn_yK#i3F!<=7A#NmhI00n1FDRZc;Hj+XZHsZ;Pf1RYv!PbD^5=jyUO zu((gqF;klp zarOQK!N-BsD2|8^4GbWjm)2$rRURMfJU@2X=Tk&R2KS*u5#&s#zo}rQfsi|LOw_7B zfbu6LvFUHx;VBVVaZXhmPio9omY30jCg9bmiu$e2gA)YHxj=P9j0L3&4TYdna!>}@ z1@s2kd*ey)A&QDTQEX~zVPI8qZ2fa9b$+|R$e`-Vv!bg)-#Z{djET{MX>MxT|Bzk5 zP29-adj+y9>@k!N_y7V_j(wF#=p#0ib-AIwJ_}EjcxHzyr9$o$ah#f%NOpP!3BYs8 z@Y=PP=*s{J<1Jskfc`6+mig(U&0?#Reg?MyIgtL4Xv97$SvBINIAb^+o+ z8n?2xMxqmD(M<1jMpt*Y(#{XKD4Z(9e8_!!mw|og@4AGjjUy(8j+ua`vyF5&T~mIm#u`;A5(3wVyv@GQo~X^^8Rjn}t9$K0P`y zVW6QQ+b4n%^S-W*S4>P7tV@o~$M(VY@ra0U9sBki;esFK-g6isbsBgs$t<@R{zdvb zCRp)FZ{9qjx}v33W0i-_5C5)eefAPq0!&`I!-ubnJw2Xy;}Mk$Bz$;U+dSm8`kz1j z)c`C~Qc@s~;A-OW4WOUfq?x#%fe<7^dV-G+;lRLjlLGztr%xw;{jx27)HtdjFP|VC z;D7Zhx_JiDBETtqebPwYfVIMv!rP%XV0NS;_L*hw}b#O5z$MoqH5~wECyP(tbGDE^pFg? zlctHuRvt;2p>e$&$Ang#CWh&t^^cl2f+#L7~ z52nUYxxgxiCkzyW^cEf~Y000#>s@Va1yEh9>!nx6k_kluNS7)pD$>)_i{UvBm12mM zFuoF>Sm1d|lzz0$dh;cIm8W74sb*2D>6#fB@PalYSjGz9rEJ~Y_kUCoW69EvOGx00 zRDu+QGTfeZc6Pq-N|39>(5(6J;c;XnNK|j7ADFTa+)vPa5O4PS?VuN6Mq|LH@J8g{ zaHcCOr68o0xQ@bY3=?^3Dvc%qucSC{`R1nE#P$<7$n@UaiCKvVIYmf~t&PnJ9yZy2 zPER6$ih`6-=P-!JDVB2r@#w@=<H)cEOLPM*6L|&e{A+u~AFd7tOuqNT0 zE59%zWt2Q?Y|T!iJH2w2-zVB2XxmF5`N3M<-4|rA{x)Q>pnhw4>i0jdvXB|B?%DqC zKlK6b|HU%N?!RTo$NJx%K;QA-+?$oK$^ZHBm{-@&E&i*gU$!WDTFGV-FZcf3zO9QF LROPZ|uHO1D;?MQ` diff --git a/ng2-components/ng2-activiti-processlist/index.ts b/ng2-components/ng2-activiti-processlist/index.ts index afae068b63..ec2dabe4f3 100644 --- a/ng2-components/ng2-activiti-processlist/index.ts +++ b/ng2-components/ng2-activiti-processlist/index.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { ModuleWithProviders, NgModule } from '@angular/core'; +import { ModuleWithProviders, NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { MdButtonModule, MdCardModule, @@ -148,7 +148,8 @@ export const ACTIVITI_PROCESSLIST_PROVIDERS: [any] = [ ], exports: [ ...ACTIVITI_PROCESSLIST_DIRECTIVES - ] + ], + schemas: [ CUSTOM_ELEMENTS_SCHEMA ] }) export class ActivitiProcessListModule { static forRoot(): ModuleWithProviders { diff --git a/ng2-components/ng2-activiti-processlist/src/assets/images/empty_doc_lib.svg b/ng2-components/ng2-activiti-processlist/src/assets/images/empty_doc_lib.svg new file mode 100644 index 0000000000..866acd527b --- /dev/null +++ b/ng2-components/ng2-activiti-processlist/src/assets/images/empty_doc_lib.svg @@ -0,0 +1,208 @@ + + + + empty_doc_lib + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.css b/ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.css deleted file mode 100644 index 5d87a966e7..0000000000 --- a/ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.css +++ /dev/null @@ -1,13 +0,0 @@ -adf-datatable >>> .column-header { - color: #232323; - font-size: 15px; -} - -adf-datatable >>> .data-cell { - cursor: pointer !important; -} - -.adf-attachment-list-loading-margin { - margin-left: calc((100% - 100px) / 2); - margin-right: calc((100% - 100px) / 2); -} diff --git a/ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.html b/ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.html index 510301cc16..de92e55dd8 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.html +++ b/ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.html @@ -1,11 +1,22 @@ - - + + +

{{'PROCESS-ATTACHMENT.EMPTY.HEADER' | translate}}
+ + +
{{'PROCESS-ATTACHMENT.EMPTY.DRAG-AND-DROP.TITLE' | translate}}
+
{{'PROCESS-ATTACHMENT.EMPTY.DRAG-AND-DROP.SUBTITLE' | translate}}
+ + +
+ + + + +
{{'PROCESS-ATTACHMENT.EMPTY-LIST.HEADER' | translate}}
+ + @@ -14,11 +25,8 @@ - + - - + + \ No newline at end of file diff --git a/ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.scss b/ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.scss new file mode 100644 index 0000000000..9679f9fd00 --- /dev/null +++ b/ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.scss @@ -0,0 +1,52 @@ +adf-datatable /deep/ .column-header { + color: #232323; + font-size: 15px; +} + +adf-datatable /deep/ .data-cell { + cursor: pointer !important; +} + +.adf-attachment-list-loading-margin { + margin-left: calc((100% - 100px) / 2); + margin-right: calc((100% - 100px) / 2); +} + +adf-empty-list-header /deep/ div { + height: 32px; + opacity: 0.26 !important; + font-family: Muli, Helvetica, Arial, sans-serif; + font-size: 24px; + line-height: 1.33; + letter-spacing: -1px; + color: #000000; +} + +.adf-empty-list-drag_drop { + height: 56px; + opacity: 0.54; + font-family: Muli, Helvetica, Arial, sans-serif; + font-size: 56px; + line-height: 1; + letter-spacing: -2px; + color: #000000; + margin-top: 40px !important; +} + +.adf-empty-list__any-files-here-to-add { + height: 24px; + opacity: 0.54; + font-family: Muli, Helvetica, Arial, sans-serif; + font-size: 16px; + line-height: 1.5; + letter-spacing: -0.4px; + color: #000000; + margin-top: 17px; +} + +.adf-empty-list__empty_doc_lib { + width: 565px; + height: 161px; + object-fit: contain; + margin-top: 17px; +} \ No newline at end of file diff --git a/ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.spec.ts b/ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.spec.ts index 762d8607e6..52cfa45404 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.spec.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.spec.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { SimpleChange } from '@angular/core'; +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'; @@ -52,7 +52,8 @@ describe('ProcessAttachmentListComponent', () => { providers: [ { provide: AlfrescoTranslationService, useClass: TranslationMock }, ActivitiContentService - ] + ], + schemas: [CUSTOM_ELEMENTS_SCHEMA] }).compileComponents(); })); @@ -168,6 +169,39 @@ describe('ProcessAttachmentListComponent', () => { }); })); + it('should display all actions if attachements are not read only', () => { + let change = new SimpleChange(null, '123', true); + component.ngOnChanges({ 'processInstanceId': change }); + + fixture.detectChanges(); + let actionButton = fixture.debugElement.nativeElement.querySelector('[data-automation-id="action_menu_0"]'); + actionButton.click(); + fixture.whenStable().then(() => { + fixture.detectChanges(); + let actionMenu = fixture.debugElement.nativeElement.querySelectorAll('button.mat-menu-item').length; + expect(fixture.debugElement.nativeElement.querySelector('[data-automation-id="View"]')).not.toBeNull(); + expect(fixture.debugElement.nativeElement.querySelector('[data-automation-id="Remove"]')).not.toBeNull(); + expect(actionMenu).toBe(3); + }); + }); + + it('should not display remove action if attachments are read only', () => { + let change = new SimpleChange(null, '123', true); + component.ngOnChanges({ 'processInstanceId': change }); + component.disabled = true; + + fixture.detectChanges(); + let actionButton = fixture.debugElement.nativeElement.querySelector('[data-automation-id="action_menu_0"]'); + actionButton.click(); + fixture.whenStable().then(() => { + fixture.detectChanges(); + let actionMenu = fixture.debugElement.nativeElement.querySelectorAll('button.mat-menu-item').length; + expect(fixture.debugElement.nativeElement.querySelector('[data-automation-id="View"]')).not.toBeNull(); + expect(fixture.debugElement.nativeElement.querySelector('[data-automation-id="Remove"]')).toBeNull(); + expect(actionMenu).toBe(2); + }); + }); + it('should show the empty list component when the attachments list is empty', async(() => { getProcessRelatedContentSpy.and.returnValue(Observable.of({ 'size': 0, @@ -179,7 +213,39 @@ describe('ProcessAttachmentListComponent', () => { component.ngOnChanges({'processInstanceId': change}); fixture.whenStable().then(() => { fixture.detectChanges(); - expect(fixture.nativeElement.querySelector('adf-empty-list .empty-list__this-space-is-empty').innerHTML).toEqual('ADF-DATATABLE.EMPTY.HEADER'); + expect(fixture.nativeElement.querySelector('adf-empty-list-header').innerText.trim()).toEqual('PROCESS-ATTACHMENT.EMPTY.HEADER'); + }); + })); + + it('should show the empty list drag and drop component when the process is not completed', async(() => { + getProcessRelatedContentSpy.and.returnValue(Observable.of({ + 'size': 0, + 'total': 0, + 'start': 0, + 'data': [] + })); + let change = new SimpleChange(null, '123', true); + component.ngOnChanges({'processInstanceId': change}); + fixture.whenStable().then(() => { + fixture.detectChanges(); + expect(fixture.nativeElement.querySelector('adf-empty-list .adf-empty-list-drag_drop').innerText.trim()).toEqual('PROCESS-ATTACHMENT.EMPTY.DRAG-AND-DROP.TITLE'); + }); + })); + + it('should show the empty list component when the attachments list is empty for completed process', 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-header').innerText.trim()).toEqual('PROCESS-ATTACHMENT.EMPTY-LIST.HEADER'); }); })); diff --git a/ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.ts b/ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.ts index 72c7071239..baaf5edd8c 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.ts @@ -21,7 +21,7 @@ import { ContentService, ThumbnailService } from 'ng2-alfresco-core'; @Component({ selector: 'adf-process-attachment-list', - styleUrls: ['./process-attachment-list.component.css'], + styleUrls: ['./process-attachment-list.component.scss'], templateUrl: './process-attachment-list.component.html' }) export class ProcessAttachmentListComponent implements OnChanges { @@ -29,6 +29,9 @@ export class ProcessAttachmentListComponent implements OnChanges { @Input() processInstanceId: string; + @Input() + disabled: boolean = false; + @Output() attachmentClick = new EventEmitter(); @@ -38,6 +41,9 @@ export class ProcessAttachmentListComponent implements OnChanges { @Output() error: EventEmitter = new EventEmitter(); + @Input() + emptyListImageUrl: string = require('./../assets/images/empty_doc_lib.svg'); + attachments: any[] = []; isLoading: boolean = true; @@ -131,9 +137,12 @@ export class ProcessAttachmentListComponent implements OnChanges { event.value.actions = [ viewAction, - removeAction, downloadAction ]; + + if (!this.disabled) { + event.value.actions.splice(1, 0, removeAction); + } } onExecuteRowAction(event: any) { @@ -173,4 +182,8 @@ export class ProcessAttachmentListComponent implements OnChanges { } ); } + + isDisabled(): boolean { + return this.disabled; + } } diff --git a/ng2-components/ng2-activiti-processlist/src/components/process-instance-variables.component.spec.ts b/ng2-components/ng2-activiti-processlist/src/components/process-instance-variables.component.spec.ts index 6239eb639d..82b5cd1a5b 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/process-instance-variables.component.spec.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/process-instance-variables.component.spec.ts @@ -164,14 +164,6 @@ describe('ProcessInstanceVariablesComponent', () => { component.ngOnChanges({ 'processInstanceId': nullChange }); expect(getVariablesSpy).not.toHaveBeenCalled(); }); - - it('should set a placeholder message when processInstanceId changed to null', () => { - component.ngOnChanges({ 'processInstanceId': nullChange }); - fixture.whenStable().then(() => { - fixture.detectChanges(); - expect(fixture.nativeElement.querySelector('adf-empty-list .empty-list__this-space-is-empty').innerHTML).toEqual('This list is empty'); - }); - }); }); describe('Add variable', () => { diff --git a/ng2-components/ng2-activiti-processlist/src/i18n/en.json b/ng2-components/ng2-activiti-processlist/src/i18n/en.json index 0e2383e288..2cdca83784 100644 --- a/ng2-components/ng2-activiti-processlist/src/i18n/en.json +++ b/ng2-components/ng2-activiti-processlist/src/i18n/en.json @@ -104,5 +104,17 @@ "LOAD_PROCESS_DEFS": "Could not load process definitions, please check you have access.", "START": "Could not start new process instance, please check you have permission." } + }, + "PROCESS-ATTACHMENT": { + "EMPTY": { + "HEADER": "This list is empty", + "DRAG-AND-DROP": { + "TITLE": "Drag and drop", + "SUBTITLE": "any files here to add" + } + }, + "EMPTY-LIST": { + "HEADER": "No documents are available" + } } } diff --git a/ng2-components/ng2-activiti-tasklist/README.md b/ng2-components/ng2-activiti-tasklist/README.md index 9edd27407d..32bd027024 100644 --- a/ng2-components/ng2-activiti-tasklist/README.md +++ b/ng2-components/ng2-activiti-tasklist/README.md @@ -379,6 +379,7 @@ This component displays attached documents on a specified task | Name | Type | Description | | --- | --- | --- | | taskId | string | (**required**): The ID of the task to display | +| disabled | boolean | false | Disable/Enable read only mode for attachement list | ### Events diff --git a/ng2-components/ng2-activiti-tasklist/src/assets/images/empty_doc_lib.svg b/ng2-components/ng2-activiti-tasklist/src/assets/images/empty_doc_lib.svg new file mode 100644 index 0000000000..866acd527b --- /dev/null +++ b/ng2-components/ng2-activiti-tasklist/src/assets/images/empty_doc_lib.svg @@ -0,0 +1,208 @@ + + + + empty_doc_lib + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ng2-components/ng2-activiti-tasklist/src/components/task-attachment-list.component.css b/ng2-components/ng2-activiti-tasklist/src/components/task-attachment-list.component.css deleted file mode 100644 index 88e06d2740..0000000000 --- a/ng2-components/ng2-activiti-tasklist/src/components/task-attachment-list.component.css +++ /dev/null @@ -1,13 +0,0 @@ -adf-datatable >>> .column-header { - color: #232323; - font-size: 15px; -} - -adf-datatable >>> .data-cell { - cursor: pointer !important; -} - -.adf-attachment-list-loading-margin { - margin-left: calc((100% - 100px) / 2); - margin-right: calc((100% - 100px) / 2); -} \ No newline at end of file diff --git a/ng2-components/ng2-activiti-tasklist/src/components/task-attachment-list.component.html b/ng2-components/ng2-activiti-tasklist/src/components/task-attachment-list.component.html index d0c9e62d17..783b6a85e4 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/task-attachment-list.component.html +++ b/ng2-components/ng2-activiti-tasklist/src/components/task-attachment-list.component.html @@ -1,11 +1,22 @@ - - + + +
{{'TASK-ATTACHMENT.EMPTY.HEADER' | translate}}
+ + +
{{'TASK-ATTACHMENT.EMPTY.DRAG-AND-DROP.TITLE' | translate}}
+
{{'TASK-ATTACHMENT.EMPTY.DRAG-AND-DROP.SUBTITLE' | translate}}
+ + +
+ + + + +
{{'TASK-ATTACHMENT.EMPTY-LIST.HEADER' | translate}}
+ + @@ -14,11 +25,8 @@ - + - + \ No newline at end of file diff --git a/ng2-components/ng2-alfresco-datatable/src/components/datatable/empty-list.component.css b/ng2-components/ng2-activiti-tasklist/src/components/task-attachment-list.component.scss similarity index 62% rename from ng2-components/ng2-alfresco-datatable/src/components/datatable/empty-list.component.css rename to ng2-components/ng2-activiti-tasklist/src/components/task-attachment-list.component.scss index 9a8fc48a47..c062ef4a15 100644 --- a/ng2-components/ng2-alfresco-datatable/src/components/datatable/empty-list.component.css +++ b/ng2-components/ng2-activiti-tasklist/src/components/task-attachment-list.component.scss @@ -1,10 +1,18 @@ -.empty-list_empty_template { - text-align: center; - margin-top: 20px; - margin-bottom: 20px; +adf-datatable /deep/ .column-header { + color: #232323; + font-size: 15px; } -.empty-list__this-space-is-empty { +adf-datatable /deep/ .data-cell { + cursor: pointer !important; +} + +.adf-attachment-list-loading-margin { + margin-left: calc((100% - 100px) / 2); + margin-right: calc((100% - 100px) / 2); +} + +adf-empty-list-header /deep/ div { height: 32px; opacity: 0.26; font-family: Muli, Helvetica, Arial, sans-serif; @@ -14,7 +22,7 @@ color: #000000; } -.empty-list__drag-drop { +.adf-empty-list-drag_drop { height: 56px; opacity: 0.54; font-family: Muli, Helvetica, Arial, sans-serif; @@ -25,7 +33,7 @@ margin-top: 40px; } -.empty-list__any-files-here-to-add { +.adf-empty-list__any-files-here-to-add { height: 24px; opacity: 0.54; font-family: Muli, Helvetica, Arial, sans-serif; @@ -36,9 +44,9 @@ margin-top: 17px; } -.empty-list__empty_doc_lib { +.adf-empty-list__empty_doc_lib { width: 565px; height: 161px; object-fit: contain; margin-top: 17px; -} +} \ No newline at end of file diff --git a/ng2-components/ng2-activiti-tasklist/src/components/task-attachment-list.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/task-attachment-list.component.spec.ts index c4ad16e1f9..7ddcb55b88 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/task-attachment-list.component.spec.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/task-attachment-list.component.spec.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { SimpleChange } from '@angular/core'; +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'; @@ -51,7 +51,8 @@ describe('TaskAttachmentList', () => { ], providers: [ ActivitiContentService - ] + ], + schemas: [CUSTOM_ELEMENTS_SCHEMA] }).compileComponents(); let translateService: AlfrescoTranslationService = TestBed.get(AlfrescoTranslationService); @@ -164,6 +165,39 @@ describe('TaskAttachmentList', () => { }); })); + it('should display all actions if attachements are not read only', () => { + let change = new SimpleChange(null, '123', true); + component.ngOnChanges({'taskId': change}); + fixture.detectChanges(); + + let actionButton = fixture.debugElement.nativeElement.querySelector('[data-automation-id="action_menu_0"]'); + actionButton.click(); + fixture.whenStable().then(() => { + fixture.detectChanges(); + let actionMenu = fixture.debugElement.nativeElement.querySelectorAll('button.mat-menu-item').length; + expect(fixture.debugElement.nativeElement.querySelector('[data-automation-id="View"]')).not.toBeNull(); + expect(fixture.debugElement.nativeElement.querySelector('[data-automation-id="Remove"]')).not.toBeNull(); + expect(actionMenu).toBe(3); + }); + }); + + it('should not display remove action if attachments are read only', () => { + let change = new SimpleChange(null, '123', true); + component.ngOnChanges({'taskId': change}); + component.disabled = true; + fixture.detectChanges(); + + let actionButton = fixture.debugElement.nativeElement.querySelector('[data-automation-id="action_menu_0"]'); + actionButton.click(); + fixture.whenStable().then(() => { + fixture.detectChanges(); + let actionMenu = fixture.debugElement.nativeElement.querySelectorAll('button.mat-menu-item').length; + expect(fixture.debugElement.nativeElement.querySelector('[data-automation-id="View"]')).not.toBeNull(); + expect(fixture.debugElement.nativeElement.querySelector('[data-automation-id="Remove"]')).toBeNull(); + expect(actionMenu).toBe(2); + }); + }); + it('should show the empty list component when the attachments list is empty', async(() => { getTaskRelatedContentSpy.and.returnValue(Observable.of({ 'size': 0, @@ -176,7 +210,40 @@ describe('TaskAttachmentList', () => { fixture.whenStable().then(() => { fixture.detectChanges(); - expect(fixture.nativeElement.querySelector('adf-empty-list .empty-list__this-space-is-empty').innerHTML).toEqual('ADF-DATATABLE.EMPTY.HEADER'); + expect(fixture.nativeElement.querySelector('adf-empty-list-header').innerText.trim()).toEqual('TASK-ATTACHMENT.EMPTY.HEADER'); + }); + })); + + it('should show the empty list drag and drop component when the task is not completed', async(() => { + getTaskRelatedContentSpy.and.returnValue(Observable.of({ + 'size': 0, + 'total': 0, + 'start': 0, + 'data': [] + })); + let change = new SimpleChange(null, '123', true); + component.ngOnChanges({'taskId': change}); + + fixture.whenStable().then(() => { + fixture.detectChanges(); + expect(fixture.nativeElement.querySelector('adf-empty-list .adf-empty-list-drag_drop').innerText.trim()).toEqual('TASK-ATTACHMENT.EMPTY.DRAG-AND-DROP.TITLE'); + }); + })); + + it('should show the empty list component when the attachments list is empty for completed task', 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-header').innerText.trim()).toEqual('TASK-ATTACHMENT.EMPTY-LIST.HEADER'); }); })); diff --git a/ng2-components/ng2-activiti-tasklist/src/components/task-attachment-list.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/task-attachment-list.component.ts index ea7b11ebf9..a275001c50 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/task-attachment-list.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/task-attachment-list.component.ts @@ -21,7 +21,7 @@ import { ContentService, ThumbnailService } from 'ng2-alfresco-core'; @Component({ selector: 'adf-task-attachment-list', - styleUrls: ['./task-attachment-list.component.css'], + styleUrls: ['./task-attachment-list.component.scss'], templateUrl: './task-attachment-list.component.html' }) export class TaskAttachmentListComponent implements OnChanges { @@ -29,6 +29,9 @@ export class TaskAttachmentListComponent implements OnChanges { @Input() taskId: string; + @Input() + disabled: boolean = false; + @Output() attachmentClick = new EventEmitter(); @@ -38,6 +41,9 @@ export class TaskAttachmentListComponent implements OnChanges { @Output() error: EventEmitter = new EventEmitter(); + @Input() + emptyListImageUrl: string = require('./../assets/images/empty_doc_lib.svg'); + attachments: any[] = []; isLoading: boolean = true; @@ -133,9 +139,12 @@ export class TaskAttachmentListComponent implements OnChanges { event.value.actions = [ viewAction, - removeAction, downloadAction ]; + + if (!this.disabled) { + event.value.actions.splice(1, 0, removeAction); + } } onExecuteRowAction(event: any) { @@ -175,4 +184,8 @@ export class TaskAttachmentListComponent implements OnChanges { } ); } + + isDisabled(): boolean { + return this.disabled; + } } diff --git a/ng2-components/ng2-activiti-tasklist/src/i18n/en.json b/ng2-components/ng2-activiti-tasklist/src/i18n/en.json index 3a31c90be9..1e93742ed8 100644 --- a/ng2-components/ng2-activiti-tasklist/src/i18n/en.json +++ b/ng2-components/ng2-activiti-tasklist/src/i18n/en.json @@ -100,5 +100,17 @@ "SEARCH": { "NO_USERS": "No user found to involve" } + }, + "TASK-ATTACHMENT": { + "EMPTY": { + "HEADER": "This list is empty", + "DRAG-AND-DROP": { + "TITLE": "Drag and drop", + "SUBTITLE": "any files here to add" + } + }, + "EMPTY-LIST": { + "HEADER": "No documents are available" + } } } diff --git a/ng2-components/ng2-alfresco-datatable/README.md b/ng2-components/ng2-alfresco-datatable/README.md index 77e2affe47..fbbd6df3d0 100644 --- a/ng2-components/ng2-alfresco-datatable/README.md +++ b/ng2-components/ng2-alfresco-datatable/README.md @@ -293,10 +293,12 @@ You can add a template that will be shown when there are no results in your data ``` -### Default Empty content template +### Custom Empty content template You can use the empty list component if you want to show the default ADF empty template: +You can use any HTML layout or Angular component as a content of the empty template section by using the special `, , ` elements: + ```html - + + "'My custom Header'" + "'My custom body'" + "'My custom footer'" + "'HTML Layout'" diff --git a/ng2-components/ng2-alfresco-datatable/src/components/datatable/empty-list.component.html b/ng2-components/ng2-alfresco-datatable/src/components/datatable/empty-list.component.html index 1b62fe0058..b453cc0966 100644 --- a/ng2-components/ng2-alfresco-datatable/src/components/datatable/empty-list.component.html +++ b/ng2-components/ng2-alfresco-datatable/src/components/datatable/empty-list.component.html @@ -1,6 +1,6 @@ -
-
{{ emptyMsg | translate }}
-
{{ dragDropMsg | translate }}
-
{{ additionalMsg | translate }}
- -
+
+ + + + +
\ No newline at end of file diff --git a/ng2-components/ng2-alfresco-datatable/src/components/datatable/empty-list.component.scss b/ng2-components/ng2-alfresco-datatable/src/components/datatable/empty-list.component.scss new file mode 100644 index 0000000000..88f7fbeb68 --- /dev/null +++ b/ng2-components/ng2-alfresco-datatable/src/components/datatable/empty-list.component.scss @@ -0,0 +1,5 @@ +.adf-empty-list_template { + text-align: center; + margin-top: 20px; + margin-bottom: 20px; +} diff --git a/ng2-components/ng2-alfresco-datatable/src/components/datatable/empty-list.component.spec.ts b/ng2-components/ng2-alfresco-datatable/src/components/datatable/empty-list.component.spec.ts index 6ad390d198..df148ad7d2 100644 --- a/ng2-components/ng2-alfresco-datatable/src/components/datatable/empty-list.component.spec.ts +++ b/ng2-components/ng2-alfresco-datatable/src/components/datatable/empty-list.component.spec.ts @@ -41,27 +41,11 @@ describe('EmptyListComponentComponent', () => { expect(component).toBeDefined(); }); - it('should show the default values', async(() => { - fixture.detectChanges(); - fixture.whenStable().then(() => { - fixture.detectChanges(); - expect(fixture.nativeElement.querySelector('.empty-list__this-space-is-empty').innerHTML).toEqual('ADF-DATATABLE.EMPTY.HEADER'); - expect(fixture.nativeElement.querySelector('.empty-list__drag-drop').innerHTML).toEqual('ADF-DATATABLE.EMPTY.DRAG-AND-DROP.TITLE'); - expect(fixture.nativeElement.querySelector('.empty-list__any-files-here-to-add').innerHTML).toEqual('ADF-DATATABLE.EMPTY.DRAG-AND-DROP.SUBTITLE'); - expect(fixture.nativeElement.querySelector('.empty-list__empty_doc_lib').src).toContain('empty_doc_lib'); - }); - })); - it('should render the input values', async(() => { - component.emptyMsg = 'Fake empty msg'; - component.dragDropMsg = 'Fake drag drop msg'; - component.additionalMsg = 'Fake additional msg'; fixture.detectChanges(); fixture.whenStable().then(() => { fixture.detectChanges(); - expect(fixture.nativeElement.querySelector('.empty-list__this-space-is-empty').innerHTML).toEqual('Fake empty msg'); - expect(fixture.nativeElement.querySelector('.empty-list__drag-drop').innerHTML).toEqual('Fake drag drop msg'); - expect(fixture.nativeElement.querySelector('.empty-list__any-files-here-to-add').innerHTML).toEqual('Fake additional msg'); + expect(fixture.nativeElement.querySelector('.adf-empty-list_template')).toBeDefined(); }); })); }); diff --git a/ng2-components/ng2-alfresco-datatable/src/components/datatable/empty-list.component.ts b/ng2-components/ng2-alfresco-datatable/src/components/datatable/empty-list.component.ts index 23e129c773..0385a2ca5a 100644 --- a/ng2-components/ng2-alfresco-datatable/src/components/datatable/empty-list.component.ts +++ b/ng2-components/ng2-alfresco-datatable/src/components/datatable/empty-list.component.ts @@ -15,27 +15,11 @@ * limitations under the License. */ -import { Component, Input } from '@angular/core'; - -declare var require: any; +import { Component } from '@angular/core'; @Component({ selector: 'adf-empty-list', - styleUrls: ['./empty-list.component.css'], + styleUrls: ['./empty-list.component.scss'], templateUrl: './empty-list.component.html' }) -export class EmptyListComponent { - - @Input() - emptyListImageUrl: string = require('../../assets/images/empty_doc_lib.svg'); - - @Input() - emptyMsg: string = 'ADF-DATATABLE.EMPTY.HEADER'; - - @Input() - dragDropMsg: string = 'ADF-DATATABLE.EMPTY.DRAG-AND-DROP.TITLE'; - - @Input() - additionalMsg: string = 'ADF-DATATABLE.EMPTY.DRAG-AND-DROP.SUBTITLE'; - -} +export class EmptyListComponent {} diff --git a/ng2-components/ng2-alfresco-documentlist/index.ts b/ng2-components/ng2-alfresco-documentlist/index.ts index 838828ec85..a5ae3d2913 100644 --- a/ng2-components/ng2-alfresco-documentlist/index.ts +++ b/ng2-components/ng2-alfresco-documentlist/index.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { ModuleWithProviders, NgModule } from '@angular/core'; +import { ModuleWithProviders, NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { CoreModule, TRANSLATION_PROVIDER } from 'ng2-alfresco-core'; import { DataTableModule } from 'ng2-alfresco-datatable'; @@ -109,7 +109,8 @@ export const DOCUMENT_LIST_PROVIDERS: any[] = [ DataTableModule, ...DOCUMENT_LIST_DIRECTIVES, MaterialModule - ] + ], + schemas: [ CUSTOM_ELEMENTS_SCHEMA ] }) export class DocumentListModule { /** @deprecated in 1.8.0 */ diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/content-node-selector/content-node-selector.component.spec.ts b/ng2-components/ng2-alfresco-documentlist/src/components/content-node-selector/content-node-selector.component.spec.ts index 8c2f6255e8..7fe30d8868 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/content-node-selector/content-node-selector.component.spec.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/content-node-selector/content-node-selector.component.spec.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { DebugElement, EventEmitter } from '@angular/core'; +import { CUSTOM_ELEMENTS_SCHEMA, DebugElement, EventEmitter } from '@angular/core'; import { async, ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing'; import { MD_DIALOG_DATA, MdDialogRef } from '@angular/material'; import { By } from '@angular/platform-browser'; @@ -86,7 +86,8 @@ describe('ContentNodeSelectorComponent', () => { DocumentListService, SearchService, ...plusProviders - ] + ], + schemas: [CUSTOM_ELEMENTS_SCHEMA] }); } diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.css b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.css index f2075a3d7d..fac54f630d 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.css +++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.css @@ -59,3 +59,13 @@ flex-direction: row; height: 100%; } + +adf-empty-list-header >>>>div { + height: 32px; + opacity: 0.26 !important; + font-family: Muli, Helvetica, Arial, sans-serif; + font-size: 24px; + line-height: 1.33; + letter-spacing: -1px; + color: #000000; +} \ No newline at end of file diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.html b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.html index 3c8d79d7eb..3f71cbacd8 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.html +++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.html @@ -21,8 +21,10 @@
- + + +
{{'ADF-DOCUMENT-LIST.EMPTY.HEADER' | translate}}
+ diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.spec.ts b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.spec.ts index df06c3e707..c303ca4d6c 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.spec.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.spec.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { NgZone, SimpleChange, TemplateRef } from '@angular/core'; +import { CUSTOM_ELEMENTS_SCHEMA, NgZone, SimpleChange, TemplateRef } from '@angular/core'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core'; import { DataColumn, DataTableComponent } from 'ng2-alfresco-datatable'; @@ -61,7 +61,8 @@ describe('DocumentList', () => { providers: [ DocumentListService, {provide: NgZone, useValue: zone} - ] + ], + schemas: [CUSTOM_ELEMENTS_SCHEMA] }).compileComponents(); }));