Skip to content

[stable22] Only display supported email scopes #28014

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
juliusknorr merged 2 commits into from
Jul 19, 2021
Merged

[stable22] Only display supported email scopes #28014

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ff4982
Refine unsupported federation scope checks
Pytal Jul 16, 2021
c8c2870
Build
Pytal Jul 16, 2021
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
Next Next commit
Refine unsupported federation scope checks 
Signed-off-by: Christopher Ng <[email protected]>
(cherry picked from commit 74aa115)
  • Loading branch information
@Pytal
Pytal committed Jul 16, 2021
commit 0ff49820c8a9035b1114fbf2d42c48b6e95cc7b6
1 change: 1 addition & 0 deletions apps/settings/lib/Settings/Personal/PersonalInfo.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ public function getForm(): TemplateResponse {

$accountParameters = [
'displayNameChangeSupported' => $user->canChangeDisplayName(),
'lookupServerUploadEnabled' => $lookupServerUploadEnabled,
];

$this->initialStateService->provideInitialState('emails', $emails);
Expand Down
5 changes: 2 additions & 3 deletions apps/settings/src/components/PersonalInfo/EmailSection/EmailSection.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ import { savePrimaryEmail, removeAdditionalEmail } from '../../../service/Person
import { DEFAULT_ADDITIONAL_EMAIL_SCOPE } from '../../../constants/AccountPropertyConstants'

const { additionalEmails, primaryEmail } = loadState('settings', 'emails', {})
const accountParams = loadState('settings', 'accountParameters', {})
const { displayNameChangeSupported } = loadState('settings', 'accountParameters', {})

export default {
name: 'EmailSection',
Expand All @@ -74,7 +74,6 @@ export default {

data() {
return {
accountParams,
additionalEmails,
primaryEmail,
isValidForm: true,
Expand All @@ -83,7 +82,7 @@ export default {

computed: {
isDisplayNameChangeSupported() {
return this.accountParams.displayNameChangeSupported
return displayNameChangeSupported
},

primaryEmailValue: {
Expand Down
20 changes: 19 additions & 1 deletion apps/settings/src/components/PersonalInfo/EmailSection/FederationControl.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,14 @@
<script>
import Actions from '@nextcloud/vue/dist/Components/Actions'
import ActionButton from '@nextcloud/vue/dist/Components/ActionButton'
import { loadState } from '@nextcloud/initial-state'
import { showError } from '@nextcloud/dialogs'

import { SCOPE_ENUM, SCOPE_PROPERTY_ENUM } from '../../../constants/AccountPropertyConstants'
import { savePrimaryEmailScope, saveAdditionalEmailScope } from '../../../service/PersonalInfoService'

const { lookupServerUploadEnabled } = loadState('settings', 'accountParameters', {})

// TODO hardcoded for email, should abstract this for other sections
const excludedScopes = [SCOPE_ENUM.PRIVATE]

Expand Down Expand Up @@ -80,11 +83,26 @@ export default {
data() {
return {
initialScope: this.scope,
federationScopes: Object.values(SCOPE_PROPERTY_ENUM).filter(({ name }) => !excludedScopes.includes(name)),
}
},

computed: {
federationScopes() {
return Object.values(SCOPE_PROPERTY_ENUM).filter(({ name }) => !this.unsupportedScopes.includes(name))
},

unsupportedScopes() {
if (!lookupServerUploadEnabled) {
return [
...excludedScopes,
SCOPE_ENUM.FEDERATED,
SCOPE_ENUM.PUBLISHED,
]
}

return excludedScopes
},

scopeIcon() {
return SCOPE_PROPERTY_ENUM[this.scope].iconClass
},
Expand Down