filter out dimension names that do not have dimension values when req…

…uesting updated data
rilldata · Dec 19, 2023 · d02c021 · d02c021
1 parent 57a27f8
commit d02c021
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 5 deletions.
diff --git a/web-common/src/features/dashboards/rows-viewer/RowsViewerAccordion.svelte b/web-common/src/features/dashboards/rows-viewer/RowsViewerAccordion.svelte
@@ -63,7 +63,10 @@
       ],
       timeStart: $timeControlsStore.timeStart,
       timeEnd,
-      filter: $dashboardStore?.filters,
+      filter: {
+        exclude: $dashboardStore.filters.exclude?.filter((f) => f.in?.length),
+        include: $dashboardStore.filters.include?.filter((f) => f.in?.length),
+      },
     },
     {
       query: {

diff --git a/web-common/src/features/dashboards/selectors.ts b/web-common/src/features/dashboards/selectors.ts
@@ -119,14 +119,22 @@ export const getFiltersForOtherDimensions = (
   const filter: V1MetricsViewFilter = {
     include:
       filters.include
-        ?.filter((dimensionValues) => dimensionName !== dimensionValues.name)
+        ?.filter((dimensionValues) => {
+          return (
+            dimensionName !== dimensionValues.name && dimensionValues.in?.length
+          );
+        })
         .map((dimensionValues) => ({
           name: dimensionValues.name,
           in: dimensionValues.in,
         })) ?? [],
     exclude:
       filters.exclude
-        ?.filter((dimensionValues) => dimensionName !== dimensionValues.name)
+        ?.filter((dimensionValues) => {
+          return (
+            dimensionName !== dimensionValues.name && dimensionValues.in?.length
+          );
+        })
         .map((dimensionValues) => ({
           name: dimensionValues.name,
           in: dimensionValues.in,

diff --git a/web-common/src/features/dashboards/time-series/timeseries-data-store.ts b/web-common/src/features/dashboards/time-series/timeseries-data-store.ts
@@ -50,7 +50,14 @@ function createMetricsViewTimeSeries(
         metricViewName,
         {
           measureNames: measures,
-          filter: dashboardStore?.filters,
+          filter: {
+            exclude: dashboardStore.filters.exclude?.filter(
+              (f) => f.in?.length
+            ),
+            include: dashboardStore.filters.include?.filter(
+              (f) => f.in?.length
+            ),
+          },
           timeStart: isComparison
             ? timeControls.comparisonAdjustedStart
             : timeControls.adjustedStart,

diff --git a/web-common/src/features/dashboards/time-series/totals-data-store.ts b/web-common/src/features/dashboards/time-series/totals-data-store.ts
@@ -26,7 +26,12 @@ export function createTotalsForMeasure(
         metricsViewName,
         {
           measures: measures.map((measure) => ({ name: measure })),
-          filter: noFilter ? { include: [], exclude: [] } : dashboard?.filters,
+          filter: noFilter
+            ? { include: [], exclude: [] }
+            : {
+                exclude: dashboard.filters.exclude?.filter((f) => f.in?.length),
+                include: dashboard.filters.include?.filter((f) => f.in?.length),
+              },
           timeStart: isComparison
             ? timeControls?.comparisonTimeStart
             : timeControls.timeStart,