Fix update of conflicting files

enso-org · Sep 17, 2024 · f379aa9 · f379aa9
1 parent a753352
commit f379aa9
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/app/dashboard/src/layouts/AssetsTable.tsx b/app/dashboard/src/layouts/AssetsTable.tsx
@@ -1853,13 +1853,14 @@ export default function AssetsTable(props: AssetsTableProps) {
 
                   const asset = isUpdating ? conflict.current : conflict.new
 
-                  fileMap.set(
-                    asset.id,
-                    new File([conflict.file], asset.title, {
-                      type: conflict.file.type,
-                      lastModified: conflict.file.lastModified,
-                    }),
-                  )
+                  const renamedFile = new File([conflict.file], asset.title, {
+                    type: conflict.file.type,
+                    lastModified: conflict.file.lastModified,
+                  })
+
+                  renamedFile.path = conflict.file.path
+
+                  fileMap.set(asset.id, renamedFile)
 
                   insertAssets([asset], event.parentId)
                   void doUploadFile(asset, isUpdating ? 'update' : 'new')