Skip to content

Make resource deletion safer with name confirmation #13104

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

Draft
sudo87 wants to merge 2 commits into
base: main
Choose a base branch
from
+30 −17
Draft

Make resource deletion safer with name confirmation #13104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
60848ce
enable double confirmation in delete flow for resource
sudo87 May 5, 2026
9f44473
address copilot comments
sudo87 May 5, 2026
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
1 change: 1 addition & 0 deletions ui/public/locales/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -795,6 +795,7 @@
"label.delete.ciscoasa1000v": "Delete CiscoASA1000v",
"label.delete.ciscovnmc.resource": "Delete CiscoVNMC resource",
"label.delete.condition": "Delete condition",
"label.delete.confirmation": "Enter the exact resource name to proceed with deletion",
"label.delete.custom.action": "Delete Custom Action",
"label.delete.dedicated.vlan.range": "Deleted dedicated VLAN/VNI range.",
"label.delete.domain": "Delete domain",
Expand Down
1 change: 1 addition & 0 deletions ui/src/config/section/project.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@ export default {
},
groupAction: true,
popup: true,
requireNameConfirmation: true,
groupMap: (selection, values) => { return selection.map(x => { return { id: x, cleanup: values.cleanup || null } }) },
Comment thread
sudo87 marked this conversation as resolved.
args: (record, store) => {
const fields = []
Expand Down
45 changes: 28 additions & 17 deletions ui/src/views/AutogenView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,8 +195,6 @@
:footer="null"
style="top: 20px;"
:width="modalWidth"
:ok-button-props="getOkProps()"
:cancel-button-props="getCancelProps()"
:confirmLoading="actionLoading"
@cancel="cancelAction"
centered
Expand Down Expand Up @@ -270,8 +268,18 @@
</a-table>
</div>
<br v-if="currentAction.paramFields.length > 0" />
</span>
<a-form
</span>
<div v-if="currentAction.requireNameConfirmation && !(currentAction.groupAction && selectedRowKeys.length > 0)" style="margin-bottom: 5px">
<a-form-item>
<a-input v-model:value="actionConfirmText" :placeholder="resource.name" />
</a-form-item>
Comment thread
sudo87 marked this conversation as resolved.
<a-alert type="info">
<template #message>
<div v-html="$t('label.delete.confirmation')"></div>
</template>
</a-alert>
</div>
<a-form
:ref="formRef"
:model="form"
:rules="rules"
Expand Down Expand Up @@ -526,6 +534,7 @@
type="primary"
@click="handleSubmit"
ref="submit"
:disabled="isSubmitDisabled"
>{{ $t('label.ok') }}</a-button>
</div>
</a-form>
Expand Down Expand Up @@ -686,6 +695,7 @@ export default {
confirmDirty: false,
firstIndex: 0,
modalWidth: '30vw',
actionConfirmText: '',
promises: []
}
},
Expand Down Expand Up @@ -893,6 +903,12 @@ export default {
return 'active'
}
return 'self'
},
isSubmitDisabled () {
if (this.currentAction?.requireNameConfirmation && !(this.currentAction.groupAction && this.selectedRowKeys.length > 0)) {
return this.actionConfirmText.trim() !== this.resource?.name?.trim()
}
return false
}
},
methods: {
Expand All @@ -902,19 +918,6 @@ export default {
}
return 'inline-flex'
},
getOkProps () {
if (this.selectedRowKeys.length > 0 && this.currentAction?.groupAction) {
} else {
return { props: { type: 'primary' } }
}
},
getCancelProps () {
if (this.selectedRowKeys.length > 0 && this.currentAction?.groupAction) {
return { props: { type: 'primary' } }
} else {
return { props: { type: 'default' } }
}
},
switchProject (projectId) {
if (!projectId || !projectId.length || projectId.length !== 36) {
return
Expand Down Expand Up @@ -1303,6 +1306,7 @@ export default {
this.actionLoading = false
this.showAction = false
this.currentAction = {}
this.actionConfirmText = ''
},
cancelAction () {
eventBus.emit('action-closing', { action: this.currentAction })
Expand Down Expand Up @@ -1360,6 +1364,7 @@ export default {
this.currentAction = action
this.currentAction.params = store.getters.apis[this.currentAction.api].params
this.resource = action.resource
this.actionConfirmText = ''
this.$emit('change-resource', this.resource)
var paramFields = this.currentAction.params
paramFields.sort(function (a, b) {
Expand Down Expand Up @@ -1642,6 +1647,12 @@ export default {
},
handleSubmit (e) {
if (this.actionLoading) return

if (this.currentAction?.requireNameConfirmation && !(this.currentAction.groupAction && this.selectedRowKeys.length > 0)) {
if (this.actionConfirmText.trim() !== this.resource?.name?.trim()) {
return
}
}
Comment thread
sudo87 marked this conversation as resolved.
Comment thread
sudo87 marked this conversation as resolved.
this.promises = []
if (!this.dataView && this.currentAction.groupAction && this.selectedRowKeys.length > 0) {
if (this.selectedRowKeys.length > 0) {
Expand Down
Loading