From c2d7054ec44d02c882ad0a832a477b612e6df4c3 Mon Sep 17 00:00:00 2001
From: Alex van Andel <me@alexvanandel.com>
Date: Fri, 21 Jun 2024 14:07:46 +0100
Subject: [PATCH] fix: isChildEvent issue + loader is shown forever (#15524)

---
 .../event-types/views/event-types-listing-view.tsx        | 8 ++++----
 packages/lib/event-types/getEventTypesByViewer.ts         | 5 ++++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/apps/web/modules/event-types/views/event-types-listing-view.tsx b/apps/web/modules/event-types/views/event-types-listing-view.tsx
index d7d4037a63..eeb1c98875 100644
--- a/apps/web/modules/event-types/views/event-types-listing-view.tsx
+++ b/apps/web/modules/event-types/views/event-types-listing-view.tsx
@@ -863,14 +863,14 @@ const Main = ({
   const isMobile = useMediaQuery("(max-width: 768px)");
   const searchParams = useCompatSearchParams();
 
-  if (!rawData || status === "pending") {
-    return <SkeletonLoader />;
-  }
-
   if (status === "error") {
     return <Alert severity="error" title="Something went wrong" message={errorMessage} />;
   }
 
+  if (!rawData || status === "pending") {
+    return <SkeletonLoader />;
+  }
+
   const isFilteredByOnlyOneItem =
     (filters?.teamIds?.length === 1 || filters?.userIds?.length === 1) &&
     rawData.eventTypeGroups.length === 1;
diff --git a/packages/lib/event-types/getEventTypesByViewer.ts b/packages/lib/event-types/getEventTypesByViewer.ts
index e7b078f134..189f262102 100644
--- a/packages/lib/event-types/getEventTypesByViewer.ts
+++ b/packages/lib/event-types/getEventTypesByViewer.ts
@@ -134,9 +134,12 @@ export const getEventTypesByViewer = async (user: User, filters?: Filters, forRo
 
   const userEventTypes = (await Promise.all(profileEventTypes.map(mapEventType))).filter((eventType) => {
     const isAChildEvent = eventType.parentId;
+    if (!isAChildEvent) {
+      return true;
+    }
     // A child event only has one user
     const childEventAssignee = eventType.users[0];
-    if (isAChildEvent && childEventAssignee.id != user.id) {
+    if (!childEventAssignee || childEventAssignee.id != user.id) {
       return false;
     }
     return true;