Remove "ANY" as a query quality option

pkg/sitewise/api/property_aggregate.go

@@ -30,8 +30,12 @@ func aggregateQueryToInput(query models.AssetPropertyValueQuery) *iotsitewise.Ge
 		timeOrdering   = aws.String("ASCENDING")
 	)
 
-	if query.Quality != "" && query.Quality != "ANY" {
-		qualities = aws.StringSlice([]string{query.Quality})
+	quality := query.Quality
+
+	if quality == "" || quality == "ANY" {
+		qualities = aws.StringSlice([]string{"GOOD"})
+	} else {
+		qualities = aws.StringSlice([]string{quality})
 	}
 
 	from, to := util.TimeRangeToUnix(query.TimeRange)
@@ -84,4 +88,4 @@ func GetAssetPropertyAggregates(ctx context.Context, client client.SitewiseClien
 				NextToken:        resp.NextToken,
 			},
 		}, nil
-}
+}

pkg/sitewise/api/property_aggregate_batch.go

@@ -31,8 +31,12 @@ func aggregateBatchQueryToInput(query models.AssetPropertyValueQuery) *iotsitewi
 		timeOrdering   = aws.String("ASCENDING")
 	)
 
-	if query.Quality != "" && query.Quality != "ANY" {
-		qualities = aws.StringSlice([]string{query.Quality})
+	quality := query.Quality
+
+	if quality == "" || quality == "ANY" {
+		qualities = aws.StringSlice([]string{"GOOD"})
+	} else {
+		qualities = aws.StringSlice([]string{quality})
 	}
 
 	from, to := util.TimeRangeToUnix(query.TimeRange)

pkg/sitewise/api/property_history.go

@@ -21,8 +21,12 @@ func historyQueryToInput(query models.AssetPropertyValueQuery) *iotsitewise.GetA
 		qualities []*string
 	)
 
-	if query.Quality != "" && query.Quality != "ANY" {
-		qualities = aws.StringSlice([]string{query.Quality})
+	quality := query.Quality
+
+	if quality == "" || quality == "ANY" {
+		qualities = aws.StringSlice([]string{"GOOD"})
+	} else {
+		qualities = aws.StringSlice([]string{quality})
 	}
 
 	from, to := util.TimeRangeToUnix(query.TimeRange)
@@ -66,4 +70,4 @@ func GetAssetPropertyValues(ctx context.Context, client client.SitewiseClient,
 			Query:                              modifiedQuery,
 		},
 		nil
-}
+}

pkg/sitewise/api/property_history_batch.go

@@ -22,8 +22,12 @@ func historyBatchQueryToInput(query models.AssetPropertyValueQuery) *iotsitewise
 		qualities []*string
 	)
 
-	if query.Quality != "" && query.Quality != "ANY" {
-		qualities = aws.StringSlice([]string{query.Quality})
+	quality := query.Quality
+
+	if quality == "" || quality == "ANY" {
+		qualities = aws.StringSlice([]string{"GOOD"})
+	} else {
+		qualities = aws.StringSlice([]string{quality})
 	}
 
 	from, to := util.TimeRangeToUnix(query.TimeRange)

pkg/sitewise/api/property_interpolated.go

@@ -37,7 +37,7 @@ func interpolatedQueryToInputs(query models.AssetPropertyValueQuery) []*iotsitew
 	endTimeInSeconds := to.Unix()
 
 	quality := query.Quality
-	if quality == "" || query.Quality == "ANY" {
+	if quality == "" || quality == "ANY" {
 		quality = "GOOD"
 	}
 

src/components/query/QualityAndOrderRow.tsx

@@ -37,14 +37,11 @@ const interpolatedResolutions: Array<SelectableValue<SiteWiseResolution>> = [
 ];
 
 const qualities: Array<SelectableValue<SiteWiseQuality>> = [
-  { value: SiteWiseQuality.ANY, label: 'ANY' },
   { value: SiteWiseQuality.GOOD, label: 'GOOD' },
   { value: SiteWiseQuality.BAD, label: 'BAD' },
   { 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' },
@@ -106,16 +103,14 @@ export class QualityAndOrderRow extends PureComponent<Props> {
 
   render() {
     const { query } = this.props;
-    const currQualities =
-      query.queryType === QueryType.PropertyInterpolated ? interpolatedPropertyQualities : qualities;
     return (
       <>
         <EditorField label="Quality" width={15} htmlFor="quality">
           <Select
             id="quality"
             aria-label="Quality"
-            options={currQualities}
-            value={currQualities.find((v) => v.value === query.quality) ?? currQualities[0]}
+            options={qualities}
+            value={qualities.find((v) => v.value === query.quality) ?? qualities[0]}
             onChange={this.onQualityChange}
             isSearchable={true}
             menuPlacement="auto"

src/components/query/QueryEditor.test.tsx

@@ -68,6 +68,8 @@ describe('QueryEditor', () => {
       expect(screen.getByText('Expand Time Range')).toBeInTheDocument();
       expect(screen.getByText('Time')).toBeInTheDocument();
       expect(screen.getByText('Format')).toBeInTheDocument();
+      // GOOD as the quality default
+      expect(screen.getByText('GOOD')).toBeInTheDocument();
     });
   });
 
@@ -82,6 +84,8 @@ describe('QueryEditor', () => {
       expect(screen.getByText('Quality')).toBeInTheDocument();
       expect(screen.getByText('Time')).toBeInTheDocument();
       expect(screen.getByText('Format')).toBeInTheDocument();
+      // GOOD as the quality default
+      expect(screen.getByText('GOOD')).toBeInTheDocument();
     });
   });
 
@@ -98,6 +102,8 @@ describe('QueryEditor', () => {
       expect(screen.getByText('Quality')).toBeInTheDocument();
       expect(screen.getByText('Format')).toBeInTheDocument();
       expect(screen.getByText('Resolution')).toBeInTheDocument();
+      // GOOD as the quality default
+      expect(screen.getByText('GOOD')).toBeInTheDocument();
     });
   });
 
@@ -111,10 +117,8 @@ describe('QueryEditor', () => {
       expect(screen.getByText('Quality')).toBeInTheDocument();
       expect(screen.getByText('Resolution')).toBeInTheDocument();
       expect(screen.getByText('Format')).toBeInTheDocument();
-
-      // Interpolated Property queries should not have ANY as the quality default
+      // GOOD as the quality default
       expect(screen.getByText('GOOD')).toBeInTheDocument();
-      expect(screen.queryByText('ANY')).not.toBeInTheDocument();
     });
   });
 
@@ -134,6 +138,8 @@ describe('QueryEditor', () => {
       expect(screen.getByText('Client cache')).toBeInTheDocument();
       expect(screen.getByText('Time')).toBeInTheDocument();
       expect(screen.getByText('Format')).toBeInTheDocument();
+      // GOOD as the quality default
+      expect(screen.getByText('GOOD')).toBeInTheDocument();
     });
   });