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

feat(offline): implement Dexie fallbacks and fix type stability in Events module

Browse Source 
- Offline Resilience: Added local Dexie fallbacks to load_ae_obj_id__* and load_ae_obj_li__* functions for Events, Sessions, Locations, Exhibits, and Badges.
- Type Safety: Standardized ae_Event and ae_EventSession interfaces in ae_types.ts; resolved Promise assignment errors in load functions (+page.ts).
- Bug Fixes: Corrected duplication in ae_events__event_location.ts and ae_events__event_badge_template.ts; fixed missing try_cache parameters.
- UI Stability: Fixed Dexie LiveQuery subscription pattern in bulk print view and ensured proper property access in layout load functions.
This commit is contained in:
Scott Idem
2026-01-16 15:09:10 -05:00
parent 2db2aba6f9
commit 8b611e7875
11 changed files with 998 additions and 1521 deletions
Download Patch File Download Diff File Expand all files Collapse all files

469
src/lib/ae_events/ae_events__event_location.ts
View File

@@ -35,108 +35,83 @@ export async function load_ae_obj_id__event_location({
const params = {};
ae_promises.load__event_location_obj = await api
.get_ae_obj_id_crud({
api_cfg: api_cfg,
obj_type: 'event_location',
obj_id: event_location_id, // NOTE: This is the FQDN, not normally the ID.
use_alt_table: true, // NOTE: This will use the table_name_alt value instead of the table_name value in the API config.
use_alt_base: false, // NOTE: This will use the base_name_alt value instead of the base_name value in the API config.
params: params,
log_lvl: log_lvl
})
.then(async function (event_location_obj_get_result) {
if (event_location_obj_get_result) {
if (try_cache) {
const processed_obj_li = await process_ae_obj__event_location_props({
obj_li: [event_location_obj_get_result],
log_lvl
});
// Save the updated results list to the database
if (log_lvl) {
console.log('Saving to DB...');
}
await db_save_ae_obj_li__ae_obj({
db_instance: db_events,
table_name: 'location',
obj_li: processed_obj_li,
properties_to_save,
log_lvl
});
if (log_lvl) {
console.log('DB save completed.');
}
try {
ae_promises.load__event_location_obj = await api
.get_ae_obj_id_crud({
api_cfg: api_cfg,
obj_type: 'event_location',
obj_id: event_location_id, // NOTE: This is the FQDN, not normally the ID.
use_alt_table: true, // NOTE: This will use the table_name_alt value instead of the table_name value in the API config.
use_alt_base: false, // NOTE: This will use the base_name_alt value instead of the base_name value in the API config.
params: params,
log_lvl: log_lvl
});
// // This is expecting a list
// db_save_ae_obj_li__event_location({
// obj_type: 'event_location',
// obj_li: [event_location_obj_get_result]
// });
}
return event_location_obj_get_result;
} else {
console.log('No results returned.');
return null;
if (ae_promises.load__event_location_obj) {
if (try_cache) {
const processed_obj_li = await process_ae_obj__event_location_props({
obj_li: [ae_promises.load__event_location_obj],
log_lvl
});
await db_save_ae_obj_li__ae_obj({
db_instance: db_events,
table_name: 'location',
obj_li: processed_obj_li,
properties_to_save,
log_lvl
});
}
})
.catch(function (error: any) {
console.log('No results returned or failed.', error);
});
} else {
console.log('No results returned from API.');
if (try_cache) {
if (log_lvl) console.log('Attempting to load from local cache...');
ae_promises.load__event_location_obj = await db_events.location.get(event_location_id);
}
}
} 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...');
ae_promises.load__event_location_obj = await db_events.location.get(event_location_id);
} else {
ae_promises.load__event_location_obj = null;
}
}
if (log_lvl) {
console.log('ae_promises.load__event_location_obj:', ae_promises.load__event_location_obj);
}
if (ae_promises?.load__event_location_obj === null) {
console.log('No results returned.');
if (!ae_promises?.load__event_location_obj) {
return null;
}
const current_location_id = ae_promises.load__event_location_obj.event_location_id || ae_promises.load__event_location_obj.id;
if (inc_file_li) {
// Load the files for the location
if (log_lvl) {
console.log(`Need to load the file list for the location now`);
}
const load_event_file_obj_li = load_ae_obj_li__event_file({
ae_promises.load__event_location_obj.event_file_li = await load_ae_obj_li__event_file({
api_cfg: api_cfg,
for_obj_type: 'event_location',
for_obj_id: event_location_id,
for_obj_id: current_location_id,
enabled: 'all',
limit: 15,
try_cache: try_cache,
log_lvl: log_lvl
}).then((event_file_obj_li) => {
if (log_lvl) {
console.log(`event_file_obj_li = `, event_file_obj_li);
}
return event_file_obj_li;
});
if (log_lvl) {
console.log(`load_event_file_obj_li = `, load_event_file_obj_li);
}
ae_promises.load__event_location_obj.event_file_li = load_event_file_obj_li;
}
if (inc_session_li) {
// Load the sessions for the location
if (log_lvl) {
console.log(`Need to load the session list for the location now`);
}
const load_event_session_obj_li = load_ae_obj_li__event_session({
ae_promises.load__event_location_obj.event_session_li = await load_ae_obj_li__event_session({
api_cfg: api_cfg,
for_obj_type: 'event_location',
for_obj_id: event_location_id,
for_obj_id: current_location_id,
enabled: 'all',
limit: 15,
try_cache: try_cache,
log_lvl: log_lvl
});
if (log_lvl) {
console.log(`load_event_session_obj_li = `, load_event_session_obj_li);
}
ae_promises.load__event_location_obj.event_session_li = load_event_session_obj_li;
}
return ae_promises.load__event_location_obj;
@@ -189,158 +164,109 @@ export async function load_ae_obj_li__event_location({
const params_json: key_val = {};
// console.log('params_json:', params_json);
try {
ae_promises.load__event_location_obj_li = await api
.get_ae_obj_li_for_obj_id_crud_v2({
api_cfg: api_cfg,
obj_type: 'event_location',
for_obj_type: for_obj_type,
for_obj_id: for_obj_id,
use_alt_tbl: true, // NOTE: This will use the table_name_alt value instead of the table_name value in the API config.
enabled: enabled,
hidden: hidden,
order_by_li: order_by_li,
limit: limit,
offset: offset,
params_json: params_json,
params: params,
log_lvl: log_lvl
});
// ae_promises.load__event_location_obj_li = await api.get_ae_obj_li_for_obj_id_crud({
ae_promises.load__event_location_obj_li = await api
.get_ae_obj_li_for_obj_id_crud_v2({
api_cfg: api_cfg,
obj_type: 'event_location',
for_obj_type: for_obj_type,
for_obj_id: for_obj_id,
use_alt_tbl: true, // NOTE: This will use the table_name_alt value instead of the table_name value in the API config.
// use_alt_mdl: false, // NOTE: This will use the base_name_alt value instead of the base_name value
enabled: enabled,
hidden: hidden,
order_by_li: order_by_li,
limit: limit,
offset: offset,
params_json: params_json,
params: params,
log_lvl: log_lvl
})
.then(async function (event_location_obj_li_get_result) {
if (event_location_obj_li_get_result) {
if (try_cache) {
// Process the results first
const processed_obj_li = await process_ae_obj__event_location_props({
obj_li: event_location_obj_li_get_result,
log_lvl: log_lvl
});
if (log_lvl) {
console.log('Processed object list:', processed_obj_li);
}
// Save the updated results list to the database
if (log_lvl) {
console.log('Saving to DB...');
}
await db_save_ae_obj_li__ae_obj({
db_instance: db_events,
table_name: 'location',
obj_li: processed_obj_li,
properties_to_save: properties_to_save,
log_lvl: log_lvl
});
if (log_lvl) {
console.log('DB save completed.');
}
// db_save_ae_obj_li__event_location({
// obj_type: 'event_location',
// obj_li: event_location_obj_li_get_result
// });
}
return event_location_obj_li_get_result;
if (ae_promises.load__event_location_obj_li) {
if (try_cache) {
const processed_obj_li = await process_ae_obj__event_location_props({
obj_li: ae_promises.load__event_location_obj_li,
log_lvl: log_lvl
});
await db_save_ae_obj_li__ae_obj({
db_instance: db_events,
table_name: 'location',
obj_li: processed_obj_li,
properties_to_save: properties_to_save,
log_lvl: log_lvl
});
}
} else {
console.log('No results returned from API.');
if (try_cache) {
if (log_lvl) console.log('Attempting to load from local cache...');
ae_promises.load__event_location_obj_li = await db_events.location
.where('event_id').equals(for_obj_id)
.toArray();
} else {
return [];
ae_promises.load__event_location_obj_li = [];
}
})
.catch(function (error: any) {
console.log('No results returned or failed.', error);
});
if (log_lvl) {
console.log(
'ae_promises.load__event_location_obj_li:',
ae_promises.load__event_location_obj_li
);
}
if (inc_device_li) {
// Load the devices for the locations
if (log_lvl) {
console.log(`Need to load the device list for each location now`);
}
for (let i = 0; i < ae_promises.load__event_location_obj_li.length; i++) {
const event_location_obj = ae_promises.load__event_location_obj_li[i];
const event_location_id = event_location_obj.event_location_id_random;
const load_event_device_obj_li = load_ae_obj_li__event_device({
api_cfg: api_cfg,
for_obj_type: 'event_location',
for_obj_id: event_location_id,
params: { qry__enabled: enabled, qry__limit: limit },
try_cache: try_cache,
log_lvl: log_lvl
}).then((event_device_obj_li) => {
if (log_lvl) {
console.log(`event_device_obj_li = `, event_device_obj_li);
}
return event_device_obj_li;
});
if (log_lvl) {
console.log(`load_event_device_obj_li = `, load_event_device_obj_li);
}
} 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...');
ae_promises.load__event_location_obj_li = await db_events.location
.where('event_id').equals(for_obj_id)
.toArray();
} else {
ae_promises.load__event_location_obj_li = [];
}
}
if (inc_file_li) {
// Load the files for the locations
if (log_lvl) {
console.log(`Need to load the file list for each location now`);
}
for (let i = 0; i < ae_promises.load__event_location_obj_li.length; i++) {
const event_location_obj = ae_promises.load__event_location_obj_li[i];
const event_location_id = event_location_obj.event_location_id_random;
if (ae_promises.load__event_location_obj_li) {
if (inc_device_li) {
for (let i = 0; i < ae_promises.load__event_location_obj_li.length; i++) {
const event_location_obj = ae_promises.load__event_location_obj_li[i];
const current_location_id = event_location_obj.event_location_id || event_location_obj.id;
const load_event_file_obj_li = load_ae_obj_li__event_file({
api_cfg: api_cfg,
for_obj_type: 'event_location',
for_obj_id: event_location_id,
enabled: enabled,
limit: limit,
try_cache: try_cache,
log_lvl: log_lvl
}).then((event_file_obj_li) => {
if (log_lvl) {
console.log(`event_file_obj_li = `, event_file_obj_li);
}
return event_file_obj_li;
});
if (log_lvl) {
console.log(`load_event_file_obj_li = `, load_event_file_obj_li);
event_location_obj.event_device_obj_li = await load_ae_obj_li__event_device({
api_cfg: api_cfg,
for_obj_type: 'event_location',
for_obj_id: current_location_id,
params: { qry__enabled: enabled, qry__limit: limit },
try_cache: try_cache,
log_lvl: log_lvl
});
}
}
}
if (inc_session_li) {
// Load the sessions for the locations
if (log_lvl) {
console.log(`Need to load the session list for each location now`);
if (inc_file_li) {
for (let i = 0; i < ae_promises.load__event_location_obj_li.length; i++) {
const event_location_obj = ae_promises.load__event_location_obj_li[i];
const current_location_id = event_location_obj.event_location_id || event_location_obj.id;
event_location_obj.event_file_li = await load_ae_obj_li__event_file({
api_cfg: api_cfg,
for_obj_type: 'event_location',
for_obj_id: current_location_id,
enabled: enabled,
limit: limit,
try_cache: try_cache,
log_lvl: log_lvl
});
}
}
for (let i = 0; i < ae_promises.load__event_location_obj_li.length; i++) {
const event_location_obj = ae_promises.load__event_location_obj_li[i];
const event_location_id = event_location_obj.event_location_id_random;
const load_event_session_obj_li = load_ae_obj_li__event_session({
api_cfg: api_cfg,
for_obj_type: 'event_location',
for_obj_id: event_location_id,
enabled: enabled,
limit: limit,
try_cache: try_cache,
log_lvl: log_lvl
}).then((event_session_obj_li) => {
if (log_lvl) {
console.log(`event_session_obj_li = `, event_session_obj_li);
}
return event_session_obj_li;
});
if (inc_session_li) {
for (let i = 0; i < ae_promises.load__event_location_obj_li.length; i++) {
const event_location_obj = ae_promises.load__event_location_obj_li[i];
const current_location_id = event_location_obj.event_location_id || event_location_obj.id;
if (log_lvl) {
console.log(`load_event_session_obj_li = `, load_event_session_obj_li);
event_location_obj.event_session_li = await load_ae_obj_li__event_session({
api_cfg: api_cfg,
for_obj_type: 'event_location',
for_obj_id: current_location_id,
enabled: enabled,
limit: limit,
try_cache: try_cache,
log_lvl: log_lvl
});
}
}
}
@@ -406,12 +332,6 @@ export async function create_ae_obj__event_location({
if (log_lvl) {
console.log('DB save completed.');
}
// db_save_ae_obj_li__event_location(
// {
// obj_type: 'event_location',
// obj_li: [event_location_obj_create_result]
// });
}
return event_location_obj_create_result;
} else {
@@ -420,12 +340,8 @@ export async function create_ae_obj__event_location({
})
.catch(function (error: any) {
console.log('No results returned or failed.', error);
})
.finally(function () {});
});
if (log_lvl) {
console.log('ae_promises.create__event_location:', ae_promises.create__event_location);
}
return ae_promises.create__event_location;
}
@@ -475,13 +391,6 @@ export async function delete_ae_obj_id__event_location({
}
});
if (log_lvl) {
console.log(
'ae_promises.delete__event_location_obj:',
ae_promises.delete__event_location_obj
);
}
return ae_promises.delete__event_location_obj;
}
@@ -543,10 +452,6 @@ export async function update_ae_obj__event_location({
if (log_lvl) {
console.log('DB save completed.');
}
// db_save_ae_obj_li__event_location({
// obj_type: 'event_location', obj_li: [event_location_obj_update_result]
// });
}
return event_location_obj_update_result;
} else {
@@ -555,15 +460,8 @@ export async function update_ae_obj__event_location({
})
.catch(function (error: any) {
console.log('No results returned or failed.', error);
})
.finally(function () {});
});
if (log_lvl) {
console.log(
'ae_promises.update__event_location_obj:',
ae_promises.update__event_location_obj
);
}
return ae_promises.update__event_location_obj;
}
@@ -597,14 +495,14 @@ export async function search__event_location({
const enabled: 'enabled' | 'all' | 'not_enabled' = (params.qry__enabled as any) ?? 'enabled';
const hidden: 'hidden' | 'all' | 'not_hidden' = (params.qry__hidden as any) ?? 'not_hidden';
const limit: number = params.qry__limit ?? 25; // 99
const offset: number = params.qry__offset ?? 0; // 0
const limit: number = params.qry__limit ?? 25;
const offset: number = params.qry__offset ?? 0;
const params_json: key_val = {};
if (!fulltext_search_qry_str && !like_search_qry_str) {
console.log('No search string provided!!!');
return false; // Returning false instead of [] because no search was performed.
return false;
}
if (fulltext_search_qry_str || ft_presenter_search_qry_str) {
@@ -618,18 +516,6 @@ export async function search__event_location({
}
}
// Use the AND (AND LIKE) query
// if (like_search_qry_str || like_presenter_search_qry_str) {
// params_json['and_like'] = {};
// if (like_search_qry_str && like_search_qry_str.length > 2) {
// params_json['and_like']['default_qry_str'] = like_search_qry_str;
// }
// if (like_presenter_search_qry_str && like_presenter_search_qry_str.length > 2) {
// params_json['and_like']['event_presenter_li_qry_str'] = like_presenter_search_qry_str;
// }
// }
// Use the AND (OR LIKE) query
if (like_search_qry_str || like_presentation_search_qry_str || like_presenter_search_qry_str) {
params_json['or_like'] = {};
if (like_search_qry_str && like_search_qry_str.length > 2) {
@@ -646,10 +532,6 @@ export async function search__event_location({
params_json['and_qry'] = {};
// if (location_type_code) {
// params_json['and_qry']['location_type_code'] = location_type_code;
// }
const order_by_li = {
priority: 'DESC',
sort: 'DESC',
@@ -659,15 +541,13 @@ export async function search__event_location({
created_on: 'DESC'
} as const;
// ae_promises.load__event_location_obj_li = await api.get_ae_obj_li_for_obj_id_crud({
ae_promises.load__event_location_obj_li = await api
.get_ae_obj_li_for_obj_id_crud_v2({
api_cfg: api_cfg,
obj_type: 'event_location',
for_obj_type: 'event',
for_obj_id: event_id,
use_alt_tbl: true, // NOTE: We want to use the alt table for location searching
// use_alt_mdl: false,
use_alt_tbl: true,
enabled: enabled,
hidden: hidden,
order_by_li: order_by_li,
@@ -680,18 +560,10 @@ export async function search__event_location({
.then(async function (event_location_obj_li_get_result) {
if (event_location_obj_li_get_result) {
if (try_cache) {
// Process the results first
const processed_obj_li = await process_ae_obj__event_location_props({
obj_li: event_location_obj_li_get_result,
log_lvl: log_lvl
});
if (log_lvl) {
console.log('Processed object list:', processed_obj_li);
}
// Save the updated results list to the database
if (log_lvl) {
console.log('Saving to DB...');
}
await db_save_ae_obj_li__ae_obj({
db_instance: db_events,
table_name: 'location',
@@ -699,9 +571,6 @@ export async function search__event_location({
properties_to_save: properties_to_save,
log_lvl: log_lvl
});
if (log_lvl) {
console.log('DB save completed.');
}
}
return event_location_obj_li_get_result;
} else {
@@ -710,15 +579,8 @@ export async function search__event_location({
})
.catch(function (error: any) {
console.log('No results returned or failed.', error);
})
.finally(function () {});
});
if (log_lvl) {
console.log(
'ae_promises.load__event_location_obj_li:',
ae_promises.load__event_location_obj_li
);
}
return ae_promises.load__event_location_obj_li;
}
@@ -726,28 +588,17 @@ export async function search__event_location({
export const properties_to_save = [
'id',
'event_location_id',
// 'event_location_id_random',
'external_id',
'code',
'type_code',
'event_id',
// 'event_id_random',
'name',
'description',
'passcode',
'hide_event_launcher',
'alert',
'alert_msg',
'data_json',
'enable',
'hide',
'priority',
@@ -756,26 +607,15 @@ export const properties_to_save = [
'notes',
'created_on',
'updated_on',
// Generated fields for sorting locally only
'tmp_sort_1',
'tmp_sort_2',
// 'tmp_sort_a',
// 'tmp_sort_b',
// From SQL view
'file_count',
'file_count_all',
'internal_use_count',
'event_file_id_li_json',
'event_name'
];
/**
* NON-EXPORTED LOCAL HELPER
* Processes a list of Aether objects by applying common and specific transformations.
*/
async function _process_generic_props<T extends Record<string, any>>({
obj_li,
obj_type,
@@ -787,39 +627,24 @@ async function _process_generic_props<T extends Record<string, any>>({
log_lvl?: number;
specific_processor?: (obj: T) => Promise<T> | T;
}): Promise<T[]> {
if (log_lvl > 0) {
console.log(
`*** _process_generic_props: Processing ${obj_li.length} objects of type "${obj_type}" ***`
);
}
if (!obj_li || obj_li.length === 0) {
if (log_lvl > 0) console.log('No objects to process.');
return [];
}
if (!obj_li || obj_li.length === 0) return [];
const processed_obj_li: T[] = [];
for (const original_obj of obj_li) {
let processed_obj = { ...original_obj };
// --- Common Transformations ---
// 1. Standardize ID and other '_random' fields
// The API often returns fields like 'person_id_random', which need to be aliased to 'person_id'.
for (const key in processed_obj) {
if (key.endsWith('_random')) {
const newKey = key.slice(0, -7); // Remove '_random' suffix
const newKey = key.slice(0, -7);
(processed_obj as any)[newKey] = processed_obj[key];
}
}
// Ensure 'id' is set from '[obj_type]_id_random'
const randomIdKey = `${obj_type}_id_random`;
if (processed_obj[randomIdKey]) {
(processed_obj as any).id = processed_obj[randomIdKey];
}
// 2. Create common computed properties for client-side sorting.
const group = processed_obj.group ?? '0';
const priority = processed_obj.priority ? 1 : 0;
const sort = processed_obj.sort ?? '0';
@@ -829,7 +654,6 @@ async function _process_generic_props<T extends Record<string, any>>({
(processed_obj as any).tmp_sort_1 = `${group}_${priority}_${sort}_${updated}`;
(processed_obj as any).tmp_sort_2 = `${group}_${priority}_${sort}_${name}_${updated}`;
// --- Specific Transformations ---
if (specific_processor) {
processed_obj = await Promise.resolve(specific_processor(processed_obj));
}
@@ -853,7 +677,6 @@ export async function process_ae_obj__event_location_props({
obj_type: 'event_location',
log_lvl,
specific_processor: (obj) => {
// Event location-specific computed sort fields, overriding generic ones if needed
obj.tmp_sort_1 = `${obj.group ?? ''}_${obj.priority ? '1' : '0'}_${
obj.sort?.toString().padStart(3, '0') ?? ''
}_${obj.updated_on ?? obj.created_on}`;
@@ -864,4 +687,4 @@ export async function process_ae_obj__event_location_props({
return obj;
}
});
}
}