From: Pawel Kowalczyk Date: Fri, 14 Dec 2018 10:52:43 +0000 (+0100) Subject: 14491-graph-field-fixed-height X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/16b3b3bd729ff4fa9fa8d197a3388ece39785a23?ds=inline 14491-graph-field-fixed-height Feature #14491 Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk --- diff --git a/src/views/run-process-panel/run-process-first-step.tsx b/src/views/run-process-panel/run-process-first-step.tsx index fe93ef85bc..18f5561db3 100644 --- a/src/views/run-process-panel/run-process-first-step.tsx +++ b/src/views/run-process-panel/run-process-first-step.tsx @@ -3,11 +3,11 @@ // SPDX-License-Identifier: AGPL-3.0 import * as React from 'react'; -import { StyleRulesCallback, withStyles, Grid, Button, WithStyles, List, ListItem, ListItemText, ListItemIcon, Tabs, Tab } from '@material-ui/core'; +import { StyleRulesCallback, withStyles, Grid, Button, WithStyles, List, ListItem, ListItemText, ListItemIcon } from '@material-ui/core'; import { ArvadosTheme } from '~/common/custom-theme'; import { WorkflowResource } from '~/models/workflow'; import { WorkflowIcon } from '~/components/icon/icon'; -import { WorkflowDetailsCard } from '../workflow-panel/workflow-description-card'; +import { WorkflowDetailsCard } from '~/views/workflow-panel/workflow-description-card'; import { SearchInput } from '~/components/search-input/search-input'; type CssRules = 'root' | 'searchGrid' | 'workflowDetailsGrid' | 'list' | 'listItem' | 'itemSelected' | 'listItemText' | 'listItemIcon'; diff --git a/src/views/workflow-panel/workflow-description-card.tsx b/src/views/workflow-panel/workflow-description-card.tsx index 02408b06bb..936c348574 100644 --- a/src/views/workflow-panel/workflow-description-card.tsx +++ b/src/views/workflow-panel/workflow-description-card.tsx @@ -22,7 +22,7 @@ import { DataTableDefaultView } from '~/components/data-table-default-view/data- import { WorkflowResource, parseWorkflowDefinition, getWorkflowInputs, getInputLabel, stringifyInputType } from '~/models/workflow'; import { WorkflowGraph } from "~/views/workflow-panel/workflow-graph"; -export type CssRules = 'root' | 'tab' | 'inputTab' | 'graphTab' | 'descriptionTab' | 'inputsTable'; +export type CssRules = 'root' | 'tab' | 'inputTab' | 'graphTab' | 'graphTabWithChosenWorkflow' | 'descriptionTab' | 'inputsTable'; const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ root: { @@ -34,12 +34,12 @@ const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ inputTab: { overflow: 'auto', maxHeight: '300px', - marginTop: theme.spacing.unit, - '&:last-child': { - paddingBottom: theme.spacing.unit / 2, - } + marginTop: theme.spacing.unit }, graphTab: { + marginTop: theme.spacing.unit, + }, + graphTabWithChosenWorkflow: { overflow: 'auto', height: '450px', marginTop: theme.spacing.unit, @@ -99,7 +99,7 @@ export const WorkflowDetailsCard = withStyles(styles)( messages={['Please select a workflow to see its inputs.']} /> } } - {value === 2 && + {value === 2 && {workflow ? :