Skip to content

Commit 431e4f9

Browse files
authored
ui: confirm on reset configurations (apache#10745)
1 parent 4a1d80d commit 431e4f9

File tree

7 files changed

+26
-6
lines changed

7 files changed

+26
-6
lines changed

ui/public/locales/en.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2672,6 +2672,7 @@
26722672
"message.confirm.remove.vmware.datacenter": "Please confirm you want to remove VMware datacenter.",
26732673
"message.confirm.remove.vpc.offering": "Are you sure you want to remove this VPC offering?",
26742674
"message.confirm.replace.acl.new.one": "Do you want to replace the ACL with a new one?",
2675+
"message.confirm.reset.configuration.value": "Are you sure you want reset configuration - %x?",
26752676
"message.confirm.reset.network.permissions": "Are you sure you want to reset this Network permissions?",
26762677
"message.confirm.scale.up.router.vm": "Do you really want to scale up the router Instance?",
26772678
"message.confirm.scale.up.system.vm": "Do you really want to scale up the system VM?",

ui/src/components/view/ListView.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,7 @@
459459
iconTwoToneColor="#52c41a" />
460460
<tooltip-button
461461
:tooltip="$t('label.reset.config.value')"
462-
@onClick="resetConfig(record)"
462+
@onClick="$resetConfigurationValueConfirm(item, resetConfig)"
463463
v-if="editableValueKey !== record.key"
464464
icon="reload-outlined"
465465
:disabled="!('updateConfiguration' in $store.getters.apis)" />

ui/src/components/view/SettingsTab.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
iconTwoToneColor="#52c41a" />
6767
<tooltip-button
6868
:tooltip="$t('label.reset.config.value')"
69-
@onClick="resetConfig(item)"
69+
@onClick="$resetConfigurationValueConfirm(item, resetConfig)"
7070
v-if="editableValueKey !== index"
7171
icon="reload-outlined"
7272
:disabled="!('updateConfiguration' in $store.getters.apis)" />

ui/src/main.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ import {
3535
resourceTypePlugin,
3636
fileSizeUtilPlugin,
3737
genericUtilPlugin,
38-
localesPlugin
38+
localesPlugin,
39+
dialogUtilPlugin
3940
} from './utils/plugins'
4041
import { VueAxios } from './utils/request'
4142
import directives from './utils/directives'
@@ -51,6 +52,7 @@ vueApp.use(resourceTypePlugin)
5152
vueApp.use(fileSizeUtilPlugin)
5253
vueApp.use(localesPlugin)
5354
vueApp.use(genericUtilPlugin)
55+
vueApp.use(dialogUtilPlugin)
5456
vueApp.use(extensions)
5557
vueApp.use(directives)
5658

ui/src/utils/plugins.js

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import _ from 'lodash'
1919
import { i18n } from '@/locales'
2020
import { api } from '@/api'
21-
import { message, notification } from 'ant-design-vue'
21+
import { message, notification, Modal } from 'ant-design-vue'
2222
import eventBus from '@/config/eventBus'
2323
import store from '@/store'
2424
import { sourceToken } from '@/utils/request'
@@ -527,3 +527,18 @@ export function createPathBasedOnVmType (vmtype, virtualmachineid) {
527527

528528
return path + virtualmachineid
529529
}
530+
531+
export const dialogUtilPlugin = {
532+
install (app) {
533+
app.config.globalProperties.$resetConfigurationValueConfirm = function (configRecord, callback) {
534+
Modal.confirm({
535+
title: i18n.global.t('label.reset.config.value'),
536+
content: `${i18n.global.t('message.confirm.reset.configuration.value').replace('%x', configRecord.name)}`,
537+
okText: i18n.global.t('label.yes'),
538+
cancelText: i18n.global.t('label.no'),
539+
okType: 'primary',
540+
onOk: () => callback(configRecord)
541+
})
542+
}
543+
}
544+
}

ui/src/views/setting/ConfigurationValue.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@
179179
:disabled="valueLoading" />
180180
<tooltip-button
181181
:tooltip="$t('label.reset.config.value')"
182-
@onClick="resetConfigurationValue(configrecord)"
182+
@onClick="$resetConfigurationValueConfirm(configrecord, resetConfigurationValue)"
183183
v-if="editableValueKey === null"
184184
icon="reload-outlined"
185185
:disabled="(!('resetConfiguration' in $store.getters.apis) || configDisabled || valueLoading)" />

ui/tests/common/index.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ import {
3131
showIconPlugin,
3232
resourceTypePlugin,
3333
fileSizeUtilPlugin,
34-
genericUtilPlugin
34+
genericUtilPlugin,
35+
dialogUtilPlugin
3536
} from '@/utils/plugins'
3637

3738
function createMockRouter (newRoutes = []) {
@@ -88,6 +89,7 @@ function createFactory (component, options) {
8889
resourceTypePlugin,
8990
fileSizeUtilPlugin,
9091
genericUtilPlugin,
92+
dialogUtilPlugin,
9193
StoragePlugin
9294
],
9395
mocks

0 commit comments

Comments
 (0)