Use original breakout dimesnion when adding order by clause

frontend/src/metabase/query_builder/components/FieldList.jsx

@@ -37,6 +37,7 @@ type Props = {
 
   alwaysExpanded?: boolean,
   enableSubDimensions?: boolean,
+  useOriginalDimension?: boolean,
 
   hideSectionHeader?: boolean,
 };
@@ -213,6 +214,7 @@ export default class FieldList extends Component {
     const {
       field,
       enableSubDimensions,
+      useOriginalDimension,
       onFilterChange,
       onFieldChange,
     } = this.props;
@@ -222,7 +224,9 @@ export default class FieldList extends Component {
       // ensure if we select the same item we don't reset datetime-field's unit
       onFieldChange(field);
     } else {
-      const dimension = item.dimension.defaultDimension() || item.dimension;
+      const dimension = useOriginalDimension
+        ? item.dimension
+        : item.dimension.defaultDimension() || item.dimension;
       const shouldExcludeBinning =
         !enableSubDimensions && dimension instanceof BinnedDimension;
 

frontend/src/metabase/query_builder/components/FieldWidget.jsx

@@ -30,11 +30,13 @@ export default class FieldWidget extends Component {
     isInitiallyOpen: PropTypes.bool,
     tableMetadata: PropTypes.object.isRequired,
     enableSubDimensions: PropTypes.bool,
+    useOriginalDimension: PropTypes.bool,
   };
 
   static defaultProps = {
     color: "brand",
     enableSubDimensions: true,
+    useOriginalDimension: false,
   };
 
   setField(value) {
@@ -60,6 +62,7 @@ export default class FieldWidget extends Component {
             customFieldOptions={this.props.customFieldOptions}
             onFieldChange={this.setField}
             enableSubDimensions={this.props.enableSubDimensions}
+            useOriginalDimension={this.props.useOriginalDimension}
           />
         </Popover>
       );

frontend/src/metabase/query_builder/components/SortWidget.jsx

@@ -76,6 +76,7 @@ export default class SortWidget extends Component {
           setField={this.setField}
           isInitiallyOpen={this.state.field === null}
           enableSubDimensions={false}
+          useOriginalDimension={true}
         />
 
         <SelectionModule