You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ch...@apache.org on 2014/04/09 14:04:41 UTC
git commit: Fixing issue STRATOS-550 and adding logic to handle auto
commit checkbox
Repository: incubator-stratos
Updated Branches:
refs/heads/master e046af8af -> d672a89ae
Fixing issue STRATOS-550 and adding logic to handle auto commit checkbox
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/d672a89a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/d672a89a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/d672a89a
Branch: refs/heads/master
Commit: d672a89ae57efba425de39765d25ee29c6bcf1d2
Parents: e046af8
Author: Chanaka Jayasena <ch...@gmail.com>
Authored: Wed Apr 9 17:34:22 2014 +0530
Committer: Chanaka Jayasena <ch...@gmail.com>
Committed: Wed Apr 9 17:34:22 2014 +0530
----------------------------------------------------------------------
.../console/controllers/wizardSubmit.jag | 94 +++++++++++---------
.../console/themes/theme1/pages/index.hbs | 2 -
.../partials/configure_stratos_wizard.hbs | 76 ++++++++--------
.../theme1/partials/subscribe_cartridge.hbs | 26 ++++--
.../console/themes/theme1/ui/js/wizard.js | 37 ++++++--
.../console/util/utility.jag | 3 +
6 files changed, 146 insertions(+), 92 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d672a89a/components/org.apache.stratos.manager.console/console/controllers/wizardSubmit.jag
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/wizardSubmit.jag b/components/org.apache.stratos.manager.console/console/controllers/wizardSubmit.jag
index 88f37c3..a8b6451 100644
--- a/components/org.apache.stratos.manager.console/console/controllers/wizardSubmit.jag
+++ b/components/org.apache.stratos.manager.console/console/controllers/wizardSubmit.jag
@@ -20,59 +20,67 @@
*
*/
(function(){
- var log = new Log("controller.partitionDefinitionSubmit");
+ var log = new Log("controller.wizardSubmit");
var utils = require('/util/utility.jag');
- var thisStep = request.getParameter("thisStep");
- var nextStep = request.getParameter("nextStep");
- var skip = request.getParameter("skip");
- if(parseInt(thisStep)<parseInt(nextStep) && skip != "true"){
- var policy = request.getParameter("policy")
+ var action = request.getParameter("action");
+ if(action !=null && action == "undeploy"){
+ var type = request.getParameter("type");
+ undeployMsg = utils.consoleAppUtil.undeployCartridge(type);
+ print(undeployMsg);
+ }else{
+ var thisStep = request.getParameter("thisStep");
+ var nextStep = request.getParameter("nextStep");
+ var skip = request.getParameter("skip");
+ if(parseInt(thisStep)<parseInt(nextStep) && skip != "true"){
+ var policy = request.getParameter("policy")
- if(parseInt(thisStep) == 1 && policy != "" ){
- utils.consoleAppUtil.deployPartitionDefinition(policy);
- session.put("deploy_artifacts", "Partition Deployment");
+ if(parseInt(thisStep) == 1 && policy != "" ){
+ utils.consoleAppUtil.deployPartitionDefinition(policy);
+ session.put("deploy_artifacts", "Partition Deployment");
- }
- if(parseInt(thisStep) == 2 && policy != "" ){
- utils.consoleAppUtil.deployAutoscalePolicyDefinition(policy);
- session.put("deploy_artifacts", "Autoscale Policy Deployment");
+ }
+ if(parseInt(thisStep) == 2 && policy != "" ){
+ utils.consoleAppUtil.deployAutoscalePolicyDefinition(policy);
+ session.put("deploy_artifacts", "Autoscale Policy Deployment");
- }
- if(parseInt(thisStep) == 3 && policy != "" ){
- var foo = utils.consoleAppUtil.deployDeploymentPolicyDefinition(policy);
- session.put("deploy_artifacts", "Deployment Policy Deployment");
+ }
+ if(parseInt(thisStep) == 3 && policy != "" ){
+ var foo = utils.consoleAppUtil.deployDeploymentPolicyDefinition(policy);
+ session.put("deploy_artifacts", "Deployment Policy Deployment");
- }
- if(parseInt(thisStep) == 4 && policy != "" ){
- utils.consoleAppUtil.deployLbDefinition(policy);
- session.put("deploy_artifacts", "Lb Deployment");
+ }
+ if(parseInt(thisStep) == 4 && policy != "" ){
+ utils.consoleAppUtil.deployLbDefinition(policy);
+ session.put("deploy_artifacts", "Lb Deployment");
- }
- if(parseInt(thisStep) == 5 && policy != "" ){
- utils.consoleAppUtil.deployCartridgeDefinition(policy);
- session.put("deploy_artifacts", "Cartridge Deployment");
+ }
+ if(parseInt(thisStep) == 5 && policy != "" ){
+ utils.consoleAppUtil.deployCartridgeDefinition(policy);
+ session.put("deploy_artifacts", "Cartridge Deployment");
- }
- if(parseInt(thisStep) == 6 && policy != "" ){
- utils.consoleAppUtil.deployServiceDefinition(policy);
- session.put("deploy_artifacts", "Service Deployment");
+ }
+ if(parseInt(thisStep) == 6 && policy != "" ){
+ utils.consoleAppUtil.deployServiceDefinition(policy);
+ session.put("deploy_artifacts", "Service Deployment");
+ }
}
- }
- var configuring = session.get("configuring");
- var get_status = session.get("get-status");
- var deploy_status = session.get("deploy-status");
- var url = "";
+ var configuring = session.get("configuring");
+ var get_status = session.get("get-status");
+ var deploy_status = session.get("deploy-status");
+ var url = "";
- if(deploy_status != null && deploy_status != "succeeded") {
- url = request.getContextPath() + '/configure_stratos_wizard.jag?step=' + thisStep;
- } else {
- url = request.getContextPath() + '/configure_stratos_wizard.jag?step=' + nextStep;
- }
- if(configuring == "true"){
- url = request.getContextPath() + '/configure_stratos.jag?step=' + thisStep;
+ if(deploy_status != null && deploy_status != "succeeded") {
+ url = request.getContextPath() + '/configure_stratos_wizard.jag?step=' + thisStep;
+ } else {
+ url = request.getContextPath() + '/configure_stratos_wizard.jag?step=' + nextStep;
+ }
+ if(configuring == "true"){
+ url = request.getContextPath() + '/configure_stratos.jag?step=' + thisStep;
+ }
+ response.sendRedirect(url);
}
- response.sendRedirect(url);
+
}());
-%>
+%>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d672a89a/components/org.apache.stratos.manager.console/console/themes/theme1/pages/index.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/pages/index.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/pages/index.hbs
index 8686fce..da90a15 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme1/pages/index.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme1/pages/index.hbs
@@ -52,8 +52,6 @@
<script src="{{url "/themes/theme1/ui/js/vendor/jquery-1.10.1.min.js"}}"></script>
<script src="{{url "/themes/theme1/ui/js/vendor/jquery-ui-1.10.3.custom.min.js"}}"></script>
- <script src="{{url "/js/main.js"}}"></script>
- <script src="{{url "/js/dialog.js"}}"></script>
</head>
<body>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d672a89a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/configure_stratos_wizard.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/configure_stratos_wizard.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/configure_stratos_wizard.hbs
index 7df50ae..229eb59 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/configure_stratos_wizard.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/configure_stratos_wizard.hbs
@@ -200,45 +200,49 @@
- {{#ifCond step "==" 4}}
- {{#each step_data}}
- <div class="panel panel-default">
- <div class="panel-heading">
- <h4 class="panel-title">
- <a data-toggle="collapse" data-parent="#accordion" href="#collapse{{cartridgeType}}">
- {{displayName}}
- </a>
- </h4>
- </div>
- <div id="collapse{{cartridgeType}}" class="panel-collapse collapse">
- <div class="panel-body">
- <pre>{{json_string}}</pre>
- </div>
- </div>
- </div>
- {{/each}}
- {{/ifCond}}
+ {{#ifCond step "==" 4}}
+ {{#each step_data}}
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h4 class="panel-title">
+ <a data-toggle="collapse" data-parent="#accordion" href="#collapse{{cartridgeType}}">
+ {{displayName}}
+ </a>
+ </h4>
+ </div>
+ <div id="collapse{{cartridgeType}}" class="panel-collapse collapse">
+ <div class="panel-body">
+ <div class="alert alert-danger alert-dismissable" style="display: none"></div>
+ <button class="btb btn-danger pull-right js_undeploy" type="button" data-type="{{cartridgeType}}">Undeploy</button>
+ <pre>{{json_string}}</pre>
+ </div>
+ </div>
+ </div>
+ {{/each}}
+ {{/ifCond}}
- {{#ifCond step "==" 5}}
- {{#each step_data}}
- <div class="panel panel-default">
- <div class="panel-heading">
- <h4 class="panel-title">
- <a data-toggle="collapse" data-parent="#accordion" href="#collapse{{cartridgeType}}">
- {{displayName}}
- </a>
- </h4>
- </div>
- <div id="collapse{{cartridgeType}}" class="panel-collapse collapse">
- <div class="panel-body">
- <pre>{{json_string}}</pre>
- </div>
- </div>
- </div>
- {{/each}}
- {{/ifCond}}
+ {{#ifCond step "==" 5}}
+ {{#each step_data}}
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h4 class="panel-title">
+ <a data-toggle="collapse" data-parent="#accordion" href="#collapse{{cartridgeType}}">
+ {{displayName}}
+ </a>
+ </h4>
+ </div>
+ <div id="collapse{{cartridgeType}}" class="panel-collapse collapse">
+ <div class="panel-body">
+ <div class="alert alert-danger alert-dismissable" style="display: none"></div>
+ <button class="btb btn-danger pull-right js_undeploy" type="button" data-type="{{cartridgeType}}">Undeploy</button>
+ <pre>{{json_string}}</pre>
+ </div>
+ </div>
+ </div>
+ {{/each}}
+ {{/ifCond}}
{{#ifCond step "==" 6 }}
{{#each step_data}}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d672a89a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/subscribe_cartridge.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/subscribe_cartridge.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/subscribe_cartridge.hbs
index dc8fba7..9841270 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/subscribe_cartridge.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/subscribe_cartridge.hbs
@@ -64,7 +64,7 @@
</div>
<div class="checkbox">
<label>
- <input name="commitsEnabled" type="checkbox" /> Auto Commit
+ <input id="commitsEnabled" name="commitsEnabled" type="checkbox" /> Auto Commit
</label>
</div>
<div class="checkbox">
@@ -180,6 +180,7 @@
</div>
</div>
<script>
+
$(function(){
$('.js-help')
.focus(
@@ -200,13 +201,28 @@
});
var $public_check = $('#public_check');
- if(!$public_check.is(':checked')){
- $('#public_check').prop("checked",true);
- }
+ var $commitsEnabled = $('#commitsEnabled');
+
+ var toggleCredentials = function(){
+ if($public_check.is(':checked') && !$commitsEnabled.is(":checked") ){
+ $('#credential_container').hide();
+ }else{
+ $('#credential_container').show();
+ }
+ };
+
+ $public_check.prop("checked",true);
+ $commitsEnabled.prop("checked",false);
+
$public_check.click(function(){
- $('#credential_container').toggle($public_check.checked);
+ toggleCredentials();
+ });
+ $commitsEnabled.click(function(){
+ toggleCredentials();
});
+
+
var $volume_check = $('#volume_check');
if($volume_check.is(':checked')){
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d672a89a/components/org.apache.stratos.manager.console/console/themes/theme1/ui/js/wizard.js
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/ui/js/wizard.js b/components/org.apache.stratos.manager.console/console/themes/theme1/ui/js/wizard.js
index 278737c..67fe64d 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme1/ui/js/wizard.js
+++ b/components/org.apache.stratos.manager.console/console/themes/theme1/ui/js/wizard.js
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
*
-*/
+ */
$(function () {
var isValidForm = function(){
@@ -77,7 +77,7 @@ $(function () {
var newStep = parseInt($(this).attr('data-step')) + 1;
$('#nextStep').val(newStep);
//if(isValidForm()){
- $('#jsonForm').submit();
+ $('#jsonForm').submit();
//}
});
@@ -85,9 +85,9 @@ $(function () {
$('#wizardBack').click(function () {
var newStep = parseInt($(this).attr('data-step')) - 1;
$('#nextStep').val(newStep);
- // if(isValidForm()){
- $('#jsonForm').submit();
- // }
+ // if(isValidForm()){
+ $('#jsonForm').submit();
+ // }
});
var thisStep = $('#thisStep').val();
@@ -113,4 +113,29 @@ $(function () {
$('textarea', $(this).parent()).val(jsonStr);
$(this).html(syntaxHighlight(jsonStr));
});
-});
+
+ $('.js_undeploy').click(function(){
+ var $btn = $(this);
+ var type = $(this).attr('data-type');
+ if(type == null || type == "" || type == undefined){
+ return;
+ }
+ $.ajax({
+ data:{type:type,action:"undeploy"},
+ url:"/console/controllers/wizardSubmit.jag",
+ success:function(data){
+ data = jQuery.parseJSON(data);
+ if(data.Error != undefined){
+ $btn.prev().html('<button aria-hidden="true" data-dismiss="alert" class="close" type="button">×</button> ' + data.Error.errorMessage).show();
+ }else{
+ $btn.closest(".panel-default")
+ .empty()
+ .removeClass("panel")
+ .removeClass("panel-default")
+ .addClass("alert alert-success alert-dismissable")
+ .html('<button aria-hidden="true" data-dismiss="alert" class="close" type="button">×</button> Cartridge undeployed successfully');
+ }
+ }
+ })
+ })
+});
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d672a89a/components/org.apache.stratos.manager.console/console/util/utility.jag
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/util/utility.jag b/components/org.apache.stratos.manager.console/console/util/utility.jag
index da3c70e..c197e47 100644
--- a/components/org.apache.stratos.manager.console/console/util/utility.jag
+++ b/components/org.apache.stratos.manager.console/console/util/utility.jag
@@ -228,6 +228,9 @@ consoleAppUtil = new function(){
this.getCaptcha = function(){
return this.sendReceiveImage("Get","/simpleImg",{});
};
+ this.undeployCartridge = function(cartridgeType){
+ return this.sendReceive("DELETE","/cartridge/definition/"+cartridgeType,{}).data;
+ };
this.getConfigStatus = function(){
var configStatus = {};
var error;