Scott.Idem/OSIT-AE-App-Svelte
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(journals): eliminate infinite search loop with criteria-based guard

Browse Source 
- Implemented a 'Search Guard' pattern in '+page.svelte' that snapshots search criteria and bails out of redundant executions.
- Stabilized reactivity by removing immediate list clearing in Remote First mode, ensuring a consistent data stream.
- Isolated all search-driven state updates with 'untrack' to prevent circular dependency triggers.
- Hardened the 'lq__journal_entry_obj_li' observable to ensure stable result emission.
This commit is contained in:
Scott Idem
2026-01-27 16:50:18 -05:00
parent 4f8c482cf3
commit 23ecb21fe1
1 changed files with 49 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
src/routes/journals/[journal_id]/+page.svelte
View File

@@ -50,6 +50,7 @@
let search_id_li: Array<string> = $state([]); let search_id_li: Array<string> = $state([]);
let search_debounce_timer: any = null; let search_debounce_timer: any = null;
let last_search_id = 0; let last_search_id = 0;
let last_executed_key = ''; // Search Guard Key
function handle_import_complete() { function handle_import_complete() {
// Trigger a refresh of the journal entry list // Trigger a refresh of the journal entry list
@@ -62,27 +63,20 @@
let lq__journal_obj = $derived( let lq__journal_obj = $derived(
liveQuery(async () => { liveQuery(async () => {
let results = await db_journals.journal.get($journals_slct?.journal_id ?? ''); return await db_journals.journal.get($journals_slct?.journal_id ?? '');
if ($journals_slct.journal_obj && results) {
if (JSON.stringify($journals_slct.journal_obj) !== JSON.stringify(results)) {
$journals_slct.journal_obj = { ...results };
}
}
return results;
}) })
); );
// Stable LiveQuery Pattern (Aether UI V3) // Stable LiveQuery Pattern (Aether UI V3)
// Shared across ID view and List Wrapper // Re-wrapped in $derived to ensure the observable instance remains stable
let lq__journal_entry_obj_li = $derived.by(() => { // unless the underlying dependencies (ids, search context) change.
// 1. Capture dependencies for Svelte tracking let lq__journal_entry_obj_li = $derived(
const ids = search_id_li; liveQuery(async () => {
const journal_id = $lq__journal_obj?.journal_id; const ids = search_id_li;
const search_text = $journals_loc.entry.qry__search_text; const journal_id = $lq__journal_obj?.journal_id;
const cat_code = $journals_loc.entry.qry__category_code; const search_text = $journals_loc.entry.qry__search_text;
const cat_code = $journals_loc.entry.qry__category_code;
// 2. Return the observable
return liveQuery(async () => {
// SCENARIO 1: Specific IDs provided (Search Results) // SCENARIO 1: Specific IDs provided (Search Results)
if (Array.isArray(ids) && ids.length > 0) { if (Array.isArray(ids) && ids.length > 0) {
if (log_lvl) console.log(`Journal Page LQ: bulkGet ${ids.length} IDs`); if (log_lvl) console.log(`Journal Page LQ: bulkGet ${ids.length} IDs`);
@@ -91,7 +85,6 @@
} }
// SCENARIO 2: Fallback to broad search (Default view) // SCENARIO 2: Fallback to broad search (Default view)
// Only if search is empty and we have a journal context
if (journal_id && !search_text && !cat_code) { if (journal_id && !search_text && !cat_code) {
if (log_lvl) console.log(`Journal Page LQ: Fallback search for journal: ${journal_id}`); if (log_lvl) console.log(`Journal Page LQ: Fallback search for journal: ${journal_id}`);
return await db_journals.journal_entry return await db_journals.journal_entry
@@ -102,8 +95,8 @@
} }
return []; return [];
}); })
}); );
// Standardized Reactive Search Pattern (Aether UI V3) // Standardized Reactive Search Pattern (Aether UI V3)
// 1. Isolate dependencies into a stable derived object // 1. Isolate dependencies into a stable derived object
@@ -121,7 +114,7 @@
// 2. Controlled effect for triggering searches // 2. Controlled effect for triggering searches
$effect(() => { $effect(() => {
// Track specifically the isolated search params // Establishes reactive dependency on search_params
const params = search_params; const params = search_params;
if (search_debounce_timer) clearTimeout(search_debounce_timer); if (search_debounce_timer) clearTimeout(search_debounce_timer);
@@ -138,30 +131,35 @@
}); });
async function handle_search_refresh(params: any) { async function handle_search_refresh(params: any) {
// 1. Guard: Check if criteria actually changed
const qry_key = JSON.stringify(params);
if (qry_key === last_executed_key) return;
last_executed_key = qry_key;
const current_search_id = ++last_search_id; const current_search_id = ++last_search_id;
const journal_id = params.journal_id; const journal_id = params.journal_id;
const remote_first = params.remote_first; const remote_first = params.remote_first;
if (log_lvl) console.log(`[Journal Search #${current_search_id}] Refreshing entries (remote=${remote_first}, journal=${journal_id})...`); if (log_lvl) console.log(`[Journal Search #${current_search_id}] Refreshing entries (remote=${remote_first}, journal=${journal_id})...`);
$journals_sess.entry.qry__status = 'loading'; // 2. Setup State
untrack(() => {
if (remote_first) { $journals_sess.entry.qry__status = 'loading';
search_id_li = []; });
}
const qry_str = params.str; const qry_str = params.str;
const cat_code = params.cat; const cat_code = params.cat;
let local_ids: string[] = []; let local_ids: string[] = [];
// 1. FAST PATH: Local IDB Search // 3. FAST PATH: Local IDB Search (SWR)
// We skip this ONLY if remote_first is checked AND we have search text
if (!remote_first) { if (!remote_first) {
try { try {
if (journal_id) { if (journal_id) {
let query = db_journals.journal_entry.where('journal_id').equals(journal_id); let local_results = await db_journals.journal_entry
.where('journal_id')
let local_results = await query .equals(journal_id)
.filter(entry => { .filter(entry => {
if (cat_code && entry.category_code !== cat_code) return false; if (cat_code && entry.category_code !== cat_code) return false;
if (qry_str) { if (qry_str) {
@@ -183,8 +181,10 @@
if (current_search_id === last_search_id) { if (current_search_id === last_search_id) {
if (log_lvl) console.log(`[Journal Search #${current_search_id}] Fast Path found ${local_ids.length} items locally.`); if (log_lvl) console.log(`[Journal Search #${current_search_id}] Fast Path found ${local_ids.length} items locally.`);
search_id_li = local_ids; untrack(() => {
if (local_ids.length > 0) $journals_sess.entry.qry__status = 'done'; search_id_li = local_ids;
if (local_ids.length > 0) $journals_sess.entry.qry__status = 'done';
});
} }
} }
} catch (e) { } catch (e) {
@@ -192,7 +192,7 @@
} }
} }
// 2. REVALIDATE: API Request // 4. REVALIDATE: API Request
try { try {
const results = await journals_func.qry__journal_entry({ const results = await journals_func.qry__journal_entry({
api_cfg: $ae_api, api_cfg: $ae_api,
@@ -210,23 +210,30 @@
const api_results = results || []; const api_results = results || [];
const api_ids = api_results.map((e: any) => e.id || e.journal_entry_id_random).filter(Boolean); const api_ids = api_results.map((e: any) => e.id || e.journal_entry_id_random).filter(Boolean);
// Protect UI cache if API returns empty during revalidation
if (api_ids.length === 0 && local_ids.length > 0 && !remote_first && !qry_str) { if (api_ids.length === 0 && local_ids.length > 0 && !remote_first && !qry_str) {
$journals_sess.entry.qry__status = 'done'; untrack(() => {
$journals_sess.entry.qry__status = 'done';
});
return; return;
} }
$journals_sess.entry_li = api_results; untrack(() => {
search_id_li = api_ids; $journals_sess.entry_li = api_results;
$journals_sess.entry.qry__status = 'done'; search_id_li = api_ids;
$journals_sess.entry.qry__status = 'done';
});
if (log_lvl) console.log(`[Journal Search #${current_search_id}] Revalidation Complete. Found ${api_ids.length} items.`); if (log_lvl) console.log(`[Journal Search #${current_search_id}] Revalidation Complete. Found ${api_ids.length} items.`);
} }
} catch (error) { } catch (error) {
if (current_search_id === last_search_id) { if (current_search_id === last_search_id) {
console.error('Journal revalidation failed:', error); console.error('Journal revalidation failed:', error);
$journals_sess.entry.qry__status = 'error'; untrack(() => {
if (search_id_li.length === 0 && local_ids.length > 0) { $journals_sess.entry.qry__status = 'error';
search_id_li = local_ids; if (search_id_li.length === 0 && local_ids.length > 0) {
} search_id_li = local_ids;
}
});
} }
} }
} }
@@ -245,8 +252,8 @@
</svelte:head> </svelte:head>
{#if $lq__journal_obj === undefined} {#if $lq__journal_obj === undefined}
<div class="flex flex-col items-center justify-center p-20 opacity-50"> <div class="flex flex-col items-center justify-center p-20 opacity-50 text-center">
<LoaderCircle size="3em" class="animate-spin mb-4" /> <LoaderCircle size="3em" class="animate-spin mb-4 mx-auto" />
<p class="text-xl">Loading Journal...</p> <p class="text-xl">Loading Journal...</p>
</div> </div>
{:else if $ae_loc.person_id == $lq__journal_obj?.person_id} {:else if $ae_loc.person_id == $lq__journal_obj?.person_id}