Don't 'shorten' the aggregation or breakout options fields, we need the full...

Don't 'shorten' the aggregation or breakout options fields, we need the full field metadata for joins (and it shouldn't take any extra memory since we're not copying the fields

resources/frontend_client/app/explore/explore.services.js

@@ -246,22 +246,16 @@ ExploreServices.service('CorvusFormGenerator', [function() {
     }
 
     // Breakouts and Aggregation options
-    function shortenFields(fields) {
-        return _.map(fields, function(field) {
-            return [field.id, field.display_name, field];
-        });
-    }
-
     function allFields(fields) {
-        return shortenFields(fields);
+        return fields;
     }
 
     function summableFields(fields) {
-        return shortenFields(_.filter(fields, isSummable));
+        return _.filter(fields, isSummable);
     }
 
     function dimensionFields(fields) {
-        return shortenFields(_.filter(fields, isDimension));
+        return _.filter(fields, isDimension);
     }
 
     var Aggregators = [{

resources/frontend_client/app/query_builder/aggregation_widget.react.js

@@ -26,7 +26,7 @@ export default React.createClass({
 
             if (option.fields &&
                     (option.fields.length === 0 ||
-                        (option.fields.length > 0 && option.fields[0].length && option.fields[0].length > 0))) {
+                        (option.fields.length > 0 && option.fields[0]))) {
                 availableAggregations.push(option);
             }
 
@@ -92,7 +92,7 @@ export default React.createClass({
                     <FieldWidget
                         className="View-section-aggregation-target SelectionModule p1"
                         field={this.props.aggregation[1]}
-                        fields={this.state.aggregationFields.map((f) => f[2])}
+                        fields={this.state.aggregationFields}
                         tableName="Foo"
                         setField={this.setAggregationTarget}
                     />

resources/frontend_client/app/query_builder/data_reference_field.react.js

@@ -102,7 +102,7 @@ export default React.createClass({
 
         var useForCurrentQuestion;
         if (validForCurrentQuestion) {
-            var validBreakout = this.state.table && this.state.table.breakout_options.fields.filter((f) => f[0] === this.props.field.id).length > 0;
+            var validBreakout = this.state.table && this.state.table.breakout_options.fields.filter((f) => f.id === this.props.field.id).length > 0;
             var useForCurrentQuestionArray = [];
             useForCurrentQuestionArray.push(
                 <li key="filter-by" className="mt1">

resources/frontend_client/app/query_builder/gui_query_editor.react.js

@@ -240,7 +240,7 @@ export default React.createClass({
             var usedFields = {};
             breakoutList = this.props.query.query.breakout.map((breakout, index) => {
                 var breakoutListOpen = breakout === null;
-                var unusedFields = this.props.options.breakout_options.fields.filter((f) => !usedFields[f[0]])
+                var unusedFields = this.props.options.breakout_options.fields.filter((f) => !usedFields[f.id])
 
                 if (breakout) {
                     usedFields[breakout] = true;
@@ -255,10 +255,10 @@ export default React.createClass({
                         key={index}
                         className="View-section-breakout"
                         placeholder='field'
-                        display="1"
+                        display="display_name"
                         items={unusedFields}
                         selectedValue={breakout}
-                        selectedKey="0"
+                        selectedKey="id"
                         index={index}
                         isInitiallyOpen={breakoutListOpen}
                         action={this.updateDimension}