Skip to content

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

Fix native editor module boundaries (#75168)

Romeo Van Snicka5630332e5b7
diff --git a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/SqlParametersList/SqlParametersList.tsx b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/SqlParametersList/SqlParametersList.tsx
index 7bc3445cbf3..d8865065863 100644
--- a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/SqlParametersList/SqlParametersList.tsx
+++ b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/SqlParametersList/SqlParametersList.tsx
@@ -2,7 +2,7 @@ import { useMemo } from "react";
import { useLatest } from "react-use";
import { useSdkQuestionContext } from "embedding-sdk-bundle/components/private/SdkQuestion/context";
-import { ResponsiveParametersList } from "metabase/query_builder/components/ResponsiveParametersList";
+import { ResponsiveParametersList } from "metabase/querying/components/ResponsiveParametersList";
import { useSelector } from "metabase/redux";
import { getMetadata } from "metabase/selectors/metadata";
import { Box } from "metabase/ui";
diff --git a/frontend/src/embedding-sdk-bundle/lib/sdk-question/update-question.ts b/frontend/src/embedding-sdk-bundle/lib/sdk-question/update-question.ts
index 39a7290fc15..622a2971d8e 100644
--- a/frontend/src/embedding-sdk-bundle/lib/sdk-question/update-question.ts
+++ b/frontend/src/embedding-sdk-bundle/lib/sdk-question/update-question.ts
@@ -3,10 +3,10 @@ import _ from "underscore";
import type { SdkQuestionState } from "embedding-sdk-bundle/types/question";
import { computeQuestionPivotTable } from "metabase/query_builder/actions/core/pivot-table";
import { getAdHocQuestionWithVizSettings } from "metabase/query_builder/actions/core/utils";
-import { createRawSeries } from "metabase/query_builder/utils";
import { loadMetadataForCard } from "metabase/questions/actions";
import type { Dispatch, GetState } from "metabase/redux/store";
import { getMetadata } from "metabase/selectors/metadata";
+import { createRawSeries } from "metabase/visualizations/lib/series";
import * as Lib from "metabase-lib";
import Question from "metabase-lib/v1/Question";
import type { ParameterValuesMap } from "metabase-types/api";
diff --git a/frontend/src/metabase/actions/containers/ActionCreator/ActionContext/QueryActionContextProvider/QueryActionEditor.tsx b/frontend/src/metabase/actions/containers/ActionCreator/ActionContext/QueryActionContextProvider/QueryActionEditor.tsx
index 3c531377ed4..8b4fde0b5ee 100644
--- a/frontend/src/metabase/actions/containers/ActionCreator/ActionContext/QueryActionContextProvider/QueryActionEditor.tsx
+++ b/frontend/src/metabase/actions/containers/ActionCreator/ActionContext/QueryActionContextProvider/QueryActionEditor.tsx
@@ -1,4 +1,4 @@
-import { NativeQueryEditor } from "metabase/query_builder/components/NativeQueryEditor";
+import { NativeQueryEditor } from "metabase/querying/components/NativeQueryEditor";
import type Question from "metabase-lib/v1/Question";
import type NativeQuery from "metabase-lib/v1/queries/NativeQuery";
diff --git a/frontend/src/metabase/public/components/EmbedFrame/EmbedFrame.tsx b/frontend/src/metabase/public/components/EmbedFrame/EmbedFrame.tsx
index c57afc8423f..34f260ba0e1 100644
--- a/frontend/src/metabase/public/components/EmbedFrame/EmbedFrame.tsx
+++ b/frontend/src/metabase/public/components/EmbedFrame/EmbedFrame.tsx
@@ -24,8 +24,8 @@ import EmbedThemeS from "metabase/embedding/theme.module.css";
import { isEmbeddingSdk } from "metabase/embedding-sdk/config";
import { ParametersList } from "metabase/parameters/components/ParametersList";
import { getVisibleParameters } from "metabase/parameters/utils/ui";
-import { SyncedParametersList } from "metabase/query_builder/components/SyncedParametersList";
-import { useSyncUrlParameters } from "metabase/query_builder/hooks/use-sync-url-parameters";
+import { SyncedParametersList } from "metabase/querying/components/SyncedParametersList";
+import { useSyncUrlParameters } from "metabase/querying/components/use-sync-url-parameters";
import { useSelector } from "metabase/redux";
import { getSetting } from "metabase/selectors/settings";
import { FullWidthContainer } from "metabase/styled-components/layout/FullWidthContainer";
diff --git a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditorInner.tsx b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditorInner.tsx
index 2ec34d97cac..85f22546637 100644
--- a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditorInner.tsx
+++ b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditorInner.tsx
@@ -28,16 +28,16 @@ import CS from "metabase/css/core/index.css";
import { PLUGIN_DEPENDENCIES } from "metabase/plugins";
import {
setDatasetEditorTab,
+ setTemplateTagConfig,
updateQuestion as updateQuestionAction,
} from "metabase/query_builder/actions";
-import { getInitialEditorHeight } from "metabase/query_builder/components/NativeQueryEditor/utils";
-import { TagEditorSidebar } from "metabase/query_builder/components/template_tags/TagEditorSidebar";
import { ViewSidebar } from "metabase/query_builder/components/view/ViewSidebar";
import {
getDatasetEditorTab,
getIsListViewConfigurationShown,
getIsResultDirty,
getMetadataDiff,
+ getOriginalQuestion,
getResultsMetadata,
getVisualizationSettings,
isResultsMetadataDirty,
@@ -45,8 +45,10 @@ import {
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 { getInitialEditorHeight } from "metabase/querying/components/NativeQueryEditor/utils";
import { QueryVisualization } from "metabase/querying/components/QueryVisualization";
import { SnippetSidebar } from "metabase/querying/components/SnippetSidebar";
+import { TagEditorSidebar } from "metabase/querying/components/template_tags/TagEditorSidebar";
import { MODAL_TYPES } from "metabase/querying/constants";
import { connect, useDispatch } from "metabase/redux";
import { setUIControls } from "metabase/redux/query-builder";
@@ -146,10 +148,11 @@ function mapStateToProps(state: any) {
resultsMetadata: getResultsMetadata(state),
isResultDirty: getIsResultDirty(state),
isShowingListViewConfiguration: getIsListViewConfigurationShown(state),
+ originalQuestion: getOriginalQuestion(state),
};
}
-const mapDispatchToProps = { setDatasetEditorTab };
+const mapDispatchToProps = { setDatasetEditorTab, setTemplateTagConfig };
function getSidebar(
props: DatasetEditorInnerProps & { modelIndexes?: unknown },
diff --git a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetQueryEditor.tsx b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetQueryEditor.tsx
index c146b721297..ccd08a1e253 100644
--- a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetQueryEditor.tsx
+++ b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetQueryEditor.tsx
@@ -8,7 +8,7 @@ import {
} from "react";
import type { ResizableBoxProps } from "react-resizable";
-import { NativeQueryEditor } from "metabase/query_builder/components/NativeQueryEditor";
+import { NativeQueryEditor } from "metabase/querying/components/NativeQueryEditor";
import { Box } from "metabase/ui";
import { isReducedMotionPreferred } from "metabase/utils/dom";
import { checkNotNull } from "metabase/utils/types";
diff --git a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetQueryEditor.unit.spec.tsx b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetQueryEditor.unit.spec.tsx
index 441af4dcdcb..a9e43f94a4b 100644
--- a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetQueryEditor.unit.spec.tsx
+++ b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetQueryEditor.unit.spec.tsx
@@ -115,7 +115,7 @@ const importDatasetQueryEditor = async () => {
describe("DatasetQueryEditor", () => {
beforeEach(() => {
- jest.unmock("metabase/query_builder/components/NativeQueryEditor");
+ jest.unmock("metabase/querying/components/NativeQueryEditor");
});
it("renders sidebar when query tab is active", async () => {
diff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditor.tsx b/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditor.tsx
deleted file mode 100644
index 10bf94949bb..00000000000
--- a/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditor.tsx
+++ /dev/null
@@ -1,101 +0,0 @@
-import { Fragment, type ReactNode, forwardRef } from "react";
-
-import type { SidebarFeatures } from "metabase/querying/editor/types";
-
-import {
- type NativeQueryEditorCoreProps,
- NativeQueryEditorRoot,
-} from "./NativeQueryEditorRoot";
-import { ParametersList } from "./slots/ParametersList";
-import { RunButton } from "./slots/RunButton";
-import { Sidebar } from "./slots/Sidebar";
-import { TopBar } from "./slots/TopBar";
-import { VisibilityToggler } from "./slots/VisibilityToggler";
-
-type NativeQueryEditorProps = NativeQueryEditorCoreProps & {
- children?: ReactNode;
- extraButton?: ReactNode;
- hasEditingSidebar?: boolean;
- hasParametersList?: boolean;
- hasRunButton?: boolean;
- hasTopBar?: boolean;
- sidebarFeatures?: SidebarFeatures;
- topBarInnerContent?: ReactNode;
-};
-
-/**
- * Native (SQL) query editor.
- *
- * Prefer the composition API, assembling only the parts you need:
- *
- * <NativeQueryEditor question={question} query={query} setDatasetQuery={...}>
- * <NativeQueryEditor.TopBar>
- * <NativeQueryEditor.ParametersList />
- * <NativeQueryEditor.Sidebar features={...} />
- * <NativeQueryEditor.VisibilityToggler />
- * </NativeQueryEditor.TopBar>
- * <NativeQueryEditor.RunButton />
- * </NativeQueryEditor>
- *
- * The legacy boolean-flag API (`hasTopBar`, `hasEditingSidebar`,
- * `hasParametersList`, `hasRunButton`, `sidebarFeatures`, `extraButton`,
- * `topBarInnerContent`) is still supported as a thin shim over the composition
- * internals and will be removed once all consumers have migrated. When
- * `children` are provided they take precedence and the legacy flags are ignored.
- */
-const NativeQueryEditorBase = forwardRef<
- HTMLDivElement,
- NativeQueryEditorProps
->(function NativeQueryEditor(props, ref) {
- const {
- children,
- extraButton,
- hasEditingSidebar = true,
- hasParametersList,
- hasRunButton = hasEditingSidebar,
- hasTopBar = true,
- sidebarFeatures,
- topBarInnerContent,
- ...coreProps
- } = props;
-
- if (children != null) {
- return (
- <NativeQueryEditorRoot {...coreProps} ref={ref}>
- {children}
- </NativeQueryEditorRoot>
- );
- }
-
- const legacyChildren: ReactNode[] = [];
- if (hasTopBar) {
- legacyChildren.push(
- <TopBar key="top-bar">
- {hasParametersList !== false && <ParametersList />}
- {topBarInnerContent}
- {hasEditingSidebar && <Sidebar features={sidebarFeatures} />}
- <VisibilityToggler />
- </TopBar>,
- );
- }
- if (extraButton != null) {
- legacyChildren.push(<Fragment key="extra-button">{extraButton}</Fragment>);
- }
- if (hasRunButton) {
- legacyChildren.push(<RunButton key="run-button" />);
- }
-
- return (
- <NativeQueryEditorRoot {...coreProps} ref={ref}>
- {legacyChildren}
- </NativeQueryEditorRoot>
- );
-});
-
-export const NativeQueryEditor = Object.assign(NativeQueryEditorBase, {
- TopBar,
- Sidebar,
- ParametersList,
- VisibilityToggler,
- RunButton,
-});
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.tsx
index 731e9883f12..b39bfa2e6b5 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
@@ -1,13 +1,16 @@
import { match } from "ts-pattern";
import { AIQuestionAnalysisSidebar } from "metabase/metabot/components/AIQuestionAnalysisSidebar";
-import { TagEditorSidebar } from "metabase/query_builder/components/template_tags/TagEditorSidebar";
+import { setTemplateTagConfig } from "metabase/query_builder/actions";
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 { getOriginalQuestion } from "metabase/query_builder/selectors";
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 { TagEditorSidebar } from "metabase/querying/components/template_tags/TagEditorSidebar";
+import { useDispatch, useSelector } from "metabase/redux";
import type Question from "metabase-lib/v1/Question";
import type Database from "metabase-lib/v1/metadata/Database";
import type {
@@ -84,6 +87,9 @@ export const NativeQueryRightSidebar = (
onCloseAIQuestionAnalysisSidebar,
} = props;
+ const dispatch = useDispatch();
+ const originalQuestion = useSelector(getOriginalQuestion);
+
return match({
isShowingTemplateTagsEditor,
isShowingDataReference,
@@ -99,6 +105,10 @@ export const NativeQueryRightSidebar = (
<TagEditorSidebar
{...props}
query={query}
+ originalQuestion={originalQuestion}
+ setTemplateTagConfig={(tag, config) =>
+ dispatch(setTemplateTagConfig(tag, config))
+ }
onClose={toggleTemplateTagsEditor}
/>
) : null;
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.tsx
index b19b37ede6a..ea8823703b1 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,8 +4,8 @@ import cx from "classnames";
import { DebouncedFrame } from "metabase/common/components/DebouncedFrame";
import CS from "metabase/css/core/index.css";
import { ObjectDetailSidesheet } from "metabase/query_builder/components/ObjectDetailSidesheet";
-import { SyncedParametersList } from "metabase/query_builder/components/SyncedParametersList";
import { QueryVisualization } from "metabase/querying/components/QueryVisualization";
+import { SyncedParametersList } from "metabase/querying/components/SyncedParametersList";
import type { QueryModalType } from "metabase/querying/constants";
import type { SelectionRange } from "metabase/querying/editor/types";
import { TimeseriesChrome } from "metabase/querying/filters/components/TimeseriesChrome";
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.tsx
index 70a15000335..6fd02f738fc 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
@@ -1,6 +1,6 @@
import { useInlineSQLPrompt } from "metabase/metabot/components/MetabotInlineSQLPrompt";
-import { NativeQueryEditor } from "metabase/query_builder/components/NativeQueryEditor";
import { getHighlightedNativeQueryLineNumbers } from "metabase/query_builder/selectors";
+import { NativeQueryEditor } from "metabase/querying/components/NativeQueryEditor";
import type { QueryModalType } from "metabase/querying/constants";
import type { SelectionRange } from "metabase/querying/editor/types";
import { useSelector } from "metabase/redux";
diff --git a/frontend/src/metabase/query_builder/selectors.ts b/frontend/src/metabase/query_builder/selectors.ts
index 31cbdf12df9..3ef2e70734f 100644
--- a/frontend/src/metabase/query_builder/selectors.ts
+++ b/frontend/src/metabase/query_builder/selectors.ts
@@ -36,6 +36,7 @@ import {
getXValues,
isTimeseries,
} from "metabase/visualizations/lib/renderer_utils";
+import { createRawSeries } from "metabase/visualizations/lib/series";
import { getComputedSettingsForSeries } from "metabase/visualizations/lib/settings/visualization";
import * as Lib from "metabase-lib";
import Question from "metabase-lib/v1/Question";
@@ -60,7 +61,7 @@ import { isAbsoluteDateTimeUnit } from "metabase-types/guards/date-time";
import { getQuestionWithDefaultVisualizationSettings } from "./actions/core/utils";
import { cleanIndexFlags } from "./model-indexes/actions";
-import { createRawSeries, getWritableColumnProperties } from "./utils";
+import { getWritableColumnProperties } from "./utils";
// This selector can be called from public questions / dashboards, which do not have state.qb
export const getUiControls = (state: State) => state.qb?.uiControls;
diff --git a/frontend/src/metabase/query_builder/utils/index.ts b/frontend/src/metabase/query_builder/utils/index.ts
index 7342f7ce31a..be393dd5922 100644
--- a/frontend/src/metabase/query_builder/utils/index.ts
+++ b/frontend/src/metabase/query_builder/utils/index.ts
@@ -8,7 +8,7 @@ import type { DatasetEditorTab, QueryBuilderMode } from "metabase/redux/store";
import * as Urls from "metabase/urls";
import * as Lib from "metabase-lib";
import type Question from "metabase-lib/v1/Question";
-import type { Card, Field, NormalizedField, Series } from "metabase-types/api";
+import type { Card, Field, NormalizedField } from "metabase-types/api";
interface GetPathNameFromQueryBuilderModeOptions {
pathname: string;
@@ -191,29 +191,6 @@ export const isNavigationAllowed = ({
return true;
};
-export const createRawSeries = (options: {
- card: Card;
- queryResult: any;
- datasetQuery?: any;
-}): Series => {
- const { card, queryResult, datasetQuery } = options;
-
- // we want to provide the visualization with a card containing the latest
- // "display", "visualization_settings", etc, (to ensure the correct visualization is shown)
- // BUT the last executed "dataset_query" (to ensure data matches the query)
- return (
- queryResult && [
- {
- ...queryResult,
- card: {
- ...card,
- ...(datasetQuery && { dataset_query: datasetQuery }),
- },
- },
- ]
- );
-};
-
const WRITABLE_MBQL_COLUMN_PROPERTIES = [
"display_name",
"description",
diff --git a/frontend/src/metabase/query_builder/components/view/DataReferenceButton/DataReferenceButton.module.css b/frontend/src/metabase/querying/components/NativeQueryEditor/DataReferenceButton/DataReferenceButton.module.css
similarity index 100%
rename from frontend/src/metabase/query_builder/components/view/DataReferenceButton/DataReferenceButton.module.css
rename to frontend/src/metabase/querying/components/NativeQueryEditor/DataReferenceButton/DataReferenceButton.module.css
diff --git a/frontend/src/metabase/query_builder/components/view/DataReferenceButton/DataReferenceButton.tsx b/frontend/src/metabase/querying/components/NativeQueryEditor/DataReferenceButton/DataReferenceButton.tsx
similarity index 69%
rename from frontend/src/metabase/query_builder/components/view/DataReferenceButton/DataReferenceButton.tsx
rename to frontend/src/metabase/querying/components/NativeQueryEditor/DataReferenceButton/DataReferenceButton.tsx
index 8d6aad8466e..7034303c477 100644
--- a/frontend/src/metabase/query_builder/components/view/DataReferenceButton/DataReferenceButton.tsx
+++ b/frontend/src/metabase/querying/components/NativeQueryEditor/DataReferenceButton/DataReferenceButton.tsx
@@ -1,8 +1,6 @@
import cx from "classnames";
import { t } from "ttag";
-import { toggleDataReference } from "metabase/query_builder/actions";
-import { useDispatch } from "metabase/redux";
import { Box, Icon, Tooltip } from "metabase/ui";
import DataReferenceButtonS from "./DataReferenceButton.module.css";
@@ -20,16 +18,6 @@ export const DataReferenceButton = ({
size,
onClick,
}: DataReferenceButtonProps) => {
- const dispatch = useDispatch();
-
- const handleClick = () => {
- if (onClick) {
- onClick();
- } else {
- dispatch(toggleDataReference());
- }
- };
-
return (
<Tooltip label={t`Learn about your data`}>
<Box
@@ -40,7 +28,7 @@ export const DataReferenceButton = ({
[DataReferenceButtonS.isSelected]: isShowingDataReference,
})}
>
- <Icon name="reference" size={size} onClick={handleClick} />
+ <Icon name="reference" size={size} onClick={onClick} />
</Box>
</Tooltip>
);
diff --git a/frontend/src/metabase/query_builder/components/view/DataReferenceButton/index.ts b/frontend/src/metabase/querying/components/NativeQueryEditor/DataReferenceButton/index.ts
similarity index 100%
rename from frontend/src/metabase/query_builder/components/view/DataReferenceButton/index.ts
rename to frontend/src/metabase/querying/components/NativeQueryEditor/DataReferenceButton/index.ts
diff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/DataSourceSelectors/DataSourceSelectors.jsx b/frontend/src/metabase/querying/components/NativeQueryEditor/DataSourceSelectors/DataSourceSelectors.jsx
similarity index 100%
rename from frontend/src/metabase/query_builder/components/NativeQueryEditor/DataSourceSelectors/DataSourceSelectors.jsx
rename to frontend/src/metabase/querying/components/NativeQueryEditor/DataSourceSelectors/DataSourceSelectors.jsx
diff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/DataSourceSelectors/index.ts b/frontend/src/metabase/querying/components/NativeQueryEditor/DataSourceSelectors/index.ts
similarity index 100%
rename from frontend/src/metabase/query_builder/components/NativeQueryEditor/DataSourceSelectors/index.ts
rename to frontend/src/metabase/querying/components/NativeQueryEditor/DataSourceSelectors/index.ts
diff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditor.composition.unit.spec.tsx b/frontend/src/metabase/querying/components/NativeQueryEditor/NativeQueryEditor.composition.unit.spec.tsx
similarity index 100%
rename from frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditor.composition.unit.spec.tsx
rename to frontend/src/metabase/querying/components/NativeQueryEditor/NativeQueryEditor.composition.unit.spec.tsx
diff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditor.module.css b/frontend/src/metabase/querying/components/NativeQueryEditor/NativeQueryEditor.module.css
similarity index 100%
rename from frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditor.module.css
rename to frontend/src/metabase/querying/components/NativeQueryEditor/NativeQueryEditor.module.css
diff --git a/frontend/src/metabase/querying/components/NativeQueryEditor/NativeQueryEditor.tsx b/frontend/src/metabase/querying/components/NativeQueryEditor/NativeQueryEditor.tsx
new file mode 100644
index 00000000000..fba553c9ed2
--- /dev/null
+++ b/frontend/src/metabase/querying/components/NativeQueryEditor/NativeQueryEditor.tsx
@@ -0,0 +1,48 @@
+import { type ReactNode, forwardRef } from "react";
+
+import {
+ type NativeQueryEditorCoreProps,
+ NativeQueryEditorRoot,
+} from "./NativeQueryEditorRoot";
+import { ParametersList } from "./slots/ParametersList";
+import { RunButton } from "./slots/RunButton";
+import { Sidebar } from "./slots/Sidebar";
+import { TopBar } from "./slots/TopBar";
+import { VisibilityToggler } from "./slots/VisibilityToggler";
+
+type NativeQueryEditorProps = NativeQueryEditorCoreProps & {
+ children?: ReactNode;
+};
+
+/**
+ * Native (SQL) query editor.
+ *
+ * Assemble only the parts you need via the composition API:
+ *
+ * <NativeQueryEditor question={question} query={query} setDatasetQuery={...}>
+ * <NativeQueryEditor.TopBar>
+ * <NativeQueryEditor.ParametersList />
+ * <NativeQueryEditor.Sidebar features={...} />
+ * <NativeQueryEditor.VisibilityToggler />
+ * </NativeQueryEditor.TopBar>
+ * <NativeQueryEditor.RunButton />
+ * </NativeQueryEditor>
+ */
+const NativeQueryEditorBase = forwardRef<
+ HTMLDivElement,
+ NativeQueryEditorProps
+>(function NativeQueryEditor({ children, ...coreProps }, ref) {
+ return (
+ <NativeQueryEditorRoot {...coreProps} ref={ref}>
+ {children}
+ </NativeQueryEditorRoot>
+ );
+});
+
+export const NativeQueryEditor = Object.assign(NativeQueryEditorBase, {
+ TopBar,
+ Sidebar,
+ ParametersList,
+ VisibilityToggler,
+ RunButton,
+});
diff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditor.unit.spec.tsx b/frontend/src/metabase/querying/components/NativeQueryEditor/NativeQueryEditor.unit.spec.tsx
similarity index 89%
rename from frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditor.unit.spec.tsx
rename to frontend/src/metabase/querying/components/NativeQueryEditor/NativeQueryEditor.unit.spec.tsx
index 88aca14301c..4e1ca1467d9 100644
--- a/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditor.unit.spec.tsx
+++ b/frontend/src/metabase/querying/components/NativeQueryEditor/NativeQueryEditor.unit.spec.tsx
@@ -3,14 +3,17 @@ import {
setupNativeQuerySnippetEndpoints,
} from "__support__/server-mocks";
import { renderWithProviders } from "__support__/ui";
-import { useNotebookScreenSize } from "metabase/query_builder/hooks/use-notebook-screen-size";
+import { useNotebookScreenSize } from "metabase/querying/components/NativeQueryEditor/use-notebook-screen-size";
import { createMockState } from "metabase/redux/store/mocks";
import { NativeQueryEditor } from "./NativeQueryEditor";
-jest.mock("metabase/query_builder/hooks/use-notebook-screen-size", () => ({
- useNotebookScreenSize: jest.fn(),
-}));
+jest.mock(
+ "metabase/querying/components/NativeQueryEditor/use-notebook-screen-size",
+ () => ({
+ useNotebookScreenSize: jest.fn(),
+ }),
+);
type UseNotebookScreenSize = ReturnType<typeof useNotebookScreenSize>;
@@ -45,7 +48,6 @@ describe("NativeQueryEditor", () => {
setDatasetQuery={jest.fn()}
setIsNativeEditorOpen={setIsNativeEditorOpen}
isInitiallyOpen={false}
- hasTopBar={false}
/>,
{
storeInitialState: createMockState({
diff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditorActionButtons/NativeQueryEditorActionButtons.module.css b/frontend/src/metabase/querying/components/NativeQueryEditor/NativeQueryEditorActionButtons/NativeQueryEditorActionButtons.module.css
similarity index 100%
rename from frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditorActionButtons/NativeQueryEditorActionButtons.module.css
rename to frontend/src/metabase/querying/components/NativeQueryEditor/NativeQueryEditorActionButtons/NativeQueryEditorActionButtons.module.css
diff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditorActionButtons/NativeQueryEditorActionButtons.tsx b/frontend/src/metabase/querying/components/NativeQueryEditor/NativeQueryEditorActionButtons/NativeQueryEditorActionButtons.tsx
similarity index 86%
rename from frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditorActionButtons/NativeQueryEditorActionButtons.tsx
rename to frontend/src/metabase/querying/components/NativeQueryEditor/NativeQueryEditorActionButtons/NativeQueryEditorActionButtons.tsx
index fb055dcd191..3091803c5d7 100644
--- a/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditorActionButtons/NativeQueryEditorActionButtons.tsx
+++ b/frontend/src/metabase/querying/components/NativeQueryEditor/NativeQueryEditorActionButtons/NativeQueryEditorActionButtons.tsx
@@ -1,9 +1,9 @@
import { t } from "ttag";
-import { DataReferenceButton } from "metabase/query_builder/components/view/DataReferenceButton";
-import { 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 { DataReferenceButton } from "metabase/querying/components/NativeQueryEditor/DataReferenceButton";
+import { NativeVariablesButton } from "metabase/querying/components/NativeQueryEditor/NativeVariablesButton";
+import { PreviewQueryButton } from "metabase/querying/components/NativeQueryEditor/PreviewQueryButton";
+import { SnippetSidebarButton } from "metabase/querying/components/NativeQueryEditor/SnippetSidebarButton";
import type { QueryModalType } from "metabase/querying/constants";
import type { SidebarFeatures } from "metabase/querying/editor/types";
import { Button, Flex, Icon, Tooltip } from "metabase/ui";
diff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditorActionButtons/index.ts b/frontend/src/metabase/querying/components/NativeQueryEditor/NativeQueryEditorActionButtons/index.ts
similarity index 100%
rename from frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditorActionButtons/index.ts
rename to frontend/src/metabase/querying/components/NativeQueryEditor/NativeQueryEditorActionButtons/index.ts
diff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditorRoot.tsx b/frontend/src/metabase/querying/components/NativeQueryEditor/NativeQueryEditorRoot.tsx
similarity index 98%
rename from frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditorRoot.tsx
rename to frontend/src/metabase/querying/components/NativeQueryEditor/NativeQueryEditorRoot.tsx
index a48898fd6e4..bef2933c728 100644
--- a/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditorRoot.tsx
+++ b/frontend/src/metabase/querying/components/NativeQueryEditor/NativeQueryEditorRoot.tsx
@@ -17,13 +17,13 @@ import { t } from "ttag";
import { useListCollectionsQuery, useListSnippetsQuery } from "metabase/api";
import { getMetabotVisible } from "metabase/metabot/state";
import { PLUGIN_REMOTE_SYNC } from "metabase/plugins";
-import { SnippetFormModal } from "metabase/query_builder/components/template_tags/SnippetFormModal";
-import { useNotebookScreenSize } from "metabase/query_builder/hooks/use-notebook-screen-size";
import {
CodeMirrorEditor,
type CodeMirrorEditorProps,
type CodeMirrorEditorRef,
} from "metabase/querying/components/CodeMirrorEditor";
+import { SnippetFormModal } from "metabase/querying/components/NativeQueryEditor/SnippetFormModal";
+import { useNotebookScreenSize } from "metabase/querying/components/NativeQueryEditor/use-notebook-screen-size";
import type { QueryModalType } from "metabase/querying/constants";
import type { SelectionRange } from "metabase/querying/editor/types";
import { useSelector } from "metabase/redux";
diff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditorRunButton/NativeQueryEditorRunButton.module.css b/frontend/src/metabase/querying/components/NativeQueryEditor/NativeQueryEditorRunButton/NativeQueryEditorRunButton.module.css
similarity index 100%
rename from frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditorRunButton/NativeQueryEditorRunButton.module.css
rename to frontend/src/metabase/querying/components/NativeQueryEditor/NativeQueryEditorRunButton/NativeQueryEditorRunButton.module.css
diff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditorRunButton/NativeQueryEditorRunButton.tsx b/frontend/src/metabase/querying/components/NativeQueryEditor/NativeQueryEditorRunButton/NativeQueryEditorRunButton.tsx
similarity index 100%
rename from frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditorRunButton/NativeQueryEditorRunButton.tsx
rename to frontend/src/metabase/querying/components/NativeQueryEditor/NativeQueryEditorRunButton/NativeQueryEditorRunButton.tsx
diff --git a/frontend/src/metabase/query_builder/components/view/NativeVariablesButton/NativeVariablesButton.module.css b/frontend/src/metabase/querying/components/NativeQueryEditor/NativeVariablesButton/NativeVariablesButton.module.css
similarity index 100%
rename from frontend/src/metabase/query_builder/components/view/NativeVariablesButton/NativeVariablesButton.module.css
rename to frontend/src/metabase/querying/components/NativeQueryEditor/NativeVariablesButton/NativeVariablesButton.module.css
diff --git a/frontend/src/metabase/query_builder/components/view/NativeVariablesButton/NativeVariablesButton.tsx b/frontend/src/metabase/querying/components/NativeQueryEditor/NativeVariablesButton/NativeVariablesButton.tsx
similarity index 66%
rename from frontend/src/metabase/query_builder/components/view/NativeVariablesButton/NativeVariablesButton.tsx
rename to frontend/src/metabase/querying/components/NativeQueryEditor/NativeVariablesButton/NativeVariablesButton.tsx
index cc008721426..bec45e52429 100644
--- a/frontend/src/metabase/query_builder/components/view/NativeVariablesButton/NativeVariablesButton.tsx
+++ b/frontend/src/metabase/querying/components/NativeQueryEditor/NativeVariablesButton/NativeVariablesButton.tsx
@@ -1,8 +1,6 @@
import cx from "classnames";
import { t } from "ttag";
-import { toggleTemplateTagsEditor } from "metabase/query_builder/actions";
-import { useDispatch } from "metabase/redux";
import { Box, Icon, Tooltip } from "metabase/ui";
import NativeVariablesButtonS from "./NativeVariablesButton.module.css";
@@ -20,7 +18,6 @@ export const NativeVariablesButton = ({
onClick,
size,
}: NativeVariablesButtonProps) => {
- const dispatch = useDispatch();
return (
<Tooltip label={t`Variables`}>
<Box
@@ -31,17 +28,7 @@ export const NativeVariablesButton = ({
[NativeVariablesButtonS.isSelected]: isShowingTemplateTagsEditor,
})}
>
- <Icon
- name="variable"
- size={size}
- onClick={() => {
- if (onClick) {
- onClick();
- } else {
- dispatch(toggleTemplateTagsEditor());
- }
- }}
- />
+ <Icon name="variable" size={size} onClick={onClick} />
</Box>
</Tooltip>
);
diff --git a/frontend/src/metabase/query_builder/components/view/NativeVariablesButton/index.ts b/frontend/src/metabase/querying/components/NativeQueryEditor/NativeVariablesButton/index.ts
similarity index 100%
rename from frontend/src/metabase/query_builder/components/view/NativeVariablesButton/index.ts
rename to frontend/src/metabase/querying/components/NativeQueryEditor/NativeVariablesButton/index.ts
diff --git a/frontend/src/metabase/query_builder/components/view/PreviewQueryButton/PreviewQueryButton.module.css b/frontend/src/metabase/querying/components/NativeQueryEditor/PreviewQueryButton/PreviewQueryButton.module.css
similarity index 100%
rename from frontend/src/metabase/query_builder/components/view/PreviewQueryButton/PreviewQueryButton.module.css
rename to frontend/src/metabase/querying/components/NativeQueryEditor/PreviewQueryButton/PreviewQueryButton.module.css
diff --git a/frontend/src/metabase/query_builder/components/view/PreviewQueryButton/PreviewQueryButton.tsx b/frontend/src/metabase/querying/components/NativeQueryEditor/PreviewQueryButton/PreviewQueryButton.tsx
similarity index 100%
rename from frontend/src/metabase/query_builder/components/view/PreviewQueryButton/PreviewQueryButton.tsx
rename to frontend/src/metabase/querying/components/NativeQueryEditor/PreviewQueryButton/PreviewQueryButton.tsx
diff --git a/frontend/src/metabase/query_builder/components/view/PreviewQueryButton/index.ts b/frontend/src/metabase/querying/components/NativeQueryEditor/PreviewQueryButton/index.ts
similarity index 100%
rename from frontend/src/metabase/query_builder/components/view/PreviewQueryButton/index.ts
rename to frontend/src/metabase/querying/components/NativeQueryEditor/PreviewQueryButton/index.ts
diff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/ResizableArea/ResizableArea.module.css b/frontend/src/metabase/querying/components/NativeQueryEditor/ResizableArea/ResizableArea.module.css
similarity index 100%
rename from frontend/src/metabase/query_builder/components/NativeQueryEditor/ResizableArea/ResizableArea.module.css
rename to frontend/src/metabase/querying/components/NativeQueryEditor/ResizableArea/ResizableArea.module.css
diff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/ResizableArea/ResizableArea.tsx b/frontend/src/metabase/querying/components/NativeQueryEditor/ResizableArea/ResizableArea.tsx
similarity index 100%
rename from frontend/src/metabase/query_builder/components/NativeQueryEditor/ResizableArea/ResizableArea.tsx
rename to frontend/src/metabase/querying/components/NativeQueryEditor/ResizableArea/ResizableArea.tsx
diff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/ResizableArea/ResizableArea.unit.spec.tsx b/frontend/src/metabase/querying/components/NativeQueryEditor/ResizableArea/ResizableArea.unit.spec.tsx
similarity index 100%
rename from frontend/src/metabase/query_builder/components/NativeQueryEditor/ResizableArea/ResizableArea.unit.spec.tsx
rename to frontend/src/metabase/querying/components/NativeQueryEditor/ResizableArea/ResizableArea.unit.spec.tsx
diff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/ResizableArea/index.ts b/frontend/src/metabase/querying/components/NativeQueryEditor/ResizableArea/index.ts
similarity index 100%
rename from frontend/src/metabase/query_builder/components/NativeQueryEditor/ResizableArea/index.ts
rename to frontend/src/metabase/querying/components/NativeQueryEditor/ResizableArea/index.ts
diff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/RightClickPopover/RightClickPopover.module.css b/frontend/src/metabase/querying/components/NativeQueryEditor/RightClickPopover/RightClickPopover.module.css
similarity index 100%
rename from frontend/src/metabase/query_builder/components/NativeQueryEditor/RightClickPopover/RightClickPopover.module.css
rename to frontend/src/metabase/querying/components/NativeQueryEditor/RightClickPopover/RightClickPopover.module.css
diff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/RightClickPopover/RightClickPopover.tsx b/frontend/src/metabase/querying/components/NativeQueryEditor/RightClickPopover/RightClickPopover.tsx
similarity index 100%
rename from frontend/src/metabase/query_builder/components/NativeQueryEditor/RightClickPopover/RightClickPopover.tsx
rename to frontend/src/metabase/querying/components/NativeQueryEditor/RightClickPopover/RightClickPopover.tsx
diff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/RightClickPopover/index.ts b/frontend/src/metabase/querying/components/NativeQueryEditor/RightClickPopover/index.ts
similarity index 100%
rename from frontend/src/metabase/query_builder/components/NativeQueryEditor/RightClickPopover/index.ts
rename to frontend/src/metabase/querying/components/NativeQueryEditor/RightClickPopover/index.ts
diff --git a/frontend/src/metabase/query_builder/components/template_tags/SnippetForm/SnippetForm.module.css b/frontend/src/metabase/querying/components/NativeQueryEditor/SnippetForm/SnippetForm.module.css
similarity index 100%
rename from frontend/src/metabase/query_builder/components/template_tags/SnippetForm/SnippetForm.module.css
rename to frontend/src/metabase/querying/components/NativeQueryEditor/SnippetForm/SnippetForm.module.css
diff --git a/frontend/src/metabase/query_builder/components/template_tags/SnippetForm/SnippetForm.tsx b/frontend/src/metabase/querying/components/NativeQueryEditor/SnippetForm/SnippetForm.tsx
similarity index 100%
rename from frontend/src/metabase/query_builder/components/template_tags/SnippetForm/SnippetForm.tsx
rename to frontend/src/metabase/querying/components/NativeQueryEditor/SnippetForm/SnippetForm.tsx
diff --git a/frontend/src/metabase/query_builder/components/template_tags/SnippetForm/index.ts b/frontend/src/metabase/querying/components/NativeQueryEditor/SnippetForm/index.ts
similarity index 100%
rename from frontend/src/metabase/query_builder/components/template_tags/SnippetForm/index.ts
rename to frontend/src/metabase/querying/components/NativeQueryEditor/SnippetForm/index.ts
diff --git a/frontend/src/metabase/query_builder/components/template_tags/SnippetFormModal/SnippetFormModal.tsx b/frontend/src/metabase/querying/components/NativeQueryEditor/SnippetFormModal/SnippetFormModal.tsx
similarity index 100%
rename from frontend/src/metabase/query_builder/components/template_tags/SnippetFormModal/SnippetFormModal.tsx
rename to frontend/src/metabase/querying/components/NativeQueryEditor/SnippetFormModal/SnippetFormModal.tsx
diff --git a/frontend/src/metabase/query_builder/components/template_tags/SnippetFormModal/SnippetFormModal.unit.spec.tsx b/frontend/src/metabase/querying/components/NativeQueryEditor/SnippetFormModal/SnippetFormModal.unit.spec.tsx
similarity index 100%
rename from frontend/src/metabase/query_builder/components/template_tags/SnippetFormModal/SnippetFormModal.unit.spec.tsx
rename to frontend/src/metabase/querying/components/NativeQueryEditor/SnippetFormModal/SnippetFormModal.unit.spec.tsx
diff --git a/frontend/src/metabase/query_builder/components/template_tags/SnippetFormModal/index.ts b/frontend/src/metabase/querying/components/NativeQueryEditor/SnippetFormModal/index.ts
similarity index 100%
rename from frontend/src/metabase/query_builder/components/template_tags/SnippetFormModal/index.ts
rename to frontend/src/metabase/querying/components/NativeQueryEditor/SnippetFormModal/index.ts
diff --git a/frontend/src/metabase/query_builder/components/view/SnippetSidebarButton/SnippetSidebarButton.module.css b/frontend/src/metabase/querying/components/NativeQueryEditor/SnippetSidebarButton/SnippetSidebarButton.module.css
similarity index 100%
rename from frontend/src/metabase/query_builder/components/view/SnippetSidebarButton/SnippetSidebarButton.module.css
rename to frontend/src/metabase/querying/components/NativeQueryEditor/SnippetSidebarButton/SnippetSidebarButton.module.css
diff --git a/frontend/src/metabase/query_builder/components/view/SnippetSidebarButton/SnippetSidebarButton.tsx b/frontend/src/metabase/querying/components/NativeQueryEditor/SnippetSidebarButton/SnippetSidebarButton.tsx
similarity index 100%
rename from frontend/src/metabase/query_builder/components/view/SnippetSidebarButton/SnippetSidebarButton.tsx
rename to frontend/src/metabase/querying/components/NativeQueryEditor/SnippetSidebarButton/SnippetSidebarButton.tsx
diff --git a/frontend/src/metabase/query_builder/components/view/SnippetSidebarButton/index.ts b/frontend/src/metabase/querying/components/NativeQueryEditor/SnippetSidebarButton/index.ts
similarity index 100%
rename from frontend/src/metabase/query_builder/components/view/SnippetSidebarButton/index.ts
rename to frontend/src/metabase/querying/components/NativeQueryEditor/SnippetSidebarButton/index.ts
diff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/VisibilityToggler/VisibilityToggler.module.css b/frontend/src/metabase/querying/components/NativeQueryEditor/VisibilityToggler/VisibilityToggler.module.css
similarity index 100%
rename from frontend/src/metabase/query_builder/components/NativeQueryEditor/VisibilityToggler/VisibilityToggler.module.css
rename to frontend/src/metabase/querying/components/NativeQueryEditor/VisibilityToggler/VisibilityToggler.module.css
diff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/VisibilityToggler/VisibilityToggler.tsx b/frontend/src/metabase/querying/components/NativeQueryEditor/VisibilityToggler/VisibilityToggler.tsx
similarity index 100%
rename from frontend/src/metabase/query_builder/components/NativeQueryEditor/VisibilityToggler/VisibilityToggler.tsx
rename to frontend/src/metabase/querying/components/NativeQueryEditor/VisibilityToggler/VisibilityToggler.tsx
diff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/VisibilityToggler/VisibilityToggler.unit.spec.tsx b/frontend/src/metabase/querying/components/NativeQueryEditor/VisibilityToggler/VisibilityToggler.unit.spec.tsx
similarity index 93%
rename from frontend/src/metabase/query_builder/components/NativeQueryEditor/VisibilityToggler/VisibilityToggler.unit.spec.tsx
rename to frontend/src/metabase/querying/components/NativeQueryEditor/VisibilityToggler/VisibilityToggler.unit.spec.tsx
index 0099e9cd28d..735e724c4f5 100644
--- a/frontend/src/metabase/query_builder/components/NativeQueryEditor/VisibilityToggler/VisibilityToggler.unit.spec.tsx
+++ b/frontend/src/metabase/querying/components/NativeQueryEditor/VisibilityToggler/VisibilityToggler.unit.spec.tsx
@@ -1,5 +1,5 @@
import { fireEvent, getIcon, render, screen } from "__support__/ui";
-import { VisibilityToggler } from "metabase/query_builder/components/NativeQueryEditor/VisibilityToggler";
+import { VisibilityToggler } from "metabase/querying/components/NativeQueryEditor/VisibilityToggler";
describe("VisibilityToggler", () => {
it("should render collapse icon when open", () => {
diff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/VisibilityToggler/index.ts b/frontend/src/metabase/querying/components/NativeQueryEditor/VisibilityToggler/index.ts
similarity index 100%
rename from frontend/src/metabase/query_builder/components/NativeQueryEditor/VisibilityToggler/index.ts
rename to frontend/src/metabase/querying/components/NativeQueryEditor/VisibilityToggler/index.ts
diff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/__mocks__/NativeQueryEditor.jsx b/frontend/src/metabase/querying/components/NativeQueryEditor/__mocks__/NativeQueryEditor.jsx
similarity index 90%
rename from frontend/src/metabase/query_builder/components/NativeQueryEditor/__mocks__/NativeQueryEditor.jsx
rename to frontend/src/metabase/querying/components/NativeQueryEditor/__mocks__/NativeQueryEditor.jsx
index 200725c1c2d..84e1b9f2787 100644
--- a/frontend/src/metabase/query_builder/components/NativeQueryEditor/__mocks__/NativeQueryEditor.jsx
+++ b/frontend/src/metabase/querying/components/NativeQueryEditor/__mocks__/NativeQueryEditor.jsx
@@ -1,7 +1,7 @@
/* eslint-disable react/prop-types */
import CS from "metabase/css/core/index.css";
-import { DataSourceSelectors } from "metabase/query_builder/components/NativeQueryEditor/DataSourceSelectors";
-import { SyncedParametersList } from "metabase/query_builder/components/SyncedParametersList";
+import { DataSourceSelectors } from "metabase/querying/components/NativeQueryEditor/DataSourceSelectors";
+import { SyncedParametersList } from "metabase/querying/components/SyncedParametersList";
export const NativeQueryEditor = ({
canChangeDatabase = true,
diff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/constants.ts b/frontend/src/metabase/querying/components/NativeQueryEditor/constants.ts
similarity index 100%
rename from frontend/src/metabase/query_builder/components/NativeQueryEditor/constants.ts
rename to frontend/src/metabase/querying/components/NativeQueryEditor/constants.ts
diff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/context/NativeQueryEditorContext.tsx b/frontend/src/metabase/querying/components/NativeQueryEditor/context/NativeQueryEditorContext.tsx
similarity index 100%
rename from frontend/src/metabase/query_builder/components/NativeQueryEditor/context/NativeQueryEditorContext.tsx
rename to frontend/src/metabase/querying/components/NativeQueryEditor/context/NativeQueryEditorContext.tsx
diff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/index.ts b/frontend/src/metabase/querying/components/NativeQueryEditor/index.ts
similarity index 100%
rename from frontend/src/metabase/query_builder/components/NativeQueryEditor/index.ts
rename to frontend/src/metabase/querying/components/NativeQueryEditor/index.ts
diff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/slots/ParametersList.tsx b/frontend/src/metabase/querying/components/NativeQueryEditor/slots/ParametersList.tsx
similarity index 62%
rename from frontend/src/metabase/query_builder/components/NativeQueryEditor/slots/ParametersList.tsx
rename to frontend/src/metabase/querying/components/NativeQueryEditor/slots/ParametersList.tsx
index 9c14d5bfecd..98794189036 100644
--- a/frontend/src/metabase/query_builder/components/NativeQueryEditor/slots/ParametersList.tsx
+++ b/frontend/src/metabase/querying/components/NativeQueryEditor/slots/ParametersList.tsx
@@ -1,6 +1,4 @@
-import { updateQuestion } from "metabase/query_builder/actions/core";
-import { ResponsiveParametersList } from "metabase/query_builder/components/ResponsiveParametersList";
-import { useDispatch } from "metabase/redux";
+import { ResponsiveParametersList } from "metabase/querying/components/ResponsiveParametersList";
import type { ParameterId } from "metabase-types/api";
import { useNativeQueryEditorContext } from "../context/NativeQueryEditorContext";
@@ -10,8 +8,8 @@ import { useNativeQueryEditorContext } from "../context/NativeQueryEditorContext
* bar. Renders nothing when the consumer did not provide `setParameterValue`.
*/
export function ParametersList() {
- const { question, query, setParameterValue } = useNativeQueryEditorContext();
- const dispatch = useDispatch();
+ const { question, query, setDatasetQuery, setParameterValue } =
+ useNativeQueryEditorContext();
if (!setParameterValue) {
return null;
@@ -21,8 +19,7 @@ export function ParametersList() {
parameterId: ParameterId,
parameterIndex: number,
) => {
- const newQuery = query.setParameterIndex(parameterId, parameterIndex);
- dispatch(updateQuestion(question.setDatasetQuery(newQuery.datasetQuery())));
+ setDatasetQuery(query.setParameterIndex(parameterId, parameterIndex));
};
return (
diff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/slots/RunButton.tsx b/frontend/src/metabase/querying/components/NativeQueryEditor/slots/RunButton.tsx
similarity index 100%
rename from frontend/src/metabase/query_builder/components/NativeQueryEditor/slots/RunButton.tsx
rename to frontend/src/metabase/querying/components/NativeQueryEditor/slots/RunButton.tsx
diff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/slots/Sidebar.tsx b/frontend/src/metabase/querying/components/NativeQueryEditor/slots/Sidebar.tsx
similarity index 100%
rename from frontend/src/metabase/query_builder/components/NativeQueryEditor/slots/Sidebar.tsx
rename to frontend/src/metabase/querying/components/NativeQueryEditor/slots/Sidebar.tsx
diff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/slots/TopBar.tsx b/frontend/src/metabase/querying/components/NativeQueryEditor/slots/TopBar.tsx
similarity index 100%
rename from frontend/src/metabase/query_builder/components/NativeQueryEditor/slots/TopBar.tsx
rename to frontend/src/metabase/querying/components/NativeQueryEditor/slots/TopBar.tsx
diff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/slots/VisibilityToggler.tsx b/frontend/src/metabase/querying/components/NativeQueryEditor/slots/VisibilityToggler.tsx
similarity index 100%
rename from frontend/src/metabase/query_builder/components/NativeQueryEditor/slots/VisibilityToggler.tsx
rename to frontend/src/metabase/querying/components/NativeQueryEditor/slots/VisibilityToggler.tsx
diff --git a/frontend/src/metabase/query_builder/hooks/use-notebook-screen-size.ts b/frontend/src/metabase/querying/components/NativeQueryEditor/use-notebook-screen-size.ts
similarity index 100%
rename from frontend/src/metabase/query_builder/hooks/use-notebook-screen-size.ts
rename to frontend/src/metabase/querying/components/NativeQueryEditor/use-notebook-screen-size.ts
diff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/utils.ts b/frontend/src/metabase/querying/components/NativeQueryEditor/utils.ts
similarity index 100%
rename from frontend/src/metabase/query_builder/components/NativeQueryEditor/utils.ts
rename to frontend/src/metabase/querying/components/NativeQueryEditor/utils.ts
diff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/utils.unit.spec.ts b/frontend/src/metabase/querying/components/NativeQueryEditor/utils.unit.spec.ts
similarity index 98%
rename from frontend/src/metabase/query_builder/components/NativeQueryEditor/utils.unit.spec.ts
rename to frontend/src/metabase/querying/components/NativeQueryEditor/utils.unit.spec.ts
index b8eb780aec0..55d40408d7f 100644
--- a/frontend/src/metabase/query_builder/components/NativeQueryEditor/utils.unit.spec.ts
+++ b/frontend/src/metabase/querying/components/NativeQueryEditor/utils.unit.spec.ts
@@ -1,7 +1,7 @@
import {
canFormatForEngine,
formatQuery,
-} from "metabase/query_builder/components/NativeQueryEditor/utils";
+} from "metabase/querying/components/NativeQueryEditor/utils";
const formattingTestCases = [
{
diff --git a/frontend/src/metabase/query_builder/components/ResponsiveParameterList.unit.spec.tsx b/frontend/src/metabase/querying/components/ResponsiveParameterList.unit.spec.tsx
similarity index 100%
rename from frontend/src/metabase/query_builder/components/ResponsiveParameterList.unit.spec.tsx
rename to frontend/src/metabase/querying/components/ResponsiveParameterList.unit.spec.tsx
diff --git a/frontend/src/metabase/query_builder/components/ResponsiveParametersList.module.css b/frontend/src/metabase/querying/components/ResponsiveParametersList.module.css
similarity index 100%
rename from frontend/src/metabase/query_builder/components/ResponsiveParametersList.module.css
rename to frontend/src/metabase/querying/components/ResponsiveParametersList.module.css
diff --git a/frontend/src/metabase/query_builder/components/ResponsiveParametersList.tsx b/frontend/src/metabase/querying/components/ResponsiveParametersList.tsx
similarity index 100%
rename from frontend/src/metabase/query_builder/components/ResponsiveParametersList.tsx
rename to frontend/src/metabase/querying/components/ResponsiveParametersList.tsx
diff --git a/frontend/src/metabase/query_builder/components/SyncedParametersList.tsx b/frontend/src/metabase/querying/components/SyncedParametersList.tsx
similarity index 73%
rename from frontend/src/metabase/query_builder/components/SyncedParametersList.tsx
rename to frontend/src/metabase/querying/components/SyncedParametersList.tsx
index 466cdfd175d..4e827dca445 100644
--- a/frontend/src/metabase/query_builder/components/SyncedParametersList.tsx
+++ b/frontend/src/metabase/querying/components/SyncedParametersList.tsx
@@ -4,11 +4,9 @@ import {
ParametersList,
type ParametersListProps,
} from "metabase/parameters/components/ParametersList";
-import { useDispatch } from "metabase/redux";
import type { ParameterId } from "metabase-types/api";
-import { setParameterValueToDefault } from "../actions";
-import { useSyncUrlParameters } from "../hooks/use-sync-url-parameters";
+import { useSyncUrlParameters } from "./use-sync-url-parameters";
export const SyncedParametersList = ({
parameters,
@@ -29,15 +27,17 @@ export const SyncedParametersList = ({
setEditingParameter,
enableParameterRequiredBehavior,
}: ParametersListProps) => {
- const dispatch = useDispatch();
-
useSyncUrlParameters({ parameters });
- const dispatchSetParameterValueToDefault = useCallback(
+ const setParameterToDefaultValue = useCallback(
(parameterId: ParameterId) => {
- dispatch(setParameterValueToDefault(parameterId));
+ const parameter = parameters.find(({ id }) => id === parameterId);
+ const defaultValue = parameter?.default;
+ if (defaultValue && setParameterValue) {
+ setParameterValue(parameterId, defaultValue);
+ }
},
- [dispatch],
+ [parameters, setParameterValue],
);
return (
@@ -55,7 +55,7 @@ export const SyncedParametersList = ({
setParameterValue={setParameterValue}
setParameterIndex={setParameterIndex}
setEditingParameter={setEditingParameter}
- setParameterValueToDefault={dispatchSetParameterValueToDefault}
+ setParameterValueToDefault={setParameterToDefaultValue}
enableParameterRequiredBehavior={enableParameterRequiredBehavior}
/>
);
diff --git a/frontend/src/metabase/query_builder/components/template_tags/TagEditorHelp/TagEditorHelp.tsx b/frontend/src/metabase/querying/components/template_tags/TagEditorHelp/TagEditorHelp.tsx
similarity index 100%
rename from frontend/src/metabase/query_builder/components/template_tags/TagEditorHelp/TagEditorHelp.tsx
rename to frontend/src/metabase/querying/components/template_tags/TagEditorHelp/TagEditorHelp.tsx
diff --git a/frontend/src/metabase/query_builder/components/template_tags/TagEditorHelp/index.ts b/frontend/src/metabase/querying/components/template_tags/TagEditorHelp/index.ts
similarity index 100%
rename from frontend/src/metabase/query_builder/components/template_tags/TagEditorHelp/index.ts
rename to frontend/src/metabase/querying/components/template_tags/TagEditorHelp/index.ts
diff --git a/frontend/src/metabase/query_builder/components/template_tags/TagEditorHelp/tests/common.unit.spec.ts b/frontend/src/metabase/querying/components/template_tags/TagEditorHelp/tests/common.unit.spec.ts
similarity index 100%
rename from frontend/src/metabase/query_builder/components/template_tags/TagEditorHelp/tests/common.unit.spec.ts
rename to frontend/src/metabase/querying/components/template_tags/TagEditorHelp/tests/common.unit.spec.ts
diff --git a/frontend/src/metabase/query_builder/components/template_tags/TagEditorHelp/tests/enterprise.unit.spec.ts b/frontend/src/metabase/querying/components/template_tags/TagEditorHelp/tests/enterprise.unit.spec.ts
similarity index 100%
rename from frontend/src/metabase/query_builder/components/template_tags/TagEditorHelp/tests/enterprise.unit.spec.ts
rename to frontend/src/metabase/querying/components/template_tags/TagEditorHelp/tests/enterprise.unit.spec.ts
diff --git a/frontend/src/metabase/query_builder/components/template_tags/TagEditorHelp/tests/premium.unit.spec.ts b/frontend/src/metabase/querying/components/template_tags/TagEditorHelp/tests/premium.unit.spec.ts
similarity index 100%
rename from frontend/src/metabase/query_builder/components/template_tags/TagEditorHelp/tests/premium.unit.spec.ts
rename to frontend/src/metabase/querying/components/template_tags/TagEditorHelp/tests/premium.unit.spec.ts
diff --git a/frontend/src/metabase/query_builder/components/template_tags/TagEditorHelp/tests/setup.tsx b/frontend/src/metabase/querying/components/template_tags/TagEditorHelp/tests/setup.tsx
similarity index 100%
rename from frontend/src/metabase/query_builder/components/template_tags/TagEditorHelp/tests/setup.tsx
rename to frontend/src/metabase/querying/components/template_tags/TagEditorHelp/tests/setup.tsx
diff --git a/frontend/src/metabase/query_builder/components/template_tags/TagEditorParam.module.css b/frontend/src/metabase/querying/components/template_tags/TagEditorParam.module.css
similarity index 100%
rename from frontend/src/metabase/query_builder/components/template_tags/TagEditorParam.module.css
rename to frontend/src/metabase/querying/components/template_tags/TagEditorParam.module.css
diff --git a/frontend/src/metabase/query_builder/components/template_tags/TagEditorParam.tsx b/frontend/src/metabase/querying/components/template_tags/TagEditorParam.tsx
similarity index 95%
rename from frontend/src/metabase/query_builder/components/template_tags/TagEditorParam.tsx
rename to frontend/src/metabase/querying/components/template_tags/TagEditorParam.tsx
index a6558d9f1db..fe8697666de 100644
--- a/frontend/src/metabase/query_builder/components/template_tags/TagEditorParam.tsx
+++ b/frontend/src/metabase/querying/components/template_tags/TagEditorParam.tsx
@@ -7,8 +7,6 @@ import { runRtkEndpoint } from "metabase/api/utils/run-rtk-endpoint";
import { TemporalUnitSettings } from "metabase/parameters/components/TemporalUnitSettings";
import { ValuesSourceSettings } from "metabase/parameters/components/ValuesSourceSettings";
import { isSingleOrMultiSelectable } from "metabase/parameters/utils/parameter-type";
-import { setTemplateTagConfig } from "metabase/query_builder/actions";
-import { getOriginalQuestion } from "metabase/query_builder/selectors";
import { type DispatchFn, connect } from "metabase/redux";
import type { State } from "metabase/redux/store";
import { getMetadata } from "metabase/selectors/metadata";
@@ -58,15 +56,10 @@ import {
interface StateProps {
metadata: Metadata;
- originalQuestion?: Question;
}
interface DispatchProps {
fetchField: (fieldId: FieldId, force?: boolean) => void;
- setTemplateTagConfig: (
- tag: TemplateTag,
- config: ParameterValuesConfig,
- ) => void;
}
interface OwnProps {
@@ -79,8 +72,14 @@ interface OwnProps {
embeddedParameterVisibility?: EmbeddingParameterVisibility | null;
database?: Database | null;
databases: Database[];
+ /**
+ * The originally saved question, used to restore a tag's value-source config
+ * when its type is switched back to the original. Optional: contexts without a
+ * saved original (e.g. the standalone query editor) simply pass nothing.
+ */
+ originalQuestion?: Question;
setTemplateTag: (tag: TemplateTag) => void;
- setTemplateTagConfig?: (
+ setTemplateTagConfig: (
tag: TemplateTag,
config: ParameterValuesConfig,
) => void;
@@ -91,14 +90,10 @@ interface OwnProps {
function mapStateToProps(state: State) {
return {
metadata: getMetadata(state),
- originalQuestion: getOriginalQuestion(state),
};
}
-const mapDispatchToProps = (
- dispatch: DispatchFn,
- props: OwnProps,
-): DispatchProps => {
+const mapDispatchToProps = (dispatch: DispatchFn): DispatchProps => {
return {
async fetchField(fieldId, force) {
const field = await runRtkEndpoint(
@@ -117,13 +112,6 @@ const mapDispatchToProps = (
);
}
},
- setTemplateTagConfig(tag, config) {
- if (props.setTemplateTagConfig) {
- props.setTemplateTagConfig(tag, config);
- return;
- }
- dispatch(setTemplateTagConfig(tag, config));
- },
};
};
diff --git a/frontend/src/metabase/query_builder/components/template_tags/TagEditorParam.unit.spec.tsx b/frontend/src/metabase/querying/components/template_tags/TagEditorParam.unit.spec.tsx
similarity index 98%
rename from frontend/src/metabase/query_builder/components/template_tags/TagEditorParam.unit.spec.tsx
rename to frontend/src/metabase/querying/components/template_tags/TagEditorParam.unit.spec.tsx
index c3312a67b3d..4a187e6d8de 100644
--- a/frontend/src/metabase/query_builder/components/template_tags/TagEditorParam.unit.spec.tsx
+++ b/frontend/src/metabase/querying/components/template_tags/TagEditorParam.unit.spec.tsx
@@ -8,6 +8,7 @@ import {
} from "__support__/server-mocks";
import { createMockEntitiesState } from "__support__/store";
import { renderWithProviders, screen, waitFor } from "__support__/ui";
+import { getOriginalQuestion } from "metabase/query_builder/selectors";
import {
createMockQueryBuilderState,
createMockState,
@@ -76,6 +77,7 @@ const setup = ({
});
const setTemplateTag = jest.fn();
+ const setTemplateTagConfig = jest.fn();
const setParameterValue = jest.fn();
renderWithProviders(
@@ -84,13 +86,15 @@ const setup = ({
database={databaseMetadata}
databases={metadata.databasesList()}
parameter={getTemplateTagParameter(tag)}
+ originalQuestion={getOriginalQuestion(state)}
setTemplateTag={setTemplateTag}
+ setTemplateTagConfig={setTemplateTagConfig}
setParameterValue={setParameterValue}
/>,
{ storeInitialState: state },
);
- return { setTemplateTag, setParameterValue };
+ return { setTemplateTag, setTemplateTagConfig, setParameterValue };
};
describe("TagEditorParam", () => {
diff --git a/frontend/src/metabase/query_builder/components/template_tags/TagEditorParamParts/DefaultRequiredValueControl.tsx b/frontend/src/metabase/querying/components/template_tags/TagEditorParamParts/DefaultRequiredValueControl.tsx
similarity index 100%
rename from frontend/src/metabase/query_builder/components/template_tags/TagEditorParamParts/DefaultRequiredValueControl.tsx
rename to frontend/src/metabase/querying/components/template_tags/TagEditorParamParts/DefaultRequiredValueControl.tsx
diff --git a/frontend/src/metabase/query_builder/components/template_tags/TagEditorParamParts/FieldAliasInput.tsx b/frontend/src/metabase/querying/components/template_tags/TagEditorParamParts/FieldAliasInput.tsx
similarity index 100%
rename from frontend/src/metabase/query_builder/components/template_tags/TagEditorParamParts/FieldAliasInput.tsx
rename to frontend/src/metabase/querying/components/template_tags/TagEditorParamParts/FieldAliasInput.tsx
diff --git a/frontend/src/metabase/query_builder/components/template_tags/TagEditorParamParts/FieldMappingSelect.tsx b/frontend/src/metabase/querying/components/template_tags/TagEditorParamParts/FieldMappingSelect.tsx
similarity index 100%
rename from frontend/src/metabase/query_builder/components/template_tags/TagEditorParamParts/FieldMappingSelect.tsx
rename to frontend/src/metabase/querying/components/template_tags/TagEditorParamParts/FieldMappingSelect.tsx
diff --git a/frontend/src/metabase/query_builder/components/template_tags/TagEditorParamParts/FilterWidgetLabelInput.tsx b/frontend/src/metabase/querying/components/template_tags/TagEditorParamParts/FilterWidgetLabelInput.tsx
similarity index 100%
rename from frontend/src/metabase/query_builder/components/template_tags/TagEditorParamParts/FilterWidgetLabelInput.tsx
rename to frontend/src/metabase/querying/components/template_tags/TagEditorParamParts/FilterWidgetLabelInput.tsx
diff --git a/frontend/src/metabase/query_builder/components/template_tags/TagEditorParamParts/FilterWidgetTypeSelect.tsx b/frontend/src/metabase/querying/components/template_tags/TagEditorParamParts/FilterWidgetTypeSelect.tsx
similarity index 100%
rename from frontend/src/metabase/query_builder/components/template_tags/TagEditorParamParts/FilterWidgetTypeSelect.tsx
rename to frontend/src/metabase/querying/components/template_tags/TagEditorParamParts/FilterWidgetTypeSelect.tsx
diff --git a/frontend/src/metabase/query_builder/components/template_tags/TagEditorParamParts/ParameterMultiSelectInput.tsx b/frontend/src/metabase/querying/components/template_tags/TagEditorParamParts/ParameterMultiSelectInput.tsx
similarity index 100%
rename from frontend/src/metabase/query_builder/components/template_tags/TagEditorParamParts/ParameterMultiSelectInput.tsx
rename to frontend/src/metabase/querying/components/template_tags/TagEditorParamParts/ParameterMultiSelectInput.tsx
diff --git a/frontend/src/metabase/query_builder/components/template_tags/TagEditorParamParts/TableMappingSelect.tsx b/frontend/src/metabase/querying/components/template_tags/TagEditorParamParts/TableMappingSelect.tsx
similarity index 100%
rename from frontend/src/metabase/query_builder/components/template_tags/TagEditorParamParts/TableMappingSelect.tsx
rename to frontend/src/metabase/querying/components/template_tags/TagEditorParamParts/TableMappingSelect.tsx
diff --git a/frontend/src/metabase/query_builder/components/template_tags/TagEditorParamParts/TagEditorParam.module.css b/frontend/src/metabase/querying/components/template_tags/TagEditorParamParts/TagEditorParam.module.css
similarity index 100%
rename from frontend/src/metabase/query_builder/components/template_tags/TagEditorParamParts/TagEditorParam.module.css
rename to frontend/src/metabase/querying/components/template_tags/TagEditorParamParts/TagEditorParam.module.css
diff --git a/frontend/src/metabase/query_builder/components/template_tags/TagEditorParamParts/TagEditorParam.tsx b/frontend/src/metabase/querying/components/template_tags/TagEditorParamParts/TagEditorParam.tsx
similarity index 100%
rename from frontend/src/metabase/query_builder/components/template_tags/TagEditorParamParts/TagEditorParam.tsx
rename to frontend/src/metabase/querying/components/template_tags/TagEditorParamParts/TagEditorParam.tsx
diff --git a/frontend/src/metabase/query_builder/components/template_tags/TagEditorParamParts/VariableTypeSelect.tsx b/frontend/src/metabase/querying/components/template_tags/TagEditorParamParts/VariableTypeSelect.tsx
similarity index 100%
rename from frontend/src/metabase/query_builder/components/template_tags/TagEditorParamParts/VariableTypeSelect.tsx
rename to frontend/src/metabase/querying/components/template_tags/TagEditorParamParts/VariableTypeSelect.tsx
diff --git a/frontend/src/metabase/query_builder/components/template_tags/TagEditorParamParts/index.tsx b/frontend/src/metabase/querying/components/template_tags/TagEditorParamParts/index.tsx
similarity index 100%
rename from frontend/src/metabase/query_builder/components/template_tags/TagEditorParamParts/index.tsx
rename to frontend/src/metabase/querying/components/template_tags/TagEditorParamParts/index.tsx
diff --git a/frontend/src/metabase/query_builder/components/template_tags/TagEditorSidebar.tsx b/frontend/src/metabase/querying/components/template_tags/TagEditorSidebar.tsx
similarity index 95%
rename from frontend/src/metabase/query_builder/components/template_tags/TagEditorSidebar.tsx
rename to frontend/src/metabase/querying/components/template_tags/TagEditorSidebar.tsx
index e328bfad7e1..5805cfb1e1e 100644
--- a/frontend/src/metabase/query_builder/components/template_tags/TagEditorSidebar.tsx
+++ b/frontend/src/metabase/querying/components/template_tags/TagEditorSidebar.tsx
@@ -32,10 +32,11 @@ interface TagEditorSidebarProps {
query: NativeQuery;
databases?: Database[];
question: Question;
+ originalQuestion?: Question;
sampleDatabaseId?: DatabaseId;
setDatasetQuery: (query: NativeDatasetQuery) => void;
setTemplateTag: (tag: TemplateTag) => void;
- setTemplateTagConfig?: (
+ setTemplateTagConfig: (
tag: TemplateTag,
config: ParameterValuesConfig,
) => void;
@@ -49,6 +50,7 @@ export function TagEditorSidebar({
query,
databases,
question,
+ originalQuestion,
sampleDatabaseId,
setDatasetQuery,
setTemplateTag,
@@ -92,6 +94,7 @@ export function TagEditorSidebar({
parametersById={parametersById}
database={database}
databases={databases as Database[]}
+ originalQuestion={originalQuestion}
setTemplateTag={setTemplateTag}
setTemplateTagConfig={setTemplateTagConfig}
setParameterValue={setParameterValue}
@@ -118,8 +121,9 @@ interface SettingsPaneProps {
database?: Database | null;
databases: Database[];
parametersById: Record<ParameterId, Parameter>;
+ originalQuestion?: Question;
setTemplateTag: (tag: TemplateTag) => void;
- setTemplateTagConfig?: (
+ setTemplateTagConfig: (
tag: TemplateTag,
config: ParameterValuesConfig,
) => void;
@@ -133,6 +137,7 @@ const SettingsPane = ({
parametersById,
database,
databases,
+ originalQuestion,
setTemplateTag,
setTemplateTagConfig,
setParameterValue,
@@ -152,6 +157,7 @@ const SettingsPane = ({
}
database={database}
databases={databases}
+ originalQuestion={originalQuestion}
setTemplateTag={setTemplateTag}
setTemplateTagConfig={setTemplateTagConfig}
setParameterValue={setParameterValue}
diff --git a/frontend/src/metabase/query_builder/components/template_tags/types.ts b/frontend/src/metabase/querying/components/template_tags/types.ts
similarity index 100%
rename from frontend/src/metabase/query_builder/components/template_tags/types.ts
rename to frontend/src/metabase/querying/components/template_tags/types.ts
diff --git a/frontend/src/metabase/query_builder/hooks/use-sync-url-parameters.ts b/frontend/src/metabase/querying/components/use-sync-url-parameters.ts
similarity index 100%
rename from frontend/src/metabase/query_builder/hooks/use-sync-url-parameters.ts
rename to frontend/src/metabase/querying/components/use-sync-url-parameters.ts
diff --git a/frontend/src/metabase/querying/editor/components/QueryEditor/NativeQuerySidebar/NativeQuerySidebar.tsx b/frontend/src/metabase/querying/editor/components/QueryEditor/NativeQuerySidebar/NativeQuerySidebar.tsx
index 0fa5337bccf..d530bb50972 100644
--- a/frontend/src/metabase/querying/editor/components/QueryEditor/NativeQuerySidebar/NativeQuerySidebar.tsx
+++ b/frontend/src/metabase/querying/editor/components/QueryEditor/NativeQuerySidebar/NativeQuerySidebar.tsx
@@ -1,8 +1,8 @@
-import { useState } from "react";
+import { useRef, useState } from "react";
import { useMount } from "react-use";
import { match } from "ts-pattern";
-import { TagEditorSidebar } from "metabase/query_builder/components/template_tags/TagEditorSidebar";
+import { TagEditorSidebar } from "metabase/querying/components/template_tags/TagEditorSidebar";
import { useSelector } from "metabase/redux";
import { Box } from "metabase/ui";
import * as Lib from "metabase-lib";
@@ -134,6 +134,19 @@ function TemplateTagsSidebar({
}: NativeQuerySidebarProps) {
const sampleDatabaseId = useSelector(getSampleDatabaseId);
+ // The template-tag editor fires several query mutations within a single event
+ // handler (e.g. switching a variable's type updates both the tag and its
+ // value-source config). React props don't update between those synchronous
+ // calls, so we track the latest query in a ref and compose each change on top
+ // of it; otherwise the second `onChangeQuery` would clobber the first.
+ const latestQueryRef = useRef(query);
+ latestQueryRef.current = query;
+
+ const commitQuery = (newQuery: Lib.Query) => {
+ latestQueryRef.current = newQuery;
+ onChangeQuery(newQuery);
+ };
+
return (
<TagEditorSidebar
question={question}
@@ -141,13 +154,14 @@ function TemplateTagsSidebar({
onClose={onToggleTemplateTagsSidebar}
sampleDatabaseId={sampleDatabaseId}
setTemplateTag={(tag) => {
- const templateTags = Lib.templateTags(query);
- const newQuery = Lib.withTemplateTags(query, {
- ...templateTags,
- [tag.name]: tag,
- });
-
- onChangeQuery(newQuery);
+ const currentQuery = latestQueryRef.current;
+ const templateTags = Lib.templateTags(currentQuery);
+ commitQuery(
+ Lib.withTemplateTags(currentQuery, {
+ ...templateTags,
+ [tag.name]: tag,
+ }),
+ );
}}
setParameterValue={(tagId, value) => {
setParameterValues({
@@ -155,9 +169,15 @@ function TemplateTagsSidebar({
[tagId]: value,
});
}}
+ setTemplateTagConfig={(tag, config) => {
+ const newQuery = question
+ .setQuery(latestQueryRef.current)
+ .legacyNativeQuery()!
+ .setTemplateTagConfig(tag, config);
+ commitQuery(newQuery.question().query());
+ }}
setDatasetQuery={(newQuery) => {
- const newQuestion = question.setDatasetQuery(newQuery);
- onChangeQuery(newQuestion.query());
+ commitQuery(question.setDatasetQuery(newQuery).query());
}}
getEmbeddedParameterVisibility={VISIBILITY_ALWAYS_ENABLED}
parametersAreUserVisible={parametersAreUserVisible}
diff --git a/frontend/src/metabase/querying/editor/components/QueryEditor/QueryEditorBody/QueryEditorBody.tsx b/frontend/src/metabase/querying/editor/components/QueryEditor/QueryEditorBody/QueryEditorBody.tsx
index 656f4e67c06..e8c055033d1 100644
--- a/frontend/src/metabase/querying/editor/components/QueryEditor/QueryEditorBody/QueryEditorBody.tsx
+++ b/frontend/src/metabase/querying/editor/components/QueryEditor/QueryEditorBody/QueryEditorBody.tsx
@@ -6,7 +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 } from "metabase/query_builder/components/NativeQueryEditor";
+import { NativeQueryEditor } from "metabase/querying/components/NativeQueryEditor";
import { Notebook } from "metabase/querying/notebook/components/Notebook";
import { Box } from "metabase/ui";
import type Question from "metabase-lib/v1/Question";
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.tsx
index cfa2e5dbb59..f4b23b94228 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
@@ -10,16 +10,16 @@ import {
generateDraftCardId,
loadMetadataForDocumentCard,
} from "metabase/documents/documents.slice";
-import { NativeQueryEditor } from "metabase/query_builder/components/NativeQueryEditor";
-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 { NativeQueryEditor } from "metabase/querying/components/NativeQueryEditor";
import { useDispatch, useSelector } from "metabase/redux";
import { getMetadata } from "metabase/selectors/metadata";
import { Box, Button, Flex, Loader, Modal, Stack, Text } from "metabase/ui";
import { isMac } from "metabase/utils/browser";
import Visualization from "metabase/visualizations/components/Visualization";
import NoResultsView from "metabase/visualizations/components/Visualization/NoResultsView/NoResultsView";
+import { createRawSeries } from "metabase/visualizations/lib/series";
import * as Lib from "metabase-lib";
import Question from "metabase-lib/v1/Question";
import type NativeQuery from "metabase-lib/v1/queries/NativeQuery";
diff --git a/frontend/src/metabase/visualizations/lib/series.ts b/frontend/src/metabase/visualizations/lib/series.ts
index a0a2e320f3a..5f71f47c3a6 100644
--- a/frontend/src/metabase/visualizations/lib/series.ts
+++ b/frontend/src/metabase/visualizations/lib/series.ts
@@ -1,6 +1,7 @@
import { assocIn } from "icepick";
import { SERIES_SETTING_KEY } from "metabase/visualizations/shared/settings/series";
+import type { Series } from "metabase-types/api";
import type { Card, VisualizationSettings } from "metabase-types/api/card";
export const updateSeriesColor = (
@@ -14,3 +15,26 @@ export const updateSeriesColor = (
export const getNameForCard = (card: Card) => {
return card?.name || "";
};
+
+export const createRawSeries = (options: {
+ card: Card;
+ queryResult: any;
+ datasetQuery?: any;
+}): Series => {
+ const { card, queryResult, datasetQuery } = options;
+
+ // we want to provide the visualization with a card containing the latest
+ // "display", "visualization_settings", etc, (to ensure the correct visualization is shown)
+ // BUT the last executed "dataset_query" (to ensure data matches the query)
+ return (
+ queryResult && [
+ {
+ ...queryResult,
+ card: {
+ ...card,
+ ...(datasetQuery && { dataset_query: datasetQuery }),
+ },
+ },
+ ]
+ );
+};
diff --git a/frontend/test/register-visualizations.js b/frontend/test/register-visualizations.js
index a82a0cb0a4d..9e620fe5f1f 100644
--- a/frontend/test/register-visualizations.js
+++ b/frontend/test/register-visualizations.js
@@ -7,6 +7,6 @@ jest.mock("metabase/common/components/ExplicitSize", () =>
// We need to mock this *before* registering the visualizations.
// Otherwise ActionViz loads the NativeQueryEditor (via ActionCreator)
// and tests fail because ace is not properly mocked
-jest.mock("metabase/query_builder/components/NativeQueryEditor", () =>
- require("metabase/query_builder/components/NativeQueryEditor/__mocks__/NativeQueryEditor"),
+jest.mock("metabase/querying/components/NativeQueryEditor", () =>
+ require("metabase/querying/components/NativeQueryEditor/__mocks__/NativeQueryEditor"),
);