From cc2f2976dd25c7e7aaf2f6811b7e4d8a5a2db85f Mon Sep 17 00:00:00 2001
From: Isabella Siu <isabella.siu@grafana.com>
Date: Fri, 12 Jul 2024 17:08:11 -0400
Subject: [PATCH 1/3] Remove ANY option for interpolated property quality

---
 pkg/sitewise/api/property_interpolated.go   | 2 +-
 src/components/query/QualityAndOrderRow.tsx | 8 ++++++--
 src/components/query/QueryEditor.test.tsx   | 4 ++++
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkg/sitewise/api/property_interpolated.go b/pkg/sitewise/api/property_interpolated.go
index 84d8514e..d9d1caec 100644
--- a/pkg/sitewise/api/property_interpolated.go
+++ b/pkg/sitewise/api/property_interpolated.go
@@ -37,7 +37,7 @@ func interpolatedQueryToInputs(query models.AssetPropertyValueQuery) []*iotsitew
 	endTimeInSeconds := to.Unix()
 
 	quality := query.Quality
-	if quality == "" {
+	if quality == "" || query.Quality == "ANY" {
 		quality = "GOOD"
 	}
 
diff --git a/src/components/query/QualityAndOrderRow.tsx b/src/components/query/QualityAndOrderRow.tsx
index 4e3ee2f7..b397bcf0 100644
--- a/src/components/query/QualityAndOrderRow.tsx
+++ b/src/components/query/QualityAndOrderRow.tsx
@@ -104,14 +104,18 @@ export class QualityAndOrderRow extends PureComponent<Props> {
 
   render() {
     const { query } = this.props;
+    let currQualites = qualities;
+    if (query.queryType === QueryType.PropertyInterpolated) {
+      currQualites = qualities.slice(1);
+    }
     return (
       <>
         <EditorField label="Quality" width={15} htmlFor="quality">
           <Select
             id="quality"
             aria-label="Quality"
-            options={qualities}
-            value={qualities.find((v) => v.value === query.quality) ?? qualities[0]}
+            options={currQualites}
+            value={currQualites.find((v) => v.value === query.quality) ?? currQualites[0]}
             onChange={this.onQualityChange}
             isSearchable={true}
             menuPlacement="auto"
diff --git a/src/components/query/QueryEditor.test.tsx b/src/components/query/QueryEditor.test.tsx
index e25e1238..e14496d0 100644
--- a/src/components/query/QueryEditor.test.tsx
+++ b/src/components/query/QueryEditor.test.tsx
@@ -111,6 +111,10 @@ describe('QueryEditor', () => {
       expect(screen.getByText('Quality')).toBeInTheDocument();
       expect(screen.getByText('Resolution')).toBeInTheDocument();
       expect(screen.getByText('Format')).toBeInTheDocument();
+
+      // Interpolatged Property queries should not have ANY as the quality default
+      expect(screen.getByText('GOOD')).toBeInTheDocument();
+      expect(screen.queryByText('ANY')).not.toBeInTheDocument();
     });
   });
 

From a4575d6303071c32fb9f78fdc79534eda5d9ad98 Mon Sep 17 00:00:00 2001
From: Isabella Siu <isabella.siu@grafana.com>
Date: Fri, 12 Jul 2024 17:40:08 -0400
Subject: [PATCH 2/3] fix spelling

---
 src/components/query/QualityAndOrderRow.tsx | 8 ++++----
 src/components/query/QueryEditor.test.tsx   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/components/query/QualityAndOrderRow.tsx b/src/components/query/QualityAndOrderRow.tsx
index b397bcf0..3926bd63 100644
--- a/src/components/query/QualityAndOrderRow.tsx
+++ b/src/components/query/QualityAndOrderRow.tsx
@@ -104,9 +104,9 @@ export class QualityAndOrderRow extends PureComponent<Props> {
 
   render() {
     const { query } = this.props;
-    let currQualites = qualities;
+    let currQualities = qualities;
     if (query.queryType === QueryType.PropertyInterpolated) {
-      currQualites = qualities.slice(1);
+      currQualities = qualities.slice(1);
     }
     return (
       <>
@@ -114,8 +114,8 @@ export class QualityAndOrderRow extends PureComponent<Props> {
           <Select
             id="quality"
             aria-label="Quality"
-            options={currQualites}
-            value={currQualites.find((v) => v.value === query.quality) ?? currQualites[0]}
+            options={currQualities}
+            value={currQualities.find((v) => v.value === query.quality) ?? currQualities[0]}
             onChange={this.onQualityChange}
             isSearchable={true}
             menuPlacement="auto"
diff --git a/src/components/query/QueryEditor.test.tsx b/src/components/query/QueryEditor.test.tsx
index e14496d0..de27022f 100644
--- a/src/components/query/QueryEditor.test.tsx
+++ b/src/components/query/QueryEditor.test.tsx
@@ -112,7 +112,7 @@ describe('QueryEditor', () => {
       expect(screen.getByText('Resolution')).toBeInTheDocument();
       expect(screen.getByText('Format')).toBeInTheDocument();
 
-      // Interpolatged Property queries should not have ANY as the quality default
+      // Interpolated Property queries should not have ANY as the quality default
       expect(screen.getByText('GOOD')).toBeInTheDocument();
       expect(screen.queryByText('ANY')).not.toBeInTheDocument();
     });

From 02dd37cca7a157189325f703c7f59af4ebb302b5 Mon Sep 17 00:00:00 2001
From: Isabella Siu <isabella.siu@grafana.com>
Date: Mon, 22 Jul 2024 11:11:21 -0400
Subject: [PATCH 3/3] kevin comments

---
 src/components/query/QualityAndOrderRow.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/query/QualityAndOrderRow.tsx b/src/components/query/QualityAndOrderRow.tsx
index 3926bd63..5f33726c 100644
--- a/src/components/query/QualityAndOrderRow.tsx
+++ b/src/components/query/QualityAndOrderRow.tsx
@@ -43,6 +43,8 @@ const qualities: Array<SelectableValue<SiteWiseQuality>> = [
   { value: SiteWiseQuality.UNCERTAIN, label: 'UNCERTAIN' },
 ];
 
+const interpolatedPropertyQualities: Array<SelectableValue<SiteWiseQuality>> = qualities.slice(1);
+
 const ordering: Array<SelectableValue<SiteWiseTimeOrder>> = [
   { value: SiteWiseTimeOrder.ASCENDING, label: 'ASCENDING' },
   { value: SiteWiseTimeOrder.DESCENDING, label: 'DESCENDING' },
@@ -104,10 +106,8 @@ export class QualityAndOrderRow extends PureComponent<Props> {
 
   render() {
     const { query } = this.props;
-    let currQualities = qualities;
-    if (query.queryType === QueryType.PropertyInterpolated) {
-      currQualities = qualities.slice(1);
-    }
+    const currQualities =
+      query.queryType === QueryType.PropertyInterpolated ? interpolatedPropertyQualities : qualities;
     return (
       <>
         <EditorField label="Quality" width={15} htmlFor="quality">