feedback

aslilac · aslilac · commit 88e3720aa62d · 2025-03-03T21:40:15.000Z
diff --git a/site/e2e/tests/roles.spec.ts b/site/e2e/tests/roles.spec.ts
@@ -23,9 +23,9 @@ const adminSettings = [
 
 async function hasAccessToAdminSettings(page: Page, settings: AdminSetting[]) {
 	// Organizations and Audit Logs both require a license to be visible
-	const visibleSettings = settings.filter(
-		(it) => Boolean(license) || (it !== "Organizations" && it !== "Audit Logs"),
-	);
+	const visibleSettings = license
+		? settings
+		: settings.filter((it) => it !== "Organizations" && it !== "Audit Logs");
 	const adminSettingsButton = page.getByRole("button", {
 		name: "Admin settings",
 	});
diff --git a/site/src/contexts/auth/permissions.tsx b/site/src/contexts/auth/permissions.tsx
@@ -180,7 +180,6 @@ export const canViewDeploymentSettings = (
 		permissions !== undefined &&
 		(permissions.viewDeploymentValues ||
 			permissions.viewAllLicenses ||
-			permissions.viewDeploymentValues ||
 			permissions.viewAllUsers ||
 			permissions.viewAnyGroup ||
 			permissions.viewNotificationTemplate ||
diff --git a/site/src/modules/management/DeploymentSettingsLayout.tsx b/site/src/modules/management/DeploymentSettingsLayout.tsx
@@ -17,10 +17,6 @@ const DeploymentSettingsLayout: FC = () => {
 	const { permissions } = useAuthenticated();
 	const location = useLocation();
 
-	// The deployment settings page also contains users and groups and more so
-	// this page must be visible if you can see any of these.
-	const canViewDeploymentSettingsPage = canViewDeploymentSettings(permissions);
-
 	if (location.pathname === "/deployment") {
 		return (
 			<Navigate
@@ -34,6 +30,10 @@ const DeploymentSettingsLayout: FC = () => {
 		);
 	}
 
+	// The deployment settings page also contains users and groups and more so
+	// this page must be visible if you can see any of these.
+	const canViewDeploymentSettingsPage = canViewDeploymentSettings(permissions);
+
 	return (
 		<RequirePermission isFeatureVisible={canViewDeploymentSettingsPage}>
 			<div>
