Remove canonical branch during search

radicle-dev · Jun 13, 2024 · 29c0bbb · 29c0bbb
1 parent 5986fe8
commit 29c0bbb
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 35 deletions.
diff --git a/src/views/projects/Source/SourceSelector.svelte b/src/views/projects/Source/SourceSelector.svelte
@@ -38,15 +38,15 @@
 <style>
   .dropdown {
     border-radius: var(--border-radius-small);
-    min-width: 25rem;
+    width: 40rem;
     max-height: 60vh;
     overflow-y: auto;
     padding: 0.25rem;
   }
   .dropdown-grid {
     display: grid;
     column-gap: 2rem;
-    grid-template-columns: [branch] minmax(20ch, 1fr) [commit] minmax(10ch 1fr);
+    grid-template-columns: [branch] minmax(20ch, 1fr) [commit] 10ch;
   }
   .dropdown-header {
     display: grid;
@@ -55,9 +55,6 @@
     padding: 0.5rem;
     color: var(--color-foreground-dim);
   }
-  /* .no-alias {
-    color: var(--color-foreground-dim);
-  } */
 </style>
 
 <div style="display: flex; gap: 1px;">
@@ -126,35 +123,6 @@
         <div class="dropdown-header">Branch</div>
         <div class="dropdown-header">Head</div>
 
-        <Link
-          style="display: grid; grid-template-columns: subgrid; grid-column: span 2;"
-          route={{
-            ...$activeUnloadedRouteStore,
-            resource: "project.source",
-            peer: undefined,
-            revision: project.defaultBranch,
-            project: project.id,
-            node,
-          }}
-          on:afterNavigate={() => closeFocused()}>
-          <DropdownListItem
-            selected={false}
-            style="display: grid; gap: inherit; grid-template-columns: subgrid; grid-column: span 2;">
-            <div style="display: flex; align-items: center; gap: 0.5rem;">
-              <IconSmall name="branch" />
-              {project.defaultBranch}
-              <Badge title="Canonical branch" variant="foreground-emphasized">
-                Canonical
-              </Badge>
-            </div>
-            <div
-              class="txt-monospace"
-              style="color: var(--color-foreground-dim);">
-              {formatCommit(project.head)}
-            </div>
-          </DropdownListItem>
-        </Link>
-
         {#if searchInput}
           {#each searchResults as result}
             {@const parsedResult = JSON.parse(result)}
@@ -175,7 +143,9 @@
                 style="display: grid; gap: inherit; grid-template-columns: subgrid; grid-column: span 2;">
                 <div style="display: flex; gap: 0.5rem;">
                   <IconSmall name="branch" />
-                  {parsedResult.peer.alias || parsedResult.peer.id} / {parsedResult.revision}
+                  <span class="txt-overflow">
+                    {parsedResult.peer.alias || parsedResult.peer.id} / {parsedResult.revision}
+                  </span>
                 </div>
                 <div
                   class="txt-monospace"
@@ -192,6 +162,34 @@
             </div>
           {/each}
         {:else}
+          <Link
+            style="display: grid; grid-template-columns: subgrid; grid-column: span 2;"
+            route={{
+              ...$activeUnloadedRouteStore,
+              resource: "project.source",
+              peer: undefined,
+              revision: project.defaultBranch,
+              project: project.id,
+              node,
+            }}
+            on:afterNavigate={() => closeFocused()}>
+            <DropdownListItem
+              selected={false}
+              style="display: grid; gap: inherit; grid-template-columns: subgrid; grid-column: span 2;">
+              <div style="display: flex; align-items: center; gap: 0.5rem;">
+                <IconSmall name="branch" />
+                {project.defaultBranch}
+                <Badge title="Canonical branch" variant="foreground-emphasized">
+                  Canonical
+                </Badge>
+              </div>
+              <div
+                class="txt-monospace"
+                style="color: var(--color-foreground-dim);">
+                {formatCommit(project.head)}
+              </div>
+            </DropdownListItem>
+          </Link>
           {#each peers as peer}
             <PeerItem
               projectId={project.id}

diff --git a/src/views/projects/Source/SourceSelector/PeerItem.svelte b/src/views/projects/Source/SourceSelector/PeerItem.svelte
@@ -19,6 +19,12 @@
   let expanded = false;
 </script>
 
+<style>
+  .no-alias {
+    color: var(--color-foreground-dim);
+  }
+</style>
+
 <div
   style="display: grid; grid-template-columns: subgrid; grid-column: span 2;">
   <div