X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/425a9687b585517385d0ae5d62c5de26e06d3193..aebc1ac220838aa4f849473f3dda8d121f6118af:/src/store/processes/process-move-actions.ts diff --git a/src/store/processes/process-move-actions.ts b/src/store/processes/process-move-actions.ts index edba5a85..7e65bcca 100644 --- a/src/store/processes/process-move-actions.ts +++ b/src/store/processes/process-move-actions.ts @@ -12,7 +12,7 @@ import { snackbarActions } from '~/store/snackbar/snackbar-actions'; import { MoveToFormDialogData } from '~/store/move-to-dialog/move-to-dialog'; import { resetPickerProjectTree } from '~/store/project-tree-picker/project-tree-picker-actions'; import { projectPanelActions } from '~/store/project-panel/project-panel-action'; -import { getProcess, getProcessStatus, ProcessStatus } from '~/store/processes/process'; +import { getProcess } from '~/store/processes/process'; import { initProjectsTreePicker } from '~/store/tree-picker/tree-picker-actions'; export const PROCESS_MOVE_FORM_NAME = 'processMoveFormName'; @@ -21,15 +21,10 @@ export const openMoveProcessDialog = (resource: { name: string, uuid: string }) (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { const process = getProcess(resource.uuid)(getState().resources); if (process) { - const processStatus = getProcessStatus(process); - if (processStatus === ProcessStatus.DRAFT) { - dispatch(resetPickerProjectTree()); - dispatch(initProjectsTreePicker(PROCESS_MOVE_FORM_NAME)); - dispatch(initialize(PROCESS_MOVE_FORM_NAME, resource)); - dispatch(dialogActions.OPEN_DIALOG({ id: PROCESS_MOVE_FORM_NAME, data: {} })); - } else { - dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'You can move only draft processes.', hideDuration: 2000 })); - } + dispatch(resetPickerProjectTree()); + dispatch(initProjectsTreePicker(PROCESS_MOVE_FORM_NAME)); + dispatch(initialize(PROCESS_MOVE_FORM_NAME, resource)); + dispatch(dialogActions.OPEN_DIALOG({ id: PROCESS_MOVE_FORM_NAME, data: {} })); } else { dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Process not found', hideDuration: 2000 })); } @@ -40,7 +35,7 @@ export const moveProcess = (resource: MoveToFormDialogData) => dispatch(startSubmit(PROCESS_MOVE_FORM_NAME)); try { const process = await services.containerRequestService.get(resource.uuid); - await services.containerRequestService.update(resource.uuid, { ...process, ownerUuid: resource.ownerUuid }); + await services.containerRequestService.update(resource.uuid, { ownerUuid: resource.ownerUuid }); dispatch(projectPanelActions.REQUEST_ITEMS()); dispatch(dialogActions.CLOSE_DIALOG({ id: PROCESS_MOVE_FORM_NAME })); return process; @@ -48,8 +43,6 @@ export const moveProcess = (resource: MoveToFormDialogData) => const error = getCommonResourceServiceError(e); if (error === CommonResourceServiceError.UNIQUE_VIOLATION) { dispatch(stopSubmit(PROCESS_MOVE_FORM_NAME, { ownerUuid: 'A process with the same name already exists in the target project.' })); - } else if (error === CommonResourceServiceError.MODIFYING_CONTAINER_REQUEST_FINAL_STATE) { - dispatch(stopSubmit(PROCESS_MOVE_FORM_NAME, { ownerUuid: 'You can move only draft processes.' })); } else { dispatch(dialogActions.CLOSE_DIALOG({ id: PROCESS_MOVE_FORM_NAME })); dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Could not move the process.', hideDuration: 2000 }));