PR comments

Author: AdityaHegde

web-common/src/features/dashboards/big-number/MeasuresContainer.svelte

@@ -37,7 +37,7 @@
       activeMeasure: { selectedMeasureNames },
     },
     actions: {
-      measures: { toggleMeasureVisibility },
+      measures: { toggleMeasureVisibility, toggleAllMeasuresVisibility },
     },
   } = getStateManagers();
 
@@ -178,7 +178,7 @@
         }))}
         selectedItems={visibleMeasureNames}
         onToggleSelectAll={() => {
-          toggleMeasureVisibility(allMeasureNames);
+          toggleAllMeasuresVisibility(allMeasureNames);
         }}
       />
     </div>

web-common/src/features/dashboards/leaderboard/LeaderboardControls.svelte

@@ -15,7 +15,7 @@
       dimensions: { visibleDimensions, allDimensions },
     },
     actions: {
-      dimensions: { toggleDimensionVisibility },
+      dimensions: { toggleDimensionVisibility, toggleAllDimensionsVisibility },
       contextCol: { setContextColumn },
       setLeaderboardMeasureName,
     },
@@ -70,7 +70,7 @@
         }))}
         selectedItems={visibleDimensionsNames}
         onToggleSelectAll={() => {
-          toggleDimensionVisibility(allDimensionNames);
+          toggleAllDimensionsVisibility(allDimensionNames);
         }}
       />
 

web-common/src/features/dashboards/state-managers/actions/dimensions.ts

@@ -17,29 +17,32 @@ export const setPrimaryDimension = (
 export const toggleDimensionVisibility = (
   { dashboard }: DashboardMutables,
   allDimensions: string[],
-  dimensionName?: string,
+  dimensionName: string,
 ) => {
-  if (dimensionName) {
-    const index = dashboard.visibleDimensions.indexOf(dimensionName);
-    if (index !== -1) {
-      dashboard.visibleDimensions.splice(index, 1);
-    } else {
-      // TODO: should this be appended to end or in relative order?
-      dashboard.visibleDimensions.push(dimensionName);
-    }
+  const index = dashboard.visibleDimensions.indexOf(dimensionName);
+  if (index !== -1) {
+    dashboard.visibleDimensions.splice(index, 1);
   } else {
-    const allSelected =
-      dashboard.visibleDimensions.length === allDimensions.length;
-
-    dashboard.visibleDimensions = allSelected
-      ? allDimensions.slice(0, 1)
-      : [...allDimensions];
+    dashboard.visibleDimensions.push(dimensionName);
   }
 
   dashboard.allDimensionsVisible =
     dashboard.visibleDimensions.length === allDimensions.length;
 };
 
+export const toggleAllDimensionsVisibility = (
+  { dashboard }: DashboardMutables,
+  allDimensions: string[],
+) => {
+  const allSelected =
+    dashboard.visibleDimensions.length === allDimensions.length;
+
+  dashboard.visibleDimensions = allSelected
+    ? allDimensions.slice(0, 1)
+    : [...allDimensions];
+  dashboard.allDimensionsVisible = !dashboard.allDimensionsVisible;
+};
+
 export const dimensionActions = {
   /**
    * Sets the primary dimension for the dashboard, which
@@ -48,4 +51,5 @@ export const dimensionActions = {
    */
   setPrimaryDimension,
   toggleDimensionVisibility,
+  toggleAllDimensionsVisibility,
 };

web-common/src/features/dashboards/state-managers/actions/measures.ts

@@ -3,33 +3,38 @@ import type { DashboardMutables } from "./types";
 export const toggleMeasureVisibility = (
   { dashboard }: DashboardMutables,
   allMeasures: string[],
-  measureName?: string,
+  measureName: string,
 ) => {
-  if (measureName) {
-    const index = dashboard.visibleMeasures.indexOf(measureName);
-    if (index > -1) {
-      dashboard.visibleMeasures.splice(index, 1);
-      if (
-        dashboard.leaderboardMeasureName === measureName &&
-        dashboard.visibleMeasures.length > 1
-      ) {
-        dashboard.leaderboardMeasureName = dashboard.visibleMeasures[0];
-      }
-    } else {
-      dashboard.visibleMeasures.push(measureName);
+  const index = dashboard.visibleMeasures.indexOf(measureName);
+  if (index > -1) {
+    dashboard.visibleMeasures.splice(index, 1);
+    if (
+      dashboard.leaderboardMeasureName === measureName &&
+      dashboard.visibleMeasures.length > 1
+    ) {
+      dashboard.leaderboardMeasureName = dashboard.visibleMeasures[0];
     }
   } else {
-    const allSelected = dashboard.visibleMeasures.length === allMeasures.length;
-
-    dashboard.visibleMeasures = allSelected
-      ? allMeasures.slice(0, 1)
-      : [...allMeasures];
+    dashboard.visibleMeasures.push(measureName);
   }
 
   dashboard.allMeasuresVisible =
     dashboard.visibleMeasures.length === allMeasures.length;
 };
 
+export const toggleAllMeasuresVisibility = (
+  { dashboard }: DashboardMutables,
+  allMeasures: string[],
+) => {
+  const allSelected = dashboard.visibleMeasures.length === allMeasures.length;
+
+  dashboard.visibleMeasures = allSelected
+    ? allMeasures.slice(0, 1)
+    : [...allMeasures];
+  dashboard.allMeasuresVisible = !dashboard.allMeasuresVisible;
+};
+
 export const measureActions = {
   toggleMeasureVisibility,
+  toggleAllMeasuresVisibility,
 };

web-common/src/features/dashboards/time-series/MetricsTimeSeriesCharts.svelte

@@ -64,7 +64,7 @@
       dimensionFilters: { includedDimensionValues },
     },
     actions: {
-      measures: { toggleMeasureVisibility },
+      measures: { toggleMeasureVisibility, toggleAllMeasuresVisibility },
     },
     validSpecStore,
   } = getStateManagers();
@@ -313,7 +313,7 @@
         }))}
         selectedItems={visibleMeasureNames}
         onToggleSelectAll={() => {
-          toggleMeasureVisibility(allMeasureNames);
+          toggleAllMeasuresVisibility(allMeasureNames);
         }}
       />
 

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

@@ -22,10 +22,7 @@ import {
   ToURLParamViewMap,
 } from "@rilldata/web-common/features/dashboards/url-state/mappers";
 import { ExploreStateURLParams } from "@rilldata/web-common/features/dashboards/url-state/url-params";
-import {
-  arrayOrderedEquals,
-  arrayUnorderedEquals,
-} from "@rilldata/web-common/lib/arrayUtils";
+import { arrayOrderedEquals } from "@rilldata/web-common/lib/arrayUtils";
 import {
   TimeComparisonOption,
   type TimeRange,