From 7fe7fdfe3545af1e8e425d4be22231ce1ccb7454 Mon Sep 17 00:00:00 2001
From: Eric Yang <weityang@ebay.com>
Date: Fri, 18 Aug 2023 17:04:08 -0700
Subject: [PATCH 1/4] fix[core-components] fix cannot convert undefined or null
 to object error

Signed-off-by: Eric Yang <weityang@ebay.com>
---
 .../StructuredMetadataTable/StructuredMetadataTable.tsx         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core-components/src/components/StructuredMetadataTable/StructuredMetadataTable.tsx b/packages/core-components/src/components/StructuredMetadataTable/StructuredMetadataTable.tsx
index 6114054bbe..2b18f6ad19 100644
--- a/packages/core-components/src/components/StructuredMetadataTable/StructuredMetadataTable.tsx
+++ b/packages/core-components/src/components/StructuredMetadataTable/StructuredMetadataTable.tsx
@@ -113,7 +113,7 @@ function toValue(
     return <Fragment>{value}</Fragment>;
   }
 
-  if (typeof value === 'object' && !Array.isArray(value)) {
+  if (value !== null && typeof value === 'object' && !Array.isArray(value)) {
     return renderMap(value, options, nested);
   }
 

From 0c9907645aabcb6781627087a6ae268d15e27746 Mon Sep 17 00:00:00 2001
From: Eric Yang <weityang@ebay.com>
Date: Fri, 18 Aug 2023 17:06:57 -0700
Subject: [PATCH 2/4] add changeset

Signed-off-by: Eric Yang <weityang@ebay.com>
---
 .changeset/eighty-fans-provide.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/eighty-fans-provide.md

diff --git a/.changeset/eighty-fans-provide.md b/.changeset/eighty-fans-provide.md
new file mode 100644
index 0000000000..8c441d33c5
--- /dev/null
+++ b/.changeset/eighty-fans-provide.md
@@ -0,0 +1,5 @@
+---
+'@backstage/core-components': patch
+---
+
+Fix "cannot convert undefined or null to object"

From a6c9198ac89785e64fea3723b0aeb6a9699fd61e Mon Sep 17 00:00:00 2001
From: Eric Yang <weityang@ebay.com>
Date: Fri, 18 Aug 2023 18:30:44 -0700
Subject: [PATCH 3/4] update unit test

Signed-off-by: Eric Yang <weityang@ebay.com>
---
 .../StructuredMetadataTable/StructuredMetadataTable.test.tsx    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core-components/src/components/StructuredMetadataTable/StructuredMetadataTable.test.tsx b/packages/core-components/src/components/StructuredMetadataTable/StructuredMetadataTable.test.tsx
index 7ebe15c931..db7c53897d 100644
--- a/packages/core-components/src/components/StructuredMetadataTable/StructuredMetadataTable.test.tsx
+++ b/packages/core-components/src/components/StructuredMetadataTable/StructuredMetadataTable.test.tsx
@@ -21,7 +21,7 @@ import { StructuredMetadataTable } from './StructuredMetadataTable';
 
 describe('<StructuredMetadataTable />', () => {
   it('renders without exploding', () => {
-    const metadata = { hello: 'world' };
+    const metadata = { hello: 'world', foo: null };
     const { getByText } = render(
       <StructuredMetadataTable metadata={metadata} />,
     );

From f8323f0a3a75059335f0565543906301e3dbb57e Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Tue, 22 Aug 2023 13:17:56 +0200
Subject: [PATCH 4/4] Update .changeset/eighty-fans-provide.md

Co-authored-by: Vincenzo Scamporlino <me@vinzscam.dev>
Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .changeset/eighty-fans-provide.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/eighty-fans-provide.md b/.changeset/eighty-fans-provide.md
index 8c441d33c5..b98bc39924 100644
--- a/.changeset/eighty-fans-provide.md
+++ b/.changeset/eighty-fans-provide.md
@@ -2,4 +2,4 @@
 '@backstage/core-components': patch
 ---
 
-Fix "cannot convert undefined or null to object"
+Fixed an issue causing `StructuredMetadataTable` to crash in case metadata contained `null` values.