fix: usage of metrics view name instead of explore name in pivots (#5925

) * Fix usage of metrics view name instead of explore name in pivot * Fix lint
rilldata · Oct 17, 2024 · 1b49dbb · 1b49dbb · github-actions · Oct 17, 2024
1 parent d18f6a9
commit 1b49dbb
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 18 deletions.
diff --git a/web-common/src/features/dashboards/dimension-table/DimensionDisplay.svelte b/web-common/src/features/dashboards/dimension-table/DimensionDisplay.svelte
@@ -40,6 +40,7 @@
       },
     },
     metricsViewName,
+    exploreName,
     runtime,
   } = stateManagers;
 
@@ -103,7 +104,7 @@
 
   function toggleComparisonDimension(dimensionName, isBeingCompared) {
     metricsExplorerStore.setComparisonDimension(
-      $metricsViewName,
+      $exploreName,
       isBeingCompared ? undefined : dimensionName,
     );
   }

diff --git a/web-common/src/features/dashboards/dimension-table/DimensionHeader.svelte b/web-common/src/features/dashboards/dimension-table/DimensionHeader.svelte
@@ -48,7 +48,7 @@
       dimensionsFilter: { toggleDimensionFilterMode },
     },
     dashboardStore,
-    metricsViewName,
+    exploreName,
   } = stateManagers;
 
   const { adminServer, exports } = featureFlags;
@@ -131,7 +131,7 @@
       });
 
     metricsExplorerStore.createPivot(
-      $metricsViewName,
+      $exploreName,
       { dimension: rowDimensions },
       {
         dimension: [],

diff --git a/web-common/src/features/dashboards/pivot/AddField.svelte b/web-common/src/features/dashboards/pivot/AddField.svelte
@@ -14,13 +14,13 @@
     selectors: {
       pivot: { dimensions, measures },
     },
-    metricsViewName,
+    exploreName,
   } = getStateManagers();
 
   let open = false;
 
   function handleSelectValue(data: PivotChipData) {
-    metricsExplorerStore.addPivotField($metricsViewName, data, zone === "rows");
+    metricsExplorerStore.addPivotField($exploreName, data, zone === "rows");
   }
 </script>
 

diff --git a/web-common/src/features/dashboards/pivot/PivotDisplay.svelte b/web-common/src/features/dashboards/pivot/PivotDisplay.svelte
@@ -16,11 +16,11 @@
 
   $: ({ isFetching, assembled } = $pivotDataStore);
 
-  $: ({ metricsViewName, dashboardStore } = stateManagers);
+  $: ({ exploreName, dashboardStore } = stateManagers);
 
   function removeActiveCell() {
     if (!$dashboardStore.pivot.activeCell) return;
-    metricsExplorerStore.removePivotActiveCell($metricsViewName);
+    metricsExplorerStore.removePivotActiveCell($exploreName);
   }
 </script>
 

diff --git a/web-common/src/features/dashboards/pivot/PivotHeader.svelte b/web-common/src/features/dashboards/pivot/PivotHeader.svelte
@@ -12,21 +12,21 @@
     selectors: {
       pivot: { rows, columns },
     },
-    metricsViewName,
+    exploreName,
   } = stateManagers;
 
   $: ({ dimension: columnsDimensions, measure: columnsMeasures } = $columns);
   $: ({ dimension: rowsDimensions } = $rows);
 
   function updateColumn(e: CustomEvent<PivotChipData[]>) {
-    metricsExplorerStore.setPivotColumns($metricsViewName, e.detail);
+    metricsExplorerStore.setPivotColumns($exploreName, e.detail);
   }
 
   function updateRows(e: CustomEvent<PivotChipData[]>) {
     const filtered = e.detail.filter(
       (item) => item.type !== PivotChipType.Measure,
     );
-    metricsExplorerStore.setPivotRows($metricsViewName, filtered);
+    metricsExplorerStore.setPivotRows($exploreName, filtered);
   }
 </script>
 

diff --git a/web-common/src/features/dashboards/pivot/PivotTable.svelte b/web-common/src/features/dashboards/pivot/PivotTable.svelte
@@ -54,7 +54,7 @@
 
   const stateManagers = getStateManagers();
 
-  const { dashboardStore, metricsViewName } = stateManagers;
+  const { dashboardStore, exploreName } = stateManagers;
 
   const config = getPivotConfig(stateManagers);
 
@@ -214,7 +214,7 @@
     //@ts-expect-error-free
     //eslint-disable-next-line
     expanded = updater(expanded);
-    metricsExplorerStore.setPivotExpanded($metricsViewName, expanded);
+    metricsExplorerStore.setPivotExpanded($exploreName, expanded);
   }
 
   function onSortingChange(updater: Updater<SortingState>) {
@@ -223,7 +223,7 @@
     } else {
       sorting = updater;
     }
-    metricsExplorerStore.setPivotSort($metricsViewName, sorting);
+    metricsExplorerStore.setPivotSort($exploreName, sorting);
   }
 
   const handleScroll = (containerRefElement?: HTMLDivElement | null) => {
@@ -240,7 +240,7 @@
         !$pivotDataStore.isFetching &&
         !reachedEndForRows
       ) {
-        metricsExplorerStore.setPivotRowPage($metricsViewName, rowPage + 1);
+        metricsExplorerStore.setPivotRowPage($exploreName, rowPage + 1);
       }
     }
   };
@@ -298,7 +298,7 @@
     const rowId = cell.row.id;
     const columnId = cell.column.id;
 
-    metricsExplorerStore.setPivotActiveCell($metricsViewName, rowId, columnId);
+    metricsExplorerStore.setPivotActiveCell($exploreName, rowId, columnId);
   }
 
   function handleHover(

diff --git a/web-common/src/features/dashboards/pivot/PivotToolbar.svelte b/web-common/src/features/dashboards/pivot/PivotToolbar.svelte
@@ -14,7 +14,7 @@
   const { adminServer, exports } = featureFlags;
 
   const stateManagers = getStateManagers();
-  const { metricsViewName, dashboardStore } = stateManagers;
+  const { exploreName, dashboardStore } = stateManagers;
 
   $: expanded = $dashboardStore?.pivot?.expanded ?? {};
 
@@ -44,7 +44,7 @@
   //     expandRow(i.toString(), 1); // Start from level 1
   //   }
 
-  //   metricsExplorerStore.setPivotExpanded($metricsViewName, expanded);
+  //   metricsExplorerStore.setPivotExpanded($exploreName, expanded);
   // }
 </script>
 
@@ -75,7 +75,7 @@
       compact
       type="text"
       on:click={() => {
-        metricsExplorerStore.setPivotExpanded($metricsViewName, {});
+        metricsExplorerStore.setPivotExpanded($exploreName, {});
       }}
     >
       Collapse All