Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

Metrics viewer fixes (#70655)

Aleksandr Lesnenkoa5b4f10c1055
diff --git a/e2e/test/scenarios/metrics/metrics-explorer.cy.spec.ts b/e2e/test/scenarios/metrics/metrics-explorer.cy.spec.ts
index e5f7b6245c1..c0eb61cb932 100644
--- a/e2e/test/scenarios/metrics/metrics-explorer.cy.spec.ts
+++ b/e2e/test/scenarios/metrics/metrics-explorer.cy.spec.ts
@@ -331,11 +331,10 @@ describe("scenarios > metrics > explorer", () => {
cy.wait("@dataset");
H.MetricsViewer.breakoutLegend().within(() => {
cy.findByRole("heading", { name: "Created At" }).should("be.visible");
- cy.findByText("2022").should("be.visible");
- cy.findByText("2023").should("be.visible");
- cy.findByText("2024").should("be.visible");
- cy.findByText("2025").should("be.visible");
- cy.findByText("2026").should("be.visible");
+ const currentYear = new Date().getFullYear();
+ for (let year = 2022; year <= currentYear; year++) {
+ cy.findByText(String(year)).should("be.visible");
+ }
});
H.MetricsViewer.searchBarPills()
@@ -644,7 +643,7 @@ describe("scenarios > metrics > explorer", () => {
H.popover().findByText("Doohickey").click();
- H.popover().findByRole("button", { name: "Update filter" }).click();
+ H.popover().findByRole("button", { name: "Add filter" }).click();
H.MetricsViewer.getMetricVisualization().should(
"not.contain.text",
"Doohickey",
diff --git a/frontend/src/metabase/metrics-viewer/components/BreakoutDimensionPicker/BreakoutDimensionPicker.tsx b/frontend/src/metabase/metrics-viewer/components/BreakoutDimensionPicker/BreakoutDimensionPicker.tsx
index f3345adbb7b..d293c0e9d84 100644
--- a/frontend/src/metabase/metrics-viewer/components/BreakoutDimensionPicker/BreakoutDimensionPicker.tsx
+++ b/frontend/src/metabase/metrics-viewer/components/BreakoutDimensionPicker/BreakoutDimensionPicker.tsx
@@ -15,10 +15,10 @@ import type { MetricDefinition, ProjectionClause } from "metabase-lib/metric";
import * as LibMetric from "metabase-lib/metric";
import { getDimensionsByType } from "../../utils/tabs";
-import { DimensionBinningPicker } from "../DimensionBinningPicker";
-import { DimensionTemporalUnitPicker } from "../DimensionTemporalUnitPicker";
import S from "./BreakoutDimensionPicker.module.css";
+import { DimensionBinningPicker } from "./DimensionBinningPicker";
+import { DimensionTemporalUnitPicker } from "./DimensionTemporalUnitPicker";
interface BreakoutDimensionPickerProps {
definition: MetricDefinition;
diff --git a/frontend/src/metabase/metrics-viewer/components/DimensionBinningPicker/DimensionBinningPicker.tsx b/frontend/src/metabase/metrics-viewer/components/BreakoutDimensionPicker/DimensionBinningPicker/DimensionBinningPicker.tsx
similarity index 97%
rename from frontend/src/metabase/metrics-viewer/components/DimensionBinningPicker/DimensionBinningPicker.tsx
rename to frontend/src/metabase/metrics-viewer/components/BreakoutDimensionPicker/DimensionBinningPicker/DimensionBinningPicker.tsx
index e66ef4d9251..be67d5be59f 100644
--- a/frontend/src/metabase/metrics-viewer/components/DimensionBinningPicker/DimensionBinningPicker.tsx
+++ b/frontend/src/metabase/metrics-viewer/components/BreakoutDimensionPicker/DimensionBinningPicker/DimensionBinningPicker.tsx
@@ -12,7 +12,7 @@ import type {
} from "metabase-lib/metric";
import * as LibMetric from "metabase-lib/metric";
-import { applyProjection } from "../../utils/definition-builder";
+import { applyProjection } from "../../../utils/definition-builder";
interface DimensionBinningPickerProps {
definition: MetricDefinition;
diff --git a/frontend/src/metabase/metrics-viewer/components/DimensionBinningPicker/index.ts b/frontend/src/metabase/metrics-viewer/components/BreakoutDimensionPicker/DimensionBinningPicker/index.ts
similarity index 100%
rename from frontend/src/metabase/metrics-viewer/components/DimensionBinningPicker/index.ts
rename to frontend/src/metabase/metrics-viewer/components/BreakoutDimensionPicker/DimensionBinningPicker/index.ts
diff --git a/frontend/src/metabase/metrics-viewer/components/DimensionTemporalUnitPicker/DimensionTemporalUnitPicker.tsx b/frontend/src/metabase/metrics-viewer/components/BreakoutDimensionPicker/DimensionTemporalUnitPicker/DimensionTemporalUnitPicker.tsx
similarity index 100%
rename from frontend/src/metabase/metrics-viewer/components/DimensionTemporalUnitPicker/DimensionTemporalUnitPicker.tsx
rename to frontend/src/metabase/metrics-viewer/components/BreakoutDimensionPicker/DimensionTemporalUnitPicker/DimensionTemporalUnitPicker.tsx
diff --git a/frontend/src/metabase/metrics-viewer/components/DimensionTemporalUnitPicker/index.ts b/frontend/src/metabase/metrics-viewer/components/BreakoutDimensionPicker/DimensionTemporalUnitPicker/index.ts
similarity index 100%
rename from frontend/src/metabase/metrics-viewer/components/DimensionTemporalUnitPicker/index.ts
rename to frontend/src/metabase/metrics-viewer/components/BreakoutDimensionPicker/DimensionTemporalUnitPicker/index.ts
diff --git a/frontend/src/metabase/metrics-viewer/components/FilterPopover/FilterPopoverContent.tsx b/frontend/src/metabase/metrics-viewer/components/FilterPopover/FilterPopoverContent.tsx
index 3b75c5e084b..a47389d8699 100644
--- a/frontend/src/metabase/metrics-viewer/components/FilterPopover/FilterPopoverContent.tsx
+++ b/frontend/src/metabase/metrics-viewer/components/FilterPopover/FilterPopoverContent.tsx
@@ -26,7 +26,6 @@ import { filterDisplayGroupsBySearch } from "./utils";
const LIST_WIDTH = "20rem";
const FILTER_WIDTH = "24rem";
-const DIMENSION_LIST_MAX_HEIGHT = Infinity;
export type DefinitionSource = {
id: MetricSourceId;
@@ -196,7 +195,7 @@ function DimensionList({
renderItemName={(item) => item.name}
renderItemIcon={renderItemIcon}
width="100%"
- maxHeight={DIMENSION_LIST_MAX_HEIGHT}
+ maxHeight={Infinity}
searchable={false}
alwaysExpanded
/>
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricControls/DimensionFilterButton/DimensionFilterButton.tsx b/frontend/src/metabase/metrics-viewer/components/MetricControls/DimensionFilterButton/DimensionFilterButton.tsx
index 6d832e9c01e..01c6e063d66 100644
--- a/frontend/src/metabase/metrics-viewer/components/MetricControls/DimensionFilterButton/DimensionFilterButton.tsx
+++ b/frontend/src/metabase/metrics-viewer/components/MetricControls/DimensionFilterButton/DimensionFilterButton.tsx
@@ -21,7 +21,6 @@ import { getFilterDisplayName } from "./utils";
type DimensionFilterButtonProps = {
definition: MetricDefinition;
filterDimension: DimensionMetadata;
- filter?: FilterClause;
dimensionFilter?: DimensionFilterValue;
allFilterDimensions?: DimensionMetadata[];
onChange: (value: DimensionFilterValue | undefined) => void;
@@ -30,7 +29,6 @@ type DimensionFilterButtonProps = {
export function DimensionFilterButton({
definition,
filterDimension,
- filter,
dimensionFilter,
allFilterDimensions,
onChange,
@@ -38,14 +36,11 @@ export function DimensionFilterButton({
const [isOpen, setIsOpen] = useState(false);
const reconstructedFilter = useMemo((): FilterClause | undefined => {
- if (filter) {
- return filter;
- }
if (dimensionFilter) {
return buildDimensionFilterClause(filterDimension, dimensionFilter);
}
return undefined;
- }, [filter, dimensionFilter, filterDimension]);
+ }, [dimensionFilter, filterDimension]);
const isDateDimension = LibMetric.isDateOrDateTime(filterDimension);
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricControls/MetricControls.tsx b/frontend/src/metabase/metrics-viewer/components/MetricControls/MetricControls.tsx
index d187f553af0..386efbf3138 100644
--- a/frontend/src/metabase/metrics-viewer/components/MetricControls/MetricControls.tsx
+++ b/frontend/src/metabase/metrics-viewer/components/MetricControls/MetricControls.tsx
@@ -96,7 +96,6 @@ export function MetricControls({
<DimensionFilterButton
definition={definition}
filterDimension={projectionInfo.filterDimension}
- filter={projectionInfo.filter}
dimensionFilter={dimensionFilter}
allFilterDimensions={allFilterDimensions}
onChange={onDimensionFilterChange}
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchDropdown/MetricSearchDropdown.tsx b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchDropdown/MetricSearchDropdown.tsx
index 48f0937addd..d78dbc070e7 100644
--- a/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchDropdown/MetricSearchDropdown.tsx
+++ b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchDropdown/MetricSearchDropdown.tsx
@@ -10,15 +10,10 @@ import {
} from "../../../hooks/use-metric-measure-search";
import type { SelectedMetric } from "../../../types/viewer-state";
import { MetricSearchResults } from "../MetricSearchResults";
-import { filterSearchResults } from "../utils";
+import { type ExcludeMetric, filterSearchResults } from "../utils";
import S from "./MetricSearchDropdown.module.css";
-type ExcludeMetric = {
- id: number;
- sourceType: "metric" | "measure";
-};
-
type MetricSearchDropdownProps = {
selectedMetricIds: Set<number>;
selectedMeasureIds: Set<number>;
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricSearch/utils.ts b/frontend/src/metabase/metrics-viewer/components/MetricSearch/utils.ts
index cbfe594c6b5..b3825272b6d 100644
--- a/frontend/src/metabase/metrics-viewer/components/MetricSearch/utils.ts
+++ b/frontend/src/metabase/metrics-viewer/components/MetricSearch/utils.ts
@@ -20,7 +20,7 @@ export function getSelectedMeasureIds(
);
}
-type ExcludeMetric = {
+export type ExcludeMetric = {
id: number;
sourceType: "metric" | "measure";
};
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricsViewerTabs/MetricsViewerTabs.module.css b/frontend/src/metabase/metrics-viewer/components/MetricsViewerTabs/MetricsViewerTabs.module.css
index b57470a0ac6..1cb39e00800 100644
--- a/frontend/src/metabase/metrics-viewer/components/MetricsViewerTabs/MetricsViewerTabs.module.css
+++ b/frontend/src/metabase/metrics-viewer/components/MetricsViewerTabs/MetricsViewerTabs.module.css
@@ -4,10 +4,6 @@
}
}
-.allTab :global(.Icon) {
- display: block;
-}
-
.closeButton {
visibility: hidden;
}
diff --git a/frontend/src/metabase/metrics-viewer/hooks/use-metrics-viewer.ts b/frontend/src/metabase/metrics-viewer/hooks/use-metrics-viewer.ts
index 2dd72affbc1..127bb9fc06d 100644
--- a/frontend/src/metabase/metrics-viewer/hooks/use-metrics-viewer.ts
+++ b/frontend/src/metabase/metrics-viewer/hooks/use-metrics-viewer.ts
@@ -22,7 +22,7 @@ import {
buildBinnedBreakoutDefinition,
getDefinitionName,
} from "../utils/definition-builder";
-import { applyDimensionFilter } from "../utils/dimension-filters";
+import { buildDimensionFilterClause } from "../utils/dimension-filters";
import {
findBinningStrategy,
findDimensionById,
@@ -140,7 +140,8 @@ function buildUrlRestoreTransform(
for (const filter of filters) {
const dimension = findFilterDimensionById(result, filter.dimensionId);
if (dimension) {
- result = applyDimensionFilter(result, dimension, filter.value);
+ const clause = buildDimensionFilterClause(dimension, filter.value);
+ result = LibMetric.filter(result, clause);
}
}
}
diff --git a/frontend/src/metabase/metrics-viewer/utils/definition-builder.ts b/frontend/src/metabase/metrics-viewer/utils/definition-builder.ts
index fbd04e223a8..ee47522ca89 100644
--- a/frontend/src/metabase/metrics-viewer/utils/definition-builder.ts
+++ b/frontend/src/metabase/metrics-viewer/utils/definition-builder.ts
@@ -1,6 +1,5 @@
import type {
DimensionMetadata,
- FilterClause,
MeasureDisplayInfo,
MetricDefinition,
MetricDisplayInfo,
@@ -12,7 +11,7 @@ import type { TemporalUnit } from "metabase-types/api";
import { UNBINNED } from "../constants";
import type { DimensionFilterValue } from "./dimension-filters";
-import { applyDimensionFilter } from "./dimension-filters";
+import { buildDimensionFilterClause } from "./dimension-filters";
import { findBinningStrategy, findTemporalBucket } from "./dimension-lookup";
// ── Projection application ──
@@ -214,11 +213,11 @@ export function buildExecutableDefinition(
projections[0],
);
if (projectionDimension) {
- definition = applyDimensionFilter(
- definition,
+ const filterClause = buildDimensionFilterClause(
projectionDimension,
dimensionFilter,
);
+ definition = LibMetric.filter(definition, filterClause);
}
}
}
@@ -232,7 +231,6 @@ export type ProjectionInfo = {
projection: ProjectionClause | undefined;
projectionDimension: DimensionMetadata | undefined;
filterDimension: DimensionMetadata | undefined;
- filter: FilterClause | undefined;
isTemporalBucketable: boolean;
isBinnable: boolean;
hasBinning: boolean;
@@ -259,7 +257,6 @@ export function getProjectionInfo(
: false;
let filterDimension: DimensionMetadata | undefined;
- let filterClause: FilterClause | undefined;
if (projectionDimension) {
const dimensionInfo = LibMetric.displayInfo(
@@ -271,30 +268,12 @@ export function getProjectionInfo(
const info = LibMetric.displayInfo(definition, candidate);
return info.name === dimensionInfo.name;
});
-
- if (filterDimension) {
- const existingFilters = LibMetric.filters(definition);
- for (const existingFilter of existingFilters) {
- const parts = LibMetric.filterParts(definition, existingFilter);
- if (parts) {
- const filterDimensionInfo = LibMetric.displayInfo(
- definition,
- parts.dimension,
- );
- if (filterDimensionInfo.name === dimensionInfo.name) {
- filterClause = existingFilter;
- break;
- }
- }
- }
- }
}
return {
projection: firstProjection,
projectionDimension: projectionDimension,
filterDimension,
- filter: filterClause,
isTemporalBucketable,
isBinnable,
hasBinning,
diff --git a/frontend/src/metabase/metrics-viewer/utils/definition-builder.unit.spec.ts b/frontend/src/metabase/metrics-viewer/utils/definition-builder.unit.spec.ts
index fd1215e4851..b306f5012b8 100644
--- a/frontend/src/metabase/metrics-viewer/utils/definition-builder.unit.spec.ts
+++ b/frontend/src/metabase/metrics-viewer/utils/definition-builder.unit.spec.ts
@@ -19,6 +19,7 @@ import {
getDefinitionName,
getProjectionInfo,
} from "./definition-builder";
+import { buildDimensionFilterClause, parseFilter } from "./dimension-filters";
const metadata = createMetricMetadata([REVENUE_METRIC]);
@@ -232,6 +233,54 @@ describe("buildExecutableDefinition", () => {
expect(LibMetric.displayInfo(result, bucket!).shortName).toBe("year");
});
});
+
+ it("preserves global filters when tab-level filter targets the same dimension", () => {
+ const definition = setupDefinition(metadata, REVENUE_METRIC.id);
+ const dimensions = LibMetric.projectionableDimensions(definition);
+ const categoryDimension = dimensions.find(
+ (dimension) =>
+ LibMetric.displayInfo(definition, dimension).displayName === "Category",
+ )!;
+
+ const globalFilterClause = buildDimensionFilterClause(categoryDimension, {
+ type: "string",
+ operator: "=",
+ values: ["Gadget"],
+ options: {},
+ });
+ const definitionWithGlobalFilter = LibMetric.filter(
+ definition,
+ globalFilterClause,
+ );
+
+ expect(LibMetric.filters(definitionWithGlobalFilter)).toHaveLength(1);
+
+ const result = buildExecutableDefinition(
+ definitionWithGlobalFilter,
+ categoryDimension,
+ {
+ dimensionFilter: {
+ type: "string",
+ operator: "=",
+ values: ["Widget"],
+ options: {},
+ },
+ },
+ )!;
+
+ const resultFilters = LibMetric.filters(result);
+ expect(resultFilters).toHaveLength(2);
+
+ const parsedFilters = resultFilters.map(
+ (filter) => parseFilter(result, filter)!.value,
+ );
+ expect(parsedFilters).toEqual(
+ expect.arrayContaining([
+ { type: "string", operator: "=", values: ["Gadget"], options: null },
+ { type: "string", operator: "=", values: ["Widget"], options: null },
+ ]),
+ );
+ });
});
describe("buildBinnedBreakoutDefinition", () => {
diff --git a/frontend/src/metabase/metrics-viewer/utils/dimension-filters.ts b/frontend/src/metabase/metrics-viewer/utils/dimension-filters.ts
index 104bf2de311..022ff84bd64 100644
--- a/frontend/src/metabase/metrics-viewer/utils/dimension-filters.ts
+++ b/frontend/src/metabase/metrics-viewer/utils/dimension-filters.ts
@@ -61,7 +61,7 @@ export type DimensionFilterValue =
| { type: "time"; operator: TimeFilterParts["operator"]; values: Date[] }
| { type: "default"; operator: DefaultFilterParts["operator"] };
-export type ParsedFilter = {
+type ParsedFilter = {
dimension: DimensionMetadata;
value: DimensionFilterValue;
};
@@ -287,32 +287,3 @@ export function extractDefinitionFilters(
return result;
}
-
-// ── Filter application ──
-
-function removeFiltersOnDimension(
- def: MetricDefinition,
- dimension: DimensionMetadata,
-): MetricDefinition {
- const existingFilters = LibMetric.filters(def);
-
- let result = def;
- for (const filter of existingFilters) {
- const parts = LibMetric.filterParts(def, filter);
- if (parts && LibMetric.isSameSource(parts.dimension, dimension)) {
- result = LibMetric.removeClause(result, filter);
- }
- }
- return result;
-}
-
-export function applyDimensionFilter(
- def: MetricDefinition,
- dimension: DimensionMetadata,
- filterValue: DimensionFilterValue,
-): MetricDefinition {
- let result = removeFiltersOnDimension(def, dimension);
- const filterClause = buildDimensionFilterClause(dimension, filterValue);
- result = LibMetric.filter(result, filterClause);
- return result;
-}
diff --git a/frontend/src/metabase/metrics-viewer/utils/dimension-filters.unit.spec.ts b/frontend/src/metabase/metrics-viewer/utils/dimension-filters.unit.spec.ts
index 26b4e97ca7c..31087200787 100644
--- a/frontend/src/metabase/metrics-viewer/utils/dimension-filters.unit.spec.ts
+++ b/frontend/src/metabase/metrics-viewer/utils/dimension-filters.unit.spec.ts
@@ -10,7 +10,6 @@ import {
} from "./__tests__/test-helpers";
import type { DimensionFilterValue } from "./dimension-filters";
import {
- applyDimensionFilter,
buildDimensionFilterClause,
extractDefinitionFilters,
parseFilter,
@@ -238,121 +237,3 @@ describe("buildDimensionFilterClause", () => {
});
});
});
-
-describe("applyDimensionFilter", () => {
- describe("metric", () => {
- it("adds filter to definition with no existing filters", () => {
- const definition = setupDefinition(metadata, REVENUE_METRIC.id);
- const dimension = getFilterableDimension(definition, "Category");
-
- const result = applyDimensionFilter(definition, dimension, {
- type: "string",
- operator: "=",
- values: ["Gadget"],
- options: {},
- });
-
- const resultFilters = LibMetric.filters(result);
- expect(resultFilters).toHaveLength(1);
- });
-
- it("replaces existing filter on same dimension when dimension has sources", () => {
- const definition = setupDefinition(metadata, REVENUE_METRIC.id);
- const dimension = getFilterableDimension(definition, "Amount");
-
- const withFirst = applyDimensionFilter(definition, dimension, {
- type: "number",
- operator: "between",
- values: [10, 100],
- });
-
- const existingFilters = LibMetric.filters(withFirst);
- const parsedFirst = parseFilter(withFirst, existingFilters[0]);
-
- const withReplaced = applyDimensionFilter(
- withFirst,
- parsedFirst!.dimension,
- {
- type: "number",
- operator: "between",
- values: [50, 200],
- },
- );
-
- const resultFilters = LibMetric.filters(withReplaced);
- expect(resultFilters).toHaveLength(1);
-
- const parsed = parseFilter(withReplaced, resultFilters[0]);
- expect(parsed!.value).toMatchObject({
- type: "number",
- operator: "between",
- values: [50, 200],
- });
- });
-
- it("preserves filters on other dimensions", () => {
- const definition = setupDefinition(metadata, REVENUE_METRIC.id);
- const categoryDimension = getFilterableDimension(definition, "Category");
- const amountDimension = getFilterableDimension(definition, "Amount");
-
- const withCategory = applyDimensionFilter(definition, categoryDimension, {
- type: "string",
- operator: "=",
- values: ["Gadget"],
- options: {},
- });
-
- const withBoth = applyDimensionFilter(withCategory, amountDimension, {
- type: "number",
- operator: "between",
- values: [10, 100],
- });
-
- const resultFilters = LibMetric.filters(withBoth);
- expect(resultFilters).toHaveLength(2);
- });
- });
-
- describe("measure", () => {
- it("adds filter to definition with no existing filters", () => {
- const definition = setupMeasureDefinition(
- measureMetadata,
- TOTAL_MEASURE.id,
- );
- const dimension = getFilterableDimension(definition, "Quantity");
-
- const result = applyDimensionFilter(definition, dimension, {
- type: "number",
- operator: "between",
- values: [1, 50],
- });
-
- const resultFilters = LibMetric.filters(result);
- expect(resultFilters).toHaveLength(1);
- });
-
- it("preserves filters on other dimensions", () => {
- const definition = setupMeasureDefinition(
- measureMetadata,
- TOTAL_MEASURE.id,
- );
- const quantityDimension = getFilterableDimension(definition, "Quantity");
- const totalDimension = getFilterableDimension(definition, "Total");
-
- const withQuantity = applyDimensionFilter(definition, quantityDimension, {
- type: "number",
- operator: "between",
- values: [1, 50],
- });
-
- const withBoth = applyDimensionFilter(withQuantity, totalDimension, {
- type: "number",
- operator: ">",
- values: [100],
- });
-
- const resultFilters = LibMetric.filters(withBoth);
- expect(resultFilters).toHaveLength(2);
- });
- });
-});
diff --git a/frontend/src/metabase/metrics-viewer/utils/dimension-picker.ts b/frontend/src/metabase/metrics-viewer/utils/dimension-picker.ts
index 82630c799cf..a11847b9921 100644
--- a/frontend/src/metabase/metrics-viewer/utils/dimension-picker.ts
+++ b/frontend/src/metabase/metrics-viewer/utils/dimension-picker.ts
@@ -76,16 +76,16 @@ function collectAllDimensionEntries(
function groupBySource(entries: DimensionEntry[]): DimensionEntry[][] {
const groups: DimensionEntry[][] = [];
+ const groupKeys: DimensionEntry[] = [];
for (const entry of entries) {
- const match = groups.find((group) =>
- group.some((existing) =>
- LibMetric.isSameSource(existing.dimension, entry.dimension),
- ),
+ const groupIndex = groupKeys.findIndex((key) =>
+ LibMetric.isSameSource(key.dimension, entry.dimension),
);
- if (match) {
- match.push(entry);
+ if (groupIndex !== -1) {
+ groups[groupIndex].push(entry);
} else {
+ groupKeys.push(entry);
groups.push([entry]);
}
}
@@ -161,13 +161,6 @@ export interface SourceDisplayInfo {
name: string;
}
-export function getSourceDisplayName(
- sourceId: MetricSourceId,
- sourceDataById: Record<MetricSourceId, SourceDisplayInfo>,
-): string {
- return sourceDataById[sourceId]?.name ?? sourceId;
-}
-
// ── Dimension picker sections ──
export type DimensionPickerItem = AvailableDimension & {
@@ -242,7 +235,7 @@ export function buildDimensionPickerSections({
}
if (hasMultipleSources) {
- const sourceName = getSourceDisplayName(sourceId, sourceDataById);
+ const sourceName = sourceDataById[sourceId]?.name ?? sourceId;
splitByGroup(sourceDimensions, sourceName);
} else {
splitByGroup(sourceDimensions);