Merge pull request #16076 from supabase/hf/fix-nullable-issues

feat: fix nullable issues with organizations, permissions, notifications
This commit is contained in:
Joshen Lim authored and GitHub committed 2023-07-28 18:10:41 +08:00
commit 85b0ffcee4
3 files changed
+10 -2

No files matched your search

@@ -37,7 +37,7 @@ const NotificationsPopover = ({ alt = false }: NotificationsPopoverProps) => {
const [targetNotification, setTargetNotification] = useState<Notification>()
if (!notifications) return <></>
if (!notifications || !Array.isArray(notifications)) return null
const newNotifications = notifications?.filter(
(notification) => notification.notification_status === NotificationStatus.New
@@ -9,6 +9,10 @@ export async function getOrganizations(signal?: AbortSignal): Promise<Organizati
const data = await get(`${API_URL}/organizations`, { signal })
if (data.error) throw data.error
if (!Array.isArray(data)) {
return []
}
const sorted = (data as Organization[]).sort((a, b) => a.name.localeCompare(b.name))
return sorted
}
+5 -1
View File
@@ -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 &&