From 44c9a15ea9a2c247fb703c984d9308d87df185db Mon Sep 17 00:00:00 2001
From: Fredrik Thorsson <fredrik.thorsson@scandichotels.com>
Date: Mon, 10 Mar 2025 08:03:07 +0000
Subject: [PATCH] Merged in fix/SW-1831-accordion-error-key-prop-is-missing
 (pull request #1496)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fix(SW-1831): add fragment

* fix(SW-1831): add fragment

* fix(SW-1831): move fragment to nodesToHtml

* fix(SW-1831): remove import

* fix(SW-1831): add getUniqueId


Approved-by: Erik Tiekstra
Approved-by: Matilda Landström
---
 .../AccordionAmenities/Parking/index.tsx          |  7 +------
 apps/scandic-web/components/JsonToHtml/index.tsx  |  1 +
 apps/scandic-web/components/JsonToHtml/utils.tsx  | 15 ++++++++++++++-
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/apps/scandic-web/components/ContentType/HotelPage/SidePeeks/Amenities/AccordionAmenities/Parking/index.tsx b/apps/scandic-web/components/ContentType/HotelPage/SidePeeks/Amenities/AccordionAmenities/Parking/index.tsx
index 877f11ec5..e1228bc8d 100644
--- a/apps/scandic-web/components/ContentType/HotelPage/SidePeeks/Amenities/AccordionAmenities/Parking/index.tsx
+++ b/apps/scandic-web/components/ContentType/HotelPage/SidePeeks/Amenities/AccordionAmenities/Parking/index.tsx
@@ -29,12 +29,7 @@ export default async function ParkingAmenity({
           <ParkingInformation key={data.type} parking={data} />
         ))}
         {parkingPageUrl && (
-          <Button
-            className={styles.parkingPageLink}
-            theme="base"
-            intent="secondary"
-            asChild
-          >
+          <Button theme="base" intent="secondary" asChild>
             <Link
               href={`/${parkingPageUrl}`}
               color="burgundy"
diff --git a/apps/scandic-web/components/JsonToHtml/index.tsx b/apps/scandic-web/components/JsonToHtml/index.tsx
index ce4ab275b..90c21d751 100644
--- a/apps/scandic-web/components/JsonToHtml/index.tsx
+++ b/apps/scandic-web/components/JsonToHtml/index.tsx
@@ -15,6 +15,7 @@ export default function JsonToHtml({
   if (!Array.isArray(nodes) || !nodes.length) {
     return null
   }
+
   return (
     <section className={cx(styles.container, className)}>
       {nodesToHtml(nodes, embeds, renderOptions).filter(Boolean)}
diff --git a/apps/scandic-web/components/JsonToHtml/utils.tsx b/apps/scandic-web/components/JsonToHtml/utils.tsx
index 37059757b..c7b761fa9 100644
--- a/apps/scandic-web/components/JsonToHtml/utils.tsx
+++ b/apps/scandic-web/components/JsonToHtml/utils.tsx
@@ -1,3 +1,5 @@
+import React from "react"
+
 import { renderOptions } from "./renderOptions"
 
 import styles from "./jsontohtml.module.css"
@@ -130,6 +132,13 @@ export function nodeToHtml(
   }
 }
 
+function getUniqueId(node: RTENode) {
+  if ("uid" in node) {
+    return node.uid
+  }
+  return node.id
+}
+
 export function nodesToHtml(
   nodes: RTENode[],
   embedsArray: Node<Embeds>[],
@@ -137,7 +146,11 @@ export function nodesToHtml(
 ) {
   const embeds = groupEmbedsByUid(embedsArray)
   const fullRenderOptions = { ...renderOptions, ...overrideRenderOptions }
-  return nodes.map((node) => nodeToHtml(node, embeds, fullRenderOptions))
+  return nodes.map((node, index) => (
+    <React.Fragment key={getUniqueId(node) ?? `node-${index}`}>
+      {nodeToHtml(node, embeds, fullRenderOptions)}
+    </React.Fragment>
+  ))
 }
 
 export function makeCssModuleCompatibleClassName(