projects
/
arvados-workbench2.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 14313-basic-view-recent-queries
[arvados-workbench2.git]
/
src
/
store
/
store.ts
diff --git
a/src/store/store.ts
b/src/store/store.ts
index 21e5029a0338bd1e56512e4c0d977db3a72ec552..60267807c700e0f7b43b69be2dc6498ee9988360 100644
(file)
--- a/
src/store/store.ts
+++ b/
src/store/store.ts
@@
-38,6
+38,9
@@
import { progressIndicatorReducer } from './progress-indicator/progress-indicato
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 { 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 { appInfoReducer } from '~/store/app-info/app-info-reducer';
+import { searchBarReducer } from './search-bar/search-bar-reducer';
const composeEnhancers =
(process.env.NODE_ENV === 'development' &&
const composeEnhancers =
(process.env.NODE_ENV === 'development' &&
@@
-99,5
+102,8
@@
const createRootReducer = (services: ServiceRepository) => combineReducers({
fileUploader: fileUploaderReducer,
processPanel: processPanelReducer,
progressIndicator: progressIndicatorReducer,
fileUploader: fileUploaderReducer,
processPanel: processPanelReducer,
progressIndicator: progressIndicatorReducer,
- runProcessPanel: runProcessPanelReducer
+ fileTreePicker: fileTreePickerReducer,
+ runProcessPanel: runProcessPanelReducer,
+ appInfo: appInfoReducer,
+ searchBar: searchBarReducer
});
});