TASK: Use conflict DTO key property as key for iteration in Conflic…

…tList component
neos · Apr 25, 2024 · a49fd0e · a49fd0e
1 parent add2a26
commit a49fd0e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 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
@@ -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
@@ -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}
                     />