From 2ac495af8e007066b82ae5d19395f2dcb682973f Mon Sep 17 00:00:00 2001
From: Scott Idem <stidem@gmail.com>
Date: Mon, 7 Oct 2024 14:47:26 -0400
Subject: [PATCH] Cleaned up the show/hide location and launcher links.

---
 src/lib/ae_events_stores.ts                      |  4 ++--
 src/routes/events/[event_id]/+page.svelte        |  6 +++---
 .../location/[event_location_id]/+page.svelte    | 10 +++++-----
 .../location/location_page_menu.svelte           | 12 +++++++-----
 src/routes/events/event_page_menu.svelte         | 16 +++++++++-------
 .../ae_comp__event_session_obj_li.svelte         |  2 +-
 .../events_pres_mgmt/event/[slug]/+page.svelte   |  2 +-
 .../events_pres_mgmt/event_page_menu.svelte      | 16 +++++++++-------
 8 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/src/lib/ae_events_stores.ts b/src/lib/ae_events_stores.ts
index 01ae105c..6f51d108 100644
--- a/src/lib/ae_events_stores.ts
+++ b/src/lib/ae_events_stores.ts
@@ -218,8 +218,8 @@ let events_local_data_struct: key_val = {
 
         // show_content__agree_text: false,
         show_content__event_view: null,
-        show_content__launcher_link: false,
-        show_content__location_link: false,
+        show__launcher_link: false,
+        show__location_link: false,
         show_content__location_qr: false,
         show_content__presentation_description: false, // Note that this is for *all* presentations in the user interface. It is a global setting.
         show_content__presenter_page_help: true,
diff --git a/src/routes/events/[event_id]/+page.svelte b/src/routes/events/[event_id]/+page.svelte
index 987372b3..593d0e04 100644
--- a/src/routes/events/[event_id]/+page.svelte
+++ b/src/routes/events/[event_id]/+page.svelte
@@ -476,9 +476,9 @@ count ids: {event_session_id_random_li?.length ?? 'nothing???'}??? -->
     lq__event_session_obj_li={lq__event_session_obj_li}
     hide__session_location={$events_loc.pres_mgmt.hide__session_location}
     hide__session_poc={$events_loc.pres_mgmt.hide__session_poc || $events_loc.pres_mgmt.hide__session_li_poc_field}
-    show__launcher_link={($ae_loc.manager_access || $ae_loc.administrator_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}
+    show__launcher_link={$ae_loc.administrator_access && $events_loc.pres_mgmt.show__launcher_link}
+    show__launcher_link_legacy={$ae_loc.trusted_access && $events_loc.pres_mgmt.show__launcher_link_legacy}
+    show__location_link={$events_loc.pres_mgmt.show__location_link}
     log_lvl={log_lvl}
     />
 <!-- </div> -->
diff --git a/src/routes/events/[event_id]/location/[event_location_id]/+page.svelte b/src/routes/events/[event_id]/location/[event_location_id]/+page.svelte
index 07d1d091..8091fa07 100644
--- a/src/routes/events/[event_id]/location/[event_location_id]/+page.svelte
+++ b/src/routes/events/[event_id]/location/[event_location_id]/+page.svelte
@@ -164,8 +164,8 @@ 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}
+        show__launcher_link={$events_loc.pres_mgmt.show__launcher_link}
+        show__launcher_link_legacy={$events_loc.pres_mgmt.show__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}
@@ -182,9 +182,9 @@ onMount(() => {
                 hide__session_location={true}
                 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={$ae_loc.administrator_access && $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}
+                show__launcher_link={$ae_loc.administrator_access && $events_loc.pres_mgmt.show__launcher_link}
+                show__launcher_link_legacy={$events_loc.pres_mgmt.show__launcher_link_legacy}
+                show__location_link={$events_loc.pres_mgmt.show__location_link}
                 log_lvl={log_lvl}
                 >
             </Comp_event_session_obj_li>
diff --git a/src/routes/events/[event_id]/location/location_page_menu.svelte b/src/routes/events/[event_id]/location/location_page_menu.svelte
index bad320fb..03c90f06 100644
--- a/src/routes/events/[event_id]/location/location_page_menu.svelte
+++ b/src/routes/events/[event_id]/location/location_page_menu.svelte
@@ -332,12 +332,13 @@ let ae_triggers: key_val = {};
             {/if} -->
 
             <!-- Button to toggle between showing and not showing the launcher and location links -->
-            {#if $events_loc.pres_mgmt.show_content__launcher_link || $events_loc.pres_mgmt.show_content__location_link}
+            {#if $events_loc.pres_mgmt.show__launcher_link || $events_loc.pres_mgmt.show__location_link}
                 <button
                     disabled={!$ae_loc.administrator_access}
                     on:click={() => {
-                        $events_loc.pres_mgmt.show_content__launcher_link = false;
-                        $events_loc.pres_mgmt.show_content__location_link = false;
+                        $events_loc.pres_mgmt.show__launcher_link = false;
+                        $events_loc.pres_mgmt.show__launcher_link_legacy = false;
+                        $events_loc.pres_mgmt.show__location_link = false;
                     }}
                     class="btn btn-sm variant-ghost-success"
                     >
@@ -348,8 +349,9 @@ let ae_triggers: key_val = {};
                 <button
                     disabled={!$ae_loc.administrator_access}
                     on:click={() => {
-                        $events_loc.pres_mgmt.show_content__launcher_link = true;
-                        $events_loc.pres_mgmt.show_content__location_link = true;
+                        $events_loc.pres_mgmt.show__launcher_link = true;
+                        $events_loc.pres_mgmt.show__launcher_link_legacy = true;
+                        $events_loc.pres_mgmt.show__location_link = true;
                     }}
                     class="btn btn-sm variant-ringed-warning"
                     >
diff --git a/src/routes/events/event_page_menu.svelte b/src/routes/events/event_page_menu.svelte
index ed75e73d..0a88c120 100644
--- a/src/routes/events/event_page_menu.svelte
+++ b/src/routes/events/event_page_menu.svelte
@@ -291,12 +291,13 @@ let ae_triggers: key_val = {};
         <div class="flex flex-col gap-1 items-center">
 
             <!-- Button to toggle between showing and not showing the launcher and location links -->
-            {#if $events_loc.pres_mgmt.show_content__launcher_link || $events_loc.pres_mgmt.show_content__location_link}
+            {#if $events_loc.pres_mgmt.show__launcher_link || $events_loc.pres_mgmt.show__location_link}
                 <button
-                    disabled={!$ae_loc.administrator_access}
+                    disabled={!$ae_loc.trusted_access}
                     on:click={() => {
-                        $events_loc.pres_mgmt.show_content__launcher_link = false;
-                        $events_loc.pres_mgmt.show_content__location_link = false;
+                        $events_loc.pres_mgmt.show__launcher_link = false;
+                        $events_loc.pres_mgmt.show__launcher_link_legacy = false;
+                        $events_loc.pres_mgmt.show__location_link = false;
                     }}
                     class="btn btn-sm variant-ghost-success"
                     >
@@ -305,10 +306,11 @@ let ae_triggers: key_val = {};
                 </button>
             {:else}
                 <button
-                    disabled={!$ae_loc.administrator_access}
+                    disabled={!$ae_loc.trusted_access}
                     on:click={() => {
-                        $events_loc.pres_mgmt.show_content__launcher_link = true;
-                        $events_loc.pres_mgmt.show_content__location_link = true;
+                        $events_loc.pres_mgmt.show__launcher_link = true;
+                        $events_loc.pres_mgmt.show__launcher_link_legacy = true;
+                        $events_loc.pres_mgmt.show__location_link = true;
                     }}
                     class="btn btn-sm variant-ringed-warning"
                     >
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 54417b87..79845020 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
@@ -209,7 +209,7 @@ let ae_triggers: key_val = {};
 
         {#if show__launcher_link}
             <a
-                href="/events_pres_mgmt/launcher/{session_obj?.event_id_random}?location_id={session_obj?.event_location_id_random}"
+                href="/events/{session_obj?.event_id_random}/launcher/{session_obj?.event_location_id_random}"
                 class="btn btn-sm variant-glass-surface hover:variant-filled-secondary text-xs lg:text-sm"
                 title="Launcher: {session_obj?.event_location_name} {session_obj?.event_location_id_random}"
                 >
diff --git a/src/routes/events_pres_mgmt/event/[slug]/+page.svelte b/src/routes/events_pres_mgmt/event/[slug]/+page.svelte
index b5ba156f..ad72ae92 100644
--- a/src/routes/events_pres_mgmt/event/[slug]/+page.svelte
+++ b/src/routes/events_pres_mgmt/event/[slug]/+page.svelte
@@ -565,7 +565,7 @@ count ids: {event_session_id_random_li?.length ?? 'nothing???'}??? -->
     hide__session_poc={$events_loc.pres_mgmt.hide__session_poc || $events_loc.pres_mgmt.hide__session_li_poc_field}
     show__launcher_link={$ae_loc.manager_access || $ae_loc.administrator_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}
+    show__location_link={$events_loc.pres_mgmt.show__location_link}
     log_lvl={log_lvl}
     />
 <!-- </div> -->
diff --git a/src/routes/events_pres_mgmt/event_page_menu.svelte b/src/routes/events_pres_mgmt/event_page_menu.svelte
index 88e7f82f..a0766feb 100644
--- a/src/routes/events_pres_mgmt/event_page_menu.svelte
+++ b/src/routes/events_pres_mgmt/event_page_menu.svelte
@@ -290,12 +290,13 @@ let ae_triggers: key_val = {};
         <div class="flex flex-col gap-1 items-center">
 
             <!-- Button to toggle between showing and not showing the launcher and location links -->
-            {#if $events_loc.pres_mgmt.show_content__launcher_link || $events_loc.pres_mgmt.show_content__location_link}
+            {#if $events_loc.pres_mgmt.show__launcher_link || $events_loc.pres_mgmt.show__location_link}
                 <button
-                    disabled={!$ae_loc.administrator_access}
+                    disabled={!$ae_loc.trusted_access}
                     on:click={() => {
-                        $events_loc.pres_mgmt.show_content__launcher_link = false;
-                        $events_loc.pres_mgmt.show_content__location_link = false;
+                        $events_loc.pres_mgmt.show__launcher_link = false;
+                        $events_loc.pres_mgmt.show__launcher_link_legacy = false;
+                        $events_loc.pres_mgmt.show__location_link = false;
                     }}
                     class="btn btn-sm variant-ghost-success"
                     >
@@ -304,10 +305,11 @@ let ae_triggers: key_val = {};
                 </button>
             {:else}
                 <button
-                    disabled={!$ae_loc.administrator_access}
+                    disabled={!$ae_loc.trusted_access}
                     on:click={() => {
-                        $events_loc.pres_mgmt.show_content__launcher_link = true;
-                        $events_loc.pres_mgmt.show_content__location_link = true;
+                        $events_loc.pres_mgmt.show__launcher_link = true;
+                        $events_loc.pres_mgmt.show__launcher_link_legacy = true;
+                        $events_loc.pres_mgmt.show__location_link = true;
                     }}
                     class="btn btn-sm variant-ringed-warning"
                     >