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.

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

CERN-specific config flag + share tooltip captions #7034

Merged
merged 2 commits into from
May 23, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions changelog/unreleased/enhancement-cern-features
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Enhancement: CERN features setting

We've added a flag to enable CERN-specific features

https://github.com/owncloud/web/pull/7034
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Enhancement: CERN-specific help in shares tooltip

We've added some CERN-related help strings to the share tooltip.

https://github.com/owncloud/web/pull/7034
1 change: 1 addition & 0 deletions docs/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ substring of a value of the authenticated user. Examples are `/Shares`, `/{{.Id}
- `options.sharingRecipientsPerPage` Sets the amount of users shown as recipients in the dropdown when sharing resources. Default amount is 200.
- `options.sidebar.shares.showAllOnLoad` Sets the list of (link) shares list in the sidebar to be initially expanded (default is a collapsed state, only showing the first three shares).
- `options.runningOnEos` Set this option to `true` if running on an [EOS storage backend](https://eos-web.web.cern.ch/eos-web/) to enable its specific features. Defaults to `false`.
- `options.cernFeatures` Enabling this will activate CERN-specific features. Defaults to `false`.

### Sentry

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ import { clientService } from 'web-pkg/src/services'
import { useCapabilityFilesSharingResharing } from 'web-pkg/src/composables'
import {
shareInviteCollaboratorHelp,
shareInviteCollaboratorHelpCern,
shareSpaceAddMemberHelp
} from '../../../../../helpers/contextualHelpers.js'

Expand Down Expand Up @@ -147,7 +148,13 @@ export default {
},

inviteCollaboratorHelp() {
return shareInviteCollaboratorHelp
const cernFeatures = !!this.configuration?.options?.cernFeatures
return cernFeatures
? {
text: shareInviteCollaboratorHelp.text,
list: [...shareInviteCollaboratorHelp.list, ...shareInviteCollaboratorHelpCern.list]
}
: shareInviteCollaboratorHelp
},

spaceAddMemberHelp() {
Expand All @@ -158,7 +165,10 @@ export default {
if (this.capabilities.files_sharing.federation?.outgoing === true) {
return this.$gettext('Add new person by name, email or federation IDs')
}
return this.$gettext('Add new person by name or email')
const cernFeatures = !!this.configuration?.options?.cernFeatures
return cernFeatures
? this.$gettext('Add new person by name, email or service/secondary/guest accounts')
: this.$gettext('Add new person by name or email')
},

$_announcementWhenCollaboratorAdded() {
Expand Down
7 changes: 7 additions & 0 deletions packages/web-app-files/src/helpers/contextualHelpers.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,13 @@ export const shareInviteCollaboratorHelp = {
$gettext('Invited persons can not see who else has access')
]
}
export const shareInviteCollaboratorHelpCern = {
list: [
kulmann marked this conversation as resolved.
Show resolved Hide resolved
$gettext(
'To search for service or secondary accounts prefix the username with "a:" (like "a:doe") and for guest accounts prefix the username with "l:" (like "l:doe")'
)
]
}
export const shareSpaceAddMemberHelp = {
text: $gettext('Add persons or groups as members to this Space. Members are allowed to:'),
list: [
Expand Down
1 change: 1 addition & 0 deletions packages/web-runtime/src/store/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ const state = {
},
previewFileExtensions: [],
runningOnEos: false,
cernFeatures: false,
sharingRecipientsPerPage: 200
}
}
Expand Down