merge master

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

diff --git a/src/store/collections/collections-reducer.ts b/src/store/collections/collections-reducer.ts
index e1982d28b73a99236a75bc71c460b2e77e3ca6c4..c7601505cbd270c587a1ae9ec3f0e04ad354980a 100644 (file)
--- a/src/store/collections/collections-reducer.ts
+++ b/src/store/collections/collections-reducer.ts
@@ -3,15 +3,12 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import { combineReducers } from 'redux';
-import * as creator from "./creator/collection-creator-reducer";
-import * as updater from "./updater/collection-updater-reducer";
+import { collectionUploaderReducer, CollectionUploaderState } from "./uploader/collection-uploader-reducer";
 
 export type CollectionsState = {
-    creator: creator.CollectionCreatorState;
-    updater: updater.CollectionUpdaterState;
+    uploader: CollectionUploaderState
 };
 
 export const collectionsReducer = combineReducers({
-    creator: creator.collectionCreatorReducer,
-    updater: updater.collectionUpdaterReducer
+    uploader: collectionUploaderReducer
 });