Revert "Merge pull request #1585 from influxdata/revert-auto-func"

This reverts commit 5a37e8f, reversing
changes made to 8bb869a.

CHANGELOG.md

@@ -36,6 +36,7 @@
   1. [#1567](https://github.com/influxdata/chronograf/pull/1567): Replace the user icon with a solid style
   1. [#1561](https://github.com/influxdata/chronograf/pull/1561): Disable query save in cell editor mode if the query does not have a database, measurement, and field
   1. [#1575](https://github.com/influxdata/chronograf/pull/1575): Improve UX of applying functions to fields in the query builder
+  1. [#1560](https://github.com/influxdata/chronograf/pull/1560): Apply mean to fields by default
 
 ## v1.3.1.0 [2017-05-22]
 

ui/spec/data_explorer/reducers/queryConfigSpec.js

@@ -149,23 +149,22 @@ describe('Chronograf.Reducers.queryConfig', () => {
         expect(newState[queryId].fields[1].field).to.equal('a different field')
       })
 
-      // TODO: uncomment when automatically applied funtions are added back to the code
-      // it('applies a funcs to newly selected fields', () => {
-      //   expect(state[queryId].fields.length).to.equal(1)
-
-      //   const oneFieldOneFunc = reducer(
-      //     state,
-      //     applyFuncsToField(queryId, {field: 'a great field', funcs: ['func1']})
-      //   )
-
-      //   const newState = reducer(
-      //     oneFieldOneFunc,
-      //     toggleField(queryId, {field: 'a different field', funcs: []})
-      //   )
-
-      //   expect(newState[queryId].fields[1].funcs.length).to.equal(1)
-      //   expect(newState[queryId].fields[1].funcs[0]).to.equal('func1')
-      // })
+      it('applies a funcs to newly selected fields', () => {
+        expect(state[queryId].fields.length).to.equal(1)
+
+        const oneFieldOneFunc = reducer(
+          state,
+          applyFuncsToField(queryId, {field: 'a great field', funcs: ['func1']})
+        )
+
+        const newState = reducer(
+          oneFieldOneFunc,
+          toggleField(queryId, {field: 'a different field', funcs: []})
+        )
+
+        expect(newState[queryId].fields[1].funcs.length).to.equal(1)
+        expect(newState[queryId].fields[1].funcs[0]).to.equal('func1')
+      })
     })
   })
 

ui/src/utils/queryTransitions.js

@@ -42,9 +42,17 @@ export const toggleField = (query, {field, funcs}, isKapacitorRule = false) => {
     }
   }
 
+  let newFuncs = ['mean']
+  if (query.fields.length) {
+    newFuncs = query.fields.find(f => f.funcs).funcs
+  }
+
   return {
     ...query,
-    fields: query.fields.concat({field, funcs}),
+    fields: query.fields.concat({
+      field,
+      funcs: newFuncs,
+    }),
   }
 }