diff --git a/plugins/github-pull-requests-board/src/components/Card/CardHeader.test.tsx b/plugins/github-pull-requests-board/src/components/Card/CardHeader.test.tsx
index 3171bff10f..0ca1bfd43f 100644
--- a/plugins/github-pull-requests-board/src/components/Card/CardHeader.test.tsx
+++ b/plugins/github-pull-requests-board/src/components/Card/CardHeader.test.tsx
@@ -37,6 +37,13 @@ const props = {
name: 'documentation',
},
],
+ status: {
+ commit: {
+ statusCheckRollup: {
+ state: 'SUCCESS',
+ },
+ },
+ },
};
describe('', () => {
@@ -54,4 +61,10 @@ describe('', () => {
await renderInTestApp();
expect(screen.queryByRole('listitem')).not.toBeInTheDocument();
});
+
+ it('finds commit status in PR Card Header', async () => {
+ await renderInTestApp();
+ expect(screen.getByText('Commit Status:')).toBeInTheDocument();
+ expect(props.status.commit.statusCheckRollup.state).toBeTruthy();
+ });
});
diff --git a/plugins/github-pull-requests-board/src/components/Card/CardHeader.tsx b/plugins/github-pull-requests-board/src/components/Card/CardHeader.tsx
index 98d53f781c..9a47938139 100644
--- a/plugins/github-pull-requests-board/src/components/Card/CardHeader.tsx
+++ b/plugins/github-pull-requests-board/src/components/Card/CardHeader.tsx
@@ -48,7 +48,7 @@ const CardHeader: FunctionComponent = (props: Props) => {
isDraft,
repositoryIsArchived,
labels,
- status: commitStatus,
+ status,
} = props;
return (
@@ -91,7 +91,7 @@ const CardHeader: FunctionComponent = (props: Props) => {
Commit Status:{' '}
- {commitStatus.commit.statusCheckRollup.state}
+ {status.commit.statusCheckRollup.state}
{labels && (
diff --git a/plugins/github-pull-requests-board/src/components/EntityTeamPullRequestsCard/EntityTeamPullRequestsCard.test.tsx b/plugins/github-pull-requests-board/src/components/EntityTeamPullRequestsCard/EntityTeamPullRequestsCard.test.tsx
index a8ef9a9e2c..a4e0240cbd 100644
--- a/plugins/github-pull-requests-board/src/components/EntityTeamPullRequestsCard/EntityTeamPullRequestsCard.test.tsx
+++ b/plugins/github-pull-requests-board/src/components/EntityTeamPullRequestsCard/EntityTeamPullRequestsCard.test.tsx
@@ -33,14 +33,21 @@ jest.mock('../../hooks/useUserRepositoriesAndTeam', () => {
});
jest.mock('../../hooks/usePullRequestsByTeam', () => {
- const buildPullRequest = (
- prTitle: string,
- authorLogin: string,
- repoName: string,
- isDraft: boolean,
- isArchived: boolean,
- status: Status,
- ) => {
+ const buildPullRequest = ({
+ prTitle,
+ authorLogin,
+ repoName,
+ isDraft,
+ isArchived,
+ status,
+ }: {
+ prTitle: string;
+ authorLogin: string;
+ repoName: string;
+ isDraft: boolean;
+ isArchived: boolean;
+ status: Status;
+ }) => {
return {
id: 'id',
title: prTitle,
@@ -81,118 +88,118 @@ jest.mock('../../hooks/usePullRequestsByTeam', () => {
{
title: 'column',
content: [
- buildPullRequest(
- 'non-team-non-draft-non-archive',
- 'non-team-member',
- 'team-repo',
- false,
- false,
- {
+ buildPullRequest({
+ prTitle: 'non-team-non-draft-non-archive',
+ authorLogin: 'non-team-member',
+ repoName: 'team-repo',
+ isDraft: false,
+ isArchived: false,
+ status: {
commit: {
statusCheckRollup: {
state: 'FAILURE',
},
},
},
- ),
- buildPullRequest(
- 'non-team-non-draft-is-archive',
- 'non-team-member',
- 'team-repo',
- false,
- true,
- {
+ }),
+ buildPullRequest({
+ prTitle: 'non-team-non-draft-is-archive',
+ authorLogin: 'non-team-member',
+ repoName: 'team-repo',
+ isDraft: false,
+ isArchived: true,
+ status: {
commit: {
statusCheckRollup: {
state: 'FAILURE',
},
},
},
- ),
- buildPullRequest(
- 'non-team-is-draft-non-archive',
- 'non-team-member',
- 'team-repo',
- true,
- false,
- {
+ }),
+ buildPullRequest({
+ prTitle: 'non-team-is-draft-non-archive',
+ authorLogin: 'non-team-member',
+ repoName: 'team-repo',
+ isDraft: true,
+ isArchived: false,
+ status: {
commit: {
statusCheckRollup: {
state: 'FAILURE',
},
},
},
- ),
- buildPullRequest(
- 'non-team-is-draft-is-archive',
- 'non-team-member',
- 'team-repo',
- true,
- true,
- {
+ }),
+ buildPullRequest({
+ prTitle: 'non-team-is-draft-is-archive',
+ authorLogin: 'non-team-member',
+ repoName: 'team-repo',
+ isDraft: true,
+ isArchived: true,
+ status: {
commit: {
statusCheckRollup: {
state: 'SUCCESS',
},
},
},
- ),
- buildPullRequest(
- 'is-team-non-draft-non-archive',
- 'team-member',
- 'non-team-repo',
- false,
- false,
- {
+ }),
+ buildPullRequest({
+ prTitle: 'is-team-non-draft-non-archive',
+ authorLogin: 'team-member',
+ repoName: 'non-team-repo',
+ isDraft: false,
+ isArchived: false,
+ status: {
commit: {
statusCheckRollup: {
state: 'FAILURE',
},
},
},
- ),
- buildPullRequest(
- 'is-team-non-draft-is-archive',
- 'team-member',
- 'non-team-repo',
- false,
- true,
- {
+ }),
+ buildPullRequest({
+ prTitle: 'is-team-non-draft-is-archive',
+ authorLogin: 'team-member',
+ repoName: 'non-team-repo',
+ isDraft: false,
+ isArchived: true,
+ status: {
commit: {
statusCheckRollup: {
state: 'FAILURE',
},
},
},
- ),
- buildPullRequest(
- 'is-team-is-draft-non-archive',
- 'team-member',
- 'non-team-repo',
- true,
- false,
- {
+ }),
+ buildPullRequest({
+ prTitle: 'is-team-is-draft-non-archive',
+ authorLogin: 'team-member',
+ repoName: 'non-team-repo',
+ isDraft: true,
+ isArchived: false,
+ status: {
commit: {
statusCheckRollup: {
state: 'FAILURE',
},
},
},
- ),
- buildPullRequest(
- 'is-team-is-draft-is-archive',
- 'team-member',
- 'non-team-repo',
- true,
- true,
- {
+ }),
+ buildPullRequest({
+ prTitle: 'is-team-is-draft-is-archive',
+ authorLogin: 'team-member',
+ repoName: 'non-team-repo',
+ isDraft: true,
+ isArchived: true,
+ status: {
commit: {
statusCheckRollup: {
state: 'SUCCESS',
},
},
},
- ),
+ }),
],
},
];
diff --git a/plugins/github-pull-requests-board/src/components/EntityTeamPullRequestsCard/EntityTeamPullRequestsCard.tsx b/plugins/github-pull-requests-board/src/components/EntityTeamPullRequestsCard/EntityTeamPullRequestsCard.tsx
index 25ef32362b..9285d6b032 100644
--- a/plugins/github-pull-requests-board/src/components/EntityTeamPullRequestsCard/EntityTeamPullRequestsCard.tsx
+++ b/plugins/github-pull-requests-board/src/components/EntityTeamPullRequestsCard/EntityTeamPullRequestsCard.tsx
@@ -114,6 +114,7 @@ const EntityTeamPullRequestsCard = (props: EntityTeamPullRequestsCardProps) => {
repository,
isDraft,
labels,
+ commits,
},
index,
) =>
@@ -137,6 +138,7 @@ const EntityTeamPullRequestsCard = (props: EntityTeamPullRequestsCardProps) => {
repositoryIsArchived={repository.isArchived}
isDraft={isDraft}
labels={labels.nodes}
+ status={commits.nodes}
/>
),
)}
diff --git a/plugins/github-pull-requests-board/src/components/EntityTeamPullRequestsContent/EntityTeamPullRequestsContent.tsx b/plugins/github-pull-requests-board/src/components/EntityTeamPullRequestsContent/EntityTeamPullRequestsContent.tsx
index 6109ddb63c..668995a306 100644
--- a/plugins/github-pull-requests-board/src/components/EntityTeamPullRequestsContent/EntityTeamPullRequestsContent.tsx
+++ b/plugins/github-pull-requests-board/src/components/EntityTeamPullRequestsContent/EntityTeamPullRequestsContent.tsx
@@ -87,9 +87,6 @@ const EntityTeamPullRequestsContent = (
return ;
}
- // eslint-disable-next-line no-console
- console.log('pull - ', pullRequests);
-
return (
{pullRequests.length ? (
diff --git a/plugins/github-pull-requests-board/src/utils/types.tsx b/plugins/github-pull-requests-board/src/utils/types.tsx
index cdabcf0713..88b05219d6 100644
--- a/plugins/github-pull-requests-board/src/utils/types.tsx
+++ b/plugins/github-pull-requests-board/src/utils/types.tsx
@@ -84,7 +84,7 @@ export type Label = {
export type Status = {
commit: {
statusCheckRollup: {
- state: 'SUCCESS' | 'FAILURE' | 'ERROR' | 'EXPECTED' | 'PENDING';
+ state: string;
};
};
};