From 4d38bab75f57f0fb80ffdc5e8b8ef65d421cab11 Mon Sep 17 00:00:00 2001
From: Phil Kuang <pkuang@factset.com>
Date: Thu, 20 May 2021 17:44:24 -0400
Subject: [PATCH] fix(github-deployments): handle deployments without commits

Signed-off-by: Phil Kuang <pkuang@factset.com>
---
 .changeset/two-cameras-repeat.md                      |  5 +++++
 plugins/github-deployments/src/api/index.ts           |  2 +-
 .../src/components/GithubDeploymentsTable/columns.tsx | 11 ++++++-----
 3 files changed, 12 insertions(+), 6 deletions(-)
 create mode 100644 .changeset/two-cameras-repeat.md

diff --git a/.changeset/two-cameras-repeat.md b/.changeset/two-cameras-repeat.md
new file mode 100644
index 0000000000..467f33adc4
--- /dev/null
+++ b/.changeset/two-cameras-repeat.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-github-deployments': patch
+---
+
+Handle deployments without a commit
diff --git a/plugins/github-deployments/src/api/index.ts b/plugins/github-deployments/src/api/index.ts
index d7e7e2fca6..a5d824914e 100644
--- a/plugins/github-deployments/src/api/index.ts
+++ b/plugins/github-deployments/src/api/index.ts
@@ -60,7 +60,7 @@ export type GithubDeployment = {
   commit: {
     abbreviatedOid: string;
     commitUrl: string;
-  };
+  } | null;
   creator: {
     login: string;
   };
diff --git a/plugins/github-deployments/src/components/GithubDeploymentsTable/columns.tsx b/plugins/github-deployments/src/components/GithubDeploymentsTable/columns.tsx
index f050af836c..a4aad47657 100644
--- a/plugins/github-deployments/src/components/GithubDeploymentsTable/columns.tsx
+++ b/plugins/github-deployments/src/components/GithubDeploymentsTable/columns.tsx
@@ -66,11 +66,12 @@ export function createStatusColumn(): TableColumn<GithubDeployment> {
 export function createCommitColumn(): TableColumn<GithubDeployment> {
   return {
     title: 'Commit',
-    render: (row: GithubDeployment): JSX.Element => (
-      <Link to={row.commit.commitUrl} target="_blank" rel="noopener">
-        {row.commit.abbreviatedOid}
-      </Link>
-    ),
+    render: (row: GithubDeployment) =>
+      row.commit && (
+        <Link to={row.commit.commitUrl} target="_blank" rel="noopener">
+          {row.commit.abbreviatedOid}
+        </Link>
+      ),
   };
 }