Skip to content

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

Move models to feature tier (#75212)

Fraser25a49059456b
diff --git a/frontend/lint/module-boundaries.mjs b/frontend/lint/module-boundaries.mjs
index cb006598445..203c8f0727f 100644
--- a/frontend/lint/module-boundaries.mjs
+++ b/frontend/lint/module-boundaries.mjs
@@ -96,7 +96,7 @@ const elements = [
createElement({ type: "shared", name: "metadata" }),
createElement({ type: "shared", name: "metrics" }),
createElement({ type: "shared", name: "metrics-viewer" }),
- createElement({ type: "shared", name: "models" }),
+ createElement({ type: "feature", name: "models" }),
createElement({ type: "shared", name: "new" }),
createElement({ type: "shared", name: "palette" }),
createElement({ type: "shared", name: "parameters" }),
diff --git a/frontend/src/metabase/actions/containers/ActionCreator/CreateActionForm/CreateActionForm.tsx b/frontend/src/metabase/actions/containers/ActionCreator/CreateActionForm/CreateActionForm.tsx
index 9df3f3c22cb..837abbf1667 100644
--- a/frontend/src/metabase/actions/containers/ActionCreator/CreateActionForm/CreateActionForm.tsx
+++ b/frontend/src/metabase/actions/containers/ActionCreator/CreateActionForm/CreateActionForm.tsx
@@ -2,6 +2,7 @@ import { useMemo } from "react";
import { t } from "ttag";
import * as Yup from "yup";
+import { FormModelPicker } from "metabase/actions/containers/ActionCreator/FormModelPicker";
import type { CreateQueryActionParams } from "metabase/actions/types";
import { FormErrorMessage } from "metabase/common/components/FormErrorMessage";
import { FormFooter } from "metabase/common/components/FormFooter";
@@ -9,7 +10,6 @@ import { FormInput } from "metabase/common/components/FormInput";
import { FormSubmitButton } from "metabase/common/components/FormSubmitButton";
import { FormTextArea } from "metabase/common/components/FormTextArea";
import { Form, FormProvider } from "metabase/forms";
-import { FormModelPicker } from "metabase/models/containers/FormModelPicker";
import { Button } from "metabase/ui";
import * as Errors from "metabase/utils/errors";
diff --git a/frontend/src/metabase/models/containers/FormModelPicker/FormModelPicker.tsx b/frontend/src/metabase/actions/containers/ActionCreator/FormModelPicker/FormModelPicker.tsx
similarity index 100%
rename from frontend/src/metabase/models/containers/FormModelPicker/FormModelPicker.tsx
rename to frontend/src/metabase/actions/containers/ActionCreator/FormModelPicker/FormModelPicker.tsx
diff --git a/frontend/src/metabase/models/containers/FormModelPicker/index.ts b/frontend/src/metabase/actions/containers/ActionCreator/FormModelPicker/index.ts
similarity index 100%
rename from frontend/src/metabase/models/containers/FormModelPicker/index.ts
rename to frontend/src/metabase/actions/containers/ActionCreator/FormModelPicker/index.ts
diff --git a/frontend/src/metabase/query_builder/containers/QueryBuilder.beforeunload-events.unit.spec.tsx b/frontend/src/metabase/query_builder/containers/QueryBuilder.beforeunload-events.unit.spec.tsx
index be32bf0deb3..8599e0f3be0 100644
--- a/frontend/src/metabase/query_builder/containers/QueryBuilder.beforeunload-events.unit.spec.tsx
+++ b/frontend/src/metabase/query_builder/containers/QueryBuilder.beforeunload-events.unit.spec.tsx
@@ -5,6 +5,7 @@ import { setupLastDownloadFormatEndpoints } from "__support__/server-mocks";
import { screen, waitForLoaderToBeRemoved, within } from "__support__/ui";
import { mockGetBoundingClientRect } from "__support__/utils";
import { BEFORE_UNLOAD_UNSAVED_MESSAGE } from "metabase/common/hooks/use-before-unload";
+import NewModelOptions from "metabase/models/containers/NewModelOptions";
import registerVisualizations from "metabase/visualizations/register";
import {
@@ -46,6 +47,7 @@ describe("QueryBuilder - beforeunload events", () => {
const { mockEventListener } = await setup({
card: null,
initialRoute: "/model/new",
+ newModelOptionsComponent: NewModelOptions,
});
await startNewNotebookModel();
diff --git a/frontend/src/metabase/query_builder/containers/QueryBuilder.unsaved-changes-warning.unit.spec.tsx b/frontend/src/metabase/query_builder/containers/QueryBuilder.unsaved-changes-warning.unit.spec.tsx
index 514591ee2fc..7a3da311cc8 100644
--- a/frontend/src/metabase/query_builder/containers/QueryBuilder.unsaved-changes-warning.unit.spec.tsx
+++ b/frontend/src/metabase/query_builder/containers/QueryBuilder.unsaved-changes-warning.unit.spec.tsx
@@ -17,6 +17,7 @@ import {
} from "__support__/ui";
import { mockGetBoundingClientRect } from "__support__/utils";
import { serializeCardForUrl } from "metabase/common/utils/card";
+import NewModelOptions from "metabase/models/containers/NewModelOptions";
import registerVisualizations from "metabase/visualizations/register";
import {
createMockCardQueryMetadata,
@@ -67,6 +68,7 @@ describe("QueryBuilder - unsaved changes warning", () => {
const { history } = await setup({
card: null,
initialRoute: "/model/new",
+ newModelOptionsComponent: NewModelOptions,
});
await startNewNotebookModel();
@@ -82,6 +84,7 @@ describe("QueryBuilder - unsaved changes warning", () => {
await setup({
card: null,
initialRoute: "/model/new",
+ newModelOptionsComponent: NewModelOptions,
});
await startNewNotebookModel();
@@ -95,6 +98,7 @@ describe("QueryBuilder - unsaved changes warning", () => {
await setup({
card: null,
initialRoute: "/model/new",
+ newModelOptionsComponent: NewModelOptions,
});
setupCardCreateEndpoint();
setupCardEndpoints(TEST_NATIVE_CARD);
diff --git a/frontend/src/metabase/query_builder/containers/test-utils.tsx b/frontend/src/metabase/query_builder/containers/test-utils.tsx
index c76dd601aa0..36c824a01d2 100644
--- a/frontend/src/metabase/query_builder/containers/test-utils.tsx
+++ b/frontend/src/metabase/query_builder/containers/test-utils.tsx
@@ -1,7 +1,7 @@
/* eslint-disable i18next/no-literal-string */
import userEvent from "@testing-library/user-event";
import fetchMock from "fetch-mock";
-import type { ComponentPropsWithoutRef } from "react";
+import type { ComponentPropsWithoutRef, ComponentType } from "react";
import { IndexRoute, Route } from "react-router";
import {
@@ -36,7 +36,6 @@ import {
import { NewItemMenu } from "metabase/common/components/NewItemMenu";
import { LOAD_COMPLETE_FAVICON } from "metabase/common/hooks/constants";
import { serializeCardForUrl } from "metabase/common/utils/card";
-import NewModelOptions from "metabase/models/containers/NewModelOptions";
import { createMockState } from "metabase/redux/store/mocks";
import { checkNotNull } from "metabase/utils/types";
import type { Card, Dataset, UnsavedCard } from "metabase-types/api";
@@ -219,6 +218,12 @@ const TestQueryBuilder = (
const TestHome = () => <NewItemMenu trigger={<button>New</button>} />;
+// The real /model/new page (NewModelOptions) lives in the `models` feature.
+// Feature modules can't import each other, so tests that need it inject it via
+// `newModelOptionsComponent` (spec files are exempt from boundary rules); other
+// tests never hit this route and get this stub.
+const TestNewModelOptions = () => <div />;
+
const TestRedirect = () => <div />;
const isSavedCard = (card: Card | UnsavedCard | null): card is Card => {
@@ -229,6 +234,9 @@ interface SetupOpts {
card: Card | UnsavedCard | null;
dataset?: Dataset;
initialRoute?: string;
+ // Loosely typed to match react-router's `component` prop: the real
+ // NewModelOptions receives router-injected props (location) the stub omits.
+ newModelOptionsComponent?: ComponentType<any>;
}
export const setup = async ({
@@ -241,6 +249,7 @@ export const setup = async ({
? `/${card.id}`
: `#${serializeCardForUrl(card)}`
}`,
+ newModelOptionsComponent = TestNewModelOptions,
}: SetupOpts) => {
setupUserMetabotPermissionsEndpoint();
setupDatabasesEndpoints([TEST_DB]);
@@ -284,7 +293,7 @@ export const setup = async ({
<Route>
<Route path="/" component={TestHome} />
<Route path="/model">
- <Route path="new" component={NewModelOptions} />
+ <Route path="new" component={newModelOptionsComponent} />
<Route path="query" component={TestQueryBuilder} />
<Route path="columns" component={TestQueryBuilder} />
<Route path="metadata" component={TestQueryBuilder} />