Skip to content

🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.

Refactor site organization membership check in SiteSettings component to improve role validation logic, ensuring accurate user access control based on organization membership.

Bill Yang0c2432dcdd69
diff --git a/client/src/components/SiteSettings/SiteSettings.tsx b/client/src/components/SiteSettings/SiteSettings.tsx
index 78b7a57f6..80a060883 100644
--- a/client/src/components/SiteSettings/SiteSettings.tsx
+++ b/client/src/components/SiteSettings/SiteSettings.tsx
@@ -37,7 +37,8 @@ export function SiteSettings({ siteId, trigger }: { siteId: number; trigger?: Re
function SiteSettingsInner({ siteMetadata, trigger }: { siteMetadata: SiteResponse; trigger?: React.ReactNode }) {
const t = useExtracted();
const { data: userOrganizationsData } = useUserOrganizations();
- const disabled = !userOrganizationsData?.[0]?.role || userOrganizationsData?.[0]?.role === "member";
+ const siteOrgMembership = userOrganizationsData?.find((org) => org.id === siteMetadata.organizationId);
+ const disabled = !siteOrgMembership?.role || siteOrgMembership.role === "member";
const [dialogOpen, setDialogOpen] = useState(false);
const [activeTab, setActiveTab] = useState("settings");