Enable branch selector even if no delegate is selected

This commit is contained in:
Sebastian Martinez
2024-02-27 14:41:10 +01:00
parent 3f07650bcc
commit 481e25dca1
4 changed files with 47 additions and 61 deletions
+4
View File
@@ -26,5 +26,9 @@
<div class="dropdown-item">
<slot name="item" {item} />
</div>
{:else}
<div class="dropdown-item">
<slot name="empty" />
</div>
{/each}
</div>
+39 -57
View File
@@ -3,6 +3,7 @@
import type { Route } from "@app/lib/router";
import * as utils from "@app/lib/utils";
import { activeUnloadedRouteStore } from "@app/lib/router";
import { closeFocused } from "@app/components/Popover.svelte";
import DropdownList from "@app/components/DropdownList.svelte";
@@ -11,7 +12,6 @@
import IconSmall from "@app/components/IconSmall.svelte";
import Link from "@app/components/Link.svelte";
import Button from "@app/components/Button.svelte";
import HoverPopover from "@app/components/HoverPopover.svelte";
export let branches: Array<{ name: string; route: Route }>;
export let node: BaseUrl;
@@ -19,7 +19,6 @@
export let selectedBranch: string | undefined;
export let selectedCommitId: string;
$: onCanonicalBranch = branches.length === 0;
$: selectedCommitShortId = utils.formatCommit(selectedCommitId);
</script>
@@ -39,62 +38,45 @@
<div class="branch">
{#if selectedBranch}
{#if onCanonicalBranch}
<HoverPopover
stylePopoverPositionLeft="0"
stylePopoverPositionTop="0.5rem">
<Button
ariaLabel="canonical-branch"
variant="gray-white"
styleBorderRadius="var(--border-radius-small) 0 0 var(--border-radius-small)"
slot="toggle"
disabled
notAllowed={false}>
<IconSmall name="branch" />
<div class="identifier">{project.defaultBranch}</div>
</Button>
<div class="txt-small" slot="popover" style:width="13.5rem">
<div style:margin-bottom="1rem">
You are currently browsing the canonical branch.
</div>
If you want to browse a specific branch, you need to select the desired
remote first.
</div>
</HoverPopover>
{:else}
<Popover
popoverPadding="0"
popoverPositionTop="2.5rem"
popoverBorderRadius="var(--border-radius-small)">
<Button
variant="gray-white"
let:expanded
let:toggle
on:click={toggle}
slot="toggle"
styleBorderRadius="var(--border-radius-small) 0 0 var(--border-radius-small)"
title="Change branch">
<IconSmall name="branch" />
<div class="identifier">{selectedBranch}</div>
{#if !onCanonicalBranch}
<IconSmall name={expanded ? "chevron-up" : "chevron-down"} />
{/if}
</Button>
<Popover
popoverPadding="0"
popoverPositionTop="2.5rem"
popoverBorderRadius="var(--border-radius-small)">
<Button
variant="gray-white"
let:expanded
let:toggle
on:click={toggle}
slot="toggle"
styleBorderRadius="var(--border-radius-small) 0 0 var(--border-radius-small)"
title="Change branch">
<IconSmall name="branch" />
<div class="identifier">{selectedBranch}</div>
<IconSmall name={expanded ? "chevron-up" : "chevron-down"} />
</Button>
<DropdownList
slot="popover"
styleDropdownMinWidth="12.5rem"
items={branches}>
<svelte:fragment slot="item" let:item>
<Link route={item.route} on:afterNavigate={() => closeFocused()}>
<DropdownListItem selected={item.name === selectedBranch}>
<div class="identifier">{item.name}</div>
</DropdownListItem>
</Link>
</svelte:fragment>
</DropdownList>
</Popover>
{/if}
<DropdownList
slot="popover"
styleDropdownMinWidth="7.5rem"
items={branches}>
<svelte:fragment slot="item" let:item>
<Link route={item.route} on:afterNavigate={() => closeFocused()}>
<DropdownListItem selected={item.name === selectedBranch}>
<div class="identifier">{item.name}</div>
</DropdownListItem>
</Link>
</svelte:fragment>
<svelte:fragment slot="empty">
<Link
route={$activeUnloadedRouteStore}
on:afterNavigate={() => closeFocused()}>
<DropdownListItem selected>
<div class="identifier">{project.defaultBranch}</div>
</DropdownListItem>
</Link>
</svelte:fragment>
</DropdownList>
</Popover>
{/if}
<Button
+2 -2
View File
@@ -28,7 +28,7 @@ test("navigate to project", async ({ page }) => {
// Project menu shows default selected branch and commit and contributor counts.
{
await expect(page.getByLabel("canonical-branch")).toBeVisible();
await expect(page.getByTitle("Change branch")).toBeVisible();
await expect(page.getByTitle("Current HEAD")).toHaveText(
aliceMainHead.substring(0, 7),
);
@@ -336,7 +336,7 @@ test("peer and branch switching", async ({ page }) => {
await expect(page.getByTitle("Change peer")).not.toContainText("alice");
await expect(page.getByTitle("Change peer")).not.toContainText("bob");
await expect(page.getByLabel("canonical-branch")).toBeVisible();
await expect(page.getByTitle("Change branch")).toBeVisible();
await expect(page.getByTitle("Current HEAD")).toHaveText(
aliceMainHead.substring(0, 7),
);
+2 -2
View File
@@ -149,7 +149,7 @@ test("pushing changes while viewing history", async ({ page, peerManager }) => {
await expect(page).toHaveURL(`${alice.uiUrl()}/${rid}/history`);
await expect(page.getByRole("link", { name: "Commits 2" })).toBeVisible();
await expect(page.getByLabel("canonical-branch")).toHaveText("main");
await expect(page.getByTitle("Change branch")).toHaveText("main");
await expect(page.getByTitle("Current HEAD")).toHaveText("516fa74");
await page
@@ -178,6 +178,6 @@ test("pushing changes while viewing history", async ({ page, peerManager }) => {
await expect(page.getByRole("link", { name: "Commits 3" })).toHaveText(
"Commits 3",
);
await expect(page.getByLabel("canonical-branch")).toHaveText("main");
await expect(page.getByTitle("Change branch")).toHaveText("main");
await expect(page.getByTitle("Current HEAD")).toHaveText("bb9089a");
});