Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: polish workflow details page #215

Merged
merged 4 commits into from
Sep 24, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/components/Entities/EntityDetails.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,11 @@ const useStyles = makeStyles((theme: Theme) => ({
flex: '1 1 auto',
flexDirection: 'column',
margin: `0 -${theme.spacing(contentMarginGridUnits)}px`,
minHeight: theme.spacing(55)
flexBasis: theme.spacing(80)
},
versionsContainer: {
display: 'flex',
flexDirection: 'column',
height: theme.spacing(53)
flexDirection: 'column'
},
versionView: {
flex: '1 1 auto'
Expand Down
5 changes: 2 additions & 3 deletions src/components/Entities/EntityVersions.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import Typography from '@material-ui/core/Typography';
import { makeStyles, Theme } from '@material-ui/core/styles';
import { contentMarginGridUnits } from 'common/layout';
import { WaitForData } from 'components/common/WaitForData';
import { useWorkflowExecutionFiltersState } from 'components/Executions/filters/useExecutionFiltersState';
import { WorkflowVersionsTable } from 'components/Executions/Tables/WorkflowVersionsTable';
Expand All @@ -20,8 +19,8 @@ const useStyles = makeStyles((theme: Theme) => ({
headerContainer: {
display: 'flex',
justifyContent: 'space-between',
marginLeft: theme.spacing(contentMarginGridUnits),
marginRight: theme.spacing(contentMarginGridUnits)
marginLeft: theme.spacing(1),
marginRight: theme.spacing(1)
},
header: {
marginBottom: theme.spacing(1)
Expand Down
2 changes: 2 additions & 0 deletions src/components/Executions/Tables/WorkflowVersionsTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ export const WorkflowVersionsTable: React.FC<WorkflowVersionsTableProps> = props
versionView={versionView}
onClick={versionView ? handleClickRow(row.id) : undefined}
isChecked={workflowVersion === row.id.version}
key={`workflow-version-row-${row.id.version}`}
/>
);

Expand All @@ -77,6 +78,7 @@ export const WorkflowVersionsTable: React.FC<WorkflowVersionsTableProps> = props
totalRows={workflows.length}
showRadioButton={versionView}
noDataString={noWorkflowVersionsFoundString}
fillEmptyRows={false}
/>
</div>
);
Expand Down
20 changes: 13 additions & 7 deletions src/components/Tables/PaginatedDataList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ interface PaginatedDataListProps<T> {
data: T[];
rowRenderer: (row: T) => void;
noDataString: string;
fillEmptyRows?: boolean;
}

const useStyles = makeStyles((theme: Theme) =>
Expand Down Expand Up @@ -164,6 +165,7 @@ const PaginatedDataList = <T,>({
rowRenderer,
totalRows,
showRadioButton,
fillEmptyRows = true,
noDataString
}: PropsWithChildren<PaginatedDataListProps<T>>) => {
const classes = useStyles();
Expand Down Expand Up @@ -211,13 +213,17 @@ const PaginatedDataList = <T,>({
{data.map((row, index) => {
return rowRenderer(row);
})}
{!showRadioButton && emptyRows > 0 && (
<TableRow
style={{ height: `${4 * emptyRows}rem` }}
>
<TableCell colSpan={6} />
</TableRow>
)}
{fillEmptyRows &&
!showRadioButton &&
emptyRows > 0 && (
<TableRow
style={{
height: `${4 * emptyRows}rem`
}}
>
<TableCell colSpan={6} />
</TableRow>
)}
</TableBody>
</Table>
</TableContainer>
Expand Down
9 changes: 4 additions & 5 deletions src/components/Workflow/StaticGraphContainer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,10 @@ export interface StaticGraphContainerProps {
export const StaticGraphContainer: React.FC<StaticGraphContainerProps> = ({
workflowId
}) => {
const containerStyle = {
width: '100%',
height: '30%',
maxHeight: '400px',
minHeight: '220px'
const containerStyle: React.CSSProperties = {
height: 300,
minHeight: 300,
padding: '1rem 0'
};
const workflowQuery = useQuery<Workflow, Error>(
makeWorkflowQuery(useQueryClient(), workflowId)
Expand Down
2 changes: 1 addition & 1 deletion src/components/common/ContentContainer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const useStyles = makeStyles((theme: Theme) => {
root: {
display: 'flex',
flexDirection: 'column',
height: '100vh',
minHeight: '100vh',
padding: `${spacerHeight} ${contentMargin} 0 ${contentMargin}`,
[`&.${ContainerClasses.NoMargin}`]: {
margin: 0,
Expand Down
13 changes: 11 additions & 2 deletions src/components/flytegraph/ReactFlow/ReactFlowGraphComponent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,20 @@ const ReactFlowGraphComponent = props => {
rfGraphJson: rfGraphJson,
type: RFGraphTypes.main
};

const containerStyle: React.CSSProperties = {
display: 'flex',
flex: `1 1 100%`,
flexDirection: 'column',
minHeight: '100px',
minWidth: '200px'
};

return (
<>
<div style={containerStyle}>
<Legend />
<ReactFlowWrapper {...ReactFlowProps} />
</>
</div>
);
};

Expand Down
10 changes: 10 additions & 0 deletions src/components/flytegraph/ReactFlow/ReactFlowWrapper.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -130,12 +130,22 @@ export const ReactFlowWrapper: React.FC<RFWrapperProps> = ({
* - Append that to the rf nodes {data} object.
*/

/**
* React Flow's min height to make it render
*/
const reactFlowStyle: React.CSSProperties = {
display: 'flex',
flex: `1 1 100%`,
flexDirection: 'column'
};

return (
<ReactFlowProvider>
<ReactFlow
elements={elements}
onLoad={onLoad}
nodeTypes={CustomNodeTypes}
style={reactFlowStyle}
>
<Background
style={backgroundStyle.background}
Expand Down