Modify do_action so default ctrl-click opens tab #20185

azul · 2020-03-26T16:03:12Z

Rebase and whitespace fix of #16530

New pull request to see if build succeeds.

apps/files/js/filelist.js

jancborchardt

@azul I commented in the issue to clarify: Yes, ctrl-click should be the "Open in new tab" action. :)

azul · 2020-04-06T08:58:36Z

apps/files_sharing/js/public.js

-					var mime = this.fileActions.getCurrentMimeType();
-					var type = this.fileActions.getCurrentType();
-					var permissions = this.fileActions.getCurrentPermissions();
-					var action = this.fileActions.getDefault(mime, type, permissions);


none of these were used anywhere.

apps/files_trashbin/tests/js/filelistSpec.js

azul · 2020-04-06T17:40:26Z

Somehow this seems to break the right click menu for me.

azul · 2020-04-07T13:14:30Z

Failing tests seem to be the same as in master.
I am also not seeing the right click menu anymore in master. So i also think that is unrelated. Hope that's an actual change... never liked it anyway 😉
@juliushaertl @gary-kim I think this one is ready to be merged.

gary-kim · 2020-04-07T14:07:59Z

I am also not seeing the right click menu anymore in master.

The right click menu is added by the files_rightclick app. If you want to test it on current master with right click, you will need to add the app and enable it.

gary-kim

The action that occurs from clicking on files to download seems to be broken now. Could you take a look at that?

azul · 2020-04-08T15:25:57Z

The right click menu is added by the files_rightclick app. If you want to test it on current master with right click, you will need to add the app and enable it.

Ahh.. got it. thanks! 😄

fileActions.getCurrentDefaultFileAction() returns the default file action for the currently selected file. There were a number of places querying for the mime, type and permissions of that file first to then query for the default action. Signed-off-by: Azul <azul@riseup.net>

azul · 2020-04-08T16:23:30Z

The action that occurs from clicking on files to download seems to be broken now. Could you take a look at that?

Should be fixed.

This is getting close. I would like to add a test for the new urls to make sure they actually trigger the action. Will probably look into that tomorrow.

gary-kim

Noticed a couple more things.

Ctrl+click on a directory in a public share doesn't go into that directory and opens a new tab with the same page.
Ctrl+click on a file in a public share to be opened by the text app doesn't work as expected. This is more of an edge case though so I'd say it'd be okay to fix this in a follow up.

apps/files_sharing/js/public.js

azul · 2020-04-09T09:28:24Z

Found another issue...
If the file that the link points to has been moved from the folder it will trigger a download of the zipped folder content instead.

@jancborchardt what would the desired behavior be when:

I create MyFile.md.
I copy the link to MyFile.md in the folder (that is used to open it in another tab)
I move MyFile.md to another place
I click on the link.

I see a number of options:

open the same file in the new folder (we can tell where it is by the file id)
display a message that the file has been moved (maybe including the new place)
only display the folder

I guess 2. would be the right thing to do. But maybe i am missing something.

tracking this here: #20394

azul · 2020-04-09T14:33:01Z

Noticed a couple more things.

* `Ctrl+click` on a directory in a public share doesn't go into that directory and opens a new tab with the same page.

* `Ctrl+click` on a file in a public share to be opened by the `text` app doesn't work as expected. This is more of an edge case though so I'd say it'd be okay to fix this in a follow up.

Okay... i figured it out and updated the pull request accordingly. The linkTo function in public.js had to be fixed.

In a file list files with a default action have an href that will trigger the action. This way ctrl-click and middle button click open the default action in a new tab. In order to achieve this a new param `openfile` was introduced to the files app. It will make the files app trigger the default action for the file in question. This also allows linking to file content rather than just the details display. Introduce fileList.getDefaultActionUrl() to create a link with that param set. It's overwritten in the trashbin fileList so that anchors continue to have `#` as a href. Fix the link generation for subfolders of public shares: 58a87d0 was the last commit that touched the linkTo function in public.js. It included the params as arguments to the generateUrl function. Turns out this completely ignores the dir parameter now. The inclusion was reverted in other places so revert it here as well. Also change `dir` to `path` in the param as that is respected when following the link. Add Test for the new link url for files with default action. Remove test for multiple selects with ctrl-click as that is not what we are doing anymore. Signed-off-by: Azul <azul@riseup.net>

azul · 2020-04-09T14:43:24Z

I renamed the editfile parameter to openfile because depending on the permissions the file will also be shown read only if needed.

@gary-kim I would say this is ready to be merged. I'd be okay with adding more tests but i'd prefer to just see this included 😄 .

In terms of tests i think it would be nice to test that the generated urls actually do what they are supposed to. I really like that the generated url with openfile and path params on public shares work.

However i have no idea about how to write such a test. If you can point me to an example i'd also be happy to take it from there.

gary-kim

LGTM at this point

kesselb requested review from gary-kim and juliushaertl March 26, 2020 22:11

kesselb added 3. to review Waiting for reviews enhancement labels Mar 26, 2020

kesselb added this to the Nextcloud 19 milestone Mar 26, 2020

This comment has been minimized.

Sign in to view

azul commented Mar 27, 2020

View reviewed changes

apps/files/js/filelist.js Outdated Show resolved Hide resolved

azul force-pushed the open-new_tab branch from fc338f1 to 0f203dd Compare March 27, 2020 19:10

This comment has been minimized.

Sign in to view

jancborchardt approved these changes Mar 31, 2020

View reviewed changes

rullzer mentioned this pull request Apr 4, 2020

19 beta 2 #20303

Merged

80 tasks

azul force-pushed the open-new_tab branch 2 times, most recently from c9dec70 to 0345ad0 Compare April 6, 2020 08:56

azul commented Apr 6, 2020

View reviewed changes

apps/files_trashbin/tests/js/filelistSpec.js Outdated Show resolved Hide resolved

azul force-pushed the open-new_tab branch from 0345ad0 to 8d70e18 Compare April 6, 2020 17:26

gary-kim reviewed Apr 7, 2020

View reviewed changes

azul force-pushed the open-new_tab branch from 8d70e18 to 0e3efea Compare April 8, 2020 16:20

gary-kim reviewed Apr 9, 2020

View reviewed changes

apps/files_sharing/js/public.js Outdated Show resolved Hide resolved

azul force-pushed the open-new_tab branch from 0e3efea to 3dba426 Compare April 9, 2020 09:11

rullzer mentioned this pull request Apr 9, 2020

19 beta 3 #20386

Merged

59 tasks

This comment has been minimized.

Sign in to view

azul force-pushed the open-new_tab branch from 3dba426 to 856e784 Compare April 9, 2020 14:28

azul mentioned this pull request Apr 9, 2020

Display file from other directory when it has been moved #20394

Closed

azul force-pushed the open-new_tab branch from 856e784 to 43f0d2a Compare April 9, 2020 14:41

gary-kim approved these changes Apr 9, 2020

View reviewed changes

gary-kim added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Apr 9, 2020

skjnldsv merged commit e5ac5c7 into nextcloud:master Apr 11, 2020

azul deleted the open-new_tab branch April 11, 2020 17:43

This was referenced Apr 24, 2020

Modify do_action so default ctrl-click opens tab #16530

Closed

Allow "Direct Editing" Link Without Public Sharing #12470

Closed

Open folder/main action in new tab with ctrl+click #16067

Closed

This was referenced May 4, 2020

update history when opening and closing viewer nextcloud/viewer#488

Closed

files: fileid param leads to redirect that drops all other params #20818

Closed

juliushaertl mentioned this pull request Nov 2, 2020

Feature request: open files in new tab/window nextcloud/richdocuments#31

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Modify do_action so default ctrl-click opens tab #20185

Modify do_action so default ctrl-click opens tab #20185

azul commented Mar 26, 2020

This comment has been minimized.

This comment has been minimized.

jancborchardt left a comment

azul Apr 6, 2020

azul commented Apr 6, 2020

azul commented Apr 7, 2020

gary-kim commented Apr 7, 2020 •

edited

gary-kim left a comment

azul commented Apr 8, 2020

azul commented Apr 8, 2020

gary-kim left a comment

azul commented Apr 9, 2020 •

edited

This comment has been minimized.

This comment has been minimized.

azul commented Apr 9, 2020

azul commented Apr 9, 2020

gary-kim left a comment

Modify do_action so default ctrl-click opens tab #20185

Modify do_action so default ctrl-click opens tab #20185

Conversation

azul commented Mar 26, 2020

This comment has been minimized.

This comment has been minimized.

jancborchardt left a comment

Choose a reason for hiding this comment

azul Apr 6, 2020

Choose a reason for hiding this comment

azul commented Apr 6, 2020

azul commented Apr 7, 2020

gary-kim commented Apr 7, 2020 • edited

gary-kim left a comment

Choose a reason for hiding this comment

azul commented Apr 8, 2020

azul commented Apr 8, 2020

gary-kim left a comment

Choose a reason for hiding this comment

azul commented Apr 9, 2020 • edited

This comment has been minimized.

This comment has been minimized.

azul commented Apr 9, 2020

azul commented Apr 9, 2020

gary-kim left a comment

Choose a reason for hiding this comment

gary-kim commented Apr 7, 2020 •

edited

azul commented Apr 9, 2020 •

edited