Skip to content

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

Migrate QueryEditorBody to composable NativeQueryEditor (#75077)

Romeo Van Snick3a28d03ece56
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 a7513ec1508..656f4e67c06 100644
--- a/frontend/src/metabase/querying/editor/components/QueryEditor/QueryEditorBody/QueryEditorBody.tsx
+++ b/frontend/src/metabase/querying/editor/components/QueryEditor/QueryEditorBody/QueryEditorBody.tsx
@@ -179,15 +179,11 @@ export function QueryEditorBody({
proposedQuestion={proposedQuestion}
query={query}
placeholder="SELECT * FROM TABLE_NAME"
- hasTopBar
- hasRunButton={!readOnly && !hideRunButton}
isInitiallyOpen
isNativeEditorOpen
readOnly={readOnly}
resizable={resizable}
canChangeDatabase={canChangeDatabase}
- hasParametersList
- hasEditingSidebar
isRunnable={isRunnable}
isRunning={isRunning}
isResultDirty={isResultDirty}
@@ -199,7 +195,6 @@ export function QueryEditorBody({
databaseIsDisabled={shouldDisableDatabase}
databaseDisabledTooltip={databaseDisabledTooltip}
setDatasetQuery={handleNativeQueryChange}
- sidebarFeatures={NATIVE_EDITOR_SIDEBAR_FEATURES}
toggleDataReference={onToggleDataReference}
toggleSnippetSidebar={onToggleSnippetSidebar}
toggleTemplateTagsEditor={onToggleTemplateTagsSidebar}
@@ -212,9 +207,18 @@ export function QueryEditorBody({
onOpenModal={onOpenModal}
onAcceptProposed={onAcceptProposed}
onRejectProposed={onRejectProposed}
- topBarInnerContent={topBarInnerContent}
- extraButton={extraButton}
- />
+ >
+ <NativeQueryEditor.TopBar>
+ <NativeQueryEditor.ParametersList />
+ {topBarInnerContent}
+ <NativeQueryEditor.Sidebar
+ features={NATIVE_EDITOR_SIDEBAR_FEATURES}
+ />
+ <NativeQueryEditor.VisibilityToggler />
+ </NativeQueryEditor.TopBar>
+ {extraButton}
+ {!readOnly && !hideRunButton && <NativeQueryEditor.RunButton />}
+ </NativeQueryEditor>
);
}