fix(fluxWizard): repair tag values selection

ui/src/shared/components/TimeMachine/fluxQueryBuilder/TagSelector.tsx

@@ -69,7 +69,7 @@ const TagSelectorBody = (props: Props) => {
     keysSearchTerm,
     onChangeKeysSearchTerm,
     onSearchKeys,
-    selectedValues,
+    tagValues: selectedValues,
   } = props
   if (aggregateFunctionType === 'filter') {
     if (keysStatus === RemoteDataState.Error) {
@@ -162,7 +162,7 @@ const TagSelectorValues = (props: Props) => {
     tagIndex,
     values,
     valuesStatus,
-    selectedValues,
+    tagValues: selectedValues,
     onSelectValues,
   } = props
   if (keysStatus === RemoteDataState.NotStarted) {

ui/src/shared/components/TimeMachine/fluxQueryBuilder/actions/thunks.ts

@@ -131,7 +131,7 @@ const loadTagSelectorValuesThunk = (
 
   try {
     let values: string[]
-    const originalSelected = tagState.selectedValues || []
+    const originalSelected = tagState.tagValues || []
     let selectedValues = originalSelected
     if (tagState.aggregateFunctionType === 'filter') {
       dispatch(tagActions.setValuesStatus(tagIndex, RemoteDataState.Loading))
@@ -145,7 +145,7 @@ const loadTagSelectorValuesThunk = (
         searchTerm: tagState.valuesSearchTerm,
         timeRange,
       })
-      for (const selectedValue of tagState.selectedValues) {
+      for (const selectedValue of tagState.tagValues) {
         // Even if the selected values didn't come back in the results, let them
         // be selected anyway
         if (!values.includes(selectedValue)) {
@@ -162,7 +162,7 @@ const loadTagSelectorValuesThunk = (
       values = [...values, ...ADDITIONAL_GROUP_BY_COLUMNS]
       const valuesSearchTerm = (tagState.valuesSearchTerm || '').toLowerCase()
       values = values.filter(x => x.includes(valuesSearchTerm))
-      selectedValues = tagState.selectedValues.filter(x => values.includes(x))
+      selectedValues = tagState.tagValues.filter(x => values.includes(x))
     }
 
     dispatch(tagActions.setValues(tagIndex, values))

ui/src/shared/components/TimeMachine/fluxQueryBuilder/apis/QueryBuilderFetcher.ts

@@ -17,7 +17,7 @@ type CancelableQuery = CancelBox<string[]>
 function tagSelectionKey(tags: BuilderTagsType[]): any[] {
   return tags.map(x => ({
     k: x.tagKey || '',
-    v: x.values || [],
+    v: x.tagValues || [],
     t: x.aggregateFunctionType,
   }))
 }

ui/src/shared/components/TimeMachine/fluxQueryBuilder/apis/queryBuilder.ts

@@ -134,7 +134,7 @@ export function extractCol(csv: string, colName: string): string[] {
 
 export function formatTagFilterPredicate(tagsSelections: BuilderTagsType[]) {
   const validSelections = tagsSelections.filter(
-    ({tagKey: key, values}) => key && values.length
+    ({tagKey, tagValues}) => tagKey && tagValues.length
   )
 
   if (!validSelections.length) {
@@ -166,7 +166,7 @@ export function formatTimeRangeArguments(timeRange: TimeRange): string {
 }
 
 export function tagToFlux(tag: BuilderTagsType) {
-  return tag.values
+  return tag.tagValues
     .map(
       value =>
         `r["${tag.tagKey}"] == "${value

ui/src/shared/components/TimeMachine/fluxQueryBuilder/reducers/tags.ts

@@ -17,7 +17,7 @@ export function initialSelectorState(
     values: [],
     valuesSearchTerm: '',
     valuesStatus: undefined,
-    selectedValues: [],
+    tagValues: [],
   }
 }
 
@@ -60,7 +60,7 @@ const aggregationReducer = (
     case 'FQB_TAG_CHANGE_TYPE': {
       return changeTagSelector(state, action.payload.tagIndex, () => ({
         aggregateFunctionType: action.payload.type,
-        selectedValues: [],
+        tagValues: [],
         valuesSearchTerm: '',
       }))
     }
@@ -83,7 +83,7 @@ const aggregationReducer = (
     }
     case 'FQB_TAG_SELECT_VALUES': {
       return changeTagSelector(state, action.payload.tagIndex, () => ({
-        selectedValues: action.payload.values,
+        tagValues: action.payload.values,
       }))
     }
     case 'FQB_TAG_SEARCH_KEY': {

ui/src/shared/components/TimeMachine/fluxQueryBuilder/types/index.ts

@@ -29,12 +29,12 @@ export interface TagSelectorState extends BuilderTagsType {
 
   valuesSearchTerm: string
   valuesStatus?: RemoteDataState
-  selectedValues: string[]
+  values: string[]
 }
 
 export interface BuilderTagsType {
   tagKey: string
-  values: string[]
+  tagValues: string[]
   aggregateFunctionType: BuilderAggregateFunctionType
 }