From 8f9bafdb85638385d8cb2c859d659293346117c2 Mon Sep 17 00:00:00 2001 From: Shekar Siri Date: Mon, 27 Feb 2023 16:13:27 +0100 Subject: [PATCH] change(ui) - gridview - menu --- .../Dashboard/components/MetricsList/GridView.tsx | 1 + .../Dashboard/components/WidgetWrapper/WidgetWrapper.tsx | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/frontend/app/components/Dashboard/components/MetricsList/GridView.tsx b/frontend/app/components/Dashboard/components/MetricsList/GridView.tsx index 519e191f0..ab3f770f0 100644 --- a/frontend/app/components/Dashboard/components/MetricsList/GridView.tsx +++ b/frontend/app/components/Dashboard/components/MetricsList/GridView.tsx @@ -22,6 +22,7 @@ function GridView(props: Props) { onItemClick(parseInt(metric.metricId))} diff --git a/frontend/app/components/Dashboard/components/WidgetWrapper/WidgetWrapper.tsx b/frontend/app/components/Dashboard/components/WidgetWrapper/WidgetWrapper.tsx index 4dfdeefc8..cfbf993dd 100644 --- a/frontend/app/components/Dashboard/components/WidgetWrapper/WidgetWrapper.tsx +++ b/frontend/app/components/Dashboard/components/WidgetWrapper/WidgetWrapper.tsx @@ -28,6 +28,7 @@ interface Props { isWidget?: boolean; hideName?: boolean; grid?: string; + isGridView?: boolean; } function WidgetWrapper(props: Props & RouteComponentProps) { const { dashboardStore } = useStore(); @@ -40,6 +41,7 @@ function WidgetWrapper(props: Props & RouteComponentProps) { isTemplate = false, siteId, grid = '', + isGridView = false, } = props; const widget: any = props.widget; const isTimeSeries = widget.metricType === 'timeseries'; @@ -133,14 +135,14 @@ function WidgetWrapper(props: Props & RouteComponentProps) { ) : null} {isWidget && (
- {!isPredefined && isTimeSeries && ( + {!isPredefined && isTimeSeries && !isGridView && ( <>
)} - {!isTemplate && ( + {!isTemplate && !isGridView && (