Merge pull request #1246 from chalettu/Generic-objects-list

Changed where Generic objects list gets rendered on Service details screen
ManageIQ · Dec 7, 2017 · 32ca812 · 32ca812
2 parents 9d488a8 + f95d714
commit 32ca812
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/client/app/services/service-details/service-details.html b/client/app/services/service-details/service-details.html
@@ -130,12 +130,12 @@ <h2 translate>Properties</h2>
             </section>
         </div>
     </div>
-    <div ng-if="vm.service.vms.length"
+    <div ng-if="vm.service.vms.length || vm.genericObjects.length"
          class="panel panel-default ss-details-panel">
         <div class="panel-body">
             <section>
                 <h2 translate>Resources</h2>
-                <ul class="list-group service-details-resources">
+                <ul class="list-group service-details-resources" ng-if="vm.service.vms.length">
                     <li class="list-group-item service-details-resource-group-item">
                         <a class="service-details-resource-group-title"
                            ng-class="{'collapsed': !vm.computeGroup.open}"
@@ -347,24 +347,25 @@ <h2 translate>Resources</h2>
                             </pf-list-view>
                         </div>
                     </li>
+                </ul>
+                <ul class="list-group service-details-resources" ng-if="vm.genericObjects.length">
                     <li class="list-group-item service-details-resource-group-item"
-                        ng-repeat="genericObject in vm.genericObjects">
+                    ng-repeat="genericObject in vm.genericObjects">
                         <a class="service-details-resource-group-title"
-                           ng-class="{'collapsed': !genericObject.isExpanded}"
-                           ng-click="vm.toggleOpenGenericObjects(genericObject)">
-                            {{genericObject.name}}
+                            ng-class="{'collapsed': !genericObject.isExpanded}"
+                            ng-click="vm.toggleOpenGenericObjects(genericObject)">
+                            {{genericObject.name}} ({{genericObject.objects.length}})
                         </a>
                         <div class="service-details-resource-list-container"
-                             ng-class="{'collapse': !genericObject.isExpanded}">
+                                ng-class="{'collapse': !genericObject.isExpanded}">
                             <generic-objects-list generic-object="genericObject"
-                                                  on-update="vm.setGenericObjectViewState(object)"></generic-objects-list>
+                                                    on-update="vm.setGenericObjectViewState(object)"></generic-objects-list>
                         </div>
                     </li>
                 </ul>
             </section>
         </div>
     </div>
-
     <service-details-ansible ng-if="vm.service.type === 'ServiceAnsiblePlaybook' && vm.permissions.viewAnsible"
                              service="vm.service"></service-details-ansible>
     <div class="panel panel-default ss-details-panel relationships-panel">