From 02cb03f1549a2c33c2dfb83a119a868d54d6ce97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matilda=20Landstr=C3=B6m?=
 <matilda.landstrom@scandichotels.com>
Date: Tue, 17 Sep 2024 15:42:15 +0200
Subject: [PATCH] refactor(SW-302): update naming

---
 .../Facilities/CardGrid/cardGrid.module.css          |  1 -
 server/routers/hotels/query.ts                       |  8 ++++----
 types/components/hotelPage/facilities.ts             |  8 ++++----
 utils/facilityCards.ts                               | 12 ++++++------
 utils/imageCard.ts                                   |  6 +++---
 5 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/components/ContentType/HotelPage/Facilities/CardGrid/cardGrid.module.css b/components/ContentType/HotelPage/Facilities/CardGrid/cardGrid.module.css
index 9cf0e4e50..0d453b437 100644
--- a/components/ContentType/HotelPage/Facilities/CardGrid/cardGrid.module.css
+++ b/components/ContentType/HotelPage/Facilities/CardGrid/cardGrid.module.css
@@ -24,7 +24,6 @@
     display: grid;
     gap: var(--Spacing-x1);
     grid-template-columns: repeat(3, 1fr);
-    grid-auto-flow: dense;
   }
 
   .mobileGrid {
diff --git a/server/routers/hotels/query.ts b/server/routers/hotels/query.ts
index 685e7f195..5abe2881e 100644
--- a/server/routers/hotels/query.ts
+++ b/server/routers/hotels/query.ts
@@ -41,7 +41,7 @@ import {
   TWENTYFOUR_HOURS,
 } from "./utils"
 
-import { facilityEnum } from "@/types/components/hotelPage/facilities"
+import { FacilityEnum } from "@/types/components/hotelPage/facilities"
 import { AvailabilityEnum } from "@/types/components/hotelReservation/selectHotel/selectHotel"
 import type { RequestOptionsWithOutBody } from "@/types/fetch"
 import type { GetHotelPageData } from "@/types/trpc/routers/contentstack/hotelPage"
@@ -216,15 +216,15 @@ export const hotelQueryRouter = router({
       const facilities: Array<Facility> = [
         {
           ...apiJson.data.attributes.restaurantImages,
-          id: facilityEnum.restaurant,
+          id: FacilityEnum.restaurant,
         },
         {
           ...apiJson.data.attributes.conferencesAndMeetings,
-          id: facilityEnum.conference,
+          id: FacilityEnum.conference,
         },
         {
           ...apiJson.data.attributes.healthAndWellness,
-          id: facilityEnum.wellness,
+          id: FacilityEnum.wellness,
         },
       ]
 
diff --git a/types/components/hotelPage/facilities.ts b/types/components/hotelPage/facilities.ts
index 1594c22b4..71babc174 100644
--- a/types/components/hotelPage/facilities.ts
+++ b/types/components/hotelPage/facilities.ts
@@ -1,18 +1,18 @@
 import type { CardProps } from "@/components/TempDesignSystem/Card/card"
 
-export type Facility = Array<CardProps>
+export type FacilityCards = Array<CardProps>
 
-export type Facilities = Array<Facility>
+export type Facilities = Array<FacilityCards>
 
 export type FacilityProps = {
   facilities: Facilities
 }
 
 export type CardGridProps = {
-  facility: Facility
+  facility: FacilityCards
 }
 
-export enum facilityEnum {
+export enum FacilityEnum {
   wellness = "wellness-and-exercise",
   conference = "meetings-and-conferences",
   restaurant = "restaurant-and-bar",
diff --git a/utils/facilityCards.ts b/utils/facilityCards.ts
index 1daa2da76..d0d2c0e5a 100644
--- a/utils/facilityCards.ts
+++ b/utils/facilityCards.ts
@@ -9,8 +9,8 @@ import { getLang } from "@/i18n/serverContext"
 
 import {
   type Facilities,
-  type Facility as f,
-  facilityEnum,
+  type FacilityCards,
+  FacilityEnum,
 } from "@/types/components/hotelPage/facilities"
 import type { ImageVaultAsset } from "@/types/components/imageVault"
 import type { CardProps } from "@/components/TempDesignSystem/Card/card"
@@ -25,7 +25,7 @@ type ActivityCard = {
   contentPage: Array<{ href: string }>
 }
 
-export function setActivityCard(activitiesCard: ActivityCard): f {
+export function setActivityCard(activitiesCard: ActivityCard): FacilityCards {
   const hasImage = activitiesCard.background_image
   return [
     {
@@ -83,7 +83,7 @@ export async function setFacilityCards(facilities: Array<Facility>) {
     })
 
     switch (facility.id) {
-      case facilityEnum.wellness:
+      case FacilityEnum.wellness:
         card.theme = "one"
         card.id = "wellness-and-exercise"
         ;(card.heading = intl.formatMessage({ id: "Sauna and gym" })),
@@ -97,7 +97,7 @@ export async function setFacilityCards(facilities: Array<Facility>) {
         grid.unshift(card)
         break
 
-      case facilityEnum.conference:
+      case FacilityEnum.conference:
         card.theme = "primaryDim"
         card.id = "meetings-and-conferences"
         ;(card.heading = intl.formatMessage({
@@ -111,7 +111,7 @@ export async function setFacilityCards(facilities: Array<Facility>) {
         grid.push(card)
         break
 
-      case facilityEnum.restaurant:
+      case FacilityEnum.restaurant:
         card.theme = "primaryDark"
         card.id = "restaurant-and-bar"
         card.heading = intl.formatMessage({
diff --git a/utils/imageCard.ts b/utils/imageCard.ts
index 4c4c99b66..84a75da18 100644
--- a/utils/imageCard.ts
+++ b/utils/imageCard.ts
@@ -1,8 +1,8 @@
-import type { Facility } from "@/types/components/hotelPage/facilities"
+import type { FacilityCards } from "@/types/components/hotelPage/facilities"
 import type { CardProps } from "@/components/TempDesignSystem/Card/card"
 
-export function sortCards(grid: Facility) {
-  const sortedCards = grid.slice(0).sort((a: CardProps, b: CardProps) => {
+export function sortCards(cards: FacilityCards) {
+  const sortedCards = cards.slice(0).sort((a: CardProps, b: CardProps) => {
     if (!a.backgroundImage && b.backgroundImage) {
       return 1
     }