From 85636955987f84d2fb8b320a684f88d7f1ddb586 Mon Sep 17 00:00:00 2001
From: Brian Fletcher <brian@roadie.io>
Date: Fri, 4 Feb 2022 15:07:24 +0000
Subject: [PATCH] move the progress bar inside the log viewer

Signed-off-by: Brian Fletcher <brian@roadie.io>
---
 .../src/components/TaskPage/TaskPage.tsx      | 105 +++++++++---------
 1 file changed, 52 insertions(+), 53 deletions(-)

diff --git a/plugins/scaffolder/src/components/TaskPage/TaskPage.tsx b/plugins/scaffolder/src/components/TaskPage/TaskPage.tsx
index cb2eeab3b2..a5a36d1d40 100644
--- a/plugins/scaffolder/src/components/TaskPage/TaskPage.tsx
+++ b/plugins/scaffolder/src/components/TaskPage/TaskPage.tsx
@@ -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>
   );
 };