From 47748c7e62594d00db1304e7252eb175cc20482a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= <freben@gmail.com>
Date: Thu, 1 Jul 2021 14:21:29 +0200
Subject: [PATCH 1/2] Fix error in error panel, and console warnings about DOM
 nesting pre inside p
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Fredrik Adelöw <freben@gmail.com>
---
 .changeset/silent-horses-fry.md                              | 5 +++++
 .../src/components/ResponseErrorPanel/ResponseErrorPanel.tsx | 5 ++---
 2 files changed, 7 insertions(+), 3 deletions(-)
 create mode 100644 .changeset/silent-horses-fry.md

diff --git a/.changeset/silent-horses-fry.md b/.changeset/silent-horses-fry.md
new file mode 100644
index 0000000000..2b7c562607
--- /dev/null
+++ b/.changeset/silent-horses-fry.md
@@ -0,0 +1,5 @@
+---
+'@backstage/core-components': patch
+---
+
+Fix error in error panel, and console warnings about DOM nesting pre inside p
diff --git a/packages/core-components/src/components/ResponseErrorPanel/ResponseErrorPanel.tsx b/packages/core-components/src/components/ResponseErrorPanel/ResponseErrorPanel.tsx
index 231cd179c7..5a19d32eef 100644
--- a/packages/core-components/src/components/ResponseErrorPanel/ResponseErrorPanel.tsx
+++ b/packages/core-components/src/components/ResponseErrorPanel/ResponseErrorPanel.tsx
@@ -76,7 +76,7 @@ export const ResponseErrorPanel = ({
           <ListItemText
             classes={{ secondary: classes.text }}
             primary="Request"
-            secondary={request}
+            secondary={request ? `${request.method} ${request.url}` : undefined}
           />
           <CopyTextButton text={requestString} />
         </ListItem>
@@ -87,10 +87,9 @@ export const ResponseErrorPanel = ({
           <ListItemText
             classes={{ secondary: classes.text }}
             primary="Full Error as JSON"
-            secondary={<CodeSnippet language="json" text={jsonString} />}
           />
-          <CopyTextButton text={jsonString} />
         </ListItem>
+        <CodeSnippet language="json" text={jsonString} showCopyCodeButton />
       </>
     </ErrorPanel>
   );

From ac663f51609fad5c461bd7b8699ad6b232ebac0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= <freben@gmail.com>
Date: Thu, 1 Jul 2021 23:42:58 +0200
Subject: [PATCH 2/2] Update
 packages/core-components/src/components/ResponseErrorPanel/ResponseErrorPanel.tsx
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Fredrik Adelöw <freben@gmail.com>

Co-authored-by: Tim <timbonicus@gmail.com>
---
 .../src/components/ResponseErrorPanel/ResponseErrorPanel.tsx    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core-components/src/components/ResponseErrorPanel/ResponseErrorPanel.tsx b/packages/core-components/src/components/ResponseErrorPanel/ResponseErrorPanel.tsx
index 5a19d32eef..ccfb706bf9 100644
--- a/packages/core-components/src/components/ResponseErrorPanel/ResponseErrorPanel.tsx
+++ b/packages/core-components/src/components/ResponseErrorPanel/ResponseErrorPanel.tsx
@@ -76,7 +76,7 @@ export const ResponseErrorPanel = ({
           <ListItemText
             classes={{ secondary: classes.text }}
             primary="Request"
-            secondary={request ? `${request.method} ${request.url}` : undefined}
+            secondary={request ? `${requestString}` : undefined}
           />
           <CopyTextButton text={requestString} />
         </ListItem>