Lots of code clean up. Finally working on the Launcher piece again.

This commit is contained in:
Scott Idem
2025-07-21 16:40:37 -04:00
parent ee0e108322
commit b54f43be35
25 changed files with 411 additions and 355 deletions

View File

@@ -127,21 +127,6 @@ async function handle_submit_form_files(event) {
} else if (log_lvl > 1) {
console.log('hosted_file_results:', hosted_file_results);
}
// db_events.files.clear();
// let params = {
// qry__enabled: 'all',
// qry__hidden: 'all',
// }
// events_func.load_ae_obj_li__event_file({
// api_cfg: $ae_api,
// for_obj_type: link_to_type,
// for_obj_id: link_to_id,
// params: params,
// try_cache: true
// });
}
$ae_sess.files.disable_submit__hosted_file_obj = false;

View File

@@ -133,8 +133,8 @@ export async function load_ae_obj_id__event(
api_cfg: api_cfg,
for_obj_type: 'event',
for_obj_id: event_id,
params: {qry__enabled: 'enabled', qry__limit: 19},
try_cache: try_cache,
enabled: 'enabled',
limit: 19,
log_lvl: log_lvl
}).then((event_location_obj_li) => {
if (log_lvl) {
@@ -158,7 +158,8 @@ export async function load_ae_obj_id__event(
api_cfg: api_cfg,
for_obj_type: 'event',
for_obj_id: event_id,
params: {qry__enabled: 'enabled', qry__limit: 249},
enabled: 'enabled',
limit: 249,
try_cache: try_cache,
log_lvl: log_lvl
}).then((event_session_obj_li) => {
@@ -367,7 +368,8 @@ export async function load_ae_obj_li__event(
api_cfg: api_cfg,
for_obj_type: 'event',
for_obj_id: event_id,
params: {qry__enabled: 'enabled', qry__limit: 19},
enabled: 'enabled',
limit: 19,
try_cache: try_cache,
log_lvl: log_lvl
})

View File

@@ -111,6 +111,10 @@ export async function load_ae_obj_li__event_device(
for_obj_type,
for_obj_id,
inc_location_id = false,
enabled = 'enabled',
hidden = 'not_hidden',
limit = 49,
offset = 0,
order_by_li = {'priority': 'DESC', 'sort': 'DESC', 'name': 'ASC', 'code': 'ASC', 'updated_on': 'DESC', 'created_on': 'DESC'},
params = {},
try_cache = true,
@@ -120,6 +124,10 @@ export async function load_ae_obj_li__event_device(
for_obj_type: string,
for_obj_id: string,
inc_location_id?: boolean,
enabled?: string, // all, disabled, enabled
hidden?: string, // all, hidden, not_hidden
limit?: number, // 99
offset?: number, // 0
order_by_li?: key_val,
params?: key_val,
try_cache?: boolean,
@@ -130,10 +138,10 @@ export async function load_ae_obj_li__event_device(
console.log(`*** load_ae_obj_li__event_device() *** for_obj_type=${for_obj_type} for_obj_id=${for_obj_id}`);
}
let enabled: string = (params.qry__enabled ?? 'enabled'); // all, disabled, enabled
let hidden: string = (params.qry__hidden ?? 'all'); // all, hidden, not_hidden
let limit: number = (params.qry__limit ?? 99); // 99
let offset: number = (params.qry__offset ?? 0); // 0
// let enabled: string = (params.qry__enabled ?? 'enabled'); // all, disabled, enabled
// let hidden: string = (params.qry__hidden ?? 'all'); // all, hidden, not_hidden
// let limit: number = (params.qry__limit ?? 99); // 99
// let offset: number = (params.qry__offset ?? 0); // 0
let params_json: key_val = {};

View File

@@ -60,6 +60,11 @@ export async function load_ae_obj_li__event_file(
api_cfg,
for_obj_type,
for_obj_id,
enabled = 'enabled',
hidden = 'not_hidden',
limit = 99,
offset = 0,
order_by_li = {'priority': 'DESC', 'sort': 'DESC', 'updated_on': 'DESC', 'created_on': 'DESC'},
params = {},
try_cache = true,
log_lvl = 0
@@ -67,6 +72,11 @@ export async function load_ae_obj_li__event_file(
api_cfg: any,
for_obj_type: string,
for_obj_id: string,
enabled?: string, // all, disabled, enabled
hidden?: string, // all, hidden, not_hidden
limit?: number, // 99
offset?: number, // 0
order_by_li?: key_val,
params?: key_val,
try_cache?: boolean,
log_lvl?: number
@@ -81,10 +91,10 @@ export async function load_ae_obj_li__event_file(
return [];
}
let enabled: string = (params.qry__enabled ?? 'enabled'); // all, disabled, enabled
let hidden: string = (params.qry__hidden ?? 'all'); // all, hidden, not_hidden
let limit: number = (params.qry__limit ?? 99); // 99
let offset: number = (params.qry__offset ?? 0); // 0
// let enabled: string = (params.qry__enabled ?? 'enabled'); // all, disabled, enabled
// let hidden: string = (params.qry__hidden ?? 'all'); // all, hidden, not_hidden
// let limit: number = (params.qry__limit ?? 99); // 99
// let offset: number = (params.qry__offset ?? 0); // 0
let params_json: key_val = {};
@@ -99,7 +109,7 @@ export async function load_ae_obj_li__event_file(
use_alt_base: false, // NOTE: This will use the base_name_alt value instead of the base_name value
enabled: enabled,
hidden: hidden,
order_by_li: {'priority': 'DESC', 'sort': 'DESC', 'updated_on': 'DESC', 'created_on': 'DESC'},
order_by_li: order_by_li,
limit: limit,
offset: offset,
params_json: params_json,

View File

@@ -100,7 +100,8 @@ export async function load_ae_obj_id__event_location(
api_cfg: api_cfg,
for_obj_type: 'event_location',
for_obj_id: event_location_id,
params: {qry__enabled: 'all', qry__limit: 15},
enabled: 'all',
limit: 15,
try_cache: try_cache,
log_lvl: log_lvl
})
@@ -126,7 +127,8 @@ export async function load_ae_obj_id__event_location(
api_cfg: api_cfg,
for_obj_type: 'event_location',
for_obj_id: event_location_id,
params: {qry__enabled: 'all', qry__limit: 15},
enabled: 'all',
limit: 15,
try_cache: try_cache,
log_lvl: log_lvl
});
@@ -150,6 +152,10 @@ export async function load_ae_obj_li__event_location(
inc_device_li = false,
inc_file_li = false,
inc_session_li = false,
enabled = 'enabled',
hidden = 'not_hidden',
limit = 29,
offset = 0,
order_by_li = {'priority': 'DESC', 'sort': 'DESC', 'name': 'ASC', 'code': 'ASC', 'updated_on': 'DESC', 'created_on': 'DESC'},
params = {},
try_cache = true,
@@ -161,6 +167,10 @@ export async function load_ae_obj_li__event_location(
inc_device_li?: boolean,
inc_file_li?: boolean,
inc_session_li?: boolean,
enabled?: string, // all, disabled, enabled
hidden?: string, // all, hidden, not_hidden
limit?: number, // 99
offset?: number, // 0
order_by_li?: key_val,
params?: key_val,
try_cache?: boolean,
@@ -171,11 +181,6 @@ export async function load_ae_obj_li__event_location(
console.log(`*** load_ae_obj_li__event_location() *** for_obj_type=${for_obj_type} for_obj_id=${for_obj_id}`);
}
let enabled: string = (params.qry__enabled ?? 'enabled'); // all, disabled, enabled
let hidden: string = (params.qry__hidden ?? 'all'); // all, hidden, not_hidden
let limit: number = (params.qry__limit ?? 99); // 99
let offset: number = (params.qry__offset ?? 0); // 0
let params_json: key_val = {};
// console.log('params_json:', params_json);
@@ -284,7 +289,8 @@ export async function load_ae_obj_li__event_location(
api_cfg: api_cfg,
for_obj_type: 'event_location',
for_obj_id: event_location_id,
params: {qry__enabled: enabled, qry__limit: limit},
enabled: enabled,
limit: limit,
try_cache: try_cache,
log_lvl: log_lvl
})
@@ -314,7 +320,8 @@ export async function load_ae_obj_li__event_location(
api_cfg: api_cfg,
for_obj_type: 'event_location',
for_obj_id: event_location_id,
params: {qry__enabled: enabled, qry__limit: limit},
enabled: enabled,
limit: limit,
try_cache: try_cache,
log_lvl: log_lvl
})

View File

@@ -112,7 +112,8 @@ export async function load_ae_obj_id__event_presentation(
api_cfg: api_cfg,
for_obj_type: 'event_presentation',
for_obj_id: event_presentation_id,
params: {qry__enabled: 'all', qry__limit: 25},
enabled: 'all',
limit: 25,
try_cache: try_cache,
log_lvl: log_lvl
})
@@ -283,7 +284,8 @@ export async function load_ae_obj_li__event_presentation(
api_cfg: api_cfg,
for_obj_type: 'event_presentation',
for_obj_id: event_presentation_id,
params: {qry__enabled: enabled, qry__limit: limit},
enabled: enabled,
limit: limit,
try_cache: try_cache,
log_lvl: log_lvl
})

View File

@@ -99,7 +99,8 @@ export async function load_ae_obj_id__event_presenter(
api_cfg: api_cfg,
for_obj_type: 'event_presenter',
for_obj_id: event_presenter_id,
params: {qry__enabled: enabled, qry__limit: limit},
enabled: enabled,
limit: limit,
try_cache: try_cache,
log_lvl: log_lvl
})
@@ -237,7 +238,8 @@ export async function load_ae_obj_li__event_presenter(
api_cfg: api_cfg,
for_obj_type: 'event_presenter',
for_obj_id: event_presenter_id,
params: {qry__enabled: enabled, qry__limit: limit},
enabled: enabled,
limit: limit,
try_cache: try_cache,
log_lvl: log_lvl
})

View File

@@ -114,7 +114,8 @@ export async function load_ae_obj_id__event_session(
api_cfg: api_cfg,
for_obj_type: 'event_session',
for_obj_id: event_session_id,
params: {qry__enabled: 'all', qry__limit: 15},
enabled: enabled,
limit: 15,
try_cache: try_cache,
log_lvl: log_lvl
})
@@ -288,7 +289,8 @@ export async function load_ae_obj_li__event_session(
api_cfg: api_cfg,
for_obj_type: 'event_session',
for_obj_id: event_session_id,
params: {qry__enabled: enabled, qry__limit: limit},
enabled: enabled,
limit: limit,
try_cache: try_cache,
log_lvl: log_lvl
})

View File

@@ -67,16 +67,18 @@ let clipboard_success = $state(false);
db_events.files.clear();
let params = {
qry__enabled: 'all',
qry__hidden: 'all',
}
// let params = {
// qry__enabled: 'all',
// qry__hidden: 'all',
// }
events_func.load_ae_obj_li__event_file({
api_cfg: $ae_api,
for_obj_type: link_to_type,
for_obj_id: link_to_id,
params: params,
enabled: 'all',
hidden: 'all',
// params: params,
try_cache: true
});
@@ -429,16 +431,18 @@ let clipboard_success = $state(false);
.then (function (update_results) {
console.log(`Update results:`, update_results);
let params = {
qry__enabled: 'all',
qry__hidden: 'all',
}
// let params = {
// qry__enabled: 'all',
// qry__hidden: 'all',
// }
events_func.load_ae_obj_li__event_file({
api_cfg: $ae_api,
for_obj_type: link_to_type,
for_obj_id: link_to_id,
params: params,
enabled: 'all',
hidden: 'all',
// params: params,
try_cache: true
});
});