From bf5bdd4a3e9ebef37596d044f8c089c15f712d96 Mon Sep 17 00:00:00 2001 From: Scott Idem Date: Sun, 8 Sep 2024 23:28:34 -0400 Subject: [PATCH] Work on the links to the legacy and new launchers. --- .../launcher/[slug]/+page@(launcher).svelte | 1 + .../ae_comp__event_session_obj_li.svelte | 19 ++++++++++++++- .../ae_comp__event_session_obj_li_v2.svelte | 17 +++++++++++++- .../event/[slug]/+page.svelte | 4 +++- .../location/[slug]/+page.svelte | 2 ++ .../events_pres_mgmt/location_view.svelte | 23 +++++++++++++++---- .../events_pres_mgmt/session_view.svelte | 21 ++++++++++++++--- 7 files changed, 76 insertions(+), 11 deletions(-) diff --git a/src/routes/events_pres_mgmt/(launcher)/launcher/[slug]/+page@(launcher).svelte b/src/routes/events_pres_mgmt/(launcher)/launcher/[slug]/+page@(launcher).svelte index c4f1bea9..37e70dbc 100644 --- a/src/routes/events_pres_mgmt/(launcher)/launcher/[slug]/+page@(launcher).svelte +++ b/src/routes/events_pres_mgmt/(launcher)/launcher/[slug]/+page@(launcher).svelte @@ -338,6 +338,7 @@ async function handle_get_device_info(event_device_id) { + Launcher: diff --git a/src/routes/events_pres_mgmt/ae_comp__event_session_obj_li.svelte b/src/routes/events_pres_mgmt/ae_comp__event_session_obj_li.svelte index df99c947..b25ceeb4 100644 --- a/src/routes/events_pres_mgmt/ae_comp__event_session_obj_li.svelte +++ b/src/routes/events_pres_mgmt/ae_comp__event_session_obj_li.svelte @@ -28,6 +28,7 @@ export let event_session_id_random_li: Array<string> = ['']; // [''] export let hide__session_location: boolean = false; export let hide__session_poc: boolean = false; export let show__launcher_link: boolean = false; +export let show__launcher_link_legacy: boolean = false; export let show__location_link: boolean = false; // export let allow_basic: boolean = false; // export let allow_moderator: boolean = false; @@ -232,13 +233,28 @@ let lq_kv__event_session_obj_li = liveQuery( class:hidden={hide__session_location} > <!-- Minimum level access to see the link here is "trusted". --> + <!-- BEGIN: Legacy link --> + {#if show__launcher_link_legacy} + <a + data-sveltekit-preload-data="false" + href="/event/{session_obj?.event_id_random}/launcher/{session_obj?.event_location_id_random}" + class="btn btn-sm variant-glass-secondary hover:variant-filled-secondary" + title="Launcher: {session_obj?.event_location_name} {session_obj?.event_location_id_random}" + > + <span class="fas fa-paper-plane m-1"></span> + {@html session_obj?.event_location_name ? session_obj?.event_location_name : ae_snip.html__not_set} + </a> + {/if} + <!-- END: Legacy Link --> + {#if show__launcher_link} <a + data-sveltekit-preload-data="false" href="/events_pres_mgmt/launcher/{session_obj?.event_id_random}?location_id={session_obj?.event_location_id_random}" class="btn btn-sm variant-glass-surface hover:variant-filled-secondary" title="Launcher: {session_obj?.event_location_name} {session_obj?.event_location_id_random}" > - <span class="fas fa-paper-plane m-1"></span> + <span class="fas fa-plane m-1"></span> {@html session_obj?.event_location_name ? session_obj?.event_location_name : ae_snip.html__not_set} </a> {:else} @@ -246,6 +262,7 @@ let lq_kv__event_session_obj_li = liveQuery( {session_obj?.event_location_name ?? '-- not set --'} </span> {/if} + {#if show__location_link} <a href="/events_pres_mgmt/location/{session_obj?.event_location_id_random}" diff --git a/src/routes/events_pres_mgmt/ae_comp__event_session_obj_li_v2.svelte b/src/routes/events_pres_mgmt/ae_comp__event_session_obj_li_v2.svelte index 15321282..2f86381e 100644 --- a/src/routes/events_pres_mgmt/ae_comp__event_session_obj_li_v2.svelte +++ b/src/routes/events_pres_mgmt/ae_comp__event_session_obj_li_v2.svelte @@ -29,6 +29,7 @@ export let event_session_id_random_li: Array<string>; // [''] export let hide__session_location: boolean = false; export let hide__session_poc: boolean = false; export let show__launcher_link: boolean = false; +export let show__launcher_link_legacy: boolean = false; export let show__location_link: boolean = false; export let show__session_files: boolean = false; export let show__session_presentations: boolean = false; @@ -226,13 +227,27 @@ if (browser) { class:hidden={hide__session_location} > <!-- Minimum level access to see the link here is "trusted". --> + <!-- BEGIN: Legacy link --> + {#if show__launcher_link_legacy} + <a + data-sveltekit-preload-data="false" + href="/event/{session_obj?.event_id_random}/launcher/{session_obj?.event_location_id_random}" + class="btn btn-sm variant-glass-secondary hover:variant-filled-secondary" + title="Launcher: {session_obj?.event_location_name} {session_obj?.event_location_id_random}" + > + <span class="fas fa-paper-plane m-1"></span> + {@html session_obj?.event_location_name ? session_obj?.event_location_name : ae_snip.html__not_set} + </a> + {/if} + <!-- END: Legacy Link --> + {#if show__launcher_link} <a href="/events_pres_mgmt/launcher/{session_obj?.event_id_random}?location_id={session_obj?.event_location_id_random}" class="btn btn-sm variant-glass-surface hover:variant-filled-secondary" title="Launcher: {session_obj?.event_location_name} {session_obj?.event_location_id_random}" > - <span class="fas fa-paper-plane m-1"></span> + <span class="fas fa-plane m-1"></span> {@html session_obj?.event_location_name ? session_obj?.event_location_name : ae_snip.html__not_set} </a> {:else} diff --git a/src/routes/events_pres_mgmt/event/[slug]/+page.svelte b/src/routes/events_pres_mgmt/event/[slug]/+page.svelte index 0ad55f94..b2fe5ecd 100644 --- a/src/routes/events_pres_mgmt/event/[slug]/+page.svelte +++ b/src/routes/events_pres_mgmt/event/[slug]/+page.svelte @@ -59,6 +59,7 @@ $: if ($lq__event_obj?.mod_pres_mgmt_json) { $events_loc.pres_mgmt.presenter__require_agree = $lq__event_obj?.mod_pres_mgmt_json?.presenter__require_agree ?? false; $events_loc.pres_mgmt.show__email_access_link = $lq__event_obj?.mod_pres_mgmt_json?.show__email_access_link ?? false; $events_loc.pres_mgmt.show__launcher_link = $lq__event_obj?.mod_pres_mgmt_json?.show__launcher_link ?? false; + $events_loc.pres_mgmt.show__launcher_link_legacy = $lq__event_obj?.mod_pres_mgmt_json?.show__launcher_link_legacy ?? false; } @@ -518,7 +519,8 @@ async function handle_search__event_session( event_session_id_random_li={event_session_id_random_li} hide__session_location={$events_loc.pres_mgmt.hide__session_location} hide__session_poc={$events_loc.pres_mgmt.hide__session_poc} - show__launcher_link={$ae_loc.manager_access || $ae_loc.trusted_access && $lq__event_obj?.mod_pres_mgmt_json?.show__launcher_link} + show__launcher_link={$ae_loc.manager_access || $ae_loc.trusted_access && $events_loc.pres_mgmt.show__launcher_link} + show__launcher_link_legacy={$ae_loc.manager_access || $ae_loc.trusted_access && $events_loc.pres_mgmt.show__launcher_link_legacy} show__location_link={$events_loc.pres_mgmt.show_content__location_link} /> </div> diff --git a/src/routes/events_pres_mgmt/location/[slug]/+page.svelte b/src/routes/events_pres_mgmt/location/[slug]/+page.svelte index 8f6c9c7b..4f18ac01 100644 --- a/src/routes/events_pres_mgmt/location/[slug]/+page.svelte +++ b/src/routes/events_pres_mgmt/location/[slug]/+page.svelte @@ -167,6 +167,7 @@ onMount(() => { <!-- General information about the location --> <Location_view show__launcher_link={$events_loc.pres_mgmt.show_content__launcher_link} + show__launcher_link_legacy={$events_loc.pres_mgmt.show_content__launcher_link_legacy} event_location_id={$lq__event_location_obj?.event_location_id} lq__event_obj={lq__event_obj} lq__event_location_obj={lq__event_location_obj} @@ -188,6 +189,7 @@ onMount(() => { show__session_files={$events_loc.pres_mgmt.show_content__session_files} show__session_presentations={$events_loc.pres_mgmt.show_content__session_presentations} show__launcher_link={$events_loc.pres_mgmt.show_content__launcher_link} + show__launcher_link_legacy={$events_loc.pres_mgmt.show_content__launcher_link_legacy} show__location_link={$events_loc.pres_mgmt.show_content__location_link} > </Comp_event_session_obj_li> diff --git a/src/routes/events_pres_mgmt/location_view.svelte b/src/routes/events_pres_mgmt/location_view.svelte index 3515da2e..847c5703 100644 --- a/src/routes/events_pres_mgmt/location_view.svelte +++ b/src/routes/events_pres_mgmt/location_view.svelte @@ -41,7 +41,8 @@ if (!$events_sess.pres_mgmt) { // $events_sess.pres_mgmt.show_content__agree_text = false; // $events_sess.pres_mgmt.show_content__presentation_start = false; -export let show__launcher_link: boolean = true; +export let show__launcher_link: boolean = false; +export let show__launcher_link_legacy: boolean = true; export let lq__event_obj: any; @@ -283,8 +284,20 @@ $: if ($lq__event_location_obj) { </Element_ae_crud> {/if} - - + <!-- BEGIN: Legacy link --> + {#if show__launcher_link_legacy} + <a + data-sveltekit-preload-data="false" + href="/event/{$lq__event_location_obj?.event_id_random}/launcher/{$lq__event_location_obj?.event_location_id_random}" + class="btn btn-sm variant-glass-secondary hover:variant-filled-secondary" + title="Launcher: {$lq__event_location_obj?.name} {$lq__event_location_obj?.event_location_id_random}" + > + <span class="fas fa-paper-plane m-1"></span> + {@html $lq__event_location_obj?.name ? $lq__event_location_obj?.name : ae_snip.html__not_set} + </a> + {/if} + <!-- END: Legacy link --> + {#if show__launcher_link} <a data-sveltekit-preload-data="false" @@ -292,8 +305,8 @@ $: if ($lq__event_location_obj) { class="btn btn-sm variant-glass-secondary hover:variant-filled-secondary" title="Launcher: {$lq__event_location_obj?.name} {$lq__event_location_obj?.event_location_id_random}" > - <span class="fas fa-paper-plane m-1"></span> - {@html $lq__event_location_obj?.name ? $lq__event_obj?.name : ae_snip.html__not_set} + <span class="fas fa-plane m-1"></span> + <!-- {@html $lq__event_location_obj?.name ? $lq__event_location_obj?.name : ae_snip.html__not_set} --> </a> {/if} </li> diff --git a/src/routes/events_pres_mgmt/session_view.svelte b/src/routes/events_pres_mgmt/session_view.svelte index a738d6b5..8beebc0c 100644 --- a/src/routes/events_pres_mgmt/session_view.svelte +++ b/src/routes/events_pres_mgmt/session_view.svelte @@ -275,14 +275,29 @@ $: if ($lq__event_session_obj) { <li> <strong class="text-sm">Location/Room:</strong> <!-- Minimum level access to see the link here is trusted. Administrators can see even if the show launcher link is disabled. --> - {#if $ae_loc.administrator_access || $ae_loc.trusted_access && $lq__event_obj?.mod_pres_mgmt_json?.show__launcher_link} + + <!-- BEGIN: Legacy link --> + {#if $ae_loc.administrator_access || $ae_loc.authenticated_access && $events_loc.pres_mgmt.show__launcher_link_legacy} <a - href="/events_pres_mgmt/launcher/{$lq__event_session_obj.event_id_random}" + data-sveltekit-preload-data="false" + href="/event/{$lq__event_session_obj?.event_id_random}/launcher/{$lq__event_session_obj?.event_location_id_random}" class="text-blue-500 hover:text-blue-800 hover:underline" title="Launcher: {$lq__event_session_obj?.event_location_name} {$lq__event_session_obj?.event_location_id_random}" > <span class="fas fa-paper-plane"></span> - {@html $lq__event_session_obj.event_location_name ? $lq__event_session_obj.event_location_name : ae_snip.html__not_set} + {@html $lq__event_session_obj?.event_location_name ? $lq__event_session_obj?.event_location_name : ae_snip.html__not_set} + </a> + {/if} + <!-- END: Legacy link --> + + {#if $ae_loc.manager_access || $ae_loc.administrator_access && $events_loc.pres_mgmt.show__launcher_link} + <a + href="/events_pres_mgmt/launcher/{$lq__event_session_obj?.event_id_random}" + class="text-blue-500 hover:text-blue-800 hover:underline" + title="Launcher: {$lq__event_session_obj?.event_location_name} {$lq__event_session_obj?.event_location_id_random}" + > + <span class="fas fa-plane"></span> + <!-- {@html $lq__event_session_obj.event_location_name ? $lq__event_session_obj.event_location_name : ae_snip.html__not_set} --> </a> {:else} {@html $lq__event_session_obj.event_location_name ? $lq__event_session_obj.event_location_name : ae_snip.html__not_set}