From eff293b4158bc84158caf799ad5a782700b9211f Mon Sep 17 00:00:00 2001
From: Bogdan Nechyporenko <bnechyporenko@bol.com>
Date: Tue, 3 Oct 2023 14:36:28 +0200
Subject: [PATCH] Fix for a Warning Panel

Signed-off-by: Bogdan Nechyporenko <bnechyporenko@bol.com>
---
 .changeset/many-timers-double.md                             | 5 -----
 .changeset/perfect-shrimps-attend.md                         | 5 +++++
 packages/app/src/App.tsx                                     | 1 -
 .../src/components/WarningPanel/WarningPanel.tsx             | 4 ++++
 plugins/scaffolder/alpha-api-report.md                       | 3 ---
 plugins/scaffolder/src/next/OngoingTask/OngoingTask.tsx      | 5 +----
 plugins/scaffolder/src/next/Router/Router.tsx                | 4 ----
 7 files changed, 10 insertions(+), 17 deletions(-)
 delete mode 100644 .changeset/many-timers-double.md
 create mode 100644 .changeset/perfect-shrimps-attend.md

diff --git a/.changeset/many-timers-double.md b/.changeset/many-timers-double.md
deleted file mode 100644
index 27d569ba8f..0000000000
--- a/.changeset/many-timers-double.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-scaffolder': patch
----
-
-Added a possibility to open logs view in a scaffolder execution panel automatically
diff --git a/.changeset/perfect-shrimps-attend.md b/.changeset/perfect-shrimps-attend.md
new file mode 100644
index 0000000000..dc3cfc28c7
--- /dev/null
+++ b/.changeset/perfect-shrimps-attend.md
@@ -0,0 +1,5 @@
+---
+'@backstage/core-components': patch
+---
+
+Fix for a Warning Panel. For certain error messages the content of it doesn't fit inside the div container.
diff --git a/packages/app/src/App.tsx b/packages/app/src/App.tsx
index 8757367338..f2b7d66b21 100644
--- a/packages/app/src/App.tsx
+++ b/packages/app/src/App.tsx
@@ -241,7 +241,6 @@ const routes = (
         path="/create"
         element={
           <NextScaffolderPage
-            logs={{ autoOpen: true }}
             groups={[
               {
                 title: 'Recommended',
diff --git a/packages/core-components/src/components/WarningPanel/WarningPanel.tsx b/packages/core-components/src/components/WarningPanel/WarningPanel.tsx
index 7e8248115f..de74c21e7d 100644
--- a/packages/core-components/src/components/WarningPanel/WarningPanel.tsx
+++ b/packages/core-components/src/components/WarningPanel/WarningPanel.tsx
@@ -69,6 +69,9 @@ export type WarningPanelClassKey =
 
 const useStyles = makeStyles<BackstageTheme>(
   theme => ({
+    content: {
+      // overflow: 'hidden',
+    },
     panel: {
       backgroundColor: ({ severity }: WarningProps) =>
         getWarningBackgroundColor(
@@ -168,6 +171,7 @@ export function WarningPanel(props: WarningProps) {
     >
       <AccordionSummary
         expandIcon={<ExpandMoreIconStyled severity={severity} />}
+        classes={{ content: classes.content }}
         className={classes.summary}
       >
         <ErrorOutlineStyled severity={severity} />
diff --git a/plugins/scaffolder/alpha-api-report.md b/plugins/scaffolder/alpha-api-report.md
index 788e2b5e00..8cacf6105e 100644
--- a/plugins/scaffolder/alpha-api-report.md
+++ b/plugins/scaffolder/alpha-api-report.md
@@ -35,9 +35,6 @@ export type NextRouterProps = {
     TemplateListPageComponent?: React_2.ComponentType<TemplateListPageProps>;
     TemplateWizardPageComponent?: React_2.ComponentType<TemplateWizardPageProps>;
   };
-  logs?: {
-    autoOpen?: boolean;
-  };
   groups?: TemplateGroupFilter[];
   templateFilter?: (entity: TemplateEntityV1beta3) => boolean;
   FormProps?: FormProps_2;
diff --git a/plugins/scaffolder/src/next/OngoingTask/OngoingTask.tsx b/plugins/scaffolder/src/next/OngoingTask/OngoingTask.tsx
index e856076908..91c04897d9 100644
--- a/plugins/scaffolder/src/next/OngoingTask/OngoingTask.tsx
+++ b/plugins/scaffolder/src/next/OngoingTask/OngoingTask.tsx
@@ -52,9 +52,6 @@ export const OngoingTask = (props: {
   TemplateOutputsComponent?: React.ComponentType<{
     output?: ScaffolderTaskOutput;
   }>;
-  logs?: {
-    autoOpen?: boolean;
-  };
 }) => {
   // todo(blam): check that task Id actually exists, and that it's valid. otherwise redirect to something more useful.
   const { taskId } = useParams();
@@ -72,7 +69,7 @@ export const OngoingTask = (props: {
     [taskStream],
   );
 
-  const [logsVisible, setLogVisibleState] = useState(props.logs?.autoOpen ?? false);
+  const [logsVisible, setLogVisibleState] = useState(false);
   const [buttonBarVisible, setButtonBarVisibleState] = useState(true);
 
   useEffect(() => {
diff --git a/plugins/scaffolder/src/next/Router/Router.tsx b/plugins/scaffolder/src/next/Router/Router.tsx
index 12193ac48b..2061cd1243 100644
--- a/plugins/scaffolder/src/next/Router/Router.tsx
+++ b/plugins/scaffolder/src/next/Router/Router.tsx
@@ -65,9 +65,6 @@ export type NextRouterProps = {
     TemplateListPageComponent?: React.ComponentType<TemplateListPageProps>;
     TemplateWizardPageComponent?: React.ComponentType<TemplateWizardPageProps>;
   };
-  logs?: {
-    autoOpen?: boolean;
-  };
   groups?: TemplateGroupFilter[];
   templateFilter?: (entity: TemplateEntityV1beta3) => boolean;
   // todo(blam): rename this to formProps
@@ -142,7 +139,6 @@ export const Router = (props: PropsWithChildren<NextRouterProps>) => {
         path={scaffolderTaskRouteRef.path}
         element={
           <TaskPageComponent
-            logs={props.logs}
             TemplateOutputsComponent={TemplateOutputsComponent}
           />
         }