-
Notifications
You must be signed in to change notification settings - Fork 449
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add "more settings" menu item to open sidebar settings
Created a new dialog for conversation settings. It includes the share link settings (aka guest access), the moderation settings and the SIP settings. Added notifications after success/error when saving. Added field disabling logic while saving which provides some visual feedback. Refactored various "conversation" computed properties to all use the same dummy conversation object when the token was not found. Signed-off-by: Vincent Petry <[email protected]>
- Loading branch information
Showing
10 changed files
with
638 additions
and
236 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
90 changes: 90 additions & 0 deletions
90
src/components/ConversationSettings/ConversationSettingsDialog.vue
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,90 @@ | ||
<!-- | ||
- @copyright Copyright (c) 2020 Vincent Petry <vincent@nextcloud.com> | ||
- | ||
- @author Vincent Petry <[email protected]> | ||
- | ||
- @license GNU AGPL version 3 or any later version | ||
- | ||
- This program is free software: you can redistribute it and/or modify | ||
- it under the terms of the GNU Affero General Public License as | ||
- published by the Free Software Foundation, either version 3 of the | ||
- License, or (at your option) any later version. | ||
- | ||
- This program is distributed in the hope that it will be useful, | ||
- but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
- GNU Affero General Public License for more details. | ||
- | ||
- You should have received a copy of the GNU Affero General Public License | ||
- along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
--> | ||
|
||
<template> | ||
<AppSettingsDialog :open.sync="showSettings" :show-navigation="true" first-selected-section="keyboard shortcuts"> | ||
<AppSettingsSection :title="t('spreed', 'Guests access')" | ||
class="app-settings-section"> | ||
<LinkShareSettings /> | ||
</AppSettingsSection> | ||
<AppSettingsSection | ||
v-if="canFullModerate" | ||
:title="t('spreed', 'Moderation settings')" | ||
class="app-settings-section"> | ||
<ModerationSettings /> | ||
</AppSettingsSection> | ||
</AppSettingsDialog> | ||
</template> | ||
|
||
<script> | ||
import { subscribe, unsubscribe } from '@nextcloud/event-bus' | ||
import { PARTICIPANT } from '../../constants' | ||
import AppSettingsDialog from '@nextcloud/vue/dist/Components/AppSettingsDialog' | ||
import AppSettingsSection from '@nextcloud/vue/dist/Components/AppSettingsSection' | ||
import LinkShareSettings from './LinkShareSettings' | ||
import ModerationSettings from './ModerationSettings' | ||
|
||
export default { | ||
name: 'ConversationSettingsDialog', | ||
|
||
components: { | ||
AppSettingsDialog, | ||
AppSettingsSection, | ||
LinkShareSettings, | ||
ModerationSettings, | ||
}, | ||
|
||
data() { | ||
return { | ||
showSettings: false, | ||
} | ||
}, | ||
|
||
computed: { | ||
token() { | ||
return this.$store.getters.getToken() | ||
}, | ||
conversation() { | ||
return this.$store.getters.conversation(this.token) || this.$store.getters.dummyConversation | ||
}, | ||
participantType() { | ||
return this.conversation.participantType | ||
}, | ||
canFullModerate() { | ||
return this.participantType === PARTICIPANT.TYPE.OWNER || this.participantType === PARTICIPANT.TYPE.MODERATOR | ||
}, | ||
}, | ||
|
||
mounted() { | ||
subscribe('show-conversation-settings', this.handleShowSettings) | ||
}, | ||
|
||
methods: { | ||
handleShowSettings() { | ||
this.showSettings = true | ||
}, | ||
|
||
beforeDestroy() { | ||
unsubscribe('show-conversation-settings', this.handleShowSettings) | ||
}, | ||
}, | ||
} | ||
</script> |
190 changes: 190 additions & 0 deletions
190
src/components/ConversationSettings/LinkShareSettings.vue
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,190 @@ | ||
<!-- | ||
- @copyright Copyright (c) 2020 Vincent Petry <vincent@nextcloud.com> | ||
- | ||
- @author Vincent Petry <[email protected]> | ||
- | ||
- @license GNU AGPL version 3 or any later version | ||
- | ||
- This program is free software: you can redistribute it and/or modify | ||
- it under the terms of the GNU Affero General Public License as | ||
- published by the Free Software Foundation, either version 3 of the | ||
- License, or (at your option) any later version. | ||
- | ||
- This program is distributed in the hope that it will be useful, | ||
- but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
- GNU Affero General Public License for more details. | ||
- | ||
- You should have received a copy of the GNU Affero General Public License | ||
- along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
--> | ||
|
||
<template> | ||
<ul> | ||
<h3 class="app-settings-section__hint"> | ||
{{ t('spreed', 'Allow guests to use a public link connect to join this conversation.') }} | ||
</h3> | ||
<ActionCheckbox | ||
:disabled="isSaving" | ||
:checked="isSharedPublicly" | ||
@change="toggleGuests"> | ||
{{ t('spreed', 'Allow guests') }} | ||
</ActionCheckbox> | ||
<ActionCheckbox | ||
v-if="isSharedPublicly" | ||
class="share-link-password-checkbox" | ||
:disabled="isSaving" | ||
:checked="conversation.hasPassword" | ||
@check="handlePasswordEnable" | ||
@uncheck="handlePasswordDisable"> | ||
{{ t('spreed', 'Password protection') }} | ||
</ActionCheckbox> | ||
<ActionInput | ||
v-show="showPasswordField" | ||
class="share-link-password" | ||
icon="icon-password" | ||
type="password" | ||
:disabled="isSaving" | ||
:value.sync="password" | ||
autocomplete="new-password" | ||
@submit="handleSetNewPassword"> | ||
{{ t('spreed', 'Enter a password') }} | ||
</ActionInput> | ||
<ActionButton | ||
v-if="isSharedPublicly" | ||
:disabled="isSaving" | ||
icon="icon-clippy" | ||
:close-after-click="true" | ||
@click="handleCopyLink"> | ||
{{ t('spreed', 'Copy public link') }} | ||
</ActionButton> | ||
</ul> | ||
</template> | ||
|
||
<script> | ||
import { showError, showSuccess } from '@nextcloud/dialogs' | ||
import { CONVERSATION } from '../../constants' | ||
import { | ||
setConversationPassword, | ||
} from '../../services/conversationsService' | ||
import { generateUrl } from '@nextcloud/router' | ||
import ActionCheckbox from '@nextcloud/vue/dist/Components/ActionCheckbox' | ||
import ActionInput from '@nextcloud/vue/dist/Components/ActionInput' | ||
import ActionButton from '@nextcloud/vue/dist/Components/ActionButton' | ||
|
||
export default { | ||
name: 'LinkShareSettings', | ||
|
||
components: { | ||
ActionCheckbox, | ||
ActionInput, | ||
ActionButton, | ||
}, | ||
|
||
data() { | ||
return { | ||
// The conversation's password | ||
password: '', | ||
// Switch for the password-editing operation | ||
showPasswordField: false, | ||
isSaving: false, | ||
} | ||
}, | ||
|
||
computed: { | ||
isSharedPublicly() { | ||
return this.conversation.type === CONVERSATION.TYPE.PUBLIC | ||
}, | ||
|
||
token() { | ||
return this.$store.getters.getToken() | ||
}, | ||
|
||
conversation() { | ||
return this.$store.getters.conversation(this.token) || this.$store.getters.dummyConversation | ||
}, | ||
|
||
linkToConversation() { | ||
return window.location.protocol + '//' + window.location.host + generateUrl('/call/' + this.token) | ||
}, | ||
}, | ||
|
||
methods: { | ||
async setConversationPassword(newPassword) { | ||
this.isSaving = true | ||
try { | ||
await setConversationPassword(this.token, newPassword) | ||
if (newPassword !== '') { | ||
showSuccess(t('spreed', 'Conversation password has been saved')) | ||
} else { | ||
showSuccess(t('spreed', 'Conversation password has been removed')) | ||
} | ||
} catch (e) { | ||
console.error('Error saving conversation password', e) | ||
showError(t('spreed', 'Error occurred while saving conversation password')) | ||
} | ||
this.isSaving = false | ||
}, | ||
|
||
async toggleGuests() { | ||
const enabled = this.conversation.type !== CONVERSATION.TYPE.PUBLIC | ||
this.isSaving = true | ||
try { | ||
await this.$store.dispatch('toggleGuests', { | ||
token: this.token, | ||
allowGuests: enabled, | ||
}) | ||
|
||
if (enabled) { | ||
showSuccess(t('spreed', 'You allowed guests')) | ||
} else { | ||
showSuccess(t('spreed', 'You disallowed guests')) | ||
} | ||
} catch (e) { | ||
if (enabled) { | ||
showError(t('spreed', 'Error occurred while allowing guests')) | ||
} else { | ||
showError(t('spreed', 'Error occurred while disallowing guests')) | ||
} | ||
console.error('Error toggling guest mode', e) | ||
} | ||
this.isSaving = false | ||
}, | ||
|
||
async handlePasswordDisable() { | ||
// disable the password protection for the current conversation | ||
if (this.conversation.hasPassword) { | ||
await this.setConversationPassword('') | ||
} | ||
this.password = '' | ||
this.showPasswordField = false | ||
}, | ||
|
||
async handlePasswordEnable() { | ||
this.showPasswordField = true | ||
}, | ||
|
||
async handleSetNewPassword() { | ||
await this.setConversationPassword(this.password) | ||
this.password = '' | ||
this.showPasswordField = false | ||
}, | ||
|
||
async handleCopyLink() { | ||
try { | ||
await this.$copyText(this.linkToConversation) | ||
showSuccess(t('spreed', 'Conversation link copied to clipboard.')) | ||
} catch (error) { | ||
showError(t('spreed', 'The link could not be copied.')) | ||
} | ||
}, | ||
}, | ||
} | ||
</script> | ||
|
||
<style lang="scss" scoped> | ||
.app-settings-section__hint { | ||
color: var(--color-text-lighter); | ||
padding: 8px 0; | ||
} | ||
</style> |
Oops, something went wrong.