From 4b30d2c89b3af5c8c43750155ca08071e2e5c0b0 Mon Sep 17 00:00:00 2001 From: Katarzyna Ziomek-Zdanowicz Date: Tue, 7 Feb 2023 17:56:44 +0100 Subject: [PATCH] 8238 Remove panel header menu --- .../dashgrid/PanelHeader/PanelHeader.tsx | 36 ++++++++++++++----- 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeader.tsx b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeader.tsx index c5bf73cf32b40..9431e752c4306 100644 --- a/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeader.tsx +++ b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeader.tsx @@ -7,6 +7,7 @@ import { Icon, useStyles2, ClickOutsideWrapper } from '@grafana/ui'; import { DashboardModel } from 'app/features/dashboard/state/DashboardModel'; import { PanelModel } from 'app/features/dashboard/state/PanelModel'; import { getPanelLinksSupplier } from 'app/features/panel/panellinks/linkSuppliers'; +import { StoreState, useSelector } from 'app/types'; import PanelHeaderCorner from './PanelHeaderCorner'; import { PanelHeaderLoadingIndicator } from './PanelHeaderLoadingIndicator'; @@ -28,6 +29,15 @@ export interface Props { } export const PanelHeader: FC = ({ panel, error, isViewing, isEditing, data, alertState, dashboard }) => { + + const isFnDashboard = useSelector((state: StoreState) => { + const { + fnGlobalState: { FNDashboard }, + } = state; + + return FNDashboard; + }); + const onCancelQuery = () => panel.getQueryRunner().cancelQuery(); const title = panel.getDisplayTitle(); const className = cx('panel-header', !(isViewing || isEditing) ? 'grid-drag-handle' : ''); @@ -44,7 +54,7 @@ export const PanelHeader: FC = ({ panel, error, isViewing, isEditing, dat links={getPanelLinksSupplier(panel)} error={error} /> -
+
{({ closeMenu, panelMenuOpen }) => { return ( @@ -60,14 +70,16 @@ export const PanelHeader: FC = ({ panel, error, isViewing, isEditing, dat /> ) : null}

{title}

- {!dashboard.meta.publicDashboardAccessToken && ( -
- - {panelMenuOpen ? ( - - ) : null} -
- )} + {isFnDashboard + ? null + : !dashboard.meta.publicDashboardAccessToken && ( +
+ + {panelMenuOpen ? ( + + ) : null} +
+ )} {data.request && data.request.timeInfo && ( {data.request.timeInfo} @@ -85,6 +97,12 @@ export const PanelHeader: FC = ({ panel, error, isViewing, isEditing, dat const panelStyles = (theme: GrafanaTheme2) => { return { + fnPanelHeader: css` + &:hover { + background-color: initial!important; + cursor: default!important; + } + `, titleText: css` text-overflow: ellipsis; overflow: hidden;