diff --git a/src/lib/ae_core/core__activity_log.ts b/src/lib/ae_core/core__activity_log.ts index 6c740de5..3fcd1adf 100644 --- a/src/lib/ae_core/core__activity_log.ts +++ b/src/lib/ae_core/core__activity_log.ts @@ -193,9 +193,9 @@ export async function qry__activity_log({ qry_person_id = null, - enabled = 'enabled', + enabled = 'all', - hidden = 'not_hidden', + hidden = 'all', view = 'default', @@ -233,13 +233,31 @@ export async function qry__activity_log({ }) { - const search_query: any = { and: [] }; + const search_query: any = {}; + + const filters: any[] = []; if (account_id) { - search_query.and.push({ field: 'account_id_random', op: 'eq', value: account_id }); + filters.push({ field: 'account_id_random', op: 'eq', value: account_id }); + + } + + + + if (qry_person_id) { + + filters.push({ field: 'person_id_random', op: 'eq', value: qry_person_id }); + + } + + + + if (filters.length > 0) { + + search_query.and = filters; } @@ -253,14 +271,6 @@ export async function qry__activity_log({ - if (qry_person_id) { - - search_query.and.push({ field: 'person_id_random', op: 'eq', value: qry_person_id }); - - } - - - ae_promises.load__activity_log_obj_li = await api.search_ae_obj_v3({ api_cfg, @@ -290,3 +300,5 @@ export async function qry__activity_log({ return ae_promises.load__activity_log_obj_li; } + + diff --git a/src/routes/core/activity_logs/+page.svelte b/src/routes/core/activity_logs/+page.svelte index 70dd3e35..7961adc8 100644 --- a/src/routes/core/activity_logs/+page.svelte +++ b/src/routes/core/activity_logs/+page.svelte @@ -23,6 +23,8 @@ api_cfg: $ae_api, account_id: $ae_loc.account_id, qry_str: qry_str || undefined, + enabled: 'all', + hidden: 'all', limit: limit, log_lvl: 1 });