merge conflicts

[arvados.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 647e24f8e67e436457271e994db3e0527c71d319..ba330f2e417dde4b07bd64914591258e255f084d 100644 (file)
--- a/src/store/details-panel/details-panel-action.ts
+++ b/src/store/details-panel/details-panel-action.ts
@@ -3,30 +3,26 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import { unionize, ofType, UnionOf } from "unionize";
-import CommonResourceService from "../../common/api/common-resource-service";
-import { ResourceKind } from "../../models/kinds";
+import { CommonResourceService } from "../../common/api/common-resource-service";
 import { Dispatch } from "redux";
-import { groupsService } from "../../services/services";
 import { serverApi } from "../../common/api/server-api";
-import { Resource } from "../../models/resource";
+import { Resource, ResourceKind } from "../../models/resource";
 
-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 }));
+        dispatch(detailsPanelActions.LOAD_DETAILS({ uuid, kind }));
         getService(kind)
             .get(uuid)
             .then(project => {
-                dispatch(actions.LOAD_DETAILS_SUCCESS({ item: project }));
+                dispatch(detailsPanelActions.LOAD_DETAILS_SUCCESS({ item: project }));
             });
     };