patrick/chitai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: name the merge options and drop their subtext

Browse Source
This commit is contained in:
patrick
2026-08-17 11:06:19 -04:00
parent a3443d36f1
commit 202cbed30e
2 changed files with 14 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/lib/components/view/batch-operations-toolbar.svelte
+5 -18
View File
@@ -199,27 +199,14 @@
> >
<GitMerge /> <GitMerge />
</DropdownMenu.Trigger> </DropdownMenu.Trigger>
<DropdownMenu.Content class="w-72"> <DropdownMenu.Content>
<DropdownMenu.Item class="flex-col items-start gap-0.5" onclick={quickMerge}> <DropdownMenu.Item onclick={quickMerge}>
<span class="flex w-full min-w-0 items-center gap-2">
<GitMerge class="size-4 shrink-0" /> <GitMerge class="size-4 shrink-0" />
<span class="truncate">Keep “{selectedBooks[0].title}”</span> Merge into first selected
</span>
<span class="pl-6 text-xs text-wrap text-muted-foreground">
Files move onto the book you selected first, which keeps its own metadata.
</span>
</DropdownMenu.Item> </DropdownMenu.Item>
<DropdownMenu.Item <DropdownMenu.Item onclick={() => (mergingBooks = selectedBooks)}>
class="flex-col items-start gap-0.5"
onclick={() => (mergingBooks = selectedBooks)}
>
<span class="flex items-center gap-2">
<SlidersHorizontal class="size-4 shrink-0" /> <SlidersHorizontal class="size-4 shrink-0" />
Choose what to keep… Manual merge…
</span>
<span class="pl-6 text-xs text-wrap text-muted-foreground">
Pick the record that survives and resolve the metadata field by field.
</span>
</DropdownMenu.Item> </DropdownMenu.Item>
</DropdownMenu.Content> </DropdownMenu.Content>
</DropdownMenu.Root> </DropdownMenu.Root>
frontend/src/routes/(root)/settings/libraries/[libraryId]/duplicates/+page.svelte
+5 -21
View File
@@ -149,30 +149,14 @@
> >
Merge… Merge…
</DropdownMenu.Trigger> </DropdownMenu.Trigger>
<DropdownMenu.Content align="end" class="w-72"> <DropdownMenu.Content align="end">
<DropdownMenu.Item <DropdownMenu.Item onclick={() => quickMerge(group)}>
class="flex-col items-start gap-0.5"
onclick={() => quickMerge(group)}
>
<span class="flex w-full min-w-0 items-center gap-2">
<GitMerge class="size-4 shrink-0" /> <GitMerge class="size-4 shrink-0" />
<span class="truncate">Keep “{records[0]?.title}”</span> Merge into first selected
</span>
<span class="pl-6 text-xs text-wrap text-muted-foreground">
Files move onto the first book, which keeps its own metadata.
</span>
</DropdownMenu.Item> </DropdownMenu.Item>
<DropdownMenu.Item <DropdownMenu.Item onclick={() => (merging = group)}>
class="flex-col items-start gap-0.5"
onclick={() => (merging = group)}
>
<span class="flex items-center gap-2">
<SlidersHorizontal class="size-4 shrink-0" /> <SlidersHorizontal class="size-4 shrink-0" />
Choose what to keep… Manual merge…
</span>
<span class="pl-6 text-xs text-wrap text-muted-foreground">
Pick the record that survives and resolve the metadata field by field.
</span>
</DropdownMenu.Item> </DropdownMenu.Item>
</DropdownMenu.Content> </DropdownMenu.Content>
</DropdownMenu.Root> </DropdownMenu.Root>