From c0fe69ea737102a34cfaddb62cad92cdde235b5c Mon Sep 17 00:00:00 2001 From: Scott Idem Date: Mon, 2 Dec 2024 09:41:43 -0500 Subject: [PATCH] Bug fix for the archive_id not getting reset when viewing the list of archives. --- src/routes/idaa/(idaa)/archives/+page.svelte | 47 +++++++++++-------- .../(idaa)/archives/[archive_id]/+page.svelte | 3 +- 2 files changed, 30 insertions(+), 20 deletions(-) diff --git a/src/routes/idaa/(idaa)/archives/+page.svelte b/src/routes/idaa/(idaa)/archives/+page.svelte index 7e33aabf..d534c2b7 100644 --- a/src/routes/idaa/(idaa)/archives/+page.svelte +++ b/src/routes/idaa/(idaa)/archives/+page.svelte @@ -37,32 +37,41 @@ $: lq__archive_obj_li = liveQuery(async () => { return results; }); -$: lq__archive_obj = liveQuery(async () => { - let results = await db_archives.archive - .get($idaa_slct.archive_id); +// $: lq__archive_obj = liveQuery(async () => { +// let results = await db_archives.archive +// .get($idaa_slct.archive_id); - return results; -}); +// return results; +// }); -$: lq__archive_content_obj_li = liveQuery(async () => { - let results = await db_archives.content - .where('archive_id') - .equals($idaa_slct.archive_id) - .reverse() - .sortBy('updated_on'); - // .sortBy('title'); +// $: lq__archive_content_obj_li = liveQuery(async () => { +// let results = await db_archives.content +// .where('archive_id') +// .equals($idaa_slct.archive_id) +// .reverse() +// .sortBy('updated_on'); +// // .sortBy('title'); - return results; -}); +// return results; +// }); -$: lq__archive_content_obj = liveQuery(async () => { - let results = await db_archives.content - .get($idaa_slct.archive_content_id); +// $: lq__archive_content_obj = liveQuery(async () => { +// let results = await db_archives.content +// .get($idaa_slct.archive_content_id); - return results; -}); +// return results; +// }); +if (browser) { + console.log('Browser environment detected.'); + + // The archive_id should not already be set while the page is loading if we are looking at this page? + // let message = {'archive_id': $idaa_slct?.archive_id ?? null}; + $idaa_slct.archive_id = null; + let message = {'archive_id': $idaa_slct.archive_id}; + window.parent.postMessage(message, "*"); +} diff --git a/src/routes/idaa/(idaa)/archives/[archive_id]/+page.svelte b/src/routes/idaa/(idaa)/archives/[archive_id]/+page.svelte index 0a0ef3e7..fe399ea8 100644 --- a/src/routes/idaa/(idaa)/archives/[archive_id]/+page.svelte +++ b/src/routes/idaa/(idaa)/archives/[archive_id]/+page.svelte @@ -136,9 +136,10 @@ $: if ($idaa_trig.archive_content_li) { if (browser) { console.log('Browser environment detected.'); - let message = {'archive_id': $idaa_slct?.archive_id}; + let message = {'archive_id': $idaa_slct?.archive_id ?? null}; window.parent.postMessage(message, "*"); } +