diff --git a/documentation/MODULE__AE_Events_Badges.md b/documentation/MODULE__AE_Events_Badges.md index 3e2eebc5..616fc928 100644 --- a/documentation/MODULE__AE_Events_Badges.md +++ b/documentation/MODULE__AE_Events_Badges.md @@ -535,8 +535,8 @@ Button has `data-testid="badge-print-btn"` and shows loading/done/error states w **Indexed Fields:** ```typescript badge: ` - event_badge_id_random, event_badge_id, id, - event_id, event_id_random, + event_badge_id, id, + event_id, full_name, full_name_override, email, email_override, affiliations, affiliations_override, badge_type, badge_type_code, badge_type_code_override, badge_type_override, diff --git a/documentation/MODULE__AE_Events_Exhibitor_Leads.md b/documentation/MODULE__AE_Events_Exhibitor_Leads.md index 9f7a7696..e61df54d 100644 --- a/documentation/MODULE__AE_Events_Exhibitor_Leads.md +++ b/documentation/MODULE__AE_Events_Exhibitor_Leads.md @@ -132,7 +132,7 @@ One exhibitor's presence at an event. | Field | Purpose | |---|---| -| `event_exhibit_id` / `event_exhibit_id_random` | Primary / URL-safe ID | +| `event_exhibit_id` | Primary / URL-safe ID | | `name` | Exhibitor display name | | `code` | Booth number | | `staff_passcode` | Shared sign-in code | @@ -232,4 +232,4 @@ Guard in [ae_tab__manage.svelte](src/routes/events/[event_id]/(leads)/leads/exhi - `license_max` controls how many licensed staff slots an exhibit can have - Export endpoint: `GET /v3/action/event_exhibit/{id}/tracking_export` — requires `leads_api_access` - Custom questions are stored per-exhibit in `leads_custom_questions_json` (not global) -- The exhibitor landing page link format: `/events/[event_id]/leads/exhibit/[exhibit_exhibit_id_random]/` +- The exhibitor landing page link format: `/events/[event_id]/leads/exhibit/[exhibit_exhibit_id]/` diff --git a/documentation/PROJECT__Use_AE_API_V3_CRUD_upgrade.md b/documentation/PROJECT__Use_AE_API_V3_CRUD_upgrade.md index b2808462..7010bb90 100644 --- a/documentation/PROJECT__Use_AE_API_V3_CRUD_upgrade.md +++ b/documentation/PROJECT__Use_AE_API_V3_CRUD_upgrade.md @@ -106,7 +106,7 @@ V3 returns detailed error metadata in the `meta.details` object. **Symptom:** Providing a string ID in a search body that the backend maps to an integer can result in **Zero Results** if the underlying view expects a string. **Final Solution (Body + Header Injection):** -1. **Body:** Inject the raw field name (e.g. `account_id_random`) into the `search_query.and` array to bypass automatic backend mapping. +1. **Body:** Inject the raw field name (e.g. `account_id`) into the `search_query.and` array to bypass automatic backend mapping. 2. **Headers:** Pass `headers: { 'x-account-id': ... }` manually to provide context for Auth validation. 3. **Isolation (IDAA):** Due to specific bugs in the IDAA module, it has been temporarily isolated to a legacy V2 search function (`qry_ae_obj_li__event_v2`) using `default_qry_str` for text searching, while the main module continues to use the V3 implementation. diff --git a/eslint.config.js b/eslint.config.js index 85b2252e..575c7b4b 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -32,7 +32,9 @@ export default tseslint.config( }, { rules: { - '@typescript-eslint/no-unused-vars': 'warn' + '@typescript-eslint/no-unused-vars': 'warn', + // No base path configured — this rule is not applicable to this project + 'svelte/no-navigation-without-resolve': 'off' } } ); diff --git a/src/lib/ae_events/ae_events__exhibit_tracking.ts b/src/lib/ae_events/ae_events__exhibit_tracking.ts index 5e1ca7d5..4d4c57b1 100644 --- a/src/lib/ae_events/ae_events__exhibit_tracking.ts +++ b/src/lib/ae_events/ae_events__exhibit_tracking.ts @@ -458,6 +458,7 @@ export async function search__exhibit_tracking({ fulltext_search_qry_str = null, qry_group = null, qry_external_person_id = null, + qry_badge_id = null, enabled = 'enabled', hidden = 'all', view = 'default', @@ -473,6 +474,7 @@ export async function search__exhibit_tracking({ fulltext_search_qry_str?: string | null; qry_group?: string | null; qry_external_person_id?: string | null; + qry_badge_id?: string | null; enabled?: 'enabled' | 'all' | 'not_enabled'; hidden?: 'hidden' | 'all' | 'not_hidden'; view?: string; @@ -498,6 +500,7 @@ export async function search__exhibit_tracking({ if (qry_group) search_query.and.push({ field: 'group', op: 'eq', value: qry_group }); if (qry_external_person_id) search_query.and.push({ field: 'external_person_id', op: 'eq', value: qry_external_person_id }); + if (qry_badge_id) search_query.and.push({ field: 'event_badge_id', op: 'eq', value: qry_badge_id }); if (enabled === 'enabled') search_query.and.push({ field: 'enable', op: 'eq', value: 1 }); else if (enabled === 'not_enabled') search_query.and.push({ field: 'enable', op: 'eq', value: 0 }); diff --git a/src/lib/ae_events/db_events.ts b/src/lib/ae_events/db_events.ts index 3bfac973..cf18aa32 100644 --- a/src/lib/ae_events/db_events.ts +++ b/src/lib/ae_events/db_events.ts @@ -16,12 +16,12 @@ export interface Event { id: string; // id_random: string; event_id: string; - event_id_random: string; + event_id_random: string; // NO LONGER USE "_random" code: string; account_id: string; - account_id_random: string; + account_id_random: string; // NO LONGER USE "_random" conference: boolean; type: string; @@ -114,7 +114,7 @@ export interface Badge { id: string; // id_random: string; event_badge_id: string; - event_badge_id_random: string; + event_badge_id_random: string; // NO LONGER USE "_random" event_id: string; event_id_random: string; @@ -210,10 +210,10 @@ export interface Badge_template { // id_random: string; event_badge_template_id?: null | string; - event_badge_template_id_random?: null | string; + event_badge_template_id_random?: null | string; // NO LONGER USE "_random" event_id: string; - event_id_random: string; + event_id_random: string; // NO LONGER USE "_random" name: string; description?: null | string; @@ -274,14 +274,14 @@ export interface Badge_template { // Updated 2024-10-16 export interface Device { id: string; - // id_random: string; + // id_random: string; // NO LONGER USE "_random" event_device_id: string; - // event_device_id_random: string; + // event_device_id_random: string; // NO LONGER USE "_random" event_id: string; - // event_id_random: string; + // event_id_random: string; // NO LONGER USE "_random" event_location_id?: string; - // event_location_id_random?: string; + // event_location_id_random?: string; // NO LONGER USE "_random" code?: string; name: string; @@ -342,12 +342,12 @@ export interface Device { export interface Exhibit { id: string; - id_random: string; + id_random: string; // NO LONGER USE "_random" event_exhibit_id: string; - event_exhibit_id_random: string; + event_exhibit_id_random: string; // NO LONGER USE "_random" event_id: string; - event_id_random: string; + event_id_random: string; // NO LONGER USE "_random" code: string; name: string; @@ -380,16 +380,16 @@ export interface Exhibit { export interface Exhibit_tracking { id: string; - id_random: string; + id_random: string; // NO LONGER USE "_random" event_exhibit_tracking_id: string; - event_exhibit_tracking_id_random: string; + event_exhibit_tracking_id_random: string; // NO LONGER USE "_random" event_exhibit_id: string; - event_exhibit_id_random: string; + event_exhibit_id_random: string; // NO LONGER USE "_random" event_badge_id: string; - event_badge_id_random: string; + event_badge_id_random: string; // NO LONGER USE "_random" event_person_id: string; - event_person_id_random?: string; + event_person_id_random?: string; // NO LONGER USE "_random" event_id: string; event_id_random: string; @@ -442,28 +442,28 @@ export interface Exhibit_tracking { export interface EventFile { id: string; - id_random: string; + id_random: string; // NO LONGER USE "_random" event_file_id: string; - event_file_id_random?: string; + event_file_id_random?: string; // NO LONGER USE "_random" hosted_file_id: string; - hosted_file_id_random?: string; + hosted_file_id_random?: string; // NO LONGER USE "_random" hash_sha256: string; for_type?: string; for_id?: string; - for_id_random?: string; + for_id_random?: string; // NO LONGER USE "_random" event_id: string; - event_id_random?: string; + event_id_random?: string; // NO LONGER USE "_random" event_session_id?: string; - event_session_id_random?: string; + event_session_id_random?: string; // NO LONGER USE "_random" event_presentation_id?: string; - event_presentation_id_random?: string; + event_presentation_id_random?: string; // NO LONGER USE "_random" event_presenter_id?: string; - event_presenter_id_random?: string; + event_presenter_id_random?: string; // NO LONGER USE "_random" event_location_id?: string; - event_location_id_random?: string; + event_location_id_random?: string; // NO LONGER USE "_random" filename: string; extension: string; @@ -517,7 +517,7 @@ export interface Location { id: string; // id_random: string; event_location_id: string; - event_location_id_random: string; + event_location_id_random: string; // NO LONGER USE "_random" external_id?: null | string; code?: null | string; @@ -525,7 +525,7 @@ export interface Location { type_code?: string; event_id: string; - event_id_random: string; + event_id_random: string; // NO LONGER USE "_random" name: string; description?: null | string; @@ -571,23 +571,23 @@ export interface Presentation { id: string; // id_random: string; event_presentation_id: string; - event_presentation_id_random: string; + event_presentation_id_random: string; // NO LONGER USE "_random" external_id?: null | string; code?: null | string; for_type?: string; for_id?: string; - for_id_random?: string; + for_id_random?: string; // NO LONGER USE "_random" type_code?: string; event_id: string; - event_id_random: string; + event_id_random: string; // NO LONGER USE "_random" event_session_id: string; - event_session_id_random: string; + event_session_id_random: string; // NO LONGER USE "_random" event_abstract_id?: null | string; - event_abstract_id_random?: null | string; + event_abstract_id_random?: null | string; // NO LONGER USE "_random" abstract_code?: null | string; @@ -630,23 +630,23 @@ export interface Presenter { id: string; // id_random: string; event_presenter_id: string; - event_presenter_id_random: string; + event_presenter_id_random: string; // NO LONGER USE "_random" external_id?: string; code?: string; event_id: string; - event_id_random: string; + event_id_random: string; // NO LONGER USE "_random" event_session_id: string; - event_session_id_random: string; + event_session_id_random: string; // NO LONGER USE "_random" event_person_id?: null | string; - event_person_id_random?: null | string; + event_person_id_random?: null | string; // NO LONGER USE "_random" event_presentation_id: string; - event_presentation_id_random: string; + event_presentation_id_random: string; // NO LONGER USE "_random" person_id?: null | string; - person_id_random?: null | string; - person_profile_id?: null | string; - person_profile_id_random?: null | string; // The new table person_profile will be used soon... + person_id_random?: null | string; // NO LONGER USE "_random" + person_profile_id?: null | string; // The new table person_profile will be used soon... + person_profile_id_random?: null | string; // NO LONGER USE "_random" pronouns?: null | string; informal_name?: null | string; @@ -731,24 +731,24 @@ export interface Session { id: string; // id_random: string; event_session_id: string; - event_session_id_random: string; + event_session_id_random: string; // NO LONGER USE "_random" external_id: null | string; code: null | string; for_type: string; for_id: string; - for_id_random: string; + for_id_random: string; // NO LONGER USE "_random" type_code?: string; event_id: string; - event_id_random: string; + event_id_random: string; // NO LONGER USE "_random" event_location_id?: null | string; - event_location_id_random?: null | string; + event_location_id_random?: null | string; // NO LONGER USE "_random" poc_person_id?: null | string; - poc_person_id_random?: null | string; + poc_person_id_random?: null | string; // NO LONGER USE "_random" poc_agree?: null | boolean; // General catchall for agreement or consent by the POC poc_kv_json?: null | key_val; // Key value list of the POC by type (examples: 'advocate', 'chair', 'champion', 'moderator', 'organizer') @@ -829,6 +829,7 @@ export class MySubClassedDexie extends Dexie { constructor() { super('ae_events_db'); this.version(6).stores({ + // NO LONGER USE "_random" event: ` id, event_id, event_id_random, code, @@ -841,7 +842,6 @@ export class MySubClassedDexie extends Dexie { tmp_sort_1, tmp_sort_2, enable, hide, priority, sort, group, notes, created_on, updated_on`, - // badge: '++id, full_name, email' // Primary key and indexed props badge: ` event_badge_id_random, event_badge_id, id, event_id, event_id_random, diff --git a/src/lib/types/ae_types.ts b/src/lib/types/ae_types.ts index dd8eda13..0ffd962e 100644 --- a/src/lib/types/ae_types.ts +++ b/src/lib/types/ae_types.ts @@ -42,7 +42,7 @@ export interface ae_BaseObj { */ export interface ae_Account extends ae_BaseObj { account_id: string; - account_id_random: string; + account_id_random: string; // NO LONGER USE "_random" account_cfg?: ae_AccountCfg; } @@ -52,7 +52,7 @@ export interface ae_Account extends ae_BaseObj { */ export interface ae_AccountCfg { id: string; - account_id_random: string; + account_id_random: string; // NO LONGER USE "_random" modules_enabled?: any; default_no_reply_email?: string; @@ -70,9 +70,9 @@ export interface ae_AccountCfg { */ export interface ae_Site extends ae_BaseObj { site_id: string; - site_id_random: string; + site_id_random: string; // NO LONGER USE "_random" account_id: string; - account_id_random: string; + account_id_random: string; // NO LONGER USE "_random" url_root?: string; site_cfg_json?: any; @@ -94,11 +94,11 @@ export interface ae_Site extends ae_BaseObj { */ export interface ae_SiteDomain extends ae_BaseObj { site_domain_id: string; - site_domain_id_random: string; + site_domain_id_random: string; // NO LONGER USE "_random" site_id: string; - site_id_random: string; + site_id_random: string; // NO LONGER USE "_random" account_id?: string; - account_id_random?: string; + account_id_random?: string; // NO LONGER USE "_random" fqdn: string; is_primary?: boolean; @@ -125,15 +125,15 @@ export interface ae_SiteDomain extends ae_BaseObj { */ export interface ae_Journal extends ae_BaseObj { journal_id: string; - journal_id_random: string; + journal_id_random: string; // NO LONGER USE "_random" account_id: string; - account_id_random: string; + account_id_random: string; // NO LONGER USE "_random" person_id?: string; - person_id_random?: string; + person_id_random?: string; // NO LONGER USE "_random" for_type?: string; for_id?: string; - for_id_random?: string; + for_id_random?: string; // NO LONGER USE "_random" type_code?: string; tags?: string; @@ -163,12 +163,12 @@ export interface ae_Journal extends ae_BaseObj { */ export interface ae_JournalEntry extends ae_BaseObj { journal_entry_id: string; - // journal_entry_id_random: string; + // journal_entry_id_random: string; // NO LONGER USE "_random" journal_id: string; - // journal_id_random: string; + // journal_id_random: string; // NO LONGER USE "_random" person_id?: string; - person_id_random?: string; + person_id_random?: string; // NO LONGER USE "_random" template?: boolean; @@ -235,12 +235,12 @@ export interface ae_JournalEntry extends ae_BaseObj { */ export interface ae_Person extends ae_BaseObj { person_id: string; - person_id_random: string; + person_id_random: string; // NO LONGER USE "_random" account_id: string; - account_id_random: string; + account_id_random: string; // NO LONGER USE "_random" user_id?: string; - user_id_random?: string; + user_id_random?: string; // NO LONGER USE "_random" prefix?: string; title_names?: string; @@ -282,11 +282,11 @@ export interface ae_Person extends ae_BaseObj { */ export interface ae_User extends ae_BaseObj { user_id: string; - user_id_random: string; + user_id_random: string; // NO LONGER USE "_random" account_id: string; - account_id_random: string; + account_id_random: string; // NO LONGER USE "_random" person_id?: string; - person_id_random?: string; + person_id_random?: string; // NO LONGER USE "_random" username: string; email?: string; @@ -309,10 +309,10 @@ export interface ae_User extends ae_BaseObj { */ export interface ae_UserRole { id: string; - user_id_random: string; + user_id_random: string; // NO LONGER USE "_random" for_type?: string; - for_id_random?: string; + for_id_random?: string; // NO LONGER USE "_random" code?: string; name?: string; @@ -327,12 +327,12 @@ export interface ae_UserRole { */ export interface ae_Address extends ae_BaseObj { address_id: string; - address_id_random: string; + address_id_random: string; // NO LONGER USE "_random" account_id: string; - account_id_random: string; + account_id_random: string; // NO LONGER USE "_random" for_type?: string; - for_id_random?: string; + for_id_random?: string; // NO LONGER USE "_random" attention_to?: string; organization_name?: string; @@ -356,13 +356,13 @@ export interface ae_Address extends ae_BaseObj { */ export interface ae_Contact extends ae_BaseObj { contact_id: string; - contact_id_random: string; + contact_id_random: string; // NO LONGER USE "_random" account_id: string; - account_id_random: string; + account_id_random: string; // NO LONGER USE "_random" - address_id_random?: string; + address_id_random?: string; // NO LONGER USE "_random" for_type?: string; - for_id_random?: string; + for_id_random?: string; // NO LONGER USE "_random" title?: string; tagline?: string; @@ -382,9 +382,9 @@ export interface ae_Contact extends ae_BaseObj { */ export interface ae_ActivityLog extends ae_BaseObj { activity_log_id: string; - activity_log_id_random: string; + activity_log_id_random: string; // NO LONGER USE "_random" account_id: string; - account_id_random: string; + account_id_random: string; // NO LONGER USE "_random" person_id_random?: string; user_id_random?: string; @@ -408,9 +408,9 @@ export interface ae_ActivityLog extends ae_BaseObj { */ export interface ae_Event extends ae_BaseObj { event_id: string; - event_id_random: string; + event_id_random: string; // NO LONGER USE "_random" account_id: string; - account_id_random: string; + account_id_random: string; // NO LONGER USE "_random" conference: boolean; type?: string; @@ -453,7 +453,7 @@ export interface ae_Event extends ae_BaseObj { * EventCfg - Advanced configuration for an event */ export interface ae_EventCfg extends ae_BaseObj { - event_id_random: string; + event_id_random: string; // NO LONGER USE "_random" enable_comments?: boolean; unauthenticated_access?: boolean; @@ -468,16 +468,16 @@ export interface ae_EventCfg extends ae_BaseObj { */ export interface ae_EventBadge extends ae_BaseObj { event_badge_id: string; - event_badge_id_random: string; + event_badge_id_random: string; // NO LONGER USE "_random" event_id: string; - event_id_random: string; + event_id_random: string; // NO LONGER USE "_random" person_id: string; - person_id_random: string; + person_id_random: string; // NO LONGER USE "_random" event_person_id?: string | null; - event_person_id_random?: string | null; + event_person_id_random?: string | null; // NO LONGER USE "_random" event_badge_template_id?: string | null; - event_badge_template_id_random?: string | null; + event_badge_template_id_random?: string | null; // NO LONGER USE "_random" badge_type_code?: string | null; badge_type?: string | null; @@ -516,9 +516,9 @@ export interface ae_EventBadge extends ae_BaseObj { */ export interface ae_EventBadgeTemplate extends ae_BaseObj { event_badge_template_id: string; - event_badge_template_id_random: string; + event_badge_template_id_random: string; // NO LONGER USE "_random" event_id: string; - event_id_random: string; + event_id_random: string; // NO LONGER USE "_random" logo_path?: string | null; header_path?: string | null; @@ -541,9 +541,9 @@ export interface ae_EventBadgeTemplate extends ae_BaseObj { */ export interface ae_EventLocation extends ae_BaseObj { event_location_id: string; - event_location_id_random: string; + event_location_id_random: string; // NO LONGER USE "_random" event_id: string; - event_id_random: string; + event_id_random: string; // NO LONGER USE "_random" location_type?: string | null; location_type_code?: string | null; @@ -561,13 +561,13 @@ export interface ae_EventLocation extends ae_BaseObj { */ export interface ae_EventSession extends ae_BaseObj { event_session_id: string; - event_session_id_random: string; + event_session_id_random: string; // NO LONGER USE "_random" event_id: string; - event_id_random: string; + event_id_random: string; // NO LONGER USE "_random" event_location_id?: string | null; - event_location_id_random?: string | null; + event_location_id_random?: string | null; // NO LONGER USE "_random" event_track_id?: string | null; - event_track_id_random?: string | null; + event_track_id_random?: string | null; // NO LONGER USE "_random" type_code?: string | null; start_datetime?: string | Date | null; @@ -610,13 +610,13 @@ export interface ae_EventSession extends ae_BaseObj { */ export interface ae_EventPresentation extends ae_BaseObj { event_presentation_id: string; - event_presentation_id_random: string; + event_presentation_id_random: string; // NO LONGER USE "_random" event_id: string; - event_id_random: string; + event_id_random: string; // NO LONGER USE "_random" event_session_id: string; - event_session_id_random: string; + event_session_id_random: string; // NO LONGER USE "_random" event_abstract_id?: string | null; - event_abstract_id_random?: string | null; + event_abstract_id_random?: string | null; // NO LONGER USE "_random" abstract_code?: string | null; type_code?: string | null; @@ -639,11 +639,11 @@ export interface ae_EventPresentation extends ae_BaseObj { */ export interface ae_EventPresenter extends ae_BaseObj { event_presenter_id: string; - event_presenter_id_random: string; + event_presenter_id_random: string; // NO LONGER USE "_random" event_id: string; - event_id_random: string; + event_id_random: string; // NO LONGER USE "_random" person_id?: string | null; - person_id_random?: string | null; + person_id_random?: string | null; // NO LONGER USE "_random" pronouns?: string | null; informal_name?: string | null; @@ -666,9 +666,9 @@ export interface ae_EventPresenter extends ae_BaseObj { */ export interface ae_EventTrack extends ae_BaseObj { event_track_id: string; - event_track_id_random: string; + event_track_id_random: string; // NO LONGER USE "_random" event_id: string; - event_id_random: string; + event_id_random: string; // NO LONGER USE "_random" track_type?: string; track_type_code?: string; @@ -682,9 +682,9 @@ export interface ae_EventTrack extends ae_BaseObj { */ export interface ae_HostedFile extends ae_BaseObj { hosted_file_id: string; - hosted_file_id_random: string; + hosted_file_id_random: string; // NO LONGER USE "_random" account_id: string; - account_id_random: string; + account_id_random: string; // NO LONGER USE "_random" hash_sha256?: string; subdirectory_path?: string; @@ -701,10 +701,10 @@ export interface ae_HostedFile extends ae_BaseObj { */ export interface ae_HostedFileLink { id: string; - account_id_random: string; - hosted_file_id_random: string; + account_id_random: string; // NO LONGER USE "_random" + hosted_file_id_random: string; // NO LONGER USE "_random" link_to_type: string; - link_to_id_random: string; + link_to_id_random: string; // NO LONGER USE "_random" created_on: string | Date; updated_on: string | Date; @@ -715,16 +715,16 @@ export interface ae_HostedFileLink { */ export interface ae_DataStore extends ae_BaseObj { data_store_id: string; - data_store_id_random: string; + data_store_id_random: string; // NO LONGER USE "_random" account_id?: null | string; - account_id_random?: null | string; + account_id_random?: null | string; // NO LONGER USE "_random" for_type?: null | string; - for_id_random?: null | string; + for_id_random?: null | string; // NO LONGER USE "_random" for_id?: null | string; - person_id_random?: null | string; - user_id_random?: null | string; + person_id_random?: null | string; // NO LONGER USE "_random" + user_id_random?: null | string; // NO LONGER USE "_random" type?: null | string; @@ -747,9 +747,9 @@ export interface ae_DataStore extends ae_BaseObj { */ export interface ae_Post extends ae_BaseObj { post_id: string; - // post_id_random: string; + // post_id_random: string; // NO LONGER USE "_random" account_id: string; - // account_id_random: string; + // account_id_random: string; // NO LONGER USE "_random" title: string; content: string; @@ -769,9 +769,9 @@ export interface ae_Post extends ae_BaseObj { */ export interface ae_PostComment extends ae_BaseObj { post_comment_id: string; - // post_comment_id_random: string; + // post_comment_id_random: string; // NO LONGER USE "_random" post_id: string; - // post_id_random: string; + // post_id_random: string; // NO LONGER USE "_random" content: string; anonymous: boolean; @@ -783,9 +783,9 @@ export interface ae_PostComment extends ae_BaseObj { */ export interface ae_Page extends ae_BaseObj { page_id: string; - page_id_random: string; + page_id_random: string; // NO LONGER USE "_random" account_id: string; - account_id_random: string; + account_id_random: string; // NO LONGER USE "_random" alias: string; title: string; @@ -801,9 +801,9 @@ export interface ae_Page extends ae_BaseObj { */ export interface ae_Archive extends ae_BaseObj { archive_id: string; - archive_id_random: string; + archive_id_random: string; // NO LONGER USE "_random" account_id: string; - account_id_random: string; + account_id_random: string; // NO LONGER USE "_random" archive_type?: string; topic_id?: string; @@ -824,8 +824,8 @@ export interface ae_Archive extends ae_BaseObj { */ export interface ae_ArchiveContent extends ae_BaseObj { archive_content_id: string; - archive_content_id_random: string; - archive_id_random: string; + archive_content_id_random: string; // NO LONGER USE "_random" + archive_id_random: string; // NO LONGER USE "_random" archive_content_type?: string; content_html?: string; @@ -833,7 +833,7 @@ export interface ae_ArchiveContent extends ae_BaseObj { duration?: string; - hosted_file_id_random?: string; + hosted_file_id_random?: string; // NO LONGER USE "_random" filename?: string; subdirectory_path?: string; } @@ -843,15 +843,15 @@ export interface ae_ArchiveContent extends ae_BaseObj { */ export interface ae_EventFile extends ae_BaseObj { event_file_id: string; - event_file_id_random?: string; + event_file_id_random?: string; // NO LONGER USE "_random" event_id: string; - event_id_random?: string; + event_id_random?: string; // NO LONGER USE "_random" hosted_file_id: string; - hosted_file_id_random?: string; + hosted_file_id_random?: string; // NO LONGER USE "_random" for_type?: string | null; - for_id_random?: string | null; + for_id_random?: string | null; // NO LONGER USE "_random" filename?: string; filename_no_ext?: string; @@ -868,10 +868,10 @@ export interface ae_EventFile extends ae_BaseObj { */ export interface ae_EventDevice extends ae_BaseObj { event_device_id: string; - event_device_id_random: string; + event_device_id_random: string; // NO LONGER USE "_random" event_id: string; - event_id_random: string; - event_location_id_random?: string; + event_id_random: string; // NO LONGER USE "_random" + event_location_id_random?: string; // NO LONGER USE "_random" app_mode?: string; status?: string; @@ -886,9 +886,9 @@ export interface ae_EventDevice extends ae_BaseObj { */ export interface ae_EventAbstract extends ae_BaseObj { event_abstract_id: string; - event_abstract_id_random: string; + event_abstract_id_random: string; // NO LONGER USE "_random" event_id: string; - event_id_random: string; + event_id_random: string; // NO LONGER USE "_random" external_id?: string; abstract?: string; @@ -901,9 +901,9 @@ export interface ae_EventAbstract extends ae_BaseObj { */ export interface ae_Organization extends ae_BaseObj { organization_id: string; - organization_id_random: string; + organization_id_random: string; // NO LONGER USE "_random" account_id: string; - account_id_random: string; + account_id_random: string; // NO LONGER USE "_random" tagline?: string; logo_path?: string; @@ -915,14 +915,14 @@ export interface ae_Organization extends ae_BaseObj { */ export interface ae_EventRegistration extends ae_BaseObj { event_registration_id: string; - event_registration_id_random: string; + event_registration_id_random: string; // NO LONGER USE "_random" event_id: string; - event_id_random: string; + event_id_random: string; // NO LONGER USE "_random" person_id: string; - person_id_random: string; + person_id_random: string; // NO LONGER USE "_random" - organization_id_random?: string; - contact_id_random?: string; + organization_id_random?: string; // NO LONGER USE "_random" + contact_id_random?: string; // NO LONGER USE "_random" } /** @@ -930,13 +930,13 @@ export interface ae_EventRegistration extends ae_BaseObj { */ export interface ae_EventExhibit extends ae_BaseObj { event_exhibit_id: string; - event_exhibit_id_random: string; + event_exhibit_id_random: string; // NO LONGER USE "_random" event_id: string; - event_id_random: string; + event_id_random: string; // NO LONGER USE "_random" - organization_id_random?: string; - contact_id_random?: string; - person_id_random?: string; + organization_id_random?: string; // NO LONGER USE "_random" + contact_id_random?: string; // NO LONGER USE "_random" + person_id_random?: string; // NO LONGER USE "_random" tagline?: string; logo_path?: string; @@ -948,13 +948,13 @@ export interface ae_EventExhibit extends ae_BaseObj { */ export interface ae_EventExhibitTracking extends ae_BaseObj { event_exhibit_tracking_id: string; - event_exhibit_tracking_id_random: string; + event_exhibit_tracking_id_random: string; // NO LONGER USE "_random" event_id: string; - event_id_random: string; - event_exhibit_id_random: string; + event_id_random: string; // NO LONGER USE "_random" + event_exhibit_id_random: string; // NO LONGER USE "_random" - event_person_id_random?: string; - event_badge_id_random?: string; + event_person_id_random?: string; // NO LONGER USE "_random" + event_badge_id_random?: string; // NO LONGER USE "_random" external_person_id?: string | null; @@ -968,14 +968,14 @@ export interface ae_EventExhibitTracking extends ae_BaseObj { */ export interface ae_EventPerson extends ae_BaseObj { event_person_id: string; - event_person_id_random: string; + event_person_id_random: string; // NO LONGER USE "_random" event_id: string; - event_id_random: string; + event_id_random: string; // NO LONGER USE "_random" person_id: string; - person_id_random: string; + person_id_random: string; // NO LONGER USE "_random" - event_badge_id_random?: string; - event_registration_id_random?: string; + event_badge_id_random?: string; // NO LONGER USE "_random" + event_registration_id_random?: string; // NO LONGER USE "_random" passcode?: string; agree_to_tc?: boolean; @@ -986,10 +986,10 @@ export interface ae_EventPerson extends ae_BaseObj { */ export interface ae_EventPersonProfile extends ae_BaseObj { event_person_profile_id: string; - event_person_profile_id_random: string; + event_person_profile_id_random: string; // NO LONGER USE "_random" event_id: string; - event_id_random: string; - event_person_id_random: string; + event_id_random: string; // NO LONGER USE "_random" + event_person_id_random: string; // NO LONGER USE "_random" tagline?: string; biography?: string; @@ -1003,11 +1003,11 @@ export interface ae_EventPersonProfile extends ae_BaseObj { * EventPersonTracking - Attendance and session interaction tracking */ export interface ae_EventPersonTracking extends ae_BaseObj { - event_person_id_random: string; + event_person_id_random: string; // NO LONGER USE "_random" event_id: string; - event_id_random: string; + event_id_random: string; // NO LONGER USE "_random" - event_session_id_random?: string; + event_session_id_random?: string; // NO LONGER USE "_random" check_in_out?: boolean; in_datetime?: string | Date; @@ -1019,11 +1019,11 @@ export interface ae_EventPersonTracking extends ae_BaseObj { */ export interface ae_Sponsorship extends ae_BaseObj { sponsorship_id: string; - sponsorship_id_random: string; + sponsorship_id_random: string; // NO LONGER USE "_random" account_id: string; - account_id_random: string; + account_id_random: string; // NO LONGER USE "_random" - sponsorship_cfg_id_random: string; + sponsorship_cfg_id_random: string; // NO LONGER USE "_random" amount?: number; paid?: boolean; } @@ -1033,9 +1033,9 @@ export interface ae_Sponsorship extends ae_BaseObj { */ export interface ae_SponsorshipCfg extends ae_BaseObj { sponsorship_cfg_id: string; - sponsorship_cfg_id_random: string; + sponsorship_cfg_id_random: string; // NO LONGER USE "_random" account_id: string; - account_id_random: string; + account_id_random: string; // NO LONGER USE "_random" level_li_json?: any; start_datetime?: string | Date; @@ -1046,7 +1046,7 @@ export interface ae_SponsorshipCfg extends ae_BaseObj { * LogClientViewing - Playback and interaction tracking for media */ export interface ae_LogClientViewing extends ae_BaseObj { - account_id_random: string; + account_id_random: string; // NO LONGER USE "_random" external_client_id: string; object_type: string; diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index 6d4c9f6a..df023a3f 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -1,6 +1,5 @@
-
{ e.preventDefault(); handle_search(); }} >
-
-
+ {:else if scanning_status === 'reenable'} +
+
+ +

Previously Removed

+

{found_badge?.full_name || 'Attendee'}

+

This lead was removed. Re-activate to restore their record including any saved notes and responses.

+
+ + + + + + View Existing Record + + + +
+ {:else if scanning_status === 'already_added'}
diff --git a/src/routes/events/[event_id]/(leads)/leads/exhibit/[exhibit_id]/ae_comp__lead_qr_scanner_multi.svelte b/src/routes/events/[event_id]/(leads)/leads/exhibit/[exhibit_id]/ae_comp__lead_qr_scanner_multi.svelte index 5c73a213..6b190937 100644 --- a/src/routes/events/[event_id]/(leads)/leads/exhibit/[exhibit_id]/ae_comp__lead_qr_scanner_multi.svelte +++ b/src/routes/events/[event_id]/(leads)/leads/exhibit/[exhibit_id]/ae_comp__lead_qr_scanner_multi.svelte @@ -21,9 +21,10 @@ import { events_func } from '$lib/ae_events/ae_events_functions'; import { ae_util } from '$lib/ae_utils/ae_utils'; import type { ae_EventBadge } from '$lib/types/ae_types'; + import { SvelteMap } from 'svelte/reactivity'; import { CircleCheck, Eye, Layers, LoaderCircle, - RefreshCw, ScanLine, ShieldOff, UserPlus, X + RefreshCw, RotateCcw, ScanLine, ShieldOff, UserPlus, X } from '@lucide/svelte'; interface Props { @@ -38,7 +39,7 @@ const is_supported = typeof window !== 'undefined' && 'BarcodeDetector' in window; // --- Types --- - type BatchStatus = 'loading' | 'ready' | 'blocked' | 'already_added' | 'adding' | 'added' | 'error'; + type BatchStatus = 'loading' | 'ready' | 'blocked' | 'already_added' | 'reenable' | 'adding' | 'added' | 'error'; interface BatchItem { id: string; // badge id_random from QR @@ -49,14 +50,18 @@ } // --- Existing leads (duplicate detection) --- + // Value includes tracking_id AND enabled status so we can offer re-activation for removed leads. let existing_leads_map = $derived( liveQuery(async () => { const leads = await db_events.exhibit_tracking .where('event_exhibit_id').equals(exhibit_id).toArray(); - const map = new Map(); + const map = new SvelteMap(); leads.forEach(l => { - const b_id = l.event_badge_id_random || l.event_badge_id?.toString(); - if (b_id) map.set(b_id, l.event_exhibit_tracking_id_random || l.event_exhibit_tracking_id?.toString() || ''); + const b_id = l.event_badge_id?.toString(); + if (b_id) map.set(b_id, { + tracking_id: l.event_exhibit_tracking_id?.toString() || '', + enabled: !!l.enable + }); }); return map; }) @@ -158,8 +163,10 @@ item.badge = badge; if ($existing_leads_map?.has(item.id)) { - item.status = 'already_added'; - item.existing_tracking_id = $existing_leads_map.get(item.id) ?? ''; + const existing = $existing_leads_map.get(item.id)!; + item.existing_tracking_id = existing.tracking_id; + // Distinguish: active lead vs previously-removed lead + item.status = existing.enabled ? 'already_added' : 'reenable'; } else if (badge?.allow_tracking !== true) { // Attendee has opted out — show card so staff can inform them item.status = 'blocked'; @@ -172,7 +179,7 @@ } async function add_lead(item: BatchItem) { - if (item.status !== 'ready' || !item.badge?.event_badge_id_random) return; + if (item.status !== 'ready' || !item.badge?.event_badge_id) return; item.status = 'adding'; const user_email = $events_loc.leads.auth_exhibit_kv?.[exhibit_id]?.key || 'shared_passcode'; @@ -180,7 +187,7 @@ const result = await events_func.create_ae_obj__exhibit_tracking({ api_cfg: $ae_api, exhibit_id, - event_badge_id: item.badge.event_badge_id_random, + event_badge_id: item.badge.event_badge_id, external_person_id: user_email, group: user_email }); @@ -198,6 +205,29 @@ } } + async function reenable_lead(item: BatchItem) { + if (!item.existing_tracking_id) return; + item.status = 'adding'; + + try { + const result = await events_func.update_ae_obj__exhibit_tracking({ + api_cfg: $ae_api, + exhibit_id, + exhibit_tracking_id: item.existing_tracking_id, + data: { enable: true } + }); + if (result) { + item.status = 'added'; + if (on_lead_added && item.badge) on_lead_added(item.badge); + setTimeout(() => dismiss_item(item), 1000); + } else { + item.status = 'error'; + } + } catch { + item.status = 'error'; + } + } + async function add_all() { const to_add = batch.filter(i => i.status === 'ready' && !i.dismissing); await Promise.all(to_add.map(add_lead)); @@ -359,6 +389,33 @@
+ {:else if item.status === 'reenable'} +
+ +
+

{item.badge?.full_name || 'Attendee'}

+

Previously removed

+
+
+
+ + +
+ {:else if item.status === 'ready'}

{item.badge?.full_name || 'Badge Found'}

diff --git a/src/routes/events/[event_id]/(leads)/leads/exhibit/[exhibit_id]/lead/[exhibit_tracking_id]/+page.svelte b/src/routes/events/[event_id]/(leads)/leads/exhibit/[exhibit_id]/lead/[exhibit_tracking_id]/+page.svelte index 16def406..b288bffe 100644 --- a/src/routes/events/[event_id]/(leads)/leads/exhibit/[exhibit_id]/lead/[exhibit_tracking_id]/+page.svelte +++ b/src/routes/events/[event_id]/(leads)/leads/exhibit/[exhibit_id]/lead/[exhibit_tracking_id]/+page.svelte @@ -4,13 +4,15 @@ * Lead Detail View - Basic Read-Only version. */ import { page } from '$app/state'; + import { goto } from '$app/navigation'; import { liveQuery } from 'dexie'; import { db_events } from '$lib/ae_events/db_events'; import { ae_util } from '$lib/ae_utils/ae_utils'; import { ae_api, ae_loc } from '$lib/stores/ae_stores'; + import { events_func } from '$lib/ae_events/ae_events_functions'; import Element_ae_obj_field_editor_v3 from '$lib/elements/element_ae_obj_field_editor_v3.svelte'; import Comp_lead_detail_form from './ae_comp__lead_detail_form.svelte'; - import { Briefcase, CalendarDays, ChevronLeft, Eye, FileText, ListTodo, LoaderCircle, Mail, MapPin, ShieldCheck, SquarePen, Star, Store, User } from '@lucide/svelte'; + import { Briefcase, CalendarDays, ChevronLeft, Eye, FileText, ListTodo, LoaderCircle, Mail, MapPin, RotateCcw, ShieldCheck, SquarePen, Star, Store, Trash2, User } from '@lucide/svelte'; const exhibit_tracking_id = $derived(page.params.exhibit_tracking_id); let lq__lead_obj = $derived( @@ -30,6 +32,46 @@ let is_edit_mode = $state(false); + // Remove / Restore flow. + // Two-click confirm for remove: idle → confirm → removing → (navigate back). + let remove_status = $state<'idle' | 'confirm' | 'removing' | 'restoring'>('idle'); + + async function remove_lead() { + const eid = page.params.exhibit_id ?? ''; + if (!exhibit_tracking_id || !eid) return; + remove_status = 'removing'; + try { + await events_func.update_ae_obj__exhibit_tracking({ + api_cfg: $ae_api, + exhibit_id: eid, + exhibit_tracking_id, + data: { enable: false } + }); + // Navigate back to exhibit leads list after removal + goto(`/events/${page.params.event_id}/leads/exhibit/${eid}`); + } catch { + // If update fails, reset so user can try again + remove_status = 'idle'; + } + } + + async function restore_lead() { + const eid = page.params.exhibit_id ?? ''; + if (!exhibit_tracking_id || !eid) return; + remove_status = 'restoring'; + try { + await events_func.update_ae_obj__exhibit_tracking({ + api_cfg: $ae_api, + exhibit_id: eid, + exhibit_tracking_id, + data: { enable: true } + }); + remove_status = 'idle'; + } catch { + remove_status = 'idle'; + } + } + // Helper to format date using Aether utility function format_date(date: any) { if (!date) return ''; @@ -57,11 +99,11 @@
{#if $lq__lead_obj} - + + + {#if $lq__lead_obj.enable} + {#if remove_status === 'confirm'} + + + {:else} + + {/if} + {/if} {/if} {#if $lq__lead_obj?.priority} @@ -238,28 +314,33 @@
- -
- {#if is_edit_mode} -
-
Enabled
- + + {#if !$lq__lead_obj.enable} +
+
+ +
+
Lead Removed
+
Not visible in leads list
+
- {:else} - -
-
{$lq__lead_obj.enable ? 'Record Enabled' : 'Record Disabled'}
-
Visibility Status
-
- {/if} -
+ +
+ {/if}
diff --git a/tests/event_badge_attendee_workflow.test.ts b/tests/event_badge_attendee_workflow.test.ts index 9270c093..d5ed1a77 100644 --- a/tests/event_badge_attendee_workflow.test.ts +++ b/tests/event_badge_attendee_workflow.test.ts @@ -22,11 +22,11 @@ const template_id = 'jgfixEpYp1B'; const mock_badge = { id: badge_id, event_badge_id: badge_id, - event_badge_id_random: badge_id, + event_badge_id_random: badge_id, // NO LONGER USE "_random" event_id: event_id, event_id_random: event_id, event_badge_template_id: template_id, - event_badge_template_id_random: template_id, + event_badge_template_id_random: template_id, // NO LONGER USE "_random" full_name_override: 'Scott Idem', given_name: 'Scott', family_name: 'Idem', @@ -41,7 +41,7 @@ const mock_badge = { const mock_template = { id: template_id, - id_random: template_id, + id_random: template_id, // NO LONGER USE "_random" event_badge_template_id: template_id, badge_template_id: template_id, event_id: event_id, diff --git a/tests/event_badge_render.test.ts b/tests/event_badge_render.test.ts index e887c2e2..75084716 100644 --- a/tests/event_badge_render.test.ts +++ b/tests/event_badge_render.test.ts @@ -42,11 +42,11 @@ function make_badge(badge_id: string, template_id: string, overrides: Record