Skip to content

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

feat: make metabot logo follow the bran colors (#65358)

Jakub Chodorowiczbe8686b5773e
diff --git a/.loki/reference/chrome_laptop_App_MetabotLogo_Customized_Brand_Color.png b/.loki/reference/chrome_laptop_App_MetabotLogo_Customized_Brand_Color.png
deleted file mode 100644
index 6ce43fd2ad6..00000000000
Binary files a/.loki/reference/chrome_laptop_App_MetabotLogo_Customized_Brand_Color.png and /dev/null differ
diff --git a/.loki/reference/chrome_laptop_App_MetabotLogo_Default.png b/.loki/reference/chrome_laptop_App_MetabotLogo_Default.png
deleted file mode 100644
index 78638033202..00000000000
Binary files a/.loki/reference/chrome_laptop_App_MetabotLogo_Default.png and /dev/null differ
diff --git a/frontend/src/metabase/common/components/MetabotLogo/MetabotLogo.module.css b/frontend/src/metabase/common/components/MetabotLogo/MetabotLogo.module.css
index a38cf184e0f..95c63b56494 100644
--- a/frontend/src/metabase/common/components/MetabotLogo/MetabotLogo.module.css
+++ b/frontend/src/metabase/common/components/MetabotLogo/MetabotLogo.module.css
@@ -3,9 +3,3 @@
--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.tsx
deleted file mode 100644
index 21da6d136a9..00000000000
--- a/frontend/src/metabase/common/components/MetabotLogo/MetabotLogo.stories.tsx
+++ /dev/null
@@ -1,64 +0,0 @@
-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, type MetabotLogoProps } from "./MetabotLogo";
-
-export default {
- title: "App/MetabotLogo",
- component: MetabotLogo,
- argTypes: {
- variant: {
- options: ["happy", "sad", "cool", "bug", "cloud"],
- control: { type: "radio" },
- },
- },
- 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: (args: MetabotLogoProps) => {
- return <MetabotLogo {...args} />;
- },
-};
-
-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.tsx
index 7a655f631d2..706e6eb29e6 100644
--- a/frontend/src/metabase/common/components/MetabotLogo/MetabotLogo.tsx
+++ b/frontend/src/metabase/common/components/MetabotLogo/MetabotLogo.tsx
@@ -7,7 +7,6 @@ import cloud from "assets/img/metabot-cloud-96x96.svg?component";
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";
import Styles from "./MetabotLogo.module.css";
@@ -32,14 +31,10 @@ export const MetabotLogo = forwardRef(function MetabotLogo(
ref: Ref<any>,
) {
const MetabotComponent = urlByVariant[variant];
- const hasSetBrandColor = Boolean(useSetting("application-colors")?.brand);
return (
<MetabotComponent
- className={cx(
- hasSetBrandColor ? Styles.MetabotLogoGray : Styles.MetabotLogo,
- className,
- )}
+ className={cx(Styles.MetabotLogo, className)}
{...rest}
ref={ref}
aria-label={t`Metabot`}
diff --git a/frontend/src/metabase/common/components/MetabotLogo/index.ts b/frontend/src/metabase/common/components/MetabotLogo/index.ts
index c4d4835ff90..9ec73c32b93 100644
--- a/frontend/src/metabase/common/components/MetabotLogo/index.ts
+++ b/frontend/src/metabase/common/components/MetabotLogo/index.ts
@@ -1 +1 @@
-export * from "./MetabotLogo";
+export { MetabotLogo } from "./MetabotLogo";
diff --git a/loki.config.js b/loki.config.js
index 4f86f0abe3d..e0c5ede977f 100644
--- a/loki.config.js
+++ b/loki.config.js
@@ -15,7 +15,6 @@ module.exports = {
"^Components/overlays/Tooltip",
"^Components/Documents",
"^Components/Feedback/Alert",
- "^App/MetabotLogo",
"^App/Palette",
].join("|"),
configurations: {