application deployemnt initiated
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/ae4419dc Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/ae4419dc Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/ae4419dc Branch: refs/heads/master Commit: ae4419dc41dfaca06693c1e8ddc9d520bac29fa2 Parents: c381851 Author: Dakshika Jayathilaka <[email protected]> Authored: Thu Dec 18 16:50:34 2014 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Thu Dec 18 17:43:21 2014 +0530 ---------------------------------------------------------------------- .../console/applications_form.jag | 40 ++++++++---- .../applications/application_requests.jag | 5 +- .../console/controllers/rest/rest_calls.jag | 4 ++ .../theme0/partials/applications_form.hbs | 8 +-- .../theme0/renderers/applications_form.js | 67 ++++++++++++++++++++ 5 files changed, 107 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/ae4419dc/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 e34cc2d..bdac23e 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,8 @@ var log = new Log("apachestratos.applications_form"), elements = uriMatcher.match('/{context}/applications/{formtype}/'), breadcrumbPathLevelOne = 'applications', formDataEdit = topology_data = editorGroups = editorCartridges = '', - isEdit = applicationView = applicationEditor= isForm = false, + isEdit = applicationView = applicationEditor = isForm = false, + applicationDeploy = false, userPermissions = session.get('PERMISSIONS'); //create left menu @@ -42,18 +43,32 @@ var leftMenu = menuGenerator(context, menuJson.menu, userPermissions); if (!elements) { elements = uriMatcher.match('/{context}/applications/{formtype}/{action}/'); - isForm = true; - if (elements.formtype == 'applications' && elements.action != 'new') { - applicationView = true; - topology_data = util.RESTCalls.getApplicationTopology(elements.action); - }else if(elements.formtype == 'applications' && elements.action == 'new'){ - applicationEditor = true; - editorGroups = util.RESTCalls.getGroups(); - editorCartridges = util.RESTCalls.getCartridges(); - }else if(elements.action != 'new'){ - isEdit = true; + if(!elements){ + elements = uriMatcher.match('/{context}/applications/{formtype}/{applicationId}/{action}'); + if(elements.action == 'view'){ + + }else if(elements.action == 'deploy'){ + var applicationName = elements.applicationId; + applicationDeploy = true; + //get application json + var applicationJSON = util.RESTCalls.getApplicationJSON(applicationName); + } + + }else{ + isForm = true; + if (elements.formtype == 'applications' && elements.action != 'new') { + applicationView = true; + topology_data = util.RESTCalls.getApplicationTopology(elements.action); + }else if(elements.formtype == 'applications' && elements.action == 'new'){ + applicationEditor = true; + editorGroups = util.RESTCalls.getGroups(); + editorCartridges = util.RESTCalls.getCartridges(); + }else if(elements.action != 'new'){ + isEdit = true; + } } + } try { @@ -118,6 +133,9 @@ var caramelData = { editorCartridges: JSON.stringify(editorCartridges), applicationView: applicationView, applicationEditor: applicationEditor, + applicationDeploy:applicationDeploy, + applicationName:applicationName, + applicationJSON:JSON.stringify(applicationJSON), formTitle: formTitle, formDataRaw: JSON.stringify(formDataRaw), formtype:elements.formtype, http://git-wip-us.apache.org/repos/asf/stratos/blob/ae4419dc/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 e85e34d..0f555cd 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 @@ -23,8 +23,9 @@ var log = new Log("apachestratos.configure_request"), util = require('/controllers/rest/rest_calls.jag'), formPayload = request.getParameter('formPayload'), formtype = request.getParameter('formtype'), + applicationId = request.getParameter('appId'), formSubmit; - +log.info(formPayload) //add login validator for pages include('/controllers/login/validator.jag'); @@ -37,7 +38,7 @@ try { formSubmit = util.RESTCalls.deployApplicationDefinition(formPayload); break; case "deployments": - formSubmit = util.RESTCalls.deployDeploymentPolicyDefinition(formPayload); + formSubmit = util.RESTCalls.deployDeploymentPolicyDefinition(applicationId, formPayload); break; case "deleteapplication": formSubmit = util.RESTCalls.deleteApplication(formPayload); http://git-wip-us.apache.org/repos/asf/stratos/blob/ae4419dc/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 0e2a019..ba235c1 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 @@ -142,6 +142,10 @@ RESTCalls = new function(){ return this.sendReceive("GET","/applications/" + appId + '/runtime',{}); }; + this.getApplicationJSON = function(appId){ + return this.sendReceive("GET","/applications/"+appId ,{}); + }; + this.getClusterInfo = function(clusterId){ return this.sendReceive("GET","/cluster/clusterId/" + clusterId,{}); }; http://git-wip-us.apache.org/repos/asf/stratos/blob/ae4419dc/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_form.hbs ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_form.hbs b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_form.hbs index ad6e2a2..43465c2 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_form.hbs +++ b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_form.hbs @@ -120,11 +120,11 @@ id="{{applicationId}}"> Delete</button> <button class="btn btn-info btn-lg hover-details" type="button" id="details_list_{{applicationId}}" - data-url="{{url ""}}/applications/applications/{{applicationId}}/" > View + data-url="{{url ""}}/applications/applications/{{applicationId}}/view" > View </button> <button class="btn btn-warning btn-lg hover-details" type="button" id="details_{{applicationId}}" - data-url="{{url ""}}/applications/applications/{{applicationId}}/" > Deploy + data-url="{{url ""}}/applications/applications/{{applicationId}}/deploy" > Deploy </button> </div> <div class="bottom-bar-wrapper"> @@ -133,11 +133,11 @@ id="{{applicationId}}"> Delete</button> <button class="btn btn-info btn-lg hover-details" type="button" id="details_{{applicationId}}" - data-url="{{url ""}}/applications/applications/{{applicationId}}/" > View + data-url="{{url ""}}/applications/applications/{{applicationId}}/view" > View </button> <button class="btn btn-warning btn-lg hover-details" type="button" id="details_{{applicationId}}" - data-url="{{url ""}}/applications/applications/{{applicationId}}/" > Deploy + data-url="{{url ""}}/applications/applications/{{applicationId}}/deploy" > Deploy </button> </div> http://git-wip-us.apache.org/repos/asf/stratos/blob/ae4419dc/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 d02a2e5..b0e4e55 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 @@ -87,6 +87,72 @@ var render = function (theme, data, meta, require) { ] }); + }else if(data.applicationDeploy == true){ + theme('index', { + page_meta: [ + { + partial: 'index_title', + context: { + page_title: 'Apache Stratos - Application Managment', + page_description: 'Apache Stratos - Application Managment' + } + } + ], + header: [ + { + partial: 'index_header', + context: { + } + } + ], + sub_header: [ + { + partial: 'index_sub_header', + context: { + breadcrumbPathLevelOne: data.breadcrumbPathLevelOne, + breadcrumbPathLevelTwo: data.breadcrumbPathLevelTwo + } + } + ], + left_menu: [ + { + partial: 'index_left_menu', + context: { + left_menu: data.left_menu + } + } + ], + right_menu_help: [ + { + partial: 'index_right_menu_help', + context: { + + } + } + ], + content: [ + { + partial: 'applications_deploy', + context: { + formContext: data.breadcrumbPathLevelTwo, + applicationName: data.applicationName, + applicationJSON: data.applicationJSON, + editorCartridges: data.editorCartridges, + editorGroups:data.editorGroups, + form_action: data.form_action, + formHtml: data.formHtml, + formData: data.formData, + formDataRaw: data.formDataRaw, + formDataEdit: data.formDataEdit, + isForm: data.isForm, + isEdit: data.isEdit, + formTitle: data.formTitle + + } + } + + ] + }); }else if(data.applicationEditor == true){ theme('index', { page_meta: [ @@ -152,6 +218,7 @@ var render = function (theme, data, meta, require) { ] }); + }else{ theme('index', { page_meta: [
