diff --git a/studio/components/layouts/ProjectLayout/LayoutHeader/NotificationsPopover/index.tsx b/studio/components/layouts/ProjectLayout/LayoutHeader/NotificationsPopover/index.tsx index ebc0348ea3f..d11b4f510a2 100644 --- a/studio/components/layouts/ProjectLayout/LayoutHeader/NotificationsPopover/index.tsx +++ b/studio/components/layouts/ProjectLayout/LayoutHeader/NotificationsPopover/index.tsx @@ -37,7 +37,7 @@ const NotificationsPopover = ({ alt = false }: NotificationsPopoverProps) => { const [targetNotification, setTargetNotification] = useState() - if (!notifications) return <> + if (!notifications || !Array.isArray(notifications)) return null const newNotifications = notifications?.filter( (notification) => notification.notification_status === NotificationStatus.New diff --git a/studio/data/organizations/organizations-query.ts b/studio/data/organizations/organizations-query.ts index dab843414ad..4bf70566dd8 100644 --- a/studio/data/organizations/organizations-query.ts +++ b/studio/data/organizations/organizations-query.ts @@ -9,6 +9,10 @@ export async function getOrganizations(signal?: AbortSignal): Promise a.name.localeCompare(b.name)) return sorted } diff --git a/studio/hooks/misc/useCheckPermissions.ts b/studio/hooks/misc/useCheckPermissions.ts index 257b4482a67..f1228eda934 100644 --- a/studio/hooks/misc/useCheckPermissions.ts +++ b/studio/hooks/misc/useCheckPermissions.ts @@ -15,7 +15,11 @@ export function doPermissionsCheck( data?: object, organizationId?: number ) { - return (permissions ?? []) + if (!permissions || !Array.isArray(permissions)) { + return false + } + + return permissions .filter( (permission) => permission.organization_id === organizationId &&