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 Viewer UX tweaks (#72553)
Kevin Kelleherbbc6ca6a040c
diff --git a/e2e/test/scenarios/data-studio/measures/measures-data-studio.cy.spec.ts b/e2e/test/scenarios/data-studio/measures/measures-data-studio.cy.spec.tsindex ba98bd6b53c..d77fe947439 100644--- a/e2e/test/scenarios/data-studio/measures/measures-data-studio.cy.spec.ts+++ b/e2e/test/scenarios/data-studio/measures/measures-data-studio.cy.spec.ts@@ -150,7 +150,7 @@ describe("scenarios > data studio > data model > measures", () => {verifyMeasureInQueryBuilder("Total Revenue");});- it("should add aggregation and show preview in menu", () => {+ it("should add aggregation and show explore in menu", () => {visitDataStudioMeasures(PRODUCTS_ID);MeasureList.getNewMeasureLink().scrollIntoView().click();@@ -164,9 +164,9 @@ describe("scenarios > data studio > data model > measures", () => {.findByText(/Average of Price/i).should("exist");- cy.log("verify preview is available in menu");+ cy.log("verify explore is available in menu");MeasureEditor.getActionsButton().click();- H.popover().findByText("Preview").should("be.visible");+ H.popover().findByText("Explore").should("be.visible");});});@@ -471,7 +471,7 @@ describe("scenarios > data studio > data model > measures", () => {cy.log("verify Remove measure option is hidden in actions menu");MeasureEditor.getActionsButton().click();- H.popover().findByText("Preview").should("be.visible");+ H.popover().findByText("Explore").should("be.visible");H.popover().findByText("Remove measure").should("not.exist");cy.realPress("Escape");diff --git a/frontend/src/metabase/data-studio/common/components/MoreMenu/MoreMenu.tsx b/frontend/src/metabase/data-studio/common/components/MoreMenu/MoreMenu.tsxindex f71fc577f80..f60046b39cd 100644--- a/frontend/src/metabase/data-studio/common/components/MoreMenu/MoreMenu.tsx+++ b/frontend/src/metabase/data-studio/common/components/MoreMenu/MoreMenu.tsx@@ -7,6 +7,7 @@ import { ActionIcon, Icon, Menu } from "metabase/ui";type MoreMenuProps = {previewUrl?: string;+ previewLabel?: string;onRemove?: () => void;ariaLabel: string;removeLabel: string;@@ -16,6 +17,7 @@ type MoreMenuProps = {export function MoreMenu({previewUrl,+ previewLabel,onRemove,ariaLabel,removeLabel,@@ -50,7 +52,7 @@ export function MoreMenu({target="_blank"leftSection={<Icon name="share" />}>- {t`Preview`}+ {previewLabel ?? t`Preview`}</Menu.Item>)}{onRemove && (diff --git a/frontend/src/metabase/data-studio/measures/components/MeasureHeader/MeasureHeader.unit.spec.tsx b/frontend/src/metabase/data-studio/measures/components/MeasureHeader/MeasureHeader.unit.spec.tsxindex f1f6cefd899..6d6d63bf51b 100644--- a/frontend/src/metabase/data-studio/measures/components/MeasureHeader/MeasureHeader.unit.spec.tsx+++ b/frontend/src/metabase/data-studio/measures/components/MeasureHeader/MeasureHeader.unit.spec.tsx@@ -44,13 +44,13 @@ describe("MeasureHeader", () => {);});- it("shows preview and remove options in the actions menu", async () => {+ it("shows explore and remove options in the actions menu", async () => {setup();await userEvent.click(screen.getByRole("button", { name: "Measure actions" }),);expect(- screen.getByRole("menuitem", { name: /Preview/ }),+ screen.getByRole("menuitem", { name: /Explore/ }),).toBeInTheDocument();expect(screen.getByRole("menuitem", { name: /Remove measure/ }),@@ -69,7 +69,7 @@ describe("MeasureHeader", () => {screen.getByRole("button", { name: "Measure actions" }),);expect(- screen.getByRole("menuitem", { name: /Preview/ }),+ screen.getByRole("menuitem", { name: /Explore/ }),).toBeInTheDocument();expect(screen.queryByRole("menuitem", { name: /Remove measure/ }),diff --git a/frontend/src/metabase/data-studio/measures/components/MeasureMoreMenu/MeasureMoreMenu.tsx b/frontend/src/metabase/data-studio/measures/components/MeasureMoreMenu/MeasureMoreMenu.tsxindex 374a531d1ba..3b1ce0bbebb 100644--- a/frontend/src/metabase/data-studio/measures/components/MeasureMoreMenu/MeasureMoreMenu.tsx+++ b/frontend/src/metabase/data-studio/measures/components/MeasureMoreMenu/MeasureMoreMenu.tsx@@ -14,6 +14,7 @@ export function MeasureMoreMenu({return (<MoreMenupreviewUrl={previewUrl}+ previewLabel={t`Explore`}onRemove={onRemove}ariaLabel={t`Measure actions`}removeLabel={t`Remove measure`}diff --git a/frontend/src/metabase/data-studio/measures/pages/MeasureDetailPage/MeasureDetailPage.tsx b/frontend/src/metabase/data-studio/measures/pages/MeasureDetailPage/MeasureDetailPage.tsxindex 0af379bd628..84911df9902 100644--- a/frontend/src/metabase/data-studio/measures/pages/MeasureDetailPage/MeasureDetailPage.tsx+++ b/frontend/src/metabase/data-studio/measures/pages/MeasureDetailPage/MeasureDetailPage.tsx@@ -6,12 +6,12 @@ import { t } from "ttag";import { useUpdateMeasureMutation } from "metabase/api";import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal";import { PageContainer } from "metabase/data-studio/common/components/PageContainer";-import { getDatasetQueryPreviewUrl } from "metabase/data-studio/common/utils/get-dataset-query-preview-url";import { getUserCanWriteMeasures } from "metabase/data-studio/selectors";import { useMetadataToasts } from "metabase/metadata/hooks";import { getMetadata } from "metabase/selectors/metadata";import { Button, Group } from "metabase/ui";import { useSelector } from "metabase/utils/redux";+import * as Urls from "metabase/utils/urls";import * as Lib from "metabase-lib";import type { Measure } from "metabase-types/api";@@ -56,9 +56,7 @@ export function MeasureDetailPage({);const isValid = aggregations.length === 1;- const previewUrl = isValid- ? getDatasetQueryPreviewUrl(definition)- : undefined;+ const previewUrl = isValid ? Urls.exploreMeasure(measure.id) : undefined;const setQuery = useCallback((newQuery: Lib.Query) => {setDefinition(Lib.toJsQuery(newQuery));diff --git a/frontend/src/metabase/metrics-viewer/hooks/use-viewer-url.ts b/frontend/src/metabase/metrics-viewer/hooks/use-viewer-url.tsindex 96c33ec306c..2f22d85fe11 100644--- a/frontend/src/metabase/metrics-viewer/hooks/use-viewer-url.ts+++ b/frontend/src/metabase/metrics-viewer/hooks/use-viewer-url.ts@@ -55,9 +55,13 @@ export function useViewerUrl(if (!hash) {const params = new URLSearchParams(location.search);const metricId = params.get("metricId");- if (metricId) {+ const measureId = params.get("measureId");+ if (metricId || measureId) {+ const entity = metricId+ ? { type: "metric" as const, id: parseInt(metricId, 10) }+ : { type: "measure" as const, id: parseInt(measureId!, 10) };serializedState = {- formulaEntities: [{ type: "metric", id: parseInt(metricId, 10) }],+ formulaEntities: [entity],tabs: [],selectedTabId: null,};diff --git a/frontend/src/metabase/metrics/components/MetricHeader/MetricHeader.tsx b/frontend/src/metabase/metrics/components/MetricHeader/MetricHeader.tsxindex 1b7f659d977..cea2823ea4d 100644--- a/frontend/src/metabase/metrics/components/MetricHeader/MetricHeader.tsx+++ b/frontend/src/metabase/metrics/components/MetricHeader/MetricHeader.tsx@@ -50,7 +50,7 @@ export function MetricHeader({icon="metric"tabs={<MetricTabs card={card} urls={urls} />}actions={- <Group wrap="nowrap" gap="sm" align="center">+ <Group wrap="nowrap" align="center">{actions}<MetricToolbarcard={card}diff --git a/frontend/src/metabase/metrics/components/MetricHeader/MetricToolbar/MetricToolbar.tsx b/frontend/src/metabase/metrics/components/MetricHeader/MetricToolbar/MetricToolbar.tsxindex e282a9b7742..ae5bd4a7166 100644--- a/frontend/src/metabase/metrics/components/MetricHeader/MetricToolbar/MetricToolbar.tsx+++ b/frontend/src/metabase/metrics/components/MetricHeader/MetricToolbar/MetricToolbar.tsx@@ -10,6 +10,7 @@ import {} from "metabase/api";import { ForwardRefLink } from "metabase/common/components/Link";import { ToolbarButton } from "metabase/common/components/ToolbarButton";+import { canAccessDataStudio as canAccessDataStudioSelector } from "metabase/data-studio/selectors";import { getLibraryCollectionType } from "metabase/data-studio/utils";import { isNumericMetric } from "metabase/metrics/utils/validation";import { QuestionAlertListModal } from "metabase/notifications/modals/QuestionAlertListModal";@@ -77,7 +78,7 @@ interface MetricToolbarButtonsProps {function MetricToolbarButtons({card,- showDataStudioLink,+ showDataStudioLink: showDataStudioLinkProp,onOpenModal,}: MetricToolbarButtonsProps) {const metadata = useSelector(getMetadata);@@ -100,15 +101,17 @@ function MetricToolbarButtons({const dispatch = useDispatch();- const isInLibrary =- showDataStudioLink &&- getLibraryCollectionType(card.collection?.type) != null;+ const canAccessDataStudio = useSelector(canAccessDataStudioSelector);++ const showDataStudioLink =+ showDataStudioLinkProp &&+ getLibraryCollectionType(card.collection?.type) != null &&+ canAccessDataStudio;return (<Group wrap="nowrap" gap="sm">{isNumericMetric(card) && (<Button- size="sm"component={ForwardRefLink}to={Urls.exploreMetric(card.id)}target="_blank"@@ -173,11 +176,11 @@ function MetricToolbarButtons({</Menu.Item>)}- {(PLUGIN_AUDIT.isEnabled || isInLibrary) && (+ {(PLUGIN_AUDIT.isEnabled || showDataStudioLink) && (<Menu.Divider role="separator" />)}- {isInLibrary && (+ {showDataStudioLink && (<Menu.ItemleftSection={<Icon name="grid_bordered" />}onClick={() => dispatch(openUrl(Urls.dataStudioMetric(card.id)))}diff --git a/frontend/src/metabase/metrics/components/MetricHeader/MetricToolbar/MetricToolbar.unit.spec.tsx b/frontend/src/metabase/metrics/components/MetricHeader/MetricToolbar/MetricToolbar.unit.spec.tsxindex befbe12c9ec..52edffbf3b9 100644--- a/frontend/src/metabase/metrics/components/MetricHeader/MetricToolbar/MetricToolbar.unit.spec.tsx+++ b/frontend/src/metabase/metrics/components/MetricHeader/MetricToolbar/MetricToolbar.unit.spec.tsx@@ -148,6 +148,7 @@ describe("MetricToolbar", () => {setup({showDataStudioLink: true,collectionType: "library-metrics",+ isAdmin: true,});await openMenu();@@ -157,7 +158,7 @@ describe("MetricToolbar", () => {});it("should hide 'Open in Data Studio' when not in library collection", async () => {- setup({ showDataStudioLink: true, collectionType: null });+ setup({ showDataStudioLink: true, collectionType: null, isAdmin: true });await openMenu();expect(screen.queryByText("Open in Data Studio")).not.toBeInTheDocument();@@ -169,6 +170,7 @@ describe("MetricToolbar", () => {setup({showDataStudioLink: false,collectionType: "library-metrics",+ isAdmin: true,});await openMenu();@@ -176,5 +178,14 @@ describe("MetricToolbar", () => {expect(getDividers()).toHaveLength(2);expectNoConsecutiveOrTrailingDividers();});++ it("should hide 'Open in Data Studio' when user is not an admin", async () => {+ setup({ showDataStudioLink: true, collectionType: "library-metrics" });+ await openMenu();++ expect(screen.queryByText("Open in Data Studio")).not.toBeInTheDocument();+ expect(getDividers()).toHaveLength(2);+ expectNoConsecutiveOrTrailingDividers();+ });});});diff --git a/frontend/src/metabase/utils/urls/metrics.ts b/frontend/src/metabase/utils/urls/metrics.tsindex 2440b3785c0..29713f82a68 100644--- a/frontend/src/metabase/utils/urls/metrics.ts+++ b/frontend/src/metabase/utils/urls/metrics.ts@@ -22,6 +22,10 @@ export function exploreMetric(metricId: number): string {return `${METRICS_VIEWER_ROOT}?metricId=${metricId}`;}+export function exploreMeasure(measureId: number): string {+ return `${METRICS_VIEWER_ROOT}?measureId=${measureId}`;+}+export interface ExploreMetricDimensionOptions {metricId: number;dimensionId: string;