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
Fix palette preview in Branding section (#63677)
Maz Amelia1582d07de22
diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ChartColorPreview/ChartColorPreview.styled.tsx b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ChartColorPreview/ChartColorPreview.styled.tsxdeleted file mode 100644index 72ac193abed..00000000000--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ChartColorPreview/ChartColorPreview.styled.tsx+++ /dev/null@@ -1,46 +0,0 @@-import styled from "@emotion/styled";--import { breakpointMinLarge } from "metabase/styled-components/theme";--export const TableRoot = styled.div`- display: flex;- flex-direction: column;- flex: 1 1 auto;- margin-top: 2rem;-- ${breakpointMinLarge} {- margin-top: 0;- }-`;--export const TableHeader = styled.div`- display: block;- padding: 1rem 1.5rem;- border: 1px solid var(--mb-color-border);- border-radius: 0.5rem 0.5rem 0 0;-- ${breakpointMinLarge} {- border-left: none;- border-top-left-radius: 0;- }-`;--export const TableTitle = styled.div`- color: var(--mb-color-text-dark);- font-size: 1rem;- font-weight: bold;-`;--export const TableBody = styled.div`- flex: 1 1 0;- padding: 3rem 1.5rem;- min-height: 24rem;- border: 1px solid var(--mb-color-border);- border-top: none;- border-radius: 0 0 0.5rem 0.5rem;-- ${breakpointMinLarge} {- border-left: none;- border-bottom-left-radius: 0;- }-`;diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ChartColorPreview/ChartColorPreview.tsx b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ChartColorPreview/ChartColorPreview.tsxindex 546d81b7934..87b637f10c4 100644--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ChartColorPreview/ChartColorPreview.tsx+++ b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ChartColorPreview/ChartColorPreview.tsx@@ -1,16 +1,10 @@import { useMemo } from "react";-import { t } from "ttag";import { useDebouncedValue } from "metabase/common/hooks/use-debounced-value";+import { Box, Flex } from "metabase/ui";import ChartColorSample from "../ChartColorSample";-import {- TableBody,- TableHeader,- TableRoot,- TableTitle,-} from "./ChartColorPreview.styled";import { getAccentColorGroups } from "./utils";const PREVIEW_TIMEOUT = 400;@@ -29,14 +23,16 @@ const ChartColorPreview = ({}, [changedColors]);return (- <TableRoot>- <TableHeader>- <TableTitle>{t`Palette preview`}</TableTitle>- </TableHeader>- <TableBody>+ <Flex+ direction="column"+ bd="1px solid var(--mb-color-border)"+ bdrs="0.5rem"+ p="3rem 1.5rem"+ >+ <Box style={{ flex: "1 1 0" }} mih="24rem"><ChartColorSample colorGroups={colorGroups} />- </TableBody>- </TableRoot>+ </Box>+ </Flex>);};diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ChartColorSettings/ChartColorSettings.styled.tsx b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ChartColorSettings/ChartColorSettings.styled.tsxindex 69d5026b6c8..80348f53047 100644--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ChartColorSettings/ChartColorSettings.styled.tsx+++ b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ChartColorSettings/ChartColorSettings.styled.tsx@@ -1,30 +1,9 @@import styled from "@emotion/styled";-import { breakpointMinLarge } from "metabase/styled-components/theme";--export const TableHeader = styled.div`- display: flex;- align-items: center;- justify-content: space-between;- padding: 1rem 1.5rem;- border: 1px solid var(--mb-color-border);- border-radius: 0.5rem 0.5rem 0 0;-- ${breakpointMinLarge} {- border-top-right-radius: 0;- }-`;--export const TableTitle = styled.div`- color: var(--mb-color-text-dark);- font-size: 1rem;- font-weight: bold;-`;-export const TableBody = styled.div`border: 1px solid var(--mb-color-border);- border-top: none;border-bottom: 0;+ border-radius: 0.5rem 0.5rem 0 0;`;export const TableBodyRow = styled.div`@@ -38,25 +17,16 @@ export const TableBodyRow = styled.div`export const TableBodyCell = styled.div`flex: 1 1 auto;- width: 12rem;padding: 1rem 1.5rem;&:not(:first-of-type) {border-left: 1px solid var(--mb-color-border);background-color: var(--mb-color-bg-light);}-- ${breakpointMinLarge} {- flex-grow: 0;- }`;export const TableFooter = styled.div`padding: 1rem 1.5rem;border: 1px solid var(--mb-color-border);border-radius: 0 0 0.5rem 0.5rem;-- ${breakpointMinLarge} {- border-bottom-right-radius: 0;- }`;diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ChartColorSettings/ChartColorSettings.tsx b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ChartColorSettings/ChartColorSettings.tsxindex a0cc3ee48df..5081fbff992 100644--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ChartColorSettings/ChartColorSettings.tsx+++ b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ChartColorSettings/ChartColorSettings.tsx@@ -7,15 +7,13 @@ import ColorPicker from "metabase/common/components/ColorPicker";import { ConfirmModal } from "metabase/common/components/ConfirmModal";import { useCurrentRef } from "metabase/common/hooks/use-current-ref";import { color } from "metabase/lib/colors";-import { Button } from "metabase/ui";+import { Button, Group } from "metabase/ui";import {TableBody,TableBodyCell,TableBodyRow,TableFooter,- TableHeader,- TableTitle,} from "./ChartColorSettings.styled";import {getAutoChartColors,@@ -102,23 +100,6 @@ const ChartColorTable = ({return (<div>- <TableHeader>- <TableTitle>{t`Chart colors`}</TableTitle>- {hasCustomColors && (- <>- <Button variant="subtle" onClick={openResetModal}>- {t`Reset to default colors`}- </Button>- <ConfirmModal- opened={showResetModal}- title={t`Are you sure you want to reset to default colors?`}- onClose={closeResetModal}- onConfirm={handleReset}- confirmButtonText={t`Reset`}- />- </>- )}- </TableHeader><TableBody>{colorGroups.map((colorGroup, index) => (<TableBodyRow key={index}>@@ -135,7 +116,23 @@ const ChartColorTable = ({))}</TableBody><TableFooter>- <Button onClick={onGenerate}>{t`Generate chart colors`}</Button>+ <Group gap="sm">+ <Button onClick={onGenerate}>{t`Generate chart colors`}</Button>+ {hasCustomColors && (+ <Button variant="subtle" onClick={openResetModal}>+ {t`Reset to default colors`}+ </Button>+ )}+ </Group>+ {hasCustomColors && (+ <ConfirmModal+ opened={showResetModal}+ title={t`Are you sure you want to reset to default colors?`}+ onClose={closeResetModal}+ onConfirm={handleReset}+ confirmButtonText={t`Reset`}+ />+ )}</TableFooter></div>);diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ColorSettings/ColorSettings.styled.tsx b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ColorSettings/ColorSettings.styled.tsxdeleted file mode 100644index 25ddee631ae..00000000000--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ColorSettings/ColorSettings.styled.tsx+++ /dev/null@@ -1,12 +0,0 @@-import styled from "@emotion/styled";--import { breakpointMinLarge } from "metabase/styled-components/theme";--export const SectionContent = styled.div`- display: flex;- flex-direction: column;-- ${breakpointMinLarge} {- flex-direction: row;- }-`;diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ColorSettings/ColorSettings.tsx b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ColorSettings/ColorSettings.tsxindex 283e093449a..e4ce9388141 100644--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ColorSettings/ColorSettings.tsx+++ b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ColorSettings/ColorSettings.tsx@@ -2,15 +2,13 @@ import { useCallback, useMemo, useState } from "react";import { t } from "ttag";import { SettingHeader } from "metabase/admin/settings/components/SettingHeader";-import { Box, Stack } from "metabase/ui";+import { Box, Stack, Tabs } from "metabase/ui";import type { ColorSettings as ColorSettingsType } from "metabase-types/api";import BrandColorSettings from "../BrandColorSettings";import ChartColorPreview from "../ChartColorPreview";import ChartColorSettings from "../ChartColorSettings";-import { SectionContent } from "./ColorSettings.styled";-export interface ColorSettingsProps {initialColors: ColorSettingsType | null;originalColors: ColorSettingsType;@@ -54,16 +52,30 @@ export const ColorSettings = ({<SettingHeaderid="chart-colors"title={t`Chart colors`}- description={t`Choose up to 24 hex values. We’ll auto-generate what you leave blank.`}+ description={t`Choose up to 24 hex values. We'll auto-generate what you leave blank.`}/>- <SectionContent>- <ChartColorSettings- colors={colors}- colorPalette={colorPalette}- onChange={handleChange}- />- <ChartColorPreview colorPalette={colorPalette} />- </SectionContent>+ <Box>+ <Tabs defaultValue="chart-colors">+ <Tabs.List>+ <Tabs.Tab value="chart-colors">{t`Colors`}</Tabs.Tab>+ <Tabs.Tab value="palette-preview">{t`Preview`}</Tabs.Tab>+ </Tabs.List>++ <Box mt="lg" bdrs={0}>+ <Tabs.Panel value="chart-colors">+ <ChartColorSettings+ colors={colors}+ colorPalette={colorPalette}+ onChange={handleChange}+ />+ </Tabs.Panel>++ <Tabs.Panel value="palette-preview">+ <ChartColorPreview colorPalette={colorPalette} />+ </Tabs.Panel>+ </Box>+ </Tabs>+ </Box></Box></Stack>);