Skip to content

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

Fix "View as table" in visualizer (#69204)

kevinkelleher128e68044b267c
diff --git a/e2e/test/scenarios/dashboard/visualizer/basics.cy.spec.ts b/e2e/test/scenarios/dashboard/visualizer/basics.cy.spec.ts
index bc4ce197047..17155dae619 100644
--- a/e2e/test/scenarios/dashboard/visualizer/basics.cy.spec.ts
+++ b/e2e/test/scenarios/dashboard/visualizer/basics.cy.spec.ts
@@ -993,4 +993,17 @@ describe("scenarios > dashboard > visualizer > basics", () => {
);
});
});
+
+ it("should allow viewing the table preview (metabase#69038)", () => {
+ createDashboardWithVisualizerDashcards();
+ H.editDashboard();
+
+ H.showDashcardVisualizerModal(0);
+
+ cy.findByTestId("visualizer-view-as-table-button").click();
+
+ cy.findByTestId("visualizer-tabular-preview-modal").within(() => {
+ cy.findByText("Count").should("exist");
+ });
+ });
});
diff --git a/frontend/src/metabase/visualizations/components/TableInteractive/cells/HeaderCellWithColumnInfo.tsx b/frontend/src/metabase/visualizations/components/TableInteractive/cells/HeaderCellWithColumnInfo.tsx
index 03890e2ffbc..8d425032de3 100644
--- a/frontend/src/metabase/visualizations/components/TableInteractive/cells/HeaderCellWithColumnInfo.tsx
+++ b/frontend/src/metabase/visualizations/components/TableInteractive/cells/HeaderCellWithColumnInfo.tsx
@@ -44,9 +44,6 @@ export const HeaderCellWithColumnInfo = memo(
className,
renderTableHeader,
}: HeaderCellWithColumnInfoProps) {
- const query = question?.query();
- const stageIndex = -1;
-
const headerCellOverride = useMemo(() => {
return renderTableHeader != null
? renderTableHeader(column, columnIndex, theme)
@@ -63,23 +60,33 @@ export const HeaderCellWithColumnInfo = memo(
</div>
);
+ let headerContent: React.ReactNode;
+
+ if (getInfoPopoversDisabled()) {
+ headerContent = cellContent;
+ } else {
+ // question.query will throw when used in the visualizer
+ // we don't go down this code path in the visualizer because isDashboard is true
+ const query = question?.query();
+ const stageIndex = -1;
+ headerContent = (
+ <QueryColumnInfoPopover
+ position="bottom-start"
+ query={query}
+ stageIndex={stageIndex}
+ column={query && Lib.fromLegacyColumn(query, stageIndex, column)}
+ timezone={timezone}
+ openDelay={500}
+ showFingerprintInfo
+ >
+ {cellContent}
+ </QueryColumnInfoPopover>
+ );
+ }
+
return (
<HeaderCellWrapper className={className} variant={variant} align={align}>
- {getInfoPopoversDisabled() ? (
- cellContent
- ) : (
- <QueryColumnInfoPopover
- position="bottom-start"
- query={query}
- stageIndex={-1}
- column={query && Lib.fromLegacyColumn(query, stageIndex, column)}
- timezone={timezone}
- openDelay={500}
- showFingerprintInfo
- >
- {cellContent}
- </QueryColumnInfoPopover>
- )}
+ {headerContent}
</HeaderCellWrapper>
);
},
diff --git a/frontend/src/metabase/visualizations/visualizations/Table/Table.tsx b/frontend/src/metabase/visualizations/visualizations/Table/Table.tsx
index 421bc8545d5..041faf724c3 100644
--- a/frontend/src/metabase/visualizations/visualizations/Table/Table.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/Table/Table.tsx
@@ -129,10 +129,17 @@ export class Table extends Component<TableProps, TableState> {
settings: ComputedVisualizationSettings,
) => data && data.cols.length !== 3 && !settings["table.pivot"],
getDefault: ([{ card, data }]: Series) => {
+ let native: boolean;
+ try {
+ native = isNative(card);
+ } catch (error) {
+ // isNative throws when used in the visualizer
+ native = false;
+ }
if (
!data ||
data.cols.length !== 3 ||
- isNative(card) ||
+ native ||
data.cols.filter(isMetric).length !== 1 ||
data.cols.filter(isDimension).length !== 2
) {