Skip to content

[stable29] fix(files): Do not download files with openfile query flag #50815

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
AndyScherzinger merged 2 commits into from
Feb 17, 2025
Merged

[stable29] fix(files): Do not download files with openfile query flag #50815

AndyScherzinger merged 2 commits into from
Feb 17, 2025

Conversation

@susnux
Copy link
Contributor

@susnux susnux commented Feb 14, 2025

Manual backport of #50669

@susnux
fix(files): Do not download files with openfile query flag
2777ef7 
Instead of downloading files, if there is no other default action,
we should just open the details tab.

Signed-off-by: Ferdinand Thiessen <[email protected]>
@susnux susnux added this to the Nextcloud 29.0.13 milestone Feb 14, 2025
@susnux susnux requested review from a team and mahibi February 14, 2025 15:42
@susnux susnux requested a review from skjnldsv as a code owner February 14, 2025 15:42
@susnux susnux requested review from artonge, nfebe and szaimen and removed request for a team and skjnldsv February 14, 2025 15:42
@susnux
Copy link
Contributor Author

susnux commented Feb 14, 2025

/compile

@nextcloud-command
chore(assets): Recompile assets
0ad0054 
Signed-off-by: nextcloud-command <[email protected]>
szaimen
szaimen approved these changes Feb 14, 2025
View reviewed changes
Copy link
Contributor

@szaimen szaimen left a comment

Choose a reason for hiding this comment

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

🐘

@github-actions
Copy link
Contributor

github-actions bot commented Feb 14, 2025

Possible performance regression detected

Show Output 
7 queries added

= /remote.php/dav/files/test
= /remote.php/dav/files/test/test.txt
= /remote.php/dav/files/test/many_files
= /remote.php/dav/files/test/new_file.txt
≠ /remote.php/dav/files/test/new_file.txt with 7 queries added
  - UPDATE "oc_filecache" SET "size" = :dcValue3 WHERE ("fileid" = :dcValue1) AND (("size" <> :dcValue2) OR ("size" IS NULL))
  - UPDATE "oc_filecache" SET "size" = :dcValue3 WHERE ("fileid" = :dcValue1) AND (("size" <> :dcValue2) OR ("size" IS NULL))
  - SELECT "path" FROM "oc_filecache" WHERE ("storage" = :dcValue1) AND ("fileid" = :dcValue2)
  - SELECT "path" FROM "oc_filecache" WHERE ("storage" = :dcValue1) AND ("fileid" = :dcValue2)
  + SELECT "storage", "path", "mimetype" FROM "oc_filecache" WHERE "fileid" = :dcValue1
  + SELECT "storage_id", "root_id", "user_id", "mount_point", "mount_id", "f"."path", "mount_provider_class" FROM "oc_mounts" "m" INNER JOIN "oc_filecache" "f" ON "m"."root_id" = "f"."fileid" WHERE ("storage_id" = ?) AND ("user_id" = ?)
  + SELECT "filecache"."fileid", "storage", "path", "path_hash", "filecache"."parent", "filecache"."name", "mimetype", "mimepart", "size", "mtime", "storage_mtime", "encrypted", "etag", "filecache"."permissions", "checksum", "unencrypted_size", "metadata_etag", "creation_time", "upload_time", "meta"."json" AS "meta_json", "meta"."sync_token" AS "meta_sync_token" FROM "oc_filecache" "filecache" LEFT JOIN "oc_filecache_extended" "fe" ON "filecache"."fileid" = "fe"."fileid" LEFT JOIN "oc_files_metadata" "meta" ON "filecache"."fileid" = "meta"."file_id" WHERE "filecache"."fileid" = :dcValue1
  + DELETE FROM "oc_filecache" WHERE "fileid" = :dcValue1
  + DELETE FROM "oc_filecache_extended" WHERE "fileid" = :dcValue1
  + DELETE FROM "oc_files_metadata" WHERE "file_id" = :dcValue1
  + DELETE FROM "oc_files_metadata_index" WHERE "file_id" = :dcValue1
  + SELECT "json", "sync_token" FROM "oc_files_metadata" WHERE "file_id" = :dcValue1
  + SELECT "fileid" FROM "oc_filecache" WHERE ("storage" = :dcValue1) AND ("path_hash" = :dcValue2)
  + UPDATE "oc_file_locks" SET "lock" = :dcValue1, "ttl" = :dcValue2 WHERE ("key" = :dcValue3) AND ("lock" = :dcValue4)
  + SELECT "filecache"."fileid", "storage", "path", "path_hash", "filecache"."parent", "filecache"."name", "mimetype", "mimepart", "size", "mtime", "storage_mtime", "encrypted", "etag", "filecache"."permissions", "checksum", "unencrypted_size", "metadata_etag", "creation_time", "upload_time", "meta"."json" AS "meta_json", "meta"."sync_token" AS "meta_sync_token" FROM "oc_filecache" "filecache" LEFT JOIN "oc_filecache_extended" "fe" ON "filecache"."fileid" = "fe"."fileid" LEFT JOIN "oc_files_metadata" "meta" ON "filecache"."fileid" = "meta"."file_id" WHERE ("storage" = :dcValue1) AND ("path_hash" = :dcValue2)

@AndyScherzinger AndyScherzinger merged commit 3c57d9c into stable29 Feb 17, 2025
111 of 113 checks passed
@AndyScherzinger AndyScherzinger deleted the backport/29-openfile branch February 17, 2025 18:17
skjnldsv
skjnldsv reviewed Feb 19, 2025
View reviewed changes
apps/files/src/components/FilesListVirtual.vue
// in this case we need to open the details instead and remove the route from the history
const query = this.$route.query
delete query.openfile
query.opendetails = ''
Copy link
Member

@skjnldsv skjnldsv Feb 19, 2025

Choose a reason for hiding this comment

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

@susnux this should have been removed 🙈

Copy link
Member

@skjnldsv skjnldsv Feb 19, 2025

Choose a reason for hiding this comment

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

Will address in #50876

@blizzz blizzz mentioned this pull request Mar 4, 2025
Merged
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@skjnldsv skjnldsv skjnldsv left review comments

@artonge artonge artonge approved these changes

@szaimen szaimen szaimen approved these changes

@mahibi mahibi Awaiting requested review from mahibi

@nfebe nfebe Awaiting requested review from nfebe nfebe was automatically assigned from nextcloud/server-frontend

Assignees

No one assigned

Labels

3. to review Waiting for reviews bug feature: files

Projects

None yet

Milestone

Nextcloud 29.0.13

Development

Successfully merging this pull request may close these issues.

7 participants

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