Fix update of conflicting files

enso-org · Sep 17, 2024 · 2a61273 · 2a61273
1 parent a753352
commit 2a61273
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 21 deletions.
diff --git a/app/dashboard/src/components/dashboard/AssetRow.tsx b/app/dashboard/src/components/dashboard/AssetRow.tsx
@@ -11,7 +11,6 @@ import * as setAssetHooks from '#/hooks/setAssetHooks'
 
 import {
   useDriveStore,
-  useNewestFolderId,
   useSetAssetPanelProps,
   useSetIsAssetPanelTemporarilyVisible,
   useSetSelectedKeys,
@@ -161,16 +160,12 @@ export const AssetRow = React.memo(function AssetRow(props: AssetRowProps) {
   const grabKeyboardFocusRef = useSyncRef(grabKeyboardFocus)
   const asset = item.item
   const [insertionVisibility, setInsertionVisibility] = React.useState(Visibility.visible)
-  const [innerRowState, setRowState] = React.useState<assetsTable.AssetRowState>(() =>
-    object.merge(assetRowUtils.INITIAL_ROW_STATE, { setVisibility: setInsertionVisibility }),
+  const [rowState, setRowState] = React.useState<assetsTable.AssetRowState>(() =>
+    object.merge(assetRowUtils.INITIAL_ROW_STATE, {
+      setVisibility: setInsertionVisibility,
+      isEditingName: driveStore.getState().newestFolderId === asset.id,
+    }),
   )
-
-  const isEditingName = useNewestFolderId() === asset.id
-
-  const rowState = React.useMemo(() => {
-    return object.merge(innerRowState, { isEditingName })
-  }, [isEditingName, innerRowState])
-
   const nodeParentKeysRef = React.useRef<{
     readonly nodeMap: WeakRef<ReadonlyMap<backendModule.AssetId, assetTreeNode.AnyAssetTreeNode>>
     readonly parentKeys: Map<backendModule.AssetId, backendModule.DirectoryId>

diff --git a/app/dashboard/src/components/dashboard/DirectoryNameColumn.tsx b/app/dashboard/src/components/dashboard/DirectoryNameColumn.tsx
@@ -59,10 +59,6 @@ export default function DirectoryNameColumn(props: DirectoryNameColumnProps) {
     if (isEditable) {
       setRowState(object.merger({ isEditingName }))
     }
-
-    if (!isEditingName) {
-      driveStore.setState({ newestFolderId: null })
-    }
   }
 
   const doRename = async (newTitle: string) => {

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')