From ffa68f6f91bf0ae46ead659e95a475c16ea32404 Mon Sep 17 00:00:00 2001 From: Dominik Prokop Date: Thu, 21 Jan 2021 15:04:00 +0100 Subject: [PATCH] GraphNG: Disable Plot logging by default (#30390) * Disable Plot loggging by default * Fix --- .../grafana-ui/src/components/uPlot/Plot.tsx | 1 + .../grafana-ui/src/components/uPlot/utils.ts | 21 ++++++++++--------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/packages/grafana-ui/src/components/uPlot/Plot.tsx b/packages/grafana-ui/src/components/uPlot/Plot.tsx index f2972a5c2ac..36f7fbb9ada 100755 --- a/packages/grafana-ui/src/components/uPlot/Plot.tsx +++ b/packages/grafana-ui/src/components/uPlot/Plot.tsx @@ -25,6 +25,7 @@ export const UPlotChart: React.FC = (props) => { props.timeZone, props.config ); + const getPlotInstance = useCallback(() => { return plotInstance.current; }, []); diff --git a/packages/grafana-ui/src/components/uPlot/utils.ts b/packages/grafana-ui/src/components/uPlot/utils.ts index e63dd00132f..760b0d52e71 100755 --- a/packages/grafana-ui/src/components/uPlot/utils.ts +++ b/packages/grafana-ui/src/components/uPlot/utils.ts @@ -2,13 +2,14 @@ import throttle from 'lodash/throttle'; import { Options } from 'uplot'; import { PlotPlugin, PlotProps } from './types'; +const LOGGING_ENABLED = false; const ALLOWED_FORMAT_STRINGS_REGEX = /\b(YYYY|YY|MMMM|MMM|MM|M|DD|D|WWWW|WWW|HH|H|h|AA|aa|a|mm|m|ss|s|fff)\b/g; -export const timeFormatToTemplate = (f: string) => { +export function timeFormatToTemplate(f: string) { return f.replace(ALLOWED_FORMAT_STRINGS_REGEX, (match) => `{${match}}`); -}; +} -export const buildPlotConfig = (props: PlotProps, plugins: Record): Options => { +export function buildPlotConfig(props: PlotProps, plugins: Record): Options { return { width: props.width, height: props.height, @@ -27,10 +28,10 @@ export const buildPlotConfig = (props: PlotProps, plugins: Record { +export function isPlottingTime(config: Options) { let isTimeSeries = false; if (!config.scales) { @@ -46,17 +47,17 @@ export const isPlottingTime = (config: Options) => { } return isTimeSeries; -}; +} // Dev helpers export const throttledLog = throttle((...t: any[]) => { console.log(...t); }, 500); -export const pluginLog = (id: string, throttle = false, ...t: any[]) => { - if (process.env.NODE_ENV === 'production') { +export function pluginLog(id: string, throttle = false, ...t: any[]) { + if (process.env.NODE_ENV === 'production' || !LOGGING_ENABLED) { return; } const fn = throttle ? throttledLog : console.log; fn(`[Plugin: ${id}]: `, ...t); -}; +}