From 71ec1ba0692030aa80e6ab1c91fb565b7d01d12a Mon Sep 17 00:00:00 2001 From: Egor Kolesnikov Date: Sat, 21 Nov 2026 14:43:32 +0200 Subject: [PATCH 1/2] Watchface page: a "more" menu with Delete for the owner and moderators $canRemove mirrors the watchfaces deleteRule (owner, or users.moderator), so the menu never offers what the server refuses. Deleting from the showcase page goes back to /. The menu is the place for the face's further actions. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01CQSU8QaiMzNR2mxbb6VVG9 --- src/lib/modules/market/model/market.model.ts | 12 +++++++++ src/lib/modules/market/pages/watchface.svelte | 27 +++++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/src/lib/modules/market/model/market.model.ts b/src/lib/modules/market/model/market.model.ts index 71fbdbd..3afa74e 100644 --- a/src/lib/modules/market/model/market.model.ts +++ b/src/lib/modules/market/model/market.model.ts @@ -98,6 +98,11 @@ export const $likes = createStore([]); // it doesn't need patching when downloads/likes move elsewhere export const $watchface = createStore(null); export const $watchfaceLoading = marketApi.loadWatchfaceFx.pending; +// the owner, or a moderator (a `users` flag a superuser sets in the PocketBase admin UI) — +// the same test as the watchfaces deleteRule, so the menu never offers what the server refuses +export const $canRemove = combine($watchface, authModel.$user, (wf, user) => + Boolean(wf && user && (wf.owner === user.id || user.moderator === true)), +); export const $items = createStore([]); // creators over the "Top creators" thresholds — see lib/top-creators. Derived from the // catalog and likes the page already holds, so it follows a like or a download as they land. @@ -336,6 +341,13 @@ sample({ clock: marketApi.removeFx.done, target: marketApi.loadMarketFx, }); +// deleted from its own showcase page: nothing left to show there +sample({ + clock: marketApi.removeFx.done, + source: $watchface, + filter: (wf, { params }) => wf?.id === params.id, + target: navigateToMarketFx, +}); sample({ clock: publishToggleRequested, diff --git a/src/lib/modules/market/pages/watchface.svelte b/src/lib/modules/market/pages/watchface.svelte index 06d1a02..5e6ae16 100644 --- a/src/lib/modules/market/pages/watchface.svelte +++ b/src/lib/modules/market/pages/watchface.svelte @@ -3,6 +3,7 @@ import { Badge } from "$lib/shared/components/badge"; import { Button } from "$lib/shared/components/button"; import { Icon } from "$lib/shared/components/icon"; + import { Menu, MenuItem } from "$lib/shared/components/menu"; import { Skeleton } from "$lib/shared/components/skeleton"; import { downloadUrl, fileUrl } from "$lib/shared/api"; import { authModel } from "$lib/modules/auth/model"; @@ -41,6 +42,8 @@ $likePending: likePending, editRequested, dialScreenSet, + $canRemove: canRemove, + removeRequested, } = marketModel; const { $bleInfo: bleInfo, @@ -60,6 +63,10 @@ const likeCount = $derived($likes.filter((l) => l.watchface === id).length); const liked = $derived($likes.some((l) => l.watchface === id && l.user === $user?.id)); + function remove() { + if (wf && confirm($t.confirmDelete(wf.name))) removeRequested(wf); + } + // ponytail: Web Share where it exists, clipboard everywhere else — no share-sheet dependency let copied = $state(false); @@ -106,6 +113,26 @@ /> {compact(likeCount)} + + {#if $canRemove} + + {#snippet trigger({ toggle })} + + {/snippet} + + + {$t.delete} + + + {/if} {/if} From 94aea27b44b03263d88caabe9f0020d89b92c4c3 Mon Sep 17 00:00:00 2001 From: Egor Kolesnikov Date: Sat, 21 Nov 2026 14:46:58 +0200 Subject: [PATCH 2/2] Watchface page: Unpublish in the "more" menu too Owner and moderators can take a published face off the market; unpublishing from the showcase page reloads the market and goes back to /, as a delete does. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01CQSU8QaiMzNR2mxbb6VVG9 --- src/lib/modules/market/model/market.model.ts | 21 +++++++++++++++---- src/lib/modules/market/pages/watchface.svelte | 11 ++++++++-- 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/src/lib/modules/market/model/market.model.ts b/src/lib/modules/market/model/market.model.ts index 3afa74e..19bf869 100644 --- a/src/lib/modules/market/model/market.model.ts +++ b/src/lib/modules/market/model/market.model.ts @@ -98,9 +98,10 @@ export const $likes = createStore([]); // it doesn't need patching when downloads/likes move elsewhere export const $watchface = createStore(null); export const $watchfaceLoading = marketApi.loadWatchfaceFx.pending; -// the owner, or a moderator (a `users` flag a superuser sets in the PocketBase admin UI) — -// the same test as the watchfaces deleteRule, so the menu never offers what the server refuses -export const $canRemove = combine($watchface, authModel.$user, (wf, user) => +// the owner, or a moderator (a `users` flag a superuser sets in the PocketBase admin UI): who +// may delete or unpublish the face — the watchfaces rules' test, so the menu never offers what +// the server refuses +export const $canModerate = combine($watchface, authModel.$user, (wf, user) => Boolean(wf && user && (wf.owner === user.id || user.moderator === true)), ); export const $items = createStore([]); @@ -341,13 +342,25 @@ sample({ clock: marketApi.removeFx.done, target: marketApi.loadMarketFx, }); -// deleted from its own showcase page: nothing left to show there +// deleted or unpublished from its own showcase page: nothing left to show there (a moderator +// can't even view an unpublished face), and the market shelf has to drop it sample({ clock: marketApi.removeFx.done, source: $watchface, filter: (wf, { params }) => wf?.id === params.id, target: navigateToMarketFx, }); +sample({ + clock: marketApi.togglePublishFx.doneData, + source: $watchface, + filter: (wf, r) => wf?.id === r.id && !r.published, + target: navigateToMarketFx, +}); +sample({ + clock: marketApi.togglePublishFx.doneData, + filter: (r) => !r.published, + target: marketApi.loadMarketFx, +}); sample({ clock: publishToggleRequested, diff --git a/src/lib/modules/market/pages/watchface.svelte b/src/lib/modules/market/pages/watchface.svelte index 5e6ae16..b36801b 100644 --- a/src/lib/modules/market/pages/watchface.svelte +++ b/src/lib/modules/market/pages/watchface.svelte @@ -42,8 +42,9 @@ $likePending: likePending, editRequested, dialScreenSet, - $canRemove: canRemove, + $canModerate: canModerate, removeRequested, + publishToggleRequested, } = marketModel; const { $bleInfo: bleInfo, @@ -115,7 +116,7 @@ - {#if $canRemove} + {#if $canModerate} {#snippet trigger({ toggle })} {/snippet} + {#if wf.published} + publishToggleRequested(wf)}> + + {$t.unpublish} + + {/if} {$t.delete}