scandic/web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Approved-by: Erik Tiekstra
This commit is contained in:
Christian Andolf
2025-04-29 07:02:31 +00:00
parent 4ae5da8a04 8ed74f08a4
commit 49feab6c89
2 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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.
// This is only temporary as we will not return null
// later on when we handle errors appropriately.
const filteredStays = (data?.pages.filter((page) => page?.data) ??
[]) as unknown as PreviousStaysNonNullResponseObject[]
const stays = filteredStays.flatMap((page) => page.data)
const stays = data.pages
.filter((page): page is PreviousStaysNonNullResponseObject => !!page?.data)
.flatMap((page) => page.data)
return isLoading ? (
<LoadingSpinner />
) : (
return (
<ListContainer>
<Grids.Stackable>
{stays.map((stay) => (

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

@@ -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.
// This is only temporary as we will not return null
// later on when we handle errors appropriately.
const filteredStays = (data?.pages.filter((page) => page && page.data) ??
[]) as unknown as UpcomingStaysNonNullResponseObject[]
const stays = filteredStays.flatMap((page) => page.data)
const stays = data.pages
.filter((page): page is UpcomingStaysNonNullResponseObject => !!page?.data)
.flatMap((page) => page.data)
return isLoading ? (
<LoadingSpinner />
) : stays.length ? (
return stays.length ? (
<ListContainer>
<Grids.Stackable>
{stays.map((stay) => (