Repository: stratos Updated Branches: refs/heads/stratos-4.1.x 01557c6f7 -> 4a18fe100
Making signup button available only when application is active Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/56d86560 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/56d86560 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/56d86560 Branch: refs/heads/stratos-4.1.x Commit: 56d86560d6b23cfa1b77a562128ef1b47554d09f Parents: 03e6273 Author: anuruddhal <[email protected]> Authored: Tue Sep 15 10:04:39 2015 +0530 Committer: anuruddhal <[email protected]> Committed: Tue Sep 15 10:05:08 2015 +0530 ---------------------------------------------------------------------- .../theme0/partials/applications_form.hbs | 198 +++++++++++++------ .../rest/endpoint/api/StratosApiV41Utils.java | 1 - .../util/converter/ObjectConverter.java | 13 +- 3 files changed, 147 insertions(+), 65 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/56d86560/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 7558f54..43d7c20 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 @@ -113,52 +113,118 @@ </div> <h2 class="truncate">{{applicationId}} </h2> - <div class="toggle-menu-description">{{description}} {{status}}</div> - {{#ifCond status "!=" "Created"}} - {{#ifCond status "==" "Deployed"}} - <div class="list-button" style="display: none;"> - <button class="btn btn-danger btn-lg hover-undeploy" type="button" - id="{{applicationId}}"> Undeploy</button> - <button class="btn btn-info btn-lg hover-details" type="button" - id="details_list_{{applicationId}}" - data-url="{{url ""}}/applications/{{applicationId}}/" > View - </button> - {{#if multiTenant}} - {{#if signUpsExist}} - <button class="btn btn-warning btn-lg hover-remove-signup" type="button" - id="{{applicationId}}" - data-appid='{{applicationName}}' >Remove Signup - </button> - {{else}} - <button class="btn btn-warning btn-lg hover-signup" type="button" - id="signup_{{applicationId}}" - data-url="{{url ""}}/applications/{{applicationId}}/signup" > Signup - </button> - {{/if}} + <div class="toggle-menu-description">{{description}} {{status}}</div> + {{#ifCond status "!=" "Created"}} + {{#ifCond status "==" "Deployed"}} + <div class="list-button" style="display: none;"> + <button class="btn btn-danger btn-lg hover-undeploy" + type="button" + id="{{applicationId}}"> Undeploy + </button> + <button class="btn btn-info btn-lg hover-details" type="button" + id="details_list_{{applicationId}}" + data-url="{{url ""}}/applications/{{applicationId}}/">View + </button> + {{#if multiTenant}} + {{#if signUpsExist}} + <button class="btn btn-warning btn-lg hover-remove-signup" + type="button" + id="{{applicationId}}" + data-appid='{{applicationName}}'>Remove Signup + </button> + {{else}} + <button class="btn btn-warning btn-lg hover-signup disabled" + type="button" + id="signup_{{applicationId}}" + data-url="{{url ""}}/applications/{{applicationId}}/signup">Signup + </button> {{/if}} - </div> - <div class="bottom-bar-wrapper"> - <div class="bottom-bar"> - <button class="btn btn-danger btn-lg hover-undeploy" type="button" - id="{{applicationId}}"> Undeploy</button> + {{/if}} + </div> + <div class="bottom-bar-wrapper"> + <div class="bottom-bar"> + <button class="btn btn-danger btn-lg hover-undeploy" + type="button" + id="{{applicationId}}"> Undeploy + </button> + <button class="btn btn-info btn-lg hover-details" type="button" + id="details_{{applicationId}}" + data-url="{{url ""}}/applications/{{applicationId}}/"> + View + </button> + {{#if multiTenant}} + {{#if signUpsExist}} + <button class="btn btn-warning btn-lg hover-remove-signup" + type="button" + id="{{applicationId}}" + data-appid='{{applicationName}}'>Remove Signup + </button> + {{else}} + <button class="btn btn-warning btn-lg hover-signup disabled" + type="button" + id="signup_{{applicationId}}" + data-url="{{url ""}}/applications/{{applicationId}}/signup"> + Signup + </button> + {{/if}} + {{/if}} + </div> + {{else}} + {{#ifCond status "==" "Active"}} + <div class="list-button" style="display: none;"> + <button class="btn btn-danger btn-lg hover-undeploy" + type="button" + id="{{applicationId}}"> Undeploy + </button> <button class="btn btn-info btn-lg hover-details" type="button" - id="details_{{applicationId}}" - data-url="{{url ""}}/applications/{{applicationId}}/" > View + id="details_list_{{applicationId}}" + data-url="{{url ""}}/applications/{{applicationId}}/"> + View </button> {{#if multiTenant}} {{#if signUpsExist}} - <button class="btn btn-warning btn-lg hover-remove-signup" type="button" + <button class="btn btn-warning btn-lg hover-remove-signup" + type="button" id="{{applicationId}}" - data-appid='{{applicationName}}' >Remove Signup + data-appid='{{applicationName}}'>Remove Signup </button> {{else}} - <button class="btn btn-warning btn-lg hover-signup" type="button" + <button class="btn btn-warning btn-lg hover-signup" + type="button" id="signup_{{applicationId}}" - data-url="{{url ""}}/applications/{{applicationId}}/signup" > Signup + data-url="{{url ""}}/applications/{{applicationId}}/signup"> + Signup </button> {{/if}} {{/if}} </div> + <div class="bottom-bar-wrapper"> + <div class="bottom-bar"> + <button class="btn btn-danger btn-lg hover-undeploy" + type="button" + id="{{applicationId}}"> Undeploy + </button> + <button class="btn btn-info btn-lg hover-details" type="button" + id="details_{{applicationId}}" + data-url="{{url ""}}/applications/{{applicationId}}/"> + View + </button> + {{#if multiTenant}} + {{#if signUpsExist}} + <button class="btn btn-warning btn-lg hover-remove-signup" + type="button" + id="{{applicationId}}" + data-appid='{{applicationName}}'>Remove Signup + </button> + {{else}} + <button class="btn btn-warning btn-lg hover-signup" + type="button" + id="signup_{{applicationId}}" + data-url="{{url ""}}/applications/{{applicationId}}/signup"> + Signup + </button> + {{/if}} + {{/if}} {{else}} <div class="list-button" style="display: none;"> <button class="btn btn-info btn-lg hover-details" type="button" @@ -168,50 +234,60 @@ </div> <div class="bottom-bar-wrapper"> <div class="bottom-bar"> - <button class="btn btn-info btn-lg hover-details" type="button" + <button class="btn btn-info btn-lg hover-details" + type="button" id="details_{{applicationId}}" - data-url="{{url ""}}/applications/{{applicationId}}/" > View + data-url="{{url ""}}/applications/{{applicationId}}/"> + View </button> </div> {{/ifCond}} - </div> - {{else}} - <div class="list-button" style="display: none;"> + {{/ifCond}} + </div> + {{else}} + <div class="list-button" style="display: none;"> + <button class="btn btn-danger btn-lg hover-delete" type="button" + id="{{applicationId}}" data-alias="{{alias}}"> Delete + </button> + <button class="btn btn-info btn-lg hover-details" type="button" + id="details_list_{{applicationId}}" + data-url="{{url ""}}/applications/{{applicationId}}/view"> + View + </button> + <button class="btn btn-warning btn-lg hover-details" type="button" + id="details_{{applicationId}}" + data-url="{{url ""}}/applications/{{applicationId}}/deploy"> + Deploy + </button> + </div> + <div class="bottom-bar-wrapper"> + <div class="bottom-bar"> <button class="btn btn-danger btn-lg hover-delete" type="button" - id="{{applicationId}}" data-alias="{{alias}}"> Delete</button> + id="{{applicationId}}" data-alias="{{alias}}"> Delete + </button> <button class="btn btn-info btn-lg hover-details" type="button" - id="details_list_{{applicationId}}" - data-url="{{url ""}}/applications/{{applicationId}}/view" > View + id="details_{{applicationId}}" + data-url="{{url ""}}/applications/{{applicationId}}/view"> + View </button> - <button class="btn btn-warning btn-lg hover-details" type="button" + <button class="btn btn-warning btn-lg hover-details" + type="button" id="details_{{applicationId}}" - data-url="{{url ""}}/applications/{{applicationId}}/deploy" > Deploy + data-url="{{url ""}}/applications/{{applicationId}}/deploy"> + Deploy </button> - </div> - <div class="bottom-bar-wrapper"> - <div class="bottom-bar"> - <button class="btn btn-danger btn-lg hover-delete" type="button" - id="{{applicationId}}" data-alias="{{alias}}"> Delete</button> - <button class="btn btn-info btn-lg hover-details" type="button" - id="details_{{applicationId}}" - data-url="{{url ""}}/applications/{{applicationId}}/view" > View - </button> - <button class="btn btn-warning btn-lg hover-details" type="button" - id="details_{{applicationId}}" - data-url="{{url ""}}/applications/{{applicationId}}/deploy" > Deploy - </button> - </div> </div> - {{/ifCond}} - </div> + </div> + {{/ifCond}} + </div> {{/each}} {{/ifCond}} </div> + </div> </div> - </div> {{/if}} -<script> + <script> $(document).ready(function () { //handled Ajax base session expire issue http://git-wip-us.apache.org/repos/asf/stratos/blob/56d86560/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java index b8bab43..b682884 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java @@ -108,7 +108,6 @@ public class StratosApiV41Utils { public static final String APPLICATION_STATUS_CREATED = "Created"; public static final String APPLICATION_STATUS_UNDEPLOYING = "Undeploying"; public static final String KUBERNETES_IAAS_PROVIDER = "kubernetes"; - public static final String APPLICATION_STATUS_ACTIVE = "Active"; private static final String METADATA_REG_PATH = "metadata/"; http://git-wip-us.apache.org/repos/asf/stratos/blob/56d86560/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java index ac32305..07a95ac 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java @@ -48,6 +48,7 @@ import org.apache.stratos.manager.service.stub.domain.application.signup.Applica import org.apache.stratos.manager.service.stub.domain.application.signup.ArtifactRepository; import org.apache.stratos.manager.service.stub.domain.application.signup.DomainMapping; import org.apache.stratos.messaging.domain.application.Application; +import org.apache.stratos.messaging.domain.application.ApplicationStatus; import org.apache.stratos.messaging.domain.application.Group; import org.apache.stratos.messaging.domain.instance.ApplicationInstance; import org.apache.stratos.messaging.domain.instance.ClusterInstance; @@ -55,6 +56,7 @@ import org.apache.stratos.messaging.domain.instance.GroupInstance; import org.apache.stratos.messaging.domain.topology.Cluster; import org.apache.stratos.messaging.domain.topology.KubernetesService; import org.apache.stratos.messaging.domain.topology.Port; +import org.apache.stratos.messaging.message.receiver.application.ApplicationManager; import org.apache.stratos.rest.endpoint.exception.ServiceGroupDefinitionException; import org.wso2.carbon.stratos.common.beans.TenantInfoBean; @@ -62,6 +64,8 @@ import java.util.*; public class ObjectConverter { + private static final String APPLICATION_STATUS_ACTIVE = "Active"; + public static Cartridge convertCartridgeBeanToStubCartridgeConfig( CartridgeBean cartridgeBean) { @@ -1147,15 +1151,18 @@ public class ObjectConverter { if (applicationContext == null) { return null; } - + Application application = ApplicationManager.getApplications().getApplication(applicationContext.getApplicationId()); ApplicationBean applicationDefinition = new ApplicationBean(); applicationDefinition.setApplicationId(applicationContext.getApplicationId()); applicationDefinition.setAlias(applicationContext.getAlias()); applicationDefinition.setMultiTenant(applicationContext.getMultiTenant()); applicationDefinition.setName(applicationContext.getName()); applicationDefinition.setDescription(applicationContext.getDescription()); - applicationDefinition.setStatus(applicationContext.getStatus()); - + if (application.getStatus().name().equals(APPLICATION_STATUS_ACTIVE)) { + applicationDefinition.setStatus(application.getStatus().name()); + } else { + applicationDefinition.setStatus(applicationContext.getStatus()); + } // convert and set components if (applicationContext.getComponents() != null) { applicationDefinition.setComponents(new ComponentBean());
