From cbd20c46f14f16ec73724454b1a524e220d9c4f9 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Sun, 5 Dec 2021 20:57:31 +0100
Subject: [PATCH] github-actions: switch to using LogViewer

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .changeset/red-chairs-wave.md                 |  5 ++
 plugins/github-actions/package.json           |  1 -
 .../WorkflowRunLogs/WorkflowRunLogs.tsx       | 69 +++++--------------
 3 files changed, 24 insertions(+), 51 deletions(-)
 create mode 100644 .changeset/red-chairs-wave.md

diff --git a/.changeset/red-chairs-wave.md b/.changeset/red-chairs-wave.md
new file mode 100644
index 0000000000..a052afe4b5
--- /dev/null
+++ b/.changeset/red-chairs-wave.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-github-actions': patch
+---
+
+Switch to using `LogViewer` component from `@backstage/core-components` to display build logs.
diff --git a/plugins/github-actions/package.json b/plugins/github-actions/package.json
index 0ea8bbe9f2..ace9527598 100644
--- a/plugins/github-actions/package.json
+++ b/plugins/github-actions/package.json
@@ -44,7 +44,6 @@
     "@material-ui/lab": "4.0.0-alpha.57",
     "@octokit/rest": "^18.5.3",
     "luxon": "^2.0.2",
-    "react-lazylog": "^4.5.3",
     "react-router": "6.0.0-beta.0",
     "react-router-dom": "6.0.0-beta.0",
     "react-use": "^17.2.4"
diff --git a/plugins/github-actions/src/components/WorkflowRunLogs/WorkflowRunLogs.tsx b/plugins/github-actions/src/components/WorkflowRunLogs/WorkflowRunLogs.tsx
index 399fed9557..509e404194 100644
--- a/plugins/github-actions/src/components/WorkflowRunLogs/WorkflowRunLogs.tsx
+++ b/plugins/github-actions/src/components/WorkflowRunLogs/WorkflowRunLogs.tsx
@@ -15,7 +15,7 @@
  */
 
 import { Entity } from '@backstage/catalog-model';
-import { Progress } from '@backstage/core-components';
+import { LogViewer } from '@backstage/core-components';
 import { configApiRef, useApi } from '@backstage/core-plugin-api';
 import { readGitHubIntegrationConfigs } from '@backstage/integration';
 import {
@@ -32,14 +32,11 @@ import {
 } from '@material-ui/core';
 import DescriptionIcon from '@material-ui/icons/Description';
 import ExpandMoreIcon from '@material-ui/icons/ExpandMore';
-import React, { Suspense } from 'react';
+import React from 'react';
 import { useProjectName } from '../useProjectName';
 import { useDownloadWorkflowRunLogs } from './useDownloadWorkflowRunLogs';
 
-const LazyLog = React.lazy(() => import('react-lazylog/build/LazyLog'));
-const LinePart = React.lazy(() => import('react-lazylog/build/LinePart'));
-
-const useStyles = makeStyles<Theme>(() => ({
+const useStyles = makeStyles<Theme>(theme => ({
   button: {
     order: -1,
     marginRight: 0,
@@ -53,49 +50,19 @@ const useStyles = makeStyles<Theme>(() => ({
     justifyContent: 'center',
     margin: 'auto',
   },
-  normalLog: {
+  normalLogContainer: {
     height: '75vh',
     width: '100%',
   },
-  modalLog: {
+  modalLogContainer: {
     height: '100%',
     width: '100%',
   },
+  log: {
+    background: theme.palette.background.default,
+  },
 }));
 
-const DisplayLog = ({
-  jobLogs,
-  className,
-}: {
-  jobLogs: any;
-  className: string;
-}) => {
-  return (
-    <Suspense fallback={<Progress />}>
-      <div className={className}>
-        <LazyLog
-          text={jobLogs ?? 'No Values Found'}
-          extraLines={1}
-          caseInsensitive
-          enableSearch
-          formatPart={line => {
-            if (
-              line.toLocaleLowerCase().includes('error') ||
-              line.toLocaleLowerCase().includes('failed') ||
-              line.toLocaleLowerCase().includes('failure')
-            ) {
-              return (
-                <LinePart style={{ color: 'red' }} part={{ text: line }} />
-              );
-            }
-            return line;
-          }}
-        />
-      </div>
-    </Suspense>
-  );
-};
-
 /**
  * A component for Run Logs visualization.
  */
@@ -123,6 +90,7 @@ export const WorkflowRunLogs = ({
     repo,
     id: runId,
   });
+  const logText = jobLogs.value ? String(jobLogs.value) : undefined;
   const [open, setOpen] = React.useState(false);
 
   const handleOpen = () => {
@@ -162,18 +130,19 @@ export const WorkflowRunLogs = ({
           onClose={handleClose}
         >
           <Fade in={open}>
-            <DisplayLog
-              jobLogs={jobLogs.value || undefined}
-              className={classes.modalLog}
-            />
+            <div className={classes.modalLogContainer}>
+              <LogViewer
+                text={logText ?? 'No Values Found'}
+                className={classes.log}
+              />
+            </div>
           </Fade>
         </Modal>
       </AccordionSummary>
-      {jobLogs.value && (
-        <DisplayLog
-          jobLogs={jobLogs.value || undefined}
-          className={classes.normalLog}
-        />
+      {logText && (
+        <div className={classes.normalLogContainer}>
+          <LogViewer text={logText} className={classes.log} />
+        </div>
       )}
     </Accordion>
   );