Skip to content

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

Show other users' personal collections in alphabetical column order (#85251)

Andersone988959681fa
diff --git a/frontend/src/metabase/common/components/CollectionListView/CollectionListView.tsx b/frontend/src/metabase/common/components/CollectionListView/CollectionListView.tsx
index 1ec001cf576..adda59d7508 100644
--- a/frontend/src/metabase/common/components/CollectionListView/CollectionListView.tsx
+++ b/frontend/src/metabase/common/components/CollectionListView/CollectionListView.tsx
@@ -2,7 +2,10 @@ import type { CSSProperties, ComponentProps, Key, ReactNode } from "react";
import { BrowserCrumbs } from "metabase/common/components/BrowserCrumbs";
import { Link } from "metabase/common/components/Link";
-import { VirtualizedGrid } from "metabase/common/components/VirtualizedGrid";
+import {
+ type GridItemOrder,
+ VirtualizedGrid,
+} from "metabase/common/components/VirtualizedGrid";
import CS from "metabase/css/core/index.css";
import { Box, Card, Flex, Group, Icon, Loader, Title } from "metabase/ui";
import type { IconName } from "metabase-types/api";
@@ -22,6 +25,7 @@ type CollectionListViewProps = {
crumbs: Crumb;
loading?: boolean;
items: CollectionListItem[];
+ itemOrder?: GridItemOrder;
containerStyle?: CSSProperties;
containerClassName?: string;
};
@@ -30,6 +34,7 @@ export const CollectionListView = ({
crumbs,
loading = false,
items,
+ itemOrder,
containerStyle,
containerClassName,
}: CollectionListViewProps) => {
@@ -70,6 +75,7 @@ export const CollectionListView = ({
) : (
<VirtualizedGrid
items={items}
+ itemOrder={itemOrder}
keyExtractor={(item) => item.key}
renderItem={renderItem}
columnsPerRow={{ xs: 1, sm: 2, md: 3, lg: 4, xl: 4 }}
diff --git a/frontend/src/metabase/common/components/UserCollectionList.tsx b/frontend/src/metabase/common/components/UserCollectionList.tsx
index 4fb41a4b91c..bcd075d8666 100644
--- a/frontend/src/metabase/common/components/UserCollectionList.tsx
+++ b/frontend/src/metabase/common/components/UserCollectionList.tsx
@@ -33,6 +33,11 @@ export const UserCollectionList = () => {
}));
return (
- <CollectionListView crumbs={crumbs} loading={isLoading} items={items} />
+ <CollectionListView
+ crumbs={crumbs}
+ loading={isLoading}
+ items={items}
+ itemOrder="column"
+ />
);
};
diff --git a/frontend/src/metabase/common/components/UserCollectionList.unit.spec.tsx b/frontend/src/metabase/common/components/UserCollectionList.unit.spec.tsx
index e1470b592f7..0f3429985b5 100644
--- a/frontend/src/metabase/common/components/UserCollectionList.unit.spec.tsx
+++ b/frontend/src/metabase/common/components/UserCollectionList.unit.spec.tsx
@@ -1,6 +1,6 @@
-import fetchMock from "fetch-mock";
-
+import { setupUsersEndpoints } from "__support__/server-mocks";
import {
+ createMockMediaQueryList,
mockGetBoundingClientRect,
renderWithProviders,
screen,
@@ -18,7 +18,7 @@ const MockUsers = new Array(100).fill(0).map((_, index) =>
);
const setup = () => {
- fetchMock.get("path:/api/user", { data: MockUsers });
+ setupUsersEndpoints(MockUsers);
renderWithProviders(<UserCollectionList />);
};
@@ -43,4 +43,31 @@ describe("UserCollectionList", () => {
expect(screen.queryByText("big boi 98")).not.toBeInTheDocument();
expect(screen.queryByText("big boi 99")).not.toBeInTheDocument();
});
+
+ it("should show users in column order while keeping each personal collection link (#83318)", async () => {
+ jest
+ .spyOn(window, "matchMedia")
+ .mockReturnValue(createMockMediaQueryList({ matches: true }));
+
+ setup();
+
+ const links = await screen.findAllByRole("link", { name: /big boi \d+$/ });
+
+ expect(links.slice(0, 8).map((link) => link.textContent)).toEqual([
+ "big boi 0",
+ "big boi 25",
+ "big boi 50",
+ "big boi 75",
+ "big boi 1",
+ "big boi 26",
+ "big boi 51",
+ "big boi 76",
+ ]);
+ expect(screen.getByRole("link", { name: /big boi 25$/ })).toHaveAttribute(
+ "href",
+ "/collection/27",
+ );
+ expect(screen.queryByText("big boi 24")).not.toBeInTheDocument();
+ expect(screen.queryByText("big boi 99")).not.toBeInTheDocument();
+ });
});
diff --git a/frontend/src/metabase/common/components/VirtualizedGrid/VirtualizedGrid.tsx b/frontend/src/metabase/common/components/VirtualizedGrid/VirtualizedGrid.tsx
index 5f2f83663ab..342301f87e2 100644
--- a/frontend/src/metabase/common/components/VirtualizedGrid/VirtualizedGrid.tsx
+++ b/frontend/src/metabase/common/components/VirtualizedGrid/VirtualizedGrid.tsx
@@ -6,12 +6,15 @@ import _ from "underscore";
import { Box, type BoxProps, SimpleGrid, useMatches } from "metabase/ui";
import type { BreakpointName } from "metabase/ui/theme";
+export type GridItemOrder = "row" | "column";
+
type VirtualizedGridProps<T> = {
items: T[];
keyExtractor: (item: T) => Key;
renderItem: (item: T) => ReactNode;
columnsPerRow: Record<BreakpointName, number>;
estimatedRowHeight: number;
+ itemOrder?: GridItemOrder;
overscan?: number;
} & Omit<BoxProps, "children">;
@@ -21,6 +24,7 @@ export const VirtualizedGrid = <T,>({
renderItem,
columnsPerRow,
estimatedRowHeight,
+ itemOrder = "row",
overscan = 5,
...boxProps
}: VirtualizedGridProps<T>) => {
@@ -39,10 +43,16 @@ export const VirtualizedGrid = <T,>({
);
// Group items into rows based on current columns
- const rows = useMemo(
- () => _.chunk(items, currentColumns),
- [items, currentColumns],
- );
+ const rows = useMemo(() => {
+ if (itemOrder === "row") {
+ return _.chunk(items, currentColumns);
+ }
+
+ const rowCount = Math.ceil(items.length / currentColumns);
+ return _.range(rowCount).map((rowIndex) =>
+ _.range(rowIndex, items.length, rowCount).map((index) => items[index]),
+ );
+ }, [items, currentColumns, itemOrder]);
const virtualizer = useVirtualizer({
count: rows.length,
diff --git a/frontend/src/metabase/common/components/VirtualizedGrid/VirtualizedGrid.unit.spec.tsx b/frontend/src/metabase/common/components/VirtualizedGrid/VirtualizedGrid.unit.spec.tsx
index 7afbbd9309a..97af049a566 100644
--- a/frontend/src/metabase/common/components/VirtualizedGrid/VirtualizedGrid.unit.spec.tsx
+++ b/frontend/src/metabase/common/components/VirtualizedGrid/VirtualizedGrid.unit.spec.tsx
@@ -7,6 +7,19 @@ import {
import { VirtualizedGrid } from "./VirtualizedGrid";
+function getRenderedRows(container: HTMLElement) {
+ // Need to use container to test actual DOM structure/chunking behavior
+ const rows = container.querySelectorAll<HTMLDivElement>(
+ 'div[style*="translateY"]',
+ );
+
+ return Array.from(rows, (row) =>
+ within(row)
+ .getAllByText(/^Item \d+$/)
+ .map((item) => item.textContent),
+ );
+}
+
describe("VirtualizedGrid", () => {
beforeEach(() => {
// Same pattern as metabase/common/components/VirtualizedList/VariableHeightVirtualizedList.unit.spec.tsx
@@ -30,28 +43,61 @@ describe("VirtualizedGrid", () => {
/>,
);
- // Need to use container to test actual DOM structure/chunking behavior
- // eslint-disable-next-line testing-library/no-container
- const rows = container.querySelectorAll<HTMLDivElement>(
- 'div[style*="translateY"]',
- );
-
// With 10 items and 4 columns per row, we should have 3 rows
- expect(rows.length).toBe(3);
-
- expect(
- Array.from(rows, (row) =>
- within(row)
- .getAllByText(/^Item \d+$/)
- .map((item) => item.textContent),
- ),
- ).toEqual([
+ expect(getRenderedRows(container)).toEqual([
["Item 0", "Item 1", "Item 2", "Item 3"],
["Item 4", "Item 5", "Item 6", "Item 7"],
["Item 8", "Item 9"],
]);
});
+ it.each([
+ {
+ name: "uneven columns",
+ itemCount: 10,
+ columnCount: 4,
+ expectedRows: [
+ ["Item 0", "Item 3", "Item 6", "Item 9"],
+ ["Item 1", "Item 4", "Item 7"],
+ ["Item 2", "Item 5", "Item 8"],
+ ],
+ },
+ {
+ name: "fewer items than columns",
+ itemCount: 2,
+ columnCount: 4,
+ expectedRows: [["Item 0", "Item 1"]],
+ },
+ {
+ name: "an empty list",
+ itemCount: 0,
+ columnCount: 4,
+ expectedRows: [],
+ },
+ ])(
+ "should preserve item order down columns with $name (#83318)",
+ ({ itemCount, columnCount, expectedRows }) => {
+ const { container } = render(
+ <VirtualizedGrid
+ items={Array.from({ length: itemCount }, (_, index) => index)}
+ keyExtractor={(item) => item}
+ renderItem={(item) => <div>Item {item}</div>}
+ columnsPerRow={{
+ xs: columnCount,
+ sm: columnCount,
+ md: columnCount,
+ lg: columnCount,
+ xl: columnCount,
+ }}
+ estimatedRowHeight={80}
+ itemOrder="column"
+ />,
+ );
+
+ expect(getRenderedRows(container)).toEqual(expectedRows);
+ },
+ );
+
it("should not render children outside the bounding client rect", () => {
const items = Array.from({ length: 100 }, (_, i) => ({ id: i }));
diff --git a/frontend/src/metabase/common/components/VirtualizedGrid/index.ts b/frontend/src/metabase/common/components/VirtualizedGrid/index.ts
index 0146d2a4210..1fa523e2477 100644
--- a/frontend/src/metabase/common/components/VirtualizedGrid/index.ts
+++ b/frontend/src/metabase/common/components/VirtualizedGrid/index.ts
@@ -1 +1,2 @@
export { VirtualizedGrid } from "./VirtualizedGrid";
+export type { GridItemOrder } from "./VirtualizedGrid";