The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
Move shared query_builder logic to querying (#71129)
Fraserf1c36719aabb
diff --git a/enterprise/frontend/src/metabase-enterprise/ai-entity-analysis/components/AIQuestionAnalysisSidebar/AIQuestionAnalysisSidebar.tsx b/enterprise/frontend/src/metabase-enterprise/ai-entity-analysis/components/AIQuestionAnalysisSidebar/AIQuestionAnalysisSidebar.tsxindex 48266e9fa42..6abe7146ac6 100644--- a/enterprise/frontend/src/metabase-enterprise/ai-entity-analysis/components/AIQuestionAnalysisSidebar/AIQuestionAnalysisSidebar.tsx+++ b/enterprise/frontend/src/metabase-enterprise/ai-entity-analysis/components/AIQuestionAnalysisSidebar/AIQuestionAnalysisSidebar.tsx@@ -3,9 +3,9 @@ import { usePrevious } from "react-use";import { t } from "ttag";import { CopyButton } from "metabase/common/components/CopyButton";+import { SidebarContent } from "metabase/common/components/SidebarContent";import { useSelector } from "metabase/lib/redux";import type { AIQuestionAnalysisSidebarProps } from "metabase/plugins";-import { SidebarContent } from "metabase/query_builder/components/SidebarContent";import { getIsLoadingComplete } from "metabase/query_builder/selectors";import { Box } from "metabase/ui";import {diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/components/MergeWorkspaceModal/components/DiffView.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/components/MergeWorkspaceModal/components/DiffView.tsxindex e49da4ad49d..70b0f1a4fab 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/components/MergeWorkspaceModal/components/DiffView.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/components/MergeWorkspaceModal/components/DiffView.tsx@@ -5,7 +5,7 @@ import { t } from "ttag";import _ from "underscore";import { CodeMirror } from "metabase/common/components/CodeMirror";-import EditorS from "metabase/query_builder/components/NativeQueryEditor/CodeMirrorEditor/CodeMirrorEditor.module.css";+import EditorS from "metabase/querying/components/CodeMirrorEditor/CodeMirrorEditor.module.css";import { Flex, Loader, Stack, Text } from "metabase/ui";import type {WorkspaceId,diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.tsx b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.tsxindex 78dffb4c440..49790aefdf0 100644--- a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.tsx@@ -14,7 +14,7 @@ import { CodeMirror } from "metabase/common/components/CodeMirror";import { useDispatch, useSelector } from "metabase/lib/redux";import * as Urls from "metabase/lib/urls";import { useMetadataToasts } from "metabase/metadata/hooks";-import EditorS from "metabase/query_builder/components/NativeQueryEditor/CodeMirrorEditor/CodeMirrorEditor.module.css";+import EditorS from "metabase/querying/components/CodeMirrorEditor/CodeMirrorEditor.module.css";import { getMetadata } from "metabase/selectors/metadata";import { getIsWorkspace } from "metabase/selectors/routing";import {diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonEditorBody/PythonEditorBody.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonEditorBody/PythonEditorBody.tsxindex 2f0c235298d..5b68aac9bcc 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonEditorBody/PythonEditorBody.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonEditorBody/PythonEditorBody.tsx@@ -7,7 +7,7 @@ import { t } from "ttag";import { clickableTokens } from "metabase/common/components/CodeMirror";import { useDispatch } from "metabase/lib/redux";import * as Urls from "metabase/lib/urls";-import { RunButtonWithTooltip } from "metabase/query_builder/components/RunButtonWithTooltip";+import { RunButtonWithTooltip } from "metabase/querying/components/QueryVisualization/RunButtonWithTooltip";import { Button, Flex, Icon, Stack, Tooltip } from "metabase/ui";import { SHARED_LIB_IMPORT_PATH } from "../../../constants";diff --git a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/Editor.tsx b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/Editor.tsxindex 264ba543221..d3fb5dd8286 100644--- a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/Editor.tsx+++ b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/Editor.tsx@@ -6,7 +6,7 @@ import { useSelector } from "metabase/lib/redux";import {isQuestionDirty,isQuestionRunnable,-} from "metabase/query_builder/utils/question";+} from "metabase/querying/common/utils/question";import { Notebook as QBNotebook } from "metabase/querying/notebook/components/Notebook";import { getMetadata } from "metabase/selectors/metadata";import { getSetting } from "metabase/selectors/settings";diff --git a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/ResetButton/ResetButton.tsx b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/ResetButton/ResetButton.tsxindex 2cebd593af6..30266799152 100644--- a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/ResetButton/ResetButton.tsx+++ b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/ResetButton/ResetButton.tsx@@ -2,7 +2,7 @@ import type { MouseEvent } from "react";import { ResetButton } from "embedding-sdk-bundle/components/private/ResetButton";import type { ButtonProps } from "embedding-sdk-bundle/types/ui";-import { isSavedQuestionChanged } from "metabase/query_builder/utils/question";+import { isSavedQuestionChanged } from "metabase/querying/common/utils/question";import * as Lib from "metabase-lib";import { useSdkQuestionContext } from "../../context";diff --git a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/SaveButton.tsx b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/SaveButton.tsxindex cdd4b0b23f5..bdfb2a9a87f 100644--- a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/SaveButton.tsx+++ b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/SaveButton.tsx@@ -3,7 +3,7 @@ import { t } from "ttag";import { useCollectionData } from "embedding-sdk-bundle/hooks/private/use-collection-data";import type { ButtonProps } from "embedding-sdk-bundle/types/ui";-import { isQuestionDirty } from "metabase/query_builder/utils/question";+import { isQuestionDirty } from "metabase/querying/common/utils/question";import * as Lib from "metabase-lib";import type Question from "metabase-lib/v1/Question";diff --git a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/Visualization.tsx b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/Visualization.tsxindex 0779cfac282..c122b56379b 100644--- a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/Visualization.tsx+++ b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/Visualization.tsx@@ -15,7 +15,7 @@ import { getIsGuestEmbed } from "embedding-sdk-bundle/store/selectors";import { useLocale } from "metabase/common/hooks/use-locale";import CS from "metabase/css/core/index.css";import { PLUGIN_CONTENT_TRANSLATION } from "metabase/plugins";-import { QueryVisualization } from "metabase/query_builder/components/QueryVisualization";+import { QueryVisualization } from "metabase/querying/components/QueryVisualization";import type Question from "metabase-lib/v1/Question";import type { CardDisplayType } from "metabase-types/api";diff --git a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/VisualizationButton/VisualizationButton.tsx b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/VisualizationButton/VisualizationButton.tsxindex d35f466a883..9f79bb9ce61 100644--- a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/VisualizationButton/VisualizationButton.tsx+++ b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/VisualizationButton/VisualizationButton.tsx@@ -4,7 +4,7 @@ import { t } from "ttag";import {isQuestionDirty,isQuestionRunnable,-} from "metabase/query_builder/utils/question";+} from "metabase/querying/common/utils/question";import { Button } from "metabase/ui";import { useSdkQuestionContext } from "../../context";diff --git a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/hooks/use-run-visualization.ts b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/hooks/use-run-visualization.tsindex 5b0fcaf8cd7..2e22838fedb 100644--- a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/hooks/use-run-visualization.ts+++ b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/hooks/use-run-visualization.ts@@ -1,7 +1,7 @@import { useMemo } from "react";import { transformSdkQuestion } from "metabase/embedding-sdk/lib/transform-question";-import { isQuestionDirty } from "metabase/query_builder/utils/question";+import { isQuestionDirty } from "metabase/querying/common/utils/question";import { useRunVisualization as useRunVisualizationCore } from "metabase/querying/notebook/components/Notebook";import type Question from "metabase-lib/v1/Question";diff --git a/frontend/src/metabase-types/store/qb.ts b/frontend/src/metabase-types/store/qb.tsindex 4aa4c3c5797..589b0d247e6 100644--- a/frontend/src/metabase-types/store/qb.ts+++ b/frontend/src/metabase-types/store/qb.ts@@ -1,5 +1,5 @@import type { Deferred } from "metabase/lib/promise";-import type { QueryModalType } from "metabase/query_builder/constants";+import type { QueryModalType } from "metabase/querying/constants";import type { Widget } from "metabase/visualizations/types";import type {Card,diff --git a/frontend/src/metabase/actions/containers/ActionCreator/ActionCreator.styled.tsx b/frontend/src/metabase/actions/containers/ActionCreator/ActionCreator.styled.tsxindex 114a05621f9..27e01d2087e 100644--- a/frontend/src/metabase/actions/containers/ActionCreator/ActionCreator.styled.tsx+++ b/frontend/src/metabase/actions/containers/ActionCreator/ActionCreator.styled.tsx@@ -1,7 +1,7 @@// eslint-disable-next-line no-restricted-importsimport styled from "@emotion/styled";-import SidebarContentS from "metabase/query_builder/components/SidebarContent/SidebarContent.module.css";+import SidebarContentS from "metabase/common/components/SidebarContent/SidebarContent.module.css";export const ActionCreatorBodyContainer = styled.div`display: grid;diff --git a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormCreator.tsx b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormCreator.tsxindex febe9470156..6d7d3d70342 100644--- a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormCreator.tsx+++ b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormCreator.tsx@@ -3,13 +3,13 @@ import { useCallback, useEffect, useMemo, useState } from "react";import { t } from "ttag";import _ from "underscore";+import { SidebarContent } from "metabase/common/components/SidebarContent";import type {DragEndEvent,RenderItemProps,} from "metabase/common/components/Sortable";import { Sortable, SortableList } from "metabase/common/components/Sortable";import { Form, FormProvider } from "metabase/forms";-import { SidebarContent } from "metabase/query_builder/components/SidebarContent";import { Flex, Icon, UnstyledButton } from "metabase/ui";import type {ActionFormSettings,diff --git a/frontend/src/metabase/actions/containers/ActionCreator/InlineActionSettings.tsx b/frontend/src/metabase/actions/containers/ActionCreator/InlineActionSettings.tsxindex 29f3beaebda..9f9f1db196b 100644--- a/frontend/src/metabase/actions/containers/ActionCreator/InlineActionSettings.tsx+++ b/frontend/src/metabase/actions/containers/ActionCreator/InlineActionSettings.tsx@@ -6,12 +6,12 @@ import { Button } from "metabase/common/components/Button";import { ConfirmModal } from "metabase/common/components/ConfirmModal";import { CopyWidget } from "metabase/common/components/CopyWidget";import { FormField } from "metabase/common/components/FormField";+import { SidebarContent } from "metabase/common/components/SidebarContent";import { TextArea } from "metabase/common/components/TextArea";import { useUniqueId } from "metabase/common/hooks/use-unique-id";import { Actions } from "metabase/entities/actions/actions";import { connect } from "metabase/lib/redux";import * as Urls from "metabase/lib/urls";-import { SidebarContent } from "metabase/query_builder/components/SidebarContent";import { getSetting } from "metabase/selectors/settings";import { getUserIsAdmin } from "metabase/selectors/user";import { Switch, Tooltip } from "metabase/ui";diff --git a/frontend/src/metabase/actions/containers/ActionCreator/InlineDataReference.tsx b/frontend/src/metabase/actions/containers/ActionCreator/InlineDataReference.tsxindex a140b1ff26a..9f71873c95d 100644--- a/frontend/src/metabase/actions/containers/ActionCreator/InlineDataReference.tsx+++ b/frontend/src/metabase/actions/containers/ActionCreator/InlineDataReference.tsx@@ -2,8 +2,8 @@ import { useState } from "react";import { t } from "ttag";import { Button } from "metabase/common/components/Button";-import { DataReference } from "metabase/query_builder/components/dataref/DataReference";-import type { DataReferenceItem } from "metabase/query_builder/components/dataref/types";+import { DataReference } from "metabase/querying/components/DataReference/DataReference";+import type { DataReferenceItem } from "metabase/querying/components/DataReference/types";import { Tooltip } from "metabase/ui";export const DataReferenceInline = ({diff --git a/frontend/src/metabase/common/components/AggregationPicker/AggregationPicker.tsx b/frontend/src/metabase/common/components/AggregationPicker/AggregationPicker.tsxindex fb77be86fac..0f38ea26022 100644--- a/frontend/src/metabase/common/components/AggregationPicker/AggregationPicker.tsx+++ b/frontend/src/metabase/common/components/AggregationPicker/AggregationPicker.tsx@@ -18,7 +18,7 @@ import { useSelector } from "metabase/lib/redux";import {ExpressionWidget,ExpressionWidgetHeader,-} from "metabase/query_builder/components/expressions";+} from "metabase/querying/components/expressions";import {type DefinedClauseName,type MBQLClauseFunctionConfig,diff --git a/frontend/src/metabase/query_builder/components/SidebarContent/SidebarContent.module.css b/frontend/src/metabase/common/components/SidebarContent/SidebarContent.module.csssimilarity index 100%rename from frontend/src/metabase/query_builder/components/SidebarContent/SidebarContent.module.cssrename to frontend/src/metabase/common/components/SidebarContent/SidebarContent.module.cssdiff --git a/frontend/src/metabase/query_builder/components/SidebarContent/SidebarContent.tsx b/frontend/src/metabase/common/components/SidebarContent/SidebarContent.tsxsimilarity index 97%rename from frontend/src/metabase/query_builder/components/SidebarContent/SidebarContent.tsxrename to frontend/src/metabase/common/components/SidebarContent/SidebarContent.tsxindex 2e70f52c348..c87ef449eb0 100644--- a/frontend/src/metabase/query_builder/components/SidebarContent/SidebarContent.tsx+++ b/frontend/src/metabase/common/components/SidebarContent/SidebarContent.tsx@@ -12,7 +12,7 @@ import {} from "metabase/ui";import { SidebarHeader } from "../SidebarHeader";-import { ViewButton } from "../view/ViewButton";+import { ViewButton } from "../ViewButton";import SidebarContentS from "./SidebarContent.module.css";diff --git a/frontend/src/metabase/query_builder/components/SidebarContent/index.ts b/frontend/src/metabase/common/components/SidebarContent/index.tssimilarity index 100%rename from frontend/src/metabase/query_builder/components/SidebarContent/index.tsrename to frontend/src/metabase/common/components/SidebarContent/index.tsdiff --git a/frontend/src/metabase/query_builder/components/SidebarHeader/SidebarHeader.module.css b/frontend/src/metabase/common/components/SidebarHeader/SidebarHeader.module.csssimilarity index 100%rename from frontend/src/metabase/query_builder/components/SidebarHeader/SidebarHeader.module.cssrename to frontend/src/metabase/common/components/SidebarHeader/SidebarHeader.module.cssdiff --git a/frontend/src/metabase/query_builder/components/SidebarHeader/SidebarHeader.tsx b/frontend/src/metabase/common/components/SidebarHeader/SidebarHeader.tsxsimilarity index 100%rename from frontend/src/metabase/query_builder/components/SidebarHeader/SidebarHeader.tsxrename to frontend/src/metabase/common/components/SidebarHeader/SidebarHeader.tsxdiff --git a/frontend/src/metabase/query_builder/components/SidebarHeader/index.ts b/frontend/src/metabase/common/components/SidebarHeader/index.tssimilarity index 100%rename from frontend/src/metabase/query_builder/components/SidebarHeader/index.tsrename to frontend/src/metabase/common/components/SidebarHeader/index.tsdiff --git a/frontend/src/metabase/query_builder/components/view/ViewButton.module.css b/frontend/src/metabase/common/components/ViewButton/ViewButton.module.csssimilarity index 100%rename from frontend/src/metabase/query_builder/components/view/ViewButton.module.cssrename to frontend/src/metabase/common/components/ViewButton/ViewButton.module.cssdiff --git a/frontend/src/metabase/query_builder/components/view/ViewButton.tsx b/frontend/src/metabase/common/components/ViewButton/ViewButton.tsxsimilarity index 100%rename from frontend/src/metabase/query_builder/components/view/ViewButton.tsxrename to frontend/src/metabase/common/components/ViewButton/ViewButton.tsxdiff --git a/frontend/src/metabase/common/components/ViewButton/index.ts b/frontend/src/metabase/common/components/ViewButton/index.tsnew file mode 100644index 00000000000..5ded89ba711--- /dev/null+++ b/frontend/src/metabase/common/components/ViewButton/index.ts@@ -0,0 +1 @@+export { ViewButton } from "./ViewButton";diff --git a/frontend/src/metabase/data-studio/common/components/OverviewVisualization/OverviewVisualization.tsx b/frontend/src/metabase/data-studio/common/components/OverviewVisualization/OverviewVisualization.tsxindex e3daf8307e3..f63d0fe4bd3 100644--- a/frontend/src/metabase/data-studio/common/components/OverviewVisualization/OverviewVisualization.tsx+++ b/frontend/src/metabase/data-studio/common/components/OverviewVisualization/OverviewVisualization.tsx@@ -7,7 +7,7 @@ import {} from "metabase/api";import { DebouncedFrame } from "metabase/common/components/DebouncedFrame";import { useSelector } from "metabase/lib/redux";-import { QueryVisualization } from "metabase/query_builder/components/QueryVisualization";+import { QueryVisualization } from "metabase/querying/components/QueryVisualization";import { getMetadata } from "metabase/selectors/metadata";import Question from "metabase-lib/v1/Question";import type { Card } from "metabase-types/api";diff --git a/frontend/src/metabase/embedding/components/SharingMenu/QuestionSharingMenu.tsx b/frontend/src/metabase/embedding/components/SharingMenu/QuestionSharingMenu.tsxindex 9d29f24c67c..88892fe25eb 100644--- a/frontend/src/metabase/embedding/components/SharingMenu/QuestionSharingMenu.tsx+++ b/frontend/src/metabase/embedding/components/SharingMenu/QuestionSharingMenu.tsx@@ -5,7 +5,7 @@ import { useSetting } from "metabase/common/hooks";import { GUEST_EMBED_EMBEDDING_TYPE } from "metabase/embedding/constants";import { useDispatch, useSelector } from "metabase/lib/redux";import { setUIControls } from "metabase/query_builder/actions";-import { MODAL_TYPES } from "metabase/query_builder/constants";+import { MODAL_TYPES } from "metabase/querying/constants";import {canManageSubscriptions as canManageSubscriptionsSelector,getUserIsAdmin,diff --git a/frontend/src/metabase/list-view/components/ListView/ListViewConfiguration.tsx b/frontend/src/metabase/list-view/components/ListView/ListViewConfiguration.tsxindex a175cea68d3..9dcb2ff268e 100644--- a/frontend/src/metabase/list-view/components/ListView/ListViewConfiguration.tsx+++ b/frontend/src/metabase/list-view/components/ListView/ListViewConfiguration.tsx@@ -16,7 +16,7 @@ import {ReorderableTagsInput,SortablePill,} from "metabase/common/components/ReorderableTagsInput/ReorderableTagsInput";-import { getColumnExample } from "metabase/query_builder/components/expressions/CombineColumns/util";+import { getColumnExample } from "metabase/querying/components/expressions/CombineColumns/util";import {ActionIcon,Box,diff --git a/frontend/src/metabase/query_builder/analytics.js b/frontend/src/metabase/query_builder/analytics.jsindex e0742310bd6..19fa96247a3 100644--- a/frontend/src/metabase/query_builder/analytics.js+++ b/frontend/src/metabase/query_builder/analytics.js@@ -1,5 +1,4 @@import { trackSchemaEvent, trackSimpleEvent } from "metabase/lib/analytics";-import * as Lib from "metabase-lib";export const trackNewQuestionSaved = (draftQuestion,@@ -33,60 +32,6 @@ export const trackNotebookNativePreviewShown = (question, isShown) => {});};-export const trackColumnCombineViaShortcut = (query, question) => {- trackSchemaEvent("question", {- event: "column_combine_via_shortcut",- custom_expressions_used: ["concat"],- database_id: Lib.databaseID(query),- question_id: question?.id() ?? 0,- });-};--export const trackColumnCombineViaPlusModal = (query, question) => {- trackSchemaEvent("question", {- event: "column_combine_via_plus_modal",- custom_expressions_used: ["concat"],- database_id: Lib.databaseID(query),- question_id: question?.id() ?? 0,- });-};--export const trackColumnExtractViaShortcut = (- query,- stageIndex,- extraction,- question,-) => {- trackSchemaEvent("question", {- event: "column_extract_via_shortcut",- custom_expressions_used: Lib.functionsUsedByExtraction(- query,- stageIndex,- extraction,- ),- database_id: Lib.databaseID(query),- question_id: question?.id() ?? 0,- });-};--export const trackColumnExtractViaPlusModal = (- query,- stageIndex,- extraction,- question,-) => {- trackSchemaEvent("question", {- event: "column_extract_via_plus_modal",- custom_expressions_used: Lib.functionsUsedByExtraction(- query,- stageIndex,- extraction,- ),- database_id: Lib.databaseID(query),- question_id: question?.id() ?? 0,- });-};-export const trackFirstNonTableChartGenerated = (card) => {trackSimpleEvent({event: "chart_generated",diff --git a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditorInner.tsx b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditorInner.tsxindex 4ed82e9d66a..805a654b40b 100644--- a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditorInner.tsx+++ b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditorInner.tsx@@ -33,12 +33,8 @@ import {updateQuestion as updateQuestionAction,} from "metabase/query_builder/actions";import { getInitialEditorHeight } from "metabase/query_builder/components/NativeQueryEditor/utils";-import { QueryVisualization } from "metabase/query_builder/components/QueryVisualization";-import { DataReference } from "metabase/query_builder/components/dataref/DataReference";-import { SnippetSidebar } from "metabase/query_builder/components/template_tags/SnippetSidebar/SnippetSidebar";import { TagEditorSidebar } from "metabase/query_builder/components/template_tags/TagEditorSidebar";import { ViewSidebar } from "metabase/query_builder/components/view/ViewSidebar";-import { MODAL_TYPES } from "metabase/query_builder/constants";import {getDatasetEditorTab,getIsListViewConfigurationShown,@@ -49,6 +45,11 @@ import {isResultsMetadataDirty,} from "metabase/query_builder/selectors";import { getWritableColumnProperties } from "metabase/query_builder/utils";+import { DataReference } from "metabase/querying/components/DataReference/DataReference";+import type { DataReferenceItem } from "metabase/querying/components/DataReference/types";+import { QueryVisualization } from "metabase/querying/components/QueryVisualization";+import { SnippetSidebar } from "metabase/querying/components/SnippetSidebar";+import { MODAL_TYPES } from "metabase/querying/constants";import { getMetadata } from "metabase/selectors/metadata";import { Box, Flex, Icon, Tooltip } from "metabase/ui";import {@@ -76,8 +77,6 @@ import type {} from "metabase-types/api";import type { DatasetEditorTab, QueryBuilderMode } from "metabase-types/store";-import type { DataReferenceItem } from "../dataref/types";-import DatasetEditorS from "./DatasetEditor.module.css";import {DatasetEditorSettingsSidebar,diff --git a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetFieldMetadataSidebar/DatasetFieldMetadataSidebar.jsx b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetFieldMetadataSidebar/DatasetFieldMetadataSidebar.jsxindex fbf784fecf7..a596aee410d 100644--- a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetFieldMetadataSidebar/DatasetFieldMetadataSidebar.jsx+++ b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetFieldMetadataSidebar/DatasetFieldMetadataSidebar.jsx@@ -3,6 +3,7 @@ import { memo, useCallback, useEffect, useMemo, useRef, useState } from "react";import { t } from "ttag";import _ from "underscore";+import { SidebarContent } from "metabase/common/components/SidebarContent";import {canIndexField,fieldHasIndex,@@ -16,7 +17,6 @@ import {FormTextarea,} from "metabase/forms";import { FIELD_VISIBILITY_TYPES } from "metabase/lib/core";-import { SidebarContent } from "metabase/query_builder/components/SidebarContent";import { Box, Radio, Stack, Tabs } from "metabase/ui";import { color } from "metabase/ui/colors";import {diff --git a/frontend/src/metabase/query_builder/components/LimitPopover.tsx b/frontend/src/metabase/query_builder/components/LimitPopover.tsxindex f381f145ba2..d96d81eea30 100644--- a/frontend/src/metabase/query_builder/components/LimitPopover.tsx+++ b/frontend/src/metabase/query_builder/components/LimitPopover.tsx@@ -5,7 +5,7 @@ import { t } from "ttag";import { Radio } from "metabase/common/components/Radio";import CS from "metabase/css/core/index.css";import { formatNumber } from "metabase/lib/formatting";-import { LimitInput } from "metabase/query_builder/components/LimitInput";+import { LimitInput } from "metabase/querying/components/LimitInput";import { HARD_ROW_LIMIT } from "metabase-lib/v1/queries/utils";interface CustomRowLimitProps {diff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditor.tsx b/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditor.tsxindex 9fe46aed0fb..c3da8a91fbf 100644--- a/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditor.tsx+++ b/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditor.tsx@@ -15,8 +15,17 @@ import { useListCollectionsQuery, useListSnippetsQuery } from "metabase/api";import { useSelector } from "metabase/lib/redux";import { PLUGIN_METABOT, PLUGIN_REMOTE_SYNC } from "metabase/plugins";import { SnippetFormModal } from "metabase/query_builder/components/template_tags/SnippetFormModal";-import type { QueryModalType } from "metabase/query_builder/constants";import { useNotebookScreenSize } from "metabase/query_builder/hooks/use-notebook-screen-size";+import {+ CodeMirrorEditor,+ type CodeMirrorEditorProps,+ type CodeMirrorEditorRef,+} from "metabase/querying/components/CodeMirrorEditor";+import type { QueryModalType } from "metabase/querying/constants";+import type {+ SelectionRange,+ SidebarFeatures,+} from "metabase/querying/editor/types";import { Button, Flex, Icon, Stack, Tooltip } from "metabase/ui";import * as Lib from "metabase-lib";import type Question from "metabase-lib/v1/Question";@@ -30,11 +39,6 @@ import type {ParameterId,} from "metabase-types/api";-import {- CodeMirrorEditor,- type CodeMirrorEditorProps,- type CodeMirrorEditorRef,-} from "./CodeMirrorEditor";import S from "./NativeQueryEditor.module.css";import { NativeQueryEditorRunButton } from "./NativeQueryEditorRunButton/NativeQueryEditorRunButton";import { NativeQueryEditorTopBar } from "./NativeQueryEditorTopBar/NativeQueryEditorTopBar";@@ -45,7 +49,6 @@ import {RESIZE_CONSTRAINT_OFFSET,THRESHOLD_FOR_AUTO_CLOSE,} from "./constants";-import type { SelectionRange, SidebarFeatures } from "./types";import {canFormatForEngine,formatQuery,diff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditorActionButtons/NativeQueryEditorActionButtons.tsx b/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditorActionButtons/NativeQueryEditorActionButtons.tsxindex 4456c54f813..fb055dcd191 100644--- a/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditorActionButtons/NativeQueryEditorActionButtons.tsx+++ b/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditorActionButtons/NativeQueryEditorActionButtons.tsx@@ -4,13 +4,12 @@ import { DataReferenceButton } from "metabase/query_builder/components/view/Dataimport { NativeVariablesButton } from "metabase/query_builder/components/view/NativeVariablesButton";import { PreviewQueryButton } from "metabase/query_builder/components/view/PreviewQueryButton";import { SnippetSidebarButton } from "metabase/query_builder/components/view/SnippetSidebarButton";-import type { QueryModalType } from "metabase/query_builder/constants";+import type { QueryModalType } from "metabase/querying/constants";+import type { SidebarFeatures } from "metabase/querying/editor/types";import { Button, Flex, Icon, Tooltip } from "metabase/ui";import type Question from "metabase-lib/v1/Question";import type { Collection, NativeQuerySnippet } from "metabase-types/api";-import type { SidebarFeatures } from "../types";-import S from "./NativeQueryEditorActionButtons.module.css";const ICON_SIZE = 18;diff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditorRunButton/NativeQueryEditorRunButton.tsx b/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditorRunButton/NativeQueryEditorRunButton.tsxindex 5e06ed7f7b4..31cdf87662f 100644--- a/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditorRunButton/NativeQueryEditorRunButton.tsx+++ b/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditorRunButton/NativeQueryEditorRunButton.tsx@@ -1,7 +1,7 @@import { t } from "ttag";import { METAKEY } from "metabase/lib/browser";-import { RunButtonWithTooltip } from "metabase/query_builder/components/RunButtonWithTooltip";+import { RunButtonWithTooltip } from "metabase/querying/components/QueryVisualization/RunButtonWithTooltip";import type * as Lib from "metabase-lib";import S from "./NativeQueryEditorRunButton.module.css";diff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditorTopBar/NativeQueryEditorTopBar.tsx b/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditorTopBar/NativeQueryEditorTopBar.tsxindex 12f511b0004..e70e0c76825 100644--- a/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditorTopBar/NativeQueryEditorTopBar.tsx+++ b/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditorTopBar/NativeQueryEditorTopBar.tsx@@ -2,7 +2,8 @@ import { type PropsWithChildren, forwardRef } from "react";import { useDispatch } from "metabase/lib/redux";import { updateQuestion } from "metabase/query_builder/actions/core";-import type { QueryModalType } from "metabase/query_builder/constants";+import type { QueryModalType } from "metabase/querying/constants";+import type { SidebarFeatures } from "metabase/querying/editor/types";import { Flex } from "metabase/ui";import type Question from "metabase-lib/v1/Question";import type Database from "metabase-lib/v1/metadata/Database";@@ -19,7 +20,6 @@ import { ResponsiveParametersList } from "../../ResponsiveParametersList";import { DataSourceSelectors } from "../DataSourceSelectors/DataSourceSelectors";import { NativeQueryEditorActionButtons } from "../NativeQueryEditorActionButtons/NativeQueryEditorActionButtons";import { VisibilityToggler } from "../VisibilityToggler/VisibilityToggler";-import type { SidebarFeatures } from "../types";interface NativeQueryEditorTopBarProps extends PropsWithChildren {question: Question;diff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/index.ts b/frontend/src/metabase/query_builder/components/NativeQueryEditor/index.tsindex 7335df89693..733e5488046 100644--- a/frontend/src/metabase/query_builder/components/NativeQueryEditor/index.ts+++ b/frontend/src/metabase/query_builder/components/NativeQueryEditor/index.ts@@ -1,2 +1,2 @@export { NativeQueryEditor } from "./NativeQueryEditor";-export { type SelectionRange } from "./types";+export { type SelectionRange } from "metabase/querying/editor/types";diff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/types.tsx b/frontend/src/metabase/query_builder/components/NativeQueryEditor/types.tsxdeleted file mode 100644index 4ef023c1f87..00000000000--- a/frontend/src/metabase/query_builder/components/NativeQueryEditor/types.tsx+++ /dev/null@@ -1,17 +0,0 @@-export type Location = {- row: number;- column: number;-};--export type SelectionRange = {- start: Location;- end: Location;-};--export type SidebarFeatures = {- dataReference?: boolean;- variables?: boolean;- snippets?: boolean;- promptInput?: boolean;- formatQuery?: boolean;-};diff --git a/frontend/src/metabase/query_builder/components/QueryModals/QueryModals.tsx b/frontend/src/metabase/query_builder/components/QueryModals/QueryModals.tsxindex c623db6dbdb..370410258c2 100644--- a/frontend/src/metabase/query_builder/components/QueryModals/QueryModals.tsx+++ b/frontend/src/metabase/query_builder/components/QueryModals/QueryModals.tsx@@ -17,9 +17,8 @@ import { ImpossibleToCreateModelModal } from "metabase/query_builder/components/import { NewDatasetModal } from "metabase/query_builder/components/NewDatasetModal";import { QuestionEmbedWidget } from "metabase/query_builder/components/QuestionEmbedWidget";import { PreviewQueryModal } from "metabase/query_builder/components/view/PreviewQueryModal";-import type { QueryModalType } from "metabase/query_builder/constants";-import { MODAL_TYPES } from "metabase/query_builder/constants";import { getQuestionWithoutComposing } from "metabase/query_builder/selectors";+import { MODAL_TYPES, type QueryModalType } from "metabase/querying/constants";import { ArchiveCardModal } from "metabase/questions/components/ArchiveCardModal";import { MoveCardModal } from "metabase/questions/components/MoveCardModal";import EditEventModal from "metabase/timelines/questions/containers/EditEventModal";diff --git a/frontend/src/metabase/query_builder/components/QueryVisualization.unit.spec.tsx b/frontend/src/metabase/query_builder/components/QueryVisualization.unit.spec.tsxindex 0640d9875e5..fd5bd575e43 100644--- a/frontend/src/metabase/query_builder/components/QueryVisualization.unit.spec.tsx+++ b/frontend/src/metabase/query_builder/components/QueryVisualization.unit.spec.tsx@@ -1,7 +1,6 @@import { renderWithProviders, screen } from "__support__/ui";import { PLUGIN_SELECTORS } from "metabase/plugins";--import { VisualizationRunningState } from "./QueryVisualization";+import { VisualizationRunningState } from "metabase/querying/components/QueryVisualization";type SetupOpts = {customMessage?: (isSlow?: boolean) => string;diff --git a/frontend/src/metabase/query_builder/components/Warnings.unit.spec.js b/frontend/src/metabase/query_builder/components/Warnings.unit.spec.jsindex 7e7ca284d56..4bc5ef44f2f 100644--- a/frontend/src/metabase/query_builder/components/Warnings.unit.spec.js+++ b/frontend/src/metabase/query_builder/components/Warnings.unit.spec.js@@ -1,7 +1,7 @@import userEvent from "@testing-library/user-event";import { render, screen } from "__support__/ui";-import { Warnings } from "metabase/query_builder/components/Warnings";+import { Warnings } from "metabase/querying/components/QueryVisualization/Warnings";describe("Warnings", () => {it("should render a warning icon", () => {diff --git a/frontend/src/metabase/query_builder/components/template_tags/TagEditorHelp/TagEditorHelp.tsx b/frontend/src/metabase/query_builder/components/template_tags/TagEditorHelp/TagEditorHelp.tsxindex c4fb516e23e..b363d20d8ba 100644--- a/frontend/src/metabase/query_builder/components/template_tags/TagEditorHelp/TagEditorHelp.tsx+++ b/frontend/src/metabase/query_builder/components/template_tags/TagEditorHelp/TagEditorHelp.tsx@@ -221,7 +221,7 @@ const TagExample = ({ datasetQuery, setDatasetQuery }: TagExampleProps) => (interface TagEditorHelpProps {database?: Database | null;- sampleDatabaseId: DatabaseId;+ sampleDatabaseId?: DatabaseId;setDatasetQuery: (datasetQuery: NativeDatasetQuery, run?: boolean) => void;switchToSettings: () => void;}diff --git a/frontend/src/metabase/query_builder/components/template_tags/TagEditorSidebar.tsx b/frontend/src/metabase/query_builder/components/template_tags/TagEditorSidebar.tsxindex 7b5c6b3ee32..1e37cf6943e 100644--- a/frontend/src/metabase/query_builder/components/template_tags/TagEditorSidebar.tsx+++ b/frontend/src/metabase/query_builder/components/template_tags/TagEditorSidebar.tsx@@ -2,8 +2,8 @@ import { useState } from "react";import { t } from "ttag";import _ from "underscore";+import { SidebarContent } from "metabase/common/components/SidebarContent";import type { EmbeddingParameterVisibility } from "metabase/public/lib/types";-import { SidebarContent } from "metabase/query_builder/components/SidebarContent";import { Box, Tabs } from "metabase/ui";import type Question from "metabase-lib/v1/Question";import type Database from "metabase-lib/v1/metadata/Database";@@ -32,7 +32,7 @@ interface TagEditorSidebarProps {query: NativeQuery;databases?: Database[];question: Question;- sampleDatabaseId: DatabaseId;+ sampleDatabaseId?: DatabaseId;setDatasetQuery: (query: NativeDatasetQuery) => void;setTemplateTag: (tag: TemplateTag) => void;setTemplateTagConfig?: (diff --git a/frontend/src/metabase/query_builder/components/view/PreviewQueryButton/PreviewQueryButton.tsx b/frontend/src/metabase/query_builder/components/view/PreviewQueryButton/PreviewQueryButton.tsxindex 42323127157..cb8641d8ac7 100644--- a/frontend/src/metabase/query_builder/components/view/PreviewQueryButton/PreviewQueryButton.tsx+++ b/frontend/src/metabase/query_builder/components/view/PreviewQueryButton/PreviewQueryButton.tsx@@ -2,8 +2,7 @@ import { useCallback } from "react";import { t } from "ttag";import { IconButtonWrapper } from "metabase/common/components/IconButtonWrapper";-import type { QueryModalType } from "metabase/query_builder/constants";-import { MODAL_TYPES } from "metabase/query_builder/constants";+import { MODAL_TYPES, type QueryModalType } from "metabase/querying/constants";import { Icon, Tooltip } from "metabase/ui";import * as Lib from "metabase-lib";import type Question from "metabase-lib/v1/Question";diff --git a/frontend/src/metabase/query_builder/components/view/View/NativeQueryRightSidebar/NativeQueryRightSidebar.tsx b/frontend/src/metabase/query_builder/components/view/View/NativeQueryRightSidebar/NativeQueryRightSidebar.tsxindex 24211ee99dc..46a04448f56 100644--- a/frontend/src/metabase/query_builder/components/view/View/NativeQueryRightSidebar/NativeQueryRightSidebar.tsx+++ b/frontend/src/metabase/query_builder/components/view/View/NativeQueryRightSidebar/NativeQueryRightSidebar.tsx@@ -2,13 +2,13 @@ import { match } from "ts-pattern";import { PLUGIN_AI_ENTITY_ANALYSIS } from "metabase/plugins";import type { EmbeddingParameterVisibility } from "metabase/public/lib/types";-import { DataReference } from "metabase/query_builder/components/dataref/DataReference";-import type { DataReferenceItem } from "metabase/query_builder/components/dataref/types";-import { SnippetSidebar } from "metabase/query_builder/components/template_tags/SnippetSidebar";import { TagEditorSidebar } from "metabase/query_builder/components/template_tags/TagEditorSidebar";import { QuestionInfoSidebar } from "metabase/query_builder/components/view/sidebars/QuestionInfoSidebar";import { QuestionSettingsSidebar } from "metabase/query_builder/components/view/sidebars/QuestionSettingsSidebar";import { TimelineSidebar } from "metabase/query_builder/components/view/sidebars/TimelineSidebar";+import { DataReference } from "metabase/querying/components/DataReference/DataReference";+import type { DataReferenceItem } from "metabase/querying/components/DataReference/types";+import { SnippetSidebar } from "metabase/querying/components/SnippetSidebar";import type Question from "metabase-lib/v1/Question";import type Database from "metabase-lib/v1/metadata/Database";import type {diff --git a/frontend/src/metabase/query_builder/components/view/View/ViewMainContainer/ViewMainContainer.tsx b/frontend/src/metabase/query_builder/components/view/View/ViewMainContainer/ViewMainContainer.tsxindex 00911425518..2509171cb3b 100644--- a/frontend/src/metabase/query_builder/components/view/View/ViewMainContainer/ViewMainContainer.tsx+++ b/frontend/src/metabase/query_builder/components/view/View/ViewMainContainer/ViewMainContainer.tsx@@ -4,13 +4,13 @@ import type { ResizableBoxProps } from "react-resizable";import { DebouncedFrame } from "metabase/common/components/DebouncedFrame";import CS from "metabase/css/core/index.css";+import { SyncedParametersList } from "metabase/query_builder/components/SyncedParametersList";+import { QueryVisualization } from "metabase/querying/components/QueryVisualization";+import type { QueryModalType } from "metabase/querying/constants";import type {SelectionRange,SidebarFeatures,-} from "metabase/query_builder/components/NativeQueryEditor/types";-import { QueryVisualization } from "metabase/query_builder/components/QueryVisualization";-import { SyncedParametersList } from "metabase/query_builder/components/SyncedParametersList";-import type { QueryModalType } from "metabase/query_builder/constants";+} from "metabase/querying/editor/types";import { TimeseriesChrome } from "metabase/querying/filters/components/TimeseriesChrome";import { Box } from "metabase/ui";import type { Mode } from "metabase/visualizations/click-actions/Mode";diff --git a/frontend/src/metabase/query_builder/components/view/View/ViewNativeQueryEditor/ViewNativeQueryEditor.tsx b/frontend/src/metabase/query_builder/components/view/View/ViewNativeQueryEditor/ViewNativeQueryEditor.tsxindex 3f01ce55b78..3de06fc388a 100644--- a/frontend/src/metabase/query_builder/components/view/View/ViewNativeQueryEditor/ViewNativeQueryEditor.tsx+++ b/frontend/src/metabase/query_builder/components/view/View/ViewNativeQueryEditor/ViewNativeQueryEditor.tsx@@ -3,12 +3,12 @@ import type { ResizableBoxProps } from "react-resizable";import { useSelector } from "metabase/lib/redux";import { useInlineSQLPrompt } from "metabase/metabot/components/MetabotInlineSQLPrompt";import { NativeQueryEditor } from "metabase/query_builder/components/NativeQueryEditor";+import { getHighlightedNativeQueryLineNumbers } from "metabase/query_builder/selectors";+import type { QueryModalType } from "metabase/querying/constants";import type {SelectionRange,SidebarFeatures,-} from "metabase/query_builder/components/NativeQueryEditor/types";-import type { QueryModalType } from "metabase/query_builder/constants";-import { getHighlightedNativeQueryLineNumbers } from "metabase/query_builder/selectors";+} from "metabase/querying/editor/types";import { Box } from "metabase/ui";import * as Lib from "metabase-lib";import type Question from "metabase-lib/v1/Question";diff --git a/frontend/src/metabase/query_builder/components/view/ViewFooter/LeftViewFooterButtonGroup.tsx b/frontend/src/metabase/query_builder/components/view/ViewFooter/LeftViewFooterButtonGroup.tsxindex 7e62f8cbfc8..81ce9c1198e 100644--- a/frontend/src/metabase/query_builder/components/view/ViewFooter/LeftViewFooterButtonGroup.tsx+++ b/frontend/src/metabase/query_builder/components/view/ViewFooter/LeftViewFooterButtonGroup.tsx@@ -2,6 +2,7 @@ import cx from "classnames";import { t } from "ttag";import { ButtonGroup } from "metabase/common/components/ButtonGroup";+import { ViewButton } from "metabase/common/components/ViewButton";import CS from "metabase/css/core/index.css";import { useDispatch, useSelector } from "metabase/lib/redux";import { useRegisterShortcut } from "metabase/palette/hooks/useRegisterShortcut";@@ -11,7 +12,6 @@ import {onOpenChartSettings,onOpenChartType,} from "metabase/query_builder/actions";-import { ViewButton } from "metabase/query_builder/components/view/ViewButton";import { getQuestion, getUiControls } from "metabase/query_builder/selectors";import { Group } from "metabase/ui";import type { QueryBuilderUIControls } from "metabase-types/store";diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/ViewTitleHeader.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/ViewTitleHeader.tsxindex 0789de3358f..20d58ca5125 100644--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/ViewTitleHeader.tsx+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/ViewTitleHeader.tsx@@ -4,7 +4,7 @@ import { useEffect } from "react";import { usePrevious } from "react-use";import { useToggle } from "metabase/common/hooks/use-toggle";-import type { QueryModalType } from "metabase/query_builder/constants";+import type { QueryModalType } from "metabase/querying/constants";import { Flex } from "metabase/ui";import * as Lib from "metabase-lib";import type Question from "metabase-lib/v1/Question";diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/AdHocQuestionLeftSide/AdHocQuestionLeftSide.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/AdHocQuestionLeftSide/AdHocQuestionLeftSide.tsxindex f3e6b2ac3ce..9324850d06a 100644--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/AdHocQuestionLeftSide/AdHocQuestionLeftSide.tsx+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/AdHocQuestionLeftSide/AdHocQuestionLeftSide.tsx@@ -1,8 +1,7 @@import type React from "react";import { t } from "ttag";-import type { QueryModalType } from "metabase/query_builder/constants";-import { MODAL_TYPES } from "metabase/query_builder/constants";+import { MODAL_TYPES, type QueryModalType } from "metabase/querying/constants";import { Box, Flex } from "metabase/ui";import * as Lib from "metabase-lib";import type Question from "metabase-lib/v1/Question";diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ExploreResultsLink.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ExploreResultsLink.tsxindex 2910307423c..ef071f15af9 100644--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ExploreResultsLink.tsx+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ExploreResultsLink.tsx@@ -1,7 +1,7 @@import { t } from "ttag";import { Link } from "metabase/common/components/Link";-import { ViewButton } from "metabase/query_builder/components/view/ViewButton";+import { ViewButton } from "metabase/common/components/ViewButton";import type Question from "metabase-lib/v1/Question";import { getUrl as ML_getUrl } from "metabase-lib/v1/urls";diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionActions.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionActions.tsxindex 0ae11817372..86452298383 100644--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionActions.tsx+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionActions.tsx@@ -10,7 +10,7 @@ import { getLibraryCollectionType } from "metabase/data-studio/utils";import { useDispatch } from "metabase/lib/redux";import { useRegisterShortcut } from "metabase/palette/hooks/useRegisterShortcut";import { QuestionMoreActionsMenu } from "metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionMoreActionsMenu";-import type { QueryModalType } from "metabase/query_builder/constants";+import type { QueryModalType } from "metabase/querying/constants";import { uploadFile } from "metabase/redux/uploads";import { Box, Divider, Icon, Menu } from "metabase/ui";import type Question from "metabase-lib/v1/Question";diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionActions.unit.spec.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionActions.unit.spec.tsxindex 77a4a08bd4f..a1ac6048e6b 100644--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionActions.unit.spec.tsx+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionActions.unit.spec.tsx@@ -12,7 +12,7 @@ import {within,} from "__support__/ui";import * as modelActions from "metabase/query_builder/actions/models";-import { MODAL_TYPES } from "metabase/query_builder/constants";+import { MODAL_TYPES } from "metabase/querying/constants";import { getMetadata } from "metabase/selectors/metadata";import type Question from "metabase-lib/v1/Question";import type { Card } from "metabase-types/api";diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionMoreActionsMenu/QuestionMoreActionsMenu.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionMoreActionsMenu/QuestionMoreActionsMenu.tsxindex bc8662f685d..b2188b9ec86 100644--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionMoreActionsMenu/QuestionMoreActionsMenu.tsx+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionMoreActionsMenu/QuestionMoreActionsMenu.tsx@@ -17,11 +17,8 @@ import {import { trackTurnIntoModelClicked } from "metabase/query_builder/analytics";import { DatasetMetadataStrengthIndicator } from "metabase/query_builder/components/view/sidebars/DatasetManagementSection/DatasetMetadataStrengthIndicator";import { shouldShowQuestionSettingsSidebar } from "metabase/query_builder/components/view/sidebars/QuestionSettingsSidebar";-import {- MODAL_TYPES,- type QueryModalType,-} from "metabase/query_builder/constants";import { getQuestionWithoutComposing } from "metabase/query_builder/selectors";+import { MODAL_TYPES, type QueryModalType } from "metabase/querying/constants";import { canManageSubscriptions as canManageSubscriptionsSelector } from "metabase/selectors/user";import { Icon, Menu } from "metabase/ui";import * as Lib from "metabase-lib";diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ViewTitleHeaderRightSide/ViewTitleHeaderRightSide.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ViewTitleHeaderRightSide/ViewTitleHeaderRightSide.tsxindex 891b3f85f53..3179092a263 100644--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ViewTitleHeaderRightSide/ViewTitleHeaderRightSide.tsx+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ViewTitleHeaderRightSide/ViewTitleHeaderRightSide.tsx@@ -9,10 +9,9 @@ import { useSelector } from "metabase/lib/redux";import MetabaseSettings from "metabase/lib/settings";import { useRegisterShortcut } from "metabase/palette/hooks/useRegisterShortcut";import { PLUGIN_AI_ENTITY_ANALYSIS } from "metabase/plugins";-import { RunButtonWithTooltip } from "metabase/query_builder/components/RunButtonWithTooltip";import { canExploreResults } from "metabase/query_builder/components/view/ViewHeader/utils";-import type { QueryModalType } from "metabase/query_builder/constants";-import { MODAL_TYPES } from "metabase/query_builder/constants";+import { RunButtonWithTooltip } from "metabase/querying/components/QueryVisualization/RunButtonWithTooltip";+import { MODAL_TYPES, type QueryModalType } from "metabase/querying/constants";import { getUserCanWriteToCollections } from "metabase/selectors/user";import { Box, Button, Flex, Tooltip } from "metabase/ui";import * as Lib from "metabase-lib";diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/ChartSettingsSidebar.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/ChartSettingsSidebar.tsxindex 8d9e02b1452..28cc5ff0668 100644--- a/frontend/src/metabase/query_builder/components/view/sidebars/ChartSettingsSidebar.tsx+++ b/frontend/src/metabase/query_builder/components/view/sidebars/ChartSettingsSidebar.tsx@@ -2,6 +2,7 @@ import { memo, useCallback, useMemo } from "react";import { t } from "ttag";import ErrorBoundary from "metabase/ErrorBoundary";+import { SidebarContent } from "metabase/common/components/SidebarContent";import CS from "metabase/css/core/index.css";import { useDispatch, useSelector } from "metabase/lib/redux";import {@@ -9,7 +10,6 @@ import {onOpenChartType,onReplaceAllVisualizationSettings,} from "metabase/query_builder/actions";-import { SidebarContent } from "metabase/query_builder/components/SidebarContent";import {getUiControls,getVisualizationSettings,diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/ChartTypeSidebar/ChartTypeSidebar.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/ChartTypeSidebar/ChartTypeSidebar.tsxindex 259e3e926e0..3ee635e7c5d 100644--- a/frontend/src/metabase/query_builder/components/view/sidebars/ChartTypeSidebar/ChartTypeSidebar.tsx+++ b/frontend/src/metabase/query_builder/components/view/sidebars/ChartTypeSidebar/ChartTypeSidebar.tsx@@ -2,6 +2,7 @@ import cx from "classnames";import { useMemo } from "react";import { t } from "ttag";+import { SidebarContent } from "metabase/common/components/SidebarContent";import CS from "metabase/css/core/index.css";import { useDispatch } from "metabase/lib/redux";import {@@ -10,7 +11,6 @@ import {setUIControls,updateQuestion,} from "metabase/query_builder/actions";-import { SidebarContent } from "metabase/query_builder/components/SidebarContent";import {ChartTypeSettings,type GetSensibleVisualizationsProps,diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/SummarizeSidebar.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/SummarizeSidebar.tsxindex 165a8e139ec..92b3b02c58e 100644--- a/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/SummarizeSidebar.tsx+++ b/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/SummarizeSidebar.tsx@@ -2,7 +2,7 @@ import cx from "classnames";import { useCallback } from "react";import { t } from "ttag";-import { SidebarContent } from "metabase/query_builder/components/SidebarContent";+import { SidebarContent } from "metabase/common/components/SidebarContent";import type { UpdateQueryHookProps } from "metabase/query_builder/hooks/types";import { useDefaultQueryAggregation } from "metabase/query_builder/hooks/use-default-query-aggregation";import { Divider } from "metabase/ui";diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/TimelineSidebar/TimelineSidebar.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/TimelineSidebar/TimelineSidebar.tsxindex bec2f0c1dd9..e8e6cbae8d8 100644--- a/frontend/src/metabase/query_builder/components/view/sidebars/TimelineSidebar/TimelineSidebar.tsx+++ b/frontend/src/metabase/query_builder/components/view/sidebars/TimelineSidebar/TimelineSidebar.tsx@@ -2,9 +2,8 @@ import type { Dayjs } from "dayjs";import { useCallback } from "react";import { t } from "ttag";-import { SidebarContent } from "metabase/query_builder/components/SidebarContent";-import type { QueryModalType } from "metabase/query_builder/constants";-import { MODAL_TYPES } from "metabase/query_builder/constants";+import { SidebarContent } from "metabase/common/components/SidebarContent";+import { MODAL_TYPES, type QueryModalType } from "metabase/querying/constants";import TimelinePanel from "metabase/timelines/questions/containers/TimelinePanel";import type Question from "metabase-lib/v1/Question";import type { Timeline, TimelineEvent } from "metabase-types/api";diff --git a/frontend/src/metabase/query_builder/constants.ts b/frontend/src/metabase/query_builder/constants.tsindex 605ef4924dd..250cee3e1e5 100644--- a/frontend/src/metabase/query_builder/constants.ts+++ b/frontend/src/metabase/query_builder/constants.ts@@ -1,25 +1,4 @@-export const MODAL_TYPES = {- SAVE: "save",- ADD_TO_DASHBOARD: "add-to-dashboard",- MOVE: "move",- CLONE: "clone",- ARCHIVE: "archive",- CREATE_ALERT: "create-alert",- SAVE_QUESTION_BEFORE_EMBED: "save-question-before-embed",- TURN_INTO_DATASET: "turn-into-dataset",- CAN_NOT_CREATE_MODEL: "can-not-create-model",- NEW_EVENT: "new-event",- EDIT_EVENT: "edit-event",- MOVE_EVENT: "move-event",- PREVIEW_QUERY: "preview-query",- QUESTION_EMBED: "question-embed",-} as const;--export type QueryModalType = (typeof MODAL_TYPES)[keyof typeof MODAL_TYPES];-export const SIDEBAR_SIZES = {NORMAL: 355,TIMELINE: 300,};--export const VISUALIZATION_SLOW_TIMEOUT = 15 * 1000;diff --git a/frontend/src/metabase/query_builder/containers/QueryBuilder.tsx b/frontend/src/metabase/query_builder/containers/QueryBuilder.tsxindex 054ceae8cd6..80060999b20 100644--- a/frontend/src/metabase/query_builder/containers/QueryBuilder.tsx+++ b/frontend/src/metabase/query_builder/containers/QueryBuilder.tsx@@ -19,6 +19,11 @@ import { Bookmarks } from "metabase/entities/bookmarks";import { Timelines } from "metabase/entities/timelines";import { usePageTitleWithLoadingTime } from "metabase/hooks/use-page-title";import { connect, useSelector } from "metabase/lib/redux";+import { VISUALIZATION_SLOW_TIMEOUT } from "metabase/querying/constants";+import {+ getDatabasesList,+ getSampleDatabaseId,+} from "metabase/querying/selectors";import { closeNavbar } from "metabase/redux/app";import { getIsNavbarOpen } from "metabase/selectors/app";import { getMetadata } from "metabase/selectors/metadata";@@ -39,11 +44,9 @@ import type { QueryBuilderUIControls, State } from "metabase-types/store";import * as actions from "../actions";import { trackCardBookmarkAdded } from "../analytics";import { View } from "../components/view/View";-import { VISUALIZATION_SLOW_TIMEOUT } from "../constants";import {getCard,getDataReferenceStack,- getDatabasesList,getDocumentTitle,getEmbeddedParameterVisibility,getFilteredTimelines,@@ -73,7 +76,6 @@ import {getQueryStartTime,getQuestion,getRawSeries,- getSampleDatabaseId,getSelectedTimelineEventIds,getShouldShowUnsavedChangesWarning,getSnippetCollectionId,diff --git a/frontend/src/metabase/query_builder/selectors.js b/frontend/src/metabase/query_builder/selectors.jsindex 315d24f2040..c65b84ce8db 100644--- a/frontend/src/metabase/query_builder/selectors.js+++ b/frontend/src/metabase/query_builder/selectors.js@@ -5,12 +5,16 @@ import { merge, updateIn } from "icepick";import _ from "underscore";import { LOAD_COMPLETE_FAVICON } from "metabase/common/hooks/constants";-import { Databases } from "metabase/entities/databases";import { cleanIndexFlags } from "metabase/entities/model-indexes/actions";import { Timelines } from "metabase/entities/timelines";import { parseTimestamp } from "metabase/lib/time-dayjs";import { getSortedTimelines } from "metabase/lib/timelines";import { isNotNull } from "metabase/lib/types";+import {+ isQuestionDirty,+ isQuestionRunnable,+ isSavedQuestionChanged,+} from "metabase/querying/common/utils/question";import {getEmbedOptions,getIsEmbeddingIframe,@@ -42,11 +46,6 @@ import { isAbsoluteDateTimeUnit } from "metabase-types/guards/date-time";import { getQuestionWithDefaultVisualizationSettings } from "./actions/core/utils";import { createRawSeries, getWritableColumnProperties } from "./utils";-import {- isQuestionDirty,- isQuestionRunnable,- isSavedQuestionChanged,-} from "./utils/question";// This selector can be called from public questions / dashboards, which do not have state.qbexport const getUiControls = (state) => state.qb?.uiControls;@@ -129,20 +128,6 @@ export const getDatabaseId = createSelector(export const getTableForeignKeyReferences = (state) =>state.qb.tableForeignKeyReferences;-const getDatabasesListDefaultValue = [];-export const getDatabasesList = (state) =>- Databases.selectors.getList(state, {- entityQuery: { include: "tables", saved: true },- }) || getDatabasesListDefaultValue;--export const getSampleDatabaseId = createSelector(- [getDatabasesList],- (databases) => {- const sampleDatabase = _.findWhere(databases, { is_sample: true });- return sampleDatabase && sampleDatabase.id;- },-);-export const getParameters = createSelector([getCard, getMetadata, getParameterValues],(card, metadata, parameterValues) =>diff --git a/frontend/src/metabase/querying/analytics.ts b/frontend/src/metabase/querying/analytics.tsindex 786ce53f77d..56d22e12d9a 100644--- a/frontend/src/metabase/querying/analytics.ts+++ b/frontend/src/metabase/querying/analytics.ts@@ -31,3 +31,63 @@ export const trackColumnExtractViaHeader = (question_id: question?.id() ?? 0,});};++export const trackColumnCombineViaShortcut = (+ query: Lib.Query,+ question?: Question,+) => {+ trackSchemaEvent("question", {+ event: "column_combine_via_shortcut",+ custom_expressions_used: ["concat"],+ database_id: Lib.databaseID(query),+ question_id: question?.id() ?? 0,+ });+};++export const trackColumnCombineViaPlusModal = (+ query: Lib.Query,+ question?: Question,+) => {+ trackSchemaEvent("question", {+ event: "column_combine_via_plus_modal",+ custom_expressions_used: ["concat"],+ database_id: Lib.databaseID(query),+ question_id: question?.id() ?? 0,+ });+};++export const trackColumnExtractViaShortcut = (+ query: Lib.Query,+ stageIndex: number,+ extraction: Lib.ColumnExtraction,+ question?: Question,+) => {+ trackSchemaEvent("question", {+ event: "column_extract_via_shortcut",+ custom_expressions_used: Lib.functionsUsedByExtraction(+ query,+ stageIndex,+ extraction,+ ),+ database_id: Lib.databaseID(query),+ question_id: question?.id() ?? 0,+ });+};++export const trackColumnExtractViaPlusModal = (+ query: Lib.Query,+ stageIndex: number,+ extraction: Lib.ColumnExtraction,+ question?: Question,+) => {+ trackSchemaEvent("question", {+ event: "column_extract_via_plus_modal",+ custom_expressions_used: Lib.functionsUsedByExtraction(+ query,+ stageIndex,+ extraction,+ ),+ database_id: Lib.databaseID(query),+ question_id: question?.id() ?? 0,+ });+};diff --git a/frontend/src/metabase/query_builder/utils/question.ts b/frontend/src/metabase/querying/common/utils/question.tssimilarity index 100%rename from frontend/src/metabase/query_builder/utils/question.tsrename to frontend/src/metabase/querying/common/utils/question.tsdiff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/CodeMirrorEditor/CodeMirrorEditor.module.css b/frontend/src/metabase/querying/components/CodeMirrorEditor/CodeMirrorEditor.module.csssimilarity index 100%rename from frontend/src/metabase/query_builder/components/NativeQueryEditor/CodeMirrorEditor/CodeMirrorEditor.module.cssrename to frontend/src/metabase/querying/components/CodeMirrorEditor/CodeMirrorEditor.module.cssdiff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/CodeMirrorEditor/CodeMirrorEditor.tsx b/frontend/src/metabase/querying/components/CodeMirrorEditor/CodeMirrorEditor.tsxsimilarity index 98%rename from frontend/src/metabase/query_builder/components/NativeQueryEditor/CodeMirrorEditor/CodeMirrorEditor.tsxrename to frontend/src/metabase/querying/components/CodeMirrorEditor/CodeMirrorEditor.tsxindex 273ba0322ba..4164b3cdf2b 100644--- a/frontend/src/metabase/query_builder/components/NativeQueryEditor/CodeMirrorEditor/CodeMirrorEditor.tsx+++ b/frontend/src/metabase/querying/components/CodeMirrorEditor/CodeMirrorEditor.tsx@@ -19,7 +19,7 @@ import { useLlmSqlGenerationEnabled } from "metabase/metabot/hooks";import * as Lib from "metabase-lib";import type { CardId } from "metabase-types/api";-import type { SelectionRange } from "../types";+import type { SelectionRange } from "../../editor/types";import S from "./CodeMirrorEditor.module.css";import { useExtensions } from "./extensions";diff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/CodeMirrorEditor/CodeMirrorEditor.unit.spec.tsx b/frontend/src/metabase/querying/components/CodeMirrorEditor/CodeMirrorEditor.unit.spec.tsxsimilarity index 100%rename from frontend/src/metabase/query_builder/components/NativeQueryEditor/CodeMirrorEditor/CodeMirrorEditor.unit.spec.tsxrename to frontend/src/metabase/querying/components/CodeMirrorEditor/CodeMirrorEditor.unit.spec.tsxdiff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/CodeMirrorEditor/completers.tsx b/frontend/src/metabase/querying/components/CodeMirrorEditor/completers.tsxsimilarity index 100%rename from frontend/src/metabase/query_builder/components/NativeQueryEditor/CodeMirrorEditor/completers.tsxrename to frontend/src/metabase/querying/components/CodeMirrorEditor/completers.tsxdiff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/CodeMirrorEditor/completers.unit.spec.tsx b/frontend/src/metabase/querying/components/CodeMirrorEditor/completers.unit.spec.tsxsimilarity index 100%rename from frontend/src/metabase/query_builder/components/NativeQueryEditor/CodeMirrorEditor/completers.unit.spec.tsxrename to frontend/src/metabase/querying/components/CodeMirrorEditor/completers.unit.spec.tsxdiff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/CodeMirrorEditor/extensions.tsx b/frontend/src/metabase/querying/components/CodeMirrorEditor/extensions.tsxsimilarity index 100%rename from frontend/src/metabase/query_builder/components/NativeQueryEditor/CodeMirrorEditor/extensions.tsxrename to frontend/src/metabase/querying/components/CodeMirrorEditor/extensions.tsxdiff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/CodeMirrorEditor/index.tsx b/frontend/src/metabase/querying/components/CodeMirrorEditor/index.tsxsimilarity index 100%rename from frontend/src/metabase/query_builder/components/NativeQueryEditor/CodeMirrorEditor/index.tsxrename to frontend/src/metabase/querying/components/CodeMirrorEditor/index.tsxdiff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/CodeMirrorEditor/language.ts b/frontend/src/metabase/querying/components/CodeMirrorEditor/language.tssimilarity index 100%rename from frontend/src/metabase/query_builder/components/NativeQueryEditor/CodeMirrorEditor/language.tsrename to frontend/src/metabase/querying/components/CodeMirrorEditor/language.tsdiff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/CodeMirrorEditor/util.tsx b/frontend/src/metabase/querying/components/CodeMirrorEditor/util.tsxsimilarity index 98%rename from frontend/src/metabase/query_builder/components/NativeQueryEditor/CodeMirrorEditor/util.tsxrename to frontend/src/metabase/querying/components/CodeMirrorEditor/util.tsxindex f4a6b2cf659..008cf1b8c2e 100644--- a/frontend/src/metabase/query_builder/components/NativeQueryEditor/CodeMirrorEditor/util.tsx+++ b/frontend/src/metabase/querying/components/CodeMirrorEditor/util.tsx@@ -9,7 +9,7 @@ import { isNotNull } from "metabase/lib/types";import * as Lib from "metabase-lib";import type { CardId, CardType } from "metabase-types/api";-import type { Location, SelectionRange as Range } from "../types";+import type { Location, SelectionRange as Range } from "../../editor/types";export function convertIndexToPosition(value: string, index: number): Location {let row = 0;diff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/CodeMirrorEditor/util.unit.spec.tsx b/frontend/src/metabase/querying/components/CodeMirrorEditor/util.unit.spec.tsxsimilarity index 100%rename from frontend/src/metabase/query_builder/components/NativeQueryEditor/CodeMirrorEditor/util.unit.spec.tsxrename to frontend/src/metabase/querying/components/CodeMirrorEditor/util.unit.spec.tsxdiff --git a/frontend/src/metabase/query_builder/components/dataref/ConnectedTableList.tsx b/frontend/src/metabase/querying/components/DataReference/ConnectedTableList.tsxsimilarity index 100%rename from frontend/src/metabase/query_builder/components/dataref/ConnectedTableList.tsxrename to frontend/src/metabase/querying/components/DataReference/ConnectedTableList.tsxdiff --git a/frontend/src/metabase/query_builder/components/dataref/DataReference.tsx b/frontend/src/metabase/querying/components/DataReference/DataReference.tsxsimilarity index 100%rename from frontend/src/metabase/query_builder/components/dataref/DataReference.tsxrename to frontend/src/metabase/querying/components/DataReference/DataReference.tsxdiff --git a/frontend/src/metabase/query_builder/components/dataref/DatabasePane.tsx b/frontend/src/metabase/querying/components/DataReference/DatabasePane.tsxsimilarity index 98%rename from frontend/src/metabase/query_builder/components/dataref/DatabasePane.tsxrename to frontend/src/metabase/querying/components/DataReference/DatabasePane.tsxindex dd82bad8203..fddef7c3f2d 100644--- a/frontend/src/metabase/query_builder/components/dataref/DatabasePane.tsx+++ b/frontend/src/metabase/querying/components/DataReference/DatabasePane.tsx@@ -10,13 +10,13 @@ import {} from "metabase/api";import { getCollectionName } from "metabase/collections/utils";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import { SidebarContent } from "metabase/common/components/SidebarContent";import { Tree } from "metabase/common/components/tree";import type {ITreeNodeItem,TreeNodeProps,} from "metabase/common/components/tree/types";import CS from "metabase/css/core/index.css";-import { SidebarContent } from "metabase/query_builder/components/SidebarContent";import {type Card,type CollectionId,diff --git a/frontend/src/metabase/query_builder/components/dataref/DatabasePane.unit.spec.tsx b/frontend/src/metabase/querying/components/DataReference/DatabasePane.unit.spec.tsxsimilarity index 100%rename from frontend/src/metabase/query_builder/components/dataref/DatabasePane.unit.spec.tsxrename to frontend/src/metabase/querying/components/DataReference/DatabasePane.unit.spec.tsxdiff --git a/frontend/src/metabase/query_builder/components/dataref/FieldList.tsx b/frontend/src/metabase/querying/components/DataReference/FieldList.tsxsimilarity index 100%rename from frontend/src/metabase/query_builder/components/dataref/FieldList.tsxrename to frontend/src/metabase/querying/components/DataReference/FieldList.tsxdiff --git a/frontend/src/metabase/query_builder/components/dataref/FieldList.unit.spec.tsx b/frontend/src/metabase/querying/components/DataReference/FieldList.unit.spec.tsxsimilarity index 100%rename from frontend/src/metabase/query_builder/components/dataref/FieldList.unit.spec.tsxrename to frontend/src/metabase/querying/components/DataReference/FieldList.unit.spec.tsxdiff --git a/frontend/src/metabase/query_builder/components/dataref/FieldPane.tsx b/frontend/src/metabase/querying/components/DataReference/FieldPane.tsxsimilarity index 97%rename from frontend/src/metabase/query_builder/components/dataref/FieldPane.tsxrename to frontend/src/metabase/querying/components/DataReference/FieldPane.tsxindex 82cb55ccfcf..126e8d510ff 100644--- a/frontend/src/metabase/query_builder/components/dataref/FieldPane.tsx+++ b/frontend/src/metabase/querying/components/DataReference/FieldPane.tsx@@ -6,7 +6,7 @@ import {} from "metabase/api";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { TableColumnInfo } from "metabase/common/components/MetadataInfo/ColumnInfo";-import { SidebarContent } from "metabase/query_builder/components/SidebarContent";+import { SidebarContent } from "metabase/common/components/SidebarContent";import { getQuestionIdFromVirtualTableId } from "metabase-lib/v1/metadata/utils/saved-questions";import type { FieldId } from "metabase-types/api";diff --git a/frontend/src/metabase/query_builder/components/dataref/MainPane.tsx b/frontend/src/metabase/querying/components/DataReference/MainPane.tsxsimilarity index 94%rename from frontend/src/metabase/query_builder/components/dataref/MainPane.tsxrename to frontend/src/metabase/querying/components/DataReference/MainPane.tsxindex 66f48c314cd..635d0db04a7 100644--- a/frontend/src/metabase/query_builder/components/dataref/MainPane.tsx+++ b/frontend/src/metabase/querying/components/DataReference/MainPane.tsx@@ -3,8 +3,8 @@ import { t } from "ttag";import { useListDatabasesQuery } from "metabase/api";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import { SidebarContent } from "metabase/common/components/SidebarContent";import CS from "metabase/css/core/index.css";-import { SidebarContent } from "metabase/query_builder/components/SidebarContent";import {NodeListItemIcon,diff --git a/frontend/src/metabase/query_builder/components/dataref/NodeList.module.css b/frontend/src/metabase/querying/components/DataReference/NodeList.module.csssimilarity index 100%rename from frontend/src/metabase/query_builder/components/dataref/NodeList.module.cssrename to frontend/src/metabase/querying/components/DataReference/NodeList.module.cssdiff --git a/frontend/src/metabase/query_builder/components/dataref/NodeList.tsx b/frontend/src/metabase/querying/components/DataReference/NodeList.tsxsimilarity index 100%rename from frontend/src/metabase/query_builder/components/dataref/NodeList.tsxrename to frontend/src/metabase/querying/components/DataReference/NodeList.tsxdiff --git a/frontend/src/metabase/query_builder/components/dataref/QuestionPane/QuestionPane.module.css b/frontend/src/metabase/querying/components/DataReference/QuestionPane/QuestionPane.module.csssimilarity index 100%rename from frontend/src/metabase/query_builder/components/dataref/QuestionPane/QuestionPane.module.cssrename to frontend/src/metabase/querying/components/DataReference/QuestionPane/QuestionPane.module.cssdiff --git a/frontend/src/metabase/query_builder/components/dataref/QuestionPane/QuestionPane.tsx b/frontend/src/metabase/querying/components/DataReference/QuestionPane/QuestionPane.tsxsimilarity index 98%rename from frontend/src/metabase/query_builder/components/dataref/QuestionPane/QuestionPane.tsxrename to frontend/src/metabase/querying/components/DataReference/QuestionPane/QuestionPane.tsxindex 4b18842b16c..cb0948fe494 100644--- a/frontend/src/metabase/query_builder/components/dataref/QuestionPane/QuestionPane.tsx+++ b/frontend/src/metabase/querying/components/DataReference/QuestionPane/QuestionPane.tsx@@ -13,8 +13,8 @@ import {Description,EmptyDescription,} from "metabase/common/components/MetadataInfo/MetadataInfo";+import { SidebarContent } from "metabase/common/components/SidebarContent";import { useSelector } from "metabase/lib/redux";-import { SidebarContent } from "metabase/query_builder/components/SidebarContent";import { getMetadata } from "metabase/selectors/metadata";import { Box, Flex, Icon, type IconName } from "metabase/ui";import type Question from "metabase-lib/v1/Question";diff --git a/frontend/src/metabase/query_builder/components/dataref/QuestionPane/index.ts b/frontend/src/metabase/querying/components/DataReference/QuestionPane/index.tssimilarity index 100%rename from frontend/src/metabase/query_builder/components/dataref/QuestionPane/index.tsrename to frontend/src/metabase/querying/components/DataReference/QuestionPane/index.tsdiff --git a/frontend/src/metabase/query_builder/components/dataref/ResourceTreeNode.module.css b/frontend/src/metabase/querying/components/DataReference/ResourceTreeNode.module.csssimilarity index 100%rename from frontend/src/metabase/query_builder/components/dataref/ResourceTreeNode.module.cssrename to frontend/src/metabase/querying/components/DataReference/ResourceTreeNode.module.cssdiff --git a/frontend/src/metabase/query_builder/components/dataref/ResourceTreeNode.tsx b/frontend/src/metabase/querying/components/DataReference/ResourceTreeNode.tsxsimilarity index 100%rename from frontend/src/metabase/query_builder/components/dataref/ResourceTreeNode.tsxrename to frontend/src/metabase/querying/components/DataReference/ResourceTreeNode.tsxdiff --git a/frontend/src/metabase/query_builder/components/dataref/SchemaPane.tsx b/frontend/src/metabase/querying/components/DataReference/SchemaPane.tsxsimilarity index 96%rename from frontend/src/metabase/query_builder/components/dataref/SchemaPane.tsxrename to frontend/src/metabase/querying/components/DataReference/SchemaPane.tsxindex d179203f962..c71abf46401 100644--- a/frontend/src/metabase/query_builder/components/dataref/SchemaPane.tsx+++ b/frontend/src/metabase/querying/components/DataReference/SchemaPane.tsx@@ -2,7 +2,7 @@ import { msgid, ngettext } from "ttag";import { useListDatabaseSchemaTablesQuery } from "metabase/api";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";-import { SidebarContent } from "metabase/query_builder/components/SidebarContent";+import { SidebarContent } from "metabase/common/components/SidebarContent";import { isConcreteTableId } from "metabase-types/api";import {diff --git a/frontend/src/metabase/query_builder/components/dataref/TableInfoLoader.tsx b/frontend/src/metabase/querying/components/DataReference/TableInfoLoader.tsxsimilarity index 100%rename from frontend/src/metabase/query_builder/components/dataref/TableInfoLoader.tsxrename to frontend/src/metabase/querying/components/DataReference/TableInfoLoader.tsxdiff --git a/frontend/src/metabase/query_builder/components/dataref/TablePane.tsx b/frontend/src/metabase/querying/components/DataReference/TablePane.tsxsimilarity index 95%rename from frontend/src/metabase/query_builder/components/dataref/TablePane.tsxrename to frontend/src/metabase/querying/components/DataReference/TablePane.tsxindex 0e90e3e0a96..21c29f7144c 100644--- a/frontend/src/metabase/query_builder/components/dataref/TablePane.tsx+++ b/frontend/src/metabase/querying/components/DataReference/TablePane.tsx@@ -6,13 +6,13 @@ import {Description,EmptyDescription,} from "metabase/common/components/MetadataInfo/MetadataInfo";+import { SidebarContent } from "metabase/common/components/SidebarContent";import CS from "metabase/css/core/index.css";import { useSelector } from "metabase/lib/redux";-import { SidebarContent } from "metabase/query_builder/components/SidebarContent";-import { ConnectedTableList } from "metabase/query_builder/components/dataref/ConnectedTableList";import { getMetadata } from "metabase/selectors/metadata";import { isConcreteTableId } from "metabase-types/api";+import { ConnectedTableList } from "./ConnectedTableList";import { FieldList } from "./FieldList";import {NodeListIcon,diff --git a/frontend/src/metabase/query_builder/components/dataref/types.ts b/frontend/src/metabase/querying/components/DataReference/types.tssimilarity index 100%rename from frontend/src/metabase/query_builder/components/dataref/types.tsrename to frontend/src/metabase/querying/components/DataReference/types.tsdiff --git a/frontend/src/metabase/query_builder/components/LimitInput.tsx b/frontend/src/metabase/querying/components/LimitInput.tsxsimilarity index 100%rename from frontend/src/metabase/query_builder/components/LimitInput.tsxrename to frontend/src/metabase/querying/components/LimitInput.tsxdiff --git a/frontend/src/metabase/query_builder/components/QueryVisualization.jsx b/frontend/src/metabase/querying/components/QueryVisualization/QueryVisualization.jsxsimilarity index 99%rename from frontend/src/metabase/query_builder/components/QueryVisualization.jsxrename to frontend/src/metabase/querying/components/QueryVisualization/QueryVisualization.jsxindex 54607fc2498..b9f297e7498 100644--- a/frontend/src/metabase/query_builder/components/QueryVisualization.jsx+++ b/frontend/src/metabase/querying/components/QueryVisualization/QueryVisualization.jsx@@ -87,6 +87,7 @@ export function QueryVisualization(props) {via={result.via}question={question}duration={result.duration}+ isResultDirty={isResultDirty}/>) : result?.data ? (<VisualizationResultdiff --git a/frontend/src/metabase/query_builder/components/RunButton.tsx b/frontend/src/metabase/querying/components/QueryVisualization/RunButton.tsxsimilarity index 100%rename from frontend/src/metabase/query_builder/components/RunButton.tsxrename to frontend/src/metabase/querying/components/QueryVisualization/RunButton.tsxdiff --git a/frontend/src/metabase/query_builder/components/RunButtonWithTooltip.jsx b/frontend/src/metabase/querying/components/QueryVisualization/RunButtonWithTooltip.jsxsimilarity index 100%rename from frontend/src/metabase/query_builder/components/RunButtonWithTooltip.jsxrename to frontend/src/metabase/querying/components/QueryVisualization/RunButtonWithTooltip.jsxdiff --git a/frontend/src/metabase/query_builder/components/VisualizationError/VisualizationError.module.css b/frontend/src/metabase/querying/components/QueryVisualization/VisualizationError/VisualizationError.module.csssimilarity index 100%rename from frontend/src/metabase/query_builder/components/VisualizationError/VisualizationError.module.cssrename to frontend/src/metabase/querying/components/QueryVisualization/VisualizationError/VisualizationError.module.cssdiff --git a/frontend/src/metabase/query_builder/components/VisualizationError/VisualizationError.tsx b/frontend/src/metabase/querying/components/QueryVisualization/VisualizationError/VisualizationError.tsxsimilarity index 97%rename from frontend/src/metabase/query_builder/components/VisualizationError/VisualizationError.tsxrename to frontend/src/metabase/querying/components/QueryVisualization/VisualizationError/VisualizationError.tsxindex 123608329bc..5ce909bb20c 100644--- a/frontend/src/metabase/query_builder/components/VisualizationError/VisualizationError.tsx+++ b/frontend/src/metabase/querying/components/QueryVisualization/VisualizationError/VisualizationError.tsx@@ -11,7 +11,6 @@ import QueryBuilderS from "metabase/css/query_builder.module.css";import { getEngineNativeType } from "metabase/lib/engine";import { useSelector } from "metabase/lib/redux";import { PLUGIN_AI_SQL_FIXER } from "metabase/plugins";-import { getIsResultDirty } from "metabase/query_builder/selectors";import { getLearnUrl } from "metabase/selectors/settings";import { getShowMetabaseLinks } from "metabase/selectors/whitelabel";import { Box, Center, Flex, Icon } from "metabase/ui";@@ -19,7 +18,7 @@ import * as Lib from "metabase-lib";import type Question from "metabase-lib/v1/Question";import type { DatasetError, DatasetErrorType } from "metabase-types/api";-import { VISUALIZATION_SLOW_TIMEOUT } from "../../constants";+import { VISUALIZATION_SLOW_TIMEOUT } from "../../../constants";import VisErrorS from "./VisualizationError.module.css";import { AdminEmail } from "./components";@@ -32,6 +31,7 @@ interface VisualizationErrorProps {duration: number;error: DatasetError;errorType?: DatasetErrorType;+ isResultDirty?: boolean;}export function VisualizationError({@@ -41,9 +41,9 @@ export function VisualizationError({duration,error,errorType,+ isResultDirty,}: VisualizationErrorProps) {const query = question.query();- const isResultDirty = useSelector(getIsResultDirty);const showMetabaseLinks = useSelector(getShowMetabaseLinks);const isNative = question && Lib.queryDisplayInfo(query).isNative;diff --git a/frontend/src/metabase/query_builder/components/VisualizationError/components/AdminEmail/AdminEmail.tsx b/frontend/src/metabase/querying/components/QueryVisualization/VisualizationError/components/AdminEmail/AdminEmail.tsxsimilarity index 100%rename from frontend/src/metabase/query_builder/components/VisualizationError/components/AdminEmail/AdminEmail.tsxrename to frontend/src/metabase/querying/components/QueryVisualization/VisualizationError/components/AdminEmail/AdminEmail.tsxdiff --git a/frontend/src/metabase/query_builder/components/VisualizationError/components/AdminEmail/AdminEmail.unit.spec.tsx b/frontend/src/metabase/querying/components/QueryVisualization/VisualizationError/components/AdminEmail/AdminEmail.unit.spec.tsxsimilarity index 100%rename from frontend/src/metabase/query_builder/components/VisualizationError/components/AdminEmail/AdminEmail.unit.spec.tsxrename to frontend/src/metabase/querying/components/QueryVisualization/VisualizationError/components/AdminEmail/AdminEmail.unit.spec.tsxdiff --git a/frontend/src/metabase/query_builder/components/VisualizationError/components/AdminEmail/index.ts b/frontend/src/metabase/querying/components/QueryVisualization/VisualizationError/components/AdminEmail/index.tssimilarity index 100%rename from frontend/src/metabase/query_builder/components/VisualizationError/components/AdminEmail/index.tsrename to frontend/src/metabase/querying/components/QueryVisualization/VisualizationError/components/AdminEmail/index.tsdiff --git a/frontend/src/metabase/query_builder/components/VisualizationError/components/index.ts b/frontend/src/metabase/querying/components/QueryVisualization/VisualizationError/components/index.tssimilarity index 100%rename from frontend/src/metabase/query_builder/components/VisualizationError/components/index.tsrename to frontend/src/metabase/querying/components/QueryVisualization/VisualizationError/components/index.tsdiff --git a/frontend/src/metabase/query_builder/components/VisualizationError/index.ts b/frontend/src/metabase/querying/components/QueryVisualization/VisualizationError/index.tssimilarity index 100%rename from frontend/src/metabase/query_builder/components/VisualizationError/index.tsrename to frontend/src/metabase/querying/components/QueryVisualization/VisualizationError/index.tsdiff --git a/frontend/src/metabase/query_builder/components/VisualizationError/tests/common.unit.spec.ts b/frontend/src/metabase/querying/components/QueryVisualization/VisualizationError/tests/common.unit.spec.tssimilarity index 100%rename from frontend/src/metabase/query_builder/components/VisualizationError/tests/common.unit.spec.tsrename to frontend/src/metabase/querying/components/QueryVisualization/VisualizationError/tests/common.unit.spec.tsdiff --git a/frontend/src/metabase/query_builder/components/VisualizationError/tests/enterprise.unit.spec.ts b/frontend/src/metabase/querying/components/QueryVisualization/VisualizationError/tests/enterprise.unit.spec.tssimilarity index 100%rename from frontend/src/metabase/query_builder/components/VisualizationError/tests/enterprise.unit.spec.tsrename to frontend/src/metabase/querying/components/QueryVisualization/VisualizationError/tests/enterprise.unit.spec.tsdiff --git a/frontend/src/metabase/query_builder/components/VisualizationError/tests/premium.unit.spec.ts b/frontend/src/metabase/querying/components/QueryVisualization/VisualizationError/tests/premium.unit.spec.tssimilarity index 100%rename from frontend/src/metabase/query_builder/components/VisualizationError/tests/premium.unit.spec.tsrename to frontend/src/metabase/querying/components/QueryVisualization/VisualizationError/tests/premium.unit.spec.tsdiff --git a/frontend/src/metabase/query_builder/components/VisualizationError/tests/setup.tsx b/frontend/src/metabase/querying/components/QueryVisualization/VisualizationError/tests/setup.tsxsimilarity index 100%rename from frontend/src/metabase/query_builder/components/VisualizationError/tests/setup.tsxrename to frontend/src/metabase/querying/components/QueryVisualization/VisualizationError/tests/setup.tsxdiff --git a/frontend/src/metabase/query_builder/components/VisualizationError/tests/utils.unit.spec.ts b/frontend/src/metabase/querying/components/QueryVisualization/VisualizationError/tests/utils.unit.spec.tssimilarity index 100%rename from frontend/src/metabase/query_builder/components/VisualizationError/tests/utils.unit.spec.tsrename to frontend/src/metabase/querying/components/QueryVisualization/VisualizationError/tests/utils.unit.spec.tsdiff --git a/frontend/src/metabase/query_builder/components/VisualizationError/utils.ts b/frontend/src/metabase/querying/components/QueryVisualization/VisualizationError/utils.tssimilarity index 100%rename from frontend/src/metabase/query_builder/components/VisualizationError/utils.tsrename to frontend/src/metabase/querying/components/QueryVisualization/VisualizationError/utils.tsdiff --git a/frontend/src/metabase/query_builder/components/VisualizationResult.jsx b/frontend/src/metabase/querying/components/QueryVisualization/VisualizationResult.jsxsimilarity index 100%rename from frontend/src/metabase/query_builder/components/VisualizationResult.jsxrename to frontend/src/metabase/querying/components/QueryVisualization/VisualizationResult.jsxdiff --git a/frontend/src/metabase/query_builder/components/Warnings.tsx b/frontend/src/metabase/querying/components/QueryVisualization/Warnings.tsxsimilarity index 100%rename from frontend/src/metabase/query_builder/components/Warnings.tsxrename to frontend/src/metabase/querying/components/QueryVisualization/Warnings.tsxdiff --git a/frontend/src/metabase/querying/components/QueryVisualization/index.ts b/frontend/src/metabase/querying/components/QueryVisualization/index.tsnew file mode 100644index 00000000000..8ed0c58b990--- /dev/null+++ b/frontend/src/metabase/querying/components/QueryVisualization/index.ts@@ -0,0 +1,5 @@+export {+ QueryVisualization,+ VisualizationRunningState,+ VisualizationDirtyState,+} from "./QueryVisualization";diff --git a/frontend/src/metabase/query_builder/components/template_tags/SnippetRow/SnippetRow.jsx b/frontend/src/metabase/querying/components/SnippetSidebar/SnippetRow/SnippetRow.jsxsimilarity index 100%rename from frontend/src/metabase/query_builder/components/template_tags/SnippetRow/SnippetRow.jsxrename to frontend/src/metabase/querying/components/SnippetSidebar/SnippetRow/SnippetRow.jsxdiff --git a/frontend/src/metabase/query_builder/components/template_tags/SnippetRow/SnippetRow.module.css b/frontend/src/metabase/querying/components/SnippetSidebar/SnippetRow/SnippetRow.module.csssimilarity index 100%rename from frontend/src/metabase/query_builder/components/template_tags/SnippetRow/SnippetRow.module.cssrename to frontend/src/metabase/querying/components/SnippetSidebar/SnippetRow/SnippetRow.module.cssdiff --git a/frontend/src/metabase/query_builder/components/template_tags/SnippetRow/index.ts b/frontend/src/metabase/querying/components/SnippetSidebar/SnippetRow/index.tssimilarity index 100%rename from frontend/src/metabase/query_builder/components/template_tags/SnippetRow/index.tsrename to frontend/src/metabase/querying/components/SnippetSidebar/SnippetRow/index.tsdiff --git a/frontend/src/metabase/query_builder/components/template_tags/SnippetSidebar/SnippetSidebar.jsx b/frontend/src/metabase/querying/components/SnippetSidebar/SnippetSidebar.jsxsimilarity index 97%rename from frontend/src/metabase/query_builder/components/template_tags/SnippetSidebar/SnippetSidebar.jsxrename to frontend/src/metabase/querying/components/SnippetSidebar/SnippetSidebar.jsxindex 07f64ae8c5d..d6f2200c411 100644--- a/frontend/src/metabase/query_builder/components/template_tags/SnippetSidebar/SnippetSidebar.jsx+++ b/frontend/src/metabase/querying/components/SnippetSidebar/SnippetSidebar.jsx@@ -5,6 +5,8 @@ import { t } from "ttag";import _ from "underscore";import { canonicalCollectionId } from "metabase/collections/utils";+import { SidebarContent } from "metabase/common/components/SidebarContent";+import { SidebarHeader } from "metabase/common/components/SidebarHeader";import CS from "metabase/css/core/index.css";import { Search } from "metabase/entities/search";import { SnippetCollections } from "metabase/entities/snippet-collections";@@ -17,12 +19,9 @@ import {PLUGIN_SNIPPET_SIDEBAR_PLUS_MENU_OPTIONS,PLUGIN_SNIPPET_SIDEBAR_ROW_RENDERERS,} from "metabase/plugins";-import { SidebarContent } from "metabase/query_builder/components/SidebarContent";-import { SidebarHeader } from "metabase/query_builder/components/SidebarHeader";import { Box, Button, Flex, Icon, Menu } from "metabase/ui";-import { SnippetRow } from "../SnippetRow";-+import { SnippetRow } from "./SnippetRow";import S from "./SnippetSidebar.module.css";import { SnippetSidebarEmptyState } from "./SnippetSidebarEmptyState";diff --git a/frontend/src/metabase/query_builder/components/template_tags/SnippetSidebar/SnippetSidebar.module.css b/frontend/src/metabase/querying/components/SnippetSidebar/SnippetSidebar.module.csssimilarity index 100%rename from frontend/src/metabase/query_builder/components/template_tags/SnippetSidebar/SnippetSidebar.module.cssrename to frontend/src/metabase/querying/components/SnippetSidebar/SnippetSidebar.module.cssdiff --git a/frontend/src/metabase/query_builder/components/template_tags/SnippetSidebar/SnippetSidebarEmptyState.tsx b/frontend/src/metabase/querying/components/SnippetSidebar/SnippetSidebarEmptyState.tsxsimilarity index 100%rename from frontend/src/metabase/query_builder/components/template_tags/SnippetSidebar/SnippetSidebarEmptyState.tsxrename to frontend/src/metabase/querying/components/SnippetSidebar/SnippetSidebarEmptyState.tsxdiff --git a/frontend/src/metabase/query_builder/components/template_tags/SnippetSidebar/SnippetSidebarEmptyState.unit.spec.tsx b/frontend/src/metabase/querying/components/SnippetSidebar/SnippetSidebarEmptyState.unit.spec.tsxsimilarity index 100%rename from frontend/src/metabase/query_builder/components/template_tags/SnippetSidebar/SnippetSidebarEmptyState.unit.spec.tsxrename to frontend/src/metabase/querying/components/SnippetSidebar/SnippetSidebarEmptyState.unit.spec.tsxdiff --git a/frontend/src/metabase/query_builder/components/template_tags/SnippetSidebar/index.ts b/frontend/src/metabase/querying/components/SnippetSidebar/index.tssimilarity index 100%rename from frontend/src/metabase/query_builder/components/template_tags/SnippetSidebar/index.tsrename to frontend/src/metabase/querying/components/SnippetSidebar/index.tsdiff --git a/frontend/src/metabase/query_builder/components/template_tags/SnippetSidebar/tests/common.unit.spec.tsx b/frontend/src/metabase/querying/components/SnippetSidebar/tests/common.unit.spec.tsxsimilarity index 100%rename from frontend/src/metabase/query_builder/components/template_tags/SnippetSidebar/tests/common.unit.spec.tsxrename to frontend/src/metabase/querying/components/SnippetSidebar/tests/common.unit.spec.tsxdiff --git a/frontend/src/metabase/query_builder/components/template_tags/SnippetSidebar/tests/enterprise.unit.spec.tsx b/frontend/src/metabase/querying/components/SnippetSidebar/tests/enterprise.unit.spec.tsxsimilarity index 100%rename from frontend/src/metabase/query_builder/components/template_tags/SnippetSidebar/tests/enterprise.unit.spec.tsxrename to frontend/src/metabase/querying/components/SnippetSidebar/tests/enterprise.unit.spec.tsxdiff --git a/frontend/src/metabase/query_builder/components/template_tags/SnippetSidebar/tests/premium.unit.spec.tsx b/frontend/src/metabase/querying/components/SnippetSidebar/tests/premium.unit.spec.tsxsimilarity index 100%rename from frontend/src/metabase/query_builder/components/template_tags/SnippetSidebar/tests/premium.unit.spec.tsxrename to frontend/src/metabase/querying/components/SnippetSidebar/tests/premium.unit.spec.tsxdiff --git a/frontend/src/metabase/query_builder/components/template_tags/SnippetSidebar/tests/setup.tsx b/frontend/src/metabase/querying/components/SnippetSidebar/tests/setup.tsxsimilarity index 100%rename from frontend/src/metabase/query_builder/components/template_tags/SnippetSidebar/tests/setup.tsxrename to frontend/src/metabase/querying/components/SnippetSidebar/tests/setup.tsxdiff --git a/frontend/src/metabase/query_builder/components/expressions/CombineColumns/ColumnAndSeparatorRow/ColumnAndSeparatorRow.module.css b/frontend/src/metabase/querying/components/expressions/CombineColumns/ColumnAndSeparatorRow/ColumnAndSeparatorRow.module.csssimilarity index 100%rename from frontend/src/metabase/query_builder/components/expressions/CombineColumns/ColumnAndSeparatorRow/ColumnAndSeparatorRow.module.cssrename to frontend/src/metabase/querying/components/expressions/CombineColumns/ColumnAndSeparatorRow/ColumnAndSeparatorRow.module.cssdiff --git a/frontend/src/metabase/query_builder/components/expressions/CombineColumns/ColumnAndSeparatorRow/ColumnAndSeparatorRow.tsx b/frontend/src/metabase/querying/components/expressions/CombineColumns/ColumnAndSeparatorRow/ColumnAndSeparatorRow.tsxsimilarity index 100%rename from frontend/src/metabase/query_builder/components/expressions/CombineColumns/ColumnAndSeparatorRow/ColumnAndSeparatorRow.tsxrename to frontend/src/metabase/querying/components/expressions/CombineColumns/ColumnAndSeparatorRow/ColumnAndSeparatorRow.tsxdiff --git a/frontend/src/metabase/query_builder/components/expressions/CombineColumns/ColumnAndSeparatorRow/ColumnInput.module.css b/frontend/src/metabase/querying/components/expressions/CombineColumns/ColumnAndSeparatorRow/ColumnInput.module.csssimilarity index 100%rename from frontend/src/metabase/query_builder/components/expressions/CombineColumns/ColumnAndSeparatorRow/ColumnInput.module.cssrename to frontend/src/metabase/querying/components/expressions/CombineColumns/ColumnAndSeparatorRow/ColumnInput.module.cssdiff --git a/frontend/src/metabase/query_builder/components/expressions/CombineColumns/ColumnAndSeparatorRow/ColumnInput.tsx b/frontend/src/metabase/querying/components/expressions/CombineColumns/ColumnAndSeparatorRow/ColumnInput.tsxsimilarity index 100%rename from frontend/src/metabase/query_builder/components/expressions/CombineColumns/ColumnAndSeparatorRow/ColumnInput.tsxrename to frontend/src/metabase/querying/components/expressions/CombineColumns/ColumnAndSeparatorRow/ColumnInput.tsxdiff --git a/frontend/src/metabase/query_builder/components/expressions/CombineColumns/ColumnAndSeparatorRow/index.tsx b/frontend/src/metabase/querying/components/expressions/CombineColumns/ColumnAndSeparatorRow/index.tsxsimilarity index 100%rename from frontend/src/metabase/query_builder/components/expressions/CombineColumns/ColumnAndSeparatorRow/index.tsxrename to frontend/src/metabase/querying/components/expressions/CombineColumns/ColumnAndSeparatorRow/index.tsxdiff --git a/frontend/src/metabase/query_builder/components/expressions/CombineColumns/CombineColumns.tsx b/frontend/src/metabase/querying/components/expressions/CombineColumns/CombineColumns.tsxsimilarity index 100%rename from frontend/src/metabase/query_builder/components/expressions/CombineColumns/CombineColumns.tsxrename to frontend/src/metabase/querying/components/expressions/CombineColumns/CombineColumns.tsxdiff --git a/frontend/src/metabase/query_builder/components/expressions/CombineColumns/Example.tsx b/frontend/src/metabase/querying/components/expressions/CombineColumns/Example.tsxsimilarity index 100%rename from frontend/src/metabase/query_builder/components/expressions/CombineColumns/Example.tsxrename to frontend/src/metabase/querying/components/expressions/CombineColumns/Example.tsxdiff --git a/frontend/src/metabase/query_builder/components/expressions/CombineColumns/index.tsx b/frontend/src/metabase/querying/components/expressions/CombineColumns/index.tsxsimilarity index 100%rename from frontend/src/metabase/query_builder/components/expressions/CombineColumns/index.tsxrename to frontend/src/metabase/querying/components/expressions/CombineColumns/index.tsxdiff --git a/frontend/src/metabase/query_builder/components/expressions/CombineColumns/util.ts b/frontend/src/metabase/querying/components/expressions/CombineColumns/util.tssimilarity index 100%rename from frontend/src/metabase/query_builder/components/expressions/CombineColumns/util.tsrename to frontend/src/metabase/querying/components/expressions/CombineColumns/util.tsdiff --git a/frontend/src/metabase/query_builder/components/expressions/CombineColumns/util.unit.spec.ts b/frontend/src/metabase/querying/components/expressions/CombineColumns/util.unit.spec.tssimilarity index 100%rename from frontend/src/metabase/query_builder/components/expressions/CombineColumns/util.unit.spec.tsrename to frontend/src/metabase/querying/components/expressions/CombineColumns/util.unit.spec.tsdiff --git a/frontend/src/metabase/query_builder/components/expressions/Editor/CloseModal/CloseModal.tsx b/frontend/src/metabase/querying/components/expressions/Editor/CloseModal/CloseModal.tsxsimilarity index 100%rename from frontend/src/metabase/query_builder/components/expressions/Editor/CloseModal/CloseModal.tsxrename to frontend/src/metabase/querying/components/expressions/Editor/CloseModal/CloseModal.tsxdiff --git a/frontend/src/metabase/query_builder/components/expressions/Editor/CloseModal/index.ts b/frontend/src/metabase/querying/components/expressions/Editor/CloseModal/index.tssimilarity index 100%rename from frontend/src/metabase/query_builder/components/expressions/Editor/CloseModal/index.tsrename to frontend/src/metabase/querying/components/expressions/Editor/CloseModal/index.tsdiff --git a/frontend/src/metabase/query_builder/components/expressions/Editor/CloseModal/utils.ts b/frontend/src/metabase/querying/components/expressions/Editor/CloseModal/utils.tssimilarity index 100%rename from frontend/src/metabase/query_builder/components/expressions/Editor/CloseModal/utils.tsrename to frontend/src/metabase/querying/components/expressions/Editor/CloseModal/utils.tsdiff --git a/frontend/src/metabase/query_builder/components/expressions/Editor/Editor.module.css b/frontend/src/metabase/querying/components/expressions/Editor/Editor.module.csssimilarity index 100%rename from frontend/src/metabase/query_builder/components/expressions/Editor/Editor.module.cssrename to frontend/src/metabase/querying/components/expressions/Editor/Editor.module.cssdiff --git a/frontend/src/metabase/query_builder/components/expressions/Editor/Editor.tsx b/frontend/src/metabase/querying/components/expressions/Editor/Editor.tsxsimilarity index 100%rename from frontend/src/metabase/query_builder/components/expressions/Editor/Editor.tsxrename to frontend/src/metabase/querying/components/expressions/Editor/Editor.tsxdiff --git a/frontend/src/metabase/query_builder/components/expressions/Editor/Errors/Errors.module.css b/frontend/src/metabase/querying/components/expressions/Editor/Errors/Errors.module.csssimilarity index 100%rename from frontend/src/metabase/query_builder/components/expressions/Editor/Errors/Errors.module.cssrename to frontend/src/metabase/querying/components/expressions/Editor/Errors/Errors.module.cssdiff --git a/frontend/src/metabase/query_builder/components/expressions/Editor/Errors/Errors.tsx b/frontend/src/metabase/querying/components/expressions/Editor/Errors/Errors.tsxsimilarity index 100%rename from frontend/src/metabase/query_builder/components/expressions/Editor/Errors/Errors.tsxrename to frontend/src/metabase/querying/components/expressions/Editor/Errors/Errors.tsxdiff --git a/frontend/src/metabase/query_builder/components/expressions/Editor/Errors/index.ts b/frontend/src/metabase/querying/components/expressions/Editor/Errors/index.tssimilarity index 100%rename from frontend/src/metabase/query_builder/components/expressions/Editor/Errors/index.tsrename to frontend/src/metabase/querying/components/expressions/Editor/Errors/index.tsdiff --git a/frontend/src/metabase/query_builder/components/expressions/Editor/HelpText/HelpText.module.css b/frontend/src/metabase/querying/components/expressions/Editor/HelpText/HelpText.module.csssimilarity index 100%rename from frontend/src/metabase/query_builder/components/expressions/Editor/HelpText/HelpText.module.cssrename to frontend/src/metabase/querying/components/expressions/Editor/HelpText/HelpText.module.cssdiff --git a/frontend/src/metabase/query_builder/components/expressions/Editor/HelpText/HelpText.stories.tsx b/frontend/src/metabase/querying/components/expressions/Editor/HelpText/HelpText.stories.tsxsimilarity index 100%rename from frontend/src/metabase/query_builder/components/expressions/Editor/HelpText/HelpText.stories.tsxrename to frontend/src/metabase/querying/components/expressions/Editor/HelpText/HelpText.stories.tsxdiff --git a/frontend/src/metabase/query_builder/components/expressions/Editor/HelpText/HelpText.tsx b/frontend/src/metabase/querying/components/expressions/Editor/HelpText/HelpText.tsxsimilarity index 100%rename from frontend/src/metabase/query_builder/components/expressions/Editor/HelpText/HelpText.tsxrename to frontend/src/metabase/querying/components/expressions/Editor/HelpText/HelpText.tsxdiff --git a/frontend/src/metabase/query_builder/components/expressions/Editor/HelpText/index.tsx b/frontend/src/metabase/querying/components/expressions/Editor/HelpText/index.tsxsimilarity index 100%rename from frontend/src/metabase/query_builder/components/expressions/Editor/HelpText/index.tsxrename to frontend/src/metabase/querying/components/expressions/Editor/HelpText/index.tsxdiff --git a/frontend/src/metabase/query_builder/components/expressions/Editor/HelpText/tests/common.unit.spec.tsx b/frontend/src/metabase/querying/components/expressions/Editor/HelpText/tests/common.unit.spec.tsxsimilarity index 100%rename from frontend/src/metabase/query_builder/components/expressions/Editor/HelpText/tests/common.unit.spec.tsxrename to frontend/src/metabase/querying/components/expressions/Editor/HelpText/tests/common.unit.spec.tsxdiff --git a/frontend/src/metabase/query_builder/components/expressions/Editor/HelpText/tests/enterprise.unit.spec.tsx b/frontend/src/metabase/querying/components/expressions/Editor/HelpText/tests/enterprise.unit.spec.tsxsimilarity index 100%rename from frontend/src/metabase/query_builder/components/expressions/Editor/HelpText/tests/enterprise.unit.spec.tsxrename to frontend/src/metabase/querying/components/expressions/Editor/HelpText/tests/enterprise.unit.spec.tsxdiff --git a/frontend/src/metabase/query_builder/components/expressions/Editor/HelpText/tests/premium.unit.spec.tsx b/frontend/src/metabase/querying/components/expressions/Editor/HelpText/tests/premium.unit.spec.tsxsimilarity index 100%rename from frontend/src/metabase/query_builder/components/expressions/Editor/HelpText/tests/premium.unit.spec.tsxrename to frontend/src/metabase/querying/components/expressions/Editor/HelpText/tests/premium.unit.spec.tsxdiff --git a/frontend/src/metabase/query_builder/components/expressions/Editor/HelpText/tests/setup.tsx b/frontend/src/metabase/querying/components/expressions/Editor/HelpText/tests/setup.tsxsimilarity index 100%rename from frontend/src/metabase/query_builder/components/expressions/Editor/HelpText/tests/setup.tsxrename to frontend/src/metabase/querying/components/expressions/Editor/HelpText/tests/setup.tsxdiff --git a/frontend/src/metabase/query_builder/components/expressions/Editor/Listbox/Listbox.module.css b/frontend/src/metabase/querying/components/expressions/Editor/Listbox/Listbox.module.csssimilarity index 100%rename from frontend/src/metabase/query_builder/components/expressions/Editor/Listbox/Listbox.module.cssrename to frontend/src/metabase/querying/components/expressions/Editor/Listbox/Listbox.module.cssdiff --git a/frontend/src/metabase/query_builder/components/expressions/Editor/Listbox/Listbox.tsx b/frontend/src/metabase/querying/components/expressions/Editor/Listbox/Listbox.tsxsimilarity index 100%rename from frontend/src/metabase/query_builder/components/expressions/Editor/Listbox/Listbox.tsxrename to frontend/src/metabase/querying/components/expressions/Editor/Listbox/Listbox.tsxdiff --git a/frontend/src/metabase/query_builder/components/expressions/Editor/Listbox/MatchText.tsx b/frontend/src/metabase/querying/components/expressions/Editor/Listbox/MatchText.tsxsimilarity index 100%rename from frontend/src/metabase/query_builder/components/expressions/Editor/Listbox/MatchText.tsxrename to frontend/src/metabase/querying/components/expressions/Editor/Listbox/MatchText.tsxdiff --git a/frontend/src/metabase/query_builder/components/expressions/Editor/Listbox/index.tsx b/frontend/src/metabase/querying/components/expressions/Editor/Listbox/index.tsxsimilarity index 100%rename from frontend/src/metabase/query_builder/components/expressions/Editor/Listbox/index.tsxrename to frontend/src/metabase/querying/components/expressions/Editor/Listbox/index.tsxdiff --git a/frontend/src/metabase/query_builder/components/expressions/Editor/Listbox/util.tsx b/frontend/src/metabase/querying/components/expressions/Editor/Listbox/util.tsxsimilarity index 100%rename from frontend/src/metabase/query_builder/components/expressions/Editor/Listbox/util.tsxrename to frontend/src/metabase/querying/components/expressions/Editor/Listbox/util.tsxdiff --git a/frontend/src/metabase/query_builder/components/expressions/Editor/Shortcuts/Shortcuts.tsx b/frontend/src/metabase/querying/components/expressions/Editor/Shortcuts/Shortcuts.tsxsimilarity index 100%rename from frontend/src/metabase/query_builder/components/expressions/Editor/Shortcuts/Shortcuts.tsxrename to frontend/src/metabase/querying/components/expressions/Editor/Shortcuts/Shortcuts.tsxdiff --git a/frontend/src/metabase/query_builder/components/expressions/Editor/Shortcuts/index.tsx b/frontend/src/metabase/querying/components/expressions/Editor/Shortcuts/index.tsxsimilarity index 100%rename from frontend/src/metabase/query_builder/components/expressions/Editor/Shortcuts/index.tsxrename to frontend/src/metabase/querying/components/expressions/Editor/Shortcuts/index.tsxdiff --git a/frontend/src/metabase/query_builder/components/expressions/Editor/Tooltip/Tooltip.module.css b/frontend/src/metabase/querying/components/expressions/Editor/Tooltip/Tooltip.module.csssimilarity index 100%rename from frontend/src/metabase/query_builder/components/expressions/Editor/Tooltip/Tooltip.module.cssrename to frontend/src/metabase/querying/components/expressions/Editor/Tooltip/Tooltip.module.cssdiff --git a/frontend/src/metabase/query_builder/components/expressions/Editor/Tooltip/Tooltip.tsx b/frontend/src/metabase/querying/components/expressions/Editor/Tooltip/Tooltip.tsxsimilarity index 100%rename from frontend/src/metabase/query_builder/components/expressions/Editor/Tooltip/Tooltip.tsxrename to frontend/src/metabase/querying/components/expressions/Editor/Tooltip/Tooltip.tsxdiff --git a/frontend/src/metabase/query_builder/components/expressions/Editor/Tooltip/index.tsx b/frontend/src/metabase/querying/components/expressions/Editor/Tooltip/index.tsxsimilarity index 100%rename from frontend/src/metabase/query_builder/components/expressions/Editor/Tooltip/index.tsxrename to frontend/src/metabase/querying/components/expressions/Editor/Tooltip/index.tsxdiff --git a/frontend/src/metabase/query_builder/components/expressions/Editor/constants.ts b/frontend/src/metabase/querying/components/expressions/Editor/constants.tssimilarity index 100%rename from frontend/src/metabase/query_builder/components/expressions/Editor/constants.tsrename to frontend/src/metabase/querying/components/expressions/Editor/constants.tsdiff --git a/frontend/src/metabase/query_builder/components/expressions/Editor/custom-tooltip.tsx b/frontend/src/metabase/querying/components/expressions/Editor/custom-tooltip.tsxsimilarity index 100%rename from frontend/src/metabase/query_builder/components/expressions/Editor/custom-tooltip.tsxrename to frontend/src/metabase/querying/components/expressions/Editor/custom-tooltip.tsxdiff --git a/frontend/src/metabase/query_builder/components/expressions/Editor/extensions.ts b/frontend/src/metabase/querying/components/expressions/Editor/extensions.tssimilarity index 100%rename from frontend/src/metabase/query_builder/components/expressions/Editor/extensions.tsrename to frontend/src/metabase/querying/components/expressions/Editor/extensions.tsdiff --git a/frontend/src/metabase/query_builder/components/expressions/Editor/index.tsx b/frontend/src/metabase/querying/components/expressions/Editor/index.tsxsimilarity index 100%rename from frontend/src/metabase/query_builder/components/expressions/Editor/index.tsxrename to frontend/src/metabase/querying/components/expressions/Editor/index.tsxdiff --git a/frontend/src/metabase/query_builder/components/expressions/Editor/language.ts b/frontend/src/metabase/querying/components/expressions/Editor/language.tssimilarity index 100%rename from frontend/src/metabase/query_builder/components/expressions/Editor/language.tsrename to frontend/src/metabase/querying/components/expressions/Editor/language.tsdiff --git a/frontend/src/metabase/query_builder/components/expressions/Editor/utils.ts b/frontend/src/metabase/querying/components/expressions/Editor/utils.tssimilarity index 100%rename from frontend/src/metabase/query_builder/components/expressions/Editor/utils.tsrename to frontend/src/metabase/querying/components/expressions/Editor/utils.tsdiff --git a/frontend/src/metabase/query_builder/components/expressions/ExpressionWidget/ExpressionWidget.tsx b/frontend/src/metabase/querying/components/expressions/ExpressionWidget/ExpressionWidget.tsxsimilarity index 100%rename from frontend/src/metabase/query_builder/components/expressions/ExpressionWidget/ExpressionWidget.tsxrename to frontend/src/metabase/querying/components/expressions/ExpressionWidget/ExpressionWidget.tsxdiff --git a/frontend/src/metabase/query_builder/components/expressions/ExpressionWidget/ExpressionWidget.unit.spec.tsx b/frontend/src/metabase/querying/components/expressions/ExpressionWidget/ExpressionWidget.unit.spec.tsxsimilarity index 100%rename from frontend/src/metabase/query_builder/components/expressions/ExpressionWidget/ExpressionWidget.unit.spec.tsxrename to frontend/src/metabase/querying/components/expressions/ExpressionWidget/ExpressionWidget.unit.spec.tsxdiff --git a/frontend/src/metabase/query_builder/components/expressions/ExpressionWidget/ExpressionWidgetHeader.module.css b/frontend/src/metabase/querying/components/expressions/ExpressionWidget/ExpressionWidgetHeader.module.csssimilarity index 100%rename from frontend/src/metabase/query_builder/components/expressions/ExpressionWidget/ExpressionWidgetHeader.module.cssrename to frontend/src/metabase/querying/components/expressions/ExpressionWidget/ExpressionWidgetHeader.module.cssdiff --git a/frontend/src/metabase/query_builder/components/expressions/ExpressionWidget/ExpressionWidgetHeader.tsx b/frontend/src/metabase/querying/components/expressions/ExpressionWidget/ExpressionWidgetHeader.tsxsimilarity index 100%rename from frontend/src/metabase/query_builder/components/expressions/ExpressionWidget/ExpressionWidgetHeader.tsxrename to frontend/src/metabase/querying/components/expressions/ExpressionWidget/ExpressionWidgetHeader.tsxdiff --git a/frontend/src/metabase/query_builder/components/expressions/ExpressionWidget/index.ts b/frontend/src/metabase/querying/components/expressions/ExpressionWidget/index.tssimilarity index 100%rename from frontend/src/metabase/query_builder/components/expressions/ExpressionWidget/index.tsrename to frontend/src/metabase/querying/components/expressions/ExpressionWidget/index.tsdiff --git a/frontend/src/metabase/query_builder/components/expressions/ExtractColumn/ExtractColumn.module.css b/frontend/src/metabase/querying/components/expressions/ExtractColumn/ExtractColumn.module.csssimilarity index 100%rename from frontend/src/metabase/query_builder/components/expressions/ExtractColumn/ExtractColumn.module.cssrename to frontend/src/metabase/querying/components/expressions/ExtractColumn/ExtractColumn.module.cssdiff --git a/frontend/src/metabase/query_builder/components/expressions/ExtractColumn/ExtractColumn.tsx b/frontend/src/metabase/querying/components/expressions/ExtractColumn/ExtractColumn.tsxsimilarity index 100%rename from frontend/src/metabase/query_builder/components/expressions/ExtractColumn/ExtractColumn.tsxrename to frontend/src/metabase/querying/components/expressions/ExtractColumn/ExtractColumn.tsxdiff --git a/frontend/src/metabase/query_builder/components/expressions/ExtractColumn/index.tsx b/frontend/src/metabase/querying/components/expressions/ExtractColumn/index.tsxsimilarity index 100%rename from frontend/src/metabase/query_builder/components/expressions/ExtractColumn/index.tsxrename to frontend/src/metabase/querying/components/expressions/ExtractColumn/index.tsxdiff --git a/frontend/src/metabase/query_builder/components/expressions/ExtractColumn/util.ts b/frontend/src/metabase/querying/components/expressions/ExtractColumn/util.tssimilarity index 100%rename from frontend/src/metabase/query_builder/components/expressions/ExtractColumn/util.tsrename to frontend/src/metabase/querying/components/expressions/ExtractColumn/util.tsdiff --git a/frontend/src/metabase/query_builder/components/expressions/ExtractColumn/util.unit.spec.ts b/frontend/src/metabase/querying/components/expressions/ExtractColumn/util.unit.spec.tssimilarity index 100%rename from frontend/src/metabase/query_builder/components/expressions/ExtractColumn/util.unit.spec.tsrename to frontend/src/metabase/querying/components/expressions/ExtractColumn/util.unit.spec.tsdiff --git a/frontend/src/metabase/query_builder/components/expressions/FunctionBrowser/FunctionBrowser.module.css b/frontend/src/metabase/querying/components/expressions/FunctionBrowser/FunctionBrowser.module.csssimilarity index 100%rename from frontend/src/metabase/query_builder/components/expressions/FunctionBrowser/FunctionBrowser.module.cssrename to frontend/src/metabase/querying/components/expressions/FunctionBrowser/FunctionBrowser.module.cssdiff --git a/frontend/src/metabase/query_builder/components/expressions/FunctionBrowser/FunctionBrowser.tsx b/frontend/src/metabase/querying/components/expressions/FunctionBrowser/FunctionBrowser.tsxsimilarity index 100%rename from frontend/src/metabase/query_builder/components/expressions/FunctionBrowser/FunctionBrowser.tsxrename to frontend/src/metabase/querying/components/expressions/FunctionBrowser/FunctionBrowser.tsxdiff --git a/frontend/src/metabase/query_builder/components/expressions/FunctionBrowser/index.tsx b/frontend/src/metabase/querying/components/expressions/FunctionBrowser/index.tsxsimilarity index 100%rename from frontend/src/metabase/query_builder/components/expressions/FunctionBrowser/index.tsxrename to frontend/src/metabase/querying/components/expressions/FunctionBrowser/index.tsxdiff --git a/frontend/src/metabase/query_builder/components/expressions/FunctionBrowser/utils.ts b/frontend/src/metabase/querying/components/expressions/FunctionBrowser/utils.tssimilarity index 100%rename from frontend/src/metabase/query_builder/components/expressions/FunctionBrowser/utils.tsrename to frontend/src/metabase/querying/components/expressions/FunctionBrowser/utils.tsdiff --git a/frontend/src/metabase/query_builder/components/expressions/FunctionBrowser/utils.unit.spec.ts b/frontend/src/metabase/querying/components/expressions/FunctionBrowser/utils.unit.spec.tssimilarity index 100%rename from frontend/src/metabase/query_builder/components/expressions/FunctionBrowser/utils.unit.spec.tsrename to frontend/src/metabase/querying/components/expressions/FunctionBrowser/utils.unit.spec.tsdiff --git a/frontend/src/metabase/query_builder/components/expressions/HighlightExpression/HighlightExpression.module.css b/frontend/src/metabase/querying/components/expressions/HighlightExpression/HighlightExpression.module.csssimilarity index 100%rename from frontend/src/metabase/query_builder/components/expressions/HighlightExpression/HighlightExpression.module.cssrename to frontend/src/metabase/querying/components/expressions/HighlightExpression/HighlightExpression.module.cssdiff --git a/frontend/src/metabase/query_builder/components/expressions/HighlightExpression/HighlightExpression.tsx b/frontend/src/metabase/querying/components/expressions/HighlightExpression/HighlightExpression.tsxsimilarity index 100%rename from frontend/src/metabase/query_builder/components/expressions/HighlightExpression/HighlightExpression.tsxrename to frontend/src/metabase/querying/components/expressions/HighlightExpression/HighlightExpression.tsxdiff --git a/frontend/src/metabase/query_builder/components/expressions/HighlightExpression/index.tsx b/frontend/src/metabase/querying/components/expressions/HighlightExpression/index.tsxsimilarity index 100%rename from frontend/src/metabase/query_builder/components/expressions/HighlightExpression/index.tsxrename to frontend/src/metabase/querying/components/expressions/HighlightExpression/index.tsxdiff --git a/frontend/src/metabase/query_builder/components/expressions/HighlightExpression/util.unit.spec.ts b/frontend/src/metabase/querying/components/expressions/HighlightExpression/util.unit.spec.tssimilarity index 100%rename from frontend/src/metabase/query_builder/components/expressions/HighlightExpression/util.unit.spec.tsrename to frontend/src/metabase/querying/components/expressions/HighlightExpression/util.unit.spec.tsdiff --git a/frontend/src/metabase/query_builder/components/expressions/HighlightExpression/utils.ts b/frontend/src/metabase/querying/components/expressions/HighlightExpression/utils.tssimilarity index 100%rename from frontend/src/metabase/query_builder/components/expressions/HighlightExpression/utils.tsrename to frontend/src/metabase/querying/components/expressions/HighlightExpression/utils.tsdiff --git a/frontend/src/metabase/query_builder/components/expressions/Layout/Layout.module.css b/frontend/src/metabase/querying/components/expressions/Layout/Layout.module.csssimilarity index 100%rename from frontend/src/metabase/query_builder/components/expressions/Layout/Layout.module.cssrename to frontend/src/metabase/querying/components/expressions/Layout/Layout.module.cssdiff --git a/frontend/src/metabase/query_builder/components/expressions/Layout/Layout.tsx b/frontend/src/metabase/querying/components/expressions/Layout/Layout.tsxsimilarity index 100%rename from frontend/src/metabase/query_builder/components/expressions/Layout/Layout.tsxrename to frontend/src/metabase/querying/components/expressions/Layout/Layout.tsxdiff --git a/frontend/src/metabase/query_builder/components/expressions/Layout/index.tsx b/frontend/src/metabase/querying/components/expressions/Layout/index.tsxsimilarity index 100%rename from frontend/src/metabase/query_builder/components/expressions/Layout/index.tsxrename to frontend/src/metabase/querying/components/expressions/Layout/index.tsxdiff --git a/frontend/src/metabase/query_builder/components/expressions/NameInput/NameInput.module.css b/frontend/src/metabase/querying/components/expressions/NameInput/NameInput.module.csssimilarity index 100%rename from frontend/src/metabase/query_builder/components/expressions/NameInput/NameInput.module.cssrename to frontend/src/metabase/querying/components/expressions/NameInput/NameInput.module.cssdiff --git a/frontend/src/metabase/query_builder/components/expressions/NameInput/NameInput.tsx b/frontend/src/metabase/querying/components/expressions/NameInput/NameInput.tsxsimilarity index 100%rename from frontend/src/metabase/query_builder/components/expressions/NameInput/NameInput.tsxrename to frontend/src/metabase/querying/components/expressions/NameInput/NameInput.tsxdiff --git a/frontend/src/metabase/query_builder/components/expressions/NameInput/index.ts b/frontend/src/metabase/querying/components/expressions/NameInput/index.tssimilarity index 100%rename from frontend/src/metabase/query_builder/components/expressions/NameInput/index.tsrename to frontend/src/metabase/querying/components/expressions/NameInput/index.tsdiff --git a/frontend/src/metabase/query_builder/components/expressions/NameInput/utils.ts b/frontend/src/metabase/querying/components/expressions/NameInput/utils.tssimilarity index 100%rename from frontend/src/metabase/query_builder/components/expressions/NameInput/utils.tsrename to frontend/src/metabase/querying/components/expressions/NameInput/utils.tsdiff --git a/frontend/src/metabase/query_builder/components/expressions/index.ts b/frontend/src/metabase/querying/components/expressions/index.tssimilarity index 100%rename from frontend/src/metabase/query_builder/components/expressions/index.tsrename to frontend/src/metabase/querying/components/expressions/index.tsdiff --git a/frontend/src/metabase/querying/constants.ts b/frontend/src/metabase/querying/constants.tsnew file mode 100644index 00000000000..a8f22bce0ea--- /dev/null+++ b/frontend/src/metabase/querying/constants.ts@@ -0,0 +1,20 @@+export const MODAL_TYPES = {+ SAVE: "save",+ ADD_TO_DASHBOARD: "add-to-dashboard",+ MOVE: "move",+ CLONE: "clone",+ ARCHIVE: "archive",+ CREATE_ALERT: "create-alert",+ SAVE_QUESTION_BEFORE_EMBED: "save-question-before-embed",+ TURN_INTO_DATASET: "turn-into-dataset",+ CAN_NOT_CREATE_MODEL: "can-not-create-model",+ NEW_EVENT: "new-event",+ EDIT_EVENT: "edit-event",+ MOVE_EVENT: "move-event",+ PREVIEW_QUERY: "preview-query",+ QUESTION_EMBED: "question-embed",+} as const;++export type QueryModalType = (typeof MODAL_TYPES)[keyof typeof MODAL_TYPES];++export const VISUALIZATION_SLOW_TIMEOUT = 15 * 1000;diff --git a/frontend/src/metabase/querying/drills/utils/column-extract-drill.tsx b/frontend/src/metabase/querying/drills/utils/column-extract-drill.tsxindex 0e67c80c274..de003773bca 100644--- a/frontend/src/metabase/querying/drills/utils/column-extract-drill.tsx+++ b/frontend/src/metabase/querying/drills/utils/column-extract-drill.tsx@@ -2,7 +2,6 @@ import { c } from "ttag";import { useDispatch } from "metabase/lib/redux";import { setUIControls } from "metabase/query_builder/actions";-import { trackColumnExtractViaHeader } from "metabase/querying/analytics";import { ClickActionsView } from "metabase/visualizations/components/ClickActions";import type {ClickActionPopoverProps,@@ -11,6 +10,8 @@ import type {} from "metabase/visualizations/types/click-actions";import * as Lib from "metabase-lib";+import { trackColumnExtractViaHeader } from "../../analytics";+export const columnExtractDrill: Drill<Lib.ColumnExtractDrillThruInfo> = ({query,stageIndex,diff --git a/frontend/src/metabase/querying/drills/utils/combine-columns-drill.tsx b/frontend/src/metabase/querying/drills/utils/combine-columns-drill.tsxindex 599ac9c94ee..a72f096e458 100644--- a/frontend/src/metabase/querying/drills/utils/combine-columns-drill.tsx+++ b/frontend/src/metabase/querying/drills/utils/combine-columns-drill.tsx@@ -2,8 +2,6 @@ import { t } from "ttag";import { useDispatch } from "metabase/lib/redux";import { setUIControls } from "metabase/query_builder/actions";-import { CombineColumns } from "metabase/query_builder/components/expressions";-import { trackColumnCombineViaColumnHeader } from "metabase/querying/analytics";import { Box, Title } from "metabase/ui";import type {ClickActionPopoverProps,@@ -11,6 +9,9 @@ import type {} from "metabase/visualizations/types/click-actions";import * as Lib from "metabase-lib";+import { trackColumnCombineViaColumnHeader } from "../../analytics";+import { CombineColumns } from "../../components/expressions";+export const combineColumnsDrill: Drill<Lib.CombineColumnsDrillThruInfo> = ({question,drill,diff --git a/frontend/src/metabase/querying/editor/components/QueryEditor/NativeQuerySidebar/NativeQuerySidebar.tsx b/frontend/src/metabase/querying/editor/components/QueryEditor/NativeQuerySidebar/NativeQuerySidebar.tsxindex 28c599ab163..b7709492bcd 100644--- a/frontend/src/metabase/querying/editor/components/QueryEditor/NativeQuerySidebar/NativeQuerySidebar.tsx+++ b/frontend/src/metabase/querying/editor/components/QueryEditor/NativeQuerySidebar/NativeQuerySidebar.tsx@@ -3,15 +3,16 @@ import { useMount } from "react-use";import { match } from "ts-pattern";import { useSelector } from "metabase/lib/redux";-import { DataReference } from "metabase/query_builder/components/dataref/DataReference";-import { SnippetSidebar } from "metabase/query_builder/components/template_tags/SnippetSidebar";import { TagEditorSidebar } from "metabase/query_builder/components/template_tags/TagEditorSidebar";-import { getSampleDatabaseId } from "metabase/query_builder/selectors";import { Box } from "metabase/ui";import * as Lib from "metabase-lib";import type Question from "metabase-lib/v1/Question";import type { NativeQuerySnippet, RowValue } from "metabase-types/api";+import { DataReference } from "../../../../components/DataReference/DataReference";+import { SnippetSidebar } from "../../../../components/SnippetSidebar";+import { getSampleDatabaseId } from "../../../../selectors";+import S from "./NativeQuerySidebar.module.css";type NativeQuerySidebarProps = {diff --git a/frontend/src/metabase/querying/editor/components/QueryEditor/QueryEditorBody/QueryEditorBody.tsx b/frontend/src/metabase/querying/editor/components/QueryEditor/QueryEditorBody/QueryEditorBody.tsxindex 2d0d683f18f..b37511e06fa 100644--- a/frontend/src/metabase/querying/editor/components/QueryEditor/QueryEditorBody/QueryEditorBody.tsx+++ b/frontend/src/metabase/querying/editor/components/QueryEditor/QueryEditorBody/QueryEditorBody.tsx@@ -6,12 +6,7 @@ import { useWindowSize } from "react-use";import type { OmniPickerItem } from "metabase/common/components/Pickers";import { ResizeHandle } from "metabase/common/components/ResizeHandle";import { useSetting } from "metabase/common/hooks";-import {- NativeQueryEditor,- type SelectionRange,-} from "metabase/query_builder/components/NativeQueryEditor";-import type { QueryModalType } from "metabase/query_builder/constants";-import type { QueryEditorDatabasePickerItem } from "metabase/querying/editor/types";+import { NativeQueryEditor } from "metabase/query_builder/components/NativeQueryEditor";import { Notebook } from "metabase/querying/notebook/components/Notebook";import { Box } from "metabase/ui";import type Question from "metabase-lib/v1/Question";@@ -21,6 +16,12 @@ import type {RecentCollectionItem,} from "metabase-types/api";+import type { QueryModalType } from "../../../../constants";+import type {+ QueryEditorDatabasePickerItem,+ SelectionRange,+} from "../../../types";+import S from "./QueryEditorBody.module.css";const DEFAULT_EDITOR_HEIGHT = 550;diff --git a/frontend/src/metabase/querying/editor/components/QueryEditor/QueryEditorVisualization/QueryEditorVisualization.tsx b/frontend/src/metabase/querying/editor/components/QueryEditor/QueryEditorVisualization/QueryEditorVisualization.tsxindex 955b45b72b5..bf36015dd10 100644--- a/frontend/src/metabase/querying/editor/components/QueryEditor/QueryEditorVisualization/QueryEditorVisualization.tsx+++ b/frontend/src/metabase/querying/editor/components/QueryEditor/QueryEditorVisualization/QueryEditorVisualization.tsx@@ -1,8 +1,9 @@import { DebouncedFrame } from "metabase/common/components/DebouncedFrame";-import { QueryVisualization } from "metabase/query_builder/components/QueryVisualization";import type Question from "metabase-lib/v1/Question";import type { Dataset, RawSeries } from "metabase-types/api";+import { QueryVisualization } from "../../../../components/QueryVisualization";+import S from "./QueryEditorVisualization.module.css";type QueryEditorVisualizationProps = {diff --git a/frontend/src/metabase/querying/editor/hooks/use-query-controls/use-query-controls.ts b/frontend/src/metabase/querying/editor/hooks/use-query-controls/use-query-controls.tsindex caa41997e5f..fba7927baa7 100644--- a/frontend/src/metabase/querying/editor/hooks/use-query-controls/use-query-controls.ts+++ b/frontend/src/metabase/querying/editor/hooks/use-query-controls/use-query-controls.ts@@ -1,18 +1,16 @@import { useMemo } from "react";-import type {- Location,- SelectionRange,-} from "metabase/query_builder/components/NativeQueryEditor/types";-import type { QueryModalType } from "metabase/query_builder/constants";import * as Lib from "metabase-lib";import type Question from "metabase-lib/v1/Question";import type { NativeQuerySnippet } from "metabase-types/api";+import type { QueryModalType } from "../../../constants";import type {+ Location,QueryEditorModalType,QueryEditorSidebarType,QueryEditorUiState,+ SelectionRange,} from "../../types";const EMPTY_SELECTION_RANGE: SelectionRange = {diff --git a/frontend/src/metabase/querying/editor/types.ts b/frontend/src/metabase/querying/editor/types.tsindex 790a2157b10..a9c5d01370c 100644--- a/frontend/src/metabase/querying/editor/types.ts+++ b/frontend/src/metabase/querying/editor/types.ts@@ -1,6 +1,5 @@import type { OmniPickerItem } from "metabase/common/components/Pickers";import type { MiniPickerTableItem } from "metabase/common/components/Pickers/MiniPicker/types";-import type { SelectionRange } from "metabase/query_builder/components/NativeQueryEditor/types";import type {CardDisplayType,CardType,@@ -12,6 +11,24 @@ import type {VisualizationSettings,} from "metabase-types/api";+export type Location = {+ row: number;+ column: number;+};++export type SelectionRange = {+ start: Location;+ end: Location;+};++export type SidebarFeatures = {+ dataReference?: boolean;+ variables?: boolean;+ snippets?: boolean;+ promptInput?: boolean;+ formatQuery?: boolean;+};+export type QueryEditorSidebarType =| "data-reference"| "snippet"diff --git a/frontend/src/metabase/querying/filters/components/FilterPicker/FilterPicker.tsx b/frontend/src/metabase/querying/filters/components/FilterPicker/FilterPicker.tsxindex ba3d7c8dd56..a4b8188bc9e 100644--- a/frontend/src/metabase/querying/filters/components/FilterPicker/FilterPicker.tsx+++ b/frontend/src/metabase/querying/filters/components/FilterPicker/FilterPicker.tsx@@ -1,12 +1,13 @@import { useDisclosure } from "@mantine/hooks";import { useCallback, useLayoutEffect, useMemo, useState } from "react";+import type { DefinedClauseName } from "metabase/querying/expressions";+import * as Lib from "metabase-lib";+import {ExpressionWidget,ExpressionWidgetHeader,-} from "metabase/query_builder/components/expressions";-import type { DefinedClauseName } from "metabase/querying/expressions";-import * as Lib from "metabase-lib";+} from "../../../components/expressions";import {FilterColumnPicker,diff --git a/frontend/src/metabase/querying/metrics/components/MetricEditor/MetricEditorFooter/MetricEditorFooter.tsx b/frontend/src/metabase/querying/metrics/components/MetricEditor/MetricEditorFooter/MetricEditorFooter.tsxindex 942e9cabc13..4b3fbbf6aaa 100644--- a/frontend/src/metabase/querying/metrics/components/MetricEditor/MetricEditorFooter/MetricEditorFooter.tsx+++ b/frontend/src/metabase/querying/metrics/components/MetricEditor/MetricEditorFooter/MetricEditorFooter.tsx@@ -1,8 +1,9 @@import { DebouncedFrame } from "metabase/common/components/DebouncedFrame";-import { QueryVisualization } from "metabase/query_builder/components/QueryVisualization";import type Question from "metabase-lib/v1/Question";import type { Dataset, RawSeries } from "metabase-types/api";+import { QueryVisualization } from "../../../../components/QueryVisualization";+import S from "./MetricEditorFooter.module.css";import { MetricEmptyState } from "./MetricEmptyState";diff --git a/frontend/src/metabase/querying/notebook/components/ExpressionStep/ExpressionStep.tsx b/frontend/src/metabase/querying/notebook/components/ExpressionStep/ExpressionStep.tsxindex 610d4c347e9..ff2ae6e018f 100644--- a/frontend/src/metabase/querying/notebook/components/ExpressionStep/ExpressionStep.tsx+++ b/frontend/src/metabase/querying/notebook/components/ExpressionStep/ExpressionStep.tsx@@ -1,10 +1,10 @@import { useMemo } from "react";import { useTranslateContent } from "metabase/i18n/hooks";-import { ExpressionWidget } from "metabase/query_builder/components/expressions/ExpressionWidget";import * as Lib from "metabase-lib";import { getUniqueExpressionName } from "metabase-lib/v1/queries/utils/expression";+import { ExpressionWidget } from "../../../components/expressions/ExpressionWidget";import type { NotebookStepProps } from "../../types";import { ClauseStep } from "../ClauseStep";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.tsxindex a828afbf120..168cb43225f 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@@ -4,13 +4,13 @@ import {type ColumnListItem,QueryColumnPicker,} from "metabase/common/components/QueryColumnPicker";-import {- ExpressionWidget,- ExpressionWidgetHeader,-} from "metabase/query_builder/components/expressions/ExpressionWidget";import type { DefinedClauseName } from "metabase/querying/expressions";import * as Lib from "metabase-lib";+import {+ ExpressionWidget,+ ExpressionWidgetHeader,+} from "../../../../../components/expressions/ExpressionWidget";import { getJoinStrategyIcon } from "../../utils";import S from "./JoinColumnDropdown.module.css";diff --git a/frontend/src/metabase/querying/notebook/components/LimitStep/LimitStep.tsx b/frontend/src/metabase/querying/notebook/components/LimitStep/LimitStep.tsxindex 5e2a74f3725..970fd2970f8 100644--- a/frontend/src/metabase/querying/notebook/components/LimitStep/LimitStep.tsx+++ b/frontend/src/metabase/querying/notebook/components/LimitStep/LimitStep.tsx@@ -3,9 +3,9 @@ import { useState } from "react";import { t } from "ttag";import CS from "metabase/css/core/index.css";-import { LimitInput } from "metabase/query_builder/components/LimitInput";import * as Lib from "metabase-lib";+import { LimitInput } from "../../../components/LimitInput";import type { NotebookStepProps } from "../../types";import { NotebookCell } from "../NotebookCell";diff --git a/frontend/src/metabase/querying/notebook/components/NativeQueryPreview/NativeQueryPreview.tsx b/frontend/src/metabase/querying/notebook/components/NativeQueryPreview/NativeQueryPreview.tsxindex 5ab0ceb5a8a..d685e430d79 100644--- a/frontend/src/metabase/querying/notebook/components/NativeQueryPreview/NativeQueryPreview.tsx+++ b/frontend/src/metabase/querying/notebook/components/NativeQueryPreview/NativeQueryPreview.tsx@@ -7,7 +7,6 @@ import { CopyButton } from "metabase/common/components/CopyButton";import { ExternalLink } from "metabase/common/components/ExternalLink";import { formatNativeQuery } from "metabase/lib/engine";import { useSelector } from "metabase/lib/redux";-import { language } from "metabase/query_builder/components/NativeQueryEditor/CodeMirrorEditor/language";import { getLearnUrl } from "metabase/selectors/settings";import { getShowMetabaseLinks } from "metabase/selectors/whitelabel";import { Box, Flex, Icon, Loader, Stack } from "metabase/ui";@@ -15,6 +14,8 @@ import * as Lib from "metabase-lib";import type { UiParameter } from "metabase-lib/v1/parameters/types";import type { NativeDatasetResponse } from "metabase-types/api";+import { language } from "../../../components/CodeMirrorEditor/language";+import S from "./NativeQueryPreview.module.css";export function NativeQueryPreview({diff --git a/frontend/src/metabase/querying/notebook/components/Notebook/use-run-visualization.ts b/frontend/src/metabase/querying/notebook/components/Notebook/use-run-visualization.tsindex da08e5d7b06..2f2a60b8a2a 100644--- a/frontend/src/metabase/querying/notebook/components/Notebook/use-run-visualization.ts+++ b/frontend/src/metabase/querying/notebook/components/Notebook/use-run-visualization.ts@@ -1,6 +1,7 @@-import { cleanQuestion } from "metabase/query_builder/utils/question";import type Question from "metabase-lib/v1/Question";+import { cleanQuestion } from "../../../common/utils/question";+type UseVisualizationProps = {question?: Question;isDirty: boolean;diff --git a/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/NotebookDataPicker.tsx b/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/NotebookDataPicker.tsxindex 6aff894f1b6..c8a612a20bc 100644--- a/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/NotebookDataPicker.tsx+++ b/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/NotebookDataPicker.tsx@@ -16,7 +16,6 @@ import type {import { isEmbedding } from "metabase/embedding/config";import { useDispatch, useSelector, useStore } from "metabase/lib/redux";import { checkNotNull } from "metabase/lib/types";-import type { QueryEditorDatabasePickerItem } from "metabase/querying/editor/types";import { loadMetadataForTable } from "metabase/questions/actions";import { getMetadata } from "metabase/selectors/metadata";import { getIsTenantUser } from "metabase/selectors/user";@@ -25,6 +24,7 @@ import * as Lib from "metabase-lib";import { getQuestionVirtualTableId } from "metabase-lib/v1/metadata/utils/saved-questions";import type { TableId } from "metabase-types/api";+import type { QueryEditorDatabasePickerItem } from "../../../editor/types";import {type NotebookContextType,useNotebookContext,diff --git a/frontend/src/metabase/querying/notebook/components/NotebookNativePreview/NotebookNativePreview.tsx b/frontend/src/metabase/querying/notebook/components/NotebookNativePreview/NotebookNativePreview.tsxindex d73513896f5..e9523d9d1ca 100644--- a/frontend/src/metabase/querying/notebook/components/NotebookNativePreview/NotebookNativePreview.tsx+++ b/frontend/src/metabase/querying/notebook/components/NotebookNativePreview/NotebookNativePreview.tsx@@ -4,11 +4,12 @@ import { t } from "ttag";import { useGetNativeDatasetQuery } from "metabase/api";import { DelayedLoadingSpinner } from "metabase/common/components/Pickers/EntityPicker/components/LoadingSpinner";import { getEngineNativeType } from "metabase/lib/engine";-import { CodeMirrorEditor as Editor } from "metabase/query_builder/components/NativeQueryEditor/CodeMirrorEditor";import { Box, Button, Flex, Icon, rem } from "metabase/ui";import * as Lib from "metabase-lib";import type Question from "metabase-lib/v1/Question";+import { CodeMirrorEditor as Editor } from "../../../components/CodeMirrorEditor";+import { createNativeQuestion } from "./utils";const TITLE = {diff --git a/frontend/src/metabase/querying/selectors.ts b/frontend/src/metabase/querying/selectors.tsnew file mode 100644index 00000000000..15201d475a6--- /dev/null+++ b/frontend/src/metabase/querying/selectors.ts@@ -0,0 +1,21 @@+import { createSelector } from "@reduxjs/toolkit";+import _ from "underscore";++import { Databases } from "metabase/entities/databases";+import type { Database } from "metabase-types/api";+import type { State } from "metabase-types/store";++const getDatabasesListDefaultValue: Database[] = [];++export const getDatabasesList = (state: State): Database[] =>+ Databases.selectors.getList(state, {+ entityQuery: { include: "tables", saved: true },+ }) || getDatabasesListDefaultValue;++export const getSampleDatabaseId = createSelector(+ [getDatabasesList],+ (databases): number | undefined => {+ const sampleDatabase = _.findWhere(databases, { is_sample: true });+ return sampleDatabase?.id;+ },+);diff --git a/frontend/src/metabase/rich_text_editing/tiptap/extensions/shared/NativeQueryModal.tsx b/frontend/src/metabase/rich_text_editing/tiptap/extensions/shared/NativeQueryModal.tsxindex 1772f7a0d8a..bfa918eef49 100644--- a/frontend/src/metabase/rich_text_editing/tiptap/extensions/shared/NativeQueryModal.tsx+++ b/frontend/src/metabase/rich_text_editing/tiptap/extensions/shared/NativeQueryModal.tsx@@ -13,9 +13,9 @@ import {import { isMac } from "metabase/lib/browser";import { useDispatch, useSelector } from "metabase/lib/redux";import { NativeQueryEditor } from "metabase/query_builder/components/NativeQueryEditor";-import { DataReference } from "metabase/query_builder/components/dataref/DataReference";-import type { DataReferenceItem } from "metabase/query_builder/components/dataref/types";import { createRawSeries } from "metabase/query_builder/utils";+import { DataReference } from "metabase/querying/components/DataReference/DataReference";+import type { DataReferenceItem } from "metabase/querying/components/DataReference/types";import { getMetadata } from "metabase/selectors/metadata";import { Box, Button, Flex, Loader, Modal, Stack, Text } from "metabase/ui";import Visualization from "metabase/visualizations/components/Visualization";diff --git a/frontend/src/metabase/visualizations/click-actions/actions/CombineColumnsAction/CombineColumnsAction.tsx b/frontend/src/metabase/visualizations/click-actions/actions/CombineColumnsAction/CombineColumnsAction.tsxindex 9484745ce7b..55093ac987d 100644--- a/frontend/src/metabase/visualizations/click-actions/actions/CombineColumnsAction/CombineColumnsAction.tsx+++ b/frontend/src/metabase/visualizations/click-actions/actions/CombineColumnsAction/CombineColumnsAction.tsx@@ -3,12 +3,12 @@ import { t } from "ttag";import { useDispatch, useSelector } from "metabase/lib/redux";import { checkNotNull } from "metabase/lib/types";import { setUIControls } from "metabase/query_builder/actions";-import { trackColumnCombineViaPlusModal } from "metabase/query_builder/analytics";+import { getQuestion } from "metabase/query_builder/selectors";+import { trackColumnCombineViaPlusModal } from "metabase/querying/analytics";import {CombineColumns,hasCombinations,-} from "metabase/query_builder/components/expressions";-import { getQuestion } from "metabase/query_builder/selectors";+} from "metabase/querying/components/expressions";import type { LegacyDrill } from "metabase/visualizations/types";import type { ClickActionPopoverProps } from "metabase/visualizations/types/click-actions";import * as Lib from "metabase-lib";diff --git a/frontend/src/metabase/visualizations/click-actions/actions/ExtractColumnAction/ExtractColumnAction.tsx b/frontend/src/metabase/visualizations/click-actions/actions/ExtractColumnAction/ExtractColumnAction.tsxindex 6ca2a0cb777..1bb3dae2c7e 100644--- a/frontend/src/metabase/visualizations/click-actions/actions/ExtractColumnAction/ExtractColumnAction.tsx+++ b/frontend/src/metabase/visualizations/click-actions/actions/ExtractColumnAction/ExtractColumnAction.tsx@@ -3,12 +3,12 @@ import { t } from "ttag";import { useDispatch, useSelector } from "metabase/lib/redux";import { checkNotNull } from "metabase/lib/types";import { setUIControls } from "metabase/query_builder/actions";-import { trackColumnExtractViaPlusModal } from "metabase/query_builder/analytics";+import { getQuestion } from "metabase/query_builder/selectors";+import { trackColumnExtractViaPlusModal } from "metabase/querying/analytics";import {ExtractColumn,hasExtractions,-} from "metabase/query_builder/components/expressions";-import { getQuestion } from "metabase/query_builder/selectors";+} from "metabase/querying/components/expressions";import { Box, rem } from "metabase/ui";import type { LegacyDrill } from "metabase/visualizations/types";import type { ClickActionPopoverProps } from "metabase/visualizations/types/click-actions";diff --git a/frontend/src/metabase/visualizations/click-actions/actions/NativeQueryClickFallback.tsx b/frontend/src/metabase/visualizations/click-actions/actions/NativeQueryClickFallback.tsxindex da08d0cbece..eaa7974f7c9 100644--- a/frontend/src/metabase/visualizations/click-actions/actions/NativeQueryClickFallback.tsx+++ b/frontend/src/metabase/visualizations/click-actions/actions/NativeQueryClickFallback.tsx@@ -2,7 +2,7 @@ import { c } from "ttag";import { isWithinIframe } from "metabase/lib/dom";import { setUIControls } from "metabase/query_builder/actions";-import { MODAL_TYPES } from "metabase/query_builder/constants";+import { MODAL_TYPES } from "metabase/querying/constants";import { Button, Flex } from "metabase/ui";import type {CustomClickActionWithCustomView,diff --git a/frontend/src/metabase/visualizations/components/ChartSettings/ChartSettingsVisualization/ChartSettingsVisualization.styled.tsx b/frontend/src/metabase/visualizations/components/ChartSettings/ChartSettingsVisualization/ChartSettingsVisualization.styled.tsxindex 50805c168ed..df4d79cf8c5 100644--- a/frontend/src/metabase/visualizations/components/ChartSettings/ChartSettingsVisualization/ChartSettingsVisualization.styled.tsx+++ b/frontend/src/metabase/visualizations/components/ChartSettings/ChartSettingsVisualization/ChartSettingsVisualization.styled.tsx@@ -1,7 +1,7 @@// eslint-disable-next-line no-restricted-importsimport styled from "@emotion/styled";-import { Warnings } from "metabase/query_builder/components/Warnings";+import { Warnings } from "metabase/querying/components/QueryVisualization/Warnings";import { color } from "metabase/ui/colors";export const SectionWarnings = styled(Warnings)`