From: Michal Klobukowski <michal.klobukowski@contractors.roche.com>
Date: Thu, 2 Aug 2018 14:47:22 +0000 (+0200)
Subject: Merge branch 'master'
X-Git-Tag: 1.2.0~16^2~6
X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/72c12f527787181e4abb09fc968f07e795179c3c

Merge branch 'master'

Feature #13855

Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski@contractors.roche.com>
---

72c12f527787181e4abb09fc968f07e795179c3c
diff --cc src/store/store.ts
index 0ce46160,53a01e2a..3eda0054
--- a/src/store/store.ts
+++ b/src/store/store.ts
@@@ -17,12 -16,13 +16,16 @@@ import { contextMenuReducer, ContextMen
  import { reducer as formReducer } from 'redux-form';
  import { FavoritesState, favoritesReducer } from './favorites/favorites-reducer';
  import { snackbarReducer, SnackbarState } from './snackbar/snackbar-reducer';
 +import { CollectionPanelFilesState } from './collection-panel/collection-panel-files/collection-panel-files-state';
 +import { collectionPanelFilesReducer } from './collection-panel/collection-panel-files/collections-panel-files-reducer';
+ import { dataExplorerMiddleware } from "./data-explorer/data-explorer-middleware";
+ import { FAVORITE_PANEL_ID } from "./favorite-panel/favorite-panel-action";
+ import { PROJECT_PANEL_ID } from "./project-panel/project-panel-action";
+ import { ProjectPanelMiddlewareService } from "./project-panel/project-panel-middleware-service";
+ import { FavoritePanelMiddlewareService } from "./favorite-panel/favorite-panel-middleware-service";
  import { CollectionCreatorState, collectionCreationReducer } from './collections/creator/collection-creator-reducer';
  import { CollectionPanelState, collectionPanelReducer } from './collection-panel/collection-panel-reducer';
 +import { DialogState, dialogReducer } from './dialog/dialog-reducer';
  
  const composeEnhancers =
      (process.env.NODE_ENV === 'development' &&
@@@ -58,12 -56,16 +61,18 @@@ const rootReducer = combineReducers(
      form: formReducer,
      favorites: favoritesReducer,
      snackbar: snackbarReducer,
 +    collectionPanelFiles: collectionPanelFilesReducer,
 +    dialog: dialogReducer
  });
  
- 
  export function configureStore(history: History) {
+     const projectPanelMiddleware = dataExplorerMiddleware(
+         new ProjectPanelMiddlewareService(PROJECT_PANEL_ID)
+     );
+     const favoritePanelMiddleware = dataExplorerMiddleware(
+         new FavoritePanelMiddlewareService(FAVORITE_PANEL_ID)
+     );
+ 
      const middlewares: Middleware[] = [
          routerMiddleware(history),
          thunkMiddleware,