Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

Pass qb into viz via props (#72844)

Frasercbe82473d6eb
diff --git a/frontend/src/metabase/querying/components/QueryVisualization/VisualizationResult.jsx b/frontend/src/metabase/querying/components/QueryVisualization/VisualizationResult.jsx
index 84fce8ab092..dd86cc9a558 100644
--- a/frontend/src/metabase/querying/components/QueryVisualization/VisualizationResult.jsx
+++ b/frontend/src/metabase/querying/components/QueryVisualization/VisualizationResult.jsx
@@ -11,6 +11,11 @@ import { isEmbeddingSdk } from "metabase/embedding-sdk/config";
import { CreateOrEditQuestionAlertModalWithQuestion } from "metabase/notifications/modals/CreateOrEditQuestionAlertModal/CreateOrEditQuestionAlertModal";
import { ALERT_TYPE_ROWS, getAlertType } from "metabase/notifications/utils";
import { zoomInRow } from "metabase/query_builder/actions";
+import {
+ getIsShowingRawTable,
+ getUiControls,
+} from "metabase/query_builder/selectors";
+import { useSelector } from "metabase/utils/redux";
import Visualization from "metabase/visualizations/components/Visualization";
import * as Lib from "metabase-lib";
import { datasetContainsNoResults } from "metabase-lib/v1/queries/utils/dataset";
@@ -30,7 +35,21 @@ const ALLOWED_VISUALIZATION_PROPS = [
"hideLegend",
];
-export class VisualizationResult extends Component {
+export function VisualizationResult(props) {
+ const isRawTable = useSelector(getIsShowingRawTable);
+ const scrollToLastColumn = useSelector(
+ (state) => getUiControls(state)?.scrollToLastColumn ?? false,
+ );
+ return (
+ <VisualizationResultInner
+ {...props}
+ isRawTable={isRawTable}
+ scrollToLastColumn={scrollToLastColumn}
+ />
+ );
+}
+
+class VisualizationResultInner extends Component {
state = {
showCreateAlertModal: false,
};
@@ -69,6 +88,8 @@ export class VisualizationResult extends Component {
isShowingSummarySidebar,
editSummary,
renderEmptyMessage,
+ isRawTable,
+ scrollToLastColumn,
} = this.props;
const { showCreateAlertModal } = this.state;
@@ -142,6 +163,8 @@ export class VisualizationResult extends Component {
isEditing={true}
isObjectDetail={false}
isQueryBuilder={true}
+ isRawTable={isRawTable}
+ scrollToLastColumn={scrollToLastColumn}
isShowingSummarySidebar={isShowingSummarySidebar}
isRunning={isRunning}
editSummary={editSummary}
diff --git a/frontend/src/metabase/visualizations/components/Visualization/Visualization.tsx b/frontend/src/metabase/visualizations/components/Visualization/Visualization.tsx
index 97eff1ed85d..570d249dda4 100644
--- a/frontend/src/metabase/visualizations/components/Visualization/Visualization.tsx
+++ b/frontend/src/metabase/visualizations/components/Visualization/Visualization.tsx
@@ -21,10 +21,6 @@ import DashboardS from "metabase/css/dashboard.module.css";
import type { CardSlownessStatus } from "metabase/dashboard/components/DashCard/types";
import { isEmbeddingSdk } from "metabase/embedding-sdk/config";
import type { ContentTranslationFunction } from "metabase/i18n/types";
-import {
- getIsShowingRawTable,
- getUiControls,
-} from "metabase/query_builder/selectors";
import { getIsDownloadingToImage } from "metabase/redux/downloads";
import type { Dispatch, State } from "metabase/redux/store";
import { getTokenFeature } from "metabase/setup/selectors";
@@ -103,9 +99,7 @@ type StateDispatchProps = {
type StateProps = {
hasDevWatermark: boolean;
fontFamily: string;
- isRawTable: boolean;
isEmbeddingSdk: boolean;
- scrollToLastColumn: boolean;
isDownloadingToImage: boolean;
};
@@ -143,11 +137,13 @@ type VisualizationOwnProps = {
isDocument?: boolean;
isMetricsViewer?: boolean;
isMobile?: boolean;
+ isRawTable?: boolean;
isRunning?: boolean;
isShowingSummarySidebar?: boolean;
isSlow?: CardSlownessStatus;
isVisible?: boolean;
isVisualizer?: boolean;
+ scrollToLastColumn?: boolean;
renderLoadingView?: (props: LoadingViewProps) => JSX.Element | null;
metadata?: Metadata;
mode?: ClickActionModeGetter | ClickActionsMode | QueryClickActionsMode;
@@ -212,9 +208,7 @@ type VisualizationState = {
const mapStateToProps = (state: State): StateProps => ({
hasDevWatermark: getTokenFeature(state, "development_mode"),
fontFamily: getFont(state),
- isRawTable: getIsShowingRawTable(state),
isEmbeddingSdk: isEmbeddingSdk(),
- scrollToLastColumn: getUiControls(state)?.scrollToLastColumn ?? false,
isDownloadingToImage: getIsDownloadingToImage(state),
});