Last round of prettier: npx prettier --write src/
This commit is contained in:
@@ -46,7 +46,9 @@ export async function load_ae_obj_id__event({
|
||||
log_lvl?: number;
|
||||
}): Promise<ae_Event | null> {
|
||||
if (log_lvl) {
|
||||
console.log(`*** load_ae_obj_id__event() *** event_id=${event_id} (SWR Optimization)`);
|
||||
console.log(
|
||||
`*** load_ae_obj_id__event() *** event_id=${event_id} (SWR Optimization)`
|
||||
);
|
||||
}
|
||||
|
||||
// Hierarchy Enforcement: Pulling presentations/presenters requires pulling sessions first
|
||||
@@ -57,20 +59,43 @@ export async function load_ae_obj_id__event({
|
||||
try {
|
||||
const cached_event = await db_events.event.get(event_id);
|
||||
if (cached_event) {
|
||||
if (log_lvl) console.log('EVENT LOAD: Cache hit. Returning stale data immediately.');
|
||||
if (log_lvl)
|
||||
console.log(
|
||||
'EVENT LOAD: Cache hit. Returning stale data immediately.'
|
||||
);
|
||||
|
||||
// Trigger background refresh
|
||||
_refresh_event_background({
|
||||
api_cfg, event_id, view, try_cache,
|
||||
inc_device_li, inc_file_li, inc_location_li, inc_session_li, inc_presentation_li, inc_presenter_li, inc_template_li,
|
||||
enabled, hidden,
|
||||
api_cfg,
|
||||
event_id,
|
||||
view,
|
||||
try_cache,
|
||||
inc_device_li,
|
||||
inc_file_li,
|
||||
inc_location_li,
|
||||
inc_session_li,
|
||||
inc_presentation_li,
|
||||
inc_presenter_li,
|
||||
inc_template_li,
|
||||
enabled,
|
||||
hidden,
|
||||
log_lvl: 0
|
||||
});
|
||||
|
||||
// Still handle nested loads for the cached version to ensure UI richness
|
||||
return await _handle_nested_loads(cached_event, {
|
||||
api_cfg, inc_device_li, inc_file_li, inc_location_li, inc_session_li, inc_presentation_li, inc_presenter_li, inc_template_li,
|
||||
enabled, hidden, try_cache, log_lvl
|
||||
api_cfg,
|
||||
inc_device_li,
|
||||
inc_file_li,
|
||||
inc_location_li,
|
||||
inc_session_li,
|
||||
inc_presentation_li,
|
||||
inc_presenter_li,
|
||||
inc_template_li,
|
||||
enabled,
|
||||
hidden,
|
||||
try_cache,
|
||||
log_lvl
|
||||
});
|
||||
}
|
||||
} catch (e) {
|
||||
@@ -80,9 +105,19 @@ export async function load_ae_obj_id__event({
|
||||
|
||||
// 2. SLOW PATH: Wait for API if cache is empty or try_cache is false
|
||||
return await _refresh_event_background({
|
||||
api_cfg, event_id, view, try_cache,
|
||||
inc_device_li, inc_file_li, inc_location_li, inc_session_li, inc_presentation_li, inc_presenter_li, inc_template_li,
|
||||
enabled, hidden,
|
||||
api_cfg,
|
||||
event_id,
|
||||
view,
|
||||
try_cache,
|
||||
inc_device_li,
|
||||
inc_file_li,
|
||||
inc_location_li,
|
||||
inc_session_li,
|
||||
inc_presentation_li,
|
||||
inc_presenter_li,
|
||||
inc_template_li,
|
||||
enabled,
|
||||
hidden,
|
||||
log_lvl
|
||||
});
|
||||
}
|
||||
@@ -91,9 +126,19 @@ export async function load_ae_obj_id__event({
|
||||
* Internal helper to perform the actual API fetch and cache update for events
|
||||
*/
|
||||
async function _refresh_event_background({
|
||||
api_cfg, event_id, view, try_cache,
|
||||
inc_device_li, inc_file_li, inc_location_li, inc_session_li, inc_presentation_li, inc_presenter_li, inc_template_li,
|
||||
enabled, hidden,
|
||||
api_cfg,
|
||||
event_id,
|
||||
view,
|
||||
try_cache,
|
||||
inc_device_li,
|
||||
inc_file_li,
|
||||
inc_location_li,
|
||||
inc_session_li,
|
||||
inc_presentation_li,
|
||||
inc_presenter_li,
|
||||
inc_template_li,
|
||||
enabled,
|
||||
hidden,
|
||||
log_lvl
|
||||
}: any) {
|
||||
// Check if offline
|
||||
@@ -129,8 +174,18 @@ async function _refresh_event_background({
|
||||
}
|
||||
|
||||
return await _handle_nested_loads(processed_obj, {
|
||||
api_cfg, inc_device_li, inc_file_li, inc_location_li, inc_session_li, inc_presentation_li, inc_presenter_li, inc_template_li,
|
||||
enabled, hidden, try_cache: false, log_lvl
|
||||
api_cfg,
|
||||
inc_device_li,
|
||||
inc_file_li,
|
||||
inc_location_li,
|
||||
inc_session_li,
|
||||
inc_presentation_li,
|
||||
inc_presenter_li,
|
||||
inc_template_li,
|
||||
enabled,
|
||||
hidden,
|
||||
try_cache: false,
|
||||
log_lvl
|
||||
});
|
||||
}
|
||||
} catch (error: any) {
|
||||
@@ -142,8 +197,27 @@ async function _refresh_event_background({
|
||||
/**
|
||||
* Shared logic for loading nested child collections
|
||||
*/
|
||||
async function _handle_nested_loads(event_obj: any, { api_cfg, inc_device_li, inc_file_li, inc_location_li, inc_session_li, inc_presentation_li, inc_presenter_li, inc_template_li, enabled, hidden, try_cache, log_lvl }: any) {
|
||||
if (log_lvl) console.log(`Loading nested collections for event: ${event_obj.event_id} (Devices: ${inc_device_li}, Files: ${inc_file_li}, Locations: ${inc_location_li}, Sessions: ${inc_session_li}, Presentations: ${inc_presentation_li}, Presenters: ${inc_presenter_li}, Templates: ${inc_template_li})`);
|
||||
async function _handle_nested_loads(
|
||||
event_obj: any,
|
||||
{
|
||||
api_cfg,
|
||||
inc_device_li,
|
||||
inc_file_li,
|
||||
inc_location_li,
|
||||
inc_session_li,
|
||||
inc_presentation_li,
|
||||
inc_presenter_li,
|
||||
inc_template_li,
|
||||
enabled,
|
||||
hidden,
|
||||
try_cache,
|
||||
log_lvl
|
||||
}: any
|
||||
) {
|
||||
if (log_lvl)
|
||||
console.log(
|
||||
`Loading nested collections for event: ${event_obj.event_id} (Devices: ${inc_device_li}, Files: ${inc_file_li}, Locations: ${inc_location_li}, Sessions: ${inc_session_li}, Presentations: ${inc_presentation_li}, Presenters: ${inc_presenter_li}, Templates: ${inc_template_li})`
|
||||
);
|
||||
// String-Only ID Vision: the '_id' field IS the string ID
|
||||
const current_event_id = event_obj.id || event_obj.event_id;
|
||||
|
||||
@@ -151,56 +225,66 @@ async function _handle_nested_loads(event_obj: any, { api_cfg, inc_device_li, in
|
||||
const tasks = [];
|
||||
|
||||
if (inc_device_li) {
|
||||
tasks.push(load_ae_obj_li__event_device({
|
||||
api_cfg,
|
||||
for_obj_type: 'event',
|
||||
for_obj_id: current_event_id,
|
||||
try_cache,
|
||||
log_lvl
|
||||
}).then(res => event_obj.event_device_obj_li = res));
|
||||
tasks.push(
|
||||
load_ae_obj_li__event_device({
|
||||
api_cfg,
|
||||
for_obj_type: 'event',
|
||||
for_obj_id: current_event_id,
|
||||
try_cache,
|
||||
log_lvl
|
||||
}).then((res) => (event_obj.event_device_obj_li = res))
|
||||
);
|
||||
}
|
||||
if (inc_file_li) {
|
||||
tasks.push(load_ae_obj_li__event_file({
|
||||
api_cfg,
|
||||
for_obj_type: 'event',
|
||||
for_obj_id: current_event_id,
|
||||
enabled: 'all',
|
||||
limit: 100,
|
||||
try_cache,
|
||||
log_lvl
|
||||
}).then(res => event_obj.event_file_li = res));
|
||||
tasks.push(
|
||||
load_ae_obj_li__event_file({
|
||||
api_cfg,
|
||||
for_obj_type: 'event',
|
||||
for_obj_id: current_event_id,
|
||||
enabled: 'all',
|
||||
limit: 100,
|
||||
try_cache,
|
||||
log_lvl
|
||||
}).then((res) => (event_obj.event_file_li = res))
|
||||
);
|
||||
}
|
||||
if (inc_location_li) {
|
||||
tasks.push(load_ae_obj_li__event_location({
|
||||
api_cfg,
|
||||
for_obj_type: 'event',
|
||||
for_obj_id: current_event_id,
|
||||
enabled,
|
||||
hidden,
|
||||
try_cache,
|
||||
log_lvl
|
||||
}).then(res => event_obj.event_location_obj_li = res));
|
||||
tasks.push(
|
||||
load_ae_obj_li__event_location({
|
||||
api_cfg,
|
||||
for_obj_type: 'event',
|
||||
for_obj_id: current_event_id,
|
||||
enabled,
|
||||
hidden,
|
||||
try_cache,
|
||||
log_lvl
|
||||
}).then((res) => (event_obj.event_location_obj_li = res))
|
||||
);
|
||||
}
|
||||
if (inc_session_li) {
|
||||
tasks.push(load_ae_obj_li__event_session({
|
||||
api_cfg,
|
||||
for_obj_type: 'event',
|
||||
for_obj_id: current_event_id,
|
||||
inc_presentation_li,
|
||||
inc_presenter_li,
|
||||
enabled,
|
||||
hidden,
|
||||
try_cache,
|
||||
log_lvl
|
||||
}).then(res => event_obj.event_session_obj_li = res));
|
||||
tasks.push(
|
||||
load_ae_obj_li__event_session({
|
||||
api_cfg,
|
||||
for_obj_type: 'event',
|
||||
for_obj_id: current_event_id,
|
||||
inc_presentation_li,
|
||||
inc_presenter_li,
|
||||
enabled,
|
||||
hidden,
|
||||
try_cache,
|
||||
log_lvl
|
||||
}).then((res) => (event_obj.event_session_obj_li = res))
|
||||
);
|
||||
}
|
||||
if (inc_template_li) {
|
||||
tasks.push(load_ae_obj_li__event_badge_template({
|
||||
api_cfg,
|
||||
event_id: current_event_id,
|
||||
try_cache,
|
||||
log_lvl
|
||||
}).then(res => event_obj.event_badge_template_obj_li = res));
|
||||
tasks.push(
|
||||
load_ae_obj_li__event_badge_template({
|
||||
api_cfg,
|
||||
event_id: current_event_id,
|
||||
try_cache,
|
||||
log_lvl
|
||||
}).then((res) => (event_obj.event_badge_template_obj_li = res))
|
||||
);
|
||||
}
|
||||
|
||||
if (tasks.length > 0) await Promise.all(tasks);
|
||||
@@ -238,20 +322,25 @@ export async function load_ae_obj_li__event({
|
||||
inc_presenter_li?: boolean;
|
||||
limit?: number;
|
||||
offset?: number;
|
||||
order_by_li?: Record<string, 'ASC' | 'DESC'> | Record<string, 'ASC' | 'DESC'>[];
|
||||
order_by_li?:
|
||||
| Record<string, 'ASC' | 'DESC'>
|
||||
| Record<string, 'ASC' | 'DESC'>[];
|
||||
params?: key_val;
|
||||
try_cache?: boolean;
|
||||
log_lvl?: number;
|
||||
}): Promise<ae_Event[]> {
|
||||
|
||||
// Hierarchy Enforcement: Pulling presentations/presenters requires pulling sessions first
|
||||
if (inc_presenter_li || inc_presentation_li) inc_session_li = true;
|
||||
|
||||
// Check if offline
|
||||
if (typeof navigator !== 'undefined' && !navigator.onLine) {
|
||||
if (log_lvl) console.log('Browser is offline. Skipping API and attempting cache load.');
|
||||
if (log_lvl)
|
||||
console.log(
|
||||
'Browser is offline. Skipping API and attempting cache load.'
|
||||
);
|
||||
ae_promises.load__event_obj_li = await db_events.event
|
||||
.where('account_id').equals(for_obj_id)
|
||||
.where('account_id')
|
||||
.equals(for_obj_id)
|
||||
.toArray();
|
||||
return ae_promises.load__event_obj_li || [];
|
||||
}
|
||||
@@ -264,7 +353,11 @@ export async function load_ae_obj_li__event({
|
||||
};
|
||||
|
||||
if (for_obj_id) {
|
||||
search_query.and.push({ field: `${for_obj_type}_id`, op: 'eq', value: for_obj_id });
|
||||
search_query.and.push({
|
||||
field: `${for_obj_type}_id`,
|
||||
op: 'eq',
|
||||
value: for_obj_id
|
||||
});
|
||||
}
|
||||
|
||||
promise = api.search_ae_obj({
|
||||
@@ -319,9 +412,11 @@ export async function load_ae_obj_li__event({
|
||||
} else {
|
||||
console.log('No results returned from API.');
|
||||
if (try_cache) {
|
||||
if (log_lvl) console.log('Attempting to load from local cache...');
|
||||
if (log_lvl)
|
||||
console.log('Attempting to load from local cache...');
|
||||
ae_promises.load__event_obj_li = await db_events.event
|
||||
.where('account_id').equals(for_obj_id)
|
||||
.where('account_id')
|
||||
.equals(for_obj_id)
|
||||
.toArray();
|
||||
} else {
|
||||
ae_promises.load__event_obj_li = [];
|
||||
@@ -330,9 +425,13 @@ export async function load_ae_obj_li__event({
|
||||
} catch (error: any) {
|
||||
console.log('API request failed.', error);
|
||||
if (try_cache) {
|
||||
if (log_lvl) console.log('Attempting to load from local cache after error...');
|
||||
if (log_lvl)
|
||||
console.log(
|
||||
'Attempting to load from local cache after error...'
|
||||
);
|
||||
ae_promises.load__event_obj_li = await db_events.event
|
||||
.where('account_id').equals(for_obj_id)
|
||||
.where('account_id')
|
||||
.equals(for_obj_id)
|
||||
.toArray();
|
||||
} else {
|
||||
ae_promises.load__event_obj_li = [];
|
||||
@@ -340,18 +439,20 @@ export async function load_ae_obj_li__event({
|
||||
}
|
||||
|
||||
if (inc_session_li && ae_promises.load__event_obj_li) {
|
||||
const session_tasks = ae_promises.load__event_obj_li.map((event_obj: any) => {
|
||||
const current_event_id = event_obj.id || event_obj.event_id;
|
||||
return load_ae_obj_li__event_session({
|
||||
api_cfg,
|
||||
for_obj_type: 'event',
|
||||
for_obj_id: current_event_id,
|
||||
inc_presentation_li,
|
||||
inc_presenter_li,
|
||||
try_cache,
|
||||
log_lvl
|
||||
}).then((res) => (event_obj.event_session_obj_li = res));
|
||||
});
|
||||
const session_tasks = ae_promises.load__event_obj_li.map(
|
||||
(event_obj: any) => {
|
||||
const current_event_id = event_obj.id || event_obj.event_id;
|
||||
return load_ae_obj_li__event_session({
|
||||
api_cfg,
|
||||
for_obj_type: 'event',
|
||||
for_obj_id: current_event_id,
|
||||
inc_presentation_li,
|
||||
inc_presenter_li,
|
||||
try_cache,
|
||||
log_lvl
|
||||
}).then((res) => (event_obj.event_session_obj_li = res));
|
||||
}
|
||||
);
|
||||
await Promise.all(session_tasks);
|
||||
}
|
||||
|
||||
@@ -543,13 +644,21 @@ export async function search__event({
|
||||
};
|
||||
const params: key_val = {};
|
||||
|
||||
search_query.and.push({ field: 'default_qry_str', op: 'like', value: `%${qry_str.trim()}%` });
|
||||
params['lk_qry'] = { 'default_qry_str': qry_str.trim() };
|
||||
search_query.and.push({
|
||||
field: 'default_qry_str',
|
||||
op: 'like',
|
||||
value: `%${qry_str.trim()}%`
|
||||
});
|
||||
params['lk_qry'] = { default_qry_str: qry_str.trim() };
|
||||
|
||||
if (for_obj_id) {
|
||||
// V3 Standard: Use random string ID for body filters.
|
||||
// The API resolves this to the integer column automatically.
|
||||
search_query.and.push({ field: `${for_obj_type}_id_random`, op: 'eq', value: for_obj_id });
|
||||
search_query.and.push({
|
||||
field: `${for_obj_type}_id_random`,
|
||||
op: 'eq',
|
||||
value: for_obj_id
|
||||
});
|
||||
}
|
||||
|
||||
// NOTE: We do NOT push 'physical' and 'virtual' to the server-side query here.
|
||||
@@ -593,7 +702,11 @@ export async function search__event({
|
||||
let valid_result_li: ae_Event[] = [];
|
||||
if (Array.isArray(result_li)) {
|
||||
valid_result_li = result_li;
|
||||
} else if (result_li && typeof result_li === 'object' && Array.isArray((result_li as any).data)) {
|
||||
} else if (
|
||||
result_li &&
|
||||
typeof result_li === 'object' &&
|
||||
Array.isArray((result_li as any).data)
|
||||
) {
|
||||
valid_result_li = (result_li as any).data;
|
||||
} else {
|
||||
return [];
|
||||
@@ -641,13 +754,12 @@ export async function search__event({
|
||||
|
||||
// Handle person ID filter
|
||||
if (qry_person_id) {
|
||||
const match = (
|
||||
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
|
||||
);
|
||||
ev.poc_event_person_id_random === qry_person_id;
|
||||
if (!match) return false;
|
||||
}
|
||||
|
||||
@@ -655,7 +767,9 @@ export async function search__event({
|
||||
});
|
||||
|
||||
if (log_lvl) {
|
||||
console.log(`Filter results (Hybrid): Input=${processed_obj_li.length}, Output=${filtered_obj_li.length}`);
|
||||
console.log(
|
||||
`Filter results (Hybrid): Input=${processed_obj_li.length}, Output=${filtered_obj_li.length}`
|
||||
);
|
||||
}
|
||||
|
||||
return filtered_obj_li.slice(0, limit);
|
||||
@@ -663,7 +777,6 @@ export async function search__event({
|
||||
|
||||
export const qry_ae_obj_li__event = search__event;
|
||||
|
||||
|
||||
// Updated 2026-03-10
|
||||
export const properties_to_save = [
|
||||
'id',
|
||||
@@ -780,14 +893,21 @@ async function _process_generic_props<T extends Record<string, any>>({
|
||||
const group = processed_obj.group ?? '0';
|
||||
const priority = processed_obj.priority ? 1 : 0;
|
||||
const sort = processed_obj.sort ?? '0';
|
||||
const updated = processed_obj.updated_on ?? processed_obj.created_on ?? new Date(0).toISOString();
|
||||
const updated =
|
||||
processed_obj.updated_on ??
|
||||
processed_obj.created_on ??
|
||||
new Date(0).toISOString();
|
||||
const name = processed_obj.name ?? '';
|
||||
|
||||
(processed_obj as any).tmp_sort_1 = `${group}_${priority}_${sort}_${updated}`;
|
||||
(processed_obj as any).tmp_sort_2 = `${group}_${priority}_${sort}_${name}_${updated}`;
|
||||
(processed_obj as any).tmp_sort_1 =
|
||||
`${group}_${priority}_${sort}_${updated}`;
|
||||
(processed_obj as any).tmp_sort_2 =
|
||||
`${group}_${priority}_${sort}_${name}_${updated}`;
|
||||
|
||||
if (specific_processor) {
|
||||
processed_obj = await Promise.resolve(specific_processor(processed_obj));
|
||||
processed_obj = await Promise.resolve(
|
||||
specific_processor(processed_obj)
|
||||
);
|
||||
}
|
||||
|
||||
processed_obj_li.push(processed_obj as T);
|
||||
@@ -849,7 +969,8 @@ export function sync_config__event_pres_mgmt({
|
||||
pres_mgmt_cfg_remote?.label__session_poc_name_short ?? 'POC';
|
||||
pres_mgmt_cfg_local.label__session_poc_name =
|
||||
pres_mgmt_cfg_remote?.label__session_poc_name ?? 'Point of Contact';
|
||||
pres_mgmt_cfg_local.hide__session_poc = pres_mgmt_cfg_remote?.hide__session_poc ?? false;
|
||||
pres_mgmt_cfg_local.hide__session_poc =
|
||||
pres_mgmt_cfg_remote?.hide__session_poc ?? false;
|
||||
pres_mgmt_cfg_local.require__presenter_agree =
|
||||
pres_mgmt_cfg_remote?.require__presenter_agree ?? false;
|
||||
pres_mgmt_cfg_local.require__session_agree =
|
||||
@@ -874,27 +995,31 @@ export function sync_config__event_pres_mgmt({
|
||||
pres_mgmt_cfg_local.hide__presentation_datetime =
|
||||
pres_mgmt_cfg_remote?.hide__presentation_datetime ?? false;
|
||||
pres_mgmt_cfg_local.show_content__presentation_description =
|
||||
pres_mgmt_cfg_remote?.show_content__presentation_description ?? false;
|
||||
pres_mgmt_cfg_remote?.show_content__presentation_description ??
|
||||
false;
|
||||
pres_mgmt_cfg_local.hide__presenter_code =
|
||||
pres_mgmt_cfg_remote?.hide__presenter_code ?? false;
|
||||
pres_mgmt_cfg_local.hide__presenter_biography =
|
||||
pres_mgmt_cfg_remote?.hide__presenter_biography ?? false;
|
||||
pres_mgmt_cfg_local.hide__session_code = pres_mgmt_cfg_remote?.hide__session_code ?? false;
|
||||
pres_mgmt_cfg_local.hide__session_code =
|
||||
pres_mgmt_cfg_remote?.hide__session_code ?? false;
|
||||
pres_mgmt_cfg_local.hide__session_description =
|
||||
pres_mgmt_cfg_remote?.hide__session_description ?? false;
|
||||
pres_mgmt_cfg_local.hide__session_location =
|
||||
pres_mgmt_cfg_remote?.hide__session_location ?? false;
|
||||
pres_mgmt_cfg_local.hide__session_msg = pres_mgmt_cfg_remote?.hide__session_msg ?? false;
|
||||
pres_mgmt_cfg_local.hide__session_msg =
|
||||
pres_mgmt_cfg_remote?.hide__session_msg ?? false;
|
||||
pres_mgmt_cfg_local.hide__session_poc_profile =
|
||||
pres_mgmt_cfg_remote?.hide__session_poc_profile ?? false;
|
||||
pres_mgmt_cfg_local.hide__session_poc_biography =
|
||||
pres_mgmt_cfg_remote?.hide__session_poc_biography ?? false;
|
||||
pres_mgmt_cfg_local.hide__session_poc_profile_pic =
|
||||
pres_mgmt_cfg_remote?.hide__session_poc_profile_pic ?? false;
|
||||
pres_mgmt_cfg_local.hide_launcher_link = pres_mgmt_cfg_remote?.hide_launcher_link ?? false;
|
||||
pres_mgmt_cfg_local.hide_launcher_link =
|
||||
pres_mgmt_cfg_remote?.hide_launcher_link ?? false;
|
||||
pres_mgmt_cfg_local.hide_launcher_link_legacy =
|
||||
pres_mgmt_cfg_remote?.hide_launcher_link_legacy ?? false;
|
||||
}
|
||||
|
||||
return pres_mgmt_cfg_local;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user