mirror of
https://github.com/thegeneralist01/archivr
synced 2026-10-09 21:03:17 +02:00
feat(collections): public collections, per-collection auth, UX improvements (#34)
* feat(core): add requires_auth to collections; include name in entry-collection memberships
- Add `requires_auth INTEGER NOT NULL DEFAULT 1` column to the
collections DDL and as an idempotent ALTER TABLE migration in
initialize_schema (archive DB), not initialize_auth_schema.
- CollectionRecord and CollectionSummary gain `requires_auth: bool`.
- create_collection() and update_collection() accept the new field.
- get_entry_collection_memberships() now returns collection name as the
third tuple element; EntryCollectionMembership gains a `name` field
so the sidebar can show human-readable names instead of raw UIDs.
* feat(server): conditional auth for public collections; add requires_auth + original_url to API
- CreateCollectionBody gains requires_auth (default true).
- PatchCollectionBody gains requires_auth: Option<bool>.
- get_collection_handler: load record first, then skip auth.require_auth()
when record.requires_auth == false so public collections are accessible
to unauthenticated callers; caller_bits falls back to ROLE_GUEST (1)
so only visibility_bits=3 entries are returned to guests.
- Collection JSON response includes requires_auth and each entry now
includes original_url for use by the public collection page.
- list_collections_handler keeps require_auth (management UI).
* feat(frontend): public collection page at /c/:archiveId/:collUid
- Detect PUBLIC_COLL_ROUTE at module load time (like PREVIEW_ROUTE) and
return <PublicCollectionPage> before any auth checks so unauthenticated
users can view public collections without hitting the login gate.
- PublicCollectionPage fetches via getCollection() and renders the
server-filtered entry list (no client-side bitmask filtering - the
server already applies caller_bits=GUEST for unauthenticated requests).
Entry titles link to original_url when present; fall back to plain
text when original_url is null.
- api.js createCollection() gains requiresAuth param (default true),
sent as requires_auth in the request body.
- Storybook story covers WithEntries, Empty, and LoadError states.
* feat(frontend): collections view improvements
- addVis in the 'Add entry' form now syncs to the selected collection's
default_visibility_bits via useEffect on collDetail, so the default
matches the collection's configured entry visibility.
- Rename 'Default visibility' label to 'Entries\' default visibility'
in both the detail pane and the create form to distinguish it from
the new collection-level access setting.
- Add 'Require authentication to view' checkbox in the detail pane
backed by a PATCH to requires_auth; reads collDetail?.requires_auth
with fallback to the list-level selected record.
- Create form gains a matching requires_auth checkbox (default: true),
passed as 5th arg to createCollection().
* feat(frontend): context rail collection improvements
- Show collection name (c.name) instead of raw UID in the sidebar
Collections section; names now come from the updated
EntryCollectionMembership API response.
- Fix horizontal overflow on long collection names: coll-name gains
overflow:hidden + text-overflow:ellipsis + white-space:nowrap +
min-width:0; coll-row gets overflow:hidden.
- Single-entry 'Add to collection' UI: dropdown + button inside the
Collections rail section lets users add the current entry to any
non-default collection without multi-selecting. After add, the
membership list refreshes automatically.
- Collections section now shows even when entryCollections is empty,
as long as non-default collections exist (so the add form is
accessible for un-membered entries).
- Bulk 'Add to collection' now uses the target collection's
default_visibility_bits instead of hardcoded 2 (Users only).
- Both bulk and single-entry dropdowns filter out slug='_default_'
to match the backend rejection in add_entry_to_collection_handler.
- Collections list is now fetched on archiveId change (not just on
bulk mode entry) so it is available for single-entry mode too.
* build(frontend): update static assets
* feat(frontend): public collection link UX + app-styled public page
CollectionsView:
- When a collection has requires_auth=false, show a read-only URL input
and Copy button below the auth checkbox so the public link is
immediately discoverable. The input auto-selects on focus so manual
copy always works. Copy button tries navigator.clipboard.writeText
first; falls back to execCommand('copy') for HTTP deployments where
the Clipboard API is unavailable in non-secure contexts.
PublicCollectionPage:
- Rewritten to use the app's CSS classes and variables instead of
bare inline styles, so it visually matches the main archive UI.
Dark topbar (.pub-coll-topbar) with brand + collection name, paper
background body, entry list via .coll-entries-list / .coll-entry-row /
.coll-entry-info / .coll-entry-kind — the same classes used in the
authenticated Collections view.
styles.css:
- .coll-public-link-row / -wrap / -input / .coll-copy-btn for the
new link field in CollectionsView detail pane.
- .pub-coll-* classes for the public page layout and typography.
* feat(core): add get_collection_by_slug; scope search to active collection
- get_collection_by_slug(): new function mirroring get_collection_by_uid
but matching on slug, used to resolve the _default_ collection when no
?collection param is supplied.
- SearchEntriesQuery gains collection_id: Option<i64>. When set, the
search SQL adds an EXISTS subquery that checks collection_entries cef
for both membership (cef.collection_id = ?) and visibility bits in
that specific collection — preventing cross-collection visibility
leaks where an entry is public in one collection but private in the
current one. Without collection_id the original cross-collection
visibility fallback is kept.
* feat(server): collection-scoped entries/search with uniform auth gate
All entry listing and search now route through the active collection:
list_entries (?collection=<uid>|main|<omitted>):
- Resolves the target collection; omitted or 'main' resolves to _default_.
- Checks requires_auth on that collection; gates auth conditionally.
- Returns list_entries_for_collection() — same EntrySummary shape.
search_entries_handler:
- Same collection resolution + conditional auth as list_entries.
- Sets search_query.collection_id so SQL scopes membership + visibility
to the specific collection, not cross-collection fallback.
list_collections_handler:
- Dropped require_auth() — collection summaries (name/slug/uid/
requires_auth/default_visibility_bits) are public metadata needed for
the guest collection-switcher dropdown.
Tests:
- list_collections_requires_auth → list_collections_is_public (200).
- list_entries_requires_auth and search coverage still pass.
* feat(frontend): integrate collection switching into main Archive view
Replaces the standalone /c/:archiveId/:collUid public page with a
unified main-view approach where all collection logic lives at /.
URL param:
- ?collection=<uid> selects a collection; omitted or 'main' = default.
- 'main' is normalized to null in parseLocation() so the dropdown shows
'All entries' and the URL stays clean.
Collection switcher (Topbar):
- Dropdown always visible (guests need it to navigate public collections).
- Non-default collections only (All entries = no param = _default_).
- Guest selecting an auth-required collection calls onSignInClick().
- handleCollectionChange checks both named and _default_ requires_auth
before proceeding, redirecting guests to login if needed.
listCollections fetched for all users (guests too) since the endpoint
is now public; used to populate the switcher without auth.
Public-session mode (authenticated state, no currentUser):
- Auth gate: fetchArchives() + fetchEntries() with collection param;
401 falls through to login, 200 proceeds as guest.
- auth:expired suppressed when !currentUser.
- fetchEntryDetail skipped; ContextRail shows entry summary + sign-in prompt.
- ContextRail selection effect skips tag/collection API calls.
- runs/tags not fetched in guest mode.
- Child row expansion disabled in EntryRow (hasChildren = false).
api.js:
- fetchEntries/searchEntries both thread ?collection=<uid> to server.
Deleted: PublicCollectionPage.jsx, PublicCollectionPage.stories.jsx,
copy-link UI from CollectionsView, pub-coll-*/copy-link CSS.
* build(frontend): update static assets
* feat(core): add is_entry_publicly_accessible; checks entry+parent vs public collections
* feat(server): allow guests to fetch detail/children/artifacts for public entries
* feat(frontend): guest collection dropdown filtering; public entry detail without auth wall
* build(frontend): update static assets
* test(server): public entry detail/artifact/children contract for guests
* feat(server): filter auth-required collections from guest list_collections response
This commit is contained in:
GitHub
parent
1af920eb63
commit
e1ee05bd41
16 changed files with 1218 additions and 185 deletions
|
|
@ -1,5 +1,5 @@
|
|||
import { useState, useEffect, useCallback, useRef, useMemo, createContext } from 'react'
|
||||
import { fetchArchives, fetchEntries, searchEntries, fetchRuns, fetchTags, checkSetup, fetchMe, fetchEntryDetail } from './api'
|
||||
import { fetchArchives, fetchEntries, searchEntries, fetchRuns, fetchTags, checkSetup, fetchMe, fetchEntryDetail, listCollections } from './api'
|
||||
import LoginPage from './components/LoginPage.jsx'
|
||||
import SetupPage from './components/SetupPage.jsx'
|
||||
|
||||
|
|
@ -20,15 +20,15 @@ import ToastStack from './components/ToastStack'
|
|||
|
||||
export const AuthContext = createContext(null);
|
||||
|
||||
const VIEWS = ['archive','tags','collections','runs','admin','settings']
|
||||
const SETTINGS_TABS = ['profile','tokens','instance','cookies','extensions','storage']
|
||||
|
||||
// Detect /preview/:archiveId/:entryUid at load time (static — no navigation)
|
||||
const PREVIEW_ROUTE = (() => {
|
||||
const m = window.location.pathname.match(/^\/preview\/([^/]+)\/([^/]+)/)
|
||||
return m ? { archiveId: m[1], entryUid: m[2] } : null
|
||||
})()
|
||||
|
||||
const VIEWS = ['archive','tags','collections','runs','admin','settings']
|
||||
const SETTINGS_TABS = ['profile','tokens','instance','cookies','extensions','storage']
|
||||
|
||||
function parseLocation() {
|
||||
const parts = window.location.pathname.split('/').filter(Boolean)
|
||||
const view = VIEWS.includes(parts[0]) ? parts[0] : 'archive'
|
||||
|
|
@ -37,7 +37,14 @@ function parseLocation() {
|
|||
const q = params.get('q') ?? ''
|
||||
const tag = view === 'archive' ? (params.get('tag') ?? null) : null
|
||||
const entry = view === 'archive' ? (params.get('entry') ?? null) : null
|
||||
return { view, settingsTab, q, tag, entry }
|
||||
// 'main' is the user-facing alias for the default collection; normalize to null
|
||||
// so the collection dropdown shows "All entries" and no ?collection param is needed.
|
||||
const rawColl = view === 'archive' ? (params.get('collection') ?? null) : null
|
||||
const collection = rawColl === 'main' ? null : rawColl
|
||||
// ?archive=<id> pins a specific archive for public-collection sharing in multi-archive
|
||||
// setups; without it the bootstrap tries archives[0] which may be the wrong one.
|
||||
const archive = params.get('archive') ?? null
|
||||
return { view, settingsTab, q, tag, entry, collection, archive }
|
||||
}
|
||||
|
||||
function locationPath(view, settingsTab) {
|
||||
|
|
@ -55,22 +62,48 @@ export default function App() {
|
|||
const needsSetup = await checkSetup();
|
||||
if (needsSetup) { setAuthState('setup'); return; }
|
||||
const user = await fetchMe();
|
||||
if (!user) { setAuthState('login'); return; }
|
||||
if (!user) {
|
||||
// Before showing login: check whether the active collection is publicly accessible.
|
||||
// fetchArchives is unauthenticated. ?archive=<id> pins the archive for multi-archive
|
||||
// setups; without it we try archives[0] (works for the common single-archive case).
|
||||
const { collection, archive: archiveParam } = parseLocation();
|
||||
try {
|
||||
const archiveList = await fetchArchives();
|
||||
const aid = archiveParam
|
||||
? (archiveList.find(a => a.id === archiveParam)?.id ?? archiveList[0]?.id)
|
||||
: archiveList[0]?.id;
|
||||
if (aid) {
|
||||
await fetchEntries(aid, collection); // 401 if collection requires auth
|
||||
setArchives(archiveList);
|
||||
setArchiveId(aid);
|
||||
setSelectedCollectionUid(collection);
|
||||
setAuthState('authenticated');
|
||||
return;
|
||||
}
|
||||
} catch { /* not public or error — fall through to login */ }
|
||||
setAuthState('login');
|
||||
return;
|
||||
}
|
||||
setCurrentUser(user);
|
||||
setAuthState('authenticated');
|
||||
})();
|
||||
}, []);
|
||||
|
||||
// Suppress auth:expired redirect when browsing as a public guest (no currentUser).
|
||||
// Without this, incidental 401s on auth-required tabs would kick guests to login.
|
||||
useEffect(() => {
|
||||
const handler = () => { setCurrentUser(null); setAuthState('login'); };
|
||||
const handler = () => {
|
||||
if (!currentUser) return;
|
||||
setCurrentUser(null); setAuthState('login');
|
||||
};
|
||||
window.addEventListener('auth:expired', handler);
|
||||
return () => window.removeEventListener('auth:expired', handler);
|
||||
}, []);
|
||||
}, [currentUser]);
|
||||
|
||||
// Sync URL → state on back/forward
|
||||
useEffect(() => {
|
||||
const handler = () => {
|
||||
const { view, settingsTab, q, tag, entry } = parseLocation()
|
||||
const { view, settingsTab, q, tag, entry, collection } = parseLocation()
|
||||
setView(view)
|
||||
setSettingsTab(settingsTab)
|
||||
setSearchQuery(q)
|
||||
|
|
@ -78,6 +111,7 @@ export default function App() {
|
|||
setSelectedEntryUid(entry)
|
||||
setSelectedEntry(null)
|
||||
setSelectedUids(entry ? new Set([entry]) : new Set())
|
||||
setSelectedCollectionUid(collection)
|
||||
}
|
||||
window.addEventListener('popstate', handler)
|
||||
return () => window.removeEventListener('popstate', handler)
|
||||
|
|
@ -85,6 +119,8 @@ export default function App() {
|
|||
|
||||
const [archives, setArchives] = useState([])
|
||||
const [archiveId, setArchiveId] = useState(null)
|
||||
const [selectedCollectionUid, setSelectedCollectionUid] = useState(() => parseLocation().collection)
|
||||
const [collections, setCollections] = useState([])
|
||||
const [entries, setEntries] = useState([])
|
||||
const [deletedUids, setDeletedUids] = useState(() => new Set())
|
||||
const [selectedEntryUid, setSelectedEntryUid] = useState(() => parseLocation().entry)
|
||||
|
|
@ -140,7 +176,8 @@ export default function App() {
|
|||
|
||||
const humanizeTags = currentUser?.humanize_slugs ?? false;
|
||||
|
||||
// Fetch entry detail whenever selected entry changes
|
||||
// Fetch entry detail whenever selected entry changes.
|
||||
// The backend gates by public accessibility, so guests get detail for public entries too.
|
||||
useEffect(() => {
|
||||
const seq = ++detailSeqRef.current
|
||||
setEntryDetail(null)
|
||||
|
|
@ -156,15 +193,15 @@ export default function App() {
|
|||
sessionStorage.setItem('captureDialogOpen', captureDialogOpen)
|
||||
}, [captureDialogOpen])
|
||||
|
||||
const loadEntries = useCallback(async (aid, q, tag) => {
|
||||
const loadEntries = useCallback(async (aid, q, tag, collUid) => {
|
||||
if (!aid) return
|
||||
setSearchBusy(true)
|
||||
try {
|
||||
let results
|
||||
if (q || tag) {
|
||||
results = await searchEntries(aid, q, tag)
|
||||
results = await searchEntries(aid, q, tag, collUid)
|
||||
} else {
|
||||
results = await fetchEntries(aid)
|
||||
results = await fetchEntries(aid, collUid)
|
||||
}
|
||||
setEntries(results)
|
||||
// Prune multi-selection to only entries still visible after load.
|
||||
|
|
@ -184,51 +221,57 @@ export default function App() {
|
|||
}
|
||||
}, [])
|
||||
|
||||
// Load archives once authenticated (re-runs when authState changes so
|
||||
// it triggers correctly after first login or a session refresh).
|
||||
// Load archives once authenticated. Public-session auth also pre-sets archiveId in the auth
|
||||
// useEffect; this effect handles the normal authenticated path and page refreshes.
|
||||
useEffect(() => {
|
||||
if (authState !== 'authenticated') return
|
||||
if (archiveId) return // already set (public-session path set it synchronously)
|
||||
fetchArchives().then(list => {
|
||||
setArchives(list)
|
||||
if (list.length > 0) {
|
||||
const first = list[0].id
|
||||
setArchiveId(first)
|
||||
const { archive: archiveParam } = parseLocation()
|
||||
const preferred = archiveParam ? list.find(a => a.id === archiveParam) : null
|
||||
setArchiveId(preferred?.id ?? list[0].id)
|
||||
}
|
||||
})
|
||||
}, [authState])
|
||||
}, [authState, archiveId])
|
||||
|
||||
// Archive change: parallel load entries + runs + tags
|
||||
// Archive change: load entries + runs/tags (runs/tags skipped for public guests).
|
||||
useEffect(() => {
|
||||
if (!archiveId) return
|
||||
const isGuest = !currentUser
|
||||
if (firstArchiveLoad.current) {
|
||||
// First load: URL-initialized filters are already in state; the debounced
|
||||
// search and tagFilter effects will call loadEntries with the right values.
|
||||
firstArchiveLoad.current = false
|
||||
Promise.all([
|
||||
fetchRuns(archiveId).then(setRuns),
|
||||
fetchTags(archiveId).then(setTagNodes),
|
||||
])
|
||||
const tasks = []
|
||||
if (!isGuest) {
|
||||
tasks.push(fetchRuns(archiveId).then(setRuns))
|
||||
tasks.push(fetchTags(archiveId).then(setTagNodes))
|
||||
}
|
||||
if (tasks.length) Promise.all(tasks)
|
||||
return
|
||||
}
|
||||
setTagFilter(null)
|
||||
setSelectedEntry(null)
|
||||
setSelectedEntryUid(null)
|
||||
setSelectedUids(new Set())
|
||||
Promise.all([
|
||||
loadEntries(archiveId, '', null),
|
||||
fetchRuns(archiveId).then(setRuns),
|
||||
fetchTags(archiveId).then(setTagNodes),
|
||||
])
|
||||
}, [archiveId]) // intentionally not including loadEntries to avoid re-running on its recreation
|
||||
setSelectedCollectionUid(null)
|
||||
const tasks = [loadEntries(archiveId, '', null, null)]
|
||||
if (!isGuest) {
|
||||
tasks.push(fetchRuns(archiveId).then(setRuns))
|
||||
tasks.push(fetchTags(archiveId).then(setTagNodes))
|
||||
}
|
||||
Promise.all(tasks)
|
||||
}, [archiveId, currentUser]) // currentUser distinguishes guest vs authenticated
|
||||
|
||||
// Debounced search
|
||||
// Debounced search — scoped to active collection
|
||||
useEffect(() => {
|
||||
if (archiveId === null) return
|
||||
const timer = setTimeout(() => {
|
||||
loadEntries(archiveId, searchQuery, tagFilter)
|
||||
loadEntries(archiveId, searchQuery, tagFilter, selectedCollectionUid)
|
||||
}, 300)
|
||||
return () => clearTimeout(timer)
|
||||
}, [searchQuery, archiveId]) // tagFilter handled separately below
|
||||
}, [searchQuery, archiveId, selectedCollectionUid])
|
||||
|
||||
// Tag filter applied: switch to archive view and reload.
|
||||
// Only reset view when tagFilter is non-null; archive change alone (tagFilter=null)
|
||||
|
|
@ -236,13 +279,47 @@ export default function App() {
|
|||
useEffect(() => {
|
||||
if (archiveId === null) return
|
||||
if (tagFilter !== null) setView('archive')
|
||||
loadEntries(archiveId, searchQuery, tagFilter)
|
||||
}, [tagFilter, archiveId]) // intentional: searchQuery excluded to avoid double-fire
|
||||
loadEntries(archiveId, searchQuery, tagFilter, selectedCollectionUid)
|
||||
}, [tagFilter, archiveId, selectedCollectionUid])
|
||||
|
||||
const handleArchiveChange = useCallback((id) => {
|
||||
setArchiveId(id)
|
||||
setSelectedCollectionUid(null)
|
||||
// Update URL so refresh/share reopens the correct archive.
|
||||
const params = new URLSearchParams(window.location.search)
|
||||
params.set('archive', id)
|
||||
params.delete('collection')
|
||||
const qs = params.toString()
|
||||
history.replaceState(null, '', window.location.pathname + (qs ? '?' + qs : ''))
|
||||
}, [])
|
||||
|
||||
// Load collection list for the switcher — listCollections is now public so guests get it too.
|
||||
useEffect(() => {
|
||||
if (!archiveId) { setCollections([]); return }
|
||||
listCollections(archiveId).then(setCollections).catch(() => setCollections([]))
|
||||
}, [archiveId])
|
||||
|
||||
const handleCollectionChange = useCallback((uid) => {
|
||||
// Resolve which collection record applies: named uid or the _default_ collection.
|
||||
// If the guest would land on an auth-required collection, redirect to login.
|
||||
if (!currentUser) {
|
||||
const coll = uid
|
||||
? collections.find(c => c.collection_uid === uid)
|
||||
: collections.find(c => c.slug === '_default_')
|
||||
if (coll?.requires_auth) { setAuthState('login'); return }
|
||||
}
|
||||
setSelectedCollectionUid(uid)
|
||||
setSelectedEntry(null)
|
||||
setSelectedEntryUid(null)
|
||||
setSelectedUids(new Set())
|
||||
loadEntries(archiveId, searchQuery, tagFilter, uid)
|
||||
const params = new URLSearchParams(window.location.search)
|
||||
if (uid) { params.set('collection', uid); params.set('archive', archiveId) }
|
||||
else { params.delete('collection'); if (archiveId) params.set('archive', archiveId) }
|
||||
const qs = params.toString()
|
||||
history.replaceState(null, '', window.location.pathname + (qs ? '?' + qs : ''))
|
||||
}, [archiveId, searchQuery, tagFilter, currentUser, collections, loadEntries])
|
||||
|
||||
const handleViewChange = useCallback((name) => {
|
||||
setView(name)
|
||||
if (name === 'tags' && archiveId) {
|
||||
|
|
@ -380,8 +457,8 @@ export default function App() {
|
|||
setSelectedEntryUid(prev => prev === entryUid ? null : prev)
|
||||
setSelectedUids(prev => { const n = new Set(prev); n.delete(entryUid); return n })
|
||||
// Child delete: parent row's child_count/size are stale — reload after state updates.
|
||||
if (!isRoot) loadEntries(archiveId, searchQuery, tagFilter)
|
||||
}, [entries, archiveId, searchQuery, tagFilter, loadEntries])
|
||||
if (!isRoot) loadEntries(archiveId, searchQuery, tagFilter, selectedCollectionUid)
|
||||
}, [entries, archiveId, searchQuery, tagFilter, selectedCollectionUid, loadEntries])
|
||||
|
||||
const handleBulkDeleted = useCallback((uids) => {
|
||||
const rootUids = new Set(entries.map(e => e.entry_uid))
|
||||
|
|
@ -391,8 +468,8 @@ export default function App() {
|
|||
setSelectedUids(new Set())
|
||||
setSelectedEntry(null)
|
||||
setSelectedEntryUid(null)
|
||||
if (hasChildDelete) loadEntries(archiveId, searchQuery, tagFilter)
|
||||
}, [entries, archiveId, searchQuery, tagFilter, loadEntries])
|
||||
if (hasChildDelete) loadEntries(archiveId, searchQuery, tagFilter, selectedCollectionUid)
|
||||
}, [entries, archiveId, searchQuery, tagFilter, selectedCollectionUid, loadEntries])
|
||||
|
||||
// Auto-snap: drive selectedEntryUid from selectedUids so URL sync and detail
|
||||
// panel stay correct. size >= 2 clears single-entry state (bulk panel takes over).
|
||||
|
|
@ -424,17 +501,27 @@ export default function App() {
|
|||
}, [entries, selectedEntryUid, selectedEntry])
|
||||
|
||||
// Sync search params → URL via replaceState (no new history entry).
|
||||
// ?archive=<id> is preserved whenever it was already in the URL (sticky) so that
|
||||
// multi-archive public links (?archive=other) survive navigation to the default collection.
|
||||
useEffect(() => {
|
||||
if (PREVIEW_ROUTE) return
|
||||
const existingArchive = new URLSearchParams(window.location.search).get('archive')
|
||||
const params = new URLSearchParams()
|
||||
if (searchQuery) params.set('q', searchQuery)
|
||||
if (view === 'archive' && tagFilter) params.set('tag', tagFilter)
|
||||
if (view === 'archive' && selectedEntryUid) params.set('entry', selectedEntryUid)
|
||||
if (view === 'archive' && selectedCollectionUid) {
|
||||
params.set('collection', selectedCollectionUid)
|
||||
if (archiveId) params.set('archive', archiveId)
|
||||
} else if (existingArchive && archiveId) {
|
||||
// Preserve ?archive when already in the URL (e.g. default collection public link)
|
||||
params.set('archive', archiveId)
|
||||
}
|
||||
const qs = params.toString()
|
||||
const url = window.location.pathname + (qs ? '?' + qs : '')
|
||||
const current = window.location.pathname + window.location.search
|
||||
if (current !== url) history.replaceState(null, '', url)
|
||||
}, [searchQuery, tagFilter, selectedEntryUid, view])
|
||||
}, [searchQuery, tagFilter, selectedEntryUid, selectedCollectionUid, archiveId, view])
|
||||
|
||||
// ⌘K / Ctrl+K / /: focus the search input, switching to archive view first if needed.
|
||||
useEffect(() => {
|
||||
|
|
@ -533,10 +620,10 @@ export default function App() {
|
|||
const handleCaptured = useCallback(() => {
|
||||
if (!archiveId) return
|
||||
return Promise.allSettled([
|
||||
loadEntries(archiveId, searchQuery, tagFilter),
|
||||
loadEntries(archiveId, searchQuery, tagFilter, selectedCollectionUid),
|
||||
fetchRuns(archiveId).then(setRuns),
|
||||
])
|
||||
}, [archiveId, searchQuery, tagFilter, loadEntries])
|
||||
}, [archiveId, searchQuery, tagFilter, selectedCollectionUid, loadEntries])
|
||||
|
||||
const handleToast = useCallback((text, locator, type = 'error', headline = null) => {
|
||||
// Only suppress per-item ublock/cookie warnings (those carry a locator).
|
||||
|
|
@ -604,10 +691,10 @@ export default function App() {
|
|||
return () => document.body.classList.remove('has-audio-bar')
|
||||
}, [currentAudio])
|
||||
|
||||
if (PREVIEW_ROUTE) return <PreviewPage archiveId={PREVIEW_ROUTE.archiveId} entryUid={PREVIEW_ROUTE.entryUid} />;
|
||||
if (authState === 'loading') return <div className="auth-loading">Loading\u2026</div>;
|
||||
if (authState === 'setup') return <SetupPage onComplete={() => setAuthState('login')} />;
|
||||
if (authState === 'login') return <LoginPage onLogin={user => { setCurrentUser(user); setAuthState('authenticated'); }} />;
|
||||
if (PREVIEW_ROUTE) return <PreviewPage archiveId={PREVIEW_ROUTE.archiveId} entryUid={PREVIEW_ROUTE.entryUid} />;
|
||||
|
||||
return (
|
||||
<AuthContext.Provider value={{ currentUser, setCurrentUser }}>
|
||||
|
|
@ -619,6 +706,11 @@ export default function App() {
|
|||
view={view}
|
||||
onViewChange={handleViewChange}
|
||||
onCaptureClick={handleCaptureClick}
|
||||
collections={collections}
|
||||
selectedCollectionUid={selectedCollectionUid}
|
||||
onCollectionChange={handleCollectionChange}
|
||||
isPublicSession={!currentUser}
|
||||
onSignInClick={() => setAuthState('login')}
|
||||
/>
|
||||
<main className="app-shell">
|
||||
<div className="workspace">
|
||||
|
|
@ -660,6 +752,7 @@ export default function App() {
|
|||
archiveId={archiveId}
|
||||
pendingCaptures={pendingCaptures}
|
||||
deletedUids={deletedUids}
|
||||
isPublicSession={!currentUser}
|
||||
/>
|
||||
)}
|
||||
{view === 'runs' && <RunsView runs={runs} />}
|
||||
|
|
@ -700,6 +793,7 @@ export default function App() {
|
|||
onDetailRefresh={handleDetailRefresh}
|
||||
onOpenPreview={handleOpenPreview}
|
||||
onPlay={handlePlay}
|
||||
isPublicSession={!currentUser}
|
||||
/>
|
||||
</main>
|
||||
{previewEntryUid && selectedEntry && selectedEntry.entry_uid === previewEntryUid && (
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue