From 77cc1528373181add0b4d7eb0cca1d751f57e512 Mon Sep 17 00:00:00 2001 From: Scott Idem Date: Tue, 19 Nov 2024 13:02:05 -0500 Subject: [PATCH] General improvement for archive content creation. Better show/hide for enable and hide fields. Novi and iframe related updates. --- .../ae_archives__archive_content.ts | 16 +- src/lib/ae_idaa_stores.ts | 27 ++- src/lib/element_tiptap_editor.svelte | 19 +- src/routes/idaa/(idaa)/archives/+page.svelte | 2 +- .../(idaa)/archives/[archive_id]/+page.svelte | 48 +++++- ...a_comp__archive_content_obj_id_edit.svelte | 58 ++++--- ...e_idaa_comp__archive_content_obj_li.svelte | 2 - .../ae_idaa_comp__archive_obj_id_view.svelte | 162 +++++++++++++++++- src/routes/idaa/(idaa)/bb/+page.svelte | 2 +- .../bb/ae_idaa_comp__post_obj_id_view.svelte | 20 +-- .../bb/ae_idaa_comp__post_options.svelte | 5 + .../ae_idaa_comp__event_obj_qry.svelte | 5 + static/idaa_novi_iframe_archives.html | 3 +- 13 files changed, 311 insertions(+), 58 deletions(-) diff --git a/src/lib/ae_archives/ae_archives__archive_content.ts b/src/lib/ae_archives/ae_archives__archive_content.ts index 71650618..1b671f95 100644 --- a/src/lib/ae_archives/ae_archives__archive_content.ts +++ b/src/lib/ae_archives/ae_archives__archive_content.ts @@ -66,6 +66,10 @@ export async function load_ae_obj_li__archive_content( api_cfg, for_obj_type = 'archive', for_obj_id, + enabled = 'enabled', + hidden = 'not_hidden', + limit = 99, + offset = 0, order_by_li = {'priority': 'DESC', 'sort': 'DESC', 'original_datetime': 'ASC', 'name': 'ASC', 'updated_on': 'DESC', 'created_on': 'DESC'}, params = {}, try_cache = true, @@ -74,6 +78,10 @@ export async function load_ae_obj_li__archive_content( api_cfg: any, for_obj_type: string, for_obj_id: string, + enabled?: string, + hidden?: string, + limit?: number, + offset?: number, order_by_li?: key_val, params?: key_val, try_cache?: boolean, @@ -82,10 +90,10 @@ export async function load_ae_obj_li__archive_content( ) { console.log(`*** load_ae_obj_li__archive_content() *** for_obj_type=${for_obj_type} for_obj_id=${for_obj_id}`); - let enabled: string = (params.qry__enabled ?? 'enabled'); // all, disabled, enabled - let hidden: string = (params.qry__hidden ?? 'not_hidden'); // all, hidden, not_hidden - let limit: number = (params.qry__limit ?? 99); // 99 - let offset: number = (params.qry__offset ?? 0); // 0 + // let enabled: string = (params.qry__enabled ?? 'enabled'); // all, disabled, enabled + // let hidden: string = (params.qry__hidden ?? 'not_hidden'); // all, hidden, not_hidden + // let limit: number = (params.qry__limit ?? 99); // 99 + // let offset: number = (params.qry__offset ?? 0); // 0 let params_json: key_val = {}; diff --git a/src/lib/ae_idaa_stores.ts b/src/lib/ae_idaa_stores.ts index 5977a47a..dca689ef 100644 --- a/src/lib/ae_idaa_stores.ts +++ b/src/lib/ae_idaa_stores.ts @@ -115,7 +115,7 @@ let idaa_session_data_struct: key_val = { export let idaa_sess = writable(idaa_session_data_struct); -/* *** BEGIN *** Initialize idaa_slct and idaa_trigger */ +/* *** BEGIN *** Initialize idaa_slct and idaa_trig */ /* The slct and slct_trigger variable should not be stored in local storage. Only use session storage because browser tabs can be open to different idaa, badges, exhibits, etc. */ // Intended for temporary session storage. @@ -151,8 +151,25 @@ export let idaa_slct = writable(idaa_slct_obj_template); // export let idaa_slct: Writable = localStorageStore('ae_idaa_slct', idaa_slct_obj_template); -/* *** BEGIN *** Initialize idaa_trigger */ +/* *** BEGIN *** Initialize idaa_trig */ // Intended for temporary session storage. -// Updated 2024-03-06 -export let idaa_trigger: any = writable(null); -// console.log(`AE IDAA Stores - IDAA Trigger:`, idaa_trigger); +// Updated 2024-11-19 +let idaa_trig_template: key_val = { + archive_id: false, + archive_content_li: false, + event_id: false, +}; +export let idaa_trig: any = writable(idaa_trig_template); +// console.log(`AE IDAA Stores - IDAA Trigger:`, idaa_trig); + + +/* *** BEGIN *** Initialize idaa_prom */ +// Intended for temporary session storage. +// Updated 2024-11-19 +let idaa_prom_template: key_val = { + archive_id: false, + archive_content_li: false, + event_id: false, +}; +export let idaa_prom: any = writable(idaa_prom_template); +// console.log(`AE IDAA Stores - IDAA Trigger:`, idaa_prom); diff --git a/src/lib/element_tiptap_editor.svelte b/src/lib/element_tiptap_editor.svelte index 71f35862..39bad6b4 100644 --- a/src/lib/element_tiptap_editor.svelte +++ b/src/lib/element_tiptap_editor.svelte @@ -134,7 +134,8 @@ function getContent() { } let mouse_entered_timer: any; -let mouse_entered_wait: number = 2500; +let mouse_enter_wait: number = 500; +let mouse_leave_wait: number = 2000; @@ -148,11 +149,13 @@ let mouse_entered_wait: number = 2500; } }} on:mouseleave={() => { + clearTimeout(mouse_entered_timer); + mouse_entered_timer = setTimeout(() => { if (default_minimal) { show_menu = false; } - }, mouse_entered_wait); + }, mouse_leave_wait); // if (default_minimal) { // show_menu = false; @@ -161,9 +164,15 @@ let mouse_entered_wait: number = 2500; on:mouseenter={() => { clearTimeout(mouse_entered_timer); - if (default_minimal) { - show_menu = true; - } + mouse_entered_timer = setTimeout(() => { + if (default_minimal) { + show_menu = true; + } + }, mouse_enter_wait); + + // if (default_minimal) { + // show_menu = true; + // } }} class="editor textarea p-1 transition-all duration-1000" > diff --git a/src/routes/idaa/(idaa)/archives/+page.svelte b/src/routes/idaa/(idaa)/archives/+page.svelte index 7be02637..4dd537e0 100644 --- a/src/routes/idaa/(idaa)/archives/+page.svelte +++ b/src/routes/idaa/(idaa)/archives/+page.svelte @@ -15,7 +15,7 @@ import { liveQuery } from "dexie"; import { core_func } from '$lib/ae_core/ae_core_functions'; import { db_archives } from "$lib/db_archives"; import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores'; -import { idaa_loc, idaa_sess, idaa_slct, idaa_trigger } from '$lib/ae_idaa_stores'; +import { idaa_loc, idaa_sess, idaa_slct, idaa_trig } from '$lib/ae_idaa_stores'; import { archives_func } from '$lib/ae_archives/ae_archives_functions'; import Comp__archive_obj_li from './ae_idaa_comp__archive_obj_li.svelte'; diff --git a/src/routes/idaa/(idaa)/archives/[archive_id]/+page.svelte b/src/routes/idaa/(idaa)/archives/[archive_id]/+page.svelte index 7e5db8c5..6095008f 100644 --- a/src/routes/idaa/(idaa)/archives/[archive_id]/+page.svelte +++ b/src/routes/idaa/(idaa)/archives/[archive_id]/+page.svelte @@ -1,7 +1,7 @@ @@ -21,7 +45,15 @@ onMount(() => {
-

{@html $lq__archive_obj?.name} ({$lq__archive_content_obj_li?.length}×)

+

+ {@html $lq__archive_obj?.name ?? 'Loading...'} + ({$lq__archive_content_obj_li?.length ?? '0'}×) + {#await $idaa_prom.load__archive_content_obj_li} + + {:then} + + {/await} +

@@ -71,12 +103,129 @@ onMount(() => { {#if $ae_loc.trusted_access && $ae_loc.edit_mode} + + {#if ($ae_loc.edit_mode && $ae_loc.trusted_access) && (!$idaa_loc.archives.qry__hidden || $idaa_loc.archives.qry__hidden == 'not_hidden')} + + {:else if $ae_loc.trusted_access && $idaa_loc.archives.qry__hidden != 'not_hidden'} + + {/if} + + {#if ($ae_loc.edit_mode && $ae_loc.administrator_access) && (!$idaa_loc.archives.qry__enabled || $idaa_loc.archives.qry__enabled == 'enabled')} + + {:else if $ae_loc.administrator_access && $idaa_loc.archives.qry__enabled != 'enabled'} + + {/if} + +
{:else if $ae_loc.trusted_access && $idaa_loc.bb.qry__hidden != 'not_hidden'} {:else if $ae_loc.administrator_access && $idaa_loc.bb.qry__enabled != 'enabled'} {:else if $ae_loc.trusted_access && $idaa_loc.recovery_meetings.qry__hidden != 'not_hidden'} {:else if $ae_loc.administrator_access && $idaa_loc.recovery_meetings.qry__enabled != 'enabled'}