Skip to content

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

remove border from dashboard header where header=false and no tabs (#65161)

Nicolò Prettoa04b79857ffc
diff --git a/frontend/src/metabase/dashboard/components/Dashboard/Dashboard.module.css b/frontend/src/metabase/dashboard/components/Dashboard/Dashboard.module.css
index 451b0e0ee30..2fea5dbc39a 100644
--- a/frontend/src/metabase/dashboard/components/Dashboard/Dashboard.module.css
+++ b/frontend/src/metabase/dashboard/components/Dashboard/Dashboard.module.css
@@ -20,9 +20,12 @@
.DashboardHeaderContainer {
position: relative;
z-index: 2;
- border-bottom: 1px solid var(--mb-color-border);
transition: var(--transition-theme-change);
+ &:not(.noBorder) {
+ border-bottom: 1px solid var(--mb-color-border);
+ }
+
&:not(.isEmbeddingSdk) {
background-color: var(--mb-color-background);
}
diff --git a/frontend/src/metabase/dashboard/components/Dashboard/Dashboard.tsx b/frontend/src/metabase/dashboard/components/Dashboard/Dashboard.tsx
index 59718440ed3..28b862acc61 100644
--- a/frontend/src/metabase/dashboard/components/Dashboard/Dashboard.tsx
+++ b/frontend/src/metabase/dashboard/components/Dashboard/Dashboard.tsx
@@ -6,7 +6,9 @@ import { DashboardArchivedEntityBanner } from "metabase/archive/components/Archi
import DashboardS from "metabase/css/dashboard.module.css";
import { DashboardHeader } from "metabase/dashboard/components/DashboardHeader";
import { useDashboardContext } from "metabase/dashboard/context";
+import { getIsHeaderVisible } from "metabase/dashboard/selectors";
import { isEmbeddingSdk } from "metabase/embedding-sdk/config";
+import { useSelector } from "metabase/lib/redux";
import { FilterApplyToast } from "metabase/parameters/components/FilterApplyToast";
import EmbedFrameS from "metabase/public/components/EmbedFrame/EmbedFrame.module.css";
import { FullWidthContainer } from "metabase/styled-components/layout/FullWidthContainer";
@@ -33,6 +35,8 @@ const DashboardDefaultView = ({ className }: { className?: string }) => {
const { dashboard, isEditing, isFullscreen, isSharing, selectedTabId } =
useDashboardContext();
+ const isHeaderVisible = useSelector(getIsHeaderVisible);
+
const currentTabDashcards = useMemo(() => {
if (!dashboard || !Array.isArray(dashboard.dashcards)) {
return [];
@@ -58,6 +62,7 @@ const DashboardDefaultView = ({ className }: { className?: string }) => {
}
const isEmpty = !dashboardHasCards || (dashboardHasCards && !tabHasCards);
+ const hasTabs = dashboard.tabs && dashboard.tabs.length > 1;
// Embedding SDK has parent containers that requires dashboard to be full height to avoid double scrollbars.
const isFullHeight = isEditing || isSharing || isEmbeddingSdk();
@@ -89,6 +94,7 @@ const DashboardDefaultView = ({ className }: { className?: string }) => {
{
[S.isEmbeddingSdk]: isEmbeddingSdk(),
[S.isFullscreen]: isFullscreen,
+ [S.noBorder]: !hasTabs && !isHeaderVisible,
},
)}
data-element-id="dashboard-header-container"