From 6694ec92c717dbbf59b8c37f76b5a9a103279a1d Mon Sep 17 00:00:00 2001 From: Scott Idem Date: Tue, 8 Oct 2024 16:34:06 -0400 Subject: [PATCH] Renamed a bunch of functions! --- src/lib/ae_events__event_file.ts | 20 ++++++++++--------- src/lib/ae_events__event_location.ts | 6 +++--- src/lib/ae_events__event_presentation.ts | 6 +++--- src/lib/ae_events__event_presenter.ts | 6 +++--- src/lib/ae_events__event_session.ts | 6 +++--- src/lib/ae_events_functions.ts | 20 +++++++++---------- src/lib/element_manage_event_file_li.svelte | 12 +++++------ .../events/[event_id]/(launcher)/+layout.ts | 2 +- .../(launcher)/launcher_file_cont.svelte | 2 +- src/routes/events/[event_id]/+layout.ts | 2 +- .../location/[event_location_id]/+page.ts | 2 +- .../presenter/[presenter_id]/+page.ts | 2 +- .../[presenter_id]/presenter_view.svelte | 2 +- src/routes/events_badges/+layout.ts | 2 +- src/routes/events_leads/+layout.ts | 2 +- .../ae_comp__event_files_upload.svelte | 2 +- .../events_pres_mgmt/session/[slug]/+page.ts | 2 +- src/routes/events_speakers/+layout.ts | 2 +- 18 files changed, 50 insertions(+), 48 deletions(-) diff --git a/src/lib/ae_events__event_file.ts b/src/lib/ae_events__event_file.ts index 98d6186e..624578a4 100644 --- a/src/lib/ae_events__event_file.ts +++ b/src/lib/ae_events__event_file.ts @@ -7,7 +7,7 @@ let ae_promises: key_val = {}; // Updated 2024-06-14 -export async function handle_load_ae_obj_id__event_file( +export async function load_ae_obj_id__event_file( { api_cfg, event_file_id, @@ -20,7 +20,7 @@ export async function handle_load_ae_obj_id__event_file( log_lvl?: number } ) { - console.log(`*** handle_load_ae_obj_id__event_file() *** event_file_id=${event_file_id}`); + console.log(`*** load_ae_obj_id__event_file() *** event_file_id=${event_file_id}`); let params = {}; @@ -52,7 +52,7 @@ export async function handle_load_ae_obj_id__event_file( // Updated 2024-07-03 -export async function handle_load_ae_obj_li__event_file( +export async function load_ae_obj_li__event_file( { api_cfg, for_obj_type, @@ -69,7 +69,7 @@ export async function handle_load_ae_obj_li__event_file( log_lvl?: number } ) { - console.log(`*** handle_load_ae_obj_li__event_file() *** for_obj_type=${for_obj_type} for_obj_id=${for_obj_id}`); + console.log(`*** load_ae_obj_li__event_file() *** for_obj_type=${for_obj_type} for_obj_id=${for_obj_id}`); // Check if for_obj_type is in the list of valid Aether object types: let valid_for_obj_types = ['event', 'event_session', 'event_presentation', 'event_presenter', 'event_location']; @@ -126,7 +126,7 @@ export async function handle_load_ae_obj_li__event_file( // Updated 2024-06-17 -export async function handle_delete_ae_obj_id__event_file( +export async function delete_ae_obj_id__event_file( { api_cfg, event_file_id, @@ -139,7 +139,7 @@ export async function handle_delete_ae_obj_id__event_file( log_lvl?: number } ) { - console.log(`*** handle_delete_ae_obj_id__event_file() *** event_file_id=${event_file_id}`); + console.log(`*** delete_ae_obj_id__event_file() *** event_file_id=${event_file_id}`); const endpoint = `/event/file/${event_file_id}/v2`; @@ -223,13 +223,13 @@ export async function create_event_file_obj_from_hosted_file_async( // Updated 2024-06-13 -export async function handle_update_ae_obj__event_file( +export async function update_ae_obj__event_file( { api_cfg, event_file_id, data_kv, params = {}, - log_lvl = 3 + log_lvl = 1 }: { api_cfg: any, event_file_id: string, @@ -238,7 +238,9 @@ export async function handle_update_ae_obj__event_file( log_lvl?: number } ) { - console.log(`*** handle_update_ae_obj__event_file() *** event_file_id=${event_file_id}`); + if (log_lvl) { + console.log(`*** update_ae_obj__event_file() *** event_file_id=${event_file_id}`); + } ae_promises.update__event_file_obj = await api.update_ae_obj_id_crud({ api_cfg: api_cfg, diff --git a/src/lib/ae_events__event_location.ts b/src/lib/ae_events__event_location.ts index 946eae04..603cf10e 100644 --- a/src/lib/ae_events__event_location.ts +++ b/src/lib/ae_events__event_location.ts @@ -3,7 +3,7 @@ import { api } from '$lib/api'; import { db_events } from "$lib/db_events"; -import { handle_load_ae_obj_li__event_file } from "$lib/ae_events__event_file"; +import { load_ae_obj_li__event_file } from "$lib/ae_events__event_file"; import { load_ae_obj_li__event_session } from './ae_events__event_session'; let ae_promises: key_val = {}; @@ -69,7 +69,7 @@ export async function load_ae_obj_id__event_location( if (log_lvl) { console.log(`Need to load the file list for the location now`); } - let load_event_file_obj_li = handle_load_ae_obj_li__event_file({ + let load_event_file_obj_li = load_ae_obj_li__event_file({ api_cfg: api_cfg, for_obj_type: 'event_location', for_obj_id: event_location_id, @@ -210,7 +210,7 @@ export async function load_ae_obj_li__event_location( let event_location_obj = ae_promises.load__event_location_obj_li[i]; let event_location_id = event_location_obj.event_location_id_random; - let load_event_file_obj_li = handle_load_ae_obj_li__event_file({ + let load_event_file_obj_li = load_ae_obj_li__event_file({ api_cfg: api_cfg, for_obj_type: 'event_location', for_obj_id: event_location_id, diff --git a/src/lib/ae_events__event_presentation.ts b/src/lib/ae_events__event_presentation.ts index 3ce60faa..a34fe327 100644 --- a/src/lib/ae_events__event_presentation.ts +++ b/src/lib/ae_events__event_presentation.ts @@ -2,7 +2,7 @@ import type { key_val } from '$lib/ae_stores'; import { api } from '$lib/api'; import { db_events } from "$lib/db_events"; -import { handle_load_ae_obj_li__event_file } from "$lib/ae_events__event_file"; +import { load_ae_obj_li__event_file } from "$lib/ae_events__event_file"; import { load_ae_obj_li__event_presenter } from "$lib/ae_events__event_presenter"; let ae_promises: key_val = {}; @@ -64,7 +64,7 @@ export async function load_ae_obj_id__event_presentation( if (log_lvl) { console.log(`Need to load the file list for the presentation now.`); } - let load_event_file_obj_li = handle_load_ae_obj_li__event_file({ + let load_event_file_obj_li = load_ae_obj_li__event_file({ api_cfg: api_cfg, for_obj_type: 'event_presentation', for_obj_id: event_presentation_id, @@ -196,7 +196,7 @@ export async function load_ae_obj_li__event_presentation( let event_presentation_obj = ae_promises.load__event_presentation_obj_li[i]; let event_presentation_id = event_presentation_obj.event_presentation_id_random; - let load_event_file_obj_li = handle_load_ae_obj_li__event_file({ + let load_event_file_obj_li = load_ae_obj_li__event_file({ api_cfg: api_cfg, for_obj_type: 'event_presentation', for_obj_id: event_presentation_id, diff --git a/src/lib/ae_events__event_presenter.ts b/src/lib/ae_events__event_presenter.ts index 9ddf85e4..d3685710 100644 --- a/src/lib/ae_events__event_presenter.ts +++ b/src/lib/ae_events__event_presenter.ts @@ -2,7 +2,7 @@ import type { key_val } from '$lib/ae_stores'; import { api } from '$lib/api'; import { db_events } from "$lib/db_events"; -import { handle_load_ae_obj_li__event_file } from "$lib/ae_events__event_file"; +import { load_ae_obj_li__event_file } from "$lib/ae_events__event_file"; let ae_promises: key_val = {}; @@ -60,7 +60,7 @@ export async function load_ae_obj_id__event_presenter( if (log_lvl) { console.log(`Need to load the file list for the presenter now.`); } - let load_event_file_obj_li = handle_load_ae_obj_li__event_file({ + let load_event_file_obj_li = load_ae_obj_li__event_file({ api_cfg: api_cfg, for_obj_type: 'event_presenter', for_obj_id: event_presenter_id, @@ -166,7 +166,7 @@ export async function load_ae_obj_li__event_presenter( let event_presenter_obj = ae_promises.load__event_presenter_obj_li[i]; let event_presenter_id = event_presenter_obj.event_presenter_id_random; - let load_event_file_obj_li = handle_load_ae_obj_li__event_file({ + let load_event_file_obj_li = load_ae_obj_li__event_file({ api_cfg: api_cfg, for_obj_type: 'event_presenter', for_obj_id: event_presenter_id, diff --git a/src/lib/ae_events__event_session.ts b/src/lib/ae_events__event_session.ts index e6bb3767..6260b869 100644 --- a/src/lib/ae_events__event_session.ts +++ b/src/lib/ae_events__event_session.ts @@ -3,7 +3,7 @@ import { api } from '$lib/api'; import { db_events } from "$lib/db_events"; -import { handle_load_ae_obj_li__event_file } from "$lib/ae_events__event_file"; +import { load_ae_obj_li__event_file } from "$lib/ae_events__event_file"; import { load_ae_obj_li__event_presentation } from "$lib/ae_events__event_presentation"; let ae_promises: key_val = {}; @@ -76,7 +76,7 @@ export async function load_ae_obj_id__event_session( if (log_lvl) { console.log(`Need to load the file list for the session now`); } - let load_event_file_obj_li = handle_load_ae_obj_li__event_file({ + let load_event_file_obj_li = load_ae_obj_li__event_file({ api_cfg: api_cfg, for_obj_type: 'event_session', for_obj_id: event_session_id, @@ -221,7 +221,7 @@ export async function load_ae_obj_li__event_session( let event_session_obj = ae_promises.load__event_session_obj_li[i]; let event_session_id = event_session_obj.event_session_id_random; - let load_event_file_obj_li = handle_load_ae_obj_li__event_file({ + let load_event_file_obj_li = load_ae_obj_li__event_file({ api_cfg: api_cfg, for_obj_type: 'event_session', for_obj_id: event_session_id, diff --git a/src/lib/ae_events_functions.ts b/src/lib/ae_events_functions.ts index d147931b..f08ac64b 100644 --- a/src/lib/ae_events_functions.ts +++ b/src/lib/ae_events_functions.ts @@ -4,11 +4,11 @@ import * as events from "$lib/ae_events__event"; import { - handle_load_ae_obj_id__event_file, - handle_load_ae_obj_li__event_file, - handle_delete_ae_obj_id__event_file, + load_ae_obj_id__event_file, + load_ae_obj_li__event_file, + delete_ae_obj_id__event_file, create_event_file_obj_from_hosted_file_async, - handle_update_ae_obj__event_file, + update_ae_obj__event_file, search__event_file, db_save_ae_obj_li__event_file, } from "$lib/ae_events__event_file"; @@ -71,18 +71,18 @@ import { let export_obj = { - handle_load_ae_obj_id__event: events.load_ae_obj_id__event, + load_ae_obj_id__event: events.load_ae_obj_id__event, load_ae_obj_li__event: events.load_ae_obj_li__event, qry_ae_obj_li__event: events.qry_ae_obj_li__event, create_ae_obj__event: events.create_ae_obj__event, update_ae_obj__event: events.update_ae_obj__event, - handle_db_save_ae_obj_li__event: events.db_save_ae_obj_li__event, + db_save_ae_obj_li__event: events.db_save_ae_obj_li__event, sync_config__event_pres_mgmt: events.sync_config__event_pres_mgmt, - handle_load_ae_obj_id__event_file: handle_load_ae_obj_id__event_file, - handle_load_ae_obj_li__event_file: handle_load_ae_obj_li__event_file, - handle_delete_ae_obj_id__event_file: handle_delete_ae_obj_id__event_file, - handle_update_ae_obj__event_file: handle_update_ae_obj__event_file, + load_ae_obj_id__event_file: load_ae_obj_id__event_file, + load_ae_obj_li__event_file: load_ae_obj_li__event_file, + delete_ae_obj_id__event_file: delete_ae_obj_id__event_file, + update_ae_obj__event_file: update_ae_obj__event_file, search__event_file: search__event_file, db_save_ae_obj_li__event_file: db_save_ae_obj_li__event_file, diff --git a/src/lib/element_manage_event_file_li.svelte b/src/lib/element_manage_event_file_li.svelte index 2aab63d6..f1564485 100644 --- a/src/lib/element_manage_event_file_li.svelte +++ b/src/lib/element_manage_event_file_li.svelte @@ -55,7 +55,7 @@ onMount(() => { qry__hidden: 'all', } - events_func.handle_load_ae_obj_li__event_file({ + events_func.load_ae_obj_li__event_file({ api_cfg: $ae_api, for_obj_type: link_to_type, for_obj_id: link_to_id, @@ -248,7 +248,7 @@ onMount(() => { filename: new_filename, }; - ae_promises.update__event_file_obj = events_func.handle_update_ae_obj__event_file({ + ae_promises.update__event_file_obj = events_func.update_ae_obj__event_file({ api_cfg: $ae_api, event_file_id: event_file_obj.event_file_id_random, data_kv: event_file_data, @@ -312,7 +312,7 @@ onMount(() => { hide: !event_file_obj.hide, }; - ae_promises.update__event_file_obj = events_func.handle_update_ae_obj__event_file({ + ae_promises.update__event_file_obj = events_func.update_ae_obj__event_file({ api_cfg: $ae_api, event_file_id: event_file_obj.event_file_id_random, data_kv: event_file_data, @@ -326,7 +326,7 @@ onMount(() => { qry__hidden: 'all', } - events_func.handle_load_ae_obj_li__event_file({ + events_func.load_ae_obj_li__event_file({ api_cfg: $ae_api, for_obj_type: link_to_type, for_obj_id: link_to_id, @@ -367,7 +367,7 @@ onMount(() => { // ae_promises[event_file_obj.event_file_id_random] = handle_delete__event_file({event_file_id: event_file_obj.event_file_id_random}); - ae_promises.delete__event_file_obj = await events_func.handle_delete_ae_obj_id__event_file({ + ae_promises.delete__event_file_obj = await events_func.delete_ae_obj_id__event_file({ api_cfg: $ae_api, event_file_id: event_file_obj.event_file_id_random, log_lvl: 1 @@ -425,7 +425,7 @@ onMount(() => { file_purpose: e.target.value, }; - events_func.handle_update_ae_obj__event_file({ + events_func.update_ae_obj__event_file({ api_cfg: $ae_api, event_file_id: event_file_obj.event_file_id_random, data_kv: event_file_data, diff --git a/src/routes/events/[event_id]/(launcher)/+layout.ts b/src/routes/events/[event_id]/(launcher)/+layout.ts index fbf5726f..9ba72bef 100644 --- a/src/routes/events/[event_id]/(launcher)/+layout.ts +++ b/src/routes/events/[event_id]/(launcher)/+layout.ts @@ -42,7 +42,7 @@ export async function load({ params, parent, url }) { // route if (browser) { console.log(`BROWSER Events - [event_id] launcher +layout.ts start`); - let load_event_obj = events_func.handle_load_ae_obj_id__event({ + 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); diff --git a/src/routes/events/[event_id]/(launcher)/launcher_file_cont.svelte b/src/routes/events/[event_id]/(launcher)/launcher_file_cont.svelte index 9eb8c6f5..dbc38e01 100644 --- a/src/routes/events/[event_id]/(launcher)/launcher_file_cont.svelte +++ b/src/routes/events/[event_id]/(launcher)/launcher_file_cont.svelte @@ -508,7 +508,7 @@ async function handle_open_file() { on:ae_crud_updated={e => { console.log(`ae_crud_updated:`, e.detail); - events_func.handle_load_ae_obj_id__event_file({ + events_func.load_ae_obj_id__event_file({ api_cfg: $ae_api, event_file_id: event_file_obj?.event_file_id_random, log_lvl: log_lvl diff --git a/src/routes/events/[event_id]/+layout.ts b/src/routes/events/[event_id]/+layout.ts index 60c91eb9..5b646500 100644 --- a/src/routes/events/[event_id]/+layout.ts +++ b/src/routes/events/[event_id]/+layout.ts @@ -40,7 +40,7 @@ export async function load({ params, parent }) { // route // ae_acct.slct.event_obj = await load_event_obj; if (browser) { - let load_event_obj = events_func.handle_load_ae_obj_id__event({ + 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); diff --git a/src/routes/events/[event_id]/location/[event_location_id]/+page.ts b/src/routes/events/[event_id]/location/[event_location_id]/+page.ts index ed9657c5..d48f0c68 100644 --- a/src/routes/events/[event_id]/location/[event_location_id]/+page.ts +++ b/src/routes/events/[event_id]/location/[event_location_id]/+page.ts @@ -85,7 +85,7 @@ export async function load({ params, parent }) { // route qry__limit: 50 } - let load_event_file_obj_li = await events_func.handle_load_ae_obj_li__event_file({ + let load_event_file_obj_li = await events_func.load_ae_obj_li__event_file({ api_cfg: ae_acct.api, for_obj_type: 'event_location', for_obj_id: event_location_id, diff --git a/src/routes/events/[event_id]/presenter/[presenter_id]/+page.ts b/src/routes/events/[event_id]/presenter/[presenter_id]/+page.ts index 7f6ea9f1..24a57df1 100644 --- a/src/routes/events/[event_id]/presenter/[presenter_id]/+page.ts +++ b/src/routes/events/[event_id]/presenter/[presenter_id]/+page.ts @@ -41,7 +41,7 @@ export async function load({ params, parent }) { // route qry__limit: 50 } - let load_event_file_obj_li = await events_func.handle_load_ae_obj_li__event_file({ + let load_event_file_obj_li = await events_func.load_ae_obj_li__event_file({ api_cfg: ae_acct.api, for_obj_type: 'event_presenter', for_obj_id: event_presenter_id, diff --git a/src/routes/events/[event_id]/presenter/[presenter_id]/presenter_view.svelte b/src/routes/events/[event_id]/presenter/[presenter_id]/presenter_view.svelte index 760af896..5d2aa3cd 100644 --- a/src/routes/events/[event_id]/presenter/[presenter_id]/presenter_view.svelte +++ b/src/routes/events/[event_id]/presenter/[presenter_id]/presenter_view.svelte @@ -226,7 +226,7 @@ async function handle_delete__event_file({event_file_id}) { let link_to_type = 'event_presenter'; let link_to_id = $lq__event_presenter_obj?.event_presenter_id_random; - ae_promises.delete__event_file_obj = await events_func.handle_delete_ae_obj_id__event_file({ + ae_promises.delete__event_file_obj = await events_func.delete_ae_obj_id__event_file({ api_cfg: $ae_api, event_file_id: event_file_id, log_lvl: 2 diff --git a/src/routes/events_badges/+layout.ts b/src/routes/events_badges/+layout.ts index f9712f0e..55764ccd 100644 --- a/src/routes/events_badges/+layout.ts +++ b/src/routes/events_badges/+layout.ts @@ -25,7 +25,7 @@ export async function load({ parent }) { return false; } - let load_event_obj = events_func.handle_load_ae_obj_id__event({api_cfg: ae_acct.api, event_id: event_id, try_cache: true}); + let load_event_obj = events_func.load_ae_obj_id__event({api_cfg: ae_acct.api, event_id: event_id, try_cache: true}); ae_acct.slct.event_obj = load_event_obj; diff --git a/src/routes/events_leads/+layout.ts b/src/routes/events_leads/+layout.ts index a518a155..bc678fc2 100644 --- a/src/routes/events_leads/+layout.ts +++ b/src/routes/events_leads/+layout.ts @@ -23,7 +23,7 @@ export async function load({ parent }) { return false; } - let load_event_obj = events_func.handle_load_ae_obj_id__event({api_cfg: ae_acct.api, event_id: event_id, try_cache: true}); + let load_event_obj = events_func.load_ae_obj_id__event({api_cfg: ae_acct.api, event_id: event_id, try_cache: true}); ae_acct.slct.event_obj = load_event_obj; diff --git a/src/routes/events_pres_mgmt/ae_comp__event_files_upload.svelte b/src/routes/events_pres_mgmt/ae_comp__event_files_upload.svelte index 1c6c8761..1b34b1a7 100644 --- a/src/routes/events_pres_mgmt/ae_comp__event_files_upload.svelte +++ b/src/routes/events_pres_mgmt/ae_comp__event_files_upload.svelte @@ -86,7 +86,7 @@ async function handle_submit_form_files(event) { qry__hidden: 'all', } - events_func.handle_load_ae_obj_li__event_file({ + events_func.load_ae_obj_li__event_file({ api_cfg: $ae_api, for_obj_type: link_to_type, for_obj_id: link_to_id, diff --git a/src/routes/events_pres_mgmt/session/[slug]/+page.ts b/src/routes/events_pres_mgmt/session/[slug]/+page.ts index 3e8d7911..d9ae7604 100644 --- a/src/routes/events_pres_mgmt/session/[slug]/+page.ts +++ b/src/routes/events_pres_mgmt/session/[slug]/+page.ts @@ -84,7 +84,7 @@ export async function load({ params, parent }) { // route qry__limit: 50 } - let load_event_file_obj_li = await events_func.handle_load_ae_obj_li__event_file({ + let load_event_file_obj_li = await events_func.load_ae_obj_li__event_file({ api_cfg: ae_acct.api, for_obj_type: 'event_session', for_obj_id: event_session_id, diff --git a/src/routes/events_speakers/+layout.ts b/src/routes/events_speakers/+layout.ts index d7f4147a..b51e3b0a 100644 --- a/src/routes/events_speakers/+layout.ts +++ b/src/routes/events_speakers/+layout.ts @@ -30,7 +30,7 @@ export async function load({ parent }) { return false; } - let load_event_obj = events_func.handle_load_ae_obj_id__event({ + let load_event_obj = events_func.load_ae_obj_id__event({ api_cfg: ae_acct.api, event_id: event_id, try_cache: true