fix: timestamp column selection in explore not persiting

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

@@ -167,6 +167,7 @@ export class DashboardStateSync {
     // Get the updated url params. If we merged state other than the url we would need to navigate to it.
     const redirectUrl = this.getUrlForExploreState(initExploreState);
 
+    console.log(initExploreState);
     // Update session storage with the initial state
     updateExploreSessionStore(
       this.exploreName,

web-common/src/features/dashboards/state-managers/loaders/explore-web-view-store.spec.ts

@@ -190,8 +190,8 @@ describe("Explore web view store", () => {
         AD_BIDS_APPLY_PUB_DIMENSION_FILTER,
         AD_BIDS_SET_P7D_TIME_RANGE_FILTER,
         AD_BIDS_SET_PREVIOUS_PERIOD_COMPARE_TIME_RANGE_FILTER,
-        AD_BIDS_TOGGLE_BID_PRICE_MEASURE_VISIBILITY,
-        AD_BIDS_TOGGLE_BID_DOMAIN_DIMENSION_VISIBILITY,
+        AD_BIDS_TOGGLE_BID_PRICE_MEASURE_VISIBILITY(AD_BIDS_EXPLORE_INIT),
+        AD_BIDS_TOGGLE_BID_DOMAIN_DIMENSION_VISIBILITY(AD_BIDS_EXPLORE_INIT),
         AD_BIDS_SORT_ASC_BY_IMPRESSIONS,
         AD_BIDS_SORT_BY_PERCENT_VALUE,
       ]);

web-common/src/features/dashboards/state-managers/most-recent-explore-state.spec.ts

@@ -69,8 +69,8 @@ const TestCases: {
     mutations: [
       AD_BIDS_APPLY_PUB_DIMENSION_FILTER,
       AD_BIDS_SET_P4W_TIME_RANGE_FILTER,
-      AD_BIDS_TOGGLE_IMPRESSIONS_MEASURE_VISIBILITY,
-      AD_BIDS_TOGGLE_BID_DOMAIN_DIMENSION_VISIBILITY,
+      AD_BIDS_TOGGLE_IMPRESSIONS_MEASURE_VISIBILITY(AD_BIDS_EXPLORE_INIT),
+      AD_BIDS_TOGGLE_BID_DOMAIN_DIMENSION_VISIBILITY(AD_BIDS_EXPLORE_INIT),
       AD_BIDS_SORT_BY_PERCENT_VALUE,
       AD_BIDS_SORT_ASC_BY_BID_PRICE,
     ],

web-common/src/features/dashboards/stores/test-data/data.ts

@@ -21,6 +21,7 @@ import {
 import { DashboardState_ActivePage } from "@rilldata/web-common/proto/gen/rill/ui/v1/dashboard_pb";
 import {
   type MetricsViewSpecDimension,
+  MetricsViewSpecDimensionType,
   type MetricsViewSpecMeasure,
   TypeCode,
   V1ExploreComparisonMode,
@@ -50,6 +51,7 @@ export const AD_BIDS_DOMAIN_DIMENSION = "domain";
 export const AD_BIDS_COUNTRY_DIMENSION = "country";
 export const AD_BIDS_PUBLISHER_IS_NULL_DOMAIN = "publisher_is_null";
 export const AD_BIDS_TIMESTAMP_DIMENSION = "timestamp";
+export const AD_BIDS_OFFSET_TIMESTAMP_DIMENSION = "offset_timestamp";
 
 export const AD_BIDS_INIT_MEASURES: MetricsViewSpecMeasure[] = [
   {
@@ -129,6 +131,34 @@ export const AD_BIDS_THREE_DIMENSIONS: MetricsViewSpecDimension[] = [
     dataType: { code: TypeCode.CODE_STRING },
   },
 ];
+// Exhaustive set of dimensions. TODO: try and replace all instance of partial dimensions
+const AD_BIDS_DIMENSIONS: MetricsViewSpecDimension[] = [
+  {
+    name: AD_BIDS_PUBLISHER_DIMENSION,
+    dataType: { code: TypeCode.CODE_STRING },
+    type: MetricsViewSpecDimensionType.DIMENSION_TYPE_CATEGORICAL,
+  },
+  {
+    name: AD_BIDS_DOMAIN_DIMENSION,
+    dataType: { code: TypeCode.CODE_STRING },
+    type: MetricsViewSpecDimensionType.DIMENSION_TYPE_CATEGORICAL,
+  },
+  {
+    name: AD_BIDS_COUNTRY_DIMENSION,
+    dataType: { code: TypeCode.CODE_STRING },
+    type: MetricsViewSpecDimensionType.DIMENSION_TYPE_CATEGORICAL,
+  },
+  {
+    name: AD_BIDS_TIMESTAMP_DIMENSION,
+    dataType: { code: TypeCode.CODE_TIMESTAMP },
+    type: MetricsViewSpecDimensionType.DIMENSION_TYPE_TIME,
+  },
+  {
+    name: AD_BIDS_OFFSET_TIMESTAMP_DIMENSION,
+    dataType: { code: TypeCode.CODE_TIMESTAMP },
+    type: MetricsViewSpecDimensionType.DIMENSION_TYPE_TIME,
+  },
+];
 
 const Hour = 1000 * 60 * 60;
 export const TestTimeConstants = {
@@ -210,6 +240,15 @@ export const AD_BIDS_METRICS_3_MEASURES_DIMENSIONS_WITH_TIME: V1MetricsViewSpec
     timeDimension: AD_BIDS_TIMESTAMP_DIMENSION,
   };
 
+// Exhaustive metrics view. TODO: replace usage of partial metrics view
+export const AD_BIDS_METRICS_VIEW: V1MetricsViewSpec = {
+  displayName: AD_BIDS_NAME,
+  table: AD_BIDS_SOURCE_NAME,
+  dimensions: AD_BIDS_DIMENSIONS,
+  measures: AD_BIDS_THREE_MEASURES,
+  timeDimension: AD_BIDS_TIMESTAMP_DIMENSION,
+};
+
 export const AD_BIDS_EXPLORE_INIT: V1ExploreSpec = {
   displayName: AD_BIDS_EXPLORE_NAME,
   metricsView: AD_BIDS_METRICS_NAME,
@@ -256,6 +295,13 @@ export const AD_BIDS_EXPLORE_WITH_3_MEASURES_DIMENSIONS: V1ExploreSpec = {
   dimensions: AD_BIDS_THREE_DIMENSIONS.map((d) => d.name!),
 };
 
+// Exhaustive metrics view. TODO: replace usage of partial metrics view
+export const AD_BIDS_EXPLORE: V1ExploreSpec = {
+  metricsView: AD_BIDS_NAME,
+  dimensions: AD_BIDS_DIMENSIONS.map((d) => d.name!),
+  measures: AD_BIDS_THREE_MEASURES.map((m) => m.name!),
+};
+
 export const AD_BIDS_PRESET: V1ExplorePreset = {
   timeRange: "P7D",
   timezone: "Asia/Kathmandu",

web-common/src/features/dashboards/stores/test-data/store-mutations.ts

@@ -37,7 +37,7 @@
   AD_BIDS_BID_PRICE_MEASURE,
   AD_BIDS_COUNTRY_DIMENSION,
   AD_BIDS_DOMAIN_DIMENSION,
   AD_BIDS_EXPLORE_INIT,
   AD_BIDS_EXPLORE_NAME,
   AD_BIDS_IMPRESSIONS_MEASURE,
   AD_BIDS_METRICS_INIT,
@@ -55,7 +55,10 @@
 } from "@rilldata/web-common/lib/time/types";
 import { asyncWait } from "@rilldata/web-common/lib/waitUtils.ts";
 import { DashboardState_LeaderboardSortType } from "@rilldata/web-common/proto/gen/rill/ui/v1/dashboard_pb";
-import { V1TimeGrain } from "@rilldata/web-common/runtime-client";
+import {
+  type V1ExploreSpec,
+  V1TimeGrain,
+} from "@rilldata/web-common/runtime-client";
 import {
   setLeaderboardMeasureNames,
   setLeaderboardSortByMeasureName,
@@ -218,38 +221,42 @@
     AD_BIDS_DOMAIN_DIMENSION,
   );
 
-export const AD_BIDS_TOGGLE_IMPRESSIONS_MEASURE_VISIBILITY: TestDashboardMutation =
-  (mut) => {
-    toggleMeasureVisibility(
-      mut,
-      AD_BIDS_EXPLORE_INIT.measures!,
-      AD_BIDS_IMPRESSIONS_MEASURE,
-    );
-  };
-export const AD_BIDS_TOGGLE_BID_PRICE_MEASURE_VISIBILITY: TestDashboardMutation =
-  (mut) => {
-    toggleMeasureVisibility(
-      mut,
-      AD_BIDS_EXPLORE_INIT.measures!,
-      AD_BIDS_BID_PRICE_MEASURE,
-    );
-  };
-export const AD_BIDS_TOGGLE_BID_PUBLISHER_DIMENSION_VISIBILITY: TestDashboardMutation =
-  (mut) => {
-    toggleDimensionVisibility(
-      mut,
-      AD_BIDS_EXPLORE_INIT.dimensions!,
-      AD_BIDS_PUBLISHER_DIMENSION,
-    );
-  };
-export const AD_BIDS_TOGGLE_BID_DOMAIN_DIMENSION_VISIBILITY: TestDashboardMutation =
-  (mut) => {
-    toggleDimensionVisibility(
-      mut,
-      AD_BIDS_EXPLORE_INIT.dimensions!,
-      AD_BIDS_DOMAIN_DIMENSION,
-    );
-  };
+export const AD_BIDS_TOGGLE_IMPRESSIONS_MEASURE_VISIBILITY: (
+  exploreSpec: V1ExploreSpec,
+) => TestDashboardMutation = (exploreSpec: V1ExploreSpec) => (mut) => {
+  toggleMeasureVisibility(
+    mut,
+    exploreSpec.measures!,
+    AD_BIDS_IMPRESSIONS_MEASURE,
+  );
+};
+export const AD_BIDS_TOGGLE_BID_PRICE_MEASURE_VISIBILITY: (
+  exploreSpec: V1ExploreSpec,
+) => TestDashboardMutation = (exploreSpec: V1ExploreSpec) => (mut) => {
+  toggleMeasureVisibility(
+    mut,
+    exploreSpec.measures!,
+    AD_BIDS_BID_PRICE_MEASURE,
+  );
+};
+export const AD_BIDS_TOGGLE_BID_PUBLISHER_DIMENSION_VISIBILITY: (
+  exploreSpec: V1ExploreSpec,
+) => TestDashboardMutation = (exploreSpec: V1ExploreSpec) => (mut) => {
+  toggleDimensionVisibility(
+    mut,
+    exploreSpec.dimensions!,
+    AD_BIDS_PUBLISHER_DIMENSION,
+  );
+};
+export const AD_BIDS_TOGGLE_BID_DOMAIN_DIMENSION_VISIBILITY: (
+  exploreSpec: V1ExploreSpec,
+) => TestDashboardMutation = (exploreSpec: V1ExploreSpec) => (mut) => {
+  toggleDimensionVisibility(
+    mut,
+    exploreSpec.dimensions!,
+    AD_BIDS_DOMAIN_DIMENSION,
+  );
+};
 
 export const AD_BIDS_SORT_DESC_BY_IMPRESSIONS: TestDashboardMutation = (
   mut,

web-common/src/features/dashboards/url-state/convertURLToExplorePreset.ts

@@ -66,10 +66,8 @@ export function convertURLToExplorePreset(
     (m) => m.name!,
   );
   const dimensions = getMapFromArray(
-    metricsView.dimensions?.filter(
-      (d) =>
-        explore.dimensions?.includes(d.name!) &&
-        d.type !== "DIMENSION_TYPE_TIME",
+    metricsView.dimensions?.filter((d) =>
+      explore.dimensions?.includes(d.name!),
     ) ?? [],
     (d) => d.name!,
   );