Merged in fix/cleanup-ts-stays-components (pull request #1884)

fix: make proper use of type predicates and minor cleanup to avoid double ternary and reduce computation

Approved-by: Erik Tiekstra

apps/scandic-web/components/Blocks/DynamicContent/Stays/Previous/Client.tsx

@@ -36,22 +36,21 @@ export default function ClientPreviousStays({
       }
     )
 
+  if (isLoading) {
+    return <LoadingSpinner />
+  }
+
   function loadMoreData() {
     if (hasNextPage) {
       fetchNextPage()
     }
   }
 
-  // TS having a hard time with the filtered type.
+  const stays = data.pages
-  // This is only temporary as we will not return null
+    .filter((page): page is PreviousStaysNonNullResponseObject => !!page?.data)
-  // later on when we handle errors appropriately.
+    .flatMap((page) => page.data)
-  const filteredStays = (data?.pages.filter((page) => page?.data) ??
-    []) as unknown as PreviousStaysNonNullResponseObject[]
-  const stays = filteredStays.flatMap((page) => page.data)
 
-  return isLoading ? (
+  return (
-    <LoadingSpinner />
-  ) : (
     <ListContainer>
       <Grids.Stackable>
         {stays.map((stay) => (

apps/scandic-web/components/Blocks/DynamicContent/Stays/Upcoming/Client.tsx

@@ -36,22 +36,21 @@ export default function ClientUpcomingStays({
       }
     )
 
+  if (isLoading) {
+    return <LoadingSpinner />
+  }
+
   function loadMoreData() {
     if (hasNextPage) {
       fetchNextPage()
     }
   }
 
-  // TS having a hard time with the filtered type.
+  const stays = data.pages
-  // This is only temporary as we will not return null
+    .filter((page): page is UpcomingStaysNonNullResponseObject => !!page?.data)
-  // later on when we handle errors appropriately.
+    .flatMap((page) => page.data)
-  const filteredStays = (data?.pages.filter((page) => page && page.data) ??
-    []) as unknown as UpcomingStaysNonNullResponseObject[]
-  const stays = filteredStays.flatMap((page) => page.data)
 
-  return isLoading ? (
+  return stays.length ? (
-    <LoadingSpinner />
-  ) : stays.length ? (
     <ListContainer>
       <Grids.Stackable>
         {stays.map((stay) => (