From 5dac6ab610f42908f965debe8f2d7213343eda3f Mon Sep 17 00:00:00 2001
From: Maja Komel <maja.komel@gmail.com>
Date: Thu, 24 Nov 2022 17:41:56 +0100
Subject: [PATCH] Fix server errors due to missing vars

---
 components/aggregation/mat/ChartHeader.js | 8 ++++----
 components/aggregation/mat/RowChart.js    | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/components/aggregation/mat/ChartHeader.js b/components/aggregation/mat/ChartHeader.js
index cbb180797..95d4ffe03 100644
--- a/components/aggregation/mat/ChartHeader.js
+++ b/components/aggregation/mat/ChartHeader.js
@@ -33,10 +33,10 @@ export const SubtitleStr = ({ query }) => {
   const intl = useIntl()
   const params = new Set()
 
-  const testName = intl.formatMessage({id: getRowLabel(query.test_name, 'test_name')})
-  params.add(testName)
-
-
+  if (query.test_name) {
+    const testName = intl.formatMessage({id: getRowLabel(query.test_name, 'test_name')})
+    params.add(testName)
+  }
   if (query.domain) {
     params.add(query.domain)
   }
diff --git a/components/aggregation/mat/RowChart.js b/components/aggregation/mat/RowChart.js
index 23d7602b0..4b3dca59e 100644
--- a/components/aggregation/mat/RowChart.js
+++ b/components/aggregation/mat/RowChart.js
@@ -153,8 +153,8 @@ const RowChart = ({ data, indexBy, label, height, rowIndex /* width, first, last
   const chartProps = useMemo(() => {
     const xAxisTicks = getXAxisTicks(query)
     chartProps1D.axisBottom.tickValues = xAxisTicks
-    chartProps1D.axisBottom.legend = intl.formatMessage(messages[`x_axis.${query.axis_x}`])
-    return label === undefined ? chartProps1D : chartProps2D
+    chartProps1D.axisBottom.legend = query.axis_x ? intl.formatMessage(messages[`x_axis.${query.axis_x}`]) : ''
+      return label === undefined ? chartProps1D : chartProps2D
   }, [intl, label, query])
 
   return (