Skip to content
This repository has been archived by the owner on Aug 30, 2024. It is now read-only.

Commit

Permalink
EUCA-3905: New notification implementation for multi-ops
Browse files Browse the repository at this point in the history
  • Loading branch information
@sangmin
sangmin committed Oct 26, 2012
1 parent c1158e3 commit c6f61c6
Show file tree
Hide file tree
Showing 11 changed files with 368 additions and 113 deletions.
20 changes: 18 additions & 2 deletions console/static/css/eucalyptus.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ ol li {

.euca-notification-container {
position: relative; /* Needed so z-index will be respected */
z-index: 10;
z-index: 11;
}

.euca-main-outercontainer {
Expand Down Expand Up @@ -466,8 +466,24 @@ ol li {
font-size: 1.2em;
}

#euca-notification-desc {
#euca-notification-progress {
display: none;
position: relative;
width: 700px;
left: 130px;
}

#euca-notification-desc .multiop-summary-success {
margin-top: 10px;
}

#euca-notification-desc .multiop-summary-failure {
}

#euca-notification-desc textarea {
width: 600px;
height: 200px;
margin: 10px;
}

#euca-notification-close a {
Expand Down
24 changes: 24 additions & 0 deletions console/static/custom/Messages.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@ keypair_create_error = Failed to create key pair {0}. Please try again.

keypair_delete_success = Deleted keypair {0}. It may take a few minutes for the state to be updated in your table view.
keypair_delete_error = Failed to delete key pair {0}. Please try again.
keypair_delete_progress = Deleting {0} key pair(s).
keypair_delete_done = Started deleting {0} of {1} key pair(s).
keypair_delete_fail = Failed to delete {0} key pair(s). <a href="#">Click here for details. </a>

keypair_import_success = Imported key pair {0}. It may take a few minutes for the state to be updated in your table view.
keypair_import_error = Failed to import key pair {0}. Please try again.
Expand Down Expand Up @@ -124,6 +127,9 @@ sgroup_create_error = Failed to create security group {0}. Please try again.

sgroup_delete_success = Deleted security group {0}. It may take a few minutes for the state to be updated in your table view.
sgroup_delete_error = Failed to delete security group {0}. Please try again.
sgroup_delete_progress = Deleting {0} security group(s).
sgroup_delete_done = Started deleting {0} of {1} security group(s).
sgroup_delete_fail = Failed to delete {0} security group(s). <a href="#">Click here for details. </a>

sgroup_dialog_add_title = Create new security group
sgroup_dialog_del_title = Delete security group
Expand Down Expand Up @@ -200,13 +206,19 @@ volume_dialog_del_text = <p>All data on the volumes will be destroyed.</p> <p>A
volume_dialog_del_btn = Yes, delete
volume_delete_success = Started delete volume operation for volume {0}. It may take a few minutes for the state to be updated in your table view.
volume_delete_error = Failed to start delete operation for volume {0}. Please try again.
volume_delete_progress = Deleting {0} volume(s).
volume_delete_done = Started deleting {0} of {1} volume(s).
volume_delete_fail = Failed to delete {0} volume(s). <a href="#">Click here for details. </a>

#[volume detach and force detach dialogs]
volume_dialog_detach_title = Detach volumes
volume_dialog_detach_text = <p>If you detach a volume, the instance can no longer read or write to it.</p> <p>Are you sure you want to detach the following volumes?</p>
volume_dialog_detach_btn = Yes, detach
volume_detach_success = Started detach volume operation for volume {0}. It may take a few minutes for the state to be updated in your table view.
volume_detach_error = Failed to start volume detach operation for volume {0}. Please try again.
volume_detach_progress = Detaching {0} volume(s).
volume_detach_done = Started detaching {0} of {1} volume(s).
volume_detach_fail = Failed to detach {0} volume(s). <a href="#">Click here for details. </a>

#[volume create dialog]
volume_dialog_create_btn = Create volume
Expand Down Expand Up @@ -288,6 +300,9 @@ snapshot_delete_dialog_title = Delete snapshots
snapshot_dialog_del_btn = Yes, delete
snapshot_delete_success = Started delete operation for snapshot {0}. It may take a few minutes for the state to be updated in your table view.
snapshot_delete_error = Failed to start delete operation for snapshot {0}. Please try again.
snapshot_delete_progress = Deleting {0} snapshot(s).
snapshot_delete_done = Started deleting {0} of {1} snapshot(s).
snapshot_delete_fail = Failed to delete {0} snapshot(s). <a href="#">Click here for details. </a>

#[snapshot register dialog]
snapshot_register_dialog_text = You can register a snapshot as an image if it was created from a volume containing a root file system. The image can then be used to launch EBS-backed instances.
Expand Down Expand Up @@ -327,6 +342,9 @@ eip_allocate_dialog_count_label = How many IP addresses would you like to alloca
eip_allocate_dialog_count_tip = Enter the number of IP addresses to allocate.
eip_allocate_success = Allocated new IP addresses. It may take a few minutes for the state to be updated in your table view.
eip_allocate_error = Unable to allocate all the requested IP addresses. Please verify you are allowed to manage more IP addresses than you currently have and then try again.
eip_allocate_progress = Allocating {0} IP address(es).
eip_allocate_done = Started allocating {0} of {1} IP address(es).
eip_allocate_fail = Failed to allocate {0} IP address(es). <a href="#">Click here for details. </a>
eip_allocate_count_error_msg = Please specify a whole number

#[IP associate dialog]
Expand All @@ -345,13 +363,19 @@ eip_release_dialog_title = Release IP address to cloud
eip_release_dialog_release_btn = Yes, release
eip_release_success = IP addresses released back to the cloud. It may take a few minutes for the state to be updated in your table view.
eip_release_error = Unable to release the specified IP addresses back to the cloud. Please try again.
eip_release_progress = Releasing {0} IP address(es).
eip_release_done = Started releasing {0} of {1} IP address(es).
eip_release_fail = Failed to release {0} IP address(es). <a href="#">Click here for details. </a>

#[IP disassociate dialog]
eip_disassociate_dialog_text = <p>If you disassociate an IP address from an instance, you will no longer be able to connect to that instance using that IP address.</p> <p>Are you sure you want to disassociate the following IP addresses from their instances?</p>
eip_disassociate_dialog_title = Disassociate IP address from instance
eip_disassociate_dialog_disassociate_btn = Yes, disassociate
eip_disassociate_success = {0} disassociated from instance. It may take a few minutes for the state to be updated in your table view.
eip_disassociate_error = Could not disassociate IP {0} from instance. Please try again.
eip_disassociate_progress = Disassociating {0} IP address(es).
eip_disassociate_done = Started disassociating {0} of {1} IP address(es).
eip_disassociate_fail = Failed to disassociate {0} IP address(es). <a href="#">Click here for details. </a>

#[instance]
instance_h_title = Manage instances
Expand Down
5 changes: 4 additions & 1 deletion console/static/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,10 @@
<div id="euca-notification" class="notification-box clearfix">
<div id="euca-notification-close"> </div>
<div id="euca-notification-title"> </div>
<div id="euca-notification-desc"> </div>
<div id="euca-notification-desc-wrapper">
<div id="euca-notification-progress"> </div>
<div id="euca-notification-desc"> </div>
</div>
</div>
</div>
</div>
Expand Down
97 changes: 69 additions & 28 deletions console/static/js/eip.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,10 @@

_releaseListedIps : function (rowsToDelete) {
var thisObj = this;
var done = 0;
var all = rowsToDelete.length;
var error = [];

doMultiAjax(rowsToDelete, function(item, dfd){
var eipId = item;
$.ajax({
Expand All @@ -254,28 +258,43 @@
(function(eipId) {
return function(data, textStatus, jqXHR){
if ( data.results && data.results == true ) {
notifySuccess(null, $.i18n.prop('eip_release_success', eipId));
dfd.resolve();
;
} else {
notifyError($.i18n.prop('eip_release_error', eipId), undefined_error);
dfd.reject();
error.push({id:eipId, reason: undefined_reason});
}
}
})(eipId),
error:
(function(eipId) {
return function(jqXHR, textStatus, errorThrown){
notifyError($.i18n.prop('eip_release_error', eipId), getErrorMessage(jqXHR));
dfd.reject();
error.push({id:eipId, reason: getErrorMessage(jqXHR)});
}
})(eipId)
})(eipId),
complete: (function(eipId) {
return function(jqXHR, textStatus){
done++;
if(done < all)
notifyMulti(100*(done/all), $.i18n.prop('eip_release_progress', all));
else {
var $msg = $('<div>').addClass('multiop-summary').append(
$('<div>').addClass('multiop-summary-success').html($.i18n.prop('eip_release_done', (all-error.length), all)));
if (error.length > 0)
$msg.append($('<div>').addClass('multiop-summary-failure').html($.i18n.prop('eip_release_fail', error.length)));
notifyMulti(100, $msg.html(), error);
}
dfd.resolve();
}
})(eipId),
});
});
}, 100);
thisObj.tableWrapper.eucatable('refreshTable');
},

_disassociateListedIps : function (ipsToDisassociate) {
var thisObj = this;
var done = 0;
var all = ipsToDisassociate.length;
var error = [];
doMultiAjax(ipsToDisassociate, function(item, dfd){
var eipId = item;
$.ajax({
Expand All @@ -290,23 +309,35 @@
(function(eipId) {
return function(data, textStatus, jqXHR){
if ( data.results && data.results == true ) {
notifySuccess(null, $.i18n.prop('eip_disassociate_success', eipId));
dfd.resolve();
;
} else {
notifyError($.i18n.prop('eip_disassociate_error', eipId), undefined_error);
dfd.reject();
error.push({id:eipId, reason: undefined_reason});
}
}
})(eipId),
error:
(function(eipId) {
return function(jqXHR, textStatus, errorThrown){
notifyError($.i18n.prop('eip_disassociate_error', eipId), getErrorMessage(jqXHR));
dfd.reject();
error.push({id:eipId, reason: getErrorMessage(jqXHR)});
}
})(eipId),
complete: (function(eipId) {
return function(jqXHR, textStatus){
done++;
if(done < all)
notifyMulti(100*(done/all), $.i18n.prop('eip_disassociate_progress', all));
else {
var $msg = $('<div>').addClass('multiop-summary').append(
$('<div>').addClass('multiop-summary-success').html($.i18n.prop('eip_disassociate_done', (all-error.length), all)));
if (error.length > 0)
$msg.append($('<div>').addClass('multiop-summary-failure').html($.i18n.prop('eip_disassociate_fail', error.length)));
notifyMulti(100, $msg.html(), error);
}
dfd.resolve();
}
})(eipId)
})(eipId),
});
});
}, 100);
thisObj.tableWrapper.eucatable('refreshTable');
},

Expand All @@ -316,6 +347,9 @@
for ( i=0; i<numberIpsToAllocate; i++)
arrayIps.push(0);

var done = 0;
var all = arrayIps.length;
var error = [];
var allocatedIps = [];
doMultiAjax(arrayIps, function(item, dfd){
$.ajax({
Expand All @@ -326,25 +360,32 @@
cache:false,
timeout:PROXY_TIMEOUT,
async:false,
success:
function(data, textStatus, jqXHR){
success: function(data, textStatus, jqXHR){
if ( data.results ) {
ip = data.results.public_ip;
allocatedIps.push(ip);
notifySuccess(null, $.i18n.prop('eip_allocate_success', ip));
dfd.resolve();
} else {
notifyError($.i18n.prop('eip_allocate_error'), undefined_error);
dfd.reject();
error.push({id:'unknown', reason: undefined_reason});
}
},
error:
function(jqXHR, textStatus, errorThrown){
notifyError($.i18n.prop('eip_allocate_error'), getErrorMessage(jqXHR));
dfd.reject();
},
error: function(jqXHR, textStatus, errorThrown){
error.push({id:'unknown', reason: getErrorMessage(jqXHR)});
},
complete: function(jqXHR, textStatus){
done++;
if(done < all)
notifyMulti(100*(done/all), $.i18n.prop('eip_allocate_progress', all));
else {
var $msg = $('<div>').addClass('multiop-summary').append(
$('<div>').addClass('multiop-summary-success').html($.i18n.prop('eip_allocate_done', (all-error.length), all)));
if (error.length > 0)
$msg.append($('<div>').addClass('multiop-summary-failure').html($.i18n.prop('eip_allocate_fail', error.length)));
notifyMulti(100, $msg.html(), error);
}
dfd.resolve();
}
});
});
}, 100);
thisObj.tableWrapper.eucatable('refreshTable');
$.each(allocatedIps, function(idx, ip){
thisObj.tableWrapper.eucatable('glowRow', ip);
Expand Down
45 changes: 31 additions & 14 deletions console/static/js/instance.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,6 @@
success: function(data, textStatus, jqXHR){
if ( data.results && data.results == true ) {
notifySuccess(null, $.i18n.prop('instance_reboot_success', instances));
thisObj.tableWrapper.eucatable('refreshTable');
} else {
notifyError($.i18n.prop('instance_reboot_error', instances), undefined_error);
}
Expand Down Expand Up @@ -747,10 +746,16 @@

_detachVolume : function (force) {
var thisObj = this;

var selectedVolumes = thisObj.detachDialog.find("input:checked");
var checkedVolumes = thisObj.detachDialog.find("input:checked");
var selectedVolumes = [];
$.each(checkedVolumes, function(idx, vol){
selectedVolumes.push($(vol).val());
});
var done = 0;
var all = selectedVolumes.length;
var error = [];
doMultiAjax(selectedVolumes, function(item, dfd){
var volumeId = $(item).val();
var volumeId = item;
$.ajax({
type:"POST",
url:"/ec2?Action=DetachVolume",
Expand All @@ -760,20 +765,32 @@
success: (function(volumeId) {
return function(data, textStatus, jqXHR){
if ( data.results && data.results == 'detaching' ) {
notifySuccess(null, volume_detach_success(volumeId));
dfd.resolve();
} else {
notifyError($.i18n.prop('volume_detach_error', volumeId), undefined_error);
dfd.reject();
}
}
;
}else{
error.push({id:volumeId, reason: undefined_reason});
}
}
})(volumeId),
error: (function(volumeId) {
return function(jqXHR, textStatus, errorThrown){
notifyError($.i18n.prop('volume_detach_error', volumeId), getErrorMessage(jqXHR));
dfd.reject();
error.push({id:volumeId, reason: getErrorMessage(jqXHR)});
}
})(volumeId)
})(volumeId),
complete: (function(volumeId) {
return function(jqXHR, textStatus){
done++;
if(done < all)
notifyMulti(100*(done/all), $.i18n.prop('volume_detach_progress', all));
else {
var $msg = $('<div>').addClass('multiop-summary').append(
$('<div>').addClass('multiop-summary-success').html($.i18n.prop('volume_detach_done', (all-error.length), all)));
if (error.length > 0)
$msg.append($('<div>').addClass('multiop-summary-failure').html($.i18n.prop('volume_detach_fail', error.length)));
notifyMulti(100, $msg.html(), error);
}
dfd.resolve();
}
})(volumeId),
});
});
thisObj.tableWrapper.eucatable('refreshTable');
Expand Down
Loading

0 comments on commit c6f61c6

Please sign in to comment.