github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-07-18 17:33:43 +00:00
Code Issues Projects Releases Wiki Activity

acrn-config: add confirmation for commit of generated source in config app

Browse Source 
add a confirmation interface to let user to commit changes into local tree
or not commit after generated source codes in config app.

Tracked-On: #3834
Signed-off-by: Shuang Zheng <shuang.zheng@intel.com>
Reviewed-by: Victor Sun <victor.sun@intel.com>
This commit is contained in:
Shuang Zheng 2019-10-15 14:35:50 +08:00 committed by ACRN System Integration
parent 8eaee3b09b
commit afb3608b81
2 changed files with 44 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
misc/acrn-config/config_app/static/main.js
View File

@ -419,19 +419,25 @@ function save_scenario(generator=null){
}) })
if(no_err == true && status == 'success') { if(no_err == true && status == 'success') {
file_name = result.file_name; file_name = result.file_name;
validate_message = 'Scenario setting saved successfully with name: '
+file_name+'\ninto acrn-hypervisor/misc/acrn-config/xmls/config-xmls/'+board_info+'/user_defined/.'
if(result.rename==true) { if(result.rename==true) {
alert('Scenario setting existed, saved successfully with a new name: ' validate_message = 'Scenario setting existed, saved successfully with a new name: '
+file_name+'\nto acrn-hypervisor/misc/acrn-config/xmls/config-xmls/'+board_info+'/user_defined/'); +file_name+'\ninto acrn-hypervisor/misc/acrn-config/xmls/config-xmls/'+board_info+'/user_defined/.';
} else {
alert('Scenario setting saved successfully with name: '
+file_name+'\nto acrn-hypervisor/misc/acrn-config/xmls/config-xmls/'+board_info+'/user_defined/');
} }
if(generator != null) { if(generator != null) {
commit_confirm_message = validate_message+'\n\nGenerate source codes from scenario setting.'
+'\n\nDo you want to commit changes to local tree?'
commit_confirm = 'no'
if(confirm(commit_confirm_message)) {
commit_confirm = 'yes'
}
generator_config = { generator_config = {
type: generator, type: generator,
board_info: $("select#board_info").val(), board_info: $("select#board_info").val(),
board_setting: "board_setting", board_setting: "board_setting",
scenario_setting: file_name scenario_setting: file_name,
commit: commit_confirm
} }
$.ajax({ $.ajax({
type : "POST", type : "POST",
@ -442,8 +448,11 @@ function save_scenario(generator=null){
console.log(result); console.log(result);
status = result.status status = result.status
error_list = result.error_list error_list = result.error_list
if (status == 'success' && JSON.stringify(error_list)=='{}') { if (status == 'success' && (JSON.stringify(error_list)=='{}' || JSON.stringify(error_list)=='null')) {
alert(generator+' successfully.'); if(commit_confirm == 'yes')
alert(generator+' with commit successfully.');
else
alert(generator+' successfully.');
} else { } else {
alert(generator+' failed. \nError list:\n'+JSON.stringify(error_list)); alert(generator+' failed. \nError list:\n'+JSON.stringify(error_list));
} }
@ -456,6 +465,7 @@ function save_scenario(generator=null){
} }
}); });
} else { } else {
alert(validate_message);
window.location = "./user_defined_" + file_name; window.location = "./user_defined_" + file_name;
} }
} }
@ -536,20 +546,26 @@ function save_launch(generator=null) {
}) })
if(no_err == true && status == 'success') { if(no_err == true && status == 'success') {
file_name = result.file_name; file_name = result.file_name;
validate_message = 'Launch setting saved successfully with name: '
+file_name+'\nto acrn-hypervisor/misc/acrn-config/xmls/config-xmls/'+board_info+'/user_defined/.'
if(result.rename==true) { if(result.rename==true) {
alert('Launch setting existed, saved successfully with a new name: ' validate_message = 'Launch setting existed, saved successfully with a new name: '
+file_name+'\nto acrn-hypervisor/misc/acrn-config/xmls/config-xmls/'+board_info+'/user_defined/'); +file_name+'\nto acrn-hypervisor/misc/acrn-config/xmls/config-xmls/'+board_info+'/user_defined/.';
} else {
alert('Launch setting saved successfully with name: '
+file_name+'\nto acrn-hypervisor/misc/acrn-config/xmls/config-xmls/'+board_info+'/user_defined/');
} }
if(generator != null) { if(generator != null) {
commit_confirm_message = validate_message+'\n\nGenerate launch scripts from launch setting.'
+'\n\nDo you want to commit changes to local tree?'
commit_confirm = 'no'
if(confirm(commit_confirm_message)) {
commit_confirm = 'yes'
}
generator_config = { generator_config = {
type: generator, type: generator,
board_info: $("select#board_info").val(), board_info: $("select#board_info").val(),
board_setting: "board_setting", board_setting: "board_setting",
scenario_setting: $("select#scenario_name").val(), scenario_setting: $("select#scenario_name").val(),
launch_setting: file_name launch_setting: file_name,
commit: commit_confirm
} }
$.ajax({ $.ajax({
type : "POST", type : "POST",
@ -560,8 +576,13 @@ function save_launch(generator=null) {
console.log(result); console.log(result);
status = result.status status = result.status
error_list = result.error_list error_list = result.error_list
if (status == 'success' && JSON.stringify(error_list)=='{}') { if (status == 'success' && (JSON.stringify(error_list)=='{}' || JSON.stringify(error_list)=='null')) {
alert(generator+' successfully.'); if(commit_confirm == 'yes')
alert(generator+' successfully into '+
'acrn-hypervisor/misc/acrn-config/xmls/config-xmls/'+board_info+'/output/ with changes committed.');
else
alert(generator+' successfully into '+
'acrn-hypervisor/misc/acrn-config/xmls/config-xmls/'+board_info+'/output/.');
} else { } else {
alert(generator+' failed. \nError list:\n'+JSON.stringify(error_list)); alert(generator+' failed. \nError list:\n'+JSON.stringify(error_list));
} }
@ -574,6 +595,7 @@ function save_launch(generator=null) {
} }
}); });
} else { } else {
alert(validate_message);
window.location = "./user_defined_" + file_name; window.location = "./user_defined_" + file_name;
} }
} }

9
misc/acrn-config/config_app/views.py
View File

@ -360,20 +360,23 @@ def generate_src():
launch_setting = generator_config_data['launch_setting'] launch_setting = generator_config_data['launch_setting']
launch_setting_xml = os.path.join(current_app.config.get('CONFIG_PATH'), launch_setting_xml = os.path.join(current_app.config.get('CONFIG_PATH'),
board_type, 'user_defined', launch_setting + '.xml') board_type, 'user_defined', launch_setting + '.xml')
commit = False
if 'commit' in generator_config_data and generator_config_data['commit'] == 'yes':
commit = True
msg = {} msg = {}
error_list = {} error_list = {}
status = 'success' status = 'success'
if src_type == 'generate_board_src': if src_type == 'generate_board_src':
try: try:
from board_config.board_cfg_gen import ui_entry_api from board_config.board_cfg_gen import ui_entry_api
error_list = ui_entry_api(board_info_xml, scenario_setting_xml) error_list = ui_entry_api(board_info_xml, scenario_setting_xml, commit)
except Exception as error: except Exception as error:
status = 'fail' status = 'fail'
error_list = {'board setting error': str(error)} error_list = {'board setting error': str(error)}
elif src_type == 'generate_scenario_src': elif src_type == 'generate_scenario_src':
try: try:
from scenario_config.scenario_cfg_gen import ui_entry_api from scenario_config.scenario_cfg_gen import ui_entry_api
error_list = ui_entry_api(board_info_xml, scenario_setting_xml) error_list = ui_entry_api(board_info_xml, scenario_setting_xml, commit)
except Exception as error: except Exception as error:
status = 'fail' status = 'fail'
error_list = {'scenario setting error': str(error)} error_list = {'scenario setting error': str(error)}
@ -388,7 +391,7 @@ def generate_src():
try: try:
from launch_config.launch_cfg_gen import ui_entry_api from launch_config.launch_cfg_gen import ui_entry_api
error_list = ui_entry_api(board_info_xml, scenario_setting_xml, launch_setting_xml) error_list = ui_entry_api(board_info_xml, scenario_setting_xml, launch_setting_xml, commit)
except Exception as error: except Exception as error:
status = 'fail' status = 'fail'
error_list = {'launch setting error': str(error)} error_list = {'launch setting error': str(error)}