Skip to content

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

Small store batch: QueryModalType, metabot re-export (#79347)

Fraser381ab6c1a035
diff --git a/enterprise/frontend/src/embedding-sdk-ee/metabot/hooks/use-metabot.unit.spec.tsx b/enterprise/frontend/src/embedding-sdk-ee/metabot/hooks/use-metabot.unit.spec.tsx
index e69094ad0f4..be1b5458c37 100644
--- a/enterprise/frontend/src/embedding-sdk-ee/metabot/hooks/use-metabot.unit.spec.tsx
+++ b/enterprise/frontend/src/embedding-sdk-ee/metabot/hooks/use-metabot.unit.spec.tsx
@@ -5,7 +5,7 @@ import { useState } from "react";
import { act, screen, waitFor } from "__support__/ui";
import { ensureMetabaseProviderPropsStore } from "embedding-sdk-shared/lib/ensure-metabase-provider-props-store";
import type { GeneratedCard } from "metabase/api/ai-streaming/schemas";
-import { metabotActions } from "metabase/metabot/state";
+import { getMetabotState, metabotActions } from "metabase/metabot/state";
import {
createTestMetabotState,
lastReqBody,
@@ -430,21 +430,25 @@ describe("useMetabot", () => {
});
expect(
- store.getState().metabot?.conversations?.[conversationId]?.messages
- .length,
+ getMetabotState(store.getState()).conversations[conversationId]
+ ?.messages.length,
).toBe(0);
- expect(store.getState().metabot?.agents?.omnibot?.visible).toBe(false);
+ expect(getMetabotState(store.getState()).agents.omnibot?.visible).toBe(
+ false,
+ );
await userEvent.click(screen.getByTestId("submit-btn"));
await waitFor(() => {
expect(
- store.getState().metabot?.conversations?.[conversationId]?.messages
- .length,
+ getMetabotState(store.getState()).conversations[conversationId]
+ ?.messages.length,
).toBeGreaterThan(0);
});
- expect(store.getState().metabot?.agents?.omnibot?.visible).toBe(false);
+ expect(getMetabotState(store.getState()).agents.omnibot?.visible).toBe(
+ false,
+ );
});
it("resolves to undefined even though agent.submitInput returns an action", async () => {
diff --git a/frontend/src/metabase/metabot/components/MetabotConversationPage/MetabotConversationPage.unit.spec.tsx b/frontend/src/metabase/metabot/components/MetabotConversationPage/MetabotConversationPage.unit.spec.tsx
index 902a249caca..08a277242a0 100644
--- a/frontend/src/metabase/metabot/components/MetabotConversationPage/MetabotConversationPage.unit.spec.tsx
+++ b/frontend/src/metabase/metabot/components/MetabotConversationPage/MetabotConversationPage.unit.spec.tsx
@@ -20,7 +20,7 @@ import { createMockUser } from "metabase-types/api/mocks";
import { FIXED_METABOT_IDS } from "../../constants";
import { MetabotProvider } from "../../context";
-import { metabotReducer } from "../../state";
+import { getMetabotState, metabotReducer } from "../../state";
import {
createConversation,
getMetabotInitialState,
@@ -156,7 +156,7 @@ describe("MetabotConversationPage", () => {
).not.toBeInTheDocument();
await waitFor(() => {
expect(
- store.getState().metabot.conversations[CONVERSATION_ID],
+ getMetabotState(store.getState()).conversations[CONVERSATION_ID],
).toBeDefined();
});
});
diff --git a/frontend/src/metabase/metabot/state/selectors.ts b/frontend/src/metabase/metabot/state/selectors.ts
index c9c86348241..08c7f4e86fb 100644
--- a/frontend/src/metabase/metabot/state/selectors.ts
+++ b/frontend/src/metabase/metabot/state/selectors.ts
@@ -18,6 +18,7 @@ import type {
MetabotAgentId,
MetabotContextUsage,
MetabotMessage,
+ MetabotState,
} from "./types";
import { hasInProgressMessage, isGeneratedCardPart, isTextPart } from "./utils";
@@ -25,8 +26,9 @@ import { hasInProgressMessage, isGeneratedCardPart, isTextPart } from "./utils";
* Top Level Selectors
*/
-export const getMetabotState = (state: State) => {
- return state.metabot;
+export const getMetabotState = (state: { metabot: unknown }) => {
+ // Every store root registers `metabotReducer` under this key, so the value is always a `MetabotState`.
+ return state.metabot as MetabotState;
};
export const getActiveMetabotAgentIds = createSelector(
diff --git a/frontend/src/metabase/metabot/tests/query-builder-code-edit.unit.spec.tsx b/frontend/src/metabase/metabot/tests/query-builder-code-edit.unit.spec.tsx
index 838e2f1ba0a..bd38f8dc581 100644
--- a/frontend/src/metabase/metabot/tests/query-builder-code-edit.unit.spec.tsx
+++ b/frontend/src/metabase/metabot/tests/query-builder-code-edit.unit.spec.tsx
@@ -29,6 +29,7 @@ import {
import { createSampleDatabase } from "metabase-types/api/mocks/presets";
import { MetabotProvider } from "../context";
+import { getMetabotState } from "../state";
import { sendAgentRequest } from "../state/actions";
import {
@@ -211,9 +212,9 @@ describe("query builder code edits from omnibot", () => {
});
expect(
- typedStore
- .getState()
- .metabot.conversations[conversationId]?.messages.at(-1),
+ getMetabotState(typedStore.getState()).conversations[
+ conversationId
+ ]?.messages.at(-1),
).toMatchObject({
role: "agent",
externalId: "msg_test_code_edit",
diff --git a/frontend/src/metabase/metabot/tests/utils.tsx b/frontend/src/metabase/metabot/tests/utils.tsx
index 42a4689753b..429bd76d61e 100644
--- a/frontend/src/metabase/metabot/tests/utils.tsx
+++ b/frontend/src/metabase/metabot/tests/utils.tsx
@@ -49,6 +49,7 @@ import {
type MetabotAgentId,
type MetabotState,
fixedMetabotAgentIds,
+ getMetabotState,
metabotReducer,
setVisible,
} from "../state";
@@ -61,7 +62,7 @@ import {
export { createMockReadableStream, createMockSSEStream, createPauses };
-type MetabotStoreLike = { getState: () => { metabot: MetabotState } };
+type MetabotStoreLike = { getState: () => { metabot: unknown } };
const agentIn = (state: MetabotState, agentId: MetabotAgentId) =>
checkNotNull(state.agents[agentId]);
@@ -72,12 +73,16 @@ const convoIn = (state: MetabotState, conversationId: string) =>
export const conversationIdForAgent = (
store: MetabotStoreLike,
agentId: MetabotAgentId = "omnibot",
-) => agentIn(store.getState().metabot, agentId).conversationId;
+) => agentIn(getMetabotState(store.getState()), agentId).conversationId;
export const convoForAgent = (
store: MetabotStoreLike,
agentId: MetabotAgentId = "omnibot",
-) => convoIn(store.getState().metabot, conversationIdForAgent(store, agentId));
+) =>
+ convoIn(
+ getMetabotState(store.getState()),
+ conversationIdForAgent(store, agentId),
+ );
// starts turns without making an API request
export const startRequestlessAgentTurn = (
diff --git a/frontend/src/metabase/query_builder/components/QueryModals/QueryModals.tsx b/frontend/src/metabase/query_builder/components/QueryModals/QueryModals.tsx
index d23516b2ac7..744f63fb55c 100644
--- a/frontend/src/metabase/query_builder/components/QueryModals/QueryModals.tsx
+++ b/frontend/src/metabase/query_builder/components/QueryModals/QueryModals.tsx
@@ -10,11 +10,11 @@ import { SaveQuestionModal } from "metabase/common/components/SaveQuestionModal"
import { type ToastArgs, useToast } from "metabase/common/hooks";
import { QuestionEmbedWidget } from "metabase/embedding/components/QuestionEmbedWidget";
import { QuestionAlertListModal } from "metabase/notifications/modals";
-import { MODAL_TYPES, type QueryModalType } from "metabase/querying/constants";
+import { MODAL_TYPES } from "metabase/querying/constants";
import { ArchiveCardModal } from "metabase/questions/components/ArchiveCardModal";
import { MoveCardModal } from "metabase/questions/components/MoveCardModal";
import { useDispatch, useSelector } from "metabase/redux";
-import type { QueryBuilderMode } from "metabase/redux/store";
+import type { QueryBuilderMode, QueryModalType } from "metabase/redux/store";
import { useNavigate } from "metabase/router";
import EditEventModal from "metabase/timelines/questions/containers/EditEventModal";
import MoveEventModal from "metabase/timelines/questions/containers/MoveEventModal";
diff --git a/frontend/src/metabase/query_builder/components/view/View/StructuredQueryRightSidebar/StructuredQueryRightSidebar.tsx b/frontend/src/metabase/query_builder/components/view/View/StructuredQueryRightSidebar/StructuredQueryRightSidebar.tsx
index 1ca7624bf5f..0da5926a668 100644
--- a/frontend/src/metabase/query_builder/components/view/View/StructuredQueryRightSidebar/StructuredQueryRightSidebar.tsx
+++ b/frontend/src/metabase/query_builder/components/view/View/StructuredQueryRightSidebar/StructuredQueryRightSidebar.tsx
@@ -1,7 +1,7 @@
import { match } from "ts-pattern";
import type { Dayjs } from "metabase/dayjs";
-import type { QueryModalType } from "metabase/querying/constants";
+import type { QueryModalType } from "metabase/redux/store";
import type Question from "metabase-lib/v1/Question";
import type { Timeline, TimelineEvent } from "metabase-types/api";
diff --git a/frontend/src/metabase/query_builder/components/view/View/View/View.tsx b/frontend/src/metabase/query_builder/components/view/View/View/View.tsx
index 2160901e926..ce5186036be 100644
--- a/frontend/src/metabase/query_builder/components/view/View/View/View.tsx
+++ b/frontend/src/metabase/query_builder/components/view/View/View/View.tsx
@@ -18,12 +18,11 @@ import {
import CS from "metabase/css/core/index.css";
import QueryBuilderS from "metabase/css/query_builder.module.css";
import { HasResultsAlertPrompt } from "metabase/notifications/HasResultsAlertPrompt";
-import type { QueryModalType } from "metabase/querying/constants";
import { MetricEditor } from "metabase/querying/metrics/components/MetricEditor";
import { connect, useDispatch } from "metabase/redux";
import { updateQuestionCard } from "metabase/redux/cards";
import { questionUpdated } from "metabase/redux/query-builder";
-import type { Dispatch } from "metabase/redux/store";
+import type { Dispatch, QueryModalType } from "metabase/redux/store";
import { Flex } from "metabase/ui";
import * as Lib from "metabase-lib";
import type Question from "metabase-lib/v1/Question";
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 100ab7eb6e6..61fb8b34eb1 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
@@ -9,10 +9,9 @@ import { SyncedParametersList } from "metabase/parameters/components/SyncedParam
import { Mode } from "metabase/querying/click-actions/Mode";
import { getQueryMode } from "metabase/querying/click-actions/lib/modes";
import { QueryVisualization } from "metabase/querying/components/QueryVisualization";
-import type { QueryModalType } from "metabase/querying/constants";
import type { SelectionRange } from "metabase/querying/editor/types";
import { TimeseriesChrome } from "metabase/querying/filters/components/TimeseriesChrome";
-import type { QueryBuilderMode } from "metabase/redux/store";
+import type { QueryBuilderMode, QueryModalType } from "metabase/redux/store";
import { Box } from "metabase/ui";
import * as Lib from "metabase-lib";
import type Question from "metabase-lib/v1/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.tsx
index ea2d2851e64..75f93a27dd2 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
@@ -7,9 +7,9 @@ import {
NATIVE_EDITOR_ICON_SIZE,
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";
+import type { QueryModalType } from "metabase/redux/store";
import { Box } from "metabase/ui";
import * as Lib from "metabase-lib";
import type Question from "metabase-lib/v1/Question";
diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/ViewTitleHeader.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/ViewTitleHeader.tsx
index 5135e84d3ef..8d56f0144e9 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/ViewTitleHeader.tsx
+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/ViewTitleHeader.tsx
@@ -4,8 +4,11 @@ import { useEffect } from "react";
import { usePrevious } from "react-use";
import { useToggle } from "metabase/common/hooks/use-toggle";
-import type { QueryModalType } from "metabase/querying/constants";
-import type { DatasetEditorTab, QueryBuilderMode } from "metabase/redux/store";
+import type {
+ DatasetEditorTab,
+ QueryBuilderMode,
+ QueryModalType,
+} from "metabase/redux/store";
import { Flex } from "metabase/ui";
import * as Lib from "metabase-lib";
import type Question from "metabase-lib/v1/Question";
diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/AdHocQuestionLeftSide/AdHocQuestionLeftSide.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/AdHocQuestionLeftSide/AdHocQuestionLeftSide.tsx
index 9324850d06a..f464c2bd69a 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/AdHocQuestionLeftSide/AdHocQuestionLeftSide.tsx
+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/AdHocQuestionLeftSide/AdHocQuestionLeftSide.tsx
@@ -1,7 +1,8 @@
import type React from "react";
import { t } from "ttag";
-import { MODAL_TYPES, type QueryModalType } from "metabase/querying/constants";
+import { MODAL_TYPES } from "metabase/querying/constants";
+import type { QueryModalType } from "metabase/redux/store";
import { Box, Flex } from "metabase/ui";
import * as Lib from "metabase-lib";
import type Question from "metabase-lib/v1/Question";
diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionActions.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionActions.tsx
index 67aec06378c..e299b4ae96d 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionActions.tsx
+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionActions.tsx
@@ -8,9 +8,12 @@ import { ConfirmModal } from "metabase/common/components/ConfirmModal";
import { ToolbarButton } from "metabase/common/components/ToolbarButton";
import { UploadInput } from "metabase/common/components/upload";
import { useRegisterShortcut } from "metabase/palette/hooks/useRegisterShortcut";
-import type { QueryModalType } from "metabase/querying/constants";
import { useDispatch } from "metabase/redux";
-import type { DatasetEditorTab, QueryBuilderMode } from "metabase/redux/store";
+import type {
+ DatasetEditorTab,
+ QueryBuilderMode,
+ QueryModalType,
+} from "metabase/redux/store";
import { UploadMode } from "metabase/redux/store/upload";
import { uploadFile } from "metabase/redux/uploads";
import { Box, Divider, Icon, Menu } from "metabase/ui";
diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionMoreActionsMenu/QuestionMoreActionsMenu.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionMoreActionsMenu/QuestionMoreActionsMenu.tsx
index 431fcf3a37f..8d97c0714ad 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionMoreActionsMenu/QuestionMoreActionsMenu.tsx
+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionMoreActionsMenu/QuestionMoreActionsMenu.tsx
@@ -10,9 +10,13 @@ import {
} from "metabase/current-user";
import { useRegisterShortcut } from "metabase/palette/hooks/useRegisterShortcut";
import { PLUGIN_MODERATION } from "metabase/plugins";
-import { MODAL_TYPES, type QueryModalType } from "metabase/querying/constants";
+import { MODAL_TYPES } from "metabase/querying/constants";
import { useDispatch, useSelector } from "metabase/redux";
-import type { DatasetEditorTab, QueryBuilderMode } from "metabase/redux/store";
+import type {
+ DatasetEditorTab,
+ QueryBuilderMode,
+ QueryModalType,
+} from "metabase/redux/store";
import { Icon, Menu } from "metabase/ui";
import * as Lib from "metabase-lib";
import type Question from "metabase-lib/v1/Question";
diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ViewTitleHeaderRightSide/ViewTitleHeaderRightSide.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ViewTitleHeaderRightSide/ViewTitleHeaderRightSide.tsx
index 39a0b40f0f8..eb2e9dd97d5 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ViewTitleHeaderRightSide/ViewTitleHeaderRightSide.tsx
+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ViewTitleHeaderRightSide/ViewTitleHeaderRightSide.tsx
@@ -6,9 +6,13 @@ import { t } from "ttag";
import { getUserCanWriteToCollections } from "metabase/current-user";
import { useRegisterShortcut } from "metabase/palette/hooks/useRegisterShortcut";
import { RunButtonWithTooltip } from "metabase/querying/components/QueryVisualization/RunButtonWithTooltip";
-import { MODAL_TYPES, type QueryModalType } from "metabase/querying/constants";
+import { MODAL_TYPES } from "metabase/querying/constants";
import { useSelector } from "metabase/redux";
-import type { DatasetEditorTab, QueryBuilderMode } from "metabase/redux/store";
+import type {
+ DatasetEditorTab,
+ QueryBuilderMode,
+ QueryModalType,
+} from "metabase/redux/store";
import { Box, Button, Flex, Tooltip } from "metabase/ui";
import { SERVER_ERROR_TYPES } from "metabase/utils/errors";
import MetabaseSettings from "metabase/utils/settings";
diff --git a/frontend/src/metabase/querying/components/NativeQueryEditor/NativeQueryEditorActionButtons/NativeQueryEditorActionButtons.tsx b/frontend/src/metabase/querying/components/NativeQueryEditor/NativeQueryEditorActionButtons/NativeQueryEditorActionButtons.tsx
index 4cca9580b80..ab1ca4011df 100644
--- a/frontend/src/metabase/querying/components/NativeQueryEditor/NativeQueryEditorActionButtons/NativeQueryEditorActionButtons.tsx
+++ b/frontend/src/metabase/querying/components/NativeQueryEditor/NativeQueryEditorActionButtons/NativeQueryEditorActionButtons.tsx
@@ -5,8 +5,8 @@ import { DataReferenceButton } from "metabase/querying/components/NativeQueryEdi
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 type { QueryModalType } from "metabase/redux/store";
import { Button, Flex, Icon, Tooltip } from "metabase/ui";
import type Question from "metabase-lib/v1/Question";
import type { Collection, NativeQuerySnippet } from "metabase-types/api";
diff --git a/frontend/src/metabase/querying/components/NativeQueryEditor/NativeQueryEditorRoot.tsx b/frontend/src/metabase/querying/components/NativeQueryEditor/NativeQueryEditorRoot.tsx
index 667d65919c2..e1662e22688 100644
--- a/frontend/src/metabase/querying/components/NativeQueryEditor/NativeQueryEditorRoot.tsx
+++ b/frontend/src/metabase/querying/components/NativeQueryEditor/NativeQueryEditorRoot.tsx
@@ -24,9 +24,9 @@ import {
} 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";
+import type { QueryModalType } from "metabase/redux/store";
import { Button, Flex, Icon, Stack, Tooltip } from "metabase/ui";
import * as Lib from "metabase-lib";
import type Question from "metabase-lib/v1/Question";
diff --git a/frontend/src/metabase/querying/components/NativeQueryEditor/PreviewQueryButton/PreviewQueryButton.tsx b/frontend/src/metabase/querying/components/NativeQueryEditor/PreviewQueryButton/PreviewQueryButton.tsx
index 40db336b41a..df34e12c8cb 100644
--- a/frontend/src/metabase/querying/components/NativeQueryEditor/PreviewQueryButton/PreviewQueryButton.tsx
+++ b/frontend/src/metabase/querying/components/NativeQueryEditor/PreviewQueryButton/PreviewQueryButton.tsx
@@ -2,12 +2,14 @@ import { useCallback } from "react";
import { t } from "ttag";
import { IconButtonWrapper } from "metabase/common/components/IconButtonWrapper";
-import { MODAL_TYPES, type QueryModalType } from "metabase/querying/constants";
+import type { QueryModalType } from "metabase/redux/store";
import { Icon, Tooltip } from "metabase/ui";
import * as Lib from "metabase-lib";
import type Question from "metabase-lib/v1/Question";
import type NativeQuery from "metabase-lib/v1/queries/NativeQuery";
+import { MODAL_TYPES } from "../../../constants";
+
import PreviewQueryButtonS from "./PreviewQueryButton.module.css";
interface PreviewQueryButtonProps {
diff --git a/frontend/src/metabase/querying/components/NativeQueryEditor/context/NativeQueryEditorContext.tsx b/frontend/src/metabase/querying/components/NativeQueryEditor/context/NativeQueryEditorContext.tsx
index 6dfc6192adc..45c35014bb3 100644
--- a/frontend/src/metabase/querying/components/NativeQueryEditor/context/NativeQueryEditorContext.tsx
+++ b/frontend/src/metabase/querying/components/NativeQueryEditor/context/NativeQueryEditorContext.tsx
@@ -1,7 +1,7 @@
import { createContext, useContext } from "react";
import type { DataSelectorDatabase } from "metabase/querying/common/components/DataSelector";
-import type { QueryModalType } from "metabase/querying/constants";
+import type { QueryModalType } from "metabase/redux/store";
import type Question from "metabase-lib/v1/Question";
import type NativeQuery from "metabase-lib/v1/queries/NativeQuery";
import type {
diff --git a/frontend/src/metabase/querying/constants.ts b/frontend/src/metabase/querying/constants.ts
index a8f22bce0ea..2325bd67083 100644
--- a/frontend/src/metabase/querying/constants.ts
+++ b/frontend/src/metabase/querying/constants.ts
@@ -1,3 +1,5 @@
+import type { QueryModalType } from "metabase/redux/store";
+
export const MODAL_TYPES = {
SAVE: "save",
ADD_TO_DASHBOARD: "add-to-dashboard",
@@ -13,8 +15,6 @@ export const MODAL_TYPES = {
MOVE_EVENT: "move-event",
PREVIEW_QUERY: "preview-query",
QUESTION_EMBED: "question-embed",
-} as const;
-
-export type QueryModalType = (typeof MODAL_TYPES)[keyof typeof MODAL_TYPES];
+} as const satisfies Record<string, QueryModalType>;
export const VISUALIZATION_SLOW_TIMEOUT = 15 * 1000;
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 8a10e38fc16..b5084786ef4 100644
--- a/frontend/src/metabase/querying/editor/components/QueryEditor/QueryEditorBody/QueryEditorBody.tsx
+++ b/frontend/src/metabase/querying/editor/components/QueryEditor/QueryEditorBody/QueryEditorBody.tsx
@@ -7,6 +7,7 @@ import type { OmniPickerItem } from "metabase/common/components/Pickers";
import { ResizeHandle } from "metabase/common/components/ResizeHandle";
import { NativeQueryEditor } from "metabase/querying/components/NativeQueryEditor";
import { Notebook } from "metabase/querying/notebook/components/Notebook";
+import type { QueryModalType } from "metabase/redux/store";
import { useSetting } from "metabase/settings";
import { Box } from "metabase/ui";
import type Question from "metabase-lib/v1/Question";
@@ -16,7 +17,6 @@ import type {
RecentCollectionItem,
} from "metabase-types/api";
-import type { QueryModalType } from "../../../../constants";
import type {
QueryEditorDatabasePickerItem,
SelectionRange,
diff --git a/frontend/src/metabase/querying/editor/hooks/use-query-controls/use-query-controls.ts b/frontend/src/metabase/querying/editor/hooks/use-query-controls/use-query-controls.ts
index fba7927baa7..505fea881b5 100644
--- a/frontend/src/metabase/querying/editor/hooks/use-query-controls/use-query-controls.ts
+++ b/frontend/src/metabase/querying/editor/hooks/use-query-controls/use-query-controls.ts
@@ -1,10 +1,10 @@
import { useMemo } from "react";
+import type { QueryModalType } from "metabase/redux/store";
import * as Lib from "metabase-lib";
import type Question from "metabase-lib/v1/Question";
import type { NativeQuerySnippet } from "metabase-types/api";
-import type { QueryModalType } from "../../../constants";
import type {
Location,
QueryEditorModalType,
diff --git a/frontend/src/metabase/redux/store/metabot.ts b/frontend/src/metabase/redux/store/metabot.ts
deleted file mode 100644
index 13fd7b4f057..00000000000
--- a/frontend/src/metabase/redux/store/metabot.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { type MetabotState } from "metabase/metabot/state";
diff --git a/frontend/src/metabase/redux/store/qb.ts b/frontend/src/metabase/redux/store/qb.ts
index f57546d8648..017746b0373 100644
--- a/frontend/src/metabase/redux/store/qb.ts
+++ b/frontend/src/metabase/redux/store/qb.ts
@@ -1,4 +1,3 @@
-import type { QueryModalType } from "metabase/querying/constants";
import type { Widget } from "metabase/viz-core";
import type {
Card,
@@ -10,6 +9,22 @@ import type {
TimelineEventId,
} from "metabase-types/api";
+export type QueryModalType =
+ | "save"
+ | "add-to-dashboard"
+ | "move"
+ | "clone"
+ | "archive"
+ | "create-alert"
+ | "save-question-before-embed"
+ | "turn-into-dataset"
+ | "can-not-create-model"
+ | "new-event"
+ | "edit-event"
+ | "move-event"
+ | "preview-query"
+ | "question-embed";
+
export type QueryBuilderMode = "view" | "notebook" | "dataset";
export type DatasetEditorTab = "query" | "columns" | "metadata";
export type QueryBuilderQueryStatus = "idle" | "running" | "complete";
diff --git a/frontend/src/metabase/redux/store/state.ts b/frontend/src/metabase/redux/store/state.ts
index 2569e429f7d..27f1ceaa0d4 100644
--- a/frontend/src/metabase/redux/store/state.ts
+++ b/frontend/src/metabase/redux/store/state.ts
@@ -10,7 +10,6 @@ import type { DownloadsState } from "./downloads";
import type { EmbedState } from "./embed";
import type { EmbeddingDataPickerState } from "./embedding-data-picker";
import type { EntitiesState } from "./entities";
-import type { MetabotState } from "./metabot";
import type { ModalState } from "./modal";
import type { ParametersState } from "./parameters";
import type { PulseState } from "./pulse";
@@ -45,7 +44,8 @@ export interface State {
};
"metabase-api": MetabaseApiState;
documents: DocumentsState;
- metabot: MetabotState;
+ // The slice shape is metabot's own — read it through metabot's selectors, which narrow this key.
+ metabot: unknown;
explorations: ExplorationsState;
}
diff --git a/frontend/src/metabase/timelines/questions/components/TimelineSidebar/TimelineSidebar.tsx b/frontend/src/metabase/timelines/questions/components/TimelineSidebar/TimelineSidebar.tsx
index 327ab292da1..b5fbc30705c 100644
--- a/frontend/src/metabase/timelines/questions/components/TimelineSidebar/TimelineSidebar.tsx
+++ b/frontend/src/metabase/timelines/questions/components/TimelineSidebar/TimelineSidebar.tsx
@@ -3,7 +3,8 @@ import { t } from "ttag";
import { SidebarContent } from "metabase/common/components/SidebarContent";
import { type Dayjs, type OpUnitType, dayjs } from "metabase/dayjs";
-import { MODAL_TYPES, type QueryModalType } from "metabase/querying/constants";
+import { MODAL_TYPES } from "metabase/querying/constants";
+import type { QueryModalType } from "metabase/redux/store";
import EditEventModal from "metabase/timelines/questions/containers/EditEventModal";
import MoveEventModal from "metabase/timelines/questions/containers/MoveEventModal";
import NewEventModal from "metabase/timelines/questions/containers/NewEventModal";