From b54f43be3515f980604a21c95b94254a2a651cae Mon Sep 17 00:00:00 2001 From: Scott Idem Date: Mon, 21 Jul 2025 16:40:37 -0400 Subject: [PATCH] Lots of code clean up. Finally working on the Launcher piece again. --- ...ae_comp__hosted_files_clip_video_v1.svelte | 15 -- src/lib/ae_events/ae_events__event.ts | 10 +- src/lib/ae_events/ae_events__event_device.ts | 16 +- src/lib/ae_events/ae_events__event_file.ts | 20 ++- .../ae_events/ae_events__event_location.ts | 25 ++-- .../ae_events__event_presentation.ts | 6 +- .../ae_events/ae_events__event_presenter.ts | 6 +- src/lib/ae_events/ae_events__event_session.ts | 6 +- src/lib/element_manage_event_file_li.svelte | 24 +-- .../events/[event_id]/(launcher)/+layout.ts | 96 ------------ .../(launcher)/{ => launcher}/+layout.svelte | 141 ++++++++++++------ .../[event_id]/(launcher)/launcher/+layout.ts | 120 +++++++++++++++ .../launcher/[event_location_id]/+page.svelte | 1 - .../launcher/[event_location_id]/+page.ts | 118 ++++----------- .../(launcher)/launcher_menu.svelte | 63 +++++--- .../(launcher)/menu_session_list.svelte | 5 +- src/routes/events/[event_id]/+layout.ts | 18 ++- .../location/[event_location_id]/+page.ts | 40 +++-- .../presenter/[presenter_id]/+page.ts | 10 +- .../[event_id]/session/[session_id]/+page.ts | 10 +- .../events/ae_comp__event_files_upload.svelte | 8 +- src/routes/idaa/(idaa)/bb/+layout.svelte | 2 +- .../journals/[journal_id]/+layout.svelte | 2 +- src/routes/journals/[journal_id]/+layout.ts | 2 +- src/routes/journals/[journal_id]/+page.svelte | 2 +- 25 files changed, 411 insertions(+), 355 deletions(-) delete mode 100644 src/routes/events/[event_id]/(launcher)/+layout.ts rename src/routes/events/[event_id]/(launcher)/{ => launcher}/+layout.svelte (89%) create mode 100644 src/routes/events/[event_id]/(launcher)/launcher/+layout.ts diff --git a/src/lib/ae_core/ae_comp__hosted_files_clip_video_v1.svelte b/src/lib/ae_core/ae_comp__hosted_files_clip_video_v1.svelte index 169896b0..ec211b1e 100644 --- a/src/lib/ae_core/ae_comp__hosted_files_clip_video_v1.svelte +++ b/src/lib/ae_core/ae_comp__hosted_files_clip_video_v1.svelte @@ -127,21 +127,6 @@ async function handle_submit_form_files(event) { } else if (log_lvl > 1) { console.log('hosted_file_results:', hosted_file_results); } - - // db_events.files.clear(); - - // let params = { - // qry__enabled: 'all', - // qry__hidden: 'all', - // } - - // events_func.load_ae_obj_li__event_file({ - // api_cfg: $ae_api, - // for_obj_type: link_to_type, - // for_obj_id: link_to_id, - // params: params, - // try_cache: true - // }); } $ae_sess.files.disable_submit__hosted_file_obj = false; diff --git a/src/lib/ae_events/ae_events__event.ts b/src/lib/ae_events/ae_events__event.ts index 99e163f1..5f949568 100644 --- a/src/lib/ae_events/ae_events__event.ts +++ b/src/lib/ae_events/ae_events__event.ts @@ -133,8 +133,8 @@ export async function load_ae_obj_id__event( api_cfg: api_cfg, for_obj_type: 'event', for_obj_id: event_id, - params: {qry__enabled: 'enabled', qry__limit: 19}, - try_cache: try_cache, + enabled: 'enabled', + limit: 19, log_lvl: log_lvl }).then((event_location_obj_li) => { if (log_lvl) { @@ -158,7 +158,8 @@ export async function load_ae_obj_id__event( api_cfg: api_cfg, for_obj_type: 'event', for_obj_id: event_id, - params: {qry__enabled: 'enabled', qry__limit: 249}, + enabled: 'enabled', + limit: 249, try_cache: try_cache, log_lvl: log_lvl }).then((event_session_obj_li) => { @@ -367,7 +368,8 @@ export async function load_ae_obj_li__event( api_cfg: api_cfg, for_obj_type: 'event', for_obj_id: event_id, - params: {qry__enabled: 'enabled', qry__limit: 19}, + enabled: 'enabled', + limit: 19, try_cache: try_cache, log_lvl: log_lvl }) diff --git a/src/lib/ae_events/ae_events__event_device.ts b/src/lib/ae_events/ae_events__event_device.ts index b42d3338..9f203cce 100644 --- a/src/lib/ae_events/ae_events__event_device.ts +++ b/src/lib/ae_events/ae_events__event_device.ts @@ -111,6 +111,10 @@ export async function load_ae_obj_li__event_device( for_obj_type, for_obj_id, inc_location_id = false, + enabled = 'enabled', + hidden = 'not_hidden', + limit = 49, + offset = 0, order_by_li = {'priority': 'DESC', 'sort': 'DESC', 'name': 'ASC', 'code': 'ASC', 'updated_on': 'DESC', 'created_on': 'DESC'}, params = {}, try_cache = true, @@ -120,6 +124,10 @@ export async function load_ae_obj_li__event_device( for_obj_type: string, for_obj_id: string, inc_location_id?: boolean, + enabled?: string, // all, disabled, enabled + hidden?: string, // all, hidden, not_hidden + limit?: number, // 99 + offset?: number, // 0 order_by_li?: key_val, params?: key_val, try_cache?: boolean, @@ -130,10 +138,10 @@ export async function load_ae_obj_li__event_device( console.log(`*** load_ae_obj_li__event_device() *** for_obj_type=${for_obj_type} for_obj_id=${for_obj_id}`); } - let enabled: string = (params.qry__enabled ?? 'enabled'); // all, disabled, enabled - let hidden: string = (params.qry__hidden ?? 'all'); // all, hidden, not_hidden - let limit: number = (params.qry__limit ?? 99); // 99 - let offset: number = (params.qry__offset ?? 0); // 0 + // let enabled: string = (params.qry__enabled ?? 'enabled'); // all, disabled, enabled + // let hidden: string = (params.qry__hidden ?? 'all'); // all, hidden, not_hidden + // let limit: number = (params.qry__limit ?? 99); // 99 + // let offset: number = (params.qry__offset ?? 0); // 0 let params_json: key_val = {}; diff --git a/src/lib/ae_events/ae_events__event_file.ts b/src/lib/ae_events/ae_events__event_file.ts index 781987a9..fa53a2c5 100644 --- a/src/lib/ae_events/ae_events__event_file.ts +++ b/src/lib/ae_events/ae_events__event_file.ts @@ -60,6 +60,11 @@ export async function load_ae_obj_li__event_file( api_cfg, for_obj_type, for_obj_id, + enabled = 'enabled', + hidden = 'not_hidden', + limit = 99, + offset = 0, + order_by_li = {'priority': 'DESC', 'sort': 'DESC', 'updated_on': 'DESC', 'created_on': 'DESC'}, params = {}, try_cache = true, log_lvl = 0 @@ -67,6 +72,11 @@ export async function load_ae_obj_li__event_file( api_cfg: any, for_obj_type: string, for_obj_id: string, + enabled?: string, // all, disabled, enabled + hidden?: string, // all, hidden, not_hidden + limit?: number, // 99 + offset?: number, // 0 + order_by_li?: key_val, params?: key_val, try_cache?: boolean, log_lvl?: number @@ -81,10 +91,10 @@ export async function load_ae_obj_li__event_file( return []; } - let enabled: string = (params.qry__enabled ?? 'enabled'); // all, disabled, enabled - let hidden: string = (params.qry__hidden ?? 'all'); // all, hidden, not_hidden - let limit: number = (params.qry__limit ?? 99); // 99 - let offset: number = (params.qry__offset ?? 0); // 0 + // let enabled: string = (params.qry__enabled ?? 'enabled'); // all, disabled, enabled + // let hidden: string = (params.qry__hidden ?? 'all'); // all, hidden, not_hidden + // let limit: number = (params.qry__limit ?? 99); // 99 + // let offset: number = (params.qry__offset ?? 0); // 0 let params_json: key_val = {}; @@ -99,7 +109,7 @@ export async function load_ae_obj_li__event_file( use_alt_base: false, // NOTE: This will use the base_name_alt value instead of the base_name value enabled: enabled, hidden: hidden, - order_by_li: {'priority': 'DESC', 'sort': 'DESC', 'updated_on': 'DESC', 'created_on': 'DESC'}, + order_by_li: order_by_li, limit: limit, offset: offset, params_json: params_json, diff --git a/src/lib/ae_events/ae_events__event_location.ts b/src/lib/ae_events/ae_events__event_location.ts index e7aeaca3..e9237a1e 100644 --- a/src/lib/ae_events/ae_events__event_location.ts +++ b/src/lib/ae_events/ae_events__event_location.ts @@ -100,7 +100,8 @@ export async function load_ae_obj_id__event_location( api_cfg: api_cfg, for_obj_type: 'event_location', for_obj_id: event_location_id, - params: {qry__enabled: 'all', qry__limit: 15}, + enabled: 'all', + limit: 15, try_cache: try_cache, log_lvl: log_lvl }) @@ -126,7 +127,8 @@ export async function load_ae_obj_id__event_location( api_cfg: api_cfg, for_obj_type: 'event_location', for_obj_id: event_location_id, - params: {qry__enabled: 'all', qry__limit: 15}, + enabled: 'all', + limit: 15, try_cache: try_cache, log_lvl: log_lvl }); @@ -150,6 +152,10 @@ export async function load_ae_obj_li__event_location( inc_device_li = false, inc_file_li = false, inc_session_li = false, + enabled = 'enabled', + hidden = 'not_hidden', + limit = 29, + offset = 0, order_by_li = {'priority': 'DESC', 'sort': 'DESC', 'name': 'ASC', 'code': 'ASC', 'updated_on': 'DESC', 'created_on': 'DESC'}, params = {}, try_cache = true, @@ -161,6 +167,10 @@ export async function load_ae_obj_li__event_location( inc_device_li?: boolean, inc_file_li?: boolean, inc_session_li?: boolean, + enabled?: string, // all, disabled, enabled + hidden?: string, // all, hidden, not_hidden + limit?: number, // 99 + offset?: number, // 0 order_by_li?: key_val, params?: key_val, try_cache?: boolean, @@ -171,11 +181,6 @@ export async function load_ae_obj_li__event_location( console.log(`*** load_ae_obj_li__event_location() *** for_obj_type=${for_obj_type} for_obj_id=${for_obj_id}`); } - let enabled: string = (params.qry__enabled ?? 'enabled'); // all, disabled, enabled - let hidden: string = (params.qry__hidden ?? 'all'); // all, hidden, not_hidden - let limit: number = (params.qry__limit ?? 99); // 99 - let offset: number = (params.qry__offset ?? 0); // 0 - let params_json: key_val = {}; // console.log('params_json:', params_json); @@ -284,7 +289,8 @@ export async function load_ae_obj_li__event_location( api_cfg: api_cfg, for_obj_type: 'event_location', for_obj_id: event_location_id, - params: {qry__enabled: enabled, qry__limit: limit}, + enabled: enabled, + limit: limit, try_cache: try_cache, log_lvl: log_lvl }) @@ -314,7 +320,8 @@ export async function load_ae_obj_li__event_location( api_cfg: api_cfg, for_obj_type: 'event_location', for_obj_id: event_location_id, - params: {qry__enabled: enabled, qry__limit: limit}, + enabled: enabled, + limit: limit, try_cache: try_cache, log_lvl: log_lvl }) diff --git a/src/lib/ae_events/ae_events__event_presentation.ts b/src/lib/ae_events/ae_events__event_presentation.ts index 4198e0e0..df4d3023 100644 --- a/src/lib/ae_events/ae_events__event_presentation.ts +++ b/src/lib/ae_events/ae_events__event_presentation.ts @@ -112,7 +112,8 @@ export async function load_ae_obj_id__event_presentation( api_cfg: api_cfg, for_obj_type: 'event_presentation', for_obj_id: event_presentation_id, - params: {qry__enabled: 'all', qry__limit: 25}, + enabled: 'all', + limit: 25, try_cache: try_cache, log_lvl: log_lvl }) @@ -283,7 +284,8 @@ export async function load_ae_obj_li__event_presentation( api_cfg: api_cfg, for_obj_type: 'event_presentation', for_obj_id: event_presentation_id, - params: {qry__enabled: enabled, qry__limit: limit}, + enabled: enabled, + limit: limit, try_cache: try_cache, log_lvl: log_lvl }) diff --git a/src/lib/ae_events/ae_events__event_presenter.ts b/src/lib/ae_events/ae_events__event_presenter.ts index 6b8bd06b..2d4d02b1 100644 --- a/src/lib/ae_events/ae_events__event_presenter.ts +++ b/src/lib/ae_events/ae_events__event_presenter.ts @@ -99,7 +99,8 @@ export async function load_ae_obj_id__event_presenter( api_cfg: api_cfg, for_obj_type: 'event_presenter', for_obj_id: event_presenter_id, - params: {qry__enabled: enabled, qry__limit: limit}, + enabled: enabled, + limit: limit, try_cache: try_cache, log_lvl: log_lvl }) @@ -237,7 +238,8 @@ export async function load_ae_obj_li__event_presenter( api_cfg: api_cfg, for_obj_type: 'event_presenter', for_obj_id: event_presenter_id, - params: {qry__enabled: enabled, qry__limit: limit}, + enabled: enabled, + limit: limit, try_cache: try_cache, log_lvl: log_lvl }) diff --git a/src/lib/ae_events/ae_events__event_session.ts b/src/lib/ae_events/ae_events__event_session.ts index 5a284292..7317c5cd 100644 --- a/src/lib/ae_events/ae_events__event_session.ts +++ b/src/lib/ae_events/ae_events__event_session.ts @@ -114,7 +114,8 @@ export async function load_ae_obj_id__event_session( api_cfg: api_cfg, for_obj_type: 'event_session', for_obj_id: event_session_id, - params: {qry__enabled: 'all', qry__limit: 15}, + enabled: enabled, + limit: 15, try_cache: try_cache, log_lvl: log_lvl }) @@ -288,7 +289,8 @@ export async function load_ae_obj_li__event_session( api_cfg: api_cfg, for_obj_type: 'event_session', for_obj_id: event_session_id, - params: {qry__enabled: enabled, qry__limit: limit}, + enabled: enabled, + limit: limit, try_cache: try_cache, log_lvl: log_lvl }) diff --git a/src/lib/element_manage_event_file_li.svelte b/src/lib/element_manage_event_file_li.svelte index 89f484a2..3e117d30 100644 --- a/src/lib/element_manage_event_file_li.svelte +++ b/src/lib/element_manage_event_file_li.svelte @@ -67,16 +67,18 @@ let clipboard_success = $state(false); db_events.files.clear(); - let params = { - qry__enabled: 'all', - qry__hidden: 'all', - } + // let params = { + // qry__enabled: 'all', + // qry__hidden: 'all', + // } events_func.load_ae_obj_li__event_file({ api_cfg: $ae_api, for_obj_type: link_to_type, for_obj_id: link_to_id, - params: params, + enabled: 'all', + hidden: 'all', + // params: params, try_cache: true }); @@ -429,16 +431,18 @@ let clipboard_success = $state(false); .then (function (update_results) { console.log(`Update results:`, update_results); - let params = { - qry__enabled: 'all', - qry__hidden: 'all', - } + // let params = { + // qry__enabled: 'all', + // qry__hidden: 'all', + // } events_func.load_ae_obj_li__event_file({ api_cfg: $ae_api, for_obj_type: link_to_type, for_obj_id: link_to_id, - params: params, + enabled: 'all', + hidden: 'all', + // params: params, try_cache: true }); }); diff --git a/src/routes/events/[event_id]/(launcher)/+layout.ts b/src/routes/events/[event_id]/(launcher)/+layout.ts deleted file mode 100644 index e015a1ad..00000000 --- a/src/routes/events/[event_id]/(launcher)/+layout.ts +++ /dev/null @@ -1,96 +0,0 @@ -/** @type {import('./$types').LayoutLoad} */ -console.log(`Events - [event_id] launcher +layout.ts start`); - -import { error } from '@sveltejs/kit'; -import { browser } from '$app/environment'; -import { events_func } from '$lib/ae_events_functions'; - -export async function load({ params, parent, url }) { // route - let log_lvl: number = 0; - - let data = await parent(); - // console.log(`ae events_pres_mgmt event [event_id] +page.ts data:`, data); - data.log_lvl = log_lvl; - - let account_id = data.account_id; - let ae_acct = data[account_id]; - // console.log(`ae_acct = `, ae_acct); - - // if (!account_id) { - // console.log(`events_pres_mgmt_event [event_id] +page.ts: The account_id was not found in the data!!!`); - // return false; - // } - - // data.ae_events_pres_mgmt_event_event_id_page_ts = true; - - let event_id = params.event_id; - if (!event_id) { - console.log(`ae Events - [event_id] +page.ts: The event_id was not found in the params.event_id!!!`); - error(404, { - message: 'Event ID not found' - }); - } - - // ae_acct.slct.event_id = event_id; - - // let load_event_obj = events_func.handle_load_ae_obj_id__event({ - // api_cfg: ae_acct.api, event_id: event_id, try_cache: true - // }); - - // ae_acct.slct.event_obj = await load_event_obj; - - if (browser) { - console.log(`BROWSER Events - [event_id] launcher +layout.ts start`); - - let load_event_obj = events_func.load_ae_obj_id__event({ - api_cfg: ae_acct.api, event_id: event_id, try_cache: true - }); - console.log(`load_event_obj = `, load_event_obj); - ae_acct.slct.event_obj = load_event_obj; - - // let load_event_session_obj_li = events_func.load_ae_obj_li__event_session({ - // api_cfg: ae_acct.api, - // for_obj_type: 'event', - // for_obj_id: event_id, - // params: {qry__enabled: 'enabled', qry__hidden: 'all', qry__limit: 200}, - // try_cache: true, - // log_lvl: 1 - // }); - // console.log(`load_event_session_obj_li = `, load_event_session_obj_li); - // ae_acct.slct.event_session_obj_li = load_event_session_obj_li; - - let load_event_location_obj_li = events_func.load_ae_obj_li__event_location({ - api_cfg: ae_acct.api, - for_obj_type: 'event', - for_obj_id: event_id, - params: {qry__enabled: 'enabled', qry__hidden: 'all', qry__limit: 200}, - try_cache: true, - log_lvl: log_lvl - }); - console.log(`load_event_location_obj_li = `, load_event_location_obj_li); - ae_acct.slct.event_location_obj_li = load_event_location_obj_li; - - - let event_session_id = url.searchParams.get('session_id'); - if (event_session_id) { - let load_event_session_obj = events_func.load_ae_obj_id__event_session({ - api_cfg: ae_acct.api, - event_session_id: event_session_id, - inc_file_li: true, - inc_presentation_li: true, - inc_presenter_li: true, - try_cache: true, - log_lvl: log_lvl - }); - ae_acct.slct.event_session_id = event_session_id; - console.log(`load_event_session_obj = `, load_event_session_obj); - ae_acct.slct.event_session_obj = load_event_session_obj; - } - - } - - // WARNING: Precaution against shared data between sites and sessions. - data[account_id] = ae_acct; - - return data; -} diff --git a/src/routes/events/[event_id]/(launcher)/+layout.svelte b/src/routes/events/[event_id]/(launcher)/launcher/+layout.svelte similarity index 89% rename from src/routes/events/[event_id]/(launcher)/+layout.svelte rename to src/routes/events/[event_id]/(launcher)/launcher/+layout.svelte index d9cc00a9..3cf443a3 100644 --- a/src/routes/events/[event_id]/(launcher)/+layout.svelte +++ b/src/routes/events/[event_id]/(launcher)/launcher/+layout.svelte @@ -1,8 +1,8 @@ @@ -659,7 +706,7 @@ $: { - +{@render children?.()} @@ -739,7 +786,7 @@ $: {
-->