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
Fix NativeQueryEditor's action buttons (#68638)
Sloan Sparger6c09fca35583
diff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditor.module.css b/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditor.module.cssindex 2b83734cc29..f6a0e8b68ef 100644--- a/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditor.module.css+++ b/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditor.module.css@@ -18,6 +18,10 @@flex-direction: column;}+.resizableBoxContent {+ overflow: hidden;+}+.actionButtons {/* min-height of the top bar, it's needed for vertical alignment when thereare several template tags */diff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditor.tsx b/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditor.tsxindex 0acdd06a41c..f974bbc0304 100644--- a/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditor.tsx+++ b/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditor.tsx@@ -325,80 +325,83 @@ export const NativeQueryEditor = forwardRef<initialHeight={getInitialEditorHeight({ query, availableHeight })}className={S.resizableArea}>- <CodeMirrorEditor- ref={editorRef}- query={question.query()}- proposedQuery={proposedQuestion?.query()}- readOnly={readOnly}- placeholder={placeholder}- highlightedLineNumbers={highlightedLineNumbers}- extensions={extensions}- onBlur={onBlur}- onChange={handleChange}- onRunQuery={runQuery}- onSelectionChange={setNativeEditorSelectedRange}- onCursorMoveOverCardTag={openDataReferenceAtQuestion}- onRightClickSelection={handleRightClickSelection}- onFormatQuery={handleFormatQuery}- />+ <Flex w="100%" flex="1" className={S.resizableBoxContent}>+ <CodeMirrorEditor+ ref={editorRef}+ query={question.query()}+ proposedQuery={proposedQuestion?.query()}+ readOnly={readOnly}+ placeholder={placeholder}+ highlightedLineNumbers={highlightedLineNumbers}+ extensions={extensions}+ onBlur={onBlur}+ onChange={handleChange}+ onRunQuery={runQuery}+ onSelectionChange={setNativeEditorSelectedRange}+ onCursorMoveOverCardTag={openDataReferenceAtQuestion}+ onRightClickSelection={handleRightClickSelection}+ onFormatQuery={handleFormatQuery}+ />- <Stack- bottom="0.75rem"- display={readOnly ? "none" : undefined}- gap="md"- left="0.75rem"- pos="absolute"- >- {proposedQuestion && onRejectProposed && onAcceptProposed && (- <>- <Tooltip label={t`Accept proposed changes`} position="top">- <Button- data-testid="accept-proposed-changes-button"- variant="filled"- bg="success"- px="0"- w="2.5rem"- onClick={() => {- const proposedQuery =- proposedQuestion.legacyNativeQuery();- if (proposedQuery) {- handleChange(proposedQuery.queryText());- onAcceptProposed(proposedQuery.datasetQuery());- }- }}- >- <Icon name="check" />- </Button>- </Tooltip>- <Tooltip label={t`Reject proposed changes`} position="top">- <Button- data-testid="reject-proposed-changes-button"- w="2.5rem"- px="0"- variant="filled"- bg="danger"- onClick={onRejectProposed}- >- <Icon name="close" />- </Button>- </Tooltip>- </>- )}- <Flex gap="sm">- {extraButton}- {hasRunButton && !readOnly && (- <NativeQueryEditorRunButton- cancelQuery={cancelQuery}- isResultDirty={isResultDirty}- isRunnable={isRunnable}- isRunning={isRunning}- nativeEditorSelectedText={nativeEditorSelectedText}- runQuery={runQuery}- questionErrors={Lib.validateTemplateTags(question.query())}- />+ <Stack+ m="1rem"+ mt="auto"+ display={readOnly ? "none" : undefined}+ gap="md"+ >+ {proposedQuestion && onRejectProposed && onAcceptProposed && (+ <>+ <Tooltip label={t`Accept proposed changes`} position="top">+ <Button+ data-testid="accept-proposed-changes-button"+ variant="filled"+ bg="success"+ px="0"+ w="2.5rem"+ onClick={() => {+ const proposedQuery =+ proposedQuestion.legacyNativeQuery();+ if (proposedQuery) {+ handleChange(proposedQuery.queryText());+ onAcceptProposed(proposedQuery.datasetQuery());+ }+ }}+ >+ <Icon name="check" />+ </Button>+ </Tooltip>+ <Tooltip label={t`Reject proposed changes`} position="top">+ <Button+ data-testid="reject-proposed-changes-button"+ w="2.5rem"+ px="0"+ variant="filled"+ bg="danger"+ onClick={onRejectProposed}+ >+ <Icon name="close" />+ </Button>+ </Tooltip>+ </>)}- </Flex>- </Stack>+ <Flex gap="sm">+ {extraButton}+ {hasRunButton && !readOnly && (+ <NativeQueryEditorRunButton+ cancelQuery={cancelQuery}+ isResultDirty={isResultDirty}+ isRunnable={isRunnable}+ isRunning={isRunning}+ nativeEditorSelectedText={nativeEditorSelectedText}+ runQuery={runQuery}+ questionErrors={Lib.validateTemplateTags(+ question.query(),+ )}+ />+ )}+ </Flex>+ </Stack>+ </Flex></ResizableArea>)}</div>