From f99d62608039367e0e21fe947c0d1896474abf1b Mon Sep 17 00:00:00 2001 From: Lucas Oliveira <62335616+lucaseduoli@users.noreply.github.com> Date: Sat, 29 Mar 2025 20:54:37 -0300 Subject: [PATCH] fix: change file cursor and selection ordering on file modal (#7344) * Removed renaming from file renderer and changed cursor * Removed sorting by selected files * Updated file upload test --- .../components/fileRendererComponent/index.tsx | 10 ++-------- .../components/recentFilesComponent/index.tsx | 4 ++-- .../tests/core/unit/fileUploadComponent.spec.ts | 6 ++---- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/src/frontend/src/modals/fileManagerModal/components/filesRendererComponent/components/fileRendererComponent/index.tsx b/src/frontend/src/modals/fileManagerModal/components/filesRendererComponent/components/fileRendererComponent/index.tsx index bf726a900..0c7946f57 100644 --- a/src/frontend/src/modals/fileManagerModal/components/filesRendererComponent/components/fileRendererComponent/index.tsx +++ b/src/frontend/src/modals/fileManagerModal/components/filesRendererComponent/components/fileRendererComponent/index.tsx @@ -115,24 +115,18 @@ export default function FileRendererComponent({ file.progress === -1 && "pointer-events-none text-placeholder-foreground", )} - onDoubleClick={(e) => { - e.stopPropagation(); - if (!file.progress && !handleRemove) { - setOpenRename(true); - } - }} > {file.name}.{type} - + {formatFileSize(file.size)} diff --git a/src/frontend/src/modals/fileManagerModal/components/recentFilesComponent/index.tsx b/src/frontend/src/modals/fileManagerModal/components/recentFilesComponent/index.tsx index 10284fb68..b58071df0 100644 --- a/src/frontend/src/modals/fileManagerModal/components/recentFilesComponent/index.tsx +++ b/src/frontend/src/modals/fileManagerModal/components/recentFilesComponent/index.tsx @@ -91,8 +91,8 @@ export default function RecentFilesComponent({ files={searchResults .toSorted((a, b) => { const selectedOrder = sortByBoolean( - selectedFiles.includes(a.path) || a.progress !== undefined, - selectedFiles.includes(b.path) || b.progress !== undefined, + a.progress !== undefined, + b.progress !== undefined, ); return selectedOrder === 0 ? sortByDate( diff --git a/src/frontend/tests/core/unit/fileUploadComponent.spec.ts b/src/frontend/tests/core/unit/fileUploadComponent.spec.ts index e301869eb..06817180f 100644 --- a/src/frontend/tests/core/unit/fileUploadComponent.spec.ts +++ b/src/frontend/tests/core/unit/fileUploadComponent.spec.ts @@ -169,10 +169,8 @@ test( timeout: 1000, }); - await page - .getByText(`${jsonFileName}.json`) - .first() - .click({ clickCount: 2 }); + await page.getByTestId(`context-menu-button-${jsonFileName}`).click(); + await page.getByTestId("btn-rename-file").click(); await page .getByTestId(`rename-input-${jsonFileName}`) .fill(renamedJsonFile);