fixing displaying list issue and kubernetes add and update
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/6175bb77 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/6175bb77 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/6175bb77 Branch: refs/heads/master Commit: 6175bb77aa6d03f38f015c8a5de7fd86a9f846fe Parents: b26ecdc Author: reka <[email protected]> Authored: Thu May 21 13:35:00 2015 +0530 Committer: reka <[email protected]> Committed: Thu May 21 13:36:39 2015 +0530 ---------------------------------------------------------------------- .../configure/configure_requests.jag | 4 +- .../default/configure/application-policies.json | 6 +- .../schema/configure/application-policies.json | 54 ++++++----------- .../schema/configure/kubernetes-clusters.json | 63 ++++++-------------- .../themes/theme0/partials/configure_form.hbs | 4 +- 5 files changed, 40 insertions(+), 91 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/6175bb77/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 0444a01..1ca280c 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 @@ -72,10 +72,10 @@ try { case "delete-deployment-policy": formSubmit = util.RESTCalls.deleteDeploymentPolicyDefinition(formPayload); break; - case "update-kubernetes-cluster": + case "update-kubernetes-clusters": formSubmit = util.RESTCalls.updateKubernetesClusterDefinition(formPayload); break; - case "delete-kubernetes-cluster": + case "delete-kubernetes-clusters": formSubmit = util.RESTCalls.deleteKubernetesClusterDefinition(formPayload); break; case "update-network-partitions": http://git-wip-us.apache.org/repos/asf/stratos/blob/6175bb77/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/application-policies.json ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/application-policies.json b/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/application-policies.json index a0c18ee..008e079 100644 --- a/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/application-policies.json +++ b/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/application-policies.json @@ -8,10 +8,6 @@ { "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/6175bb77/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/application-policies.json ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/application-policies.json b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/application-policies.json index b5297e0..6ea3895 100644 --- a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/application-policies.json +++ b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/application-policies.json @@ -38,43 +38,25 @@ "properties": { "id": "root/properties", "type": "array", - "title": "Properties ", - "name": "Properties", - "format":"tabs", - "items": [ - { - "id": "root/properties/0", - "type": "object", - "title": "Properties ", - "name": "Properties", - "properties": { - "name": { - "id": "root/properties/0/name", - "type": "string" - }, - "value": { - "id": "root/properties/0/value", - "type": "string" - } - } - }, - { - "id": "root/properties/1", - "type": "object", - "title": "Properties ", - "name": "Properties", - "properties": { - "name": { - "id": "root/properties/1/name", - "type": "string" - }, - "value": { - "id": "root/properties/1/value", - "type": "string" - } + "title": "Properties", + "format": "tabs", + "items": { + "id": "root/properties/0", + "type": "object", + "title": "Property", + "properties": { + "name": { + "id": "root/properties/0/name", + "title": "Name", + "type": "string" + }, + "value": { + "id": "root/properties/0/value", + "title": "Value", + "type": "string" } } - ] + } } }, "required": [ @@ -83,4 +65,4 @@ "networkPartitions", "properties" ] -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/stratos/blob/6175bb77/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/kubernetes-clusters.json ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/kubernetes-clusters.json b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/kubernetes-clusters.json index 615eb8f..fe0334d 100644 --- a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/kubernetes-clusters.json +++ b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/kubernetes-clusters.json @@ -62,56 +62,27 @@ "name": "Hostname" }, "property": { - "type":"array", "id": "root/kubernetesMaster/property", - "required":false, + "type": "array", "title": "Property", - "name": "Property", - "format":"tabs", - "items":[ - { - "type":"object", - "id": "root/kubernetesMaster/property/0", - "required":false, - "title": "Property", - "name": "Property", - "properties":{ - "name": { - "type":"string", - "id": "root/kubernetesMaster/property/0/name", - "default": "prop1", - "required":false - }, - "value": { - "type":"string", - "id": "root/kubernetesMaster/property/0/value", - "default": "val1", - "required":false - } - } - }, - { - "type":"object", - "id": "root/kubernetesMaster/property/1", - "required":false, - "title": "Property", - "name": "Property", - "properties":{ - "name": { - "type":"string", - "id": "root/kubernetesMaster/property/1/name", - "default": "prop2", - "required":false - }, - "value": { - "type":"string", - "id": "root/kubernetesMaster/property/1/value", - "default": "val2", - "required":false - } + "format": "tabs", + "items": { + "id": "root/kubernetesMaster/property/0", + "type": "object", + "title": "Property", + "properties": { + "name": { + "id": "root/kubernetesMaster/property/0/name", + "title": "Name", + "type": "string" + }, + "value": { + "id": "root/kubernetesMaster/property/0/value", + "title": "Value", + "type": "string" } } - ] + } } } http://git-wip-us.apache.org/repos/asf/stratos/blob/6175bb77/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 ad9a224..1ef765d 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 @@ -153,7 +153,7 @@ <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="{{clusterId}}" data-formtype="delete-kubernetes-cluster"> Delete</button> + id="{{clusterId}}" data-formtype="delete-kubernetes-clusters"> Delete</button> <button class="btn btn-warning btn-lg hover-details" type="button" id="details_list_{{id}}" data-url="{{url ""}}/configure/kubernetes-clusters/{{clusterId}}/edit" > Edit </button> @@ -164,7 +164,7 @@ <div class="bottom-bar-wrapper"> <div class="bottom-bar"> <button class="btn btn-danger btn-lg hover-delete" type="button" - id="{{clusterId}}" data-formtype="delete-kubernetes-cluster"> Delete</button> + id="{{clusterId}}" data-formtype="delete-kubernetes-clusters"> Delete</button> <button class="btn btn-warning btn-lg hover-details" type="button" id="details_list_{{id}}" data-url="{{url ""}}/configure/kubernetes-clusters/{{clusterId}}/edit" > Edit </button>
