Skip to content

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

Data studio drop models from Library (#66631)

Alexander Polyankin609c502fdeef
diff --git a/e2e/support/helpers/e2e-data-studio-helpers.ts b/e2e/support/helpers/e2e-data-studio-helpers.ts
index 8d77b338b52..01e14d135cf 100644
--- a/e2e/support/helpers/e2e-data-studio-helpers.ts
+++ b/e2e/support/helpers/e2e-data-studio-helpers.ts
@@ -56,7 +56,7 @@ export const DataStudio = {
glossarySection,
glossaryLink: () => glossarySection().findByText("Glossary"),
createCardMenuButton: () =>
- collectionsSection().findByLabelText("Create model or metric"),
+ collectionsSection().findByLabelText("Create metric"),
createSnippetButton: () =>
snippetsSection().findByLabelText("Create snippet"),
snippetCollectionOptionsButton: () =>
diff --git a/e2e/support/test-library-data.ts b/e2e/support/test-library-data.ts
index 47ae872ac2c..65e3bd276ce 100644
--- a/e2e/support/test-library-data.ts
+++ b/e2e/support/test-library-data.ts
@@ -1,4 +1,5 @@
const { H } = cy;
+
import { SAMPLE_DATABASE } from "e2e/support/cypress_sample_database";
import type { StructuredQuestionDetails } from "e2e/support/helpers/api";
import type { Collection } from "metabase-types/api";
@@ -13,15 +14,9 @@ type LibraryResponse = Collection & {
effective_children?: Collection[];
};
-export const TRUSTED_ORDERS_MODEL: StructuredQuestionDetailsWithName = {
- name: "Trusted Orders Model",
- query: {
- "source-table": ORDERS_ID,
- },
-};
-
export const TRUSTED_ORDERS_METRIC: StructuredQuestionDetailsWithName = {
name: "Trusted Orders Metric",
+ type: "metric",
query: {
"source-table": ORDERS_ID,
aggregation: [["count"]],
@@ -29,65 +24,24 @@ export const TRUSTED_ORDERS_METRIC: StructuredQuestionDetailsWithName = {
};
export function createLibraryWithItems() {
- return H.createLibrary().then(
- (response: Cypress.Response<LibraryResponse>) => {
- const body = response.body;
- const modelsCollection = body.effective_children?.find(
- (child) => child.name === "Data",
- );
- const metricsCollection = body.effective_children?.find(
- (child) => child.name === "Metrics",
- );
-
- return H.createQuestion(TRUSTED_ORDERS_MODEL, {
- wrapId: true,
- idAlias: "trustedOrdersModelId",
- }).then(() =>
- cy.get("@trustedOrdersModelId").then((modelId) =>
- cy
- .request("PUT", `/api/card/${modelId}`, {
- type: "model",
- collection_id: modelsCollection?.id,
- })
- .then(() =>
- H.createQuestion(TRUSTED_ORDERS_METRIC, {
- wrapId: true,
- idAlias: "trustedOrdersMetricId",
- }),
- )
- .then(() =>
- cy.get("@trustedOrdersMetricId").then((metricId) =>
- cy.request("PUT", `/api/card/${metricId}`, {
- type: "metric",
- collection_id: metricsCollection?.id,
- }),
- ),
- ),
- ),
- );
- },
- );
+ H.createLibrary().then((response: Cypress.Response<LibraryResponse>) => {
+ const body = response.body;
+ const metricsCollection = body.effective_children?.find(
+ (child) => child.name === "Metrics",
+ );
+
+ H.publishTables({ table_ids: [ORDERS_ID] });
+ H.createQuestion({
+ ...TRUSTED_ORDERS_METRIC,
+ }).then(({ body: card }) => {
+ cy.request("PUT", `/api/card/${card.id}`, {
+ collection_id: metricsCollection?.id,
+ });
+ });
+ });
}
-export function createLibraryWithModel() {
- return H.createLibrary().then(
- (response: Cypress.Response<LibraryResponse>) => {
- const body = response.body;
- const modelsCollection = body.effective_children?.find(
- (child) => child.name === "Data",
- );
-
- return H.createQuestion(TRUSTED_ORDERS_MODEL, {
- wrapId: true,
- idAlias: "trustedOrdersModelId",
- }).then(() =>
- cy.get("@trustedOrdersModelId").then((modelId) =>
- cy.request("PUT", `/api/card/${modelId}`, {
- type: "model",
- collection_id: modelsCollection?.id,
- }),
- ),
- );
- },
- );
+export function createLibraryWithTable() {
+ H.createLibrary();
+ H.publishTables({ table_ids: [ORDERS_ID] });
}
diff --git a/e2e/test/scenarios/data-studio/data-model/data-studio-single-table.cy.spec.ts b/e2e/test/scenarios/data-studio/data-model/data-studio-single-table.cy.spec.ts
index e41daa7cd8c..45910bd3162 100644
--- a/e2e/test/scenarios/data-studio/data-model/data-studio-single-table.cy.spec.ts
+++ b/e2e/test/scenarios/data-studio/data-model/data-studio-single-table.cy.spec.ts
@@ -97,7 +97,7 @@ describe("Table editing", () => {
H.DataStudio.nav().findByLabelText("Modeling").click();
H.DataStudio.ModelingSidebar.collectionsTree().findByText("Data").click();
H.DataStudio.Modeling.collectionPage()
- .findByText("No tables or models yet")
+ .findByText("No published tables yet")
.should("be.visible");
},
);
diff --git a/e2e/test/scenarios/data-studio/modeling-library.cy.spec.ts b/e2e/test/scenarios/data-studio/modeling-library.cy.spec.ts
index 79314310ae4..ea47a2eff88 100644
--- a/e2e/test/scenarios/data-studio/modeling-library.cy.spec.ts
+++ b/e2e/test/scenarios/data-studio/modeling-library.cy.spec.ts
@@ -1,16 +1,11 @@
-import { SAMPLE_DB_ID } from "e2e/support/cypress_data";
-import { SAMPLE_DATABASE } from "e2e/support/cypress_sample_database";
-import {
- ALL_USERS_GROUP_ID,
- ORDERS_MODEL_ID,
-} from "e2e/support/cypress_sample_instance_data";
+const { H } = cy;
+
import {
+ TRUSTED_ORDERS_METRIC,
createLibraryWithItems,
- createLibraryWithModel,
+ createLibraryWithTable,
} from "e2e/support/test-library-data";
-const { H } = cy;
-
describe("scenarios > data studio > modeling > library", () => {
beforeEach(() => {
H.restore();
@@ -63,9 +58,9 @@ describe("scenarios > data studio > modeling > library", () => {
cy.log("Select Data collection and verify it's empty");
H.DataStudio.ModelingSidebar.collectionsTree().findByText("Data").click();
- cy.log("Verify no tables or models yet message");
+ cy.log("Verify No published tables yet message");
H.DataStudio.Modeling.collectionPage().within(() => {
- cy.findByText("No tables or models yet").should("be.visible");
+ cy.findByText("No published tables yet").should("be.visible");
});
});
@@ -77,11 +72,11 @@ describe("scenarios > data studio > modeling > library", () => {
H.entityPickerModalItem(0, "Library").click();
H.entityPickerModalItem(1, "Data").click();
- H.entityPickerModalItem(2, "Trusted Orders Model").click();
+ H.entityPickerModalItem(2, "Orders").click();
cy.log("Ensure that the we can build the path from a value");
- cy.button(/Trusted Orders Model/).click();
+ cy.button(/Orders/).click();
H.miniPickerHeader().click();
H.miniPickerBrowseAll().click();
@@ -95,76 +90,34 @@ describe("scenarios > data studio > modeling > library", () => {
"data-active",
"true",
);
- H.entityPickerModalItem(2, "Trusted Orders Model").should(
+ H.entityPickerModalItem(2, "Orders").should(
"have.attr",
"data-active",
"true",
);
});
- it("should let you move models and metrics into the library, even when empty", () => {
+ it("should let you move metrics into the library, even when empty", () => {
H.createLibrary();
-
- H.visitModel(ORDERS_MODEL_ID);
+ H.createQuestion(TRUSTED_ORDERS_METRIC, { visitQuestion: true });
H.openQuestionActions("Duplicate");
H.modal().findByTestId("dashboard-and-collection-picker-button").click();
H.entityPickerModalTab("Collections").click();
H.entityPickerModalItem(0, "Library").click();
- H.entityPickerModalItem(1, "Metrics").should(
- "have.attr",
- "data-disabled",
- "true",
- );
- H.entityPickerModalItem(1, "Data").click();
+ H.entityPickerModalItem(1, "Metrics").click();
H.entityPickerModal().button("Select this collection").click();
H.modal().button("Duplicate").click();
});
it("should show the library collection even if only 1 child collection has items", () => {
- createLibraryWithModel();
+ createLibraryWithTable();
H.startNewQuestion();
H.miniPickerBrowseAll().click();
H.entityPickerModalItem(0, "Library").click();
H.entityPickerModalItem(1, "Data").click();
- H.entityPickerModalItem(2, "Trusted Orders Model").should("exist");
- });
-
- it("should be available in the question picker modal", () => {
- createLibraryWithItems();
-
- const library = () => H.entityPickerModalLevel(0).findByText("Library");
-
- cy.visit(
- `/admin/permissions/data/group/${ALL_USERS_GROUP_ID}/database/${SAMPLE_DB_ID}/schema/PUBLIC/${SAMPLE_DATABASE.ACCOUNTS_ID}/segmented`,
- );
-
- H.modal()
- .findByText(/Use a saved question/)
- .click();
- H.modal()
- .button(/Select a question/)
- .click();
-
- H.entityPickerModal().within(() => {
- // Questions tab should not show the library, because the library can only contain models and metrics
- H.entityPickerModalTab("Questions").click();
- library().should("not.exist");
- H.entityPickerModalItem(0, "Our analytics").should("exist");
-
- // Question picker should show library in models tab
- H.entityPickerModalTab("Models").click();
- H.entityPickerModalItem(0, "Our analytics").should("exist");
- library().click();
- H.entityPickerModalItem(1, "Metrics").should(
- "have.attr",
- "data-disabled",
- "true",
- );
- H.entityPickerModalItem(1, "Data").click();
- H.entityPickerModalItem(2, "Trusted Orders Model").should("exist");
- });
+ H.entityPickerModalItem(2, "Orders").should("exist");
});
});
diff --git a/e2e/test/scenarios/data-studio/modeling-metrics.cy.spec.ts b/e2e/test/scenarios/data-studio/modeling-metrics.cy.spec.ts
index aa104749469..254df17a417 100644
--- a/e2e/test/scenarios/data-studio/modeling-metrics.cy.spec.ts
+++ b/e2e/test/scenarios/data-studio/modeling-metrics.cy.spec.ts
@@ -22,7 +22,7 @@ describe("scenarios > data studio > modeling > metrics", () => {
H.DataStudio.Modeling.emptyPage().should("be.visible");
H.DataStudio.Modeling.emptyPage()
.parent()
- .findByText("Build your semantic layer with models and metrics.")
+ .findByText("Build your semantic layer with tables and metrics.")
.should("be.visible");
});
});
diff --git a/e2e/test/scenarios/data-studio/modeling-models.cy.spec.ts b/e2e/test/scenarios/data-studio/modeling-models.cy.spec.ts
deleted file mode 100644
index 8c739730d79..00000000000
--- a/e2e/test/scenarios/data-studio/modeling-models.cy.spec.ts
+++ /dev/null
@@ -1,281 +0,0 @@
-const { H } = cy;
-import { createLibraryWithItems } from "e2e/support/test-library-data";
-
-describe("scenarios > data studio > modeling > models", () => {
- beforeEach(() => {
- H.restore();
- H.resetSnowplow();
- cy.signInAsAdmin();
- H.activateToken("bleeding-edge");
-
- cy.intercept("POST", "/api/card").as("createCard");
- cy.intercept("PUT", "/api/card/*").as("updateCard");
- cy.intercept("POST", "/api/collection").as("createCollection");
- cy.intercept("PUT", "/api/collection/*").as("updateCollection");
- cy.intercept("POST", "/api/dataset").as("dataset");
-
- createLibraryWithItems();
- });
-
- it("should edit model name and description", () => {
- cy.log("Navigate to Data Studio Modeling");
- cy.visit("/data-studio/modeling");
-
- cy.log("Select Models collection from sidebar");
- H.DataStudio.ModelingSidebar.collectionsTree().findByText("Data").click();
-
- cy.log("Click on the model from the collection view");
- H.DataStudio.Modeling.collectionPage().should("be.visible");
- cy.findByRole("table").findByText("Trusted Orders Model").click();
-
- cy.log("Verify model overview page displays correct data");
- H.DataStudio.Models.overviewPage()
- .findByDisplayValue("Trusted Orders Model")
- .should("be.visible");
-
- cy.log("Update the model name");
- H.DataStudio.Models.overviewPage()
- .findByDisplayValue("Trusted Orders Model")
- .clear()
- .type("Updated Orders Model{enter}");
-
- cy.wait("@updateCard");
-
- cy.log("Verify updated name appears in overview");
- H.DataStudio.Models.overviewPage()
- .findByDisplayValue("Updated Orders Model")
- .should("be.visible");
-
- cy.log("Verify updated name appears in collection view");
- cy.visit("/data-studio/modeling");
- H.DataStudio.ModelingSidebar.collectionsTree().findByText("Data").click();
- H.DataStudio.Modeling.collectionPage().should("be.visible");
- H.DataStudio.Modeling.modelItem("Updated Orders Model").should(
- "be.visible",
- );
- });
-
- it("should navigate between tabs", () => {
- cy.log("Navigate to Data Studio Modeling");
- cy.visit("/data-studio/modeling");
-
- cy.log("Select Models collection from sidebar");
- H.DataStudio.ModelingSidebar.collectionsTree().findByText("Data").click();
-
- cy.log("Click on the model from the collection view");
- H.DataStudio.Modeling.collectionPage().should("be.visible");
- cy.findByRole("table").findByText("Trusted Orders Model").click();
-
- cy.log("Verify Overview tab displays model name");
- H.DataStudio.Models.overviewPage()
- .findByDisplayValue("Trusted Orders Model")
- .should("be.visible");
-
- cy.log("Navigate to Definition tab");
- H.DataStudio.Models.definitionTab().click();
- H.DataStudio.Models.queryEditor().findByText("Orders").should("be.visible");
-
- cy.log("Navigate to Fields tab");
- H.DataStudio.Models.fieldsTab().click();
- H.DataStudio.Models.fieldsPage().within(() => {
- cy.findByText("ID").should("be.visible");
- cy.findByText("User ID").should("be.visible");
- cy.findByText("Product ID").should("be.visible");
- });
-
- cy.log("Navigate to Dependencies tab");
- H.DataStudio.Models.dependenciesTab().click();
- H.DependencyGraph.graph().within(() => {
- cy.findByText("Orders").should("be.visible");
- cy.findByText("Trusted Orders Model").should("be.visible");
- });
-
- cy.log("Navigate back to Overview tab");
- H.DataStudio.Models.overviewTab().click();
- H.DataStudio.Models.overviewPage()
- .findByDisplayValue("Trusted Orders Model")
- .should("be.visible");
- });
-
- it("should archive and restore a model", () => {
- cy.log("Navigate to Data Studio Modeling");
- cy.visit("/data-studio/modeling");
-
- cy.log("Select Models collection from sidebar");
- H.DataStudio.ModelingSidebar.collectionsTree().findByText("Data").click();
-
- cy.log("Wait for collection page to load");
- H.DataStudio.Modeling.collectionPage().should("be.visible");
-
- cy.log("Click on the model from the collection view");
- cy.findByRole("table").findByText("Trusted Orders Model").click();
-
- cy.log("Verify model is loaded before archiving");
- H.DataStudio.Models.overviewPage()
- .findByDisplayValue("Trusted Orders Model")
- .should("be.visible");
-
- cy.log("Archive the model");
- H.DataStudio.Models.moreMenu().click();
- H.popover().findByText("Move to trash").click();
-
- cy.log("Confirm archiving in modal");
- H.modal().button("Move to trash").click();
-
- cy.wait("@updateCard");
-
- cy.log("Verify redirected to modeling page");
- cy.url().should("include", "/data-studio/modeling");
-
- cy.log("Verify model is removed from collection view");
- cy.visit("/data-studio/modeling");
- H.DataStudio.ModelingSidebar.collectionsTree().findByText("Data").click();
- H.DataStudio.Modeling.collectionPage().should("be.visible");
- H.DataStudio.Modeling.collectionPage()
- .findByText("No tables or models yet")
- .should("be.visible");
-
- cy.log("Navigate to trash");
- cy.visit("/trash");
-
- cy.log("Verify model appears in trash");
- cy.findByRole("table")
- .findByText("Trusted Orders Model")
- .should("be.visible");
-
- cy.log("Restore the model");
- cy.findByRole("table").findByText("Trusted Orders Model").click();
- cy.findByTestId("archive-banner").should("be.visible");
- cy.findByTestId("archive-banner").findByText("Restore").click();
- cy.wait("@updateCard");
-
- cy.log("Verify model is restored in collection view");
- cy.visit("/data-studio/modeling");
- H.DataStudio.ModelingSidebar.collectionsTree().findByText("Data").click();
- H.DataStudio.Modeling.collectionPage().should("be.visible");
- cy.findByRole("table")
- .findByText("Trusted Orders Model")
- .should("be.visible");
- });
-
- it("should view model in question view via more menu", () => {
- cy.log("Navigate to Data Studio Modeling");
- cy.visit("/data-studio/modeling");
-
- cy.log("Select Models collection from sidebar");
- H.DataStudio.ModelingSidebar.collectionsTree().findByText("Data").click();
-
- cy.log("Click on the model from the collection view");
- H.DataStudio.Modeling.collectionPage().should("be.visible");
- cy.findByRole("table").findByText("Trusted Orders Model").click();
-
- cy.log("Verify model is loaded");
- H.DataStudio.Models.overviewPage()
- .findByDisplayValue("Trusted Orders Model")
- .should("be.visible");
-
- cy.log("Verify View link opens in new tab");
- H.DataStudio.Models.moreMenu().click();
- H.popover()
- .findByText("View")
- .closest("a")
- .should("have.attr", "target", "_blank")
- .should("have.attr", "href")
- .and("match", /\/model\/\d+/);
- });
-
- it("should duplicate model via more menu", () => {
- cy.log("Navigate to Data Studio Modeling");
- cy.visit("/data-studio/modeling");
-
- cy.log("Select Models collection from sidebar");
- H.DataStudio.ModelingSidebar.collectionsTree().findByText("Data").click();
-
- cy.log("Click on the model from the collection view");
- H.DataStudio.Modeling.collectionPage().should("be.visible");
- cy.findByRole("table").findByText("Trusted Orders Model").click();
-
- cy.log("Verify model is loaded");
- H.DataStudio.Models.overviewPage()
- .findByDisplayValue("Trusted Orders Model")
- .should("be.visible");
-
- cy.log("Open more menu and click Duplicate");
- H.DataStudio.Models.moreMenu().click();
- H.popover().findByText("Duplicate").click();
-
- cy.log("Save duplicate model");
- H.modal()
- .findByText('Duplicate "Trusted Orders Model"')
- .should("be.visible");
- H.modal()
- .findByLabelText("Name")
- .should("have.value", "Trusted Orders Model - Duplicate");
- H.modal().findByTestId("dashboard-and-collection-picker-button").click();
-
- H.entityPickerModalTab("Collections").click();
- H.entityPickerModal().within(() => {
- cy.findByText("Our analytics").click();
- cy.findByText("Library").click();
- cy.findByText("Data").click();
- cy.button("Select this collection").click();
- });
-
- H.modal().button("Duplicate").click();
-
- cy.wait("@createCard");
- H.modal().should("not.exist");
-
- cy.log("Verify duplicate model is created");
- H.DataStudio.Models.overviewPage()
- .findByText("Trusted Orders Model - Duplicate")
- .should("be.visible");
-
- cy.log("Verify both models appear in collection view");
- cy.visit("/data-studio/modeling");
- H.DataStudio.ModelingSidebar.collectionsTree().findByText("Data").click();
- H.DataStudio.Modeling.collectionPage().should("be.visible");
- cy.findByRole("table").within(() => {
- cy.findByText("Trusted Orders Model").should("be.visible");
- cy.findByText("Trusted Orders Model - Duplicate").should("be.visible");
- });
- });
-
- it("should move model to different collection via more menu", () => {
- cy.log("Navigate to Data Studio Modeling");
- cy.visit("/data-studio/modeling");
-
- cy.log("Select Models collection from sidebar");
- H.DataStudio.ModelingSidebar.collectionsTree().findByText("Data").click();
-
- cy.log("Click on the model from the collection view");
- H.DataStudio.Modeling.collectionPage().should("be.visible");
- cy.findByRole("table").findByText("Trusted Orders Model").click();
-
- cy.log("Verify model is loaded");
- H.DataStudio.Models.overviewPage()
- .findByDisplayValue("Trusted Orders Model")
- .should("be.visible");
-
- cy.log("Open more menu and click Move");
- H.DataStudio.Models.moreMenu().click();
- H.popover().findByText("Move").click();
-
- cy.log("Select First collection as destination");
- H.entityPickerModal().findByText("First collection").click();
- H.entityPickerModal().button("Move").click();
-
- cy.wait("@updateCard");
-
- cy.log("Verify model is in First collection");
- cy.findByTestId("move-card-toast").findByText("First collection").click();
-
- cy.log("Verify model is no longer in Models collection");
- cy.visit("/data-studio/modeling");
- H.DataStudio.ModelingSidebar.collectionsTree().findByText("Data").click();
- H.DataStudio.Modeling.collectionPage().should("be.visible");
- H.DataStudio.Modeling.collectionPage()
- .findByText("No tables or models yet")
- .should("be.visible");
- });
-});
diff --git a/e2e/test/scenarios/data-studio/modeling-tables.cy.spec.ts b/e2e/test/scenarios/data-studio/modeling-tables.cy.spec.ts
index e34e60d8dfe..e26dd27b091 100644
--- a/e2e/test/scenarios/data-studio/modeling-tables.cy.spec.ts
+++ b/e2e/test/scenarios/data-studio/modeling-tables.cy.spec.ts
@@ -48,7 +48,7 @@ describe("scenarios > data studio > modeling > tables", () => {
H.DataStudio.Modeling.emptyPage().should("be.visible");
H.DataStudio.ModelingSidebar.collectionsTree().findByText("Data").click();
H.DataStudio.Modeling.collectionPage()
- .findByText("No tables or models yet")
+ .findByText("No published tables yet")
.should("be.visible");
});
});
diff --git a/e2e/test/scenarios/data-studio/transforms.cy.spec.ts b/e2e/test/scenarios/data-studio/transforms.cy.spec.ts
index 48e2a4bfa50..8bf93b75447 100644
--- a/e2e/test/scenarios/data-studio/transforms.cy.spec.ts
+++ b/e2e/test/scenarios/data-studio/transforms.cy.spec.ts
@@ -108,7 +108,7 @@ describe("scenarios > admin > transforms", () => {
cy.findByText("Our analytics").should("not.exist");
cy.findByText("Browse all").should("exist");
cy.findByText("Data").click();
- cy.findByText("Trusted Orders Model").should("exist");
+ cy.findByText("Orders").should("exist");
});
});
diff --git a/enterprise/backend/src/metabase_enterprise/data_studio/api/table.clj b/enterprise/backend/src/metabase_enterprise/data_studio/api/table.clj
index 49f8a81fac2..eab2ab4a57d 100644
--- a/enterprise/backend/src/metabase_enterprise/data_studio/api/table.clj
+++ b/enterprise/backend/src/metabase_enterprise/data_studio/api/table.clj
@@ -232,10 +232,10 @@
body :- ::table-selectors]
(api/check-superuser)
(let [target-collection (api/let-404 [colls (seq (t2/select :model/Collection
- :type collection/library-models-collection-type
+ :type collection/library-data-collection-type
{:limit 2}))]
(if (next colls)
- (throw (ex-info (tru "Multiple library-models collections found.")
+ (throw (ex-info (tru "Multiple library-data collections found.")
{:status-code 409}))
(first colls)))
where (table-selectors->filter (select-keys body [:database_ids :schema_ids :table_ids]))
diff --git a/enterprise/backend/src/metabase_enterprise/library/api.clj b/enterprise/backend/src/metabase_enterprise/library/api.clj
index 63e33bb2d13..c547711ba24 100644
--- a/enterprise/backend/src/metabase_enterprise/library/api.clj
+++ b/enterprise/backend/src/metabase_enterprise/library/api.clj
@@ -60,7 +60,7 @@
(t2/select :model/Collection
{:where [:and
[:in :type [collection/library-collection-type
- collection/library-models-collection-type
+ collection/library-data-collection-type
collection/library-metrics-collection-type]]
(collection/visible-collection-filter-clause
:id
diff --git a/enterprise/backend/src/metabase_enterprise/library/validation.clj b/enterprise/backend/src/metabase_enterprise/library/validation.clj
index 2f36f5c2669..869fd27e9bd 100644
--- a/enterprise/backend/src/metabase_enterprise/library/validation.clj
+++ b/enterprise/backend/src/metabase_enterprise/library/validation.clj
@@ -12,12 +12,12 @@
[content-type collection-id]
(when collection-id
(when-let [collection-type (t2/select-one-fn :type [:model/Collection :type] :id collection-id)]
- (when (and (= collection-type collection/library-collection-type) (not (contains? #{collection/library-models-collection-type
+ (when (and (= collection-type collection/library-collection-type) (not (contains? #{collection/library-data-collection-type
collection/library-metrics-collection-type}
content-type)))
(throw (ex-info "Cannot add anything to the Library collection" {})))
- (when (and (= collection-type collection/library-models-collection-type) (not (= :model content-type)))
- (throw (ex-info "Can only add models to the 'Models' collection" {})))
+ (when (and (= collection-type collection/library-data-collection-type) (not (= :table content-type)))
+ (throw (ex-info "Can only add tables to the 'Data' collection" {})))
(when (and (= collection-type collection/library-metrics-collection-type) (not (= :metric content-type)))
(throw (ex-info "Can only add metrics to the 'Metrics' collection" {})))))
true)
@@ -28,7 +28,7 @@
:feature :data-studio
[collection]
(when (and (contains? #{collection/library-collection-type
- collection/library-models-collection-type
+ collection/library-data-collection-type
collection/library-metrics-collection-type} (:type collection))
(seq (set/intersection (set (keys (t2/changes collection)))
#{:name :description :archived :location :personal_owner_id :slug :namespace :type :authority_level :is_sample})))
diff --git a/enterprise/backend/test/metabase_enterprise/data_studio/api/table_test.clj b/enterprise/backend/test/metabase_enterprise/data_studio/api/table_test.clj
index dc6b2959bba..718e6d5c028 100644
--- a/enterprise/backend/test/metabase_enterprise/data_studio/api/table_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/data_studio/api/table_test.clj
@@ -19,8 +19,8 @@
(mt/with-premium-features #{:data-studio}
(without-library
(testing "POST /api/ee/data-studio/table/(un)publish-table"
- (testing "publishes tables into the library-models collection"
- (mt/with-temp [:model/Collection {collection-id :id} {:type collection/library-models-collection-type}]
+ (testing "publishes tables into the library-data collection"
+ (mt/with-temp [:model/Collection {collection-id :id} {:type collection/library-data-collection-type}]
(testing "normal users are not allowed to publish"
(mt/user-http-request :rasta :post 403 "ee/data-studio/table/publish-tables"
{:table_ids [(mt/id :users) (mt/id :venues)]}))
@@ -50,14 +50,14 @@
:collection_id nil
:is_published false}
(t2/select-one :model/Table (mt/id :users))))))
- (testing "returns 404 when no library-models collection exists"
+ (testing "returns 404 when no library-data collection exists"
(is (= "Not found."
(mt/user-http-request :crowberto :post 404 "ee/data-studio/table/publish-tables"
{:table_ids [(mt/id :users)]}))))
- (testing "returns 409 when multiple library-models collections exist"
- (mt/with-temp [:model/Collection _ {:type collection/library-models-collection-type}
- :model/Collection _ {:type collection/library-models-collection-type}]
- (is (= "Multiple library-models collections found."
+ (testing "returns 409 when multiple library-data collections exist"
+ (mt/with-temp [:model/Collection _ {:type collection/library-data-collection-type}
+ :model/Collection _ {:type collection/library-data-collection-type}]
+ (is (= "Multiple library-data collections found."
(mt/user-http-request :crowberto :post 409 "ee/data-studio/table/publish-tables"
{:table_ids [(mt/id :users)]})))))))))
@@ -593,7 +593,7 @@
(deftest publish-tables-with-upstream-dependencies-test
(mt/with-premium-features #{:data-studio}
(testing "POST /api/ee/data-studio/table/publish-tables publishes upstream dependencies"
- (mt/with-temp [:model/Collection _ {:type collection/library-models-collection-type}
+ (mt/with-temp [:model/Collection _ {:type collection/library-data-collection-type}
:model/Database {db-id :id} {}
;; Products table (upstream)
:model/Table {products-id :id} {:db_id db-id :name "products" :is_published false}
@@ -620,7 +620,7 @@
(deftest publish-tables-recursive-upstream-test
(mt/with-premium-features #{:data-studio}
(testing "POST /api/ee/data-studio/table/publish-tables publishes recursive upstream dependencies"
- (mt/with-temp [:model/Collection _ {:type collection/library-models-collection-type}
+ (mt/with-temp [:model/Collection _ {:type collection/library-data-collection-type}
:model/Database {db-id :id} {}
;; Customers table (upstream of orders)
:model/Table {customers-id :id} {:db_id db-id :name "customers" :is_published false}
@@ -658,7 +658,7 @@
(deftest unpublish-tables-with-downstream-dependents-test
(mt/with-premium-features #{:data-studio}
(testing "POST /api/ee/data-studio/table/unpublish-tables unpublishes downstream dependents"
- (mt/with-temp [:model/Collection {coll-id :id} {:type collection/library-models-collection-type}
+ (mt/with-temp [:model/Collection {coll-id :id} {:type collection/library-data-collection-type}
:model/Database {db-id :id} {}
;; Products table (upstream, published)
:model/Table {products-id :id} {:db_id db-id :name "products" :is_published true
@@ -687,7 +687,7 @@
(deftest unpublish-tables-recursive-downstream-test
(mt/with-premium-features #{:data-studio}
(testing "POST /api/ee/data-studio/table/unpublish-tables unpublishes recursive downstream dependents"
- (mt/with-temp [:model/Collection {coll-id :id} {:type collection/library-models-collection-type}
+ (mt/with-temp [:model/Collection {coll-id :id} {:type collection/library-data-collection-type}
:model/Database {db-id :id} {}
;; Customers table (upstream of orders, published)
:model/Table {customers-id :id} {:db_id db-id :name "customers" :is_published true
diff --git a/enterprise/backend/test/metabase_enterprise/library/api_test.clj b/enterprise/backend/test/metabase_enterprise/library/api_test.clj
index f2f9a19ec34..f23b8e1f00a 100644
--- a/enterprise/backend/test/metabase_enterprise/library/api_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/library/api_test.clj
@@ -14,7 +14,7 @@
(let [response (mt/user-http-request :crowberto :get 200 "ee/library")]
(is (= {:data nil} response))))
(let [_ (collection/create-library-collection!)
- models-id (t2/select-one-pk :model/Collection :type collection/library-models-collection-type)
+ data-id (t2/select-one-pk :model/Collection :type collection/library-data-collection-type)
metrics-id (t2/select-one-pk :model/Collection :type collection/library-metrics-collection-type)
response (mt/user-http-request :crowberto :get 200 "ee/library")]
(testing "When library exists, but no content"
@@ -22,16 +22,16 @@
(is (= ["collection"] (:here response)))
(is (= [] (:below response))))
(testing "With content in the library"
- (mt/with-temp [:model/Card _ {:name "Card in Models"
- :collection_id models-id
- :type :model}
- :model/Card _ {:name "Card in Metrics"
- :collection_id metrics-id
- :type :metric}
- :model/Card _ {:name "Other Card in Metrics"
- :collection_id metrics-id
- :type :metric}]
+ (mt/with-temp [:model/Table _ {:display_name "Table in Data"
+ :collection_id data-id
+ :is_published true}
+ :model/Card _ {:name "Card in Metrics"
+ :collection_id metrics-id
+ :type :metric}
+ :model/Card _ {:name "Other Card in Metrics"
+ :collection_id metrics-id
+ :type :metric}]
(let [response (mt/user-http-request :crowberto :get 200 "ee/library")]
(is (= "Library" (:name response)))
- (is (= ["dataset" "metric"] (:below response)))
+ (is (= ["metric" "table"] (:below response)))
(is (= ["collection"] (:here response)))))))))))
diff --git a/enterprise/backend/test/metabase_enterprise/library/validation_test.clj b/enterprise/backend/test/metabase_enterprise/library/validation_test.clj
index cc5e75409d7..8dbe9414280 100644
--- a/enterprise/backend/test/metabase_enterprise/library/validation_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/library/validation_test.clj
@@ -27,23 +27,29 @@
(is (thrown-with-msg? clojure.lang.ExceptionInfo #"Cannot add anything to the Library collection"
(t2/insert! :model/Dashboard (merge (mt/with-temp-defaults :model/Dashboard) {:collection_id (:id no-allowed-content)}))))))))
-(deftest check-allowed-content-model
+(deftest check-allowed-content-table
(mt/with-premium-features #{:data-studio}
- (mt/with-temp [:model/Collection allow-models {:name "Test Base Library" :type collection/library-models-collection-type}]
+ (mt/with-temp [:model/Collection allow-tables {:name "Test Base Library" :type collection/library-data-collection-type}]
(testing "Can only add allowed content types"
- (is (some? (t2/insert! :model/Card (merge (mt/with-temp-defaults :model/Card) {:type :model, :collection_id (:id allow-models)}))))
- (is (thrown-with-msg? clojure.lang.ExceptionInfo #"Can only add models to the 'Models' collection"
- (t2/insert! :model/Collection (merge (mt/with-temp-defaults :model/Collection) {:location (str "/" (:id allow-models) "/")}))))
- (is (thrown-with-msg? clojure.lang.ExceptionInfo #"Can only add models to the 'Models' collection"
- (t2/insert! :model/Card (merge (mt/with-temp-defaults :model/Card) {:type :metric :collection_id (:id allow-models)}))))
- (is (thrown-with-msg? clojure.lang.ExceptionInfo #"Can only add models to the 'Models' collection"
- (t2/insert! :model/Dashboard (merge (mt/with-temp-defaults :model/Dashboard) {:collection_id (:id allow-models)}))))))))
+ (mt/with-temp [:model/Table table {:collection_id (:id allow-tables)
+ :is_published true}]
+ (is (some? table)))
+ (is (thrown-with-msg? clojure.lang.ExceptionInfo #"Can only add tables to the 'Data' collection"
+ (t2/insert! :model/Collection (merge (mt/with-temp-defaults :model/Collection) {:location (str "/" (:id allow-tables) "/")}))))
+ (is (thrown-with-msg? clojure.lang.ExceptionInfo #"Can only add tables to the 'Data' collection"
+ (t2/insert! :model/Card (merge (mt/with-temp-defaults :model/Card) {:type :model :collection_id (:id allow-tables)}))))
+ (is (thrown-with-msg? clojure.lang.ExceptionInfo #"Can only add tables to the 'Data' collection"
+ (t2/insert! :model/Card (merge (mt/with-temp-defaults :model/Card) {:type :metric :collection_id (:id allow-tables)}))))
+ (is (thrown-with-msg? clojure.lang.ExceptionInfo #"Can only add tables to the 'Data' collection"
+ (t2/insert! :model/Dashboard (merge (mt/with-temp-defaults :model/Dashboard) {:collection_id (:id allow-tables)}))))))))
(deftest check-allowed-content-metric
(mt/with-premium-features #{:data-studio}
(mt/with-temp [:model/Collection allow-metrics {:name "Test Base Library" :type collection/library-metrics-collection-type}]
(testing "Can only add allowed content types"
- (is (some? (t2/insert! :model/Card (merge (mt/with-temp-defaults :model/Card) {:type :metric, :collection_id (:id allow-metrics)}))))
+ (mt/with-temp [:model/Card card {:collection_id (:id allow-metrics)
+ :type :metric}]
+ (is (some? card)))
(is (thrown-with-msg? clojure.lang.ExceptionInfo #"Can only add metrics to the 'Metrics' collection"
(t2/insert! :model/Collection (merge (mt/with-temp-defaults :model/Collection) {:location (str "/" (:id allow-metrics) "/")}))))
(is (thrown-with-msg? clojure.lang.ExceptionInfo #"Can only add metrics to the 'Metrics' collection"
@@ -54,7 +60,7 @@
(deftest cannot-update-library-collections
(mt/with-premium-features #{:data-studio}
(mt/with-temp [:model/Collection library {:name "Test Library" :type collection/library-collection-type}
- :model/Collection models {:name "Test Semantic Model Layer" :type collection/library-models-collection-type}
+ :model/Collection models {:name "Test Semantic Model Layer" :type collection/library-data-collection-type}
:model/Collection metrics {:name "Test Semantic Metrics Layer" :type collection/library-metrics-collection-type}]
(doseq [col [library models metrics]]
(testing (str "Checking type " (:type col))
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/LibrarySection/LibraryCollectionTree/LibraryCollectionTree.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/LibrarySection/LibraryCollectionTree/LibraryCollectionTree.tsx
index ce252513c4d..0b2356aa59e 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/LibrarySection/LibraryCollectionTree/LibraryCollectionTree.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/LibrarySection/LibraryCollectionTree/LibraryCollectionTree.tsx
@@ -17,25 +17,18 @@ type LibraryCollectionTreeProps = {
rootCollection: Collection;
selectedCollectionId: CollectionId | undefined;
hasDataAccess: boolean;
- hasNativeWrite: boolean;
};
export function LibraryCollectionTree({
rootCollection,
selectedCollectionId,
hasDataAccess,
- hasNativeWrite,
}: LibraryCollectionTreeProps) {
const collectionTree = useMemo(
() => buildCollectionTree([rootCollection]),
[rootCollection],
);
- const modelCollection = useMemo(
- () => getWritableCollection(rootCollection, "library-models"),
- [rootCollection],
- );
-
const metricCollection = useMemo(
() => getWritableCollection(rootCollection, "library-metrics"),
[rootCollection],
@@ -66,21 +59,12 @@ export function LibraryCollectionTree({
return null;
}
- const canCreateModel = hasDataAccess && modelCollection != null;
const canCreateMetric = hasDataAccess && metricCollection != null;
- if (!canCreateModel && !canCreateMetric) {
+ if (!canCreateMetric) {
return null;
}
- return (
- <CreateCardMenu
- modelCollectionId={modelCollection?.id}
- metricCollectionId={metricCollection?.id}
- canCreateModel={canCreateModel}
- canCreateMetric={canCreateMetric}
- canCreateNativeQuery={hasNativeWrite}
- />
- );
+ return <CreateCardMenu metricCollectionId={metricCollection?.id} />;
}}
role="tree"
onSelect={handleCollectionSelect}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/LibrarySection/LibrarySection.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/LibrarySection/LibrarySection.tsx
index 187a843cf05..66cca6b8377 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/LibrarySection/LibrarySection.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/LibrarySection/LibrarySection.tsx
@@ -25,7 +25,6 @@ export function LibrarySection({
collections,
selectedCollectionId,
hasDataAccess,
- hasNativeWrite,
}: LibrarySectionProps) {
const isAdmin = useSelector(getUserIsAdmin);
const [isModalOpened, { open: openModal, close: closeModal }] =
@@ -48,7 +47,6 @@ export function LibrarySection({
rootCollection={rootCollection}
selectedCollectionId={selectedCollectionId}
hasDataAccess={hasDataAccess}
- hasNativeWrite={hasNativeWrite}
/>
);
}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebarView/CreateCardMenu/CreateCardMenu.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebarView/CreateCardMenu/CreateCardMenu.tsx
index 7ce8182ea99..72a33c00477 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebarView/CreateCardMenu/CreateCardMenu.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/ModelingSectionLayout/ModelingSidebar/ModelingSidebarView/CreateCardMenu/CreateCardMenu.tsx
@@ -7,27 +7,17 @@ import { Button, FixedSizeIcon, Menu, Tooltip } from "metabase/ui";
import type { CollectionId } from "metabase-types/api";
type CreateCardMenuProps = {
- modelCollectionId?: CollectionId;
metricCollectionId?: CollectionId;
- canCreateModel: boolean;
- canCreateMetric: boolean;
- canCreateNativeQuery: boolean;
};
-export function CreateCardMenu({
- modelCollectionId,
- metricCollectionId,
- canCreateModel,
- canCreateMetric,
- canCreateNativeQuery,
-}: CreateCardMenuProps) {
+export function CreateCardMenu({ metricCollectionId }: CreateCardMenuProps) {
const handleClick = (event: MouseEvent) => {
event.stopPropagation();
};
return (
<Menu position="bottom-end">
- <Tooltip label={t`Create model or metric`}>
+ <Tooltip label={t`Create metric`}>
<Menu.Target>
<Button
w={24}
@@ -35,66 +25,21 @@ export function CreateCardMenu({
size="compact-xs"
variant="subtle"
c="text-medium"
- aria-label={t`Create model or metric`}
+ aria-label={t`Create metric`}
leftSection={<FixedSizeIcon name="add" size={16} />}
onClick={handleClick}
/>
</Menu.Target>
</Tooltip>
<Menu.Dropdown>
- {canCreateModel && canCreateNativeQuery && (
- <Menu.Sub>
- <Menu.Sub.Target>
- <Menu.Sub.Item leftSection={<FixedSizeIcon name="model" />}>
- {t`Model`}
- </Menu.Sub.Item>
- </Menu.Sub.Target>
- <Menu.Sub.Dropdown>
- <Menu.Item
- component={ForwardRefLink}
- to={Urls.newDataStudioQueryModel({
- collectionId: modelCollectionId,
- })}
- leftSection={<FixedSizeIcon name="notebook" />}
- onClick={handleClick}
- >
- {t`Query builder`}
- </Menu.Item>
- <Menu.Item
- component={ForwardRefLink}
- to={Urls.newDataStudioNativeModel({
- collectionId: modelCollectionId,
- })}
- leftSection={<FixedSizeIcon name="sql" />}
- onClick={handleClick}
- >
- {t`SQL query`}
- </Menu.Item>
- </Menu.Sub.Dropdown>
- </Menu.Sub>
- )}
- {canCreateModel && !canCreateNativeQuery && (
- <Menu.Item
- component={ForwardRefLink}
- to={Urls.newDataStudioQueryModel({
- collectionId: modelCollectionId,
- })}
- leftSection={<FixedSizeIcon name="model" />}
- onClick={handleClick}
- >
- {t`Model`}
- </Menu.Item>
- )}
- {canCreateMetric && (
- <Menu.Item
- component={ForwardRefLink}
- to={Urls.newDataStudioMetric({ collectionId: metricCollectionId })}
- leftSection={<FixedSizeIcon name="metric" />}
- onClick={handleClick}
- >
- {t`Metric`}
- </Menu.Item>
- )}
+ <Menu.Item
+ component={ForwardRefLink}
+ to={Urls.newDataStudioMetric({ collectionId: metricCollectionId })}
+ leftSection={<FixedSizeIcon name="metric" />}
+ onClick={handleClick}
+ >
+ {t`Metric`}
+ </Menu.Item>
</Menu.Dropdown>
</Menu>
);
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/CardMoreMenu/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/CardMoreMenu/index.ts
deleted file mode 100644
index f153f552f0c..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/CardMoreMenu/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./CardMoreMenu";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/CardOverview/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/CardOverview/index.ts
deleted file mode 100644
index 12b837dffab..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/CardOverview/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./CardOverview";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/components/MetricHeader/MetricHeader.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/components/MetricHeader/MetricHeader.tsx
index bc8b293236c..cc973694ff0 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/components/MetricHeader/MetricHeader.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/components/MetricHeader/MetricHeader.tsx
@@ -1,26 +1,14 @@
import type { ReactNode } from "react";
-import { push } from "react-router-redux";
-import { t } from "ttag";
-
-import { useUpdateCardMutation } from "metabase/api";
-import { useDispatch, useSelector } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
-import { useMetadataToasts } from "metabase/metadata/hooks";
-import { PLUGIN_DEPENDENCIES } from "metabase/plugins";
-import { getMetadata } from "metabase/selectors/metadata";
-import { CardMoreMenu } from "metabase-enterprise/data-studio/common/components/CardMoreMenu";
-import * as Lib from "metabase-lib";
-import type Metadata from "metabase-lib/v1/metadata/Metadata";
-import type { Card } from "metabase-types/api";
import {
PaneHeader,
- PaneHeaderInput,
- type PaneHeaderTab,
- PaneHeaderTabs,
PanelHeaderTitle,
-} from "../../../common/components/PaneHeader";
-import { NAME_MAX_LENGTH } from "../../constants";
+} from "metabase-enterprise/data-studio/common/components/PaneHeader";
+import type { Card } from "metabase-types/api";
+
+import { MetricMoreMenu } from "./MetricMoreMenu";
+import { MetricNameInput } from "./MetricNameInput";
+import { MetricTabs } from "./MetricTabs";
type MetricHeaderProps = {
card: Card;
@@ -45,100 +33,3 @@ export function MetricHeader({ card, actions }: MetricHeaderProps) {
/>
);
}
-
-type MetricNameInputProps = {
- card: Card;
- onChangeName?: (name: string) => void;
-};
-
-function MetricNameInput({ card }: MetricNameInputProps) {
- const [updateCard] = useUpdateCardMutation();
- const { sendSuccessToast, sendErrorToast } = useMetadataToasts();
-
- const handleChangeName = async (newName: string) => {
- const { error } = await updateCard({
- id: card.id,
- name: newName,
- });
-
- if (error) {
- sendErrorToast(t`Failed to update metric name`);
- } else {
- sendSuccessToast(t`Metric name updated`);
- }
- };
-
- return (
- <PaneHeaderInput
- initialValue={card.name}
- maxLength={NAME_MAX_LENGTH}
- onChange={handleChangeName}
- />
- );
-}
-
-type MetricMoreMenuProps = {
- card: Card;
-};
-
-function MetricMoreMenu({ card }: MetricMoreMenuProps) {
- const dispatch = useDispatch();
-
- const handleCopy = (newCard: Card) => {
- dispatch(push(Urls.dataStudioMetric(newCard.id)));
- };
-
- const handleArchive = () => {
- dispatch(push(Urls.dataStudioModeling()));
- };
-
- const handleUnarchive = () => {
- dispatch(push(Urls.dataStudioMetric(card.id)));
- };
-
- return (
- <CardMoreMenu
- card={card}
- onCopy={handleCopy}
- onArchive={handleArchive}
- onUnarchive={handleUnarchive}
- />
- );
-}
-
-type MetricTabsProps = {
- card: Card;
-};
-
-function MetricTabs({ card }: MetricTabsProps) {
- const metadata = useSelector(getMetadata);
- const tabs = getTabs(card, metadata);
- return <PaneHeaderTabs tabs={tabs} />;
-}
-
-function getTabs(card: Card, metadata: Metadata): PaneHeaderTab[] {
- const tabs: PaneHeaderTab[] = [
- {
- label: t`Overview`,
- to: Urls.dataStudioMetric(card.id),
- },
- ];
-
- const query = Lib.fromJsQueryAndMetadata(metadata, card.dataset_query);
- const queryInfo = Lib.queryDisplayInfo(query);
- if (queryInfo.isEditable) {
- tabs.push({
- label: t`Definition`,
- to: Urls.dataStudioMetricQuery(card.id),
- });
- }
-
- if (PLUGIN_DEPENDENCIES.isEnabled) {
- tabs.push({
- label: t`Dependencies`,
- to: Urls.dataStudioMetricDependencies(card.id),
- });
- }
-
- return tabs;
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/CardMoreMenu/CardMoreMenu.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/components/MetricHeader/MetricMoreMenu/MetricMoreMenu.tsx
similarity index 69%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/common/components/CardMoreMenu/CardMoreMenu.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/metrics/components/MetricHeader/MetricMoreMenu/MetricMoreMenu.tsx
index 0352585367d..6c5fa2c688b 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/CardMoreMenu/CardMoreMenu.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/components/MetricHeader/MetricMoreMenu/MetricMoreMenu.tsx
@@ -1,8 +1,9 @@
import { type ReactNode, useState } from "react";
+import { push } from "react-router-redux";
import { c, t } from "ttag";
import { ForwardRefLink } from "metabase/common/components/Link";
-import { useSelector } from "metabase/lib/redux";
+import { useDispatch, useSelector } from "metabase/lib/redux";
import * as Urls from "metabase/lib/urls";
import { ArchiveCardModal } from "metabase/questions/components/ArchiveCardModal";
import { CardCopyModal } from "metabase/questions/components/CardCopyModal";
@@ -12,32 +13,22 @@ import { ActionIcon, Icon, Menu } from "metabase/ui";
import * as Lib from "metabase-lib";
import type { Card } from "metabase-types/api";
-type CardModalType = "move" | "copy" | "archive";
+type MetricModalType = "move" | "copy" | "archive";
-type CardMoreMenuProps = {
+type MetricMoreMenuProps = {
card: Card;
- onCopy?: (newCard: Card) => void;
- onArchive?: () => void;
- onUnarchive?: () => void;
};
-export function CardMoreMenu({
- card,
- onCopy,
- onArchive,
- onUnarchive,
-}: CardMoreMenuProps) {
- const [modalType, setModalType] = useState<CardModalType>();
+export function MetricMoreMenu({ card }: MetricMoreMenuProps) {
+ const [modalType, setModalType] = useState<MetricModalType>();
+
return (
<>
- <CardMenu card={card} onOpenModal={setModalType} />
+ <MetricMenu card={card} onOpenModal={setModalType} />
{modalType != null && (
- <CardModal
+ <MetricModal
card={card}
modalType={modalType}
- onCopy={onCopy}
- onArchive={onArchive}
- onUnarchive={onUnarchive}
onClose={() => setModalType(undefined)}
/>
)}
@@ -45,12 +36,12 @@ export function CardMoreMenu({
);
}
-type CardMenuProps = {
+type MetricMenuProps = {
card: Card;
- onOpenModal: (modalType: CardModalType) => void;
+ onOpenModal: (modalType: MetricModalType) => void;
};
-function CardMenu({ card, onOpenModal }: CardMenuProps) {
+function MetricMenu({ card, onOpenModal }: MetricMenuProps) {
const menuItems: ReactNode[] = [];
const metadata = useSelector(getMetadata);
const query = Lib.fromJsQueryAndMetadata(metadata, card.dataset_query);
@@ -120,34 +111,40 @@ function CardMenu({ card, onOpenModal }: CardMenuProps) {
);
}
-type CardModalProps = {
+type MetricModalProps = {
card: Card;
- modalType: CardModalType;
- onCopy?: (newCard: Card) => void;
- onArchive?: () => void;
- onUnarchive?: () => void;
+ modalType: MetricModalType;
onClose: () => void;
};
-function CardModal({
- card,
- modalType,
- onCopy,
- onArchive,
- onUnarchive,
- onClose,
-}: CardModalProps) {
+function MetricModal({ card, modalType, onClose }: MetricModalProps) {
+ const dispatch = useDispatch();
+
+ const handleCopy = (newCard: Card) => {
+ dispatch(push(Urls.dataStudioMetric(newCard.id)));
+ };
+
+ const handleArchive = () => {
+ dispatch(push(Urls.dataStudioModeling()));
+ };
+
+ const handleUnarchive = () => {
+ dispatch(push(Urls.dataStudioMetric(card.id)));
+ };
+
switch (modalType) {
case "move":
return <MoveCardModal card={card} onClose={onClose} />;
case "copy":
- return <CardCopyModal card={card} onCopy={onCopy} onClose={onClose} />;
+ return (
+ <CardCopyModal card={card} onCopy={handleCopy} onClose={onClose} />
+ );
case "archive":
return (
<ArchiveCardModal
card={card}
- onArchive={onArchive}
- onUnarchive={onUnarchive}
+ onArchive={handleArchive}
+ onUnarchive={handleUnarchive}
onClose={onClose}
/>
);
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/components/MetricHeader/MetricMoreMenu/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/components/MetricHeader/MetricMoreMenu/index.ts
new file mode 100644
index 00000000000..4b4cd4b1064
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/components/MetricHeader/MetricMoreMenu/index.ts
@@ -0,0 +1 @@
+export * from "./MetricMoreMenu";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/components/MetricHeader/MetricNameInput/MetricNameInput.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/components/MetricHeader/MetricNameInput/MetricNameInput.tsx
new file mode 100644
index 00000000000..0ccae7ce395
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/components/MetricHeader/MetricNameInput/MetricNameInput.tsx
@@ -0,0 +1,39 @@
+import { t } from "ttag";
+
+import { useUpdateCardMutation } from "metabase/api";
+import { useMetadataToasts } from "metabase/metadata/hooks";
+import { PaneHeaderInput } from "metabase-enterprise/data-studio/common/components/PaneHeader";
+import type { Card } from "metabase-types/api";
+
+import { NAME_MAX_LENGTH } from "../../../constants";
+
+type MetricNameInputProps = {
+ card: Card;
+ onChangeName?: (name: string) => void;
+};
+
+export function MetricNameInput({ card }: MetricNameInputProps) {
+ const [updateCard] = useUpdateCardMutation();
+ const { sendSuccessToast, sendErrorToast } = useMetadataToasts();
+
+ const handleChangeName = async (newName: string) => {
+ const { error } = await updateCard({
+ id: card.id,
+ name: newName,
+ });
+
+ if (error) {
+ sendErrorToast(t`Failed to update metric name`);
+ } else {
+ sendSuccessToast(t`Metric name updated`);
+ }
+ };
+
+ return (
+ <PaneHeaderInput
+ initialValue={card.name}
+ maxLength={NAME_MAX_LENGTH}
+ onChange={handleChangeName}
+ />
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/components/MetricHeader/MetricNameInput/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/components/MetricHeader/MetricNameInput/index.ts
new file mode 100644
index 00000000000..8ab5a1a9ab7
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/components/MetricHeader/MetricNameInput/index.ts
@@ -0,0 +1 @@
+export * from "./MetricNameInput";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/components/MetricHeader/MetricTabs/MetricTabs.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/components/MetricHeader/MetricTabs/MetricTabs.tsx
new file mode 100644
index 00000000000..0c3e4b9bd33
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/components/MetricHeader/MetricTabs/MetricTabs.tsx
@@ -0,0 +1,50 @@
+import { t } from "ttag";
+
+import { useSelector } from "metabase/lib/redux";
+import * as Urls from "metabase/lib/urls";
+import { PLUGIN_DEPENDENCIES } from "metabase/plugins";
+import { getMetadata } from "metabase/selectors/metadata";
+import {
+ type PaneHeaderTab,
+ PaneHeaderTabs,
+} from "metabase-enterprise/data-studio/common/components/PaneHeader";
+import * as Lib from "metabase-lib";
+import type Metadata from "metabase-lib/v1/metadata/Metadata";
+import type { Card } from "metabase-types/api";
+
+type MetricTabsProps = {
+ card: Card;
+};
+
+export function MetricTabs({ card }: MetricTabsProps) {
+ const metadata = useSelector(getMetadata);
+ const tabs = getTabs(card, metadata);
+ return <PaneHeaderTabs tabs={tabs} />;
+}
+
+function getTabs(card: Card, metadata: Metadata): PaneHeaderTab[] {
+ const tabs: PaneHeaderTab[] = [
+ {
+ label: t`Overview`,
+ to: Urls.dataStudioMetric(card.id),
+ },
+ ];
+
+ const query = Lib.fromJsQueryAndMetadata(metadata, card.dataset_query);
+ const queryInfo = Lib.queryDisplayInfo(query);
+ if (queryInfo.isEditable) {
+ tabs.push({
+ label: t`Definition`,
+ to: Urls.dataStudioMetricQuery(card.id),
+ });
+ }
+
+ if (PLUGIN_DEPENDENCIES.isEnabled) {
+ tabs.push({
+ label: t`Dependencies`,
+ to: Urls.dataStudioMetricDependencies(card.id),
+ });
+ }
+
+ return tabs;
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/components/MetricHeader/MetricTabs/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/components/MetricHeader/MetricTabs/index.ts
new file mode 100644
index 00000000000..fb46accdbad
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/components/MetricHeader/MetricTabs/index.ts
@@ -0,0 +1 @@
+export * from "./MetricTabs";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/CardOverview/DescriptionSection/DescriptionSection.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricOverviewPage/MetricOverview/DescriptionSection/DescriptionSection.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/common/components/CardOverview/DescriptionSection/DescriptionSection.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricOverviewPage/MetricOverview/DescriptionSection/DescriptionSection.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/CardOverview/DescriptionSection/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricOverviewPage/MetricOverview/DescriptionSection/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/common/components/CardOverview/DescriptionSection/index.ts
rename to enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricOverviewPage/MetricOverview/DescriptionSection/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/CardOverview/CardOverview.module.css b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricOverviewPage/MetricOverview/MetricOverview.module.css
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/common/components/CardOverview/CardOverview.module.css
rename to enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricOverviewPage/MetricOverview/MetricOverview.module.css
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/CardOverview/CardOverview.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricOverviewPage/MetricOverview/MetricOverview.tsx
similarity index 78%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/common/components/CardOverview/CardOverview.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricOverviewPage/MetricOverview/MetricOverview.tsx
index aeaa65addc5..ab71726e13f 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/CardOverview/CardOverview.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricOverviewPage/MetricOverview/MetricOverview.tsx
@@ -1,18 +1,17 @@
import { EntityCreationInfo } from "metabase/common/components/EntityCreationInfo";
import { Flex, Stack } from "metabase/ui";
+import { OverviewVisualization } from "metabase-enterprise/data-studio/common/components/OverviewVisualization";
import type { Card } from "metabase-types/api";
-import { OverviewVisualization } from "../OverviewVisualization";
-
-import S from "./CardOverview.module.css";
import { DescriptionSection } from "./DescriptionSection";
+import S from "./MetricOverview.module.css";
import { QuerySourceSection } from "./QuerySourceSection";
-type CardOverviewProps = {
+type MetricOverviewProps = {
card: Card;
};
-export function CardOverview({ card }: CardOverviewProps) {
+export function MetricOverview({ card }: MetricOverviewProps) {
return (
<Flex className={S.root} p="lg" flex={1} bg="bg-light">
<Flex direction="column" flex={1} mah={700}>
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/CardOverview/QuerySourceSection/QuerySourceInfo.module.css b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricOverviewPage/MetricOverview/QuerySourceSection/QuerySourceInfo.module.css
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/common/components/CardOverview/QuerySourceSection/QuerySourceInfo.module.css
rename to enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricOverviewPage/MetricOverview/QuerySourceSection/QuerySourceInfo.module.css
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/CardOverview/QuerySourceSection/QuerySourceSection.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricOverviewPage/MetricOverview/QuerySourceSection/QuerySourceSection.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/common/components/CardOverview/QuerySourceSection/QuerySourceSection.tsx
rename to enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricOverviewPage/MetricOverview/QuerySourceSection/QuerySourceSection.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/CardOverview/QuerySourceSection/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricOverviewPage/MetricOverview/QuerySourceSection/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/common/components/CardOverview/QuerySourceSection/index.ts
rename to enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricOverviewPage/MetricOverview/QuerySourceSection/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricOverviewPage/MetricOverview/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricOverviewPage/MetricOverview/index.ts
new file mode 100644
index 00000000000..18a00fa75cc
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricOverviewPage/MetricOverview/index.ts
@@ -0,0 +1 @@
+export * from "./MetricOverview";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricOverviewPage/MetricOverviewPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricOverviewPage/MetricOverviewPage.tsx
index a499dbe00ed..a21bc8f5d9b 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricOverviewPage/MetricOverviewPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/metrics/pages/MetricOverviewPage/MetricOverviewPage.tsx
@@ -3,9 +3,10 @@ import * as Urls from "metabase/lib/urls";
import { Center, Flex } from "metabase/ui";
import { useLoadCardWithMetadata } from "metabase-enterprise/data-studio/common/hooks/use-load-card-with-metadata";
-import { CardOverview } from "../../../common/components/CardOverview";
import { MetricHeader } from "../../components/MetricHeader";
+import { MetricOverview } from "./MetricOverview";
+
type MetricOverviewPageParams = {
cardId: string;
};
@@ -29,7 +30,7 @@ export function MetricOverviewPage({ params }: MetricOverviewPageProps) {
return (
<Flex direction="column" h="100%" data-testid="metric-overview-page">
<MetricHeader card={card} />
- <CardOverview card={card} />
+ <MetricOverview card={card} />
</Flex>
);
}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionEmptyState/CollectionEmptyState.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionEmptyState/CollectionEmptyState.tsx
index 71c7dea831c..2f89fbae8eb 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionEmptyState/CollectionEmptyState.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionEmptyState/CollectionEmptyState.tsx
@@ -28,9 +28,9 @@ export function CollectionEmptyState({
function getMessages(collection: Collection) {
switch (PLUGIN_DATA_STUDIO.getLibraryCollectionType(collection.type)) {
- case "models":
+ case "data":
return {
- title: t`No tables or models yet`,
+ title: t`No published tables yet`,
message: t`Publish tables in the Library to see them here.`,
};
case "metrics":
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionItemsTable/CollectionItemsTable.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionItemsTable/CollectionItemsTable.tsx
index 492659482ed..6046c71d5c8 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionItemsTable/CollectionItemsTable.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionItemsTable/CollectionItemsTable.tsx
@@ -45,7 +45,7 @@ export function CollectionItemsTable({ items }: CollectionItemsTableProps) {
);
return (
- <Table aria-label={t`Table of models and metrics`}>
+ <Table aria-label={t`Table of tables and metrics`}>
<colgroup>
<NameColumn {...sharedProps} />
<TableColumn {...descriptionProps} width="60%" />
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionItemsTable/MenuCell/MenuCell.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionItemsTable/MenuCell/MenuCell.tsx
index d849250b9f6..fd767d0ee28 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionItemsTable/MenuCell/MenuCell.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionItemsTable/MenuCell/MenuCell.tsx
@@ -35,8 +35,7 @@ export function MenuCell({ item }: MenuCellProps) {
return <Cell />;
}
- const deleteLabel =
- item.model === "metric" ? t`Delete metric` : t`Delete model`;
+ const deleteLabel = item.model === "metric" ? t`Delete metric` : t`Delete`;
return (
<Cell onClick={stopPropagation} className={S.menuCell}>
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionPage.tsx
index 089bbf14ed8..a31b9e7dcfd 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionPage.tsx
@@ -36,7 +36,7 @@ export function CollectionPage({ params }: CollectionPageProps) {
error: itemsError,
} = useListCollectionItemsQuery({
id: params.collectionId,
- models: ["dataset", "metric", "table"],
+ models: ["table", "metric"],
});
const items = data?.data ?? [];
const isLoading = isLoadingCollection || isLoadingItems;
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionPage.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionPage.unit.spec.tsx
index 245f6699585..7bef266b673 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionPage.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/CollectionPage/CollectionPage.unit.spec.tsx
@@ -22,10 +22,10 @@ const TEST_COLLECTION = createMockCollection({
name: "Test Collection",
});
-const TEST_MODEL_ITEM = createMockCollectionItem({
+const TEST_TABLE_ITEM = createMockCollectionItem({
id: 1,
- name: "Test Model",
- model: "dataset",
+ name: "Test Table",
+ model: "table",
collection_id: TEST_COLLECTION.id,
});
@@ -45,7 +45,7 @@ const TEST_CARD_ITEM = createMockCollectionItem({
interface SetupOpts {
collection?: typeof TEST_COLLECTION;
- collectionItems?: (typeof TEST_MODEL_ITEM)[];
+ collectionItems?: (typeof TEST_TABLE_ITEM)[];
collectionError?: string;
itemsError?: string;
}
@@ -70,7 +70,7 @@ const setup = async ({
setupCollectionItemsEndpoint({
collection,
collectionItems,
- models: ["dataset", "metric"],
+ models: ["table", "metric"],
});
}
@@ -87,7 +87,7 @@ describe("CollectionPage", () => {
it("should render collection name in header", async () => {
await setup({
- collectionItems: [TEST_MODEL_ITEM],
+ collectionItems: [TEST_TABLE_ITEM],
});
await waitForLoaderToBeRemoved();
@@ -106,15 +106,15 @@ describe("CollectionPage", () => {
).toBeInTheDocument();
});
- it("should display items table when collection has models", async () => {
+ it("should display items table when collection has tables", async () => {
await setup({
- collectionItems: [TEST_MODEL_ITEM],
+ collectionItems: [TEST_TABLE_ITEM],
});
await waitForLoaderToBeRemoved();
expect(screen.getByTestId("collection-page")).toBeInTheDocument();
- expect(screen.getByText(TEST_MODEL_ITEM.name)).toBeInTheDocument();
+ expect(screen.getByText(TEST_TABLE_ITEM.name)).toBeInTheDocument();
});
it("should display items table when collection has metrics", async () => {
@@ -128,27 +128,27 @@ describe("CollectionPage", () => {
expect(screen.getByText(TEST_METRIC_ITEM.name)).toBeInTheDocument();
});
- it("should display both models and metrics in items table", async () => {
+ it("should display both tables and metrics in items table", async () => {
await setup({
- collectionItems: [TEST_MODEL_ITEM, TEST_METRIC_ITEM, TEST_CARD_ITEM],
+ collectionItems: [TEST_TABLE_ITEM, TEST_METRIC_ITEM, TEST_CARD_ITEM],
});
await waitForLoaderToBeRemoved();
- expect(screen.getByText(TEST_MODEL_ITEM.name)).toBeInTheDocument();
+ expect(screen.getByText(TEST_TABLE_ITEM.name)).toBeInTheDocument();
expect(screen.getByText(TEST_METRIC_ITEM.name)).toBeInTheDocument();
// should filter out cards
expect(screen.queryByText(TEST_CARD_ITEM.name)).not.toBeInTheDocument();
});
- it("should show model icons", async () => {
+ it("should show table icons", async () => {
await setup({
- collectionItems: [TEST_MODEL_ITEM],
+ collectionItems: [TEST_TABLE_ITEM],
});
await waitForLoaderToBeRemoved();
- expect(await screen.findByLabelText("model icon")).toBeInTheDocument();
+ expect(await screen.findByLabelText("table icon")).toBeInTheDocument();
});
it("should show metric icons", async () => {
@@ -179,9 +179,9 @@ describe("CollectionPage", () => {
expect(screen.getByText(errorMessage)).toBeInTheDocument();
});
- it("should request only tables, models, and metrics from API", async () => {
+ it("should request only tables and metrics from API", async () => {
await setup({
- collectionItems: [TEST_MODEL_ITEM, TEST_METRIC_ITEM],
+ collectionItems: [TEST_TABLE_ITEM, TEST_METRIC_ITEM],
});
await waitForLoaderToBeRemoved();
@@ -194,12 +194,12 @@ describe("CollectionPage", () => {
const url = new URL(itemsCall.url);
const models = url.searchParams.getAll("models");
- expect(models).toEqual(["dataset", "metric", "table"]);
+ expect(models).toEqual(["table", "metric"]);
});
it("should show collection name in page header", async () => {
await setup({
- collectionItems: [TEST_MODEL_ITEM],
+ collectionItems: [TEST_TABLE_ITEM],
});
await waitForLoaderToBeRemoved();
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/ModelingEmptyPage/ModelingEmptyPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/ModelingEmptyPage/ModelingEmptyPage.tsx
index 597a2f63c1c..995da4b0bc2 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/ModelingEmptyPage/ModelingEmptyPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/pages/ModelingEmptyPage/ModelingEmptyPage.tsx
@@ -9,8 +9,8 @@ export function ModelingEmptyPage() {
<Center h="100%" bg="bg-light" data-testid="modeling-empty-page">
<EmptyState
illustrationElement={<img src={EmptyDashboardBot} />}
- title={t`Pick a collection or create a new model or metric`}
- message={t`Build your semantic layer with models and metrics.`}
+ title={t`Pick a collection or create a new metric`}
+ message={t`Build your semantic layer with tables and metrics.`}
/>
</Center>
);
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/utils.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/utils.ts
index 1364fcc7344..42e508ad4bf 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/utils.ts
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/modeling/utils.ts
@@ -5,8 +5,6 @@ export function getItemUrl(item: CollectionItem) {
switch (item.model) {
case "table":
return Urls.dataStudioTable(item.id);
- case "dataset":
- return Urls.dataStudioModel(item.id);
case "metric":
return Urls.dataStudioMetric(item.id);
default:
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/models/components/ModelHeader/ModelHeader.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/models/components/ModelHeader/ModelHeader.tsx
deleted file mode 100644
index 36f2c1ed497..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/models/components/ModelHeader/ModelHeader.tsx
+++ /dev/null
@@ -1,149 +0,0 @@
-import type { ReactNode } from "react";
-import { push } from "react-router-redux";
-import { t } from "ttag";
-
-import { useUpdateCardMutation } from "metabase/api";
-import { useDispatch, useSelector } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
-import { useMetadataToasts } from "metabase/metadata/hooks";
-import { PLUGIN_DEPENDENCIES } from "metabase/plugins";
-import { getMetadata } from "metabase/selectors/metadata";
-import { CardMoreMenu } from "metabase-enterprise/data-studio/common/components/CardMoreMenu";
-import * as Lib from "metabase-lib";
-import type Metadata from "metabase-lib/v1/metadata/Metadata";
-import type { Card } from "metabase-types/api";
-
-import {
- PaneHeader,
- PaneHeaderInput,
- type PaneHeaderTab,
- PaneHeaderTabs,
- PanelHeaderTitle,
-} from "../../../common/components/PaneHeader";
-import { NAME_MAX_LENGTH } from "../../constants";
-
-type ModelHeaderProps = {
- card: Card;
- actions?: ReactNode;
-};
-
-export function ModelHeader({ card, actions }: ModelHeaderProps) {
- return (
- <PaneHeader
- data-testid="model-header"
- title={
- card.can_write ? (
- <ModelNameInput card={card} />
- ) : (
- <PanelHeaderTitle>{card.name}</PanelHeaderTitle>
- )
- }
- icon="model"
- menu={<ModelMoreMenu card={card} />}
- tabs={<ModelTabs card={card} />}
- actions={actions}
- />
- );
-}
-
-type ModelNameInputProps = {
- card: Card;
- onChangeName?: (name: string) => void;
-};
-
-function ModelNameInput({ card }: ModelNameInputProps) {
- const [updateCard] = useUpdateCardMutation();
- const { sendSuccessToast, sendErrorToast } = useMetadataToasts();
-
- const handleChangeName = async (newName: string) => {
- const { error } = await updateCard({
- id: card.id,
- name: newName,
- });
-
- if (error) {
- sendErrorToast(t`Failed to update model name`);
- } else {
- sendSuccessToast(t`Model name updated`);
- }
- };
-
- return (
- <PaneHeaderInput
- initialValue={card.name}
- maxLength={NAME_MAX_LENGTH}
- onChange={handleChangeName}
- />
- );
-}
-
-type ModelMoreMenuProps = {
- card: Card;
-};
-
-function ModelMoreMenu({ card }: ModelMoreMenuProps) {
- const dispatch = useDispatch();
-
- const handleCopy = (newCard: Card) => {
- dispatch(push(Urls.dataStudioModel(newCard.id)));
- };
-
- const handleArchive = () => {
- dispatch(push(Urls.dataStudioModeling()));
- };
-
- const handleUnarchive = () => {
- dispatch(push(Urls.dataStudioModel(card.id)));
- };
-
- return (
- <CardMoreMenu
- card={card}
- onCopy={handleCopy}
- onArchive={handleArchive}
- onUnarchive={handleUnarchive}
- />
- );
-}
-
-type ModelTabsProps = {
- card: Card;
-};
-
-function ModelTabs({ card }: ModelTabsProps) {
- const metadata = useSelector(getMetadata);
- const tabs = getTabs(card, metadata);
- return <PaneHeaderTabs tabs={tabs} />;
-}
-
-function getTabs(card: Card, metadata: Metadata): PaneHeaderTab[] {
- const tabs: PaneHeaderTab[] = [
- {
- label: t`Overview`,
- to: Urls.dataStudioModel(card.id),
- },
- ];
-
- const query = Lib.fromJsQueryAndMetadata(metadata, card.dataset_query);
- const queryInfo = Lib.queryDisplayInfo(query);
- if (queryInfo.isEditable) {
- tabs.push({
- label: t`Definition`,
- to: Urls.dataStudioModelQuery(card.id),
- });
- }
-
- tabs.push({
- label: t`Fields`,
- to: Urls.dataStudioModelFields(card.id),
- });
-
- if (PLUGIN_DEPENDENCIES.isEnabled) {
- tabs.push({
- label: t`Dependencies`,
- to: Urls.dataStudioModelDependencies(card.id),
- });
- }
-
- return tabs;
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/models/components/ModelHeader/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/models/components/ModelHeader/index.ts
deleted file mode 100644
index 7384e56e46e..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/models/components/ModelHeader/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./ModelHeader";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/models/components/ModelQueryEditor/ModelQueryEditor.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/models/components/ModelQueryEditor/ModelQueryEditor.tsx
deleted file mode 100644
index 417ff5779a3..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/models/components/ModelQueryEditor/ModelQueryEditor.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-import { useMemo } from "react";
-
-import { QueryEditor } from "metabase/querying/editor/components/QueryEditor";
-import type { QueryEditorUiState } from "metabase/querying/editor/types";
-import type * as Lib from "metabase-lib";
-
-import { getEditorOptions } from "./utils";
-
-type ModelEditorProps = {
- query: Lib.Query;
- uiState: QueryEditorUiState;
- readOnly?: boolean;
- onChangeQuery: (newQuery: Lib.Query) => void;
- onChangeUiState: (newUiState: QueryEditorUiState) => void;
-};
-
-export function ModelQueryEditor({
- query,
- uiState,
- readOnly = false,
- onChangeQuery,
- onChangeUiState,
-}: ModelEditorProps) {
- const uiOptions = useMemo(() => getEditorOptions(readOnly), [readOnly]);
-
- return (
- <QueryEditor
- query={query}
- uiState={uiState}
- uiOptions={uiOptions}
- onChangeQuery={onChangeQuery}
- onChangeUiState={onChangeUiState}
- />
- );
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/models/components/ModelQueryEditor/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/models/components/ModelQueryEditor/index.ts
deleted file mode 100644
index b47e412f949..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/models/components/ModelQueryEditor/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./ModelQueryEditor";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/models/components/ModelQueryEditor/utils.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/models/components/ModelQueryEditor/utils.ts
deleted file mode 100644
index 8f19e854d36..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/models/components/ModelQueryEditor/utils.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { t } from "ttag";
-
-import type { QueryEditorUiOptions } from "metabase/querying/editor/types";
-
-export function getEditorOptions(readOnly: boolean): QueryEditorUiOptions {
- return {
- cardType: "model",
- readOnly,
- canConvertToNative: true,
- convertToNativeTitle: t`SQL for this model`,
- convertToNativeButtonLabel: t`Convert this model to SQL`,
- };
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/models/constants.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/models/constants.ts
deleted file mode 100644
index 9c12330ebda..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/models/constants.ts
+++ /dev/null
@@ -1 +0,0 @@
-export const NAME_MAX_LENGTH = 254;
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelDependenciesPage/ModelDependenciesPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelDependenciesPage/ModelDependenciesPage.tsx
deleted file mode 100644
index 89a9a2a96fb..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelDependenciesPage/ModelDependenciesPage.tsx
+++ /dev/null
@@ -1,48 +0,0 @@
-import type { ReactNode } from "react";
-
-import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
-import * as Urls from "metabase/lib/urls";
-import { PLUGIN_DEPENDENCIES } from "metabase/plugins";
-import { Center, Flex } from "metabase/ui";
-import { useLoadCardWithMetadata } from "metabase-enterprise/data-studio/common/hooks/use-load-card-with-metadata";
-
-import { ModelHeader } from "../../components/ModelHeader";
-
-type ModelDependenciesPageParams = {
- cardId: string;
-};
-
-type ModelDependenciesPageProps = {
- params: ModelDependenciesPageParams;
- children?: ReactNode;
-};
-
-export function ModelDependenciesPage({
- params,
- children,
-}: ModelDependenciesPageProps) {
- const cardId = Urls.extractEntityId(params.cardId);
- const { card, isLoading, error } = useLoadCardWithMetadata(cardId);
-
- if (isLoading || error != null || card == null) {
- return (
- <Center h="100%">
- <LoadingAndErrorWrapper loading={isLoading} error={error} />
- </Center>
- );
- }
-
- return (
- <Flex direction="column" h="100%">
- <ModelHeader card={card} />
- <PLUGIN_DEPENDENCIES.DependencyGraphPageContext.Provider
- value={{
- baseUrl: Urls.dataStudioModelDependencies(card.id),
- defaultEntry: { id: card.id, type: "card" },
- }}
- >
- {children}
- </PLUGIN_DEPENDENCIES.DependencyGraphPageContext.Provider>
- </Flex>
- );
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelDependenciesPage/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelDependenciesPage/index.ts
deleted file mode 100644
index fbe46462baa..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelDependenciesPage/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./ModelDependenciesPage";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelFieldsPage/ModelFieldDetails/ModelFieldDetails.module.css b/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelFieldsPage/ModelFieldDetails/ModelFieldDetails.module.css
deleted file mode 100644
index fada053163c..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelFieldsPage/ModelFieldDetails/ModelFieldDetails.module.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.section {
- overflow: auto;
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelFieldsPage/ModelFieldDetails/ModelFieldDetails.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelFieldsPage/ModelFieldDetails/ModelFieldDetails.tsx
deleted file mode 100644
index ecf433d273d..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelFieldsPage/ModelFieldDetails/ModelFieldDetails.tsx
+++ /dev/null
@@ -1,146 +0,0 @@
-import { useMemo } from "react";
-import { t } from "ttag";
-
-import { getColumnIcon } from "metabase/common/utils/columns";
-import {
- FieldVisibilityPicker,
- LabeledValue,
- NameDescriptionInput,
- SemanticTypeAndTargetPicker,
- TitledSection,
-} from "metabase/metadata/components";
-import { Box, Flex, Group, Title } from "metabase/ui";
-import ColumnSettings from "metabase/visualizations/components/ColumnSettings";
-import { getGlobalSettingsForColumn } from "metabase/visualizations/lib/settings/column";
-import * as Lib from "metabase-lib";
-import type {
- Field,
- FieldFormattingSettings,
- FieldVisibilityType,
-} from "metabase-types/api";
-
-import { NAME_MAX_LENGTH } from "../../../constants";
-import type { FieldOverrides } from "../../../types";
-
-import S from "./ModelFieldDetails.module.css";
-
-type ModelFieldDetailsProps = {
- field: Field;
- idFields: Field[];
- isReadOnly: boolean;
- onChangeField: (field: Field, overrides: FieldOverrides) => void;
-};
-
-export function ModelFieldDetails({
- field,
- idFields,
- isReadOnly,
- onChangeField,
-}: ModelFieldDetailsProps) {
- const denyList = useMemo(() => {
- return Lib.isCurrency(Lib.legacyColumnTypeInfo(field))
- ? new Set(["column_title", "number_style"])
- : new Set(["column_title"]);
- }, [field]);
-
- const inheritedSettings = useMemo(() => {
- return getGlobalSettingsForColumn();
- }, []);
-
- const handleChange = (overrides: FieldOverrides) => {
- onChangeField(field, overrides);
- };
-
- const handleNameChange = (name: string) => {
- onChangeField(field, { display_name: name });
- };
-
- const handleDescriptionChange = (description: string | null) => {
- onChangeField(field, { description });
- };
-
- const handleVisibilityChange = (visibility: FieldVisibilityType) => {
- onChangeField(field, { visibility_type: visibility });
- };
-
- const handleSettingsChange = (settings: FieldFormattingSettings) => {
- onChangeField(field, { settings });
- };
-
- return (
- <Flex
- className={S.section}
- flex={1}
- direction="column"
- h="100%"
- bg="bg-white"
- >
- <Box p="md">
- <NameDescriptionInput
- name={field.display_name}
- nameIcon={getColumnIcon(Lib.legacyColumnTypeInfo(field))}
- nameMaxLength={NAME_MAX_LENGTH}
- namePlaceholder={t`Give this field a name`}
- description={field.description ?? ""}
- descriptionPlaceholder={
- isReadOnly
- ? t`No description yet`
- : t`Give this field a description`
- }
- readOnly={isReadOnly}
- onNameChange={handleNameChange}
- onDescriptionChange={handleDescriptionChange}
- />
- </Box>
- <Title order={5} px="md">
- {t`Settings`}
- </Title>
- <Flex direction="column" p="md" gap="md">
- <TitledSection>
- <Group>
- <Box flex={1}>
- <LabeledValue label={t`Field name`}>{field.name}</LabeledValue>
- </Box>
- <Box flex={1}>
- <LabeledValue label={t`Data type`}>
- {field.database_type}
- </LabeledValue>
- </Box>
- </Group>
- </TitledSection>
- {!isReadOnly && (
- <>
- <TitledSection>
- <SemanticTypeAndTargetPicker
- label={t`Semantic type`}
- description={t`What this data represents`}
- field={field}
- idFields={idFields}
- onChange={handleChange}
- />
- </TitledSection>
- <TitledSection>
- <FieldVisibilityPicker
- label={t`Visibility`}
- description={t`Where this field should be displayed`}
- value={field.visibility_type}
- onChange={handleVisibilityChange}
- />
- </TitledSection>
- <TitledSection>
- <ColumnSettings
- value={field.settings ?? {}}
- column={field}
- denylist={denyList}
- extraData={{ forAdminSettings: true }}
- inheritedSettings={inheritedSettings}
- style={{ maxWidth: undefined }}
- onChange={handleSettingsChange}
- />
- </TitledSection>
- </>
- )}
- </Flex>
- </Flex>
- );
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelFieldsPage/ModelFieldDetails/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelFieldsPage/ModelFieldDetails/index.ts
deleted file mode 100644
index a5784cce80c..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelFieldsPage/ModelFieldDetails/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./ModelFieldDetails";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelFieldsPage/ModelFieldList/ModelFieldList.module.css b/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelFieldsPage/ModelFieldList/ModelFieldList.module.css
deleted file mode 100644
index ef33573dccf..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelFieldsPage/ModelFieldList/ModelFieldList.module.css
+++ /dev/null
@@ -1,11 +0,0 @@
-.section {
- overflow: auto;
- border-right: 1px solid var(--mb-color-border);
-}
-
-.header {
- position: sticky;
- top: 0;
- z-index: 1;
- background-color: var(--mb-color-bg-light);
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelFieldsPage/ModelFieldList/ModelFieldList.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelFieldsPage/ModelFieldList/ModelFieldList.tsx
deleted file mode 100644
index d600f7cc2f5..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelFieldsPage/ModelFieldList/ModelFieldList.tsx
+++ /dev/null
@@ -1,58 +0,0 @@
-import { FieldList } from "metabase/metadata/components/FieldList";
-import { Box, Flex } from "metabase/ui";
-import type { Field } from "metabase-types/api";
-
-import type { FieldOverrides } from "../../../types";
-
-import S from "./ModelFieldList.module.css";
-
-type ModelFieldListProps = {
- fields: Field[];
- activeFieldName?: string;
- isReadOnly: boolean;
- onSelectField: (field: Field) => void;
- onChangeField: (field: Field, overrides: FieldOverrides) => void;
-};
-
-export function ModelFieldList({
- fields,
- activeFieldName,
- isReadOnly,
- onSelectField,
- onChangeField,
-}: ModelFieldListProps) {
- const handleNameChange = (field: Field, name: string) => {
- onChangeField(field, { display_name: name });
- };
-
- const handleDescriptionChange = (
- field: Field,
- description: string | null,
- ) => {
- onChangeField(field, { description });
- };
-
- return (
- <Flex
- className={S.section}
- flex={activeFieldName ? "0 0 33%" : 1}
- direction="column"
- >
- <Box px="md" pb="md" pt={isReadOnly ? "md" : undefined}>
- <FieldList
- fields={fields}
- activeFieldKey={activeFieldName}
- readOnly={isReadOnly}
- getFieldKey={getFieldKey}
- onSelect={onSelectField}
- onNameChange={handleNameChange}
- onDescriptionChange={handleDescriptionChange}
- />
- </Box>
- </Flex>
- );
-}
-
-function getFieldKey(field: Field) {
- return field.name;
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelFieldsPage/ModelFieldList/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelFieldsPage/ModelFieldList/index.ts
deleted file mode 100644
index a4a0963c294..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelFieldsPage/ModelFieldList/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./ModelFieldList";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelFieldsPage/ModelFieldsPage.module.css b/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelFieldsPage/ModelFieldsPage.module.css
deleted file mode 100644
index 18249a9b674..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelFieldsPage/ModelFieldsPage.module.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.contentWrapper {
- overflow-x: auto;
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelFieldsPage/ModelFieldsPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelFieldsPage/ModelFieldsPage.tsx
deleted file mode 100644
index 2c72a084676..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelFieldsPage/ModelFieldsPage.tsx
+++ /dev/null
@@ -1,176 +0,0 @@
-import { useLayoutEffect, useMemo, useState } from "react";
-import type { Route } from "react-router";
-import { useLatest } from "react-use";
-import { t } from "ttag";
-import _ from "underscore";
-
-import {
- skipToken,
- useListDatabaseIdFieldsQuery,
- useUpdateCardMutation,
-} from "metabase/api";
-import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal";
-import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
-import * as Urls from "metabase/lib/urls";
-import { useMetadataToasts } from "metabase/metadata/hooks";
-import { PLUGIN_FEATURE_LEVEL_PERMISSIONS } from "metabase/plugins";
-import { Center, Flex } from "metabase/ui";
-import { useLoadCardWithMetadata } from "metabase-enterprise/data-studio/common/hooks/use-load-card-with-metadata";
-import type { Card, Field } from "metabase-types/api";
-
-import { PaneHeaderActions } from "../../../common/components/PaneHeader";
-import { ModelHeader } from "../../components/ModelHeader";
-import type { FieldOverrides } from "../../types";
-
-import { ModelFieldDetails } from "./ModelFieldDetails";
-import { ModelFieldList } from "./ModelFieldList";
-import S from "./ModelFieldsPage.module.css";
-
-type ModelFieldsPageParams = {
- cardId: string;
-};
-
-type ModelFieldsPageProps = {
- params: ModelFieldsPageParams;
- route: Route;
-};
-
-export function ModelFieldsPage({ params, route }: ModelFieldsPageProps) {
- const cardId = Urls.extractEntityId(params.cardId);
- const {
- card,
- isLoading: isLoadingCard,
- error: cardError,
- } = useLoadCardWithMetadata(cardId);
- const {
- data: idFields = [],
- isLoading: isLoadingFields,
- error: fieldsError,
- } = useListDatabaseIdFieldsQuery(
- card?.database_id != null
- ? {
- id: card.database_id,
- ...PLUGIN_FEATURE_LEVEL_PERMISSIONS.dataModelQueryProps,
- }
- : skipToken,
- );
- const isLoading = isLoadingCard || isLoadingFields;
- const error = cardError ?? fieldsError;
-
- if (isLoading || error != null || card == null) {
- return (
- <Center h="100%">
- <LoadingAndErrorWrapper loading={isLoading} error={error} />
- </Center>
- );
- }
-
- return <ModelFieldsPageBody card={card} idFields={idFields} route={route} />;
-}
-
-type ModelFieldsPageBodyProps = {
- card: Card;
- idFields: Field[];
- route: Route;
-};
-
-function ModelFieldsPageBody({
- card,
- idFields,
- route,
-}: ModelFieldsPageBodyProps) {
- const [fields, setFields] = useState(card.result_metadata ?? []);
- const [activeFieldName, setActiveFieldName] = useState<string>();
- const [updateCard, { isLoading: isSaving }] = useUpdateCardMutation();
- const { sendSuccessToast, sendErrorToast } = useMetadataToasts();
- const isReadOnly = !card.can_write;
-
- const activeField = useMemo(
- () => (activeFieldName ? fieldField(fields, activeFieldName) : null),
- [fields, activeFieldName],
- );
-
- const isDirty = useMemo(
- () => !_.isEqual(fields, card.result_metadata ?? []),
- [fields, card],
- );
-
- const handleSelectField = (field: Field) => {
- setActiveFieldName(field.name);
- };
-
- const handleChangeField = (field: Field, overrides: FieldOverrides) => {
- const newFields = [...fields];
- newFields[findFieldIndex(fields, field.name)] = { ...field, ...overrides };
- setFields(newFields);
- };
-
- const handleSave = async () => {
- const { error } = await updateCard({
- id: card.id,
- result_metadata: fields,
- });
- if (error == null) {
- sendSuccessToast(t`Model fields updated`);
- } else {
- sendErrorToast(t`Failed to update model fields`);
- }
- };
-
- const handleCancel = () => {
- setFields(card.result_metadata ?? []);
- setActiveFieldName(undefined);
- };
-
- const resetRef = useLatest(handleCancel);
-
- useLayoutEffect(() => {
- resetRef.current();
- }, [card.id, resetRef]);
-
- return (
- <>
- <Flex direction="column" h="100%" data-testid="model-fields-page">
- <ModelHeader
- card={card}
- actions={
- <PaneHeaderActions
- isDirty={isDirty}
- isSaving={isSaving}
- onSave={handleSave}
- onCancel={handleCancel}
- />
- }
- />
- <Flex className={S.contentWrapper} flex={1}>
- <Flex flex={1} mih={0} bg="bg-light" miw={740}>
- <ModelFieldList
- fields={fields}
- activeFieldName={activeFieldName}
- isReadOnly={isReadOnly}
- onSelectField={handleSelectField}
- onChangeField={handleChangeField}
- />
- {activeField != null ? (
- <ModelFieldDetails
- field={activeField}
- idFields={idFields}
- isReadOnly={isReadOnly}
- onChangeField={handleChangeField}
- />
- ) : null}
- </Flex>
- </Flex>
- </Flex>
- <LeaveRouteConfirmModal route={route} isEnabled={isDirty} />
- </>
- );
-}
-
-function fieldField(fields: Field[], fieldName: string) {
- return fields[findFieldIndex(fields, fieldName)];
-}
-
-function findFieldIndex(fields: Field[], fieldName: string) {
- return fields.findIndex((field) => field.name === fieldName);
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelFieldsPage/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelFieldsPage/index.ts
deleted file mode 100644
index c2e644bb6fe..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelFieldsPage/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./ModelFieldsPage";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelOverviewPage/ModelOverviewPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelOverviewPage/ModelOverviewPage.tsx
deleted file mode 100644
index bad5e59f4c9..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelOverviewPage/ModelOverviewPage.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
-import * as Urls from "metabase/lib/urls";
-import { Center, Flex } from "metabase/ui";
-import { useLoadCardWithMetadata } from "metabase-enterprise/data-studio/common/hooks/use-load-card-with-metadata";
-
-import { CardOverview } from "../../../common/components/CardOverview";
-import { ModelHeader } from "../../components/ModelHeader";
-
-type ModelOverviewPageParams = {
- cardId: string;
-};
-
-type ModelOverviewPageProps = {
- params: ModelOverviewPageParams;
-};
-
-export function ModelOverviewPage({ params }: ModelOverviewPageProps) {
- const cardId = Urls.extractEntityId(params.cardId);
- const { card, isLoading, error } = useLoadCardWithMetadata(cardId);
-
- if (isLoading || error != null || card == null) {
- return (
- <Center h="100%">
- <LoadingAndErrorWrapper loading={isLoading} error={error} />
- </Center>
- );
- }
-
- return (
- <Flex direction="column" h="100%" data-testid="model-overview-page">
- <ModelHeader card={card} />
- <CardOverview card={card} />
- </Flex>
- );
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelOverviewPage/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelOverviewPage/index.ts
deleted file mode 100644
index dc304796b28..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelOverviewPage/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./ModelOverviewPage";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelQueryPage/ModelQueryPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelQueryPage/ModelQueryPage.tsx
deleted file mode 100644
index 8f2143c6f91..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelQueryPage/ModelQueryPage.tsx
+++ /dev/null
@@ -1,202 +0,0 @@
-import { useLayoutEffect, useMemo, useState } from "react";
-import type { Route } from "react-router";
-import { useLatest } from "react-use";
-import { t } from "ttag";
-
-import { useUpdateCardMutation } from "metabase/api";
-import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal";
-import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
-import { useSelector } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
-import { useMetadataToasts } from "metabase/metadata/hooks";
-import { PLUGIN_DEPENDENCIES } from "metabase/plugins";
-import {
- type QueryEditorUiState,
- getInitialUiState,
-} from "metabase/querying/editor/components/QueryEditor";
-import { getMetadata } from "metabase/selectors/metadata";
-import { Center, Stack } from "metabase/ui";
-import { useLoadCardWithMetadata } from "metabase-enterprise/data-studio/common/hooks/use-load-card-with-metadata";
-import { getResultMetadata } from "metabase-enterprise/data-studio/common/utils";
-import * as Lib from "metabase-lib";
-import Question from "metabase-lib/v1/Question";
-import type { Card } from "metabase-types/api";
-
-import { PaneHeaderActions } from "../../../common/components/PaneHeader";
-import { ModelHeader } from "../../components/ModelHeader";
-import { ModelQueryEditor } from "../../components/ModelQueryEditor";
-import { getValidationResult } from "../../utils";
-
-import {
- applyFieldOverridesInDataset,
- applyFieldOverridesInResultMetadata,
-} from "./utils";
-
-type ModelQueryPageParams = {
- cardId: string;
-};
-
-type ModelQueryPageProps = {
- params: ModelQueryPageParams;
- route: Route;
-};
-
-export function ModelQueryPage({ params, route }: ModelQueryPageProps) {
- const cardId = Urls.extractEntityId(params.cardId);
- const { card, isLoading, error } = useLoadCardWithMetadata(cardId);
-
- if (isLoading || error != null || card == null) {
- return (
- <Center h="100%">
- <LoadingAndErrorWrapper loading={isLoading} error={error} />
- </Center>
- );
- }
-
- return <ModelQueryPageBody card={card} route={route} />;
-}
-
-type ModelQueryPageBodyProps = {
- card: Card;
- route: Route;
-};
-
-function ModelQueryPageBody({ card, route }: ModelQueryPageBodyProps) {
- const metadata = useSelector(getMetadata);
- const [datasetQuery, setDatasetQuery] = useState(card.dataset_query);
- const [uiState, setUiState] = useState(getInitialUiState);
- const [updateCard, { isLoading: isSaving }] = useUpdateCardMutation();
- const { sendSuccessToast, sendErrorToast } = useMetadataToasts();
-
- const question = useMemo(() => {
- return new Question(card, metadata).setDatasetQuery(datasetQuery);
- }, [card, metadata, datasetQuery]);
-
- const resultMetadata = useMemo(() => {
- const fields = getResultMetadata(
- datasetQuery,
- uiState.lastRunQuery,
- uiState.lastRunResult,
- );
- if (fields == null || card.result_metadata == null) {
- return fields;
- }
- return applyFieldOverridesInResultMetadata(fields, card.result_metadata);
- }, [card, datasetQuery, uiState.lastRunResult, uiState.lastRunQuery]);
-
- const validationResult = useMemo(
- () => getValidationResult(question.query(), resultMetadata),
- [question, resultMetadata],
- );
-
- const isDirty = useMemo(() => {
- return !Lib.areLegacyQueriesEqual(datasetQuery, card.dataset_query);
- }, [datasetQuery, card.dataset_query]);
-
- const {
- checkData,
- isCheckingDependencies,
- isConfirmationShown,
- handleInitialSave,
- handleSaveAfterConfirmation,
- handleCloseConfirmation,
- } = PLUGIN_DEPENDENCIES.useCheckCardDependencies({
- onSave: async (question) => {
- const { error } = await updateCard({
- id: card.id,
- dataset_query: question.datasetQuery(),
- result_metadata: resultMetadata,
- });
- if (error) {
- sendErrorToast(t`Failed to update model query`);
- } else {
- sendSuccessToast(t`Model query updated`);
- }
- },
- });
-
- const handleChangeQuery = (newQuery: Lib.Query) => {
- setDatasetQuery(Lib.toJsQuery(newQuery));
- };
-
- const handleChangeUiState = (newUiState: QueryEditorUiState) => {
- if (
- card.result_metadata != null &&
- newUiState.lastRunResult != null &&
- newUiState.lastRunResult !== uiState.lastRunResult
- ) {
- setUiState({
- ...newUiState,
- lastRunResult: applyFieldOverridesInDataset(
- newUiState.lastRunResult,
- card.result_metadata,
- ),
- });
- } else {
- setUiState(newUiState);
- }
- };
-
- const handleSave = () => {
- handleInitialSave(question.setResultsMetadata({ columns: resultMetadata }));
- };
-
- const handleCancel = () => {
- setDatasetQuery(card.dataset_query);
- };
-
- const handleResetRef = useLatest(() => {
- setDatasetQuery(card.dataset_query);
- setUiState(getInitialUiState());
- });
-
- useLayoutEffect(() => {
- handleResetRef.current();
- }, [card.id, handleResetRef]);
-
- return (
- <>
- <Stack
- pos="relative"
- w="100%"
- h="100%"
- bg="bg-white"
- data-testid="model-query-editor"
- gap={0}
- >
- <ModelHeader
- card={card}
- actions={
- <PaneHeaderActions
- errorMessage={validationResult.errorMessage}
- isValid={validationResult.isValid}
- isDirty={isDirty}
- isSaving={isSaving || isCheckingDependencies}
- onSave={handleSave}
- onCancel={handleCancel}
- />
- }
- />
- <ModelQueryEditor
- query={question.query()}
- uiState={uiState}
- readOnly={!card.can_write}
- onChangeQuery={handleChangeQuery}
- onChangeUiState={handleChangeUiState}
- />
- </Stack>
- {isConfirmationShown && checkData != null && (
- <PLUGIN_DEPENDENCIES.CheckDependenciesModal
- checkData={checkData}
- opened
- onSave={handleSaveAfterConfirmation}
- onClose={handleCloseConfirmation}
- />
- )}
- <LeaveRouteConfirmModal
- route={route}
- isEnabled={isDirty && !isSaving && !isCheckingDependencies}
- />
- </>
- );
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelQueryPage/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelQueryPage/index.ts
deleted file mode 100644
index effb63e016e..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelQueryPage/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./ModelQueryPage";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelQueryPage/utils.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelQueryPage/utils.ts
deleted file mode 100644
index dbd0044ec9a..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/ModelQueryPage/utils.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import type { Dataset, DatasetColumn, Field } from "metabase-types/api";
-
-import type { FieldOverrides } from "../../types";
-
-function getFieldOverrides(field: Field): FieldOverrides {
- const {
- display_name,
- description,
- semantic_type,
- fk_target_field_id,
- visibility_type,
- settings,
- } = field;
- return {
- display_name,
- description,
- semantic_type,
- fk_target_field_id,
- visibility_type,
- settings,
- };
-}
-
-function applyFieldOverrides<T extends Field | DatasetColumn>(
- queryFields: T[],
- savedFields: Field[],
-): T[] {
- const savedFieldByName = Object.fromEntries(
- savedFields.map((field) => [field.name, field]),
- );
- return queryFields.map((queryField) => {
- const savedField = savedFieldByName[queryField.name];
- return savedField == null
- ? queryField
- : { ...queryField, ...getFieldOverrides(savedField) };
- });
-}
-
-export function applyFieldOverridesInDataset(
- dataset: Dataset,
- savedMetadata: Field[],
-) {
- if (dataset.data == null) {
- return dataset;
- }
-
- return {
- ...dataset,
- data: {
- ...dataset.data,
- cols: applyFieldOverrides(dataset.data.cols, savedMetadata),
- },
- };
-}
-
-export function applyFieldOverridesInResultMetadata(
- queryMetadata: Field[],
- savedMetadata: Field[],
-) {
- return applyFieldOverrides(queryMetadata, savedMetadata);
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/NewModelPage/CreateModelModal/CreateModelModal.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/NewModelPage/CreateModelModal/CreateModelModal.tsx
deleted file mode 100644
index cb1d706b19f..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/NewModelPage/CreateModelModal/CreateModelModal.tsx
+++ /dev/null
@@ -1,145 +0,0 @@
-import { useMemo } from "react";
-import { t } from "ttag";
-import * as Yup from "yup";
-
-import { useCreateCardMutation } from "metabase/api";
-import FormCollectionPicker from "metabase/collections/containers/FormCollectionPicker";
-import {
- Form,
- FormErrorMessage,
- FormProvider,
- FormSubmitButton,
- FormTextInput,
- FormTextarea,
-} from "metabase/forms";
-import * as Errors from "metabase/lib/errors";
-import { Box, Button, Group, Modal, Stack } from "metabase/ui";
-import * as Lib from "metabase-lib";
-import type { Card, CreateCardRequest } from "metabase-types/api";
-
-import type { NewModelValues } from "../types";
-
-const NEW_MODEL_SCHEMA = Yup.object({
- name: Yup.string().required(Errors.required),
- description: Yup.string().nullable(),
- collection_id: Yup.number().nullable().default(null),
-});
-
-type CreateModelModalProps = {
- query: Lib.Query;
- defaultValues: Partial<NewModelValues>;
- onCreate: (card: Card) => void;
- onClose: () => void;
-};
-
-export function CreateModelModal({
- query,
- defaultValues,
- onCreate,
- onClose,
-}: CreateModelModalProps) {
- return (
- <Modal title={t`Save your model`} opened padding="xl" onClose={onClose}>
- <CreateModelForm
- query={query}
- defaultValues={defaultValues}
- onCreate={onCreate}
- onClose={onClose}
- />
- </Modal>
- );
-}
-
-type CreateModelFormProps = {
- query: Lib.Query;
- defaultValues: Partial<NewModelValues>;
- onCreate: (card: Card) => void;
- onClose: () => void;
-};
-
-function CreateModelForm({
- query,
- defaultValues,
- onCreate,
- onClose,
-}: CreateModelFormProps) {
- const [createCard] = useCreateCardMutation();
-
- const initialValues: NewModelValues = useMemo(
- () => getInitialValues(defaultValues),
- [defaultValues],
- );
-
- const handleSubmit = async (values: NewModelValues) => {
- const request = getCreateRequest(query, values);
- const card = await createCard(request).unwrap();
- onCreate(card);
- };
-
- return (
- <FormProvider
- initialValues={initialValues}
- validationSchema={NEW_MODEL_SCHEMA}
- onSubmit={handleSubmit}
- >
- <Form>
- <Stack gap="lg">
- <FormTextInput
- name="name"
- label={t`Name`}
- placeholder={t`My Great Model`}
- data-autofocus
- />
- <FormTextarea
- name="description"
- label={t`Description`}
- placeholder={t`This is optional, but helpful`}
- minRows={4}
- maxRows={10}
- />
- <FormCollectionPicker
- name="collection_id"
- title={t`Where do you want to save this?`}
- entityType="dataset"
- />
- <Group>
- <Box flex={1}>
- <FormErrorMessage />
- </Box>
- <Button variant="subtle" onClick={onClose}>{t`Back`}</Button>
- <FormSubmitButton label={t`Save`} variant="filled" />
- </Group>
- </Stack>
- </Form>
- </FormProvider>
- );
-}
-
-function getInitialValues(
- defaultValues: Partial<NewModelValues>,
-): NewModelValues {
- return {
- name: "",
- description: null,
- result_metadata: null,
- resultMetadata: null,
- collection_id: null,
- ...defaultValues,
- };
-}
-
-function getCreateRequest(
- query: Lib.Query,
- { name, description, collection_id, result_metadata }: NewModelValues,
-): CreateCardRequest {
- return {
- name,
- description,
- collection_id,
- result_metadata,
- type: "model",
- dataset_query: Lib.toJsQuery(query),
- display: "table",
- visualization_settings: {},
- };
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/NewModelPage/CreateModelModal/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/NewModelPage/CreateModelModal/index.ts
deleted file mode 100644
index ab0909b6415..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/NewModelPage/CreateModelModal/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./CreateModelModal";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/NewModelPage/NewModelPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/NewModelPage/NewModelPage.tsx
deleted file mode 100644
index 245535a9e50..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/NewModelPage/NewModelPage.tsx
+++ /dev/null
@@ -1,191 +0,0 @@
-import { useDisclosure } from "@mantine/hooks";
-import type { Location } from "history";
-import { useMemo, useState } from "react";
-import type { Route } from "react-router";
-import { push } from "react-router-redux";
-import { t } from "ttag";
-
-import { useGetDefaultCollectionId } from "metabase/collections/hooks";
-import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal";
-import { useDispatch, useSelector } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
-import { getInitialUiState } from "metabase/querying/editor/components/QueryEditor";
-import { getMetadata } from "metabase/selectors/metadata";
-import { Stack } from "metabase/ui";
-import { getResultMetadata } from "metabase-enterprise/data-studio/common/utils";
-import * as Lib from "metabase-lib";
-import type { Card, CollectionId } from "metabase-types/api";
-
-import {
- PaneHeader,
- PaneHeaderActions,
- PaneHeaderInput,
-} from "../../../common/components/PaneHeader";
-import { ModelQueryEditor } from "../../components/ModelQueryEditor";
-import { NAME_MAX_LENGTH } from "../../constants";
-import { getValidationResult } from "../../utils";
-
-import { CreateModelModal } from "./CreateModelModal";
-import { getInitialNativeQuery, getInitialQuery, getQuery } from "./utils";
-
-type NewModelPageQuery = {
- collectionId?: string;
-};
-
-type NewModelPageProps = {
- initialQuery: Lib.Query;
- initialCollectionId?: CollectionId | null;
- route: Route;
-};
-
-function NewModelPage({
- initialQuery,
- initialCollectionId,
- route,
-}: NewModelPageProps) {
- const [name, setName] = useState("");
- const [datasetQuery, setDatasetQuery] = useState(() =>
- Lib.toJsQuery(initialQuery),
- );
- const [uiState, setUiState] = useState(getInitialUiState);
- const [isModalOpened, { open: openModal, close: closeModal }] =
- useDisclosure();
- const metadata = useSelector(getMetadata);
- const defaultCollectionId = useGetDefaultCollectionId();
- const dispatch = useDispatch();
-
- const query = useMemo(
- () => getQuery(datasetQuery, metadata),
- [datasetQuery, metadata],
- );
-
- const resultMetadata = useMemo(() => {
- return getResultMetadata(
- datasetQuery,
- uiState.lastRunQuery,
- uiState.lastRunResult,
- );
- }, [datasetQuery, uiState.lastRunResult, uiState.lastRunQuery]);
-
- const validationResult = useMemo(
- () => getValidationResult(query, resultMetadata),
- [query, resultMetadata],
- );
-
- const defaultValues = useMemo(
- () => ({
- name,
- result_metadata: resultMetadata,
- collection_id: initialCollectionId ?? defaultCollectionId,
- }),
- [name, resultMetadata, initialCollectionId, defaultCollectionId],
- );
-
- const handleCreate = (card: Card) => {
- dispatch(push(Urls.dataStudioModel(card.id)));
- };
-
- const handleChangeQuery = (query: Lib.Query) => {
- setDatasetQuery(Lib.toJsQuery(query));
- };
-
- const handleCancel = () => {
- dispatch(push(Urls.dataStudioModeling()));
- };
-
- return (
- <>
- <Stack
- pos="relative"
- w="100%"
- h="100%"
- bg="bg-white"
- data-testid="model-query-editor"
- gap={0}
- >
- <PaneHeader
- title={
- <PaneHeaderInput
- initialValue={name}
- placeholder={t`New model`}
- maxLength={NAME_MAX_LENGTH}
- isOptional
- onChange={setName}
- />
- }
- icon="model"
- actions={
- <PaneHeaderActions
- errorMessage={validationResult.errorMessage}
- isValid={validationResult.isValid}
- isDirty
- onSave={openModal}
- onCancel={handleCancel}
- />
- }
- />
- <ModelQueryEditor
- query={query}
- uiState={uiState}
- onChangeQuery={handleChangeQuery}
- onChangeUiState={setUiState}
- />
- </Stack>
- {isModalOpened && (
- <CreateModelModal
- query={query}
- defaultValues={defaultValues}
- onCreate={handleCreate}
- onClose={closeModal}
- />
- )}
- <LeaveRouteConfirmModal route={route} isEnabled={!isModalOpened} />
- </>
- );
-}
-
-type NewQueryModelPageProps = {
- location: Location<NewModelPageQuery>;
- route: Route;
-};
-
-export function NewQueryModelPage({ route, location }: NewQueryModelPageProps) {
- const metadata = useSelector(getMetadata);
- const initialQuery = useMemo(() => getInitialQuery(metadata), [metadata]);
- const collectionId = Urls.extractCollectionId(location.query.collectionId);
-
- return (
- <NewModelPage
- initialQuery={initialQuery}
- initialCollectionId={collectionId}
- route={route}
- />
- );
-}
-
-type NewNativeModelPageProps = {
- location: Location<NewModelPageQuery>;
- route: Route;
-};
-
-export function NewNativeModelPage({
- location,
- route,
-}: NewNativeModelPageProps) {
- const metadata = useSelector(getMetadata);
- const initialQuery = useMemo(
- () => getInitialNativeQuery(metadata),
- [metadata],
- );
- const initialCollectionId = Urls.extractCollectionId(
- location.query.collectionId,
- );
-
- return (
- <NewModelPage
- initialQuery={initialQuery}
- initialCollectionId={initialCollectionId}
- route={route}
- />
- );
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/NewModelPage/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/NewModelPage/index.ts
deleted file mode 100644
index 5a5d7ae4ab2..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/NewModelPage/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./NewModelPage";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/NewModelPage/types.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/NewModelPage/types.ts
deleted file mode 100644
index 3ee52ef62a1..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/NewModelPage/types.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import type { CollectionId, Field } from "metabase-types/api";
-
-export type NewModelValues = {
- name: string;
- description: string | null;
- resultMetadata: Field[] | null;
- collection_id: CollectionId | null;
- result_metadata: Field[] | null;
-};
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/NewModelPage/utils.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/NewModelPage/utils.ts
deleted file mode 100644
index 4a26a4a2b78..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/models/pages/NewModelPage/utils.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import Question from "metabase-lib/v1/Question";
-import type Metadata from "metabase-lib/v1/metadata/Metadata";
-import type { DatasetQuery } from "metabase-types/api";
-
-export function getQuery(datasetQuery: DatasetQuery, metadata: Metadata) {
- return Question.create({ dataset_query: datasetQuery, metadata }).query();
-}
-
-export function getInitialQuery(metadata: Metadata) {
- return Question.create({
- DEPRECATED_RAW_MBQL_type: "query",
- metadata,
- }).query();
-}
-
-export function getInitialNativeQuery(metadata: Metadata) {
- return Question.create({
- DEPRECATED_RAW_MBQL_type: "native",
- metadata,
- }).query();
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/models/routes.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/models/routes.tsx
deleted file mode 100644
index ca5b289cae5..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/models/routes.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-import { IndexRoute, Route } from "react-router";
-
-import { PLUGIN_DEPENDENCIES } from "metabase/plugins";
-
-import { ModelDependenciesPage } from "./pages/ModelDependenciesPage";
-import { ModelFieldsPage } from "./pages/ModelFieldsPage";
-import { ModelOverviewPage } from "./pages/ModelOverviewPage";
-import { ModelQueryPage } from "./pages/ModelQueryPage";
-import { NewNativeModelPage, NewQueryModelPage } from "./pages/NewModelPage";
-
-export function getDataStudioModelRoutes() {
- return (
- <Route path="models">
- <Route path="new/query" component={NewQueryModelPage} />
- <Route path="new/native" component={NewNativeModelPage} />
- <Route path=":cardId" component={ModelOverviewPage} />
- <Route path=":cardId/query" component={ModelQueryPage} />
- <Route path=":cardId/fields" component={ModelFieldsPage} />
- {PLUGIN_DEPENDENCIES.isEnabled && (
- <Route path=":cardId/dependencies" component={ModelDependenciesPage}>
- <IndexRoute component={PLUGIN_DEPENDENCIES.DependencyGraphPage} />
- </Route>
- )}
- </Route>
- );
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/models/types.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/models/types.ts
deleted file mode 100644
index 82ccbbebe0c..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/models/types.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import type { Field } from "metabase-types/api";
-
-export type FieldOverrides = Partial<
- Pick<
- Field,
- | "display_name"
- | "description"
- | "semantic_type"
- | "fk_target_field_id"
- | "visibility_type"
- | "settings"
- >
->;
-
-export type ValidationResult = {
- isValid: boolean;
- errorMessage?: string;
-};
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/models/utils.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/models/utils.ts
deleted file mode 100644
index b1b281a70c2..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/models/utils.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { t } from "ttag";
-
-import * as Lib from "metabase-lib";
-import type { Field } from "metabase-types/api";
-
-import type { ValidationResult } from "./types";
-
-export function getValidationResult(
- query: Lib.Query,
- resultMetadata: Field[] | null,
-): ValidationResult {
- const { isNative } = Lib.queryDisplayInfo(query);
- if (isNative) {
- const tags = Object.values(Lib.templateTags(query));
- if (tags.some((t) => t.type !== "card" && t.type !== "snippet")) {
- return {
- isValid: false,
- errorMessage: t`In models, you can use snippets and question or model references, but not variables.`,
- };
- }
-
- if (resultMetadata == null) {
- return {
- isValid: false,
- errorMessage: t`You must run the query before you can save this model.`,
- };
- }
- }
-
- return { isValid: Lib.canSave(query, "model") };
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/query-builder/components/DataStudioToolbarButton/DataStudioToolbarButton.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/query-builder/components/DataStudioToolbarButton/DataStudioToolbarButton.tsx
index 7ce06aceb8a..4dfd217757b 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/query-builder/components/DataStudioToolbarButton/DataStudioToolbarButton.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/query-builder/components/DataStudioToolbarButton/DataStudioToolbarButton.tsx
@@ -11,17 +11,13 @@ export const DataStudioToolbarButton = ({
question,
}: DataStudioToolbarButtonProps) => {
const dispatch = useDispatch();
- const isModel = question.type() === "model";
const isMetric = question.type() === "metric";
const handleClick = useCallback(() => {
- const url = isModel
- ? Urls.dataStudioModel(question.id())
- : Urls.dataStudioMetric(question.id());
- dispatch(openUrl(url));
- }, [isModel, question, dispatch]);
+ dispatch(openUrl(Urls.dataStudioMetric(question.id())));
+ }, [question, dispatch]);
- if (!isModel && !isMetric) {
+ if (!isMetric) {
return null;
}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/routes.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/routes.tsx
index fe1dba13c9a..a21de32f3a2 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/routes.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/routes.tsx
@@ -19,7 +19,6 @@ import { getDataStudioMetadataRoutes } from "./data-model/routes";
import { getDataStudioGlossaryRoutes } from "./glossary/routes";
import { getDataStudioMetricRoutes } from "./metrics/routes";
import { getDataStudioModelingRoutes } from "./modeling/routes";
-import { getDataStudioModelRoutes } from "./models/routes";
import { getDataStudioSegmentRoutes } from "./segments/routes";
import { getDataStudioSnippetRoutes } from "./snippets/routes";
import { getDataStudioTableRoutes } from "./tables/routes";
@@ -53,7 +52,6 @@ export function getDataStudioRoutes(
<Route path="modeling" component={ModelingSectionLayout}>
{getDataStudioModelingRoutes()}
{getDataStudioTableRoutes()}
- {getDataStudioModelRoutes()}
{getDataStudioMetricRoutes()}
{getDataStudioSegmentRoutes()}
{getDataStudioSnippetRoutes()}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/utils.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/utils.ts
index cc644b64c31..4c07002875b 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/utils.ts
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/utils.ts
@@ -24,8 +24,8 @@ export function getLibraryCollectionType(
switch (type) {
case "library":
return "root";
- case "library-models":
- return "models";
+ case "library-data":
+ return "data";
case "library-metrics":
return "metrics";
}
@@ -49,8 +49,8 @@ export function canPlaceEntityInCollection(
return false;
}
- if (collectionType === "library-models") {
- return entityType === "dataset";
+ if (collectionType === "library-data") {
+ return entityType === "table";
}
if (collectionType === "library-metrics") {
@@ -70,7 +70,7 @@ export function canPlaceEntityInCollectionOrDescendants(
if (collectionType === "library") {
return (
- canPlaceEntityInCollection(entityType, "library-models") ||
+ canPlaceEntityInCollection(entityType, "library-data") ||
canPlaceEntityInCollection(entityType, "library-metrics")
);
}
@@ -122,7 +122,7 @@ export const useGetLibraryChildCollectionByType = ({
};
// This hook will return the library collection if there are both metrics and models in the library,
-// the library-metrics collection if the library has no models, or the library-models collection
+// the library-metrics collection if the library has no models, or the library-data collection
// if the library has no metrics
export const useGetResolvedLibraryCollection = ({
skip = false,
diff --git a/frontend/src/embedding-sdk-bundle/types/collection.ts b/frontend/src/embedding-sdk-bundle/types/collection.ts
index 6787670ed2a..778b4e6232a 100644
--- a/frontend/src/embedding-sdk-bundle/types/collection.ts
+++ b/frontend/src/embedding-sdk-bundle/types/collection.ts
@@ -32,7 +32,7 @@ export type MetabaseCollectionItem = {
| "trash"
| "remote-synced"
| "library"
- | "library-models"
+ | "library-data"
| "library-metrics"
| "model"
| "question"
diff --git a/frontend/src/metabase-types/api/collection.ts b/frontend/src/metabase-types/api/collection.ts
index e132d03d4db..9e876ee713a 100644
--- a/frontend/src/metabase-types/api/collection.ts
+++ b/frontend/src/metabase-types/api/collection.ts
@@ -35,7 +35,7 @@ export type CollectionType =
| "trash"
| "remote-synced"
| "library"
- | "library-models"
+ | "library-data"
| "library-metrics"
| null;
diff --git a/frontend/src/metabase/collections/components/CollectionEmptyState/CollectionEmptyState.tsx b/frontend/src/metabase/collections/components/CollectionEmptyState/CollectionEmptyState.tsx
index 738e15ae84e..6f7ff5ee213 100644
--- a/frontend/src/metabase/collections/components/CollectionEmptyState/CollectionEmptyState.tsx
+++ b/frontend/src/metabase/collections/components/CollectionEmptyState/CollectionEmptyState.tsx
@@ -85,9 +85,9 @@ const DefaultCollectionEmptyState = ({
function getDefaultEmptyStateMessages(collection: Collection | undefined) {
switch (PLUGIN_DATA_STUDIO.getLibraryCollectionType(collection?.type)) {
- case "models":
+ case "data":
return {
- title: t`No tables or models yet`,
+ title: t`No published tables yet`,
description: t`Publish tables in the Library to see them here.`,
};
case "metrics":
diff --git a/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPicker/test/ee.unit.spec.tsx b/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPicker/test/ee.unit.spec.tsx
index 5e7a3987799..14869bd8747 100644
--- a/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPicker/test/ee.unit.spec.tsx
+++ b/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPicker/test/ee.unit.spec.tsx
@@ -17,15 +17,15 @@ const LIBRARY_COLLECTION = createMockCollection({
below: ["dataset", "metric"],
});
-const LIBRARY_MODELS_COLELCTION = createMockCollectionItem({
+const LIBRARY_DATA_COLLECTION = createMockCollectionItem({
name: "data",
- type: "library-models",
+ type: "library-data",
model: "collection",
id: 1338,
here: ["dataset"],
});
-const LIBRARY_METRICS_COLELCTION = createMockCollectionItem({
+const LIBRARY_METRICS_COLLECTION = createMockCollectionItem({
name: "metrics",
type: "library-metrics",
model: "collection",
@@ -38,7 +38,7 @@ describe("library", () => {
fetchMock.get("/api/ee/library", LIBRARY_COLLECTION);
setupCollectionItemsEndpoint({
collection: LIBRARY_COLLECTION,
- collectionItems: [LIBRARY_MODELS_COLELCTION, LIBRARY_METRICS_COLELCTION],
+ collectionItems: [LIBRARY_DATA_COLLECTION, LIBRARY_METRICS_COLLECTION],
});
setup(
@@ -58,8 +58,8 @@ describe("library", () => {
setupCollectionItemsEndpoint({
collection: LIBRARY_COLLECTION,
collectionItems: [
- { ...LIBRARY_MODELS_COLELCTION, here: undefined },
- { ...LIBRARY_METRICS_COLELCTION, here: undefined },
+ { ...LIBRARY_DATA_COLLECTION, here: undefined },
+ { ...LIBRARY_METRICS_COLLECTION, here: undefined },
],
});
@@ -79,13 +79,13 @@ describe("library", () => {
setupCollectionItemsEndpoint({
collection: LIBRARY_COLLECTION,
collectionItems: [
- LIBRARY_MODELS_COLELCTION,
- { ...LIBRARY_METRICS_COLELCTION, here: undefined },
+ LIBRARY_DATA_COLLECTION,
+ { ...LIBRARY_METRICS_COLLECTION, here: undefined },
],
});
setupCollectionItemsEndpoint({
- collection: LIBRARY_MODELS_COLELCTION,
+ collection: LIBRARY_DATA_COLLECTION,
collectionItems: [
createMockCollectionItem({ model: "dataset", name: "Surprise" }),
],
@@ -103,7 +103,7 @@ describe("library", () => {
fetchMock.get("/api/ee/library", LIBRARY_COLLECTION);
setupCollectionItemsEndpoint({
collection: LIBRARY_COLLECTION,
- collectionItems: [LIBRARY_MODELS_COLELCTION, LIBRARY_METRICS_COLELCTION],
+ collectionItems: [LIBRARY_DATA_COLLECTION, LIBRARY_METRICS_COLLECTION],
});
setup(
diff --git a/frontend/src/metabase/entities/collections/utils.ts b/frontend/src/metabase/entities/collections/utils.ts
index b7687c0a036..cc323b08218 100644
--- a/frontend/src/metabase/entities/collections/utils.ts
+++ b/frontend/src/metabase/entities/collections/utils.ts
@@ -44,7 +44,7 @@ export function getCollectionIcon(
switch (PLUGIN_DATA_STUDIO.getLibraryCollectionType(collection.type)) {
case "root":
return { name: "repository" };
- case "models":
+ case "data":
return { name: "table" };
case "metrics":
return { name: "metric" };
diff --git a/frontend/src/metabase/lib/icon.ts b/frontend/src/metabase/lib/icon.ts
index de0e935b65e..8a9d62e3ec2 100644
--- a/frontend/src/metabase/lib/icon.ts
+++ b/frontend/src/metabase/lib/icon.ts
@@ -84,7 +84,7 @@ export const getIconBase = (item: ObjectWithModel): IconData => {
) {
case "root":
return { name: "repository" };
- case "models":
+ case "data":
return { name: "table" };
case "metrics":
return { name: "metric" };
diff --git a/frontend/src/metabase/lib/urls/data-studio.ts b/frontend/src/metabase/lib/urls/data-studio.ts
index eac8f46b408..2c8d2467b4e 100644
--- a/frontend/src/metabase/lib/urls/data-studio.ts
+++ b/frontend/src/metabase/lib/urls/data-studio.ts
@@ -130,22 +130,6 @@ export function newDataStudioNativeModel(
return `${dataStudioModeling()}/models/new/native${getQueryString(params)}`;
}
-export function dataStudioModel(cardId: CardId) {
- return `${dataStudioModeling()}/models/${cardId}`;
-}
-
-export function dataStudioModelQuery(cardId: CardId) {
- return `${dataStudioModel(cardId)}/query`;
-}
-
-export function dataStudioModelFields(cardId: CardId) {
- return `${dataStudioModel(cardId)}/fields`;
-}
-
-export function dataStudioModelDependencies(cardId: CardId) {
- return `${dataStudioModel(cardId)}/dependencies`;
-}
-
export type NewDataStudioMetricProps = {
collectionId?: CollectionId;
};
diff --git a/frontend/src/metabase/lib/urls/modelToUrl.ts b/frontend/src/metabase/lib/urls/modelToUrl.ts
index 30d67ee52bf..dc4584cebe9 100644
--- a/frontend/src/metabase/lib/urls/modelToUrl.ts
+++ b/frontend/src/metabase/lib/urls/modelToUrl.ts
@@ -1,4 +1,8 @@
-import type { CollectionId, IndexedEntity } from "metabase-types/api";
+import type {
+ CollectionId,
+ DatabaseId,
+ IndexedEntity,
+} from "metabase-types/api";
import { browseDatabase } from "./browse";
import { collection } from "./collections";
@@ -17,6 +21,7 @@ export type UrlableModel = {
database?: {
id: number;
};
+ database_id?: DatabaseId;
collection_id?: CollectionId | null;
};
@@ -27,6 +32,8 @@ const NOT_FOUND_URL = "/404";
* anything in metabase, just put it through here
*/
export function modelToUrl(item: UrlableModel): string {
+ const databaseId = item.database_id ?? item.database?.id;
+
switch (item.model) {
case "card":
return question({
@@ -42,8 +49,8 @@ export function modelToUrl(item: UrlableModel): string {
case "dashboard":
return dashboard(item);
case "table":
- if (item?.database?.id) {
- return tableRowsQuery(item.database.id, item.id);
+ if (databaseId != null) {
+ return tableRowsQuery(databaseId, item.id);
}
return NOT_FOUND_URL;
case "collection":
diff --git a/frontend/src/metabase/models/containers/NewModelOptions/NewModelOptions.tsx b/frontend/src/metabase/models/containers/NewModelOptions/NewModelOptions.tsx
index 96597858410..84fc7184c03 100644
--- a/frontend/src/metabase/models/containers/NewModelOptions/NewModelOptions.tsx
+++ b/frontend/src/metabase/models/containers/NewModelOptions/NewModelOptions.tsx
@@ -7,7 +7,6 @@ import CS from "metabase/css/core/index.css";
import { useSelector } from "metabase/lib/redux";
import * as Urls from "metabase/lib/urls";
import NewModelOption from "metabase/models/components/NewModelOption";
-import { PLUGIN_DATA_STUDIO } from "metabase/plugins";
import { NoDatabasesEmptyState } from "metabase/reference/databases/NoDatabasesEmptyState";
import { getLearnUrl, getSetting } from "metabase/selectors/settings";
import {
@@ -36,17 +35,10 @@ const NewModelOptions = ({ location }: NewModelOptionsProps) => {
getSetting(state, "last-used-native-database-id"),
);
- const urlCollectionId = Urls.extractEntityId(
+ const collectionId = Urls.extractEntityId(
location.query.collectionId as string,
);
- const libraryModelsCollection =
- PLUGIN_DATA_STUDIO.useGetLibraryChildCollectionByType({
- type: "library-models",
- });
-
- const collectionId = urlCollectionId || libraryModelsCollection?.id;
-
const showMetabaseLinks = useSelector(getShowMetabaseLinks);
if (!hasDataAccess && !hasNativeWrite) {
diff --git a/frontend/src/metabase/plugins/oss/data-studio.ts b/frontend/src/metabase/plugins/oss/data-studio.ts
index a843d6e6cd5..0eae59e3801 100644
--- a/frontend/src/metabase/plugins/oss/data-studio.ts
+++ b/frontend/src/metabase/plugins/oss/data-studio.ts
@@ -19,7 +19,7 @@ export type NavbarLibrarySectionProps = {
onItemSelect: () => void;
};
-export type LibraryCollectionType = "root" | "models" | "metrics";
+export type LibraryCollectionType = "root" | "data" | "metrics";
export type DataStudioToolbarButtonProps = {
question: Question;
diff --git a/resources/migrations/058_update_migrations.yaml b/resources/migrations/058_update_migrations.yaml
index 7f5499c1248..b789361c29b 100644
--- a/resources/migrations/058_update_migrations.yaml
+++ b/resources/migrations/058_update_migrations.yaml
@@ -890,6 +890,79 @@ databaseChangeLog:
constraints:
nullable: false
+ - changeSet:
+ id: v58.2025-12-05T17:41:51
+ author: ranquild
+ comment: Drop fk_report_card_published_table
+ changes:
+ - dropForeignKeyConstraint:
+ baseTableName: report_card
+ constraintName: fk_report_card_published_table
+ rollback:
+ - addForeignKeyConstraint:
+ baseTableName: report_card
+ baseColumnNames: published_table_id
+ referencedTableName: metabase_table
+ referencedColumnNames: id
+ constraintName: fk_report_card_published_table
+ onDelete: SET NULL
+
+ - changeSet:
+ id: v58.2025-12-05T17:41:52
+ author: ranquild
+ comment: Drop idx_report_card_published_table_id
+ changes:
+ - dropIndex:
+ tableName: report_card
+ indexName: idx_report_card_published_table_id
+ rollback:
+ - createIndex:
+ tableName: report_card
+ indexName: idx_report_card_published_table_id
+ columns:
+ - column:
+ name: published_table_id
+
+ - changeSet:
+ id: v58.2025-12-05T17:41:53
+ author: ranquild
+ comment: Drop report_card.published_table_id
+ changes:
+ - dropColumn:
+ tableName: report_card
+ columnName: published_table_id
+ rollback:
+ - addColumn:
+ tableName: report_card
+ columns:
+ - column:
+ name: published_table_id
+ type: int
+ remarks: The table id that is 'published' by this model
+ constraints:
+ nullable: true
+
+
+ - changeSet:
+ id: v58.2025-12-05T17:41:54
+ author: ranquild
+ comment: Rename collection.type 'library-models' to 'library-data'
+ changes:
+ - update:
+ tableName: collection
+ columns:
+ - column:
+ name: type
+ value: 'library-data'
+ where: type = 'library-models'
+ rollback:
+ - update:
+ tableName: collection
+ columns:
+ - column:
+ name: type
+ value: 'library-models'
+ where: type = 'library-data'
# >>>>>>>>>> DO NOT ADD NEW MIGRATIONS BELOW THIS LINE! ADD THEM ABOVE <<<<<<<<<<
diff --git a/src/metabase/collections/core.clj b/src/metabase/collections/core.clj
index 5446e84d168..ff06f3e72f5 100644
--- a/src/metabase/collections/core.clj
+++ b/src/metabase/collections/core.clj
@@ -15,7 +15,7 @@
check-non-remote-synced-dependencies
check-remote-synced-dependents
library-collection
- library-models-collection-type
+ library-data-collection-type
create-library-collection!
moving-into-remote-synced?
moving-from-remote-synced?
diff --git a/src/metabase/collections/models/collection.clj b/src/metabase/collections/models/collection.clj
index a9d48fd367a..6fa8c5c41e8 100644
--- a/src/metabase/collections/models/collection.clj
+++ b/src/metabase/collections/models/collection.clj
@@ -72,12 +72,12 @@
"The value of the `:type` field for library collections."
"library")
-(def ^:constant library-models-collection-type
- "The value of the `:type` field for collections that only allow models."
- "library-models")
+(def ^:constant library-data-collection-type
+ "The value of the `:type` field for collections that only allow tables."
+ "library-data")
(def ^:constant library-metrics-collection-type
- "The value of the `:type` field for collections that only allow models."
+ "The value of the `:type` field for collections that only allow metrics."
"library-metrics")
(defn- trash-collection* []
@@ -133,10 +133,10 @@
[collection]
(= (:type collection) library-collection-type))
-(defn- is-library-models-collection?
- "Is this the library-models (named 'Data') collection?"
+(defn- is-library-data-collection?
+ "Is this the Data collection?"
[collection]
- (= (:type collection) library-models-collection-type))
+ (= (:type collection) library-data-collection-type))
(defn- is-library-metrics-collection?
"Is this the Metrics collection?"
@@ -179,13 +179,13 @@
:type library-collection-type
:location "/"})
base-location (str "/" (:id library) "/")
- models (t2/insert-returning-instance! :model/Collection {:name "Data"
- :type library-models-collection-type
+ data (t2/insert-returning-instance! :model/Collection {:name "Data"
+ :type library-data-collection-type
:location base-location})
metrics (t2/insert-returning-instance! :model/Collection {:name "Metrics"
:type library-metrics-collection-type
:location base-location})]
- (doseq [col [library models metrics]]
+ (doseq [col [library data metrics]]
(t2/delete! :model/Permissions :collection_id (:id col))
(perms/grant-collection-read-permissions! (perms/all-users-group) col))
library))
@@ -208,7 +208,7 @@
(cond-> collection
(is-trash? collection) (assoc :name (tru "Trash"))
(is-library? collection) (assoc :name (tru "Library"))
- (is-library-models-collection? collection) (assoc :name (tru "Data"))
+ (is-library-data-collection? collection) (assoc :name (tru "Data"))
(is-library-metrics-collection? collection) (assoc :name (tru "Metrics"))))
(t2/define-after-select :model/Collection [collection]
@@ -2185,5 +2185,5 @@
[collection-id]
(when collection-id
(pos-int? (t2/count :model/Collection :id collection-id :type [:in [library-collection-type
- library-models-collection-type
+ library-data-collection-type
library-metrics-collection-type]]))))
diff --git a/src/metabase/collections_rest/api.clj b/src/metabase/collections_rest/api.clj
index a73a0ade618..87a22eb63d6 100644
--- a/src/metabase/collections_rest/api.clj
+++ b/src/metabase/collections_rest/api.clj
@@ -101,7 +101,7 @@
(when-not include-library?
[:or [:= nil :type]
[:not-in :type [collection/library-collection-type
- collection/library-models-collection-type
+ collection/library-data-collection-type
collection/library-metrics-collection-type]]])
(perms/audit-namespace-clause :namespace namespace)
(collection/visible-collection-filter-clause
@@ -677,7 +677,7 @@
[:or [:= nil :type]
[:not [:in :type [collection/library-collection-type
collection/library-metrics-collection-type
- collection/library-models-collection-type]]]])
+ collection/library-data-collection-type]]]])
(perms/audit-namespace-clause :namespace (u/qualified-name collection-namespace))
(snippets-collection-filter-clause))
;; We get from the effective-children-query a normal set of columns selected:
diff --git a/src/metabase/queries/models/card.clj b/src/metabase/queries/models/card.clj
index 5617a9badf2..410837cef40 100644
--- a/src/metabase/queries/models/card.clj
+++ b/src/metabase/queries/models/card.clj
@@ -900,7 +900,7 @@
(not (:dashboard_id input-card-data)))))
(let [data-keys [:dataset_query :description :display :name :visualization_settings
:parameters :parameter_mappings :collection_id :collection_position
- :cache_ttl :type :dashboard_id :document_id :published_table_id]
+ :cache_ttl :type :dashboard_id :document_id]
position-info {:collection_id (:collection_id input-card-data)
:collection_position (:collection_position input-card-data)}
card-data (-> (select-keys input-card-data data-keys)
@@ -1215,7 +1215,6 @@
:document_id (serdes/fk :model/Document)
:creator_id (serdes/fk :model/User)
:made_public_by_id (serdes/fk :model/User)
- :published_table_id (serdes/fk :model/Table)
:dataset_query {:export serdes/export-mbql :import serdes/import-mbql}
:parameters {:export serdes/export-parameters :import serdes/import-parameters}
:parameter_mappings {:export serdes/export-parameter-mappings :import serdes/import-parameter-mappings}
diff --git a/src/metabase/warehouse_schema/models/table.clj b/src/metabase/warehouse_schema/models/table.clj
index 820d20bfb9c..2da5c3b2478 100644
--- a/src/metabase/warehouse_schema/models/table.clj
+++ b/src/metabase/warehouse_schema/models/table.clj
@@ -424,36 +424,6 @@
[tables]
(with-fields tables))
-(methodical/defmethod t2/batched-hydrate [:model/Table :published_as_model]
- [_model k tables]
- (mi/instances-with-hydrated-data
- tables k
- (fn []
- (let [table-ids (map :id tables)
- published-as-model (t2/select-fn-set :published_table_id [:model/Card :published_table_id]
- :published_table_id [:in table-ids]
- :type :model
- :archived false
- :archived_directly false)]
- (u/index-by identity #(contains? published-as-model %) table-ids)))
- :id
- {:default nil}))
-
-(methodical/defmethod t2/batched-hydrate [:model/Table :published_models]
- [_model k tables]
- (mi/instances-with-hydrated-data
- tables k
- (fn []
- (let [table-ids (map :id tables)
- models (t2/select :model/Card
- :published_table_id [:in table-ids]
- :type :model
- :archived false
- :archived_directly false)]
- (group-by :published_table_id models)))
- :id
- {:default nil}))
-
;;; ------------------------------------------------ Convenience Fns -------------------------------------------------
(defn database
diff --git a/src/metabase/warehouse_schema/table.clj b/src/metabase/warehouse_schema/table.clj
index d817f8461c0..d8b1067724e 100644
--- a/src/metabase/warehouse_schema/table.clj
+++ b/src/metabase/warehouse_schema/table.clj
@@ -56,8 +56,7 @@
(api/check-403 (can-access-table-for-query-metadata? table)))
(let [hydration-keys (cond-> [:db [:fields [:target :has_field_values] :has_field_values :dimensions :name_field]
[:segments :definition_description] :metrics :collection]
- (premium-features/has-feature? :transforms) (conj :transform)
- api/*is-superuser?* (conj :published_models))]
+ (premium-features/has-feature? :transforms) (conj :transform))]
(-> table
(update :collection nil-if-unreadable)
(#(apply t2/hydrate % hydration-keys))
diff --git a/src/metabase/warehouse_schema_rest/api/table.clj b/src/metabase/warehouse_schema_rest/api/table.clj
index 4d8ed42153a..cbabddbe51a 100644
--- a/src/metabase/warehouse_schema_rest/api/table.clj
+++ b/src/metabase/warehouse_schema_rest/api/table.clj
@@ -107,7 +107,7 @@
[:= :d.to_entity_id :metabase_table.id]
[:= :d.to_entity_type "table"]]}]))
query {:where where, :order-by [[:name :asc]]}
- hydrations (cond-> [:db :published_as_model]
+ hydrations (cond-> [:db]
(premium-features/has-feature? :transforms) (conj :transform))]
(as-> (t2/select :model/Table query) tables
(apply t2/hydrate tables hydrations)
diff --git a/src/metabase/warehouses_rest/api.clj b/src/metabase/warehouses_rest/api.clj
index 235128a8cba..348a3249cd5 100644
--- a/src/metabase/warehouses_rest/api.clj
+++ b/src/metabase/warehouses_rest/api.clj
@@ -1370,7 +1370,7 @@
(f candidate-tables)
candidate-tables)
(filter mi/can-read? candidate-tables))
- hydration-keys (cond-> [:published_as_model]
+ hydration-keys (cond-> []
(premium-features/has-feature? :transforms) (conj :transform))]
(if (seq hydration-keys)
(apply t2/hydrate filtered-tables hydration-keys)
diff --git a/test/metabase/collections/models/collection_test.clj b/test/metabase/collections/models/collection_test.clj
index 2a40692ce99..08ecfd55210 100644
--- a/test/metabase/collections/models/collection_test.clj
+++ b/test/metabase/collections/models/collection_test.clj
@@ -3312,7 +3312,7 @@
(mt/with-discard-model-updates! [:model/Collection]
(testing "Can create a library if none exist"
(t2/update! :model/Collection :type collection/library-collection-type {:type nil})
- (t2/update! :model/Collection :type collection/library-models-collection-type {:type nil})
+ (t2/update! :model/Collection :type collection/library-data-collection-type {:type nil})
(t2/update! :model/Collection :type collection/library-metrics-collection-type {:type nil})
(let [library (collection/create-library-collection!)]
(is (= "Library" (:name library)))
@@ -3329,12 +3329,12 @@
(is (thrown-with-msg? clojure.lang.ExceptionInfo #"Library already exists" (collection/create-library-collection!))))
;;cleanup created libraries
(t2/delete! :model/Collection :type [:in [collection/library-collection-type
- collection/library-models-collection-type
+ collection/library-data-collection-type
collection/library-metrics-collection-type]])))
(deftest is-library-collection?
(mt/with-temp [:model/Collection {library-id :id} {:name "Test Library" :type collection/library-collection-type}
- :model/Collection {models-id :id} {:name "Test Semantic Model Layer" :type collection/library-models-collection-type}
+ :model/Collection {models-id :id} {:name "Test Semantic Model Layer" :type collection/library-data-collection-type}
:model/Collection {metrics-id :id} {:name "Test Semantic Metrics Layer" :type collection/library-metrics-collection-type}
:model/Collection {regular-collection-id :id} {:name "Regular Collection" :type nil}]
(testing "Correctly identifies library collections"
diff --git a/test/metabase/collections/test_helpers.clj b/test/metabase/collections/test_helpers.clj
index 8556a56ee4b..7faeea4b436 100644
--- a/test/metabase/collections/test_helpers.clj
+++ b/test/metabase/collections/test_helpers.clj
@@ -23,7 +23,7 @@
:type collection/library-collection-type
{:type nil})
(t2/update! (t2/table-name :model/Collection)
- :type collection/library-models-collection-type
+ :type collection/library-data-collection-type
{:type nil})
(t2/update! (t2/table-name :model/Collection)
:type collection/library-metrics-collection-type
@@ -35,5 +35,5 @@
;; Clean up any created library collections
(t2/delete! :model/Collection
:type [:in [collection/library-collection-type
- collection/library-models-collection-type
+ collection/library-data-collection-type
collection/library-metrics-collection-type]])))))
diff --git a/test/metabase/collections_rest/api_test.clj b/test/metabase/collections_rest/api_test.clj
index 2f01c765338..44e7e27b23c 100644
--- a/test/metabase/collections_rest/api_test.clj
+++ b/test/metabase/collections_rest/api_test.clj
@@ -552,13 +552,13 @@
all-types (flatten-tree-types response)]
(is (not-any? #{collection/library-collection-type} all-types))
(is (not-any? #{collection/library-metrics-collection-type} all-types))
- (is (not-any? #{collection/library-models-collection-type} all-types))))
+ (is (not-any? #{collection/library-data-collection-type} all-types))))
(testing "Can choose to include include library items"
(let [response (mt/user-http-request :rasta :get 200 "collection/tree" :include-library true)
all-types (flatten-tree-types response)]
(is (some #{collection/library-collection-type} all-types))
(is (some #{collection/library-metrics-collection-type} all-types))
- (is (some #{collection/library-models-collection-type} all-types))))))))
+ (is (some #{collection/library-data-collection-type} all-types))))))))
;;; +----------------------------------------------------------------------------------------------------------------+
;;; | GET /collection/:id |
diff --git a/test/metabase/revisions/impl/card_test.clj b/test/metabase/revisions/impl/card_test.clj
index e37c9027f0c..f54990d8fb2 100644
--- a/test/metabase/revisions/impl/card_test.clj
+++ b/test/metabase/revisions/impl/card_test.clj
@@ -126,7 +126,7 @@
(is (= 1 (t2/count :model/Revision :model "Card" :model_id (:id card)))))
(when-not (#{;; these columns are expected to not have a description because it's always
;; comes with a dataset_query changes
- :table_id :database_id :query_type :source_card_id :published_table_id
+ :table_id :database_id :query_type :source_card_id
;; we don't need a description for made_public_by_id because whenever this field changes
;; public_uuid will change and we have a description for it.
:made_public_by_id
diff --git a/test/metabase/warehouse_schema/models/table_test.clj b/test/metabase/warehouse_schema/models/table_test.clj
index f3213a62c43..9714a21c249 100644
--- a/test/metabase/warehouse_schema/models/table_test.clj
+++ b/test/metabase/warehouse_schema/models/table_test.clj
@@ -394,32 +394,6 @@
(is (some? (t2/update! :model/Table table-id {:data_source nil})))
(is (nil? (t2/select-one-fn :data_source :model/Table :id table-id)))))))
-(deftest published-as-model-test
- (testing "hydrating :published_as_model"
- (mt/with-temp [:model/Table {t1 :id :as table1} {}
- :model/Table {t2 :id :as table2} {}
- :model/Card {_c1 :id} {:type :model :published_table_id t1}
- :model/Card {_c2 :id} {:type :model :published_table_id t1 :archived true}
- :model/Card {_c3 :id} {:type :model :published_table_id t1}
- :model/Card {_c4 :id} {:type :model :published_table_id t2 :archived_directly true}
- :model/Card {_c5 :id} {:type :metric :published_table_id t2}]
- (is (= {t1 true, t2 false}
- (->> (t2/hydrate [table1 table2] :published_as_model)
- (u/index-by :id :published_as_model)))))))
-
-(deftest published-models-test
- (testing "hydrating :published_models"
- (mt/with-temp [:model/Table {t1 :id :as table1} {}
- :model/Table {t2 :id :as table2} {}
- :model/Card {c1 :id} {:type :model :published_table_id t1}
- :model/Card {_c2 :id} {:type :model :published_table_id t1 :archived true}
- :model/Card {c3 :id} {:type :model :published_table_id t1}
- :model/Card {_c4 :id} {:type :model :published_table_id t2 :archived_directly true}
- :model/Card {_c5 :id} {:type :metric :published_table_id t2}]
- (is (= {t1 [c1 c3], t2 []}
- (->> (t2/hydrate [table1 table2] :published_models)
- (u/index-by :id (comp sort (partial mapv :id) :published_models))))))))
-
(deftest is-published-and-collection-id-test
(testing "is_published defaults to false"
(mt/with-temp [:model/Table {table-id :id} {}]
diff --git a/test_resources/serialization_baseline/collections/JS5JHDitDkWEtTt1-N7zr_qdlkexrocaxgnecmryqu/cards/_DexsxY2EQdmhwMZU4BCs_dependent_card.yaml b/test_resources/serialization_baseline/collections/JS5JHDitDkWEtTt1-N7zr_qdlkexrocaxgnecmryqu/cards/_DexsxY2EQdmhwMZU4BCs_dependent_card.yaml
index 3796de47aaf..641fea3f1aa 100644
--- a/test_resources/serialization_baseline/collections/JS5JHDitDkWEtTt1-N7zr_qdlkexrocaxgnecmryqu/cards/_DexsxY2EQdmhwMZU4BCs_dependent_card.yaml
+++ b/test_resources/serialization_baseline/collections/JS5JHDitDkWEtTt1-N7zr_qdlkexrocaxgnecmryqu/cards/_DexsxY2EQdmhwMZU4BCs_dependent_card.yaml
@@ -31,6 +31,5 @@ dashboard_id: null
document_id: null
embedding_type: null
metabase_version: v1.57.1-SNAPSHOT (d027b42)
-published_table_id: null
source_card_id: null
type: question
diff --git a/test_resources/serialization_baseline/collections/M-Q4pcV0qkiyJ0kiSWECl_some_collection/cards/OMuZ0wHe2O5Z_59-cLmn4_series_question_a.yaml b/test_resources/serialization_baseline/collections/M-Q4pcV0qkiyJ0kiSWECl_some_collection/cards/OMuZ0wHe2O5Z_59-cLmn4_series_question_a.yaml
index 6f4adfca36a..e06cddb6925 100644
--- a/test_resources/serialization_baseline/collections/M-Q4pcV0qkiyJ0kiSWECl_some_collection/cards/OMuZ0wHe2O5Z_59-cLmn4_series_question_a.yaml
+++ b/test_resources/serialization_baseline/collections/M-Q4pcV0qkiyJ0kiSWECl_some_collection/cards/OMuZ0wHe2O5Z_59-cLmn4_series_question_a.yaml
@@ -31,6 +31,5 @@ dashboard_id: null
document_id: null
embedding_type: null
metabase_version: v1.57.1-SNAPSHOT (d027b42)
-published_table_id: null
source_card_id: null
type: question
diff --git a/test_resources/serialization_baseline/collections/M-Q4pcV0qkiyJ0kiSWECl_some_collection/cards/XsxiHuzwlGIFNq245HdZC_series_question_b.yaml b/test_resources/serialization_baseline/collections/M-Q4pcV0qkiyJ0kiSWECl_some_collection/cards/XsxiHuzwlGIFNq245HdZC_series_question_b.yaml
index a7cb32758b3..3bbb8b29ff1 100644
--- a/test_resources/serialization_baseline/collections/M-Q4pcV0qkiyJ0kiSWECl_some_collection/cards/XsxiHuzwlGIFNq245HdZC_series_question_b.yaml
+++ b/test_resources/serialization_baseline/collections/M-Q4pcV0qkiyJ0kiSWECl_some_collection/cards/XsxiHuzwlGIFNq245HdZC_series_question_b.yaml
@@ -31,6 +31,5 @@ dashboard_id: null
document_id: null
embedding_type: null
metabase_version: v1.57.1-SNAPSHOT (d027b42)
-published_table_id: null
source_card_id: null
type: question
diff --git a/test_resources/serialization_baseline/collections/M-Q4pcV0qkiyJ0kiSWECl_some_collection/cards/f1C68pznmrpN1F5xFDj6d_some_question.yaml b/test_resources/serialization_baseline/collections/M-Q4pcV0qkiyJ0kiSWECl_some_collection/cards/f1C68pznmrpN1F5xFDj6d_some_question.yaml
index 1305872e019..731eadf36c0 100644
--- a/test_resources/serialization_baseline/collections/M-Q4pcV0qkiyJ0kiSWECl_some_collection/cards/f1C68pznmrpN1F5xFDj6d_some_question.yaml
+++ b/test_resources/serialization_baseline/collections/M-Q4pcV0qkiyJ0kiSWECl_some_collection/cards/f1C68pznmrpN1F5xFDj6d_some_question.yaml
@@ -31,6 +31,5 @@ dashboard_id: null
document_id: null
embedding_type: null
metabase_version: v1.57.1-SNAPSHOT (d027b42)
-published_table_id: null
source_card_id: null
type: question
diff --git a/test_resources/serialization_baseline/collections/cards/1z82DAj_YUJAsCZZaacxK_linked_card.yaml b/test_resources/serialization_baseline/collections/cards/1z82DAj_YUJAsCZZaacxK_linked_card.yaml
index e1478384957..fe9ed9f76a9 100644
--- a/test_resources/serialization_baseline/collections/cards/1z82DAj_YUJAsCZZaacxK_linked_card.yaml
+++ b/test_resources/serialization_baseline/collections/cards/1z82DAj_YUJAsCZZaacxK_linked_card.yaml
@@ -31,6 +31,5 @@ dashboard_id: null
document_id: null
embedding_type: null
metabase_version: v1.57.1-SNAPSHOT (d027b42)
-published_table_id: null
source_card_id: null
type: question
diff --git a/test_resources/serialization_baseline/collections/cards/4ahdpFn43jybRFVQTRjX__ai_model.yaml b/test_resources/serialization_baseline/collections/cards/4ahdpFn43jybRFVQTRjX__ai_model.yaml
index 1a10da2c18d..722c0e53fad 100644
--- a/test_resources/serialization_baseline/collections/cards/4ahdpFn43jybRFVQTRjX__ai_model.yaml
+++ b/test_resources/serialization_baseline/collections/cards/4ahdpFn43jybRFVQTRjX__ai_model.yaml
@@ -31,6 +31,5 @@ dashboard_id: null
document_id: null
embedding_type: null
metabase_version: v1.57.1-SNAPSHOT (d027b42)
-published_table_id: null
source_card_id: null
type: model
diff --git a/test_resources/serialization_baseline/collections/cards/RC0EJ8I00lOUnvbnGJJNf_ai_model.yaml b/test_resources/serialization_baseline/collections/cards/RC0EJ8I00lOUnvbnGJJNf_ai_model.yaml
index 0e929e143ee..99f4c056939 100644
--- a/test_resources/serialization_baseline/collections/cards/RC0EJ8I00lOUnvbnGJJNf_ai_model.yaml
+++ b/test_resources/serialization_baseline/collections/cards/RC0EJ8I00lOUnvbnGJJNf_ai_model.yaml
@@ -31,6 +31,5 @@ dashboard_id: null
document_id: null
embedding_type: null
metabase_version: v1.57.1-SNAPSHOT (d027b42)
-published_table_id: null
source_card_id: null
type: model
diff --git a/test_resources/serialization_baseline/collections/cards/aqpA3mIKUnfzYUlwjuGwT_source_question.yaml b/test_resources/serialization_baseline/collections/cards/aqpA3mIKUnfzYUlwjuGwT_source_question.yaml
index e27ecb8e521..bb72d382690 100644
--- a/test_resources/serialization_baseline/collections/cards/aqpA3mIKUnfzYUlwjuGwT_source_question.yaml
+++ b/test_resources/serialization_baseline/collections/cards/aqpA3mIKUnfzYUlwjuGwT_source_question.yaml
@@ -35,6 +35,5 @@ dashboard_id: null
document_id: null
embedding_type: null
metabase_version: v1.57.1-SNAPSHOT (d027b42)
-published_table_id: null
source_card_id: null
type: model
diff --git a/test_resources/serialization_baseline/collections/cards/kDd3G__y2cqdZu7A1SUsU_ai_model.yaml b/test_resources/serialization_baseline/collections/cards/kDd3G__y2cqdZu7A1SUsU_ai_model.yaml
index 9eea146d929..6fcd7109d78 100644
--- a/test_resources/serialization_baseline/collections/cards/kDd3G__y2cqdZu7A1SUsU_ai_model.yaml
+++ b/test_resources/serialization_baseline/collections/cards/kDd3G__y2cqdZu7A1SUsU_ai_model.yaml
@@ -31,6 +31,5 @@ dashboard_id: null
document_id: null
embedding_type: null
metabase_version: v1.57.1-SNAPSHOT (d027b42)
-published_table_id: null
source_card_id: null
type: model
diff --git a/test_resources/serialization_baseline/collections/cards/ze7O4-8qRFH1v2Ho2apT1_root_card.yaml b/test_resources/serialization_baseline/collections/cards/ze7O4-8qRFH1v2Ho2apT1_root_card.yaml
index 2abd9948465..c8b6f9c0eca 100644
--- a/test_resources/serialization_baseline/collections/cards/ze7O4-8qRFH1v2Ho2apT1_root_card.yaml
+++ b/test_resources/serialization_baseline/collections/cards/ze7O4-8qRFH1v2Ho2apT1_root_card.yaml
@@ -31,6 +31,5 @@ dashboard_id: null
document_id: null
embedding_type: null
metabase_version: v1.57.1-SNAPSHOT (d027b42)
-published_table_id: null
source_card_id: null
type: question
diff --git a/test_resources/serialization_baseline/collections/gQuHAIM4C-7fToHzHyNNQ_ai_model/cards/Mr5p0TE2FSxGeUFaWd9yu_ai_model.yaml b/test_resources/serialization_baseline/collections/gQuHAIM4C-7fToHzHyNNQ_ai_model/cards/Mr5p0TE2FSxGeUFaWd9yu_ai_model.yaml
index 95fa9d12d00..f645c49a885 100644
--- a/test_resources/serialization_baseline/collections/gQuHAIM4C-7fToHzHyNNQ_ai_model/cards/Mr5p0TE2FSxGeUFaWd9yu_ai_model.yaml
+++ b/test_resources/serialization_baseline/collections/gQuHAIM4C-7fToHzHyNNQ_ai_model/cards/Mr5p0TE2FSxGeUFaWd9yu_ai_model.yaml
@@ -31,6 +31,5 @@ dashboard_id: null
document_id: null
embedding_type: null
metabase_version: v1.57.1-SNAPSHOT (d027b42)
-published_table_id: null
source_card_id: null
type: model
diff --git a/test_resources/serialization_baseline/collections/olgKH56lYOjakuobH4zPz_grandparent_collection/cards/m98z04nYGCF5n7cvOTfbj_grandparent_card.yaml b/test_resources/serialization_baseline/collections/olgKH56lYOjakuobH4zPz_grandparent_collection/cards/m98z04nYGCF5n7cvOTfbj_grandparent_card.yaml
index 0590fe99af3..2b0bb32c6c7 100644
--- a/test_resources/serialization_baseline/collections/olgKH56lYOjakuobH4zPz_grandparent_collection/cards/m98z04nYGCF5n7cvOTfbj_grandparent_card.yaml
+++ b/test_resources/serialization_baseline/collections/olgKH56lYOjakuobH4zPz_grandparent_collection/cards/m98z04nYGCF5n7cvOTfbj_grandparent_card.yaml
@@ -31,6 +31,5 @@ dashboard_id: null
document_id: null
embedding_type: null
metabase_version: v1.57.1-SNAPSHOT (d027b42)
-published_table_id: null
source_card_id: null
type: question
diff --git a/test_resources/serialization_baseline/collections/olgKH56lYOjakuobH4zPz_grandparent_collection/qPZhJMPNGkfd3sq8jWiZS_parent_collection/cards/IBZSKSt2-QOMviIaGcQE6_parent_card.yaml b/test_resources/serialization_baseline/collections/olgKH56lYOjakuobH4zPz_grandparent_collection/qPZhJMPNGkfd3sq8jWiZS_parent_collection/cards/IBZSKSt2-QOMviIaGcQE6_parent_card.yaml
index 74b3d43129d..46b22d823fd 100644
--- a/test_resources/serialization_baseline/collections/olgKH56lYOjakuobH4zPz_grandparent_collection/qPZhJMPNGkfd3sq8jWiZS_parent_collection/cards/IBZSKSt2-QOMviIaGcQE6_parent_card.yaml
+++ b/test_resources/serialization_baseline/collections/olgKH56lYOjakuobH4zPz_grandparent_collection/qPZhJMPNGkfd3sq8jWiZS_parent_collection/cards/IBZSKSt2-QOMviIaGcQE6_parent_card.yaml
@@ -31,6 +31,5 @@ dashboard_id: null
document_id: null
embedding_type: null
metabase_version: v1.57.1-SNAPSHOT (d027b42)
-published_table_id: null
source_card_id: null
type: question
diff --git a/test_resources/serialization_baseline/collections/olgKH56lYOjakuobH4zPz_grandparent_collection/qPZhJMPNGkfd3sq8jWiZS_parent_collection/fJVsXIDzzipSZsaro9Pvu_child_collection/cards/Ra0JVOCXKTxH5TPbwZm0x_child_card.yaml b/test_resources/serialization_baseline/collections/olgKH56lYOjakuobH4zPz_grandparent_collection/qPZhJMPNGkfd3sq8jWiZS_parent_collection/fJVsXIDzzipSZsaro9Pvu_child_collection/cards/Ra0JVOCXKTxH5TPbwZm0x_child_card.yaml
index e31415ba648..6145fd273d1 100644
--- a/test_resources/serialization_baseline/collections/olgKH56lYOjakuobH4zPz_grandparent_collection/qPZhJMPNGkfd3sq8jWiZS_parent_collection/fJVsXIDzzipSZsaro9Pvu_child_collection/cards/Ra0JVOCXKTxH5TPbwZm0x_child_card.yaml
+++ b/test_resources/serialization_baseline/collections/olgKH56lYOjakuobH4zPz_grandparent_collection/qPZhJMPNGkfd3sq8jWiZS_parent_collection/fJVsXIDzzipSZsaro9Pvu_child_collection/cards/Ra0JVOCXKTxH5TPbwZm0x_child_card.yaml
@@ -31,6 +31,5 @@ dashboard_id: null
document_id: null
embedding_type: null
metabase_version: v1.57.1-SNAPSHOT (d027b42)
-published_table_id: null
source_card_id: null
type: question