From d362fde16d3ba7eb15b6ca81fc306417bd6db576 Mon Sep 17 00:00:00 2001 From: Peter Amstutz Date: Mon, 12 Aug 2024 17:54:36 -0400 Subject: [PATCH] 21944: Add title and description to workflow launch panel Arvados-DCO-1.1-Signed-off-by: Peter Amstutz --- .../run-process-basic-form.tsx | 81 +++++++++++++------ .../run-process-second-step.tsx | 2 +- 2 files changed, 57 insertions(+), 26 deletions(-) diff --git a/services/workbench2/src/views/run-process-panel/run-process-basic-form.tsx b/services/workbench2/src/views/run-process-panel/run-process-basic-form.tsx index a6f7a70693..d775c0c3e6 100644 --- a/services/workbench2/src/views/run-process-panel/run-process-basic-form.tsx +++ b/services/workbench2/src/views/run-process-panel/run-process-basic-form.tsx @@ -3,13 +3,15 @@ // SPDX-License-Identifier: AGPL-3.0 import React from 'react'; -import { reduxForm, Field } from 'redux-form'; -import { Grid } from '@material-ui/core'; +import { reduxForm, Field, InjectedFormProps } from 'redux-form'; +import { Grid, Typography, StyleRulesCallback, withStyles, WithStyles } from '@material-ui/core'; import { TextField } from 'components/text-field/text-field'; import { ProjectInput, ProjectCommandInputParameter } from 'views/run-process-panel/inputs/project-input'; import { PROCESS_NAME_VALIDATION } from 'validators/validators'; import { ProjectResource } from 'models/project'; import { UserResource } from 'models/user'; +import { WorkflowResource } from 'models/workflow'; +import { ArvadosTheme } from 'common/custom-theme'; export const RUN_PROCESS_BASIC_FORM = 'runProcessBasicForm'; @@ -19,32 +21,61 @@ export interface RunProcessBasicFormData { owner?: ProjectResource | UserResource; } +interface RunProcessBasicFormProps { + workflow?: WorkflowResource +} + +type CssRules = 'name' | 'description'; + +const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ + name: { + overflow: "hidden", + color: theme.customs.colors.greyD, + fontSize: "1.875rem", + }, + description: { + marginBottom: "3em", + } +}); + export const RunProcessBasicForm = - reduxForm({ + reduxForm({ form: RUN_PROCESS_BASIC_FORM - })(() => -
+ })(withStyles(styles)((props: InjectedFormProps & RunProcessBasicFormProps & WithStyles) => + - - - - + - - + name='name' + component={TextField as any} + label="Name for this workflow run" + required + validate={PROCESS_NAME_VALIDATION} /> + + - - - ); + options={{ showOnlyOwned: false, showOnlyWritable: true }} /> + + + + + + {props.workflow && {props.workflow.name}} + + + {props.workflow && } + + + )); diff --git a/services/workbench2/src/views/run-process-panel/run-process-second-step.tsx b/services/workbench2/src/views/run-process-panel/run-process-second-step.tsx index 2f41dedb82..d35e4eb88a 100644 --- a/services/workbench2/src/views/run-process-panel/run-process-second-step.tsx +++ b/services/workbench2/src/views/run-process-panel/run-process-second-step.tsx @@ -57,7 +57,7 @@ export const RunProcessSecondStepForm = connect(mapStateToProps, { onPresetChang ({ inputs, workflow, selectedPreset, presets, onPresetChange, valid, goBack, runProcess }: RunProcessSecondStepFormProps) => - + -- 2.30.2