Skip to content

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

Documents new questions (#65504)

Denis Berezinef329bbe6a7d
diff --git a/e2e/support/cypress_sample_instance_data.js b/e2e/support/cypress_sample_instance_data.js
index 32fa1de461d..a5b6b187cba 100644
--- a/e2e/support/cypress_sample_instance_data.js
+++ b/e2e/support/cypress_sample_instance_data.js
@@ -73,6 +73,11 @@ export const NO_COLLECTION_PERSONAL_COLLECTION_ID = _.findWhere(
{ name: "No Collection Tableton's Personal Collection" },
).id;
+export const NO_SQL_PERSONAL_COLLECTION_ID = _.findWhere(
+ SAMPLE_INSTANCE_DATA.collections,
+ { name: "No SQL Tableton's Personal Collection" },
+).id;
+
/**
* @type number
*/
diff --git a/e2e/test/scenarios/documents/card-embed-node.cy.spec.ts b/e2e/test/scenarios/documents/card-embed-node.cy.spec.ts
index 08f112e09b8..b5250e463ae 100644
--- a/e2e/test/scenarios/documents/card-embed-node.cy.spec.ts
+++ b/e2e/test/scenarios/documents/card-embed-node.cy.spec.ts
@@ -583,6 +583,7 @@ function addNewStandaloneCard(
cy.get(".node-paragraph.is-empty").click();
H.addToDocument("/", false);
H.commandSuggestionItem("Chart").click();
+ H.commandSuggestionItem(/Browse all/).click();
H.entityPickerModalTab(
cardType === "question" ? "Questions" : "Models",
).click();
diff --git a/e2e/test/scenarios/documents/documents.cy.spec.ts b/e2e/test/scenarios/documents/documents.cy.spec.ts
index 14db7def573..eb7bf34d113 100644
--- a/e2e/test/scenarios/documents/documents.cy.spec.ts
+++ b/e2e/test/scenarios/documents/documents.cy.spec.ts
@@ -1,6 +1,8 @@
import {
+ NO_SQL_PERSONAL_COLLECTION_ID,
ORDERS_BY_YEAR_QUESTION_ID,
ORDERS_QUESTION_ID,
+ READ_ONLY_PERSONAL_COLLECTION_ID,
} from "e2e/support/cypress_sample_instance_data";
import {
ACCOUNTS_COUNT_BY_CREATED_AT,
@@ -898,6 +900,329 @@ H.describeWithSnowplowEE("documents", () => {
});
});
+ describe("creating new questions", () => {
+ beforeEach(() => {
+ H.createDocument({
+ name: "New Question Test Document",
+ document: {
+ content: [],
+ type: "doc",
+ },
+ collection_id: null,
+ alias: "document",
+ idAlias: "documentId",
+ });
+
+ cy.intercept("POST", "/api/dataset").as("dataset");
+ });
+
+ it("should allow creating a new notebook question and embedding it in the document", () => {
+ H.visitDocument("@documentId");
+ H.documentContent().click();
+
+ cy.log("Trigger command menu and select Chart");
+ H.addToDocument("/", false);
+ H.commandSuggestionItem("Chart").click();
+ H.commandSuggestionItem(/New chart/).click();
+ H.commandSuggestionItem(/New Question/).click();
+
+ cy.log("Create a simple query in the notebook editor");
+ cy.findByTestId("entity-picker-modal").within(() => {
+ H.entityPickerModalTab("Tables").click();
+ H.entityPickerModalItem(2, "Orders").click();
+ });
+
+ cy.log("Save and use the new question");
+ cy.findByRole("dialog", { name: "Create new question" }).within(() => {
+ cy.findByText("Orders").should("exist");
+ cy.findByRole("button", { name: "Save and use" }).click();
+ });
+
+ cy.wait("@dataset");
+
+ cy.log("Verify the question is embedded in the document");
+ H.getDocumentCard("Orders").should("exist");
+
+ cy.get("@documentId").then((id) => {
+ H.expectUnstructuredSnowplowEvent({
+ event: "document_add_card",
+ target_id: id,
+ });
+ });
+
+ cy.log("Verify document can be saved with a new question");
+ cy.findByRole("button", { name: "Save" }).should("be.visible").click();
+ cy.findByRole("button", { name: "Save" }).should("not.exist");
+
+ H.undoToast().findByText("Document saved").should("exist");
+ });
+
+ it("should allow creating a new native SQL question and embedding it in the document", () => {
+ cy.intercept("GET", "/api/database").as("database");
+ H.visitDocument("@documentId");
+ H.documentContent().click();
+
+ cy.log("Trigger command menu and select Chart");
+ H.addToDocument("/", false);
+ H.commandSuggestionItem("Chart").click();
+ H.commandSuggestionItem(/New chart/).click();
+ H.commandSuggestionItem(/New SQL query/).click();
+
+ cy.log("Save and use the new SQL query");
+
+ cy.wait("@database");
+ cy.wait(200); // wait for db selector to load
+
+ cy.findByTestId("selected-database").should("exist");
+
+ H.NativeEditor.focus();
+ H.NativeEditor.type("SELECT * FROM ORDERS LIMIT 10");
+
+ cy.findByRole("dialog", { name: "Edit SQL Query" })
+ .findByRole("button", { name: "Save and use" })
+ .click();
+
+ cy.wait("@dataset");
+
+ cy.log("Verify the SQL query is embedded in the document");
+ H.getDocumentCard("New question").should("exist");
+ cy.findByRole("button", { name: "Save" }).should("be.visible").click();
+
+ cy.get("@documentId").then((id) => {
+ H.expectUnstructuredSnowplowEvent({
+ event: "document_add_card",
+ target_id: id,
+ });
+ });
+
+ cy.log("Change native question title");
+ H.documentContent().within(() => {
+ cy.findByText("New question").realHover();
+ cy.icon("pencil").click();
+
+ cy.realType("New native question");
+ });
+ cy.get(".node-paragraph").first().click(); // unfocus cardEmbed
+
+ H.getDocumentCard("New native question").should("be.visible");
+
+ cy.log("Verify document can be saved with a new question");
+ cy.findByRole("button", { name: "Save" }).should("be.visible").click();
+ cy.findByRole("button", { name: "Save" }).should("not.exist");
+
+ H.undoToast().findByText("Document saved").should("exist");
+ });
+
+ it("should support keyboard navigation when creating a new question", () => {
+ H.visitDocument("@documentId");
+ H.documentContent().click();
+
+ cy.log("Trigger command menu and navigate to 'Chart' item");
+ H.addToDocument("/", false);
+ cy.realPress("{downarrow}");
+ H.commandSuggestionItem("Chart").should(
+ "have.attr",
+ "aria-selected",
+ "true",
+ );
+ cy.realPress("{enter}");
+
+ cy.log("Click 'New chart' to open question type menu");
+ H.commandSuggestionItem(/New chart/)
+ .should("exist")
+ .should("have.attr", "aria-selected", "true");
+ H.commandSuggestionItem(/Browse all/).should("exist");
+ cy.realPress("{enter}");
+
+ cy.log("Verify notebook option is selected by default");
+ H.commandSuggestionItem(/New Question/).should(
+ "have.attr",
+ "aria-selected",
+ "true",
+ );
+
+ cy.log("Navigate to SQL option");
+ cy.realPress("{downarrow}");
+
+ H.commandSuggestionItem(/New SQL query/).should(
+ "have.attr",
+ "aria-selected",
+ "true",
+ );
+
+ cy.log("Select SQL option with Enter");
+ cy.realPress("{enter}");
+
+ cy.log("Verify native query modal opens");
+ cy.findByRole("dialog", { name: "Edit SQL Query" }).should("be.visible");
+
+ cy.log("Cancel the modal");
+ cy.findByRole("dialog", { name: "Edit SQL Query" })
+ .findByRole("button", { name: "Cancel" })
+ .click();
+
+ cy.log("Verify modal is closed");
+ cy.findByRole("dialog", { name: "Edit SQL Query" }).should("not.exist");
+ });
+
+ it("should show 'Create new question' footer when no search results are found", () => {
+ H.visitDocument("@documentId");
+ H.documentContent().click();
+
+ cy.log("Trigger command menu and select Chart");
+ H.addToDocument("/", false);
+ H.commandSuggestionItem("Chart").click();
+
+ cy.log("Search for something that doesn't exist");
+ H.addToDocument("xyznonexistentquery", false);
+
+ cy.log("Verify 'No results found' message appears");
+ H.commandSuggestionDialog().should("contain.text", "No results found");
+
+ H.commandSuggestionDialog().findByRole("separator").should("exist");
+
+ cy.log("Verify 'Create new question' footer is visible");
+ H.commandSuggestionItem(/New chart/).should("be.visible");
+
+ cy.log("Verify 'Browse all' footer is also visible");
+ H.commandSuggestionItem(/Browse all/).should("be.visible");
+ });
+
+ it("should automatically assign appropriate visualization type for time series aggregation", () => {
+ H.visitDocument("@documentId");
+ H.documentContent().click();
+
+ cy.log("Trigger command menu and create a new question");
+ H.addToDocument("/", false);
+ H.commandSuggestionItem("Chart").click();
+ H.commandSuggestionItem(/New chart/).click();
+ H.commandSuggestionItem(/New Question/).click();
+
+ cy.log("Create a time series query with Orders table");
+ cy.findByRole("dialog", { name: "Pick your starting data" }).should(
+ "be.visible",
+ );
+ H.entityPickerModalItem(2, "Orders").click();
+
+ H.addSummaryField({ metric: "Sum of ...", field: "Total" });
+ H.addSummaryGroupingField({ field: "Created At" });
+
+ cy.findByRole("dialog", { name: "Create new question" })
+ .findByRole("button", { name: "Save and use" })
+ .click();
+
+ cy.log("Verify the question is embedded with a line chart visualization");
+ H.getDocumentCard("Orders, Sum of Total, Grouped by Created At: Month")
+ .should("exist")
+ .within(() => {
+ cy.log("Verify it has a line chart visualization (not a table)");
+ cy.findByTestId("chart-container").should("exist");
+ cy.get("svg").should("exist");
+ H.cartesianChartCircle().should("have.length.at.least", 1);
+ });
+ });
+
+ it("should trigger new question type suggestion menu when typing non-matching search and hitting Enter", () => {
+ H.visitDocument("@documentId");
+ H.documentContent().click();
+
+ cy.log("Type a non-matching search term");
+ H.addToDocument("/asdfsdaf", false);
+
+ H.commandSuggestionDialog().should("be.visible");
+ H.commandSuggestionDialog().should("contain.text", "No results found");
+ H.commandSuggestionItem(/New chart/)
+ .should("exist")
+ .should("have.attr", "aria-selected", "true");
+ cy.realPress("Enter");
+
+ cy.log("Verify that the new question type suggestion menu appears");
+ H.commandSuggestionDialog().should("be.visible");
+ H.commandSuggestionItem(/New Question/).should("be.visible");
+ H.commandSuggestionDialog()
+ .findByText(/Browse all/)
+ .should("not.exist");
+ });
+ });
+
+ describe("creating new questions - limited permissions", () => {
+ it("should not show 'Create new question' option for users without database permissions", () => {
+ cy.signIn("readonly");
+
+ H.createDocument({
+ name: "Test Document",
+ document: {
+ content: [],
+ type: "doc",
+ },
+ collection_id: READ_ONLY_PERSONAL_COLLECTION_ID,
+ alias: "document",
+ idAlias: "documentId",
+ });
+
+ H.visitDocument("@documentId");
+ H.documentContent().click();
+
+ cy.log("Trigger command menu and select Chart");
+ H.addToDocument("/", false);
+ H.commandSuggestionItem("Chart").click();
+
+ cy.log("Verify 'Create new question' footer is not visible");
+ H.commandSuggestionDialog()
+ .findByRole("button", { name: /New chart/ })
+ .should("not.exist");
+
+ cy.log("Search for something to verify footer doesn't appear");
+ H.addToDocument("xyznonexistent", false);
+
+ cy.log("Verify 'No results found' message appears");
+ H.commandSuggestionDialog().should("contain.text", "No results found");
+
+ cy.log(
+ "Verify 'Create new question' footer is still not visible for no-permission user",
+ );
+ H.commandSuggestionDialog()
+ .findByRole("button", { name: /New chart/ })
+ .should("not.exist");
+
+ cy.log("Verify 'Browse all' footer is still available");
+ H.commandSuggestionItem(/Browse all/).should("be.visible");
+ });
+
+ it("should not show native SQL question option for users without native query editing permissions", () => {
+ cy.signIn("nosql");
+
+ H.createDocument({
+ name: "Test Document",
+ document: {
+ content: [],
+ type: "doc",
+ },
+ collection_id: NO_SQL_PERSONAL_COLLECTION_ID,
+ alias: "document",
+ idAlias: "documentId",
+ });
+
+ H.visitDocument("@documentId");
+ H.documentContent().click();
+
+ cy.log("Trigger command menu and select Chart");
+ H.addToDocument("/", false);
+ H.commandSuggestionItem("Chart").click();
+
+ cy.log("Click 'New chart' to open question type menu");
+ H.commandSuggestionItem(/New chart/).click();
+
+ cy.log("Verify only notebook option is available, not SQL");
+ H.commandSuggestionItem(/New SQL query/).should("not.exist");
+
+ cy.log("Verify notebook modal opens automatically");
+ cy.findByRole("dialog", { name: "Pick your starting data" }).should(
+ "be.visible",
+ );
+ });
+ });
+
describe("error handling", () => {
it("should display an error toast when creating a new document fails", () => {
// setup
diff --git a/enterprise/frontend/src/metabase-enterprise/documents/components/Editor/shared/MenuComponents.tsx b/enterprise/frontend/src/metabase-enterprise/documents/components/Editor/shared/MenuComponents.tsx
index 31e4f10dacf..5b4ac55e371 100644
--- a/enterprise/frontend/src/metabase-enterprise/documents/components/Editor/shared/MenuComponents.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/documents/components/Editor/shared/MenuComponents.tsx
@@ -92,6 +92,25 @@ export const SearchResultsFooter = ({
</UnstyledButton>
);
+export const CreateNewQuestionFooter = ({
+ isSelected,
+ onClick,
+ ...rest
+}: ExtraItemProps) => (
+ <UnstyledButton
+ className={S.menuItem}
+ onClick={onClick}
+ role="option"
+ aria-selected={isSelected}
+ {...rest}
+ >
+ <Group gap="sm" wrap="nowrap" align="center">
+ <Icon name="add" size={16} color="inherit" />
+ <Text size="md" lh="lg" c="inherit">{t`New chart`}</Text>
+ </Group>
+ </UnstyledButton>
+);
+
export const MetabotFooter = ({ isSelected, onClick }: ExtraItemProps) => (
<UnstyledButton
className={S.menuItemWithBorder}
diff --git a/enterprise/frontend/src/metabase-enterprise/documents/documents.slice.ts b/enterprise/frontend/src/metabase-enterprise/documents/documents.slice.ts
index 95377b87eef..8435b87ddd5 100644
--- a/enterprise/frontend/src/metabase-enterprise/documents/documents.slice.ts
+++ b/enterprise/frontend/src/metabase-enterprise/documents/documents.slice.ts
@@ -105,7 +105,7 @@ const documentsSlice = createSlice({
createDraftCard: (
state,
action: PayloadAction<{
- originalCard: Card;
+ originalCard: Card | undefined;
modifiedData: Partial<Card>;
draftId: number;
}>,
@@ -115,7 +115,7 @@ const documentsSlice = createSlice({
...originalCard,
...modifiedData,
id: draftId,
- };
+ } as Card;
},
clearDraftCards: (state) => {
state.draftCards = {};
diff --git a/enterprise/frontend/src/metabase-enterprise/documents/hooks/use-draft-card-operations.ts b/enterprise/frontend/src/metabase-enterprise/documents/hooks/use-draft-card-operations.ts
index 51b5bd541b3..bf3ee3ceba1 100644
--- a/enterprise/frontend/src/metabase-enterprise/documents/hooks/use-draft-card-operations.ts
+++ b/enterprise/frontend/src/metabase-enterprise/documents/hooks/use-draft-card-operations.ts
@@ -19,7 +19,7 @@ export function useDraftCardOperations(
const dispatch = useDispatch();
const ensureDraftCard = useCallback(
- (initialModifications = {}, isVizSettingsOnly = false) => {
+ (initialModifications: Partial<Card> = {}, isVizSettingsOnly = false) => {
const baseCard = draftCard || card;
if (!baseCard) {
return cardId;
diff --git a/enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/CardEmbed/CardEmbedNode.module.css b/enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/CardEmbed/CardEmbedNode.module.css
index deaa76fd9cc..dc630ac0f3e 100644
--- a/enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/CardEmbed/CardEmbedNode.module.css
+++ b/enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/CardEmbed/CardEmbedNode.module.css
@@ -18,6 +18,7 @@
flex-direction: column;
height: 100%;
background: var(--mb-color-background);
+ overflow: hidden;
}
.cardEmbed.selected {
diff --git a/enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/CardEmbed/CardEmbedNode.tsx b/enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/CardEmbed/CardEmbedNode.tsx
index a1786730d66..0e31330748f 100644
--- a/enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/CardEmbed/CardEmbedNode.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/CardEmbed/CardEmbedNode.tsx
@@ -56,11 +56,11 @@ import {
} from "../HandleEditorDrop/utils";
import { createIdAttribute, createProseMirrorPlugin } from "../NodeIds";
import CS from "../extensions.module.css";
+import { NativeQueryModal } from "../shared/NativeQueryModal";
import styles from "./CardEmbedNode.module.css";
-import { ModifyQuestionModal } from "./ModifyQuestionModal";
-import { NativeQueryModal } from "./NativeQueryModal";
import { PublicDocumentCardMenu } from "./PublicDocumentCardMenu";
+import { ModifyQuestionModal } from "./modals/ModifyQuestionModal";
import { useDndHelpers } from "./use-dnd-helpers";
import { useUpdateCardOperations } from "./use-update-card-operations";
import { getEmbedIndex } from "./utils";
diff --git a/enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/CardEmbed/ModifyQuestionModal.module.css b/enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/CardEmbed/modals/ModifyQuestionModal.module.css
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/CardEmbed/ModifyQuestionModal.module.css
rename to enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/CardEmbed/modals/ModifyQuestionModal.module.css
diff --git a/enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/CardEmbed/ModifyQuestionModal.tsx b/enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/CardEmbed/modals/ModifyQuestionModal.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/CardEmbed/ModifyQuestionModal.tsx
rename to enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/CardEmbed/modals/ModifyQuestionModal.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/Command/CommandSuggestion.tsx b/enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/Command/CommandSuggestion.tsx
index abbaed80bd0..4248aa7c144 100644
--- a/enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/Command/CommandSuggestion.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/Command/CommandSuggestion.tsx
@@ -12,18 +12,17 @@ import {
import { t } from "ttag";
import { useSelector } from "metabase/lib/redux";
-import { PLUGIN_METABOT } from "metabase/plugins";
import {
Box,
Divider,
Group,
Icon,
- type IconName,
Stack,
Text,
UnstyledButton,
} from "metabase/ui";
import {
+ CreateNewQuestionFooter,
MenuItemComponent,
SearchResultsFooter,
} from "metabase-enterprise/documents/components/Editor/shared/MenuComponents";
@@ -32,6 +31,7 @@ import {
SuggestionPaper,
} from "metabase-enterprise/documents/components/Editor/shared/SuggestionPaper";
import { getCurrentDocument } from "metabase-enterprise/documents/selectors";
+import { getBrowseAllItemIndex } from "metabase-enterprise/rich_text_editing/tiptap/extensions/shared/suggestionUtils";
import type { SearchResult } from "metabase-types/api";
import { EntitySearchSection } from "../shared/EntitySearchSection";
@@ -40,6 +40,10 @@ import { useEntitySuggestions } from "../shared/useEntitySuggestions";
import type { CommandProps } from "./CommandExtension";
import CommandS from "./CommandSuggestion.module.css";
+import { NewQuestionTypeMenuView } from "./NewQuestionTypeMenuView";
+import type { CommandOption, CommandSection } from "./types";
+import { useCreateQuestionsMenuItems } from "./use-create-questions-menu-items";
+import { getAllCommandSections } from "./utils";
export interface CommandSuggestionProps {
items: SearchResult[];
@@ -53,18 +57,6 @@ interface SuggestionRef {
onKeyDown: (props: { event: KeyboardEvent }) => boolean;
}
-interface CommandOption {
- icon?: IconName;
- text?: string;
- label: string;
- command: string;
-}
-
-interface CommandSection {
- title?: string;
- items: CommandOption[];
-}
-
const CommandMenuItem = forwardRef<
HTMLButtonElement,
{
@@ -109,76 +101,18 @@ export const CommandSuggestion = forwardRef<
>(function CommandSuggestionComponent({ command, editor, query }, ref) {
const document = useSelector(getCurrentDocument);
const [selectedIndex, setSelectedIndex] = useState(0);
- const [showLinkSearch, setShowLinkSearch] = useState(false);
- const [showEmbedSearch, setShowEmbedSearch] = useState(false);
+
+ const [viewMode, setViewMode] = useState<
+ "linkTo" | "embedQuestion" | "newQuestionType" | null
+ >(null);
+ const [newQuestionType, setNewQuestionType] = useState<
+ "notebook" | "native" | null
+ >(null);
+
const itemRefs = useRef<(HTMLButtonElement | null)[]>([]);
const allCommandSections: CommandSection[] = useMemo(
- () => [
- {
- items: [
- ...(PLUGIN_METABOT.isEnabled()
- ? ([
- {
- icon: "metabot",
- label: t`Ask Metabot`,
- command: "metabot",
- },
- ] as const)
- : []),
- {
- icon: "lineandbar",
- label: t`Chart`,
- command: "embedQuestion",
- },
- {
- icon: "link",
- label: t`Link`,
- command: "linkTo",
- },
- ],
- },
- {
- title: t`Formatting`,
- items: [
- {
- text: "H1",
- label: t`Heading 1`,
- command: "heading1",
- },
- {
- text: "H2",
- label: t`Heading 2`,
- command: "heading2",
- },
- {
- text: "H3",
- label: t`Heading 3`,
- command: "heading3",
- },
- {
- icon: "list",
- label: t`Bullet list`,
- command: "bulletList",
- },
- {
- icon: "ordered_list",
- label: t`Numbered list`,
- command: "orderedList",
- },
- {
- icon: "quote",
- label: t`Quote`,
- command: "blockquote",
- },
- {
- icon: "code_block",
- label: t`Code block`,
- command: "codeBlock",
- },
- ],
- },
- ],
+ getAllCommandSections,
[],
);
@@ -189,7 +123,7 @@ export const CommandSuggestion = forwardRef<
// Filter command options based on query when not in link search mode
const commandOptions = useMemo(() => {
- if (showLinkSearch || showEmbedSearch) {
+ if (viewMode === "linkTo" || viewMode === "embedQuestion") {
return allCommandOptions;
}
@@ -201,11 +135,18 @@ export const CommandSuggestion = forwardRef<
return allCommandOptions.filter((option) =>
option.label.toLowerCase().includes(lowerQuery),
);
- }, [allCommandOptions, query, showLinkSearch, showEmbedSearch]);
+ }, [viewMode, query, allCommandOptions]);
+
+ const createQuestionsMenuItems = useCreateQuestionsMenuItems({
+ onSelectItem: setNewQuestionType,
+ });
+
+ const canCreateNewQuestion =
+ createQuestionsMenuItems.length > 0 && viewMode !== "linkTo";
const onSelectLinkEntity = useCallback(
(item: { id: number | string; model: string }) => {
- if (showLinkSearch) {
+ if (viewMode === "linkTo") {
command({
selectItem: true,
entityId: item.id,
@@ -221,18 +162,25 @@ export const CommandSuggestion = forwardRef<
});
}
},
- [command, showLinkSearch, document],
+ [viewMode, command, document],
);
+ const onTriggerCreateNewQuestion = useCallback(() => {
+ setViewMode("newQuestionType");
+ }, []);
+
// Use shared entity suggestions for link/embed mode and browse all functionality
const entitySuggestions = useEntitySuggestions({
query,
editor,
onSelectEntity: onSelectLinkEntity,
enabled: true,
- searchModels: showLinkSearch ? LINK_SEARCH_MODELS : EMBED_SEARCH_MODELS,
+ searchModels:
+ viewMode === "linkTo" ? LINK_SEARCH_MODELS : EMBED_SEARCH_MODELS,
canFilterSearchModels: false,
canBrowseAll: true,
+ canCreateNewQuestion,
+ onTriggerCreateNewQuestion,
});
const {
@@ -250,7 +198,7 @@ export const CommandSuggestion = forwardRef<
clearQuery: true,
switchToLinkMode: true,
});
- setShowLinkSearch(true);
+ setViewMode("linkTo");
return;
}
@@ -260,10 +208,7 @@ export const CommandSuggestion = forwardRef<
switchToEmbedMode: true,
});
- if (searchMenuItems.length === 0) {
- entityHandlers.openModal();
- }
- setShowEmbedSearch(true);
+ setViewMode("embedQuestion");
return;
}
@@ -281,10 +226,14 @@ export const CommandSuggestion = forwardRef<
};
const currentItems = useMemo(() => {
- if (showLinkSearch || showEmbedSearch) {
+ if (viewMode === "linkTo" || viewMode === "embedQuestion") {
return searchMenuItems;
}
+ if (viewMode === "newQuestionType") {
+ return createQuestionsMenuItems;
+ }
+
// When searching in command mode, combine search results with matching commands
if (query && searchMenuItems.length > 0) {
// Show search results (questions) followed by matching commands
@@ -292,17 +241,24 @@ export const CommandSuggestion = forwardRef<
}
return commandOptions;
- }, [showLinkSearch, showEmbedSearch, query, searchMenuItems, commandOptions]);
+ }, [
+ viewMode,
+ query,
+ searchMenuItems,
+ commandOptions,
+ createQuestionsMenuItems,
+ ]);
+
let totalItems = currentItems.length;
- if (showLinkSearch || showEmbedSearch) {
- totalItems = searchMenuItems.length + 1;
+ if (viewMode === "linkTo" || viewMode === "embedQuestion") {
+ totalItems = searchMenuItems.length + 1 + Number(canCreateNewQuestion); // "Browse all" footer and "New chart"
} else if (currentItems.length === 0 && query) {
- totalItems = 1; // Just the browse all footer
+ totalItems = 1 + Number(canCreateNewQuestion); // "Browse all" footer and "New chart"
}
const selectItem = (index: number) => {
- if (showLinkSearch || showEmbedSearch) {
+ if (viewMode) {
entityHandlers.selectItem(index);
} else {
// When searching in command mode, handle both entity results and commands
@@ -315,11 +271,23 @@ export const CommandSuggestion = forwardRef<
executeCommand(commandOptions[commandIndex].command);
}
}
- } else if (currentItems.length === 0 && query && index === 0) {
+ } else if (
+ currentItems.length === 0 &&
+ query &&
+ index ===
+ getBrowseAllItemIndex(currentItems.length, canCreateNewQuestion)
+ ) {
// Handle browse all when no results
// Switch to embed mode so selected questions get embedded
- setShowEmbedSearch(true);
+ setViewMode("embedQuestion");
entityHandlers.openModal();
+ } else if (
+ currentItems.length === 0 &&
+ query &&
+ index === 0 &&
+ canCreateNewQuestion
+ ) {
+ onTriggerCreateNewQuestion();
} else {
if (index < commandOptions.length) {
executeCommand(commandOptions[index].command);
@@ -342,12 +310,7 @@ export const CommandSuggestion = forwardRef<
useEffect(() => {
setSelectedIndex(0);
- }, [
- currentItems.length,
- showLinkSearch,
- showEmbedSearch,
- searchMenuItems.length,
- ]);
+ }, [currentItems.length, viewMode, searchMenuItems.length]);
useEffect(() => {
const selectedItem = itemRefs.current[selectedIndex];
@@ -358,10 +321,15 @@ export const CommandSuggestion = forwardRef<
useImperativeHandle(ref, () => ({
onKeyDown: ({ event }: { event: KeyboardEvent }) => {
- if (showLinkSearch || showEmbedSearch) {
+ if (viewMode === "linkTo" || viewMode === "embedQuestion") {
return entityHandlers.onKeyDown({ event });
}
+ if (viewMode === "newQuestionType" && event.key === "Enter") {
+ createQuestionsMenuItems[selectedIndex]?.action();
+ return true;
+ }
+
if (event.key === "ArrowUp") {
upHandler();
return true;
@@ -381,13 +349,16 @@ export const CommandSuggestion = forwardRef<
},
}));
- if ((showLinkSearch || showEmbedSearch) && isSearchLoading) {
+ if (
+ (viewMode === "linkTo" || viewMode === "embedQuestion") &&
+ isSearchLoading
+ ) {
return <LoadingSuggestionPaper aria-label={t`Command Dialog`} />;
}
return (
<SuggestionPaper aria-label={t`Command Dialog`}>
- {showLinkSearch || showEmbedSearch ? (
+ {(viewMode === "linkTo" || viewMode === "embedQuestion") && (
<EntitySearchSection
menuItems={searchMenuItems}
selectedIndex={entitySelectedIndex}
@@ -400,8 +371,27 @@ export const CommandSuggestion = forwardRef<
onModalSelect={entityHandlers.handleModalSelect}
onModalClose={entityHandlers.handleModalClose}
canBrowseAll
+ canCreateNewQuestion={canCreateNewQuestion}
+ onTriggerCreateNew={onTriggerCreateNewQuestion}
/>
- ) : (
+ )}
+
+ {viewMode === "newQuestionType" && (
+ <NewQuestionTypeMenuView
+ menuItems={createQuestionsMenuItems}
+ selectedIndex={selectedIndex}
+ setSelectedIndex={setSelectedIndex}
+ newQuestionType={newQuestionType}
+ setNewQuestionType={setNewQuestionType}
+ onSave={entityHandlers.onSaveNewQuestion}
+ onClose={() => {
+ setNewQuestionType(null);
+ setViewMode(null);
+ }}
+ />
+ )}
+
+ {!viewMode && (
<>
{commandOptions.length > 0 ||
(query && searchMenuItems.length > 0) ? (
@@ -487,11 +477,33 @@ export const CommandSuggestion = forwardRef<
{query && (
<>
<Divider my="sm" mx="sm" />
+ {canCreateNewQuestion && (
+ <CreateNewQuestionFooter
+ isSelected={selectedIndex === 0}
+ onMouseEnter={() => setSelectedIndex(0)}
+ onClick={onTriggerCreateNewQuestion}
+ />
+ )}
+
<SearchResultsFooter
- isSelected={selectedIndex === currentItems.length}
+ isSelected={
+ selectedIndex ===
+ getBrowseAllItemIndex(
+ searchMenuItems.length,
+ canCreateNewQuestion,
+ )
+ }
+ onMouseEnter={() =>
+ setSelectedIndex(
+ getBrowseAllItemIndex(
+ searchMenuItems.length,
+ canCreateNewQuestion,
+ ),
+ )
+ }
onClick={() => {
// Switch to embed mode so selected questions get embedded
- setShowEmbedSearch(true);
+ setViewMode("embedQuestion");
entityHandlers.openModal();
}}
/>
diff --git a/enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/Command/CommandSuggestion.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/Command/CommandSuggestion.unit.spec.tsx
index 238217e78df..d5c4bd15d61 100644
--- a/enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/Command/CommandSuggestion.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/Command/CommandSuggestion.unit.spec.tsx
@@ -5,6 +5,7 @@ import { useState } from "react";
import {
setupCollectionByIdEndpoint,
setupCollectionItemsEndpoint,
+ setupDatabasesEndpoints,
setupRecentViewsEndpoints,
setupSearchEndpoints,
} from "__support__/server-mocks";
@@ -15,6 +16,7 @@ import { Input } from "metabase/ui";
import registerVisualizations from "metabase/visualizations/register";
import { type RecentItem, isRecentTableItem } from "metabase-types/api";
import {
+ createMockDatabase,
createMockRecentCollectionItem,
createMockRecentTableItem,
createMockSearchResult,
@@ -84,6 +86,11 @@ const RECENT_ITEMS = [
const getRecentItemName = (item: RecentItem) =>
isRecentTableItem(item) ? (item.display_name ?? item.name) : item.name;
+const MOCK_DATABASE = createMockDatabase({
+ is_saved_questions: true,
+ native_permissions: "write",
+});
+
const TestWrapper = (props: CommandSuggestionProps) => {
const [query, setQuery] = useState(props.query);
@@ -118,6 +125,7 @@ const setup = ({
setupSearchEndpoints(SEARCH_ITEMS);
setupRecentViewsEndpoints(RECENT_ITEMS);
+ setupDatabasesEndpoints([MOCK_DATABASE]);
renderWithProviders(
<TestWrapper
@@ -318,7 +326,7 @@ describe("CommandSuggestion", () => {
});
});
- it("should auto-open the Browse all modal when clicking Chart with no recent items", async () => {
+ it("should auto-open the Browse all modal when clicking Chart with no recent items and no New Question", async () => {
// Setup with empty recent items to reproduce the bug
setupSearchEndpoints(SEARCH_ITEMS);
setupRecentViewsEndpoints([]);
@@ -332,6 +340,13 @@ describe("CommandSuggestion", () => {
collectionItems: [],
});
+ setupDatabasesEndpoints([
+ createMockDatabase({
+ is_saved_questions: false,
+ native_permissions: "none",
+ }),
+ ]);
+
const command = jest.fn();
const editor = {
commands: {
@@ -369,6 +384,7 @@ describe("CommandSuggestion", () => {
collection: { id: 1 },
collectionItems: [],
});
+ setupDatabasesEndpoints([MOCK_DATABASE]);
const command = jest.fn();
const editor = {
@@ -390,16 +406,9 @@ describe("CommandSuggestion", () => {
await userEvent.click(await screen.findByRole("option", { name: "Chart" }));
- // Wait for the modal to auto-open
- const modal = await screen.findByLabelText("Choose a question or model");
- expect(modal).toBeInTheDocument();
-
- // Close the modal to test the menu state without auto-opening
- const closeButton = within(modal).getByRole("button", { name: /close/i });
- await userEvent.click(closeButton);
-
// Now the menu should show Browse all without a redundant divider
expect(await screen.findByText("Browse all")).toBeInTheDocument();
+ expect(await screen.findByText("New chart")).toBeInTheDocument();
// There should be no menu items above Browse all, so no divider should be present
const menuContainer = screen.getByLabelText("Command Dialog");
diff --git a/enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/Command/CreateNativeQuestionModal.tsx b/enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/Command/CreateNativeQuestionModal.tsx
new file mode 100644
index 00000000000..98466af9fea
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/Command/CreateNativeQuestionModal.tsx
@@ -0,0 +1,37 @@
+import { useMemo } from "react";
+
+import Question from "metabase-lib/v1/Question";
+
+import { NativeQueryModal } from "../shared/NativeQueryModal";
+
+interface CreateQuestionModalProps {
+ onSave: (id: number, name: string) => void;
+ onClose: () => void;
+}
+
+export const CreateNativeQuestionModal = ({
+ onSave,
+ onClose,
+}: CreateQuestionModalProps) => {
+ const question = useMemo(
+ () =>
+ Question.create({
+ DEPRECATED_RAW_MBQL_type: "native",
+ }),
+ [],
+ );
+
+ const handleSaveNativeQuestion = async ({ card_id }: { card_id: number }) => {
+ onSave(card_id, "New SQL query");
+ onClose();
+ };
+
+ return (
+ <NativeQueryModal
+ isOpen
+ card={question.card()}
+ onSave={handleSaveNativeQuestion}
+ onClose={onClose}
+ />
+ );
+};
diff --git a/enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/Command/CreateStructuredQuestionModal.module.css b/enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/Command/CreateStructuredQuestionModal.module.css
new file mode 100644
index 00000000000..1abd12bc835
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/Command/CreateStructuredQuestionModal.module.css
@@ -0,0 +1,3 @@
+.notebookContainer {
+ overflow: auto;
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/Command/CreateStructuredQuestionModal.tsx b/enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/Command/CreateStructuredQuestionModal.tsx
new file mode 100644
index 00000000000..a327ffb46d3
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/Command/CreateStructuredQuestionModal.tsx
@@ -0,0 +1,143 @@
+import { useMemo, useState } from "react";
+import { t } from "ttag";
+import _ from "underscore";
+
+import { useDispatch, useSelector, useStore } from "metabase/lib/redux";
+import { Notebook } from "metabase/querying/notebook/components/Notebook";
+import { getMetadata } from "metabase/selectors/metadata";
+import { getSetting } from "metabase/selectors/settings";
+import { Box, Button, Flex, Modal } from "metabase/ui";
+import {
+ createDraftCard,
+ generateDraftCardId,
+ loadMetadataForDocumentCard,
+} from "metabase-enterprise/documents/documents.slice";
+import * as Lib from "metabase-lib";
+import Question from "metabase-lib/v1/Question";
+
+import S from "./CreateStructuredQuestionModal.module.css";
+
+interface CreateQuestionModalProps {
+ onSave: (id: number, name: string) => void;
+ onClose: () => void;
+}
+
+export const CreateStructuredQuestionModal = ({
+ onSave,
+ onClose,
+}: CreateQuestionModalProps) => {
+ const store = useStore();
+ const dispatch = useDispatch();
+
+ const [modifiedQuestion, setModifiedQuestion] = useState<Question>(() =>
+ Question.create(),
+ );
+
+ const reportTimezone = useSelector((state) =>
+ getSetting(state, "report-timezone-long"),
+ );
+
+ const canSave = useMemo(
+ () => Lib.canSave(modifiedQuestion.query(), modifiedQuestion.type()),
+ [modifiedQuestion],
+ );
+
+ const handleUpdateQuestion = async (newQuestion: Question) => {
+ const currentDependencies = modifiedQuestion
+ ? Lib.dependentMetadata(
+ modifiedQuestion.query(),
+ modifiedQuestion.id(),
+ modifiedQuestion.type(),
+ )
+ : [];
+
+ const nextDependencies = Lib.dependentMetadata(
+ newQuestion.query(),
+ newQuestion.id(),
+ newQuestion.type(),
+ );
+
+ if (!_.isEqual(currentDependencies, nextDependencies)) {
+ await dispatch(loadMetadataForDocumentCard(newQuestion.card()));
+ const freshMetadata = getMetadata(store.getState());
+ const questionWithFreshMetadata = new Question(
+ newQuestion.card(),
+ freshMetadata,
+ );
+ setModifiedQuestion(questionWithFreshMetadata);
+ } else {
+ setModifiedQuestion(newQuestion);
+ }
+ };
+
+ const handleSaveStructuredQuestion = async () => {
+ try {
+ const name =
+ modifiedQuestion.displayName() ||
+ modifiedQuestion.generateQueryDescription() ||
+ "";
+
+ const dataset_query = modifiedQuestion.datasetQuery();
+
+ const questionWithDefaultDisplay = modifiedQuestion.setDefaultDisplay();
+
+ const modifiedData = {
+ name,
+ database_id: dataset_query.database || undefined,
+ dataset_query: dataset_query,
+ display: questionWithDefaultDisplay.display(),
+ settings: questionWithDefaultDisplay.settings(),
+ visualization_settings:
+ questionWithDefaultDisplay.card().visualization_settings ?? {},
+ };
+ const newCardId = generateDraftCardId();
+
+ dispatch(
+ createDraftCard({
+ originalCard: undefined,
+ modifiedData,
+ draftId: newCardId,
+ }),
+ );
+
+ onSave(newCardId, name);
+ onClose();
+ } catch (error) {
+ console.error("Failed to save modified question:", error);
+ }
+ };
+
+ return (
+ <Modal
+ opened
+ onClose={onClose}
+ size="80%"
+ title={t`Create new question`}
+ padding="lg"
+ >
+ <Box h="70vh" className={S.notebookContainer}>
+ <Notebook
+ question={modifiedQuestion}
+ isDirty={true}
+ isRunnable={true}
+ isResultDirty={true}
+ reportTimezone={reportTimezone}
+ hasVisualizeButton={false}
+ updateQuestion={handleUpdateQuestion}
+ />
+ </Box>
+ <Flex mt="lg" justify="flex-end" gap="0.5rem">
+ <Button variant="subtle" onClick={onClose}>
+ {t`Cancel`}
+ </Button>
+ <Button
+ variant="filled"
+ disabled={!canSave}
+ onClick={handleSaveStructuredQuestion}
+ >
+ {t`Save and use`}
+ </Button>
+ </Flex>
+ </Modal>
+ );
+};
diff --git a/enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/Command/NewQuestionTypeMenuView.tsx b/enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/Command/NewQuestionTypeMenuView.tsx
new file mode 100644
index 00000000000..f1f0d36995b
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/Command/NewQuestionTypeMenuView.tsx
@@ -0,0 +1,69 @@
+import { useCallback, useLayoutEffect } from "react";
+
+import { MenuItemComponent } from "metabase-enterprise/documents/components/Editor/shared/MenuComponents";
+
+import { CreateNativeQuestionModal } from "./CreateNativeQuestionModal";
+import { CreateStructuredQuestionModal } from "./CreateStructuredQuestionModal";
+import type { NewQuestionMenuItem } from "./types";
+
+interface Props {
+ menuItems: NewQuestionMenuItem[];
+ selectedIndex: number;
+ setSelectedIndex: (index: number) => void;
+ newQuestionType: "notebook" | "native" | null;
+ setNewQuestionType: (type: "notebook" | "native" | null) => void;
+ onSave: (id: number, name: string) => void;
+ onClose: () => void;
+}
+
+export const NewQuestionTypeMenuView = ({
+ menuItems,
+ selectedIndex,
+ setSelectedIndex,
+ newQuestionType,
+ setNewQuestionType,
+ onSave,
+ onClose,
+}: Props) => {
+ const handleSaveNewQuestion = useCallback(
+ (id: number, name: string) => {
+ setNewQuestionType(null);
+ onSave(id, name);
+ },
+ [onSave, setNewQuestionType],
+ );
+
+ useLayoutEffect(() => {
+ if (menuItems.length === 1) {
+ setNewQuestionType(menuItems[0].value);
+ }
+ }, [menuItems, setNewQuestionType]);
+
+ return (
+ <>
+ {menuItems.map((item, index) => (
+ <MenuItemComponent
+ key={item.value}
+ item={item}
+ isSelected={selectedIndex === index}
+ onClick={() => setNewQuestionType(item.value)}
+ onMouseEnter={() => setSelectedIndex(index)}
+ />
+ ))}
+
+ {newQuestionType === "notebook" && (
+ <CreateStructuredQuestionModal
+ onSave={handleSaveNewQuestion}
+ onClose={onClose}
+ />
+ )}
+
+ {newQuestionType === "native" && (
+ <CreateNativeQuestionModal
+ onSave={handleSaveNewQuestion}
+ onClose={onClose}
+ />
+ )}
+ </>
+ );
+};
diff --git a/enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/Command/types.ts b/enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/Command/types.ts
new file mode 100644
index 00000000000..961458f55b2
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/Command/types.ts
@@ -0,0 +1,18 @@
+import type { IconName } from "metabase/ui";
+import type { MenuItem } from "metabase-enterprise/documents/components/Editor/shared/MenuComponents";
+
+export interface CommandOption {
+ icon?: IconName;
+ text?: string;
+ label: string;
+ command: string;
+}
+
+export interface CommandSection {
+ title?: string;
+ items: CommandOption[];
+}
+
+export interface NewQuestionMenuItem extends MenuItem {
+ value: "native" | "notebook";
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/Command/use-create-questions-menu-items.ts b/enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/Command/use-create-questions-menu-items.ts
new file mode 100644
index 00000000000..7294d64d951
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/Command/use-create-questions-menu-items.ts
@@ -0,0 +1,55 @@
+import { useMemo } from "react";
+import { t } from "ttag";
+
+import { useListDatabasesQuery } from "metabase/api";
+import {
+ getHasDataAccess,
+ getHasDatabaseWithJsonEngine,
+ getHasNativeWrite,
+} from "metabase/selectors/data";
+
+import type { NewQuestionMenuItem } from "./types";
+
+export const useCreateQuestionsMenuItems = ({
+ onSelectItem,
+}: {
+ onSelectItem: (item: "notebook" | "native") => void;
+}) => {
+ const { data } = useListDatabasesQuery();
+ const databases = useMemo(() => data?.data ?? [], [data]);
+ const hasDataAccess = useMemo(() => getHasDataAccess(databases), [databases]);
+ const hasNativeWrite = useMemo(
+ () => getHasNativeWrite(databases),
+ [databases],
+ );
+
+ const hasDatabaseWithJsonEngine = getHasDatabaseWithJsonEngine(databases);
+
+ const items = useMemo(() => {
+ const result: NewQuestionMenuItem[] = [];
+
+ if (hasDataAccess) {
+ result.push({
+ label: t`New Question`,
+ icon: "insight",
+ value: "notebook" as const,
+ action: () => onSelectItem("notebook"),
+ });
+ }
+
+ if (hasNativeWrite) {
+ result.push({
+ label: hasDatabaseWithJsonEngine
+ ? t`New Native query`
+ : t`New SQL query`,
+ icon: "sql",
+ value: "native" as const,
+ action: () => onSelectItem("native"),
+ });
+ }
+
+ return result;
+ }, [hasDataAccess, hasDatabaseWithJsonEngine, hasNativeWrite, onSelectItem]);
+
+ return items;
+};
diff --git a/enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/Command/utils.ts b/enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/Command/utils.ts
new file mode 100644
index 00000000000..4f5e26802a0
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/Command/utils.ts
@@ -0,0 +1,73 @@
+import { t } from "ttag";
+
+import { PLUGIN_METABOT } from "metabase/plugins";
+
+import type { CommandSection } from "./types";
+
+export const getAllCommandSections = (): CommandSection[] => {
+ return [
+ {
+ items: [
+ ...(PLUGIN_METABOT.isEnabled()
+ ? ([
+ {
+ icon: "metabot",
+ label: t`Ask Metabot`,
+ command: "metabot",
+ },
+ ] as const)
+ : []),
+ {
+ icon: "lineandbar",
+ label: t`Chart`,
+ command: "embedQuestion",
+ },
+ {
+ icon: "link",
+ label: t`Link`,
+ command: "linkTo",
+ },
+ ],
+ },
+ {
+ title: t`Formatting`,
+ items: [
+ {
+ text: "H1",
+ label: t`Heading 1`,
+ command: "heading1",
+ },
+ {
+ text: "H2",
+ label: t`Heading 2`,
+ command: "heading2",
+ },
+ {
+ text: "H3",
+ label: t`Heading 3`,
+ command: "heading3",
+ },
+ {
+ icon: "list",
+ label: t`Bullet list`,
+ command: "bulletList",
+ },
+ {
+ icon: "ordered_list",
+ label: t`Numbered list`,
+ command: "orderedList",
+ },
+ {
+ icon: "quote",
+ label: t`Quote`,
+ command: "blockquote",
+ },
+ {
+ icon: "code_block",
+ label: t`Code block`,
+ command: "codeBlock",
+ },
+ ],
+ },
+ ];
+};
diff --git a/enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/shared/EntitySearchSection.tsx b/enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/shared/EntitySearchSection.tsx
index 0b3a56876e5..17653ff1688 100644
--- a/enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/shared/EntitySearchSection.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/shared/EntitySearchSection.tsx
@@ -5,11 +5,14 @@ import type { QuestionPickerValueItem } from "metabase/common/components/Pickers
import { Box, Divider, Text } from "metabase/ui";
import type { MenuItem } from "metabase-enterprise/documents/components/Editor/shared/MenuComponents";
import {
+ CreateNewQuestionFooter,
MenuItemComponent,
SearchResultsFooter,
} from "metabase-enterprise/documents/components/Editor/shared/MenuComponents";
import type { SearchResult } from "metabase-types/api";
+import { getBrowseAllItemIndex } from "./suggestionUtils";
+
interface EntitySearchSectionProps {
menuItems: MenuItem[];
selectedIndex: number;
@@ -22,7 +25,9 @@ interface EntitySearchSectionProps {
onModalClose: () => void;
onItemHover: (index: number) => void;
canBrowseAll?: boolean;
+ canCreateNewQuestion?: boolean;
selectedSearchModelName?: string;
+ onTriggerCreateNew?: () => void;
}
export function EntitySearchSection({
@@ -38,7 +43,17 @@ export function EntitySearchSection({
onItemHover,
selectedSearchModelName,
canBrowseAll,
+ canCreateNewQuestion,
+ onTriggerCreateNew,
}: EntitySearchSectionProps) {
+ const hasNoItems = menuItems.length === 0 && searchResults.length === 0;
+ const shouldShowNoResults = query.length > 0 && hasNoItems;
+
+ const browseAllItemIndex = getBrowseAllItemIndex(
+ menuItems.length,
+ canCreateNewQuestion,
+ );
+
return (
<>
{selectedSearchModelName && (
@@ -57,20 +72,30 @@ export function EntitySearchSection({
onMouseEnter={() => onItemHover(index)}
/>
))}
- {query.length > 0 &&
- menuItems.length === 0 &&
- searchResults.length === 0 ? (
+
+ {shouldShowNoResults ? (
<Box p="sm" ta="center">
<Text size="md" c="text-medium">{t`No results found`}</Text>
</Box>
) : null}
+
+ {(shouldShowNoResults || !hasNoItems) &&
+ (canCreateNewQuestion || canBrowseAll) && <Divider my="sm" mx="sm" />}
+
+ {canCreateNewQuestion && (
+ <CreateNewQuestionFooter
+ isSelected={selectedIndex === menuItems.length}
+ onClick={onTriggerCreateNew}
+ onMouseEnter={() => onItemHover(menuItems.length)}
+ />
+ )}
+
{canBrowseAll && (
<>
- {menuItems.length > 0 && <Divider my="sm" mx="sm" />}
<SearchResultsFooter
- isSelected={selectedIndex === menuItems.length}
+ isSelected={selectedIndex === browseAllItemIndex}
onClick={onFooterClick}
- onMouseEnter={() => onItemHover(menuItems.length)}
+ onMouseEnter={() => onItemHover(browseAllItemIndex)}
/>
{modal === "question-picker" && (
diff --git a/enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/CardEmbed/NativeQueryModal.module.css b/enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/shared/NativeQueryModal.module.css
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/CardEmbed/NativeQueryModal.module.css
rename to enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/shared/NativeQueryModal.module.css
diff --git a/enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/CardEmbed/NativeQueryModal.tsx b/enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/shared/NativeQueryModal.tsx
similarity index 91%
rename from enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/CardEmbed/NativeQueryModal.tsx
rename to enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/shared/NativeQueryModal.tsx
index 04a04cfcf35..390cfa074a5 100644
--- a/enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/CardEmbed/NativeQueryModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/shared/NativeQueryModal.tsx
@@ -18,6 +18,7 @@ import {
generateDraftCardId,
loadMetadataForDocumentCard,
} from "metabase-enterprise/documents/documents.slice";
+import * as Lib from "metabase-lib";
import Question from "metabase-lib/v1/Question";
import type NativeQuery from "metabase-lib/v1/queries/NativeQuery";
import type { Card, DatabaseId, Dataset, RawSeries } from "metabase-types/api";
@@ -145,6 +146,8 @@ export const NativeQueryModal = ({
queryResult || (!hasExecutedQuery ? initialDataset : null);
const failedDataset = isFailedDataset(datasetToUse) ? datasetToUse : null;
+ const isNewQuestion = !card?.id;
+
useEffect(() => {
if (isOpen && card) {
dispatch(loadMetadataForDocumentCard(card));
@@ -163,6 +166,10 @@ export const NativeQueryModal = ({
return baseQuestion;
}, [card, metadata, isOpen, modifiedQuestion]);
+ const canSave =
+ modifiedQuestion &&
+ Lib.canSave(modifiedQuestion.query(), modifiedQuestion.type());
+
useEffect(() => {
if (isOpen) {
setHasExecutedQuery(false);
@@ -214,26 +221,50 @@ export const NativeQueryModal = ({
return;
}
- const modifiedData = {
- dataset_query: modifiedQuestion.datasetQuery(),
- display: modifiedQuestion.display(),
- visualization_settings:
- modifiedQuestion.card().visualization_settings ?? {},
- };
-
const newCardId = generateDraftCardId();
-
- dispatch(
- createDraftCard({
- originalCard: card,
- modifiedData,
- draftId: newCardId,
- }),
- );
+ if (!isNewQuestion) {
+ const modifiedData = {
+ dataset_query: modifiedQuestion.datasetQuery(),
+ display: modifiedQuestion.display(),
+ visualization_settings:
+ modifiedQuestion.card().visualization_settings ?? {},
+ };
+
+ dispatch(
+ createDraftCard({
+ originalCard: card,
+ modifiedData,
+ draftId: newCardId,
+ }),
+ );
+ } else {
+ const dataset_query = modifiedQuestion.datasetQuery();
+ const name =
+ modifiedQuestion.displayName() ||
+ modifiedQuestion.generateQueryDescription() ||
+ t`New question`;
+
+ const modifiedData = {
+ name,
+ database_id: dataset_query.database || undefined,
+ dataset_query: dataset_query,
+ display: modifiedQuestion.display(),
+ visualization_settings:
+ modifiedQuestion.card().visualization_settings ?? {},
+ };
+
+ dispatch(
+ createDraftCard({
+ originalCard: undefined,
+ modifiedData,
+ draftId: newCardId,
+ }),
+ );
+ }
onSave({ card_id: newCardId });
onClose();
- }, [modifiedQuestion, card, dispatch, onSave, onClose]);
+ }, [modifiedQuestion, isNewQuestion, onSave, onClose, dispatch, card]);
const rawSeries = useMemo<RawSeries | null>(() => {
if (!modifiedQuestion || !datasetToUse || failedDataset) {
@@ -451,7 +482,7 @@ export const NativeQueryModal = ({
<Button
variant="filled"
onClick={handleSave}
- disabled={!modifiedQuestion}
+ disabled={!canSave || !modifiedQuestion}
>
{t`Save and use`}
</Button>
diff --git a/enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/shared/suggestionUtils.ts b/enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/shared/suggestionUtils.ts
index db89cf96496..7cfc4441561 100644
--- a/enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/shared/suggestionUtils.ts
+++ b/enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/shared/suggestionUtils.ts
@@ -147,3 +147,10 @@ export function mbProtocolModelToSuggestionModel(inputModel: string): string {
return model;
}
+
+export function getBrowseAllItemIndex(
+ menuItemsLength: number,
+ canCreateNewQuestion?: boolean,
+): number {
+ return canCreateNewQuestion ? menuItemsLength + 1 : menuItemsLength;
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/shared/useEntitySuggestions.ts b/enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/shared/useEntitySuggestions.ts
index a8b99a9cc17..667055d6211 100644
--- a/enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/shared/useEntitySuggestions.ts
+++ b/enterprise/frontend/src/metabase-enterprise/rich_text_editing/tiptap/extensions/shared/useEntitySuggestions.ts
@@ -13,6 +13,7 @@ import type {
import {
buildSearchModelMenuItems,
entityToUrlableModel,
+ getBrowseAllItemIndex,
} from "./suggestionUtils";
import type { SuggestionModel } from "./types";
import { useEntitySearch } from "./useEntitySearch";
@@ -31,6 +32,8 @@ interface UseEntitySuggestionsOptions {
searchModels?: SuggestionModel[];
canFilterSearchModels: boolean;
canBrowseAll: boolean;
+ canCreateNewQuestion?: boolean;
+ onTriggerCreateNewQuestion?: () => void;
}
interface UseEntitySuggestionsResult {
@@ -51,6 +54,7 @@ interface UseEntitySuggestionsResult {
handleModalClose: () => void;
openModal: () => void;
hoverHandler: (index: number) => void;
+ onSaveNewQuestion: (id: number, name: string) => void;
};
}
@@ -62,7 +66,9 @@ export function useEntitySuggestions({
enabled = true,
searchModels,
canFilterSearchModels,
- canBrowseAll,
+ canBrowseAll = false,
+ canCreateNewQuestion = false,
+ onTriggerCreateNewQuestion,
}: UseEntitySuggestionsOptions): UseEntitySuggestionsResult {
const [selectedIndex, setSelectedIndex] = useState(0);
const [modal, setModal] = useState<"question-picker" | null>(null);
@@ -181,17 +187,31 @@ export function useEntitySuggestions({
return entityMenuItems;
}, [isInModelSelectionMode, searchModelMenuItems, entityMenuItems]);
- const totalItems = menuItems.length + Number(canBrowseAll);
+ const totalItems =
+ menuItems.length + Number(canBrowseAll) + Number(canCreateNewQuestion);
const selectItem = useCallback(
(index: number) => {
if (index < menuItems.length) {
menuItems[index].action();
- } else {
+ return;
+ }
+
+ if (index === menuItems.length && canCreateNewQuestion) {
+ onTriggerCreateNewQuestion?.();
+ return;
+ }
+
+ const browseAllItemIndex = getBrowseAllItemIndex(
+ menuItems.length,
+ canCreateNewQuestion,
+ );
+
+ if (index === browseAllItemIndex) {
setModal("question-picker");
}
},
- [menuItems],
+ [canCreateNewQuestion, menuItems, onTriggerCreateNewQuestion],
);
const upHandler = useCallback(() => {
@@ -258,6 +278,15 @@ export function useEntitySuggestions({
setModal("question-picker");
}, []);
+ const onSaveNewQuestion = (id: number, name: string) => {
+ onSelectEntity({
+ id: id,
+ model: "card",
+ label: name,
+ href: modelToUrl(entityToUrlableModel({ id, name }, "card")),
+ });
+ };
+
useEffect(() => {
setSelectedIndex(0);
}, [menuItems.length]);
@@ -285,6 +314,7 @@ export function useEntitySuggestions({
handleModalClose,
openModal,
hoverHandler,
+ onSaveNewQuestion,
},
};
}