diff --git a/src/lib/ae_journals/ae_journals__journal.ts b/src/lib/ae_journals/ae_journals__journal.ts index 4c4d8de7..48d8c3eb 100644 --- a/src/lib/ae_journals/ae_journals__journal.ts +++ b/src/lib/ae_journals/ae_journals__journal.ts @@ -46,7 +46,9 @@ export async function load_ae_obj_id__journal({ log_lvl?: number; }): Promise { if (log_lvl) { - console.log(`*** load_ae_obj_id__journal() *** journal_id=${journal_id} (SWR)`); + console.log( + `*** load_ae_obj_id__journal() *** journal_id=${journal_id} (SWR)` + ); } // 1. FAST PATH: Return cached data immediately @@ -54,16 +56,39 @@ export async function load_ae_obj_id__journal({ try { const cached = await db_journals.journal.get(journal_id); if (cached) { - if (log_lvl) console.log('JOURNAL LOAD: Cache hit. Returning stale data.'); - _refresh_journal_id_background({ - api_cfg, journal_id, view, params, try_cache, - inc_entry_li, enabled, hidden, limit, offset, order_by_li, log_lvl: 0 + if (log_lvl) + console.log( + 'JOURNAL LOAD: Cache hit. Returning stale data.' + ); + _refresh_journal_id_background({ + api_cfg, + journal_id, + view, + params, + try_cache, + inc_entry_li, + enabled, + hidden, + limit, + offset, + order_by_li, + log_lvl: 0 }); if (inc_entry_li && !cached.journal_entry_li) { - cached.journal_entry_li = await load_ae_obj_li__journal_entry({ - api_cfg, for_obj_type: 'journal', for_obj_id: journal_id, - enabled, hidden, limit, offset, order_by_li, params, try_cache, log_lvl - }); + cached.journal_entry_li = + await load_ae_obj_li__journal_entry({ + api_cfg, + for_obj_type: 'journal', + for_obj_id: journal_id, + enabled, + hidden, + limit, + offset, + order_by_li, + params, + try_cache, + log_lvl + }); } return cached; } @@ -71,28 +96,76 @@ export async function load_ae_obj_id__journal({ } // 2. SLOW PATH: Wait for API - return await _refresh_journal_id_background({ - api_cfg, journal_id, view, params, try_cache, - inc_entry_li, enabled, hidden, limit, offset, order_by_li, log_lvl + return await _refresh_journal_id_background({ + api_cfg, + journal_id, + view, + params, + try_cache, + inc_entry_li, + enabled, + hidden, + limit, + offset, + order_by_li, + log_lvl }); } /** * Internal background refresh for a single journal */ -async function _refresh_journal_id_background({ api_cfg, journal_id, view, params, try_cache, inc_entry_li, enabled, hidden, limit, offset, order_by_li, log_lvl }: any) { +async function _refresh_journal_id_background({ + api_cfg, + journal_id, + view, + params, + try_cache, + inc_entry_li, + enabled, + hidden, + limit, + offset, + order_by_li, + log_lvl +}: any) { if (typeof navigator !== 'undefined' && !navigator.onLine) return null; try { - const result = await api.get_ae_obj_v3({ api_cfg, obj_type: 'journal', obj_id: journal_id, view, params, log_lvl }); + const result = await api.get_ae_obj_v3({ + api_cfg, + obj_type: 'journal', + obj_id: journal_id, + view, + params, + log_lvl + }); if (result) { if (try_cache) { - const processed = await process_ae_obj__journal_props({ obj_li: [result], log_lvl }); - await db_save_ae_obj_li__ae_obj({ db_instance: db_journals, table_name: 'journal', obj_li: processed, properties_to_save, log_lvl }); + const processed = await process_ae_obj__journal_props({ + obj_li: [result], + log_lvl + }); + await db_save_ae_obj_li__ae_obj({ + db_instance: db_journals, + table_name: 'journal', + obj_li: processed, + properties_to_save, + log_lvl + }); } if (inc_entry_li) { result.journal_entry_li = await load_ae_obj_li__journal_entry({ - api_cfg, for_obj_type: 'journal', for_obj_id: journal_id, - enabled, hidden, limit, offset, order_by_li, params, try_cache, log_lvl + api_cfg, + for_obj_type: 'journal', + for_obj_id: journal_id, + enabled, + hidden, + limit, + offset, + order_by_li, + params, + try_cache, + log_lvl }); } return result; @@ -138,18 +211,37 @@ export async function load_ae_obj_li__journal({ log_lvl?: number; }): Promise { if (log_lvl) { - console.log(`*** load_ae_obj_li__journal() *** for=${for_obj_type}:${for_obj_id} (SWR)`); + console.log( + `*** load_ae_obj_li__journal() *** for=${for_obj_type}:${for_obj_id} (SWR)` + ); } // 1. FAST PATH: Check cache if (try_cache) { try { - const cached_li = await db_journals.journal.where('for_id').equals(for_obj_id).toArray(); + const cached_li = await db_journals.journal + .where('for_id') + .equals(for_obj_id) + .toArray(); if (cached_li && cached_li.length > 0) { - if (log_lvl) console.log(`JOURNAL LIST: Cache hit (${cached_li.length}).`); - _refresh_journal_li_background({ - api_cfg, for_obj_type, for_obj_id, qry_person_id, inc_entry_li, - enabled, hidden, limit, offset, order_by_li, params, try_cache, log_lvl: 0 + if (log_lvl) + console.log( + `JOURNAL LIST: Cache hit (${cached_li.length}).` + ); + _refresh_journal_li_background({ + api_cfg, + for_obj_type, + for_obj_id, + qry_person_id, + inc_entry_li, + enabled, + hidden, + limit, + offset, + order_by_li, + params, + try_cache, + log_lvl: 0 }); return cached_li; } @@ -157,39 +249,110 @@ export async function load_ae_obj_li__journal({ } // 2. SLOW PATH: API - return await _refresh_journal_li_background({ - api_cfg, for_obj_type, for_obj_id, qry_person_id, inc_entry_li, - enabled, hidden, limit, offset, order_by_li, params, try_cache, log_lvl + return await _refresh_journal_li_background({ + api_cfg, + for_obj_type, + for_obj_id, + qry_person_id, + inc_entry_li, + enabled, + hidden, + limit, + offset, + order_by_li, + params, + try_cache, + log_lvl }); } -async function _refresh_journal_li_background({ api_cfg, for_obj_type, for_obj_id, qry_person_id, inc_entry_li, enabled, hidden, limit, offset, order_by_li, params, try_cache, log_lvl }: any) { +async function _refresh_journal_li_background({ + api_cfg, + for_obj_type, + for_obj_id, + qry_person_id, + inc_entry_li, + enabled, + hidden, + limit, + offset, + order_by_li, + params, + try_cache, + log_lvl +}: any) { if (typeof navigator !== 'undefined' && !navigator.onLine) return []; - + let promise; if (qry_person_id) { - const search_query: any = { and: [{ field: 'person_id_random', op: 'eq', value: qry_person_id }] }; - if (for_obj_id) search_query.and.push({ field: `${for_obj_type}_id_random`, op: 'eq', value: for_obj_id }); - if (enabled === 'enabled') search_query.and.push({ field: 'enable', op: 'eq', value: true }); - if (hidden === 'hidden') search_query.and.push({ field: 'hide', op: 'eq', value: true }); + const search_query: any = { + and: [{ field: 'person_id_random', op: 'eq', value: qry_person_id }] + }; + if (for_obj_id) + search_query.and.push({ + field: `${for_obj_type}_id_random`, + op: 'eq', + value: for_obj_id + }); + if (enabled === 'enabled') + search_query.and.push({ field: 'enable', op: 'eq', value: true }); + if (hidden === 'hidden') + search_query.and.push({ field: 'hide', op: 'eq', value: true }); - promise = api.search_ae_obj_v3({ api_cfg, obj_type: 'journal', search_query, order_by_li, limit, offset, log_lvl }); + promise = api.search_ae_obj_v3({ + api_cfg, + obj_type: 'journal', + search_query, + order_by_li, + limit, + offset, + log_lvl + }); } else { - promise = api.get_ae_obj_li_v3({ api_cfg, obj_type: 'journal', for_obj_type, for_obj_id, enabled, hidden, limit, offset, order_by_li, log_lvl }); + promise = api.get_ae_obj_li_v3({ + api_cfg, + obj_type: 'journal', + for_obj_type, + for_obj_id, + enabled, + hidden, + limit, + offset, + order_by_li, + log_lvl + }); } try { const results = await promise; if (results) { if (try_cache) { - const processed = await process_ae_obj__journal_props({ obj_li: results, log_lvl }); - await db_save_ae_obj_li__ae_obj({ db_instance: db_journals, table_name: 'journal', obj_li: processed, properties_to_save, log_lvl }); + const processed = await process_ae_obj__journal_props({ + obj_li: results, + log_lvl + }); + await db_save_ae_obj_li__ae_obj({ + db_instance: db_journals, + table_name: 'journal', + obj_li: processed, + properties_to_save, + log_lvl + }); } if (inc_entry_li) { for (const journal of results) { load_ae_obj_li__journal_entry({ - api_cfg, for_obj_type: 'journal', for_obj_id: journal.journal_id_random, - enabled, hidden, limit, offset, order_by_li, params, try_cache, log_lvl: 0 + api_cfg, + for_obj_type: 'journal', + for_obj_id: journal.journal_id_random, + enabled, + hidden, + limit, + offset, + order_by_li, + params, + try_cache, + log_lvl: 0 }); } } @@ -216,11 +379,15 @@ export async function create_ae_obj__journal({ log_lvl?: number; }): Promise { if (log_lvl) { - console.log(`*** create_ae_obj__journal() *** account_id=${account_id}`); + console.log( + `*** create_ae_obj__journal() *** account_id=${account_id}` + ); } if (!account_id) { - console.log(`ERROR: Journals - Journal - account_id required to create`); + console.log( + `ERROR: Journals - Journal - account_id required to create` + ); return null; } @@ -239,10 +406,11 @@ export async function create_ae_obj__journal({ if (journal_obj_create_result) { if (try_cache) { // Process the results first - const processed_obj_li = await process_ae_obj__journal_props({ - obj_li: [journal_obj_create_result], - log_lvl: log_lvl - }); + const processed_obj_li = + await process_ae_obj__journal_props({ + obj_li: [journal_obj_create_result], + log_lvl: log_lvl + }); if (log_lvl) { console.log('Processed object list:', processed_obj_li); } @@ -284,7 +452,9 @@ export async function delete_ae_obj_id__journal({ log_lvl?: number; }) { if (log_lvl) { - console.log(`*** delete_ae_obj_id__journal() *** journal_id=${journal_id}`); + console.log( + `*** delete_ae_obj_id__journal() *** journal_id=${journal_id}` + ); } ae_promises.delete__journal_obj = await api @@ -302,7 +472,9 @@ export async function delete_ae_obj_id__journal({ .finally(async function () { if (try_cache) { if (log_lvl) { - console.log(`Attempting to remove IDB entry for journal_id=${journal_id}`); + console.log( + `Attempting to remove IDB entry for journal_id=${journal_id}` + ); } await db_journals.journal.delete(journal_id); } @@ -328,7 +500,10 @@ export async function update_ae_obj__journal({ log_lvl?: number; }): Promise { if (log_lvl) { - console.log(`*** update_ae_obj__journal() *** journal_id=${journal_id}`, data_kv); + console.log( + `*** update_ae_obj__journal() *** journal_id=${journal_id}`, + data_kv + ); } // Perform the API update @@ -401,7 +576,9 @@ export async function qry__journal({ hidden?: 'hidden' | 'all' | 'not_hidden' | undefined; // all, hidden, not_hidden limit?: number; offset?: number; - order_by_li?: Record | Record[]; + order_by_li?: + | Record + | Record[]; params?: any; try_cache?: boolean; log_lvl?: number; @@ -417,17 +594,29 @@ export async function qry__journal({ if (qry_files === true) { search_query.and.push({ field: 'file_count_all', op: 'gt', value: 0 }); } else if (qry_files === false) { - search_query.and.push({ field: 'file_count_all', op: 'is', value: null }); + search_query.and.push({ + field: 'file_count_all', + op: 'is', + value: null + }); } if (qry_start_datetime) { - search_query.and.push({ field: 'start_datetime', op: 'gt', value: qry_start_datetime }); + search_query.and.push({ + field: 'start_datetime', + op: 'gt', + value: qry_start_datetime + }); } // Add for_obj_id context (Account ID) if (journal_id) { // Assuming journal_id here is actually the account_id as per original usage context - search_query.and.push({ field: 'account_id_random', op: 'eq', value: journal_id }); + search_query.and.push({ + field: 'account_id_random', + op: 'eq', + value: journal_id + }); } // Add enabled/hidden filters @@ -457,10 +646,11 @@ export async function qry__journal({ if (journal_obj_li_get_result) { if (try_cache) { // Process the results first - const processed_obj_li = await process_ae_obj__journal_props({ - obj_li: journal_obj_li_get_result, - log_lvl: log_lvl - }); + const processed_obj_li = + await process_ae_obj__journal_props({ + obj_li: journal_obj_li_get_result, + log_lvl: log_lvl + }); if (log_lvl) { console.log('Processed object list:', processed_obj_li); } @@ -486,7 +676,10 @@ export async function qry__journal({ }); if (log_lvl) { - console.log('ae_promises.load__journal_obj_li:', ae_promises.load__journal_obj_li); + console.log( + 'ae_promises.load__journal_obj_li:', + ae_promises.load__journal_obj_li + ); } return ae_promises.load__journal_obj_li; } @@ -624,12 +817,16 @@ async function _process_generic_props>({ const updated = processed_obj.updated_on ?? processed_obj.created_on; 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}`; // --- Specific Transformations --- 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); @@ -656,7 +853,8 @@ export async function process_ae_obj__journal_props({ /^[\u200B\u200C\u200D\u200E\u200F\uFEFF]/, '' ); - obj.description_md_html = (await marked.parse(description_cleaned ?? '')) ?? null; + obj.description_md_html = + (await marked.parse(description_cleaned ?? '')) ?? null; obj.cfg_json = obj.cfg_json ?? {}; obj.data_json = obj.data_json ?? {}; @@ -669,4 +867,4 @@ export async function process_ae_obj__journal_props({ return obj; } }); -} \ No newline at end of file +} diff --git a/src/lib/ae_journals/ae_journals__journal_entry.ts b/src/lib/ae_journals/ae_journals__journal_entry.ts index f93fd533..2b4ca368 100644 --- a/src/lib/ae_journals/ae_journals__journal_entry.ts +++ b/src/lib/ae_journals/ae_journals__journal_entry.ts @@ -22,7 +22,9 @@ export async function load_ae_obj_id__journal_entry({ log_lvl?: number; }): Promise { if (log_lvl) { - console.log(`*** load_ae_obj_id__journal_entry() *** journal_entry_id=${journal_entry_id}`); + console.log( + `*** load_ae_obj_id__journal_entry() *** journal_entry_id=${journal_entry_id}` + ); } ae_promises.load__journal_entry_obj = await api @@ -36,10 +38,11 @@ export async function load_ae_obj_id__journal_entry({ if (journal_entry_obj_get_result) { if (try_cache) { // Process the results first - const processed_obj_li = await process_ae_obj__journal_entry_props({ - obj_li: [journal_entry_obj_get_result], - log_lvl: log_lvl - }); + const processed_obj_li = + await process_ae_obj__journal_entry_props({ + obj_li: [journal_entry_obj_get_result], + log_lvl: log_lvl + }); if (log_lvl) { console.log('Processed object list:', processed_obj_li); } @@ -138,11 +141,15 @@ export async function load_ae_obj_li__journal_entry({ if (journal_entry_obj_li_get_result) { if (try_cache) { // Process the results first - const processed_obj_li = await process_ae_obj__journal_entry_props({ - obj_li: journal_entry_obj_li_get_result, - journal_id: for_obj_type === 'journal' ? for_obj_id : undefined, - log_lvl: log_lvl - }); + const processed_obj_li = + await process_ae_obj__journal_entry_props({ + obj_li: journal_entry_obj_li_get_result, + journal_id: + for_obj_type === 'journal' + ? for_obj_id + : undefined, + log_lvl: log_lvl + }); if (log_lvl) { console.log('Processed object list:', processed_obj_li); } @@ -197,7 +204,9 @@ export async function create_ae_obj__journal_entry({ log_lvl?: number; }): Promise { if (log_lvl) { - console.log(`*** create_ae_obj__journal_entry() *** journal_id=${journal_id}`); + console.log( + `*** create_ae_obj__journal_entry() *** journal_id=${journal_id}` + ); } if (!journal_id) { @@ -219,11 +228,12 @@ export async function create_ae_obj__journal_entry({ if (journal_entry_obj_create_result) { if (try_cache) { // Process the results first - const processed_obj_li = await process_ae_obj__journal_entry_props({ - obj_li: [journal_entry_obj_create_result], - journal_id, - log_lvl: log_lvl - }); + const processed_obj_li = + await process_ae_obj__journal_entry_props({ + obj_li: [journal_entry_obj_create_result], + journal_id, + log_lvl: log_lvl + }); if (log_lvl) { console.log('Processed object list:', processed_obj_li); } @@ -342,36 +352,64 @@ export async function qry__journal_entry({ log_lvl?: number; }) { if (log_lvl) { - console.log(`*** qry__journal_entry() *** journal_id=${journal_id} person_id=${person_id}`); + console.log( + `*** qry__journal_entry() *** journal_id=${journal_id} person_id=${person_id}` + ); } const search_query: any = { and: [] }; if (qry_str) { // Using 'like' with wildcards to ensure compatibility - 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 (qry_category_code) { - search_query.and.push({ field: 'category_code', op: 'eq', value: qry_category_code }); + search_query.and.push({ + field: 'category_code', + op: 'eq', + value: qry_category_code + }); } if (qry_created_on) { - search_query.and.push({ field: 'created_on', op: 'gt', value: qry_created_on }); + search_query.and.push({ + field: 'created_on', + op: 'gt', + value: qry_created_on + }); } if (qry_priority) { - search_query.and.push({ field: 'priority', op: 'eq', value: qry_priority }); + search_query.and.push({ + field: 'priority', + op: 'eq', + value: qry_priority + }); } // Context scoping: Prefer journal_id if provided, otherwise fallback to person_id (global search) if (journal_id) { - search_query.and.push({ field: 'journal_id_random', op: 'eq', value: journal_id }); + search_query.and.push({ + field: 'journal_id_random', + op: 'eq', + value: journal_id + }); } else if (person_id) { - search_query.and.push({ field: 'person_id_random', op: 'eq', value: person_id }); + search_query.and.push({ + field: 'person_id_random', + op: 'eq', + value: person_id + }); } else { - console.warn('qry__journal_entry: No journal_id or person_id provided. Search might be too broad.'); + console.warn( + 'qry__journal_entry: No journal_id or person_id provided. Search might be too broad.' + ); } // Add enabled/hidden filters @@ -413,11 +451,12 @@ export async function qry__journal_entry({ if (valid_result_li && valid_result_li.length > 0) { if (try_cache) { - const processed_obj_li = await process_ae_obj__journal_entry_props({ - obj_li: valid_result_li, - journal_id, - log_lvl - }); + const processed_obj_li = + await process_ae_obj__journal_entry_props({ + obj_li: valid_result_li, + journal_id, + log_lvl + }); await db_save_ae_obj_li__ae_obj({ db_instance: db_journals, table_name: 'journal_entry', @@ -907,12 +946,16 @@ async function _process_generic_props>({ const updated = processed_obj.updated_on ?? processed_obj.created_on; 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}`; // --- Specific Transformations --- 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); @@ -952,8 +995,12 @@ export async function process_ae_obj__journal_entry_props({ content_cleaned = null; content_md_html = null; } else { - content_cleaned = content.replace(/^[\u200B\u200C\u200D\u200E\u200F\uFEFF]/, ''); - content_md_html = (await marked.parse(content_cleaned ?? '')) ?? null; + content_cleaned = content.replace( + /^[\u200B\u200C\u200D\u200E\u200F\uFEFF]/, + '' + ); + content_md_html = + (await marked.parse(content_cleaned ?? '')) ?? null; } obj.content = content; obj.content_md_html = content_md_html; @@ -968,8 +1015,12 @@ export async function process_ae_obj__journal_entry_props({ history_cleaned = null; history_md_html = null; } else { - history_cleaned = history.replace(/^[\u200B\u200C\u200D\u200E\u200F\uFEFF]/, ''); - history_md_html = (await marked.parse(history_cleaned ?? '')) ?? null; + history_cleaned = history.replace( + /^[\u200B\u200C\u200D\u200E\u200F\uFEFF]/, + '' + ); + history_md_html = + (await marked.parse(history_cleaned ?? '')) ?? null; } obj.history = history; obj.history_md_html = history_md_html; diff --git a/src/lib/ae_journals/ae_journals_decryption.ts b/src/lib/ae_journals/ae_journals_decryption.ts index 61d42f0f..f615d119 100644 --- a/src/lib/ae_journals/ae_journals_decryption.ts +++ b/src/lib/ae_journals/ae_journals_decryption.ts @@ -13,7 +13,7 @@ export interface DecryptionResult { /** * Decrypts a journal entry's content and history using the provided or stored passcode. - * + * * @param entry The journal entry object to decrypt. * @param journal The parent journal object (provides base passcode and private_passcode). * @param typed_passcode Optional: A user-entered passcode override. @@ -24,11 +24,10 @@ export async function decrypt_journal_entry( journal: ae_Journal, typed_passcode?: string ): Promise { - // Safety check: if not encrypted, return as-is if (!entry.content_encrypted) { - return { - success: true, + return { + success: true, content: entry.content ?? '', history: entry.history ?? '' }; @@ -37,36 +36,46 @@ export async function decrypt_journal_entry( // Determine which key to use let journal_key = typed_passcode; let key_source = 'user_typed'; - + // If no override, try the private passcode stored on the journal object if (!journal_key?.length) { journal_key = journal.private_passcode; key_source = 'journal_private_passcode'; } - + if (!journal_key) { - console.warn('decrypt_journal_entry: No key available. Source:', key_source); - return { - success: false, - error: 'No passcode provided or available for decryption.' + console.warn( + 'decrypt_journal_entry: No key available. Source:', + key_source + ); + return { + success: false, + error: 'No passcode provided or available for decryption.' }; } // Aether standard: combine the journal's public passcode with the private key const decrypt_key = `${journal.passcode ?? ''}:${journal_key}`; - - console.log(`decrypt_journal_entry: Attempting decryption. Source: ${key_source}`); + + console.log( + `decrypt_journal_entry: Attempting decryption. Source: ${key_source}` + ); // console.log(`decrypt_journal_entry: Key: ${decrypt_key}`); // Log ONLY for deep debugging try { // Decrypt Primary Content - const result = await ae_util.decrypt_wrapper(entry.content_encrypted, decrypt_key); + const result = await ae_util.decrypt_wrapper( + entry.content_encrypted, + decrypt_key + ); if (result === false) { - console.error('decrypt_journal_entry: Decryption wrapper returned false.'); - return { - success: false, - error: 'Decryption failed. Incorrect passcode or corrupted data.' + console.error( + 'decrypt_journal_entry: Decryption wrapper returned false.' + ); + return { + success: false, + error: 'Decryption failed. Incorrect passcode or corrupted data.' }; } @@ -75,24 +84,28 @@ export async function decrypt_journal_entry( // Decrypt History (if it exists) if (entry.history_encrypted) { - const h_res = await ae_util.decrypt_wrapper(entry.history_encrypted, decrypt_key); + const h_res = await ae_util.decrypt_wrapper( + entry.history_encrypted, + decrypt_key + ); if (h_res !== false) { decrypted_history = typeof h_res === 'string' ? h_res : ''; } } - console.log(`decrypt_journal_entry: SUCCESS. Source: ${key_source}, Content length: ${decrypted_text.length}. Preview: ${decrypted_text.substring(0, 30).replace(/\n/g, ' ')}...`); - return { - success: true, + console.log( + `decrypt_journal_entry: SUCCESS. Source: ${key_source}, Content length: ${decrypted_text.length}. Preview: ${decrypted_text.substring(0, 30).replace(/\n/g, ' ')}...` + ); + return { + success: true, content: decrypted_text, history: decrypted_history }; - } catch (err: any) { console.error('decrypt_journal_entry error:', err); - return { - success: false, - error: `System error during decryption: ${err.message}` + return { + success: false, + error: `System error during decryption: ${err.message}` }; } } diff --git a/src/lib/ae_journals/ae_journals_editor_helpers.ts b/src/lib/ae_journals/ae_journals_editor_helpers.ts index d7889fa6..511957b3 100644 --- a/src/lib/ae_journals/ae_journals_editor_helpers.ts +++ b/src/lib/ae_journals/ae_journals_editor_helpers.ts @@ -1,19 +1,28 @@ /** * Wraps the current selection in CodeMirror with the given prefix and suffix. */ -export function wrapSelection(view: any, prefix: string, suffix: string = prefix) { +export function wrapSelection( + view: any, + prefix: string, + suffix: string = prefix +) { if (!view || view.updateInProgress) return; - + const { state } = view; - view.dispatch(state.changeByRange((range: any) => { - return { - changes: [ - {from: range.from, insert: prefix}, - {from: range.to, insert: suffix} - ], - range: range.constructor.range(range.from + prefix.length, range.to + prefix.length) - }; - })); + view.dispatch( + state.changeByRange((range: any) => { + return { + changes: [ + { from: range.from, insert: prefix }, + { from: range.to, insert: suffix } + ], + range: range.constructor.range( + range.from + prefix.length, + range.to + prefix.length + ) + }; + }) + ); view.focus(); } @@ -22,32 +31,49 @@ export function wrapSelection(view: any, prefix: string, suffix: string = prefix */ export function toggleLinePrefix(view: any, prefix: string) { if (!view || view.updateInProgress) return; - + const { state } = view; - view.dispatch(state.changeByRange((range: any) => { - const lines = []; - for (let pos = range.from; pos <= range.to; ) { - const line = state.doc.lineAt(pos); - lines.push(line); - pos = line.to + 1; - } - - const isAlreadyPrefixed = lines.every(l => l.text.startsWith(prefix)); - const lineChanges = lines.map(l => { - if (isAlreadyPrefixed) { - return { from: l.from, to: l.from + prefix.length, insert: '' }; - } else { - return { from: l.from, insert: prefix }; + view.dispatch( + state.changeByRange((range: any) => { + const lines = []; + for (let pos = range.from; pos <= range.to; ) { + const line = state.doc.lineAt(pos); + lines.push(line); + pos = line.to + 1; } - }); - const newFrom = range.from + (isAlreadyPrefixed ? -prefix.length : prefix.length); - const newTo = range.to + (isAlreadyPrefixed ? (-prefix.length * lines.length) : (prefix.length * lines.length)); + const isAlreadyPrefixed = lines.every((l) => + l.text.startsWith(prefix) + ); + const lineChanges = lines.map((l) => { + if (isAlreadyPrefixed) { + return { + from: l.from, + to: l.from + prefix.length, + insert: '' + }; + } else { + return { from: l.from, insert: prefix }; + } + }); - return { - changes: lineChanges, - range: range.constructor.range(newFrom, Math.max(newFrom, newTo)) - }; - })); + const newFrom = + range.from + + (isAlreadyPrefixed ? -prefix.length : prefix.length); + const newTo = + range.to + + (isAlreadyPrefixed + ? -prefix.length * lines.length + : prefix.length * lines.length); + + return { + changes: lineChanges, + range: range.constructor.range( + newFrom, + Math.max(newFrom, newTo) + ) + }; + }) + ); view.focus(); -} \ No newline at end of file +} diff --git a/src/lib/ae_journals/ae_journals_export_templates.ts b/src/lib/ae_journals/ae_journals_export_templates.ts index 48e1b5cd..e0701c9d 100644 --- a/src/lib/ae_journals/ae_journals_export_templates.ts +++ b/src/lib/ae_journals/ae_journals_export_templates.ts @@ -24,12 +24,17 @@ export const template_standard_markdown: ExportTemplate = { description: 'Basic Markdown with title, date, and content.', extension: 'md', formatter: (entries) => { - return entries.map(entry => { - const dateStr = ae_util.iso_datetime_formatter(entry.created_on, 'datetime_12_long'); - const title = entry.name || dateStr; - const header = `# ${title}\n*${dateStr}*\n\n`; - return `${header}${entry.content || ''}\n\n---\n`; - }).join('\n'); + return entries + .map((entry) => { + const dateStr = ae_util.iso_datetime_formatter( + entry.created_on, + 'datetime_12_long' + ); + const title = entry.name || dateStr; + const header = `# ${title}\n*${dateStr}*\n\n`; + return `${header}${entry.content || ''}\n\n---\n`; + }) + .join('\n'); } }; @@ -50,12 +55,17 @@ export const template_personal_log: ExportTemplate = { return dateA.localeCompare(dateB); }); - return sorted.map(entry => { - const dateStr = ae_util.iso_datetime_formatter(entry.created_on, 'date_iso'); - const title = entry.name || ''; - const header = `## ${dateStr}${title ? ' - ' + title : ''}\n\n`; - return `${header}${entry.content || ''}\n\n`; - }).join('\n'); + return sorted + .map((entry) => { + const dateStr = ae_util.iso_datetime_formatter( + entry.created_on, + 'date_iso' + ); + const title = entry.name || ''; + const header = `## ${dateStr}${title ? ' - ' + title : ''}\n\n`; + return `${header}${entry.content || ''}\n\n`; + }) + .join('\n'); } }; @@ -69,19 +79,24 @@ export const template_amazon_vine: ExportTemplate = { description: 'Optimized for product reviews.', extension: 'md', formatter: (entries) => { - return entries.map(entry => { - const dateStr = ae_util.iso_datetime_formatter(entry.created_on, 'date_iso'); - // Try to find a product name in the title or content - const productName = entry.name || 'Unknown Product'; - - // Look for product link in content_json or tags if available, - // otherwise just output content - let output = `## ${productName}\n`; - output += `*Date: ${dateStr}*\n\n`; - output += `${entry.content || ''}\n\n`; - output += `---`; - return output; - }).join('\n\n'); + return entries + .map((entry) => { + const dateStr = ae_util.iso_datetime_formatter( + entry.created_on, + 'date_iso' + ); + // Try to find a product name in the title or content + const productName = entry.name || 'Unknown Product'; + + // Look for product link in content_json or tags if available, + // otherwise just output content + let output = `## ${productName}\n`; + output += `*Date: ${dateStr}*\n\n`; + output += `${entry.content || ''}\n\n`; + output += `---`; + return output; + }) + .join('\n\n'); } }; @@ -94,10 +109,14 @@ export const template_standard_html: ExportTemplate = { description: 'Semantic HTML5 articles.', extension: 'html', formatter: (entries) => { - const body = entries.map(entry => { - const dateStr = ae_util.iso_datetime_formatter(entry.created_on, 'datetime_12_long'); - const title = entry.name || dateStr; - return ` + const body = entries + .map((entry) => { + const dateStr = ae_util.iso_datetime_formatter( + entry.created_on, + 'datetime_12_long' + ); + const title = entry.name || dateStr; + return `

${title}

@@ -108,7 +127,8 @@ export const template_standard_html: ExportTemplate = {
`; - }).join('\n'); + }) + .join('\n'); return ` diff --git a/src/lib/ae_journals/ae_journals_functions.ts b/src/lib/ae_journals/ae_journals_functions.ts index 1c412f88..dad87abd 100644 --- a/src/lib/ae_journals/ae_journals_functions.ts +++ b/src/lib/ae_journals/ae_journals_functions.ts @@ -13,7 +13,8 @@ const export_obj = { load_ae_obj_id__journal_entry: journal_entry.load_ae_obj_id__journal_entry, load_ae_obj_li__journal_entry: journal_entry.load_ae_obj_li__journal_entry, create_ae_obj__journal_entry: journal_entry.create_ae_obj__journal_entry, - delete_ae_obj_id__journal_entry: journal_entry.delete_ae_obj_id__journal_entry, + delete_ae_obj_id__journal_entry: + journal_entry.delete_ae_obj_id__journal_entry, update_ae_obj__journal_entry: journal_entry.update_ae_obj__journal_entry, qry__journal_entry: journal_entry.qry__journal_entry // db_save_ae_obj_li__journal_entry: journal_entry.db_save_ae_obj_li__journal_entry, diff --git a/src/lib/ae_journals/ae_journals_parsers.ts b/src/lib/ae_journals/ae_journals_parsers.ts index 8bf1e117..f5c1eaf8 100644 --- a/src/lib/ae_journals/ae_journals_parsers.ts +++ b/src/lib/ae_journals/ae_journals_parsers.ts @@ -19,7 +19,10 @@ export interface AeJournalEntryInput { * - First line is title (if it looks like a title). * - Rest is content. */ -export async function parse_standard_note(file: File, text: string): Promise { +export async function parse_standard_note( + file: File, + text: string +): Promise { const lines = text.split('\n'); let name = file.name.replace(/\.md$/i, '').replace(/\.txt$/i, ''); let content = text; @@ -29,11 +32,15 @@ export async function parse_standard_note(file: File, text: string): Promise 0 && lines[0].startsWith('# ')) { name = lines[0].substring(2).trim(); content = lines.slice(1).join('\n').trim(); - } else if (lines.length > 0 && lines[0].trim().length > 0 && lines[0].trim().length < 60) { + } else if ( + lines.length > 0 && + lines[0].trim().length > 0 && + lines[0].trim().length < 60 + ) { // First line is short, treat as title if it doesn't look like frontmatter if (lines[0].trim() !== '---') { - name = lines[0].trim(); - content = lines.slice(1).join('\n').trim(); + name = lines[0].trim(); + content = lines.slice(1).join('\n').trim(); } } @@ -42,18 +49,28 @@ export async function parse_standard_note(file: File, text: string): Promise -1) { const frontmatter = lines.slice(1, endFrontmatter); - content = lines.slice(endFrontmatter + 1).join('\n').trim(); - + content = lines + .slice(endFrontmatter + 1) + .join('\n') + .trim(); + // Extract tags or title from frontmatter (very basic parsing) - frontmatter.forEach(line => { - if (line.startsWith('title:')) name = line.substring(6).trim().replace(/^['"]|['"]$/g, ''); + frontmatter.forEach((line) => { + if (line.startsWith('title:')) + name = line + .substring(6) + .trim() + .replace(/^['"]|['"]$/g, ''); if (line.startsWith('tags:')) { // This is brittle, assumes inline tags like [a, b] or comma separated const tagPart = line.substring(5).trim(); if (tagPart.startsWith('[') && tagPart.endsWith(']')) { - tagPart.substring(1, tagPart.length - 1).split(',').forEach(t => tags.push(t.trim())); + tagPart + .substring(1, tagPart.length - 1) + .split(',') + .forEach((t) => tags.push(t.trim())); } else { - tagPart.split(',').forEach(t => tags.push(t.trim())); + tagPart.split(',').forEach((t) => tags.push(t.trim())); } } }); @@ -62,31 +79,36 @@ export async function parse_standard_note(file: File, text: string): Promise { +export async function parse_personal_log( + file: File, + text: string +): Promise { const entries: AeJournalEntryInput[] = []; const dateRegex = /^##\s+(\d{4}-\d{2}-\d{2})(.*)$/; - + const lines = text.split('\n'); let currentEntry: Partial | null = null; let currentContent: string[] = []; - + // Check if the whole file is just one entry (no date headers) - if (!lines.some(l => dateRegex.test(l))) { + if (!lines.some((l) => dateRegex.test(l))) { return parse_standard_note(file, text); } @@ -104,19 +126,21 @@ export async function parse_personal_log(file: File, text: string): Promise { +export async function parse_amazon_vine( + file: File, + text: string +): Promise { // Split by `\n## ` but we need to keep the delimiter or reconstruct // JS split doesn't keep delimiter nicely unless captured. // Let's iterate lines. const entries: AeJournalEntryInput[] = []; const productHeaderRegex = /^##\s+(.+)$/; - + const lines = text.split('\n'); let currentEntry: any = null; let currentBody: string[] = []; - + for (const line of lines) { const match = line.match(productHeaderRegex); if (match) { - if (currentEntry) { - entries.push(format_vine_entry(currentEntry, currentBody, file)); - } - currentEntry = { productName: match[1].trim() }; - currentBody = []; + if (currentEntry) { + entries.push( + format_vine_entry(currentEntry, currentBody, file) + ); + } + currentEntry = { productName: match[1].trim() }; + currentBody = []; } else { if (currentEntry) { currentBody.push(line); @@ -169,15 +198,19 @@ export async function parse_amazon_vine(file: File, text: string): Promise @@ -124,7 +126,10 @@ > - + Æ Journals - - - @@ -182,7 +215,9 @@ >
- +
- +
- - + +
{/if} {#if $journals_sess.show__modal__journals_config} - + {/if} (show_import_modal = false)} on_import_complete={() => {}} -/> \ No newline at end of file +/> diff --git a/src/routes/journals/+page.ts b/src/routes/journals/+page.ts index 866aa184..995efb24 100644 --- a/src/routes/journals/+page.ts +++ b/src/routes/journals/+page.ts @@ -14,7 +14,9 @@ export async function load({ fetch, parent }) { let ae_acct = parent_data[account_id]; if (!ae_acct) { - console.warn(`ae Journals +page.ts: Account ${account_id} not found in parent data. Initializing ghost acct.`); + console.warn( + `ae Journals +page.ts: Account ${account_id} not found in parent data. Initializing ghost acct.` + ); ae_acct = { api: parent_data.ae_api || {}, loc: {}, @@ -30,7 +32,7 @@ export async function load({ fetch, parent }) { const person_id = ae_acct.loc.person_id; // OPTIMIZATION: Fire the journal list load in the background. - // Components using LiveQuery (db_journals) will display cached data + // Components using LiveQuery (db_journals) will display cached data // instantly while this refresh runs. journals_func.load_ae_obj_li__journal({ api_cfg: ae_acct.api, diff --git a/src/routes/journals/[journal_id]/+layout.svelte b/src/routes/journals/[journal_id]/+layout.svelte index d8bc5e92..5caaa139 100644 --- a/src/routes/journals/[journal_id]/+layout.svelte +++ b/src/routes/journals/[journal_id]/+layout.svelte @@ -35,11 +35,16 @@ let lq__journal_obj = $derived( liveQuery(async () => { - let results = await db_journals.journal.get($journals_slct?.journal_id ?? ''); // null or undefined does not reset things like '' does + let results = await db_journals.journal.get( + $journals_slct?.journal_id ?? '' + ); // null or undefined does not reset things like '' does // Check if results are different than the current session version stored under $journals_slct if ($journals_slct.journal_obj && results) { - if (JSON.stringify($journals_slct.journal_obj) !== JSON.stringify(results)) { + if ( + JSON.stringify($journals_slct.journal_obj) !== + JSON.stringify(results) + ) { $journals_slct.journal_obj = { ...results }; } } @@ -50,11 +55,14 @@ $effect(() => { if (log_lvl) { - console.log(`lq__journal_obj: journal_id = ${$journals_slct?.journal_id}`); + console.log( + `lq__journal_obj: journal_id = ${$journals_slct?.journal_id}` + ); console.log(`lq__journal_obj: results = `, lq__journal_obj); if ($journals_slct.journal_obj && lq__journal_obj) { if ( - JSON.stringify($journals_slct.journal_obj) !== JSON.stringify(lq__journal_obj) + JSON.stringify($journals_slct.journal_obj) !== + JSON.stringify(lq__journal_obj) ) { console.log( `Session slct stored version has changed for ID = ${$journals_slct.journal_id}`, @@ -99,7 +107,8 @@ " > - {/if} @@ -75,7 +95,7 @@ {#if journal?.cfg_json?.pref_editor == 'codemirror'} - {#if $journals_loc.entry.auto_save} - {#if save_status === 'saving'} - {:else if save_status === 'saved'} + {#if save_status === 'saving'} + {:else if save_status === 'saved'} {:else}{/if} {/if} @@ -106,20 +152,25 @@ {#if entry.private} - {/if}
- {/if} - \ No newline at end of file + diff --git a/src/routes/journals/ae_comp__journal_entry_metadata.svelte b/src/routes/journals/ae_comp__journal_entry_metadata.svelte index 99dbbc79..53fc19e5 100644 --- a/src/routes/journals/ae_comp__journal_entry_metadata.svelte +++ b/src/routes/journals/ae_comp__journal_entry_metadata.svelte @@ -17,16 +17,24 @@
-
+
- Created: - {ae_util.iso_datetime_formatter(entry.created_on, 'datetime_12_long')} + Created: + {ae_util.iso_datetime_formatter( + entry.created_on, + 'datetime_12_long' + )} {#if entry.updated_on} - Updated: - {ae_util.iso_datetime_formatter(entry.updated_on, 'datetime_12_long')} + Updated: + {ae_util.iso_datetime_formatter( + entry.updated_on, + 'datetime_12_long' + )} {/if}
diff --git a/src/routes/journals/ae_comp__journal_entry_obj_file_li.svelte b/src/routes/journals/ae_comp__journal_entry_obj_file_li.svelte index 3e780538..0838d11c 100644 --- a/src/routes/journals/ae_comp__journal_entry_obj_file_li.svelte +++ b/src/routes/journals/ae_comp__journal_entry_obj_file_li.svelte @@ -7,8 +7,13 @@ // *** Import Lucide Icons import { - FileUp, Trash2, Download, Paperclip, - ExternalLink, Loader2, RefreshCw + FileUp, + Trash2, + Download, + Paperclip, + ExternalLink, + Loader2, + RefreshCw } from 'lucide-svelte'; // *** Import Aether specific variables and functions @@ -45,7 +50,12 @@ lq__journal_entry_obj: any; } - let { log_lvl = 0, link_to_type, link_to_id, lq__journal_entry_obj }: Props = $props(); + let { + log_lvl = 0, + link_to_type, + link_to_id, + lq__journal_entry_obj + }: Props = $props(); // *** State let ae_promises: Record = $state({}); @@ -74,11 +84,20 @@ // 2. Merge with legacy hosted_file_kv if not already present if (entry.data_json?.hosted_file_kv) { - Object.entries(entry.data_json.hosted_file_kv).forEach(([id, obj]: [string, any]) => { - if (!files.find(f => (f.hosted_file_id || f.id || f.hosted_file_id) === id)) { - files.push({ ...obj, id: id }); + Object.entries(entry.data_json.hosted_file_kv).forEach( + ([id, obj]: [string, any]) => { + if ( + !files.find( + (f) => + (f.hosted_file_id || + f.id || + f.hosted_file_id) === id + ) + ) { + files.push({ ...obj, id: id }); + } } - }); + ); } return files; @@ -91,7 +110,10 @@ data_json: { ...$lq__journal_entry_obj?.data_json, hosted_file_kv: Object.fromEntries( - updated_files.map(f => [f.hosted_file_id || f.id || f.hosted_file_id, f]) + updated_files.map((f) => [ + f.hosted_file_id || f.id || f.hosted_file_id, + f + ]) ) } }; @@ -112,8 +134,15 @@ // Handle "Select Existing" completion $effect(() => { - if ($lq__journal_entry_obj && slct_hosted_file_id && slct_hosted_file_obj) { - const new_file = { ...slct_hosted_file_obj, id: slct_hosted_file_id }; + if ( + $lq__journal_entry_obj && + slct_hosted_file_id && + slct_hosted_file_obj + ) { + const new_file = { + ...slct_hosted_file_obj, + id: slct_hosted_file_id + }; const updated_li = [...unified_file_li, new_file]; slct_hosted_file_id = null; @@ -125,8 +154,12 @@ // Handle "Upload" completion $effect(() => { - if ($lq__journal_entry_obj && upload_complete && slct_hosted_file_id_li.length) { - const new_files = slct_hosted_file_id_li.map(id => ({ + if ( + $lq__journal_entry_obj && + upload_complete && + slct_hosted_file_id_li.length + ) { + const new_files = slct_hosted_file_id_li.map((id) => ({ ...slct_hosted_file_kv[id], id: id })); @@ -140,9 +173,12 @@ }); async function handle_remove_file(file_id: string) { - if (!confirm('Are you sure you want to remove this file attachment?')) return; + if (!confirm('Are you sure you want to remove this file attachment?')) + return; - const updated_li = unified_file_li.filter(f => (f.hosted_file_id || f.id || f.hosted_file_id) !== file_id); + const updated_li = unified_file_li.filter( + (f) => (f.hosted_file_id || f.id || f.hosted_file_id) !== file_id + ); // Also perform physical/orphan deletion if admin if ($ae_loc.administrator_access) { @@ -163,24 +199,34 @@
-
+

Attachments {#if unified_file_li.length} - {unified_file_li.length} + {unified_file_li.length} {/if}

{#if $ae_loc.edit_mode} - {/if}
@@ -189,8 +235,11 @@ {#if unified_file_li.length}
{#each unified_file_li as file} - {@const file_id = file.hosted_file_id || file.id || file.hosted_file_id} -
+ {@const file_id = + file.hosted_file_id || file.id || file.hosted_file_id} +
{#if $ae_loc.edit_mode} -
{:else if !$ae_loc.edit_mode} -

+

No files attached to this entry.

{/if} {#if $ae_loc.edit_mode} -
+
{#if $ae_sess.files.add_to_use_files_method === 'upload'} {#snippet label()}
-
+

Upload new attachment

-

Drag and drop or click to browse

+

+ Drag and drop or click to browse +

{/snippet} {:else}
-

Select from existing hosted files:

+

+ Select from existing hosted files: +

{ if (!tmp_entry_obj || !orig_entry_obj || is_processing) return false; - - const normalize = (val: any) => (val === null || val === undefined) ? '' : String(val).trim(); - - const content_changed = normalize(tmp_entry_obj.content) !== normalize(orig_entry_obj.content); - const name_changed = normalize(tmp_entry_obj.name) !== normalize(orig_entry_obj.name); - const private_changed = (tmp_entry_obj.private ?? false) !== (orig_entry_obj.private ?? false); - + + const normalize = (val: any) => + val === null || val === undefined ? '' : String(val).trim(); + + const content_changed = + normalize(tmp_entry_obj.content) !== + normalize(orig_entry_obj.content); + const name_changed = + normalize(tmp_entry_obj.name) !== normalize(orig_entry_obj.name); + const private_changed = + (tmp_entry_obj.private ?? false) !== + (orig_entry_obj.private ?? false); + if (content_changed || name_changed || private_changed) return true; - const other_fields = ['tags', 'category_code', 'public', 'personal', 'professional', 'archive_on', 'sort']; + const other_fields = [ + 'tags', + 'category_code', + 'public', + 'personal', + 'professional', + 'archive_on', + 'sort' + ]; for (const field of other_fields) { - if (normalize(tmp_entry_obj[field]) !== normalize(orig_entry_obj[field])) return true; + if ( + normalize(tmp_entry_obj[field]) !== + normalize(orig_entry_obj[field]) + ) + return true; } - + return false; }); @@ -108,16 +130,21 @@ // 1. Initial Load & Background Sync $effect(() => { const entry = $lq__journal_entry_obj; // Track only entry - + untrack(() => { const journal = $lq__journal_obj; if (!entry || !(entry.updated_on || entry.created_on)) return; const session_kv = $journals_sess?.journal_kv[journal?.id]; - const is_decrypted = session_kv?.journal_passcode_decrypted === true; + const is_decrypted = + session_kv?.journal_passcode_decrypted === true; // Only sync if saved and not currently processing/editing - if (save_status === 'saved' && !has_unsaved_changes && !is_processing) { + if ( + save_status === 'saved' && + !has_unsaved_changes && + !is_processing + ) { // Prevent overwrite of recovered text if we are in a decrypted session if (is_decrypted && tmp_entry_obj.content && !entry.content) { return; @@ -141,16 +168,30 @@ const _private = tmp_entry_obj.private; // Isolate logic from secondary dependencies - const should_save = untrack(() => has_unsaved_changes && !is_processing && save_status !== 'saving'); + const should_save = untrack( + () => + has_unsaved_changes && + !is_processing && + save_status !== 'saving' + ); if (should_save) { if (save_status !== 'saving') save_status = 'unsaved'; - - const auto_save_enabled = untrack(() => $journals_loc.entry.auto_save); + + const auto_save_enabled = untrack( + () => $journals_loc.entry.auto_save + ); if (auto_save_enabled) { clearTimeout(auto_save_timer); auto_save_timer = setTimeout(() => { - if (untrack(() => has_unsaved_changes && !is_processing && save_status !== 'saving')) { + if ( + untrack( + () => + has_unsaved_changes && + !is_processing && + save_status !== 'saving' + ) + ) { update_journal_entry(); } }, 2000); @@ -172,7 +213,12 @@ const decrypted_status = session?.journal_passcode_decrypted; const has_encrypted_content = !!entry.content_encrypted; - if (has_encrypted_content && is_verified && decrypted_status !== true && decrypted_status !== 'processing') { + if ( + has_encrypted_content && + is_verified && + decrypted_status !== true && + decrypted_status !== 'processing' + ) { untrack(() => run_decryption_workflow()); } }); @@ -183,22 +229,27 @@ const journal = $lq__journal_obj; if (!journal?.id || is_processing) return; - let journal_key = $journals_sess.journal_kv[journal.id]?.typed_journal_passcode; - + let journal_key = + $journals_sess.journal_kv[journal.id]?.typed_journal_passcode; + is_processing = true; decryption_error = null; - - journals_sess.update(s => { + + journals_sess.update((s) => { if (!s.journal_kv[journal.id]) s.journal_kv[journal.id] = {}; s.journal_kv[journal.id].journal_passcode_decrypted = 'processing'; return s; }); - const result = await decrypt_journal_entry($lq__journal_entry_obj, journal, journal_key); + const result = await decrypt_journal_entry( + $lq__journal_entry_obj, + journal, + journal_key + ); if (!result.success) { decryption_error = result.error || 'Decryption failed.'; - journals_sess.update(s => { + journals_sess.update((s) => { s.journal_kv[journal.id].journal_passcode_verified = false; s.journal_kv[journal.id].journal_passcode_decrypted = false; return s; @@ -225,7 +276,7 @@ if (orig_entry_obj) orig_entry_obj.history = result.history; } - journals_sess.update(s => { + journals_sess.update((s) => { s.journal_kv[journal.id].journal_passcode_decrypted = true; return s; }); @@ -233,8 +284,13 @@ } async function update_journal_entry(fields_kv?: key_val) { - if (!$ae_loc.trusted_access || save_status === 'saving' || is_processing) return; - + if ( + !$ae_loc.trusted_access || + save_status === 'saving' || + is_processing + ) + return; + is_processing = true; save_status = 'saving'; @@ -259,7 +315,9 @@ group: tmp_entry_obj.group, data_json: tmp_entry_obj.data_json, archive_on: tmp_entry_obj.archive_on, - linked_li_json: tmp_entry_obj.linked_li_json ? JSON.stringify(tmp_entry_obj.linked_li_json) : null + linked_li_json: tmp_entry_obj.linked_li_json + ? JSON.stringify(tmp_entry_obj.linked_li_json) + : null }; const decrypt_key = $lq__journal_obj.combined_passcode; @@ -268,7 +326,10 @@ if (!fields_kv) { if (tmp_entry_obj.private) { if (tmp_entry_obj.content) { - data_kv.content_encrypted = await ae_util.encrypt_wrapper(tmp_entry_obj.content, decrypt_key); + data_kv.content_encrypted = await ae_util.encrypt_wrapper( + tmp_entry_obj.content, + decrypt_key + ); data_kv.content = null; } } else { @@ -284,7 +345,7 @@ data_kv: data_kv, log_lvl: 1 }); - + // Sync ORIG after save to clear unsaved changes flag if (!fields_kv) { orig_entry_obj = deep_copy(tmp_entry_obj); @@ -313,7 +374,7 @@ orig_entry_obj.content = null; orig_entry_obj.history = null; } - journals_sess.update(s => { + journals_sess.update((s) => { s.journal_kv[journal.id].journal_passcode_decrypted = false; return s; }); @@ -327,23 +388,27 @@ } async function handle_force_reset() { - if (!confirm('WARNING: This will permanently DELETE the encrypted content and history for this entry and reset it to plain text. This cannot be undone. Proceed?')) { + if ( + !confirm( + 'WARNING: This will permanently DELETE the encrypted content and history for this entry and reset it to plain text. This cannot be undone. Proceed?' + ) + ) { return; } is_processing = true; tmp_entry_obj.private = false; - tmp_entry_obj.content = ""; + tmp_entry_obj.content = ''; tmp_entry_obj.content_encrypted = null; - tmp_entry_obj.history = ""; + tmp_entry_obj.history = ''; tmp_entry_obj.history_encrypted = null; - + // Sync orig to match the "cleared" state if (orig_entry_obj) { orig_entry_obj.private = false; - orig_entry_obj.content = ""; + orig_entry_obj.content = ''; orig_entry_obj.content_encrypted = null; - orig_entry_obj.history = ""; + orig_entry_obj.history = ''; orig_entry_obj.history_encrypted = null; } @@ -355,7 +420,10 @@ let modal_mode: 'append' | 'prepend' | 'auto' = $state('auto'); -
+
{#if $lq__journal_entry_obj && $lq__journal_obj} update_journal_entry()} on_decrypt={handle_content_decryption} - on_show_config={() => show_config_modal = true} + on_show_config={() => (show_config_modal = true)} {save_status} {log_lvl} /> - + {#if decryption_error} -
-
+
+
{decryption_error}
-
{/if} -
- +
- (show_append_modal = false)} - on_update={() => { show_append_modal = false; }} + on_update={() => { + show_append_modal = false; + }} {log_lvl} /> @@ -432,15 +513,23 @@ bind:tmp_entry_obj on_save={() => update_journal_entry()} on_force_reset={handle_force_reset} - on_show_export={on_show_export} - on_append={() => { modal_mode = 'append'; show_append_modal = true; }} - on_prepend={() => { modal_mode = 'prepend'; show_append_modal = true; }} + {on_show_export} + on_append={() => { + modal_mode = 'append'; + show_append_modal = true; + }} + on_prepend={() => { + modal_mode = 'prepend'; + show_append_modal = true; + }} {log_lvl} /> {:else} -
+
Loading Journal Entry...
{/if} -
\ No newline at end of file +
diff --git a/src/routes/journals/ae_comp__journal_entry_obj_li.svelte b/src/routes/journals/ae_comp__journal_entry_obj_li.svelte index 39e47a53..cfdfb28a 100644 --- a/src/routes/journals/ae_comp__journal_entry_obj_li.svelte +++ b/src/routes/journals/ae_comp__journal_entry_obj_li.svelte @@ -6,9 +6,9 @@ show_found_header?: boolean; } - let { - log_lvl = $bindable(0), - lq__journal_obj, + let { + log_lvl = $bindable(0), + lq__journal_obj, lq__journal_entry_obj_li, show_found_header = true }: Props = $props(); @@ -68,7 +68,8 @@ $effect(() => { // Sync local boolean with store ID presence - show_append_modal = !!$journals_sess.show__modal_append__journal_entry_id; + show_append_modal = + !!$journals_sess.show__modal_append__journal_entry_id; }); function handle_modal_close() { @@ -82,35 +83,42 @@ // Derived list of visible items (Standardized Search Pattern 2026-01-27) // Ensures count matches exactly what is rendered to the user - let visible_journal_entry_obj_li = $derived((() => { - // Subscribe to the observable - const list = $lq__journal_entry_obj_li; - - // Return null to signify 'loading' vs [] for 'empty' - if (list === undefined || list === null) return null; - if (!Array.isArray(list)) return []; - - const filtered = list.filter((item: any) => { - if (!item) return false; + let visible_journal_entry_obj_li = $derived( + (() => { + // Subscribe to the observable + const list = $lq__journal_entry_obj_li; - // ADMIN/TRUSTED: See everything - if ($ae_loc.trusted_access) return true; + // Return null to signify 'loading' vs [] for 'empty' + if (list === undefined || list === null) return null; + if (!Array.isArray(list)) return []; - // PUBLIC: Filter hidden/disabled - // Permissive defaults for missing metadata - const is_hidden = item.hide === true || item.hide === 1; - const is_disabled = item.enable === false || item.enable === 0; + const filtered = list.filter((item: any) => { + if (!item) return false; - return !is_hidden && !is_disabled; - }); + // ADMIN/TRUSTED: See everything + if ($ae_loc.trusted_access) return true; - if (log_lvl) console.log(`visible_journal_entry_obj_li: Input=${list.length}, Output=${filtered.length}`); + // PUBLIC: Filter hidden/disabled + // Permissive defaults for missing metadata + const is_hidden = item.hide === true || item.hide === 1; + const is_disabled = item.enable === false || item.enable === 0; - return filtered; - })()); + return !is_hidden && !is_disabled; + }); + + if (log_lvl) + console.log( + `visible_journal_entry_obj_li: Input=${list.length}, Output=${filtered.length}` + ); + + return filtered; + })() + ); -
+
{#if visible_journal_entry_obj_li === null}
@@ -121,9 +129,16 @@ {#if show_found_header}

- Found: - - {visible_journal_entry_obj_li.length}× + + Found: + + + {visible_journal_entry_obj_li.length}×

@@ -147,33 +162,52 @@ class:dim={!journals_journal_entry_obj.enable} class:bg-warning-100={!journals_journal_entry_obj?.enable} > -
+
{#if journals_journal_entry_obj.alert} - + {/if} {#if journals_journal_entry_obj.priority} - + {/if} {#if journals_journal_entry_obj.group} - - - -

+

{#if journals_journal_entry_obj.template} - {@html journals_journal_entry_obj.name ?? '-- no name --'} + {@html journals_journal_entry_obj.name ?? + '-- no name --'} {:else if journals_journal_entry_obj.name} - + {#if !journals_journal_entry_obj.private} - - - - {/if} @@ -434,7 +552,8 @@ Journal ID: ${journals_journal_entry_obj?.journal_id} -

\ No newline at end of file +
diff --git a/src/routes/journals/ae_comp__journal_entry_obj_li_wrapper.svelte b/src/routes/journals/ae_comp__journal_entry_obj_li_wrapper.svelte index 2fa7a267..f953a293 100644 --- a/src/routes/journals/ae_comp__journal_entry_obj_li_wrapper.svelte +++ b/src/routes/journals/ae_comp__journal_entry_obj_li_wrapper.svelte @@ -23,9 +23,9 @@ {#if $lq__journal_entry_obj_li} - diff --git a/src/routes/journals/ae_comp__journal_entry_obj_qry.svelte b/src/routes/journals/ae_comp__journal_entry_obj_qry.svelte index ebf68d8b..51b6a4f9 100644 --- a/src/routes/journals/ae_comp__journal_entry_obj_qry.svelte +++ b/src/routes/journals/ae_comp__journal_entry_obj_qry.svelte @@ -76,25 +76,29 @@ $journals_loc.entry.search_version++; } - function preventDefault(fn: (event: T) => void) { + function prevent_default(fn: (event: T) => void) { return function (event: T) { - event.preventDefault(); + event.prevent_default(); fn(event); }; } -
+
{ + onsubmit={prevent_default(() => { handle_search_trigger(); })} autocomplete="off" class="search_form flex flex-row flex-wrap gap-1 items-center justify-center" > - + - +
@@ -171,7 +179,9 @@ - + -
- - - - -
@@ -201,111 +241,241 @@ {#if tab === 'actions'}
- - -
- {:else if tab === 'general'}
-

+

Journal Categories

-
+
{#each tmp__journal_obj?.cfg_json?.category_li ?? [] as category, i}
- - -
{/each} -
- {:else if tab === 'security'}
-

+

Status & Lifecycle

-
- {:else if tab === 'ui'}
-

+

Default View Modes

-
+
@@ -391,106 +633,252 @@
-

+

Entry Visibility (Global)

-
-
-

+

Entry Feature Buttons

-
-
-

+

List Interactions

- {:else if tab === 'json'}
- -
{/snippet} - \ No newline at end of file + diff --git a/src/routes/journals/ae_comp__journal_obj_id_view.svelte b/src/routes/journals/ae_comp__journal_obj_id_view.svelte index 1e690c05..79c1dc72 100644 --- a/src/routes/journals/ae_comp__journal_obj_id_view.svelte +++ b/src/routes/journals/ae_comp__journal_obj_id_view.svelte @@ -3,7 +3,17 @@ import { goto } from '$app/navigation'; // *** Import other supporting libraries - import { BookPlus, BookOpenText, FilePlus, Menu, Pencil, FileDown, FileUp, Settings, LoaderCircle } from 'lucide-svelte'; + import { + BookPlus, + BookOpenText, + FilePlus, + Menu, + Pencil, + FileDown, + FileUp, + Settings, + LoaderCircle + } from 'lucide-svelte'; // *** Import Aether specific variables and functions import { ae_util } from '$lib/ae_utils/ae_utils'; @@ -34,7 +44,13 @@ on_show_import?: () => void; } - let { log_lvl = 0, lq__journal_obj, lq__journal_entry_obj_li, on_show_export, on_show_import }: Props = $props(); + let { + log_lvl = 0, + lq__journal_obj, + lq__journal_entry_obj_li, + on_show_export, + on_show_import + }: Props = $props(); // let ae_promises: key_val = {}; // let ae_tmp: key_val = {}; @@ -60,7 +76,8 @@ if ( $lq__journal_obj?.id && $journals_sess?.journal_kv[$lq__journal_obj?.id] && - $journals_sess?.journal_kv[$lq__journal_obj?.id]?.journal_passcode_verified + $journals_sess?.journal_kv[$lq__journal_obj?.id] + ?.journal_passcode_verified ) { if (passcode_timer) { if (log_lvl) { @@ -74,27 +91,30 @@ const timeout_ms = 1000 * 60 * timeout_minutes; if (log_lvl) { - console.log(`Setting passcode timer for ${timeout_minutes} minutes (${timeout_ms}ms)`); + console.log( + `Setting passcode timer for ${timeout_minutes} minutes (${timeout_ms}ms)` + ); } - passcode_timer = setTimeout( - () => { - if (log_lvl) { - console.log('Passcode timer expired'); - } - typed_journal_passcode = ''; - if (!$journals_sess?.journal_kv[$lq__journal_obj?.id]) { - $journals_sess.journal_kv[$lq__journal_obj?.id] = {}; - } + passcode_timer = setTimeout(() => { + if (log_lvl) { + console.log('Passcode timer expired'); + } + typed_journal_passcode = ''; + if (!$journals_sess?.journal_kv[$lq__journal_obj?.id]) { + $journals_sess.journal_kv[$lq__journal_obj?.id] = {}; + } - // Reset verification and decryption flags - $journals_sess.journal_kv[$lq__journal_obj?.id].journal_passcode_verified = false; - $journals_sess.journal_kv[$lq__journal_obj?.id].journal_passcode_decrypted = false; + // Reset verification and decryption flags + $journals_sess.journal_kv[ + $lq__journal_obj?.id + ].journal_passcode_verified = false; + $journals_sess.journal_kv[ + $lq__journal_obj?.id + ].journal_passcode_decrypted = false; - passcode_timer = null; - }, - timeout_ms - ); + passcode_timer = null; + }, timeout_ms); } }); @@ -137,9 +157,13 @@ }); if (results?.journal_entry_id_random) { - $journals_slct.journal_entry_id = results.journal_entry_id_random; - $journals_loc.entry.edit_kv[$journals_slct.journal_entry_id] = 'current'; - goto(`/journals/${$lq__journal_obj?.journal_id}/entry/${results.journal_entry_id_random}`); + $journals_slct.journal_entry_id = + results.journal_entry_id_random; + $journals_loc.entry.edit_kv[$journals_slct.journal_entry_id] = + 'current'; + goto( + `/journals/${$lq__journal_obj?.journal_id}/entry/${results.journal_entry_id_random}` + ); } } catch (error) { console.error('Error creating journal entry:', error); @@ -169,19 +193,28 @@ class="badge preset-tonal-success font-bold text-lg px-2 ml-2" title="Entries matching current filters" > - {$lq__journal_entry_obj_li?.length ?? '0'}× + {$lq__journal_entry_obj_li?.length ?? '0'}× {/if} {#await $journals_prom.load__journal_entry_obj_li} - + {/await} -
+
- -
{/snippet} - \ No newline at end of file + diff --git a/src/routes/journals/ae_comp__modal_journal_entry_append.svelte b/src/routes/journals/ae_comp__modal_journal_entry_append.svelte index 704950a3..6eaa67d0 100644 --- a/src/routes/journals/ae_comp__modal_journal_entry_append.svelte +++ b/src/routes/journals/ae_comp__modal_journal_entry_append.svelte @@ -16,112 +16,132 @@ log_lvl?: number; } - let { - open = $bindable(false), - journal_entry, - journal_config, + let { + open = $bindable(false), + journal_entry, + journal_config, mode = 'auto', - on_close, + on_close, on_update, - log_lvl = 0 + log_lvl = 0 }: Props = $props(); -// Local State -let tmp_entry_obj: key_val = $state({}); + // Local State + let tmp_entry_obj: key_val = $state({}); -// Header Options -let add_timestamp_header: boolean = $state(true); -let add_timestamp_header_w_day_of_week: boolean = $state(true); -let add_text_header: string = $state(''); -let add_text: string = $state(''); + // Header Options + let add_timestamp_header: boolean = $state(true); + let add_timestamp_header_w_day_of_week: boolean = $state(true); + let add_text_header: string = $state(''); + let add_text: string = $state(''); -// Change detection -let has_changes: boolean = $derived(add_text_header.length > 0 || add_text.length > 0); - -// Initialize tmp object when entry changes or modal opens -$effect(() => { - if (open && journal_entry) { - tmp_entry_obj = JSON.parse(JSON.stringify(journal_entry)); - // Reset fields - add_text_header = ''; - add_text = ''; - } -}); - -async function handle_save() { - let current_entry_content = tmp_entry_obj?.content || ''; - let add_content = ''; - let new_content = current_entry_content; - - // Construct the header/content to add (Following original logic) - let timestamp_str = ae_util.iso_datetime_formatter( - new Date(), - 'datetime_iso_12_no_seconds' + // Change detection + let has_changes: boolean = $derived( + add_text_header.length > 0 || add_text.length > 0 ); - let day_of_week_str = add_timestamp_header_w_day_of_week - ? ' (' + ae_util.iso_datetime_formatter(new Date(), 'week_long') + ')' - : ''; - if (add_timestamp_header && add_text_header) { - add_content = - '## ' + - timestamp_str + - day_of_week_str + - ' - ' + - add_text_header.trim() + - '\n' + - add_text.trim() + - '\n\n'; - } else if (add_timestamp_header) { - add_content = '## ' + timestamp_str + day_of_week_str + '\n' + add_text.trim() + '\n\n'; - } else if (add_text_header) { - add_content = - '## ' + add_text_header.trim() + day_of_week_str + '\n' + add_text.trim() + '\n\n'; - } else { - add_content = add_text.trim() + '\n\n'; - } + // Initialize tmp object when entry changes or modal opens + $effect(() => { + if (open && journal_entry) { + tmp_entry_obj = JSON.parse(JSON.stringify(journal_entry)); + // Reset fields + add_text_header = ''; + add_text = ''; + } + }); - // Determine Append or Prepend - let effective_mode = mode; - if (effective_mode === 'auto') { - effective_mode = journal_config?.entry_add_text || 'append'; - } + async function handle_save() { + let current_entry_content = tmp_entry_obj?.content || ''; + let add_content = ''; + let new_content = current_entry_content; - if (effective_mode == 'prepend') { - new_content = add_content + new_content; - } else { - // Append - new_content = new_content.trim() + '\n\n' + add_content; - } + // Construct the header/content to add (Following original logic) + let timestamp_str = ae_util.iso_datetime_formatter( + new Date(), + 'datetime_iso_12_no_seconds' + ); + let day_of_week_str = add_timestamp_header_w_day_of_week + ? ' (' + + ae_util.iso_datetime_formatter(new Date(), 'week_long') + + ')' + : ''; - new_content = new_content.trim() + '\n'; - - let data_kv = { content: new_content }; - - try { - let update_result = await journals_func.update_ae_obj__journal_entry({ - api_cfg: $ae_api, - journal_entry_id: tmp_entry_obj?.journal_entry_id, - data_kv: data_kv, - log_lvl: log_lvl - }); - - if (update_result) { - // Success - on_update(); - open = false; + if (add_timestamp_header && add_text_header) { + add_content = + '## ' + + timestamp_str + + day_of_week_str + + ' - ' + + add_text_header.trim() + + '\n' + + add_text.trim() + + '\n\n'; + } else if (add_timestamp_header) { + add_content = + '## ' + + timestamp_str + + day_of_week_str + + '\n' + + add_text.trim() + + '\n\n'; + } else if (add_text_header) { + add_content = + '## ' + + add_text_header.trim() + + day_of_week_str + + '\n' + + add_text.trim() + + '\n\n'; } else { + add_content = add_text.trim() + '\n\n'; + } + + // Determine Append or Prepend + let effective_mode = mode; + if (effective_mode === 'auto') { + effective_mode = journal_config?.entry_add_text || 'append'; + } + + if (effective_mode == 'prepend') { + new_content = add_content + new_content; + } else { + // Append + new_content = new_content.trim() + '\n\n' + add_content; + } + + new_content = new_content.trim() + '\n'; + + let data_kv = { content: new_content }; + + try { + let update_result = + await journals_func.update_ae_obj__journal_entry({ + api_cfg: $ae_api, + journal_entry_id: tmp_entry_obj?.journal_entry_id, + data_kv: data_kv, + log_lvl: log_lvl + }); + + if (update_result) { + // Success + on_update(); + open = false; + } else { + alert('Failed to update journal entry.'); + } + } catch (error) { + console.error('Error updating journal entry:', error); alert('Failed to update journal entry.'); } - } catch (error) { - console.error('Error updating journal entry:', error); - alert('Failed to update journal entry.'); } -} -
@@ -167,12 +193,14 @@ async function handle_save() { class="grow min-h-48 h-full w-full p-2 bg-slate-100 text-gray-900 dark:bg-slate-900 dark:text-gray-100 shadow-lg rounded-lg border border-gray-200 dark:border-gray-700 hover:border-gray-500 dark:hover:border-gray-500" placeholder="Content to {mode === 'auto' ? journal_config?.entry_add_text - : mode}..."> + : mode}..." + >
- -
- \ No newline at end of file + diff --git a/src/routes/journals/ae_comp__modal_journal_entry_config.svelte b/src/routes/journals/ae_comp__modal_journal_entry_config.svelte index 23cb1c31..ee4679e6 100644 --- a/src/routes/journals/ae_comp__modal_journal_entry_config.svelte +++ b/src/routes/journals/ae_comp__modal_journal_entry_config.svelte @@ -26,7 +26,10 @@ } from 'lucide-svelte'; import { Modal } from 'flowbite-svelte'; import { ae_loc, ae_api } from '$lib/stores/ae_stores'; - import { journals_loc, journals_sess } from '$lib/ae_journals/ae_journals_stores'; + import { + journals_loc, + journals_sess + } from '$lib/ae_journals/ae_journals_stores'; import { journals_func } from '$lib/ae_journals/ae_journals_functions'; import AE_Comp_Editor_CodeMirror from '$lib/elements/AE_Comp_Editor_CodeMirror.svelte'; import AE_Object_Flags from '$lib/ae_elements/AE_Object_Flags.svelte'; @@ -59,7 +62,8 @@ let tab: 'actions' | 'meta' | 'security' | 'json' = $state('actions'); - const normalize_date = (val: string | null) => val ? val.slice(0, 16) : null; + const normalize_date = (val: string | null) => + val ? val.slice(0, 16) : null; async function handle_update_entry() { try { @@ -120,17 +124,43 @@
-
- - - -
@@ -138,27 +168,66 @@ {#if tab === 'actions'}
- - - -
-

Quick Category

+

+ Quick Category +

{#each journal?.cfg_json?.category_li ?? [] as cat} - @@ -166,12 +235,18 @@
- {:else if tab === 'meta'}
- {:else if tab === 'security'}
-

+

Status & Security

-
-

Privacy Flags

+

+ Privacy Flags +

{ handle_update_entry(); on_save(); }} + on_toggle={() => { + handle_update_entry(); + on_save(); + }} hide_alert={journal?.cfg_json?.hide_btn_alert} hide_private={journal?.cfg_json?.hide_btn_private} hide_public={journal?.cfg_json?.hide_btn_public} hide_personal={journal?.cfg_json?.hide_btn_personal} - hide_professional={journal?.cfg_json?.hide_btn_professional} + hide_professional={journal?.cfg_json + ?.hide_btn_professional} hide_template={journal?.cfg_json?.hide_btn_template} />
{#if tmp_entry_obj.private && !tmp_entry_obj.content && tmp_entry_obj.content_encrypted}
-
-

+
+

Disaster Recovery

-

If the encryption passcode is lost, the data is unrecoverable. You can force a reset to plain text to reuse this entry ID.

-
@@ -275,12 +479,17 @@ {/if}
-

- {:else if tab === 'json'}
{#snippet footer()} - {/snippet} - \ No newline at end of file + diff --git a/src/routes/journals/ae_comp__modal_journal_export.svelte b/src/routes/journals/ae_comp__modal_journal_export.svelte index ce3a0810..e14e4cfb 100644 --- a/src/routes/journals/ae_comp__modal_journal_export.svelte +++ b/src/routes/journals/ae_comp__modal_journal_export.svelte @@ -7,10 +7,20 @@ */ import { Modal } from 'flowbite-svelte'; - import { Download, Copy, FileJson, FileType, Code, Settings2 } from 'lucide-svelte'; + import { + Download, + Copy, + FileJson, + FileType, + Code, + Settings2 + } from 'lucide-svelte'; import { ae_util } from '$lib/ae_utils/ae_utils'; import type { ae_JournalEntry, ae_Journal } from '$lib/types/ae_types'; - import { EXPORT_TEMPLATES, type ExportTemplate } from '$lib/ae_journals/ae_journals_export_templates'; + import { + EXPORT_TEMPLATES, + type ExportTemplate + } from '$lib/ae_journals/ae_journals_export_templates'; interface Props { open: boolean; @@ -19,7 +29,12 @@ on_close: () => void; } - let { open = $bindable(false), entries = [], journal, on_close }: Props = $props(); + let { + open = $bindable(false), + entries = [], + journal, + on_close + }: Props = $props(); // State let selected_template_id: string = $state('standard_markdown'); @@ -27,14 +42,24 @@ let export_count: number = $derived(entries.length); const templates = Object.values(EXPORT_TEMPLATES); - const selected_template = $derived(EXPORT_TEMPLATES[selected_template_id as keyof typeof EXPORT_TEMPLATES] || EXPORT_TEMPLATES.standard_markdown); + const selected_template = $derived( + EXPORT_TEMPLATES[ + selected_template_id as keyof typeof EXPORT_TEMPLATES + ] || EXPORT_TEMPLATES.standard_markdown + ); // Auto-select template based on journal type when modal opens $effect(() => { if (open && journal?.type_code) { - if (journal.type_code === 'personal_log' && EXPORT_TEMPLATES.personal_log) { + if ( + journal.type_code === 'personal_log' && + EXPORT_TEMPLATES.personal_log + ) { selected_template_id = 'personal_log'; - } else if (journal.type_code === 'amazon_vine' && EXPORT_TEMPLATES.amazon_vine) { + } else if ( + journal.type_code === 'amazon_vine' && + EXPORT_TEMPLATES.amazon_vine + ) { selected_template_id = 'amazon_vine'; } } @@ -58,8 +83,10 @@ function handle_download() { const timestamp = new Date().toISOString().replace(/[:.]/g, '-'); const filename = `journal_export_${timestamp}.${selected_template.extension}`; - const blob = new Blob([export_preview], { type: 'text/plain;charset=utf-8' }); - + const blob = new Blob([export_preview], { + type: 'text/plain;charset=utf-8' + }); + const url = URL.createObjectURL(blob); const link = document.createElement('a'); link.href = url; @@ -86,19 +113,24 @@
-
+
- Ready to Export: {export_count} entries. + Ready to Export: + {export_count} entries.
{#if journal}
- Journal Type: {journal.type_code || 'standard'} + Journal Type: {journal.type_code || 'standard'}
{/if}
@@ -111,10 +143,16 @@
{#each templates as template} - {/each}
@@ -134,27 +176,44 @@
Preview - {selected_template.name} + {selected_template.name}
-
- - + +
- -
- \ No newline at end of file + diff --git a/src/routes/journals/ae_comp__modal_journal_import.svelte b/src/routes/journals/ae_comp__modal_journal_import.svelte index cfb2a026..4d08a560 100644 --- a/src/routes/journals/ae_comp__modal_journal_import.svelte +++ b/src/routes/journals/ae_comp__modal_journal_import.svelte @@ -1,7 +1,17 @@ -
+
- {:else} - - - - + {#if !$ae_loc.edit_mode} {ae_util.iso_datetime_formatter( @@ -329,7 +347,9 @@ class="flex flex-row flex-wrap gap-2 items-center justify-start border border-gray-200 rounded-lg" > - +