Merge branch 'master'

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

diff --git a/src/store/details-panel/details-panel-action.ts b/src/store/details-panel/details-panel-action.ts
index ffa66b69a402807a15a9c9adc3967284d339d471..c4acf5aa9b3710fac0a3f61a905132651f8709da 100644 (file)
--- a/src/store/details-panel/details-panel-action.ts
+++ b/src/store/details-panel/details-panel-action.ts
@@ -3,40 +3,34 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import { unionize, ofType, UnionOf } from "unionize";
-import CommonResourceService, { Resource } from "../../common/api/common-resource-service";
-import { ResourceKind } from "../../models/kinds";
 import { Dispatch } from "redux";
-import { groupsService } from "../../services/services";
-import { serverApi } from "../../common/api/server-api";
+import { Resource, ResourceKind } from "../../models/resource";
+import { RootState } from "../store";
+import { ServiceRepository } from "../../services/services";
 
-const actions = unionize({
+export const detailsPanelActions = unionize({
     TOGGLE_DETAILS_PANEL: ofType<{}>(),
     LOAD_DETAILS: ofType<{ uuid: string, kind: ResourceKind }>(),
     LOAD_DETAILS_SUCCESS: ofType<{ item: Resource }>(),
 }, { tag: 'type', value: 'payload' });
 
-export default actions;
-
-export type DetailsPanelAction = UnionOf<typeof actions>;
+export type DetailsPanelAction = UnionOf<typeof detailsPanelActions>;
 
 export const loadDetails = (uuid: string, kind: ResourceKind) =>
-    (dispatch: Dispatch) => {
-        dispatch(actions.LOAD_DETAILS({ uuid, kind }));
-        getService(kind)
-            .get(uuid)
-            .then(project => {
-                dispatch(actions.LOAD_DETAILS_SUCCESS({ item: project }));
-            });
+    async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
+        dispatch(detailsPanelActions.LOAD_DETAILS({ uuid, kind }));
+        const item = await getService(services, kind).get(uuid);
+        dispatch(detailsPanelActions.LOAD_DETAILS_SUCCESS({ item }));
     };
 
-const getService = (kind: ResourceKind) => {
+const getService = (services: ServiceRepository, kind: ResourceKind) => {
     switch (kind) {
-        case ResourceKind.Project:
-            return new CommonResourceService(serverApi, "groups");
-        case ResourceKind.Collection:
-            return new CommonResourceService(serverApi, "collections");
+        case ResourceKind.PROJECT:
+            return services.projectService;
+        case ResourceKind.COLLECTION:
+            return services.collectionService;
         default:
-            return new CommonResourceService(serverApi, "");
+            return services.projectService;
     }
 };