Skip to content

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

Stop autopinning models and metrics on creation (#79548)

Andrei Chernykh9bdf46f3d7ea
diff --git a/e2e/test/scenarios/metrics/metrics-editing.cy.spec.js b/e2e/test/scenarios/metrics/metrics-editing.cy.spec.js
index 588b0a23dfb..efc95ff8ebd 100644
--- a/e2e/test/scenarios/metrics/metrics-editing.cy.spec.js
+++ b/e2e/test/scenarios/metrics/metrics-editing.cy.spec.js
@@ -195,40 +195,6 @@ describe("scenarios > metrics > editing", () => {
verifyMetricAboutTimeseries({ yAxis: "Sum of Total" });
});
- it("should pin new metrics automatically", () => {
- cy.visit("/browse/metrics");
- cy.findByTestId("browse-metrics-header")
- .findByLabelText("Create a new metric")
- .should("be.visible")
- .click();
-
- H.expectUnstructuredSnowplowEvent({
- event: "metric_create_started",
- triggered_from: "browse_metrics",
- });
-
- H.MetricPage.queryEditor().should("be.visible");
- H.miniPicker().within(() => {
- cy.findByText("Sample Database").click();
- cy.findByText("Orders").click();
- });
- saveNewMetric({ name: "Pinned metric" });
-
- H.expectUnstructuredSnowplowEvent({
- event: "metric_created",
- triggered_from: "main_app",
- result: "success",
- });
-
- H.MetricPage.aboutPage().should("be.visible");
- H.MetricPage.header().findByText("Our analytics").click();
-
- cy.findByTestId("pinned-items").within(() => {
- cy.findByText("Pinned metric").should("be.visible");
- cy.findByText("A metric").should("be.visible");
- });
- });
-
it("should not crash when cancelling creation or editing of a metric (metabase#48024)", () => {
cy.log("cancel new metric creation");
startNewMetricWithTable("Sample Database", "Orders");
diff --git a/e2e/test/scenarios/models/create.cy.spec.js b/e2e/test/scenarios/models/create.cy.spec.js
index e8228ad78c1..18344e96869 100644
--- a/e2e/test/scenarios/models/create.cy.spec.js
+++ b/e2e/test/scenarios/models/create.cy.spec.js
@@ -36,8 +36,6 @@ describe("scenarios > models > create", () => {
// After saving, we land on view mode for the model
cy.location("pathname").should("match", /^\/model\/\d+-.*$/);
cy.findByTestId("question-row-count").should("have.text", "Showing 1 row");
-
- checkIfPinned(modelName);
});
// This covers creating a GUI model from the browse page + nocollection permissions (2 in 1)
@@ -105,15 +103,3 @@ function navigateToNewModelPage(queryType = "native") {
cy.findByText("Use a native query").click();
}
}
-
-function checkIfPinned(modelName) {
- cy.findByTestId("app-bar").findByText("Our analytics").click();
- cy.location("pathname").should("eq", "/collection/root");
-
- cy.findByText(modelName)
- .closest("a")
- .find(".Icon-ellipsis")
- .click({ force: true });
-
- H.popover().findByText("Unpin").should("be.visible");
-}
diff --git a/e2e/test/scenarios/models/models.cy.spec.js b/e2e/test/scenarios/models/models.cy.spec.js
index 717ab9c29a5..d15d2bf3755 100644
--- a/e2e/test/scenarios/models/models.cy.spec.js
+++ b/e2e/test/scenarios/models/models.cy.spec.js
@@ -87,7 +87,7 @@ describe("scenarios > models", () => {
.findAllByText("Our analytics")
.first()
.click();
- getCollectionItemCard("Products Model").icon("model");
+ getCollectionItemRow("Products Model").icon("model");
getCollectionItemRow("Q1").icon("table2");
cy.url().should("not.include", "/question/" + id);
@@ -167,9 +167,7 @@ describe("scenarios > models", () => {
});
cy.findByTestId("qb-header").findAllByText("Our analytics").first().click();
- getCollectionItemCard("Product Model").within(() => {
- cy.icon("model");
- });
+ getCollectionItemRow("Product Model").icon("model");
getCollectionItemRow("Q1").icon("table2");
cy.location("pathname").should("eq", "/collection/root");
@@ -603,30 +601,6 @@ describe("scenarios > models", () => {
});
});
- it("should automatically pin newly created models", () => {
- H.visitQuestion(ORDERS_QUESTION_ID);
- turnIntoModel();
- H.visitCollection("root");
- cy.findByTestId("pinned-items").within(() => {
- cy.findByText("Orders");
- cy.findByText("A model");
- });
- });
-
- it("should undo pinning a question if turning into a model was undone", () => {
- H.visitQuestion(ORDERS_QUESTION_ID);
-
- turnIntoModel();
- H.undo();
- cy.wait("@cardUpdate");
-
- H.visitCollection("root");
- // eslint-disable-next-line metabase/no-unscoped-text-selectors -- deprecated usage
- cy.findByText("Useful data").should("not.exist");
- // eslint-disable-next-line metabase/no-unscoped-text-selectors -- deprecated usage
- cy.findByText("A model").should("not.exist");
- });
-
describe("listing", () => {
const modelDetails = {
name: "Orders Model 2",
@@ -665,10 +639,6 @@ function getCollectionItemRow(itemName) {
return cy.findByText(itemName).closest("tr");
}
-function getCollectionItemCard(itemName) {
- return cy.findByText(itemName).closest("a");
-}
-
function getResults() {
return cy.findAllByTestId("result-item");
}
diff --git a/enterprise/frontend/src/embedding-sdk-package/cli/utils/create-model-from-table.ts b/enterprise/frontend/src/embedding-sdk-package/cli/utils/create-model-from-table.ts
index 55d6b0e4048..8345e296dd1 100644
--- a/enterprise/frontend/src/embedding-sdk-package/cli/utils/create-model-from-table.ts
+++ b/enterprise/frontend/src/embedding-sdk-package/cli/utils/create-model-from-table.ts
@@ -30,7 +30,6 @@ export async function createModelFromTable(options: Options) {
display: "table",
result_metadata: null,
collection_id: collectionId,
- collection_position: 1,
visualization_settings: {},
dataset_query: datasetQuery,
description: `A model created via the embedding sdk's CLI`,
diff --git a/frontend/src/metabase/collections/components/PinnedItemsGrid/PinnedItemsGrid.tsx b/frontend/src/metabase/collections/components/PinnedItemsGrid/PinnedItemsGrid.tsx
index 7ce2551f30a..3ab28d1032a 100644
--- a/frontend/src/metabase/collections/components/PinnedItemsGrid/PinnedItemsGrid.tsx
+++ b/frontend/src/metabase/collections/components/PinnedItemsGrid/PinnedItemsGrid.tsx
@@ -52,11 +52,8 @@ export function PinnedItemsGrid({
<PinDropZone variant="pin" />
<SimpleGrid cols={{ base: 1, md: 2, lg: 3 }} spacing="md">
{sortedItems.map((item, index) => {
- // Autopinned items can share a collection_position (e.g. several
- // items at 1), which would make the strict front/back drop-target
- // comparisons reject every slot. Use the dense display order for
- // drag and drop instead; the backend reconciles sibling positions
- // on drop.
+ // collection_position isn't guaranteed unique, so drag and drop is
+ // keyed by display index instead.
const pinIndex = index + 1;
return (
<Box key={`${item.model}-${item.id}`} pos="relative">
diff --git a/frontend/src/metabase/metrics/pages/NewMetricPage/CreateMetricModal/CreateMetricModal.tsx b/frontend/src/metabase/metrics/pages/NewMetricPage/CreateMetricModal/CreateMetricModal.tsx
index 22f4407c55d..24e2948e814 100644
--- a/frontend/src/metabase/metrics/pages/NewMetricPage/CreateMetricModal/CreateMetricModal.tsx
+++ b/frontend/src/metabase/metrics/pages/NewMetricPage/CreateMetricModal/CreateMetricModal.tsx
@@ -141,7 +141,6 @@ function getCreateRequest(
name,
description,
collection_id,
- collection_position: 1,
result_metadata,
type: "metric",
dataset_query: Lib.toJsQuery(query),
diff --git a/frontend/src/metabase/query_builder/actions/models.ts b/frontend/src/metabase/query_builder/actions/models.ts
index 26481dbec3b..1a2d96541cc 100644
--- a/frontend/src/metabase/query_builder/actions/models.ts
+++ b/frontend/src/metabase/query_builder/actions/models.ts
@@ -38,11 +38,7 @@ export const turnQuestionIntoModel =
return;
}
- const model = question
- .setType("model")
- .setPinned(true)
- .setDisplay("table")
- .setSettings({});
+ const model = question.setType("model").setDisplay("table").setSettings({});
await dispatch(apiUpdateQuestion(model, { rerunQuery: true }));
dispatch(
diff --git a/frontend/src/metabase/query_builder/containers/use-create-question.ts b/frontend/src/metabase/query_builder/containers/use-create-question.ts
index 37d4d308033..1d596c57cc6 100644
--- a/frontend/src/metabase/query_builder/containers/use-create-question.ts
+++ b/frontend/src/metabase/query_builder/containers/use-create-question.ts
@@ -22,10 +22,8 @@ export const useCreateQuestion = ({
return useCallback(
async (newQuestion: Question, options?: OnCreateOptions) => {
- const shouldBePinned =
- newQuestion.type() === "model" || newQuestion.type() === "metric";
const createdQuestion = await dispatch(
- apiCreateQuestion(newQuestion.setPinned(shouldBePinned), options),
+ apiCreateQuestion(newQuestion.setPinned(false), options),
);
await dispatch(setUIControls({ isModifiedFromNotebook: false }));