Skip to content

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

Allow editing segments and measures when remote sync is read-only and table is unpublished (#68326)

Anderson1afabc3d0169
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/MeasureList.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/MeasureList.tsx
index e858bb8e38b..bcd39271ba0 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/MeasureList.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/MeasureList.tsx
@@ -5,7 +5,7 @@ import { ForwardRefLink } from "metabase/common/components/Link";
import { useSelector } from "metabase/lib/redux";
import * as Urls from "metabase/lib/urls";
import { Button, Group, Icon, Stack } from "metabase/ui";
-import { getIsRemoteSyncReadOnly } from "metabase-enterprise/remote_sync/selectors";
+import { getUserCanWriteMeasures } from "metabase-enterprise/data-studio/selectors";
import type { Table } from "metabase-types/api";
import { MeasureItem } from "./MeasureItem";
@@ -23,11 +23,13 @@ export function MeasureList({ table }: MeasureListProps) {
tableId: table.id,
measureId,
});
- const remoteSyncReadOnly = useSelector(getIsRemoteSyncReadOnly);
+ const canWriteMeasures = useSelector((state) =>
+ getUserCanWriteMeasures(state, table.is_published),
+ );
return (
<Stack gap="md" data-testid="table-measures-page">
- {!remoteSyncReadOnly && (
+ {canWriteMeasures && (
<Group gap="md" justify="flex-start" wrap="nowrap">
<Button
component={ForwardRefLink}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/MeasureList.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/MeasureList.unit.spec.tsx
index 7c7d50b497c..4afaac8a8f1 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/MeasureList.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/MeasureList.unit.spec.tsx
@@ -19,6 +19,7 @@ function setup({ measures = [], table = {}, remoteSyncType }: SetupOpts = {}) {
db_id: 1,
schema: "PUBLIC",
measures,
+ is_published: true,
...table,
});
@@ -74,17 +75,32 @@ describe("MeasureList", () => {
);
});
- it("should render a 'New measure' button", () => {
- setup();
- expect(
- screen.getByRole("link", { name: /New measure/i }),
- ).toBeInTheDocument();
- });
+ describe("'new measure' link", () => {
+ it("is rendered by default", () => {
+ setup();
- it("should not render 'New measure' button when remote sync is set to read-only", () => {
- setup({ remoteSyncType: "read-only" });
- expect(
- screen.queryByRole("link", { name: /New measure/i }),
- ).not.toBeInTheDocument();
+ expect(
+ screen.getByRole("link", { name: /New measure/i }),
+ ).toBeInTheDocument();
+ });
+
+ it("is not rendered when remote sync is set to read-only", () => {
+ setup({ remoteSyncType: "read-only" });
+
+ expect(
+ screen.queryByRole("link", { name: /New measure/i }),
+ ).not.toBeInTheDocument();
+ });
+
+ it("is still rendered when remote sync is set to read-only but table is not published", () => {
+ setup({
+ remoteSyncType: "read-only",
+ table: { is_published: false },
+ });
+
+ expect(
+ screen.getByRole("link", { name: /New measure/i }),
+ ).toBeInTheDocument();
+ });
});
});
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/SegmentList.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/SegmentList.tsx
index 69c753a6486..65bfad078d6 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/SegmentList.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/SegmentList.tsx
@@ -4,9 +4,8 @@ import EmptyState from "metabase/common/components/EmptyState";
import { ForwardRefLink } from "metabase/common/components/Link";
import { useSelector } from "metabase/lib/redux";
import * as Urls from "metabase/lib/urls";
-import { getUserCanWriteSegments } from "metabase/selectors/user";
import { Button, Group, Icon, Stack } from "metabase/ui";
-import { getIsRemoteSyncReadOnly } from "metabase-enterprise/remote_sync/selectors";
+import { getUserCanWriteSegments } from "metabase-enterprise/data-studio/selectors";
import type { Table } from "metabase-types/api";
import { SegmentItem } from "./SegmentItem";
@@ -16,7 +15,6 @@ type SegmentListProps = {
};
export function SegmentList({ table }: SegmentListProps) {
- const canCreateSegment = useSelector(getUserCanWriteSegments);
const segments = table.segments ?? [];
const getSegmentHref = (segmentId: number) =>
Urls.dataStudioDataModelSegment({
@@ -25,11 +23,13 @@ export function SegmentList({ table }: SegmentListProps) {
tableId: table.id,
segmentId,
});
- const remoteSyncReadOnly = useSelector(getIsRemoteSyncReadOnly);
+ const canCreateSegment = useSelector((state) =>
+ getUserCanWriteSegments(state, table.is_published),
+ );
return (
<Stack gap="md" data-testid="table-segments-page">
- {canCreateSegment && !remoteSyncReadOnly && (
+ {canCreateSegment && (
<Group gap="md" justify="flex-start" wrap="nowrap">
<Button
component={ForwardRefLink}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/SegmentList.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/SegmentList.unit.spec.tsx
index a4ffafdcc61..6cb91497d8c 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/SegmentList.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/SegmentList.unit.spec.tsx
@@ -29,6 +29,7 @@ function setup({
db_id: 1,
schema: "PUBLIC",
segments,
+ is_published: true,
...table,
});
@@ -60,21 +61,43 @@ describe("SegmentList", () => {
).toBeInTheDocument();
});
- it("should not render 'New segment' button when user cannot create segments", () => {
- setup({ segments: [], isAdmin: false });
+ describe("'new segment' link", () => {
+ it("is rendered when user is an admin", () => {
+ setup({ segments: [], isAdmin: true });
- expect(screen.getByText("No segments yet")).toBeInTheDocument();
- expect(
- screen.queryByRole("link", { name: /New segment/i }),
- ).not.toBeInTheDocument();
- });
+ expect(
+ screen.getByRole("link", { name: /New segment/i }),
+ ).toBeInTheDocument();
+ });
- it("should not render 'New segment' button when remote sync is set to read-only", () => {
- setup({ segments: [], isAdmin: true, remoteSyncType: "read-only" });
+ it("is not rendered when user is not an admin", () => {
+ setup({ segments: [], isAdmin: false });
- expect(
- screen.queryByRole("link", { name: /New segment/i }),
- ).not.toBeInTheDocument();
+ expect(
+ screen.queryByRole("link", { name: /New segment/i }),
+ ).not.toBeInTheDocument();
+ });
+
+ it("is not rendered when remote sync is set to read-only", () => {
+ setup({ segments: [], isAdmin: true, remoteSyncType: "read-only" });
+
+ expect(
+ screen.queryByRole("link", { name: /New segment/i }),
+ ).not.toBeInTheDocument();
+ });
+
+ it("is still rendered when remote sync is set to read-only but table is not published", () => {
+ setup({
+ segments: [],
+ isAdmin: true,
+ remoteSyncType: "read-only",
+ table: { is_published: false },
+ });
+
+ expect(
+ screen.getByRole("link", { name: /New segment/i }),
+ ).toBeInTheDocument();
+ });
});
it("should render segment items", () => {
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/index.ts
index ec1accb81d2..37a7cb48507 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/index.ts
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/index.ts
@@ -4,8 +4,8 @@ import { hasPremiumFeature } from "metabase-enterprise/settings";
import { DataStudioToolbarButton } from "./query-builder/components/DataStudioToolbarButton";
import { getDataStudioRoutes } from "./routes";
+import { canAccessDataStudio } from "./selectors";
import {
- canAccessDataStudio,
canPlaceEntityInCollection,
canPlaceEntityInCollectionOrDescendants,
getLibraryCollectionType,
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/MeasureDetailPage/MeasureDetailPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/MeasureDetailPage/MeasureDetailPage.tsx
index 65245fbe1e0..a8934c2eff2 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/MeasureDetailPage/MeasureDetailPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/MeasureDetailPage/MeasureDetailPage.tsx
@@ -11,7 +11,7 @@ import { getMetadata } from "metabase/selectors/metadata";
import { Button, Group } from "metabase/ui";
import { PageContainer } from "metabase-enterprise/data-studio/common/components/PageContainer";
import { getDatasetQueryPreviewUrl } from "metabase-enterprise/data-studio/common/utils/get-dataset-query-preview-url";
-import { getIsRemoteSyncReadOnly } from "metabase-enterprise/remote_sync/selectors";
+import { getUserCanWriteMeasures } from "metabase-enterprise/data-studio/selectors";
import * as Lib from "metabase-lib";
import type { Measure } from "metabase-types/api";
@@ -36,7 +36,10 @@ export function MeasureDetailPage({
onRemove,
}: MeasureDetailPageProps) {
const metadata = useSelector(getMetadata);
- const remoteSyncReadOnly = useSelector(getIsRemoteSyncReadOnly);
+ const table = metadata.tables[measure.table_id];
+ const canWriteMeasures = useSelector((state) =>
+ getUserCanWriteMeasures(state, table?.is_published),
+ );
const { sendSuccessToast, sendErrorToast } = useMetadataToasts();
const [description, setDescription] = useState(measure.description ?? "");
@@ -119,14 +122,14 @@ export function MeasureDetailPage({
</Group>
)
}
- readOnly={remoteSyncReadOnly}
+ readOnly={!canWriteMeasures}
/>
<MeasureEditor
query={query}
description={description}
onQueryChange={setQuery}
onDescriptionChange={setDescription}
- readOnly={remoteSyncReadOnly}
+ readOnly={!canWriteMeasures}
/>
<LeaveRouteConfirmModal
key={measure.id}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/SegmentDetailPage/SegmentDetailPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/SegmentDetailPage/SegmentDetailPage.tsx
index dfc1cbdbd4b..cbd66d08b2b 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/SegmentDetailPage/SegmentDetailPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/SegmentDetailPage/SegmentDetailPage.tsx
@@ -8,11 +8,10 @@ import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmM
import { useSelector } from "metabase/lib/redux";
import { useMetadataToasts } from "metabase/metadata/hooks";
import { getMetadata } from "metabase/selectors/metadata";
-import { getUserCanWriteSegments } from "metabase/selectors/user";
import { Button, Group } from "metabase/ui";
import { PageContainer } from "metabase-enterprise/data-studio/common/components/PageContainer";
import { getDatasetQueryPreviewUrl } from "metabase-enterprise/data-studio/common/utils/get-dataset-query-preview-url";
-import { getIsRemoteSyncReadOnly } from "metabase-enterprise/remote_sync/selectors";
+import { getUserCanWriteSegments } from "metabase-enterprise/data-studio/selectors";
import * as Lib from "metabase-lib";
import type { Segment } from "metabase-types/api";
@@ -36,9 +35,11 @@ export function SegmentDetailPage({
breadcrumbs,
onRemove,
}: SegmentDetailPageProps) {
- const canWriteSegments = useSelector(getUserCanWriteSegments);
const metadata = useSelector(getMetadata);
- const remoteSyncReadOnly = useSelector(getIsRemoteSyncReadOnly);
+ const table = metadata.tables[segment.table_id];
+ const canWriteSegments = useSelector((state) =>
+ getUserCanWriteSegments(state, !!table?.is_published),
+ );
const { sendSuccessToast, sendErrorToast } = useMetadataToasts();
const [description, setDescription] = useState(segment.description ?? "");
@@ -46,7 +47,6 @@ export function SegmentDetailPage({
const [savedSegment, setSavedSegment] = useState(segment);
const { query, filters } = useSegmentQuery(definition, metadata);
- const canEditSegments = canWriteSegments && !remoteSyncReadOnly;
const isDirty = useMemo(
() =>
@@ -104,11 +104,11 @@ export function SegmentDetailPage({
segment={segment}
tabUrls={tabUrls}
previewUrl={previewUrl}
- onRemove={canEditSegments ? onRemove : undefined}
- readOnly={!canEditSegments}
+ onRemove={canWriteSegments ? onRemove : undefined}
+ readOnly={!canWriteSegments}
breadcrumbs={breadcrumbs}
actions={
- canEditSegments &&
+ canWriteSegments &&
isDirty && (
<Group gap="sm">
<Button onClick={handleReset}>{t`Cancel`}</Button>
@@ -127,11 +127,11 @@ export function SegmentDetailPage({
<SegmentEditor
query={query}
description={description}
- readOnly={!canEditSegments}
+ readOnly={!canWriteSegments}
onQueryChange={setQuery}
onDescriptionChange={setDescription}
/>
- {canEditSegments && (
+ {canWriteSegments && (
<LeaveRouteConfirmModal
key={segment.id}
route={route}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/SegmentDetailPage/SegmentDetailPage.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/SegmentDetailPage/SegmentDetailPage.unit.spec.tsx
index 152db42c632..6fbf3bf1d64 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/SegmentDetailPage/SegmentDetailPage.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/SegmentDetailPage/SegmentDetailPage.unit.spec.tsx
@@ -291,40 +291,56 @@ describe("SegmentDetailPage", () => {
});
});
- describe("readonly state for read-only remote sync", () => {
- it("has readonly segment name input", async () => {
- setup({ remoteSyncType: "read-only" });
+ describe("readonly state", () => {
+ describe("when remote sync is read-only and table is published", () => {
+ beforeEach(() => {
+ setup({
+ remoteSyncType: "read-only",
+ table: { ...TEST_TABLE, is_published: true },
+ });
+ });
- const nameInput = screen.getByDisplayValue("High Value Orders");
- expect(nameInput).toBeDisabled();
- });
+ it("has readonly segment name input", async () => {
+ const nameInput = screen.getByDisplayValue("High Value Orders");
+ expect(nameInput).toBeDisabled();
+ });
- it("shows description as plain text", async () => {
- setup({ remoteSyncType: "read-only" });
+ it("shows description as plain text", async () => {
+ expect(screen.getByText("Description")).toBeInTheDocument();
+ expect(screen.getByText("Orders with total > 100")).toBeInTheDocument();
+ expect(
+ screen.queryByLabelText("Give it a description"),
+ ).not.toBeInTheDocument();
+ });
- expect(screen.getByText("Description")).toBeInTheDocument();
- expect(screen.getByText("Orders with total > 100")).toBeInTheDocument();
- expect(
- screen.queryByLabelText("Give it a description"),
- ).not.toBeInTheDocument();
- });
+ it("does not show Remove segment option in actions menu", async () => {
+ await userEvent.click(screen.getByLabelText("Segment actions"));
- it("hides description section when there is no description", async () => {
- setup({
- remoteSyncType: "read-only",
- segment: createMockSegment({ ...TEST_SEGMENT, description: "" }),
+ expect(
+ screen.getByRole("menuitem", { name: /Preview/ }),
+ ).toBeInTheDocument();
+ expect(
+ screen.queryByRole("menuitem", { name: /Remove segment/ }),
+ ).not.toBeInTheDocument();
});
-
- expect(screen.queryByText("Description")).not.toBeInTheDocument();
});
- it("does not show Remove segment option in actions menu", async () => {
- setup({ remoteSyncType: "read-only" });
+ describe("when remote sync is read-only and table is not published", () => {
+ it("does not show elements as read-only", async () => {
+ setup({
+ remoteSyncType: "read-only",
+ table: { ...TEST_TABLE, is_published: false },
+ });
- await userEvent.click(screen.getByLabelText("Segment actions"));
+ expect(screen.getByDisplayValue("High Value Orders")).toBeEnabled();
+ expect(screen.getByLabelText("Give it a description")).toBeEnabled();
- expect(screen.getByText("Preview")).toBeInTheDocument();
- expect(screen.queryByText("Remove segment")).not.toBeInTheDocument();
+ await userEvent.click(screen.getByLabelText("Segment actions"));
+
+ expect(
+ screen.getByRole("menuitem", { name: /Remove segment/ }),
+ ).toBeInTheDocument();
+ });
});
});
});
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/selectors.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/selectors.ts
new file mode 100644
index 00000000000..764032e980d
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/selectors.ts
@@ -0,0 +1,40 @@
+import { PLUGIN_FEATURE_LEVEL_PERMISSIONS } from "metabase/plugins";
+import { getIsEmbeddingIframe } from "metabase/selectors/embed";
+import { getUserIsAdmin } from "metabase/selectors/user";
+import { getIsRemoteSyncReadOnly } from "metabase-enterprise/remote_sync/selectors";
+import type { State } from "metabase-types/store";
+
+// Must be in sync with CanAccessDataStudio in frontend/src/metabase/route-guards.tsx
+export function canAccessDataStudio(state: State) {
+ if (getIsEmbeddingIframe(state)) {
+ return false;
+ }
+ return (
+ getUserIsAdmin(state) ||
+ PLUGIN_FEATURE_LEVEL_PERMISSIONS.canAccessDataModel(state)
+ );
+}
+
+export const getUserCanWriteSegments = (
+ state: State,
+ isTablePublished: boolean,
+) => {
+ const isAdmin = getUserIsAdmin(state);
+
+ if (!isAdmin) {
+ return false;
+ }
+
+ const isRemoteSyncReadOnly = getIsRemoteSyncReadOnly(state);
+
+ return !isRemoteSyncReadOnly || !isTablePublished;
+};
+
+export const getUserCanWriteMeasures = (
+ state: State,
+ isTablePublished: boolean,
+) => {
+ const isRemoteSyncReadOnly = getIsRemoteSyncReadOnly(state);
+
+ return !isRemoteSyncReadOnly || !isTablePublished;
+};
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableMeasuresPage/TableMeasures.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableMeasuresPage/TableMeasures.tsx
index 015f297ddf3..994fae30209 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableMeasuresPage/TableMeasures.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableMeasuresPage/TableMeasures.tsx
@@ -3,7 +3,7 @@ import { t } from "ttag";
import { useSelector } from "metabase/lib/redux";
import * as Urls from "metabase/lib/urls";
import { Flex } from "metabase/ui";
-import { getIsRemoteSyncReadOnly } from "metabase-enterprise/remote_sync/selectors";
+import { getUserCanWriteMeasures } from "metabase-enterprise/data-studio/selectors";
import type { Table } from "metabase-types/api";
import {
@@ -16,12 +16,14 @@ type TableMeasuresProps = {
};
export function TableMeasures({ table }: TableMeasuresProps) {
- const remoteSyncReadOnly = useSelector(getIsRemoteSyncReadOnly);
+ const canWriteMeasures = useSelector((state) =>
+ getUserCanWriteMeasures(state, table.is_published),
+ );
const measures = table.measures ?? [];
let newButtonLabel: string | undefined;
let newButtonUrl: string | undefined;
- if (!remoteSyncReadOnly) {
+ if (canWriteMeasures) {
newButtonLabel = t`New measure`;
newButtonUrl = Urls.dataStudioPublishedTableMeasureNew(table.id);
}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableMeasuresPage/TableMeasures.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableMeasuresPage/TableMeasures.unit.spec.tsx
index bee08dc3556..5b853726d4e 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableMeasuresPage/TableMeasures.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableMeasuresPage/TableMeasures.unit.spec.tsx
@@ -2,20 +2,23 @@ import { Route } from "react-router";
import { mockSettings } from "__support__/settings";
import { renderWithProviders, screen } from "__support__/ui";
-import type { EnterpriseSettings } from "metabase-types/api";
+import type { EnterpriseSettings, Table } from "metabase-types/api";
import { createMockTable } from "metabase-types/api/mocks";
import { TableMeasures } from "./TableMeasures";
type SetupOpts = {
remoteSyncType?: EnterpriseSettings["remote-sync-type"];
+ table?: Partial<Table>;
};
-const setup = ({ remoteSyncType }: SetupOpts = {}) => {
+const setup = ({ remoteSyncType, table }: SetupOpts = {}) => {
const mockTable = createMockTable({
id: 1,
db_id: 1,
schema: "PUBLIC",
+ is_published: true,
+ ...table,
});
renderWithProviders(
@@ -33,21 +36,24 @@ const setup = ({ remoteSyncType }: SetupOpts = {}) => {
};
describe("TablesMeasures", () => {
- it("renders the new measure button", () => {
- setup();
- expect(
- screen.getByRole("link", { name: /New measure/ }),
- ).toBeInTheDocument();
- expect(screen.getByRole("link", { name: /New measure/ })).toHaveAttribute(
- "href",
- "/data-studio/library/tables/1/measures/new",
- );
- });
+ describe("'new measure' link", () => {
+ it("is not rendered when remote sync is set to read-only", () => {
+ setup({ remoteSyncType: "read-only" });
+
+ expect(
+ screen.queryByRole("link", { name: /New measure/i }),
+ ).not.toBeInTheDocument();
+ });
+
+ it("is rendered when remote sync is set to read-only but table is not published", () => {
+ setup({
+ remoteSyncType: "read-only",
+ table: { is_published: false },
+ });
- it("does not render the new measure button if remote sync is set to read-only", () => {
- setup({ remoteSyncType: "read-only" });
- expect(
- screen.queryByRole("link", { name: /New measure/ }),
- ).not.toBeInTheDocument();
+ expect(
+ screen.getByRole("link", { name: /New measure/i }),
+ ).toBeInTheDocument();
+ });
});
});
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableSegmentsPage/TableSegments.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableSegmentsPage/TableSegments.tsx
index 43e3e6cf9d7..bdbaf143e74 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableSegmentsPage/TableSegments.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableSegmentsPage/TableSegments.tsx
@@ -2,9 +2,8 @@ import { t } from "ttag";
import { useSelector } from "metabase/lib/redux";
import * as Urls from "metabase/lib/urls";
-import { getUserCanWriteSegments } from "metabase/selectors/user";
import { Flex } from "metabase/ui";
-import { getIsRemoteSyncReadOnly } from "metabase-enterprise/remote_sync/selectors";
+import { getUserCanWriteSegments } from "metabase-enterprise/data-studio/selectors";
import type { Table } from "metabase-types/api";
import {
@@ -17,13 +16,14 @@ type TableSegmentsProps = {
};
export function TableSegments({ table }: TableSegmentsProps) {
- const canWriteSegments = useSelector(getUserCanWriteSegments);
- const remoteSyncReadOnly = useSelector(getIsRemoteSyncReadOnly);
+ const canWriteSegments = useSelector((state) =>
+ getUserCanWriteSegments(state, table.is_published),
+ );
const segments = table.segments ?? [];
let newButtonLabel: string | undefined;
let newButtonUrl: string | undefined;
- if (!remoteSyncReadOnly && canWriteSegments) {
+ if (canWriteSegments) {
newButtonLabel = t`New segment`;
newButtonUrl = Urls.dataStudioPublishedTableSegmentNew(table.id);
}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableSegmentsPage/TableSegments.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableSegmentsPage/TableSegments.unit.spec.tsx
index ce117515adf..abf224c6f78 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableSegmentsPage/TableSegments.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableSegmentsPage/TableSegments.unit.spec.tsx
@@ -2,7 +2,7 @@ import { Route } from "react-router";
import { mockSettings } from "__support__/settings";
import { renderWithProviders, screen } from "__support__/ui";
-import type { EnterpriseSettings } from "metabase-types/api";
+import type { EnterpriseSettings, Table } from "metabase-types/api";
import { createMockTable, createMockUser } from "metabase-types/api/mocks";
import { TableSegments } from "./TableSegments";
@@ -10,13 +10,20 @@ import { TableSegments } from "./TableSegments";
type SetupOpts = {
isAdmin?: boolean;
remoteSyncType?: EnterpriseSettings["remote-sync-type"];
+ table?: Partial<Table>;
};
-const setup = ({ isAdmin = true, remoteSyncType }: SetupOpts = {}) => {
+const setup = ({
+ isAdmin = true,
+ remoteSyncType,
+ table = {},
+}: SetupOpts = {}) => {
const mockTable = createMockTable({
id: 1,
db_id: 1,
schema: "PUBLIC",
+ is_published: true,
+ ...table,
});
renderWithProviders(
@@ -35,28 +42,41 @@ const setup = ({ isAdmin = true, remoteSyncType }: SetupOpts = {}) => {
};
describe("TableSegments", () => {
- it("renders the new segment button", () => {
- setup();
- expect(
- screen.getByRole("link", { name: /New segment/ }),
- ).toBeInTheDocument();
- expect(screen.getByRole("link", { name: /New segment/ })).toHaveAttribute(
- "href",
- "/data-studio/library/tables/1/segments/new",
- );
- });
+ describe("'new segment' link", () => {
+ it("is rendered when user is an admin", () => {
+ setup({ isAdmin: true });
- it("does not render the new segment button if remote sync is set to read-only", () => {
- setup({ remoteSyncType: "read-only" });
- expect(
- screen.queryByRole("link", { name: /New segment/ }),
- ).not.toBeInTheDocument();
- });
+ expect(
+ screen.getByRole("link", { name: /New segment/i }),
+ ).toBeInTheDocument();
+ });
+
+ it("is not rendered when user is not an admin", () => {
+ setup({ isAdmin: false });
+
+ expect(
+ screen.queryByRole("link", { name: /New segment/i }),
+ ).not.toBeInTheDocument();
+ });
+
+ it("is not rendered when remote sync is set to read-only", () => {
+ setup({ isAdmin: true, remoteSyncType: "read-only" });
+
+ expect(
+ screen.queryByRole("link", { name: /New segment/i }),
+ ).not.toBeInTheDocument();
+ });
+
+ it("is still rendered when remote sync is set to read-only but table is not published", () => {
+ setup({
+ isAdmin: true,
+ remoteSyncType: "read-only",
+ table: { is_published: false },
+ });
- it("does not render the new segment button if the user is not an admin", () => {
- setup({ isAdmin: false });
- expect(
- screen.queryByRole("link", { name: /New segment/ }),
- ).not.toBeInTheDocument();
+ expect(
+ screen.getByRole("link", { name: /New segment/i }),
+ ).toBeInTheDocument();
+ });
});
});
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/utils.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/utils.ts
index 366d334dd3c..8d918a1b5e7 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/utils.ts
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/utils.ts
@@ -3,27 +3,12 @@ import { match } from "ts-pattern";
import { skipToken, useListCollectionItemsQuery } from "metabase/api";
import type { LibraryCollectionType } from "metabase/plugins";
-import { PLUGIN_FEATURE_LEVEL_PERMISSIONS } from "metabase/plugins";
-import { getIsEmbeddingIframe } from "metabase/selectors/embed";
-import { getUserIsAdmin } from "metabase/selectors/user";
import { useGetLibraryCollectionQuery } from "metabase-enterprise/api";
import type {
CollectionItem,
CollectionItemModel,
CollectionType,
} from "metabase-types/api";
-import type { State } from "metabase-types/store";
-
-// Must be in sync with CanAccessDataStudio in frontend/src/metabase/route-guards.tsx
-export function canAccessDataStudio(state: State) {
- if (getIsEmbeddingIframe(state)) {
- return false;
- }
- return (
- getUserIsAdmin(state) ||
- PLUGIN_FEATURE_LEVEL_PERMISSIONS.canAccessDataModel(state)
- );
-}
export function getLibraryCollectionType(
type: CollectionType | null | undefined,
diff --git a/frontend/src/metabase/admin/datamodel/containers/SegmentListApp.jsx b/frontend/src/metabase/admin/datamodel/containers/SegmentListApp.jsx
index 92a856764f6..ae661e73348 100644
--- a/frontend/src/metabase/admin/datamodel/containers/SegmentListApp.jsx
+++ b/frontend/src/metabase/admin/datamodel/containers/SegmentListApp.jsx
@@ -13,7 +13,7 @@ import CS from "metabase/css/core/index.css";
import { Segments } from "metabase/entities/segments";
import { connect } from "metabase/lib/redux";
import * as Urls from "metabase/lib/urls";
-import { getUserCanWriteSegments } from "metabase/selectors/user";
+import { getUserIsAdmin } from "metabase/selectors/user";
class SegmentListAppInner extends Component {
render() {
@@ -66,7 +66,7 @@ class SegmentListAppInner extends Component {
const SegmentListApp = _.compose(
Segments.loadList(),
FilteredToUrlTable("segments"),
- connect((state) => ({ isAdmin: getUserCanWriteSegments(state) }), {
+ connect((state, props) => ({ isAdmin: getUserIsAdmin(state) }), {
setArchived: Segments.actions.setArchived,
}),
)(SegmentListAppInner);
diff --git a/frontend/src/metabase/route-guards.tsx b/frontend/src/metabase/route-guards.tsx
index 1eaba3621ba..cc1e0262df2 100644
--- a/frontend/src/metabase/route-guards.tsx
+++ b/frontend/src/metabase/route-guards.tsx
@@ -141,7 +141,7 @@ export const CanAccessOnboarding = UserCanAccessOnboarding(
({ children }) => children,
);
-// Must be in sync with canAccessDataStudio in enterprise/frontend/src/metabase-enterprise/data-studio/utils.ts
+// Must be in sync with canAccessDataStudio in enterprise/frontend/src/metabase-enterprise/data-studio/selectors.ts
export const CanAccessDataStudio = MetabaseIsSetup(
UserIsAuthenticated(
UserCanAccessDataStudio(AvailableInEmbedding(({ children }) => children)),
diff --git a/frontend/src/metabase/selectors/user.ts b/frontend/src/metabase/selectors/user.ts
index afb5c414745..ea854311640 100644
--- a/frontend/src/metabase/selectors/user.ts
+++ b/frontend/src/metabase/selectors/user.ts
@@ -64,5 +64,3 @@ export const getIsTenantUser = createSelector(
[getUser],
(user) => user?.tenant_id != null,
);
-
-export const getUserCanWriteSegments = getUserIsAdmin;