Scott.Idem/OSIT-AE-App-Svelte
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(leads): fix native calls and apply batch formatting

Browse Source 
- Corrected native 'event.preventDefault()' calls in exhibit search components.
- Applied batch formatting (printWidth: 80) across the leads module.
This commit is contained in:
Scott Idem
2026-02-06 14:59:09 -05:00
parent 5385eacc0f
commit 9ea94c0727
5 changed files with 249 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
src/routes/events/[event_id]/(leads)/leads/+page.svelte
View File

@@ -2,7 +2,11 @@
import { onMount, untrack } from 'svelte';
import { liveQuery } from 'dexie';
import { db_events } from '$lib/ae_events/db_events';
import { events_loc, events_sess, events_slct } from '$lib/stores/ae_events_stores';
import {
events_loc,
events_sess,
events_slct
} from '$lib/stores/ae_events_stores';
import { ae_api, ae_loc } from '$lib/stores/ae_stores';
import { page } from '$app/state';
import { events_func } from '$lib/ae_events_functions';
@@ -11,10 +15,14 @@
// *** Initialization & Store Guard ***
if ($events_loc.leads) {
if (typeof $events_loc.leads.search_version === 'undefined') $events_loc.leads.search_version = 0;
if (typeof $events_loc.leads.qry__remote_first === 'undefined') $events_loc.leads.qry__remote_first = false;
if (typeof $events_loc.leads.qry__search_text === 'undefined') $events_loc.leads.qry__search_text = '';
if (typeof $events_loc.leads.qry__sort_order === 'undefined') $events_loc.leads.qry__sort_order = 'name_asc';
if (typeof $events_loc.leads.search_version === 'undefined')
$events_loc.leads.search_version = 0;
if (typeof $events_loc.leads.qry__remote_first === 'undefined')
$events_loc.leads.qry__remote_first = false;
if (typeof $events_loc.leads.qry__search_text === 'undefined')
$events_loc.leads.qry__search_text = '';
if (typeof $events_loc.leads.qry__sort_order === 'undefined')
$events_loc.leads.qry__sort_order = 'name_asc';
}
let exhibit_id_li: Array<string> = $state([]);
@@ -27,14 +35,14 @@
let lq__event_exhibit_obj_li = $derived.by(() => {
const ids = exhibit_id_li;
const event_id = page.params.event_id;
return liveQuery(async () => {
// SCENARIO 1: Specific IDs provided (Search Results)
if (Array.isArray(ids) && ids.length > 0) {
const results = await db_events.exhibit.bulkGet(ids);
return results.filter(item => item !== undefined);
return results.filter((item) => item !== undefined);
}
// SCENARIO 2: Fallback broad search
if (event_id && !$events_loc.leads.qry__search_text) {
return await db_events.exhibit
@@ -77,7 +85,7 @@
const current_search_id = ++last_search_id;
const event_id = params.event_id;
const remote_first = params.remote_first;
if (!event_id) return;
untrack(() => {
@@ -92,11 +100,15 @@
let local_results = await db_events.exhibit
.where('event_id_random')
.equals(event_id)
.filter(exhibit => {
.filter((exhibit) => {
if (qry_str) {
const name = (exhibit.name ?? '').toLowerCase();
const code = (exhibit.code ?? '').toLowerCase();
if (!name.includes(qry_str) && !code.includes(qry_str)) return false;
if (
!name.includes(qry_str) &&
!code.includes(qry_str)
)
return false;
}
return true;
})
@@ -104,16 +116,27 @@
local_results.sort((a, b) => {
switch (params.sort) {
case 'name_asc': return (a.name ?? '').localeCompare(b.name ?? '');
case 'name_desc': return (b.name ?? '').localeCompare(a.name ?? '');
case 'code_asc': return (a.code ?? '').localeCompare(b.code ?? '');
case 'code_desc': return (b.code ?? '').localeCompare(a.code ?? '');
case 'updated_desc': return new Date(b.updated_on || 0).getTime() - new Date(a.updated_on || 0).getTime();
default: return (a.name ?? '').localeCompare(b.name ?? '');
case 'name_asc':
return (a.name ?? '').localeCompare(b.name ?? '');
case 'name_desc':
return (b.name ?? '').localeCompare(a.name ?? '');
case 'code_asc':
return (a.code ?? '').localeCompare(b.code ?? '');
case 'code_desc':
return (b.code ?? '').localeCompare(a.code ?? '');
case 'updated_desc':
return (
new Date(b.updated_on || 0).getTime() -
new Date(a.updated_on || 0).getTime()
);
default:
return (a.name ?? '').localeCompare(b.name ?? '');
}
});
const local_ids = local_results.map(e => String(e.id || e.event_exhibit_id_random)).filter(Boolean);
const local_ids = local_results
.map((e) => String(e.id || e.event_exhibit_id_random))
.filter(Boolean);
if (current_search_id === last_search_id) {
untrack(() => {
exhibit_id_li = local_ids;
@@ -128,12 +151,23 @@
try {
let order_by_li: any = {};
switch (params.sort) {
case 'name_asc': order_by_li = { name: 'ASC' }; break;
case 'name_desc': order_by_li = { name: 'DESC' }; break;
case 'code_asc': order_by_li = { code: 'ASC' }; break;
case 'code_desc': order_by_li = { code: 'DESC' }; break;
case 'updated_desc': order_by_li = { updated_on: 'DESC' }; break;
default: order_by_li = { name: 'ASC' };
case 'name_asc':
order_by_li = { name: 'ASC' };
break;
case 'name_desc':
order_by_li = { name: 'DESC' };
break;
case 'code_asc':
order_by_li = { code: 'ASC' };
break;
case 'code_desc':
order_by_li = { code: 'DESC' };
break;
case 'updated_desc':
order_by_li = { updated_on: 'DESC' };
break;
default:
order_by_li = { name: 'ASC' };
}
const results = await events_func.search__exhibit({
@@ -145,7 +179,9 @@
});
if (current_search_id === last_search_id) {
const api_ids = results.map((e: any) => String(e.id || e.event_exhibit_id_random)).filter(Boolean);
const api_ids = results
.map((e: any) => String(e.id || e.event_exhibit_id_random))
.filter(Boolean);
untrack(() => {
exhibit_id_li = api_ids;
$events_sess.leads.submit_status__search = 'done';
@@ -161,33 +197,40 @@
}
</script>
<section class="ae_events_leads_new h-full w-full flex flex-col items-center space-y-4 p-4">
<section
class="ae_events_leads_new h-full w-full flex flex-col items-center space-y-4 p-4"
>
<h1 class="h2">Exhibitor Leads</h1>
<Comp_exhibit_search
event_id={page.params.event_id ?? ''}
/>
<Comp_exhibit_search event_id={page.params.event_id ?? ''} />
{#if $events_sess.leads.submit_status__search === 'searching' && exhibit_id_li.length === 0}
<div class="flex flex-col items-center justify-center p-10 opacity-50 text-center">
<div
class="flex flex-col items-center justify-center p-10 opacity-50 text-center"
>
<LoaderCircle size="3em" class="animate-spin mb-4 mx-auto" />
<p class="text-xl">Searching exhibits...</p>
</div>
{:else if $lq__event_exhibit_obj_li && $lq__event_exhibit_obj_li.length > 0}
<h2 class="h3">Select your exhibit from the list</h2>
<div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4 w-full max-w-6xl">
<div
class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4 w-full max-w-6xl"
>
{#each $lq__event_exhibit_obj_li as exhibit_obj}
<a
href="/events/{page.params.event_id}/leads/exhibit/{exhibit_obj.id_random}"
<a
href="/events/{page.params
.event_id}/leads/exhibit/{exhibit_obj.id_random}"
class="card card-hover p-4 flex flex-col items-center justify-center text-center space-y-2 preset-tonal"
>
<Store size="2em" />
<div class="font-bold text-lg">{exhibit_obj.name}</div>
<div class="badge preset-filled-surface-500">Booth #{exhibit_obj.code}</div>
<div class="badge preset-filled-surface-500">
Booth #{exhibit_obj.code}
</div>
</a>
{/each}
</div>
{:else}
<p class="opacity-50 mt-10">No exhibits found matching your search.</p>
{/if}
</section>
</section>