Skip to content

[full-ci] fix(collaboration): hide SaveAs and ExportAs buttons in web office #471

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
kulmann merged 5 commits into from
Mar 26, 2025
Merged

[full-ci] fix(collaboration): hide SaveAs and ExportAs buttons in web office #471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
be912e1
fix(collaboration): hide SaveAs and ExportAs buttons in web office
kulmann Mar 25, 2025
43a5e24
fix(collaboration): limit KeyUserCanNotWriteRelative to collabora
kulmann Mar 25, 2025
63cd3c6
tests(collaboration): fix checkFileInfo test case
kulmann Mar 26, 2025
27e3646
add test to expected failures file
ScharfViktor Mar 26, 2025
700ffbc
Update expected-failures-without-remotephp.md
ScharfViktor Mar 26, 2025
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
4 changes: 4 additions & 0 deletions services/collaboration/pkg/connector/fileconnector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1272,6 +1272,10 @@ func (f *FileConnector) CheckFileInfo(ctx context.Context) (*ConnectorResponse,

fileinfo.KeyPostMessageOrigin: f.cfg.Commons.OpenCloudURL,
fileinfo.KeyLicenseCheckForEditIsEnabled: f.cfg.App.LicenseCheckEnable,

// set to true for Collabora until we have a web embed mode for "Save As" and "Export As"
// see the FIXME in ./fileinfo/collabora.go and https://github.com/opencloud-eu/web/issues/422
fileinfo.KeyUserCanNotWriteRelative: false,
}

switch wopiContext.ViewMode {
Expand Down
4 changes: 2 additions & 2 deletions services/collaboration/pkg/connector/fileconnector_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1780,7 +1780,7 @@ var _ = Describe("FileConnector", func() {
OwnerID: "61616262636340637573746f6d496470", // hex of aabbcc@customIdp
Size: int64(998877),
BaseFileName: "test.txt",
UserCanNotWriteRelative: false,
UserCanNotWriteRelative: true,
DisableExport: true,
DisableCopy: true,
DisablePrint: true,
Expand Down Expand Up @@ -1962,7 +1962,7 @@ var _ = Describe("FileConnector", func() {
OwnerID: "61616262636340637573746f6d496470", // hex of aabbcc@customIdp
Size: int64(998877),
BaseFileName: "test.txt",
UserCanNotWriteRelative: false,
UserCanNotWriteRelative: true,
DisableExport: true,
DisableCopy: true,
DisablePrint: true,
Expand Down
2 changes: 1 addition & 1 deletion services/collaboration/pkg/connector/fileinfo/collabora.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ func (cinfo *Collabora) SetProperties(props map[string]interface{}) {
case KeyUserCanWrite:
cinfo.UserCanWrite = value.(bool)
case KeyUserCanNotWriteRelative:
cinfo.UserCanNotWriteRelative = value.(bool)
cinfo.UserCanNotWriteRelative = true // FIXME: set to `value.(bool)` again for https://github.com/opencloud-eu/web/issues/422
case KeyUserID:
cinfo.UserID = value.(string)
case KeyUserFriendlyName:
Expand Down
1 change: 1 addition & 0 deletions tests/acceptance/expected-failures-without-remotephp.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,7 @@
- [coreApiWebdavUploadTUS/uploadFileMtime.feature:39](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFileMtime.feature#L39)
- [coreApiWebdavUploadTUS/uploadFileMtime.feature:51](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFileMtime.feature#L51)
- [coreApiWebdavUploadTUS/uploadFileMtime.feature:65](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFileMtime.feature#L65)
- [coreApiWebdavUploadTUS/uploadFileMtime.feature:79](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFileMtime.feature#L79)
- [coreApiWebdavUploadTUS/uploadFileMtimeShares.feature:29](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFileMtimeShares.feature#L29)
- [coreApiWebdavUploadTUS/uploadFileMtimeShares.feature:48](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFileMtimeShares.feature#L48)
- [coreApiWebdavUploadTUS/uploadFileMtimeShares.feature:69](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFileMtimeShares.feature#L69)
Expand Down
12 changes: 6 additions & 6 deletions tests/acceptance/features/apiCollaboration/checkFileInfo.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ Feature: check file info with different wopi apps
"const": true
},
"UserCanNotWriteRelative": {
"const": false
"const": true
},
"EnableOwnerTermination": {
"const": true
Expand Down Expand Up @@ -581,7 +581,7 @@ Feature: check file info with different wopi apps
"const": <user-can-write>
},
"UserCanNotWriteRelative": {
"const": false
"const": true
},
"EnableOwnerTermination": {
"const": true
Expand Down Expand Up @@ -691,7 +691,7 @@ Feature: check file info with different wopi apps
"const": true
},
"UserCanNotWriteRelative": {
"const": false
"const": true
},
"EnableOwnerTermination": {
"const": true
Expand Down Expand Up @@ -1077,7 +1077,7 @@ Feature: check file info with different wopi apps
"const": true
},
"UserCanNotWriteRelative": {
"const": false
"const": true
},
"EnableOwnerTermination": {
"const": true
Expand Down Expand Up @@ -1424,7 +1424,7 @@ Feature: check file info with different wopi apps
"const": true
},
"UserCanNotWriteRelative": {
"const": false
"const": true
},
"EnableOwnerTermination": {
"const": true
Expand Down Expand Up @@ -1810,7 +1810,7 @@ Feature: check file info with different wopi apps
"const": <user-can-write>
},
"UserCanNotWriteRelative": {
"const": false
"const": true
},
"EnableOwnerTermination": {
"const": true
Expand Down