public/harvester-ui-extension
1
0
Fork 0
mirror of https://github.com/harvester/harvester-ui-extension.git synced 2025-12-13 21:21:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #79 from a110605/fix_7317

Browse Source 
fix: add missing wording in delete VM modal
This commit is contained in:
Andy Lee 2025-01-13 13:36:52 +08:00 committed by GitHub
commit 5bd8ad2a93
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 44 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/harvester/models/kubevirt.io.virtualmachine.js
View File

@ -1120,10 +1120,6 @@ export default class VirtVm extends HarvesterResource {
return qemu?.status === 'True'; return qemu?.status === 'True';
} }
get warnDeletionMessage() {
return this.t('harvester.virtualMachine.promptRemove.tips');
}
get instanceLabels() { get instanceLabels() {
const all = this.spec?.template?.metadata?.labels || {}; const all = this.spec?.template?.metadata?.labels || {};

21
pkg/harvester/promptRemove/kubevirt.io.virtualmachine.vue
View File

@ -4,6 +4,7 @@ import { isEmpty } from '@shell/utils/object';
import Parse from 'url-parse'; import Parse from 'url-parse';
import { resourceNames } from '@shell/utils/string'; import { resourceNames } from '@shell/utils/string';
import { HCI } from '../types'; import { HCI } from '../types';
import { alternateLabel as alternateLabelButton } from '@shell/utils/platform';
export default { export default {
name: 'HarvesterPromptRemove', name: 'HarvesterPromptRemove',
@ -40,7 +41,8 @@ export default {
data() { data() {
return { return {
checkedList: [], checkedList: [],
checkAll: true checkAll: true,
alternateLabel: alternateLabelButton
}; };
}, },
@ -138,6 +140,7 @@ export default {
</script> </script>
<template> <template>
<div>
<div class="mt-10"> <div class="mt-10">
{{ t('promptRemove.attemptingToRemove', {type}) }} {{ t('promptRemove.attemptingToRemove', {type}) }}
<span v-clean-html="resourceNames(names, plusMore, t)"></span> <span v-clean-html="resourceNames(names, plusMore, t)"></span>
@ -150,7 +153,8 @@ export default {
v-for="(name, i) in removeNameArr[value[0].id]" v-for="(name, i) in removeNameArr[value[0].id]"
:key="i" :key="i"
> >
<label class="checkbox-container mr-15"><input <label class="checkbox-container mr-15">
<input
v-model="checkedList" v-model="checkedList"
type="checkbox" type="checkbox"
:label="name" :label="name"
@ -164,10 +168,10 @@ export default {
</label> </label>
</span> </span>
</div> </div>
<div v-else> <div v-else>
<label class="checkbox-container mr-15"><input <label class="checkbox-container mr-15">
v-model="checkAll" <input
v-model="checkedList"
type="checkbox" type="checkbox"
/> />
<span <span
@ -178,4 +182,11 @@ export default {
</label> </label>
</div> </div>
</div> </div>
<div class="text-warning mb-10 mt-10">
{{ t('harvester.virtualMachine.promptRemove.tips') }}
</div>
<div class="text-info mt-20">
{{ t('promptRemove.protip', { alternateLabel }) }}
</div>
</div>
</template> </template>