From 7c3ce36812d6b1f569f435e1d7dc97703bae6e97 Mon Sep 17 00:00:00 2001
From: Aditya Hegde <adityahegderocks@gmail.com>
Date: Thu, 12 Dec 2024 12:02:17 +0530
Subject: [PATCH] Fix race condition on cloud

---
 .../[project]/explore/[dashboard]/+page.svelte         | 10 +++++++++-
 .../state-managers/StateManagersProvider.svelte        |  2 +-
 .../dashboards/url-state/DashboardURLStateSync.svelte  | 10 ++++++++++
 web-common/src/features/explores/selectors.ts          |  1 -
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/web-admin/src/routes/[organization]/[project]/explore/[dashboard]/+page.svelte b/web-admin/src/routes/[organization]/[project]/explore/[dashboard]/+page.svelte
index 678a13371d4..eeb481aeda2 100644
--- a/web-admin/src/routes/[organization]/[project]/explore/[dashboard]/+page.svelte
+++ b/web-admin/src/routes/[organization]/[project]/explore/[dashboard]/+page.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { onNavigate } from "$app/navigation";
+  import { afterNavigate, onNavigate } from "$app/navigation";
   import { page } from "$app/stores";
   import DashboardBuilding from "@rilldata/web-admin/features/dashboards/DashboardBuilding.svelte";
   import DashboardErrored from "@rilldata/web-admin/features/dashboards/DashboardErrored.svelte";
@@ -12,6 +12,7 @@
   import { useExplore } from "@rilldata/web-common/features/explores/selectors";
   import { eventBus } from "@rilldata/web-common/lib/event-bus/event-bus";
   import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import type { AfterNavigate } from "@sveltejs/kit";
   import type { PageData } from "./$types";
 
   const PollIntervalWhenDashboardFirstReconciling = 1000;
@@ -82,6 +83,12 @@
     });
   }
 
+  let previousNavigationType: AfterNavigate["type"];
+  afterNavigate(({ from, type }) => {
+    if (from !== null && !from.url) return;
+    previousNavigationType = type;
+  });
+
   onNavigate(() => {
     // Temporary: clear the mocked user when navigating away.
     // In the future, we should be able to handle the mocked user on all project pages.
@@ -110,6 +117,7 @@
           {exploreStateFromYAMLConfig}
           {partialExploreStateFromUrl}
           {exploreStateFromSessionStorage}
+          {previousNavigationType}
         >
           <DashboardThemeProvider>
             <Dashboard {metricsViewName} {exploreName} />
diff --git a/web-common/src/features/dashboards/state-managers/StateManagersProvider.svelte b/web-common/src/features/dashboards/state-managers/StateManagersProvider.svelte
index 52be5778f78..36f128234b9 100644
--- a/web-common/src/features/dashboards/state-managers/StateManagersProvider.svelte
+++ b/web-common/src/features/dashboards/state-managers/StateManagersProvider.svelte
@@ -17,7 +17,7 @@
     metricsViewName,
     exploreName,
     extraKeyPrefix:
-      orgName && projectName ? `__${orgName}__${projectName}` : "",
+      orgName && projectName ? `${orgName}__${projectName}__` : "",
   });
   setContext(DEFAULT_STORE_KEY, stateManagers);
 
diff --git a/web-common/src/features/dashboards/url-state/DashboardURLStateSync.svelte b/web-common/src/features/dashboards/url-state/DashboardURLStateSync.svelte
index ae828a51cb2..cd543523e12 100644
--- a/web-common/src/features/dashboards/url-state/DashboardURLStateSync.svelte
+++ b/web-common/src/features/dashboards/url-state/DashboardURLStateSync.svelte
@@ -13,6 +13,8 @@
   } from "@rilldata/web-common/runtime-client";
   import type { HTTPError } from "@rilldata/web-common/runtime-client/fetchWrapper";
   import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
+  import type { AfterNavigate } from "@sveltejs/kit";
+  import { onMount } from "svelte";
 
   export let metricsViewName: string;
   export let exploreName: string;
@@ -24,6 +26,7 @@
   export let exploreStateFromSessionStorage:
     | Partial<MetricsExplorerEntity>
     | undefined;
+  export let previousNavigationType: AfterNavigate["type"];
 
   const { dashboardStore, validSpecStore, timeRangeSummaryStore } =
     getStateManagers();
@@ -127,6 +130,13 @@
   $: if ($dashboardStore) {
     gotoNewState();
   }
+
+  onMount(() => {
+    // safeguard to make sure we initialize the explore state in case afterNavigate is missed
+    if (!$dashboardStore) {
+      handleExploreInit(previousNavigationType === "enter");
+    }
+  });
 </script>
 
 {#if schemaError}
diff --git a/web-common/src/features/explores/selectors.ts b/web-common/src/features/explores/selectors.ts
index 850bec56dda..67fdd1cf5b6 100644
--- a/web-common/src/features/explores/selectors.ts
+++ b/web-common/src/features/explores/selectors.ts
@@ -22,7 +22,6 @@ import {
 } from "@rilldata/web-common/runtime-client";
 import type { ErrorType } from "@rilldata/web-common/runtime-client/http-client";
 import { error } from "@sveltejs/kit";
-import type { Part } from "@sveltejs/kit/src/core/sync/create_manifest_data/types";
 
 export function useExplore(
   instanceId: string,