[ARVADOS-WORKBENCH2] updated: 1.3.0-84-g94ca0c1
Git user
git at public.curoverse.com
Mon Dec 10 03:24:51 EST 2018
Summary of changes:
.../run-process-panel/run-process-second-step.tsx | 12 +--
.../run-process-panel/workflow-preset-select.tsx | 92 +++++++++++-----------
2 files changed, 52 insertions(+), 52 deletions(-)
via 94ca0c19fac51ae89bed3a9bbb2b90545697dfbf (commit)
via 6c12dcde231f8a6d419a4e154d6906bce944963c (commit)
from 222a0099d2b8285b8770092f5da01314e0c7de7d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 94ca0c19fac51ae89bed3a9bbb2b90545697dfbf
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date: Mon Dec 10 09:24:17 2018 +0100
Wrap WorkflowPresetSelect in the grid
Feature #14490
Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
diff --git a/src/views/run-process-panel/run-process-second-step.tsx b/src/views/run-process-panel/run-process-second-step.tsx
index d547fba..a7e4a87 100644
--- a/src/views/run-process-panel/run-process-second-step.tsx
+++ b/src/views/run-process-panel/run-process-second-step.tsx
@@ -58,11 +58,13 @@ export const RunProcessSecondStepForm = connect(mapStateToProps, { onPresetChang
({ inputs, workflow, selectedPreset, presets, onPresetChange, valid, goBack, runProcess }: RunProcessSecondStepFormProps) =>
<Grid container spacing={16}>
<Grid item xs={12}>
- <Grid item xs={6}>
- {workflow && selectedPreset && presets &&
- < WorkflowPresetSelect
- {...{ workflow, selectedPreset, presets, onChange: onPresetChange }} />
- }
+ <Grid container spacing={32}>
+ <Grid item xs={12} md={6}>
+ {workflow && selectedPreset && presets &&
+ < WorkflowPresetSelect
+ {...{ workflow, selectedPreset, presets, onChange: onPresetChange }} />
+ }
+ </Grid>
</Grid>
<RunProcessBasicForm />
<RunProcessInputsForm inputs={inputs} />
commit 6c12dcde231f8a6d419a4e154d6906bce944963c
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date: Mon Dec 10 09:23:42 2018 +0100
Improve WorkflowPresetSelect layout
Feature #14490
Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
diff --git a/src/views/run-process-panel/workflow-preset-select.tsx b/src/views/run-process-panel/workflow-preset-select.tsx
index 46bdecd..a69be95 100644
--- a/src/views/run-process-panel/workflow-preset-select.tsx
+++ b/src/views/run-process-panel/workflow-preset-select.tsx
@@ -3,7 +3,7 @@
// SPDX-License-Identifier: AGPL-3.0
import * as React from 'react';
-import { Select, FormControl, InputLabel, MenuItem, Tooltip, Grid, withStyles, WithStyles } from '@material-ui/core';
+import { Select, FormControl, InputLabel, MenuItem, Tooltip, withStyles, WithStyles } from '@material-ui/core';
import { WorkflowResource } from '~/models/workflow';
import { DetailsIcon } from '~/components/icon/icon';
@@ -14,57 +14,55 @@ export interface WorkflowPresetSelectProps {
onChange: (preset: WorkflowResource) => void;
}
-export class WorkflowPresetSelect extends React.Component<WorkflowPresetSelectProps> {
+type CssRules = 'root' | 'icon';
- render() {
+export const WorkflowPresetSelect = withStyles<CssRules>(theme => ({
+ root: {
+ display: 'flex',
+ },
+ icon: {
+ color: theme.palette.text.hint,
+ marginTop: 18,
+ marginLeft: 8,
+ },
+}))(
+ class extends React.Component<WorkflowPresetSelectProps & WithStyles<CssRules>> {
- const { selectedPreset, workflow, presets } = this.props;
+ render() {
- return (
- <Grid container wrap='nowrap' spacing={32}>
- <Grid item xs container>
- <Grid item xs>
- <FormControl fullWidth>
- <InputLabel htmlFor="age-simple">Preset</InputLabel>
- <Select
- value={selectedPreset.uuid}
- onChange={this.handleChange}>
- <MenuItem value={workflow.uuid}>
- <em>Default</em>
- </MenuItem>
- {presets.map(
- ({ uuid, name }) => <MenuItem key={uuid} value={uuid}>{name}</MenuItem>
- )}
- </Select>
- </FormControl>
- </Grid>
- <WorkflowPresetSelectInfo />
- </Grid>
- </Grid>
- );
- }
+ const { selectedPreset, workflow, presets, classes } = this.props;
- handleChange = ({ target }: React.ChangeEvent<HTMLSelectElement>) => {
+ return (
+ <div className={classes.root}>
+ <FormControl fullWidth>
+ <InputLabel htmlFor="age-simple">Preset</InputLabel>
+ <Select
+ value={selectedPreset.uuid}
+ onChange={this.handleChange}>
+ <MenuItem value={workflow.uuid}>
+ <em>Default</em>
+ </MenuItem>
+ {presets.map(
+ ({ uuid, name }) => <MenuItem key={uuid} value={uuid}>{name}</MenuItem>
+ )}
+ </Select>
+ </FormControl>
+ <Tooltip title='List of already defined set of inputs to run a workflow'>
+ <DetailsIcon className={classes.icon} />
+ </Tooltip>
+ </div >
+ );
+ }
- const { workflow, presets, onChange } = this.props;
+ handleChange = ({ target }: React.ChangeEvent<HTMLSelectElement>) => {
- const selectedPreset = [workflow, ...presets]
- .find(({ uuid }) => uuid === target.value);
+ const { workflow, presets, onChange } = this.props;
- if (selectedPreset) {
- onChange(selectedPreset);
- }
- }
-}
+ const selectedPreset = [workflow, ...presets]
+ .find(({ uuid }) => uuid === target.value);
-const WorkflowPresetSelectInfo = withStyles<'icon'>(theme => ({
- icon: {
- marginTop: 18,
- marginLeft: 8,
- },
-}))(
- ({ classes }: WithStyles<'icon'>) =>
- <Tooltip title='List of already defined set of inputs to run a workflow'>
- <DetailsIcon className={classes.icon} />
- </Tooltip>
-);
+ if (selectedPreset) {
+ onChange(selectedPreset);
+ }
+ }
+ });
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list