Local Dashboard fixes #10958

somebody1234 · 2024-09-03T09:00:16Z

Pull Request Description

Fix most of https://github.com/enso-org/cloud-v2/issues/1459
- Prevent click + click from triggering rename on Windows and Linux. Behavior is preserved on macOS.
- Fix text in Drive when root folder is empty
- Properly remove the "Drop here to upload box" after a file is dropped
- "Copy as path" now unconditionally uses / for path delimiters, even on Windows
- Duplicating a project in the root folder on Windows no longer errors
- Extra folders in the sidebar now (correctly) show folder name, rather than path, on Windows
- Mouse pointer when dragging to a folder is now move, not copy

Not addressed:

[no-repro] Tooltips should have some latency before showing up
- This should already be the case, although it may work weirdly (once the tooltip opens, there is no delay on subsequent tooltips opening until the last tooltip closes.)
[no-repro] Ctrl-click should add to selection
Column width should be resizable
- This requires a refactor and therefore is considered out of scope for this PR
[no-repro] Choosing root folder needs a file browser
[no-repro] Choosing root folder doesn't do anything get the same list as we had before
[no-repro] Open in explorer didn't work in a file but did on project - possibly fixed by path changes.
[no-repro] Opening an enso-project by double clicking resulted on it being renamed with a (2)

Related changes:

Make "root directory" picker's file browser default to the current root directory

Important Notes

None

Checklist

Please ensure that the following checklist has been satisfied before submitting the PR:

~~The documentation has been updated, if necessary.~~
~~Screenshots/screencasts have been attached, if there are any visual changes. For interactive or animated visual changes, a screencast is preferred.~~
All code follows the
Scala,
Java,
TypeScript,
and
Rust
style guides. In case you are using a language not listed above, follow the Rust style guide.
~~Unit tests have been written where possible.~~

PabloBuchu · 2024-09-03T10:16:51Z

| [no-repro] Ctrl-click should add to selection
Does it mean it works for you? I also can't select multiple things with cmd/ctrl maybe key mapping is bugged?

| Opening an enso-project by double clicking resulted on it being renamed with a (2)
Looks bugged to me but maybe this needs a separate issue?

Screen.Recording.2024-09-03.at.12.12.20.mp4

somebody1234 · 2024-09-03T11:39:06Z

I also can't select multiple things with cmd/ctrl maybe key mapping is bugged?

maybe - editing an asset's name uses the same shortcut (cmd+click) - does that work for you?

somebody1234 · 2024-09-03T11:39:38Z

ahhh, double clicking like that...

PabloBuchu · 2024-09-03T12:31:14Z

✅

…at correct root directory is used

somebody1234 · 2024-09-04T08:15:30Z

@PabloBuchu some minor re-QA might be needed, for the double clicking to open. steps to repro:

set your Local root directory to a non-default value
double click a file. currently errors on develop since the file was uploaded to the default root directory so it is not present in the FE's root directory.
also refresh to make sure we don't repeatedly upload the new file every time we refresh (due to changes to when the file is uploaded.)

PabloBuchu · 2024-09-06T07:44:47Z

@somebody1234 I think looks good

MrFlashAccount

LGTM

MrFlashAccount · 2024-09-06T08:28:56Z

app/dashboard/src/pages/dashboard/Dashboard.tsx

@@ -145,6 +147,30 @@ function DashboardInner(props: DashboardProps) {
  const openProjectMutation = projectHooks.useOpenProjectMutation()
  const renameProjectMutation = projectHooks.useRenameProjectMutation()

+  useQuery({


I think it's better to use usePrefetchQuery here: https://stackoverflow.com/a/77486960

kazcw

Based on the tanstack-query changelogs, this version update shouldn't cause any problems for the GUI

app/ide-desktop/common/package.json

- Fix most of enso-org/cloud-v2#1459 - Prevent click + click from triggering rename on Windows and Linux. Behavior is preserved on macOS. - Fix text in Drive when root folder is empty - Properly remove the "Drop here to upload box" after a file is dropped - "Copy as path" now unconditionally uses `/` for path delimiters, even on Windows - Duplicating a project in the root folder on Windows no longer errors - Extra folders in the sidebar now (correctly) show folder name, rather than path, on Windows - Mouse pointer when dragging to a folder is now move, not copy Not addressed: - [no-repro] Tooltips should have some latency before showing up - This should already be the case, although it may work weirdly (once the tooltip opens, there is no delay on subsequent tooltips opening until the last tooltip closes.) - [no-repro] Ctrl-click should add to selection - Column width should be resizable - This requires a refactor and therefore is considered out of scope for this PR - [no-repro] Choosing root folder needs a file browser - [no-repro] Choosing root folder doesn't do anything get the same list as we had before - [no-repro] Open in explorer didn't work in a file but did on project - possibly fixed by path changes. - [no-repro] Opening an enso-project by double clicking resulted on it being renamed with a (2) Related changes: - Make "root directory" picker's file browser default to the current root directory # Important Notes None (cherry picked from commit 9ec6029)

somebody1234 added 15 commits September 2, 2024 21:54

Show "move" cursor instead of "copy" cursor when dragging files

be61a6f

Handle backslash in file functions

7d80dba

Normalize path for "Copy as Path"

9ca6a95

Adjust text for empty folder

4f0f5a7

WIP: Fix file drag dialog not disappearing

61d9b8a

Hide dialog title bar when not needed

0f63c5c

Fix lint errors

3b3acb4

Fix YDoc server on Electron watch mode

06f50f2

Hide drop area on drop

d433de4

Add missing cross-env to desktop app package

87bcfd0

Consistent paths on watch:windows script

97a6886

Fix error duplicating project in Local root directory

ec61bd0

Normalize picked directory

3d4f49e

Fix lints

d4da273

Only toggle asset name editing on click+click when on macOS

39cdec0

somebody1234 added --bug Type: bug g-dashboard labels Sep 3, 2024

somebody1234 requested review from PabloBuchu, indiv0, MrFlashAccount, Frizi, farmaazon, vitvakatu, kazcw and AdRiley as code owners September 3, 2024 09:00

somebody1234 added the CI: No changelog needed Do not require a changelog entry for this PR. label Sep 3, 2024

Fix Electron watch script

0763b0b

Prettier

813ee51

PabloBuchu approved these changes Sep 3, 2024

View reviewed changes

somebody1234 added 2 commits September 4, 2024 18:10

Upload opened project after loading into dashboard, not before, so th…

92a6cd4

…at correct root directory is used

Fix errors

69b12e7

somebody1234 added 2 commits September 6, 2024 01:01

Merge branch 'develop' into wip/sb/dashboard-local-fixes

c1df7f9

Fix errors

9564bec

MrFlashAccount approved these changes Sep 6, 2024

View reviewed changes

somebody1234 added 5 commits September 6, 2024 18:40

Merge branch 'develop' into wip/sb/dashboard-local-fixes

0aafca0

Upgrade to @tanstack/query 5.54; Switch to usePrefetchQuery

69d23ea

Fix launching file via double click

80539cc

Merge branch 'develop' into wip/sb/dashboard-local-fixes

085178c

Prevent auto-scroll every time Assets Table refreshes

8ea8e5e

somebody1234 added the CI: Ready to merge This PR is eligible for automatic merge label Sep 6, 2024

kazcw approved these changes Sep 6, 2024

View reviewed changes

app/ide-desktop/common/package.json Show resolved Hide resolved

somebody1234 removed the CI: Ready to merge This PR is eligible for automatic merge label Sep 6, 2024

Remove fix for vue-query that is no longer necessary

8e3e7ad

somebody1234 added the CI: Ready to merge This PR is eligible for automatic merge label Sep 6, 2024

somebody1234 added 2 commits September 7, 2024 20:29

Merge branch 'develop' into wip/sb/dashboard-local-fixes

fa23d68

Fix errors

f2d834f

mergify bot merged commit 9ec6029 into develop Sep 8, 2024
36 checks passed

mergify bot deleted the wip/sb/dashboard-local-fixes branch September 8, 2024 06:54

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Local Dashboard fixes #10958

Local Dashboard fixes #10958

somebody1234 commented Sep 3, 2024 •

edited

Loading

PabloBuchu commented Sep 3, 2024

somebody1234 commented Sep 3, 2024

somebody1234 commented Sep 3, 2024

PabloBuchu commented Sep 3, 2024

somebody1234 commented Sep 4, 2024

PabloBuchu commented Sep 6, 2024

MrFlashAccount left a comment

MrFlashAccount Sep 6, 2024

kazcw left a comment

Local Dashboard fixes #10958

Local Dashboard fixes #10958

Conversation

somebody1234 commented Sep 3, 2024 • edited Loading

Pull Request Description

Important Notes

Checklist

PabloBuchu commented Sep 3, 2024

somebody1234 commented Sep 3, 2024

somebody1234 commented Sep 3, 2024

PabloBuchu commented Sep 3, 2024

somebody1234 commented Sep 4, 2024

PabloBuchu commented Sep 6, 2024

MrFlashAccount left a comment

Choose a reason for hiding this comment

MrFlashAccount Sep 6, 2024

Choose a reason for hiding this comment

kazcw left a comment

Choose a reason for hiding this comment

somebody1234 commented Sep 3, 2024 •

edited

Loading