Skip to content

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

updating ClauseStep type, fixing segment and measure editors (#67956)

Nick Fitzpatricka6b5cb73715c
diff --git a/frontend/src/metabase/querying/measures/components/MeasureAggregationPicker/MeasureAggregationPicker.tsx b/frontend/src/metabase/querying/measures/components/MeasureAggregationPicker/MeasureAggregationPicker.tsx
index 5445a68e407..f4a0bebe302 100644
--- a/frontend/src/metabase/querying/measures/components/MeasureAggregationPicker/MeasureAggregationPicker.tsx
+++ b/frontend/src/metabase/querying/measures/components/MeasureAggregationPicker/MeasureAggregationPicker.tsx
@@ -4,7 +4,6 @@ import { t } from "ttag";
import ErrorBoundary from "metabase/ErrorBoundary";
import { AggregationPicker } from "metabase/common/components/AggregationPicker";
import { ClauseStep } from "metabase/querying/notebook/components/ClauseStep";
-import { color } from "metabase/ui/utils/colors";
import * as Lib from "metabase-lib";
const STAGE_INDEX = -1;
@@ -79,7 +78,7 @@ export function MeasureAggregationPicker({
items={aggregations}
initialAddText={t`Pick an aggregation function`}
readOnly={readOnly}
- color={color("summarize")}
+ color="summarize"
isLastOpened={false}
hasAddButton={hasAddButton}
hasRemoveButton={hasRemoveButton}
diff --git a/frontend/src/metabase/querying/notebook/components/ClauseStep/ClauseStep.tsx b/frontend/src/metabase/querying/notebook/components/ClauseStep/ClauseStep.tsx
index 5a6065cc45a..553352f9686 100644
--- a/frontend/src/metabase/querying/notebook/components/ClauseStep/ClauseStep.tsx
+++ b/frontend/src/metabase/querying/notebook/components/ClauseStep/ClauseStep.tsx
@@ -7,6 +7,7 @@ import { useMergedRef } from "@mantine/hooks";
import type { ReactNode, Ref } from "react";
import { forwardRef, useCallback } from "react";
+import type { ColorName } from "metabase/lib/colors/types";
import { Icon } from "metabase/ui";
import {
@@ -32,7 +33,7 @@ type RenderPopoverOpts<T> = {
};
export type ClauseStepProps<T> = {
- color: string;
+ color: ColorName;
items: T[];
initialAddText?: string;
readOnly?: boolean;
diff --git a/frontend/src/metabase/querying/segments/components/SegmentFilterEditor/SegmentFilterEditor.tsx b/frontend/src/metabase/querying/segments/components/SegmentFilterEditor/SegmentFilterEditor.tsx
index 1c71fa87686..08139558d1a 100644
--- a/frontend/src/metabase/querying/segments/components/SegmentFilterEditor/SegmentFilterEditor.tsx
+++ b/frontend/src/metabase/querying/segments/components/SegmentFilterEditor/SegmentFilterEditor.tsx
@@ -4,7 +4,6 @@ import { t } from "ttag";
import ErrorBoundary from "metabase/ErrorBoundary";
import { FilterPicker } from "metabase/querying/filters/components/FilterPicker";
import { ClauseStep } from "metabase/querying/notebook/components/ClauseStep";
-import { color } from "metabase/ui/utils/colors";
import * as Lib from "metabase-lib";
const STAGE_INDEX = -1;
@@ -65,7 +64,7 @@ export function SegmentFilterEditor({
items={filters}
initialAddText={t`Add filters to narrow your answer`}
readOnly={readOnly}
- color={color("filter")}
+ color="filter"
isLastOpened={false}
renderName={renderFilterName}
renderPopover={({ item: filter, index, onClose }) =>