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
Make Metabot logo gray when brand color customization is defined (#64566)
Jakub Chodorowicz35f1f1903df4
diff --git a/.loki/reference/chrome_laptop_App_MetabotLogo_Customized_Brand_Color.png b/.loki/reference/chrome_laptop_App_MetabotLogo_Customized_Brand_Color.pngnew file mode 100644index 00000000000..6ce43fd2ad6Binary files /dev/null and b/.loki/reference/chrome_laptop_App_MetabotLogo_Customized_Brand_Color.png differdiff --git a/.loki/reference/chrome_laptop_App_MetabotLogo_Default.png b/.loki/reference/chrome_laptop_App_MetabotLogo_Default.pngnew file mode 100644index 00000000000..78638033202Binary files /dev/null and b/.loki/reference/chrome_laptop_App_MetabotLogo_Default.png differdiff --git a/frontend/src/metabase/common/components/MetabotLogo/MetabotLogo.module.css b/frontend/src/metabase/common/components/MetabotLogo/MetabotLogo.module.cssindex 95c63b56494..a38cf184e0f 100644--- a/frontend/src/metabase/common/components/MetabotLogo/MetabotLogo.module.css+++ b/frontend/src/metabase/common/components/MetabotLogo/MetabotLogo.module.css@@ -3,3 +3,9 @@--illustration-secondary: var(--mb-color-brand-lighter);--illustration-background: var(--mb-color-bg-light);}++.MetabotLogoGray {+ --illustration-primary: var(--mb-color-bg-night);+ --illustration-secondary: var(--mb-color-bg-medium);+ --illustration-background: var(--mb-color-bg-light);+}diff --git a/frontend/src/metabase/common/components/MetabotLogo/MetabotLogo.stories.tsx b/frontend/src/metabase/common/components/MetabotLogo/MetabotLogo.stories.tsxnew file mode 100644index 00000000000..4f3acda44d9--- /dev/null+++ b/frontend/src/metabase/common/components/MetabotLogo/MetabotLogo.stories.tsx@@ -0,0 +1,58 @@+import type { StoryFn } from "@storybook/react";++import { setupEnterprisePlugins } from "__support__/enterprise";+import { mockSettings } from "__support__/settings";+import { ReduxProvider } from "__support__/storybook";+import type { EnterpriseSettings } from "metabase-types/api";+import { createMockTokenFeatures } from "metabase-types/api/mocks";+import { createMockState } from "metabase-types/store/mocks";++import MetabotLogo from "./MetabotLogo";++export default {+ title: "App/MetabotLogo",+ component: MetabotLogo,+ decorators: [+ (+ Story: StoryFn,+ { parameters }: { parameters: { initialState: object | undefined } },+ ) => (+ <ReduxProvider+ storeInitialState={getState({+ "token-features": createMockTokenFeatures({+ whitelabel: true,+ }),+ ...parameters.initialState,+ })}+ >+ <Story />+ </ReduxProvider>+ ),+ ],+};++function getState(settings?: Partial<EnterpriseSettings>) {+ return createMockState({+ settings: mockSettings(settings),+ });+}++export const Default = {+ render: () => {+ return <MetabotLogo />;+ },+};++export const CustomizedBrandColor = {+ render: () => {+ setupEnterprisePlugins();+ return <MetabotLogo />;+ },+ parameters: {+ initialState: {+ "application-colors": {+ brand: "#F9D45C",+ },+ },+ },+};diff --git a/frontend/src/metabase/common/components/MetabotLogo/MetabotLogo.tsx b/frontend/src/metabase/common/components/MetabotLogo/MetabotLogo.tsxindex d4ced05da81..73229592d27 100644--- a/frontend/src/metabase/common/components/MetabotLogo/MetabotLogo.tsx+++ b/frontend/src/metabase/common/components/MetabotLogo/MetabotLogo.tsx@@ -5,6 +5,7 @@ import { t } from "ttag";import happy from "assets/img/metabot-happy.svg?component";import sad from "assets/img/metabot-sad.svg?component";import cool from "assets/img/metabot-shades.svg?component";+import { useSetting } from "metabase/common/hooks";export type MetabotVariant = "happy" | "sad" | "cool";import Styles from "./MetabotLogo.module.css";@@ -26,9 +27,14 @@ const MetabotLogo = forwardRef(function MetabotLogo(ref: Ref<any>,) {const MetabotComponent = urlByVariant[variant];+ const hasSetBrandColor = Boolean(useSetting("application-colors")?.brand);+return (<MetabotComponent- className={cx(Styles.MetabotLogo, className)}+ className={cx(+ hasSetBrandColor ? Styles.MetabotLogoGray : Styles.MetabotLogo,+ className,+ )}{...rest}ref={ref}aria-label={t`Metabot`}diff --git a/loki.config.js b/loki.config.jsindex 50a8bda0678..688c1243b98 100644--- a/loki.config.js+++ b/loki.config.js@@ -15,6 +15,7 @@ module.exports = {"^Components/overlays/Tooltip","^Components/Documents","^Components/Feedback/Alert",+ "^App/MetabotLogo",].join("|"),configurations: {"chrome.laptop": {