diff --git a/plugins/github-pull-requests-board/package.json b/plugins/github-pull-requests-board/package.json index 7497bff479..5e76257d5d 100644 --- a/plugins/github-pull-requests-board/package.json +++ b/plugins/github-pull-requests-board/package.json @@ -38,12 +38,13 @@ "@backstage/catalog-model": "^1.0.1", "@backstage/core-components": "^0.9.3", "@backstage/core-plugin-api": "^1.0.1", + "@backstage/integration": "^1.1.0", "@backstage/plugin-catalog-react": "^1.0.1", "@backstage/theme": "^0.2.15", "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.57", - "@octokit/rest": "^18.6.7", + "@octokit/rest": "^18.12.0", "moment": "^2.29.1", "react-use": "^17.2.4" }, diff --git a/plugins/github-pull-requests-board/src/components/TeamPullRequestsBoard/TeamPullRequestsBoard.tsx b/plugins/github-pull-requests-board/src/components/TeamPullRequestsBoard/TeamPullRequestsBoard.tsx index f0f47c6a16..8aee285d36 100644 --- a/plugins/github-pull-requests-board/src/components/TeamPullRequestsBoard/TeamPullRequestsBoard.tsx +++ b/plugins/github-pull-requests-board/src/components/TeamPullRequestsBoard/TeamPullRequestsBoard.tsx @@ -25,30 +25,31 @@ import { Wrapper } from '../Wrapper'; import { PullRequestCard } from '../PullRequestCard'; import { usePullRequestsByTeam } from '../../hooks/usePullRequestsByTeam'; import { PRCardFormating } from '../../utils/types'; -import { DraftPrIcon } from '../icons/DraftPr' +import { DraftPrIcon } from '../icons/DraftPr'; import { useUserRepositories } from '../../hooks/useUserRepositories'; const TeamPullRequestsBoard: FunctionComponent = () => { const [infoCardFormat, setInfoCardFormat] = useState([]); const { repositories } = useUserRepositories(); - const { loading, pullRequests, refreshPullRequests } = usePullRequestsByTeam(repositories); + const { loading, pullRequests, refreshPullRequests } = + usePullRequestsByTeam(repositories); const header = ( setInfoCardFormat(newFormats)} + onClickOption={newFormats => setInfoCardFormat(newFormats)} value={infoCardFormat} options={[ { icon: , value: 'draft', - ariaLabel: 'Show draft PRs' + ariaLabel: 'Show draft PRs', }, { icon: , value: 'fullscreen', - ariaLabel: 'Info card is set to fullscreen' - } + ariaLabel: 'Info card is set to fullscreen', + }, ]} /> @@ -67,44 +68,36 @@ const TeamPullRequestsBoard: FunctionComponent = () => { key={columnTitle} fullscreen={infoCardFormat.includes('fullscreen')} > - - {columnTitle} - - {content.map(({ - id, - title, - createdAt, - lastEditedAt, - author, - url, - latestReviews, - repository, - isDraft - }, index) => ( - isDraft ? (infoCardFormat.includes('draft') === isDraft) && - - : - ))} + {columnTitle} + {content.map( + ( + { + id, + title, + createdAt, + lastEditedAt, + author, + url, + latestReviews, + repository, + isDraft, + }, + index, + ) => + infoCardFormat.includes('draft') === isDraft && ( + + ), + )} )) ) : ( diff --git a/plugins/github-pull-requests-board/src/components/TeamPullRequestsPage/TeamPullRequestsPage.tsx b/plugins/github-pull-requests-board/src/components/TeamPullRequestsPage/TeamPullRequestsPage.tsx index be388e24e9..8761c55682 100644 --- a/plugins/github-pull-requests-board/src/components/TeamPullRequestsPage/TeamPullRequestsPage.tsx +++ b/plugins/github-pull-requests-board/src/components/TeamPullRequestsPage/TeamPullRequestsPage.tsx @@ -23,24 +23,25 @@ import { Wrapper } from '../../components/Wrapper'; import { PullRequestCard } from '../../components/PullRequestCard'; import { usePullRequestsByTeam } from '../../hooks/usePullRequestsByTeam'; import { PRCardFormating } from '../../utils/types'; -import { DraftPrIcon } from '../../components/icons/DraftPr' +import { DraftPrIcon } from '../../components/icons/DraftPr'; import { useUserRepositories } from '../../hooks/useUserRepositories'; const TeamPullRequestsPage: FunctionComponent = () => { const [infoCardFormat, setInfoCardFormat] = useState([]); const { repositories } = useUserRepositories(); - const { loading, pullRequests, refreshPullRequests } = usePullRequestsByTeam(repositories); + const { loading, pullRequests, refreshPullRequests } = + usePullRequestsByTeam(repositories); const header = ( setInfoCardFormat(newFormats)} + onClickOption={newFormats => setInfoCardFormat(newFormats)} value={infoCardFormat} options={[ { icon: , value: 'draft', - ariaLabel: 'Show draft PRs' + ariaLabel: 'Show draft PRs', }, ]} /> @@ -56,48 +57,37 @@ const TeamPullRequestsPage: FunctionComponent = () => { {pullRequests.length ? ( pullRequests.map(({ title: columnTitle, content }) => ( - - - {columnTitle} - - {content.map(({ - id, - title, - createdAt, - lastEditedAt, - author, - url, - latestReviews, - repository, - isDraft - }, index) => ( - isDraft ? (infoCardFormat.includes('draft') === isDraft) && - - : - ))} + + {columnTitle} + {content.map( + ( + { + id, + title, + createdAt, + lastEditedAt, + author, + url, + latestReviews, + repository, + isDraft, + }, + index, + ) => + infoCardFormat.includes('draft') === isDraft && ( + + ), + )} )) ) : ( diff --git a/plugins/github-pull-requests-board/src/components/icons/DraftPr/DraftPr.tsx b/plugins/github-pull-requests-board/src/components/icons/DraftPr/DraftPr.tsx index eca407dee8..6dc5e306c1 100644 --- a/plugins/github-pull-requests-board/src/components/icons/DraftPr/DraftPr.tsx +++ b/plugins/github-pull-requests-board/src/components/icons/DraftPr/DraftPr.tsx @@ -16,8 +16,15 @@ import React from 'react'; const DraftPr = () => ( -