Skip to content

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

UXW-2183 Remove fullscreen dashboard night mode toggle (#65312)

Brad Andersondff2d779810b
diff --git a/e2e/test/scenarios/dashboard/dashboard-reproductions.cy.spec.js b/e2e/test/scenarios/dashboard/dashboard-reproductions.cy.spec.js
index 834d794c878..d49897eeab8 100644
--- a/e2e/test/scenarios/dashboard/dashboard-reproductions.cy.spec.js
+++ b/e2e/test/scenarios/dashboard/dashboard-reproductions.cy.spec.js
@@ -1630,13 +1630,13 @@ describe("issue 47170", () => {
});
it("should show legible dark mode colors in fullscreen mode (metabase#51524)", () => {
+ cy.visit("/account/profile");
+ cy.findByDisplayValue("Light").click();
+ H.popover().findByText("Dark").click();
cy.visit(`/dashboard/${ORDERS_DASHBOARD_ID}`);
H.dashboardHeader().findByLabelText("Move, trash, and more…").click();
H.popover().findByText("Enter fullscreen").click();
- H.dashboardHeader()
- .findByLabelText(/dark mode/)
- .click();
const primaryTextColor = "rgba(255, 255, 255, 0.95)";
diff --git a/enterprise/frontend/src/embedding-sdk-bundle/components/public/dashboard/SdkDashboard.stories.tsx b/enterprise/frontend/src/embedding-sdk-bundle/components/public/dashboard/SdkDashboard.stories.tsx
index fd1edc4bdd5..8a5d4e4b06d 100644
--- a/enterprise/frontend/src/embedding-sdk-bundle/components/public/dashboard/SdkDashboard.stories.tsx
+++ b/enterprise/frontend/src/embedding-sdk-bundle/components/public/dashboard/SdkDashboard.stories.tsx
@@ -342,7 +342,6 @@ export const ExperimentalLayout = {
<Paper>
<SdkDashboard.ExportAsPdfButton />
<SdkDashboard.InfoButton />
- <SdkDashboard.NightModeButton />
<SdkDashboard.RefreshPeriod />
</Paper>
</Popover.Dropdown>
diff --git a/enterprise/frontend/src/embedding-sdk-bundle/components/public/dashboard/SdkDashboard.tsx b/enterprise/frontend/src/embedding-sdk-bundle/components/public/dashboard/SdkDashboard.tsx
index 6c66c5c0b4f..e85cc5955f9 100644
--- a/enterprise/frontend/src/embedding-sdk-bundle/components/public/dashboard/SdkDashboard.tsx
+++ b/enterprise/frontend/src/embedding-sdk-bundle/components/public/dashboard/SdkDashboard.tsx
@@ -375,7 +375,6 @@ export const SdkDashboard = withPublicComponentWrapper(
| "FullscreenButton"
| "ExportAsPdfButton"
| "InfoButton"
- | "NightModeButton"
| "RefreshPeriod"
>;
@@ -387,7 +386,6 @@ SdkDashboard.ParametersList = Dashboard.ParametersList;
SdkDashboard.FullscreenButton = Dashboard.FullscreenButton;
SdkDashboard.ExportAsPdfButton = Dashboard.ExportAsPdfButton;
SdkDashboard.InfoButton = Dashboard.InfoButton;
-SdkDashboard.NightModeButton = Dashboard.NightModeButton;
SdkDashboard.RefreshPeriod = Dashboard.RefreshPeriod;
type DashboardQueryBuilderProps = {
diff --git a/frontend/src/metabase/common/components/ColorScheme/ColorSchemeToggle.tsx b/frontend/src/metabase/common/components/ColorScheme/ColorSchemeToggle.tsx
deleted file mode 100644
index 440b67cc0e0..00000000000
--- a/frontend/src/metabase/common/components/ColorScheme/ColorSchemeToggle.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import { t } from "ttag";
-
-import { ActionIcon, type ActionIconProps, Icon, Tooltip } from "metabase/ui";
-import { useColorScheme } from "metabase/ui/components/theme/ColorSchemeProvider";
-import type { ResolvedColorScheme } from "metabase/ui/components/theme/ColorSchemeProvider/ColorSchemeProvider";
-
-const iconMap: Record<ResolvedColorScheme, "sun" | "moon"> = {
- light: "sun",
- dark: "moon",
-};
-
-const getTooltipText = (
- scheme: ResolvedColorScheme,
- systemScheme: ResolvedColorScheme,
-): string => {
- const baseText =
- scheme === "dark" ? t`Switch to light mode` : t`Switch to dark mode`;
-
- return systemScheme !== scheme
- ? `${baseText} ${t`(system preference)`}`
- : baseText;
-};
-
-export function ColorSchemeToggle(props: ActionIconProps & { id?: string }) {
- const { resolvedColorScheme, systemColorScheme, toggleColorScheme } =
- useColorScheme();
-
- const tooltipText = getTooltipText(resolvedColorScheme, systemColorScheme);
-
- return (
- <Tooltip label={tooltipText}>
- <ActionIcon
- onClick={toggleColorScheme}
- aria-label={tooltipText}
- {...props}
- >
- <Icon name={iconMap[resolvedColorScheme]} />
- </ActionIcon>
- </Tooltip>
- );
-}
diff --git a/frontend/src/metabase/common/components/ColorScheme/index.ts b/frontend/src/metabase/common/components/ColorScheme/index.ts
index 46b9442e5ad..325559d022a 100644
--- a/frontend/src/metabase/common/components/ColorScheme/index.ts
+++ b/frontend/src/metabase/common/components/ColorScheme/index.ts
@@ -1,2 +1 @@
export * from "./ColorSchemeSelect";
-export * from "./ColorSchemeToggle";
diff --git a/frontend/src/metabase/dashboard/components/Dashboard/Dashboard.tsx b/frontend/src/metabase/dashboard/components/Dashboard/Dashboard.tsx
index 28b862acc61..905bc2a6f7e 100644
--- a/frontend/src/metabase/dashboard/components/Dashboard/Dashboard.tsx
+++ b/frontend/src/metabase/dashboard/components/Dashboard/Dashboard.tsx
@@ -20,7 +20,6 @@ import {
DashboardInfoButton,
ExportAsPdfButton,
FullscreenToggle,
- NightModeToggleButton,
} from "../DashboardHeader/buttons";
import { DashboardParameterPanel } from "../DashboardParameterPanel";
import { DashboardSidebars } from "../DashboardSidebars";
@@ -147,7 +146,6 @@ type DashboardComponentType = typeof DashboardDefaultView & {
FullscreenButton: typeof FullscreenToggle;
ExportAsPdfButton: typeof ExportAsPdfButton;
InfoButton: typeof DashboardInfoButton;
- NightModeButton: typeof NightModeToggleButton;
RefreshPeriod: typeof RefreshWidget;
};
@@ -160,7 +158,6 @@ DashboardComponent.ParametersList = ParametersList;
DashboardComponent.FullscreenButton = FullscreenToggle;
DashboardComponent.ExportAsPdfButton = ExportAsPdfButton;
DashboardComponent.InfoButton = DashboardInfoButton;
-DashboardComponent.NightModeButton = NightModeToggleButton;
DashboardComponent.RefreshPeriod = RefreshWidget;
export const Dashboard = DashboardComponent;
diff --git a/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/DashboardHeaderButtonRow.unit.spec.tsx b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/DashboardHeaderButtonRow.unit.spec.tsx
index 578ea57980b..f1f734a600c 100644
--- a/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/DashboardHeaderButtonRow.unit.spec.tsx
+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/DashboardHeaderButtonRow.unit.spec.tsx
@@ -75,10 +75,6 @@ const DASHBOARD_EXPECTED_DATA_MAP: Record<
icon: "clock",
tooltip: "Auto-refresh",
},
- [DASHBOARD_ACTION.NIGHT_MODE_TOGGLE]: {
- icon: "sun",
- tooltip: "Switch to dark mode",
- },
[DASHBOARD_ACTION.FULLSCREEN_TOGGLE]: {
icon: "expand",
tooltip: "Enter fullscreen",
@@ -338,17 +334,6 @@ describe("DashboardHeaderButtonRow", () => {
expectedButtons: [DASHBOARD_ACTION.FULLSCREEN_TOGGLE],
});
});
-
- it("should show night mode toggle when in fullscreen", async () => {
- setup({
- isEditing: false,
- isFullscreen: true,
- });
-
- await expectButtonsToExistInHeader({
- expectedButtons: [DASHBOARD_ACTION.NIGHT_MODE_TOGGLE],
- });
- });
});
describe("when viewing analytics dashboard", () => {
diff --git a/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/action-buttons.tsx b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/action-buttons.tsx
index 1676c1c41e8..6d0a791081b 100644
--- a/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/action-buttons.tsx
+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/action-buttons.tsx
@@ -17,7 +17,6 @@ import {
ExportAsPdfButton,
FullscreenAnalyticsDashboard,
FullscreenToggle,
- NightModeToggleButton,
} from "../buttons";
import { AddLinkOrEmbedButton } from "../buttons/AddLinkOrEmbedButton";
@@ -73,11 +72,6 @@ export const dashboardActionButtons: Record<
component: () => <RefreshWidget />,
enabled: ({ dashboard, isEditing }) => !isEditing && !dashboard?.archived,
},
- [DASHBOARD_ACTION.NIGHT_MODE_TOGGLE]: {
- component: () => <NightModeToggleButton />,
- enabled: ({ isEditing, isFullscreen, dashboard }) =>
- Boolean(!isEditing && isFullscreen && !dashboard.archived),
- },
[DASHBOARD_ACTION.FULLSCREEN_TOGGLE]: {
component: FullscreenToggle,
enabled: ({ isFullscreen, isPublic }) => isPublic || isFullscreen,
diff --git a/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/constants.ts b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/constants.ts
index b21cc48b75a..c7ca7c17570 100644
--- a/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/constants.ts
+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/constants.ts
@@ -3,7 +3,6 @@ import { DASHBOARD_ACTION } from "./dashboard-action-keys";
// Buttons visible in public dashboard
export const DASHBOARD_DISPLAY_ACTIONS = [
DASHBOARD_ACTION.REFRESH_WIDGET,
- DASHBOARD_ACTION.NIGHT_MODE_TOGGLE,
DASHBOARD_ACTION.FULLSCREEN_TOGGLE,
];
diff --git a/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/dashboard-action-keys.tsx b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/dashboard-action-keys.tsx
index 245b65a8680..80c537f2811 100644
--- a/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/dashboard-action-keys.tsx
+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/dashboard-action-keys.tsx
@@ -10,7 +10,6 @@ export const DASHBOARD_ACTION = {
EDIT_DASHBOARD: "EDIT_DASHBOARD",
DASHBOARD_SHARING: "DASHBOARD_SHARING",
REFRESH_WIDGET: "REFRESH_WIDGET",
- NIGHT_MODE_TOGGLE: "NIGHT_MODE_TOGGLE",
FULLSCREEN_TOGGLE: "FULLSCREEN_TOGGLE",
DASHBOARD_HEADER_ACTION_DIVIDER: "DASHBOARD_HEADER_ACTION_DIVIDER",
DASHBOARD_BOOKMARK: "DASHBOARD_BOOKMARK",
diff --git a/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/NightModeToggleButton.tsx b/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/NightModeToggleButton.tsx
deleted file mode 100644
index c6175f801c5..00000000000
--- a/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/NightModeToggleButton.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import { ColorSchemeToggle } from "metabase/common/components/ColorScheme";
-
-export const NightModeToggleButton = () => {
- return <ColorSchemeToggle variant="viewHeader" />;
-};
diff --git a/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/index.tsx b/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/index.tsx
index 8c686ed14c5..07ec1f95ab2 100644
--- a/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/index.tsx
+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/index.tsx
@@ -11,5 +11,4 @@ export * from "./EditDashboardButton";
export * from "./FullscreenAnalyticsDashboard";
export * from "./SaveEditButton";
export * from "./FullscreenToggle";
-export * from "./NightModeToggleButton";
export * from "./ExportAsPdfButton";