Fix: hide DashboardControlBar in home page #11

42Cluster-Seoul · Jun 27, 2024 · e9a3825 · e9a3825
1 parent ccb6d3a
commit e9a3825
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/public/app/core/components/AppChrome/AppChrome.tsx b/public/app/core/components/AppChrome/AppChrome.tsx
@@ -11,7 +11,7 @@ import { useMediaQueryChange } from 'app/core/hooks/useMediaQueryChange';
 import store from 'app/core/store';
 import { useLoadNextChildrenPage } from 'app/features/browse-dashboards/state';
 import { CommandPalette } from 'app/features/commandPalette/CommandPalette';
-import { determineUrl } from 'app/features/dashboard/utils/42cluster';
+import { determineUrl, DASHBOARD, LOGIN } from 'app/features/dashboard/utils/42cluster';
 import { KioskMode } from 'app/types';
 
 import { AppChromeMenu } from './AppChromeMenu';
@@ -30,7 +30,8 @@ export function AppChrome({ children }: Props) {
   const searchBarHidden = state.searchBarHidden || state.kioskMode === KioskMode.TV;
   const theme = useTheme2();
   const styles = useStyles2(getStyles);
-  const [dashboardUrl, loginUrl] = determineUrl();
+  const dashboardUrl = determineUrl(DASHBOARD);
+  const loginUrl = determineUrl(LOGIN);
   const isDashboardPage = window.location.pathname.startsWith(dashboardUrl);
   const isLogin = window.location.pathname.startsWith(loginUrl);
   // should render when kiosk mode is full while only at dashboard page

diff --git a/public/app/features/dashboard/containers/DashboardPage.tsx b/public/app/features/dashboard/containers/DashboardPage.tsx
@@ -37,6 +37,7 @@ import { liveTimer } from '../dashgrid/liveTimer';
 import { getTimeSrv } from '../services/TimeSrv';
 import { cleanUpDashboardAndVariables } from '../state/actions';
 import { initDashboard } from '../state/initDashboard';
+import { determineUrl, ROOT } from '../utils/42cluster';
 
 import DashboardControlBar from './DashboardControlBar';
 import { DashboardPageRouteParams, DashboardPageRouteSearchParams } from './types';
@@ -315,7 +316,7 @@ export class UnthemedDashboardPage extends PureComponent<Props, State> {
     const showSubMenu = !editPanel && !kioskMode && !this.props.queryParams.editview;
 
     const showToolbar = kioskMode !== KioskMode.Full && !queryParams.editview;
-    const isHome = window.location.pathname === '/';
+    const isHome = window.location.pathname === determineUrl(ROOT);
 
     const pageClassName = cx({
       'panel-in-fullscreen': Boolean(viewPanel),