From 72e71af89ad865007efda24933be9e59a654f423 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Wed, 15 Oct 2014 15:50:55 +0200 Subject: [PATCH] Feature #3175: Refactor SG wizard --- .../public/js/plugins/secgroups-tab.js | 257 +++++++++++------- src/sunstone/public/js/sunstone.js | 10 + 2 files changed, 167 insertions(+), 100 deletions(-) diff --git a/src/sunstone/public/js/plugins/secgroups-tab.js b/src/sunstone/public/js/plugins/secgroups-tab.js index 4a90ca2462..c4ef0f8d40 100644 --- a/src/sunstone/public/js/plugins/secgroups-tab.js +++ b/src/sunstone/public/js/plugins/secgroups-tab.js @@ -21,93 +21,111 @@ function initialize_create_security_group_dialog(dialog){ setupTips(dialog); - $(".add_security_group_rule", dialog).on("click", function(){ - $(".security_group_rules tbody").append( - '\ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ -
\ -
\ - \ - \ - \ - \ - \ - \ - \ - '); - - //Initialize shown options - $('select',$(".security_group_rules tbody", dialog).children("tr").last()).trigger("change"); - }); - dialog.on("change", '.security_group_rule_network_sel', function(){ - var td = $(this).parent("td"); switch ($(this).val()) { case "ANY": - $('.security_group_rule_network',td).hide(); - $('.vnet_select',td).hide(); + $('.security_group_rule_network',dialog).hide(); + $('.vnet_select',dialog).hide(); break; case "NETWORK": - $('.security_group_rule_network',td).show(); - $('.vnet_select',td).hide(); + $('.security_group_rule_network',dialog).show(); + $('.vnet_select',dialog).hide(); break; case "VNET": - $('.security_group_rule_network',td).hide(); - $('.vnet_select',td).show(); + $('.security_group_rule_network',dialog).hide(); + $('.vnet_select',dialog).show(); + + refreshVNetTableSelect(dialog, "new_sg_rule"); - insertSelectOptions('div.vnet_select', td, "Network", null, true); break; }; }); dialog.on("change", '.security_group_rule_range_sel', function(){ - var td = $(this).parent("td"); switch ($(this).val()) { case "ALL": - $('.security_group_rule_range',td).hide(); + $('.security_group_rule_range', dialog).hide(); break; case "RANGE": - $('.security_group_rule_range',td).show(); + $('.security_group_rule_range', dialog).show(); break; }; }); - $(".add_security_group_rule", dialog).trigger("click"); + $(".add_security_group_rule", dialog).on("click", function(){ + var rule = {}; + + rule["PROTOCOL"] = $(".security_group_rule_protocol", dialog).val(); + rule["RULE_TYPE"] = $(".security_group_rule_type", dialog).val(); + + switch ($('.security_group_rule_range_sel', dialog).val()) { + case "ALL": + // TODO + break; + case "RANGE": + rule["RANGE"] = $(".security_group_rule_range input", dialog).val(); + break; + } + + switch ($('.security_group_rule_network_sel', dialog).val()) { + case "ANY": + // TODO + break; + case "NETWORK": + rule["NETWORK"] = $('.security_group_rule_network', dialog).val(); + break; + case "VNET": + rule["NETWORK_ID"] = retrieveVNetTableSelect(dialog, "new_sg_rule"); + break; + } + + rule["ICMP_TYPE"] = $(".security_group_rule_icmp_type", dialog).val(); + + + // TODO: create generic method to show rules table + + function td(attr){ + return ''+ (attr ? attr : '') +''; + } + + $(".security_group_rules tbody").append( + ''+ + td(rule.PROTOCOL)+ + td(rule.RULE_TYPE)+ + td(rule.RANGE)+ + ''+"TODO"+'\ + '+"TODO"+'\ + \ + \ + \ + '); + + // Add data to tr element + $(".security_group_rules tbody").children("tr").last().data("rule", rule); + + // Reset new rule fields + $('#new_rule_wizard select option', dialog).prop('selected', function() { + return this.defaultSelected; + }); + + $('#new_rule_wizard select', dialog).trigger("change"); + + $('#new_rule_wizard input', dialog).val(""); + + resetResourceTableSelect(dialog, "new_sg_rule"); + }); dialog.on("click", ".security_group_rules i.remove-tab", function(){ var tr = $(this).closest('tr'); tr.remove(); }); + setupVNetTableSelect(dialog, "new_sg_rule"); + dialog.foundation(); + $('#new_rule_wizard select', dialog).trigger("change"); + $('#create_security_group_form_wizard',dialog).on('invalid', function () { notifyError(tr("One or more required fields are missing or malformed.")); popFormDialog("create_security_group_form", $("#secgroup-tab")); @@ -127,37 +145,7 @@ function generate_json_security_group_from_form(dialog) { var rules = []; $(".security_group_rules tbody tr").each(function(){ - // TODO: if (x & y & z empty){} else do nothing - var rule = {}; - - rule["PROTOCOL"] = $(".security_group_rule_protocol", $(this)).val(); - rule["RULE_TYPE"] = $(".security_group_rule_type", $(this)).val(); - - switch ($('.security_group_rule_range_sel', $(this)).val()) { - case "ALL": - // TODO - break; - case "RANGE": - rule["RANGE"] = $(".security_group_rule_range", $(this)).val(); - break; - } - - switch ($('.security_group_rule_network_sel', $(this)).val()) { - case "ANY": - // TODO - break; - case "NETWORK": - rule["NETWORK"] = $('.security_group_rule_network', $(this)).val(); - break; - case "VNET": - // TODO: detect if select is "please select" - rule["NETWORK_ID"] = $('div.vnet_select .resource_list_select',$(this)).val(); - break; - } - - rule["ICMP_TYPE"] = $(".security_group_rule_icmp_type", $(this)).val(); - - rules.push(rule); + rules.push($(this).data("rule")); }); var security_group_json = @@ -257,19 +245,95 @@ function popUpSecurityGroupCloneDialog(){ var create_security_group_wizard_html = '
\
\ -
\ +
\ \ \
\ -
\ -
\ -
\ +
\ \