X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/c324b64f3b26e79b4640b6f0cf55671f1a261bca..394ebdfd13fe40a7096f484c46a353d2537f4c9a:/src/store/processes/process-copy-actions.ts diff --git a/src/store/processes/process-copy-actions.ts b/src/store/processes/process-copy-actions.ts index bb8d8f5a..57e85397 100644 --- a/src/store/processes/process-copy-actions.ts +++ b/src/store/processes/process-copy-actions.ts @@ -3,14 +3,15 @@ // SPDX-License-Identifier: AGPL-3.0 import { Dispatch } from "redux"; -import { dialogActions } from "~/store/dialog/dialog-actions"; +import { dialogActions } from "store/dialog/dialog-actions"; import { initialize, startSubmit } from 'redux-form'; -import { resetPickerProjectTree } from '~/store/project-tree-picker/project-tree-picker-actions'; -import { RootState } from '~/store/store'; -import { ServiceRepository } from '~/services/services'; -import { CopyFormDialogData } from '~/store/copy-dialog/copy-dialog'; -import { getProcess, ProcessStatus, getProcessStatus } from '~/store/processes/process'; -import { snackbarActions } from '~/store/snackbar/snackbar-actions'; +import { resetPickerProjectTree } from 'store/project-tree-picker/project-tree-picker-actions'; +import { RootState } from 'store/store'; +import { ServiceRepository } from 'services/services'; +import { CopyFormDialogData } from 'store/copy-dialog/copy-dialog'; +import { getProcess } from 'store/processes/process'; +import {snackbarActions, SnackbarKind} from 'store/snackbar/snackbar-actions'; +import { initProjectsTreePicker } from 'store/tree-picker/tree-picker-actions'; export const PROCESS_COPY_FORM_NAME = 'processCopyFormName'; @@ -18,17 +19,13 @@ export const openCopyProcessDialog = (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()); - const initialData: CopyFormDialogData = { name: `Copy of: ${resource.name}`, uuid: resource.uuid, ownerUuid: '' }; - dispatch(initialize(PROCESS_COPY_FORM_NAME, initialData)); - dispatch(dialogActions.OPEN_DIALOG({ id: PROCESS_COPY_FORM_NAME, data: {} })); - } else { - dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'You can copy only draft processes.', hideDuration: 2000 })); - } + dispatch(resetPickerProjectTree()); + dispatch(initProjectsTreePicker(PROCESS_COPY_FORM_NAME)); + const initialData: CopyFormDialogData = { name: `Copy of: ${resource.name}`, uuid: resource.uuid, ownerUuid: '' }; + dispatch(initialize(PROCESS_COPY_FORM_NAME, initialData)); + dispatch(dialogActions.OPEN_DIALOG({ id: PROCESS_COPY_FORM_NAME, data: {} })); } else { - dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Process not found', hideDuration: 2000 })); + dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Process not found', hideDuration: 2000, kind: SnackbarKind.ERROR })); } }; @@ -37,9 +34,8 @@ export const copyProcess = (resource: CopyFormDialogData) => dispatch(startSubmit(PROCESS_COPY_FORM_NAME)); try { const process = await services.containerRequestService.get(resource.uuid); - const uuidKey = 'uuid'; - delete process[uuidKey]; - await services.containerRequestService.create({ ...process, ownerUuid: resource.ownerUuid, name: resource.name }); + const { kind, containerImage, outputPath, outputName, containerCountMax, command, properties, requestingContainerUuid, mounts, runtimeConstraints, schedulingParameters, environment, cwd, outputTtl, priority, expiresAt, useExisting, filters } = process; + await services.containerRequestService.create({ command, containerImage, outputPath, ownerUuid: resource.ownerUuid, name: resource.name, kind, outputName, containerCountMax, properties, requestingContainerUuid, mounts, runtimeConstraints, schedulingParameters, environment, cwd, outputTtl, priority, expiresAt, useExisting, filters }); dispatch(dialogActions.CLOSE_DIALOG({ id: PROCESS_COPY_FORM_NAME })); return process; } catch (e) {