🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
fix: guard organization member query (#1037)
Alex Dugglebya88e1b3c7843
diff --git a/client/src/api/admin/hooks/useOrganizationMembers.ts b/client/src/api/admin/hooks/useOrganizationMembers.tsindex 6728beb33..a21a6d363 100644--- a/client/src/api/admin/hooks/useOrganizationMembers.ts+++ b/client/src/api/admin/hooks/useOrganizationMembers.ts@@ -1,10 +1,17 @@import { useQuery } from "@tanstack/react-query";import { getOrganizationMembers, GetOrganizationMembersResponse } from "../endpoints";-export const useOrganizationMembers = (organizationId: string) => {+export const useOrganizationMembers = (organizationId?: string) => {return useQuery<GetOrganizationMembersResponse>({queryKey: ["organization-members", organizationId],- queryFn: () => getOrganizationMembers(organizationId),+ queryFn: () => {+ if (!organizationId) {+ throw new Error("Organization ID is required");+ }++ return getOrganizationMembers(organizationId);+ },staleTime: Infinity,+ enabled: !!organizationId,});};diff --git a/client/src/app/settings/teams/components/CreateEditTeamDialog.tsx b/client/src/app/settings/teams/components/CreateEditTeamDialog.tsxindex aafee723f..9de578348 100644--- a/client/src/app/settings/teams/components/CreateEditTeamDialog.tsx+++ b/client/src/app/settings/teams/components/CreateEditTeamDialog.tsx@@ -40,7 +40,7 @@ export function CreateEditTeamDialog({}: CreateEditTeamDialogProps) {const t = useExtracted();const { data: activeOrganization } = authClient.useActiveOrganization();- const { data: membersData, isLoading: isLoadingMembers } = useOrganizationMembers(activeOrganization?.id || "");+ const { data: membersData, isLoading: isLoadingMembers } = useOrganizationMembers(activeOrganization?.id);const { data: sitesData, isLoading: isLoadingSites } = useGetSitesFromOrg(activeOrganization?.id);const createTeam = useCreateTeam();diff --git a/client/src/app/settings/teams/layout.tsx b/client/src/app/settings/teams/layout.tsxindex 9d7f160cf..db834f00d 100644--- a/client/src/app/settings/teams/layout.tsx+++ b/client/src/app/settings/teams/layout.tsx@@ -28,7 +28,7 @@ export default function TeamsLayout({ children }: { children: React.ReactNode })</ExternalLink></p></div>- {!isMember && (+ {activeOrg?.id && !isMember && (<CreateEditTeamDialogtrigger={<Button size="sm">