From 90b642e1eb71854e3168a6d8a8b52ed3033135ea Mon Sep 17 00:00:00 2001
From: rmilea <robert.milea@ni.com>
Date: Tue, 20 Aug 2024 16:02:17 +0300
Subject: [PATCH] feedback 3

---
 src/datasources/asset/AssetDataSource.ts                      | 2 +-
 .../components/AssetQueryCalibrationForecastEditor.test.tsx   | 4 ++--
 .../asset/components/AssetQueryCalibrationForecastEditor.tsx  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/datasources/asset/AssetDataSource.ts b/src/datasources/asset/AssetDataSource.ts
index 2ae3e788..da97a43b 100644
--- a/src/datasources/asset/AssetDataSource.ts
+++ b/src/datasources/asset/AssetDataSource.ts
@@ -89,7 +89,7 @@ export class AssetDataSource extends DataSourceBase<AssetQuery> {
 
     const calibrationForecastResponse: CalibrationForecastResponse = await this.queryCalibrationForecast(query.groupBy, from, to);
 
-    result.fields = calibrationForecastResponse.calibrationForecast.columns;
+    result.fields = calibrationForecastResponse.calibrationForecast.columns || [];
 
     return result;
   }
diff --git a/src/datasources/asset/components/AssetQueryCalibrationForecastEditor.test.tsx b/src/datasources/asset/components/AssetQueryCalibrationForecastEditor.test.tsx
index f32bd90a..a7077385 100644
--- a/src/datasources/asset/components/AssetQueryCalibrationForecastEditor.test.tsx
+++ b/src/datasources/asset/components/AssetQueryCalibrationForecastEditor.test.tsx
@@ -3,7 +3,7 @@ import { setupRenderer } from '../../../test/fixtures';
 import { SystemMetadata } from '../../system/types';
 import { AssetDataSource } from '../AssetDataSource';
 import { AssetQueryEditor } from './AssetQueryEditor';
-import { AssetCalibrationForecastGroupByType, AssetCalibrationForecastQuery, AssetMetadataQuery, AssetQueryLabel, AssetQueryType } from '../types';
+import { AssetCalibrationForecastGroupByType, AssetCalibrationForecastQuery, AssetQueryLabel, AssetQueryType } from '../types';
 import { select } from 'react-select-event';
 
 const fakeSystems: SystemMetadata[] = [
@@ -28,7 +28,7 @@ class FakeAssetDataSource extends AssetDataSource {
 const render = setupRenderer(AssetQueryEditor, FakeAssetDataSource);
 
 it('renders with query type calibration forecast', async () => {
-  render({ queryKind: AssetQueryType.CalibrationForecast } as AssetMetadataQuery);
+  render({ queryKind: AssetQueryType.CalibrationForecast } as AssetCalibrationForecastQuery);
 
   expect(screen.getByRole('radio', { name: AssetQueryLabel.CalibrationForecast })).toBeChecked();
   const groupBy = screen.getAllByRole('combobox')[0];
diff --git a/src/datasources/asset/components/AssetQueryCalibrationForecastEditor.tsx b/src/datasources/asset/components/AssetQueryCalibrationForecastEditor.tsx
index c9d36f96..91d32a30 100644
--- a/src/datasources/asset/components/AssetQueryCalibrationForecastEditor.tsx
+++ b/src/datasources/asset/components/AssetQueryCalibrationForecastEditor.tsx
@@ -52,6 +52,6 @@ export function QueryCalibrationForecastEditor({ query, handleQueryChange, datas
 
 const tooltips = {
   calibrationForecast: {
-    groupBy: `Group the calibration forecast by day, week, or month. Only one time based grouping is allowed.`
+    groupBy: `Group the calibration forecast by day, week, month or location. Only one time based grouping is allowed.`
   },
 };