Repository: stratos Updated Branches: refs/heads/master 112680a12 -> 7e810ec11
Updating the UI with the dependency JSON changes Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/7e810ec1 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/7e810ec1 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/7e810ec1 Branch: refs/heads/master Commit: 7e810ec1178c88d97c69766ebd56c035addce2a0 Parents: 112680a Author: Imesh Gunaratne <[email protected]> Authored: Sun May 10 15:03:50 2015 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Sun May 10 15:03:50 2015 +0530 ---------------------------------------------------------------------- .../theme0/js/custom/applications-editor.js | 62 ++++++++++++---- .../js/custom/applications_group_editor.js | 78 +++++++++++++++----- 2 files changed, 109 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/7e810ec1/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications-editor.js ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications-editor.js b/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications-editor.js index 2030635..0c5e8e1 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications-editor.js +++ b/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications-editor.js @@ -640,28 +640,64 @@ var applicationBlockTemplate = { "id": "root/dependencies/startupOrders", "type": "array", "title": "Startup Orders", - "name": "Startup Orders", + "name": "StartupOrders", "format":"tabs", "items": { "id": "root/dependencies/startupOrders/0", - "type": "string", - "title": "Order", - "name": "Order", - "default":"group.my-group1,cartridge.my-c4" + "type": "object", + "title": "Startup Order", + "name": "StartupOrder", + "options": { + "disable_properties":true + }, + "properties" : { + "aliases" : { + "id" : "root/dependencies/startupOrders/aliases", + "type" : "array", + "title" : "Aliases", + "name" : "aliases", + "format" : "tabs", + "items" : { + "id" : "root/dependencies/startupOrders/aliases/0", + "type" : "string", + "title" : "alias", + "name" : "alias", + "default" : "cartridge.c4" + } + } + } } }, "scalingDependents": { "id": "root/dependencies/scalingDependents", "type": "array", "title": "Scaling Dependents", - "name": "Scaling Dependents", + "name": "ScalingDependents", "format":"tabs", "items": { "id": "root/dependencies/scalingDependents/0", - "type": "string", - "title": "Dependent", - "name": "Dependent", - "default":"group.my-group1,cartridge.my-c4" + "type": "object", + "title": "Scaling Dependent", + "name": "ScalingDependent", + "options": { + "disable_properties":true + }, + "properties" : { + "aliases" : { + "id" : "root/dependencies/scalingDependents/aliases", + "type" : "array", + "title" : "Aliases", + "name" : "aliases", + "format" : "tabs", + "items" : { + "id" : "root/dependencies/scalingDependents/aliases/0", + "type" : "string", + "title" : "alias", + "name" : "alias", + "default" : "cartridge.c1" + } + } + } } }, "terminationBehaviour": { @@ -669,7 +705,7 @@ var applicationBlockTemplate = { "type": "string", "title": "Termination Behaviour", "name": "Termination Behaviour", - "enum": ["terminate-none","terminate-dependents","terminate-all"], + "enum": ["terminate-none","terminate-dependents","terminate-all"] } } } @@ -682,12 +718,10 @@ var applicationBlockDefault = { "multiTenant": false, "dependencies": { "startupOrders": [ - ], "scalingDependents": [ - ], - "terminationBehaviour": "terminate-dependents" + "terminationBehaviour": "terminate-none" } }; http://git-wip-us.apache.org/repos/asf/stratos/blob/7e810ec1/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications_group_editor.js ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications_group_editor.js b/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications_group_editor.js index 3969abe..8451a15 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications_group_editor.js +++ b/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications_group_editor.js @@ -283,36 +283,82 @@ var groupBlockTemplate = { "name": { "id": "root/name", "type": "string", - "title": "Group Name: " + "title": "Group Name", + "name" : "name" }, "dependencies": { "id": "root/dependencies", "type": "object", - "title": "Dependencies: ", + "title": "Dependencies", + "name" : "Dependencies", "options": { - "disable_properties": true + "hidden": false, + "disable_properties":true, + "collapsed": true }, "properties": { "startupOrders": { "id": "root/dependencies/startupOrders", "type": "array", - "title": "Startup Orders: ", + "title": "Startup Orders", + "name" : "StartupOrders", "format":"tabs", "items": { "id": "root/dependencies/startupOrders/0", - "type": "string", - "title": "Order" + "type": "object", + "title": "Startup Order", + "name": "StartupOrder", + "options": { + "disable_properties":true + }, + "properties" : { + "aliases" : { + "id" : "root/dependencies/startupOrders/aliases", + "type" : "array", + "title" : "Aliases", + "name" : "aliases", + "format" : "tabs", + "items" : { + "id" : "root/dependencies/startupOrders/aliases/0", + "type" : "string", + "title" : "alias", + "name" : "alias", + "default" : "cartridge.c4" + } + } + } } }, - "scalingDependants": { - "id": "root/dependencies/scalingDependants", + "scalingDependents": { + "id": "root/dependencies/scalingDependents", "type": "array", - "title": "Scaling Dependants: ", + "title": "Scaling Dependents", + "name" : "ScalingDependents", "format":"tabs", "items": { - "id": "root/dependencies/scalingDependants/0", - "type": "string", - "title": "Dependant" + "id": "root/dependencies/scalingDependents/0", + "type": "object", + "title": "Scaling Dependent", + "name": "ScalingDependent", + "options": { + "disable_properties":true + }, + "properties" : { + "aliases" : { + "id" : "root/dependencies/scalingDependents/aliases", + "type" : "array", + "title" : "Aliases", + "name" : "aliases", + "format" : "tabs", + "items" : { + "id" : "root/dependencies/scalingDependents/aliases/0", + "type" : "string", + "title" : "alias", + "name" : "alias", + "default" : "cartridge.c1" + } + } + } } }, "terminationBehaviour": { @@ -323,7 +369,7 @@ var groupBlockTemplate = { }, "required": [ "startupOrders", - "scalingDependants", + "scalingDependents", "terminationBehaviour" ] } @@ -339,12 +385,10 @@ var groupBlockDefault = { "name": "", "dependencies": { "startupOrders": [ - "cartridge.type, group.name" ], - "scalingDependants": [ - "cartridge.type, group.name" + "scalingDependents": [ ], - "terminationBehaviour": "terminate-all" + "terminationBehaviour": "terminate-none" } };
