diff --git a/poetry.lock b/poetry.lock index fd8fd8128..54460b655 100644 --- a/poetry.lock +++ b/poetry.lock @@ -3213,7 +3213,7 @@ tango = ["PyTango (>=9.3.6,<10.0.0)"] type = "git" url = "https://github.com/AustralianSynchrotron/mxcubecore.git" reference = "prefect_3" -resolved_reference = "eb5161c13605dd02bfc31531e477ac8e1c2fb580" +resolved_reference = "e952cb7e6a04e749677776596a0dfa3a6248ce05" [[package]] name = "myst-parser" diff --git a/ui/src/components/SampleQueue/WorkflowTaskItem.jsx b/ui/src/components/SampleQueue/WorkflowTaskItem.jsx index 8a7253f76..38339c98d 100644 --- a/ui/src/components/SampleQueue/WorkflowTaskItem.jsx +++ b/ui/src/components/SampleQueue/WorkflowTaskItem.jsx @@ -55,7 +55,7 @@ export default class WorkflowTaskItem extends Component { > {' '} - View Results in ISPyB + View Results in MX-PRISM ); diff --git a/ui/src/components/Tasks/GenericTaskForm.jsx b/ui/src/components/Tasks/GenericTaskForm.jsx index 8fca81877..3b07eaca6 100644 --- a/ui/src/components/Tasks/GenericTaskForm.jsx +++ b/ui/src/components/Tasks/GenericTaskForm.jsx @@ -284,7 +284,7 @@ class GenericTaskForm extends React.Component { {this.props.taskData.parameters.name} -
+ {/* @@ -329,7 +329,7 @@ class GenericTaskForm extends React.Component { ) : null} - + */}
diff --git a/ui/src/components/Tasks/Workflow.jsx b/ui/src/components/Tasks/Workflow.jsx index 4ef900ed2..1172d2ad1 100644 --- a/ui/src/components/Tasks/Workflow.jsx +++ b/ui/src/components/Tasks/Workflow.jsx @@ -55,7 +55,7 @@ function Workflow(props) {
- + {/*
- )} + )} */}
diff --git a/ui/src/containers/WorkflowParametersDialog.jsx b/ui/src/containers/WorkflowParametersDialog.jsx index d2a54e9ce..d719e3f49 100644 --- a/ui/src/containers/WorkflowParametersDialog.jsx +++ b/ui/src/containers/WorkflowParametersDialog.jsx @@ -20,30 +20,16 @@ function WorkflowParametersDialog() { dispatch(showWorkflowParametersDialog(null, false)); } - useEffect(() => { - function handleKeyDown(event) { - if (event.key === 'Escape') { - event.preventDefault(); - } - } - - if (show) { - window.addEventListener('keydown', handleKeyDown); - } else { - window.removeEventListener('keydown', handleKeyDown); - } - - return () => { - window.removeEventListener('keydown', handleKeyDown); - }; - }, [show]); + function handleClose() { + dispatch(submitWorkflowParameters({})); + dispatch(showWorkflowParametersDialog(null, false)); + } return ( dispatch(showWorkflowParametersDialog(null, false))} + onHide={handleClose} backdrop="static" - keyboard={false} // Prevent closing with Escape key > {formData ? formData.dialogName : ''} @@ -59,7 +45,7 @@ function WorkflowParametersDialog() { schema={formData} formData={formData.initialValues} onSubmit={submitData} - onError={console.log('onError message???')} // eslint-disable-line no-console + onError={console.log('error')} // eslint-disable-line no-console /> )}