Skip to content

fix: handle closed PR status not showing properly #102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Rizina wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix: handle closed PR status not showing properly #102

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e73045
fix: handle closed PR status not showing properly
Rizina Oct 28, 2023
b55f329
fix: handle optional chaining failing build
Rizina Oct 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions src/pages/User/components/PullRequests/PullRequest/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable camelcase */
import React from 'react';
import PropTypes from 'prop-types';
import MergeStatus from './MergeStatus';
Expand All @@ -11,7 +12,10 @@ const ISSUE_STATUS = {

const PullRequest = ({ pullRequest }) => (
<div className={`bg-white leading-normal p-4 flex break-words gitaccount__commit`}>
<MergeStatus open={pullRequest.state === ISSUE_STATUS.OPEN} merged={pullRequest.state === ISSUE_STATUS.CLOSED} />
<MergeStatus
open={pullRequest.state === ISSUE_STATUS.OPEN}
merged={pullRequest.state === ISSUE_STATUS.CLOSED && pullRequest.pull_request.merged_at}
Copy link
Copy Markdown
Member

@sbimochan sbimochan Nov 5, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
merged={pullRequest.state === ISSUE_STATUS.CLOSED && pullRequest.pull_request.merged_at}
merged={pullRequest.state === ISSUE_STATUS.CLOSED && !!pullRequest.pull_request.merged_at}

/>
<PullRequestInfo pullRequest={pullRequest} />
</div>
);
Expand All @@ -21,12 +25,15 @@ PullRequest.propTypes = {
pullRequest: PropTypes.shape({
number: PropTypes.number.isRequired,
title: PropTypes.string.isRequired,
created_at: PropTypes.string.isRequired, // eslint-disable-line camelcase
created_at: PropTypes.string.isRequired,
state: PropTypes.string.isRequired,
user: PropTypes.shape({
login: PropTypes.string.isRequired,
url: PropTypes.string.isRequired
}).isRequired
}).isRequired,
pull_request: PropTypes.shape({
merged_at: PropTypes.string
})
}).isRequired
};

Expand Down