Skip to content

fix(web): duplicate key error and enable expiration editing for expired shared links #24686

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

Merged
danieldietzler merged 5 commits into from
Jan 5, 2026
Merged

fix(web): duplicate key error and enable expiration editing for expired shared links #24686

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bfa0634
fix(web): improve unique expiration options for shared links
timonrieger Dec 18, 2025
6df06e5
fix(web): enable shared link expiration regardless of current date
timonrieger Dec 18, 2025
a62ea4a
extract deduplication logic for expiration options into a separate fu…
timonrieger Dec 18, 2025
6568568
Merge remote-tracking branch 'origin/main' into fix/shared-link-expir…
danieldietzler Jan 5, 2026
de91e3d
chore: cleanup
danieldietzler Jan 5, 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
12 changes: 11 additions & 1 deletion web/src/lib/components/SharedLinkExpiration.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,17 @@
<SettingSelect
bind:value={expirationOption}
{onSelect}
options={[...new Set([...expiredDateOptions, getExpirationOption(createdAt, expiresAt)])]}
options={(() => {

@alextran1502 alextran1502 Dec 18, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably cleaner to extract this into a method instead of inlining it

@timonrieger timonrieger Dec 18, 2025

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done in a62ea4a ✅

const allOptions = [...expiredDateOptions, getExpirationOption(createdAt, expiresAt)];
const seen = new Set<string | number>();

Check failure on line 73 in web/src/lib/components/SharedLinkExpiration.svelte

View workflow job for this annotation

GitHub Actions / Lint Web 

Found a mutable instance of the built-in Set class. Use SvelteSet instead
return allOptions.filter((option) => {
if (seen.has(option.value)) {
return false;
}
seen.add(option.value);
return true;
});
})()}
label={$t('expire_after')}

@timonrieger timonrieger Dec 18, 2025

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and that's the "55 years old" and crash fix

disabled={expiresAt !== null && DateTime.fromISO(expiresAt) < DateTime.now()}
number={true}
Expand Down
Loading