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
Sever visualizer, custom-viz and data-grid edges (#79355)
Fraser644d271c6dff
diff --git a/frontend/lint/shared-tiers.mjs b/frontend/lint/shared-tiers.mjsindex a030e8a781c..d218279729a 100644--- a/frontend/lint/shared-tiers.mjs+++ b/frontend/lint/shared-tiers.mjs@@ -44,12 +44,14 @@ const SHARED_UTILS_LEVELS = [];const SHARED_PLATFORM_LEVELS = [- // P0 — independent peers: chart rendering and database metadata/forms.+ // P0 — the data grid, a rendering primitive visualizations builds on.+ ["shared/data-grid"],+ // P1 — independent peers: chart rendering and database metadata/forms.["shared/visualizations", "shared/databases"],- // P1 — query editing and subscription editing compose visualizations;+ // P2 — query editing and subscription editing compose visualizations;// querying and pulse have no edges between them.["shared/querying", "shared/pulse"],- // P2 — building blocks over querying; mutually independent.+ // P3 — building blocks over querying; mutually independent.["shared/metadata", "shared/parameters", "shared/questions"],];@@ -57,7 +59,6 @@ const SHARED_DOMAIN = ["shared/actions","shared/comments","shared/custom-viz",- "shared/data-grid","shared/detail-view","shared/metabot","shared/metrics-ui",@@ -118,15 +119,6 @@ const sharedRules = [...TIERED_SHARED.map((type) => ({ from: [type], allow: [type] })),// Transitional clusters: these domain modules still import each other, so both ways are allowed.// Delete each entry once the imports are one-directional.- {- from: ["shared/visualizations"],- allow: [- "shared/custom-viz",- "shared/data-grid",- "shared/static-viz",- "shared/visualizer",- ],- },{from: ["shared/metabot", "shared/rich_text_editing", "shared/comments"],allow: ["shared/metabot", "shared/rich_text_editing", "shared/comments"],diff --git a/frontend/src/metabase-types/api/custom-viz-plugin.ts b/frontend/src/metabase-types/api/custom-viz-plugin.tsindex 9be7b932c6e..35fe03d477e 100644--- a/frontend/src/metabase-types/api/custom-viz-plugin.ts+++ b/frontend/src/metabase-types/api/custom-viz-plugin.ts@@ -53,6 +53,25 @@ export type CustomVizPluginWarning =current_version: string;};+/**+ * Handle returned by a custom widget's mount call.+ * Mirrors `WidgetMountHandle` in the custom-viz plugin sdk, and the two copies must stay structurally identical.+ */+export type WidgetMountHandle<TProps> = {+ update(props: TProps): void;+ unmount(): void;+};++/**+ * Mount adapter for a custom-component setting widget: the host gives the plugin a container element,+ * and the plugin renders into it with its own React instance.+ * Mirrors `WidgetMount` in the custom-viz plugin sdk, and the two copies must stay structurally identical.+ */+export type WidgetMount<TProps = Record<string, unknown>> = (+ container: Element,+ initialProps: TProps,+) => WidgetMountHandle<TProps>;+export interface CreateCustomVizPluginRequest {file: File;}diff --git a/frontend/src/metabase/common/components/CopyButton/CopyButton.tsx b/frontend/src/metabase/common/components/CopyButton/CopyButton.tsxindex 21db04b9dfe..595c8a4859b 100644--- a/frontend/src/metabase/common/components/CopyButton/CopyButton.tsx+++ b/frontend/src/metabase/common/components/CopyButton/CopyButton.tsx@@ -3,9 +3,9 @@ import cx from "classnames";import { useCallback } from "react";import { t } from "ttag";-import { isPlainKey } from "metabase/common/utils/keyboard";import Styles from "metabase/css/core/index.css";import { Icon, Text, Tooltip } from "metabase/ui";+import { isPlainKey } from "metabase/utils/keyboard";import CopyButtonStyles from "./CopyButton.module.css";diff --git a/frontend/src/metabase/common/utils/keyboard.ts b/frontend/src/metabase/common/utils/keyboard.tsdeleted file mode 100644index c61cb18fe36..00000000000--- a/frontend/src/metabase/common/utils/keyboard.ts+++ /dev/null@@ -1,8 +0,0 @@-/** Returns true if e.key is the given key and no modifier keys (ctrl, meta, alt, shift) were pressed */-export const isPlainKey = (e: React.KeyboardEvent, key: string) => {- return e.key === key && !e.ctrlKey && !e.metaKey && !e.altKey && !e.shiftKey;-};--export const hasModifierKeys = (e: React.MouseEvent) => {- return e.shiftKey || e.ctrlKey || e.metaKey || e.altKey;-};diff --git a/frontend/src/metabase/dashboard/components/DashCard/DashCardVisualization.tsx b/frontend/src/metabase/dashboard/components/DashCard/DashCardVisualization.tsxindex 05e8fe4c093..3bcda27bb60 100644--- a/frontend/src/metabase/dashboard/components/DashCard/DashCardVisualization.tsx+++ b/frontend/src/metabase/dashboard/components/DashCard/DashCardVisualization.tsx@@ -38,9 +38,13 @@ import {} from "metabase/visualizations/components/legend/LegendCaption";import { extendCardWithDashcardSettings } from "metabase/visualizations/lib/settings/typed-utils";import { getComputedSettingsForSeries } from "metabase/visualizations/lib/settings/visualization";-import type { CardSlownessStatus } from "metabase/visualizations/types";+import type {+ CardSlownessStatus,+ ClickObject,+} from "metabase/visualizations/types";import {createDataSource,+ formatVisualizerClickObject,mergeVisualizerData,shouldSplitVisualizerSeries,splitVisualizerSeries,@@ -529,6 +533,18 @@ export function DashCardVisualization({dashcardId: dashcard.id,});+ // Visualizer cards render remapped columns,+ // so click objects must be mapped back to the columns of the underlying questions before computing actions.+ const transformClickObject = useMemo(() => {+ if (!isVisualizerDashboardCard(dashcard) || !rawSeries) {+ return undefined;+ }+ const { columnValuesMapping } =+ dashcard.visualization_settings.visualization;+ return (clicked: ClickObject) =>+ formatVisualizerClickObject(clicked, rawSeries, columnValuesMapping);+ }, [dashcard, rawSeries]);+const renderLoadingView = (loadingViewProps: LoadingViewProps) => (<DashCardLoadingView {...loadingViewProps} display={question?.display()} />);@@ -574,6 +590,7 @@ export function DashCardVisualization({actionButtons={actionButtons}replacementContent={visualizationOverlay}getExtraDataForClick={getExtraDataForClick}+ transformClickObject={transformClickObject}onUpdateVisualizationSettings={handleOnUpdateVisualizationSettings}onTogglePreviewing={onTogglePreviewing}onChangeCardAndRun={onChangeCardAndRun}diff --git a/frontend/src/metabase/data-grid/components/DataGrid/DataGrid.tsx b/frontend/src/metabase/data-grid/components/DataGrid/DataGrid.tsxindex 71161a5979e..23c4a627b9a 100644--- a/frontend/src/metabase/data-grid/components/DataGrid/DataGrid.tsx+++ b/frontend/src/metabase/data-grid/components/DataGrid/DataGrid.tsx@@ -9,8 +9,8 @@ import type React from "react";import { useCallback, useEffect, useState } from "react";import _ from "underscore";-import { useForceUpdate } from "metabase/common/hooks/use-force-update";import { getScrollBarSize } from "metabase/utils/dom";+import { useForceUpdate } from "metabase/utils/use-force-update";import {ADD_COLUMN_BUTTON_WIDTH,@@ -29,7 +29,7 @@ import type {import { AddColumnButton } from "../AddColumnButton/AddColumnButton";import { DataGridHeader } from "../DataGridHeader/DataGridHeader";import { DataGridRow } from "../DataGridRow/DataGridRow";-import { Footer } from "../Footer/Footer";+import { Footer, type FooterProps } from "../Footer/Footer";import S from "./DataGrid.module.css";import type { DataGridStylesProps } from "./types";@@ -38,11 +38,12 @@ export interface DataGridProps<TData>extends DataGridInstance<TData>, DataGridStylesProps {emptyState?: React.ReactNode;showRowsCount?: boolean;- rowsTruncated?: number;isColumnReorderingDisabled?: boolean;theme?: DataGridTheme;zoomedRowIndex?: number;tableFooterExtraButtons?: React.ReactNode;+ formatRowsCountMessage?: FooterProps<TData>["formatRowsCountMessage"];+ formatPaginationMessage?: FooterProps<TData>["formatPaginationMessage"];}export const DataGrid = function DataGrid<TData>({@@ -69,7 +70,8 @@ export const DataGrid = function DataGrid<TData>({onBodyCellClick,onWheel,tableFooterExtraButtons,- rowsTruncated,+ formatRowsCountMessage,+ formatPaginationMessage,onAddColumnClick,onHeaderCellClick,isColumnReorderingDisabled,@@ -327,10 +329,11 @@ export const DataGrid = function DataGrid<TData>({table={table}enablePagination={enablePagination}showRowsCount={showRowsCount}- rowsTruncated={rowsTruncated}style={styles?.footer}className={classNames?.footer}tableFooterExtraButtons={tableFooterExtraButtons}+ formatRowsCountMessage={formatRowsCountMessage}+ formatPaginationMessage={formatPaginationMessage}/></div></DndContext>diff --git a/frontend/src/metabase/data-grid/components/DataGridRow/DataGridRow.tsx b/frontend/src/metabase/data-grid/components/DataGridRow/DataGridRow.tsxindex 6aef2c720c9..cd3d41b0098 100644--- a/frontend/src/metabase/data-grid/components/DataGridRow/DataGridRow.tsx+++ b/frontend/src/metabase/data-grid/components/DataGridRow/DataGridRow.tsx@@ -2,7 +2,7 @@ import { flexRender } from "@tanstack/react-table";import cx from "classnames";import type React from "react";-import { hasModifierKeys } from "metabase/common/utils/keyboard";+import { hasModifierKeys } from "metabase/utils/keyboard";import type {DataGridColumnType,diff --git a/frontend/src/metabase/data-grid/components/Footer/Footer.tsx b/frontend/src/metabase/data-grid/components/Footer/Footer.tsxindex 7de5d75776e..acf0d9d5d58 100644--- a/frontend/src/metabase/data-grid/components/Footer/Footer.tsx+++ b/frontend/src/metabase/data-grid/components/Footer/Footer.tsx@@ -1,22 +1,29 @@import type { Table } from "@tanstack/react-table";import cx from "classnames";-import { msgid, ngettext } from "ttag";+import type { ReactNode } from "react";+import { msgid, ngettext, t } from "ttag";-import { useNumberFormatter } from "metabase/common/hooks/use-number-formatter";-import { getRowCountMessage } from "metabase/common/utils/get-row-count-message";import { FOOTER_HEIGHT } from "metabase/data-grid/constants";-import { PaginationFooter } from "metabase/visualizations/components/PaginationFooter/PaginationFooter";++import { PaginationFooter } from "../PaginationFooter/PaginationFooter";import S from "./Footer.module.css";+export interface PaginationMessageParams {+ start: number;+ end: number;+ total: number;+}+export interface FooterProps<TData> {table: Table<TData>;enablePagination?: boolean;showRowsCount?: boolean;- rowsTruncated?: number;style?: React.CSSProperties;className?: string;tableFooterExtraButtons?: React.ReactNode;+ formatRowsCountMessage?: (total: number) => ReactNode;+ formatPaginationMessage?: (params: PaginationMessageParams) => ReactNode;}export const Footer = <TData,>({@@ -26,9 +33,9 @@ export const Footer = <TData,>({className,style,tableFooterExtraButtons,- rowsTruncated,+ formatRowsCountMessage,+ formatPaginationMessage,}: FooterProps<TData>) => {- const formatNumber = useNumberFormatter();const wrapperAttributes = {"data-testid": "table-footer",className: cx(S.root, className),@@ -42,6 +49,9 @@ export const Footer = <TData,>({const start = pagination.pageIndex * pagination.pageSize;const end =Math.min((pagination.pageIndex + 1) * pagination.pageSize, total) - 1;+ const message = formatPaginationMessage+ ? formatPaginationMessage({ start, end, total })+ : t`Rows ${start + 1}-${end + 1} of ${total}`;return (<div {...wrapperAttributes}>{tableFooterExtraButtons}@@ -49,6 +59,7 @@ export const Footer = <TData,>({start={start}end={end}total={total}+ message={message}onPreviousPage={table.previousPage}onNextPage={table.nextPage}/>@@ -61,19 +72,9 @@ export const Footer = <TData,>({<div {...wrapperAttributes}>{tableFooterExtraButtons}<span className={S.rowsCount}>- {rowsTruncated !== undefined- ? getRowCountMessage(- {- data: { rows_truncated: rowsTruncated ?? 0 },- row_count: total,- },- formatNumber,- )- : ngettext(- msgid`${formatNumber(total)} row`,- `${formatNumber(total)} rows`,- total,- )}+ {formatRowsCountMessage+ ? formatRowsCountMessage(total)+ : ngettext(msgid`${total} row`, `${total} rows`, total)}</span></div>);diff --git a/frontend/src/metabase/data-grid/components/PaginationFooter/PaginationFooter.module.css b/frontend/src/metabase/data-grid/components/PaginationFooter/PaginationFooter.module.cssnew file mode 100644index 00000000000..d55a708a102--- /dev/null+++ b/frontend/src/metabase/data-grid/components/PaginationFooter/PaginationFooter.module.css@@ -0,0 +1,30 @@+.root {+ display: flex;+ flex-shrink: 0;+ align-items: center;+ margin-left: auto;+ text-align: right;+}++.message {+ font-weight: bold;+}++.button {+ padding-right: 0.5rem;+ color: var(--mb-color-text-primary);+ cursor: pointer;+}++.button:hover {+ color: var(--mb-color-core-brand);+}++.button:disabled {+ pointer-events: none;+ opacity: 0.4;+}++.previous {+ padding-left: 0.5rem;+}diff --git a/frontend/src/metabase/data-grid/components/PaginationFooter/PaginationFooter.tsx b/frontend/src/metabase/data-grid/components/PaginationFooter/PaginationFooter.tsxnew file mode 100644index 00000000000..0bd8a50b39d--- /dev/null+++ b/frontend/src/metabase/data-grid/components/PaginationFooter/PaginationFooter.tsx@@ -0,0 +1,79 @@+import cx from "classnames";+import type { MouseEvent, ReactNode } from "react";+import { forwardRef, useCallback } from "react";+import { t } from "ttag";++import DashboardS from "metabase/css/dashboard.module.css";+import { Icon } from "metabase/ui";++import S from "./PaginationFooter.module.css";++interface PaginationFooterProps {+ className?: string;+ "data-testid"?: string;+ start: number;+ end: number;+ total: number;+ message: ReactNode;+ onPreviousPage: () => void;+ onNextPage: () => void;+}++export const PaginationFooter = forwardRef<+ HTMLDivElement,+ PaginationFooterProps+>(function PaginationFooter(+ {+ className,+ "data-testid": dataTestId = "pagination-footer",+ start,+ end,+ total,+ message,+ onPreviousPage,+ onNextPage,+ }: PaginationFooterProps,+ ref,+) {+ const handlePreviousPage = useCallback(+ (event: MouseEvent) => {+ event.preventDefault();+ onPreviousPage();+ },+ [onPreviousPage],+ );++ const handleNextPage = useCallback(+ (event: MouseEvent) => {+ event.preventDefault();+ onNextPage();+ },+ [onNextPage],+ );++ return (+ <div+ className={cx(S.root, DashboardS.fullscreenNormalText, className)}+ data-testid={dataTestId}+ ref={ref}+ >+ <span className={S.message}>{message}</span>+ <button+ className={cx(S.button, S.previous)}+ aria-label={t`Previous page`}+ onClick={handlePreviousPage}+ disabled={start === 0}+ >+ <Icon name="chevronleft" />+ </button>+ <button+ className={S.button}+ aria-label={t`Next page`}+ onClick={handleNextPage}+ disabled={end + 1 >= total}+ >+ <Icon name="chevronright" />+ </button>+ </div>+ );+});diff --git a/frontend/src/metabase/data-grid/index.ts b/frontend/src/metabase/data-grid/index.tsindex e22bd8d7331..ff702ed6962 100644--- a/frontend/src/metabase/data-grid/index.ts+++ b/frontend/src/metabase/data-grid/index.ts@@ -3,5 +3,6 @@ export * from "./components/DataGrid/types";export * from "./components/BaseCell/BaseCell";export * from "./components/HeaderCell/HeaderCell";export * from "./components/BodyCell/BodyCell";+export { PaginationFooter } from "./components/PaginationFooter/PaginationFooter";export * from "./types";export * from "./hooks/use-data-grid-instance";diff --git a/frontend/src/metabase/documents/components/Editor/AnchorLinkMenu/AnchorLinkButton.tsx b/frontend/src/metabase/documents/components/Editor/AnchorLinkMenu/AnchorLinkButton.tsxindex af4d194a900..a7ee5e00b0c 100644--- a/frontend/src/metabase/documents/components/Editor/AnchorLinkMenu/AnchorLinkButton.tsx+++ b/frontend/src/metabase/documents/components/Editor/AnchorLinkMenu/AnchorLinkButton.tsx@@ -3,8 +3,8 @@ import type { ComponentPropsWithoutRef, ElementType } from "react";import { useCallback } from "react";import { t } from "ttag";-import { isPlainKey } from "metabase/common/utils/keyboard";import { Button, type ButtonProps, Icon, Text, Tooltip } from "metabase/ui";+import { isPlainKey } from "metabase/utils/keyboard";type Props<C extends ElementType = "button"> = ButtonProps & {url: string;diff --git a/frontend/src/metabase/explorations/components/ExplorationSidebar/ExplorationLastActivity.tsx b/frontend/src/metabase/explorations/components/ExplorationSidebar/ExplorationLastActivity.tsxindex 7af6a0b78f6..3513d877016 100644--- a/frontend/src/metabase/explorations/components/ExplorationSidebar/ExplorationLastActivity.tsx+++ b/frontend/src/metabase/explorations/components/ExplorationSidebar/ExplorationLastActivity.tsx@@ -1,8 +1,8 @@import { useInterval } from "react-use";import { getFormattedTime } from "metabase/common/components/DateTime/DateTime";-import { useForceUpdate } from "metabase/common/hooks/use-force-update";import { Text, Tooltip } from "metabase/ui";+import { useForceUpdate } from "metabase/utils/use-force-update";import { getCompactRelativeTime } from "./utils";diff --git a/frontend/src/metabase/plugins/oss/custom-viz.ts b/frontend/src/metabase/plugins/oss/custom-viz.tsindex cf4507278ac..6647532f871 100644--- a/frontend/src/metabase/plugins/oss/custom-viz.ts+++ b/frontend/src/metabase/plugins/oss/custom-viz.ts@@ -1,4 +1,3 @@-import type { WidgetMount } from "custom-viz";import type { ComponentType } from "react";import type { IconData } from "metabase/common/utils/icon";@@ -8,6 +7,7 @@ import type {CustomVizPluginId,CustomVizPluginRuntime,VisualizationDisplay,+ WidgetMount,} from "metabase-types/api";import { isCustomVizDisplay } from "metabase-types/guards";diff --git a/frontend/src/metabase/query_builder/containers/QueryBuilder.tsx b/frontend/src/metabase/query_builder/containers/QueryBuilder.tsxindex 932868759c0..9a4e67dd70b 100644--- a/frontend/src/metabase/query_builder/containers/QueryBuilder.tsx+++ b/frontend/src/metabase/query_builder/containers/QueryBuilder.tsx@@ -15,7 +15,6 @@ import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmMimport { isRouteInSync } from "metabase/common/hooks/is-route-in-sync";import { useCallbackEffect } from "metabase/common/hooks/use-callback-effect";import { useFavicon } from "metabase/common/hooks/use-favicon";-import { useForceUpdate } from "metabase/common/hooks/use-force-update";import { useLoadingTimer } from "metabase/common/hooks/use-loading-timer";import { useWebNotification } from "metabase/common/hooks/use-web-notification";import { usePageTitleWithLoadingTime } from "metabase/hooks/use-page-title";@@ -65,6 +64,7 @@ import {getUserIsAdmin,} from "metabase/selectors/user";import { getSetting } from "metabase/settings";+import { useForceUpdate } from "metabase/utils/use-force-update";import type { Series } from "metabase-types/api";import {diff --git a/frontend/src/metabase/rich_text_editing/tiptap/components/EditorBubbleMenu/EditorBubbleMenu.tsx b/frontend/src/metabase/rich_text_editing/tiptap/components/EditorBubbleMenu/EditorBubbleMenu.tsxindex 627752416e9..5a4fc9b762a 100644--- a/frontend/src/metabase/rich_text_editing/tiptap/components/EditorBubbleMenu/EditorBubbleMenu.tsx+++ b/frontend/src/metabase/rich_text_editing/tiptap/components/EditorBubbleMenu/EditorBubbleMenu.tsx@@ -6,8 +6,8 @@ import type React from "react";import { useEffect, useState } from "react";import { t } from "ttag";-import { useForceUpdate } from "metabase/common/hooks/use-force-update";import { Flex } from "metabase/ui";+import { useForceUpdate } from "metabase/utils/use-force-update";import { FormatButton } from "../FormatButton/FormatButton";diff --git a/frontend/src/metabase/utils/keyboard.ts b/frontend/src/metabase/utils/keyboard.tsindex 3628651d8b3..d2013efb85d 100644--- a/frontend/src/metabase/utils/keyboard.ts+++ b/frontend/src/metabase/utils/keyboard.ts@@ -15,3 +15,12 @@ export const KEYCODE_FORWARD_SLASH = 191;export const KEY_ESCAPE = "Escape";export const KEY_ENTER = "Enter";export const KEY_BACKSPACE = "Backspace";++/** Returns true if e.key is the given key and no modifier keys (ctrl, meta, alt, shift) were pressed */+export const isPlainKey = (e: React.KeyboardEvent, key: string) => {+ return e.key === key && !e.ctrlKey && !e.metaKey && !e.altKey && !e.shiftKey;+};++export const hasModifierKeys = (e: React.MouseEvent) => {+ return e.shiftKey || e.ctrlKey || e.metaKey || e.altKey;+};diff --git a/frontend/src/metabase/common/hooks/use-force-update.ts b/frontend/src/metabase/utils/use-force-update.tssimilarity index 100%rename from frontend/src/metabase/common/hooks/use-force-update.tsrename to frontend/src/metabase/utils/use-force-update.tsdiff --git a/frontend/src/metabase/visualizations/components/ChartSettingsWidget.tsx b/frontend/src/metabase/visualizations/components/ChartSettingsWidget.tsxindex 844cafb67d9..dc2bbf84e53 100644--- a/frontend/src/metabase/visualizations/components/ChartSettingsWidget.tsx+++ b/frontend/src/metabase/visualizations/components/ChartSettingsWidget.tsx@@ -1,10 +1,10 @@import cx from "classnames";-import type { WidgetMount } from "custom-viz";import type { CSSProperties, ComponentType } from "react";import FormS from "metabase/css/components/form.module.css";import { PLUGIN_CUSTOM_VIZ } from "metabase/plugins";import { Box, Group, Icon, Text, Tooltip } from "metabase/ui";+import type { WidgetMount } from "metabase-types/api";import S from "./ChartSettingsWidget.module.css";diff --git a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetail.tsx b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetail.tsxindex 3d8de356969..0311ed6641f 100644--- a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetail.tsx+++ b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetail.tsx@@ -1,13 +1,20 @@import { useEffect, useState } from "react";+import { t } from "ttag";+import { PaginationFooter } from "metabase/data-grid";import Question from "metabase-lib/v1/Question";--import { PaginationFooter } from "../PaginationFooter/PaginationFooter";+import { HARD_ROW_LIMIT } from "metabase-lib/v1/queries/utils";import S from "./ObjectDetail.module.css";import { ObjectDetailPanel } from "./ObjectDetailPanel";import type { ObjectDetailProps } from "./types";+function getItemMessage(index: number, total: number) {+ return total >= HARD_ROW_LIMIT+ ? t`Item ${index + 1} of first ${total}`+ : t`Item ${index + 1} of ${total}`;+}+export function ObjectDetail({question,isDataApp,@@ -51,9 +58,9 @@ export function ObjectDetail({start={currentObjectIndex}end={currentObjectIndex}total={data.rows.length}+ message={getItemMessage(currentObjectIndex, data.rows.length)}onNextPage={() => setCurrentObjectIndex((prev) => prev + 1)}onPreviousPage={() => setCurrentObjectIndex((prev) => prev - 1)}- singleItem/>)}</>diff --git a/frontend/src/metabase/visualizations/components/PaginationFooter/PaginationFooter.styled.tsx b/frontend/src/metabase/visualizations/components/PaginationFooter/PaginationFooter.styled.tsxdeleted file mode 100644index 94deee72dbb..00000000000--- a/frontend/src/metabase/visualizations/components/PaginationFooter/PaginationFooter.styled.tsx+++ /dev/null@@ -1,36 +0,0 @@-// eslint-disable-next-line no-restricted-imports-import { css } from "@emotion/react";-// eslint-disable-next-line no-restricted-imports-import styled from "@emotion/styled";--export const PaginationFooterRoot = styled.div`- display: flex;- flex-shrink: 0;- align-items: center;- margin-left: auto;- text-align: right;-`;--export const PaginationMessage = styled.span`- font-weight: bold;-`;--export const PaginationButton = styled.button<{- direction: "next" | "previous";-}>`- padding-left: ${(props) =>- props.direction === "previous" ? "0.5rem" : "unset"};- padding-right: 0.5rem;- cursor: pointer;-- &:hover {- color: var(--mb-color-core-brand);- }-- ${(props) =>- props.disabled &&- css`- pointer-events: none;- opacity: 0.4;- `}-`;diff --git a/frontend/src/metabase/visualizations/components/PaginationFooter/PaginationFooter.tsx b/frontend/src/metabase/visualizations/components/PaginationFooter/PaginationFooter.tsxdeleted file mode 100644index 4e20b54ec32..00000000000--- a/frontend/src/metabase/visualizations/components/PaginationFooter/PaginationFooter.tsx+++ /dev/null@@ -1,105 +0,0 @@-import cx from "classnames";-import type { MouseEvent } from "react";-import { forwardRef, useCallback, useMemo } from "react";-import { t } from "ttag";--import { useNumberFormatter } from "metabase/common/hooks/use-number-formatter";-import CS from "metabase/css/core/index.css";-import DashboardS from "metabase/css/dashboard.module.css";-import { Icon } from "metabase/ui";-import { HARD_ROW_LIMIT } from "metabase-lib/v1/queries/utils";--import {- PaginationButton,- PaginationFooterRoot,- PaginationMessage,-} from "./PaginationFooter.styled";--interface PaginationFooterProps {- className?: string;- "data-testid"?: string;- start: number;- end: number;- total: number;- limit?: number;- onPreviousPage: () => void;- onNextPage: () => void;- singleItem?: boolean;-}--export const PaginationFooter = forwardRef<- HTMLDivElement,- PaginationFooterProps->(function ObjectDetailFooter(- {- className,- "data-testid": dataTestId = "ObjectDetailFooter",- start,- end,- limit,- total,- onPreviousPage,- onNextPage,- singleItem,- }: PaginationFooterProps,- ref,-) {- const formatNumber = useNumberFormatter();- const paginateMessage = useMemo(() => {- const isOverLimit = limit === undefined && total >= HARD_ROW_LIMIT;-- if (singleItem) {- return isOverLimit- ? t`Item ${start + 1} of first ${total}`- : t`Item ${start + 1} of ${total}`;- }-- return isOverLimit- ? t`Rows ${start + 1}-${end + 1} of first ${formatNumber(total)}`- : t`Rows ${start + 1}-${end + 1} of ${formatNumber(total)}`;- }, [total, start, end, limit, singleItem, formatNumber]);-- const handlePreviousPage = useCallback(- (event: MouseEvent) => {- event.preventDefault();- onPreviousPage();- },- [onPreviousPage],- );-- const handleNextPage = useCallback(- (event: MouseEvent) => {- event.preventDefault();- onNextPage();- },- [onNextPage],- );-- return (- <PaginationFooterRoot- className={cx(className, DashboardS.fullscreenNormalText)}- data-testid={dataTestId}- ref={ref}- >- <PaginationMessage>{paginateMessage}</PaginationMessage>- <PaginationButton- className={CS.textPrimary}- aria-label={t`Previous page`}- direction="previous"- onClick={handlePreviousPage}- disabled={start === 0}- >- <Icon name="chevronleft" />- </PaginationButton>- <PaginationButton- className={CS.textPrimary}- aria-label={t`Next page`}- direction="next"- onClick={handleNextPage}- disabled={end + 1 >= total}- >- <Icon name="chevronright" />- </PaginationButton>- </PaginationFooterRoot>- );-});diff --git a/frontend/src/metabase/visualizations/components/TableInteractive/TableInteractive.tsx b/frontend/src/metabase/visualizations/components/TableInteractive/TableInteractive.tsxindex a40e9111692..be7ee0b3411 100644--- a/frontend/src/metabase/visualizations/components/TableInteractive/TableInteractive.tsx+++ b/frontend/src/metabase/visualizations/components/TableInteractive/TableInteractive.tsx@@ -14,13 +14,15 @@ import {useRef,useState,} from "react";-import { t } from "ttag";+import { msgid, ngettext, t } from "ttag";import _ from "underscore";import { ErrorMessage } from "metabase/common/components/ErrorMessage";import { ExplicitSize } from "metabase/common/components/ExplicitSize";import { ExternalLink } from "metabase/common/components/ExternalLink";import { useMemoizedCallback } from "metabase/common/hooks/use-memoized-callback";+import { useNumberFormatter } from "metabase/common/hooks/use-number-formatter";+import { getRowCountMessage } from "metabase/common/utils/get-row-count-message";import { useTranslateContent } from "metabase/content-translation/hooks";import DashboardS from "metabase/css/dashboard.module.css";import { DataGrid, type DataGridStylesProps } from "metabase/data-grid";@@ -59,6 +61,7 @@ import type {} from "metabase/visualizations/types";import type { ClickObject, OrderByDirection } from "metabase-lib";import type Question from "metabase-lib/v1/Question";+import { HARD_ROW_LIMIT } from "metabase-lib/v1/queries/utils";import { isFK, isID, isPK, isString } from "metabase-lib/v1/types/utils/isa";import type {ColumnSettings,@@ -756,6 +759,31 @@ export const TableInteractiveInner = forwardRef(function TableInteractiveInner(return isDashcardViewTable || isEmbeddingSdk ? width : undefined;}, [isDashcardViewTable, isEmbeddingSdk, width]);+ const formatNumber = useNumberFormatter();++ const formatRowsCountMessage = useCallback(+ (total: number) =>+ data.rows_truncated != null+ ? getRowCountMessage(+ { data: { rows_truncated: data.rows_truncated }, row_count: total },+ formatNumber,+ )+ : ngettext(+ msgid`${formatNumber(total)} row`,+ `${formatNumber(total)} rows`,+ total,+ ),+ [data.rows_truncated, formatNumber],+ );++ const formatPaginationMessage = useCallback(+ ({ start, end, total }: { start: number; end: number; total: number }) =>+ total >= HARD_ROW_LIMIT+ ? t`Rows ${start + 1}-${end + 1} of first ${formatNumber(total)}`+ : t`Rows ${start + 1}-${end + 1} of ${formatNumber(total)}`,+ [formatNumber],+ );+const pinnedLeftColumnsCount = useMemo<number | undefined>(() => {if (isPivoted || !settings["table.freeze_columns"]) {return undefined;@@ -868,7 +896,8 @@ export const TableInteractiveInner = forwardRef(function TableInteractiveInner({...tableProps}styles={dataGridStyles}showRowsCount={isDashboard}- rowsTruncated={data.rows_truncated}+ formatRowsCountMessage={formatRowsCountMessage}+ formatPaginationMessage={formatPaginationMessage}isColumnReorderingDisabled={isColumnReorderingDisabled}emptyState={emptyState}zoomedRowIndex={zoomedRowIndex}diff --git a/frontend/src/metabase/visualizations/components/Visualization/Visualization.tsx b/frontend/src/metabase/visualizations/components/Visualization/Visualization.tsxindex 2999a0ede55..6d9cd9a1260 100644--- a/frontend/src/metabase/visualizations/components/Visualization/Visualization.tsx+++ b/frontend/src/metabase/visualizations/components/Visualization/Visualization.tsx@@ -64,7 +64,6 @@ import {isClickActionsMode,isRegularClickAction,} from "metabase/visualizations/types";-import { formatVisualizerClickObject } from "metabase/visualizer/utils";import Question from "metabase-lib/v1/Question";import type Metadata from "metabase-lib/v1/metadata/Metadata";import type {@@ -459,17 +458,14 @@ class Visualization extends PureComponent<getExtraDataForClick: (clicked: ClickObject | null,) => Record<string, unknown> = () => ({}),+ transformClickObject?: (clicked: ClickObject) => ClickObject,) {if (!clickedObject) {return [];}- const clicked = isVisualizerDashboardCard(dashcard)- ? formatVisualizerClickObject(- clickedObject,- visualizerRawSeries,- dashcard.visualization_settings.visualization.columnValuesMapping,- )+ const clicked = transformClickObject+ ? transformClickObject(clickedObject): clickedObject;const card = Visualization.findCardById(@@ -532,6 +528,7 @@ class Visualization extends PureComponent<visualizerRawSeries,isRawTable,getExtraDataForClick,+ transformClickObject,} = this.props;const { computedSettings } = this.state;@@ -546,6 +543,7 @@ class Visualization extends PureComponent<visualizerRawSeries,isRawTable,getExtraDataForClick,+ transformClickObject,);}diff --git a/frontend/src/metabase/visualizations/lib/series.ts b/frontend/src/metabase/visualizations/lib/series.tsindex 0eb4af8f225..4c6261acb99 100644--- a/frontend/src/metabase/visualizations/lib/series.ts+++ b/frontend/src/metabase/visualizations/lib/series.ts@@ -29,6 +29,19 @@ export const getSeriesWithDisplay = (card: { ...series.card, display },}));+// The split series of a visualizer card get synthetic negative card ids, so they can't collide with real card ids.+// The id encodes the series position.+export function getVisualizerSeriesCardId(seriesIndex: number) {+ return -(seriesIndex + 1);+}++export function getVisualizerSeriesCardIndex(cardId?: number) {+ if (!cardId) {+ return 0;+ }+ return -cardId - 1;+}+export const createRawSeries = (options: {card: Card;queryResult: any;diff --git a/frontend/src/metabase/visualizations/types/visualization.ts b/frontend/src/metabase/visualizations/types/visualization.tsindex fbc6b9ab92b..2caf93f8b9b 100644--- a/frontend/src/metabase/visualizations/types/visualization.ts+++ b/frontend/src/metabase/visualizations/types/visualization.ts@@ -264,6 +264,12 @@ export type VisualizationPassThroughProps = {totalNumGridCols?: number;onTogglePreviewing?: () => void;+ /**+ * Maps a click object to the one click actions should be computed for,+ * supplied for visualizer cards whose rendered columns are remapped from the underlying questions.+ */+ transformClickObject?: (clicked: ClickObject) => ClickObject;+showAllLegendItems?: boolean;onHeaderColumnReorder?: (columnIndex: number) => void;diff --git a/frontend/src/metabase/visualizations/visualizations/CartesianChart/use-chart-events.ts b/frontend/src/metabase/visualizations/visualizations/CartesianChart/use-chart-events.tsindex b91baadd692..0b24fe3438b 100644--- a/frontend/src/metabase/visualizations/visualizations/CartesianChart/use-chart-events.ts+++ b/frontend/src/metabase/visualizations/visualizations/CartesianChart/use-chart-events.ts@@ -36,9 +36,10 @@ import {getSeriesClickData,getSeriesHovered,} from "metabase/visualizations/visualizations/CartesianChart/events";-import { getVisualizerSeriesCardIndex } from "metabase/visualizer/utils";import type { CardId } from "metabase-types/api";+import { getVisualizerSeriesCardIndex } from "../../lib/series";+import type { CartesianHoveredObject } from "./types";import { useBrush } from "./use-brush";import { useTooltipMouseLeave } from "./use-tooltip-mouse-leave";diff --git a/frontend/src/metabase/visualizer/utils/split-series.ts b/frontend/src/metabase/visualizer/utils/split-series.tsindex 1875277688c..2501a08ccd4 100644--- a/frontend/src/metabase/visualizer/utils/split-series.ts+++ b/frontend/src/metabase/visualizer/utils/split-series.ts@@ -2,6 +2,7 @@ import _ from "underscore";import { isNotNull } from "metabase/utils/types";import { isCartesianChart } from "metabase/visualizations";+import { getVisualizerSeriesCardId } from "metabase/visualizations/lib/series";import type {RawSeries,VisualizerColumnValueSource,@@ -118,14 +119,3 @@ export function splitVisualizerSeries(}).filter(isNotNull) as RawSeries;}--function getVisualizerSeriesCardId(seriesIndex: number) {- return -(seriesIndex + 1);-}--export function getVisualizerSeriesCardIndex(cardId?: number) {- if (!cardId) {- return 0;- }- return -cardId - 1;-}