feat: fix nullable issues with organizations, permissions, notifications

This commit is contained in:
Stojan Dimitrovski committed 2023-07-27 15:25:36 +02:00
1 parent d28fd66404
commit 2f78bf4c33
3 files changed
+11 -3

No files matched your search

@@ -33,9 +33,9 @@ const NotificationsPopover = () => {
const [targetNotification, setTargetNotification] = useState<Notification>()
if (!notifications) return <></>
if (!notifications || !Array.isArray(notifications)) return <></>
const hasNewNotifications = notifications?.some(
const hasNewNotifications = notifications.some(
(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 &&