From 50c989e36ab06b66780da7923bc68bba45b091b9 Mon Sep 17 00:00:00 2001
From: shamoon <4887959+shamoon@users.noreply.github.com>
Date: Sat, 6 Jan 2024 09:22:25 -0800
Subject: [PATCH] Fix: unique element key generation in quicklaunch and
 services (#2586)

---
 src/components/quicklaunch.jsx   | 2 +-
 src/components/services/list.jsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/quicklaunch.jsx b/src/components/quicklaunch.jsx
index a356fdeec..7fb1460aa 100644
--- a/src/components/quicklaunch.jsx
+++ b/src/components/quicklaunch.jsx
@@ -199,7 +199,7 @@ export default function QuickLaunch({
             {results.length > 0 && (
               <ul className="max-h-[60vh] overflow-y-auto m-2">
                 {results.map((r, i) => (
-                  <li key={r.container ?? r.app ?? `${r.name}-${r.href}`}>
+                  <li key={[r.name, r.container, r.app, r.href].filter((s) => s).join("-")}>
                     <button
                       type="button"
                       data-index={i}
diff --git a/src/components/services/list.jsx b/src/components/services/list.jsx
index 854361788..f3fd6e2ae 100644
--- a/src/components/services/list.jsx
+++ b/src/components/services/list.jsx
@@ -14,7 +14,7 @@ export default function List({ group, services, layout, useEqualHeights }) {
     >
       {services.map((service) => (
         <Item
-          key={service.container ?? service.app ?? service.name}
+          key={[service.container, service.app, service.name].filter((s) => s).join("-")}
           service={service}
           group={group}
           useEqualHeights={layout?.useEqualHeights ?? useEqualHeights}