Merge branch 'master' into statuses-for-github-deployments-plugin

plugins/github-deployments/CHANGELOG.md

@@ -1,5 +1,33 @@
 # @backstage/plugin-github-deployments
 
+## 0.1.7
+
+### Patch Changes
+
+- 4d38bab75: Handle deployments without a commit
+- Updated dependencies [0fd4ea443]
+- Updated dependencies [add62a455]
+- Updated dependencies [cc592248b]
+- Updated dependencies [17c497b81]
+- Updated dependencies [704875e26]
+  - @backstage/integration@0.5.4
+  - @backstage/catalog-model@0.8.0
+  - @backstage/core@0.7.11
+  - @backstage/plugin-catalog-react@0.2.0
+
+## 0.1.6
+
+### Patch Changes
+
+- fa69982fb: Support GHE by properly parsing enterprise instance hosts
+- Updated dependencies [f7f7783a3]
+- Updated dependencies [65e6c4541]
+- Updated dependencies [68fdbf014]
+- Updated dependencies [5da6a561d]
+  - @backstage/catalog-model@0.7.10
+  - @backstage/core@0.7.10
+  - @backstage/integration@0.5.3
+
 ## 0.1.5
 
 ### Patch Changes

plugins/github-deployments/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-github-deployments",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -20,13 +20,13 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.7.9",
-    "@backstage/core": "^0.7.9",
+    "@backstage/catalog-model": "^0.8.0",
+    "@backstage/core": "^0.7.11",
     "@backstage/errors": "^0.1.1",
-    "@backstage/integration": "^0.5.1",
+    "@backstage/integration": "^0.5.4",
     "@backstage/integration-react": "^0.1.2",
-    "@backstage/plugin-catalog-react": "^0.1.6",
-    "@backstage/theme": "^0.2.7",
+    "@backstage/plugin-catalog-react": "^0.2.0",
+    "@backstage/theme": "^0.2.8",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
@@ -37,9 +37,9 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.6.11",
-    "@backstage/dev-utils": "^0.1.14",
-    "@backstage/test-utils": "^0.1.11",
+    "@backstage/cli": "^0.6.14",
+    "@backstage/dev-utils": "^0.1.17",
+    "@backstage/test-utils": "^0.1.13",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
     "@testing-library/user-event": "^13.1.8",

plugins/github-deployments/src/api/index.ts

@@ -64,7 +64,7 @@ export type GithubDeployment = {
   commit: {
     abbreviatedOid: string;
     commitUrl: string;
-  };
+  } | null;
   statuses: {
     nodes: Node[];
   };

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>
+      ),
   };
 }