Skip to content

High performance self-hosted photo and video management solution.

feat(web): Keep show more open on duplicates (#29734)

Jorge Montejo55dc57905947
diff --git a/web/src/routes/(user)/utilities/duplicates/[[photos=photos]]/[[assetId=id]]/+page.svelte b/web/src/routes/(user)/utilities/duplicates/[[photos=photos]]/[[assetId=id]]/+page.svelte
index f31af90f32..a9a0b7729a 100644
--- a/web/src/routes/(user)/utilities/duplicates/[[photos=photos]]/[[assetId=id]]/+page.svelte
+++ b/web/src/routes/(user)/utilities/duplicates/[[photos=photos]]/[[assetId=id]]/+page.svelte
@@ -54,6 +54,7 @@
};
let duplicates = $state(data.duplicates);
+ let showMore = $state(false);
const correctDuplicatesIndex = (index: number) => {
return Math.max(0, Math.min(index, duplicates.length - 1));
@@ -261,6 +262,7 @@
<DuplicatesCompareControl
assets={duplicates[duplicatesIndex].assets}
suggestedKeepAssetIds={duplicates[duplicatesIndex].suggestedKeepAssetIds}
+ bind:showMore
onResolve={(duplicateAssetIds, trashIds) =>
handleResolve(duplicates[duplicatesIndex].duplicateId, duplicateAssetIds, trashIds)}
onStack={(assets) => handleStack(duplicates[duplicatesIndex].duplicateId, assets)}
diff --git a/web/src/routes/(user)/utilities/duplicates/[[photos=photos]]/[[assetId=id]]/DuplicatesCompareControl.svelte b/web/src/routes/(user)/utilities/duplicates/[[photos=photos]]/[[assetId=id]]/DuplicatesCompareControl.svelte
index 7a3505c575..f517b6f8f5 100644
--- a/web/src/routes/(user)/utilities/duplicates/[[photos=photos]]/[[assetId=id]]/DuplicatesCompareControl.svelte
+++ b/web/src/routes/(user)/utilities/duplicates/[[photos=photos]]/[[assetId=id]]/DuplicatesCompareControl.svelte
@@ -22,11 +22,12 @@
interface Props {
assets: AssetResponseDto[];
suggestedKeepAssetIds: string[];
+ showMore: boolean;
onResolve: (duplicateAssetIds: string[], trashIds: string[]) => void;
onStack: (assets: AssetResponseDto[]) => void;
}
- let { assets, suggestedKeepAssetIds, onResolve, onStack }: Props = $props();
+ let { assets, suggestedKeepAssetIds, onResolve, onStack, showMore = $bindable() }: Props = $props();
// eslint-disable-next-line svelte/no-unnecessary-state-wrap
let selectedAssetIds = $state(new SvelteSet<string>());
let trashCount = $derived(assets.length - selectedAssetIds.size);
@@ -36,7 +37,6 @@
const differingMetadataFields: DifferingMetadataFields = $derived(computeDifferingMetadataFields(assets));
const differingCount = $derived(countDifferingMetadataItems(differingMetadataFields));
const hasMore = $derived(differingCount > InitialVisibleCount);
- let showMore = $state(false);
onMount(() => {
if (suggestedKeepAssetIds.length > 0) {