diff --git a/shared/panels/contribution-sidepanel/_features/description/description.tsx b/shared/panels/contribution-sidepanel/_features/description/description.tsx index 2bed29d2a..9636f55f3 100644 --- a/shared/panels/contribution-sidepanel/_features/description/description.tsx +++ b/shared/panels/contribution-sidepanel/_features/description/description.tsx @@ -8,15 +8,17 @@ import { DescriptionProps } from "./description.types"; const Emoji = dynamic(() => import("react-emoji-render")); export function Description({ description }: DescriptionProps) { - if (!description) return null; - return ( - - {description} - + {description ? ( + + {description} + + ) : ( + + )} ); } diff --git a/shared/panels/contribution-sidepanel/_features/issue-overview/issue-overview.tsx b/shared/panels/contribution-sidepanel/_features/issue-overview/issue-overview.tsx index f83117c74..31d897eff 100644 --- a/shared/panels/contribution-sidepanel/_features/issue-overview/issue-overview.tsx +++ b/shared/panels/contribution-sidepanel/_features/issue-overview/issue-overview.tsx @@ -1,79 +1,8 @@ -import { useMemo } from "react"; - -import { ContributionReactQueryAdapter } from "@/core/application/react-query-adapter/contribution"; - -import { Accordion } from "@/design-system/molecules/accordion"; -import { - CardContributionKanban as Card, - CardContributionKanbanLoading, -} from "@/design-system/molecules/cards/card-contribution-kanban"; +import { CardContributionKanban as Card } from "@/design-system/molecules/cards/card-contribution-kanban"; import { IssueOverviewProps } from "./issue-overview.types"; -function LinkedIssues({ issueIds }: { issueIds?: string[] }) { - const { data, isLoading } = ContributionReactQueryAdapter.client.useGetContributions({ - queryParams: { - ids: issueIds, - pageSize: 100, - }, - options: { - enabled: Boolean(issueIds?.length), - }, - }); - - const contributions = useMemo(() => data?.pages.flatMap(page => page.contributions) ?? [], [data]); - - function renderContributions() { - if (isLoading) { - return ( -
- -
- ); - } - - return contributions.map(contribution => ( -
- -
- )); - } - - if (!issueIds || (!isLoading && !data)) return null; - - return ( - - {renderContributions()} - - ); -} - export function IssueOverview({ contribution }: IssueOverviewProps) { - if (contribution.isPullRequest()) { - return ( - issue.contributionUuid ?? "").filter(Boolean)} /> - ); - } - return ( issue.contributionUuid ?? "").filter(Boolean); + + const { data, isLoading } = ContributionReactQueryAdapter.client.useGetContributions({ + queryParams: { + ids: issueIds, + pageSize: 100, + }, + options: { + enabled: Boolean(issueIds?.length), + }, + }); + + const contributions = useMemo(() => data?.pages.flatMap(page => page.contributions) ?? [], [data]); + + function renderContributions() { + if (isLoading) { + return ( +
+ +
+ ); + } + + return contributions.map(contribution => ( +
+ +
+ )); + } + + if (!issueIds || (!isLoading && !data)) return null; return ( - {issues.map(issue => ( -
- -
- ))} + {renderContributions()}
); } diff --git a/shared/panels/contribution-sidepanel/contributions-sidepanel.en.json b/shared/panels/contribution-sidepanel/contributions-sidepanel.en.json index ffc333398..7dec5429e 100644 --- a/shared/panels/contribution-sidepanel/contributions-sidepanel.en.json +++ b/shared/panels/contribution-sidepanel/contributions-sidepanel.en.json @@ -92,5 +92,8 @@ }, "githubComment": { "title": "Github comment" + }, + "description": { + "empty": "No description provided" } } diff --git a/shared/panels/contribution-sidepanel/contributions-sidepanel.hooks.tsx b/shared/panels/contribution-sidepanel/contributions-sidepanel.hooks.tsx index 44810a394..6f9ee1d05 100644 --- a/shared/panels/contribution-sidepanel/contributions-sidepanel.hooks.tsx +++ b/shared/panels/contribution-sidepanel/contributions-sidepanel.hooks.tsx @@ -152,6 +152,7 @@ function useContributionBlocksAsContributor({ contribution }: UseContributionBlo return ( <> + {/*// Timeline*/} @@ -164,6 +165,7 @@ function useContributionBlocksAsContributor({ contribution }: UseContributionBlo return ( <> +