Skip to content

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

UXW-2531 Omits "New snippet" option in Library "New" dropdown if user lacks permission (#66835)

Brad Anderson1ebb50b914d6
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/CreateMenu.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/CreateMenu.tsx
index 7ce7f1d7cdb..36cf7074a8a 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/CreateMenu.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/CreateMenu.tsx
@@ -5,57 +5,71 @@ import { ForwardRefLink } from "metabase/common/components/Link";
import { useSelector } from "metabase/lib/redux";
import * as Urls from "metabase/lib/urls";
import { PLUGIN_SNIPPET_FOLDERS } from "metabase/plugins";
-import { canUserCreateQueries } from "metabase/selectors/user";
+import {
+ canUserCreateNativeQueries,
+ canUserCreateQueries,
+} from "metabase/selectors/user";
import { Button, FixedSizeIcon, Icon, Menu } from "metabase/ui";
import type { CollectionId } from "metabase-types/api";
export const CreateMenu = ({
metricCollectionId,
}: {
- modelCollectionId?: CollectionId;
metricCollectionId?: CollectionId;
}) => {
const [creatingSnippetFolder, setCreatingSnippetFolder] = useState(false);
+ const hasNativeWrite = useSelector(canUserCreateNativeQueries);
const hasDataAccess = useSelector(canUserCreateQueries);
const canCreateMetric = hasDataAccess && metricCollectionId;
+ const menuItems = [
+ canCreateMetric && (
+ <Menu.Item
+ key="metric"
+ component={ForwardRefLink}
+ to={Urls.newDataStudioMetric({
+ collectionId: metricCollectionId,
+ })}
+ leftSection={<FixedSizeIcon name="metric" />}
+ >
+ {t`Metric`}
+ </Menu.Item>
+ ),
+ hasNativeWrite && (
+ <Menu.Item
+ key="snippet"
+ component={ForwardRefLink}
+ to={Urls.newDataStudioSnippet()}
+ leftSection={<FixedSizeIcon name="snippet" />}
+ aria-label={t`Create new snippet`}
+ >
+ {t`New snippet`}
+ </Menu.Item>
+ ),
+ hasNativeWrite && PLUGIN_SNIPPET_FOLDERS.isEnabled && (
+ <Menu.Item
+ key="snippet-folder"
+ leftSection={<FixedSizeIcon name="folder" />}
+ onClick={() => setCreatingSnippetFolder(true)}
+ >
+ {t`New snippet folder`}
+ </Menu.Item>
+ ),
+ ].filter(Boolean);
+
+ if (!menuItems.length) {
+ return null;
+ }
+
return (
<>
<Menu position="bottom-end">
<Menu.Target>
<Button leftSection={<Icon name="add" />}>{t`New`}</Button>
</Menu.Target>
- <Menu.Dropdown>
- {canCreateMetric && (
- <Menu.Item
- component={ForwardRefLink}
- to={Urls.newDataStudioMetric({
- collectionId: metricCollectionId,
- })}
- leftSection={<FixedSizeIcon name="metric" />}
- >
- {t`Metric`}
- </Menu.Item>
- )}
- <Menu.Item
- component={ForwardRefLink}
- to={Urls.newDataStudioSnippet()}
- leftSection={<FixedSizeIcon name="snippet" />}
- aria-label={t`Create new snippet`}
- >
- {t`New snippet`}
- </Menu.Item>
- {PLUGIN_SNIPPET_FOLDERS.isEnabled && (
- <Menu.Item
- leftSection={<FixedSizeIcon name="folder" />}
- onClick={() => setCreatingSnippetFolder(true)}
- >
- {t`New snippet folder`}
- </Menu.Item>
- )}
- </Menu.Dropdown>
+ <Menu.Dropdown>{menuItems}</Menu.Dropdown>
</Menu>
<PLUGIN_SNIPPET_FOLDERS.CollectionFormModal
opened={creatingSnippetFolder}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/CreateMenu.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/CreateMenu.unit.spec.tsx
new file mode 100644
index 00000000000..94e8d4afcd9
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/CreateMenu.unit.spec.tsx
@@ -0,0 +1,64 @@
+import userEvent from "@testing-library/user-event";
+
+import { setupEnterprisePlugins } from "__support__/enterprise";
+import { mockSettings } from "__support__/settings";
+import { renderWithProviders, screen } from "__support__/ui";
+import {
+ createMockTokenFeatures,
+ createMockUser,
+} from "metabase-types/api/mocks";
+import type { UserPermissions } from "metabase-types/api/user";
+import { createMockState } from "metabase-types/store/mocks/state";
+
+import { CreateMenu } from "./CreateMenu";
+
+const setup = ({ permissions }: { permissions?: UserPermissions } = {}) => {
+ const state = createMockState({
+ settings: mockSettings({
+ "token-features": createMockTokenFeatures({
+ snippet_collections: true,
+ }),
+ }),
+ currentUser: createMockUser({
+ permissions,
+ }),
+ });
+ setupEnterprisePlugins();
+ return renderWithProviders(<CreateMenu metricCollectionId={1} />, {
+ storeInitialState: state,
+ });
+};
+
+describe("CreateMenu", () => {
+ it("renders nothing if menu does not have any options (user lacks permissions)", () => {
+ setup();
+ expect(
+ screen.queryByRole("button", { name: /New/ }),
+ ).not.toBeInTheDocument();
+ });
+
+ it("does not render snippet menu items if user only has query builder access", async () => {
+ setup({ permissions: { can_create_queries: true } });
+
+ await userEvent.click(screen.getByRole("button", { name: /New/ }));
+
+ expect(
+ screen.getAllByRole("menuitem").map((item) => item.textContent),
+ ).toEqual(["Metric"]);
+ });
+
+ it("renders all options when user has full permissions", async () => {
+ setup({
+ permissions: {
+ can_create_queries: true,
+ can_create_native_queries: true,
+ },
+ });
+
+ await userEvent.click(screen.getByRole("button", { name: /New/ }));
+
+ expect(
+ screen.getAllByRole("menuitem").map((item) => item.textContent),
+ ).toEqual(["Metric", "New snippet", "New snippet folder"]);
+ });
+});