Extra checks in UI before deleting an account #10242
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 | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,140 @@ | ||||||
| // Licensed to the Apache Software Foundation (ASF) under one | ||||||
| // or more contributor license agreements. See the NOTICE file | ||||||
| // distributed with this work for additional information | ||||||
| // regarding copyright ownership. The ASF licenses this file | ||||||
| // to you under the Apache License, Version 2.0 (the | ||||||
| // "License"); you may not use this file except in compliance | ||||||
| // with the License. You may obtain a copy of the License at | ||||||
| // | ||||||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||||||
| // | ||||||
| // Unless required by applicable law or agreed to in writing, | ||||||
| // software distributed under the License is distributed on an | ||||||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||||||
| // KIND, either express or implied. See the License for the | ||||||
| // specific language governing permissions and limitations | ||||||
| // under the License. | ||||||
|
|
||||||
| <template> | ||||||
| <a-form | ||||||
| class="form" | ||||||
| :ref="formRef" | ||||||
| :model="form" | ||||||
| :rules="rules" | ||||||
| layout="vertical" | ||||||
| @finish="handleSubmit" | ||||||
| v-ctrl-enter="handleSubmit" | ||||||
| > | ||||||
| <div style="margin-bottom: 10px"> | ||||||
| <a-alert type="warning"> | ||||||
| <template #message> | ||||||
| <div v-html="$t('message.delete.account.warning')"></div> | ||||||
| </template> | ||||||
| </a-alert> | ||||||
| </div> | ||||||
| <div style="margin-bottom: 10px"> | ||||||
| <a-alert> | ||||||
| <template #message> | ||||||
| <div v-html="$t('message.delete.account.confirm')"></div> | ||||||
| </template> | ||||||
| </a-alert> | ||||||
| </div> | ||||||
| <a-form-item name="name" ref="name"> | ||||||
| <a-input | ||||||
| v-model:value="form.name" | ||||||
| :placeholder="$t('label.enter.account.name')" | ||||||
| style="width: auto"/> | ||||||
|
There was a problem hiding this comment. We could set the input width to
Suggested change
|
||||||
| </a-form-item> | ||||||
| <p v-if="error" class="error">{{ error }}</p> | ||||||
| <div :span="24" class="actions"> | ||||||
| <a-button @click="closeModal">{{ $t('label.cancel') }}</a-button> | ||||||
| <a-button type="primary" ref="submit" @click="handleSubmit">{{ $t('label.ok') }}</a-button> | ||||||
| </div> | ||||||
| </a-form> | ||||||
| </template> | ||||||
|
|
||||||
| <script> | ||||||
| import { ref, reactive } from 'vue' | ||||||
| import { api } from '@/api' | ||||||
|
|
||||||
| export default { | ||||||
| name: 'DeleteAccount', | ||||||
| props: { | ||||||
| resource: { | ||||||
| type: Object, | ||||||
| required: true | ||||||
| } | ||||||
| }, | ||||||
| data () { | ||||||
| return { | ||||||
| error: '' | ||||||
| } | ||||||
| }, | ||||||
| created () { | ||||||
| this.initForm() | ||||||
| }, | ||||||
| methods: { | ||||||
| initForm () { | ||||||
| this.formRef = ref() | ||||||
| this.form = reactive({ | ||||||
| }) | ||||||
| this.rules = reactive({ | ||||||
| name: [{ required: true, message: this.$t('label.required') }] | ||||||
| }) | ||||||
| }, | ||||||
| closeModal () { | ||||||
| this.$emit('close-action') | ||||||
| }, | ||||||
| handleSubmit (e) { | ||||||
| e.preventDefault() | ||||||
| this.formRef.value.validate().then(async () => { | ||||||
| if (this.form.name !== this.resource.name) { | ||||||
| this.error = `${this.$t('message.error.account.delete.name.mismatch')}` | ||||||
| return | ||||||
| } | ||||||
| api('deleteAccount', { | ||||||
| id: this.resource.id | ||||||
| }).then(response => { | ||||||
| this.$pollJob({ | ||||||
| jobId: response.deleteaccountresponse.jobid, | ||||||
| title: this.$t('label.action.delete.account'), | ||||||
| description: this.resource.id, | ||||||
| successMessage: `${this.$t('message.delete.account.success')} - ${this.resource.name}`, | ||||||
| errorMessage: `${this.$t('message.delete.account.failed')} - ${this.resource.name}`, | ||||||
| loadingMessage: `${this.$t('message.delete.account.processing')} - ${this.resource.name}`, | ||||||
| catchMessage: this.$t('error.fetching.async.job.result') | ||||||
| }) | ||||||
| this.closeModal() | ||||||
|
Comment on lines
+95
to
+107
There was a problem hiding this comment. After deleting an account, the UI does not redirect the user to another page. As a consequence of that, the following errors are rendered on screen:
It would be interesting to redirect the user to the accounts section |
||||||
| }).catch(error => { | ||||||
| this.$notifyError(error) | ||||||
| }) | ||||||
| }).catch((error) => { | ||||||
| this.formRef.value.scrollToField(error.errorFields[0].name) | ||||||
| }) | ||||||
| } | ||||||
| } | ||||||
| } | ||||||
| </script> | ||||||
|
|
||||||
| <style lang="scss" scoped> | ||||||
| .form { | ||||||
| width: 80vw; | ||||||
| @media (min-width: 500px) { | ||||||
| width: 400px; | ||||||
| } | ||||||
| } | ||||||
| .actions { | ||||||
| display: flex; | ||||||
| justify-content: flex-end; | ||||||
| margin-top: 20px; | ||||||
| button { | ||||||
| &:not(:last-child) { | ||||||
| margin-right: 10px; | ||||||
| } | ||||||
| } | ||||||
| } | ||||||
| .error { | ||||||
| color: red; | ||||||
| margin-top: 10px; | ||||||
| } | ||||||
| </style> | ||||||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It would be interesting to find a way to indicate to the users that the delete button will only become enabled when the account is disabled.
One way of achieving this would be keep the
DeleteAccountcomponent always enabled. When accounts are not disabled, then the component could show a message explaining that the account needs first to be disabled in order to proceed with the deletion.