Skip to content
Snippets Groups Projects
Unverified Commit 1963b14c authored by Ryan Laurie's avatar Ryan Laurie Committed by GitHub
Browse files

Disable object detail in notebook preview (#24195)

* disable object detail in notebook preview
* add query builder state to table viz test
* fix column widths
parent 4214771c
No related branches found
No related tags found
No related merge requests found
......@@ -31,6 +31,7 @@ import { isAdHocModelQuestionCard } from "metabase/lib/data-modeling/utils";
import Dimension from "metabase-lib/lib/Dimension";
import { getScrollBarSize } from "metabase/lib/dom";
import { zoomInRow } from "metabase/query_builder/actions";
import { getQueryBuilderMode } from "metabase/query_builder/selectors";
import ExplicitSize from "metabase/components/ExplicitSize";
import MiniBar from "../MiniBar";
......@@ -69,6 +70,10 @@ function pickRowsToMeasure(rows, columnIndex, count = 10) {
return rowIndexes;
}
const mapStateToProps = state => ({
queryBuilderMode: getQueryBuilderMode(state),
});
const mapDispatchToProps = dispatch => ({
onZoomRow: objectId => dispatch(zoomInRow({ objectId })),
});
......@@ -173,9 +178,19 @@ class TableInteractive extends Component {
_showDetailShortcut = (query, isPivoted) => {
const hasAggregation = !!query?.aggregations?.()?.length;
this.setState({
showDetailShortcut: !(isPivoted || hasAggregation),
});
const isNotebookPreview = this.props.queryBuilderMode === "notebook";
const newShowDetailState = !(
isPivoted ||
hasAggregation ||
isNotebookPreview
);
if (newShowDetailState !== this.state.showDetailShortcut) {
this.setState({
showDetailShortcut: newShowDetailState,
});
this.recomputeColumnSizes();
}
};
_getColumnSettings(props) {
......@@ -1114,7 +1129,7 @@ export default _.compose(
ExplicitSize({
refreshMode: props => (props.isDashboard ? "debounce" : "throttle"),
}),
connect(null, mapDispatchToProps),
connect(mapStateToProps, mapDispatchToProps),
memoizeClass(
"_getCellClickedObjectCached",
"_getHeaderClickedObjectCached",
......
......@@ -2,6 +2,7 @@ import React from "react";
import { renderWithProviders } from "__support__/ui";
import { NumberColumn } from "../__support__/visualizations";
import { createMockQueryBuilderState } from "metabase-types/store/mocks/qb";
import Visualization from "metabase/visualizations/components/Visualization";
......@@ -37,11 +38,18 @@ describe("Table", () => {
},
],
};
const qbState = createMockQueryBuilderState();
const { getByText } = renderWithProviders(
<Visualization rawSeries={series(rows, settings)} />,
{
withSettings: true,
withEmbedSettings: true,
storeInitialState: {
qb: qbState,
},
reducers: {
qb: () => qbState,
},
},
);
jest.runAllTimers();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment