Merge branch 'master' into rugvip/ports

plugins/jenkins/CHANGELOG.md

@@ -1,5 +1,28 @@
 # @backstage/plugin-jenkins
 
+## 0.3.8
+
+### Patch Changes
+
+- 019fe39a0: Switch dependency from `@backstage/plugin-catalog` to `@backstage/plugin-catalog-react`.
+- Updated dependencies [12ece98cd]
+- Updated dependencies [d82246867]
+- Updated dependencies [7fc89bae2]
+- Updated dependencies [c810082ae]
+- Updated dependencies [5fa3bdb55]
+- Updated dependencies [6e612ce25]
+- Updated dependencies [025e122c3]
+- Updated dependencies [21e624ba9]
+- Updated dependencies [da9f53c60]
+- Updated dependencies [32c95605f]
+- Updated dependencies [7881f2117]
+- Updated dependencies [54c7d02f7]
+- Updated dependencies [11cb5ef94]
+  - @backstage/core@0.6.0
+  - @backstage/plugin-catalog-react@0.0.2
+  - @backstage/theme@0.2.3
+  - @backstage/catalog-model@0.7.1
+
 ## 0.3.7
 
 ### Patch Changes

plugins/jenkins/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-jenkins",
-  "version": "0.3.7",
+  "version": "0.3.8",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -31,10 +31,10 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.7.0",
-    "@backstage/core": "^0.5.0",
-    "@backstage/plugin-catalog-react": "^0.0.1",
-    "@backstage/theme": "^0.2.2",
+    "@backstage/catalog-model": "^0.7.1",
+    "@backstage/core": "^0.6.0",
+    "@backstage/plugin-catalog-react": "^0.0.2",
+    "@backstage/theme": "^0.2.3",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
@@ -47,8 +47,8 @@
     "react-use": "^15.3.3"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.5.0",
-    "@backstage/dev-utils": "^0.1.8",
+    "@backstage/cli": "^0.6.0",
+    "@backstage/dev-utils": "^0.1.9",
     "@backstage/test-utils": "^0.1.6",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^10.4.1",

plugins/jenkins/src/components/useBuilds.ts

@@ -36,17 +36,17 @@ export function useBuilds(owner: string, repo: string, branch?: string) {
 
   const { loading, value: builds, retry } = useAsyncRetry(async () => {
     try {
-      let builds;
+      let build;
       if (branch) {
-        builds = await api.getLastBuild(`${owner}/${repo}/${branch}`);
+        build = await api.getLastBuild(`${owner}/${repo}/${branch}`);
       } else {
-        builds = await api.getFolder(`${owner}/${repo}`);
+        build = await api.getFolder(`${owner}/${repo}`);
       }
 
-      const size = Array.isArray(builds) ? builds?.[0].build_num! : 1;
+      const size = Array.isArray(build) ? build?.[0].build_num! : 1;
       setTotal(size);
 
-      return builds || [];
+      return build || [];
     } catch (e) {
       errorApi.post(e);
       throw e;