The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
Metrics home page and viewer cleanup (#71514)
Kevin Kelleherd825c4dab315
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricsViewerTabs/MetricsViewerTabContent/MetricsViewerTabContent.tsx b/frontend/src/metabase/metrics-viewer/components/MetricsViewerTabs/MetricsViewerTabContent/MetricsViewerTabContent.tsxindex 93be9765440..136e354ce90 100644--- a/frontend/src/metabase/metrics-viewer/components/MetricsViewerTabs/MetricsViewerTabContent/MetricsViewerTabContent.tsx+++ b/frontend/src/metabase/metrics-viewer/components/MetricsViewerTabs/MetricsViewerTabContent/MetricsViewerTabContent.tsx@@ -1,11 +1,13 @@import { useCallback, useMemo } from "react";+import { t } from "ttag";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { getObjectKeys, getObjectValues } from "metabase/lib/objects";import { isNotNull } from "metabase/lib/types";-import { Flex, Stack } from "metabase/ui";+import { Center, Flex, Stack } from "metabase/ui";import type { DimensionMetadata, MetricDefinition } from "metabase-lib/metric";import * as LibMetric from "metabase-lib/metric";+import { isMetric } from "metabase-lib/v1/types/utils/isa";import type { Dataset, TemporalUnit } from "metabase-types/api";import type {@@ -58,18 +60,6 @@ export function MetricsViewerTabContent({return getObjectKeys(tab.dimensionMapping).some(isExecuting);}, [tab.dimensionMapping, isExecuting]);- const firstError = useMemo(() => {- for (const sourceId of getObjectKeys(tab.dimensionMapping)) {- const err = errorsByDefinitionId.get(sourceId);- if (err) {- return err;- }- }- return null;- }, [tab.dimensionMapping, errorsByDefinitionId]);-- const dimensionFilter = getTabConfig(tab.type).dimensionPredicate;-const { series: rawSeries, cardIdToDimensionId } = useMemo(() =>buildRawSeriesFromDefinitions(@@ -90,6 +80,25 @@ export function MetricsViewerTabContent({],);+ const firstError = useMemo(() => {+ for (const series of rawSeries) {+ const cols = series.data.cols;+ if (!cols.some((col) => isMetric(col))) {+ return t`Non-numeric metrics are not supported`;+ }+ }++ for (const sourceId of getObjectKeys(tab.dimensionMapping)) {+ const err = errorsByDefinitionId.get(sourceId);+ if (err) {+ return err;+ }+ }+ return null;+ }, [tab.dimensionMapping, errorsByDefinitionId, rawSeries]);++ const dimensionFilter = getTabConfig(tab.type).dimensionPredicate;+const dimensionItems = useMemo(() =>buildDimensionItemsFromDefinitions(@@ -202,7 +211,11 @@ export function MetricsViewerTabContent({mappedDimensionCount > 1 ? onDimensionRemove : undefined;if (isLoading || firstError) {- return <LoadingAndErrorWrapper loading={isLoading} error={firstError} />;+ return (+ <Center h="100%">+ <LoadingAndErrorWrapper loading={isLoading} error={firstError} />+ </Center>+ );}if (rawSeries.length === 0) {diff --git a/frontend/src/metabase/metrics-viewer/components/MetricsViewerVisualization/MetricsViewerVisualization.tsx b/frontend/src/metabase/metrics-viewer/components/MetricsViewerVisualization/MetricsViewerVisualization.tsxindex 0ba68512b11..2fa36979bf9 100644--- a/frontend/src/metabase/metrics-viewer/components/MetricsViewerVisualization/MetricsViewerVisualization.tsx+++ b/frontend/src/metabase/metrics-viewer/components/MetricsViewerVisualization/MetricsViewerVisualization.tsx@@ -94,6 +94,7 @@ export function MetricsViewerVisualization({mode={clickActionsMode}onChangeCardAndRun={noop}autoAdjustSettings+ isMetricsViewer/></DebouncedFrame></Stack>diff --git a/frontend/src/metabase/metrics-viewer/utils/series.ts b/frontend/src/metabase/metrics-viewer/utils/series.tsindex 99e44d440aa..c6784b77994 100644--- a/frontend/src/metabase/metrics-viewer/utils/series.ts+++ b/frontend/src/metabase/metrics-viewer/utils/series.ts@@ -300,7 +300,7 @@ export function buildRawSeriesFromDefinitions(};let entrySeries: SingleSeries[];- if (!entryHasBreakout(entry)) {+ if (!entryHasBreakout(entry) || singleSeries.data.rows.length === 0) {entrySeries = [singleSeries];} else {entrySeries = splitByBreakout(diff --git a/frontend/src/metabase/metrics/components/MetricDimensionGrid/MetricDimensionGrid.tsx b/frontend/src/metabase/metrics/components/MetricDimensionGrid/MetricDimensionGrid.tsxindex cfa95e8e9aa..890cad2df77 100644--- a/frontend/src/metabase/metrics/components/MetricDimensionGrid/MetricDimensionGrid.tsx+++ b/frontend/src/metabase/metrics/components/MetricDimensionGrid/MetricDimensionGrid.tsx@@ -134,6 +134,7 @@ function MetricDimensionCard({isQueryBuilder={false}hideLegendonChangeCardAndRun={_.noop}+ isMetricsViewer/>) : (<ChartSkeleton display={displayType} className={S.visualization} />diff --git a/frontend/src/metabase/metrics/components/MetricHeader/MetricTabs/MetricTabs.tsx b/frontend/src/metabase/metrics/components/MetricHeader/MetricTabs/MetricTabs.tsxindex 5be19cb5419..023373614aa 100644--- a/frontend/src/metabase/metrics/components/MetricHeader/MetricTabs/MetricTabs.tsx+++ b/frontend/src/metabase/metrics/components/MetricHeader/MetricTabs/MetricTabs.tsx@@ -6,6 +6,7 @@ import {PaneHeaderTabs,} from "metabase/data-studio/common/components/PaneHeader";import { useSelector } from "metabase/lib/redux";+import { isNumericMetric } from "metabase/metrics/utils/validation";import { PLUGIN_CACHING, PLUGIN_DEPENDENCIES } from "metabase/plugins";import { getMetadata } from "metabase/selectors/metadata";import * as Lib from "metabase-lib";@@ -45,10 +46,12 @@ function getTabs(const queryInfo = Lib.queryDisplayInfo(query);if (queryInfo.isEditable) {- tabs.push({- label: t`Overview`,- to: urls.overview(card.id),- });+ if (isNumericMetric(card)) {+ tabs.push({+ label: t`Overview`,+ to: urls.overview(card.id),+ });+ }tabs.push({label: t`Definition`,to: urls.query(card.id),diff --git a/frontend/src/metabase/metrics/components/MetricHeader/MetricToolbar/MetricToolbar.tsx b/frontend/src/metabase/metrics/components/MetricHeader/MetricToolbar/MetricToolbar.tsxindex bd361987385..814bed342cd 100644--- a/frontend/src/metabase/metrics/components/MetricHeader/MetricToolbar/MetricToolbar.tsx+++ b/frontend/src/metabase/metrics/components/MetricHeader/MetricToolbar/MetricToolbar.tsx@@ -13,6 +13,7 @@ import { ToolbarButton } from "metabase/common/components/ToolbarButton";import { getLibraryCollectionType } from "metabase/data-studio/utils";import { useDispatch, useSelector } from "metabase/lib/redux";import * as Urls from "metabase/lib/urls";+import { isNumericMetric } from "metabase/metrics/utils/validation";import { QuestionAlertListModal } from "metabase/notifications/modals/QuestionAlertListModal";import { PLUGIN_AUDIT, PLUGIN_MODERATION } from "metabase/plugins";import { AddToDashSelectDashModal } from "metabase/query_builder/components/AddToDashSelectDashModal";@@ -105,16 +106,18 @@ function MetricToolbarButtons({return (<Group wrap="nowrap" gap="sm">- <Button- size="sm"- component={ForwardRefLink}- to={Urls.exploreMetric(card.id)}- target="_blank"- leftSection={<Icon name="external" />}- data-testid="explore-link"- >- {t`Explore`}- </Button>+ {isNumericMetric(card) && (+ <Button+ size="sm"+ component={ForwardRefLink}+ to={Urls.exploreMetric(card.id)}+ target="_blank"+ leftSection={<Icon name="external" />}+ data-testid="explore-link"+ >+ {t`Explore`}+ </Button>+ )}<Menu position="bottom-end"><Menu.Target><ToolbarButton icon="ellipsis" aria-label={t`More options`} />diff --git a/frontend/src/metabase/metrics/utils/validation.ts b/frontend/src/metabase/metrics/utils/validation.tsindex bb3ea43d94f..3e04cb7a584 100644--- a/frontend/src/metabase/metrics/utils/validation.ts+++ b/frontend/src/metabase/metrics/utils/validation.ts@@ -1,4 +1,6 @@import * as Lib from "metabase-lib";+import { isSummable } from "metabase-lib/v1/types/utils/isa";+import type { Card } from "metabase-types/api";export type ValidationResult = {isValid: boolean;@@ -8,3 +10,7 @@ export type ValidationResult = {export function getValidationResult(query: Lib.Query): ValidationResult {return { isValid: Lib.canSave(query, "metric") };}++export function isNumericMetric(card: Card): boolean {+ return card.result_metadata?.some(isSummable) ?? false;+}diff --git a/frontend/src/metabase/visualizations/components/ChartWithLegend.tsx b/frontend/src/metabase/visualizations/components/ChartWithLegend.tsxindex 873f55caf41..cc7df8bc383 100644--- a/frontend/src/metabase/visualizations/components/ChartWithLegend.tsx+++ b/frontend/src/metabase/visualizations/components/ChartWithLegend.tsx@@ -52,6 +52,7 @@ type ChartWithLegendProps = {showLegend?: boolean;isDashboard?: boolean;isDocument?: boolean;+ isMetricsViewer?: boolean;onToggleSeriesVisibility?: (event: MouseEvent, index: number) => void;forwardedRef?: Ref<HTMLDivElement>;};@@ -73,6 +74,7 @@ const ChartWithLegendInner = ({showLegend = true,isDashboard,isDocument,+ isMetricsViewer,onToggleSeriesVisibility = () => {},forwardedRef,}: ChartWithLegendProps) => {@@ -167,7 +169,7 @@ const ChartWithLegendInner = ({titles={layout.processedLegendTitles}hiddenIndices={legendHiddenIndices}colors={legendColors}- dotSize={isDashboard ? "8px" : "12px"}+ dotSize={isDashboard || isMetricsViewer ? "8px" : "12px"}hovered={hovered}onHoverChange={onHoverChange}onToggleSeriesVisibility={onToggleSeriesVisibility}@@ -211,7 +213,9 @@ const ChartWithLegendInner = ({<divclassName={cx(styles.LegendSpacer)}// don't center the chart on dashboards- style={isDashboard || isDocument ? { flexBasis: 0 } : {}}+ style={+ isDashboard || isDocument || isMetricsViewer ? { flexBasis: 0 } : {}+ }data-testid="chart-legend-spacer">{legend}diff --git a/frontend/src/metabase/visualizations/components/ChoroplethMap.jsx b/frontend/src/metabase/visualizations/components/ChoroplethMap.jsxindex 1f6975c7a55..6d9f38671c5 100644--- a/frontend/src/metabase/visualizations/components/ChoroplethMap.jsx+++ b/frontend/src/metabase/visualizations/components/ChoroplethMap.jsx@@ -411,6 +411,7 @@ class ChoroplethMapInner extends Component {onHoverChange={onHoverChange}isDashboard={this.props.isDashboard}isDocument={this.props.isDocument}+ isMetricsViewer={this.props.isMetricsViewer}>{projection ? (<LegacyChoroplethdiff --git a/frontend/src/metabase/visualizations/components/Visualization/Visualization.tsx b/frontend/src/metabase/visualizations/components/Visualization/Visualization.tsxindex a7b7e3a1466..f639a4fb8d3 100644--- a/frontend/src/metabase/visualizations/components/Visualization/Visualization.tsx+++ b/frontend/src/metabase/visualizations/components/Visualization/Visualization.tsx@@ -142,6 +142,7 @@ type VisualizationOwnProps = {isAction?: boolean;isDashboard?: boolean;isDocument?: boolean;+ isMetricsViewer?: boolean;isMobile?: boolean;isRunning?: boolean;isShowingSummarySidebar?: boolean;@@ -274,6 +275,7 @@ class Visualization extends PureComponent<isEditing: false,isEmbeddingSdk: false,isFullscreen: false,+ isMetricsViewer: false,isPreviewing: false,isQueryBuilder: false,isSettings: false,@@ -671,6 +673,7 @@ class Visualization extends PureComponent<isEditing,isEmbeddingSdk,isFullscreen,+ isMetricsViewer,isMobile,isObjectDetail,isPreviewing,@@ -764,6 +767,7 @@ class Visualization extends PureComponent<e instanceof ChartSettingsError &&visualization?.hasEmptyState &&!isDashboard &&+ !isMetricsViewer &&// For the SDK the EmptyVizState component in some cases (a small container) looks really weird,// so at least temporarily we don't display it when rendered in the SDK.!isEmbeddingSdk@@ -939,6 +943,7 @@ class Visualization extends PureComponent<isEditing={!!isEditing}isEmbeddingSdk={isEmbeddingSdk}isFullscreen={!!isFullscreen}+ isMetricsViewer={!!isMetricsViewer}isMobile={!!isMobile}isVisualizer={!!isVisualizer}isVisualizerCard={isVisualizerDashCard}diff --git a/frontend/src/metabase/visualizations/types/visualization.ts b/frontend/src/metabase/visualizations/types/visualization.tsindex 285bf6c8ffd..0c1004bcaf1 100644--- a/frontend/src/metabase/visualizations/types/visualization.ts+++ b/frontend/src/metabase/visualizations/types/visualization.ts@@ -156,6 +156,7 @@ export interface VisualizationProps {// Is this visualization made by the visualizerisVisualizerCard: boolean;isEditing: boolean;+ isMetricsViewer: boolean;isMobile: boolean;isSettings: boolean;showAllLegendItems?: boolean;diff --git a/frontend/src/metabase/visualizations/visualizations/Funnel/Funnel.unit.spec.tsx b/frontend/src/metabase/visualizations/visualizations/Funnel/Funnel.unit.spec.tsxindex aadbf94211b..e9f8bd0f555 100644--- a/frontend/src/metabase/visualizations/visualizations/Funnel/Funnel.unit.spec.tsx+++ b/frontend/src/metabase/visualizations/visualizations/Funnel/Funnel.unit.spec.tsx@@ -72,6 +72,7 @@ const setup = (isVisualizer: false,isVisualizerCard: false,isEditing: false,+ isMetricsViewer: false,isMobile: false,isSettings: false,width: 500,diff --git a/frontend/src/metabase/visualizations/visualizations/Map/Map.jsx b/frontend/src/metabase/visualizations/visualizations/Map/Map.jsxindex 7b9db4cd92c..fe2def1276a 100644--- a/frontend/src/metabase/visualizations/visualizations/Map/Map.jsx+++ b/frontend/src/metabase/visualizations/visualizations/Map/Map.jsx@@ -5,7 +5,7 @@ import _ from "underscore";import { ColorRangeSelector } from "metabase/common/components/ColorRangeSelector";import MetabaseSettings from "metabase/lib/settings";-import { getAccentColors } from "metabase/ui/colors/groups";+import { getAccentColors, getPreferredColor } from "metabase/ui/colors/groups";import { ChartSettingsError } from "metabase/visualizations/lib/errors";import { columnSettings } from "metabase/visualizations/lib/settings/column";import {@@ -249,8 +249,12 @@ export class Map extends Component {),isQuantile: true,}),- getDefault: () => getColorplethColorScale(getAccentColors()[0]),+ getDefault: (series, vizSettings) =>+ getColorplethColorScale(+ getPreferredColor(vizSettings["map.metric"]) ?? getAccentColors()[0],+ ),getHidden: (series, vizSettings) => vizSettings["map.type"] !== "region",+ readDependencies: ["map.metric"],},"map.zoom": {},"map.center_latitude": {},