X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/5941908e7a1d369ca823702f60e8fd048ae08a9a..d9ee24d0f78a21603e2276d0d3142d4db40a831b:/src/store/processes/processes-actions.ts diff --git a/src/store/processes/processes-actions.ts b/src/store/processes/processes-actions.ts index a94e56d6..d3d715ad 100644 --- a/src/store/processes/processes-actions.ts +++ b/src/store/processes/processes-actions.ts @@ -6,8 +6,6 @@ import { Dispatch } from "redux"; import { RootState } from '~/store/store'; import { ServiceRepository } from '~/services/services'; import { updateResources } from '~/store/resources/resources-actions'; -import { FilterBuilder } from '~/services/api/filter-builder'; -import { ContainerRequestResource } from '~/models/container-request'; import { Process } from './process'; import { dialogActions } from '~/store/dialog/dialog-actions'; import { snackbarActions, SnackbarKind } from '~/store/snackbar/snackbar-actions'; @@ -25,44 +23,18 @@ export const loadProcess = (containerRequestUuid: string) => async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository): Promise => { const response = await services.workflowService.list(); dispatch(runProcessPanelActions.SET_WORKFLOWS(response.items)); + const containerRequest = await services.containerRequestService.get(containerRequestUuid); dispatch(updateResources([containerRequest])); + if (containerRequest.containerUuid) { const container = await services.containerService.get(containerRequest.containerUuid); dispatch(updateResources([container])); - await dispatch(loadSubprocesses(containerRequest.containerUuid)); return { containerRequest, container }; } return { containerRequest }; }; -export const loadSubprocesses = (containerUuid: string) => - async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { - const containerRequests = await dispatch(loadContainerRequests( - new FilterBuilder().addEqual('requesting_container_uuid', containerUuid).getFilters() - )) as ContainerRequestResource[]; - - const containerUuids: string[] = containerRequests.reduce((uuids, { containerUuid }) => - containerUuid - ? [...uuids, containerUuid] - : uuids, []); - - if (containerUuids.length > 0) { - await dispatch(loadContainers( - new FilterBuilder().addIn('uuid', containerUuids).getFilters() - )); - } - }; - -const MAX_AMOUNT_OF_SUBPROCESSES = 10000; - -export const loadContainerRequests = (filters: string) => - async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { - const { items } = await services.containerRequestService.list({ filters, limit: MAX_AMOUNT_OF_SUBPROCESSES }); - dispatch(updateResources(items)); - return items; - }; - export const loadContainers = (filters: string) => async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { const { items } = await services.containerService.list({ filters }); @@ -125,7 +97,7 @@ const getInputs = (data: any) => { default: data.mounts[MOUNT_PATH_CWL_INPUT].content[it.id], doc: it.doc } - ) + ) ) : []; };