paulononato/backstage
1
0
Fork 0
Code Issues Pull Requests Actions 42 Packages Projects Releases Wiki Activity

move the progress bar inside the log viewer

Browse Source 
Signed-off-by: Brian Fletcher <brian@roadie.io>
This commit is contained in:
Brian Fletcher
2022-02-04 15:07:24 +00:00
parent 33e139e652
commit 8563695598
1 changed files with 52 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/scaffolder/src/components/TaskPage/TaskPage.tsx
+52 -53
View File
@@ -295,59 +295,58 @@ export const TaskPage = () => {
};
return (
<>
<Progress style={{ display: !!currentStepId ? 'none' : undefined }} />
<Page themeId="home">
<Header
pageTitleOverride={`Task ${taskId}`}
title={
<>
Task Activity <Lifecycle alpha shorthand />
</>
}
subtitle={`Activity for task: ${taskId}`}
/>
<Content>
{taskNotFound ? (
<ErrorPage
status="404"
statusMessage="Task not found"
additionalInfo="No task found with this ID"
/>
) : (
<div>
<Grid container>
<Grid item xs={3}>
<Paper>
<TaskStatusStepper
steps={steps}
currentStepId={currentStepId}
onUserStepChange={setUserSelectedStepId}
/>
{output && hasLinks(output) && (
<TaskPageLinks output={output} />
)}
<Button
className={classes.button}
onClick={handleStartOver}
disabled={!completed}
variant="contained"
color="primary"
>
Start Over
</Button>
</Paper>
</Grid>
<Grid item xs={9}>
<div style={{ height: '80vh' }}>
<LogViewer text={logAsString} />
</div>
</Grid>
<Page themeId="home">
<Header
pageTitleOverride={`Task ${taskId}`}
title={
<>
Task Activity <Lifecycle alpha shorthand />
</>
}
subtitle={`Activity for task: ${taskId}`}
/>
<Content>
{taskNotFound ? (
<ErrorPage
status="404"
statusMessage="Task not found"
additionalInfo="No task found with this ID"
/>
) : (
<div>
<Grid container>
<Grid item xs={3}>
<Paper>
<TaskStatusStepper
steps={steps}
currentStepId={currentStepId}
onUserStepChange={setUserSelectedStepId}
/>
{output && hasLinks(output) && (
<TaskPageLinks output={output} />
)}
<Button
className={classes.button}
onClick={handleStartOver}
disabled={!completed}
variant="contained"
color="primary"
>
Start Over
</Button>
</Paper>
</Grid>
</div>
)}
</Content>
</Page>
</>
<Grid item xs={9}>
{!currentStepId && <Progress />}
<div style={{ height: '80vh' }}>
<LogViewer text={logAsString} />
</div>
</Grid>
</Grid>
</div>
)}
</Content>
</Page>
);
};