The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
Render pinned collection items in a single grid of compact static cards (#79493)
Andrei Chernykh4d6c2d2dbe9d
diff --git a/docs/exploration-and-organization/collections.md b/docs/exploration-and-organization/collections.mdindex b6dc7cb5f67..4ed98a229b1 100644--- a/docs/exploration-and-organization/collections.md+++ b/docs/exploration-and-organization/collections.md@@ -75,10 +75,6 @@ To pin and un-pin things in a collection, you need to have **Curate** permission- To pin an item, find the item on the collection page, go into the three-dot menu (**...**), and select **Pin this**.- To unpin a pinned item, hover over the pinned card, go to the three-dot menu (**...**), and select **Unpin**.-For pinned questions, you can also choose whether to display the visualization from the three-dot menu (**...**).---Pinned items will appear pinned for all people looking at the collection. If you just want to organize your favorite items, you should [bookmark them](./exploration.md#bookmarks) (only you can see your bookmarks).## Moving collectionsdiff --git a/docs/exploration-and-organization/images/pinned-show-viz.png b/docs/exploration-and-organization/images/pinned-show-viz.pngdeleted file mode 100644index 41ac861ee0d..00000000000Binary files a/docs/exploration-and-organization/images/pinned-show-viz.png and /dev/null differdiff --git a/e2e/test/scenarios/collections/collection-pinned-overview.cy.spec.js b/e2e/test/scenarios/collections/collection-pinned-overview.cy.spec.jsindex 56f19228a4c..53b218fa8a7 100644--- a/e2e/test/scenarios/collections/collection-pinned-overview.cy.spec.js+++ b/e2e/test/scenarios/collections/collection-pinned-overview.cy.spec.js@@ -6,7 +6,7 @@ import {ORDERS_QUESTION_ID,} from "e2e/support/cypress_sample_instance_data";-const { ORDERS, ORDERS_ID, PEOPLE } = SAMPLE_DATABASE;+const { ORDERS, ORDERS_ID } = SAMPLE_DATABASE;const DASHBOARD_NAME = "Orders in a dashboard";const QUESTION_NAME = "Orders, Count";@@ -48,25 +48,6 @@ const SQL_QUESTION_DETAILS_REQUIRED_PARAMETER = {},};-const SQL_QUESTION_DETAILS_WITH_DEFAULT_VALUE = {- name: "SQL with parameters",- display: "scalar",- native: {- "template-tags": {- filter: {- type: "dimension",- name: "filter",- id: "4b77cc1f-ea70-4ef6-84db-58432fce6928",- "display-name": "date",- default: "1999-02-26~2024-02-26",- dimension: ["field", PEOPLE.BIRTH_DATE, null],- "widget-type": "date/range",- },- },- query: "select count(*) from people where {{filter}}",- },-};-describe("scenarios > collection pinned items overview", () => {beforeEach(() => {H.restore();@@ -90,17 +71,19 @@ describe("scenarios > collection pinned items overview", () => {});});- it("should be able to pin a question", () => {+ it("should be able to pin a question without rendering its visualization", () => {openRootCollection();H.openUnpinnedItemMenu(QUESTION_NAME);H.popover().findByText("Pin this").click();- cy.wait(["@getPinnedItems", "@getCardQuery"]);+ cy.wait("@getPinnedItems");H.getPinnedSection().within(() => {- cy.findByText("18,760").should("be.visible");+ cy.findByText("A question").should("be.visible");cy.findByText(QUESTION_NAME).click();cy.url().should("include", `/question/${ORDERS_COUNT_QUESTION_ID}`);});++ cy.get("@getCardQuery.all").should("have.length", 0);});it("should be able to pin a pivot table", () => {@@ -109,12 +92,10 @@ describe("scenarios > collection pinned items overview", () => {});openRootCollection();- cy.wait("@getCardQuery");H.getPinnedSection().within(() => {cy.findByText(PIVOT_QUESTION_DETAILS.name).should("be.visible");- cy.findByText("Created At: Month").should("be.visible");- cy.findByText("Count").should("be.visible");+ cy.findByText("A question").should("be.visible");});});@@ -190,81 +171,43 @@ describe("scenarios > collection pinned items overview", () => {cy.findByText(DASHBOARD_NAME).should("not.exist");});- it("should be able to hide the visualization for a pinned question", () => {- cy.request("PUT", `/api/card/${ORDERS_COUNT_QUESTION_ID}`, {- collection_position: 1,- });+ it("should render pinned native questions as static cards", () => {+ H.createNativeQuestion(SQL_QUESTION_DETAILS_REQUIRED_PARAMETER).then(+ ({ body: { id } }) => {+ cy.request("PUT", `/api/card/${id}`, { collection_position: 1 });+ },+ );openRootCollection();- cy.log("wait for data to be loaded and displayed");- H.getPinnedSection().should("contain", "18,760");- H.openPinnedItemMenu(QUESTION_NAME);- H.popover().findByText("Don’t show visualization").click();- cy.wait("@getPinnedItems");-H.getPinnedSection().within(() => {- cy.findByText("18,760").should("not.exist");+ cy.findByText(SQL_QUESTION_DETAILS_REQUIRED_PARAMETER.name).should(+ "be.visible",+ );cy.findByText("A question").should("be.visible");- cy.findByText(QUESTION_NAME).click();- cy.url().should("include", `/question/${ORDERS_COUNT_QUESTION_ID}`);});});- it("should be able to show the visualization for a pinned question", () => {- cy.request("PUT", `/api/card/${ORDERS_COUNT_QUESTION_ID}`, {+ it("should render all pinned items in a single section without type headings", () => {+ cy.request("PUT", `/api/dashboard/${ORDERS_DASHBOARD_ID}`, {collection_position: 1,- collection_preview: false,+ });+ cy.request("PUT", `/api/card/${ORDERS_COUNT_QUESTION_ID}`, {+ collection_position: 2,});openRootCollection();- H.openPinnedItemMenu(QUESTION_NAME);- H.popover().findByText("Show visualization").click();- cy.wait(["@getPinnedItems", "@getCardQuery"]);H.getPinnedSection().within(() => {+ cy.findByText(DASHBOARD_NAME).should("be.visible");cy.findByText(QUESTION_NAME).should("be.visible");- cy.findByText("18,760").should("be.visible");- });- });-- describe("native questions", () => {- it("should automatically hide the visualization for pinned native questions with missing required parameters", () => {- H.createNativeQuestion(SQL_QUESTION_DETAILS_REQUIRED_PARAMETER).then(- ({ body: { id } }) => {- cy.request("PUT", `/api/card/${id}`, { collection_position: 1 });- },- );-- openRootCollection();- H.getPinnedSection().within(() => {- cy.findByText(SQL_QUESTION_DETAILS_WITH_DEFAULT_VALUE.name).should(- "be.visible",- );- cy.findByText("A question").should("be.visible");- });- });-- it("should apply default value of variable for pinned native questions (metabase#37831)", () => {- H.createNativeQuestion(SQL_QUESTION_DETAILS_WITH_DEFAULT_VALUE).then(- ({ body: { id } }) => {- cy.request("PUT", `/api/card/${id}`, { collection_position: 1 });- },- );-- openRootCollection();- H.getPinnedSection().within(() => {- cy.findByText(SQL_QUESTION_DETAILS_WITH_DEFAULT_VALUE.name).should(- "be.visible",- );- cy.findByTestId("scalar-value").should("have.text", "68");- });+ cy.findByText("Dashboards").should("not.exist");+ cy.findByText("Pinned questions").should("not.exist");});});it("should be able to pin a visualization by dragging it up", () => {cy.request("PUT", `/api/card/${ORDERS_COUNT_QUESTION_ID}`, {collection_position: 1,- collection_preview: false,});openRootCollection();diff --git a/e2e/test/scenarios/collections/collections.cy.spec.js b/e2e/test/scenarios/collections/collections.cy.spec.jsindex a690ed0a9ea..bca98c2de5c 100644--- a/e2e/test/scenarios/collections/collections.cy.spec.js+++ b/e2e/test/scenarios/collections/collections.cy.spec.js@@ -812,7 +812,7 @@ describe("scenarios > collection defaults", () => {H.openUnpinnedItemMenu("Orders, Count");H.popover().findByText("Pin this").click();H.getPinnedSection().within(() => {- cy.findByText("18,760");+ cy.findByText("Orders, Count");});// Select onediff --git a/e2e/test/scenarios/metrics/metrics-collection.cy.spec.js b/e2e/test/scenarios/metrics/metrics-collection.cy.spec.jsindex 1ca1c7492fa..f1bec6d4431 100644--- a/e2e/test/scenarios/metrics/metrics-collection.cy.spec.js+++ b/e2e/test/scenarios/metrics/metrics-collection.cy.spec.js@@ -43,13 +43,9 @@ describe("scenarios > metrics > collection", () => {H.createQuestion(ORDERS_TIMESERIES_METRIC);cy.visit("/collection/root");H.getPinnedSection().within(() => {- cy.findByText("Metrics").should("be.visible");cy.findByText(ORDERS_SCALAR_METRIC.name).should("be.visible");cy.findByText(ORDERS_TIMESERIES_METRIC.name).should("be.visible");- cy.findAllByTestId("scalar-container")- .should("have.length", 2)- .and("be.visible");- cy.findAllByText("18,760").should("have.length", 2).and("be.visible");+ cy.findAllByText("A metric").should("have.length", 2).and("be.visible");});});@@ -76,29 +72,6 @@ describe("scenarios > metrics > collection", () => {H.getUnpinnedSection().findByText(ORDERS_SCALAR_METRIC.name).should("not.exist");-- cy.log(- "should persist pinned metric visualization on collection page reload (UXW-4958)",- );- H.createQuestion(ORDERS_TIMESERIES_METRIC).then(({ body: metric }) => {- cy.request("GET", `/api/metric/${metric.id}/dimension`).then(- ({ body }) => {- const createdAt = body.added.find(- (dimension) => dimension.display_name === "Created At",- );- expect(createdAt).to.exist;- cy.request("POST", `/api/metric/${metric.id}/dimension/set-default`, {- dimension_id: createdAt.id,- });- },- );- cy.reload();- H.getPinnedSection()- .findByRole("link", { name: new RegExp(ORDERS_TIMESERIES_METRIC.name) })- .findByTestId("visualization-root")- .should("have.attr", "data-viz-ui-name", "Line")- .and("be.visible");- });});it("should be possible to add and remove a metric from bookmarks", () => {@@ -107,12 +80,10 @@ describe("scenarios > metrics > collection", () => {...ORDERS_TIMESERIES_METRIC,collection_position: null,});- cy.intercept("POST", "/api/card/*/query").as("cardQuery");cy.visit("/collection/root");- cy.wait("@cardQuery");- H.getPinnedSection().should("contain", "18,760");+ H.getPinnedSection().should("contain", ORDERS_SCALAR_METRIC.name);H.openPinnedItemMenu(ORDERS_SCALAR_METRIC.name);H.popover().findByText("Bookmark").click();@@ -120,10 +91,6 @@ describe("scenarios > metrics > collection", () => {.findByText(ORDERS_SCALAR_METRIC.name).should("be.visible");- cy.log("pinned card should 'blink' to load and later show the data");- cy.wait("@cardQuery");- H.getPinnedSection().should("contain", "18,760");-H.openPinnedItemMenu(ORDERS_SCALAR_METRIC.name);H.popover().findByText("Remove from bookmarks").click();H.navigationSidebar()@@ -142,29 +109,6 @@ describe("scenarios > metrics > collection", () => {.should("not.exist");});- it("should be possible to hide the visualization for a pinned metric", () => {- H.createQuestion(ORDERS_SCALAR_METRIC);- cy.visit("/collection/root");- H.getPinnedSection().within(() => {- cy.findByText(ORDERS_SCALAR_METRIC.name).should("be.visible");- cy.findByTestId("scalar-container").should("be.visible");- });-- H.openPinnedItemMenu(ORDERS_SCALAR_METRIC.name);- H.popover().findByText("Don’t show visualization").click();- H.getPinnedSection().within(() => {- cy.findByText(ORDERS_SCALAR_METRIC.name).should("be.visible");- cy.findByTestId("scalar-container").should("not.exist");- });-- H.openPinnedItemMenu(ORDERS_SCALAR_METRIC.name);- H.popover().findByText("Show visualization").click();- H.getPinnedSection().within(() => {- cy.findByText(ORDERS_SCALAR_METRIC.name).should("be.visible");- cy.findByTestId("scalar-container").should("be.visible");- });- });-it("should be possible to archive, unarchive, and delete a metric", () => {H.createQuestion(ORDERS_SCALAR_METRIC);H.createQuestion({diff --git a/e2e/test/scenarios/metrics/metrics-editing.cy.spec.js b/e2e/test/scenarios/metrics/metrics-editing.cy.spec.jsindex b8eff4a642e..588b0a23dfb 100644--- a/e2e/test/scenarios/metrics/metrics-editing.cy.spec.js+++ b/e2e/test/scenarios/metrics/metrics-editing.cy.spec.js@@ -224,15 +224,8 @@ describe("scenarios > metrics > editing", () => {H.MetricPage.header().findByText("Our analytics").click();cy.findByTestId("pinned-items").within(() => {- cy.findByRole("heading", { name: "Metrics" }).should("be.visible");- cy.findByText("Pinned metric")- .closest("a")- .within(() => {- cy.findByTestId("visualization-root")- .should("be.visible")- .and("have.attr", "data-viz-ui-name", "Line");- H.echartsContainer().should("be.visible");- });+ cy.findByText("Pinned metric").should("be.visible");+ cy.findByText("A metric").should("be.visible");});});diff --git a/e2e/test/scenarios/models/models.cy.spec.js b/e2e/test/scenarios/models/models.cy.spec.jsindex c21ecfac7fe..717ab9c29a5 100644--- a/e2e/test/scenarios/models/models.cy.spec.js+++ b/e2e/test/scenarios/models/models.cy.spec.js@@ -608,7 +608,7 @@ describe("scenarios > models", () => {turnIntoModel();H.visitCollection("root");cy.findByTestId("pinned-items").within(() => {- cy.findByText("Models");+ cy.findByText("Orders");cy.findByText("A model");});});diff --git a/e2e/test/scenarios/onboarding/home/homepage.cy.spec.js b/e2e/test/scenarios/onboarding/home/homepage.cy.spec.jsindex 434abad15e8..561192c9931 100644--- a/e2e/test/scenarios/onboarding/home/homepage.cy.spec.js+++ b/e2e/test/scenarios/onboarding/home/homepage.cy.spec.js@@ -16,7 +16,6 @@ describe("scenarios > home > homepage", () => {cy.intercept("GET", "/api/activity/recents?*").as("getRecentItems");cy.intercept("GET", "/api/activity/popular_items").as("getPopularItems");cy.intercept("GET", "/api/collection/*/items*").as("getCollectionItems");- cy.intercept("POST", "/api/card/*/query").as("getQuestionQuery");});describe("after setup", () => {@@ -293,7 +292,6 @@ describe("scenarios > home > homepage", () => {cy.wait("@getCollectionItems");pinItem("Orders, Count");cy.wait("@getCollectionItems");- cy.wait("@getQuestionQuery");cy.visit("/");cy.wait("@getRecentItems");diff --git a/e2e/test/scenarios/organization/bookmarks-collection.cy.spec.js b/e2e/test/scenarios/organization/bookmarks-collection.cy.spec.jsindex 832b6a6076f..062f118a5f8 100644--- a/e2e/test/scenarios/organization/bookmarks-collection.cy.spec.js+++ b/e2e/test/scenarios/organization/bookmarks-collection.cy.spec.js@@ -168,7 +168,7 @@ describe("scenarios > organization > bookmarks > collection", () => {H.visitCollection("root");pin(name);- H.tableHeaderColumn("ID");+ H.getPinnedSection().findByText("A question");bookmarkPinnedItem(name);H.expectUnstructuredSnowplowEvent({diff --git a/e2e/test/scenarios/question/saved.cy.spec.js b/e2e/test/scenarios/question/saved.cy.spec.jsindex 34ce93965d1..ddbf3446d3b 100644--- a/e2e/test/scenarios/question/saved.cy.spec.js+++ b/e2e/test/scenarios/question/saved.cy.spec.js@@ -539,9 +539,6 @@ describe("scenarios > question > saved", () => {H.appBar().findByRole("link", { name: /Our analytics/i }).click();- cy.findByTestId("pinned-items")- .findAllByTestId("development-watermark")- .should("have.length.above", 0);cy.findByTestId("collection-table").findByRole("link", { name: /Orders in a dashboard/i })diff --git a/e2e/test/scenarios/visualizations-charts/custom-viz.cy.spec.ts b/e2e/test/scenarios/visualizations-charts/custom-viz.cy.spec.tsindex 1fbda2377dd..65c6f83fb9c 100644--- a/e2e/test/scenarios/visualizations-charts/custom-viz.cy.spec.ts+++ b/e2e/test/scenarios/visualizations-charts/custom-viz.cy.spec.ts@@ -805,7 +805,7 @@ describe("admin > custom visualizations", () => {H.getPinnedSection().within(() => {cy.findByText("Custom Viz Question Test").should("be.visible");- cy.findByText("Custom viz rendered successfully").should("be.visible");+ cy.findByText("A question").should("be.visible");});});@@ -1239,9 +1239,9 @@ describe("admin > custom visualizations", () => {H.updateSetting("custom-viz-enabled", true);H.addCustomVizPlugin(H.CUSTOM_VIZ_FIXTURE_TGZ);- // Main question: pinned with preview hidden so the pinned card shows- // the plugin icon instead of the rendered viz. Also bookmarked, queried- // (for recents), and embedded in a document below.+ // Main question: pinned, so the static pinned card shows the plugin+ // icon. Also bookmarked, queried (for recents), and embedded in a+ // document below.H.createQuestion({name: ICON_QUESTION_NAME,@@ -1257,7 +1257,6 @@ describe("admin > custom visualizations", () => {cy.get<CardId>("@questionId").then((cardId) => {cy.request("PUT", `/api/card/${cardId}`, {collection_position: 1,- collection_preview: false,});cy.request("POST", `/api/card/${cardId}/query`);cy.request("POST", `/api/bookmark/card/${cardId}`);@@ -1323,7 +1322,7 @@ describe("admin > custom visualizations", () => {.find(PLUGIN_ICON_SELECTOR).should("exist");- cy.log("Pinned section (collection_preview: false → icon, not viz)");+ cy.log("Pinned section shows the plugin icon on the static card");H.getPinnedSection().find(PLUGIN_ICON_SELECTOR).should("exist");cy.log("Navigate → question editor by clicking the pinned card title");diff --git a/e2e/test/scenarios/visualizations-charts/visualizations-charts-reproductions.cy.spec.ts b/e2e/test/scenarios/visualizations-charts/visualizations-charts-reproductions.cy.spec.tsindex 5357254b68f..7bdd23662fa 100644--- a/e2e/test/scenarios/visualizations-charts/visualizations-charts-reproductions.cy.spec.ts+++ b/e2e/test/scenarios/visualizations-charts/visualizations-charts-reproductions.cy.spec.ts@@ -787,14 +787,11 @@ describe("UXW-2696", () => {assertDataVisible();});- it("should show the message on pinned cards", () => {+ it("should be able to open the menu on pinned cards", () => {H.visitCollection("root");H.openCollectionItemMenu(QUESTION_NAME);H.popover().findByText("Pin this").click();- H.getPinnedSection().within(() => {- assertNoPoints();- });// assert that the menu trigger is not coveredH.openPinnedItemMenu(QUESTION_NAME);H.popover().should("exist");diff --git a/frontend/src/metabase-lib/v1/Question.ts b/frontend/src/metabase-lib/v1/Question.tsindex 9f2bd3ee6a1..29e350c4af4 100644--- a/frontend/src/metabase-lib/v1/Question.ts+++ b/frontend/src/metabase-lib/v1/Question.ts@@ -606,20 +606,16 @@ class Question {return question;}- private _getParameters = _.memoize((collectionPreview?: boolean) => {+ private _getParameters = _.memoize(() => {return getCardUiParameters(this.card(),this.metadata(),this._parameterValues,- undefined,- collectionPreview,);});- parameters({- collectionPreview,- }: { collectionPreview?: boolean } = {}): ParameterObject[] {- return this._getParameters(collectionPreview);+ parameters(): ParameterObject[] {+ return this._getParameters();}// predicate function that determines if the question is "dirty" compared to the given questiondiff --git a/frontend/src/metabase-lib/v1/parameters/utils/cards.ts b/frontend/src/metabase-lib/v1/parameters/utils/cards.tsindex 15a53d08a33..cb05188d82a 100644--- a/frontend/src/metabase-lib/v1/parameters/utils/cards.ts+++ b/frontend/src/metabase-lib/v1/parameters/utils/cards.ts@@ -15,7 +15,6 @@ export function getCardUiParameters(metadata: Metadata,parameterValues: { [key: string]: any } = {},parameters = getParametersFromCard(card, metadata),- collectionPreview?: boolean,): UiParameter[] {if (!card) {return [];@@ -25,7 +24,6 @@ export function getCardUiParameters(getValuePopulatedParameters({parameters,values: parameterValues,- collectionPreview,});const question = new Question(card, metadata);diff --git a/frontend/src/metabase-lib/v1/parameters/utils/parameter-values.js b/frontend/src/metabase-lib/v1/parameters/utils/parameter-values.jsindex 82bdc8ff187..c982870ad53 100644--- a/frontend/src/metabase-lib/v1/parameters/utils/parameter-values.js+++ b/frontend/src/metabase-lib/v1/parameters/utils/parameter-values.js@@ -40,15 +40,7 @@ export function getValuePopulatedParameters({parameters,values = {},defaultRequired = false,- collectionPreview = false,}) {- // pinned native question can have default values on parameters, usually we- // get them from URL, which is not the case for collection preview. to force- // BE to apply default values to those filters, empty array is provided- if (collectionPreview) {- return [];- }-return parameters.map((parameter) => ({...parameter,value: getParameterValue({diff --git a/frontend/src/metabase/browse/models/RecentModels.module.css b/frontend/src/metabase/browse/models/RecentModels.module.cssdeleted file mode 100644index acaccc71ed3..00000000000--- a/frontend/src/metabase/browse/models/RecentModels.module.css+++ /dev/null@@ -1,8 +0,0 @@-.recentModelsGrid {- display: grid;- grid-template-columns: repeat(auto-fill, minmax(13rem, 1fr));- gap: var(--mantine-spacing-sm);- margin: 0;- width: 100%;- margin-bottom: var(--mantine-spacing-sm);-}diff --git a/frontend/src/metabase/browse/models/RecentModels.tsx b/frontend/src/metabase/browse/models/RecentModels.tsxindex e2c844a0000..71b962b3d1e 100644--- a/frontend/src/metabase/browse/models/RecentModels.tsx+++ b/frontend/src/metabase/browse/models/RecentModels.tsx@@ -1,10 +1,12 @@import { t } from "ttag";-import PinnedItemCard from "metabase/common/collections/components/PinnedItemCard";-import { Box, Repeat, Text } from "metabase/ui";+import {+ CompactPinnedItemCard,+ CompactPinnedItemCardSkeleton,+} from "metabase/common/collections/components/CompactPinnedItemCard";+import { Box, Repeat, SimpleGrid, Text } from "metabase/ui";import type { RecentCollectionItem } from "metabase-types/api";-import S from "./RecentModels.module.css";import { trackModelClick } from "./analytics";export function RecentModels({@@ -35,21 +37,21 @@ export function RecentModels({mb="lg"style={{ visibility: skeleton ? "hidden" : undefined }}>{t`Recents`}</Text>- <div className={S.recentModelsGrid}>+ <SimpleGrid cols={{ base: 1, md: 2, lg: 3 }} mb="sm" spacing="md">{skeleton ? (<Repeat times={2}>- <PinnedItemCard skeleton iconForSkeleton="model" />+ <CompactPinnedItemCardSkeleton icon="model" /></Repeat>) : (models.map((model) => (- <PinnedItemCard+ <CompactPinnedItemCardkey={`model-${model.id}`}item={model}onClick={() => trackModelClick(model.id)}/>)))}- </div>+ </SimpleGrid></Box>);}diff --git a/frontend/src/metabase/collections/components/CollectionContent/CollectionContentView.tsx b/frontend/src/metabase/collections/components/CollectionContent/CollectionContentView.tsxindex 31218a34bf4..63b15a5b3a9 100644--- a/frontend/src/metabase/collections/components/CollectionContent/CollectionContentView.tsx+++ b/frontend/src/metabase/collections/components/CollectionContent/CollectionContentView.tsx@@ -15,7 +15,7 @@ import { listTag } from "metabase/api/tags";import { ArchivedEntityBanner } from "metabase/archive/components/ArchivedEntityBanner";import { useSetArchive } from "metabase/archive/hooks";import { CollectionBulkActions } from "metabase/collections/components/CollectionBulkActions";-import PinnedItemOverview from "metabase/collections/components/PinnedItemOverview";+import { PinnedItemsGrid } from "metabase/collections/components/PinnedItemsGrid";import Header from "metabase/collections/containers/CollectionHeader";import { trackCollectionBookmarked } from "metabase/common/collections/analytics";import { getComposedDragProps } from "metabase/common/collections/dropzone";@@ -299,7 +299,7 @@ export const CollectionContentView = ({</ErrorBoundary><ErrorBoundary>- <PinnedItemOverview+ <PinnedItemsGriddatabases={databases}bookmarks={bookmarks}createBookmark={createBookmark}diff --git a/frontend/src/metabase/collections/components/PinnedItemOverview/PinnedItemOverview.styled.tsx b/frontend/src/metabase/collections/components/PinnedItemOverview/PinnedItemOverview.styled.tsxdeleted file mode 100644index 51d013d2194..00000000000--- a/frontend/src/metabase/collections/components/PinnedItemOverview/PinnedItemOverview.styled.tsx+++ /dev/null@@ -1,28 +0,0 @@-// eslint-disable-next-line no-restricted-imports-import styled from "@emotion/styled";--import { breakpointMaxMedium } from "metabase/styled-components/theme";--export const GAP_REM = 1.15;--export const Container = styled.div`- position: relative;- display: flex;- flex-direction: column;- gap: ${GAP_REM}rem;- margin-bottom: 1.5em;-`;--export const Grid = styled.div`- display: grid;- grid-template-columns: minmax(0, 1fr) minmax(0, 1fr);- gap: ${GAP_REM}rem;-- ${breakpointMaxMedium} {- grid-template-columns: minmax(0, 1fr);- }-- &:not(:last-child) {- margin-bottom: ${GAP_REM}rem;- }-`;diff --git a/frontend/src/metabase/collections/components/PinnedItemOverview/PinnedItemOverview.tsx b/frontend/src/metabase/collections/components/PinnedItemOverview/PinnedItemOverview.tsxdeleted file mode 100644index d076cf4b38a..00000000000--- a/frontend/src/metabase/collections/components/PinnedItemOverview/PinnedItemOverview.tsx+++ /dev/null@@ -1,340 +0,0 @@-import { t } from "ttag";-import _ from "underscore";--import PinnedItemSortDropTarget from "metabase/collections/components/PinnedItemSortDropTarget";-import PinnedQuestionCard from "metabase/collections/components/PinnedQuestionCard";-import PinDropZone from "metabase/common/collections/components/PinDropZone";-import PinnedItemCard from "metabase/common/collections/components/PinnedItemCard";-import type {- CreateBookmark,- DeleteBookmark,-} from "metabase/common/collections/types";-import {- isPreviewShown,- isRootCollection,-} from "metabase/common/collections/utils";-import { ItemDragSource } from "metabase/common/components/dnd/ItemDragSource";-import CS from "metabase/css/core/index.css";-import { Box, Group, Icon, Stack } from "metabase/ui";-import type Database from "metabase-lib/v1/metadata/Database";-import type {- Bookmark,- Collection,- CollectionItem,- IconName,-} from "metabase-types/api";--import { Container, Grid } from "./PinnedItemOverview.styled";--type Props = {- databases?: Database[];- bookmarks?: Bookmark[];- createBookmark: CreateBookmark;- deleteBookmark: DeleteBookmark;- items: CollectionItem[];- collection: Collection;- onCopy: (items: CollectionItem[]) => void;- onMove: (items: CollectionItem[]) => void;-};--function PinnedItemOverview({- databases,- bookmarks,- createBookmark,- deleteBookmark,- items,- collection,- onCopy,- onMove,-}: Props) {- const sortedItems = _.sortBy(items, (item) => item.collection_position);- const {- card: cardItems = [],- dashboard: dashboardItems = [],- dataset: modelItems = [],- metric: metricItems = [],- document: documentItems = [],- exploration: explorationItems = [],- } = _.groupBy(sortedItems, "model");- const cardGroups = _.partition(cardItems, isPreviewShown);- const metricGroups = _.partition(metricItems, isPreviewShown);-- return items.length === 0 ? (- <Container>- <PinDropZone variant="pin" empty />- </Container>- ) : (- <Container data-testid="pinned-items">- <PinDropZone variant="pin" />-- <Stack gap="1.5rem">- {metricItems.length > 0 && (- <div>- <SectionTitle title={t`Metrics`} icon="metric" />- {metricGroups.map(- (cardGroup, cardGroupIndex) =>- cardGroup.length > 0 && (- <Grid key={cardGroupIndex}>- {cardGroup.map((item) => (- <div key={item.id} className={CS.relative}>- <PinnedItemSortDropTarget- isFrontTarget- itemModel="metric"- pinIndex={item.collection_position}- enableDropTargetBackground={false}- />- <ItemDragSource item={item} collection={collection}>- <div>- <PinnedQuestionCard- item={item}- collection={collection}- databases={databases}- bookmarks={bookmarks}- onCopy={onCopy}- onMove={onMove}- onCreateBookmark={createBookmark}- onDeleteBookmark={deleteBookmark}- />- </div>- </ItemDragSource>- <PinnedItemSortDropTarget- isBackTarget- itemModel="metric"- pinIndex={item.collection_position}- enableDropTargetBackground={false}- />- </div>- ))}- </Grid>- ),- )}- </div>- )}-- {cardItems.length > 0 && (- <div>- <SectionTitle title={t`Pinned questions`} icon="pin" />- {cardGroups.map(- (cardGroup, cardGroupIndex) =>- cardGroup.length > 0 && (- <Grid key={cardGroupIndex}>- {cardGroup.map((item) => (- <div key={item.id} className={CS.relative}>- <PinnedItemSortDropTarget- isFrontTarget- itemModel="card"- pinIndex={item.collection_position}- enableDropTargetBackground={false}- />- <ItemDragSource item={item} collection={collection}>- <div>- <PinnedQuestionCard- item={item}- collection={collection}- databases={databases}- bookmarks={bookmarks}- onCopy={onCopy}- onMove={onMove}- onCreateBookmark={createBookmark}- onDeleteBookmark={deleteBookmark}- />- </div>- </ItemDragSource>- <PinnedItemSortDropTarget- isBackTarget- itemModel="card"- pinIndex={item.collection_position}- enableDropTargetBackground={false}- />- </div>- ))}- </Grid>- ),- )}- </div>- )}-- {dashboardItems.length > 0 && (- <div>- <SectionTitle title={t`Dashboards`} icon="dashboard" />- <Grid>- {dashboardItems.map((item) => (- <div key={item.id} className={CS.relative}>- <PinnedItemSortDropTarget- isFrontTarget- itemModel="dashboard"- pinIndex={item.collection_position}- enableDropTargetBackground={false}- />- <ItemDragSource item={item} collection={collection}>- <div>- <PinnedItemCard- databases={databases}- bookmarks={bookmarks}- createBookmark={createBookmark}- deleteBookmark={deleteBookmark}- item={item}- collection={collection}- onCopy={onCopy}- onMove={onMove}- />- </div>- </ItemDragSource>- <PinnedItemSortDropTarget- isBackTarget- itemModel="dashboard"- pinIndex={item.collection_position}- enableDropTargetBackground={false}- />- </div>- ))}- </Grid>- </div>- )}-- {documentItems.length > 0 && (- <div>- <SectionTitle title={t`Documents`} icon="document" />- <Grid>- {documentItems.map((item) => (- <div key={item.id} className={CS.relative}>- <PinnedItemSortDropTarget- isFrontTarget- itemModel="document"- pinIndex={item.collection_position}- enableDropTargetBackground={false}- />- <ItemDragSource item={item} collection={collection}>- <div>- <PinnedItemCard- databases={databases}- bookmarks={bookmarks}- createBookmark={createBookmark}- deleteBookmark={deleteBookmark}- item={item}- collection={collection}- onCopy={onCopy}- onMove={onMove}- />- </div>- </ItemDragSource>- <PinnedItemSortDropTarget- isBackTarget- itemModel="document"- pinIndex={item.collection_position}- enableDropTargetBackground={false}- />- </div>- ))}- </Grid>- </div>- )}-- {explorationItems.length > 0 && (- <div>- <SectionTitle title={t`Research projects`} icon="telescope" />- <Grid>- {explorationItems.map((item) => (- <div key={item.id} className={CS.relative}>- <PinnedItemSortDropTarget- isFrontTarget- itemModel="exploration"- pinIndex={item.collection_position}- enableDropTargetBackground={false}- />- <ItemDragSource item={item} collection={collection}>- <div>- <PinnedItemCard- databases={databases}- bookmarks={bookmarks}- createBookmark={createBookmark}- deleteBookmark={deleteBookmark}- item={item}- collection={collection}- onCopy={onCopy}- onMove={onMove}- />- </div>- </ItemDragSource>- <PinnedItemSortDropTarget- isBackTarget- itemModel="exploration"- pinIndex={item.collection_position}- enableDropTargetBackground={false}- />- </div>- ))}- </Grid>- </div>- )}-- {modelItems.length > 0 && (- <div>- <SectionTitle- title={t`Models`}- icon="model"- description={- isRootCollection(collection)- ? t`Start new explorations here`- : t`Start new explorations about ${collection.name} here`- }- />- <Grid>- {modelItems.map((item) => (- <div key={item.id} className={CS.relative}>- <PinnedItemSortDropTarget- isFrontTarget- itemModel="dataset"- pinIndex={item.collection_position}- enableDropTargetBackground={false}- />- <ItemDragSource item={item} collection={collection}>- <div>- <PinnedItemCard- databases={databases}- bookmarks={bookmarks}- createBookmark={createBookmark}- deleteBookmark={deleteBookmark}- item={item}- collection={collection}- onCopy={onCopy}- onMove={onMove}- />- </div>- </ItemDragSource>- <PinnedItemSortDropTarget- isBackTarget- itemModel="dataset"- pinIndex={item.collection_position}- enableDropTargetBackground={false}- />- </div>- ))}- </Grid>- </div>- )}- </Stack>- </Container>- );-}--interface SectionTitleProps {- title: string;- description?: string;- icon?: IconName;-}--function SectionTitle({ title, description, icon }: SectionTitleProps) {- return (- <Stack gap="sm" pb="md">- <Group gap="sm">- {icon && <Icon name={icon} c="core-brand" />}- <h3>{title}</h3>- </Group>- {description && <Box c="text-secondary">{description}</Box>}- </Stack>- );-}--// eslint-disable-next-line import/no-default-export -- deprecated usage-export default PinnedItemOverview;diff --git a/frontend/src/metabase/collections/components/PinnedItemOverview/PinnedItemOverview.unit.spec.tsx b/frontend/src/metabase/collections/components/PinnedItemOverview/PinnedItemOverview.unit.spec.tsxdeleted file mode 100644index f13fa4fdeec..00000000000--- a/frontend/src/metabase/collections/components/PinnedItemOverview/PinnedItemOverview.unit.spec.tsx+++ /dev/null@@ -1,75 +0,0 @@-import { renderWithProviders, screen } from "__support__/ui";-import type { Collection, CollectionItem } from "metabase-types/api";-import { createMockCollection } from "metabase-types/api/mocks";--import PinnedItemOverview from "./PinnedItemOverview";--const mockOnCopy = jest.fn();-const mockOnMove = jest.fn();--const defaultCollection = createMockCollection({- can_write: true,- id: 1,- name: "Collection Foo",- archived: false,-});--const dashboardItem1: CollectionItem = {- id: 1,- model: "dashboard",- collection_position: 2,- collection_id: null,- name: "Dashboard Foo",- description: "description foo",- archived: false,-};--const dashboardItem2: CollectionItem = {- id: 2,- model: "dashboard",- collection_position: 1,- collection_id: null,- name: "Dashboard Bar",- description: "description foo",- archived: false,-};--function setup({- items,- collection,-}: { items?: CollectionItem[]; collection?: Collection } = {}) {- items = items || [dashboardItem1, dashboardItem2];- collection = collection || defaultCollection;-- mockOnCopy.mockReset();- mockOnMove.mockReset();-- return renderWithProviders(- <PinnedItemOverview- items={items}- collection={collection}- onCopy={mockOnCopy}- onMove={mockOnMove}- createBookmark={jest.fn()}- deleteBookmark={jest.fn()}- />,- {- withDND: true,- },- );-}--describe("PinnedItemOverview", () => {- it("should render items", () => {- setup();- expect(screen.getByText(dashboardItem1.name)).toBeInTheDocument();- expect(screen.getByText(dashboardItem2.name)).toBeInTheDocument();- });-- it("should render items sorted by collection_position", () => {- setup();- const names = screen.queryAllByText(/Dashboard (Foo|Bar)/);- expect(names[0]).toHaveTextContent(new RegExp(dashboardItem2.name));- expect(names[1]).toHaveTextContent(new RegExp(dashboardItem1.name));- });-});diff --git a/frontend/src/metabase/collections/components/PinnedItemOverview/index.ts b/frontend/src/metabase/collections/components/PinnedItemOverview/index.tsdeleted file mode 100644index 97410aa4b12..00000000000--- a/frontend/src/metabase/collections/components/PinnedItemOverview/index.ts+++ /dev/null@@ -1,2 +0,0 @@-// eslint-disable-next-line import/no-default-export -- deprecated usage-export { default } from "./PinnedItemOverview";diff --git a/frontend/src/metabase/collections/components/PinnedItemSortDropTarget/PinnedItemSortDropTarget.module.css b/frontend/src/metabase/collections/components/PinnedItemSortDropTarget/PinnedItemSortDropTarget.module.cssnew file mode 100644index 00000000000..17ec0f68e15--- /dev/null+++ b/frontend/src/metabase/collections/components/PinnedItemSortDropTarget/PinnedItemSortDropTarget.module.css@@ -0,0 +1,44 @@+/* Extends 5/8 of the pinned grid's `md` spacing (see PinnedItemsGrid) into the+ gaps so the drop slots between cards are reachable. */+.dropTarget {+ position: absolute !important;+ top: 0;+ bottom: 0;+ left: -0.625rem;+ right: -0.625rem;+ pointer-events: none;+ background-color: transparent;+}++/* The drop area renders arbitrary children through a render prop; re-enable+ pointer events on all of them. */+.dropTarget * {+ pointer-events: all;+}++.indicator {+ z-index: 1;+ position: absolute;+ inset: 0;+ display: none;+}++.visible {+ display: block;+}++.front {+ border-left: 4px solid var(--mb-color-background_page-tertiary);+}++.back {+ border-right: 4px solid var(--mb-color-background_page-tertiary);+}++.hovered.front {+ border-left-color: var(--mb-color-core-brand);+}++.hovered.back {+ border-right-color: var(--mb-color-core-brand);+}diff --git a/frontend/src/metabase/collections/components/PinnedItemSortDropTarget/PinnedItemSortDropTarget.styled.tsx b/frontend/src/metabase/collections/components/PinnedItemSortDropTarget/PinnedItemSortDropTarget.styled.tsxdeleted file mode 100644index 5f20db32dd5..00000000000--- a/frontend/src/metabase/collections/components/PinnedItemSortDropTarget/PinnedItemSortDropTarget.styled.tsx+++ /dev/null@@ -1,59 +0,0 @@-// eslint-disable-next-line no-restricted-imports-import styled from "@emotion/styled";--import { GAP_REM } from "metabase/collections/components/PinnedItemOverview/PinnedItemOverview.styled";-import { PinnedItemSortDropTarget } from "metabase/common/components/dnd/PinnedItemSortDropTarget";-import { color } from "metabase/ui/utils/colors";--export type PinDropTargetProps = {- isBackTarget?: boolean;- isFrontTarget?: boolean;- itemModel: string;- pinIndex?: number | null;- enableDropTargetBackground?: boolean;-};--export type PinDropTargetRenderArgs = PinDropTargetProps & {- hovered: boolean;- highlighted: boolean;-};--export const StyledPinDropTarget = styled(- PinnedItemSortDropTarget,-)<PinDropTargetProps>`- position: absolute !important;- top: 0;- bottom: 0;- left: -${(GAP_REM * 5) / 8}rem;- right: -${(GAP_REM * 5) / 8}rem;- pointer-events: none;- background-color: transparent;-- * {- pointer-events: all;- }-`;--export const PinDropTargetIndicator = styled.div<PinDropTargetRenderArgs>`- z-index: 1;- position: absolute;- top: 0;- bottom: 0;- left: 0;- right: 0;- border-left: ${(props) =>- props.isFrontTarget &&- `4px solid ${- props.hovered- ? color("core-brand")- : "var(--mb-color-background_page-tertiary)"- }`};- border-right: ${(props) =>- props.isBackTarget &&- `4px solid ${- props.hovered- ? color("core-brand")- : "var(--mb-color-background_page-tertiary)"- }`};- display: ${(props) => !(props.hovered || props.highlighted) && "none"};-`;diff --git a/frontend/src/metabase/collections/components/PinnedItemSortDropTarget/PinnedItemSortDropTarget.tsx b/frontend/src/metabase/collections/components/PinnedItemSortDropTarget/PinnedItemSortDropTarget.tsxindex bc7239954d1..e39b22170df 100644--- a/frontend/src/metabase/collections/components/PinnedItemSortDropTarget/PinnedItemSortDropTarget.tsx+++ b/frontend/src/metabase/collections/components/PinnedItemSortDropTarget/PinnedItemSortDropTarget.tsx@@ -1,19 +1,39 @@-import type {- PinDropTargetProps,- PinDropTargetRenderArgs,-} from "./PinnedItemSortDropTarget.styled";-import {- PinDropTargetIndicator,- StyledPinDropTarget,-} from "./PinnedItemSortDropTarget.styled";+import cx from "classnames";-function PinnedItemSortDropTarget(props: PinDropTargetProps) {+import { PinnedItemSortDropTarget as PinnedItemSortDropArea } from "metabase/common/components/dnd/PinnedItemSortDropTarget";++import S from "./PinnedItemSortDropTarget.module.css";++type PinDropTargetProps = {+ isBackTarget?: boolean;+ isFrontTarget?: boolean;+ pinIndex?: number | null;+ enableDropTargetBackground?: boolean;+};++type PinDropTargetRenderArgs = PinDropTargetProps & {+ hovered: boolean;+ highlighted: boolean;+};++export function PinnedItemSortDropTarget(props: PinDropTargetProps) {return (- <StyledPinDropTarget {...props}>- {(args: PinDropTargetRenderArgs) => <PinDropTargetIndicator {...args} />}- </StyledPinDropTarget>+ <PinnedItemSortDropArea className={S.dropTarget} {...props}>+ {({+ isFrontTarget,+ isBackTarget,+ hovered,+ highlighted,+ }: PinDropTargetRenderArgs) => (+ <div+ className={cx(S.indicator, {+ [S.visible]: hovered || highlighted,+ [S.front]: isFrontTarget,+ [S.back]: isBackTarget,+ [S.hovered]: hovered,+ })}+ />+ )}+ </PinnedItemSortDropArea>);}--// eslint-disable-next-line import/no-default-export -- deprecated usage-export default PinnedItemSortDropTarget;diff --git a/frontend/src/metabase/collections/components/PinnedItemSortDropTarget/index.ts b/frontend/src/metabase/collections/components/PinnedItemSortDropTarget/index.tsindex dac3189b5a1..3c223fac3c4 100644--- a/frontend/src/metabase/collections/components/PinnedItemSortDropTarget/index.ts+++ b/frontend/src/metabase/collections/components/PinnedItemSortDropTarget/index.ts@@ -1,2 +1 @@-// eslint-disable-next-line import/no-default-export -- deprecated usage-export { default } from "./PinnedItemSortDropTarget";+export { PinnedItemSortDropTarget } from "./PinnedItemSortDropTarget";diff --git a/frontend/src/metabase/collections/components/PinnedItemsGrid/PinnedItemsGrid.tsx b/frontend/src/metabase/collections/components/PinnedItemsGrid/PinnedItemsGrid.tsxnew file mode 100644index 00000000000..7ce2551f30a--- /dev/null+++ b/frontend/src/metabase/collections/components/PinnedItemsGrid/PinnedItemsGrid.tsx@@ -0,0 +1,97 @@+import { useMemo } from "react";+import _ from "underscore";++import { PinnedItemSortDropTarget } from "metabase/collections/components/PinnedItemSortDropTarget";+import { CompactPinnedItemCard } from "metabase/common/collections/components/CompactPinnedItemCard";+import PinDropZone from "metabase/common/collections/components/PinDropZone";+import type {+ CreateBookmark,+ DeleteBookmark,+} from "metabase/common/collections/types";+import { ItemDragSource } from "metabase/common/components/dnd/ItemDragSource";+import { Box, SimpleGrid, rem } from "metabase/ui";+import type Database from "metabase-lib/v1/metadata/Database";+import type { Bookmark, Collection, CollectionItem } from "metabase-types/api";++type Props = {+ databases?: Database[];+ bookmarks?: Bookmark[];+ createBookmark: CreateBookmark;+ deleteBookmark: DeleteBookmark;+ items: CollectionItem[];+ collection: Collection;+ onCopy: (items: CollectionItem[]) => void;+ onMove: (items: CollectionItem[]) => void;+};++export function PinnedItemsGrid({+ databases,+ bookmarks,+ createBookmark,+ deleteBookmark,+ items,+ collection,+ onCopy,+ onMove,+}: Props) {+ const sortedItems = useMemo(+ () => _.sortBy(items, (item) => item.collection_position),+ [items],+ );++ if (items.length === 0) {+ return (+ <Box mb={rem(48)} pos="relative">+ <PinDropZone variant="pin" empty />+ </Box>+ );+ }++ return (+ <Box mb={rem(48)} pos="relative" data-testid="pinned-items">+ <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.+ const pinIndex = index + 1;+ return (+ <Box key={`${item.model}-${item.id}`} pos="relative">+ <PinnedItemSortDropTarget+ isFrontTarget+ pinIndex={pinIndex}+ enableDropTargetBackground={false}+ />+ <ItemDragSource+ item={{ ...item, collection_position: pinIndex }}+ collection={collection}+ >+ {/* ItemDragSource needs a native DOM element to attach its drag ref */}+ <div data-drag-source-node>+ <CompactPinnedItemCard+ item={item}+ collection={collection}+ databases={databases}+ bookmarks={bookmarks}+ createBookmark={createBookmark}+ deleteBookmark={deleteBookmark}+ onCopy={onCopy}+ onMove={onMove}+ />+ </div>+ </ItemDragSource>+ <PinnedItemSortDropTarget+ isBackTarget+ pinIndex={pinIndex}+ enableDropTargetBackground={false}+ />+ </Box>+ );+ })}+ </SimpleGrid>+ </Box>+ );+}diff --git a/frontend/src/metabase/collections/components/PinnedItemsGrid/PinnedItemsGrid.unit.spec.tsx b/frontend/src/metabase/collections/components/PinnedItemsGrid/PinnedItemsGrid.unit.spec.tsxnew file mode 100644index 00000000000..e32cdc622ff--- /dev/null+++ b/frontend/src/metabase/collections/components/PinnedItemsGrid/PinnedItemsGrid.unit.spec.tsx@@ -0,0 +1,110 @@+import { renderWithProviders, screen, within } from "__support__/ui";+import type { Collection, CollectionItem } from "metabase-types/api";+import {+ createMockCollection,+ createMockCollectionItem,+} from "metabase-types/api/mocks";++import { PinnedItemsGrid } from "./PinnedItemsGrid";++const mockOnCopy = jest.fn();+const mockOnMove = jest.fn();++const defaultCollection = createMockCollection({+ can_write: true,+ id: 1,+ name: "Collection Foo",+ archived: false,+});++const dashboardItem = createMockCollectionItem({+ id: 1,+ model: "dashboard",+ collection_position: 2,+ name: "Dashboard Foo",+ description: "description foo",+});++const metricItem = createMockCollectionItem({+ id: 2,+ model: "metric",+ collection_position: 1,+ name: "Metric Bar",+});++const questionItem = createMockCollectionItem({+ id: 3,+ model: "card",+ collection_position: 3,+ name: "Question Baz",+});++const modelItem = createMockCollectionItem({+ id: 4,+ model: "dataset",+ collection_position: 4,+ name: "Model Qux",+});++const defaultItems = [dashboardItem, metricItem, questionItem, modelItem];++function setup({+ items,+ collection,+}: { items?: CollectionItem[]; collection?: Collection } = {}) {+ items = items || defaultItems;+ collection = collection || defaultCollection;++ mockOnCopy.mockReset();+ mockOnMove.mockReset();++ return renderWithProviders(+ <PinnedItemsGrid+ items={items}+ collection={collection}+ onCopy={mockOnCopy}+ onMove={mockOnMove}+ createBookmark={jest.fn()}+ deleteBookmark={jest.fn()}+ />,+ {+ withDND: true,+ },+ );+}++describe("PinnedItemsGrid", () => {+ it("should render pinned items of all types in one section", () => {+ setup();+ const section = within(screen.getByTestId("pinned-items"));+ expect(section.getByText(dashboardItem.name)).toBeInTheDocument();+ expect(section.getByText(metricItem.name)).toBeInTheDocument();+ expect(section.getByText(questionItem.name)).toBeInTheDocument();+ expect(section.getByText(modelItem.name)).toBeInTheDocument();+ });++ it("should not group items into typed sections", () => {+ setup();+ expect(screen.queryByText("Metrics")).not.toBeInTheDocument();+ expect(screen.queryByText("Pinned questions")).not.toBeInTheDocument();+ expect(screen.queryByText("Dashboards")).not.toBeInTheDocument();+ expect(screen.queryByText("Documents")).not.toBeInTheDocument();+ expect(screen.queryByText("Models")).not.toBeInTheDocument();+ expect(+ screen.queryByText(/Start new explorations/),+ ).not.toBeInTheDocument();+ });++ it("should render items sorted by collection_position across types", () => {+ setup();+ const names = screen.getAllByText(+ /Dashboard Foo|Metric Bar|Question Baz|Model Qux/,+ );+ expect(names.map((name) => name.textContent)).toEqual([+ "Metric Bar",+ "Dashboard Foo",+ "Question Baz",+ "Model Qux",+ ]);+ });+});diff --git a/frontend/src/metabase/collections/components/PinnedItemsGrid/index.ts b/frontend/src/metabase/collections/components/PinnedItemsGrid/index.tsnew file mode 100644index 00000000000..faed12b6b51--- /dev/null+++ b/frontend/src/metabase/collections/components/PinnedItemsGrid/index.ts@@ -0,0 +1 @@+export { PinnedItemsGrid } from "./PinnedItemsGrid";diff --git a/frontend/src/metabase/collections/components/PinnedQuestionCard/PinnedQuestionCard.styled.tsx b/frontend/src/metabase/collections/components/PinnedQuestionCard/PinnedQuestionCard.styled.tsxdeleted file mode 100644index 5a33e600bd9..00000000000--- a/frontend/src/metabase/collections/components/PinnedQuestionCard/PinnedQuestionCard.styled.tsx+++ /dev/null@@ -1,66 +0,0 @@-// eslint-disable-next-line no-restricted-imports-import styled from "@emotion/styled";--import { Link } from "metabase/common/components/Link";-import { doNotForwardProps } from "metabase/common/utils/doNotForwardProps";-import { LegendLabel } from "metabase/visualizations/components/legend/LegendCaption/LegendCaption.styled";-import ChartSkeleton from "metabase/visualizations/components/skeletons/ChartSkeleton";-import StaticSkeleton from "metabase/visualizations/components/skeletons/StaticSkeleton";--export const CardActionMenuContainer = styled.div`- position: absolute;- top: 0.3125rem;- right: 0.3125rem;- z-index: 3;- color: var(--mb-color-text-secondary);- visibility: hidden;-`;--export const CardStaticSkeleton = styled(StaticSkeleton)`- padding: 0.5rem 1.5rem;-`;--export const CardPreviewSkeleton = styled(ChartSkeleton)`- padding: 0.5rem 1rem;-`;--interface CardRootProps {- isPreview?: boolean;-}--export const CardRoot = styled(- Link,- doNotForwardProps("isPreview"),-)<CardRootProps>`- position: relative;- display: block;- overflow: hidden;- height: ${(props) => props.isPreview && "15.625rem"};- padding: ${(props) => (props.isPreview ? "0" : "0.5rem 0")};- border: 1px solid var(--mb-color-border-neutral);- border-radius: 0.375rem;- background-color: var(--mb-color-background_page-primary);-- &:hover {- ${CardActionMenuContainer} {- visibility: visible;- }-- ${LegendLabel} {- color: var(--mb-color-core-brand);- }-- ${ChartSkeleton.Title} {- color: var(--mb-color-core-brand);- }-- ${ChartSkeleton.Description} {- visibility: visible;- }- }-- .leaflet-container,- .leaflet-container * {- pointer-events: none !important;- }-`;diff --git a/frontend/src/metabase/collections/components/PinnedQuestionCard/PinnedQuestionCard.tsx b/frontend/src/metabase/collections/components/PinnedQuestionCard/PinnedQuestionCard.tsxdeleted file mode 100644index c53e42210eb..00000000000--- a/frontend/src/metabase/collections/components/PinnedQuestionCard/PinnedQuestionCard.tsx+++ /dev/null@@ -1,162 +0,0 @@-import cx from "classnames";-import { t } from "ttag";--import ActionMenu from "metabase/common/collections/components/ActionMenu";-import type {- CreateBookmark,- DeleteBookmark,-} from "metabase/common/collections/types";-import {- isFullyParameterized,- isPreviewShown,-} from "metabase/common/collections/utils";-import { EventSandbox } from "metabase/common/components/EventSandbox";-import CS from "metabase/css/core/index.css";-import { useGetIcon } from "metabase/hooks/use-icon";-import { PLUGIN_MODERATION } from "metabase/plugins";-import { Box, Flex, Group, Icon, Text } from "metabase/ui";-import { modelToUrl } from "metabase/urls";-import Visualization from "metabase/visualizations/components/Visualization";-import type Database from "metabase-lib/v1/metadata/Database";-import type { Bookmark, Collection, CollectionItem } from "metabase-types/api";--import {- CardActionMenuContainer,- CardPreviewSkeleton,- CardRoot,- CardStaticSkeleton,-} from "./PinnedQuestionCard.styled";-import PinnedQuestionLoader from "./PinnedQuestionLoader";--export interface PinnedQuestionCardProps {- item: CollectionItem;- collection: Collection;- databases?: Database[];- bookmarks?: Bookmark[];- onCopy: (items: CollectionItem[]) => void;- onMove: (items: CollectionItem[]) => void;- onCreateBookmark?: CreateBookmark;- onDeleteBookmark?: DeleteBookmark;-}--const PinnedQuestionCard = ({- item,- collection,- databases,- bookmarks,- onCopy,- onMove,- onCreateBookmark,- onDeleteBookmark,-}: PinnedQuestionCardProps): JSX.Element => {- const getIcon = useGetIcon();- const isPreview = isPreviewShown(item);-- const actionMenu = (- // This component is used within a `<Link>` component,- // so we must prevent events from triggering the activation of the link- <EventSandbox preventDefault sandboxedEvents={["onClick"]}>- <ActionMenu- item={item}- collection={collection}- databases={databases}- bookmarks={bookmarks}- onCopy={onCopy}- onMove={onMove}- createBookmark={onCreateBookmark}- deleteBookmark={onDeleteBookmark}- />- </EventSandbox>- );-- const positionedActionMenu = (- <CardActionMenuContainer>{actionMenu}</CardActionMenuContainer>- );-- const DEFAULT_DESCRIPTION: Record<string, string> = {- card: t`A question`,- metric: t`A metric`,- };-- return (- <CardRoot- to={modelToUrl(item)}- isPreview={isPreview}- className={cx(CS.hoverChild, CS.hoverVisibility)}- >- <Flex h="100%" direction="column">- {isPreview ? (- <Group justify="space-between" py="0.5rem" px="1rem">- <Group gap="0.5rem">- <Text fw="bold">{item.name}</Text>- <PLUGIN_MODERATION.ModerationStatusIcon- status={item.moderated_status}- filled- />- </Group>- <Group>- {item.description && isPreview && (- <Icon- className={cx(CS.hoverChild, CS.hoverChildSmooth)}- name="info"- c="text-disabled"- tooltip={item.description}- />- )}- {actionMenu}- </Group>- </Group>- ) : (- positionedActionMenu- )}- <Box flex="1 0 0">- {isPreview ? (- <PinnedQuestionLoader id={item.id}>- {({ question, rawSeries, loading, error, errorIcon }) =>- loading ? (- <CardPreviewSkeleton- display={question?.display()}- description={question?.description()}- />- ) : (- <Visualization- rawSeries={rawSeries}- error={error}- errorIcon={errorIcon}- isDashboard- />- )- }- </PinnedQuestionLoader>- ) : (- <CardStaticSkeleton- name={item.name}- nameRightSection={- <PLUGIN_MODERATION.ModerationStatusIcon- status={item.moderated_status}- filled- />- }- description={- item.description || DEFAULT_DESCRIPTION[item.model] || ""- }- icon={getIcon(item)}- tooltip={getSkeletonTooltip(item)}- />- )}- </Box>- </Flex>- </CardRoot>- );-};--const getSkeletonTooltip = (item: CollectionItem) => {- if (!isFullyParameterized(item)) {- return t`Open this question and fill in its variables to see it.`;- } else {- return undefined;- }-};--// eslint-disable-next-line import/no-default-export -- deprecated usage-export default PinnedQuestionCard;diff --git a/frontend/src/metabase/collections/components/PinnedQuestionCard/PinnedQuestionLoader.tsx b/frontend/src/metabase/collections/components/PinnedQuestionCard/PinnedQuestionLoader.tsxdeleted file mode 100644index 060c9aea4fd..00000000000--- a/frontend/src/metabase/collections/components/PinnedQuestionCard/PinnedQuestionLoader.tsx+++ /dev/null@@ -1,129 +0,0 @@-import { useMemo } from "react";--import { useGetCardQuery } from "metabase/api";-import { QuestionResultLoader } from "metabase/common/components/QuestionResultLoader";-import { getMetricSeriesWithDefaultDisplay } from "metabase/common/utils/card";-import { useSelector } from "metabase/redux";-import { getMetadata } from "metabase/selectors/metadata";-import { getResponseErrorMessage } from "metabase/utils/errors";-import {- getGenericErrorMessage,- getPermissionErrorMessage,-} from "metabase/visualizations/lib/errors";-import Question from "metabase-lib/v1/Question";-import type Metadata from "metabase-lib/v1/metadata/Metadata";-import type { Dataset, IconName, RawSeries } from "metabase-types/api";--export interface PinnedQuestionLoaderProps {- id: number;- children: (props: PinnedQuestionChildrenProps) => JSX.Element;-}--export interface PinnedQuestionChildrenProps {- loading: boolean;- question?: Question;- rawSeries?: RawSeries;- error?: string;- errorIcon?: IconName;-}--const PinnedQuestionLoader = ({- id,- children,-}: PinnedQuestionLoaderProps): JSX.Element => {- const {- data: card,- error,- isLoading,- } = useGetCardQuery({- id,- context: "collection",- });-- const metadata = useSelector(getMetadata);- const question = useMemo(() => {- return card ? new Question(card, metadata) : undefined;- }, [card, metadata]);-- if (isLoading) {- return children({- loading: true,- });- }-- if (!question) {- return children({- error: getResponseErrorMessage(error),- errorIcon: "warning",- loading: false,- });- }-- return (- <QuestionResultLoader question={question} collectionPreview>- {({ loading, error, result, results, rawSeries }) =>- children({- question,- loading: loading || results == null,- rawSeries: getRawSeries(rawSeries, result, metadata),- error: getError(error, result),- errorIcon: getErrorIcon(error, result),- })- }- </QuestionResultLoader>- );-};--const getRawSeries = (- rawSeries: RawSeries | null | undefined,- result: Dataset | null,- metadata: Metadata,-) => {- const seriesWithQuery = rawSeries?.map((series) => ({- ...series,- json_query: result?.json_query,- }));- const seriesWithDisplay = seriesWithQuery- ? getMetricSeriesWithDefaultDisplay(seriesWithQuery, metadata)- : undefined;-- return seriesWithDisplay?.map((series) => ({- ...series,- card: {- ...series.card,- visualization_settings: {- ...series.card.visualization_settings,- "graph.show_values": false,- "graph.x_axis.labels_enabled": false,- "graph.y_axis.labels_enabled": false,- },- },- }));-};--const getError = (error?: any, result?: any) => {- const errorResponse = error ?? result?.error;-- if (!errorResponse) {- return undefined;- } else if (errorResponse.status === 403) {- return getPermissionErrorMessage();- } else {- return getGenericErrorMessage();- }-};--const getErrorIcon = (error?: any, result?: any) => {- const errorResponse = error ?? result?.error;-- if (!errorResponse) {- return undefined;- } else if (errorResponse.status === 403) {- return "lock";- } else {- return "warning";- }-};--// eslint-disable-next-line import/no-default-export -- deprecated usage-export default PinnedQuestionLoader;diff --git a/frontend/src/metabase/collections/components/PinnedQuestionCard/index.ts b/frontend/src/metabase/collections/components/PinnedQuestionCard/index.tsdeleted file mode 100644index 31cd1de7db6..00000000000--- a/frontend/src/metabase/collections/components/PinnedQuestionCard/index.ts+++ /dev/null@@ -1,2 +0,0 @@-// eslint-disable-next-line import/no-default-export -- deprecated usage-export { default } from "./PinnedQuestionCard";diff --git a/frontend/src/metabase/collections/components/PinnedQuestionCard/test/PinnedQuestionCard-ee.unit.spec.tsx b/frontend/src/metabase/collections/components/PinnedQuestionCard/test/PinnedQuestionCard-ee.unit.spec.tsxdeleted file mode 100644index f06dea53916..00000000000--- a/frontend/src/metabase/collections/components/PinnedQuestionCard/test/PinnedQuestionCard-ee.unit.spec.tsx+++ /dev/null@@ -1,24 +0,0 @@-import { screen } from "__support__/ui";-import type { CollectionItem } from "metabase-types/api";--import { setup } from "./setup";--describe("moderated status", () => {- it.each<Partial<CollectionItem>>([- { model: "card" },- { model: "card", collection_preview: false },- { model: "metric" },- { model: "dashboard" },- { model: "dataset" },- ])(- "should display the correct icon when moderated_status is verified for the $model",- async (collectionItem) => {- setup(- { ...collectionItem, moderated_status: "verified" },- { enterprise: true },- );-- expect(screen.getByRole("img", { name: /verified/ })).toBeInTheDocument();- },- );-});diff --git a/frontend/src/metabase/collections/components/PinnedQuestionCard/test/PinnedQuestionCard.unit.spec.tsx b/frontend/src/metabase/collections/components/PinnedQuestionCard/test/PinnedQuestionCard.unit.spec.tsxdeleted file mode 100644index 7ece3191d8a..00000000000--- a/frontend/src/metabase/collections/components/PinnedQuestionCard/test/PinnedQuestionCard.unit.spec.tsx+++ /dev/null@@ -1,146 +0,0 @@-import userEvent from "@testing-library/user-event";-import fetchMock from "fetch-mock";--import { screen } from "__support__/ui";-import * as Lib from "metabase-lib";-import { SAMPLE_PROVIDER } from "metabase-lib/test-helpers";-import type { CollectionItemModel } from "metabase-types/api";-import {- createMockDatasetData,- createMockDatetimeColumn,- createMockNumericColumn,-} from "metabase-types/api/mocks";-import {- ORDERS_ID,- createSampleDatabase,-} from "metabase-types/api/mocks/presets";--import { setup } from "./setup";--describe("PinnedQuestionCard", () => {- it("should render query card once (metabase#25848)", async () => {- setup();-- expect(await screen.findByTestId("visualization-root")).toBeInTheDocument();-- expect(fetchMock.callHistory.calls("path:/api/card/1/query")).toHaveLength(- 1,- );- });-- it("uses the default display for a pinned metric preview", async () => {- const query = Lib.createTestQuery(SAMPLE_PROVIDER, {- stages: [- {- source: { type: "table", id: ORDERS_ID },- aggregations: [{ type: "operator", operator: "count", args: [] }],- breakouts: [- {- type: "column",- name: "TOTAL",- sourceName: "ORDERS",- bins: 10,- },- ],- },- ],- });-- setup(- { model: "metric", collection_preview: true },- {- card: { type: "metric", display: "line" },- dataset: { json_query: Lib.toJsQuery(query) },- databases: [createSampleDatabase()],- },- );-- expect(await screen.findByTestId("visualization-root")).toHaveAttribute(- "data-viz-ui-name",- "Bar",- );- });-- it("uses result metadata for a cold pinned metric preview (UXW-4958)", async () => {- const query = Lib.createTestQuery(SAMPLE_PROVIDER, {- stages: [- {- source: { type: "table", id: ORDERS_ID },- aggregations: [{ type: "operator", operator: "count", args: [] }],- breakouts: [- { type: "column", name: "CREATED_AT", sourceName: "ORDERS" },- ],- },- ],- });-- setup(- { model: "metric", collection_preview: true },- {- card: { type: "metric", display: "line" },- dataset: {- json_query: Lib.toJsQuery(query),- data: createMockDatasetData({- cols: [- createMockDatetimeColumn({ source: "breakout" }),- createMockNumericColumn({ source: "aggregation" }),- ],- }),- },- },- );-- expect(await screen.findByTestId("visualization-root")).toHaveAttribute(- "data-viz-ui-name",- "Line",- );- });-});--describe("description", () => {- it.each<{ model: CollectionItemModel; description: string }>([- { model: "card", description: "A question" },- { model: "metric", description: "A metric" },- ])(- "should display the default description for the $model (metabase#45270)",- async ({ model, description }) => {- setup({ collection_preview: false, model });-- expect(await screen.findByText(description)).toBeInTheDocument();- expect(- screen.queryByRole("img", { name: /info/ }),- ).not.toBeInTheDocument();- },- );-- it.each<{ model: CollectionItemModel }>([- { model: "card" },- { model: "metric" },- ])(- "should display the correct item description when it is set for the $model",- async ({ model }) => {- setup({ collection_preview: false, model, description: "Foobar" });-- expect(await screen.findByText("Foobar")).toBeInTheDocument();- expect(- screen.queryByRole("img", { name: /info/ }),- ).not.toBeInTheDocument();- },- );-- it("should not display description with the preview enabled and there is no item description", async () => {- setup();-- expect(await screen.findByTestId("visualization-root")).toBeInTheDocument();- expect(screen.queryByText("A question")).not.toBeInTheDocument();- expect(screen.queryByRole("img", { name: /info/ })).not.toBeInTheDocument();- });-- it("should should display the description in a tooltip when there is an item descrrption", async () => {- setup({ description: "Foobar" });-- expect(await screen.findByTestId("visualization-root")).toBeInTheDocument();- await userEvent.hover(screen.getByRole("img", { name: /info/ }));- expect(await screen.findByText("Foobar")).toBeInTheDocument();- });-});diff --git a/frontend/src/metabase/collections/components/PinnedQuestionCard/test/setup.tsx b/frontend/src/metabase/collections/components/PinnedQuestionCard/test/setup.tsxdeleted file mode 100644index f2d88af8632..00000000000--- a/frontend/src/metabase/collections/components/PinnedQuestionCard/test/setup.tsx+++ /dev/null@@ -1,92 +0,0 @@-import { setupEnterprisePlugins } from "__support__/enterprise";-import {- setupCardEndpoints,- setupCardQueryEndpoints,-} from "__support__/server-mocks";-import { mockSettings } from "__support__/settings";-import { createMockEntitiesState } from "__support__/store";-import { renderWithProviders } from "__support__/ui";-import { ROOT_COLLECTION } from "metabase/common/collections/constants";-import { createMockState } from "metabase/redux/store/mocks";-import { registerVisualizations } from "metabase/visualizations/register";-import type {- Card,- CollectionItem,- Database,- Dataset,-} from "metabase-types/api";-import {- createMockCard,- createMockCollection,- createMockCollectionItem,- createMockDataset,- createMockSettings,- createMockTokenFeatures,-} from "metabase-types/api/mocks";--import PinnedQuestionCard from "../PinnedQuestionCard";--registerVisualizations();--const defaultCardDetails: Partial<CollectionItem> = {- model: "card",- collection_preview: true,-};--interface SetupOptions {- enterprise?: boolean;- card?: Partial<Card>;- dataset?: Partial<Dataset>;- databases?: Database[];-}--export function setup(- cardDetails = defaultCardDetails,- {- enterprise = false,- card: cardOverrides,- dataset: datasetOverrides,- databases = [],- }: SetupOptions = {},-) {- const card = createMockCard({- id: 1,- ...cardOverrides,- });- const collectionItem = createMockCollectionItem({- id: card.id,- ...cardDetails,- });- setupCardEndpoints(card);- setupCardQueryEndpoints(card, createMockDataset(datasetOverrides));-- const settings = mockSettings(- createMockSettings({- "token-features": createMockTokenFeatures({- content_verification: true,- }),- }),- );-- if (enterprise) {- setupEnterprisePlugins();- }-- renderWithProviders(- <PinnedQuestionCard- item={collectionItem}- collection={createMockCollection(ROOT_COLLECTION)}- onCopy={jest.fn()}- onMove={jest.fn()}- />,- {- storeInitialState: createMockState({- entities: createMockEntitiesState({- databases,- questions: [card],- }),- settings,- }),- },- );-}diff --git a/frontend/src/metabase/common/collections/components/ActionMenu/ActionMenu.tsx b/frontend/src/metabase/common/collections/components/ActionMenu/ActionMenu.tsxindex 0ae7d70bf8d..3340fe0af2e 100644--- a/frontend/src/metabase/common/collections/components/ActionMenu/ActionMenu.tsx+++ b/frontend/src/metabase/common/collections/components/ActionMenu/ActionMenu.tsx@@ -21,9 +21,7 @@ import {canArchiveItem,canBookmarkItem,canCopyItem,- canPreviewItem,isItemPinned,- isPreviewEnabled,} from "metabase/common/collections/utils";import { ConfirmModal } from "metabase/common/components/ConfirmModal";import { EntityItem } from "metabase/common/components/EntityItem";@@ -33,7 +31,6 @@ import {isPinnable,useSetPinned,} from "metabase/common/hooks";-import { useSetCollectionPreview } from "metabase/common/hooks/use-set-collection-preview";import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";import { getSetting } from "metabase/settings";@@ -81,7 +78,7 @@ function mapStateToProps(state: State): ActionMenuStateProps {};}-function ActionMenu({+function ActionMenuInner({className,item,bookmarks,@@ -96,12 +93,10 @@ function ActionMenu({const restore = useRestore();const deleteItem = useDeleteItem();const setPinned = useSetPinned();- const setCollectionPreview = useSetCollectionPreview();const [modalOpened, { open: openModal, close: closeModal }] = useDisclosure();const isBookmarked = bookmarks && getIsBookmarked(item, bookmarks);const canBookmark = canBookmarkItem(item);const canPin = canPinItem(item, collection);- const canPreview = canPreviewItem(item, collection);const canMove = canMoveItem(item, collection);const canArchive = canArchiveItem(item, collection);const canRestore = item.can_restore;@@ -145,10 +140,6 @@ function ActionMenu({return handler;}, [createBookmark, deleteBookmark, isBookmarked, item]);- const handleTogglePreview = useCallback(() => {- setCollectionPreview(item.id, !isPreviewEnabled(item));- }, [item, setCollectionPreview]);-const handleRestore = useCallback(async () => {if (!isRestorable(item)) {return;@@ -175,7 +166,6 @@ function ActionMenu({onCopy={canCopy ? handleCopy : undefined}onArchive={canArchive ? handleArchive : undefined}onToggleBookmark={canBookmark ? handleToggleBookmark : undefined}- onTogglePreview={canPreview ? handleTogglePreview : undefined}onRestore={canRestore ? handleRestore : undefined}onDeletePermanently={canDelete ? openModal : undefined}/>@@ -192,5 +182,4 @@ function ActionMenu({);}-// eslint-disable-next-line import/no-default-export -- deprecated usage-export default connect(mapStateToProps)(ActionMenu);+export const ActionMenu = connect(mapStateToProps)(ActionMenuInner);diff --git a/frontend/src/metabase/common/collections/components/ActionMenu/ActionMenu.unit.spec.tsx b/frontend/src/metabase/common/collections/components/ActionMenu/ActionMenu.unit.spec.tsxindex a34a46720b2..21495702ad7 100644--- a/frontend/src/metabase/common/collections/components/ActionMenu/ActionMenu.unit.spec.tsx+++ b/frontend/src/metabase/common/collections/components/ActionMenu/ActionMenu.unit.spec.tsx@@ -2,7 +2,6 @@ import { screen, waitFor } from "@testing-library/react";import userEvent from "@testing-library/user-event";import fetchMock from "fetch-mock";-import { setupCardEndpoints } from "__support__/server-mocks";import { createMockEntitiesState } from "__support__/store";import { getIcon, queryIcon, renderWithProviders } from "__support__/ui";import {@@ -10,20 +9,14 @@ import {createMockState,} from "metabase/redux/store/mocks";import { getMetadata } from "metabase/selectors/metadata";-import type {- Collection,- CollectionItem,- CollectionItemModel,- Database,-} from "metabase-types/api";+import type { Collection, CollectionItem, Database } from "metabase-types/api";import {- createMockCard,createMockCollection,createMockCollectionItem,createMockDocument,} from "metabase-types/api/mocks";-import ActionMenu from "./ActionMenu";+import { ActionMenu } from "./ActionMenu";interface SetupOpts {item: CollectionItem;@@ -66,119 +59,6 @@ const setup = ({};describe("ActionMenu", () => {- describe("preview", () => {- it.each<CollectionItemModel>(["card", "metric"])(- "should show an option to hide preview for a pinned %s",- async (model) => {- const item = createMockCollectionItem({- model,- collection_position: 1,- collection_preview: true,- });- setupCardEndpoints(createMockCard({ id: item.id }));-- setup({ item });-- await userEvent.click(getIcon("ellipsis"));- await userEvent.click(- await screen.findByText("Don’t show visualization"),- );-- await waitFor(() =>- expect(- fetchMock.callHistory.calls(`path:/api/card/${item.id}`, {- method: "PUT",- }),- ).toHaveLength(1),- );- const call = fetchMock.callHistory.lastCall(- `path:/api/card/${item.id}`,- { method: "PUT" },- );- // Unjustified type cast. FIXME- expect(JSON.parse(call?.options.body as string)).toEqual({- collection_preview: false,- });- },- );-- it("should show a tooltip for the disabled preview action", async () => {- const item = createMockCollectionItem({- collection_position: 1,- collection_preview: false,- fully_parameterized: false,- });- setupCardEndpoints(createMockCard({ id: item.id }));-- setup({ item });-- await userEvent.click(getIcon("ellipsis"));- const menuItem = await screen.findByText("Show visualization");- await userEvent.hover(menuItem);-- const tooltip = await screen.findByText(- "Open this question and fill in its variables to see it.",- );- await waitFor(() => expect(tooltip).toBeVisible());-- await userEvent.click(menuItem);-- expect(- fetchMock.callHistory.calls(`path:/api/card/${item.id}`, {- method: "PUT",- }),- ).toHaveLength(0);- });-- it.each<CollectionItemModel>(["card", "metric"])(- "should show an option to show preview for a pinned %s",- async (model) => {- const item = createMockCollectionItem({- model,- collection_position: 1,- collection_preview: false,- });- setupCardEndpoints(createMockCard({ id: item.id }));-- setup({ item });-- await userEvent.click(getIcon("ellipsis"));- await userEvent.click(await screen.findByText("Show visualization"));-- await waitFor(() =>- expect(- fetchMock.callHistory.calls(`path:/api/card/${item.id}`, {- method: "PUT",- }),- ).toHaveLength(1),- );- const call = fetchMock.callHistory.lastCall(- `path:/api/card/${item.id}`,- { method: "PUT" },- );- // Unjustified type cast. FIXME- expect(JSON.parse(call?.options.body as string)).toEqual({- collection_preview: true,- });- },- );-- it("should not show an option to hide preview for a pinned model", async () => {- setup({- item: createMockCollectionItem({- model: "dataset",- collection_position: 1,- }),- });-- await userEvent.click(getIcon("ellipsis"));-- expect(- screen.queryByText("Don’t show visualization"),- ).not.toBeInTheDocument();- });- });-describe("moving and archiving", () => {it("should duplicate an item", async () => {const item = createMockCollectionItem({diff --git a/frontend/src/metabase/common/collections/components/ActionMenu/index.ts b/frontend/src/metabase/common/collections/components/ActionMenu/index.tsindex 7a6b30b396c..24e17290ce1 100644--- a/frontend/src/metabase/common/collections/components/ActionMenu/index.ts+++ b/frontend/src/metabase/common/collections/components/ActionMenu/index.ts@@ -1,3 +1,2 @@-// eslint-disable-next-line import/no-default-export -- deprecated usage-export { default } from "./ActionMenu";+export { ActionMenu } from "./ActionMenu";export type { ActionMenuProps } from "./ActionMenu";diff --git a/frontend/src/metabase/common/collections/components/PinnedItemCard/PinnedItemCard-ee.unit.spec.tsx b/frontend/src/metabase/common/collections/components/CompactPinnedItemCard/CompactPinnedItemCard-ee.unit.spec.tsxsimilarity index 91%rename from frontend/src/metabase/common/collections/components/PinnedItemCard/PinnedItemCard-ee.unit.spec.tsxrename to frontend/src/metabase/common/collections/components/CompactPinnedItemCard/CompactPinnedItemCard-ee.unit.spec.tsxindex 4aad2016f73..f42d312e703 100644--- a/frontend/src/metabase/common/collections/components/PinnedItemCard/PinnedItemCard-ee.unit.spec.tsx+++ b/frontend/src/metabase/common/collections/components/CompactPinnedItemCard/CompactPinnedItemCard-ee.unit.spec.tsx@@ -10,7 +10,7 @@ import {createMockTokenFeatures,} from "metabase-types/api/mocks";-import PinnedItemCard from "./PinnedItemCard";+import { CompactPinnedItemCard } from "./CompactPinnedItemCard";const defaultCollection = createMockCollection({can_write: true,@@ -41,7 +41,7 @@ function setup({<Routepath="/"element={- <PinnedItemCard+ <CompactPinnedItemCarditem={item}collection={collection}createBookmark={jest.fn()}@@ -53,7 +53,7 @@ function setup({);}-describe("PinnedItemCard enterprise", () => {+describe("CompactPinnedItemCard enterprise", () => {describe("models", () => {const model = createMockCollectionItem({id: 1,diff --git a/frontend/src/metabase/common/collections/components/CompactPinnedItemCard/CompactPinnedItemCard.module.css b/frontend/src/metabase/common/collections/components/CompactPinnedItemCard/CompactPinnedItemCard.module.cssnew file mode 100644index 00000000000..254868e60b3--- /dev/null+++ b/frontend/src/metabase/common/collections/components/CompactPinnedItemCard/CompactPinnedItemCard.module.css@@ -0,0 +1,63 @@+.link {+ display: block;+}++.card {+ cursor: pointer;+ box-shadow: none;+}++.skeletonCard {+ cursor: default;+}++.body {+ display: flex;+ align-items: flex-start;+ gap: var(--mantine-spacing-sm);+ height: 100%;+ padding: var(--mantine-spacing-lg) var(--mantine-spacing-xl)+ var(--mantine-spacing-md) 1.25rem;+}++.icon {+ flex: 0 0 auto;+ /* optically center the 20px icon on the 16px title line */+ margin-top: -2px;+}++.content {+ min-width: 0;+ flex: 1;+ display: flex;+ flex-direction: column;+ gap: var(--mantine-spacing-xs);+}++/* Ellipsified's Text sets an inline `color: inherit`, so the title color and+ its hover highlight must live on the row wrapper and cascade down. */+.titleRow {+ color: var(--mb-color-text-primary);+ transition: color 0.2s ease;+}++.card:hover .titleRow {+ color: var(--mb-color-core-brand);+}++.description {+ color: var(--mb-color-text-secondary);+ font-size: var(--mantine-font-size-sm);+ line-height: 1rem;+}++.actions {+ position: absolute;+ top: var(--mantine-spacing-sm);+ right: var(--mantine-spacing-sm);+ visibility: hidden;+}++.card:hover .actions {+ visibility: visible;+}diff --git a/frontend/src/metabase/common/collections/components/CompactPinnedItemCard/CompactPinnedItemCard.tsx b/frontend/src/metabase/common/collections/components/CompactPinnedItemCard/CompactPinnedItemCard.tsxnew file mode 100644index 00000000000..3861f2b99dd--- /dev/null+++ b/frontend/src/metabase/common/collections/components/CompactPinnedItemCard/CompactPinnedItemCard.tsx@@ -0,0 +1,142 @@+import { t } from "ttag";++import { ActionMenu } from "metabase/common/collections/components/ActionMenu";+import type {+ CreateBookmark,+ DeleteBookmark,+} from "metabase/common/collections/types";+import { EntityIcon } from "metabase/common/components/EntityIcon";+import { EventSandbox } from "metabase/common/components/EventSandbox";+import { Link } from "metabase/common/components/Link";+import { MarkdownPreview } from "metabase/common/components/MarkdownPreview";+import { useGetIcon } from "metabase/hooks/use-icon";+import { PLUGIN_MODERATION } from "metabase/plugins";+import { Box, Card, Ellipsified, Group } from "metabase/ui";+import { modelToUrl } from "metabase/urls";+import type Database from "metabase-lib/v1/metadata/Database";+import type {+ Bookmark,+ Collection,+ CollectionItem,+ CollectionItemModel,+ RecentCollectionItem,+} from "metabase-types/api";++import S from "./CompactPinnedItemCard.module.css";++const TOOLTIP_MAX_WIDTH = 450;++const DEFAULT_DESCRIPTION: Partial<Record<CollectionItemModel, string>> = {+ get card() {+ return t`A question`;+ },+ get metric() {+ return t`A metric`;+ },+ get dashboard() {+ return t`A dashboard`;+ },+ get dataset() {+ return t`A model`;+ },+ get document() {+ return t`A document`;+ },+};++export type CompactPinnedItemCardProps = {+ item: CollectionItem | RecentCollectionItem;+ collection?: Collection;+ databases?: Database[];+ bookmarks?: Bookmark[];+ createBookmark?: CreateBookmark;+ deleteBookmark?: DeleteBookmark;+ onCopy?: (items: CollectionItem[]) => void;+ onMove?: (items: CollectionItem[]) => void;+ onClick?: () => void;+};++const isCollectionItem = (+ item: CollectionItem | RecentCollectionItem,+): item is CollectionItem => {+ return !("parent_collection" in item);+};++export function CompactPinnedItemCard({+ item,+ collection,+ databases,+ bookmarks,+ createBookmark,+ deleteBookmark,+ onCopy,+ onMove,+ onClick,+}: CompactPinnedItemCardProps) {+ const getIcon = useGetIcon();+ const icon = getIcon({+ model: item.model,+ display: item.display,+ moderated_status: item.moderated_status,+ });+ const description = item.description || DEFAULT_DESCRIPTION[item.model] || "";+ const actionMenuItem = isCollectionItem(item) ? item : null;+ const hasActionHandlers = Boolean(+ onCopy || onMove || createBookmark || deleteBookmark || collection,+ );++ return (+ <Link className={S.link} to={modelToUrl(item)} onClick={onClick}>+ <Card className={S.card} h="5rem" p={0} pos="relative" withBorder>+ <div className={S.body}>+ <EntityIcon+ {...icon}+ className={S.icon}+ size="1.25rem"+ color="core-brand"+ />+ <div className={S.content}>+ <Group className={S.titleRow} gap="sm" miw={0} wrap="nowrap">+ <Ellipsified+ fw="bold"+ fz="md"+ lh="1rem"+ tooltipProps={{ maw: TOOLTIP_MAX_WIDTH, position: "bottom" }}+ >+ {item.name}+ </Ellipsified>+ <PLUGIN_MODERATION.ModerationStatusIcon+ status={item.moderated_status}+ filled+ size={14}+ />+ </Group>+ <MarkdownPreview+ className={S.description}+ tooltipMaxWidth={TOOLTIP_MAX_WIDTH}+ >+ {description}+ </MarkdownPreview>+ </div>+ </div>+ {actionMenuItem && hasActionHandlers && (+ <Box className={S.actions}>+ {/* Used within a `<Link>`, so we must prevent events from triggering the link */}+ <EventSandbox preventDefault sandboxedEvents={["onClick"]}>+ <ActionMenu+ item={actionMenuItem}+ collection={collection}+ databases={databases}+ bookmarks={bookmarks}+ createBookmark={createBookmark}+ deleteBookmark={deleteBookmark}+ onCopy={onCopy}+ onMove={onMove}+ />+ </EventSandbox>+ </Box>+ )}+ </Card>+ </Link>+ );+}diff --git a/frontend/src/metabase/common/collections/components/CompactPinnedItemCard/CompactPinnedItemCard.unit.spec.tsx b/frontend/src/metabase/common/collections/components/CompactPinnedItemCard/CompactPinnedItemCard.unit.spec.tsxnew file mode 100644index 00000000000..8f3a1bea9fa--- /dev/null+++ b/frontend/src/metabase/common/collections/components/CompactPinnedItemCard/CompactPinnedItemCard.unit.spec.tsx@@ -0,0 +1,164 @@+import userEvent from "@testing-library/user-event";++import {+ renderWithProviders,+ screen,+ getIcon as testGetIcon,+} from "__support__/ui";+import { modelIconMap } from "metabase/common/utils/icon";+import { Route } from "metabase/router";+import type { CollectionItemModel } from "metabase-types/api";+import {+ createMockCollection,+ createMockCollectionItem,+} from "metabase-types/api/mocks";+import { createMockRecentCollectionItem } from "metabase-types/api/mocks/activity";++import { CompactPinnedItemCard } from "./CompactPinnedItemCard";+import { CompactPinnedItemCardSkeleton } from "./CompactPinnedItemCardSkeleton";++const defaultCollection = createMockCollection({+ can_write: true,+ id: 1,+ name: "Collection Foo",+});++const defaultItem = createMockCollectionItem({+ id: 1,+ model: "dashboard",+ name: "My Item",+ description: "description foo foo foo",+ collection_position: 1,+});++function setup({ item = defaultItem, collection = defaultCollection } = {}) {+ return renderWithProviders(+ <Route+ path="/"+ element={+ <CompactPinnedItemCard+ item={item}+ collection={collection}+ onCopy={jest.fn()}+ onMove={jest.fn()}+ createBookmark={jest.fn()}+ deleteBookmark={jest.fn()}+ />+ }+ />,+ { withRouter: true },+ );+}++describe("CompactPinnedItemCard", () => {+ it("should show the item's icon", () => {+ setup();+ expect(testGetIcon(modelIconMap[defaultItem.model])).toBeInTheDocument();+ });++ it("should show the item's name and description", () => {+ setup();+ expect(screen.getByText("My Item")).toBeInTheDocument();+ expect(screen.getByText("description foo foo foo")).toBeInTheDocument();+ });++ it("should link to the item's url", () => {+ setup();+ expect(screen.getByRole("link")).toHaveAttribute(+ "href",+ expect.stringContaining("/dashboard/1"),+ );+ });++ it.each<[CollectionItemModel, string]>([+ ["card", "A question"],+ ["metric", "A metric"],+ ["dashboard", "A dashboard"],+ ["dataset", "A model"],+ ["document", "A document"],+ ])(+ "should show a default description for a %s without a description",+ (model, description) => {+ setup({+ item: createMockCollectionItem({ model, description: "" }),+ });+ expect(screen.getByText(description)).toBeInTheDocument();+ },+ );++ it("should show an action menu when user clicks on the menu icon in the card", async () => {+ setup();+ await userEvent.click(testGetIcon("ellipsis"));+ expect(await screen.findByText("Unpin")).toBeInTheDocument();+ });++ describe("recent items", () => {+ const recentModel = createMockRecentCollectionItem({+ id: 7,+ model: "dataset",+ name: "Recent model",+ description: "recently viewed",+ });++ it("should render a recent item with its name, description and link", () => {+ renderWithProviders(+ <Route+ path="/"+ element={<CompactPinnedItemCard item={recentModel} />}+ />,+ { withRouter: true },+ );++ expect(screen.getByText("Recent model")).toBeInTheDocument();+ expect(screen.getByText("recently viewed")).toBeInTheDocument();+ expect(screen.getByRole("link")).toHaveAttribute(+ "href",+ expect.stringContaining("/model/7"),+ );+ });++ it("should not show an action menu for a recent item", () => {+ renderWithProviders(+ <Route+ path="/"+ element={+ <CompactPinnedItemCard+ item={recentModel}+ collection={defaultCollection}+ onCopy={jest.fn()}+ onMove={jest.fn()}+ />+ }+ />,+ { withRouter: true },+ );++ expect(screen.queryByLabelText("Actions")).not.toBeInTheDocument();+ });++ it("should call onClick when the card is clicked", async () => {+ const onClick = jest.fn();+ renderWithProviders(+ <Route+ path="/"+ element={+ <CompactPinnedItemCard item={recentModel} onClick={onClick} />+ }+ />,+ { withRouter: true },+ );++ await userEvent.click(screen.getByText("Recent model"));+ expect(onClick).toHaveBeenCalledTimes(1);+ });+ });++ describe("skeleton", () => {+ it("should render a skeleton card without a link", () => {+ renderWithProviders(<CompactPinnedItemCardSkeleton icon="model" />);++ expect(testGetIcon("model")).toBeInTheDocument();+ expect(screen.queryByRole("link")).not.toBeInTheDocument();+ });+ });+});diff --git a/frontend/src/metabase/common/collections/components/CompactPinnedItemCard/CompactPinnedItemCardSkeleton.tsx b/frontend/src/metabase/common/collections/components/CompactPinnedItemCard/CompactPinnedItemCardSkeleton.tsxnew file mode 100644index 00000000000..96296259721--- /dev/null+++ b/frontend/src/metabase/common/collections/components/CompactPinnedItemCard/CompactPinnedItemCardSkeleton.tsx@@ -0,0 +1,32 @@+import cx from "classnames";++import { EntityIcon } from "metabase/common/components/EntityIcon";+import { Card, Skeleton } from "metabase/ui";+import type { IconName } from "metabase-types/api";++import S from "./CompactPinnedItemCard.module.css";++export function CompactPinnedItemCardSkeleton({ icon }: { icon: IconName }) {+ return (+ <Card+ className={cx(S.card, S.skeletonCard)}+ h="5rem"+ p={0}+ pos="relative"+ withBorder+ >+ <div className={S.body}>+ <EntityIcon+ name={icon}+ className={S.icon}+ size="1.25rem"+ color="core-brand"+ />+ <div className={S.content}>+ <Skeleton natural h="1rem" maw="8rem" />+ <Skeleton natural h="1rem" maw="12rem" />+ </div>+ </div>+ </Card>+ );+}diff --git a/frontend/src/metabase/common/collections/components/CompactPinnedItemCard/index.ts b/frontend/src/metabase/common/collections/components/CompactPinnedItemCard/index.tsnew file mode 100644index 00000000000..bd61f12f7bd--- /dev/null+++ b/frontend/src/metabase/common/collections/components/CompactPinnedItemCard/index.ts@@ -0,0 +1,2 @@+export { CompactPinnedItemCard } from "./CompactPinnedItemCard";+export { CompactPinnedItemCardSkeleton } from "./CompactPinnedItemCardSkeleton";diff --git a/frontend/src/metabase/common/collections/components/PinnedItemCard/PinnedItemCard.stories.tsx b/frontend/src/metabase/common/collections/components/PinnedItemCard/PinnedItemCard.stories.tsxdeleted file mode 100644index 254b3726739..00000000000--- a/frontend/src/metabase/common/collections/components/PinnedItemCard/PinnedItemCard.stories.tsx+++ /dev/null@@ -1,87 +0,0 @@-import { action } from "@storybook/addon-actions";-import type { StoryFn } from "@storybook/react";--import PinnedItemCard, { type PinnedItemCardProps } from "./PinnedItemCard";--export default {- title: "App/Collections/PinnedItemCard",- component: PinnedItemCard,-};--const collection = {- can_write: true,- id: 1,- name: "Collection Foo",- description: null,- archived: false,- can_restore: false,- can_delete: false,- location: "/",-};--const onCopy = action("onCopy");-const onMove = action("onMove");--const Template: StoryFn<PinnedItemCardProps> = (args) => {- return <PinnedItemCard {...args} />;-};--export const Question = {- render: Template,-- args: {- collection,- item: {- id: 1,- collection_position: 1,- collection_id: null,- model: "card",- name: "Question",- description: "This is a description of the question",- copy: true,- archived: false,- },- onCopy,- onMove,- },-};--export const Dashboard = {- render: Template,-- args: {- collection,- item: {- id: 1,- model: "dashboard",- collection_position: 1,- collection_id: null,- name: "Dashboard",- description: Array(20)- .fill("This is a description of the dashboard.")- .join(" "),- archived: false,- },- onCopy,- onMove,- },-};--export const Model = {- render: Template,-- args: {- collection,- item: {- id: 1,- model: "dataset",- collection_position: 1,- collection_id: null,- name: "Model",- description: "This is a description of the model",- archived: false,- },- onCopy,- onMove,- },-};diff --git a/frontend/src/metabase/common/collections/components/PinnedItemCard/PinnedItemCard.styled.tsx b/frontend/src/metabase/common/collections/components/PinnedItemCard/PinnedItemCard.styled.tsxdeleted file mode 100644index 7e8ad06576b..00000000000--- a/frontend/src/metabase/common/collections/components/PinnedItemCard/PinnedItemCard.styled.tsx+++ /dev/null@@ -1,53 +0,0 @@-// eslint-disable-next-line no-restricted-imports-import styled from "@emotion/styled";--import { MarkdownPreview } from "metabase/common/components/MarkdownPreview";-import { Box, type BoxProps } from "metabase/ui";--// Unjustified type cast. FIXME-export const ActionsContainer = styled(Box)<BoxProps>`- display: flex;- align-items: center;- gap: 0.5rem;- visibility: hidden;-` as unknown as typeof Box;--export const Title = styled.div`- font-weight: bold;- font-size: 1rem;- line-height: 1.5rem;- color: var(--mb-color-text-primary);- transition: color 0.2s ease;- white-space: nowrap;- text-overflow: ellipsis;- overflow: hidden;-`;--export const Description = styled(MarkdownPreview)`- color: var(--mb-color-text-secondary);- margin-top: 0.25rem;-`;--export const Body = styled.div`- padding: 1rem 1.5rem 1.25rem;- display: flex;- flex-direction: column;- cursor: pointer;-- &:hover {- ${Title} {- color: var(--mb-color-core-brand);- }-- ${ActionsContainer} {- visibility: visible;- }- }-`;--export const Header = styled.div`- padding-bottom: 0.5rem;- display: flex;- justify-content: space-between;- align-items: center;-`;diff --git a/frontend/src/metabase/common/collections/components/PinnedItemCard/PinnedItemCard.tsx b/frontend/src/metabase/common/collections/components/PinnedItemCard/PinnedItemCard.tsxdeleted file mode 100644index d5067f78a7f..00000000000--- a/frontend/src/metabase/common/collections/components/PinnedItemCard/PinnedItemCard.tsx+++ /dev/null@@ -1,194 +0,0 @@-import type { Dispatch, MouseEvent, SetStateAction } from "react";-import { useState } from "react";-import { t } from "ttag";--import ActionMenu from "metabase/common/collections/components/ActionMenu";-import type {- CreateBookmark,- DeleteBookmark,-} from "metabase/common/collections/types";-import { EntityIcon } from "metabase/common/components/EntityIcon";-import { EventSandbox } from "metabase/common/components/EventSandbox";-import { Link } from "metabase/common/components/Link";-import { useGetIcon } from "metabase/hooks/use-icon";-import { PLUGIN_MODERATION } from "metabase/plugins";-import { Box, Card, Flex, Skeleton, Tooltip } from "metabase/ui";-import { modelToUrl } from "metabase/urls";-import type Database from "metabase-lib/v1/metadata/Database";-import type {- Bookmark,- Collection,- CollectionItem,- IconName,- RecentCollectionItem,-} from "metabase-types/api";--import {- ActionsContainer,- Body,- Description,- Header,- Title,-} from "./PinnedItemCard.styled";--type ItemOrSkeleton =- | {- /** If `item` is undefined, the `skeleton` prop must be true */- item: CollectionItem | RecentCollectionItem;- skeleton?: never;- iconForSkeleton?: never;- }- | {- item?: never;- skeleton: true;- iconForSkeleton: IconName;- };--export type PinnedItemCardProps = {- databases?: Database[];- bookmarks?: Bookmark[];- createBookmark?: CreateBookmark;- deleteBookmark?: DeleteBookmark;- className?: string;- collection?: Collection;- onCopy?: (items: CollectionItem[]) => void;- onMove?: (items: CollectionItem[]) => void;- onClick?: () => void;-} & ItemOrSkeleton;--const TOOLTIP_MAX_WIDTH = 450;--const DEFAULT_DESCRIPTION: Record<string, string> = {- get card() {- return t`A question`;- },- get metric() {- return t`A metric`;- },- get dashboard() {- return t`A dashboard`;- },- get dataset() {- return t`A model`;- },-};--const isCollectionItem = (- item: CollectionItem | RecentCollectionItem,-): item is CollectionItem => {- return !("parent_collection" in item);-};--function PinnedItemCard({- databases,- bookmarks,- createBookmark,- deleteBookmark,- className,- item,- collection,- onCopy,- onMove,- onClick,- iconForSkeleton,-}: PinnedItemCardProps) {- const getIcon = useGetIcon();- const [showTitleTooltip, setShowTitleTooltip] = useState(false);- const iconData = iconForSkeleton- ? { name: iconForSkeleton }- : getIcon({- model: item.model,- display: item.display,- moderated_status: item.moderated_status,- });-- const maybeEnableTooltip = (- event: MouseEvent<HTMLDivElement>,- setterFn: Dispatch<SetStateAction<boolean>>,- ) => {- // Unjustified type cast. FIXME- const target = event.target as HTMLDivElement;- const isTargetElWiderThanCard = target?.scrollWidth > target?.clientWidth;- if (isTargetElWiderThanCard) {- setterFn(true);- }- };-- const hasActions =- item &&- isCollectionItem(item) &&- (onCopy || onMove || createBookmark || deleteBookmark || collection);-- const card = (- <Card p={0} radius="md" shadow="none" withBorder>- <Body style={item ? undefined : { cursor: "default" }}>- <Header>- <EntityIcon {...iconData} size="1.5rem" color="core-brand" />- <ActionsContainer h={item ? undefined : "2rem"}>- {hasActions && (- // This component is used within a `<Link>` component,- // so we must prevent events from triggering the activation of the link- <EventSandbox preventDefault sandboxedEvents={["onClick"]}>- <ActionMenu- databases={databases}- bookmarks={bookmarks}- createBookmark={createBookmark}- deleteBookmark={deleteBookmark}- item={item}- collection={collection}- onCopy={onCopy}- onMove={onMove}- />- </EventSandbox>- )}- </ActionsContainer>- </Header>- {item ? (- <>- <Tooltip- label={item.name}- position="bottom"- disabled={!showTitleTooltip}- maw={TOOLTIP_MAX_WIDTH}- >- <Title- onMouseEnter={(e) => maybeEnableTooltip(e, setShowTitleTooltip)}- >- <Flex align="center" gap="0.5rem">- {item.name}- <PLUGIN_MODERATION.ModerationStatusIcon- status={item.moderated_status}- filled- size={14}- />- </Flex>- </Title>- </Tooltip>- <Description tooltipMaxWidth={TOOLTIP_MAX_WIDTH}>- {item.description || DEFAULT_DESCRIPTION[item.model] || ""}- </Description>- </>- ) : (- <>- <Skeleton natural h="1.5rem" />- <Skeleton natural mt="xs" mb="4px" h="1rem" />- </>- )}- </Body>- </Card>- );- const to = item ? (modelToUrl(item) ?? "/") : undefined;- return (- <Box- display="block"- h="min-content"- className={className}- onClick={onClick}- >- {to ? <Link to={to}>{card}</Link> : card}- </Box>- );-}--// eslint-disable-next-line import/no-default-export -- deprecated usage-export default PinnedItemCard;diff --git a/frontend/src/metabase/common/collections/components/PinnedItemCard/PinnedItemCard.unit.spec.tsx b/frontend/src/metabase/common/collections/components/PinnedItemCard/PinnedItemCard.unit.spec.tsxdeleted file mode 100644index dd0cc0adcfb..00000000000--- a/frontend/src/metabase/common/collections/components/PinnedItemCard/PinnedItemCard.unit.spec.tsx+++ /dev/null@@ -1,147 +0,0 @@-import userEvent from "@testing-library/user-event";--import {- mockTextOverflow,- renderWithProviders,- screen,- getIcon as testGetIcon,-} from "__support__/ui";-import { modelIconMap } from "metabase/common/utils/icon";-import { Route } from "metabase/router";-import type { CollectionItem, CollectionItemModel } from "metabase-types/api";-import {- createMockCollection,- createMockCollectionItem,-} from "metabase-types/api/mocks";--import PinnedItemCard from "./PinnedItemCard";--const mockOnCopy = jest.fn();-const mockOnMove = jest.fn();--const defaultCollection = createMockCollection({- can_write: true,- id: 1,- name: "Collection Foo",- archived: false,-});--const HEADING_1_TEXT = "Heading 1";-const HEADING_1_MARKDOWN = `# ${HEADING_1_TEXT}`;-const HEADING_2_TEXT = "Heading 2";-const HEADING_2_MARKDOWN = `## ${HEADING_2_TEXT}`;-const PARAGRAPH_TEXT = "Paragraph with link";-const PARAGRAPH_MARKDOWN = "Paragraph with [link](https://example.com)";-const IMAGE_MARKDOWN = "";-const MARKDOWN = [- IMAGE_MARKDOWN,- HEADING_1_MARKDOWN,- HEADING_2_MARKDOWN,- PARAGRAPH_MARKDOWN,-].join("\n\n");-const MARKDOWN_AS_TEXT = [HEADING_1_TEXT, HEADING_2_TEXT, PARAGRAPH_TEXT].join(- " ",-);--const getCollectionItem = ({- id = 1,- model = "dashboard",- name = "My Item",- description = "description foo foo foo",- collection_position = 1,- ...rest-}: {- id?: number;- model?: CollectionItemModel;- name?: string;- description?: string;- collection_position?: number;-} = {}): CollectionItem & { description: string } => {- // Unjustified type cast. FIXME- return createMockCollectionItem({- ...rest,- id,- model,- name,- description,- collection_position,- }) as CollectionItem & { description: string };-};--const defaultItem: CollectionItem & { description: string } =- getCollectionItem();--function setup({ item = defaultItem, collection = defaultCollection } = {}) {- mockOnCopy.mockReset();- mockOnMove.mockReset();- return renderWithProviders(- <Route- path="/"- element={- <PinnedItemCard- item={item}- collection={collection}- onCopy={mockOnCopy}- onMove={mockOnMove}- createBookmark={jest.fn()}- deleteBookmark={jest.fn()}- />- }- />,- { withRouter: true },- );-}--describe("PinnedItemCard", () => {- it("should show the item's icon", () => {- setup();- expect(testGetIcon(modelIconMap[defaultItem.model])).toBeInTheDocument();- });-- it("should show the item's name", () => {- setup();- expect(screen.getByText(defaultItem.name)).toBeInTheDocument();- });-- it("should show the item's description", () => {- setup();- expect(screen.getByText(defaultItem.description)).toBeInTheDocument();- });-- it("should show a default description if there is no item description", () => {- setup({ item: getCollectionItem({ description: "" }) });- expect(screen.getByText("A dashboard")).toBeInTheDocument();- });-- it("should show an action menu when user clicks on the menu icon in the card", async () => {- setup();- await userEvent.click(testGetIcon("ellipsis"));- expect(await screen.findByText("Unpin")).toBeInTheDocument();- });-- describe("description", () => {- beforeAll(() => {- mockTextOverflow();- });-- afterAll(() => {- jest.restoreAllMocks();- });-- it("should render description markdown as plain text", () => {- setup({ item: getCollectionItem({ description: MARKDOWN }) });-- expect(screen.getByText(MARKDOWN_AS_TEXT)).toBeInTheDocument();- });-- it("should show description tooltip with markdown formatting on hover", async () => {- setup({ item: getCollectionItem({ description: MARKDOWN }) });-- await userEvent.hover(screen.getByText(MARKDOWN_AS_TEXT));-- expect(await screen.findByRole("tooltip")).toHaveTextContent(- MARKDOWN_AS_TEXT,- );- });- });-});diff --git a/frontend/src/metabase/common/collections/components/PinnedItemCard/index.ts b/frontend/src/metabase/common/collections/components/PinnedItemCard/index.tsdeleted file mode 100644index 0c07bc5be41..00000000000--- a/frontend/src/metabase/common/collections/components/PinnedItemCard/index.ts+++ /dev/null@@ -1,2 +0,0 @@-// eslint-disable-next-line import/no-default-export -- deprecated usage-export { default } from "./PinnedItemCard";diff --git a/frontend/src/metabase/common/collections/types.ts b/frontend/src/metabase/common/collections/types.tsindex b2e22ca0cad..7ca991c1e00 100644--- a/frontend/src/metabase/common/collections/types.ts+++ b/frontend/src/metabase/common/collections/types.ts@@ -68,7 +68,6 @@ export type OnPin = () => void | null;export type OnArchive = (() => Promise<any>) | null;export type OnRestore = (() => Promise<any> | void) | null;export type OnDeletePermanently = (() => Promise<any> | void) | null;-export type OnTogglePreview = () => void | null;export type OnToggleBookmark = () => void | null;export type OnDrop = () => void;export type OnToggleSelected = () => void | null;diff --git a/frontend/src/metabase/common/collections/utils.ts b/frontend/src/metabase/common/collections/utils.tsindex b788f417186..d8593fd4a45 100644--- a/frontend/src/metabase/common/collections/utils.ts+++ b/frontend/src/metabase/common/collections/utils.ts@@ -252,15 +252,6 @@ export function canBookmarkItem({ model, type, archived }: CollectionItem) {}}-export function canPreviewItem(item: CollectionItem, collection?: Collection) {- return (- collection?.can_write &&- isItemPinned(item) &&- (isItemQuestion(item) || isItemMetric(item)) &&- !item.archived- );-}-export function canArchiveItem(item: CollectionItem, collection?: Collection) {return (collection?.can_write &&@@ -299,18 +290,6 @@ export function canPlaceEntityInCollectionOrDescendants();}-export function isPreviewShown(item: CollectionItem) {- return isPreviewEnabled(item) && isFullyParameterized(item);-}--export function isPreviewEnabled(item: CollectionItem) {- return item.collection_preview ?? true;-}--export function isFullyParameterized(item: CollectionItem) {- return item.fully_parameterized ?? true;-}-export function coerceCollectionId(collectionId: CollectionId | null | undefined,): CollectionId {diff --git a/frontend/src/metabase/common/components/EntityItem/EntityItem.tsx b/frontend/src/metabase/common/components/EntityItem/EntityItem.tsxindex 0beefe2bb6b..24ddc36f634 100644--- a/frontend/src/metabase/common/components/EntityItem/EntityItem.tsx+++ b/frontend/src/metabase/common/components/EntityItem/EntityItem.tsx@@ -12,15 +12,9 @@ import type {OnPin,OnRestore,OnToggleBookmark,- OnTogglePreview,OnToggleSelected,} from "metabase/common/collections/types";-import {- isFullyParameterized,- isItemModel,- isItemPinned,- isPreviewShown,-} from "metabase/common/collections/utils";+import { isItemModel, isItemPinned } from "metabase/common/collections/utils";import { EntityIcon } from "metabase/common/components/EntityIcon";import { Link } from "metabase/common/components/Link";import { Swapper } from "metabase/common/components/Swapper";@@ -169,7 +163,6 @@ function EntityItemMenu({onRestore,onDeletePermanently,onToggleBookmark,- onTogglePreview,className,}: {item: CollectionItem;@@ -182,12 +175,9 @@ function EntityItemMenu({onRestore?: OnRestore;onDeletePermanently?: OnDeletePermanently;onToggleBookmark?: OnToggleBookmark;- onTogglePreview?: OnTogglePreview;className?: string;}) {const isPinned = isItemPinned(item);- const isPreviewed = isPreviewShown(item);- const isParameterized = isFullyParameterized(item);const isModel = isItemModel(item);const isXrayShown = isModel && isXrayEnabled;@@ -218,20 +208,6 @@ function EntityItemMenu({});}- if (onTogglePreview) {- result.push({- title: isPreviewed- ? t`Don’t show visualization`- : t`Show visualization`,- icon: isPreviewed ? "eye_crossed_out" : "eye",- action: onTogglePreview,- tooltip: !isParameterized- ? t`Open this question and fill in its variables to see it.`- : undefined,- disabled: !isParameterized,- });- }-if (onCopy) {result.push({title: c("Verb").t`Duplicate`,@@ -284,14 +260,11 @@ function EntityItemMenu({item,isPinned,isXrayShown,- isPreviewed,- isParameterized,isBookmarked,onPin,onMove,onCopy,onArchive,- onTogglePreview,onToggleBookmark,onDeletePermanently,onRestore,diff --git a/frontend/src/metabase/common/components/ItemsTable/Columns.tsx b/frontend/src/metabase/common/components/ItemsTable/Columns.tsxindex 2d182e11534..7c4e1f2b74f 100644--- a/frontend/src/metabase/common/components/ItemsTable/Columns.tsx+++ b/frontend/src/metabase/common/components/ItemsTable/Columns.tsx@@ -2,7 +2,7 @@ import type { PropsWithChildren } from "react";import { c, t } from "ttag";import type { ActionMenuProps } from "metabase/common/collections/components/ActionMenu";-import ActionMenu from "metabase/common/collections/components/ActionMenu";+import { ActionMenu } from "metabase/common/collections/components/ActionMenu";import { DateTime } from "metabase/common/components/DateTime";import { EntityItem } from "metabase/common/components/EntityItem";import { Markdown } from "metabase/common/components/Markdown";diff --git a/frontend/src/metabase/common/components/QuestionResultLoader.tsx b/frontend/src/metabase/common/components/QuestionResultLoader.tsxindex 93f134d29ed..870d463f2ee 100644--- a/frontend/src/metabase/common/components/QuestionResultLoader.tsx+++ b/frontend/src/metabase/common/components/QuestionResultLoader.tsx@@ -21,7 +21,6 @@ type QuestionResultLoaderProps = {question: Question | null | undefined;onLoad?: (results: Dataset[]) => void;keepPreviousWhileLoading?: boolean;- collectionPreview?: boolean;children: (state: QuestionResultLoaderChildrenProps) => ReactNode;};@@ -47,7 +46,6 @@ export function QuestionResultLoader({question,onLoad,keepPreviousWhileLoading = false,- collectionPreview,children,}: QuestionResultLoaderProps) {const dispatch = useDispatch();@@ -81,7 +79,6 @@ export function QuestionResultLoader({const queryResults = await runQuestionQuery(questionToLoad, {dispatch,signal: cancelControllerRef.current.signal,- collectionPreview,});setLoading(false);@@ -95,7 +92,7 @@ export function QuestionResultLoader({setError(err);}},- [dispatch, collectionPreview],+ [dispatch],);// A function to pass to the child to allow the component to call `loadResult` againdiff --git a/frontend/src/metabase/common/components/dnd/PinnedItemSortDropTarget.tsx b/frontend/src/metabase/common/components/dnd/PinnedItemSortDropTarget.tsxindex c32b9ccf3ea..c7132c16329 100644--- a/frontend/src/metabase/common/components/dnd/PinnedItemSortDropTarget.tsx+++ b/frontend/src/metabase/common/components/dnd/PinnedItemSortDropTarget.tsx@@ -11,7 +11,6 @@ import { PinnableDragTypes, isItemDragPayload } from ".";interface PinnedItemSortDropTargetOwnProps {isFrontTarget: boolean;isBackTarget: boolean;- itemModel: string;pinIndex: number;noDrop: boolean;}@@ -33,7 +32,7 @@ export const PinnedItemSortDropTarget = DropTarget(return false;}const { items } = payload;- const { isFrontTarget, isBackTarget, itemModel, pinIndex } = props;+ const { isFrontTarget, isBackTarget, pinIndex } = props;// NOTE: not necessary to check collection permission here since we// enforce it when beginning to drag and item within the same collection@@ -41,10 +40,6 @@ export const PinnedItemSortDropTarget = DropTarget(return false;}- if (itemModel != null && items.some((item) => item.model !== itemModel)) {- return false;- }-if (pinIndex == null) {return false;}diff --git a/frontend/src/metabase/common/components/dnd/index.ts b/frontend/src/metabase/common/components/dnd/index.tsindex dcf5dfd50e8..45d18bee8bf 100644--- a/frontend/src/metabase/common/components/dnd/index.ts+++ b/frontend/src/metabase/common/components/dnd/index.ts@@ -30,6 +30,7 @@ export const DragTypes = {DATASET: "dataset",METRIC: "metric",DOCUMENT: "document",+ EXPLORATION: "exploration",};export const PinnableDragTypes = [@@ -39,6 +40,7 @@ export const PinnableDragTypes = [DragTypes.DATASET,DragTypes.METRIC,DragTypes.DOCUMENT,+ DragTypes.EXPLORATION,];export const MoveableDragTypes = [@@ -49,4 +51,5 @@ export const MoveableDragTypes = [DragTypes.DATASET,DragTypes.METRIC,DragTypes.DOCUMENT,+ DragTypes.EXPLORATION,];diff --git a/frontend/src/metabase/common/hooks/index.ts b/frontend/src/metabase/common/hooks/index.tsindex d8be914e3c0..94e27c6b401 100644--- a/frontend/src/metabase/common/hooks/index.ts+++ b/frontend/src/metabase/common/hooks/index.ts@@ -9,7 +9,6 @@ export * from "./use-has-token-feature";export * from "./use-locale";export * from "./use-notification-channels";export * from "./use-scroll-to-top";-export * from "./use-set-collection-preview";export * from "./use-sorting-state-change";export * from "./use-temp-storage";export * from "./use-temporary-state";diff --git a/frontend/src/metabase/common/hooks/use-set-collection-preview.ts b/frontend/src/metabase/common/hooks/use-set-collection-preview.tsdeleted file mode 100644index efb81d6b893..00000000000--- a/frontend/src/metabase/common/hooks/use-set-collection-preview.ts+++ /dev/null@@ -1,14 +0,0 @@-import { useCallback } from "react";--import { useUpdateCardMutation } from "metabase/api";-import type { CardId } from "metabase-types/api";--export function useSetCollectionPreview() {- const [updateCard] = useUpdateCardMutation();-- return useCallback(- (id: CardId, collection_preview: boolean) =>- updateCard({ id, collection_preview }),- [updateCard],- );-}diff --git a/frontend/src/metabase/querying/run-query.ts b/frontend/src/metabase/querying/run-query.tsindex 807975bd758..bce98e09f2c 100644--- a/frontend/src/metabase/querying/run-query.ts+++ b/frontend/src/metabase/querying/run-query.ts@@ -26,7 +26,6 @@ type RunQuestionQueryOptions = {isDirty?: boolean;token?: string | null;ignoreCache?: boolean;- collectionPreview?: boolean;// Ability to override or add extra query params to the request, used by Embedding SDKqueryParamsOverride?: Record<string, unknown>;};@@ -34,7 +33,6 @@ type RunQuestionQueryOptions = {type SavedCardQueryOptions = {parameters: unknown[];ignoreCache?: boolean;- collectionPreview?: boolean;token?: string | null;queryParamsOverride?: Record<string, unknown>;};@@ -121,7 +119,6 @@ function runSavedCardQuery({parameters,ignoreCache,- collectionPreview,token,queryParamsOverride,}: SavedCardQueryOptions,@@ -134,7 +131,6 @@ function runSavedCardQuery(const body = {ignore_cache: ignoreCache,- collection_preview: collectionPreview,parameters,// Disambiguate the RTK cache key so two callers running the same saved card// don't co-subscribe to one in-flight request — otherwise one caller@@ -186,14 +182,11 @@ export async function runQuestionQuery(isDirty = false,token,ignoreCache = false,- collectionPreview = false,queryParamsOverride = {},}: RunQuestionQueryOptions,): Promise<[Dataset]> {const canUseCardApiEndpoint = !isDirty && question.isSaved();- const parameters = normalizeParameters(- question.parameters({ collectionPreview }),- );+ const parameters = normalizeParameters(question.parameters());const card = question.card();if (canUseCardApiEndpoint) {@@ -205,7 +198,6 @@ export async function runQuestionQuery({parameters,ignoreCache,- collectionPreview,token,queryParamsOverride,},diff --git a/frontend/src/metabase/querying/run-query.unit.spec.ts b/frontend/src/metabase/querying/run-query.unit.spec.tsindex 4d424de0144..34d83b4a873 100644--- a/frontend/src/metabase/querying/run-query.unit.spec.ts+++ b/frontend/src/metabase/querying/run-query.unit.spec.ts@@ -110,7 +110,6 @@ describe("metabase/querying/run-query > runQuestionQuery", () => {`path:/api/card/${question.id()}/query`,);expect(await call?.request?.json()).toEqual({- collection_preview: false,ignore_cache: false,parameters: [],});@@ -129,7 +128,6 @@ describe("metabase/querying/run-query > runQuestionQuery", () => {`path:/api/card/pivot/${question.id()}/query`,);expect(await call?.request?.json()).toEqual({- collection_preview: false,ignore_cache: false,parameters: [],});@@ -146,7 +144,6 @@ describe("metabase/querying/run-query > runQuestionQuery", () => {`path:/api/dashboard/${dashboardId}/dashcard/${dashcardId}/card/${question.id()}/query`,);expect(await call?.request?.json()).toEqual({- collection_preview: false,ignore_cache: false,parameters: [],});@@ -167,7 +164,6 @@ describe("metabase/querying/run-query > runQuestionQuery", () => {`path:/api/dashboard/pivot/${dashboardId}/dashcard/${dashcardId}/card/${question.id()}/query`,);expect(await call?.request?.json()).toEqual({- collection_preview: false,ignore_cache: false,parameters: [],});