From 695a520eb375b910f56330289cf1b04cf42ed873 Mon Sep 17 00:00:00 2001 From: Scott Idem Date: Wed, 4 Jun 2025 11:27:37 -0400 Subject: [PATCH] Work on bug fix for presenters not being save in the IDB. Also cleaned up the related functions to use the more standard enabled, hidden, limit, and offset params. Other minor clean up --- .../ae_events__event_presentation.ts | 43 +++++++++++++++---- .../ae_events/ae_events__event_presenter.ts | 28 +++++++++--- src/lib/ae_events/ae_events__event_session.ts | 36 +++++++++++++--- .../[event_id]/session/[session_id]/+page.ts | 21 ++++++--- 4 files changed, 103 insertions(+), 25 deletions(-) diff --git a/src/lib/ae_events/ae_events__event_presentation.ts b/src/lib/ae_events/ae_events__event_presentation.ts index d7d55350..b4bf92a3 100644 --- a/src/lib/ae_events/ae_events__event_presentation.ts +++ b/src/lib/ae_events/ae_events__event_presentation.ts @@ -17,6 +17,10 @@ export async function load_ae_obj_id__event_presentation( event_presentation_id, inc_file_li = false, inc_presenter_li = false, + enabled = 'enabled', + hidden = 'not_hidden', + limit = 49, + offset = 0, try_cache = true, log_lvl = 0 }: { @@ -24,6 +28,10 @@ export async function load_ae_obj_id__event_presentation( event_presentation_id: string, inc_file_li?: boolean, inc_presenter_li?: boolean, + enabled?: string, + hidden?: string, + limit?: number, + offset?: number, try_cache?: boolean, log_lvl?: number } @@ -131,7 +139,12 @@ export async function load_ae_obj_id__event_presentation( for_obj_type: 'event_presentation', for_obj_id: event_presentation_id, inc_file_li: inc_file_li, - params: {qry__enabled: 'all', qry__limit: 25}, + enabled: enabled, + hidden: hidden, + limit: limit, + offset: offset, + // order_by_li: {'priority': 'DESC', 'sort': 'DESC', 'updated_on': 'DESC', 'created_on': 'DESC'}, + // params: params, try_cache: try_cache, log_lvl: log_lvl }) @@ -160,6 +173,10 @@ export async function load_ae_obj_li__event_presentation( for_obj_id, inc_file_li = false, inc_presenter_li = false, + enabled = 'enabled', + hidden = 'not_hidden', + limit = 49, + offset = 0, order_by_li = {'priority': 'DESC', 'sort': 'DESC', 'start_datetime': 'ASC', 'name': 'ASC', 'updated_on': 'DESC', 'created_on': 'DESC'}, params = {}, try_cache = true, @@ -170,6 +187,10 @@ export async function load_ae_obj_li__event_presentation( for_obj_id: string, inc_file_li?: boolean, inc_presenter_li?: boolean, + enabled?: string, + hidden?: string, + limit?: number, + offset?: number, order_by_li?: key_val, params?: key_val, try_cache?: boolean, @@ -180,17 +201,17 @@ export async function load_ae_obj_li__event_presentation( console.log(`*** load_ae_obj_li__event_presentation() *** 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 ?? 'not_hidden'); // 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 ?? 'not_hidden'); // 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('params_json:', params_json); // ae_promises.load__event_presentation_obj_li = await api.get_ae_obj_li_for_obj_id_crud({ - ae_promises.load__event_session_obj_li = await api.get_ae_obj_li_for_obj_id_crud_v2({ + ae_promises.load__event_presentation_obj_li = await api.get_ae_obj_li_for_obj_id_crud_v2({ api_cfg: api_cfg, obj_type: 'event_presentation', for_obj_type: for_obj_type, @@ -262,7 +283,7 @@ 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: 'all', qry__limit: 25}, + params: {qry__enabled: enabled, qry__limit: limit}, try_cache: try_cache, log_lvl: log_lvl }) @@ -293,7 +314,13 @@ 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: 'all', qry__limit: 25}, + inc_file_li: inc_file_li, + enabled: enabled, + hidden: hidden, + limit: limit, + offset: offset, + // order_by_li: {'priority': 'DESC', 'sort': 'DESC', 'updated_on': 'DESC', 'created_on': 'DESC'}, + // params: {}, 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 c1f96175..612ab200 100644 --- a/src/lib/ae_events/ae_events__event_presenter.ts +++ b/src/lib/ae_events/ae_events__event_presenter.ts @@ -15,12 +15,20 @@ export async function load_ae_obj_id__event_presenter( api_cfg, event_presenter_id, inc_file_li = false, + enabled = 'enabled', + hidden = 'not_hidden', + limit = 19, + offset = 0, try_cache = true, log_lvl = 0 }: { api_cfg: any, event_presenter_id: string, inc_file_li?: boolean, + enabled?: string, + hidden?: string, + limit?: number, + offset?: number, try_cache?: boolean, log_lvl?: number } @@ -91,7 +99,7 @@ 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: 'all', qry__limit: 25}, + params: {qry__enabled: enabled, qry__limit: limit}, try_cache: try_cache, log_lvl: log_lvl }) @@ -119,6 +127,10 @@ export async function load_ae_obj_li__event_presenter( for_obj_type, for_obj_id, inc_file_li = false, + enabled = 'enabled', + hidden = 'not_hidden', + limit = 19, + offset = 0, order_by_li = {'priority': 'DESC', 'sort': 'DESC', 'given_name': 'ASC', 'family_name': 'ASC', 'updated_on': 'DESC', 'created_on': 'DESC'}, params = {}, try_cache = true, @@ -128,6 +140,10 @@ export async function load_ae_obj_li__event_presenter( for_obj_type: string, for_obj_id: string, inc_file_li?: boolean, + enabled?: string, + hidden?: string, + limit?: number, + offset?: number, order_by_li?: key_val, params?: key_val, try_cache?: boolean, @@ -138,10 +154,10 @@ export async function load_ae_obj_li__event_presenter( console.log(`*** load_ae_obj_li__event_presenter() *** 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 ?? 'not_hidden'); // 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 ?? 'not_hidden'); // 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 = {}; @@ -221,7 +237,7 @@ 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: 'all', qry__limit: 25}, + params: {qry__enabled: enabled, qry__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 e48f38cf..5ef4a82c 100644 --- a/src/lib/ae_events/ae_events__event_session.ts +++ b/src/lib/ae_events/ae_events__event_session.ts @@ -18,6 +18,10 @@ export async function load_ae_obj_id__event_session( inc_file_li = false, inc_presentation_li = false, inc_presenter_li = false, + enabled = 'enabled', + hidden = 'not_hidden', + limit = 149, + offset = 0, try_cache = true, log_lvl = 0 }: { @@ -26,6 +30,10 @@ export async function load_ae_obj_id__event_session( inc_file_li?: boolean, inc_presentation_li?: boolean, inc_presenter_li?: boolean, + enabled?: string, + hidden?: string, + limit?: number, + offset?: number, try_cache?: boolean, log_lvl?: number } @@ -134,7 +142,11 @@ export async function load_ae_obj_id__event_session( for_obj_id: event_session_id, inc_file_li: inc_file_li, inc_presenter_li: inc_presenter_li, - params: {qry__enabled: 'all', qry__limit: 25}, + enabled: enabled, // all, disabled, enabled + hidden: hidden, // all, hidden, not_hidden + limit: limit, // 25 + offset: offset, // 0 + params: {}, try_cache: try_cache, log_lvl: log_lvl }) @@ -164,6 +176,10 @@ export async function load_ae_obj_li__event_session( inc_file_li = false, inc_presentation_li = false, inc_presenter_li = false, + enabled = 'enabled', + hidden = 'not_hidden', + limit = 149, + offset = 0, order_by_li = {'priority': 'DESC', 'sort': 'DESC', 'start_datetime': 'ASC', 'name': 'ASC', 'updated_on': 'DESC', 'created_on': 'DESC'}, params = {}, try_cache = true, @@ -175,6 +191,10 @@ export async function load_ae_obj_li__event_session( inc_file_li?: boolean, inc_presentation_li?: boolean, inc_presenter_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, @@ -185,10 +205,10 @@ export async function load_ae_obj_li__event_session( console.log(`*** load_ae_obj_li__event_session() *** 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 ?? 'not_hidden'); // 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 ?? 'not_hidden'); // 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 = {}; @@ -300,7 +320,11 @@ export async function load_ae_obj_li__event_session( for_obj_id: event_session_id, inc_file_li: inc_file_li, inc_presenter_li: inc_presenter_li, - params: {qry__enabled: enabled, qry__limit: limit}, + enabled: enabled, + hidden: hidden, + limit: limit, + offset: offset, + params: params, try_cache: try_cache, log_lvl: log_lvl }) diff --git a/src/routes/events/[event_id]/session/[session_id]/+page.ts b/src/routes/events/[event_id]/session/[session_id]/+page.ts index 700a113c..8cf56d94 100644 --- a/src/routes/events/[event_id]/session/[session_id]/+page.ts +++ b/src/routes/events/[event_id]/session/[session_id]/+page.ts @@ -33,9 +33,11 @@ export async function load({ params, parent }) { // route if (browser) { // Load event session object - let load_event_session_obj = events_func.load_ae_obj_id__event_session({ + let load_event_session_obj = await events_func.load_ae_obj_id__event_session({ api_cfg: ae_acct.api, event_session_id: event_session_id, + // inc_presentation_li: true, + // inc_presenter_li: true, try_cache: true }); @@ -46,8 +48,13 @@ export async function load({ params, parent }) { // route api_cfg: ae_acct.api, for_obj_type: 'event_session', for_obj_id: event_session_id, - params: {qry__enabled: 'all', qry__limit: 50}, - try_cache: true + inc_presenter_li: true, + enabled: 'all', + hidden: 'all', + limit: 19, + // params: {}, + try_cache: true, + log_lvl: 2 }) .then((event_presentation_obj_li) => { if (log_lvl) { @@ -61,8 +68,12 @@ export async function load({ params, parent }) { // route api_cfg: ae_acct.api, for_obj_type: 'event_presentation', for_obj_id: event_presentation_id, - params: {qry__enabled: 'all', qry__limit: 15}, - try_cache: true + enabled: 'all', + hidden: 'all', + limit: 19, + params: {}, + try_cache: true, + log_lvl: 2 }); if (log_lvl) { console.log(`load_event_presenter_obj_li = `, load_event_presenter_obj_li);