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
Migrate ViewNativeQueryEditor to composable NativeQueryEditor (#75080)
Romeo Van Snick13724dfa7ef2
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 4e1727ea792..b19b37ede6a 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@@ -1,6 +1,5 @@import { useElementSize } from "@mantine/hooks";import cx from "classnames";-import type { ResizableBoxProps } from "react-resizable";import { DebouncedFrame } from "metabase/common/components/DebouncedFrame";import CS from "metabase/css/core/index.css";@@ -8,10 +7,7 @@ import { ObjectDetailSidesheet } from "metabase/query_builder/components/ObjectDimport { 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/querying/editor/types";+import type { SelectionRange } from "metabase/querying/editor/types";import { TimeseriesChrome } from "metabase/querying/filters/components/TimeseriesChrome";import type { QueryBuilderMode } from "metabase/redux/store";import { Box } from "metabase/ui";@@ -52,12 +48,7 @@ interface ViewMainContainerProps {readOnly?: boolean;canChangeDatabase?: boolean;- hasTopBar?: boolean;- hasParametersList?: boolean;- hasEditingSidebar?: boolean;- sidebarFeatures?: SidebarFeatures;resizable?: boolean;- resizableBoxProps?: Partial<Omit<ResizableBoxProps, "axis">>;editorContext?: "question";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 96e37bdf7d2..70a15000335 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,13 +1,8 @@-import type { ResizableBoxProps } from "react-resizable";-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/querying/editor/types";+import type { SelectionRange } from "metabase/querying/editor/types";import { useSelector } from "metabase/redux";import { Box } from "metabase/ui";import * as Lib from "metabase-lib";@@ -46,12 +41,7 @@ interface ViewNativeQueryEditorProps {readOnly?: boolean;canChangeDatabase?: boolean;- hasTopBar?: boolean;- hasParametersList?: boolean;- hasEditingSidebar?: boolean;- sidebarFeatures?: SidebarFeatures;resizable?: boolean;- resizableBoxProps?: Partial<Omit<ResizableBoxProps, "axis">>;editorContext?: "question";@@ -113,7 +103,14 @@ export const ViewNativeQueryEditor = (props: ViewNativeQueryEditorProps) => {proposedQuestion={inlineSQLPrompt?.proposedQuestion}onAcceptProposed={inlineSQLPrompt?.handleAcceptProposed}onRejectProposed={inlineSQLPrompt?.handleRejectProposed}- />+ >+ <NativeQueryEditor.TopBar>+ <NativeQueryEditor.ParametersList />+ <NativeQueryEditor.Sidebar />+ <NativeQueryEditor.VisibilityToggler />+ </NativeQueryEditor.TopBar>+ <NativeQueryEditor.RunButton />+ </NativeQueryEditor>{inlineSQLPrompt?.portalElement}</Box>);