Merge branch 'master'
authorMichal Klobukowski <michal.klobukowski@contractors.roche.com>
Tue, 9 Oct 2018 11:36:57 +0000 (13:36 +0200)
committerMichal Klobukowski <michal.klobukowski@contractors.roche.com>
Tue, 9 Oct 2018 11:36:57 +0000 (13:36 +0200)
Feature #13862

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

1  2 
src/store/store.ts

index 21e5029a0338bd1e56512e4c0d977db3a72ec552,8e753660b26e19c91f15e17de52239ed506ef6e1..d38689c5029d3223642da4519ecfe033e736304a
@@@ -38,6 -38,8 +38,7 @@@ import { progressIndicatorReducer } fro
  import { runProcessPanelReducer } from '~/store/run-process-panel/run-process-panel-reducer';
  import { WorkflowMiddlewareService } from './workflow-panel/workflow-middleware-service';
  import { WORKFLOW_PANEL_ID } from './workflow-panel/workflow-panel-actions';
 -import { fileTreePickerReducer } from './file-tree-picker/file-tree-picker-reducer';
+ import { searchBarReducer } from './search-bar/search-bar-reducer';
  
  const composeEnhancers =
      (process.env.NODE_ENV === 'development' &&
@@@ -99,5 -101,7 +100,6 @@@ const createRootReducer = (services: Se
      fileUploader: fileUploaderReducer,
      processPanel: processPanelReducer,
      progressIndicator: progressIndicatorReducer,
-     runProcessPanel: runProcessPanelReducer
 -    fileTreePicker: fileTreePickerReducer,
+     runProcessPanel: runProcessPanelReducer,
+     searchBar: searchBarReducer
  });