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
Remove Security and Appearance from embedding settings related links on OSS (#68151)
kevinkelleher1206a24797b4da
diff --git a/frontend/src/metabase/admin/components/RelatedSettingsSection/constants.ts b/frontend/src/metabase/admin/components/RelatedSettingsSection/constants.tsindex c2a991da4fc..2ae61c548fb 100644--- a/frontend/src/metabase/admin/components/RelatedSettingsSection/constants.ts+++ b/frontend/src/metabase/admin/components/RelatedSettingsSection/constants.ts@@ -11,17 +11,23 @@ export interface RelatedSettingItem {export const getModularEmbeddingRelatedSettingItems = ({isUsingTenants,+ hasSimpleEmbedding,}: {isUsingTenants?: boolean;+ hasSimpleEmbedding?: boolean;}): RelatedSettingItem[] => {const isTenantsFeatureAvailable = PLUGIN_TENANTS.isEnabled;const items: RelatedSettingItem[] = [- {- icon: "shield_outline",- name: t`Security`,- to: "/admin/embedding/security",- },+ ...(hasSimpleEmbedding+ ? [+ {+ icon: "shield_outline" as const,+ name: t`Security`,+ to: "/admin/embedding/security",+ },+ ]+ : []),{icon: "lock",name: t`Authentication`,@@ -42,11 +48,15 @@ export const getModularEmbeddingRelatedSettingItems = ({name: t`Permissions`,to: "/admin/permissions",},- {- icon: "palette",- name: t`Appearance`,- to: "/admin/settings/appearance",- },+ ...(hasSimpleEmbedding+ ? [+ {+ icon: "palette" as const,+ name: t`Appearance`,+ to: "/admin/settings/appearance",+ },+ ]+ : []),...(isTenantsFeatureAvailable? [{diff --git a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSettings/EmbeddingSettings.tsx b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSettings/EmbeddingSettings.tsxindex ff665e84cfc..74f238e126e 100644--- a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSettings/EmbeddingSettings.tsx+++ b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSettings/EmbeddingSettings.tsx@@ -30,13 +30,17 @@ import { SharedCombinedEmbeddingSettings } from "../SharedCombinedEmbeddingSettifunction EmbeddingSettingsPageWrapper({ children }: PropsWithChildren) {const isEE = isEEBuild();const isUsingTenants = useSetting("use-tenants");+ const hasSimpleEmbedding = useHasTokenFeature("embedding_simple");return (<SettingsPageWrapper title={t`Embedding settings`}>{children}<RelatedSettingsSection- items={getModularEmbeddingRelatedSettingItems({ isUsingTenants })}+ items={getModularEmbeddingRelatedSettingItems({+ isUsingTenants,+ hasSimpleEmbedding,+ })}/>{isEE && <UpsellDevInstances location="embedding-page" />}diff --git a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSettings/tests/common.unit.spec.tsx b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSettings/tests/common.unit.spec.tsxindex 44af1a4ab33..b19f953d382 100644--- a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSettings/tests/common.unit.spec.tsx+++ b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSettings/tests/common.unit.spec.tsx@@ -33,21 +33,19 @@ describe("EmbeddingSdkSettings (OSS)", () => {it("should show cards with related settings", async () => {await setup({- isEmbeddingSdkEnabled: true,+ isEmbeddingSdkEnabled: false,showSdkEmbedTerms: false,});const relatedSettingCards = await screen.findAllByTestId("related-setting-card",);- expect(relatedSettingCards).toHaveLength(6);+ expect(relatedSettingCards).toHaveLength(4);- expect(await screen.findByText("Security")).toBeInTheDocument();expect(await screen.findByText("Authentication")).toBeInTheDocument();expect(await screen.findByText("Databases")).toBeInTheDocument();expect(await screen.findByText("People")).toBeInTheDocument();expect(await screen.findByText("Permissions")).toBeInTheDocument();- expect(await screen.findByText("Appearance")).toBeInTheDocument();});it("does not show the modular embedding toggle when token features are missing", () => {diff --git a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSettings/tests/enterprise.unit.spec.tsx b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSettings/tests/enterprise.unit.spec.tsxindex 457e4d4dd97..80529f50463 100644--- a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSettings/tests/enterprise.unit.spec.tsx+++ b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSettings/tests/enterprise.unit.spec.tsx@@ -53,4 +53,15 @@ describe("EmbeddingSdkSettings (EE)", () => {expect(screen.getByText("Tenants")).toBeInTheDocument();});++ it("should not show Security and Appearance in related settings without token", async () => {+ await setup({+ isEmbeddingSdkEnabled: false,+ isEmbeddingSimpleEnabled: false,+ showSdkEmbedTerms: false,+ });++ expect(screen.queryByText("Security")).not.toBeInTheDocument();+ expect(screen.queryByText("Appearance")).not.toBeInTheDocument();+ });});diff --git a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSettings/tests/premium.unit.spec.tsx b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSettings/tests/premium.unit.spec.tsxindex 45b6062e67b..0804fa01c14 100644--- a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSettings/tests/premium.unit.spec.tsx+++ b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSettings/tests/premium.unit.spec.tsx@@ -76,4 +76,15 @@ describe("EmbeddingSdkSettings (EE with Embedding SDK token)", () => {).not.toBeInTheDocument();});});++ it("should show Security and Appearance in related settings", async () => {+ await setup({+ isEmbeddingSdkEnabled: true,+ isEmbeddingSimpleEnabled: true,+ showSdkEmbedTerms: false,+ });++ expect(screen.getByText("Security")).toBeInTheDocument();+ expect(screen.getByText("Appearance")).toBeInTheDocument();+ });});diff --git a/frontend/src/metabase/embedding/embedding-hub/components/EmbeddingHubAdminSettingsPage.tsx b/frontend/src/metabase/embedding/embedding-hub/components/EmbeddingHubAdminSettingsPage.tsxindex 1bb063e94fb..c5aa4eb07e6 100644--- a/frontend/src/metabase/embedding/embedding-hub/components/EmbeddingHubAdminSettingsPage.tsx+++ b/frontend/src/metabase/embedding/embedding-hub/components/EmbeddingHubAdminSettingsPage.tsx@@ -4,13 +4,14 @@ import {RelatedSettingsSection,getModularEmbeddingRelatedSettingItems,} from "metabase/admin/components/RelatedSettingsSection";-import { useSetting } from "metabase/common/hooks";+import { useHasTokenFeature, useSetting } from "metabase/common/hooks";import { Stack, Text, Title } from "metabase/ui";import { EmbeddingHub } from "./EmbeddingHub";export const EmbeddingHubAdminSettingsPage = () => {const isUsingTenants = useSetting("use-tenants");+ const hasSimpleEmbedding = useHasTokenFeature("embedding_simple");return (<Stack mx="auto" py="xl" gap="xl" maw={800}>@@ -24,7 +25,10 @@ export const EmbeddingHubAdminSettingsPage = () => {<Stack ml="2.7rem"><RelatedSettingsSection- items={getModularEmbeddingRelatedSettingItems({ isUsingTenants })}+ items={getModularEmbeddingRelatedSettingItems({+ isUsingTenants,+ hasSimpleEmbedding,+ })}/></Stack></Stack>