Don't use readable, change names

Author: JamesPeck

src/lib/AccessState.ts

@@ -0,0 +1,16 @@
+import { page } from '$app/state';
+import { features } from '$lib/configuration';
+import { isUserLoggedIn } from '$lib/stores/User';
+import { browser } from '$app/environment';
+
+export function useAuth(): boolean {
+  return !features.login.open || isUserLoggedIn();
+}
+
+export function isOpenAccess(): boolean {
+  return (browser && page.url.pathname.includes('/discover')) || !isUserLoggedIn();
+}
+
+export function isAuthorizedAccess(): boolean {
+  return isUserLoggedIn() && !features.explorer.open;
+}

src/lib/components/explorer/Visualizations.svelte

@@ -13,14 +13,14 @@
   import Loading from '$lib/components/Loading.svelte';
   import { Picsure } from '$lib/paths';
   import { resources } from '$lib/stores/Resources';
-  import { useAuth } from '$lib/stores/AccessState';
+  import { useAuth } from '$lib/AccessState';
 
   let plotValues: PlotValues[] = $state([]);
   let newPlot: PlotlyNewPlot = $state() as PlotlyNewPlot;
   let loading = $state(true);
 
   async function loadPlotData() {
-    const query = getQueryRequest($useAuth, $resources.visualization);
+    const query = getQueryRequest(useAuth(), $resources.visualization);
     const token = localStorage.getItem('token');
 
     await api

src/lib/components/explorer/cell/Actions.svelte

@@ -5,7 +5,7 @@
   import ExportStore from '$lib/stores/Export';
   import { panelOpen } from '$lib/stores/SidePanel';
   import { features } from '$lib/configuration';
-  import { authorizedUsersOnly } from '$lib/stores/AccessState';
+  import { isAuthorizedAccess, isOpenAccess } from '$lib/AccessState';
   import { genericUUID } from '$lib/utilities/UUID';
 
   let { exports, addExport, removeExport } = ExportStore;
@@ -45,7 +45,7 @@
   let isExported = $derived(
     $exports.map((exp) => exp.conceptPath).includes(exportItem.conceptPath),
   );
-  let shouldDisableFilter = $derived(!$authorizedUsersOnly && !data.row.allowFiltering);
+  let shouldDisableFilter = $derived(!isAuthorizedAccess() && !data.row.allowFiltering);
 </script>
 
 <button type="button" title="Information" class="btn-icon-color" onclick={insertInfoContent}>
@@ -75,7 +75,7 @@
     <span class="sr-only">View Data Hierarchy</span>
   </button>
 {/if}
-{#if features.explorer.exportsEnableExport && $authorizedUsersOnly}
+{#if features.explorer.exportsEnableExport && !isOpenAccess()}
   <button
     type="button"
     title={isExported ? 'Remove from Analysis' : 'Add for Analysis'}

src/lib/components/explorer/results/ResultsPanel.svelte

@@ -12,7 +12,7 @@
   import { filters, hasGenomicFilter, clearFilters } from '$lib/stores/Filter';
   import { loadPatientCount, hasNonZeroResult } from '$lib/stores/ResultStore';
   import { exports, clearExports } from '$lib/stores/Export';
-  import { openUsersOnly, authorizedUsersOnly, useAuth } from '$lib/stores/AccessState';
+  import { useAuth } from '$lib/AccessState';
 
   import FilterComponent from '$lib/components/explorer/results/AddedFilter.svelte';
   import ExportedVariable from '$lib/components/explorer/results/ExportedVariable.svelte';
@@ -44,11 +44,12 @@
   );
 
   let showExplorerDistributions = $derived(
-    $authorizedUsersOnly && features.explorer.distributionExplorer && hasValidDistributionFilters,
+    !isDiscoverPage && features.explorer.distributionExplorer && hasValidDistributionFilters,
   );
 
   let showDiscoverDistributions = $derived(
-    $openUsersOnly &&
+    isDiscoverPage &&
+      features.discover &&
       features.discoverFeautures.distributionExplorer &&
       hasValidDistributionFilters,
   );
@@ -67,7 +68,7 @@
 
   function subscribe() {
     if (!unsubFilters) {
-      unsubFilters = filters.subscribe(() => loadPatientCount($useAuth));
+      unsubFilters = filters.subscribe(() => loadPatientCount(useAuth()));
     }
   }