Skip to content

fix(files): Make sure files are opened when using open-in-files action(s) or at lease are scrolled into view#45611

Merged
skjnldsv merged 5 commits intomasterfrom
fix/open-file
Jun 8, 2024
Merged

fix(files): Make sure files are opened when using open-in-files action(s) or at lease are scrolled into view#45611
skjnldsv merged 5 commits intomasterfrom
fix/open-file

Conversation

@susnux
Copy link
Contributor

@susnux susnux commented May 31, 2024 •
edited
Loading

Summary

This fixes following isses:

  1. When using on of the open-in-files actions the openfile query should be set to trigger opening
  2. The sidebar action should preserve the query, as otherwise the internal "open sidebar" on fileid change will unset openfile
  3. Add a min-height to the files list, as otherwise in the initial rendering the scrollTop can not be set as the height is not fully setup yet.

Before

See that the file is not scrolled into view

Screencast_20240531_161643.webm

After

See that the file entry is now visible

Screencast_20240531_161912.webm

Checklist

@susnux susnux requested review from Pytal, artonge, blizzz and szaimen May 31, 2024 14:24
@susnux susnux requested a review from skjnldsv as a code owner May 31, 2024 14:24
@susnux
Copy link
Contributor Author

susnux commented May 31, 2024

/backport to stable29

@susnux
Copy link
Contributor Author

susnux commented May 31, 2024

/backport to stable28

@ShGKme
Copy link
Contributor

ShGKme commented May 31, 2024

  1. When using on of the open-in-files actions the openfile query should be set to trigger opening

But should it be open, is it really a bug?

After clicking, it goes to the file, selects it, scrolls to it and opens it in the sidebar. Should the file (especially if it is a heavy file like a document) be immediately open in viewer?

@szaimen
Copy link
Contributor

szaimen commented May 31, 2024

After clicking, it goes to the file, selects it, scrolls to it and opens it in the sidebar. Should the file (especially if it is a heavy file like a document) be immediately open in viewer?

yes afaik

@susnux
Copy link
Contributor Author

susnux commented May 31, 2024

After clicking, it goes to the file, selects it, scrolls to it and opens it in the sidebar. Should the file (especially if it is a heavy file like a document) be immediately open in viewer?

Yes that is the expected "open" behavior, you can open the details also in the "shares"-view. But the actions says "download xyz" or "open xyz" (depending on the type).
So it is expected to change the view to files and open the file (if possible).

skjnldsv
skjnldsv approved these changes May 31, 2024
View reviewed changes
apps/files/src/components/FileEntry/FileEntryActions.vue

mountType() {
return this.source._attributes['mount-type']
return this.source.attributes['mount-type']
Copy link
Member

@skjnldsv skjnldsv May 31, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😅😅😅😅

@susnux
Copy link
Contributor Author

susnux commented Jun 5, 2024

/compile

@artonge artonge added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Jun 5, 2024
@susnux
Copy link
Contributor Author

susnux commented Jun 7, 2024

Rebased to resolve conflicts.

@skjnldsv
Copy link
Member

skjnldsv commented Jun 8, 2024

Rebased to resolve conflicts.

Need one more 🙈

susnux and others added 5 commits June 8, 2024 15:58
@susnux
refactor(files): Fix TypeScript issues in FileEntryActions
13d9a10 
* We filter the array in `enabledSubmenuActions` so we can be sure the action does have a parent
* Node attributes must be accessed using the `attributes` getter not the private `_attributes` property
* Cast action ref to correct component interface to make TypeScript happy

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
@susnux
fix(files): open-in-files action should also set openfile query
423c930 
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
@susnux
fix(files): Keep query when trigger the sidebar action
fbceac9 
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
@susnux
fix(files): Ensure that focussed file is always scrolled right
75dcf90 
Ensure the correct file is scrolled if the content changes,
this also sets a minimal height to the virtual scrolling area
so that the `scrollTop` can be set.

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
@nextcloud-command @susnux
chore(assets): Recompile assets
d45cd93 
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
@susnux
Copy link
Contributor Author

susnux commented Jun 8, 2024

Need one more 🙈

done

@skjnldsv skjnldsv merged commit efe2a43 into master Jun 8, 2024
@skjnldsv skjnldsv deleted the fix/open-file branch June 8, 2024 14:58
This was referenced Jun 8, 2024
Merged
Merged
@susnux susnux mentioned this pull request Jun 12, 2024
Closed
8 tasks
@nfebe nfebe mentioned this pull request Jul 9, 2024
Closed
@blizzz blizzz mentioned this pull request Jul 24, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@artonge artonge artonge approved these changes

@skjnldsv skjnldsv skjnldsv approved these changes

@blizzz blizzz Awaiting requested review from blizzz

@Pytal Pytal Awaiting requested review from Pytal

@szaimen szaimen Awaiting requested review from szaimen

Assignees

No one assigned

Labels

4. to release Ready to be released and/or waiting for tests to finish bug feature: files

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

[Bug]: links to files from "shared with you" do not redirect correctly

6 participants

@susnux @ShGKme @szaimen @skjnldsv @artonge @nextcloud-command