From 22ea7451a23465149b59897a268e3483a52b53e9 Mon Sep 17 00:00:00 2001 From: Timothee Guerin Date: Wed, 22 Nov 2017 09:54:08 -0800 Subject: [PATCH] Fix list fetchall --- app/components/pool/graphs/pool-graphs.component.ts | 1 - app/services/core/data/list-view.ts | 13 +++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/components/pool/graphs/pool-graphs.component.ts b/app/components/pool/graphs/pool-graphs.component.ts index af56f025f4..d449358ced 100644 --- a/app/components/pool/graphs/pool-graphs.component.ts +++ b/app/components/pool/graphs/pool-graphs.component.ts @@ -89,7 +89,6 @@ export class PoolGraphsComponent implements OnChanges, OnDestroy { this.nodes = nodes; if (nodes.size !== 0) { - this._stateCounter.updateCount(nodes); this.runningNodesHistory.update(this.nodes); this.runningTaskHistory.update(this.nodes); diff --git a/app/services/core/data/list-view.ts b/app/services/core/data/list-view.ts index a45cd8caac..d7a7f79539 100644 --- a/app/services/core/data/list-view.ts +++ b/app/services/core/data/list-view.ts @@ -106,16 +106,17 @@ export class ListView extends GenericView { - const obs = this._getter.fetchAll(this._params, this._options); - - obs.subscribe({ - next: (items) => { + const fetchObs = () => this._getter.fetchAll(this._params, this._options); + return this.fetchData({ + getData: fetchObs, + next: (items: List) => { this._updateNewKeys(this._retrieveKeys(items)); this._hasMore.next(false); }, - error: (e) => this._hasMore.next(false), + error: (error) => { + this._hasMore.next(false); + }, }); - return obs; } /**