Merge pull request #4053 from metabase/collections-fixes

Collections fixes

frontend/src/metabase/questions/collections.js

 
 import { createAction, createThunkAction, handleActions, combineReducers } from "metabase/lib/redux";
 import { reset } from 'redux-form';
-import { goBack } from "react-router-redux";
+import { push } from "react-router-redux";
+import Urls from "metabase/lib/urls";
 
 import _ from "underscore";
 
@@ -36,7 +37,7 @@ export const saveCollection = createThunkAction(SAVE_COLLECTION, (collection) =>
             if (response.id != null) {
                 dispatch(reset("collection"));
             }
-            dispatch(goBack())
+            dispatch(push(Urls.collection(response)));
             return response;
         } catch (e) {
             // redux-form expects an object with either { field: error } or { _error: error }

frontend/src/metabase/questions/components/CollectionButtons.jsx

@@ -29,9 +29,11 @@ class CollectionButton extends Component {
     }
 
     render () {
-        const { id, name, color, slug, isAdmin, push } = this.props;
+        const { id, name, color, slug, isAdmin } = this.props;
         return (
-            <div
+            <Link
+                to={`/questions/collections/${slug}`}
+                className="no-decoration"
                 onMouseEnter={() => this.setState({ hovered: true })}
                 onMouseLeave={() => this.setState({ hovered: false })}
             >
@@ -43,7 +45,6 @@ class CollectionButton extends Component {
                         borderRadius: 10,
                         backgroundColor: this.state.hovered ? color : '#fafafa'
                     }}
-                    onClick={() => push(`/questions/collections/${slug}`)}
                 >
                     { isAdmin &&
                         <div className="absolute top right mt2 mr2 hover-child">
@@ -61,7 +62,7 @@ class CollectionButton extends Component {
                     />
                     <h3>{ name }</h3>
                 </div>
-            </div>
+            </Link>
         )
     }
 }