Merge branch 'master' of github.com:spotify/backstage into mob/scaffolder-cra-fixes

plugins/github-actions/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-github-actions",
-  "version": "0.1.1-alpha.24",
+  "version": "0.1.1-alpha.26",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -21,11 +21,11 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.1.1-alpha.24",
-    "@backstage/core": "^0.1.1-alpha.24",
-    "@backstage/core-api": "^0.1.1-alpha.24",
-    "@backstage/plugin-catalog": "^0.1.1-alpha.24",
-    "@backstage/theme": "^0.1.1-alpha.24",
+    "@backstage/catalog-model": "^0.1.1-alpha.26",
+    "@backstage/core": "^0.1.1-alpha.26",
+    "@backstage/core-api": "^0.1.1-alpha.26",
+    "@backstage/plugin-catalog": "^0.1.1-alpha.26",
+    "@backstage/theme": "^0.1.1-alpha.26",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
@@ -40,16 +40,16 @@
     "react-use": "^15.3.3"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.1.1-alpha.24",
-    "@backstage/dev-utils": "^0.1.1-alpha.24",
+    "@backstage/cli": "^0.1.1-alpha.26",
+    "@backstage/dev-utils": "^0.1.1-alpha.26",
+    "@backstage/test-utils": "^0.1.1-alpha.26",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^10.4.1",
     "@testing-library/user-event": "^12.0.7",
     "@types/jest": "^26.0.7",
     "@types/node": "^12.0.0",
-    "jest-fetch-mock": "^3.0.3",
-    "msw": "^0.20.5",
-    "node-fetch": "^2.6.1"
+    "cross-fetch": "^3.0.6",
+    "msw": "^0.21.2"
   },
   "files": [
     "dist"

plugins/github-actions/src/api/types.ts

@@ -17,7 +17,7 @@
 export type Step = {
   name: string;
   status: string;
-  conclusion: string;
+  conclusion?: string;
   number: number; // starts from 1
   started_at: string;
   completed_at: string;

plugins/github-actions/src/components/Cards/Cards.tsx

@@ -81,10 +81,9 @@ const WidgetContent = ({
 export const LatestWorkflowRunCard = ({
   entity,
   branch = 'master',
-}: {
-  entity: Entity;
-  branch: string;
-}) => {
+  // Display the card full height suitable for
+  variant,
+}: Props) => {
   const errorApi = useApi(errorApiRef);
   const [owner, repo] = (
     entity?.metadata.annotations?.[GITHUB_ACTIONS_ANNOTATION] ?? '/'
@@ -102,7 +101,7 @@ export const LatestWorkflowRunCard = ({
   }, [error, errorApi]);
 
   return (
-    <InfoCard title={`Last ${branch} build`}>
+    <InfoCard title={`Last ${branch} build`} variant={variant}>
       <WidgetContent
         error={error}
         loading={loading}
@@ -113,14 +112,18 @@ export const LatestWorkflowRunCard = ({
   );
 };
 
+type Props = {
+  entity: Entity;
+  branch: string;
+  variant?: string;
+};
+
 export const LatestWorkflowsForBranchCard = ({
   entity,
   branch = 'master',
-}: {
-  entity: Entity;
-  branch: string;
-}) => (
-  <InfoCard title={`Last ${branch} build`}>
+  variant,
+}: Props) => (
+  <InfoCard title={`Last ${branch} build`} variant={variant}>
     <WorkflowRunsTable branch={branch} entity={entity} />
   </InfoCard>
 );

plugins/github-actions/src/components/Cards/RecentWorkflowRunsCard.tsx

@@ -18,9 +18,9 @@ import { errorApiRef, useApi } from '@backstage/core-api';
 import { GITHUB_ACTIONS_ANNOTATION } from '../useProjectName';
 import { useWorkflowRuns } from '../useWorkflowRuns';
 import React, { useEffect } from 'react';
-import { EmptyState, Table } from '@backstage/core';
+import { EmptyState, InfoCard, Table } from '@backstage/core';
 import { WorkflowRunStatus } from '../WorkflowRunStatus';
-import { Button, Card, Link, TableContainer } from '@material-ui/core';
+import { Button, Link } from '@material-ui/core';
 import { generatePath, Link as RouterLink } from 'react-router-dom';
 
 const firstLine = (message: string): string => message.split('\n')[0];
@@ -30,6 +30,7 @@ export type Props = {
   branch?: string;
   dense?: boolean;
   limit?: number;
+  variant?: string;
 };
 
 export const RecentWorkflowRunsCard = ({
@@ -37,6 +38,7 @@ export const RecentWorkflowRunsCard = ({
   branch,
   dense = false,
   limit = 5,
+  variant,
 }: Props) => {
   const errorApi = useApi(errorApiRef);
   const [owner, repo] = (
@@ -70,15 +72,19 @@ export const RecentWorkflowRunsCard = ({
       }
     />
   ) : (
-    <TableContainer component={Card}>
+    <InfoCard
+      title="Recent Workflow Runs"
+      subheader={branch ? `Branch: ${branch}` : 'All Branches'}
+      noPadding
+      variant={variant}
+    >
       <Table
-        title="Recent Workflow Runs"
-        subtitle={branch ? `Branch: ${branch}` : 'All Branches'}
         isLoading={loading}
         options={{
           search: false,
           paging: false,
           padding: dense ? 'dense' : 'default',
+          toolbar: false,
         }}
         columns={[
           {
@@ -98,6 +104,6 @@ export const RecentWorkflowRunsCard = ({
         ]}
         data={runs}
       />
-    </TableContainer>
+    </InfoCard>
   );
 };

plugins/github-actions/src/components/WorkflowRunDetails/WorkflowRunDetails.tsx

@@ -77,8 +77,9 @@ const JobsList = ({ jobs, entity }: { jobs?: Jobs; entity: Entity }) => {
     <Box>
       {jobs &&
         jobs.total_count > 0 &&
-        jobs.jobs.map((job: Job) => (
+        jobs.jobs.map(job => (
           <JobListItem
+            key={job.id}
             job={job}
             className={
               job.status !== 'success' ? classes.failed : classes.success
@@ -108,7 +109,7 @@ const StepView = ({ step }: { step: Step }) => {
       <TableCell>
         <WorkflowRunStatus
           status={step.status.toUpperCase()}
-          conclusion={step.conclusion.toUpperCase()}
+          conclusion={step.conclusion?.toUpperCase()}
         />
       </TableCell>
     </TableRow>
@@ -142,8 +143,8 @@ const JobListItem = ({
       <AccordionDetails className={classes.accordionDetails}>
         <TableContainer>
           <Table>
-            {job.steps.map((step: Step) => (
-              <StepView step={step} />
+            {job.steps.map(step => (
+              <StepView key={step.number} step={step} />
             ))}
           </Table>
         </TableContainer>

plugins/github-actions/src/setupTests.ts

@@ -15,5 +15,3 @@
  */
 
 import '@testing-library/jest-dom';
-
-require('jest-fetch-mock').enableMocks();