You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2015/03/14 03:01:49 UTC
[3/6] stratos git commit: Move Application policies to configure
section
Move Application policies to configure section
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/dfb7cace
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/dfb7cace
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/dfb7cace
Branch: refs/heads/master
Commit: dfb7cace38b001c333e58a6675274c31565abaeb
Parents: b921446
Author: Dakshika Jayathilaka <si...@gmail.com>
Authored: Sat Mar 14 05:50:07 2015 +0530
Committer: Dakshika Jayathilaka <si...@gmail.com>
Committed: Sat Mar 14 05:50:07 2015 +0530
----------------------------------------------------------------------
.../console/applications_form.jag | 13 +---
.../console/configure_form.jag | 13 ++++
.../applications/application_requests.jag | 6 --
.../configure/configure_requests.jag | 6 ++
.../applications/applicationpolicies.json | 17 -----
.../default/configure/applicationpolicies.json | 17 +++++
.../applications/applicationpolicies.json | 69 -------------------
.../schema/configure/applicationpolicies.json | 69 +++++++++++++++++++
.../console/controllers/menu/menu.json | 18 ++---
.../theme0/partials/applications_form.hbs | 71 --------------------
.../themes/theme0/partials/configure_form.hbs | 28 ++++++++
11 files changed, 143 insertions(+), 184 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/dfb7cace/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 e936bab..f295520 100644
--- a/components/org.apache.stratos.manager.console/console/applications_form.jag
+++ b/components/org.apache.stratos.manager.console/console/applications_form.jag
@@ -98,9 +98,7 @@ if (!elements) {
id = escape(elements.action);
switch (formtype) {
- case "applicationpolicies":
- formDataEdit = util.RESTCalls.getPolicyApplication(id);
- break;
+
case "groups":
formDataEdit = util.RESTCalls.getPolicyCartridgeGroup(id);
break;
@@ -133,15 +131,6 @@ switch (formtype) {
}
break;
- case "applicationpolicies":
- formTitle = "Application Policy Definition",
- buttonText = "Application Policy Definition";
- list_data = util.RESTCalls.getApplicationPolicies();
- if (list_data && list_data.length === 0) {
- list_data = null;
- }
- break;
-
default:
error.push({"errorMessage":"Incorrect resource path found"});
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/dfb7cace/components/org.apache.stratos.manager.console/console/configure_form.jag
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/configure_form.jag b/components/org.apache.stratos.manager.console/console/configure_form.jag
index 8397881..20ba8e9 100644
--- a/components/org.apache.stratos.manager.console/console/configure_form.jag
+++ b/components/org.apache.stratos.manager.console/console/configure_form.jag
@@ -113,6 +113,15 @@ if(isEdit == false && elements.action != 'new') {
}
break;
+ case "applicationpolicies":
+ formTitle = "Application Policy Definition",
+ buttonText = "Application Policy Definition";
+ list_data = util.RESTCalls.getApplicationPolicies();
+ if (list_data && list_data.length === 0) {
+ list_data = null;
+ }
+ break;
+
default:
error.push({"errorMessage": "Incorrect resource path found"});
@@ -151,6 +160,10 @@ if (elements.action != 'new' && isEdit) {
case "docker":
formDataEdit = util.RESTCalls.getKubernetesCluster(id);
break;
+
+ case "applicationpolicies":
+ formDataEdit = util.RESTCalls.getPolicyApplication(id);
+ break;
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/dfb7cace/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 516ba3e..9f0d6f6 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
@@ -37,12 +37,6 @@ try {
case "deletegroups":
formSubmit = util.RESTCalls.deleteGroup(formPayload);
break;
- case "applicationpolicies":
- formSubmit = util.RESTCalls.deployApplicationPolicyDefinition(formPayload);
- break;
- case "deleteapppolicy":
- formSubmit = util.RESTCalls.deleteApplicationPolicyDefinition(formPayload);
- break;
case "applications":
formSubmit = util.RESTCalls.deployApplicationDefinition(formPayload);
break;
http://git-wip-us.apache.org/repos/asf/stratos/blob/dfb7cace/components/org.apache.stratos.manager.console/console/controllers/configure/configure_requests.jag
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/configure/configure_requests.jag b/components/org.apache.stratos.manager.console/console/controllers/configure/configure_requests.jag
index 361f227..5142a1d 100644
--- a/components/org.apache.stratos.manager.console/console/controllers/configure/configure_requests.jag
+++ b/components/org.apache.stratos.manager.console/console/controllers/configure/configure_requests.jag
@@ -45,6 +45,12 @@ try {
case "docker":
formSubmit = util.RESTCalls.deployKubernetesClusterDefinition(formPayload);
break;
+ case "applicationpolicies":
+ formSubmit = util.RESTCalls.deployApplicationPolicyDefinition(formPayload);
+ break;
+ case "delete-applicationpolicies":
+ formSubmit = util.RESTCalls.deleteApplicationPolicyDefinition(formPayload);
+ break;
case "delete-partitions":
formSubmit = util.RESTCalls.deletePartiions(formPayload);
break;
http://git-wip-us.apache.org/repos/asf/stratos/blob/dfb7cace/components/org.apache.stratos.manager.console/console/controllers/forms/default/applications/applicationpolicies.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/default/applications/applicationpolicies.json b/components/org.apache.stratos.manager.console/console/controllers/forms/default/applications/applicationpolicies.json
deleted file mode 100644
index a0c18ee..0000000
--- a/components/org.apache.stratos.manager.console/console/controllers/forms/default/applications/applicationpolicies.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "id": "application-policy-1",
- "algorithm":"one-after-another",
- "networkPartitions":[
- "network-partition-1"
- ],
- "properties":[
- {
- "name": "key-1",
- "value": "value-1"
- },
- {
- "name": "key-2",
- "value": "value-2"
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/dfb7cace/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/applicationpolicies.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/applicationpolicies.json b/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/applicationpolicies.json
new file mode 100644
index 0000000..a0c18ee
--- /dev/null
+++ b/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/applicationpolicies.json
@@ -0,0 +1,17 @@
+{
+ "id": "application-policy-1",
+ "algorithm":"one-after-another",
+ "networkPartitions":[
+ "network-partition-1"
+ ],
+ "properties":[
+ {
+ "name": "key-1",
+ "value": "value-1"
+ },
+ {
+ "name": "key-2",
+ "value": "value-2"
+ }
+ ]
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/dfb7cace/components/org.apache.stratos.manager.console/console/controllers/forms/schema/applications/applicationpolicies.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/applications/applicationpolicies.json b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/applications/applicationpolicies.json
deleted file mode 100644
index 051adab..0000000
--- a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/applications/applicationpolicies.json
+++ /dev/null
@@ -1,69 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-04/schema#",
- "id": "root",
- "type": "object",
- "title": "Application Policy Definition",
- "name": "Application Policy",
- "options": {
- "disable_properties": true,
- "disable_collapse": true
- },
- "properties": {
- "id": {
- "id": "root/id",
- "type": "string"
- },
- "algorithm": {
- "id": "root/algorithm",
- "type": "string"
- },
- "networkPartitions": {
- "id": "root/networkPartitions",
- "type": "array",
- "items": {
- "id": "root/networkPartitions/0",
- "type": "string"
- }
- },
- "properties": {
- "id": "root/properties",
- "type": "array",
- "items": [
- {
- "id": "root/properties/0",
- "type": "object",
- "properties": {
- "name": {
- "id": "root/properties/0/name",
- "type": "string"
- },
- "value": {
- "id": "root/properties/0/value",
- "type": "string"
- }
- }
- },
- {
- "id": "root/properties/1",
- "type": "object",
- "properties": {
- "name": {
- "id": "root/properties/1/name",
- "type": "string"
- },
- "value": {
- "id": "root/properties/1/value",
- "type": "string"
- }
- }
- }
- ]
- }
- },
- "required": [
- "id",
- "algorithm",
- "networkPartitions",
- "properties"
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/dfb7cace/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/applicationpolicies.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/applicationpolicies.json b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/applicationpolicies.json
new file mode 100644
index 0000000..051adab
--- /dev/null
+++ b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/applicationpolicies.json
@@ -0,0 +1,69 @@
+{
+ "$schema": "http://json-schema.org/draft-04/schema#",
+ "id": "root",
+ "type": "object",
+ "title": "Application Policy Definition",
+ "name": "Application Policy",
+ "options": {
+ "disable_properties": true,
+ "disable_collapse": true
+ },
+ "properties": {
+ "id": {
+ "id": "root/id",
+ "type": "string"
+ },
+ "algorithm": {
+ "id": "root/algorithm",
+ "type": "string"
+ },
+ "networkPartitions": {
+ "id": "root/networkPartitions",
+ "type": "array",
+ "items": {
+ "id": "root/networkPartitions/0",
+ "type": "string"
+ }
+ },
+ "properties": {
+ "id": "root/properties",
+ "type": "array",
+ "items": [
+ {
+ "id": "root/properties/0",
+ "type": "object",
+ "properties": {
+ "name": {
+ "id": "root/properties/0/name",
+ "type": "string"
+ },
+ "value": {
+ "id": "root/properties/0/value",
+ "type": "string"
+ }
+ }
+ },
+ {
+ "id": "root/properties/1",
+ "type": "object",
+ "properties": {
+ "name": {
+ "id": "root/properties/1/name",
+ "type": "string"
+ },
+ "value": {
+ "id": "root/properties/1/value",
+ "type": "string"
+ }
+ }
+ }
+ ]
+ }
+ },
+ "required": [
+ "id",
+ "algorithm",
+ "networkPartitions",
+ "properties"
+ ]
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/dfb7cace/components/org.apache.stratos.manager.console/console/controllers/menu/menu.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/menu/menu.json b/components/org.apache.stratos.manager.console/console/controllers/menu/menu.json
index db2f084..c3dc76a 100644
--- a/components/org.apache.stratos.manager.console/console/controllers/menu/menu.json
+++ b/components/org.apache.stratos.manager.console/console/controllers/menu/menu.json
@@ -37,6 +37,15 @@
"description": "Define specific policies for application deployment."
},
{
+ "link": "configure/applicationpolicies/",
+ "linkexternal": false,
+ "context": "/configure",
+ "title": "Application Policies",
+ "icon": "fa-cube",
+ "permissionPaths": ["/permission", "/permission/admin", "/permission/admin/manage/view/subscription"],
+ "description": "Manage application policies"
+ },
+ {
"link": "configure/cartridges/",
"linkexternal": false,
"context": "/configure",
@@ -104,15 +113,6 @@
"description": "Manage cartridge groups"
},
{
- "link": "applications/applicationpolicies/",
- "linkexternal": false,
- "context": "/applications",
- "title": "Application Policies",
- "icon": "fa-road",
- "permissionPaths": ["/permission", "/permission/admin", "/permission/admin/manage/view/subscription"],
- "description": "Manage application policies"
- },
- {
"link": "applications/applications/",
"linkexternal": false,
"context": "/applications",
http://git-wip-us.apache.org/repos/asf/stratos/blob/dfb7cace/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 c8ed4f6..c6a1067 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
@@ -174,34 +174,6 @@
</div>
{{/each}}
{{/ifCond}}
- {{#ifCond formtype "==" "applicationpolicies"}}
- {{#each content_body.sections}}
- <div class="block col-md-4 grid-group-item border-right">
- <div class="toggle-menu-icon">
- <i class="fa fa-th-large"></i>
- </div>
- <h2 class="truncate">{{id}} </h2>
-
- <div class="toggle-menu-description">{{description}} </div>
- <div class="list-button" style="display: none;">
- <button class="btn btn-danger btn-lg hover-delete-app-policy" type="button"
- id="{{id}}"> Delete</button>
- <button class="btn btn-info btn-lg hover-details" type="button" id="details_list_{{id}}"
- data-url="{{url ""}}/applications/applicationpolicies{{id}}/" > Details
- </button>
- </div>
- <div class="bottom-bar-wrapper">
- <div class="bottom-bar">
- <button class="btn btn-danger btn-lg hover-delete-app-policy" type="button"
- id="{{id}}"> Delete</button>
- <button class="btn btn-info btn-lg hover-details" type="button" id="details_{{id}}"
- data-url="{{url ""}}/applications/applicationpolicies/{{id}}/" > Details
- </button>
- </div>
- </div>
- </div>
- {{/each}}
- {{/ifCond}}
</div>
</div>
</div>
@@ -469,49 +441,6 @@
});
});
- $('.general-table').on('click', '.hover-delete-app-policy', function (event) {
-
- var payload =$(this).attr("id");
- noty({
- layout: 'bottomRight',
- type: 'warning',
- text: 'Are you sure you want to delete Application Policy: <strong>'+$(this).attr("id") + "</strong> ?",
- buttons: [
- {addClass: 'btn btn-primary', text: 'Yes', onClick: function($noty) {
- var formtype = 'deleteapppolicy';
- $noty.close();
-
- $.ajax({
- type: "POST",
- url: caramel.context + "/controllers/applications/application_requests.jag",
- dataType: 'json',
- data: { "formPayload": payload, "formtype": formtype },
- success: function (data) {
- if (data.status == 'error') {
- var n = noty({text: data.message, layout: 'bottomRight', type: 'error'});
- } else if (data.status == 'warning') {
- var n = noty({text: data.message, layout: 'bottomRight', type: 'warning'});
- } else {
- var n = noty({text: data.message, layout: 'bottomRight', type: 'success'});
- }
- window.setTimeout(function(){
- location.reload();
- }, 1000);
- }
- }).always(function () {
-
- });
-
- }
- },
- {addClass: 'btn btn-danger', text: 'No', onClick: function($noty) {
- $noty.close();
- }
- }
- ]
- });
- });
-
$('.general-table').on('click', '.hover-undeploy', function (event) {
var payload =$(this).attr("id");
http://git-wip-us.apache.org/repos/asf/stratos/blob/dfb7cace/components/org.apache.stratos.manager.console/console/themes/theme0/partials/configure_form.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/configure_form.hbs b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/configure_form.hbs
index 41aebb3..608bff6 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/configure_form.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/configure_form.hbs
@@ -233,6 +233,34 @@
</div>
{{/each}}
{{/ifCond}}
+ {{#ifCond formtype "==" "applicationpolicies"}}
+ {{#each content_body.sections}}
+ <div class="block col-md-4 grid-group-item border-right">
+ <div class="toggle-menu-icon">
+ <i class="fa fa-th-large"></i>
+ </div>
+ <h2 class="truncate">{{id}} </h2>
+
+ <div class="toggle-menu-description">{{description}} </div>
+ <div class="list-button" style="display: none;">
+ <button class="btn btn-danger btn-lg hover-delete" type="button"
+ id="{{id}}" data-formtype="delete-applicationpolicies"> Delete</button>
+ <button class="btn btn-info btn-lg hover-details" type="button" id="details_list_{{id}}"
+ data-url="{{url ""}}/configure/applicationpolicies{{id}}/" > Details
+ </button>
+ </div>
+ <div class="bottom-bar-wrapper">
+ <div class="bottom-bar">
+ <button class="btn btn-danger btn-lg hover-delete" type="button"
+ id="{{id}}" data-formtype="delete-applicationpolicies"> Delete</button>
+ <button class="btn btn-info btn-lg hover-details" type="button" id="details_{{id}}"
+ data-url="{{url ""}}/configure/applicationpolicies/{{id}}/" > Details
+ </button>
+ </div>
+ </div>
+ </div>
+ {{/each}}
+ {{/ifCond}}
</div>
</div>
</div>