Skip to content

Populate etag and permissions to active the image editor #7776

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

Merged
nickvergessen merged 3 commits into from
Aug 19, 2022
Merged

Populate etag and permissions to active the image editor #7776

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0b51f05
Populate etag and permissions to active the image editor
nickvergessen Aug 18, 2022
9c2b966
Fix tests
nickvergessen Aug 18, 2022
edfe870
Fix JS tests
nickvergessen Aug 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions lib/Chat/Parser/SystemMessage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -629,6 +629,8 @@ protected function getFileFromShare(Participant $participant, string $shareId):
'size' => $size,
'path' => $path,
'link' => $url,
'etag' => $node->getEtag(),
'permissions' => $node->getPermissions(),
'mimetype' => $node->getMimeType(),
'preview-available' => $this->previewManager->isAvailable($node) ? 'yes' : 'no',
];
Expand Down
35 changes: 35 additions & 0 deletions src/components/MessagesList/MessagesGroup/Message/MessagePart/FilePreview.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,20 @@ export default {
type: String,
default: '',
},
/**
* File ETag
*/
etag: {
type: String,
default: '',
},
/**
* File ETag
*/
permissions: {
type: Number,
default: 0,
},
/**
* Whether a preview is available, string "yes" for yes
* otherwise the string "no"
Expand Down Expand Up @@ -448,6 +462,25 @@ export default {
OCA.Files.Sidebar.state.file = this.internalAbsolutePath
}

let permissions = ''
if (this.permissions) {
if (this.permissions & OC.PERMISSION_CREATE) {
permissions += 'CK'
}
if (this.permissions & OC.PERMISSION_READ) {
permissions += 'G'
}
if (this.permissions & OC.PERMISSION_UPDATE) {
permissions += 'W'
}
if (this.permissions & OC.PERMISSION_DELETE) {
permissions += 'D'
}
if (this.permissions & OC.PERMISSION_SHARE) {
permissions += 'R'
}
}

OCA.Viewer.open({
// Viewer expects an internal absolute path starting with "/".
path: this.internalAbsolutePath,
Expand All @@ -458,6 +491,8 @@ export default {
basename: this.name,
mime: this.mimetype,
hasPreview: this.previewAvailable === 'yes',
etag: this.etag,
permissions,
},
],
})
Expand Down