[ARVADOS-WORKBENCH2] updated: 1.1.4-447-gb3593d2
Git user
git at public.curoverse.com
Thu Jul 26 07:25:56 EDT 2018
Summary of changes:
src/store/data-explorer/data-explorer-middleware-service.ts | 9 +++++----
src/store/favorite-panel/favorite-panel-middleware-service.ts | 2 +-
src/store/project-panel/project-panel-middleware-service.ts | 2 +-
3 files changed, 7 insertions(+), 6 deletions(-)
via b3593d28da32bdcf35ec91a6e0dd9099b7bd43b2 (commit)
from ffac6f1051efb642db49c4c4a5d2f3f477ca6d34 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit b3593d28da32bdcf35ec91a6e0dd9099b7bd43b2
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date: Thu Jul 26 13:25:34 2018 +0200
Fix and make use of DataExplorer getter
Feature #13887
Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
diff --git a/src/store/data-explorer/data-explorer-middleware-service.ts b/src/store/data-explorer/data-explorer-middleware-service.ts
index 444e740..acd15b3 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<any>;
- 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 89e78b2..8eb77ad 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<FavoritePanelItem, FavoritePanelFilter>;
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 5c828be..2cbc810 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<ProjectPanelItem, ProjectPanelFilter>;
const typeFilters = getColumnFilters(columns, ProjectPanelColumnNames.TYPE);
const statusFilters = getColumnFilters(columns, ProjectPanelColumnNames.STATUS);
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list