X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetstack%2Fcore%2Fxoslib%2Fstatic%2Fjs%2FxosTenant.js;h=4225caccbc54bf9e311c96361ba755d8d26d8348;hb=8ce133b9805597522ff5957d6a879f9b078787eb;hp=0ab8e819378a4d045a08b817979b9f7b03ae3cb2;hpb=f6f70ea6c7bb44df898b085ba27120a8d72ae6f2;p=plstackapi.git diff --git a/planetstack/core/xoslib/static/js/xosTenant.js b/planetstack/core/xoslib/static/js/xosTenant.js index 0ab8e81..4225cac 100644 --- a/planetstack/core/xoslib/static/js/xosTenant.js +++ b/planetstack/core/xoslib/static/js/xosTenant.js @@ -5,7 +5,7 @@ XOSTenantSite = XOSModel.extend( { }); XOSTenantSiteCollection = XOSCollection.extend( { - listFields: ["name", "allocated"], + listFields: ["name", "allocated", "ready"], modelName: "tenantSite", collectionName: "tenantSites", @@ -14,17 +14,33 @@ XOSTenantSiteCollection = XOSCollection.extend( { var id = 0; for (siteName in slice.attributes.site_allocation) { allocated = slice.attributes.site_allocation[siteName]; - tenantSites.push(new XOSTenantSite( { name: siteName, allocated: allocated, id: id} )); + ready = slice.attributes.site_ready[siteName] || 0; + tenantSites.push(new XOSTenantSite( { name: siteName, allocated: allocated, ready: ready, id: id} )); id = id + 1; } for (index in xos.tenantview.models[0].attributes.blessed_site_names) { siteName = xos.tenantview.models[0].attributes.blessed_site_names[index]; if (! (siteName in slice.attributes.site_allocation)) { - tenantSites.push(new XOSTenantSite( { name: siteName, allocated: 0, id: id} )); + tenantSites.push(new XOSTenantSite( { name: siteName, allocated: 0, ready: 0, id: id} )); id = id + 1; } } this.set(tenantSites); + + var that=this; + this.listenTo(slice, 'change', function() { that.getReadyFromSlice(slice); }) + }, + + getReadyFromSlice: function(slice) { + for (siteName in slice.attributes.site_ready) { + ready = slice.attributes.site_ready[siteName]; + for (index in this.models) { + tenantSite = this.models[index]; + if (tenantSite.attributes.name == siteName) { + tenantSite.set("ready", ready); + } + } + } }, putToSlice: function(slice) { @@ -50,6 +66,20 @@ XOSEditUsersView = Marionette.ItemView.extend({ }); +XOSTenantSummaryView = XOSDetailView.extend({ + events: {"change": "onChange"}, + + onChange: function(e) { + XOSTenantApp.setDirty(true); + }, + + saveSuccess: function() { + console.log("saveSuccess!"); + XOSTenantApp.setDirty(false); + }, + + }); + XOSTenantButtonView = Marionette.ItemView.extend({ template: "#xos-tenant-buttons-template", @@ -58,6 +88,7 @@ XOSTenantButtonView = Marionette.ItemView.extend({ "click button.btn-tenant-delete": "deleteClicked", "click button.btn-tenant-add-user": "addUserClicked", "click button.btn-tenant-save": "saveClicked", + "click button.btn-tenant-download-ssh": "downloadClicked", }, createClicked: function(e) { @@ -72,11 +103,19 @@ XOSTenantButtonView = Marionette.ItemView.extend({ XOSTenantApp.editUsers(this.options.linkedView.model); }, + downloadClicked: function(e) { + XOSTenantApp.downloadSSH(this.options.linkedView.model); + }, + saveClicked: function(e) { model = this.options.linkedView.model; model.tenantSiteCollection.putToSlice(model); model.attributes.users = model.usersBuffer; - this.options.linkedView.submitContinueClicked.call(this.options.linkedView, e); + + e.preventDefault(); + this.options.linkedView.save(); + //this.options.linkedView.submitContinueClicked.call(this.options.linkedView, e); + //XOSTenantApp.setDirty(false); }, }); @@ -84,6 +123,7 @@ XOSTenantApp = new XOSApplication({ logTableId: "#logTable", statusMsgId: "#statusMsg", hideTabsByDefault: true, + dirty: false, varName: "XOSTenantApp", }); @@ -94,15 +134,28 @@ XOSTenantApp.addRegions({ tenantButtons: "#tenantButtons", tenantAddSliceInterior: "#tenant-addslice-interior", tenantEditUsersInterior: "#tenant-edit-users-interior", + tenantSSHCommandsInterior: "#tenant-ssh-commands-interior", }); +XOSTenantApp.setDirty = function(dirty) { + XOSTenantApp.dirty = dirty; + if (dirty) { + $("button.btn-tenant-save").addClass("btn-success"); + } else { + $("button.btn-tenant-save").removeClass("btn-success"); + } +}; + XOSTenantApp.buildViews = function() { XOSTenantApp.tenantSites = new XOSTenantSiteCollection(); - tenantSummaryClass = XOSDetailView.extend({template: "#xos-detail-template", + tenantSummaryClass = XOSTenantSummaryView.extend({template: "#xos-detail-template", app: XOSTenantApp, - detailFields: ["serviceClass", "default_image", "default_flavor", "network_ports", "mount_data_sets"], + detailFields: ["serviceClass", "default_image", "default_flavor", "network_ports"], fieldDisplayNames: {serviceClass: "Service Level", "default_flavor": "Flavor", "default_image": "Image", "mount_data_sets": "Data Sets"}, + helpText: {"serviceClass": "Existing slivers will be re-instantiated if changed", + "default_image": "Existing slivers will be re-instantiated if changed", + "default_flavor": "Existing slivers will be re-instantiated if changed"}, onShow: function() { // the slice selector is in a different table, so make every label cell the maximal width @@ -141,6 +194,9 @@ XOSTenantApp.buildViews = function() { sliceChanged: function(id) { XOSTenantApp.navToSlice(id); }, + filter: function(slice) { + return slice.attributes.current_user_can_see; + }, }); xos.sites.fetch(); @@ -172,6 +228,7 @@ XOSTenantApp.navToSlice = function(id) { XOSTenantApp.adjustCollectionField = function(collectionName, id, fieldName, amount) { model = XOSTenantApp[collectionName].get(id); model.set(fieldName, Math.max(model.get(fieldName) + amount, 0)); + XOSTenantApp.setDirty(true); }; XOSTenantApp.addSlice = function() { @@ -226,6 +283,9 @@ XOSTenantApp.editUsers = function(model) { var editDialog = this; user_ids = all_options($("#tenant-edit-users-dialog").find(".select-picker-to")); user_ids = user_ids.map( function(x) { return parseInt(x,10); } ); + if (!array_same_elements(user_ids, model.usersBuffer)) { + XOSTenantApp.setDirty(true); + } model.usersBuffer = user_ids; $(editDialog).dialog("close"); }, @@ -237,12 +297,57 @@ XOSTenantApp.editUsers = function(model) { $("#tenant-edit-users-dialog").dialog("open"); }; +XOSTenantApp.downloadSSH = function(model) { + var sshCommands = ""; + for (index in model.attributes.sliceInfo.sshCommands) { + sshCommand = model.attributes.sliceInfo.sshCommands[index]; + sshCommands = sshCommands + sshCommand + "\n"; + } + + if (sshCommands.length == 0) { + alert("this slice has no instantiated slivers yet"); + return; + } + + var htmlView = new HTMLView({html: '
' + sshCommands + '
'}); + XOSTenantApp.tenantSSHCommandsInterior.show(htmlView); + + $("#tenant-ssh-commands-dialog").dialog({ + autoOpen: false, + modal: true, + width: 640, + buttons : { + "Download": function() { + var dlLink = document.createElement('a'); + dlLink.setAttribute('href', 'data:text/plain;charset=utf-8,' + encodeURIComponent(sshCommands)); + dlLink.setAttribute('download', 'sshcommands.txt'); + dlLink.click(); + + //window.open('data:text/text,' + encodeURIComponent(sshCommands)); + }, + "Close" : function() { + $(this).dialog("close"); + }, + } + }); + $("#tenant-ssh-commands-dialog").dialog("open"); +}; + XOSTenantApp.deleteSlice = function(model) { var app=this; app.deleteDialog(model, function() { console.log("afterDelete"); app.viewSlice(undefined); }); }; XOSTenantApp.viewSlice = function(model) { + if (XOSTenantApp.dirty) { + if (!confirm("The current sliver has unsaved data -- view new sliver anyway ?")) { + $("#tenantSliceSelector select").val(XOSTenantApp.currentSlice.id); + return; + } + } + + XOSTenantApp.setDirty(false); + if (!model && xos.slicesPlus.models.length > 0) { model = xos.slicesPlus.models[0]; } @@ -276,6 +381,8 @@ XOSTenantApp.viewSlice = function(model) { XOSTenantApp.tenantButtons.show( new XOSTenantButtonView( { app: XOSTenantApp, linkedView: tenantSummary } ) ); + + XOSTenantApp.currentSlice = model; } else { XOSTenantApp.tenantSliceSelector.show(new HTMLView({html: ""})); XOSTenantApp.tenantSummary.show(new HTMLView({html: "You have no slices"}));