diff --git a/apps/scandic-web/components/ContentType/DestinationPage/DestinationCityPage/index.tsx b/apps/scandic-web/components/ContentType/DestinationPage/DestinationCityPage/index.tsx index c2d1739c6..9e6c3f6d4 100644 --- a/apps/scandic-web/components/ContentType/DestinationPage/DestinationCityPage/index.tsx +++ b/apps/scandic-web/components/ContentType/DestinationPage/DestinationCityPage/index.tsx @@ -29,7 +29,7 @@ import DestinationPageSidePeek from "../Sidepeek" import StaticMap from "../StaticMap" import TopImages from "../TopImages" import DestinationTracking from "../Tracking" -import { isValidSeoFilter } from "../utils" +import { getActiveSeoFilter } from "../utils" import CityMap from "./CityMap" import DestinationCityPageSkeleton from "./DestinationCityPageSkeleton" @@ -66,7 +66,9 @@ export default async function DestinationCityPage({ seo_filters, } = destinationCityPage - if (!isValidSeoFilter(seo_filters, filterFromUrl)) { + const activeSeoFilter = getActiveSeoFilter(seo_filters, filterFromUrl) + + if (filterFromUrl && !activeSeoFilter) { const updatedPathname = pathname.replace(`/${filterFromUrl}`, "") return redirect(`${updatedPathname}${isMapView ? "?view=map" : ""}`) } @@ -120,7 +122,7 @@ export default async function DestinationCityPage({
}> - + {images?.length ? ( diff --git a/apps/scandic-web/components/ContentType/DestinationPage/DestinationCountryPage/index.tsx b/apps/scandic-web/components/ContentType/DestinationPage/DestinationCountryPage/index.tsx index 08878124d..0574e730d 100644 --- a/apps/scandic-web/components/ContentType/DestinationPage/DestinationCountryPage/index.tsx +++ b/apps/scandic-web/components/ContentType/DestinationPage/DestinationCountryPage/index.tsx @@ -30,7 +30,7 @@ import DestinationPageSidePeek from "../Sidepeek" import StaticMap from "../StaticMap" import TopImages from "../TopImages" import DestinationTracking from "../Tracking" -import { isValidSeoFilter } from "../utils" +import { getActiveSeoFilter } from "../utils" import CountryMap from "./CountryMap" import DestinationCountryPageSkeleton from "./DestinationCountryPageSkeleton" @@ -67,7 +67,9 @@ export default async function DestinationCountryPage({ seo_filters, } = destinationCountryPage - if (!isValidSeoFilter(seo_filters, filterFromUrl)) { + const activeSeoFilter = getActiveSeoFilter(seo_filters, filterFromUrl) + + if (filterFromUrl && !activeSeoFilter) { const updatedPathname = pathname.replace(`/${filterFromUrl}`, "") return redirect(`${updatedPathname}${isMapView ? "?view=map" : ""}`) } @@ -132,7 +134,7 @@ export default async function DestinationCountryPage({
}> - + {images?.length ? ( f.filter.slug === filterFromUrl) + return ( + flattenedSeoFilters.find((f) => f.filter.slug === filterFromUrl) || null + ) }