From 8e7ace02a86a554fcc4f924dbd1df3bdc25184de Mon Sep 17 00:00:00 2001 From: Eric Wei Date: Thu, 28 Oct 2021 09:44:23 -0700 Subject: [PATCH 1/2] changes for adopting new sql artifact Signed-off-by: Eric Wei --- .../hooks/use_fetch_visualizations.ts | 2 +- .../count_distribution/count_distribution.tsx | 22 +++++-------------- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/dashboards-observability/public/components/explorer/hooks/use_fetch_visualizations.ts b/dashboards-observability/public/components/explorer/hooks/use_fetch_visualizations.ts index 79e3e3c32..87c9cc134 100644 --- a/dashboards-observability/public/components/explorer/hooks/use_fetch_visualizations.ts +++ b/dashboards-observability/public/components/explorer/hooks/use_fetch_visualizations.ts @@ -73,7 +73,7 @@ export const useFetchVisualizations = ({ const cur = queriesRef.current; const rawQuery = cur![requestParams.tabId][FINAL_QUERY]; fetchVisualizations({ - query: `${rawQuery} | stats count() by span(timestamp, '1${interval = interval ? interval: 'm' }')` }, + query: `${rawQuery} | stats count() by span(timestamp, 1${interval = interval ? interval: 'm' })` }, 'viz', (res: any) => { dispatch(renderCountDis({ diff --git a/dashboards-observability/public/components/explorer/visualizations/count_distribution/count_distribution.tsx b/dashboards-observability/public/components/explorer/visualizations/count_distribution/count_distribution.tsx index a31df4287..7fe2c030f 100644 --- a/dashboards-observability/public/components/explorer/visualizations/count_distribution/count_distribution.tsx +++ b/dashboards-observability/public/components/explorer/visualizations/count_distribution/count_distribution.tsx @@ -16,11 +16,13 @@ export const CountDistribution = ({ countDistribution }: any) => { - if (!countDistribution || !countDistribution.data) return null; + if ( + !countDistribution || + !countDistribution?.data || + !countDistribution?.metadata || + !countDistribution?.metadata?.fields + ) return null; - const meta = countDistribution.metadata; - const xkey = meta?.xfield?.name; - const ykey = meta?.yfield?.name; const layout = { showlegend: true, margin: { @@ -32,24 +34,12 @@ export const CountDistribution = ({ }, height: 220 }; - const config = {}; - const xaxis = { - autorange: true - }; - const yaxis = { - fixedrange: true - }; - - if (!xkey || !ykey) { - return null; - } return ( ); }; \ No newline at end of file From a2d1179c0e510136103b26b9bb8111af6cdb0956 Mon Sep 17 00:00:00 2001 From: Eric Wei Date: Thu, 28 Oct 2021 10:02:51 -0700 Subject: [PATCH 2/2] minor changes Signed-off-by: Eric Wei --- .../count_distribution/count_distribution.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dashboards-observability/public/components/explorer/visualizations/count_distribution/count_distribution.tsx b/dashboards-observability/public/components/explorer/visualizations/count_distribution/count_distribution.tsx index 7fe2c030f..c332986b6 100644 --- a/dashboards-observability/public/components/explorer/visualizations/count_distribution/count_distribution.tsx +++ b/dashboards-observability/public/components/explorer/visualizations/count_distribution/count_distribution.tsx @@ -18,9 +18,9 @@ export const CountDistribution = ({ if ( !countDistribution || - !countDistribution?.data || - !countDistribution?.metadata || - !countDistribution?.metadata?.fields + !countDistribution.data || + !countDistribution.metadata || + !countDistribution.metadata.fields ) return null; const layout = {