fix state change

sandwichfarm · Feb 10, 2025 · 9b0a1af · 9b0a1af
1 parent a424104
commit 9b0a1af
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 26 deletions.
diff --git a/apps/gui/src/lib/components/data-view/DataViewRoot.svelte b/apps/gui/src/lib/components/data-view/DataViewRoot.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { isBootstrapping } from "$stores/app";
+    import { isBootstrapping, isSeeded } from "$stores/app";
     import { onMount } from 'svelte';
     import { get, writable, derived, type Writable, type Readable, readable } from 'svelte/store';
     import * as Resizable from '$lib/components/ui/resizable';
@@ -110,6 +110,8 @@
     $: activeFilters = Object.keys($filters || {}).length
 
     export let activeView: Writable<'table' | 'grid' | 'map'>;
+
+    let loading = false 
 </script>
 
 <DataViewSelector {enabledViews} bind:activeView />
@@ -129,7 +131,7 @@
             {#if $activeView === 'map'} 
                 <MapRoot data={justData} {filters} />
             {/if}
-        {:else if $isBootstrapping}
+        {:else if $isBootstrapping && !$isSeeded}
             <div class="flex items-center justify-center h-full">
                 <span class="text-7xl">bootstrapping</span>
                 <span class="text-xl">the application is still bootstrapping, please wait while seed data is populated.</span>

diff --git a/apps/gui/src/lib/components/shortcuts/RelayDataViewShortcut.svelte b/apps/gui/src/lib/components/shortcuts/RelayDataViewShortcut.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+    import { page } from "$app/stores";
 	import { goto } from "$app/navigation";
 	import Page from "$routes/+page.svelte";
 	import Badge from "$ui/badge/badge.svelte";
@@ -185,8 +186,18 @@
     }
     
     onMount( () => {
-
+        if(!window.location.hash && $page.url.pathname === "/relays"){
+            setActive(shortcuts[0]);
+        }
     })
+
+    const setActive = (shortcut: any) => {
+        active.set(shortcut.title)
+        if(shortcut?.payload){
+            shortcut.hash = btoa(JSON.stringify(compress(shortcut.payload)))
+        }
+        onClick(`/relays#${shortcut.hash}`)
+    }
 </script>
 <div class="leading-9 {className}">
 {#if label}
@@ -198,13 +209,7 @@
     <Button 
         size="small" 
         variant={buttonVariant} 
-        on:click={() => {
-            active.set(shortcut.title)
-            if(shortcut?.payload){
-                shortcut.hash = btoa(JSON.stringify(compress(shortcut.payload)))
-            }
-            onClick(`/relays#${shortcut.hash}`)
-        }}
+        on:click={() => setActive(shortcut)}
         class="{buttonClass} {$active === shortcut.title? buttonActiveClass: ''}"
         >
         {shortcut.title}

diff --git a/apps/gui/src/lib/managers/DataRegister.ts b/apps/gui/src/lib/managers/DataRegister.ts
@@ -18,6 +18,7 @@ export type DataRegisterComposite = {
     key: string;
     priority: number;
     keys: string[];
+    fn?: DataRegisterFn;
     condition?: DataRegisterCondition;
     onComplete?: DataRegisterFn;
     ignoreConditions?: Record<string, boolean>;
@@ -241,19 +242,17 @@ export class DataRegister {
     }
 
     private async executeComposite(args: DataRegisterCompositeExecutorArguments = { key: '', params: {} }) {
-        // console.log('executeComposite', args)
         const { key: compositeKey, ignoreCondition: compositeIgnoreCondition, params:paramsMap } = args;
         const shouldRun = await this.testCondition(compositeKey, compositeIgnoreCondition, true);
-        if (!shouldRun) {
-            //console.log('executeComposite', 'condition failed', compositeKey)
-            return;
-        }
+        if (!shouldRun) return;
         const composite = this._composite.get(compositeKey)!;
-        // composite.keys.forEach( (childKey) => this._busy.set(childKey, true) );    
-        //
+        const { fn } = composite;
+        if(fn && typeof fn === 'function') {
+            const params: any[] = this.extractParams(compositeKey, paramsMap);
+            await fn(params)
+        }
         const results = new Map()
         for (const childKey of composite.keys) {
-            // console.log('executeComposite', 'childKey', childKey)
             if (this.busy(childKey)) continue;
             const params: any[] = this.extractParams(childKey, paramsMap);
             this.localStorageLoadTimestamp(childKey, params)

diff --git a/apps/gui/src/lib/stores/data-register.ts b/apps/gui/src/lib/stores/data-register.ts
@@ -171,10 +171,10 @@ export const dataRegisterInit = async () => {
             'validate:nip11s'
         ],
         priority: -10,
-        condition: async () => {
-            isBootstrapping.set(true)
-            return true;
-        },
+        // fn: async () => {
+        //     isBootstrapping.set(true)
+        //     return true;
+        // },
         onComplete: async () => {
             isBootstrapping.set(false)
             isBootstrapped.set(true)
@@ -195,7 +195,7 @@ export const dataRegisterInit = async () => {
         ],
         // condition: async () => !get(doBootstrap),
         priority: -10,
-        condition: async () => {
+        fn: async () => {
             isBootstrapping.set(true)
             return true;
         },

diff --git a/apps/gui/src/routes/+layout.svelte b/apps/gui/src/routes/+layout.svelte
@@ -243,7 +243,21 @@
   $: percentCompleted = percentModulesLoaded * 0.5 + (numMonitorsSynced*10) + (relayChecksSynced? 20: 0);
 
   let loadingThresholdPassed = false;
-  setTimeout(() => loadingThresholdPassed = true, 200 )
+  let loadingThresholdTimeout: ReturnType<typeof setTimeout>;
+
+  $: {
+    if($navigating?.to){
+      console.log('navigating to:', $navigating.to)
+      clearTimeout(loadingThresholdTimeout)
+      loadingThresholdPassed = false
+    }
+    if($navigating?.from){
+      console.log('navigating from:', $navigating.from)
+      loadingThresholdTimeout = setTimeout(() => loadingThresholdPassed = true, 1000 )
+    }
+  }
+  setTimeout(() => loadingThresholdPassed = true, 1000 )
+  
   $: loading = loadingThresholdPassed && (!isReady || !loadedEnough);
 </script>
 
@@ -254,15 +268,15 @@ loadedEnough: {loadedEnough} <br /> -->
 
 {#if $unsupported}
 <div class="flex flex-col items-center justify-center h-screen px-4">
-  <div class="text-7xl">Unsupported</div>
+  <div class="text-3xl">Unsupported</div>
   <div class="text-xs opacity-30">This version of nostr.watch does not support mobile devices.</div>
 </div>
 {:else}
   {#if loading && !hasBeenBootstrapped()}
   <BootstrapLoading {isReady} {monitorsSynced} {relayChecksSynced} {percentCompleted} />
   {:else if loading && hasBeenBootstrapped()}
     <div class="flex flex-col items-center justify-center h-screen px-4">
-      <div class="text-7xl">booting.</div>
+      <div class="text-7xl">loading.</div>
       <div class="text-xs opacity-30">[{$tabState}]</div>
     </div>
   {/if}