inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-06-30 18:15:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ADF-2412] Task List - refactoring. (#3034)

Browse Source 
* Removed initStream method.
This commit is contained in:
siva kumar 2018-03-06 19:29:25 +05:30 committed by Eugenio Romano
parent 43ce4a195a
commit d867d5f4a9
1 changed files with 21 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
lib/process-services/task-list/components/task-list.component.ts
View File

@ -39,7 +39,6 @@ import {
EventEmitter, EventEmitter,
Input, Input,
OnChanges, OnChanges,
OnInit,
Output, Output,
SimpleChanges SimpleChanges
} from '@angular/core'; } from '@angular/core';
@ -56,7 +55,7 @@ import { TaskListService } from './../services/tasklist.service';
templateUrl: './task-list.component.html', templateUrl: './task-list.component.html',
styleUrls: ['./task-list.component.css'] styleUrls: ['./task-list.component.css']
}) })
export class TaskListComponent implements OnChanges, OnInit, AfterContentInit, PaginatedComponent { export class TaskListComponent implements OnChanges, AfterContentInit, PaginatedComponent {
requestNode: TaskQueryRequestRepresentationModel; requestNode: TaskQueryRequestRepresentationModel;
@ -159,7 +158,6 @@ export class TaskListComponent implements OnChanges, OnInit, AfterContentInit, P
* @memberOf TaskListComponent * @memberOf TaskListComponent
*/ */
hasCustomDataSource: boolean = false; hasCustomDataSource: boolean = false;
isStreamLoaded = false;
constructor(private taskListService: TaskListService, constructor(private taskListService: TaskListService,
private appConfig: AppConfigService, private appConfig: AppConfigService,
@ -176,39 +174,12 @@ export class TaskListComponent implements OnChanges, OnInit, AfterContentInit, P
}); });
} }
initStream() {
if (!this.isStreamLoaded) {
this.isStreamLoaded = true;
this.taskListService.tasksList$.subscribe(
(tasks) => {
let instancesRow = this.createDataRow(tasks.data);
this.renderInstances(instancesRow);
this.selectTask(this.landingTaskId);
this.success.emit(tasks);
this.isLoading = false;
this.pagination.next({
count: tasks.data.length,
maxItems: this.size,
skipCount: this.page * this.size,
totalItems: tasks.total
});
}, (error) => {
this.error.emit(error);
this.isLoading = false;
});
}
}
ngOnInit() {
if (this.data === undefined) {
this.data = new ObjectDataTableAdapter();
}
this.initStream();
}
ngAfterContentInit() { ngAfterContentInit() {
this.loadLayoutPresets(); this.loadLayoutPresets();
this.setupSchema(); this.setupSchema();
if (this.appId) {
this.reload();
}
} }
/** /**
@ -225,7 +196,6 @@ export class TaskListComponent implements OnChanges, OnInit, AfterContentInit, P
} }
ngOnChanges(changes: SimpleChanges) { ngOnChanges(changes: SimpleChanges) {
this.initStream();
if (this.isPropertyChanged(changes)) { if (this.isPropertyChanged(changes)) {
this.reload(); this.reload();
} }
@ -264,7 +234,23 @@ export class TaskListComponent implements OnChanges, OnInit, AfterContentInit, P
private load(requestNode: TaskQueryRequestRepresentationModel) { private load(requestNode: TaskQueryRequestRepresentationModel) {
this.isLoading = true; this.isLoading = true;
this.loadTasksByState().subscribe(); this.loadTasksByState().subscribe(
(tasks) => {
let instancesRow = this.createDataRow(tasks.data);
this.renderInstances(instancesRow);
this.selectTask(this.landingTaskId);
this.success.emit(tasks);
this.isLoading = false;
this.pagination.next({
count: tasks.data.length,
maxItems: this.size,
skipCount: this.page * this.size,
totalItems: tasks.total
});
}, (error) => {
this.error.emit(error);
this.isLoading = false;
});
} }
private loadTasksByState(): Observable<TaskListModel> { private loadTasksByState(): Observable<TaskListModel> {