Merge branch 'master' into release-0.24.0

frontend/src/metabase/dashboard/components/DashCard.jsx

@@ -134,9 +134,9 @@ export default class DashCard extends Component {
                     onUpdateVisualizationSettings={this.props.onUpdateVisualizationSettings}
                     replacementContent={isEditingParameter && <DashCardParameterMapper dashcard={dashcard} />}
                     metadata={metadata}
-                    onChangeCardAndRun={(card: UnsavedCard) => {
+                    onChangeCardAndRun={ navigateToNewCard ? (card: UnsavedCard) => {
                         navigateToNewCard(card, dashcard)
-                    }}
+                    } : null}
                 />
             </div>
         );

frontend/src/metabase/public/containers/PublicDashboard.jsx

@@ -107,6 +107,8 @@ export default class PublicDashboard extends Component<*, Props, *> {
                     <DashboardGrid
                         {...this.props}
                         className={"spread"}
+                        // Don't allow clicking titles on public dashboards
+                        navigateToNewCard={null}
                     />
                 }
                 </LoadingAndErrorWrapper>

frontend/src/metabase/questions/questions.js

@@ -176,7 +176,7 @@ export const setCollection = createThunkAction(SET_COLLECTION, (cardId, collecti
                 )));
                 MetabaseAnalytics.trackEvent("Questions", "Bulk Move to Collection");
             }
-            selected.map(item => dispatch(setCollection(item.id, collectionId)));
+            selected.map(item => dispatch(setCollection(item.id, { id: collectionId })));
         } else {
             const collection = _.findWhere(state.collections.collections, { id: collectionId });
 

frontend/src/metabase/visualizations/components/Visualization.jsx

@@ -338,7 +338,7 @@ export default class Visualization extends Component<*, Props, State> {
                             actionButtons={extra}
                             description={settings["card.description"]}
                             settings={settings}
-                            onChangeCardAndRun={this.handleOnChangeCardAndRun}
+                            onChangeCardAndRun={this.props.onChangeCardAndRun ? this.handleOnChangeCardAndRun : null}
                         />
                     </div>
                 : null
@@ -397,9 +397,9 @@ export default class Visualization extends Component<*, Props, State> {
                         series={series}
                         settings={settings}
                         // $FlowFixMe
-                        card={series[0].card} // convienence for single-series visualizations
+                        card={series[0].card} // convenience for single-series visualizations
                         // $FlowFixMe
-                        data={series[0].data} // convienence for single-series visualizations
+                        data={series[0].data} // convenience for single-series visualizations
                         hovered={hovered}
                         onHoverChange={this.handleHoverChange}
                         onVisualizationClick={this.handleVisualizationClick}
@@ -407,7 +407,7 @@ export default class Visualization extends Component<*, Props, State> {
                         onRenderError={this.onRenderError}
                         onRender={this.onRender}
                         gridSize={gridSize}
-                        onChangeCardAndRun={this.handleOnChangeCardAndRun}
+                        onChangeCardAndRun={this.props.onChangeCardAndRun ? this.handleOnChangeCardAndRun : null}
                     />
                 }
                 <ChartTooltip
@@ -417,7 +417,7 @@ export default class Visualization extends Component<*, Props, State> {
                 <ChartClickActions
                     clicked={clicked}
                     clickActions={clickActions}
-                    onChangeCardAndRun={this.handleOnChangeCardAndRun}
+                    onChangeCardAndRun={this.props.onChangeCardAndRun ? this.handleOnChangeCardAndRun : null}
                     onClose={() => this.setState({ clicked: null })}
                 />
             </div>