From e4f11ca4c8bcf91e2a5e8942d25cc303eaa08410 Mon Sep 17 00:00:00 2001 From: Calvin Zhang Date: Thu, 12 May 2022 15:13:37 +0800 Subject: [PATCH] misc: configurator: report the errors on clicking save button On clicking save button, current scenario configuration is validated and errors should be prompted out if any. BTW, fix unrecognized value in cpu affinity object. Fixes: 5a3b38f778 ("config-tools: add confirm message") Tracked-On: #7469 Signed-off-by: Calvin Zhang --- .../configurator/packages/configurator/src/pages/Config.vue | 5 ++++- .../pages/Config/ConfigForm/CustomWidget/cpu_affinity.vue | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/misc/config_tools/configurator/packages/configurator/src/pages/Config.vue b/misc/config_tools/configurator/packages/configurator/src/pages/Config.vue index 17c33bfd5..441adeb05 100644 --- a/misc/config_tools/configurator/packages/configurator/src/pages/Config.vue +++ b/misc/config_tools/configurator/packages/configurator/src/pages/Config.vue @@ -358,7 +358,10 @@ export default { configurator.writeFile(this.WorkingFolder + 'scenario.xml', scenarioXMLData) .then(() => { step = 1 - configurator.pythonObject.validateScenario(this.board.content, scenarioXMLData) + this.errors = configurator.pythonObject.validateScenario(this.board.content, scenarioXMLData) + if (this.errors.length != 0) { + throw "validation failed" + } }) .then(() => { step = 2 diff --git a/misc/config_tools/configurator/packages/configurator/src/pages/Config/ConfigForm/CustomWidget/cpu_affinity.vue b/misc/config_tools/configurator/packages/configurator/src/pages/Config/ConfigForm/CustomWidget/cpu_affinity.vue index 159d22323..00a26901c 100644 --- a/misc/config_tools/configurator/packages/configurator/src/pages/Config/ConfigForm/CustomWidget/cpu_affinity.vue +++ b/misc/config_tools/configurator/packages/configurator/src/pages/Config/ConfigForm/CustomWidget/cpu_affinity.vue @@ -114,7 +114,7 @@ export default { return `${this.rootFormData.name} vCPU ${index}` }, addPCPU(index) { - this.defaultVal.pcpu.splice(index + 1, 0, {pcpu_id: null, real_time_vcpu: false}) + this.defaultVal.pcpu.splice(index + 1, 0, {pcpu_id: null, real_time_vcpu: "n"}) }, removePCPU(index) { if (this.defaultVal.pcpu.length === 1) { @@ -144,4 +144,4 @@ export default { background: #f9f9f9; padding: 5px 5px 3px; } - \ No newline at end of file +