refs #master Merge branch 'origin/master' into 13828-trash-view

[arvados-workbench2.git] / src / store / store.ts

diff --git a/src/store/store.ts b/src/store/store.ts
index abfe187c93252f73a0612f1daea063debb837096..584d05e923fd55d8f443be7512c7f16f88234c26 100644 (file)
--- a/src/store/store.ts
+++ b/src/store/store.ts
@@ -22,12 +22,12 @@ import { ProjectPanelMiddlewareService } from "./project-panel/project-panel-mid
 import { FavoritePanelMiddlewareService } from "./favorite-panel/favorite-panel-middleware-service";
 import { collectionPanelReducer } from './collection-panel/collection-panel-reducer';
 import { dialogReducer } from './dialog/dialog-reducer';
-import { collectionsReducer } from './collections/collections-reducer';
 import { ServiceRepository } from "~/services/services";
 import { treePickerReducer } from './tree-picker/tree-picker-reducer';
 import { resourcesReducer } from '~/store/resources/resources-reducer';
 import { propertiesReducer } from './properties/properties-reducer';
 import { RootState } from './store';
+import { fileUploaderReducer } from './file-uploader/file-uploader-reducer';
 
 const composeEnhancers =
     (process.env.NODE_ENV === 'development' &&
@@ -47,12 +47,16 @@ export function configureStore(history: History, services: ServiceRepository): R
     const favoritePanelMiddleware = dataExplorerMiddleware(
         new FavoritePanelMiddlewareService(services, FAVORITE_PANEL_ID)
     );
+    const trashPanelMiddleware = dataExplorerMiddleware(
+        new TrashPanelMiddlewareService(services, TRASH_PANEL_ID)
+    );
 
     const middlewares: Middleware[] = [
         routerMiddleware(history),
         thunkMiddleware.withExtraArgument(services),
         projectPanelMiddleware,
-        favoritePanelMiddleware
+        favoritePanelMiddleware,
+        trashPanelMiddleware
     ];
     const enhancer = composeEnhancers(applyMiddleware(...middlewares));
     return createStore(rootReducer, enhancer);
@@ -60,18 +64,18 @@ export function configureStore(history: History, services: ServiceRepository): R
 
 const createRootReducer = (services: ServiceRepository) => combineReducers({
     auth: authReducer(services),
-    collections: collectionsReducer,
-    router: routerReducer,
-    dataExplorer: dataExplorerReducer,
     collectionPanel: collectionPanelReducer,
-    detailsPanel: detailsPanelReducer,
+    collectionPanelFiles: collectionPanelFilesReducer,
     contextMenu: contextMenuReducer,
-    form: formReducer,
+    dataExplorer: dataExplorerReducer,
+    detailsPanel: detailsPanelReducer,
+    dialog: dialogReducer,
     favorites: favoritesReducer,
+    form: formReducer,
+    properties: propertiesReducer,
+    resources: resourcesReducer,
+    router: routerReducer,
     snackbar: snackbarReducer,
-    collectionPanelFiles: collectionPanelFilesReducer,
-    dialog: dialogReducer,
     treePicker: treePickerReducer,
-    resources: resourcesReducer,
-    properties: propertiesReducer,
+    fileUploader: fileUploaderReducer,
 });