🙌 OpenHands: AI-Driven Development
fix(frontend): show members a read-only badge on org-defaults pages (#14098)
Hiep Le15160f673335
diff --git a/frontend/__tests__/components/features/settings/org-wide-settings-badge.test.tsx b/frontend/__tests__/components/features/settings/org-wide-settings-badge.test.tsxindex db9293912b..c61867d509 100644--- a/frontend/__tests__/components/features/settings/org-wide-settings-badge.test.tsx+++ b/frontend/__tests__/components/features/settings/org-wide-settings-badge.test.tsx@@ -22,4 +22,17 @@ describe("OrgWideSettingsBadge", () => {const icon = badge.querySelector("svg");expect(icon).toBeInTheDocument();});++ it("should render the managed-by-admin i18n key when variant is set", () => {+ // Arrange & Act+ render(<OrgWideSettingsBadge variant="managed-by-admin" />);++ // Assert+ expect(+ screen.getByText("SETTINGS$ORG_MANAGED_BY_ADMIN_BADGE"),+ ).toBeInTheDocument();+ expect(+ screen.queryByText("SETTINGS$ORG_WIDE_SETTING_BADGE"),+ ).not.toBeInTheDocument();+ });});diff --git a/frontend/__tests__/routes/settings.test.tsx b/frontend/__tests__/routes/settings.test.tsxindex f04319af7f..1eb14c6793 100644--- a/frontend/__tests__/routes/settings.test.tsx+++ b/frontend/__tests__/routes/settings.test.tsx@@ -49,6 +49,10 @@ vi.mock("react-i18next", async () => {SETTINGS$NAV_BILLING: "Billing",SETTINGS$TITLE: "Settings",COMMON$LANGUAGE_MODEL_LLM: "LLM",+ SETTINGS$ORG_WIDE_SETTING_BADGE:+ "This setting affects the whole organization",+ SETTINGS$ORG_MANAGED_BY_ADMIN_BADGE:+ "This setting is managed by your organization administrator",};return translations[key] || key;},@@ -651,7 +655,10 @@ describe("Settings Screen", () => {});useSelectedOrganizationStore.setState({ organizationId: "1" });// Pre-populate user data in cache so useMe() returns admin role immediately- mockQueryClient.setQueryData(["organizations", "1", "me"], createMockUser({ role: "admin", org_id: "1" }));+ mockQueryClient.setQueryData(+ ["organizations", "1", "me"],+ createMockUser({ role: "admin", org_id: "1" }),+ );renderSettingsScreen();@@ -729,7 +736,10 @@ describe("Settings Screen", () => {});useSelectedOrganizationStore.setState({ organizationId: "1" });// Pre-populate user data in cache so useMe() returns admin role immediately- mockQueryClient.setQueryData(["organizations", "1", "me"], createMockUser({ role: "admin", org_id: "1" }));+ mockQueryClient.setQueryData(+ ["organizations", "1", "me"],+ createMockUser({ role: "admin", org_id: "1" }),+ );renderSettingsScreen();@@ -861,22 +871,33 @@ describe("Settings Screen", () => {renderSettingsScreen(path);- expect(- await screen.findByTestId("org-wide-settings-badge"),- ).toBeInTheDocument();+ const badge = await screen.findByTestId("org-wide-settings-badge");+ expect(badge).toBeInTheDocument();+ expect(badge).toHaveTextContent(+ "This setting affects the whole organization",+ );},);- it("renders the badge on /settings/org-defaults for a non-admin member of a team org (read-only view)", async () => {- seedSaasOrgContext(MOCK_TEAM_ORG_ACME, { role: "member" });+ it.each([+ "/settings/org-defaults",+ "/settings/org-defaults/condenser",+ "/settings/org-defaults/verification",+ ])(+ "renders the managed-by-admin badge on %s for a member of a team org (read-only view)",+ async (path) => {+ seedSaasOrgContext(MOCK_TEAM_ORG_ACME, { role: "member" });- renderSettingsScreen("/settings/org-defaults");+ renderSettingsScreen(path);- await screen.findByTestId("org-default-llm-settings-screen");- expect(- await screen.findByTestId("org-wide-settings-badge"),- ).toBeInTheDocument();- });+ const badge = await screen.findByTestId("org-wide-settings-badge");+ await waitFor(() => {+ expect(badge).toHaveTextContent(+ "This setting is managed by your organization administrator",+ );+ });+ },+ );it("does not render the badge on /settings/org-defaults when the selected organization is a personal org", async () => {seedSaasOrgContext(MOCK_PERSONAL_ORG, { role: "admin" });diff --git a/frontend/src/components/features/settings/org-wide-settings-badge.tsx b/frontend/src/components/features/settings/org-wide-settings-badge.tsxindex 781868c706..17b7545bc4 100644--- a/frontend/src/components/features/settings/org-wide-settings-badge.tsx+++ b/frontend/src/components/features/settings/org-wide-settings-badge.tsx@@ -3,9 +3,22 @@ import { Typography } from "#/ui/typography";import { I18nKey } from "#/i18n/declaration";import InfoCircleIcon from "#/icons/info-circle.svg?react";-export function OrgWideSettingsBadge() {+export type OrgWideSettingsBadgeVariant = "org-wide" | "managed-by-admin";++interface OrgWideSettingsBadgeProps {+ variant?: OrgWideSettingsBadgeVariant;+}++export function OrgWideSettingsBadge({+ variant = "org-wide",+}: OrgWideSettingsBadgeProps) {const { t } = useTranslation();+ const i18nKey =+ variant === "managed-by-admin"+ ? I18nKey.SETTINGS$ORG_MANAGED_BY_ADMIN_BADGE+ : I18nKey.SETTINGS$ORG_WIDE_SETTING_BADGE;+return (<divdata-testid="org-wide-settings-badge"@@ -13,7 +26,7 @@ export function OrgWideSettingsBadge() {><InfoCircleIcon width={12} height={12} className="text-[#8c8c8c]" /><Typography.Text className="text-[11px] font-medium text-[#8c8c8c] leading-5">- {t(I18nKey.SETTINGS$ORG_WIDE_SETTING_BADGE)}+ {t(i18nKey)}</Typography.Text></div>);diff --git a/frontend/src/i18n/declaration.ts b/frontend/src/i18n/declaration.tsindex 641258ea47..3d7c35dd32 100644--- a/frontend/src/i18n/declaration.ts+++ b/frontend/src/i18n/declaration.ts@@ -288,6 +288,7 @@ export enum I18nKey {SETTINGS$ORG_SETTINGS_HEADER = "SETTINGS$ORG_SETTINGS_HEADER",SETTINGS$PERSONAL_SETTINGS_HEADER = "SETTINGS$PERSONAL_SETTINGS_HEADER",SETTINGS$ORG_WIDE_SETTING_BADGE = "SETTINGS$ORG_WIDE_SETTING_BADGE",+ SETTINGS$ORG_MANAGED_BY_ADMIN_BADGE = "SETTINGS$ORG_MANAGED_BY_ADMIN_BADGE",SETTINGS$ORG_DEFAULTS_INFO = "SETTINGS$ORG_DEFAULTS_INFO",SETTINGS$PERSONAL_AGENT_INFO = "SETTINGS$PERSONAL_AGENT_INFO",SETTINGS$GITHUB = "SETTINGS$GITHUB",diff --git a/frontend/src/i18n/translation.json b/frontend/src/i18n/translation.jsonindex 6379e4300b..2b12a0a4e7 100644--- a/frontend/src/i18n/translation.json+++ b/frontend/src/i18n/translation.json@@ -4895,6 +4895,23 @@"uk": "Це налаштування впливає на всю організацію","ca": "Aquesta configuració afecta tota l'organització"},+ "SETTINGS$ORG_MANAGED_BY_ADMIN_BADGE": {+ "en": "This setting is managed by your organization administrator",+ "ja": "この設定は組織の管理者によって管理されています",+ "zh-CN": "此设置由您的组织管理员管理",+ "zh-TW": "此設定由您的組織管理員管理",+ "ko-KR": "이 설정은 조직 관리자가 관리합니다",+ "no": "Denne innstillingen administreres av organisasjonsadministratoren din",+ "it": "Questa impostazione è gestita dall’amministratore della tua organizzazione",+ "pt": "Esta configuração é gerida pelo administrador da sua organização",+ "es": "Esta configuración está gestionada por el administrador de tu organización",+ "ar": "يتم إدارة هذا الإعداد من قبل مسؤول مؤسستك",+ "fr": "Ce paramètre est géré par l’administrateur de votre organisation",+ "tr": "Bu ayar kuruluş yöneticiniz tarafından yönetilmektedir",+ "de": "Diese Einstellung wird von Ihrem Organisationsadministrator verwaltet",+ "uk": "Це налаштування керується адміністратором вашої організації",+ "ca": "Aquesta configuració està gestionada per l'administrador de la teva organització"+ },"SETTINGS$ORG_DEFAULTS_INFO": {"en": "These organization defaults are applied first. Members can still add their own credentials or personal overrides where allowed.","ja": "これらの組織のデフォルト設定が最初に適用されます。メンバーは許可されている範囲で、自分の認証情報や個人設定を追加できます。",diff --git a/frontend/src/routes/settings.tsx b/frontend/src/routes/settings.tsxindex c5e15f3637..0f5a21648a 100644--- a/frontend/src/routes/settings.tsx+++ b/frontend/src/routes/settings.tsx@@ -20,6 +20,7 @@ import {} from "#/utils/settings-utils";import { useOrgTypeAndAccess } from "#/hooks/use-org-type-and-access";import { useConfig } from "#/hooks/query/use-config";+import { useMe } from "#/hooks/query/use-me";import { OrgWideSettingsBadge } from "#/components/features/settings/org-wide-settings-badge";const SAAS_ONLY_PATHS = [@@ -131,12 +132,15 @@ function SettingsScreen() {const navItems = useSettingsNavItems();const { data: config } = useConfig();const { isTeamOrg } = useOrgTypeAndAccess();+ const { data: me } = useMe();// Determine if we should show the org-wide settings badge- // Only show for Admin/Owner roles on LLM/org-defaults pages in team orgsconst isOrgWideBadgePath = ORG_WIDE_BADGE_PATHS.has(location.pathname);const isSaasMode = config?.app_mode === "saas";const shouldShowOrgWideBadge = isOrgWideBadgePath && isTeamOrg && isSaasMode;+ // Members see a read-only message; Admins/Owners see the org-wide notice.+ const orgWideBadgeVariant =+ me?.role === "member" ? "managed-by-admin" : "org-wide";// Current section title for the main content areaconst currentSectionTitle = useMemo(() => {@@ -165,7 +169,9 @@ function SettingsScreen() {{!shouldHideTitle && (<div className="flex items-center gap-3 flex-wrap"><Typography.H2>{t(currentSectionTitle)}</Typography.H2>- {shouldShowOrgWideBadge && <OrgWideSettingsBadge />}+ {shouldShowOrgWideBadge && (+ <OrgWideSettingsBadge variant={orgWideBadgeVariant} />+ )}</div>)}<div className="flex-1 overflow-auto custom-scrollbar-always">