From 617faf0233600ef4fc31d8f83127c92323e549a5 Mon Sep 17 00:00:00 2001
From: Brian Phillips <28457+brianphillips@users.noreply.github.com>
Date: Wed, 27 Mar 2024 12:11:31 -0500
Subject: [PATCH] Handle "null" statusCheckRollup values on commits

Signed-off-by: Brian Phillips <28457+brianphillips@users.noreply.github.com>
---
 .changeset/twelve-comics-double.md                           | 5 +++++
 .../src/components/Card/CardHeader.tsx                       | 2 +-
 .../EntityTeamPullRequestsCard.test.tsx                      | 4 +---
 .../EntityTeamPullRequestsContent.test.tsx                   | 4 +---
 plugins/github-pull-requests-board/src/utils/types.tsx       | 2 +-
 5 files changed, 9 insertions(+), 8 deletions(-)
 create mode 100644 .changeset/twelve-comics-double.md

diff --git a/.changeset/twelve-comics-double.md b/.changeset/twelve-comics-double.md
new file mode 100644
index 0000000000..c720741c29
--- /dev/null
+++ b/.changeset/twelve-comics-double.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-github-pull-requests-board': patch
+---
+
+Handle null values returned from GitHub for the statusCheckRollup value on the commit object
diff --git a/plugins/github-pull-requests-board/src/components/Card/CardHeader.tsx b/plugins/github-pull-requests-board/src/components/Card/CardHeader.tsx
index 15919d4297..6c8c02da24 100644
--- a/plugins/github-pull-requests-board/src/components/Card/CardHeader.tsx
+++ b/plugins/github-pull-requests-board/src/components/Card/CardHeader.tsx
@@ -92,7 +92,7 @@ const CardHeader: FunctionComponent<Props> = (props: Props) => {
         <Box display="flex" alignItems="center" flexWrap="wrap" paddingTop={1}>
           <Typography variant="body2" component="p">
             Commit Status:{' '}
-            <strong>{status.commit.statusCheckRollup.state}</strong>
+            <strong>{status.commit.statusCheckRollup?.state || 'N/A'}</strong>
           </Typography>
         </Box>
       )}
diff --git a/plugins/github-pull-requests-board/src/components/EntityTeamPullRequestsCard/EntityTeamPullRequestsCard.test.tsx b/plugins/github-pull-requests-board/src/components/EntityTeamPullRequestsCard/EntityTeamPullRequestsCard.test.tsx
index a4e0240cbd..28e1c89fc7 100644
--- a/plugins/github-pull-requests-board/src/components/EntityTeamPullRequestsCard/EntityTeamPullRequestsCard.test.tsx
+++ b/plugins/github-pull-requests-board/src/components/EntityTeamPullRequestsCard/EntityTeamPullRequestsCard.test.tsx
@@ -96,9 +96,7 @@ jest.mock('../../hooks/usePullRequestsByTeam', () => {
           isArchived: false,
           status: {
             commit: {
-              statusCheckRollup: {
-                state: 'FAILURE',
-              },
+              statusCheckRollup: null,
             },
           },
         }),
diff --git a/plugins/github-pull-requests-board/src/components/EntityTeamPullRequestsContent/EntityTeamPullRequestsContent.test.tsx b/plugins/github-pull-requests-board/src/components/EntityTeamPullRequestsContent/EntityTeamPullRequestsContent.test.tsx
index dc02030f47..c38500a1ef 100644
--- a/plugins/github-pull-requests-board/src/components/EntityTeamPullRequestsContent/EntityTeamPullRequestsContent.test.tsx
+++ b/plugins/github-pull-requests-board/src/components/EntityTeamPullRequestsContent/EntityTeamPullRequestsContent.test.tsx
@@ -96,9 +96,7 @@ jest.mock('../../hooks/usePullRequestsByTeam', () => {
           isArchived: false,
           status: {
             commit: {
-              statusCheckRollup: {
-                state: 'FAILURE',
-              },
+              statusCheckRollup: null,
             },
           },
         }),
diff --git a/plugins/github-pull-requests-board/src/utils/types.tsx b/plugins/github-pull-requests-board/src/utils/types.tsx
index 88b05219d6..41ba42c533 100644
--- a/plugins/github-pull-requests-board/src/utils/types.tsx
+++ b/plugins/github-pull-requests-board/src/utils/types.tsx
@@ -85,7 +85,7 @@ export type Status = {
   commit: {
     statusCheckRollup: {
       state: string;
-    };
+    } | null;
   };
 };