From 108533777e10fa9aeeb7feb125aaed741afa5784 Mon Sep 17 00:00:00 2001
From: estib <stron@me.com>
Date: Wed, 25 Sep 2024 17:19:04 +0200
Subject: [PATCH] PullRequestCard: 'View details' button

Add a button to the PR card that shows a Modal with the PR details
---
 apps/desktop/src/lib/gitHost/github/types.ts  |  1 +
 .../src/lib/gitHost/interface/types.ts        |  1 +
 apps/desktop/src/lib/pr/PrDetailsModal.svelte | 75 +++++++++++++++++++
 .../desktop/src/lib/pr/PullRequestCard.svelte | 38 +++++++++-
 4 files changed, 114 insertions(+), 1 deletion(-)
 create mode 100644 apps/desktop/src/lib/pr/PrDetailsModal.svelte

diff --git a/apps/desktop/src/lib/gitHost/github/types.ts b/apps/desktop/src/lib/gitHost/github/types.ts
index f3af01219..7552b9f70 100644
--- a/apps/desktop/src/lib/gitHost/github/types.ts
+++ b/apps/desktop/src/lib/gitHost/github/types.ts
@@ -10,6 +10,7 @@ export function parseGitHubDetailedPullRequest(
 		id: data.id,
 		number: data.number,
 		title: data.title,
+		body: data.body ?? undefined,
 		sourceBranch: data.base?.ref,
 		draft: data.draft,
 		htmlUrl: data.html_url,
diff --git a/apps/desktop/src/lib/gitHost/interface/types.ts b/apps/desktop/src/lib/gitHost/interface/types.ts
index 11bba81f5..1fa1479db 100644
--- a/apps/desktop/src/lib/gitHost/interface/types.ts
+++ b/apps/desktop/src/lib/gitHost/interface/types.ts
@@ -30,6 +30,7 @@ export interface PullRequest {
 export interface DetailedPullRequest {
 	id: number;
 	title: string;
+	body: string | undefined;
 	number: number;
 	sourceBranch: string;
 	draft?: boolean;
diff --git a/apps/desktop/src/lib/pr/PrDetailsModal.svelte b/apps/desktop/src/lib/pr/PrDetailsModal.svelte
new file mode 100644
index 000000000..b352da191
--- /dev/null
+++ b/apps/desktop/src/lib/pr/PrDetailsModal.svelte
@@ -0,0 +1,75 @@
+<script lang="ts">
+	import Markdown from '$lib/components/Markdown.svelte';
+	import ScrollableContainer from '$lib/scroll/ScrollableContainer.svelte';
+	import Button from '@gitbutler/ui/Button.svelte';
+	import Modal from '@gitbutler/ui/Modal.svelte';
+	import type { DetailedPullRequest } from '$lib/gitHost/interface/types';
+
+	interface Props {
+		pr: DetailedPullRequest;
+	}
+
+	let { pr }: Props = $props();
+
+	let modal = $state<Modal>();
+
+	export function show() {
+		modal?.show();
+	}
+
+	export const imports = {
+		get open() {
+			return modal?.imports.open;
+		}
+	};
+</script>
+
+<Modal bind:this={modal} width="large" noPadding>
+	{#snippet children(_, close)}
+		<ScrollableContainer maxHeight="70vh">
+			<div class="pr-modal__content">
+				<div class="card">
+					<div class="card__header text-14 text-body text-semibold pr-modal__header">
+						{pr.title}
+					</div>
+					{#if pr.body}
+						<div class="card__content text-13 text-body">
+							<Markdown content={pr.body} />
+						</div>
+					{:else}
+						<div class="card__content text-13 text-body text-clr2">No PR description.</div>
+					{/if}
+				</div>
+			</div>
+		</ScrollableContainer>
+		<div class="pr-modal__footer">
+			<Button style="ghost" outline onclick={close}>Done</Button>
+		</div>
+	{/snippet}
+</Modal>
+
+<style>
+	.pr-modal__content {
+		padding: 16px;
+	}
+
+	.pr-modal__header {
+		position: sticky;
+		top: 0;
+		background: var(--clr-bg-1);
+		border-top-left-radius: var(--radius-m);
+		border-top-right-radius: var(--radius-m);
+	}
+
+	.pr-modal__footer {
+		display: flex;
+		width: 100%;
+		justify-content: flex-end;
+		gap: 8px;
+		padding: 16px;
+		border-top: 1px solid var(--clr-border-2);
+		background-color: var(--clr-bg-1);
+		border-bottom-left-radius: var(--radius-l);
+		border-bottom-right-radius: var(--radius-l);
+	}
+</style>
diff --git a/apps/desktop/src/lib/pr/PullRequestCard.svelte b/apps/desktop/src/lib/pr/PullRequestCard.svelte
index 5ca8703b6..449b31513 100644
--- a/apps/desktop/src/lib/pr/PullRequestCard.svelte
+++ b/apps/desktop/src/lib/pr/PullRequestCard.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
 	import MergeButton from './MergeButton.svelte';
+	import PrDetailsModal from './PrDetailsModal.svelte';
 	import ViewPrButton from './ViewPrButton.svelte';
 	import InfoMessage from '../shared/InfoMessage.svelte';
 	import { Project } from '$lib/backend/projects';
@@ -34,6 +35,8 @@
 	const baseBranchService = getContext(BaseBranchService);
 	const project = getContext(Project);
 
+	let prDetailsModal = $state<PrDetailsModal>();
+
 	const gitHostListingService = getGitHostListingService();
 	const prStore = $derived($gitHostListingService?.prs);
 	const prs = $derived(prStore ? $prStore : undefined);
@@ -192,6 +195,17 @@
 			<span style="color: var(--clr-scale-ntrl-50)">PR #{$pr?.number}:</span>
 			{$pr.title}
 		</div>
+		<div class="pr-options">
+			<Button
+				size="tag"
+				style="ghost"
+				outline
+				icon="eye-shown"
+				onclick={() => {
+					prDetailsModal?.show();
+				}}>View details</Button
+			>
+		</div>
 		<div class="pr-tags">
 			<Button
 				size="tag"
@@ -269,6 +283,10 @@
 	</div>
 {/if}
 
+{#if $pr}
+	<PrDetailsModal bind:this={prDetailsModal} pr={$pr} />
+{/if}
+
 <style lang="postcss">
 	.pr-card {
 		position: relative;
@@ -284,7 +302,25 @@
 		cursor: text;
 	}
 
-	.pr-tags {
+	<<<<<<< ours|||||||ancestor .stacked-pr-title {
+		color: var(--clr-scale-ntrl-0);
+		padding: 14px 14px 12px 14px;
+		user-select: text;
+		cursor: text;
+	}
+
+	======= .stacked-pr-title {
+		color: var(--clr-scale-ntrl-0);
+		padding: 14px 14px 12px 14px;
+		user-select: text;
+		cursor: text;
+	}
+
+	.pr-options {
+		margin-bottom: 12px;
+	}
+
+	>>>>>>>theirs .pr-tags {
 		display: flex;
 		gap: 4px;
 	}