Compare to revisionBase instead of projectHead

radicle-dev · Dec 4, 2023 · 6dfa802 · 6dfa802
1 parent bf2e524
commit 6dfa802
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 55 deletions.
diff --git a/src/views/projects/Cob/Revision.svelte b/src/views/projects/Cob/Revision.svelte
@@ -33,8 +33,6 @@
   export let rawPath: (commit?: string) => string;
   export let patchId: string;
   export let patchState: PatchState;
-  export let projectHead: string;
-  export let projectDefaultBranch: string;
   export let projectId: string;
   export let revisionBase: string;
   export let revisionId: string;
@@ -260,47 +258,6 @@
           {@const { insertions, deletions } = response.diff.stats}
           <DiffStatBadge {insertions} {deletions} />
         {/if}
-        {#if previousRevOid}
-          <Link
-            title="Compare {utils.formatObjectId(
-              previousRevOid,
-            )}..{utils.formatObjectId(revisionOid)}"
-            route={{
-              resource: "project.patch",
-              project: projectId,
-              node: baseUrl,
-              patch: patchId,
-              view: {
-                name: "diff",
-                fromCommit: previousRevOid,
-                toCommit: revisionOid,
-              },
-            }}>
-            <IconButton>
-              <IconSmall name="diff" />
-            </IconButton>
-          </Link>
-        {:else}
-          <Link
-            title="Compare {utils.formatObjectId(
-              projectHead,
-            )}..{utils.formatObjectId(revisionOid)}"
-            route={{
-              resource: "project.patch",
-              project: projectId,
-              node: baseUrl,
-              patch: patchId,
-              view: {
-                name: "diff",
-                fromCommit: projectHead,
-                toCommit: revisionOid,
-              },
-            }}>
-            <IconButton>
-              <IconSmall name="diff" />
-            </IconButton>
-          </Link>
-        {/if}
         <Popover
           popoverPadding="0"
           popoverPositionTop="2.5rem"
@@ -311,13 +268,13 @@
             let:toggle
             on:click={toggle}
             title="toggle-context-menu">
-            <IconSmall name="more" />
+            <IconSmall name="diff" />
           </IconButton>
           <DropdownList
             slot="popover"
             items={previousRevOid && previousRevId
-              ? [projectHead, previousRevOid]
-              : [projectHead]}>
+              ? [revisionBase, previousRevOid]
+              : [revisionBase]}>
             <Link
               let:item
               slot="item"
@@ -333,15 +290,15 @@
                   toCommit: revisionOid,
                 },
               }}>
-              {#if item === projectHead}
+              {#if item === revisionBase}
                 <DropdownListItem selected={false}>
                   <span class="compare-dropdown-item">
-                    Compare to {projectDefaultBranch}:
+                    Compare to revision base:
                     <span
                       style:color="var(--color-fill-secondary)"
                       style:font-weight="var(--font-weight-bold)"
                       style:font-family="var(--font-family-monospace)">
-                      {utils.formatObjectId(projectHead)}
+                      {utils.formatObjectId(revisionBase)}
                     </span>
                   </span>
                 </DropdownListItem>
@@ -392,7 +349,7 @@
           {#if revisionDescription && !first}
             <div class="revision-description txt-small">
               <Markdown
-                rawPath={rawPath(projectHead)}
+                rawPath={rawPath(revisionBase)}
                 content={revisionDescription} />
             </div>
           {/if}
@@ -432,7 +389,7 @@
           <Thread
             enableAttachments
             thread={element.inner}
-            rawPath={rawPath(projectHead)}
+            rawPath={rawPath(revisionBase)}
             {canEditComment}
             {editComment}
             {createReply}
@@ -475,7 +432,7 @@
             class:positive-review={review.verdict === "accept"}
             class:negative-review={review.verdict === "reject"}>
             <CommentComponent
-              rawPath={rawPath(projectHead)}
+              rawPath={rawPath(revisionBase)}
               caption={formatVerdict(review.verdict)}
               authorId={author}
               authorAlias={review.author.alias}

diff --git a/src/views/projects/Patch.svelte b/src/views/projects/Patch.svelte
@@ -847,12 +847,10 @@
           <RevisionComponent
             {baseUrl}
             {rawPath}
-            projectId={project.id}
             {timelines}
-            projectDefaultBranch={project.defaultBranch}
-            projectHead={project.head}
             {...revision}
             first={index === 0}
+            projectId={project.id}
             canEditComment={partial(
               role.isDelegateOrAuthor,
               session?.publicKey,