Skip to content

fix(web): Duplicate Side-by-Side path highlighting fix #26476

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
qtemp wants to merge 5 commits into from
+10 −7
Closed

fix(web): Duplicate Side-by-Side path highlighting fix #26476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
edac1fc
Duplicate Side-by-Side path highlighting fix
qtemp Feb 23, 2026
3bfdab1
Update formatting
qtemp Feb 24, 2026
784e2e0
Merge branch 'main' into duplicate-assets
qtemp Mar 12, 2026
9f625d2
Merge branch 'main' into duplicate-assets
qtemp Mar 12, 2026
93d6c37
Merge branch 'main' into duplicate-assets
qtemp Mar 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions i18n/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1234,6 +1234,7 @@
"free_up_space_description": "Move backed-up photos and videos to your device's trash to free up space. Your copies on the server remain safe.",
"free_up_space_settings_subtitle": "Free up device storage",
"full_path": "Full path: {path}",
"file_path": "File path",
"gcast_enabled": "Google Cast",
"gcast_enabled_description": "This feature loads external resources from Google in order to work.",
"general": "General",
Expand Down
16 changes: 9 additions & 7 deletions web/src/lib/components/utilities-page/duplicates/duplicate-asset.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,13 @@
fileName: isDifferent((a) => a.originalFileName),
fileSize: isDifferent((a) => getFileSize(a)),
resolution: isDifferent((a) => getAssetResolution(a)),
originalPath: isDifferent((a) => a.originalPath ?? $t('unknown')),
originalPath: isDifferent((a) => {
const basePath =
a.originalPath && a.originalFileName
? getBasePath(a.originalPath, a.originalFileName)
: (a.originalPath ?? $t('unknown'));
return basePath || $t('unknown');
}),
date: isDifferent((a) => {
const tz = a.exifInfo?.timeZone;
const dt =
Expand Down Expand Up @@ -171,16 +177,12 @@
<InfoRow
icon={mdiImageOutline}
highlight={hasDifferentValues.fileName}
title={$t('file_name_with_value', { values: { file_name: asset.originalFileName ?? '' } })}
title={$t('full_path', { values: { path: asset.originalPath } })}
>
{asset.originalFileName}
</InfoRow>

<InfoRow
icon={mdiFolderOutline}
highlight={hasDifferentValues.originalPath}
title={$t('full_path', { values: { path: asset.originalPath } })}
>
<InfoRow icon={mdiFolderOutline} highlight={hasDifferentValues.originalPath} title={$t('file_path')}>
{truncateMiddle(getBasePath(asset.originalPath, asset.originalFileName)) || $t('unknown')}
</InfoRow>

Expand Down
Loading