Merge branch 'master' into canon-remove-client-directive

.changeset/loud-baboons-relate.md

@@ -0,0 +1,6 @@
+---
+'@backstage/core-components': patch
+'@backstage/plugin-scaffolder': minor
+---
+
+Updating the `TaskLogStream` to take up all space in a running task, and also show the last line of the log by default

.github/workflows/ci.yml

@@ -127,6 +127,10 @@ jobs:
       - name: build all packages
         run: yarn backstage-cli repo build --all
 
+        # For now canon has a custom build script and needs to be built separately
+      - name: build canon
+        run: yarn --cwd packages/canon build
+
       - name: verify type dependencies
         run: yarn lint:type-deps
 

.github/workflows/deploy_packages.yml

@@ -110,6 +110,10 @@ jobs:
       - name: build
         run: yarn backstage-cli repo build --all
 
+        # For now canon has a custom build script and needs to be built separately
+      - name: build canon
+        run: yarn --cwd packages/canon build
+
       - name: verify type dependencies
         run: yarn lint:type-deps
 

packages/core-components/src/components/LogViewer/RealLogViewer.tsx

@@ -18,12 +18,12 @@ import Box from '@material-ui/core/Box';
 import IconButton from '@material-ui/core/IconButton';
 import CopyIcon from '@material-ui/icons/FileCopy';
 import classnames from 'classnames';
-import React, { useEffect, useMemo, useRef } from 'react';
+import React, { useEffect, useMemo, useState } from 'react';
 import { useLocation } from 'react-router-dom';
 import AutoSizer from 'react-virtualized-auto-sizer';
 import { FixedSizeList } from 'react-window';
 
-import { AnsiProcessor } from './AnsiProcessor';
+import { AnsiLine, AnsiProcessor } from './AnsiProcessor';
 import { LogLine } from './LogLine';
 import { LogViewerControls } from './LogViewerControls';
 import { HEADER_SIZE, useStyles } from './styles';
@@ -37,7 +37,9 @@ export interface RealLogViewerProps {
 
 export function RealLogViewer(props: RealLogViewerProps) {
   const classes = useStyles({ classes: props.classes });
-  const listRef = useRef<FixedSizeList | null>(null);
+  const [fixedListInstance, setFixedListInstance] = useState<FixedSizeList<
+    AnsiLine[]
+  > | null>(null);
 
   // The processor keeps state that optimizes appending to the text
   const processor = useMemo(() => new AnsiProcessor(), []);
@@ -48,10 +50,21 @@ export function RealLogViewer(props: RealLogViewerProps) {
   const location = useLocation();
 
   useEffect(() => {
-    if (search.resultLine !== undefined && listRef.current) {
-      listRef.current.scrollToItem(search.resultLine - 1, 'center');
+    if (fixedListInstance) {
+      fixedListInstance.scrollToItem(lines.length - 1, 'end');
     }
-  }, [search.resultLine]);
+  }, [fixedListInstance, lines]);
+
+  useEffect(() => {
+    if (!fixedListInstance) {
+      return;
+    }
+    if (search.resultLine) {
+      fixedListInstance.scrollToItem(search.resultLine - 1, 'center');
+    } else {
+      fixedListInstance.scrollToItem(lines.length - 1, 'end');
+    }
+  }, [fixedListInstance, search.resultLine, lines]);
 
   useEffect(() => {
     if (location.hash) {
@@ -76,7 +89,9 @@ export function RealLogViewer(props: RealLogViewerProps) {
             <LogViewerControls {...search} />
           </Box>
           <FixedSizeList
-            ref={listRef}
+            ref={(instance: FixedSizeList<AnsiLine[]>) => {
+              setFixedListInstance(instance);
+            }}
             className={classes.log}
             height={(height || 480) - HEADER_SIZE}
             width={width || 640}

plugins/scaffolder/src/components/OngoingTask/OngoingTask.tsx

@@ -20,7 +20,6 @@ import Box from '@material-ui/core/Box';
 import Button from '@material-ui/core/Button';
 import Paper from '@material-ui/core/Paper';
 import { makeStyles } from '@material-ui/core/styles';
-import { ResizableBox } from 'react-resizable';
 import {
   ScaffolderTaskOutput,
   scaffolderApiRef,
@@ -119,6 +118,7 @@ export const OngoingTask = (props: {
 
   useEffect(() => {
     if (taskStream.completed && !taskStream.error) {
+      setLogVisibleState(true);
       setButtonBarVisibleState(false);
     }
   }, [taskStream.error, taskStream.completed]);
@@ -292,13 +292,11 @@ export const OngoingTask = (props: {
         ) : null}
 
         {logsVisible ? (
-          <ResizableBox height={240} minConstraints={[0, 160]} axis="y">
-            <Paper style={{ height: '100%' }}>
-              <Box padding={2} height="100%">
-                <TaskLogStream logs={taskStream.stepLogs} />
-              </Box>
-            </Paper>
-          </ResizableBox>
+          <Paper style={{ height: '100%' }}>
+            <Box padding={2} height="100%">
+              <TaskLogStream logs={taskStream.stepLogs} />
+            </Box>
+          </Paper>
         ) : null}
       </Content>
     </Page>