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 setIsNativeEditorOpen into shared (#74807)
Fraserbae37c48619e
diff --git a/frontend/src/metabase/metabot/components/FixSqlQueryButton/FixSqlQueryButton.tsx b/frontend/src/metabase/metabot/components/FixSqlQueryButton/FixSqlQueryButton.tsxindex 3d2f511ab9d..d57a3f13f8f 100644--- a/frontend/src/metabase/metabot/components/FixSqlQueryButton/FixSqlQueryButton.tsx+++ b/frontend/src/metabase/metabot/components/FixSqlQueryButton/FixSqlQueryButton.tsx@@ -9,8 +9,8 @@ import {useMetabotName,useUserMetabotPermissions,} from "metabase/metabot/hooks";-import { setIsNativeEditorOpen } from "metabase/query_builder/actions";import { useDispatch } from "metabase/redux";+import { setIsNativeEditorOpen } from "metabase/redux/query-builder";import { Button } from "metabase/ui";import { trackQueryFixClicked } from "../../analytics";diff --git a/frontend/src/metabase/metabot/components/FixSqlQueryButton/FixSqlQueryButton.unit.spec.tsx b/frontend/src/metabase/metabot/components/FixSqlQueryButton/FixSqlQueryButton.unit.spec.tsxindex fee777f4768..4f5bed0e69d 100644--- a/frontend/src/metabase/metabot/components/FixSqlQueryButton/FixSqlQueryButton.unit.spec.tsx+++ b/frontend/src/metabase/metabot/components/FixSqlQueryButton/FixSqlQueryButton.unit.spec.tsx@@ -6,7 +6,7 @@ import {useMetabotAgent,useUserMetabotPermissions,} from "metabase/metabot/hooks";-import { setIsNativeEditorOpen } from "metabase/query_builder/actions";+import { setIsNativeEditorOpen } from "metabase/redux/query-builder";import { trackQueryFixClicked } from "../../analytics";@@ -25,8 +25,8 @@ jest.mock("metabase/metabot/hooks", () => ({useUserMetabotPermissions: jest.fn(),}));-jest.mock("metabase/query_builder/actions", () => ({- ...jest.requireActual("metabase/query_builder/actions"),+jest.mock("metabase/redux/query-builder", () => ({+ ...jest.requireActual("metabase/redux/query-builder"),setIsNativeEditorOpen: jest.fn(),}));diff --git a/frontend/src/metabase/metabot/state/actions.ts b/frontend/src/metabase/metabot/state/actions.tsindex bc527939be7..cb37e2cbacb 100644--- a/frontend/src/metabase/metabot/state/actions.ts+++ b/frontend/src/metabase/metabot/state/actions.ts@@ -10,7 +10,7 @@ import {import type { ProcessedChatResponse } from "metabase/api/ai-streaming/process-stream";import { isEmbeddingSdk } from "metabase/embedding-sdk/config";import { PLUGIN_AUDIT } from "metabase/plugins";-import { setIsNativeEditorOpen } from "metabase/query_builder/actions";+import { setIsNativeEditorOpen } from "metabase/redux/query-builder";import type { Dispatch, State } from "metabase/redux/store";import { addUndo } from "metabase/redux/undo";import { createAsyncThunk } from "metabase/redux/utils";diff --git a/frontend/src/metabase/metabot/tests/context.unit.spec.tsx b/frontend/src/metabase/metabot/tests/context.unit.spec.tsxindex f000764a7e5..df3d78ad0cd 100644--- a/frontend/src/metabase/metabot/tests/context.unit.spec.tsx+++ b/frontend/src/metabase/metabot/tests/context.unit.spec.tsx@@ -7,7 +7,7 @@ import { setupDatabaseListEndpoint } from "__support__/server-mocks";import { screen } from "__support__/ui";import { useRegisterMetabotContextProvider } from "metabase/metabot";import { FixSqlQueryButton } from "metabase/metabot/components/FixSqlQueryButton";-import { setIsNativeEditorOpen } from "metabase/query_builder/actions";+import { setIsNativeEditorOpen } from "metabase/redux/query-builder";import {createMockDatabase,createMockUser,@@ -26,8 +26,8 @@ import {whoIsYourFavoriteResponse,} from "./utils";-jest.mock("metabase/query_builder/actions", () => ({- ...jest.requireActual("metabase/query_builder/actions"),+jest.mock("metabase/redux/query-builder", () => ({+ ...jest.requireActual("metabase/redux/query-builder"),setIsNativeEditorOpen: jest.fn(),}));diff --git a/frontend/src/metabase/query_builder/actions/native.ts b/frontend/src/metabase/query_builder/actions/native.tsindex 22e0f9ac530..880165357c2 100644--- a/frontend/src/metabase/query_builder/actions/native.ts+++ b/frontend/src/metabase/query_builder/actions/native.ts@@ -2,7 +2,6 @@ import { createAction } from "redux-actions";import { Questions } from "metabase/entities/questions";import { createThunkAction } from "metabase/redux";-import { setUIControls } from "metabase/redux/query-builder";import { updateUserSetting } from "metabase/redux/settings";import type { Dispatch, GetState } from "metabase/redux/store";import type NativeQuery from "metabase-lib/v1/queries/NativeQuery";@@ -88,25 +87,6 @@ export const setIsShowingSnippetSidebar = (isShowingSnippetSidebar,});-export const SET_IS_NATIVE_EDITOR_OPEN =- "metabase/qb/SET_IS_NATIVE_EDITOR_OPEN";-export const setIsNativeEditorOpen = createThunkAction(- SET_IS_NATIVE_EDITOR_OPEN,- (isNativeEditorOpen: boolean, toggleDataReference?: boolean) =>- (dispatch) => {- if (toggleDataReference) {- dispatch(- setUIControls({- isNativeEditorOpen,- isShowingDataReference: isNativeEditorOpen,- }),- );- } else {- dispatch(setUIControls({ isNativeEditorOpen }));- }- },-);-export const SET_NATIVE_EDITOR_SELECTED_RANGE ="metabase/qb/SET_NATIVE_EDITOR_SELECTED_RANGE";export const setNativeEditorSelectedRange = createAction(diff --git a/frontend/src/metabase/query_builder/containers/QueryBuilder.tsx b/frontend/src/metabase/query_builder/containers/QueryBuilder.tsxindex 1ef0ac545d5..2441a68ba6b 100644--- a/frontend/src/metabase/query_builder/containers/QueryBuilder.tsx+++ b/frontend/src/metabase/query_builder/containers/QueryBuilder.tsx@@ -48,6 +48,7 @@ import {onOpenQuestionInfo,onOpenQuestionSettings,onOpenTimelines,+ setIsNativeEditorOpen,setParameterValue,setUIControls,} from "metabase/redux/query-builder";@@ -94,7 +95,6 @@ import {setDatasetEditorTab,setDatasetQuery,setDidFirstNonTableChartRender,- setIsNativeEditorOpen,setIsShowingSnippetSidebar,setLimit,setMetadataDiff,@@ -271,6 +271,7 @@ const mapDispatchToProps = {onOpenQuestionInfo,onOpenQuestionSettings,onOpenTimelines,+ setIsNativeEditorOpen,setParameterValue,setUIControls,@@ -306,7 +307,6 @@ const mapDispatchToProps = {setDatasetEditorTab,setDatasetQuery,setDidFirstNonTableChartRender,- setIsNativeEditorOpen,setIsShowingSnippetSidebar,setLimit,setMetadataDiff,diff --git a/frontend/src/metabase/redux/query-builder.ts b/frontend/src/metabase/redux/query-builder.tsindex e291d25df4e..5cddce4535d 100644--- a/frontend/src/metabase/redux/query-builder.ts+++ b/frontend/src/metabase/redux/query-builder.ts@@ -11,6 +11,25 @@ export const setUIControls = createAction(SET_UI_CONTROLS);export const RESET_UI_CONTROLS = "metabase/qb/RESET_UI_CONTROLS";export const resetUIControls = createAction(RESET_UI_CONTROLS);+export const SET_IS_NATIVE_EDITOR_OPEN =+ "metabase/qb/SET_IS_NATIVE_EDITOR_OPEN";+export const setIsNativeEditorOpen = createThunkAction(+ SET_IS_NATIVE_EDITOR_OPEN,+ (isNativeEditorOpen: boolean, toggleDataReference?: boolean) =>+ (dispatch) => {+ if (toggleDataReference) {+ dispatch(+ setUIControls({+ isNativeEditorOpen,+ isShowingDataReference: isNativeEditorOpen,+ }),+ );+ } else {+ dispatch(setUIControls({ isNativeEditorOpen }));+ }+ },+);+export const NAVIGATE_BACK_TO_DASHBOARD ="metabase/qb/NAVIGATE_BACK_TO_DASHBOARD";export const navigateBackToDashboard = createAction(NAVIGATE_BACK_TO_DASHBOARD);