Added onclick functions to fields to group by

frontend/src/metabase/reference/components/FieldToGroupBy.jsx

@@ -18,21 +18,22 @@ const FieldToGroupBy = ({
     secondaryOnClick,
 }) => 
     <div className={className}>
-        <span className={Q.queryButton} onClick={onClick}>
+        <a className={Q.queryButton} onClick={onClick}>
             <span className={S.fieldToGroupByText}>
                 <span>
                     {`${metric.name} by `}
                 </span>
                 <span className="ml1 text-brand">
-                    {field.name}
+                    {field.display_name}
                 </span>
             </span>
             <Icon 
                 className={iconClass} 
                 size={20} 
                 name="reference"
+                onClick={secondaryOnClick}
             />
-        </span>
+        </a>
     </div>;
 FieldToGroupBy.propTypes = {
     className: PropTypes.string,

frontend/src/metabase/reference/components/FieldsToGroupBy.jsx

@@ -33,15 +33,15 @@ const FieldsToGroupBy = ({
                                 iconClass={L.icon}
                                 field={field}
                                 metric={metric}
-                                onClick={() => onChangeLocation(`/reference/databases/${table.db_id}/tables/${table.id}/fields/${field.id}`)}
-                                secondaryOnClick={(event) => {
-                                    event.stopPropagation();
-                                    onChangeLocation(getQuestionUrl({
+                                onClick={() => onChangeLocation(getQuestionUrl({
                                         dbId: table.db_id,
                                         tableId: table.id,
                                         fieldId: field.id,
                                         metricId: metric.id
-                                    }))
+                                    }))}
+                                secondaryOnClick={(event) => {
+                                    event.stopPropagation();
+                                    onChangeLocation(`/reference/databases/${table.db_id}/tables/${table.id}/fields/${field.id}`);
                                 }}
                             />
                         )