fix flow issue for application deployment
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/b75179e5 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/b75179e5 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/b75179e5 Branch: refs/heads/master Commit: b75179e50872388061a83f2fe473191403d514dc Parents: bcc4b2d Author: Dakshika Jayathilaka <[email protected]> Authored: Sun Mar 8 10:32:07 2015 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Sun Mar 8 12:02:55 2015 +0530 ---------------------------------------------------------------------- .../console/applications_form.jag | 5 +++-- .../applications/application_requests.jag | 2 +- .../console/controllers/rest/rest_calls.jag | 4 ++-- .../themes/theme0/js/custom/applications-deploy.js | 4 ++-- .../themes/theme0/partials/applications_deploy.hbs | 17 ++++++++++++----- .../themes/theme0/renderers/applications_form.js | 1 + 6 files changed, 21 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/b75179e5/components/org.apache.stratos.manager.console/console/applications_form.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/applications_form.jag b/components/org.apache.stratos.manager.console/console/applications_form.jag index d56742e..409ab8f 100644 --- a/components/org.apache.stratos.manager.console/console/applications_form.jag +++ b/components/org.apache.stratos.manager.console/console/applications_form.jag @@ -33,7 +33,7 @@ var log = new Log("apachestratos.applications_form"), elements = uriMatcher.match('/{context}/applications/{formtype}/'), breadcrumbPathLevelOne = 'applications', formDataEdit = topologyData = editorGroups = editorCartridges = editorAutoscalePolicies = applicationHbs ='', - editorDeploymentPolicies = '', + editorDeploymentPolicies = applicationPolicyData ='', isEdit = isForm = false, userPermissions = session.get('PERMISSIONS'); @@ -56,6 +56,7 @@ if (!elements) { applicationHbs = 'applicationView'; }else if(elements.action == 'deploy'){ applicationHbs = 'applicationDeploy'; + applicationPolicyData = util.RESTCalls.getApplicationPolicies(); } }else{ @@ -72,7 +73,6 @@ if (!elements) { isForm = true; if (elements.formtype == 'applications' && elements.action != 'new') { - applicationHbs = 'applicationTopology'; topologyData = util.RESTCalls.getApplicationTopology(elements.action); }else if(elements.formtype == 'applications' && elements.action == 'new'){ @@ -155,6 +155,7 @@ var caramelData = { editorAutoscalePolicies: JSON.stringify(editorAutoscalePolicies), editorDeploymentPolicies:JSON.stringify(editorDeploymentPolicies), applicationHbs: applicationHbs, + applicationPolicyData:applicationPolicyData, applicationAlias:applicationAlias, applicationName:applicationName, applicationJSON:JSON.stringify(applicationJSON), http://git-wip-us.apache.org/repos/asf/stratos/blob/b75179e5/components/org.apache.stratos.manager.console/console/controllers/applications/application_requests.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/controllers/applications/application_requests.jag b/components/org.apache.stratos.manager.console/console/controllers/applications/application_requests.jag index b0aa166..f26e214 100644 --- a/components/org.apache.stratos.manager.console/console/controllers/applications/application_requests.jag +++ b/components/org.apache.stratos.manager.console/console/controllers/applications/application_requests.jag @@ -44,7 +44,7 @@ try { formSubmit = util.RESTCalls.deployApplicationDefinition(formPayload); break; case "deployments": - formSubmit = util.RESTCalls.deployDeploymentPolicyDefinition(applicationId, formPayload); + formSubmit = util.RESTCalls.deployApplicationDeployment(applicationId, formPayload); break; case "deleteapplication": formSubmit = util.RESTCalls.deleteApplication(formPayload); http://git-wip-us.apache.org/repos/asf/stratos/blob/b75179e5/components/org.apache.stratos.manager.console/console/controllers/rest/rest_calls.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/controllers/rest/rest_calls.jag b/components/org.apache.stratos.manager.console/console/controllers/rest/rest_calls.jag index f14e49e..84e96bc 100644 --- a/components/org.apache.stratos.manager.console/console/controllers/rest/rest_calls.jag +++ b/components/org.apache.stratos.manager.console/console/controllers/rest/rest_calls.jag @@ -60,8 +60,8 @@ RESTCalls = new function(){ return this.send("POST","/tenant/availability/" + tenantDomain,{}); }; - this.deployApplicationDeployment = function(applicationID, policyDefinition){ - return this.send("POST","/applications/"+applicationID+"/deploy",policyDefinition); + this.deployApplicationDeployment = function(applicationID, applicationPolicyId){ + return this.send("POST","/applications/"+applicationID+"/deploy/"+applicationPolicyId,{}); }; this.deployDeploymentPolicyDefinition = function(policyDefinition){ http://git-wip-us.apache.org/repos/asf/stratos/blob/b75179e5/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications-deploy.js ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications-deploy.js b/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications-deploy.js index 2cfc093..770baf8 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications-deploy.js +++ b/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications-deploy.js @@ -380,12 +380,12 @@ $(document).ready(function(){ //trigger deploy button $('#deploy').click(function(){ - var deployjson = $('textarea#deployjsonedit').val(); + var deployjson = $('#app-policy-id').val(); var formtype = 'deployments'; var applicationId = applicationJSON.applicationId; var btn = $(this); console.log('hit kme') - btn.html("<i class='fa fa-spinner fa-spin'></i> Adding "+formtype); + btn.html("<i class='fa fa-spinner fa-spin'></i> Adding Application Policy "); $.ajax({ type: "POST", url: caramel.context + "/controllers/applications/application_requests.jag", http://git-wip-us.apache.org/repos/asf/stratos/blob/b75179e5/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_deploy.hbs ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_deploy.hbs b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_deploy.hbs index c07cd6f..4f6e45c 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_deploy.hbs +++ b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_deploy.hbs @@ -14,7 +14,7 @@ </div> <div class='col-md-7'> - <button class='btn btn-info btn-lg pull-right' type='button' id='deploy' data-form='{{formContext}}'> Deploy {{formTitle}}</button> + <button class='btn btn-info btn-lg pull-right' type='button' id='deploy' data-form='{{formContext}}'> Deploy Application Policy</button> <button class='btn btn-default btn-lg pull-right button-gap' type='button' onclick='window.location.replace("../")'> Cancel</button> </div> @@ -27,6 +27,7 @@ </div> </div> <div class="app-details"> + <br/> <div role="tabpanel app-details-tab" > <!-- Nav tabs --> @@ -39,10 +40,16 @@ <!-- Tab panes --> <div class="tab-content app-details-tab-content"> <div role="tabpanel" class="tab-pane active" id="general"> - <div id='deploy-ui'></div> - <textarea id="deployjsonedit" class="form-control" - autocomplete="off" style="height: 576px;"></textarea> - + <div class="form-group"> + <label for="inputEmail3" class="col-sm-2 control-label">Select Policy: </label> + <div class="col-sm-10"> + <select class="form-control " id="app-policy-id"> + {{#each applicationPolicyData}} + <option value="{{id}}">{{id}}</option> + {{/each}} + </select> + </div> + </div> </div> </div> http://git-wip-us.apache.org/repos/asf/stratos/blob/b75179e5/components/org.apache.stratos.manager.console/console/themes/theme0/renderers/applications_form.js ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/renderers/applications_form.js b/components/org.apache.stratos.manager.console/console/themes/theme0/renderers/applications_form.js index 324e5c2..4c8559c 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme0/renderers/applications_form.js +++ b/components/org.apache.stratos.manager.console/console/themes/theme0/renderers/applications_form.js @@ -205,6 +205,7 @@ var render = function (theme, data, meta, require) { editorCartridges: data.editorCartridges, editorGroups:data.editorGroups, form_action: data.form_action, + applicationPolicyData:data.applicationPolicyData, formHtml: data.formHtml, formData: data.formData, formDataRaw: data.formDataRaw,
