fixing the cartridge info page
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/0c78f357 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/0c78f357 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/0c78f357 Branch: refs/heads/master Commit: 0c78f357e210e9aa1a0bce236de242c5f15aca83 Parents: ed37cce Author: rekathiru <[email protected]> Authored: Tue Feb 18 15:00:32 2014 +0530 Committer: rekathiru <[email protected]> Committed: Tue Feb 18 15:00:32 2014 +0530 ---------------------------------------------------------------------- .../console/cartridge_info.jag | 15 ++++- .../controllers/cartridgeUnsubscribeSubmit.jag | 2 - .../themes/theme1/partials/cartridge_info.hbs | 71 +++++++++++++++++--- .../themes/theme1/partials/mycartridges.hbs | 4 +- .../themes/theme1/renderers/cartridge_info.js | 8 +-- .../console/util/utility.jag | 7 ++ 6 files changed, 89 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/0c78f357/components/org.apache.stratos.manager.console/console/cartridge_info.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/cartridge_info.jag b/components/org.apache.stratos.manager.console/console/cartridge_info.jag index 9424fbb..25986eb 100644 --- a/components/org.apache.stratos.manager.console/console/cartridge_info.jag +++ b/components/org.apache.stratos.manager.console/console/cartridge_info.jag @@ -1,9 +1,22 @@ <% var caramel = require('caramel'); var utils = require('/util/utility.jag'); + var log = new Log('utility.cartridgeInfo'); var alias = request.getParameter("alias"); var cartridgeInfo = utils.consoleAppUtil.getCartridgeInfo(alias).cartridge; +var lbCluster = '{}'; +if(cartridgeInfo.lbClusterId) { +log.info("&&&&&&&&&&&&&:" + cartridgeInfo.lbClusterId); + lbCluster = utils.consoleAppUtil.getClusterInfo(cartridgeInfo.lbClusterId).cluster; + log.debug("***************:" + stringify(lbCluster)); +} + +var clusterInfo = utils.consoleAppUtil.getClusterInfoWithAlias(cartridgeInfo.cartridgeType, alias).cluster; + //log.debug("~~~~~~~~~~~~~~~~~~~~:" + stringify(clusterInfo)); + caramel.render({ - cartridgeInfo:cartridgeInfo + cartridgeInfo:cartridgeInfo, + lbCluster:lbCluster, + clusterInfo:clusterInfo }); %> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/0c78f357/components/org.apache.stratos.manager.console/console/controllers/cartridgeUnsubscribeSubmit.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/controllers/cartridgeUnsubscribeSubmit.jag b/components/org.apache.stratos.manager.console/console/controllers/cartridgeUnsubscribeSubmit.jag index e71a4fd..fc47fd4 100755 --- a/components/org.apache.stratos.manager.console/console/controllers/cartridgeUnsubscribeSubmit.jag +++ b/components/org.apache.stratos.manager.console/console/controllers/cartridgeUnsubscribeSubmit.jag @@ -3,8 +3,6 @@ var log = new Log("controller.cartridgeSubscribeSubmit"); var utils = require('/util/utility.jag'); var alias = request.getParameter('alias'); - log.info("(((((((((((((((((((((((((((((("); - log.info(alias); var result = utils.consoleAppUtil.unsubscribeCartridge(alias); response.sendRedirect(request.getContextPath() + '/index.jag'); }()); http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/0c78f357/components/org.apache.stratos.manager.console/console/themes/theme1/partials/cartridge_info.hbs ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/cartridge_info.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/cartridge_info.hbs index 1a6410d..f2d5109 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/cartridge_info.hbs +++ b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/cartridge_info.hbs @@ -11,27 +11,78 @@ <div class="col-lg-12"> <div style="margin-bottom:20px;">{{cartridgeInfo.description}}</div> - <strong>activeInstances</strong> + <strong>ActiveInstances:</strong> <div>{{cartridgeInfo.activeInstances}}</div> - <strong>cartridgeAlias</strong> + <strong>CartridgeAlias:</strong> <div>{{cartridgeInfo.cartridgeAlias}}</div> - <strong>cartridgeType</strong> + <strong>CartridgeType:</strong> <div>{{cartridgeInfo.cartridgeType}}</div> - - <strong>hostName</strong> + <strong>HostName:</strong> <div>{{cartridgeInfo.hostName}}</div> - <strong>multiTenant</strong> - <div>{{cartridgeInfo.multiTenant}}</div> + <strong>Version:</strong> + <div>{{cartridgeInfo.version}}</div> + + <strong>Tenancy Model:</strong> + {{#if cartridgeInfo.multiTenant}} + <div>true</div> + + {{else}} + <div>false</div> + {{/if}} + - <strong>provider</strong> + <strong>Provider:</strong> <div>{{cartridgeInfo.provider}}</div> - <strong>repoURL</strong> - <div>{{cartridgeInfo.repoURL}}</div> + {{#if cartridgeInfo.repoURL }} + <strong>RepoURL</strong> + <div>{{cartridgeInfo.repoURL}}</div> + {{/if}} + + {{#ifCond cartridgeInfo.provider "==" "data"}} + + <strong>UserName</strong> + <div>{{cartridgeInfo.dbUserName}}</div> + + <strong>Password</strong> + <div>{{cartridgeInfo.password}}</div> + + {{/ifCond}} + {{#if clusterinfo.member}} + <strong>Members in the Cluster:</strong> + <div> + {{#each clusterinfo.member}} + {{memberIp}} , + {{/each}} + </div> + + {{/if}} + + {{#if lbclusterinfo.member}} + <strong>LB Private ip:</strong> + <div> + {{#each clusterinfo.member}} + {{memberIp}} + {{/each}} + </div> + + <strong>LB Public ip:</strong> + <div> + {{#each clusterinfo.member}} + {{memberPublicIp}} + {{/each}} + </div> + + {{/if}} + + <div> + </div> + + </div> </div> </div> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/0c78f357/components/org.apache.stratos.manager.console/console/themes/theme1/partials/mycartridges.hbs ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/mycartridges.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/mycartridges.hbs index 9adbd06..bf15e02 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/mycartridges.hbs +++ b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/mycartridges.hbs @@ -21,7 +21,9 @@ <div class="box-left"><i class="icons-default icons-{{cartridgeType}} big-pro-icons"></i></div> </div> <div class="col-lg-9"> - <div class="un-subscribe-container"><a class="un-subscribe" id="unsubscribeBtn" data-alias="{{cartridgeAlias}}">Un-subscribe <i class="fa fa-times-circle-o"></i></a></div> + {{#unless loadBalancer}} + <div class="un-subscribe-container"><a class="un-subscribe" id="unsubscribeBtn" data-alias="{{cartridgeAlias}}">Un-subscribe <i class="fa fa-times-circle-o"></i></a></div> + {{/unless}} <a href="{{url "/cartridge_info.jag?alias="}}{{cartridgeAlias}}"><h3>{{cartridgeAlias}}-<span>({{displayName}} - {{version}})</span></h3></a> <div class="cartridge-description">{{description}}</div> <div class="cartridge-description">{{repoURL}}</div> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/0c78f357/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/cartridge_info.js ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/cartridge_info.js b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/cartridge_info.js index 07d7c5b..a430643 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/cartridge_info.js +++ b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/cartridge_info.js @@ -1,15 +1,15 @@ var render = function (theme, data, meta, require) { // Re-create the data structure of the cartridges. - var log = new Log(); - log.info("#########################"); - log.info(data.cartridgeInfo); theme('index', { body: [ { partial: 'cartridge_info', context: { title:'Cartridges', - cartridgeInfo:data.cartridgeInfo + cartridgeInfo:data.cartridgeInfo, + lbclusterinfo:data.lbCluster, + clusterinfo:data.clusterInfo, + host:data.cartridgeInfo.hostName } } ], http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/0c78f357/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 e9656d6..03d50cb 100644 --- a/components/org.apache.stratos.manager.console/console/util/utility.jag +++ b/components/org.apache.stratos.manager.console/console/util/utility.jag @@ -180,6 +180,13 @@ consoleAppUtil = new function(){ return this.sendReceive("GET","/cartridge/lb",{}).data; }; + this.getClusterInfo = function(clusterId){ + return this.sendReceive("GET","/cluster/clusterId/" + clusterId,{}).data; + }; + + this.getClusterInfoWithAlias = function(cartridgeType, alias){ + return this.sendReceive("GET","/cluster/" + cartridgeType + "/" + alias,{}).data; + }; this.getCartridgeInfo = function(alias){ return this.sendReceive("GET","/cartridge/info/"+alias,{}).data; };
