diff --git a/TODO.md b/TODO.md index 00c67fba..2a3893b6 100644 --- a/TODO.md +++ b/TODO.md @@ -9,7 +9,7 @@ This is a list of tasks to be completed before the next event/show/conference. 1. **IDAA Module Hardening:** - [ ] Audit Jitsi meeting integration for connection stability. - [ ] Investigate reported "issues with IDAA pages" (Current Focus). - - [ ] Verify V3 search logic for Recovery Meetings and Archives. + - [x] Verify V3 search logic for Recovery Meetings and Archives. (Verified 2026-01-26) --- @@ -25,10 +25,19 @@ This is a list of tasks to be completed before the next event/show/conference. - [x] **Observability:** Heartbeat and Sync status moved to formal Config UI. 3. **Hardening V3 Search:** - [ ] **Exhibit Search:** Restore missing search function and logic. + - [ ] **Journal Search:** Refactor dynamic filtering and query logic (Coming back to this soon). - [ ] **Global Rule:** Preserve `ft_qry`, `lk_qry`, and `and_qry` blocks as "sacred" business logic. --- +## 🚀 Future Features & Backlog +- [ ] **Journal Annotations:** Implement a "Post-Comment" style system for adding reflections to Journal Entries. +- [ ] **Journal Media Hardening:** Improve file/media linking using the Archive module's multi-attachment pattern. +- [ ] **Notification Hooks:** Add email alerts for system events (e.g., AI Summarization / RAR completion). +- [ ] **Telemetry Visuals:** Expand Launcher dashboard with network bandwidth and storage usage stats. + +--- + ## 🛠️ DX & Tooling (MCP) - [x] **V3 API Parameter Hardening:** Updated `search_ae_obj_v3` for URL serialization. (Completed 2026-01-21) - [x] **Fetch Noise Reduction:** Silenced AbortErrors in API helpers at log_lvl 0. (Completed 2026-01-26) diff --git a/src/lib/ae_journals/ae_journals__journal_entry.ts b/src/lib/ae_journals/ae_journals__journal_entry.ts index 5751147a..09ca2561 100644 --- a/src/lib/ae_journals/ae_journals__journal_entry.ts +++ b/src/lib/ae_journals/ae_journals__journal_entry.ts @@ -302,6 +302,7 @@ export async function qry__journal_entry({ api_cfg, journal_id, qry_str = null, // Example: 'name:contains:"test"' + qry_category_code = null, qry_created_on = null, // Example greater than: '2024-10-24' qry_alert = null, qry_priority = null, @@ -325,6 +326,7 @@ export async function qry__journal_entry({ api_cfg: any; journal_id: any; qry_str?: null | string; + qry_category_code?: null | string; qry_created_on?: null | string; qry_alert?: null | string; qry_priority?: null | number; @@ -351,6 +353,10 @@ export async function qry__journal_entry({ 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 }); + } + if (qry_created_on) { search_query.and.push({ field: 'created_on', op: 'gt', value: qry_created_on }); } @@ -386,6 +392,7 @@ export async function qry__journal_entry({ order_by_li, limit, offset, + params, log_lvl }) .then(async function (journal_entry_obj_li_get_result) { diff --git a/src/lib/types/ae_types.ts b/src/lib/types/ae_types.ts index 7383c0c3..2f0f71e9 100644 --- a/src/lib/types/ae_types.ts +++ b/src/lib/types/ae_types.ts @@ -207,6 +207,11 @@ export interface ae_JournalEntry extends ae_BaseObj { billable?: boolean; bill_to?: string; bill_rate?: number; + + // Attached files/media + linked_li_json?: any[]; + hosted_file_obj_li?: any[]; + upload_complete?: boolean; billable_minutes?: number; alert?: boolean; diff --git a/src/routes/journals/+page.svelte b/src/routes/journals/+page.svelte index c7a6e78e..63c9d1e1 100644 --- a/src/routes/journals/+page.svelte +++ b/src/routes/journals/+page.svelte @@ -11,7 +11,7 @@ import { BookPlus, SquareLibrary, Wrench, FileUp, Loader2, Sparkles - } from '@lucide/svelte'; + } from 'lucide-svelte'; // *** Libraries & Stores import { liveQuery } from 'dexie'; @@ -27,7 +27,7 @@ } from '$lib/ae_journals/ae_journals_stores'; // *** Components - import Modal_journals_cfg from './modal_journals_config.svelte'; + import AeCompModalJournalConfig from './ae_comp__modal_journal_config.svelte'; import Journal_obj_li from './ae_comp__journal_obj_li.svelte'; import AeCompJournalEntryQuickAdd from './ae_comp__journal_entry_quick_add.svelte'; import AeCompModalJournalImport from './ae_comp__modal_journal_import.svelte'; @@ -212,11 +212,11 @@ {/if} {#if $journals_sess.show__modal__journals_config} - + {/if} (show_import_modal = false)} - onImportComplete={() => {}} + on_close={() => (show_import_modal = false)} + on_import_complete={() => {}} /> \ No newline at end of file diff --git a/src/routes/journals/[journal_id]/+page.svelte b/src/routes/journals/[journal_id]/+page.svelte index 89806b95..815afc26 100644 --- a/src/routes/journals/[journal_id]/+page.svelte +++ b/src/routes/journals/[journal_id]/+page.svelte @@ -60,7 +60,7 @@ import { journals_func } from '$lib/ae_journals/ae_journals_functions'; // import Journal_obj_id_edit from './ae_journals_comp__journal_obj_id_edit.svelte'; - import Journal_view from './../ae_comp__journal_obj_id_view.svelte'; + import AeCompJournalObjIdView from './../ae_comp__journal_obj_id_view.svelte'; // import Journal_page_menu from './session_page_menu.svelte'; // import Element_data_store from '$lib/element_data_store_v2.svelte'; @@ -69,7 +69,7 @@ import Journal_obj_id_edit from '../ae_comp__journal_obj_id_edit.svelte'; import AeCompModalJournalExport from '../ae_comp__modal_journal_export.svelte'; import AeCompModalJournalImport from '../ae_comp__modal_journal_import.svelte'; - import { FileDown } from '@lucide/svelte'; + import { FileDown } from 'lucide-svelte'; // let ae_promises: key_val = {}; // let ae_tmp: key_val = {}; @@ -163,7 +163,7 @@ let lq__journal_entry_obj_li = $derived( liveQuery(async () => { - let results; + let results: any[] = []; // If we have a specific list in the session (e.g. from a search), use it. if ($journals_sess?.entry_li !== null && $journals_sess?.entry_li !== undefined) { @@ -378,11 +378,11 @@ " > --> - show_export_modal = true} - onShowImport={() => show_import_modal = true} + on_show_export={() => show_export_modal = true} + on_show_import={() => show_import_modal = true} /> @@ -410,14 +410,14 @@ bind:open={show_export_modal} entries={$lq__journal_entry_obj_li ?? []} journal={$lq__journal_obj} - onClose={() => show_export_modal = false} + on_close={() => show_export_modal = false} /> show_import_modal = false} - onImportComplete={handle_import_complete} + on_close={() => show_import_modal = false} + on_import_complete={handle_import_complete} /> {:else}
diff --git a/src/routes/journals/[journal_id]/entry/[journal_entry_id]/+page.svelte b/src/routes/journals/[journal_id]/entry/[journal_entry_id]/+page.svelte index af1d1b27..c88141c4 100644 --- a/src/routes/journals/[journal_id]/entry/[journal_entry_id]/+page.svelte +++ b/src/routes/journals/[journal_id]/entry/[journal_entry_id]/+page.svelte @@ -318,7 +318,7 @@ " > - show_export_modal = true} /> + show_export_modal = true} />
@@ -326,7 +326,7 @@ bind:open={show_export_modal} entries={$lq__journal_entry_obj ? [$lq__journal_entry_obj] : []} journal={$lq__journal_obj} - onClose={() => show_export_modal = false} + on_close={() => show_export_modal = false} /> {:else}
diff --git a/src/routes/journals/JournalEntry_AITools.svelte b/src/routes/journals/ae_comp__journal_entry_ai_tools.svelte similarity index 86% rename from src/routes/journals/JournalEntry_AITools.svelte rename to src/routes/journals/ae_comp__journal_entry_ai_tools.svelte index 4f78d7e9..1c7df457 100644 --- a/src/routes/journals/JournalEntry_AITools.svelte +++ b/src/routes/journals/ae_comp__journal_entry_ai_tools.svelte @@ -1,6 +1,6 @@ @@ -27,7 +27,7 @@ bind:summary={summary} onSave={(newSummary) => { summary = newSummary; - onSave(); + on_save(); }} {log_lvl} /> diff --git a/src/routes/journals/JournalEntry_Editor.svelte b/src/routes/journals/ae_comp__journal_entry_editor.svelte similarity index 86% rename from src/routes/journals/JournalEntry_Editor.svelte rename to src/routes/journals/ae_comp__journal_entry_editor.svelte index 51f050df..96c73d6d 100644 --- a/src/routes/journals/JournalEntry_Editor.svelte +++ b/src/routes/journals/ae_comp__journal_entry_editor.svelte @@ -1,10 +1,10 @@ -
- - -

- {$ae_sess.files.add_to_use_files_method == 'select' ? 'Select' : 'Upload'} and Manage Hosted - Files -

- - - - -
- - {#snippet label()} - -
- - Upload Journal Entry files -
- - Aether hosted files only - - - {/snippet} - -
- -
- - - -
- - {#if !Object.keys(hosted_file_kv ?? {}).length} - No file(s) uploaded yet. - {:else} - - - - {#each Object.entries(hosted_file_kv) as [hosted_file_id, hosted_file_obj]} -
- - - - - -
- {/each} - - +
+

+ + Attachments + {#if unified_file_li.length} + {unified_file_li.length} {/if} - + + {#if $ae_loc.edit_mode} + + {/if} +

+ + + {#if unified_file_li.length} +
+ {#each unified_file_li as file} + {@const file_id = file.hosted_file_id_random || file.id || file.hosted_file_id} +
+
+
+ +
+
+ {file.filename} + {file.extension} • {ae_util.format_bytes(file.size)} +
+
+ +
+ + + {#if $ae_loc.edit_mode} + + {/if} +
+
+ {/each} +
+ {: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

+
+
+ {/snippet} + + {:else} +
+

Select from existing hosted files:

+ +
+ {/if} +
{/if}
diff --git a/src/routes/journals/ae_comp__journal_entry_obj_id_view.svelte b/src/routes/journals/ae_comp__journal_entry_obj_id_view.svelte index c5d91719..200f393d 100644 --- a/src/routes/journals/ae_comp__journal_entry_obj_id_view.svelte +++ b/src/routes/journals/ae_comp__journal_entry_obj_id_view.svelte @@ -3,6 +3,7 @@ * ae_comp__journal_entry_obj_id_view.svelte * Reference Implementation for Journal Entry View/Edit * Corrected for V3 API Strictness & Robust Decryption + * Uses strictly snake_case. */ // *** Import Svelte core @@ -20,15 +21,16 @@ import { journals_func } from '$lib/ae_journals/ae_journals_functions'; import { decrypt_journal_entry } from '$lib/ae_journals/ae_journals_decryption'; - import JournalEntry_Editor from './JournalEntry_Editor.svelte'; - import JournalEntry_Header from './JournalEntry_Header.svelte'; - import JournalEntry_Metadata from './JournalEntry_Metadata.svelte'; - import JournalEntry_AITools from './JournalEntry_AITools.svelte'; + import AeCompJournalEntryEditor from './ae_comp__journal_entry_editor.svelte'; + import AeCompJournalEntryHeader from './ae_comp__journal_entry_header.svelte'; + import AeCompJournalEntryMetadata from './ae_comp__journal_entry_metadata.svelte'; + import AeCompJournalEntryAiTools from './ae_comp__journal_entry_ai_tools.svelte'; + import AeCompJournalEntryObjFileLi from './ae_comp__journal_entry_obj_file_li.svelte'; import AeCompModalJournalEntryAppend from './ae_comp__modal_journal_entry_append.svelte'; - import ModalJournalEntryConfig from './modal_journal_entry_config.svelte'; + import AeCompModalJournalEntryConfig from './ae_comp__modal_journal_entry_config.svelte'; // Icons - import { AlertCircle, XCircle, Loader2 } from '@lucide/svelte'; + import { AlertCircle, XCircle, Loader2 } from 'lucide-svelte'; // *** Props interface Props { @@ -36,7 +38,7 @@ lq__journal_obj: any; lq__journal_obj_li: any; lq__journal_entry_obj: any; - onShowExport?: () => void; + on_show_export?: () => void; } let { @@ -44,11 +46,11 @@ lq__journal_obj, lq__journal_obj_li, lq__journal_entry_obj, - onShowExport + on_show_export }: Props = $props(); // *** State - let editorView: any = $state(); + let editor_view: any = $state(); let orig_entry_obj: key_val | null = $state(null); let tmp_entry_obj: key_val = $state({}); let save_status: 'saved' | 'unsaved' | 'saving' = $state('saved'); @@ -230,13 +232,14 @@ is_processing = false; } - async function update_journal_entry() { + async function update_journal_entry(fields_kv?: key_val) { if (!$ae_loc.trusted_access || save_status === 'saving' || is_processing) return; is_processing = true; save_status = 'saving'; - const data_kv: key_val = { + // Use fields_kv if provided (partial update), otherwise use full tmp_entry_obj + const data_kv: key_val = fields_kv || { name: tmp_entry_obj.name, content: tmp_entry_obj.content, history: tmp_entry_obj.history, @@ -255,19 +258,23 @@ sort: tmp_entry_obj.sort, group: tmp_entry_obj.group, data_json: tmp_entry_obj.data_json, - archive_on: tmp_entry_obj.archive_on + 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 }; const decrypt_key = $lq__journal_obj.combined_passcode; - 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 = null; + // Handle encryption logic for content only on full updates + 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 = null; + } + } else { + data_kv.content_encrypted = null; + data_kv.history_encrypted = null; } - } else { - data_kv.content_encrypted = null; - data_kv.history_encrypted = null; } try { @@ -278,8 +285,10 @@ log_lvl: 1 }); - // CRITICAL: Sync ORIG after save to clear unsaved changes - orig_entry_obj = deep_copy(tmp_entry_obj); + // Sync ORIG after save to clear unsaved changes flag + if (!fields_kv) { + orig_entry_obj = deep_copy(tmp_entry_obj); + } save_status = 'saved'; } catch (error) { console.error('Update failed:', error); @@ -317,16 +326,6 @@ return marked.parse(text.replace(/^[​‌‍‎‏]/, '')); } - async function change_journal_id() { - if (!$ae_loc.trusted_access || is_processing) return; - await journals_func.update_ae_obj__journal_entry({ - api_cfg: $ae_api, - journal_entry_id: $lq__journal_entry_obj?.journal_entry_id, - data_kv: { journal_id_random: tmp_entry_obj.journal_id } - }); - goto(`/journals/${tmp_entry_obj.journal_id}`); - } - 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?')) { return; @@ -358,15 +357,15 @@
{#if $lq__journal_entry_obj && $lq__journal_obj} - show_config_modal = true} + on_save={() => update_journal_entry()} + on_decrypt={handle_content_decryption} + on_show_config={() => show_config_modal = true} {save_status} {log_lvl} /> @@ -387,48 +386,55 @@ class:bg-yellow-50={$journals_loc.entry.edit_kv[$lq__journal_entry_obj?.journal_entry_id] == 'current'}>
- update_journal_entry()} {log_lvl} />
- update_journal_entry()} + on_force_reset={handle_force_reset} />
- + + + (show_append_modal = false)} - onUpdate={() => { show_append_modal = false; }} + on_close={() => (show_append_modal = false)} + on_update={() => { show_append_modal = false; }} {log_lvl} /> - { modal_mode = 'append'; show_append_modal = true; }} - onPrepend={() => { modal_mode = 'prepend'; show_append_modal = true; }} + 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; }} {log_lvl} /> {:else} 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 6d5c7ca5..510a05cd 100644 --- a/src/routes/journals/ae_comp__journal_entry_obj_li.svelte +++ b/src/routes/journals/ae_comp__journal_entry_obj_li.svelte @@ -31,7 +31,7 @@ Tags, TypeOutline, X - } from '@lucide/svelte'; + } from 'lucide-svelte'; // *** Import Aether specific variables and functions import type { key_val } from '$lib/stores/ae_stores'; @@ -253,10 +253,12 @@ log_lvl: log_lvl }) .then((result) => { - alert('Journal entry cloned successfully!'); - goto( - `/journals/${result.journal_id_random}/entry/${result.journal_entry_id_random}` - ); + if (result?.journal_id_random && result?.journal_entry_id_random) { + alert('Journal entry cloned successfully!'); + goto( + `/journals/${result.journal_id_random}/entry/${result.journal_entry_id_random}` + ); + } }) .catch((error) => { console.error( @@ -551,8 +553,8 @@ bind:open={show_append_modal} journal_entry={tmp_entry_obj} journal_config={$lq__journal_obj?.cfg_json} - onClose={handle_modal_close} - onUpdate={handle_modal_update} + on_close={handle_modal_close} + on_update={handle_modal_update} {log_lvl} /> {/if} 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 51c1cb6c..0c22b29a 100644 --- a/src/routes/journals/ae_comp__journal_entry_obj_qry.svelte +++ b/src/routes/journals/ae_comp__journal_entry_obj_qry.svelte @@ -77,7 +77,7 @@ if (log_lvl) { console.log( - `Triggered: $journals_trig.journal_entry_qry: ${$journals_loc.entry.qry__search_text}` + `Triggered: $journals_trig.journal_entry_qry: text="${$journals_loc.entry.qry__search_text}" cat="${$journals_loc.entry.qry__category_code}"` ); } @@ -86,6 +86,7 @@ api_cfg: $ae_api, journal_id: $lq__journal_obj?.journal_id ?? '', qry_str: $journals_loc.entry.qry__search_text, + qry_category_code: $journals_loc.entry.qry__category_code, // qry_created_on: null, // qry_alert: null, @@ -100,8 +101,8 @@ log_lvl: log_lvl }); - if (!$journals_loc.entry.qry__search_text) { - // If search text was cleared or empty, reset to default view (null) + if (!$journals_loc.entry.qry__search_text && !$journals_loc.entry.qry__category_code) { + // If search text and category were cleared or empty, reset to default view (null) $journals_sess.entry_li = null; } else if ($journals_prom.load__journal_entry_obj_li && $journals_prom.load__journal_entry_obj_li.length > 0) { $journals_sess.entry_li = $journals_prom.load__journal_entry_obj_li; @@ -146,10 +147,11 @@ - -
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 e144da93..b9036b47 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,7 @@ import { goto } from '$app/navigation'; // *** Import other supporting libraries - import { BookPlus, BookOpenText, FilePlus, Menu, Pencil, FileDown, FileUp, Settings } from '@lucide/svelte'; + import { BookPlus, BookOpenText, FilePlus, Menu, Pencil, FileDown, FileUp, Settings } from 'lucide-svelte'; // *** Import Aether specific variables and functions import { ae_util } from '$lib/ae_utils/ae_utils'; @@ -30,11 +30,11 @@ log_lvl?: number; lq__journal_obj: any; lq__journal_entry_obj_li: any; - onShowExport?: () => void; - onShowImport?: () => void; + on_show_export?: () => void; + on_show_import?: () => void; } - let { log_lvl = 0, lq__journal_obj, lq__journal_entry_obj_li, onShowExport, onShowImport }: 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 = {}; @@ -232,7 +232,7 @@ {log_lvl} {lq__journal_obj} show={$journals_sess.show__modal_edit__journal_obj} - onNewEntry={handle_new_entry} - onShowExport={onShowExport} - onShowImport={onShowImport} + on_new_entry={handle_new_entry} + on_show_export={on_show_export} + on_show_import={on_show_import} /> diff --git a/src/routes/journals/ae_comp__journal_obj_li.svelte b/src/routes/journals/ae_comp__journal_obj_li.svelte index 3ccf8d06..5a562ec2 100644 --- a/src/routes/journals/ae_comp__journal_obj_li.svelte +++ b/src/routes/journals/ae_comp__journal_obj_li.svelte @@ -5,7 +5,7 @@ * Layout: Responsive Grid (1 col mobile, 2 col tablet, 3 col desktop) * Style: Tailwind 4 + Skeleton UI Reference Standard */ - import { BookOpenText, BookType, Hash, Calendar, Clock } from '@lucide/svelte'; + import { BookOpenText, BookType, Hash, Calendar, Clock } from 'lucide-svelte'; import { ae_util } from '$lib/ae_utils/ae_utils'; import { ae_loc } from '$lib/stores/ae_stores'; diff --git a/src/routes/journals/modal_journals_config.svelte b/src/routes/journals/ae_comp__modal_journal_config.svelte similarity index 99% rename from src/routes/journals/modal_journals_config.svelte rename to src/routes/journals/ae_comp__modal_journal_config.svelte index 48a341ff..47d41cd5 100644 --- a/src/routes/journals/modal_journals_config.svelte +++ b/src/routes/journals/ae_comp__modal_journal_config.svelte @@ -1,6 +1,6 @@ @@ -232,7 +232,7 @@ {/if}
- +