X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/10ce16c28de952f6533ca3cc9df909269e3d2a53..dd89200ad6fdbfa337fdbab5f54def8712c6746c:/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 ba330f2e..cadf517a 100644 --- a/src/store/details-panel/details-panel-action.ts +++ b/src/store/details-panel/details-panel-action.ts @@ -3,10 +3,10 @@ // SPDX-License-Identifier: AGPL-3.0 import { unionize, ofType, UnionOf } from "unionize"; -import { CommonResourceService } from "../../common/api/common-resource-service"; import { Dispatch } from "redux"; -import { serverApi } from "../../common/api/server-api"; -import { Resource, ResourceKind } from "../../models/resource"; +import { Resource, ResourceKind } from "~/models/resource"; +import { RootState } from "../store"; +import { ServiceRepository } from "~/services/services"; export const detailsPanelActions = unionize({ TOGGLE_DETAILS_PANEL: ofType<{}>(), @@ -17,23 +17,20 @@ export const detailsPanelActions = unionize({ export type DetailsPanelAction = UnionOf; export const loadDetails = (uuid: string, kind: ResourceKind) => - (dispatch: Dispatch) => { + async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { dispatch(detailsPanelActions.LOAD_DETAILS({ uuid, kind })); - getService(kind) - .get(uuid) - .then(project => { - dispatch(detailsPanelActions.LOAD_DETAILS_SUCCESS({ item: project })); - }); + 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; } };