refactor(SW-302)

components/ContentType/HotelPage/AmenitiesList/index.tsx

@@ -10,11 +10,11 @@ import { getLang } from "@/i18n/serverContext"
 
 import styles from "./amenitiesList.module.css"
 
-import type { AmentiesListProps } from "@/types/components/hotelPage/amenities"
+import type { AmenitiesListProps } from "@/types/components/hotelPage/amenities"
 
 export default async function AmenitiesList({
   detailedFacilities,
-}: AmentiesListProps) {
+}: AmenitiesListProps) {
   const intl = await getIntl()
   const sortedAmenities = detailedFacilities
     .sort((a, b) => b.sortOrder - a.sortOrder)

components/ContentType/HotelPage/Facilities/CardGrid/index.tsx

@@ -1,8 +1,7 @@
 import Card from "@/components/TempDesignSystem/Card"
 import CardImage from "@/components/TempDesignSystem/Card/CardImage"
 import Grids from "@/components/TempDesignSystem/Grids"
-import { isFacilityCard } from "@/utils/facilityCards"
-import { sortCards } from "@/utils/imageCard"
+import { filterFacilityCards, isFacilityCard } from "@/utils/facilityCards"
 
 import styles from "./cardGrid.module.css"
 
@@ -14,7 +13,7 @@ import type {
 export default function FacilitiesCardGrid({
   facilitiesCardGrid,
 }: CardGridProps) {
-  const imageCard = sortCards(facilitiesCardGrid)
+  const imageCard = filterFacilityCards(facilitiesCardGrid)
   const nrCards = facilitiesCardGrid.length
 
   function getCardClassName(card: FacilityCardType): string {

components/ContentType/HotelPage/Facilities/index.tsx

@@ -8,6 +8,7 @@ import FacilitiesCardGrid from "./CardGrid"
 import styles from "./facilities.module.css"
 
 import type {
+  Facilities,
   FacilitiesProps,
   FacilityCardType,
   FacilityGrid,
@@ -21,20 +22,29 @@ export default async function Facilities({
 
   const facilityCardGrids = setFacilityCardGrids(facilities)
 
-  facilityCardGrids.map((cardGrid: FacilityGrid) => {
-    cardGrid.map((card: FacilityCardType) => {
-      if (isFacilityCard(card)) {
-        card.heading = intl.formatMessage({ id: card.heading })
-        card.secondaryButton.title = intl.formatMessage({
-          id: card.secondaryButton.title,
-        })
-      }
-    })
-  })
+  const translatedFacilityGrids: Facilities = facilityCardGrids.map(
+    (cardGrid: FacilityGrid) => {
+      return cardGrid.map((card: FacilityCardType) => {
+        if (isFacilityCard(card)) {
+          return {
+            ...card,
+            heading: intl.formatMessage({ id: card.heading }),
+            secondaryButton: {
+              ...card.secondaryButton,
+              title: intl.formatMessage({
+                id: card.secondaryButton.title,
+              }),
+            },
+          }
+        }
+        return card
+      })
+    }
+  )
 
   return (
     <SectionContainer className={styles.grid}>
-      {facilityCardGrids.map((cardGrid: FacilityGrid) => (
+      {translatedFacilityGrids.map((cardGrid: FacilityGrid) => (
         <FacilitiesCardGrid
           key={cardGrid[0].id}
           facilitiesCardGrid={cardGrid}