-
Notifications
You must be signed in to change notification settings - Fork 72
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3110 from nextcloud/fix/confirmation-mails
Fix confirmation mails and move CTAs
- Loading branch information
Showing
6 changed files
with
147 additions
and
156 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
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
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 |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| export { default as ActionChangeView } from './modules/ActionChangeView.vue' | ||
| export { default as ActionDelete } from './modules/ActionDelete.vue' | ||
| export { default as ActionSendConfirmedOptions } from './modules/ActionSendConfirmedOptions.vue' | ||
| export { default as ActionSendConfirmed } from './modules/ActionSendConfirmed.vue' | ||
| export { default as ActionSortOptions } from './modules/ActionSortOptions.vue' | ||
| export { default as ActionToggleSidebar } from './modules/ActionToggleSidebar.vue' |
113 changes: 113 additions & 0 deletions
113
src/js/components/Actions/modules/ActionSendConfirmed.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,113 @@ | ||
| <!-- | ||
| - @copyright Copyright (c) 2021 René Gieling <github@dartcafe.de> | ||
| - | ||
| - @author René Gieling <github@dartcafe.de> | ||
| - | ||
| - @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> | ||
| <div class="action send-confirmations"> | ||
| <NcButton v-tooltip="sendButtonCaption" | ||
| type="primary" | ||
| :aria-label="sendButtonCaption" | ||
| :disabled="disableButton" | ||
| @click="clickAction()"> | ||
| <template #icon> | ||
| <EmailCheckIcon /> | ||
| </template> | ||
| <template #default> | ||
| {{ t('polls', 'Send confirmation emails') }} | ||
| </template> | ||
| </NcButton> | ||
|
|
||
| <NcModal :show.sync="showModal" | ||
| :title="t('polls', 'Result of sent confirmation mails')" | ||
| size="small"> | ||
| <div class="modal-confirmation-result"> | ||
| <div v-if="confirmations?.countSentMails > 0" class="sent-confirmations"> | ||
| <h2>{{ n('polls', '%n confirmation has been sent', '%n confirmations have been sent', confirmations.countSentMails) }}</h2> | ||
| <ul> | ||
| <li v-for="(item) in confirmations.sentMails" :key="item.displayName"> | ||
| {{ item.displayName }} <{{ item.emailAddress }}> | ||
| </li> | ||
| </ul> | ||
| </div> | ||
| <div v-if="confirmations?.countAbortedMails > 0" class="error-confirmations"> | ||
| <h2>{{ n('polls', '%n confirmation could not be sent', '%n confirmations could not be sent:', confirmations.countAbortedMails) }}</h2> | ||
| <ul> | ||
| <li v-for="(item) in confirmations.abortedMails" :key="item.displayName"> | ||
| {{ item.displayName }} ({{ item.reason === 'InvalidMail' ? t('polls', 'No valid email address') : t('polls', 'Unknown error') }}) | ||
| </li> | ||
| </ul> | ||
| </div> | ||
| </div> | ||
| </NcModal> | ||
| </div> | ||
| </template> | ||
| <script> | ||
| import { NcButton, NcModal } from '@nextcloud/vue' | ||
| import EmailCheckIcon from 'vue-material-design-icons/EmailCheck.vue' // view-comfy-outline | ||
| import { PollsAPI } from '../../../Api/index.js' | ||
| export default { | ||
| name: 'ActionSendConfirmed', | ||
| components: { | ||
| EmailCheckIcon, | ||
| NcButton, | ||
| NcModal, | ||
| }, | ||
| data() { | ||
| return { | ||
| showModal: false, | ||
| sendButtonCaption: t('polls', 'Send information about confirmed options by email'), | ||
| confirmations: null, | ||
| disableButton: false, | ||
| } | ||
| }, | ||
| methods: { | ||
| async clickAction() { | ||
| try { | ||
| this.disableButton = true | ||
| const result = await PollsAPI.sendConfirmation(this.$route.params.id) | ||
| this.disableButton = false | ||
| this.confirmations = result.data.confirmations | ||
| this.showModal = true | ||
| } catch (e) { | ||
| console.error(e) | ||
| } | ||
| }, | ||
| }, | ||
| } | ||
| </script> | ||
| <style lang="scss"> | ||
| .modal-confirmation-result { | ||
| padding: 24px; | ||
| ul { | ||
| list-style: initial; | ||
| } | ||
| .sent-confirmations, .error-confirmations { | ||
| padding: 12px; | ||
| } | ||
| } | ||
| </style> |
128 changes: 0 additions & 128 deletions
128
src/js/components/Actions/modules/ActionSendConfirmedOptions.vue
This file was deleted.
Oops, something went wrong.
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