inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-05-19 17:14:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ADF - 1030] Datatable - enable isLoading to show the spinner in all the components (#2063)

Browse Source 
* added spinner module and  translate text for process-list component

* added spinner loader for data-table in processlist-variable component

* added spinner loader for data-table in processlist component

* added spinner loader for data-table in process-attachmentlist component

* added spinner module and translate text for tasklist component

* changed css for adf-datatable: selector changed in component

* added spinner loader for data-table in tasklist component

* added spinner loader for data-table in task-attachmentlist component

* removed no-content template from task/process attachment list

* fixed tasklist testcase issues

* changed imort order for test cases

* fixed testcase issue in processlist component
This commit is contained in:
Infad Kachancheri 2017-07-11 21:14:09 +05:30 committed by Eugenio Romano
parent 7772f92e64
commit ae3f5078d1
23 changed files with 224 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ng2-components/ng2-activiti-processlist/index.ts
View File

@ -20,6 +20,7 @@ import { ActivitiFormModule } from 'ng2-activiti-form';
import { ActivitiTaskListModule } from 'ng2-activiti-tasklist';
import { CoreModule } from 'ng2-alfresco-core';
import { DataTableModule } from 'ng2-alfresco-datatable';
import { MdProgressSpinnerModule } from '@angular/material';
import {
ActivitiCreateProcessAttachmentComponent,
@ -75,7 +76,8 @@ export const ACTIVITI_PROCESSLIST_PROVIDERS: [any] = [
CoreModule,
DataTableModule,
ActivitiFormModule,
ActivitiTaskListModule
ActivitiTaskListModule,
MdProgressSpinnerModule
],
declarations: [
...ACTIVITI_PROCESSLIST_DIRECTIVES

13
ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-variables.component.css Normal file
View File

@ -0,0 +1,13 @@
.adf-variable-list-loading-margin {
margin-left: calc((100% - 100px) / 2);
margin-right: calc((100% - 100px) / 2);
}
.no-content-message {
font-family: Muli;
font-size: 16px;
font-weight: bold;
text-align: center;
opacity: 0.54;
color: #000;
}

31
ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-variables.component.html
View File

@ -4,15 +4,34 @@
</div>
<div *ngIf="!isListEmpty()">
<adf-datatable [data]="data" [actions]="true" (showRowActionsMenu)="onShowRowActionsMenu($event)"
(executeRowAction)="onExecuteRowAction($event)"></adf-datatable>
</div>
<div *ngIf="isListEmpty()" data-automation-id="variables-none">
<div>
<adf-datatable
[data]="data"
[actions]="true"
[loading]="isLoading()"
(showRowActionsMenu)="onShowRowActionsMenu($event)"
(executeRowAction)="onExecuteRowAction($event)">
<loading-content-template>
<ng-template>
<!--Add your custom loading template here-->
<md-progress-spinner
class="adf-variable-list-loading-margin"
[color]="'primary'"
[mode]="'indeterminate'">
</md-progress-spinner>
</ng-template>
</loading-content-template>
<no-content-template>
<!--Add your custom empty template here-->
<ng-template>
<div class="no-content-message">
{{ 'DETAILS.VARIABLES.NONE' | translate }}
</div>
</ng-template>
</no-content-template>
</adf-datatable>
</div>
<dialog class="mdl-dialog add-dialog" #addDialog>
<h4 class="mdl-dialog__title">{{ 'DETAILS.VARIABLES.ADD_DIALOG.TITLE' |translate }}</h4>
<div class="mdl-dialog__content">

16
ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-variables.component.spec.ts
View File

@ -17,6 +17,7 @@
import { DebugElement, SimpleChange } from '@angular/core';
import { async, ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
import { MdProgressSpinnerModule } from '@angular/material';
import { By } from '@angular/platform-browser';
import { Observable } from 'rxjs/Rx';
@ -41,7 +42,8 @@ describe('ActivitiProcessInstanceVariables', () => {
TestBed.configureTestingModule({
imports: [
CoreModule.forRoot(),
DataTableModule.forRoot()
DataTableModule.forRoot(),
MdProgressSpinnerModule
],
declarations: [
ActivitiProcessInstanceVariables
@ -98,14 +100,6 @@ describe('ActivitiProcessInstanceVariables', () => {
expect(getVariablesSpy).not.toHaveBeenCalled();
});
it('should not display list when no processInstanceId is specified', fakeAsync(() => {
fixture.detectChanges();
fixture.whenStable();
tick();
let datatable: DebugElement = fixture.debugElement.query(By.css('adf-datatable'));
expect(datatable).toBeNull();
}));
it('should use the default schemaColumn as default', () => {
fixture.detectChanges();
expect(component.data.getColumns()).toBeDefined();
@ -173,8 +167,10 @@ describe('ActivitiProcessInstanceVariables', () => {
it('should set a placeholder message when processInstanceId changed to null', () => {
component.ngOnChanges({ 'processInstanceId': nullChange });
fixture.whenStable().then(() => {
fixture.detectChanges();
expect(fixture.debugElement.query(By.css('[data-automation-id="variables-none"]'))).not.toBeNull();
expect(fixture.nativeElement.querySelector('adf-empty-list .empty-list__this-space-is-empty').innerHTML).toEqual('This list is empty');
});
});
});

11
ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-variables.component.ts
View File

@ -28,7 +28,7 @@ declare let dialogPolyfill: any;
@Component({
selector: 'adf-process-instance-variables, activiti-process-instance-variables',
templateUrl: './activiti-process-instance-variables.component.html',
styleUrls: [],
styleUrls: ['./activiti-process-instance-variables.component.css'],
providers: [ActivitiProcessService]
})
export class ActivitiProcessInstanceVariables implements OnInit, OnChanges {
@ -61,6 +61,8 @@ export class ActivitiProcessInstanceVariables implements OnInit, OnChanges {
variableValue: string;
variableScope: string;
loadingFlag: boolean = true;
/**
* Constructor
* @param translate Translation service
@ -144,13 +146,16 @@ export class ActivitiProcessInstanceVariables implements OnInit, OnChanges {
private getProcessInstanceVariables(processInstanceId: string) {
if (processInstanceId) {
this.loadingFlag = true;
this.activitiProcess.getProcessInstanceVariables(processInstanceId).subscribe(
(res: ProcessInstanceVariable[]) => {
let instancesRow = this.createDataRow(res);
this.renderInstances(instancesRow);
this.loadingFlag = false;
},
(err) => {
this.error.emit(err);
this.loadingFlag = false;
}
);
} else {
@ -270,4 +275,8 @@ export class ActivitiProcessInstanceVariables implements OnInit, OnChanges {
{ id: 'edit', title: 'Edit' }
];
}
isLoading() {
return this.loadingFlag;
}
}

20
ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.css
View File

@ -1,15 +1,29 @@
alfresco-datatable >>> .column-header {
adf-datatable >>> .column-header {
color: #232323;
font-size: 15px;
}
alfresco-datatable >>> .data-cell {
adf-datatable >>> .data-cell {
cursor: pointer !important;
}
alfresco-datatable >>> .cell-value{
adf-datatable >>> .cell-value{
width: 250px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis
}
.adf-process-list-loading-margin {
margin-left: calc((100% - 100px) / 2);
margin-right: calc((100% - 100px) / 2);
}
.no-content-message {
font-family: Muli;
font-size: 16px;
font-weight: bold;
text-align: center;
opacity: 0.54;
color: #000;
}

24
ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.html
View File

@ -1,12 +1,28 @@
<div *ngIf="!requestNode">{{ 'FILTERS.MESSAGES.NONE' | translate }}</div>
<div *ngIf="requestNode">
<div *ngIf="!isListEmpty()">
<div>
<adf-datatable
[data]="data"
[loading]="isLoading()"
(rowClick)="onRowClick($event)">
</adf-datatable>
</div>
<div *ngIf="isListEmpty()">
<loading-content-template>
<ng-template>
<!--Add your custom loading template here-->
<md-progress-spinner
class="adf-process-list-loading-margin"
[color]="'primary'"
[mode]="'indeterminate'">
</md-progress-spinner>
</ng-template>
</loading-content-template>
<no-content-template>
<!--Add your custom empty template here-->
<ng-template>
<div class="no-content-message">
{{ 'PROCESSLIST.NONE' | translate }}
</div>
</ng-template>
</no-content-template>
</adf-datatable>
</div>
</div>

4
ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.spec.ts
View File

@ -17,6 +17,7 @@
import { SimpleChange } from '@angular/core';
import { async, ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
import { MdProgressSpinnerModule } from '@angular/material';
import { Observable } from 'rxjs/Rx';
import { ActivitiProcessInstanceListComponent } from './activiti-processlist.component';
@ -39,7 +40,8 @@ describe('ActivitiProcessInstanceListComponent', () => {
TestBed.configureTestingModule({
imports: [
CoreModule.forRoot(),
DataTableModule.forRoot()
DataTableModule.forRoot(),
MdProgressSpinnerModule
],
declarations: [ ActivitiProcessInstanceListComponent ],
providers: [

8
ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.ts
View File

@ -62,6 +62,7 @@ export class ActivitiProcessInstanceListComponent implements OnChanges, AfterCon
onError: EventEmitter<any> = new EventEmitter<any>();
currentInstanceId: string;
loadingFlag: boolean = true;
private defaultSchema: DataColumn[] = [
{ type: 'text', key: 'name', title: 'Name', cssClass: 'full-width name-column', sortable: true },
@ -140,6 +141,7 @@ export class ActivitiProcessInstanceListComponent implements OnChanges, AfterCon
}
private load(requestNode: ProcessFilterRequestRepresentation) {
this.loadingFlag = true;
this.processService.getProcessInstances(requestNode)
.subscribe(
(response) => {
@ -147,9 +149,11 @@ export class ActivitiProcessInstanceListComponent implements OnChanges, AfterCon
this.renderInstances(instancesRow);
this.selectFirst();
this.onSuccess.emit(response);
this.loadingFlag = false;
},
error => {
this.onError.emit(error);
this.loadingFlag = false;
});
}
@ -275,4 +279,8 @@ export class ActivitiProcessInstanceListComponent implements OnChanges, AfterCon
};
return new ProcessFilterRequestRepresentation(requestNode);
}
isLoading() {
return this.loadingFlag;
}
}

14
ng2-components/ng2-activiti-processlist/src/components/adf-process-attachment-list.component.css
View File

@ -1,17 +1,13 @@
alfresco-datatable >>> .column-header {
adf-datatable >>> .column-header {
color: #232323;
font-size: 15px;
}
alfresco-datatable >>> .data-cell {
adf-datatable >>> .data-cell {
cursor: pointer !important;
}
.no-attachment-message {
border: 1px solid rgb(224, 224, 224);
background: #fff;
text-align: left;
border-top: none;
padding: 10px;
text-align: center;
.adf-attachment-list-loading-margin {
margin-left: calc((100% - 100px) / 2);
margin-right: calc((100% - 100px) / 2);
}

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

@ -1,6 +1,7 @@
<adf-datatable
[rows]="attachments"
[actions]="true"
[loading]="isLoading()"
(rowDblClick)="openContent($event)"
(showRowActionsMenu)="onShowRowActionsMenu($event)"
(executeRowAction)="onExecuteRowAction($event)">
@ -10,4 +11,14 @@
<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-columns>
<loading-content-template>
<ng-template>
<!--Add your custom loading template here-->
<md-progress-spinner
class="adf-attachment-list-loading-margin"
[color]="'primary'"
[mode]="'indeterminate'">
</md-progress-spinner>
</ng-template>
</loading-content-template>
</adf-datatable>

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

@ -17,6 +17,7 @@
import { SimpleChange } from '@angular/core';
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { MdProgressSpinnerModule } from '@angular/material';
import { By } from '@angular/platform-browser';
import { TranslateService } from '@ngx-translate/core';
import { ActivitiContentService } from 'ng2-activiti-form';
@ -42,7 +43,8 @@ describe('ActivitiProcessAttachmentListComponent', () => {
TestBed.configureTestingModule({
imports: [
CoreModule.forRoot(),
DataTableModule.forRoot()
DataTableModule.forRoot(),
MdProgressSpinnerModule
],
declarations: [
ActivitiProcessAttachmentListComponent
@ -167,14 +169,14 @@ describe('ActivitiProcessAttachmentListComponent', () => {
}));
it('should show the empty list component when the attachments list is empty', async(() => {
component.processInstanceId = '123';
getProcessRelatedContentSpy.and.returnValue(Observable.of({
'size': 0,
'total': 0,
'start': 0,
'data': []
}));
fixture.detectChanges();
let change = new SimpleChange(null, '123', true);
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');
@ -188,7 +190,6 @@ describe('ActivitiProcessAttachmentListComponent', () => {
beforeEach(async(() => {
component.processInstanceId = '123';
fixture.detectChanges();
fixture.whenStable().then(() => {
getProcessRelatedContentSpy.calls.reset();
});
@ -214,7 +215,6 @@ describe('ActivitiProcessAttachmentListComponent', () => {
beforeEach(async(() => {
component.processInstanceId = '123';
fixture.detectChanges();
fixture.whenStable();
}));

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

@ -39,6 +39,7 @@ export class ActivitiProcessAttachmentListComponent implements OnChanges {
error: EventEmitter<any> = new EventEmitter<any>();
attachments: any[] = [];
loadingFlag: boolean = true;
constructor(private translateService: AlfrescoTranslationService,
private activitiContentService: ActivitiContentService,
@ -77,6 +78,7 @@ export class ActivitiProcessAttachmentListComponent implements OnChanges {
private loadAttachmentsByProcessInstanceId(processInstanceId: string) {
if (processInstanceId) {
this.reset();
this.loadingFlag = true;
this.activitiContentService.getProcessRelatedContent(processInstanceId).subscribe(
(res: any) => {
res.data.forEach(content => {
@ -89,9 +91,11 @@ export class ActivitiProcessAttachmentListComponent implements OnChanges {
});
});
this.success.emit(this.attachments);
this.loadingFlag = false;
},
(err) => {
this.error.emit(err);
this.loadingFlag = false;
});
}
}
@ -174,4 +178,8 @@ export class ActivitiProcessAttachmentListComponent implements OnChanges {
}
);
}
isLoading() {
return this.loadingFlag;
}
}

5
ng2-components/ng2-activiti-tasklist/index.ts
View File

@ -17,7 +17,7 @@
import { DatePipe } from '@angular/common';
import { ModuleWithProviders, NgModule } from '@angular/core';
import { MdButtonModule, MdIconModule, MdInputModule } from '@angular/material';
import { MdButtonModule, MdIconModule, MdInputModule, MdProgressSpinnerModule } from '@angular/material';
import { ActivitiFormModule } from 'ng2-activiti-form';
import { CoreModule } from 'ng2-alfresco-core';
import { DataTableModule } from 'ng2-alfresco-datatable';
@ -80,7 +80,8 @@ export const ACTIVITI_TASKLIST_PROVIDERS: any[] = [
ActivitiFormModule,
MdIconModule,
MdButtonModule,
MdInputModule
MdInputModule,
MdProgressSpinnerModule
],
declarations: [
...ACTIVITI_TASKLIST_DIRECTIVES

13
ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.css
View File

@ -38,26 +38,27 @@
.assignment-list-container {
padding: 0px;
width: 100%;
}
adf-people-list >>> alfresco-datatable >>> thead {
adf-people-list >>> adf-datatable >>> thead {
display: none;
}
adf-people-list >>> alfresco-datatable >>> .people-full-name {
adf-people-list >>> adf-datatable >>> .people-full-name {
font-family: 'Muli';
}
adf-people-list >>> alfresco-datatable >>> .people-email {
adf-people-list >>> adf-datatable >>> .people-email {
font-family: 'Muli';
opacity: 0.54;
}
adf-people-list >>> alfresco-datatable >>> .people-edit-label {
adf-people-list >>> adf-datatable >>> .people-edit-label {
font-family: 'Muli';
}
adf-people-list >>> alfresco-datatable >>> .people-pic {
adf-people-list >>> adf-datatable >>> .people-pic {
background: #ffc800;
padding: 12px 10px;
border-radius: 100px;
@ -69,6 +70,6 @@ adf-people-list >>> alfresco-datatable >>> .people-pic {
text-transform: uppercase
}
adf-people-list >>> alfresco-datatable >>> td.mdl-data-table__cell--non-numeric.non-selectable.data-cell{
adf-people-list >>> adf-datatable >>> td.mdl-data-table__cell--non-numeric.non-selectable.data-cell{
padding: 10px;
}

14
ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.css
View File

@ -13,3 +13,17 @@ alfresco-datatable >>> .cell-value{
overflow: hidden;
text-overflow: ellipsis
}
.adf-task-list-loading-margin {
margin-left: calc((100% - 100px) / 2);
margin-right: calc((100% - 100px) / 2);
}
.no-content-message {
font-family: Muli;
font-size: 16px;
font-weight: bold;
text-align: center;
opacity: 0.54;
color: #000;
}

24
ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.html
View File

@ -1,12 +1,28 @@
<div *ngIf="!requestNode">{{ 'TASK_FILTERS.MESSAGES.NONE' | translate }}</div>
<div *ngIf="requestNode">
<div *ngIf="!isListEmpty()">
<div>
<adf-datatable
[data]="data"
[loading]="isLoading()"
(rowClick)="onRowClick($event)">
</adf-datatable>
</div>
<div *ngIf="isListEmpty()">
<loading-content-template>
<ng-template>
<!--Add your custom loading template here-->
<md-progress-spinner
class="adf-task-list-loading-margin"
[color]="'primary'"
[mode]="'indeterminate'">
</md-progress-spinner>
</ng-template>
</loading-content-template>
<no-content-template>
<!--Add your custom empty template here-->
<ng-template>
<div class="no-content-message">
{{ 'TASK_LIST.MESSAGES.NONE' | translate }}
</div>
</ng-template>
</no-content-template>
</adf-datatable>
</div>
</div>

4
ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.spec.ts
View File

@ -17,6 +17,7 @@
import { SimpleChange } from '@angular/core';
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { MdProgressSpinnerModule } from '@angular/material';
import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core';
import { DataTableModule } from 'ng2-alfresco-datatable';
import { DataRowEvent, ObjectDataRow, ObjectDataTableAdapter } from 'ng2-alfresco-datatable';
@ -87,7 +88,8 @@ describe('ActivitiTaskList', () => {
TestBed.configureTestingModule({
imports: [
CoreModule.forRoot(),
DataTableModule
DataTableModule,
MdProgressSpinnerModule
],
declarations: [
ActivitiTaskList

10
ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.ts
View File

@ -82,6 +82,8 @@ export class ActivitiTaskList implements OnChanges, AfterContentInit {
currentInstanceId: string;
loadingFlag: boolean = true;
/**
* Toggles custom data source mode.
* When enabled the component reloads data from it's current source instead of the server side.
@ -180,6 +182,7 @@ export class ActivitiTaskList implements OnChanges, AfterContentInit {
}
private load(requestNode: TaskQueryRequestRepresentationModel) {
this.loadingFlag = true;
this.taskListService.getTotalTasks(requestNode).subscribe(
(res) => {
requestNode.size = res.total;
@ -189,11 +192,14 @@ export class ActivitiTaskList implements OnChanges, AfterContentInit {
this.renderInstances(instancesRow);
this.selectTask(requestNode.landingTaskId);
this.onSuccess.emit(response);
this.loadingFlag = false;
}, (error) => {
this.onError.emit(error);
this.loadingFlag = false;
});
}, (err) => {
this.onError.emit(err);
this.loadingFlag = false;
});
}
@ -300,4 +306,8 @@ export class ActivitiTaskList implements OnChanges, AfterContentInit {
};
return new TaskQueryRequestRepresentationModel(requestNode);
}
isLoading() {
return this.loadingFlag;
}
}

14
ng2-components/ng2-activiti-tasklist/src/components/adf-task-attachment-list.component.css
View File

@ -1,17 +1,13 @@
alfresco-datatable >>> .column-header {
adf-datatable >>> .column-header {
color: #232323;
font-size: 15px;
}
alfresco-datatable >>> .data-cell {
adf-datatable >>> .data-cell {
cursor: pointer !important;
}
.no-attachment-message {
border: 1px solid rgb(224, 224, 224);
background: #fff;
text-align: left;
border-top: none;
padding: 10px;
text-align: center;
.adf-attachment-list-loading-margin {
margin-left: calc((100% - 100px) / 2);
margin-right: calc((100% - 100px) / 2);
}

11
ng2-components/ng2-activiti-tasklist/src/components/adf-task-attachment-list.component.html
View File

@ -1,6 +1,7 @@
<adf-datatable
[rows]="attachments"
[actions]="true"
[loading]="isLoading()"
(rowDblClick)="openContent($event)"
(showRowActionsMenu)="onShowRowActionsMenu($event)"
(executeRowAction)="onExecuteRowAction($event)">
@ -10,4 +11,14 @@
<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="Date"></data-column>
</data-columns>
<loading-content-template>
<ng-template>
<!--Add your custom loading template here-->
<md-progress-spinner
class="adf-attachment-list-loading-margin"
[color]="'primary'"
[mode]="'indeterminate'">
</md-progress-spinner>
</ng-template>
</loading-content-template>
</adf-datatable>

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

@ -17,6 +17,7 @@
import { SimpleChange } from '@angular/core';
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { MdProgressSpinnerModule } from '@angular/material';
import { By } from '@angular/platform-browser';
import { TranslateService } from '@ngx-translate/core';
import { ActivitiContentService } from 'ng2-activiti-form';
@ -42,7 +43,8 @@ describe('TaskAttachmentList', () => {
TestBed.configureTestingModule({
imports: [
CoreModule.forRoot(),
DataTableModule.forRoot()
DataTableModule.forRoot(),
MdProgressSpinnerModule
],
declarations: [
TaskAttachmentListComponent
@ -163,14 +165,15 @@ describe('TaskAttachmentList', () => {
}));
it('should show the empty list component when the attachments list is empty', async(() => {
component.taskId = '123';
getTaskRelatedContentSpy.and.returnValue(Observable.of({
'size': 0,
'total': 0,
'start': 0,
'data': []
}));
fixture.detectChanges();
let change = new SimpleChange(null, '123', true);
component.ngOnChanges({'taskId': 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');
@ -184,7 +187,6 @@ describe('TaskAttachmentList', () => {
beforeEach(async(() => {
component.taskId = '123';
fixture.detectChanges();
fixture.whenStable().then(() => {
getTaskRelatedContentSpy.calls.reset();
});
@ -210,7 +212,6 @@ describe('TaskAttachmentList', () => {
beforeEach(async(() => {
component.taskId = '123';
fixture.detectChanges();
fixture.whenStable();
}));

9
ng2-components/ng2-activiti-tasklist/src/components/adf-task-attachment-list.component.ts
View File

@ -39,6 +39,7 @@ export class TaskAttachmentListComponent implements OnChanges {
error: EventEmitter<any> = new EventEmitter<any>();
attachments: any[] = [];
loadingFlag: boolean = true;
constructor(private translateService: AlfrescoTranslationService,
private activitiContentService: ActivitiContentService,
@ -76,6 +77,8 @@ export class TaskAttachmentListComponent implements OnChanges {
private loadAttachmentsByTaskId(taskId: string) {
if (taskId) {
this.loadingFlag = true;
this.reset();
this.activitiContentService.getTaskRelatedContent(taskId).subscribe(
(res: any) => {
let attachList = [];
@ -90,9 +93,11 @@ export class TaskAttachmentListComponent implements OnChanges {
});
this.attachments = attachList;
this.success.emit(this.attachments);
this.loadingFlag = false;
},
(err) => {
this.error.emit(err);
this.loadingFlag = false;
});
}
}
@ -175,4 +180,8 @@ export class TaskAttachmentListComponent implements OnChanges {
}
);
}
isLoading() {
return this.loadingFlag;
}
}