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
Allow grid columns in Detail visualization to grow and shrink (#70964)
Kevin Kelleher43ab4dbb8dad
diff --git a/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_Card_Visualizations_Dark_Theme.png b/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_Card_Visualizations_Dark_Theme.pngindex 322270907f1..8496974fd0d 100644Binary files a/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_Card_Visualizations_Dark_Theme.png and b/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_Card_Visualizations_Dark_Theme.png differdiff --git a/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_Card_Visualizations_Light_Theme.png b/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_Card_Visualizations_Light_Theme.pngindex 2153c848cf7..53830114825 100644Binary files a/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_Card_Visualizations_Light_Theme.png and b/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_Card_Visualizations_Light_Theme.png differdiff --git a/bun.lock b/bun.lockindex 664aabdb5d6..ab0c08697ae 100644--- a/bun.lock+++ b/bun.lock@@ -103,7 +103,6 @@"hast-util-to-html": "^9.0.0","history": "3","html2canvas-pro": "^2.0.2",- "humanize-plus": "^1.8.1","icepick": "2.4.0","iframe-resizer": "~4.3.2","immer": "^10.1.1",@@ -239,7 +238,6 @@"@types/glob": "^7.1.4","@types/hast": "^3.0.2","@types/history": "3.2.5",- "@types/humanize-plus": "^1.8.0","@types/icepick": "2.3.0","@types/iframe-resizer": "^3.5.9","@types/inflection": "^1.13.0",@@ -1736,8 +1734,6 @@"@types/http-proxy": ["@types/[email protected]", "", { "dependencies": { "@types/node": "*" } }, "sha512-5kPLG5BKpWYkw/LVOGWpiq3nEVqxiN32rTgI53Sk12/xHFQ2rG3ehI9IO+O3W2QoKeyB92dJkoka8SUm6BX1pA=="],- "@types/humanize-plus": ["@types/[email protected]", "", {}, "sha512-c7QNInYzgvbrNZvbwI/iYvHDTik/GqONxAvRUqwYF0AjgycoiyELrRR3RrILGXdZcaLt6Y+ds0+gSRQFzc71IQ=="],-"@types/icepick": ["@types/[email protected]", "", {}, "sha512-1NjupwGyCzA0tJoIu+Sm2OyGNoi8wsg5UkJSoEwK+QWWz67b17oOxQObV6Md+LbFRnevfCaTfzccHAv8h0+IfQ=="],"@types/iframe-resizer": ["@types/[email protected]", "", {}, "sha512-RQUBI75F+uXruB95BFpC/8V8lPgJg4MQ6HxOCtAZYBB/h0FNCfrFfb4I+u2pZJIV7sKeszZbFqy1UnGeBMrvsA=="],@@ -3302,8 +3298,6 @@"humanize-duration": ["[email protected]", "", {}, "sha512-inh5wue5XdfObhu/IGEMiA1nUXigSGcaKNemcbLRKa7jXYGDZXr3LoT9pTIzq2hPEbld7w/qv9h+ikWGz8fL1g=="],- "humanize-plus": ["[email protected]", "", {}, "sha1-pls0RZrWNnrbs3B6gqPJ+RYWcDA="],-"husky": ["[email protected]", "", { "bin": { "husky": "bin.js" } }, "sha512-5gs5ytaNjBrh5Ow3zrvdUUY+0VxIuWVL4i9irt6friV+BqdCfmV11CQTWMiBYWHbXhco+J1kHfTOUkePhCDvMA=="],"hyphenate-style-name": ["[email protected]", "", {}, "sha512-ygGZLjmXfPHj+ZWh6LwbC37l43MhfztxetbFCoYTM2VjkIUpeHgSNn7QIyVFj7YQ1Wl9Cbw5sholVJPzWvC2MQ=="],diff --git a/frontend/src/metabase/visualizations/components/ObjectDetail/ExpandableString.tsx b/frontend/src/metabase/visualizations/components/ObjectDetail/ExpandableString.tsxindex 55edfeb8d1d..9ca041318a2 100644--- a/frontend/src/metabase/visualizations/components/ObjectDetail/ExpandableString.tsx+++ b/frontend/src/metabase/visualizations/components/ObjectDetail/ExpandableString.tsx@@ -1,5 +1,4 @@import cx from "classnames";-import Humanize from "humanize-plus";import { type MouseEvent, useState } from "react";import { t } from "ttag";@@ -17,7 +16,7 @@ export function ExpandableString({ str, length = 140 }: ExpandableStringProps) {return null;}- const truncated = Humanize.truncate(str, length);+ const truncated = truncate(str, length);const toggleExpansion = (event: MouseEvent) => {event.stopPropagation();@@ -48,3 +47,11 @@ export function ExpandableString({ str, length = 140 }: ExpandableStringProps) {return <span>{str}</span>;}}++// inlined from humanize-plus+function truncate(str: string, length = 100, ending = "...") {+ if (str.length > length) {+ return str.substring(0, length - ending.length) + ending;+ }+ return str;+}diff --git a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetail.unit.spec.tsx b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetail.unit.spec.tsxindex c5dc7a73a24..44be513be2a 100644--- a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetail.unit.spec.tsx+++ b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetail.unit.spec.tsx@@ -111,6 +111,7 @@ function setup({ hideOrdersTable = false }: SetupOpts = {}) {isObjectDetailonVisualizationClick={jest.fn()}visualizationIsClickable={jest.fn()}+ isDashboard={false}/>,{storeInitialState: state,diff --git a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailBody.tsx b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailBody.tsxindex e872a79c88a..5ca85268d1d 100644--- a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailBody.tsx+++ b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailBody.tsx@@ -14,6 +14,7 @@ export interface ObjectDetailBodyProps {settings: VisualizationSettings;onVisualizationClick: OnVisualizationClickType;visualizationIsClickable: (clicked: unknown) => boolean;+ isDashboard: boolean;}export function ObjectDetailBody({@@ -22,6 +23,7 @@ export function ObjectDetailBody({settings,onVisualizationClick,visualizationIsClickable,+ isDashboard,}: ObjectDetailBodyProps): JSX.Element {return (<ObjectDetailBodyWrapper>@@ -31,6 +33,7 @@ export function ObjectDetailBody({settings={settings}onVisualizationClick={onVisualizationClick}visualizationIsClickable={visualizationIsClickable}+ isDashboard={isDashboard}/></ObjectDetailBodyWrapper>);diff --git a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailBody.unit.spec.tsx b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailBody.unit.spec.tsxindex f681b383a01..226d33bdc19 100644--- a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailBody.unit.spec.tsx+++ b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailBody.unit.spec.tsx@@ -14,6 +14,7 @@ describe("ObjectDetailBody", () => {}}onVisualizationClick={() => null}visualizationIsClickable={() => false}+ isDashboard={false}/>,);diff --git a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailView.tsx b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailView.tsxindex 62182e1d78d..075c1684f40 100644--- a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailView.tsx+++ b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailView.tsx@@ -88,6 +88,7 @@ export function ObjectDetailView({viewNextObjectDetail,closeObjectDetail,className,+ isDashboard,}: ObjectDetailProps): JSX.Element | null {const [hasNotFoundError, setHasNotFoundError] = useState(false);const [maybeLoading, setMaybeLoading] = useState(false);@@ -355,6 +356,7 @@ export function ObjectDetailView({settings={settings}onVisualizationClick={onVisualizationClick}visualizationIsClickable={visualizationIsClickable}+ isDashboard={isDashboard}/></ObjectDetailWrapperDiv>)}diff --git a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailView.unit.spec.tsx b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailView.unit.spec.tsxindex b8f2d79468d..6b94dce6b29 100644--- a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailView.unit.spec.tsx+++ b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailView.unit.spec.tsx@@ -266,6 +266,7 @@ function setup(viewPreviousObjectDetail={() => null}viewNextObjectDetail={() => null}closeObjectDetail={() => null}+ isDashboard={false}{...options}/>,);diff --git a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailWrapper.unit.spec.tsx b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailWrapper.unit.spec.tsxindex a357d294da8..7356c5826bc 100644--- a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailWrapper.unit.spec.tsx+++ b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailWrapper.unit.spec.tsx@@ -74,6 +74,7 @@ async function setup(options?: Partial<ObjectDetailProps>) {viewPreviousObjectDetail={() => null}viewNextObjectDetail={() => null}closeObjectDetail={() => null}+ isDashboard={false}{...options}/>,{ storeInitialState: state },diff --git a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailsTable.styled.tsx b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailsTable.styled.tsxindex a26c2567d58..2130d430181 100644--- a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailsTable.styled.tsx+++ b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailsTable.styled.tsx@@ -1,29 +1,6 @@// eslint-disable-next-line no-restricted-importsimport styled from "@emotion/styled";-export const ObjectDetailsTable = styled.div`- overflow-y: auto;- flex: 1;- padding: 2rem;-`;--type GridContainerProps = { cols?: number };--export const GridContainer = styled.div<GridContainerProps>`- display: grid;- grid-template-columns: repeat(${(props) => props.cols || 2}, minmax(0, 1fr));- gap: 1rem;-`;--interface GridItemProps {- colSpan?: number;-}--export const GridCell = styled.div<GridItemProps>`- grid-column: span ${(props) => props.colSpan || 1} / span- ${(props) => props.colSpan || 1};-`;-export const FitImage = styled.img`max-width: 100%;max-height: 18rem;diff --git a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailsTable.tsx b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailsTable.tsxindex 76df84f152f..98a92f11748 100644--- a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailsTable.tsx+++ b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailsTable.tsx@@ -8,6 +8,7 @@ import { EmptyState } from "metabase/common/components/EmptyState";import CS from "metabase/css/core/index.css";import QueryBuilderS from "metabase/css/query_builder.module.css";import { displayNameForColumn, formatValue } from "metabase/lib/formatting";+import { Box } from "metabase/ui";import type { ClickObject } from "metabase-lib";import { findColumnIndexesForColumnSettings } from "metabase-lib/v1/queries/utils/dataset";import { TYPE } from "metabase-lib/v1/types/constants";@@ -24,12 +25,7 @@ import type {} from "metabase-types/api";import { ExpandableString } from "./ExpandableString";-import {- FitImage,- GridCell,- GridContainer,- ObjectDetailsTable,-} from "./ObjectDetailsTable.styled";+import { FitImage } from "./ObjectDetailsTable.styled";import type { OnVisualizationClickType } from "./types";export interface DetailsTableCellProps {@@ -139,6 +135,7 @@ export interface DetailsTableProps {settings: VisualizationSettings;onVisualizationClick: OnVisualizationClickType;visualizationIsClickable: (clicked: unknown) => boolean;+ isDashboard: boolean;}export function DetailsTable({@@ -147,6 +144,7 @@ export function DetailsTable({settings,onVisualizationClick,visualizationIsClickable,+ isDashboard,}: DetailsTableProps): JSX.Element {const columnSettings = settings["table.columns"];@@ -182,51 +180,57 @@ export function DetailsTable({}return (- <ObjectDetailsTable>- <GridContainer cols={3}>+ <Box+ flex={1}+ p={isDashboard ? "0.5rem 1rem" : "2rem"}+ style={{ overflowY: "auto" }}+ >+ <Box+ display="grid"+ style={{+ gridTemplateColumns: "repeat(2, minmax(0, auto))",+ gap: "1rem",+ }}+ >{cols.map((column, columnIndex) => {const columnValue = row[columnIndex];return (<Fragment key={columnIndex}>- <GridCell>- <DetailsTableCell- column={column}- value={row[columnIndex] ?? t`Empty`}- isColumnName- settings={settings}- className={cx(CS.textBold, CS.textSecondary)}- onVisualizationClick={onVisualizationClick}- visualizationIsClickable={visualizationIsClickable}- />- </GridCell>- <GridCell colSpan={2}>- <DetailsTableCell- column={column}- value={columnValue}- isColumnName={false}- settings={settings}- clicked={{- value: columnValue,- column,- settings,- origin: { row, cols },- data: clickedData,- }}- className={cx(- CS.textBold,- CS.textPrimary,- CS.textSpaced,- CS.textWrap,- )}- onVisualizationClick={onVisualizationClick}- visualizationIsClickable={visualizationIsClickable}- />- </GridCell>+ <DetailsTableCell+ column={column}+ value={row[columnIndex] ?? t`Empty`}+ isColumnName+ settings={settings}+ className={cx(CS.textBold, CS.textSecondary)}+ onVisualizationClick={onVisualizationClick}+ visualizationIsClickable={visualizationIsClickable}+ />+ <DetailsTableCell+ column={column}+ value={columnValue}+ isColumnName={false}+ settings={settings}+ clicked={{+ value: columnValue,+ column,+ settings,+ origin: { row, cols },+ data: clickedData,+ }}+ className={cx(+ CS.textBold,+ CS.textPrimary,+ CS.textSpaced,+ CS.textWrap,+ )}+ onVisualizationClick={onVisualizationClick}+ visualizationIsClickable={visualizationIsClickable}+ /></Fragment>);})}- </GridContainer>- </ObjectDetailsTable>+ </Box>+ </Box>);}diff --git a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailsTable.unit.spec.tsx b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailsTable.unit.spec.tsxindex 0a39a03af19..c2ddb116f30 100644--- a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailsTable.unit.spec.tsx+++ b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailsTable.unit.spec.tsx@@ -104,6 +104,7 @@ describe("ObjectDetailsTable", () => {settings={{column: () => null,}}+ isDashboard={false}/>,);@@ -124,6 +125,7 @@ describe("ObjectDetailsTable", () => {settings={{column: () => null,}}+ isDashboard={false}/>,);@@ -144,6 +146,7 @@ describe("ObjectDetailsTable", () => {settings={{column: () => null,}}+ isDashboard={false}/>,);@@ -162,6 +165,7 @@ describe("ObjectDetailsTable", () => {settings={{column: () => null,}}+ isDashboard={false}/>,);@@ -180,6 +184,7 @@ describe("ObjectDetailsTable", () => {onVisualizationClick={() => null}visualizationIsClickable={() => false}settings={{}}+ isDashboard={false}/>,);@@ -195,6 +200,7 @@ describe("ObjectDetailsTable", () => {onVisualizationClick={() => null}visualizationIsClickable={() => false}settings={{}}+ isDashboard={false}/>,);diff --git a/frontend/src/metabase/visualizations/components/ObjectDetail/types.ts b/frontend/src/metabase/visualizations/components/ObjectDetail/types.tsindex 6b075c28fdc..2b3f43cf02c 100644--- a/frontend/src/metabase/visualizations/components/ObjectDetail/types.ts+++ b/frontend/src/metabase/visualizations/components/ObjectDetail/types.ts@@ -54,6 +54,7 @@ export interface ObjectDetailProps {viewNextObjectDetail: () => void;closeObjectDetail: () => void;className?: string;+ isDashboard: boolean;}export type ForeignKeyReferences = {diff --git a/package.json b/package.jsonindex 5c21e8c84ab..05361ebf812 100644--- a/package.json+++ b/package.json@@ -108,7 +108,6 @@"hast-util-to-html": "^9.0.0","history": "3","html2canvas-pro": "^2.0.2",- "humanize-plus": "^1.8.1","icepick": "2.4.0","iframe-resizer": "~4.3.2","immer": "^10.1.1",@@ -244,7 +243,6 @@"@types/glob": "^7.1.4","@types/hast": "^3.0.2","@types/history": "3.2.5",- "@types/humanize-plus": "^1.8.0","@types/icepick": "2.3.0","@types/iframe-resizer": "^3.5.9","@types/inflection": "^1.13.0",