From 94849137f01d11443c03cc99b9e6307bc1cd6bf7 Mon Sep 17 00:00:00 2001 From: Scott Idem Date: Tue, 24 Mar 2026 11:32:06 -0400 Subject: [PATCH] I think pretty much all references to v1 and v2 have been removed. All files have been renamed from _v3 to just the function/var name with out the appended version. Assume no _vX is the current version. --- .../PROJECT__Use_AE_API_V3_CRUD_upgrade.md | 8 +- package.json | 2 +- src/lib/ae_core/ae_core_functions.ts | 174 +++++++++--------- src/lib/ae_events/ae_events__event.ts | 132 ------------- src/lib/ae_events/ae_events_functions.ts | 1 - src/lib/api/api.ts | 2 +- .../ae_comp__badge_print_controls.svelte | 12 +- 7 files changed, 99 insertions(+), 232 deletions(-) diff --git a/documentation/PROJECT__Use_AE_API_V3_CRUD_upgrade.md b/documentation/PROJECT__Use_AE_API_V3_CRUD_upgrade.md index 524458c5..47f34cf8 100644 --- a/documentation/PROJECT__Use_AE_API_V3_CRUD_upgrade.md +++ b/documentation/PROJECT__Use_AE_API_V3_CRUD_upgrade.md @@ -114,7 +114,7 @@ V3 returns detailed error metadata in the `meta.details` object. ## 6. Final Cleanup Once all checkboxes above are completed: -1. [ ] Remove legacy exports from `src/lib/api/api.ts`. -2. [ ] Delete `src/lib/ae_api/api_get__crud_obj_li_v1.ts`. -3. [ ] Delete `src/lib/ae_api/api_get__crud_obj_li_v2.ts`. -4. [ ] Delete `src/lib/ae_api/api_get__crud_obj_id.ts` (Legacy version). +1. [x] Remove legacy exports from `src/lib/api/api.ts`. +2. [x] Delete `src/lib/ae_api/api_get__crud_obj_li_v1.ts`. +3. [x] Delete `src/lib/ae_api/api_get__crud_obj_li_v2.ts`. +4. [x] Delete `src/lib/ae_api/api_get__crud_obj_id.ts` (Legacy version). diff --git a/package.json b/package.json index 2c78d92c..f5692dee 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "osit-aether-app-svelte", - "version": "3.00.04", + "version": "3.00.05", "description": "One Sky IT's Aether App created with Svelte, SvelteKit, Tailwind CSS, Lucide, Font Awesome, and Skeleton UI. -Scott Idem", "homepage": "https://oneskyit.com/", "private": true, diff --git a/src/lib/ae_core/ae_core_functions.ts b/src/lib/ae_core/ae_core_functions.ts index cbaf6493..cd5bb319 100644 --- a/src/lib/ae_core/ae_core_functions.ts +++ b/src/lib/ae_core/ae_core_functions.ts @@ -327,102 +327,102 @@ async function update_ae_obj_id_crud({ return ae_promises.api_update__ae_obj; } -// Core - Already imported above -// import { load_ae_obj_id__person } from "$lib/ae_core/core__person"; -// import { load_ae_obj_id__user } from "$lib/ae_core/core__user"; +// // Core - Already imported above +// // import { load_ae_obj_id__person } from "$lib/ae_core/core__person"; +// // import { load_ae_obj_id__user } from "$lib/ae_core/core__user"; -// Additional Modules -import { load_ae_obj_id__archive } from '$lib/ae_archives/ae_archives__archive'; -import { load_ae_obj_id__archive_content } from '$lib/ae_archives/ae_archives__archive_content'; +// // Additional Modules +// import { load_ae_obj_id__archive } from '$lib/ae_archives/ae_archives__archive'; +// import { load_ae_obj_id__archive_content } from '$lib/ae_archives/ae_archives__archive_content'; -import { load_ae_obj_id__event } from '$lib/ae_events/ae_events__event'; -// import { load_ae_obj_id__event_badge } from "$lib/ae_events/ae_events__event_badge"; -import { load_ae_obj_id__event_exhibit } from '$lib/ae_events/ae_events__exhibit'; -import { load_ae_obj_id__event_device } from '$lib/ae_events/ae_events__event_device'; -// import { load_ae_obj_id__event_exhibit } from "$lib/ae_events/ae_events__event_exhibit"; -import { load_ae_obj_id__event_file } from '$lib/ae_events/ae_events__event_file'; -import { load_ae_obj_id__event_location } from '$lib/ae_events/ae_events__event_location'; -import { load_ae_obj_id__event_presentation } from '$lib/ae_events/ae_events__event_presentation'; -import { load_ae_obj_id__event_presenter } from '$lib/ae_events/ae_events__event_presenter'; -import { load_ae_obj_id__event_session } from '$lib/ae_events/ae_events__event_session'; +// import { load_ae_obj_id__event } from '$lib/ae_events/ae_events__event'; +// // import { load_ae_obj_id__event_badge } from "$lib/ae_events/ae_events__event_badge"; +// import { load_ae_obj_id__event_exhibit } from '$lib/ae_events/ae_events__exhibit'; +// import { load_ae_obj_id__event_device } from '$lib/ae_events/ae_events__event_device'; +// // import { load_ae_obj_id__event_exhibit } from "$lib/ae_events/ae_events__event_exhibit"; +// import { load_ae_obj_id__event_file } from '$lib/ae_events/ae_events__event_file'; +// import { load_ae_obj_id__event_location } from '$lib/ae_events/ae_events__event_location'; +// import { load_ae_obj_id__event_presentation } from '$lib/ae_events/ae_events__event_presentation'; +// import { load_ae_obj_id__event_presenter } from '$lib/ae_events/ae_events__event_presenter'; +// import { load_ae_obj_id__event_session } from '$lib/ae_events/ae_events__event_session'; -import { load_ae_obj_id__journal } from '$lib/ae_journals/ae_journals__journal'; -import { load_ae_obj_id__journal_entry } from '$lib/ae_journals/ae_journals__journal_entry'; +// import { load_ae_obj_id__journal } from '$lib/ae_journals/ae_journals__journal'; +// import { load_ae_obj_id__journal_entry } from '$lib/ae_journals/ae_journals__journal_entry'; -import { load_ae_obj_id__post } from '$lib/ae_posts/ae_posts__post'; -import { load_ae_obj_id__post_comment } from '$lib/ae_posts/ae_posts__post_comment'; +// import { load_ae_obj_id__post } from '$lib/ae_posts/ae_posts__post'; +// import { load_ae_obj_id__post_comment } from '$lib/ae_posts/ae_posts__post_comment'; // Updated 2025-09-30 -async function update_ae_obj_id_crud_v2({ - api_cfg, - object_type, - object_id, - object_reload = false, - field_name, - new_field_value, - params = {}, - log_lvl = 0 -}: { - api_cfg: any; - object_type: string; - object_id: string; - object_reload?: boolean; - field_name: string; - new_field_value: any; - params?: any | key_val; - log_lvl?: number; -}) { - if (log_lvl) { - console.log( - `*** update_ae_obj_id_crud_v2() *** object_type=${object_type}, object_id=${object_id}, object_reload=${object_reload}, field_name=${field_name}, new_field_value=`, - new_field_value - ); - } +// async function update_ae_obj_id_crud_v2({ +// api_cfg, +// object_type, +// object_id, +// object_reload = false, +// field_name, +// new_field_value, +// params = {}, +// log_lvl = 0 +// }: { +// api_cfg: any; +// object_type: string; +// object_id: string; +// object_reload?: boolean; +// field_name: string; +// new_field_value: any; +// params?: any | key_val; +// log_lvl?: number; +// }) { +// if (log_lvl) { +// console.log( +// `*** update_ae_obj_id_crud_v2() *** object_type=${object_type}, object_id=${object_id}, object_reload=${object_reload}, field_name=${field_name}, new_field_value=`, +// new_field_value +// ); +// } - const results = await api.update_ae_obj_id_crud({ - api_cfg: api_cfg, - obj_type: object_type, - obj_id: object_id, - field_name: field_name, - field_value: new_field_value, - key: api_cfg.api_crud_super_key, - log_lvl: log_lvl - }); +// const results = await api.update_ae_obj_id_crud({ +// api_cfg: api_cfg, +// obj_type: object_type, +// obj_id: object_id, +// field_name: field_name, +// field_value: new_field_value, +// key: api_cfg.api_crud_super_key, +// log_lvl: log_lvl +// }); - if (results) { - if (log_lvl) { - console.log(`Patched - Field Name: ${field_name} with new Field Value: ${new_field_value}`); - } +// if (results) { +// if (log_lvl) { +// console.log(`Patched - Field Name: ${field_name} with new Field Value: ${new_field_value}`); +// } - if (object_reload) { - if (log_lvl) { - console.log(`Reloading the object after patching...`); - } - // Trigger reloads based on object type. These are fire-and-forget or awaited internally by the library functions. - if (object_type == 'person') load_ae_obj_id__person({ api_cfg, person_id: object_id, log_lvl }); - if (object_type == 'archive') load_ae_obj_id__archive({ api_cfg, archive_id: object_id, log_lvl }); - if (object_type == 'archive_content') load_ae_obj_id__archive_content({ api_cfg, archive_content_id: object_id, log_lvl }); - if (object_type == 'journal') load_ae_obj_id__journal({ api_cfg, journal_id: object_id, log_lvl }); - if (object_type == 'journal_entry') load_ae_obj_id__journal_entry({ api_cfg, journal_entry_id: object_id, log_lvl }); - if (object_type == 'event') load_ae_obj_id__event({ api_cfg, event_id: object_id, log_lvl }); - if (object_type == 'event_exhibit') load_ae_obj_id__event_exhibit({ api_cfg, exhibit_id: object_id, log_lvl }); - if (object_type == 'event_device') load_ae_obj_id__event_device({ api_cfg, event_device_id: object_id, log_lvl }); - if (object_type == 'event_file') load_ae_obj_id__event_file({ api_cfg, event_file_id: object_id, log_lvl }); - if (object_type == 'event_location') load_ae_obj_id__event_location({ api_cfg, event_location_id: object_id, log_lvl }); - if (object_type == 'event_presentation') load_ae_obj_id__event_presentation({ api_cfg, event_presentation_id: object_id, log_lvl }); - if (object_type == 'event_presenter') load_ae_obj_id__event_presenter({ api_cfg, event_presenter_id: object_id, log_lvl }); - if (object_type == 'event_session') load_ae_obj_id__event_session({ api_cfg, event_session_id: object_id, log_lvl }); - if (object_type == 'post') load_ae_obj_id__post({ api_cfg, post_id: object_id, log_lvl }); - if (object_type == 'post_comment') load_ae_obj_id__post_comment({ api_cfg, post_comment_id: object_id, log_lvl }); - } - } else { - if (log_lvl) { - console.log(`PATCH failed for ${object_type} ${object_id}`); - } - } +// if (object_reload) { +// if (log_lvl) { +// console.log(`Reloading the object after patching...`); +// } +// // Trigger reloads based on object type. These are fire-and-forget or awaited internally by the library functions. +// if (object_type == 'person') load_ae_obj_id__person({ api_cfg, person_id: object_id, log_lvl }); +// if (object_type == 'archive') load_ae_obj_id__archive({ api_cfg, archive_id: object_id, log_lvl }); +// if (object_type == 'archive_content') load_ae_obj_id__archive_content({ api_cfg, archive_content_id: object_id, log_lvl }); +// if (object_type == 'journal') load_ae_obj_id__journal({ api_cfg, journal_id: object_id, log_lvl }); +// if (object_type == 'journal_entry') load_ae_obj_id__journal_entry({ api_cfg, journal_entry_id: object_id, log_lvl }); +// if (object_type == 'event') load_ae_obj_id__event({ api_cfg, event_id: object_id, log_lvl }); +// if (object_type == 'event_exhibit') load_ae_obj_id__event_exhibit({ api_cfg, exhibit_id: object_id, log_lvl }); +// if (object_type == 'event_device') load_ae_obj_id__event_device({ api_cfg, event_device_id: object_id, log_lvl }); +// if (object_type == 'event_file') load_ae_obj_id__event_file({ api_cfg, event_file_id: object_id, log_lvl }); +// if (object_type == 'event_location') load_ae_obj_id__event_location({ api_cfg, event_location_id: object_id, log_lvl }); +// if (object_type == 'event_presentation') load_ae_obj_id__event_presentation({ api_cfg, event_presentation_id: object_id, log_lvl }); +// if (object_type == 'event_presenter') load_ae_obj_id__event_presenter({ api_cfg, event_presenter_id: object_id, log_lvl }); +// if (object_type == 'event_session') load_ae_obj_id__event_session({ api_cfg, event_session_id: object_id, log_lvl }); +// if (object_type == 'post') load_ae_obj_id__post({ api_cfg, post_id: object_id, log_lvl }); +// if (object_type == 'post_comment') load_ae_obj_id__post_comment({ api_cfg, post_comment_id: object_id, log_lvl }); +// } +// } else { +// if (log_lvl) { +// console.log(`PATCH failed for ${object_type} ${object_id}`); +// } +// } - return results; -} +// return results; +// } async function download_export__obj_type({ api_cfg, @@ -533,7 +533,7 @@ const export_obj = { auth_ae_obj__user_id_change_password: auth_ae_obj__user_id_change_password, update_ae_obj_id_crud: update_ae_obj_id_crud, - update_ae_obj_id_crud_v2: update_ae_obj_id_crud_v2, + // update_ae_obj_id_crud_v2: update_ae_obj_id_crud_v2, download_export__obj_type: download_export__obj_type, generate_qr_code: generate_qr_code, js_generate_qr_code: js_generate_qr_code diff --git a/src/lib/ae_events/ae_events__event.ts b/src/lib/ae_events/ae_events__event.ts index a66d61f0..d568015e 100644 --- a/src/lib/ae_events/ae_events__event.ts +++ b/src/lib/ae_events/ae_events__event.ts @@ -664,138 +664,6 @@ export async function search__event({ export const qry_ae_obj_li__event = search__event; - -/** - * Specialized search function for IDAA module using legacy V2 endpoints. - * This is isolated to prevent V3 migration bugs from affecting Recovery Meetings. - */ -// Updated 2026-01-20 -// export async function qry_ae_obj_li__event_v2({ -// api_cfg, -// for_obj_type = 'account', -// for_obj_id, -// qry_str, -// qry_person_id = null, -// qry_conference = null, -// qry_physical = null, -// qry_virtual = null, -// qry_type = null, -// enabled = 'enabled', -// hidden = 'not_hidden', -// view = 'default', -// limit = 99, -// offset = 0, -// order_by_li = { start_datetime: 'DESC' } as const, -// try_cache = true, -// log_lvl = 0 -// }: { -// api_cfg: any; -// for_obj_type?: string; -// for_obj_id: string; -// qry_str?: string; -// qry_person_id?: string | null; -// qry_conference?: boolean | null; -// qry_physical?: boolean | null; -// qry_virtual?: boolean | null; -// qry_type?: string | null; -// enabled?: 'enabled' | 'all' | 'not_enabled'; -// hidden?: 'hidden' | 'all' | 'not_hidden'; -// view?: string; -// limit?: number; -// offset?: number; -// order_by_li?: Record; -// try_cache?: boolean; -// log_lvl?: number; -// }) { -// if (log_lvl) console.log('*** qry_ae_obj_li__event_v2() ***'); - -// const params_json: any = { qry: { and: [] } }; - -// if (qry_str) { -// // Use default_qry_str for searching as requested -// params_json.qry.and.push({ field: 'default_qry_str', op: 'like', value: `%${qry_str}%` }); -// } - -// const result_li = await get_ae_obj_li_for_obj_id_crud_v2({ -// api_cfg, -// obj_type: 'event', -// for_obj_type, -// for_obj_id, -// enabled, -// hidden, -// limit, -// offset, -// order_by_li, -// params_json, -// log_lvl -// }); - -// if (!result_li) return []; - -// const processed_obj_li = await process_ae_obj__event_props({ -// obj_li: result_li, -// log_lvl: log_lvl -// }); - -// if (try_cache) { -// await db_save_ae_obj_li__ae_obj({ -// db_instance: db_events, -// table_name: 'event', -// obj_li: processed_obj_li, -// properties_to_save: properties_to_save, -// log_lvl: log_lvl -// }); -// } - -// // Client-side Filter Layer -// const filtered_obj_li = processed_obj_li.filter((ev: any) => { -// // Handle conference filter -// if (qry_conference != null) { -// const ev_conf = ev.conference === true || ev.conference === 1 || ev.conference === '1'; -// if (ev_conf !== !!qry_conference) return false; -// } - -// // Location Filtering (Inclusive OR logic) -// // If either filter is explicitly true, we restrict results. -// // If both are false or null, we show everything. -// if (qry_physical === true || qry_virtual === true) { -// const ev_physical = ev.physical === true || ev.physical === 1 || ev.physical === '1'; -// const ev_virtual = ev.virtual === true || ev.virtual === 1 || ev.virtual === '1'; - -// let match = false; -// if (qry_physical === true && ev_physical) match = true; -// if (qry_virtual === true && ev_virtual) match = true; - -// if (!match) return false; -// } - -// // Handle type filter (skip if null, undefined, 'all', or empty string) -// if (qry_type != null && qry_type !== 'all' && qry_type !== '') { -// if (ev.type !== qry_type) return false; -// } - -// // Handle person ID filter -// if (qry_person_id) { -// const match = ( -// ev.external_person_id === qry_person_id || -// ev.poc_person_id === qry_person_id || -// ev.poc_person_id_random === qry_person_id || -// ev.poc_event_person_id === qry_person_id || -// ev.poc_event_person_id_random === qry_person_id -// ); -// if (!match) return false; -// } - -// return true; -// }); - -// if (log_lvl) { -// console.log(`Filter results (V2): Input=${processed_obj_li.length}, Output=${filtered_obj_li.length}`); -// } - -// return filtered_obj_li.slice(0, limit); -// } - // Updated 2026-03-10 export const properties_to_save = [ 'id', diff --git a/src/lib/ae_events/ae_events_functions.ts b/src/lib/ae_events/ae_events_functions.ts index d242f1b1..90fee808 100644 --- a/src/lib/ae_events/ae_events_functions.ts +++ b/src/lib/ae_events/ae_events_functions.ts @@ -41,7 +41,6 @@ const export_obj = { load_ae_obj_li__event: event.load_ae_obj_li__event, qry_ae_obj_li__event: event.qry_ae_obj_li__event, search__event: event.search__event, - // qry_ae_obj_li__event_v2: event.qry_ae_obj_li__event_v2, create_ae_obj__event: event.create_ae_obj__event, delete_ae_obj_id__event: event.delete_ae_obj_id__event, update_ae_obj__event: event.update_ae_obj__event, diff --git a/src/lib/api/api.ts b/src/lib/api/api.ts index 449a82ec..95ab0789 100644 --- a/src/lib/api/api.ts +++ b/src/lib/api/api.ts @@ -663,7 +663,7 @@ const obj = { create_nested_obj: create_nested_obj, update_ae_obj: update_ae_obj, update_nested_obj: update_nested_obj, - delete_ae_obj:delete_ae_obj, + delete_ae_obj:delete_ae_obj, delete_nested_ae_obj: delete_nested_ae_obj, create_ae_obj_crud: create_ae_obj_crud, update_ae_obj_id_crud: update_ae_obj_id_crud, diff --git a/src/routes/events/[event_id]/(badges)/badges/[badge_id]/ae_comp__badge_print_controls.svelte b/src/routes/events/[event_id]/(badges)/badges/[badge_id]/ae_comp__badge_print_controls.svelte index 84cea78b..66dd58dc 100644 --- a/src/routes/events/[event_id]/(badges)/badges/[badge_id]/ae_comp__badge_print_controls.svelte +++ b/src/routes/events/[event_id]/(badges)/badges/[badge_id]/ae_comp__badge_print_controls.svelte @@ -387,12 +387,12 @@ // --- Focus management: focus the input when its accordion opens --- // rAF gives the CSS accordion one repaint tick before focus() is called, // avoiding jumping to an invisible (height: 0) element. - let input_ref_name: HTMLInputElement | undefined; - let input_ref_title: HTMLInputElement | undefined; - let input_ref_affiliations: HTMLTextAreaElement | undefined; - let input_ref_location: HTMLInputElement | undefined; - let input_ref_pronouns: HTMLInputElement | undefined; - let input_ref_allow_tracking: HTMLInputElement | undefined; + let input_ref_name: HTMLInputElement | undefined = $state(); + let input_ref_title: HTMLInputElement | undefined = $state(); + let input_ref_affiliations: HTMLTextAreaElement | undefined = $state(); + let input_ref_location: HTMLInputElement | undefined = $state(); + let input_ref_pronouns: HTMLInputElement | undefined = $state(); + let input_ref_allow_tracking: HTMLInputElement | undefined = $state(); let select_ref_badge_type: HTMLSelectElement | undefined = $state(); $effect(() => {