Skip to content

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

Move the query pickers into querying (#79561)

Frasercc136d9725bf
diff --git a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/Summarize/SummarizePicker/SummarizePicker.tsx b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/Summarize/SummarizePicker/SummarizePicker.tsx
index 659c6ba13b9..9b726d4ee90 100644
--- a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/Summarize/SummarizePicker/SummarizePicker.tsx
+++ b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/Summarize/SummarizePicker/SummarizePicker.tsx
@@ -3,7 +3,7 @@ import { t } from "ttag";
import {
AggregationPicker,
type AggregationPickerProps,
-} from "metabase/common/components/AggregationPicker";
+} from "metabase/querying/common/components/AggregationPicker";
import * as Lib from "metabase-lib";
import { useSdkQuestionContext } from "../../../context";
diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/AddAggregationButton/AddAggregationButton.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/AddAggregationButton/AddAggregationButton.tsx
index fc144b09b8e..e0debcb020c 100644
--- a/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/AddAggregationButton/AddAggregationButton.tsx
+++ b/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/AddAggregationButton/AddAggregationButton.tsx
@@ -2,7 +2,7 @@ import type { ReactNode } from "react";
import { useState } from "react";
import { t } from "ttag";
-import { AggregationPicker } from "metabase/common/components/AggregationPicker";
+import { AggregationPicker } from "metabase/querying/common/components/AggregationPicker";
import { Button, Icon, Popover, Tooltip } from "metabase/ui";
import * as Lib from "metabase-lib";
diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/AggregationItem/AggregationItem.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/AggregationItem/AggregationItem.tsx
index 9e33bbe63dc..96c04c0229f 100644
--- a/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/AggregationItem/AggregationItem.tsx
+++ b/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/AggregationItem/AggregationItem.tsx
@@ -1,6 +1,6 @@
import { useDisclosure } from "@mantine/hooks";
-import { AggregationPicker } from "metabase/common/components/AggregationPicker";
+import { AggregationPicker } from "metabase/querying/common/components/AggregationPicker";
import { Box, Icon, Popover } from "metabase/ui";
import { PreventPopoverExitProvider } from "metabase/ui/components/utils/PreventPopoverExit";
import type * as Lib from "metabase-lib";
diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/BreakoutColumnList/BreakoutColumnListItem/BreakoutColumnListItem.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/BreakoutColumnList/BreakoutColumnListItem/BreakoutColumnListItem.tsx
index 7f483f7ccdb..0d1d9c801a7 100644
--- a/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/BreakoutColumnList/BreakoutColumnListItem/BreakoutColumnListItem.tsx
+++ b/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/BreakoutColumnList/BreakoutColumnListItem/BreakoutColumnListItem.tsx
@@ -8,8 +8,8 @@ import {
HoverParent,
QueryColumnInfoIcon,
} from "metabase/common/components/MetadataInfo/QueryColumnInfoIcon";
-import { ColumnBucketPickerPopover } from "metabase/common/components/QueryColumnPicker/ColumnBucketPickerPopover";
import { useTranslateContent } from "metabase/content-translation/hooks";
+import { ColumnBucketPickerPopover } from "metabase/querying/common/components/QueryColumnPicker/ColumnBucketPickerPopover";
import { Box, type BoxProps, Button, Flex, Icon, Tooltip } from "metabase/ui";
import * as Lib from "metabase-lib";
diff --git a/frontend/src/metabase/common/components/AggregationPicker/AggregationPicker.styled.tsx b/frontend/src/metabase/querying/common/components/AggregationPicker/AggregationPicker.styled.tsx
similarity index 100%
rename from frontend/src/metabase/common/components/AggregationPicker/AggregationPicker.styled.tsx
rename to frontend/src/metabase/querying/common/components/AggregationPicker/AggregationPicker.styled.tsx
diff --git a/frontend/src/metabase/common/components/AggregationPicker/AggregationPicker.tsx b/frontend/src/metabase/querying/common/components/AggregationPicker/AggregationPicker.tsx
similarity index 99%
rename from frontend/src/metabase/common/components/AggregationPicker/AggregationPicker.tsx
rename to frontend/src/metabase/querying/common/components/AggregationPicker/AggregationPicker.tsx
index 3bbe910f535..a2a129bfd80 100644
--- a/frontend/src/metabase/common/components/AggregationPicker/AggregationPicker.tsx
+++ b/frontend/src/metabase/querying/common/components/AggregationPicker/AggregationPicker.tsx
@@ -14,6 +14,7 @@ import {
import { Popover } from "metabase/common/components/MetadataInfo/Popover";
import { useToggle } from "metabase/common/hooks/use-toggle";
import { useTranslateContent } from "metabase/content-translation/hooks";
+import { QueryColumnPicker } from "metabase/querying/common/components/QueryColumnPicker";
import {
ExpressionWidget,
ExpressionWidgetHeader,
@@ -27,8 +28,6 @@ import { getMetadata } from "metabase/selectors/metadata";
import { Box, Flex, Icon, Text } from "metabase/ui";
import * as Lib from "metabase-lib";
-import { QueryColumnPicker } from "../QueryColumnPicker";
-
import {
ColumnPickerHeaderContainer,
ColumnPickerHeaderTitleContainer,
diff --git a/frontend/src/metabase/common/components/AggregationPicker/AggregationPicker.unit.spec.tsx b/frontend/src/metabase/querying/common/components/AggregationPicker/AggregationPicker.unit.spec.tsx
similarity index 100%
rename from frontend/src/metabase/common/components/AggregationPicker/AggregationPicker.unit.spec.tsx
rename to frontend/src/metabase/querying/common/components/AggregationPicker/AggregationPicker.unit.spec.tsx
diff --git a/frontend/src/metabase/common/components/AggregationPicker/index.ts b/frontend/src/metabase/querying/common/components/AggregationPicker/index.ts
similarity index 100%
rename from frontend/src/metabase/common/components/AggregationPicker/index.ts
rename to frontend/src/metabase/querying/common/components/AggregationPicker/index.ts
diff --git a/frontend/src/metabase/common/components/QueryColumnPicker/ColumnBucketPickerPopover/BinningStrategyPickerPopover.tsx b/frontend/src/metabase/querying/common/components/QueryColumnPicker/ColumnBucketPickerPopover/BinningStrategyPickerPopover.tsx
similarity index 100%
rename from frontend/src/metabase/common/components/QueryColumnPicker/ColumnBucketPickerPopover/BinningStrategyPickerPopover.tsx
rename to frontend/src/metabase/querying/common/components/QueryColumnPicker/ColumnBucketPickerPopover/BinningStrategyPickerPopover.tsx
diff --git a/frontend/src/metabase/common/components/QueryColumnPicker/ColumnBucketPickerPopover/ColumnBucketPickerPopover.tsx b/frontend/src/metabase/querying/common/components/QueryColumnPicker/ColumnBucketPickerPopover/ColumnBucketPickerPopover.tsx
similarity index 100%
rename from frontend/src/metabase/common/components/QueryColumnPicker/ColumnBucketPickerPopover/ColumnBucketPickerPopover.tsx
rename to frontend/src/metabase/querying/common/components/QueryColumnPicker/ColumnBucketPickerPopover/ColumnBucketPickerPopover.tsx
diff --git a/frontend/src/metabase/common/components/QueryColumnPicker/ColumnBucketPickerPopover/ColumnBucketPickerPopover.unit.spec.tsx b/frontend/src/metabase/querying/common/components/QueryColumnPicker/ColumnBucketPickerPopover/ColumnBucketPickerPopover.unit.spec.tsx
similarity index 100%
rename from frontend/src/metabase/common/components/QueryColumnPicker/ColumnBucketPickerPopover/ColumnBucketPickerPopover.unit.spec.tsx
rename to frontend/src/metabase/querying/common/components/QueryColumnPicker/ColumnBucketPickerPopover/ColumnBucketPickerPopover.unit.spec.tsx
diff --git a/frontend/src/metabase/common/components/QueryColumnPicker/ColumnBucketPickerPopover/TemporalBucketPickerPopover.tsx b/frontend/src/metabase/querying/common/components/QueryColumnPicker/ColumnBucketPickerPopover/TemporalBucketPickerPopover.tsx
similarity index 100%
rename from frontend/src/metabase/common/components/QueryColumnPicker/ColumnBucketPickerPopover/TemporalBucketPickerPopover.tsx
rename to frontend/src/metabase/querying/common/components/QueryColumnPicker/ColumnBucketPickerPopover/TemporalBucketPickerPopover.tsx
diff --git a/frontend/src/metabase/common/components/QueryColumnPicker/ColumnBucketPickerPopover/index.ts b/frontend/src/metabase/querying/common/components/QueryColumnPicker/ColumnBucketPickerPopover/index.ts
similarity index 100%
rename from frontend/src/metabase/common/components/QueryColumnPicker/ColumnBucketPickerPopover/index.ts
rename to frontend/src/metabase/querying/common/components/QueryColumnPicker/ColumnBucketPickerPopover/index.ts
diff --git a/frontend/src/metabase/common/components/QueryColumnPicker/ColumnBucketPickerPopover/types.ts b/frontend/src/metabase/querying/common/components/QueryColumnPicker/ColumnBucketPickerPopover/types.ts
similarity index 100%
rename from frontend/src/metabase/common/components/QueryColumnPicker/ColumnBucketPickerPopover/types.ts
rename to frontend/src/metabase/querying/common/components/QueryColumnPicker/ColumnBucketPickerPopover/types.ts
diff --git a/frontend/src/metabase/common/components/QueryColumnPicker/QueryColumnPicker.module.css b/frontend/src/metabase/querying/common/components/QueryColumnPicker/QueryColumnPicker.module.css
similarity index 100%
rename from frontend/src/metabase/common/components/QueryColumnPicker/QueryColumnPicker.module.css
rename to frontend/src/metabase/querying/common/components/QueryColumnPicker/QueryColumnPicker.module.css
diff --git a/frontend/src/metabase/common/components/QueryColumnPicker/QueryColumnPicker.tsx b/frontend/src/metabase/querying/common/components/QueryColumnPicker/QueryColumnPicker.tsx
similarity index 100%
rename from frontend/src/metabase/common/components/QueryColumnPicker/QueryColumnPicker.tsx
rename to frontend/src/metabase/querying/common/components/QueryColumnPicker/QueryColumnPicker.tsx
diff --git a/frontend/src/metabase/common/components/QueryColumnPicker/QueryColumnPicker.unit.spec.tsx b/frontend/src/metabase/querying/common/components/QueryColumnPicker/QueryColumnPicker.unit.spec.tsx
similarity index 100%
rename from frontend/src/metabase/common/components/QueryColumnPicker/QueryColumnPicker.unit.spec.tsx
rename to frontend/src/metabase/querying/common/components/QueryColumnPicker/QueryColumnPicker.unit.spec.tsx
diff --git a/frontend/src/metabase/common/components/QueryColumnPicker/index.ts b/frontend/src/metabase/querying/common/components/QueryColumnPicker/index.ts
similarity index 100%
rename from frontend/src/metabase/common/components/QueryColumnPicker/index.ts
rename to frontend/src/metabase/querying/common/components/QueryColumnPicker/index.ts
diff --git a/frontend/src/metabase/querying/components/expressions/CombineColumns/ColumnAndSeparatorRow/ColumnInput.tsx b/frontend/src/metabase/querying/components/expressions/CombineColumns/ColumnAndSeparatorRow/ColumnInput.tsx
index 0ab4bdf2163..c229c31a386 100644
--- a/frontend/src/metabase/querying/components/expressions/CombineColumns/ColumnAndSeparatorRow/ColumnInput.tsx
+++ b/frontend/src/metabase/querying/components/expressions/CombineColumns/ColumnAndSeparatorRow/ColumnInput.tsx
@@ -3,7 +3,7 @@ import type { FocusEvent, KeyboardEvent, MouseEvent } from "react";
import { useMemo, useRef, useState } from "react";
import { t } from "ttag";
-import { QueryColumnPicker } from "metabase/common/components/QueryColumnPicker";
+import { QueryColumnPicker } from "metabase/querying/common/components/QueryColumnPicker";
import { Button, FocusTrap, Icon, Input, Popover } from "metabase/ui";
import { color } from "metabase/ui/colors";
import { getThemeOverrides } from "metabase/ui/theme";
diff --git a/frontend/src/metabase/querying/components/expressions/ExtractColumn/ExtractColumn.tsx b/frontend/src/metabase/querying/components/expressions/ExtractColumn/ExtractColumn.tsx
index f85e2346338..a3de1385681 100644
--- a/frontend/src/metabase/querying/components/expressions/ExtractColumn/ExtractColumn.tsx
+++ b/frontend/src/metabase/querying/components/expressions/ExtractColumn/ExtractColumn.tsx
@@ -1,7 +1,7 @@
import { useMemo, useState } from "react";
import { t } from "ttag";
-import { QueryColumnPicker } from "metabase/common/components/QueryColumnPicker";
+import { QueryColumnPicker } from "metabase/querying/common/components/QueryColumnPicker";
import { getExample } from "metabase/querying/drills/utils/column-extract-drill";
import { Box, Button, Flex, Stack, Text, Title } from "metabase/ui";
import * as Lib from "metabase-lib";
diff --git a/frontend/src/metabase/querying/drills/utils/pivot-drill.tsx b/frontend/src/metabase/querying/drills/utils/pivot-drill.tsx
index f8d8c3ad759..a843d768b66 100644
--- a/frontend/src/metabase/querying/drills/utils/pivot-drill.tsx
+++ b/frontend/src/metabase/querying/drills/utils/pivot-drill.tsx
@@ -1,6 +1,6 @@
import { t } from "ttag";
-import { QueryColumnPicker } from "metabase/common/components/QueryColumnPicker";
+import { QueryColumnPicker } from "metabase/querying/common/components/QueryColumnPicker";
import { Box } from "metabase/ui";
import { ClickActionsView } from "metabase/visualizations/components/ClickActions";
import type {
diff --git a/frontend/src/metabase/querying/measures/components/MeasureAggregationPicker/MeasureAggregationPicker.tsx b/frontend/src/metabase/querying/measures/components/MeasureAggregationPicker/MeasureAggregationPicker.tsx
index a488069909a..2a52b44bfc3 100644
--- a/frontend/src/metabase/querying/measures/components/MeasureAggregationPicker/MeasureAggregationPicker.tsx
+++ b/frontend/src/metabase/querying/measures/components/MeasureAggregationPicker/MeasureAggregationPicker.tsx
@@ -2,7 +2,7 @@ import { useCallback, useMemo } from "react";
import { t } from "ttag";
import ErrorBoundary from "metabase/ErrorBoundary";
-import { AggregationPicker } from "metabase/common/components/AggregationPicker";
+import { AggregationPicker } from "metabase/querying/common/components/AggregationPicker";
import { ClauseStep } from "metabase/querying/notebook/components/ClauseStep";
import * as Lib from "metabase-lib";
diff --git a/frontend/src/metabase/querying/notebook/components/AggregateStep/AggregateStep.tsx b/frontend/src/metabase/querying/notebook/components/AggregateStep/AggregateStep.tsx
index 1c861ca9020..d98b6e086f2 100644
--- a/frontend/src/metabase/querying/notebook/components/AggregateStep/AggregateStep.tsx
+++ b/frontend/src/metabase/querying/notebook/components/AggregateStep/AggregateStep.tsx
@@ -1,10 +1,10 @@
import { useMemo } from "react";
import { t } from "ttag";
-import { AggregationPicker } from "metabase/common/components/AggregationPicker";
import { useLocale } from "metabase/common/hooks";
import { useTranslateContent } from "metabase/content-translation/hooks";
import { PLUGIN_CONTENT_TRANSLATION } from "metabase/plugins";
+import { AggregationPicker } from "metabase/querying/common/components/AggregationPicker";
import * as Lib from "metabase-lib";
import type { NotebookStepProps } from "../../types";
diff --git a/frontend/src/metabase/querying/notebook/components/BreakoutStep/BreakoutStep.tsx b/frontend/src/metabase/querying/notebook/components/BreakoutStep/BreakoutStep.tsx
index 7a07c809493..bbeeecc37a4 100644
--- a/frontend/src/metabase/querying/notebook/components/BreakoutStep/BreakoutStep.tsx
+++ b/frontend/src/metabase/querying/notebook/components/BreakoutStep/BreakoutStep.tsx
@@ -1,10 +1,10 @@
import { useMemo } from "react";
import { t } from "ttag";
-import { QueryColumnPicker } from "metabase/common/components/QueryColumnPicker";
import { useLocale } from "metabase/common/hooks";
import { useTranslateContent } from "metabase/content-translation/hooks";
import { PLUGIN_CONTENT_TRANSLATION } from "metabase/plugins";
+import { QueryColumnPicker } from "metabase/querying/common/components/QueryColumnPicker";
import * as Lib from "metabase-lib";
import type { NotebookStepProps } from "../../types";
diff --git a/frontend/src/metabase/querying/notebook/components/JoinStep/JoinConditionColumnPicker/JoinColumnDropdown/JoinColumnDropdown.tsx b/frontend/src/metabase/querying/notebook/components/JoinStep/JoinConditionColumnPicker/JoinColumnDropdown/JoinColumnDropdown.tsx
index 11039d84303..78c3f1f14fb 100644
--- a/frontend/src/metabase/querying/notebook/components/JoinStep/JoinConditionColumnPicker/JoinColumnDropdown/JoinColumnDropdown.tsx
+++ b/frontend/src/metabase/querying/notebook/components/JoinStep/JoinConditionColumnPicker/JoinColumnDropdown/JoinColumnDropdown.tsx
@@ -3,7 +3,7 @@ import { useMemo, useState } from "react";
import {
type ColumnListItem,
QueryColumnPicker,
-} from "metabase/common/components/QueryColumnPicker";
+} from "metabase/querying/common/components/QueryColumnPicker";
import * as Lib from "metabase-lib";
import {
diff --git a/frontend/src/metabase/querying/notebook/components/NotebookStep/NotebookStepPreview/NotebookStepPreview.tsx b/frontend/src/metabase/querying/notebook/components/NotebookStep/NotebookStepPreview/NotebookStepPreview.tsx
index c9e4321d0ad..c895d1af292 100644
--- a/frontend/src/metabase/querying/notebook/components/NotebookStep/NotebookStepPreview/NotebookStepPreview.tsx
+++ b/frontend/src/metabase/querying/notebook/components/NotebookStep/NotebookStepPreview/NotebookStepPreview.tsx
@@ -3,8 +3,6 @@ import { useMemo, useState } from "react";
import { t } from "ttag";
import { getErrorMessage } from "metabase/api/utils";
-import type { QuestionResultLoaderChildrenProps } from "metabase/common/components/QuestionResultLoader";
-import { QuestionResultLoader } from "metabase/common/components/QuestionResultLoader";
import CS from "metabase/css/core/index.css";
import { Box, Button, Flex, Icon } from "metabase/ui";
import { checkNotNull } from "metabase/utils/types";
@@ -16,6 +14,8 @@ import type { Dataset } from "metabase-types/api";
import type { NotebookStep } from "../../../types";
import S from "./NotebookStepPreview.module.css";
+import type { QuestionResultLoaderChildrenProps } from "./QuestionResultLoader";
+import { QuestionResultLoader } from "./QuestionResultLoader";
const PREVIEW_ROWS_LIMIT = 10;
diff --git a/frontend/src/metabase/common/components/QuestionResultLoader.tsx b/frontend/src/metabase/querying/notebook/components/NotebookStep/NotebookStepPreview/QuestionResultLoader.tsx
similarity index 100%
rename from frontend/src/metabase/common/components/QuestionResultLoader.tsx
rename to frontend/src/metabase/querying/notebook/components/NotebookStep/NotebookStepPreview/QuestionResultLoader.tsx
diff --git a/frontend/src/metabase/common/components/QuestionResultLoader.unit.spec.tsx b/frontend/src/metabase/querying/notebook/components/NotebookStep/NotebookStepPreview/QuestionResultLoader.unit.spec.tsx
similarity index 100%
rename from frontend/src/metabase/common/components/QuestionResultLoader.unit.spec.tsx
rename to frontend/src/metabase/querying/notebook/components/NotebookStep/NotebookStepPreview/QuestionResultLoader.unit.spec.tsx
diff --git a/frontend/src/metabase/querying/notebook/components/SortStep/SortStep.tsx b/frontend/src/metabase/querying/notebook/components/SortStep/SortStep.tsx
index 2a31a9635c7..0129c3cf3d8 100644
--- a/frontend/src/metabase/querying/notebook/components/SortStep/SortStep.tsx
+++ b/frontend/src/metabase/querying/notebook/components/SortStep/SortStep.tsx
@@ -1,10 +1,10 @@
import { useMemo } from "react";
import { t } from "ttag";
-import { QueryColumnPicker } from "metabase/common/components/QueryColumnPicker";
import { useLocale } from "metabase/common/hooks";
import { useTranslateContent } from "metabase/content-translation/hooks";
import { PLUGIN_CONTENT_TRANSLATION } from "metabase/plugins";
+import { QueryColumnPicker } from "metabase/querying/common/components/QueryColumnPicker";
import { Icon } from "metabase/ui";
import * as Lib from "metabase-lib";