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

Fix IDAA Recovery Meetings loading and optimize API retry logic

Browse Source 
- Implemented workaround for 'conference' field search restriction in V3 by using local filtering
- Optimized post_object to stop retrying on 4xx client errors (400, 401, 403)
- Migrated Archives and Event/Recovery Meeting modules to Aether API CRUD V3
- Added editable_fields definitions for Archive and Archive Content objects
This commit is contained in:
Scott Idem
2026-01-06 17:22:19 -05:00
parent e1f97d5154
commit bfa1943889
7 changed files with 471 additions and 1769 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib/ae_api/api_post_object.ts
View File

@@ -127,6 +127,12 @@ export const post_object = async function post_object({
const errorBody = await response.text();
console.error(`HTTP error! status: ${response.status}`, errorBody);
// Don't retry on client errors (400, 401, 403)
if (response.status >= 400 && response.status < 404) {
return false;
}
throw new Error(`HTTP error! status: ${response.status} - ${errorBody}`);
}

19
src/lib/ae_archives/ae_archives__archive.editable_fields.ts Normal file
View File

@@ -0,0 +1,19 @@
export const editable_fields__archive = [
'code',
'name',
'description',
'original_datetime',
'original_timezone',
'original_location',
'original_url',
'original_url_text',
'sort_by',
'sort_by_desc',
'cfg_json',
'enable',
'hide',
'priority',
'sort',
'group',
'notes'
];

681
src/lib/ae_archives/ae_archives__archive.ts
View File

@@ -8,13 +8,14 @@ import { load_ae_obj_li__archive_content } from '$lib/ae_archives/ae_archives__a
const ae_promises: key_val = {};
// Updated 2024-09-25
// Updated 2026-01-06
export async function load_ae_obj_id__archive({
api_cfg,
archive_id,
inc_content_li = false,
enabled = 'enabled',
hidden = 'not_hidden',
view = 'default',
limit = 99,
offset = 0,
params = {},
@@ -26,6 +27,7 @@ export async function load_ae_obj_id__archive({
inc_content_li?: boolean;
enabled?: 'enabled' | 'all' | 'not_enabled' | undefined;
hidden?: 'hidden' | 'all' | 'not_hidden' | undefined;
view?: string;
limit?: number;
offset?: number;
params?: key_val;
@@ -37,30 +39,21 @@ export async function load_ae_obj_id__archive({
}
ae_promises.load__archive_obj = await api
.get_ae_obj_id_crud({
.get_ae_obj_v3({
api_cfg: api_cfg,
obj_type: 'archive',
obj_id: archive_id,
use_alt_table: true,
use_alt_base: false,
params: params,
view,
params,
log_lvl: log_lvl
})
.then(async function (archive_obj_get_result) {
if (archive_obj_get_result) {
if (try_cache) {
// Process the results first
const processed_obj_li = await process_ae_obj__archive_props({
obj_li: [archive_obj_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_archives,
table_name: 'archive',
@@ -68,15 +61,6 @@ export async function load_ae_obj_id__archive({
properties_to_save: properties_to_save,
log_lvl: log_lvl
});
if (log_lvl) {
console.log('DB save completed.');
}
// // This is expecting a list
// db_save_ae_obj_li__archive({
// obj_type: 'archive',
// obj_li: [archive_obj_get_result]
// });
}
return archive_obj_get_result;
} else {
@@ -88,43 +72,27 @@ export async function load_ae_obj_id__archive({
console.log('No results returned or failed.', error);
});
if (log_lvl) {
console.log('ae_promises.load__archive_obj:', ae_promises.load__archive_obj);
}
if (inc_content_li) {
if (inc_content_li && ae_promises.load__archive_obj) {
// Load the contents for the archive
if (log_lvl) {
console.log(`Need to load the content list for the archive now`);
}
const load_archive_content_obj_li = load_ae_obj_li__archive_content({
const load_archive_content_obj_li = await load_ae_obj_li__archive_content({
api_cfg: api_cfg,
for_obj_type: 'archive',
for_obj_id: archive_id,
enabled: enabled, // all, disabled, enabled
hidden: hidden, // all, hidden, not_hidden
limit: limit, // Limit for the comments
enabled: enabled,
hidden: hidden,
limit: limit,
offset: offset,
params: params,
try_cache: try_cache,
log_lvl: log_lvl
}).then((archive_content_obj_li) => {
if (log_lvl) {
console.log(`archive_content_obj_li = `, archive_content_obj_li);
}
return archive_content_obj_li;
});
if (log_lvl) {
console.log(`archive_content_obj_li = `, load_archive_content_obj_li);
}
ae_promises.load__archive_obj.archive_content_li = load_archive_content_obj_li;
}
return ae_promises.load__archive_obj;
}
// Updated 2024-11-20
// Updated 2026-01-06
export async function load_ae_obj_li__archive({
api_cfg,
for_obj_type = 'account',
@@ -132,6 +100,7 @@ export async function load_ae_obj_li__archive({
inc_content_li = false,
enabled = 'enabled',
hidden = 'not_hidden',
view = 'default',
limit = 99,
offset = 0,
order_by_li = {
@@ -151,9 +120,10 @@ export async function load_ae_obj_li__archive({
inc_content_li?: boolean;
enabled?: 'enabled' | 'all' | 'not_enabled' | undefined;
hidden?: 'hidden' | 'all' | 'not_hidden' | undefined;
view?: string;
limit?: number;
offset?: number;
order_by_li?: key_val;
order_by_li?: Record<string, 'ASC' | 'DESC'>;
params?: key_val;
try_cache?: boolean;
log_lvl?: number;
@@ -164,43 +134,27 @@ export async function load_ae_obj_li__archive({
);
}
const params_json: key_val = {};
// console.log('params_json:', params_json);
ae_promises.load__archive_obj_li = await api
.get_ae_obj_li_for_obj_id_crud_v2({
api_cfg: api_cfg,
.get_ae_obj_li_v3({
api_cfg,
obj_type: 'archive',
for_obj_type: for_obj_type,
for_obj_id: for_obj_id,
use_alt_tbl: false,
use_alt_mdl: false,
use_alt_exp: false,
enabled: enabled,
hidden: hidden,
order_by_li: order_by_li,
limit: limit,
offset: offset,
params_json: params_json,
params: params,
log_lvl: log_lvl
for_obj_type,
for_obj_id,
enabled,
hidden,
view,
limit,
offset,
order_by_li,
log_lvl
})
.then(async function (archive_obj_li_get_result) {
if (archive_obj_li_get_result) {
if (try_cache) {
// Process the results first
const processed_obj_li = await process_ae_obj__archive_props({
obj_li: archive_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_archives,
table_name: 'archive',
@@ -208,14 +162,6 @@ export async function load_ae_obj_li__archive({
properties_to_save: properties_to_save,
log_lvl: log_lvl
});
if (log_lvl) {
console.log('DB save completed.');
}
// db_save_ae_obj_li__archive({
// obj_type: 'archive',
// obj_li: archive_obj_li_get_result
// });
}
return archive_obj_li_get_result;
} else {
@@ -223,53 +169,31 @@ export async function load_ae_obj_li__archive({
}
});
if (log_lvl) {
console.log('ae_promises.load__archive_obj_li:', ae_promises.load__archive_obj_li);
}
if (inc_content_li) {
// Load the contents for the archives
if (log_lvl) {
console.log(`Need to load the content list for each archive now`);
}
if (inc_content_li && ae_promises.load__archive_obj_li) {
for (let i = 0; i < ae_promises.load__archive_obj_li.length; i++) {
const archive_obj = ae_promises.load__archive_obj_li[i];
const archive_id = archive_obj.archive_id_random;
const load_archive_content_obj_li = load_ae_obj_li__archive_content({
const content_li = await load_ae_obj_li__archive_content({
api_cfg: api_cfg,
for_obj_type: 'archive',
for_obj_id: archive_id,
enabled: enabled, // all, disabled, enabled
hidden: hidden, // all, hidden, not_hidden
limit: limit, // Limit for the comments
offset: offset,
params: params,
try_cache: try_cache,
log_lvl: log_lvl
}).then((archive_content_obj_li) => {
if (log_lvl) {
console.log(`archive_content_obj_li = `, archive_content_obj_li);
}
return archive_content_obj_li;
enabled,
hidden,
limit,
offset,
params,
try_cache,
log_lvl
});
if (log_lvl) {
console.log(`load_archive_content_obj_li = `, load_archive_content_obj_li);
}
if (load_archive_content_obj_li) {
ae_promises.load__archive_obj_li[i].archive_content_obj_li =
load_archive_content_obj_li;
}
ae_promises.load__archive_obj_li[i].archive_content_li = content_li;
}
}
return ae_promises.load__archive_obj_li;
}
// Updated 2025-06-23
// Updated 2026-01-06
export async function create_ae_obj__archive({
api_cfg,
account_id,
@@ -289,83 +213,46 @@ export async function create_ae_obj__archive({
console.log(`*** create_ae_obj__archive() *** account_id=${account_id}`);
}
if (!account_id) {
console.log(`ERROR: Archives - Archive - account_id required to create`);
return false;
}
const result = await api.create_ae_obj_v3({
api_cfg,
obj_type: 'archive',
fields: {
account_id_random: account_id,
...data_kv
},
params,
log_lvl
});
ae_promises.create__archive = await api
.create_ae_obj_crud({
api_cfg: api_cfg,
obj_type: 'archive',
fields: {
account_id_random: account_id,
...data_kv
},
key: api_cfg.api_crud_super_key,
params: params,
return_obj: true,
if (result && try_cache) {
const processed_obj_li = await process_ae_obj__archive_props({
obj_li: [result],
log_lvl: log_lvl
});
await db_save_ae_obj_li__ae_obj({
db_instance: db_archives,
table_name: 'archive',
obj_li: processed_obj_li,
properties_to_save: properties_to_save,
log_lvl: log_lvl
})
.then(async function (archive_obj_create_result) {
if (archive_obj_create_result) {
if (try_cache) {
// Process the results first
const processed_obj_li = await process_ae_obj__archive_props({
obj_li: [archive_obj_create_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_archives,
table_name: 'archive',
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__archive(
// {
// obj_type: 'archive',
// obj_li: [archive_obj_create_result]
// });
}
return archive_obj_create_result;
} else {
return null;
}
})
.catch(function (error: any) {
console.log('No results returned or failed.', error);
});
if (log_lvl) {
console.log('ae_promises.create__archive:', ae_promises.create__archive);
}
return ae_promises.create__archive;
return result;
}
// Updated 2024-11-08
// Updated 2026-01-06
export async function delete_ae_obj_id__archive({
api_cfg,
archive_id,
method = 'delete', // 'delete', 'disable', 'hide'
method = 'delete',
params = {},
try_cache = true,
log_lvl = 0
}: {
api_cfg: any;
archive_id: string;
method?: string;
method?: 'delete' | 'soft_delete' | 'disable' | 'hide';
params?: key_val;
try_cache?: boolean;
log_lvl?: number;
@@ -374,36 +261,23 @@ export async function delete_ae_obj_id__archive({
console.log(`*** delete_ae_obj_id__archive() *** archive_id=${archive_id}`);
}
ae_promises.delete__archive_obj = await api
.delete_ae_obj_id_crud({
api_cfg: api_cfg,
obj_type: 'archive',
obj_id: archive_id,
key: api_cfg.api_crud_super_key,
params: params,
method: method,
log_lvl: log_lvl
})
.catch(function (error: any) {
console.log('No results returned or failed.', error);
})
.finally(function () {
if (try_cache) {
if (log_lvl) {
console.log(`Attempting to remove IDB entry for archive_id=${archive_id}`);
}
db_archives.content.delete(archive_id); // Delete from the DB no matter what.
}
});
const result = await api.delete_ae_obj_v3({
api_cfg,
obj_type: 'archive',
obj_id: archive_id,
method,
params,
log_lvl
});
if (log_lvl) {
console.log('ae_promises.delete__archive_obj:', ae_promises.delete__archive_obj);
if (try_cache) {
await db_archives.archive.delete(archive_id);
}
return ae_promises.delete__archive_obj;
return result;
}
// Updated 2025-06-23
// Updated 2026-01-06
export async function update_ae_obj__archive({
api_cfg,
archive_id,
@@ -423,357 +297,104 @@ export async function update_ae_obj__archive({
console.log(`*** update_ae_obj__archive() *** archive_id=${archive_id}`, data_kv);
}
// Perform the API update
const result = await api.update_ae_obj_id_crud({
api_cfg: api_cfg,
const result = await api.update_ae_obj_v3({
api_cfg,
obj_type: 'archive',
obj_id: archive_id,
fields: data_kv,
key: api_cfg.api_crud_super_key,
params: params,
return_obj: true,
log_lvl: log_lvl
params,
log_lvl
});
// Handle the result
if (result) {
if (try_cache) {
// Process the results first
const processed_obj_li = await process_ae_obj__archive_props({
obj_li: [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_archives,
table_name: 'archive',
obj_li: processed_obj_li,
properties_to_save: properties_to_save,
log_lvl: log_lvl
});
if (log_lvl) {
console.log('DB save completed.');
}
// await db_save_ae_obj_li__archive({
// obj_type: 'archive',
// obj_li: [result],
// log_lvl: log_lvl,
// });
}
return result;
} else {
console.error('Failed to update archive.');
return null;
if (result && try_cache) {
const processed_obj_li = await process_ae_obj__archive_props({
obj_li: [result],
log_lvl: log_lvl
});
await db_save_ae_obj_li__ae_obj({
db_instance: db_archives,
table_name: 'archive',
obj_li: processed_obj_li,
properties_to_save: properties_to_save,
log_lvl: log_lvl
});
}
return result;
}
// This new function is using CRUD v2. This should allow for more flexibility in the queries.
// Updated 2024-09-25
// Updated 2026-01-06
export async function qry__archive({
api_cfg,
archive_id,
account_id,
qry_str,
qry_files,
qry_start_datetime, // Example greater than: '2024-10-24'
enabled = 'enabled',
hidden = 'not_hidden',
view = 'default',
limit = 50,
offset = 0,
params = {},
try_cache = true,
log_lvl = 0
}: {
api_cfg: any;
archive_id: any;
qry_str?: string;
qry_files?: null | boolean;
qry_start_datetime?: null | string; // Greater than this datetime
enabled?: 'enabled' | 'all' | 'not_enabled' | undefined; // all, disabled, enabled
hidden?: 'hidden' | 'all' | 'not_hidden' | undefined; // all, hidden, not_hidden
limit?: number;
offset?: number;
params?: any;
try_cache?: boolean;
log_lvl?: number;
}) {
console.log(`*** qry__archive() *** archive_id=${archive_id} qry_str=${qry_str}`);
// let enabled: string = (params.qry__enabled ?? 'enabled'); // all, disabled, enabled
// let hidden: string = (params.qry__hidden ?? 'not_hidden'); // all, hidden, not_hidden
// let limit: number = (params.qry__limit ?? 25); // 99
// let offset: number = (params.qry__offset ?? 0); // 0
const params_json: key_val = {};
// if (qry_str && qry_str.length > 2) {
// params_json['ft_qry'] = {};
// params_json['ft_qry']['default_qry_str'] = qry_str;
// }
params_json['qry'] = [];
if (qry_files === true) {
const qry_param = {
type: 'AND',
field: 'file_count_all',
operator: '>',
value: 0
};
params_json['qry'].push(qry_param);
} else if (qry_files === false) {
const qry_param = {
type: 'AND',
field: 'file_count_all',
operator: 'IS',
value: null
};
params_json['qry'].push(qry_param);
}
if (qry_start_datetime) {
const qry_param = {
type: 'AND',
field: 'start_datetime',
operator: '>',
value: qry_start_datetime
};
params_json['qry'].push(qry_param);
}
const order_by_li = {
order_by_li = {
priority: 'DESC',
sort: 'DESC',
start_datetime: 'ASC',
name: 'ASC',
updated_on: 'DESC',
created_on: 'DESC'
};
},
log_lvl = 0
}: {
api_cfg: any;
account_id: string;
qry_str?: string;
enabled?: 'enabled' | 'all' | 'not_enabled';
hidden?: 'hidden' | 'all' | 'not_hidden';
view?: string;
limit?: number;
offset?: number;
order_by_li?: Record<string, 'ASC' | 'DESC'>;
log_lvl?: number;
}) {
const search_query: any = { and: [] };
ae_promises.load__archive_obj_li = await api
.get_ae_obj_li_for_obj_id_crud_v2({
api_cfg: api_cfg,
obj_type: 'archive',
for_obj_type: 'event',
for_obj_id: archive_id,
use_alt_tbl: true, // NOTE: We want to use the alt table for archive searching
use_alt_mdl: false,
use_alt_exp: false,
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 (archive_obj_li_get_result) {
if (archive_obj_li_get_result) {
if (try_cache) {
// Process the results first
const processed_obj_li = await process_ae_obj__archive_props({
obj_li: archive_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_archives,
table_name: 'archive',
obj_li: processed_obj_li,
properties_to_save: properties_to_save,
log_lvl: log_lvl
});
if (log_lvl) {
console.log('DB save completed.');
}
}
return archive_obj_li_get_result;
} else {
return [];
}
});
if (log_lvl) {
console.log('ae_promises.load__archive_obj_li:', ae_promises.load__archive_obj_li);
if (account_id) {
search_query.and.push({ field: 'account_id_random', op: 'eq', value: account_id });
}
if (qry_str) {
search_query.q = qry_str;
}
ae_promises.load__archive_obj_li = await api.search_ae_obj_v3({
api_cfg,
obj_type: 'archive',
search_query,
enabled,
hidden,
view,
limit,
offset,
order_by_li,
log_lvl
});
return ae_promises.load__archive_obj_li;
}
// // Updated 2024-09-25
// export async function search__archive(
// {
// api_cfg,
// account_id,
// poc_agree = null,
// fulltext_search_qry_str,
// ft_content_search_qry_str,
// like_search_qry_str = null,
// file_count = false, // If true then only show those that have a file count
// person_name = null,
// params = {},
// try_cache = true,
// log_lvl = 0
// }: {
// api_cfg: any,
// account_id: any,
// poc_agree?: null|boolean,
// fulltext_search_qry_str?: null|string,
// ft_content_search_qry_str?: null|string,
// like_search_qry_str?: null|string,
// file_count?: boolean,
// person_name?: null|string,
// params?: any,
// try_cache?: boolean,
// log_lvl?: number
// }
// ) {
// console.log(`*** search__archive() *** account_id=${account_id}`);
// let enabled: string = (params.qry__enabled ?? 'enabled'); // all, disabled, enabled
// let hidden: string = (params.qry__hidden ?? 'not_hidden'); // all, hidden, not_hidden
// let limit: number = (params.qry__limit ?? 25); // 99
// let offset: number = (params.qry__offset ?? 0); // 0
// let 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.
// // }
// if (fulltext_search_qry_str || ft_content_search_qry_str) {
// params_json['ft_qry'] = {};
// if (fulltext_search_qry_str && fulltext_search_qry_str.length > 2) {
// params_json['ft_qry']['default_qry_str'] = fulltext_search_qry_str;
// }
// if (ft_content_search_qry_str && ft_content_search_qry_str.length > 2) {
// params_json['ft_qry']['archive_content_li_qry_str'] = ft_content_search_qry_str;
// }
// }
// // Use the AND (AND LIKE) query
// // if (like_search_qry_str || like_content_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_content_search_qry_str && like_content_search_qry_str.length > 2) {
// // params_json['and_like']['archive_content_li_qry_str'] = like_content_search_qry_str;
// // }
// // }
// // Use the AND (OR LIKE) query
// if (like_search_qry_str || like_content_search_qry_str || like_content_search_qry_str) {
// params_json['or_like'] = {};
// if (like_search_qry_str && like_search_qry_str.length > 2) {
// params_json['or_like']['default_qry_str'] = like_search_qry_str;
// }
// if (like_content_search_qry_str && like_content_search_qry_str.length > 2) {
// params_json['or_like']['archive_content_li_qry_str'] = like_content_search_qry_str;
// }
// if (like_content_search_qry_str && like_content_search_qry_str.length > 2) {
// params_json['or_like']['archive_content_li_qry_str'] = like_content_search_qry_str;
// }
// }
// params_json['and_qry'] = {};
// if (poc_agree) {
// params_json['and_qry']['poc_agree'] = poc_agree;
// }
// if (file_count) {
// params_json['and_qry']['file_count'] = file_count;
// }
// // This should be using a like with surrounded by %'s
// if (person_name) {
// params_json['and_qry']['archive_full_name'] = person_name;
// }
// let order_by_li = {'priority': 'DESC', 'sort': 'DESC', 'name': 'ASC', 'updated_on': 'DESC', 'created_on': 'DESC'};
// ae_promises.load__archive_obj_li = await api.get_ae_obj_li_for_obj_id_crud({
// api_cfg: api_cfg,
// obj_type: 'archive',
// for_obj_type: 'account',
// for_obj_id: account_id,
// use_alt_table: true, // NOTE: We want to use the alt table for archive searching
// use_alt_base: false,
// 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(function (archive_obj_li_get_result) {
// if (archive_obj_li_get_result) {
// if (try_cache) {
// db_save_ae_obj_li__archive({
// obj_type: 'archive',
// obj_li: archive_obj_li_get_result
// });
// }
// return archive_obj_li_get_result;
// } else {
// return [];
// }
// })
// .catch(function (error: any) {
// console.log('No results returned or failed.', error);
// })
// .finally(function () {
// });
// if (log_lvl) {
// console.log('ae_promises.load__archive_obj_li:', ae_promises.load__archive_obj_li);
// }
// return ae_promises.load__archive_obj_li;
// }
// Updated 2025-06-04
export const properties_to_save = [
'id',
'archive_id',
// 'archive_id_random',
'code',
'account_id',
// 'account_id_random',
'name',
'description',
'original_datetime',
'original_timezone',
'original_location',
'original_url',
'original_url_text',
'sort_by',
'sort_by_desc',
'cfg_json',
'enable',
'hide',
'priority',
@@ -782,25 +403,10 @@ 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
// 'archive_content_count',
// A key value list of the contents
// 'archive_content_kv',
// 'archive_content_li',
];
/**
* 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,
@@ -812,39 +418,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
processed_obj[newKey] = processed_obj[key];
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';
@@ -854,7 +445,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));
}
@@ -878,7 +468,6 @@ export async function process_ae_obj__archive_props({
obj_type: 'archive',
log_lvl,
specific_processor: (obj) => {
// Archive-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}`;
@@ -889,4 +478,4 @@ export async function process_ae_obj__archive_props({
return obj;
}
});
}
}

29
src/lib/ae_archives/ae_archives__archive_content.editable_fields.ts Normal file
View File

@@ -0,0 +1,29 @@
export const editable_fields__archive_content = [
'archive_id',
'archive_id_random',
'archive_content_type',
'name',
'description',
'content_html',
'content_json',
'url',
'url_text',
'hosted_file_id',
'hosted_file_id_random',
'file_path',
'filename',
'file_extension',
'original_datetime',
'original_timezone',
'original_location',
'original_url',
'original_url_text',
'enable_for_public',
'cfg_json',
'enable',
'hide',
'priority',
'sort',
'group',
'notes'
];

335
src/lib/ae_archives/ae_archives__archive_content.ts
View File

@@ -6,26 +6,18 @@ import { db_archives } from '$lib/ae_archives/db_archives';
const ae_promises: key_val = {};
// TESTING NOTE: I changed these to all use async and await. Not sure if this helps or hurts things. Mainly this is related to the Dexie DB changes. 2024-11-08
// Updated 2024-09-25
// Updated 2026-01-06
export async function load_ae_obj_id__archive_content({
api_cfg,
archive_content_id,
// enabled = 'enabled',
// hidden = 'not_hidden',
// limit = 99,
// offset = 0,
view = 'default',
params = {},
try_cache = true,
log_lvl = 0
}: {
api_cfg: any;
archive_content_id: string;
// enabled?: "enabled" | "all" | "not_enabled" | undefined,
// hidden?: "hidden" | "all" | "not_hidden" | undefined,
// limit?: number,
// offset?: number,
view?: string;
params?: key_val;
try_cache?: boolean;
log_lvl?: number;
@@ -37,30 +29,21 @@ export async function load_ae_obj_id__archive_content({
}
ae_promises.load__archive_content_obj = await api
.get_ae_obj_id_crud({
.get_ae_obj_v3({
api_cfg: api_cfg,
obj_type: 'archive_content',
obj_id: archive_content_id,
use_alt_table: false,
use_alt_base: false,
params: params,
view,
params,
log_lvl: log_lvl
})
.then(async function (archive_content_obj_get_result) {
if (archive_content_obj_get_result) {
if (try_cache) {
// Process the results first
const processed_obj_li = await process_ae_obj__archive_content_props({
obj_li: [archive_content_obj_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_archives,
table_name: 'content',
@@ -68,16 +51,6 @@ export async function load_ae_obj_id__archive_content({
properties_to_save: properties_to_save,
log_lvl: log_lvl
});
if (log_lvl) {
console.log('DB save completed.');
}
// // This is expecting a list
// await db_save_ae_obj_li__archive_content({
// obj_type: 'archive_content',
// obj_li: [archive_content_obj_get_result]
// });
}
return archive_content_obj_get_result;
} else {
@@ -92,13 +65,14 @@ export async function load_ae_obj_id__archive_content({
return ae_promises.load__archive_content_obj;
}
// Updated 2024-11-20
// Updated 2026-01-06
export async function load_ae_obj_li__archive_content({
api_cfg,
for_obj_type = 'archive',
for_obj_id,
enabled = 'enabled',
hidden = 'not_hidden',
view = 'default',
limit = 99,
offset = 0,
order_by_li = {
@@ -118,9 +92,10 @@ export async function load_ae_obj_li__archive_content({
for_obj_id: string;
enabled?: 'enabled' | 'all' | 'not_enabled' | undefined;
hidden?: 'hidden' | 'all' | 'not_hidden' | undefined;
view?: string;
limit?: number;
offset?: number;
order_by_li?: key_val;
order_by_li?: Record<string, 'ASC' | 'DESC'>;
params?: key_val;
try_cache?: boolean;
log_lvl?: number;
@@ -131,43 +106,27 @@ export async function load_ae_obj_li__archive_content({
);
}
const params_json: key_val = {};
// console('params_json:', params_json);
ae_promises.load__archive_content_obj_li = await api
.get_ae_obj_li_for_obj_id_crud_v2({
.get_ae_obj_li_v3({
api_cfg: api_cfg,
obj_type: 'archive_content',
for_obj_type: for_obj_type,
for_obj_id: for_obj_id,
use_alt_tbl: false,
use_alt_mdl: false,
use_alt_exp: false,
enabled: enabled,
hidden: hidden,
order_by_li: order_by_li,
limit: limit,
offset: offset,
params_json: params_json,
params: params,
for_obj_type,
for_obj_id,
enabled,
hidden,
view,
limit,
offset,
order_by_li,
log_lvl: log_lvl
})
.then(async function (archive_content_obj_li_get_result) {
if (archive_content_obj_li_get_result) {
if (try_cache) {
// Process the results first
const processed_obj_li = await process_ae_obj__archive_content_props({
obj_li: archive_content_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_archives,
table_name: 'content',
@@ -175,34 +134,17 @@ export async function load_ae_obj_li__archive_content({
properties_to_save: properties_to_save,
log_lvl: log_lvl
});
if (log_lvl) {
console.log('DB save completed.');
}
// await db_save_ae_obj_li__archive_content({
// obj_type: 'archive_content', obj_li: archive_content_obj_li_get_result
// });
}
return archive_content_obj_li_get_result;
} else {
return [];
}
})
.catch(function (error: any) {
console.log('No results returned or failed.', error);
});
if (log_lvl) {
console.log(
'ae_promises.load__archive_content_obj_li:',
ae_promises.load__archive_content_obj_li
);
}
return ae_promises.load__archive_content_obj_li;
}
// Updated 2025-06-23
// Updated 2026-01-06
export async function create_ae_obj__archive_content({
api_cfg,
archive_id,
@@ -227,78 +169,46 @@ export async function create_ae_obj__archive_content({
return false;
}
ae_promises.create__archive_content = await api
.create_ae_obj_crud({
api_cfg: api_cfg,
obj_type: 'archive_content',
fields: {
archive_id_random: archive_id,
...data_kv
},
key: api_cfg.api_crud_super_key,
params: params,
return_obj: true,
const result = await api.create_ae_obj_v3({
api_cfg,
obj_type: 'archive_content',
fields: {
archive_id_random: archive_id,
...data_kv
},
params,
log_lvl
});
if (result && try_cache) {
const processed_obj_li = await process_ae_obj__archive_content_props({
obj_li: [result],
log_lvl: log_lvl
});
await db_save_ae_obj_li__ae_obj({
db_instance: db_archives,
table_name: 'content',
obj_li: processed_obj_li,
properties_to_save: properties_to_save,
log_lvl: log_lvl
})
.then(async function (archive_content_obj_create_result) {
if (archive_content_obj_create_result) {
if (try_cache) {
// Process the results first
const processed_obj_li = await process_ae_obj__archive_content_props({
obj_li: [archive_content_obj_create_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_archives,
table_name: 'content',
obj_li: processed_obj_li,
properties_to_save: properties_to_save,
log_lvl: log_lvl
});
if (log_lvl) {
console.log('DB save completed.');
}
// await db_save_ae_obj_li__archive_content(
// {
// obj_type: 'archive_content',
// obj_li: [archive_content_obj_create_result]
// });
}
return archive_content_obj_create_result;
} else {
return null;
}
})
.catch(function (error: any) {
console.log('No results returned or failed.', error);
});
if (log_lvl) {
console.log('ae_promises.create__archive_content:', ae_promises.create__archive_content);
}
return ae_promises.create__archive_content;
return result;
}
// Updated 2024-11-08
// Updated 2026-01-06
export async function delete_ae_obj_id__archive_content({
api_cfg,
archive_content_id,
method = 'delete', // 'delete', 'disable', 'hide'
method = 'delete',
params = {},
try_cache = true,
log_lvl = 0
}: {
api_cfg: any;
archive_content_id: string;
method?: string;
method?: 'delete' | 'soft_delete' | 'disable' | 'hide';
params?: key_val;
try_cache?: boolean;
log_lvl?: number;
@@ -309,41 +219,23 @@ export async function delete_ae_obj_id__archive_content({
);
}
ae_promises.delete__archive_content_obj = await api
.delete_ae_obj_id_crud({
api_cfg: api_cfg,
obj_type: 'archive_content',
obj_id: archive_content_id,
key: api_cfg.api_crud_super_key,
params: params,
method: method,
log_lvl: log_lvl
})
.catch(function (error: any) {
console.log('No results returned or failed.', error);
})
.finally(function () {
if (try_cache) {
if (log_lvl) {
console.log(
`Attempting to remove IDB entry for archive_content_id=${archive_content_id}`
);
}
db_archives.content.delete(archive_content_id); // Delete from the DB no matter what.
}
});
const result = await api.delete_ae_obj_v3({
api_cfg,
obj_type: 'archive_content',
obj_id: archive_content_id,
method,
params,
log_lvl
});
if (log_lvl) {
console.log(
'ae_promises.delete__archive_content_obj:',
ae_promises.delete__archive_content_obj
);
if (try_cache) {
await db_archives.content.delete(archive_content_id);
}
return ae_promises.delete__archive_content_obj;
return result;
}
// Updated 2025-06-23
// Updated 2026-01-06
export async function update_ae_obj__archive_content({
api_cfg,
archive_content_id,
@@ -366,95 +258,56 @@ export async function update_ae_obj__archive_content({
);
}
// Perform the API update
const result = await api.update_ae_obj_id_crud({
api_cfg: api_cfg,
const result = await api.update_ae_obj_v3({
api_cfg,
obj_type: 'archive_content',
obj_id: archive_content_id,
fields: data_kv,
key: api_cfg.api_crud_super_key,
params: params,
return_obj: true,
log_lvl: log_lvl
params,
log_lvl
});
// Handle the result
if (result) {
if (try_cache) {
// Process the results first
const processed_obj_li = await process_ae_obj__archive_content_props({
obj_li: [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_archives,
table_name: 'content',
obj_li: processed_obj_li,
properties_to_save: properties_to_save,
log_lvl: log_lvl
});
if (log_lvl) {
console.log('DB save completed.');
}
// await db_save_ae_obj_li__archive_content({
// obj_type: 'archive_content',
// obj_li: [result],
// log_lvl: log_lvl,
// });
}
return result;
} else {
console.error('Failed to update archive content.');
return null;
if (result && try_cache) {
const processed_obj_li = await process_ae_obj__archive_content_props({
obj_li: [result],
log_lvl: log_lvl
});
await db_save_ae_obj_li__ae_obj({
db_instance: db_archives,
table_name: 'content',
obj_li: processed_obj_li,
properties_to_save: properties_to_save,
log_lvl: log_lvl
});
}
return result;
}
// Updated 2025-06-04
export const properties_to_save = [
'id',
'archive_content_id',
// 'archive_content_id_random',
'archive_id',
// 'archive_id_random',
'archive_content_type',
'name',
'description',
'content_html',
'content_json',
'url',
'url_text',
'hosted_file_id',
'hosted_file_id_random',
'file_path',
'filename',
'file_extension',
'original_datetime',
'original_timezone',
'original_location',
'original_url',
'original_url_text',
'enable_for_public',
'cfg_json',
'enable',
'hide',
'priority',
@@ -463,24 +316,13 @@ 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
'archive_code',
'archive_name',
'hash_sha256'
];
/**
* 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,
@@ -492,39 +334,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
processed_obj[newKey] = processed_obj[key];
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';
@@ -534,7 +361,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));
}
@@ -558,7 +384,6 @@ export async function process_ae_obj__archive_content_props({
obj_type: 'archive_content',
log_lvl,
specific_processor: (obj) => {
// Archive content-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.original_datetime ?? ''}`;
@@ -574,4 +399,4 @@ export async function process_ae_obj__archive_content_props({
return obj;
}
});
}
}

1163
src/lib/ae_events/ae_events__event.ts
View File

File diff suppressed because it is too large Load Diff

7
src/routes/idaa/(idaa)/recovery_meetings/+layout.ts
View File

@@ -28,11 +28,11 @@ export async function load({ params, parent }) {
if (browser) {
const load_event_obj_li = events_func.load_ae_obj_li__event({
api_cfg: ae_acct.api,
for_obj_type: 'account',
for_obj_id: account_id,
qry_conference: false,
hidden: 'not_hidden', // 'not_hidden'
qry_conference: false, // IDAA Recovery Meetings are not standard conferences
enabled: 'enabled',
hidden: 'not_hidden',
limit: 199,
order_by_li: {
priority: 'DESC',
sort: 'DESC',
@@ -40,7 +40,6 @@ export async function load({ params, parent }) {
created_on: 'DESC',
name: 'ASC'
},
limit: 199,
try_cache: true,
log_lvl: log_lvl
});