Skip to content

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

Use transparency instead of white for table color ranges (#65426)

Nick Fitzpatrick15f92af50483
diff --git a/.loki/reference/chrome_laptop_viz_Table_Conditional_Fomatting_Dark.png b/.loki/reference/chrome_laptop_viz_Table_Conditional_Fomatting_Dark.png
new file mode 100644
index 00000000000..7f1b50c1488
Binary files /dev/null and b/.loki/reference/chrome_laptop_viz_Table_Conditional_Fomatting_Dark.png differ
diff --git a/.loki/reference/chrome_laptop_viz_Table_Conditional_Fomatting_Light.png b/.loki/reference/chrome_laptop_viz_Table_Conditional_Fomatting_Light.png
new file mode 100644
index 00000000000..e4b4b97979d
Binary files /dev/null and b/.loki/reference/chrome_laptop_viz_Table_Conditional_Fomatting_Light.png differ
diff --git a/frontend/src/metabase/common/components/ColorRangeSelector/ColorRangePopover.tsx b/frontend/src/metabase/common/components/ColorRangeSelector/ColorRangePopover.tsx
index 67484e08c62..ecc96a52ade 100644
--- a/frontend/src/metabase/common/components/ColorRangeSelector/ColorRangePopover.tsx
+++ b/frontend/src/metabase/common/components/ColorRangeSelector/ColorRangePopover.tsx
@@ -148,7 +148,9 @@ const getDefaultColor = (
};
const getDefaultColorMapping = (colors: string[]) => {
- return Object.fromEntries(colors.map((color) => [color, ["white", color]]));
+ return Object.fromEntries(
+ colors.map((color) => [color, ["transparent", color]]),
+ );
};
const getDefaultIsInverted = (
diff --git a/frontend/src/metabase/lib/colors/groups.ts b/frontend/src/metabase/lib/colors/groups.ts
index f52f21cb4bf..e21c7c96b1d 100644
--- a/frontend/src/metabase/lib/colors/groups.ts
+++ b/frontend/src/metabase/lib/colors/groups.ts
@@ -64,7 +64,7 @@ export const getDarkAccentColors = (
export const getStatusColorRanges = (): string[][] => {
return [
- [color("error"), color("bg-white"), color("success")],
+ [color("error"), "transparent", color("success")],
[color("error"), color("warning"), color("success")],
];
};
diff --git a/frontend/src/metabase/visualizations/lib/table_format.js b/frontend/src/metabase/visualizations/lib/table_format.js
index 1d97aac36de..98817c14e6b 100644
--- a/frontend/src/metabase/visualizations/lib/table_format.js
+++ b/frontend/src/metabase/visualizations/lib/table_format.js
@@ -1,6 +1,8 @@
// NOTE: this file is used on the frontend and backend and there are some
// limitations. See frontend/src/metabase-shared/color_selector for details
+import Color from "color";
+
import { alpha } from "metabase/lib/colors";
import { getColorScale, getSafeColor } from "metabase/lib/colors/scales";
@@ -140,7 +142,13 @@ export function compileFormatter(
const scale = getColorScale(
[min, max],
- format.colors.map((c) => alpha(c, GRADIENT_ALPHA)),
+ format.colors.map((c) => {
+ const color = Color(c);
+ const alpha = color.alpha();
+ return color
+ .alpha(alpha > GRADIENT_ALPHA ? GRADIENT_ALPHA : alpha)
+ .toString();
+ }),
).clamp(true);
return (value) => {
const colorValue = scale(value);
diff --git a/frontend/src/metabase/visualizations/visualizations/Table/Table.stories.tsx b/frontend/src/metabase/visualizations/visualizations/Table/Table.stories.tsx
index 85cb793f73e..6a433984a21 100644
--- a/frontend/src/metabase/visualizations/visualizations/Table/Table.stories.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/Table/Table.stories.tsx
@@ -1,17 +1,26 @@
+import type { Store } from "@reduxjs/toolkit";
import type { StoryFn } from "@storybook/react";
+import _ from "underscore";
+import { getStore } from "__support__/entities-store";
+import { mockSettings } from "__support__/settings";
+import { createMockEntitiesState } from "__support__/store";
import {
SdkVisualizationWrapper,
VisualizationWrapper,
createWaitForResizeToStopDecorator,
} from "__support__/storybook";
+import { Api } from "metabase/api";
import type { MetabaseTheme } from "metabase/embedding-sdk/theme";
+import { MetabaseReduxProvider } from "metabase/lib/redux";
+import { commonReducers } from "metabase/reducers-common";
import { Box } from "metabase/ui";
import { registerVisualization } from "metabase/visualizations";
import Visualization from "metabase/visualizations/components/Visualization";
import Table from "metabase/visualizations/visualizations/Table/Table";
import type { RawSeries } from "metabase-types/api";
import { createMockTokenFeatures } from "metabase-types/api/mocks";
+import type { State } from "metabase-types/store";
import {
createMockSettingsState,
createMockState,
@@ -22,6 +31,23 @@ import * as data from "./stories-data";
// @ts-expect-error: incompatible prop types with registerVisualization
registerVisualization(Table);
+const settings = mockSettings();
+
+const storeInitialState = createMockState({
+ settings,
+ entities: createMockEntitiesState({}),
+});
+const publicReducerNames = Object.keys(commonReducers);
+const initialState = _.pick(storeInitialState, ...publicReducerNames) as State;
+
+const storeMiddleware = [Api.middleware];
+
+const store = getStore(
+ commonReducers,
+ initialState,
+ storeMiddleware,
+) as unknown as Store<State>;
+
export default {
title: "viz/Table",
decorators: [createWaitForResizeToStopDecorator()],
@@ -74,6 +100,18 @@ const DefaultTemplate: StoryFn<{
);
};
+const ColumnFormattingTemplate: StoryFn<{
+ series: RawSeries;
+}> = ({ series }: { series: RawSeries }) => {
+ return (
+ <MetabaseReduxProvider store={store}>
+ <Box h="calc(100vh - 2rem)">
+ <Visualization rawSeries={series} />,
+ </Box>
+ </MetabaseReduxProvider>
+ );
+};
+
export const DefaultTable = {
parameters: {
loki: { skip: true },
@@ -83,6 +121,76 @@ export const DefaultTable = {
series: data.variousColumnSettings,
},
};
+const ordersWithPeople = data.ordersWithPeople[0];
+const CONDITIONA_FORMATTING_SERIES = [
+ {
+ ...ordersWithPeople,
+ data: {
+ ...ordersWithPeople.data,
+ rows: ordersWithPeople.data.rows.slice(0, 12),
+ },
+ card: {
+ ...ordersWithPeople.card,
+ visualization_settings: {
+ "table.column_formatting": [
+ {
+ columns: ["SUBTOTAL"],
+ type: "range",
+ colors: ["transparent", "#F9D45C"],
+ min_type: null,
+ max_type: null,
+ min_value: 0,
+ max_value: 100,
+ operator: "=",
+ },
+ {
+ columns: ["TOTAL"],
+ type: "single",
+ operator: ">",
+ value: 100,
+ color: "#7172AD",
+ highlight_row: true,
+ },
+ {
+ columns: ["QUANTITY"],
+ type: "range",
+ colors: [
+ "hsla(358, 71%, 62%, 1)",
+ "transparent",
+ "hsla(89, 48%, 40%, 1)",
+ ],
+ min_type: null,
+ max_type: null,
+ min_value: 0,
+ max_value: 100,
+ },
+ ],
+ },
+ },
+ },
+];
+
+export const ConditionalFomattingLight = {
+ parameters: {
+ layout: "fullscreen",
+ },
+ render: ColumnFormattingTemplate,
+ args: {
+ theme: "light",
+ series: CONDITIONA_FORMATTING_SERIES,
+ },
+};
+
+export const ConditionalFomattingDark = {
+ parameters: {
+ layout: "fullscreen",
+ },
+ render: ColumnFormattingTemplate,
+ args: {
+ theme: "dark",
+ series: CONDITIONA_FORMATTING_SERIES,
+ },
+};
export const TableWithImages = {
render: DefaultTemplate,