progress

Author: briangregoryholmes

runtime/parser/parse_explore.go

@@ -121,6 +121,15 @@ var exploreComparisonModes = map[string]runtimev1.ExploreComparisonMode{
 	"dimension": runtimev1.ExploreComparisonMode_EXPLORE_COMPARISON_MODE_DIMENSION,
 }
 
+var validRillComparisonOptions = map[string]bool{
+	"rill-PP": true, "rill-PD": true, "rill-PW": true,
+	"rill-PM": true, "rill-PQ": true, "rill-PY": true,
+}
+
+func isRillComparisonOption(s string) bool {
+	return validRillComparisonOptions[s]
+}
+
 func (p *Parser) parseExplore(node *Node) error {
 	// Parse YAML
 	tmp := &ExploreYAML{}
@@ -218,11 +227,17 @@ func (p *Parser) parseExplore(node *Node) error {
 		}
 
 		mode := runtimev1.ExploreComparisonMode_EXPLORE_COMPARISON_MODE_NONE
+		var compareTimeRange *string
 		if tmp.Defaults.ComparisonMode != "" {
 			var ok bool
 			mode, ok = exploreComparisonModes[tmp.Defaults.ComparisonMode]
 			if !ok {
-				return fmt.Errorf("invalid comparison mode %q (options: %s)", tmp.Defaults.ComparisonMode, strings.Join(maps.Keys(exploreComparisonModes), ", "))
+				if isRillComparisonOption(tmp.Defaults.ComparisonMode) {
+					mode = runtimev1.ExploreComparisonMode_EXPLORE_COMPARISON_MODE_TIME
+					compareTimeRange = &tmp.Defaults.ComparisonMode
+				} else {
+					return fmt.Errorf("invalid comparison mode %q (options: %s)", tmp.Defaults.ComparisonMode, strings.Join(maps.Keys(exploreComparisonModes), ", "))
+				}
 			}
 		}
 
@@ -277,6 +292,7 @@ func (p *Parser) parseExplore(node *Node) error {
 			MeasuresSelector:    presetMeasuresSelector,
 			TimeRange:           tr,
 			ComparisonMode:      mode,
+			CompareTimeRange:    compareTimeRange,
 			ComparisonDimension: compareDim,
 			Filter:              filter,
 			Pinned:              pinnedMeasuresOrDimensions,

runtime/parser/schema/project.schema.yaml

@@ -2302,12 +2302,18 @@ definitions:
                 description: Refers to the default time range shown when a user initially loads the dashboard. The value must be either a valid [ISO 8601 duration](https://en.wikipedia.org/wiki/ISO_8601#Durations) (for example, PT12H for 12 hours, P1M for 1 month, or P26W for 26 weeks) or one of the [Rill ISO 8601 extensions](https://docs.rilldata.com/reference/rill-iso-extensions#extensions)
                 type: string
               comparison_mode:
-                description: 'Controls how to compare current data with historical or categorical baselines. Options: `none` (no comparison), `time` (compares with past based on default_time_range), `dimension` (compares based on comparison_dimension values)'
+                description: 'Controls how to compare current data. Options: `none`, `time` (alias for `rill-PP`), `dimension`, or a specific comparison offset: `rill-PP` (previous period), `rill-PD` (previous day), `rill-PW` (previous week), `rill-PM` (previous month), `rill-PQ` (previous quarter), `rill-PY` (previous year)'
                 type: string
                 enum:
                   - none
                   - time
                   - dimension
+                  - rill-PP
+                  - rill-PD
+                  - rill-PW
+                  - rill-PM
+                  - rill-PQ
+                  - rill-PY
               comparison_dimension:
                 description: 'for dimension mode, specify the comparison dimension by name'
                 type: string
@@ -2519,12 +2525,18 @@ definitions:
                 description: Refers to the default time range shown when a user initially loads the dashboard. The value must be either a valid [ISO 8601 duration](https://en.wikipedia.org/wiki/ISO_8601#Durations) (for example, PT12H for 12 hours, P1M for 1 month, or P26W for 26 weeks) or one of the [Rill ISO 8601 extensions](https://docs.rilldata.com/reference/rill-iso-extensions#extensions)
                 type: string
               comparison_mode:
-                description: 'Controls how to compare current data with historical or categorical baselines. Options: `none` (no comparison), `time` (compares with past based on default_time_range), `dimension` (compares based on comparison_dimension values)'
+                description: 'Controls how to compare current data. Options: `none`, `time` (alias for `rill-PP`), `dimension`, or a specific comparison offset: `rill-PP` (previous period), `rill-PD` (previous day), `rill-PW` (previous week), `rill-PM` (previous month), `rill-PQ` (previous quarter), `rill-PY` (previous year)'
                 type: string
                 enum:
                   - none
                   - time
                   - dimension
+                  - rill-PP
+                  - rill-PD
+                  - rill-PW
+                  - rill-PM
+                  - rill-PQ
+                  - rill-PY
               comparison_dimension:
                 description: 'for dimension mode, specify the comparison dimension by name'
                 type: string
@@ -3648,7 +3660,17 @@ definitions:
                 description: Default time range to display when the explore view loads.
               comparison_mode:
                 type: string
-                description: Default comparison mode for metrics (none, time, or dimension).
+                description: 'Controls how to compare current data. Options: `none`, `time` (alias for `rill-PP`), `dimension`, or a specific comparison offset: `rill-PP` (previous period), `rill-PD` (previous day), `rill-PW` (previous week), `rill-PM` (previous month), `rill-PQ` (previous quarter), `rill-PY` (previous year)'
+                enum:
+                  - none
+                  - time
+                  - dimension
+                  - rill-PP
+                  - rill-PD
+                  - rill-PW
+                  - rill-PM
+                  - rill-PQ
+                  - rill-PY
               comparison_dimension:
                 type: string
                 description: Default dimension to use for comparison when comparison_mode is 'dimension'.

web-admin/src/features/bookmarks/HomeBookmarkButton.svelte

@@ -13,7 +13,7 @@
   import HomeBookmark from "@rilldata/web-common/components/icons/HomeBookmark.svelte";
   import HomeBookmarkPlus from "@rilldata/web-common/components/icons/HomeBookmarkPlus.svelte";
   import * as Tooltip from "@rilldata/web-common/components/tooltip-v2";
-  import { clearExploreSessionStore } from "@rilldata/web-common/features/dashboards/state-managers/loaders/explore-web-view-store.ts";
+  import { clearExploreViewState } from "@rilldata/web-common/features/dashboards/state-managers/loaders/explore-web-view-store.ts";
   import { ResourceKind } from "@rilldata/web-common/features/entity-management/resource-selectors.ts";
 
   export let organization: string;
@@ -39,7 +39,7 @@
   function goToDashboardHome() {
     if (resourceKind === ResourceKind.Explore) {
       // Without clearing sessions empty, DashboardStateDataLoader will load from session for explore view
-      clearExploreSessionStore(resourceName, `${organization}__${project}__`);
+      clearExploreViewState(resourceName, `${organization}__${project}__`);
     }
   }
 

web-admin/src/routes/-/embed/explore/[name]/+page.ts

@@ -1,13 +1,13 @@
 import { EmbedStorageNamespacePrefix } from "@rilldata/web-admin/features/embeds/constants.ts";
-import { clearExploreSessionStore } from "@rilldata/web-common/features/dashboards/state-managers/loaders/explore-web-view-store.ts";
+import { clearExploreViewState } from "@rilldata/web-common/features/dashboards/state-managers/loaders/explore-web-view-store.ts";
 
 export const load = async ({ params, parent }) => {
   const exploreName = params.name;
   const { visibleExplores } = await parent();
 
   // Check visibleExplores for more details
   if (!visibleExplores.has(exploreName)) {
-    clearExploreSessionStore(exploreName, EmbedStorageNamespacePrefix);
+    clearExploreViewState(exploreName, EmbedStorageNamespacePrefix);
     visibleExplores.add(exploreName);
   }
 

web-common/src/features/canvas/inspector/CanvasTabs.svelte

@@ -15,7 +15,7 @@
   ];
 </script>
 
-<div class="mr-4 bg-surac">
+<div class="mr-4 bg-surface-background">
   <div class="flex gap-x-2">
     {#each tabs as { tab, label } (tab)}
       {@const selected = tab === currentTab}

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

@@ -4,8 +4,9 @@ import {
   getCompoundQuery,
 } from "@rilldata/web-common/features/compound-query-result";
 import { cascadingExploreStateMerge } from "@rilldata/web-common/features/dashboards/state-managers/cascading-explore-state-merge";
-import { getPartialExploreStateFromSessionStorage } from "@rilldata/web-common/features/dashboards/state-managers/loaders/explore-web-view-store";
-import { getMostRecentPartialExploreState } from "@rilldata/web-common/features/dashboards/state-managers/loaders/most-recent-explore-state";
+import { getPartialExploreStateFromViewState } from "@rilldata/web-common/features/dashboards/state-managers/loaders/explore-web-view-store";
+import { getLastVisitedState } from "@rilldata/web-common/features/dashboards/state-managers/loaders/last-visited-state";
+import { validateAndCleanExploreState } from "@rilldata/web-common/features/dashboards/stores/validate-and-clean-explore-state";
 import { getExploreStateFromYAMLConfig } from "@rilldata/web-common/features/dashboards/stores/get-explore-state-from-yaml-config";
 import { getRillDefaultExploreState } from "@rilldata/web-common/features/dashboards/stores/get-rill-default-explore-state";
 import type { ExploreState } from "@rilldata/web-common/features/dashboards/stores/explore-state";
@@ -187,6 +188,7 @@ export class DashboardStateDataLoader {
       exploreStateFromYAMLConfig,
       rillDefaultExploreState,
       backButtonUsed,
+      skipLastVisitedState: true,
     });
   }
 
@@ -288,6 +290,7 @@ export class DashboardStateDataLoader {
     exploreStateFromYAMLConfig,
     rillDefaultExploreState,
     backButtonUsed,
+    skipLastVisitedState = false,
   }: {
     metricsViewSpec: V1MetricsViewSpec;
     exploreSpec: V1ExploreSpec;
@@ -296,13 +299,16 @@ export class DashboardStateDataLoader {
     exploreStateFromYAMLConfig: Partial<ExploreState>;
     rillDefaultExploreState: ExploreState;
     backButtonUsed: boolean;
+    skipLastVisitedState?: boolean;
   }) {
     urlSearchParams = cleanEmbedUrlParams(urlSearchParams);
 
-    const skipSessionStorage = backButtonUsed;
-    const exploreStateFromSessionStorage = skipSessionStorage
+    // Per-view state: restores full state when switching views (explore ↔ TDD ↔ pivot).
+    // Skipped on back button to avoid restoring stale state.
+    const skipViewState = backButtonUsed;
+    const exploreStateFromViewState = skipViewState
       ? null
-      : getPartialExploreStateFromSessionStorage(
+      : getPartialExploreStateFromViewState(
           this.exploreName,
           this.storageNamespacePrefix,
           urlSearchParams,
@@ -318,27 +324,35 @@ export class DashboardStateDataLoader {
         {},
       );
 
-    const { mostRecentPartialExploreState } = getMostRecentPartialExploreState(
-      this.exploreName,
-      this.storageNamespacePrefix,
-      metricsViewSpec,
-      exploreSpec,
-    );
+    // Check in-memory last visited state
+    let mostRecentPartialExploreState: Partial<ExploreState> | undefined;
+    const lastVisitedJson = getLastVisitedState(this.exploreName);
+    if (lastVisitedJson) {
+      try {
+        const parsed = JSON.parse(lastVisitedJson) as Partial<ExploreState>;
+        validateAndCleanExploreState(metricsViewSpec, exploreSpec, parsed);
+        mostRecentPartialExploreState = parsed;
+      } catch {
+        // Invalid state, ignore
+      }
+    }
 
     const shouldSkipOtherSources =
-      // If the url has some params that do not map to session storage then we need to only use state from url back-filled with rill defaults.
-      (urlSearchParams.size > 0 && !exploreStateFromSessionStorage) ||
+      // If the url has params that don't map to per-view state, only use url + rill defaults.
+      (urlSearchParams.size > 0 && !exploreStateFromViewState) ||
       // The exception to this is when back button is pressed and the user landed on empty url.
       backButtonUsed;
 
     const exploreStateOrder = [
-      // 1st priority is the state from url params. For certain params the state is from session storage.
-      // We need the state from session storage to make sure any state is not cleared while the user is still on the page but came back from a different dashboard.
-      // TODO: move all this logic based on url params to a "fromURL" method. Will replace convertURLSearchParamsToExploreState
-      exploreStateFromSessionStorage ??
+      // 1st priority: per-view state (when switching views) or URL params.
+      exploreStateFromViewState ??
         (urlSearchParams.size > 0 ? partialExploreStateFromUrl : null),
-      // Next priority is the most recent state user had visited. This is a small subset of the full state.
-      shouldSkipOtherSources || this.disableMostRecentDashboardState
+      // Next priority is the most recent in-memory state user had visited (sort/visibility preferences).
+      // Only used during init (navigating between dashboards within the same session).
+      // Skipped during URL-driven updates so that clearing URL params resets to defaults.
+      shouldSkipOtherSources ||
+      this.disableMostRecentDashboardState ||
+      skipLastVisitedState
         ? null
         : mostRecentPartialExploreState,
       // Next priority is one of the other source defined.