From a49fd0eb482b7faa356d0b64792345ec097ad27c Mon Sep 17 00:00:00 2001
From: Wilhelm Behncke <wilhelm.behncke@protonmail.com>
Date: Tue, 23 Apr 2024 13:15:42 +0200
Subject: [PATCH] TASK: Use conflict DTO `key` property as key for iteration in
 ConflictList component

---
 packages/neos-ui-redux-store/src/CR/Syncing/index.ts          | 1 +
 .../Containers/Modals/SyncWorkspaceDialog/ConflictList.tsx    | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/neos-ui-redux-store/src/CR/Syncing/index.ts b/packages/neos-ui-redux-store/src/CR/Syncing/index.ts
index 2c41a72cd8..f34d3c8e2e 100644
--- a/packages/neos-ui-redux-store/src/CR/Syncing/index.ts
+++ b/packages/neos-ui-redux-store/src/CR/Syncing/index.ts
@@ -32,6 +32,7 @@ export enum ReasonForConflict {
 }
 
 export type Conflict = {
+    key: string;
     affectedNode: null | {
         icon: string;
         label: string;
diff --git a/packages/neos-ui/src/Containers/Modals/SyncWorkspaceDialog/ConflictList.tsx b/packages/neos-ui/src/Containers/Modals/SyncWorkspaceDialog/ConflictList.tsx
index b6a20b94e8..97a9189aa5 100644
--- a/packages/neos-ui/src/Containers/Modals/SyncWorkspaceDialog/ConflictList.tsx
+++ b/packages/neos-ui/src/Containers/Modals/SyncWorkspaceDialog/ConflictList.tsx
@@ -23,9 +23,9 @@ export const ConflictList: React.FC<{
 }> = (props) => {
     return (
         <ul className={style.conflictList}>
-            {props.conflicts.map((conflict, i) => (
+            {props.conflicts.map((conflict) => (
                 <ConflictItem
-                    key={String(i)}
+                    key={conflict.key}
                     conflict={conflict}
                     i18n={props.i18n}
                     />