Skip to content
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

[stable27] Refactor attachment loading #5087

Merged
merged 26 commits into from
Dec 6, 2023
Merged

[stable27] Refactor attachment loading #5087

merged 26 commits into from
Dec 6, 2023

Conversation

mejo-
Copy link
Member

@mejo- mejo- commented Dec 5, 2023 •
edited
Loading

Manual backport of #5042

@mejo- mejo- added this to the Nextcloud 27.1.5 milestone Dec 5, 2023
@mejo- mejo- added the bug Something isn't working label Dec 5, 2023
@mejo- mejo- changed the base branch from main to stable27 December 5, 2023 15:27
@mejo- mejo- force-pushed the backport/5042/stable27 branch 2 times, most recently from 6c04c15 to a37baa0 Compare December 5, 2023 16:11
@mejo-
Copy link
Member Author

mejo- commented Dec 5, 2023

/compile

@mejo-
Copy link
Member Author

mejo- commented Dec 5, 2023

/compile

@blizzz blizzz mentioned this pull request Dec 5, 2023
Merged
@mejo-
refactor(AttachmentService): Some code style cleanup
a437b83 
Signed-off-by: Jonas <jonas@freesources.org>
@mejo-
chore(attachments): Remove support for obsolete text:// format
d331a36 
This format was only used from 03.01.2022 to 23.05.2022.

Signed-off-by: Jonas <jonas@freesources.org>
@mejo-
feat(attachments): API endpoint to get list of attachments for a docu…
0aa69d7 
…ment

Signed-off-by: Jonas <jonas@freesources.org>
@mejo-
chore(attachments): Remove obsolete metadata API endpoint
a282b70 
Signed-off-by: Jonas <jonas@freesources.org>
@mejo-
feat(attachments): Use getAttachmentList API endpoint in resolver
29c79f8 
Signed-off-by: Jonas <jonas@freesources.org>
@mejo-
fix(attachment): Remove candidate logic from ImageView node
a3ecdb1 
`AttachmentResolver` only returns one candidate now.

Signed-off-by: Jonas <jonas@freesources.org>
@mejo-
fix(attachments): Fix some issues with the showimage modal
af29e57 
* Only open images from native attachments list
* Only open images, non-image attachments are not supported anyway
* Fix watcher for `startIndex`
* Don't set computed property `currentImage`
* Show error if image cannot be found in attachments

Signed-off-by: Jonas <jonas@freesources.org>
@mejo-
chore(attachments): Remove obsolete code
a6fcc87 
* `getMetadata()` from AttachmentResolver class.
* `isSupportedImage` logic from ImageView node. Was never used.
* `hasPreview=true` logic from AttachmentResolver class.

Signed-off-by: Jonas <jonas@freesources.org>
@mejo-
feat(editor): Allow to pass fileId to MarkdownContentEditor
95ef57d 
Required for AttachmentResolver to fetch list of attachments for
the document.

Signed-off-by: Jonas <jonas@freesources.org>
@mejo-
feat(attachments): Allow to get attachments without document session
969b85c 
For all read-only attachments API endpoints, add support to authorize
with user session or share token when no document session is available.

Allows to get the attachments list and attachment files from
MarkdownContentEditor.vue without a document session.

Signed-off-by: Jonas <jonas@freesources.org>
@mejo-
chore(attachments): Remove special-handling for preview URLs
4441e7a 
We don't remember a legitimate reason why they would end up in a text
document. Probably something that predate the attachments directory
era.

Signed-off-by: Jonas <jonas@freesources.org>
@mejo-
fix(attachments): Open non-image attachments in viewer or download
3703ea1 
When viewer is available, not in use and supports the mimetype, and
we're not in a public share, open the attachment in viewer. Otherwise,
download the attachment.

Fixes: #3849
Fixes: #4723
Fixes: #5030

Signed-off-by: Jonas <jonas@freesources.org>
@mejo-
fix(AttachmentController): Set fileName of returned attachments
c2a7fea 
Signed-off-by: Jonas <jonas@freesources.org>
@mejo-
chore(composer): Update autoloader maps
95c6734 
Signed-off-by: Jonas <jonas@freesources.org>
@mejo-
fix(attachments): Fix encoding of attachment URI component
e2b2c16 
Signed-off-by: Jonas <jonas@freesources.org>
@mejo-
test(cy): Test to open image in modal and download attachment
463b55f 
Signed-off-by: Jonas <jonas@freesources.org>
@mejo-
chore(middleware): Rename to RequireDocumentSessionOrUserOrShareToken
cd51248 
Signed-off-by: Jonas <jonas@freesources.org>
@mejo-
fix(attachments): use getRelativePath from userFolder for davPath
d135f9d 
Also don't set any davPath at all in public share. We probably don't
have DAV access there anyway.

Signed-off-by: Jonas <jonas@freesources.org>
@mejo-
test(AttachmentResolver): Refactor jest tests after parent class refa…
112e399 
…ctoring

Signed-off-by: Jonas <jonas@freesources.org>
@mejo-
fix(attachments): Show all loaded images in ShowImageModal
cf30cde 
Instead of just opening native image attachments, query the HTML
document to get all loaded attachments (regardless whether native, via
direct URL or via DAV) and list them.

Signed-off-by: Jonas <jonas@freesources.org>
@mejo-
fix(SessionMiddleware): Check if user/share have access to document
99ac897 
Signed-off-by: Jonas <jonas@freesources.org>
@mejo-
fix(AttachmentResolver): Require either fileId or session
64b7639 
Signed-off-by: Jonas <jonas@freesources.org>
@mejo-
reactor(ImageView): Simplify attachmentType/isMediaAttachment logic
a4cafdc 
Signed-off-by: Jonas <jonas@freesources.org>
@mejo-
fix(deps): Update to cypress 13
febbd11 
Required for the file attachment download test to succeed.

Signed-off-by: Jonas <jonas@freesources.org>
@mejo-
chore(deps): Move cypress-visual-regression to dev dependencies
70b5a89 
Signed-off-by: Jonas <jonas@freesources.org>
@mejo-
Copy link
Member Author

mejo- commented Dec 5, 2023

/compile

@nextcloud-command
chore(assets): Recompile assets
8b67f07 
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
@mejo- mejo- merged commit 00698a7 into stable27 Dec 6, 2023
35 checks passed
@mejo- mejo- deleted the backport/5042/stable27 branch December 6, 2023 09:23
@max-nextcloud max-nextcloud mentioned this pull request Dec 21, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@max-nextcloud max-nextcloud max-nextcloud approved these changes

@juliusknorr juliusknorr Awaiting requested review from juliusknorr

Assignees
No one assigned
Labels
2. developing bug Something isn't working
Projects
None yet
Milestone
Nextcloud 27.1.5
Development

Successfully merging this pull request may close these issues.
3 participants
@mejo- @max-nextcloud @nextcloud-command