reorg

Author: briangregoryholmes

web-common/src/features/dashboards/state-managers/loaders/DashboardStateDataLoader.ts

@@ -326,12 +326,11 @@ export class DashboardStateDataLoader {
 
     // Check in-memory last visited state
     let mostRecentPartialExploreState: Partial<ExploreState> | undefined;
-    const lastVisitedJson = getLastVisitedState(this.exploreName);
-    if (lastVisitedJson) {
+    const lastVisited = getLastVisitedState(this.exploreName);
+    if (lastVisited) {
       try {
-        const parsed = JSON.parse(lastVisitedJson) as Partial<ExploreState>;
-        validateAndCleanExploreState(metricsViewSpec, exploreSpec, parsed);
-        mostRecentPartialExploreState = parsed;
+        validateAndCleanExploreState(metricsViewSpec, exploreSpec, lastVisited);
+        mostRecentPartialExploreState = lastVisited;
       } catch {
         // Invalid state, ignore
       }

web-common/src/features/dashboards/state-managers/loaders/DashboardStateManager.spec.ts

@@ -206,20 +206,17 @@ describe("DashboardStateManager", () => {
     });
 
     it("Should load most recent dashboard state", async () => {
-      setLastVisitedStateRaw(
-        AD_BIDS_EXPLORE_NAME,
-        JSON.stringify({
-          visibleMeasures: [AD_BIDS_BID_PRICE_MEASURE],
-          allMeasuresVisible: false,
-          visibleDimensions: [AD_BIDS_DOMAIN_DIMENSION],
-          allDimensionsVisible: false,
-
-          leaderboardSortByMeasureName: AD_BIDS_BID_PRICE_MEASURE,
-          leaderboardMeasureNames: [AD_BIDS_BID_PRICE_MEASURE],
-          sortDirection: DashboardState_LeaderboardSortDirection.ASCENDING,
-          dashboardSortType: DashboardState_LeaderboardSortType.VALUE,
-        }),
-      );
+      setLastVisitedStateRaw(AD_BIDS_EXPLORE_NAME, {
+        visibleMeasures: [AD_BIDS_BID_PRICE_MEASURE],
+        allMeasuresVisible: false,
+        visibleDimensions: [AD_BIDS_DOMAIN_DIMENSION],
+        allDimensionsVisible: false,
+
+        leaderboardSortByMeasureName: AD_BIDS_BID_PRICE_MEASURE,
+        leaderboardMeasureNames: [AD_BIDS_BID_PRICE_MEASURE],
+        sortDirection: DashboardState_LeaderboardSortDirection.ASCENDING,
+        dashboardSortType: DashboardState_LeaderboardSortType.VALUE,
+      });
       renderDashboardStateManager(BookmarkSourceQueryResult);
       await waitFor(() => expect(screen.getByText("Dashboard loaded!")));
 
@@ -319,20 +316,17 @@ describe("DashboardStateManager", () => {
     });
 
     it("Should load most recent dashboard state", async () => {
-      setLastVisitedStateRaw(
-        AD_BIDS_EXPLORE_NAME,
-        JSON.stringify({
-          visibleMeasures: [AD_BIDS_BID_PRICE_MEASURE],
-          allMeasuresVisible: false,
-          visibleDimensions: [AD_BIDS_DOMAIN_DIMENSION],
-          allDimensionsVisible: false,
-
-          leaderboardSortByMeasureName: AD_BIDS_BID_PRICE_MEASURE,
-          leaderboardMeasureNames: [AD_BIDS_BID_PRICE_MEASURE],
-          sortDirection: DashboardState_LeaderboardSortDirection.ASCENDING,
-          dashboardSortType: DashboardState_LeaderboardSortType.VALUE,
-        }),
-      );
+      setLastVisitedStateRaw(AD_BIDS_EXPLORE_NAME, {
+        visibleMeasures: [AD_BIDS_BID_PRICE_MEASURE],
+        allMeasuresVisible: false,
+        visibleDimensions: [AD_BIDS_DOMAIN_DIMENSION],
+        allDimensionsVisible: false,
+
+        leaderboardSortByMeasureName: AD_BIDS_BID_PRICE_MEASURE,
+        leaderboardMeasureNames: [AD_BIDS_BID_PRICE_MEASURE],
+        sortDirection: DashboardState_LeaderboardSortDirection.ASCENDING,
+        dashboardSortType: DashboardState_LeaderboardSortType.VALUE,
+      });
       renderDashboardStateManager();
       await waitFor(() => expect(screen.getByText("Dashboard loaded!")));
 
@@ -362,20 +356,17 @@ describe("DashboardStateManager", () => {
     });
 
     it("Should validate most recent dashboard state and correct invalid fields", async () => {
-      setLastVisitedStateRaw(
-        AD_BIDS_EXPLORE_NAME,
-        JSON.stringify({
-          visibleMeasures: [AD_BIDS_PUBLISHER_COUNT_MEASURE],
-          allMeasuresVisible: false,
-          visibleDimensions: [AD_BIDS_COUNTRY_DIMENSION],
-          allDimensionsVisible: false,
-
-          leaderboardSortByMeasureName: AD_BIDS_PUBLISHER_COUNT_MEASURE,
-          leaderboardMeasureNames: [AD_BIDS_PUBLISHER_COUNT_MEASURE],
-          sortDirection: DashboardState_LeaderboardSortDirection.ASCENDING,
-          dashboardSortType: DashboardState_LeaderboardSortType.VALUE,
-        }),
-      );
+      setLastVisitedStateRaw(AD_BIDS_EXPLORE_NAME, {
+        visibleMeasures: [AD_BIDS_PUBLISHER_COUNT_MEASURE],
+        allMeasuresVisible: false,
+        visibleDimensions: [AD_BIDS_COUNTRY_DIMENSION],
+        allDimensionsVisible: false,
+
+        leaderboardSortByMeasureName: AD_BIDS_PUBLISHER_COUNT_MEASURE,
+        leaderboardMeasureNames: [AD_BIDS_PUBLISHER_COUNT_MEASURE],
+        sortDirection: DashboardState_LeaderboardSortDirection.ASCENDING,
+        dashboardSortType: DashboardState_LeaderboardSortType.VALUE,
+      });
       renderDashboardStateManager();
       await waitFor(() => expect(screen.getByText("Dashboard loaded!")));
 

web-common/src/features/dashboards/state-managers/loaders/last-visited-state.ts

@@ -2,27 +2,25 @@ import { DashboardState_ActivePage } from "@rilldata/web-common/proto/gen/rill/u
 import type { ExploreState } from "@rilldata/web-common/features/dashboards/stores/explore-state";
 
 /**
- * In-memory map: exploreName → partial ExploreState (JSON string).
+ * In-memory map: exploreName → partial ExploreState snapshot.
  *
  * Replaces localStorage-based persistence for "most recent explore state."
  * Within the same browser session, navigating away from and back to an explore
  * will restore the last-visited state from this map.
  * On page refresh, the in-memory state is lost and YAML defaults apply.
- *
- * Only a curated subset of JSON-safe fields is saved — specifically sort/visibility
- * preferences. Filters, time ranges, and other stateful fields are NOT saved here;
- * they come from URL params, session storage, or YAML defaults.
  */
-const lastVisitedState = new Map<string, string>();
+const lastVisitedState = new Map<string, Partial<ExploreState>>();
 
-export function getLastVisitedState(exploreName: string): string | undefined {
+export function getLastVisitedState(
+  exploreName: string,
+): Partial<ExploreState> | undefined {
   return lastVisitedState.get(exploreName);
 }
 
 /**
- * Saves a curated subset of the explore state to in-memory storage.
- * Only saves sort/visibility preferences (all JSON-safe primitives).
- * Does NOT save filters, time ranges, or other complex objects (Set, Map, etc.).
+ * Saves a snapshot of the explore state to in-memory storage.
+ * Copies the fields we care about so that later mutations to the live
+ * ExploreState don't affect the stored snapshot.
  */
 export function setLastVisitedState(
   exploreName: string,
@@ -32,34 +30,54 @@ export function setLastVisitedState(
     exploreState.activePage !== DashboardState_ActivePage.DEFAULT &&
     exploreState.activePage !== DashboardState_ActivePage.DIMENSION_TABLE
   ) {
-    // We are not saving any state for non-explore pages
     return;
   }
 
   const subset: Partial<ExploreState> = {
+    // Filters
+    whereFilter: exploreState.whereFilter,
+    dimensionThresholdFilters: exploreState.dimensionThresholdFilters,
+    dimensionsWithInlistFilter: exploreState.dimensionsWithInlistFilter,
+    pinnedFilters: new Set(exploreState.pinnedFilters),
+    dimensionFilterExcludeMode: new Map(
+      exploreState.dimensionFilterExcludeMode,
+    ),
+
+    // Time
+    selectedTimeRange: exploreState.selectedTimeRange,
+    selectedComparisonTimeRange: exploreState.selectedComparisonTimeRange,
+    showTimeComparison: exploreState.showTimeComparison,
+    selectedComparisonDimension: exploreState.selectedComparisonDimension,
     selectedTimezone: exploreState.selectedTimezone,
 
+    // Sort / visibility
     visibleMeasures: exploreState.visibleMeasures,
     allMeasuresVisible: exploreState.allMeasuresVisible,
     visibleDimensions: exploreState.visibleDimensions,
     allDimensionsVisible: exploreState.allDimensionsVisible,
-
     leaderboardSortByMeasureName: exploreState.leaderboardSortByMeasureName,
     leaderboardMeasureNames: exploreState.leaderboardMeasureNames,
     leaderboardShowContextForAllMeasures:
       exploreState.leaderboardShowContextForAllMeasures,
     sortDirection: exploreState.sortDirection,
     dashboardSortType: exploreState.dashboardSortType,
+
+    // View
+    activePage: exploreState.activePage,
+    selectedDimensionName: exploreState.selectedDimensionName,
   };
 
-  lastVisitedState.set(exploreName, JSON.stringify(subset));
+  lastVisitedState.set(exploreName, subset);
 }
 
 export function clearLastVisitedState(exploreName: string) {
   lastVisitedState.delete(exploreName);
 }
 
-/** For testing only: directly set the raw JSON string in the map */
-export function setLastVisitedStateRaw(exploreName: string, rawJson: string) {
-  lastVisitedState.set(exploreName, rawJson);
+/** For testing only: directly set a partial explore state in the map */
+export function setLastVisitedStateRaw(
+  exploreName: string,
+  state: Partial<ExploreState>,
+) {
+  lastVisitedState.set(exploreName, state);
 }