+
{actors.map((actor, index) => (
diff --git a/apps/dashboard/src/components/pulls/detail/pull-detail-activity.tsx b/apps/dashboard/src/components/pulls/detail/pull-detail-activity.tsx
index 127a6d7..e7b88ed 100644
--- a/apps/dashboard/src/components/pulls/detail/pull-detail-activity.tsx
+++ b/apps/dashboard/src/components/pulls/detail/pull-detail-activity.tsx
@@ -3,6 +3,7 @@ import {
ChevronDownIcon,
ChevronUpIcon,
CircleIcon,
+ Delete01Icon,
EditIcon,
GitCommitIcon,
GitMergeIcon,
@@ -40,6 +41,7 @@ import {
import { LabelPill } from "#/components/details/label-pill";
import { formatRelativeTime } from "#/lib/format-relative-time";
import {
+ deleteBranch,
dismissPullReview,
getCommentPage,
getTimelineEventPage,
@@ -160,6 +162,16 @@ export function PullDetailActivitySection({
)}
+ {pr.isMerged && (
+
+
+ )}
+
@@ -199,6 +211,85 @@ function MergeStatusSection({
);
}
+function MergedBranchBanner({
+ owner,
+ repo,
+ branchName,
+}: {
+ owner: string;
+ repo: string;
+ branchName: string;
+}) {
+ const [isDeleting, setIsDeleting] = useState(false);
+ const [isDeleted, setIsDeleted] = useState(false);
+
+ const handleDelete = async () => {
+ setIsDeleting(true);
+ try {
+ const result = await deleteBranch({
+ data: { owner, repo, branch: branchName },
+ });
+ if (result.ok) {
+ setIsDeleted(true);
+ } else {
+ toast.error(result.error);
+ checkPermissionWarning(result, `${owner}/${repo}`);
+ setIsDeleting(false);
+ }
+ } catch {
+ toast.error("Failed to delete branch");
+ setIsDeleting(false);
+ }
+ };
+
+ return (
+
+
+
+
+ {isDeleted ? (
+ <>
+ Branch{" "}
+
+ {branchName}
+ {" "}
+ has been deleted.
+
+ ) : (
+ <>
+ Branch{" "}
+
+ {branchName}
+ {" "}
+ has been merged.
+
+ )}
+
+ {!isDeleted && (
+
+ ) : (
+
+ )
+ }
+ onClick={() => {
+ void handleDelete();
+ }}
+ >
+ Delete branch
+
+ )}
+
+ );
+}
+
function MergeStatusCard({
status,
owner,
diff --git a/apps/dashboard/src/components/pulls/review/review-file-diff-block.tsx b/apps/dashboard/src/components/pulls/review/review-file-diff-block.tsx
index d0bdc33..444b518 100644
--- a/apps/dashboard/src/components/pulls/review/review-file-diff-block.tsx
+++ b/apps/dashboard/src/components/pulls/review/review-file-diff-block.tsx
@@ -157,6 +157,7 @@ export const ReviewFileDiffBlock = memo(function ReviewFileDiffBlock({
`[data-utility-button] { background-color: ${mutedFg}; }`,
`[data-line-annotation] { font-family: 'Inter Variable', 'Inter', 'Avenir Next', ui-sans-serif, system-ui, sans-serif; }`,
`[data-line-annotation] code { font-family: var(--diffs-font-family, var(--diffs-font-fallback)); }`,
+ `[data-diff] { border: 1px solid var(--border); border-top: 0; border-radius: 4px; border-bottom-left-radius: 4px; border-bottom-right-radius: 4px; overflow: hidden; }`,
isDark
? `:host { --diffs-bg-addition-override: color-mix(in lab, var(--diffs-bg) 92%, var(--diffs-addition-base)); --diffs-bg-addition-number-override: color-mix(in lab, var(--diffs-bg) 88%, var(--diffs-addition-base)); --diffs-bg-addition-emphasis-override: color-mix(in lab, var(--diffs-bg) 75%, var(--diffs-addition-base)); --diffs-bg-deletion-override: color-mix(in lab, var(--diffs-bg) 92%, var(--diffs-deletion-base)); --diffs-bg-deletion-number-override: color-mix(in lab, var(--diffs-bg) 88%, var(--diffs-deletion-base)); --diffs-bg-deletion-emphasis-override: color-mix(in lab, var(--diffs-bg) 75%, var(--diffs-deletion-base)); }`
: `:host { --diffs-bg-addition-override: color-mix(in lab, var(--diffs-bg) 82%, var(--diffs-addition-base)); --diffs-bg-addition-number-override: color-mix(in lab, var(--diffs-bg) 78%, var(--diffs-addition-base)); --diffs-bg-deletion-override: color-mix(in lab, var(--diffs-bg) 82%, var(--diffs-deletion-base)); --diffs-bg-deletion-number-override: color-mix(in lab, var(--diffs-bg) 78%, var(--diffs-deletion-base)); }`,
diff --git a/apps/dashboard/src/lib/github.functions.ts b/apps/dashboard/src/lib/github.functions.ts
index 91ad1ce..f2fd2f7 100644
--- a/apps/dashboard/src/lib/github.functions.ts
+++ b/apps/dashboard/src/lib/github.functions.ts
@@ -2325,6 +2325,28 @@ export const mergePullRequest = createServerFn({ method: "POST" })
}
});
+export const deleteBranch = createServerFn({ method: "POST" })
+ .inputValidator(
+ identityValidator<{ owner: string; repo: string; branch: string }>,
+ )
+ .handler(async ({ data }): Promise
=> {
+ const context = await getGitHubContext();
+ if (!context) {
+ return { ok: false, error: "Not authenticated" };
+ }
+
+ try {
+ await context.octokit.rest.git.deleteRef({
+ owner: data.owner,
+ repo: data.repo,
+ ref: `heads/${data.branch}`,
+ });
+ return { ok: true };
+ } catch (error) {
+ return toMutationError("delete branch", error);
+ }
+ });
+
async function getPullFilesResult(
context: GitHubContext,
data: PullFilesPageInput,
diff --git a/apps/dashboard/src/routes/login.tsx b/apps/dashboard/src/routes/login.tsx
index bcd2746..97690d1 100644
--- a/apps/dashboard/src/routes/login.tsx
+++ b/apps/dashboard/src/routes/login.tsx
@@ -64,7 +64,7 @@ function LoginPage() {
DiffKit
- Review workspace
+ Beta version
- DiffKit pulls together open pull requests, assigned issues,
- and pending code reviews into one fast workspace so you can
- move through GitHub work without tab sprawl.
-
