Merge branch 'master'

[arvados-workbench2.git] / src / store / collection-panel / collection-panel-action.ts

diff --git a/src/store/collection-panel/collection-panel-action.ts b/src/store/collection-panel/collection-panel-action.ts
index ab2db17d249852dc3b68ef162901dfe858e9f8b9..419f04049b83ffaceff9f4c871c5319487163fa6 100644 (file)
--- a/src/store/collection-panel/collection-panel-action.ts
+++ b/src/store/collection-panel/collection-panel-action.ts
@@ -6,28 +6,27 @@ import { unionize, ofType, UnionOf } from "unionize";
 import { Dispatch } from "redux";
 import { ResourceKind } from "../../models/resource";
 import { CollectionResource } from "../../models/collection";
-import { collectionService, collectionFilesService } from "../../services/services";
 import { collectionPanelFilesAction } from "./collection-panel-files/collection-panel-files-actions";
 import { createTree } from "../../models/tree";
-import { mapManifestToCollectionFilesTree } from "../../services/collection-files-service/collection-manifest-mapper";
-import { parseKeepManifestText } from "../../services/collection-files-service/collection-manifest-parser";
+import { RootState } from "../store";
+import { ServiceRepository } from "../../services/services";
 
 export const collectionPanelActions = unionize({
     LOAD_COLLECTION: ofType<{ uuid: string, kind: ResourceKind }>(),
-    LOAD_COLLECTION_SUCCESS: ofType<{ item: CollectionResource }>(),
+    LOAD_COLLECTION_SUCCESS: ofType<{ item: CollectionResource }>()
 }, { tag: 'type', value: 'payload' });
 
 export type CollectionPanelAction = UnionOf<typeof collectionPanelActions>;
 
 export const loadCollection = (uuid: string, kind: ResourceKind) =>
-    (dispatch: Dispatch) => {
+    (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
         dispatch(collectionPanelActions.LOAD_COLLECTION({ uuid, kind }));
         dispatch(collectionPanelFilesAction.SET_COLLECTION_FILES({ files: createTree() }));
-        return collectionService
+        return services.collectionService
             .get(uuid)
             .then(item => {
                 dispatch(collectionPanelActions.LOAD_COLLECTION_SUCCESS({ item }));
-                return collectionFilesService.getFiles(item.uuid);
+                return services.collectionFilesService.getFiles(item.uuid);
             })
             .then(files => {
                 dispatch(collectionPanelFilesAction.SET_COLLECTION_FILES({ files }));