Skip to content
This repository was archived by the owner on Mar 1, 2025. It is now read-only.

Show only merged PR's on the members' profile. #487

Open
DeepanshuSarswat wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

Show only merged PR's on the members' profile. #487

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
76d2504
Filter Data
DeepanshuSarswat Nov 14, 2022
d127538
filter data
DeepanshuSarswat Nov 14, 2022
93c758e
filter data
DeepanshuSarswat Nov 14, 2022
944134d
filter data
DeepanshuSarswat Nov 20, 2022
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
19 changes: 12 additions & 7 deletions src/components/member-profile/contribution/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,18 @@ const renderPRLinks = (prList) =>
});

const Contribution = ({ contribution, fullName, imageLink, devUser }) => {
const contributions = contribution;
const {
task: { featureUrl },
prList,
} = contribution;
} = contributions;
const url = featureUrl || prList[0]?.url;
const gotoUrl = () => url && window.open(url, '_blank');
const urlObj = url && new URL(url);
const closePullRequest = contributions.prList.filter(
(data) => data.state === 'closed'
);
contributions.prList = closePullRequest;
const contributionCard = () => (
<ContributionCard
contribution={contribution}
Expand All @@ -36,7 +41,7 @@ const Contribution = ({ contribution, fullName, imageLink, devUser }) => {
return (
<Link href={urlObj.pathname}>
<div className={url && classNames.contributionCard}>
{contributionCard()}
{prList[0]?.title && contributionCard()}
</div>
</Link>
);
Expand All @@ -47,7 +52,7 @@ const Contribution = ({ contribution, fullName, imageLink, devUser }) => {
onClick={gotoUrl}
aria-hidden="true"
>
{contributionCard()}
{prList[0]?.title && contributionCard()}
</div>
);
};
Expand All @@ -68,7 +73,7 @@ const ContributionCard = ({
prList,
} = contribution;
const isTitleAvailable = !!title;
const featureTitle = isTitleAvailable ? title : prList[0].title;
const featureTitle = isTitleAvailable ? title : prList[0]?.title;
const [showSettings, setShowSettings] = useState(false);

const renderFeatureUrl = (featureUrl, featureUrlObj) => {
Expand Down Expand Up @@ -109,9 +114,9 @@ const ContributionCard = ({
featureLiveOnText = featureLiveDate;
}
} else {
const createdAt = +new Date(prList[0].createdAt);
const updatedAt = +new Date(prList[0].updatedAt);
if (prList[0].state === 'closed') {
const createdAt = +new Date(prList[0]?.createdAt);
const updatedAt = +new Date(prList[0]?.updatedAt);
if (prList[0]?.state === 'closed') {
completedDate = timeWas(createdAt, false, updatedAt);
completedText = (
<span className={classNames.completedText}>Completed in </span>
Expand Down