Merge remote-tracking branch 'upstream/master'

plugins/jenkins/package.json

@@ -24,7 +24,7 @@
     "@backstage/catalog-model": "^0.1.1-alpha.21",
     "@backstage/core": "^0.1.1-alpha.21",
     "@backstage/theme": "^0.1.1-alpha.21",
-    "@material-ui/core": "^4.9.1",
+    "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
     "jenkins": "^0.28.0",

plugins/jenkins/src/pages/BuildWithStepsPage/lib/ActionOutput/ActionOutput.tsx

@@ -13,15 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import React, { useEffect, FC } from 'react';
+
 import {
   Accordion,
+  AccordionDetails,
   AccordionSummary,
   Typography,
-  AccordionDetails,
 } from '@material-ui/core';
-import ExpandMoreIcon from '@material-ui/icons/ExpandMore';
 import { makeStyles } from '@material-ui/core/styles';
+import ExpandMoreIcon from '@material-ui/icons/ExpandMore';
+import React, { FC, useEffect } from 'react';
 
 const useStyles = makeStyles({
   accordionDetails: {
@@ -45,10 +46,7 @@ export const ActionOutput: FC<{
   useEffect(() => {}, [url]);
 
   return (
-    <Accordion
-      TransitionProps={{ unmountOnExit: true }}
-      className={className}
-    >
+    <Accordion TransitionProps={{ unmountOnExit: true }} className={className}>
       <AccordionSummary
         expandIcon={<ExpandMoreIcon />}
         aria-controls={`panel-${name}-content`}

plugins/jenkins/src/plugin.ts

@@ -14,8 +14,14 @@
  * limitations under the License.
  */
 
-import { createPlugin, createRouteRef } from '@backstage/core';
+import {
+  createPlugin,
+  createRouteRef,
+  createApiFactory,
+  configApiRef,
+} from '@backstage/core';
 import { DetailedViewPage } from './pages/BuildWithStepsPage';
+import { jenkinsApiRef, JenkinsApi } from './api';
 
 export const buildRouteRef = createRouteRef({
   path: '/jenkins/job',
@@ -24,6 +30,16 @@ export const buildRouteRef = createRouteRef({
 
 export const plugin = createPlugin({
   id: 'jenkins',
+  apis: [
+    createApiFactory({
+      api: jenkinsApiRef,
+      deps: { configApi: configApiRef },
+      factory: ({ configApi }) =>
+        new JenkinsApi(
+          `${configApi.getString('backend.baseUrl')}/proxy/jenkins/api`,
+        ),
+    }),
+  ],
   register({ router }) {
     router.addRoute(buildRouteRef, DetailedViewPage);
   },