Merge branch 'master'

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

diff --git a/src/store/store.ts b/src/store/store.ts
index 064faeca59a0cd289ef42c2d29d47b294d3b9db6..fa2a5be9bb658dedcf8a87829b209da72474b2b8 100644 (file)
--- a/src/store/store.ts
+++ b/src/store/store.ts
@@ -40,6 +40,9 @@ import { WorkflowMiddlewareService } from './workflow-panel/workflow-middleware-
 import { WORKFLOW_PANEL_ID } from './workflow-panel/workflow-panel-actions';
 import { appInfoReducer } from '~/store/app-info/app-info-reducer';
 import { searchBarReducer } from './search-bar/search-bar-reducer';
+import { SEARCH_RESULTS_PANEL_ID } from '~/store/search-results-panel/search-results-panel-actions';
+import { SearchResultsMiddlewareService } from './search-results-panel/search-results-middleware-service';
+import { resourcesDataReducer } from "~/store/resources-data/resources-data-reducer";
 
 const composeEnhancers =
     (process.env.NODE_ENV === 'development' &&
@@ -62,6 +65,9 @@ export function configureStore(history: History, services: ServiceRepository): R
     const trashPanelMiddleware = dataExplorerMiddleware(
         new TrashPanelMiddlewareService(services, TRASH_PANEL_ID)
     );
+    const searchResultsPanelMiddleware = dataExplorerMiddleware(
+        new SearchResultsMiddlewareService(services, SEARCH_RESULTS_PANEL_ID)
+    );
     const sharedWithMePanelMiddleware = dataExplorerMiddleware(
         new SharedWithMeMiddlewareService(services, SHARED_WITH_ME_PANEL_ID)
     );
@@ -75,6 +81,7 @@ export function configureStore(history: History, services: ServiceRepository): R
         projectPanelMiddleware,
         favoritePanelMiddleware,
         trashPanelMiddleware,
+        searchResultsPanelMiddleware,
         sharedWithMePanelMiddleware,
         workflowPanelMiddleware
     ];
@@ -95,6 +102,7 @@ const createRootReducer = (services: ServiceRepository) => combineReducers({
     processLogsPanel: processLogsPanelReducer,
     properties: propertiesReducer,
     resources: resourcesReducer,
+    resourcesData: resourcesDataReducer,
     router: routerReducer,
     snackbar: snackbarReducer,
     treePicker: treePickerReducer,