Administrator/Xen-Orchestra-xen-orchestra-MIRROR
1
0
Fork 1
mirror of https://github.com/vatesfr/xen-orchestra.git synced 2026-09-10 22:14:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

feat(xo6): add the VM name to actions that open a modal (#10310)

Browse Source
This commit is contained in:
Alina D
2026-09-08 10:11:09 +02:00
committed by GitHub
parent 069bb79d4a
commit a974448339
19 changed files with 61 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
@xen-orchestra/web-core/lib/components/modal/VtsActionModal.vue
View File

@@ -38,16 +38,18 @@ type TextMappingByObject = {
type VtsActionModalVmProps = {
object: 'vm'
action: VmActions
vmName: string
hostName?: never
}
type VtsActionModalHostProps = {
object: 'host'
action: HostActions
vmName?: never
hostName: string
}
const { action, object, hostName } = defineProps<
const { action, object, vmName, hostName } = defineProps<
(VtsActionModalVmProps | VtsActionModalHostProps) & {
accent: ModalAccent
icon: IconName
@@ -69,22 +71,22 @@ const { t } = useI18n()
const textMappingsByObject: TextMappingByObject = {
vm: {
'force-reboot': {
title: t('modal:confirm-vm-force-reboot'),
title: t('modal:confirm-vm-force-reboot?', { vm: vmName }),
message: t('modal:vm-force-reboot-message'),
action: t('modal:action:vm-force-reboot'),
},
'force-shutdown': {
title: t('modal:confirm-vm-force-shutdown'),
title: t('modal:confirm-vm-force-shutdown?', { vm: vmName }),
message: t('modal:vm-force-shutdown-message'),
action: t('modal:action:vm-force-shutdown'),
},
reboot: {
title: t('modal:confirm-vm-reboot'),
title: t('modal:confirm-vm-reboot?', { vm: vmName }),
message: t('modal:vm-reboot-message'),
action: t('modal:action:vm-reboot'),
},
shutdown: {
title: t('modal:confirm-vm-shutdown'),
title: t('modal:confirm-vm-shutdown?', { vm: vmName }),
message: t('modal:vm-shutdown-message'),
action: t('modal:action:vm-shutdown'),
},

12
@xen-orchestra/web-core/lib/components/modal/VtsDeleteModal.vue
View File

@@ -1,11 +1,7 @@
<template>
<UiModal accent="warning" icon="status:warning-picto" @confirm="emit('confirm')" @dismiss="emit('cancel')">
<template #title>
<I18nT keypath="confirm-delete" scope="global" tag="div">
<span class="n-delete">
{{ subject }}
</span>
</I18nT>
{{ t('confirm-delete', { name: subject }) }}
</template>
<template #content>
@@ -40,9 +36,3 @@ const emit = defineEmits<{
const { t } = useI18n()
</script>
<style lang="postcss" scoped>
.n-delete {
color: var(--color-warning-item-base);
}
</style>

8
@xen-orchestra/web-core/lib/locales/cs.json
View File

@@ -653,10 +653,10 @@
"modal:confirm-host-enable?": "Opravdu chcete {host} povolit?",
"modal:confirm-host-shutdown?": "Opravdu chcete {host} vypnout?",
"modal:confirm-host-start?": "Opravdu chcete {host} spustit?",
"modal:confirm-vm-force-reboot": "Potvrďte vynucený restart virt. stroje",
"modal:confirm-vm-force-shutdown": "Potvrďte vynucení vypnutí virt. stroje",
"modal:confirm-vm-reboot": "Potvrďte restart virt. stroje",
"modal:confirm-vm-shutdown": "Potvrďte vypnutí virt. stroje",
"modal:confirm-vm-force-reboot?": "Potvrďte vynucený restart virt. stroje",
"modal:confirm-vm-force-shutdown?": "Potvrďte vynucení vypnutí virt. stroje",
"modal:confirm-vm-reboot?": "Potvrďte restart virt. stroje",
"modal:confirm-vm-shutdown?": "Potvrďte vypnutí virt. stroje",
"modal:host-disable-message": "Hostitel bude označen jako nedostupný pro spouštění nebo přijímání nových virt. strojů. Už běžící virt. stroje tím nebudou ovlivněny.",
"modal:host-enable-message": "Hostitel se stane znovu dostupným pro spouštění nebo přijímání virt. strojů.",
"modal:host-shutdown-message": "Toto hostitele vypne. Jakékoli virt. stroje které na něm jsou pořád ještě spuštěné budou okamžitě vypnuty (pokud jste je předtím neodstěhovali).",

8
@xen-orchestra/web-core/lib/locales/de.json
View File

@@ -522,10 +522,10 @@
"modal:action:vm-force-shutdown": "@:action:force-shutdown",
"modal:action:vm-reboot": "@:action:reboot VM",
"modal:action:vm-shutdown": "@:action:shutdown VM",
"modal:confirm-vm-force-reboot": "Erzwungenen Neustart der VM bestätigen",
"modal:confirm-vm-force-shutdown": "Erzwungenes Herunterfahren der VM bestätigen",
"modal:confirm-vm-reboot": "VM Neustart bestätigen",
"modal:confirm-vm-shutdown": "VM Abschaltung bestätigen",
"modal:confirm-vm-force-reboot?": "Erzwungenen Neustart der VM bestätigen",
"modal:confirm-vm-force-shutdown?": "Erzwungenes Herunterfahren der VM bestätigen",
"modal:confirm-vm-reboot?": "VM Neustart bestätigen",
"modal:confirm-vm-shutdown?": "VM Abschaltung bestätigen",
"modal:vm-force-reboot-message": "Dadurch wird die virtuelle Maschine sofort ohne sauberes Herunterfahren neu gestartet. Es kann zu Datenverlust kommen und laufende Prozesse werden unterbrochen.",
"modal:vm-force-shutdown-message": "Dadurch wird die virtuelle Maschine sofort ohne sauberes Herunterfahren ausgeschaltet. Es kann zu Datenverlust kommen und laufende Prozesse werden unterbrochen.",
"modal:vm-reboot-message": "Startet die virtuelle Maschine ordnungsgemäß neu, indem sie heruntergefahren und erneut gestartet wird. Laufende Prozesse werden ordnungsgemäß geschlossen.",

10
@xen-orchestra/web-core/lib/locales/en.json
View File

@@ -276,7 +276,7 @@
"configure-for-protected": "To ensure your VMs protection, consider configuring a {backup-job}",
"configure-in-xo-5": "Configure in XO 5",
"confirm-cancel?": "Are you sure you want to cancel?",
"confirm-delete": "You're about to delete {0}",
"confirm-delete": "You're about to delete {name}",
"confirm-disconnect": "You're about to disconnect {0}",
"confirm-vm-revert": "Confirm VM revert",
"connect": "Connect",
@@ -709,10 +709,10 @@
"modal:confirm-host-shutdown?": "Are you sure you want to shut down {host}?",
"modal:confirm-host-smart-reboot?": "Are you sure you want to smart reboot {host}?",
"modal:confirm-host-start?": "Are you sure you want to start {host}?",
"modal:confirm-vm-force-reboot": "Confirm VM force reboot",
"modal:confirm-vm-force-shutdown": "Confirm VM force shutdown",
"modal:confirm-vm-reboot": "Confirm VM reboot",
"modal:confirm-vm-shutdown": "Confirm VM shutdown",
"modal:confirm-vm-force-reboot?": "Are you sure you want to force reboot {vm}?",
"modal:confirm-vm-force-shutdown?": "Are you sure you want to force shut down {vm}?",
"modal:confirm-vm-reboot?": "Are you sure you want to reboot {vm}?",
"modal:confirm-vm-shutdown?": "Are you sure you want to shut down {vm}?",
"modal:host-detach-message": "This host will be detached from the pool and its local storage reset. Make sure no VMs are still running on it and that anything you need from its local storage has been backed up.",
"modal:host-disable-and-evacuate-vms-message": "The host will be disabled and its running VMs will be automatically migrated to other hosts in the pool, with no interruption as long as resources allow.",
"modal:host-disable-message": "The host will be marked unavailable for starting or receiving new VMs. Already-running VMs are not affected.",

8
@xen-orchestra/web-core/lib/locales/es.json
View File

@@ -514,10 +514,10 @@
"modal:action:vm-force-shutdown": "@:action:force-shutdown VM",
"modal:action:vm-reboot": "@:action:reboot VM",
"modal:action:vm-shutdown": "@:action:shutdown VM",
"modal:confirm-vm-force-reboot": "Confirmar el reinicio forzado de la VM",
"modal:confirm-vm-force-shutdown": "Confirmar el apagado forzado de la VM",
"modal:confirm-vm-reboot": "Confirmar reinicio VM",
"modal:confirm-vm-shutdown": "Confirmar apagado VM",
"modal:confirm-vm-force-reboot?": "Confirmar el reinicio forzado de la VM",
"modal:confirm-vm-force-shutdown?": "Confirmar el apagado forzado de la VM",
"modal:confirm-vm-reboot?": "Confirmar reinicio VM",
"modal:confirm-vm-shutdown?": "Confirmar apagado VM",
"modal:vm-force-reboot-message": "Esto reiniciará inmediatamente la máquina virtual sin un apagado limpio. Podrían producirse pérdidas de datos y se interrumpirán los procesos en curso.",
"modal:vm-force-shutdown-message": "Esto apagará inmediatamente la máquina virtual sin un apagado limpio. Podrían producirse pérdidas de datos y se interrumpirán los procesos en curso.",
"modal:vm-reboot-message": "Reinicia la máquina virtual correctamente, apagando y encendiendo de nuevo. Los procesos en ejecución se cerrarán correctamente.",

12
@xen-orchestra/web-core/lib/locales/fr.json
View File

@@ -276,7 +276,7 @@
"configure-for-protected": "Pour garantir la protection de vos VMs, vous pouvez configurer un {backup-job}",
"configure-in-xo-5": "Configurer dans XO 5",
"confirm-cancel?": "Êtes-vous sûr de vouloir annuler ?",
"confirm-delete": "Vous êtes sur le point de supprimer {0}",
"confirm-delete": "Vous êtes sur le point de supprimer {name}",
"confirm-disconnect": "Vous êtes sur le point de déconnecter {0}",
"confirm-vm-revert": "Confirmer la restauration de la VM à l'instantané",
"connect": "Se connecter",
@@ -436,6 +436,7 @@
"host-disable-title": "Êtes-vous sûr de vouloir désactiver {host}?",
"host-enable-title": "Êtes-vous sûr de vouloir activer {host}?",
"host-internal-networks": "Réseaux internes de l'hôte",
"host-missing": "L'hôte est manquant",
"host-not-running": "Hôte non démarré",
"host-off": "L’hôte est éteint",
"host:status:active": "@:status:active",
@@ -708,11 +709,10 @@
"modal:confirm-host-shutdown?": "Êtes-vous sûr de vouloir arrêter {host} ?",
"modal:confirm-host-smart-reboot?": "Êtes-vous sûr de vouloir effectuer un redémarrage optimisé de {host} ?",
"modal:confirm-host-start?": "Êtes-vous sûr de vouloir démarrer {host} ?",
"modal:confirm-vm-force-reboot": "Confirmer le redémarrage forcé de la VM",
"modal:confirm-vm-force-shutdown": "Confirmer l'arrêt forcé de la VM",
"modal:confirm-vm-reboot": "Confirmer le redémarrage de la VM",
"host-missing": "L'hôte est manquant",
"modal:confirm-vm-shutdown": "Confirmer l'arrêt de la VM",
"modal:confirm-vm-force-reboot?": "Êtes-vous sûr de vouloir forcer le redémarrage de {vm} ?",
"modal:confirm-vm-force-shutdown?": "Êtes-vous sûr de vouloir forcer l'arrêt de {vm} ?",
"modal:confirm-vm-reboot?": "Êtes-vous sûr de vouloir redémarrer {vm} ?",
"modal:confirm-vm-shutdown?": "Êtes-vous sûr de vouloir arrêter {vm} ?",
"modal:host-detach-message": "Cet hôte sera détaché du pool et son stockage local réinitialisé. Assurez-vous qu'aucune VM n'est encore en cours d'exécution et que tout ce dont vous avez besoin sur son stockage local a été sauvegardé.",
"modal:host-disable-and-evacuate-vms-message": "L'hôte sera désactivé et ses VMs en cours d'exécution seront automatiquement migrées vers d'autres hôtes du pool, sans interruption si les ressources le permettent.",
"modal:host-disable-message": "L'hôte sera marqué comme indisponible pour le démarrage ou la réception de nouvelles VMs. Les VMs déjà en cours d’exécution ne sont pas affectées.",

8
@xen-orchestra/web-core/lib/locales/nl.json
View File

@@ -653,10 +653,10 @@
"modal:confirm-host-enable?": "Weet je zeker dat je {host} wilt inschakelen?",
"modal:confirm-host-shutdown?": "Weet je zeker dat je {host} wilt afsluiten?",
"modal:confirm-host-start?": "Weet je zeker dat je {host} wilt starten?",
"modal:confirm-vm-force-reboot": "Bevestig gedwongen herstart VM",
"modal:confirm-vm-force-shutdown": "Bevestig gedwongen afsluiten van VM",
"modal:confirm-vm-reboot": "Bevestig opnieuw opstarten van VM",
"modal:confirm-vm-shutdown": "Bevestig afsluiten van VM",
"modal:confirm-vm-force-reboot?": "Bevestig gedwongen herstart VM",
"modal:confirm-vm-force-shutdown?": "Bevestig gedwongen afsluiten van VM",
"modal:confirm-vm-reboot?": "Bevestig opnieuw opstarten van VM",
"modal:confirm-vm-shutdown?": "Bevestig afsluiten van VM",
"modal:host-disable-message": "De host wordt gemarkeerd als niet beschikbaar voor het starten of ontvangen van nieuwe VM’s. Dit heeft geen invloed op VM’s die al actief zijn.",
"modal:host-enable-message": "De host wordt weer beschikbaar voor het starten of ontvangen van VM’s.",
"modal:host-shutdown-message": "Hierdoor wordt de host uitgeschakeld. Alle virtuele machines die nog op de host draaien, worden onmiddellijk afgesloten, tenzij je ze eerst hebt gemigreerd.",

8
@xen-orchestra/web-core/lib/locales/pt-BR.json
View File

@@ -466,10 +466,10 @@
"modal:action:vm-force-shutdown": "@:action:force-shutdown VM",
"modal:action:vm-reboot": "@:action:reboot VM",
"modal:action:vm-shutdown": "@:action:shutdown VM",
"modal:confirm-vm-force-reboot": "Confirmar reinicialização forçada da VM",
"modal:confirm-vm-force-shutdown": "Confirmar o encerramento forçado da VM",
"modal:confirm-vm-reboot": "Confirmar o reinício da VM",
"modal:confirm-vm-shutdown": "Confirmar o encerramento da VM",
"modal:confirm-vm-force-reboot?": "Confirmar reinicialização forçada da VM",
"modal:confirm-vm-force-shutdown?": "Confirmar o encerramento forçado da VM",
"modal:confirm-vm-reboot?": "Confirmar o reinício da VM",
"modal:confirm-vm-shutdown?": "Confirmar o encerramento da VM",
"modal:vm-force-reboot-message": "Isto irá reiniciar imediatamente a máquina virtual sem um encerramento normal. Poderá ocorrer perda de dados e os processos em execução serão interrompidos.",
"modal:vm-force-shutdown-message": "Isto irá desligar imediatamente a máquina virtual sem um encerramento normal. Poderá ocorrer perda de dados e os processos em execução serão interrompidos.",
"modal:vm-reboot-message": "Reinicia a máquina virtual de forma controlada, desligando-a e ligando-a novamente. Os processos em execução serão encerrados corretamente.",

8
@xen-orchestra/web-core/lib/locales/pt.json
View File

@@ -466,10 +466,10 @@
"modal:action:vm-force-shutdown": "@:action:force-shutdown VM",
"modal:action:vm-reboot": "@:action:reboot VM",
"modal:action:vm-shutdown": "@:action:shutdown VM",
"modal:confirm-vm-force-reboot": "Confirmar reinicialização forçada da VM",
"modal:confirm-vm-force-shutdown": "Confirmar o encerramento forçado da VM",
"modal:confirm-vm-reboot": "Confirmar o reinício da VM",
"modal:confirm-vm-shutdown": "Confirmar o encerramento da VM",
"modal:confirm-vm-force-reboot?": "Confirmar reinicialização forçada da VM",
"modal:confirm-vm-force-shutdown?": "Confirmar o encerramento forçado da VM",
"modal:confirm-vm-reboot?": "Confirmar o reinício da VM",
"modal:confirm-vm-shutdown?": "Confirmar o encerramento da VM",
"modal:vm-force-reboot-message": "Isto irá reiniciar imediatamente a máquina virtual sem um encerramento normal. Poderá ocorrer perda de dados e os processos em execução serão interrompidos.",
"modal:vm-force-shutdown-message": "Isto irá desligar imediatamente a máquina virtual sem um encerramento normal. Poderá ocorrer perda de dados e os processos em execução serão interrompidos.",
"modal:vm-reboot-message": "Reinicia a máquina virtual de forma controlada, desligando-a e ligando-a novamente. Os processos em execução serão encerrados corretamente.",

8
@xen-orchestra/web-core/lib/locales/sk.json
View File

@@ -653,10 +653,10 @@
"modal:confirm-host-enable?": "Naozaj chcete {host} povoliť?",
"modal:confirm-host-shutdown?": "Naozaj chcete {host} vypnúť?",
"modal:confirm-host-start?": "Naozaj chcete {host} spustiť?",
"modal:confirm-vm-force-reboot": "Potvrďte vynútený reštart VM",
"modal:confirm-vm-force-shutdown": "Potvrďte vynútené vypnutie VM",
"modal:confirm-vm-reboot": "Potvrďte reštart VM",
"modal:confirm-vm-shutdown": "Potvrďte vypnutie VM",
"modal:confirm-vm-force-reboot?": "Potvrďte vynútený reštart VM",
"modal:confirm-vm-force-shutdown?": "Potvrďte vynútené vypnutie VM",
"modal:confirm-vm-reboot?": "Potvrďte reštart VM",
"modal:confirm-vm-shutdown?": "Potvrďte vypnutie VM",
"modal:host-disable-message": "Hostiteľ bude označený ako nedostupný na spúšťanie alebo prijímanie nových virt. strojov. Už bežiaci virt. stroje tým nebudú ovplyvnené.",
"modal:host-enable-message": "Hostiteľ sa stane znova dostupným na spúšťanie alebo prijímanie virt. strojov.",
"modal:host-shutdown-message": "Toto hostiteľa vypne. Akékoľvek virt. stroje ktoré na ňom sú stále ešte spustené budú okamžite vypnuté (ak ste ich predtým neodsťahovali).",

8
@xen-orchestra/web-core/lib/locales/sv.json
View File

@@ -557,10 +557,10 @@
"modal:action:vm-force-shutdown": "@:action:force-shutdown VM",
"modal:action:vm-reboot": "@:action:reboot VM",
"modal:action:vm-shutdown": "@:action:shutdown VM",
"modal:confirm-vm-force-reboot": "Bekräfta tvingad omstart av VM",
"modal:confirm-vm-force-shutdown": "Bekräftaa tvingad nedstängning av VM",
"modal:confirm-vm-reboot": "Bekräfta omstart av VM",
"modal:confirm-vm-shutdown": "Bekräfta nedstängning av VM",
"modal:confirm-vm-force-reboot?": "Bekräfta tvingad omstart av VM",
"modal:confirm-vm-force-shutdown?": "Bekräftaa tvingad nedstängning av VM",
"modal:confirm-vm-reboot?": "Bekräfta omstart av VM",
"modal:confirm-vm-shutdown?": "Bekräfta nedstängning av VM",
"modal:vm-force-reboot-message": "Detta kommer omedelbart startar om den virtuella maskinen utan en korrekt nedstängning. Dataförlust kan ske och pågående processer kommer att avbrytas.",
"modal:vm-force-shutdown-message": "Detta kommer omedelbart att stänga av den virtuella maskinen utan en korrekt nedstängning. Dataförlust kan ske och pågående processer kommer att avbrytas.",
"modal:vm-reboot-message": "Startar om den virtuella maskinen korrekt genom att stänga ned den och starta upp den igen. Processer stängs ner korrekt.",

8
@xen-orchestra/web-core/lib/locales/zh-Hans.json
View File

@@ -565,10 +565,10 @@
"modal:action:vm-force-shutdown": "@:action:force-shutdown",
"modal:action:vm-reboot": "@:action:reboot",
"modal:action:vm-shutdown": "@:action:shutdown",
"modal:confirm-vm-force-reboot": "确认强制重启虚拟机",
"modal:confirm-vm-force-shutdown": "确认强制关闭虚拟机",
"modal:confirm-vm-reboot": "确认重启虚拟机",
"modal:confirm-vm-shutdown": "确认关闭虚拟机",
"modal:confirm-vm-force-reboot?": "确认强制重启虚拟机",
"modal:confirm-vm-force-shutdown?": "确认强制关闭虚拟机",
"modal:confirm-vm-reboot?": "确认重启虚拟机",
"modal:confirm-vm-shutdown?": "确认关闭虚拟机",
"modal:vm-force-reboot-message": "此操作直接重启虚拟机，未保存数据可能丢失。",
"modal:vm-force-shutdown-message": "此操作直接断电关机，极易造成数据损坏。",
"modal:vm-reboot-message": "优雅重启虚拟机，正常保存并关闭业务进程。",

2
@xen-orchestra/web/src/modules/vm/components/actions/delete/VmDeleteButton.vue
View File

@@ -70,7 +70,7 @@ function openModal() {
},
},
props: {
subject: t('n-vms', { n: 1 }),
subject: vm.name_label,
confirmLabel: t('action:delete-n-vms', { n: 1 }),
},
})

2
@xen-orchestra/web/src/modules/vm/components/actions/reboot/VmForceRebootButton.vue
View File

@@ -44,7 +44,7 @@ const openModal = () => {
openRebootModal({
events: { onConfirm: () => forceReboot() },
props: { accent: 'info', action: 'force-reboot', object: 'vm', icon: 'status:info-picto' },
props: { accent: 'info', action: 'force-reboot', object: 'vm', vmName: vm.name_label, icon: 'status:info-picto' },
})
}
</script>

2
@xen-orchestra/web/src/modules/vm/components/actions/reboot/VmRebootButton.vue
View File

@@ -47,7 +47,7 @@ const openModal = () => {
openRebootModal({
events: { onConfirm: () => reboot() },
props: { accent: 'info', action: 'reboot', object: 'vm', icon: 'status:info-picto' },
props: { accent: 'info', action: 'reboot', object: 'vm', vmName: vm.name_label, icon: 'status:info-picto' },
})
}
</script>

2
@xen-orchestra/web/src/modules/vm/components/actions/shutdown/VmForceShutdownButton.vue
View File

@@ -43,7 +43,7 @@ const openModal = () => {
openForceShutdownModal({
events: { onConfirm: () => forceShutdown() },
props: { accent: 'info', action: 'force-shutdown', object: 'vm', icon: 'status:info-picto' },
props: { accent: 'info', action: 'force-shutdown', object: 'vm', vmName: vm.name_label, icon: 'status:info-picto' },
})
}
</script>

2
@xen-orchestra/web/src/modules/vm/components/actions/shutdown/VmShutdownButton.vue
View File

@@ -43,7 +43,7 @@ const openModal = () => {
openShutdownModal({
events: { onConfirm: () => shutdown() },
props: { accent: 'info', action: 'shutdown', object: 'vm', icon: 'status:info-picto' },
props: { accent: 'info', action: 'shutdown', object: 'vm', vmName: vm.name_label, icon: 'status:info-picto' },
})
}
</script>

1
CHANGELOG.unreleased.md
View File

@@ -11,6 +11,7 @@
> Users must be able to say: "Nice enhancement, I'm eager to test it"
- [XO6/Vm] Add the VM name to VM related actions that open a modal (PR [#10310](https://github.com/vatesfr/xen-orchestra/pull/10310))
- [XO6] Allow changing which PIF a host uses for its management interface, without deleting and recreating the network config (PR [#10110](https://github.com/vatesfr/xen-orchestra/pull/10110))
- [XO6/SR] Add dedicated Storage Repository page hosts sidepanel (PR [#10140](https://github.com/vatesfr/xen-orchestra/pull/10140))