From 8e61d417dbe599451f76f36b291e6d352138cdf7 Mon Sep 17 00:00:00 2001 From: Conghui Date: Tue, 26 Apr 2022 00:15:35 +0800 Subject: [PATCH] configurator: bugfix for removing Service VM When removing Service VM from UI, the post-launched VMs should also be removed. Besides, add a warning window when removing Service VM. Tracked-On: #7349 Signed-off-by: Conghui Reviewed-by: Weiyi Feng --- misc/config_tools/configurator/src/lib/acrn.jsx | 9 +++++++++ .../ConfigureSettingsForScenario.jsx | 17 ++++++++++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/misc/config_tools/configurator/src/lib/acrn.jsx b/misc/config_tools/configurator/src/lib/acrn.jsx index c0762da2a..39eea611e 100644 --- a/misc/config_tools/configurator/src/lib/acrn.jsx +++ b/misc/config_tools/configurator/src/lib/acrn.jsx @@ -217,6 +217,15 @@ export class ProgramLayer extends EventBase { this.onScenarioDataUpdateEvent() } + isServiceVM = (vmID) => { + for (var idx in this.scenarioData.vm.SERVICE_VM) { + if (this.scenarioData.vm.SERVICE_VM[idx]['@id'] === vmID) { + return true + } + } + return false + } + deleteVM = (vmID) => { // call by view for (let vmType in this.scenarioData.vm) { diff --git a/misc/config_tools/configurator/src/pages/Config/ConfigureSettingsForScenario/ConfigureSettingsForScenario.jsx b/misc/config_tools/configurator/src/pages/Config/ConfigureSettingsForScenario/ConfigureSettingsForScenario.jsx index 214c91f10..d9539704f 100644 --- a/misc/config_tools/configurator/src/pages/Config/ConfigureSettingsForScenario/ConfigureSettingsForScenario.jsx +++ b/misc/config_tools/configurator/src/pages/Config/ConfigureSettingsForScenario/ConfigureSettingsForScenario.jsx @@ -47,6 +47,7 @@ export default class ConfigureSettingsForScenario extends Component { render = () => { let {configurator} = this.context + let scenarioData = configurator.programLayer.scenarioData return (
@@ -74,7 +75,21 @@ export default class ConfigureSettingsForScenario extends Component {