perf: auto select min, max, and mean

ui/cypress/e2e/explorer.test.ts

@@ -390,10 +390,7 @@ describe('DataExplorer', () => {
       cy.get('.view-line')
         .first()
         .contains('import')
-      // check to see if new aggregate rate is at the bottom
-      cy.get('.view-line')
-        .last()
-        .contains('aggregate.')
+
       cy.getByTestID('flux-editor').should('exist')
       cy.getByTestID('flux-editor').within(() => {
         cy.get('textarea').type('yoyoyoyoyo', {force: true})

ui/src/shared/utils/resourceToTemplate.test.ts

@@ -367,7 +367,11 @@ describe('resourceToTemplate', () => {
                             aggregateFunctionType: 'filter',
                           },
                         ],
-                        functions: [{name: 'mean'}],
+                        functions: [
+                          {name: 'mean'},
+                          {name: 'min'},
+                          {name: 'max'},
+                        ],
                         aggregateWindow: {period: 'auto', fillValues: false},
                       },
                     },

ui/src/timeMachine/components/FunctionModeSelector.tsx

@@ -17,8 +17,8 @@ import SelectorList from 'src/timeMachine/components/SelectorList'
 //Actions
 import {
   multiSelectBuilderFunction,
-  singleSelectBuilderFunction,
   setFunctions,
+  singleSelectBuilderFunction,
 } from 'src/timeMachine/actions/queryBuilder'
 
 // Utils
@@ -36,16 +36,13 @@ type Props = ReduxProps
 const FunctionSelector: FunctionComponent<Props> = ({
   onSetFunctions,
   selectedFunctions,
-  onSingleSelectBuilderFunction,
-  onMultiSelectBuilderFunction,
+  onSingleSelectFunc,
+  onMultiSelectFunc,
   isInCheckOverlay,
 }) => {
   const autoFunctions = AUTO_FUNCTIONS.map(f => f.name)
-  const [isAutoFunction, setIsAutoFunction] = useState(
-    !isInCheckOverlay &&
-      selectedFunctions.length === 1 &&
-      autoFunctions.includes(selectedFunctions[0])
-  )
+
+  const [isAutoFunction, setIsAutoFunction] = useState(!isInCheckOverlay)
 
   const functionList = isAutoFunction
     ? autoFunctions
@@ -56,24 +53,20 @@ const FunctionSelector: FunctionComponent<Props> = ({
       setIsAutoFunction(false)
       return
     }
+
     const newFunctions = selectedFunctions.filter(f =>
       autoFunctions.includes(f)
     )
+
     if (newFunctions.length === 0) {
-      onSetFunctions([autoFunctions[0]])
-    } else if (newFunctions.length > 1) {
-      onSetFunctions([newFunctions[0]])
+      onSetFunctions(['mean', 'max', 'min'])
     } else {
       onSetFunctions(newFunctions)
     }
 
     setIsAutoFunction(true)
   }
 
-  const onSelectFunction = isAutoFunction
-    ? onSingleSelectBuilderFunction
-    : onMultiSelectBuilderFunction
-
   if (isInCheckOverlay) {
     return (
       <>
@@ -84,7 +77,7 @@ const FunctionSelector: FunctionComponent<Props> = ({
         <SelectorList
           items={functionList}
           selectedItems={selectedFunctions}
-          onSelectItem={onSingleSelectBuilderFunction}
+          onSelectItem={onSingleSelectFunc}
           multiSelect={false}
         />
       </>
@@ -135,8 +128,8 @@ const FunctionSelector: FunctionComponent<Props> = ({
       <SelectorList
         items={functionList}
         selectedItems={selectedFunctions}
-        onSelectItem={onSelectFunction}
-        multiSelect={!isAutoFunction}
+        onSelectItem={onMultiSelectFunc}
+        multiSelect={true}
       />
     </>
   )
@@ -152,8 +145,8 @@ const mstp = (state: AppState) => {
 }
 
 const mdtp = {
-  onMultiSelectBuilderFunction: multiSelectBuilderFunction,
-  onSingleSelectBuilderFunction: singleSelectBuilderFunction,
+  onMultiSelectFunc: multiSelectBuilderFunction,
+  onSingleSelectFunc: singleSelectBuilderFunction,
   onSetFunctions: setFunctions,
 }
 

ui/src/timeMachine/constants/queryBuilder.ts

@@ -61,6 +61,14 @@ export const AUTO_FUNCTIONS: QueryFn[] = [
     name: 'mean',
     flux: (period, fillValues) => genFlux('mean', period, fillValues),
   },
+  {
+    name: 'max',
+    flux: (period, fillValues) => genFlux('max', period, fillValues),
+  },
+  {
+    name: 'min',
+    flux: (period, fillValues) => genFlux('min', period, fillValues),
+  },
   {
     name: 'median',
     flux: (period, fillValues) => genFlux('median', period, fillValues),
@@ -72,8 +80,14 @@ export const AUTO_FUNCTIONS: QueryFn[] = [
 ]
 
 export const FUNCTIONS: QueryFn[] = [
-  AUTO_FUNCTIONS[0],
-  AUTO_FUNCTIONS[1],
+  {
+    name: 'mean',
+    flux: (period, fillValues) => genFlux('mean', period, fillValues),
+  },
+  {
+    name: 'median',
+    flux: (period, fillValues) => genFlux('median', period, fillValues),
+  },
   {
     name: 'max',
     flux: (period, fillValues) => genFlux('max', period, fillValues),
@@ -123,7 +137,10 @@ export const FUNCTIONS: QueryFn[] = [
     name: 'first',
     flux: (period, fillValues) => genFlux('first', period, fillValues),
   },
-  AUTO_FUNCTIONS[2],
+  {
+    name: 'last',
+    flux: (period, fillValues) => genFlux('last', period, fillValues),
+  },
   {
     name: 'unique',
     flux: (period, fillValues) => genFlux('unique', period, fillValues),

ui/src/timeMachine/reducers/index.ts

@@ -41,10 +41,12 @@ import {Action} from 'src/timeMachine/actions'
 import {TimeMachineTab} from 'src/types/timeMachine'
 import {BuilderAggregateFunctionType} from 'src/client/generatedRoutes'
 
+type Functions = {name: string}[]
+
 interface QueryBuilderState {
   buckets: string[]
   bucketsStatus: RemoteDataState
-  functions: Array<[{name: string}]>
+  functions: Functions[]
   aggregateWindow: BuilderConfigAggregateWindow
   tags: Array<{
     aggregateFunctionType: BuilderAggregateFunctionType

ui/src/views/helpers/index.ts

@@ -58,7 +58,7 @@ export function defaultBuilderConfig(): BuilderConfig {
   return {
     buckets: [],
     tags: [{key: '_measurement', values: [], aggregateFunctionType: 'filter'}],
-    functions: [{name: 'mean'}],
+    functions: [{name: 'mean'}, {name: 'min'}, {name: 'max'}],
     aggregateWindow: {period: AGG_WINDOW_AUTO, fillValues: DEFAULT_FILLVALUES},
   }
 }