From dc7da8c930471b9880428e07032dc6c1587532c7 Mon Sep 17 00:00:00 2001 From: Scott Idem Date: Fri, 9 May 2025 14:13:59 -0400 Subject: [PATCH] More general code clean up. Improvement to IDB save for Event. --- src/lib/ae_events/ae_events__event.ts | 15 +++++++++++---- src/routes/+layout.svelte | 10 +++++++--- .../idaa/(idaa)/recovery_meetings/+layout.ts | 6 ++++-- .../idaa/(idaa)/recovery_meetings/+page.svelte | 2 +- src/routes/journals/+layout.svelte | 17 ++++++++++------- src/routes/journals/+page.ts | 2 +- 6 files changed, 34 insertions(+), 18 deletions(-) diff --git a/src/lib/ae_events/ae_events__event.ts b/src/lib/ae_events/ae_events__event.ts index 47006cbe..02b8a9d1 100644 --- a/src/lib/ae_events/ae_events__event.ts +++ b/src/lib/ae_events/ae_events__event.ts @@ -160,7 +160,9 @@ export async function load_ae_obj_li__event( params_json['and_qry'] = {}; } - console.log('qry_conference is false!'); + if (log_lvl) { + console.log('qry_conference is false!'); + } params_json['and_qry']['conference'] = qry_conference; } @@ -504,7 +506,8 @@ export async function update_ae_obj__event( // This function will loop through the event_obj_li and save each one to the DB. -export function db_save_ae_obj_li__event( +// Updated 2025-05-09 +export async function db_save_ae_obj_li__event( { obj_type, obj_li, @@ -520,7 +523,9 @@ export function db_save_ae_obj_li__event( } if (obj_li && obj_li.length) { - obj_li.forEach(async function (obj: any) { + // let obj_li_id: string[] = []; + for (const obj of obj_li) { + // obj_li.forEach(async function (obj: any) { if (log_lvl) { console.log(`ae_obj ${obj_type}:`, obj); } @@ -610,6 +615,8 @@ export function db_save_ae_obj_li__event( event_file_id_li_json: obj.event_file_id_li_json, }); // console.log(`Put obj with ID: ${obj.event_id_random} or ${id_random}`); + + // obj_li_id.push(obj_record.id); } catch (error) { let status = `Failed to put ${obj.event_id_random}: ${error}`; console.log(status); @@ -617,7 +624,7 @@ export function db_save_ae_obj_li__event( // const id_random = await db_events.events.put(obj); // console.log(`Put obj with ID: ${obj.event_id_random}`); - }); + } return true; } diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index 832783b4..9e45e50b 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -153,8 +153,10 @@ if (!$ae_loc?.site_cfg_json) { // BEGIN: New Version Check: if ($ae_loc && $ae_sess && ($ae_loc.ver != $ae_sess.ver)) { - console.log('ROOT: New version of the ae_loc (core local storage) available!!!'); - console.log(`$ae_loc.ver: ${$ae_loc.ver} != $ae_sess.ver: ${$ae_sess.ver}`); + if (log_lvl) { + console.log('ROOT: New version of the ae_loc (core local storage) available!!!'); + console.log(`$ae_loc.ver: ${$ae_loc.ver} != $ae_sess.ver: ${$ae_sess.ver}`); + } flag_clear_idb = true; flag_clear_local = true; @@ -496,7 +498,9 @@ if (browser) { // save_ds_to_local(ae_acct.ds); let ae_ds = ae_acct.ds; - console.log(`ae_ds__ data:`, ae_ds) + if (log_lvl) { + console.log(`ae_ds__ data:`, ae_ds); + } for (let [key, value] of Object.entries(ae_ds)) { console.log(`ae_ds__ key: ${key}, value:`, value); localStorage.setItem(`ae_ds__${key}`, JSON.stringify(value)); diff --git a/src/routes/idaa/(idaa)/recovery_meetings/+layout.ts b/src/routes/idaa/(idaa)/recovery_meetings/+layout.ts index c33bc8f1..5312b744 100644 --- a/src/routes/idaa/(idaa)/recovery_meetings/+layout.ts +++ b/src/routes/idaa/(idaa)/recovery_meetings/+layout.ts @@ -1,5 +1,5 @@ /** @type {import('./$types').LayoutLoad} */ -console.log(`IDAA Recovery Meetings - [account_id] +layout.ts start`); +// console.log(`IDAA Recovery Meetings - [account_id] +layout.ts start`); import { error } from '@sveltejs/kit'; import { browser } from '$app/environment'; @@ -35,7 +35,9 @@ export async function load({ params, parent }) { // route try_cache: true, log_lvl: log_lvl }); - console.log(`load_event_obj_li = `, load_event_obj_li); + if (log_lvl) { + console.log(`load_event_obj_li = `, load_event_obj_li); + } ae_acct.slct.event_obj_li = load_event_obj_li; } diff --git a/src/routes/idaa/(idaa)/recovery_meetings/+page.svelte b/src/routes/idaa/(idaa)/recovery_meetings/+page.svelte index 2499803e..e3aeb2e2 100644 --- a/src/routes/idaa/(idaa)/recovery_meetings/+page.svelte +++ b/src/routes/idaa/(idaa)/recovery_meetings/+page.svelte @@ -170,7 +170,7 @@ $: if ($idaa_trig.event_li_qry) { search_delay += 50+random_delay; } - log_lvl = 1; + log_lvl = 0; let count = 0; let request_loop = setInterval(() => { diff --git a/src/routes/journals/+layout.svelte b/src/routes/journals/+layout.svelte index a38c1c18..e3120824 100644 --- a/src/routes/journals/+layout.svelte +++ b/src/routes/journals/+layout.svelte @@ -1,8 +1,9 @@ diff --git a/src/routes/journals/+page.ts b/src/routes/journals/+page.ts index 24f83800..b27c7893 100644 --- a/src/routes/journals/+page.ts +++ b/src/routes/journals/+page.ts @@ -53,7 +53,7 @@ export async function load({ fetch, parent }) { limit: 25, // params: ae_params, try_cache: true, - log_lvl: 2 + log_lvl: log_lvl }); ae_acct.slct.journal_obj_li = load_journal_obj_li;