From b3593d28da32bdcf35ec91a6e0dd9099b7bd43b2 Mon Sep 17 00:00:00 2001 From: Michal Klobukowski Date: Thu, 26 Jul 2018 13:25:34 +0200 Subject: [PATCH] Fix and make use of DataExplorer getter Feature #13887 Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski --- .../data-explorer/data-explorer-middleware-service.ts | 9 +++++---- .../favorite-panel/favorite-panel-middleware-service.ts | 2 +- .../project-panel/project-panel-middleware-service.ts | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/store/data-explorer/data-explorer-middleware-service.ts b/src/store/data-explorer/data-explorer-middleware-service.ts index 444e74006b..acd15b3829 100644 --- a/src/store/data-explorer/data-explorer-middleware-service.ts +++ b/src/store/data-explorer/data-explorer-middleware-service.ts @@ -10,13 +10,14 @@ export abstract class DataExplorerMiddlewareService { abstract get Id(): string; abstract get Columns(): DataColumns; - abstract requestItems (api: MiddlewareAPI): void; - + abstract requestItems(api: MiddlewareAPI): void; + protected api: MiddlewareAPI; set Api(value: MiddlewareAPI) { this.api = value; } - get DataExplorer () { - return getDataExplorer(this.api.getState(), this.Id); + get DataExplorer() { + const { dataExplorer } = this.api.getState(); + return getDataExplorer(dataExplorer, this.Id); } } \ No newline at end of file diff --git a/src/store/favorite-panel/favorite-panel-middleware-service.ts b/src/store/favorite-panel/favorite-panel-middleware-service.ts index 89e78b2f08..8eb77adffc 100644 --- a/src/store/favorite-panel/favorite-panel-middleware-service.ts +++ b/src/store/favorite-panel/favorite-panel-middleware-service.ts @@ -40,7 +40,7 @@ export class FavoritePanelMiddlewareService extends DataExplorerMiddlewareServic requestItems() { const state = this.api.getState() as RootState; - const dataExplorer = getDataExplorer(state.dataExplorer, this.Id); + const dataExplorer = this.DataExplorer; const columns = dataExplorer.columns as DataColumns; const sortColumn = dataExplorer.columns.find(({ sortDirection }) => Boolean(sortDirection && sortDirection !== "none")); const typeFilters = getColumnFilters(columns, FavoritePanelColumnNames.TYPE); diff --git a/src/store/project-panel/project-panel-middleware-service.ts b/src/store/project-panel/project-panel-middleware-service.ts index 5c828be300..2cbc810298 100644 --- a/src/store/project-panel/project-panel-middleware-service.ts +++ b/src/store/project-panel/project-panel-middleware-service.ts @@ -41,7 +41,7 @@ export class ProjectPanelMiddlewareService extends DataExplorerMiddlewareService requestItems() { const state = this.api.getState() as RootState; - const dataExplorer = getDataExplorer(state.dataExplorer, this.Id); + const dataExplorer = this.DataExplorer; const columns = dataExplorer.columns as DataColumns; const typeFilters = getColumnFilters(columns, ProjectPanelColumnNames.TYPE); const statusFilters = getColumnFilters(columns, ProjectPanelColumnNames.STATUS); -- 2.39.5