From 1cb64e0e8718feaad1a0b6e22655cfd3bb091e4d Mon Sep 17 00:00:00 2001
From: Chris Hale <chris.hale@me.com>
Date: Thu, 16 Nov 2017 11:42:16 -0700
Subject: [PATCH 1/5] Changed where Generic objects list gets rendered on
 screen.

---
 .../service-details/service-details.html      | 32 +++++++++++--------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/client/app/services/service-details/service-details.html b/client/app/services/service-details/service-details.html
index 6e22fb286..8819f697f 100644
--- a/client/app/services/service-details/service-details.html
+++ b/client/app/services/service-details/service-details.html
@@ -347,24 +347,28 @@ <h2 translate>Resources</h2>
                             </pf-list-view>
                         </div>
                     </li>
-                    <li class="list-group-item service-details-resource-group-item"
-                        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}}
-                        </a>
-                        <div class="service-details-resource-list-container"
-                             ng-class="{'collapse': !genericObject.isExpanded}">
-                            <generic-objects-list generic-object="genericObject"
-                                                  on-update="vm.setGenericObjectViewState(object)"></generic-objects-list>
-                        </div>
-                    </li>
                 </ul>
             </section>
+
         </div>
     </div>
-
+    <div ng-if="vm.genericObjects.length > 0">
+            <ul class="list-group service-details-resources">
+                    <li class="list-group-item service-details-resource-group-item"
+                    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}}
+                    </a>
+                    <div class="service-details-resource-list-container"
+                         ng-class="{'collapse': !genericObject.isExpanded}">
+                        <generic-objects-list generic-object="genericObject"
+                                              on-update="vm.setGenericObjectViewState(object)"></generic-objects-list>
+                    </div>
+                </li>
+            </ul>
+    </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">

From 44ba9d995dcb7c67dda3b07bb82496fc8f6dd873 Mon Sep 17 00:00:00 2001
From: Chris Hale <chris.hale@me.com>
Date: Thu, 16 Nov 2017 11:53:39 -0700
Subject: [PATCH 2/5] Updated based on PR feedback

---
 client/app/services/service-details/service-details.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/client/app/services/service-details/service-details.html b/client/app/services/service-details/service-details.html
index 8819f697f..a527234c5 100644
--- a/client/app/services/service-details/service-details.html
+++ b/client/app/services/service-details/service-details.html
@@ -349,10 +349,9 @@ <h2 translate>Resources</h2>
                     </li>
                 </ul>
             </section>
-
         </div>
     </div>
-    <div ng-if="vm.genericObjects.length > 0">
+    <div ng-if="vm.genericObjects.length">
             <ul class="list-group service-details-resources">
                     <li class="list-group-item service-details-resource-group-item"
                     ng-repeat="genericObject in vm.genericObjects">

From 7570a6d41c54f2517084ba29432fae36249a8b12 Mon Sep 17 00:00:00 2001
From: Chris Hale <chris.hale@me.com>
Date: Thu, 16 Nov 2017 12:09:53 -0700
Subject: [PATCH 3/5] Updated how the Generic Objects are grouped under
 Resources

---
 .../service-details/service-details.html      | 36 +++++++++----------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/client/app/services/service-details/service-details.html b/client/app/services/service-details/service-details.html
index a527234c5..10001d238 100644
--- 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}"
@@ -348,25 +348,23 @@ <h2 translate>Resources</h2>
                         </div>
                     </li>
                 </ul>
-            </section>
-        </div>
-    </div>
-    <div ng-if="vm.genericObjects.length">
-            <ul class="list-group service-details-resources">
+                <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">
-                    <a class="service-details-resource-group-title"
-                       ng-class="{'collapsed': !genericObject.isExpanded}"
-                       ng-click="vm.toggleOpenGenericObjects(genericObject)">
-                        {{genericObject.name}}
-                    </a>
-                    <div class="service-details-resource-list-container"
-                         ng-class="{'collapse': !genericObject.isExpanded}">
-                        <generic-objects-list generic-object="genericObject"
-                                              on-update="vm.setGenericObjectViewState(object)"></generic-objects-list>
-                    </div>
-                </li>
-            </ul>
+                        <a class="service-details-resource-group-title"
+                            ng-class="{'collapsed': !genericObject.isExpanded}"
+                            ng-click="vm.toggleOpenGenericObjects(genericObject)">
+                            {{genericObject.name}}
+                        </a>
+                        <div class="service-details-resource-list-container"
+                                ng-class="{'collapse': !genericObject.isExpanded}">
+                            <generic-objects-list generic-object="genericObject"
+                                                    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>

From 9d7383768fdc6789a60d376bd2e92618c101c758 Mon Sep 17 00:00:00 2001
From: Chris Hale <chris.hale@me.com>
Date: Thu, 30 Nov 2017 11:56:48 -0700
Subject: [PATCH 4/5] Added Object count to Generic Objects

---
 .../app/services/service-details/service-details.component.js   | 1 +
 client/app/services/service-details/service-details.html        | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/app/services/service-details/service-details.component.js b/client/app/services/service-details/service-details.component.js
index 8373ad506..acb2b6bd2 100644
--- a/client/app/services/service-details/service-details.component.js
+++ b/client/app/services/service-details/service-details.component.js
@@ -125,6 +125,7 @@ function ComponentController ($stateParams, $state, $window, CollectionsApi, Eve
       }
       object.isExpanded = objectViewState
       object.properties = lodash.chunk(properties, 3)
+      object.count = properties.length
       genericObjects[genericObjectType].objects.push(object)
     })
 
diff --git a/client/app/services/service-details/service-details.html b/client/app/services/service-details/service-details.html
index 10001d238..52afc3a65 100644
--- a/client/app/services/service-details/service-details.html
+++ b/client/app/services/service-details/service-details.html
@@ -354,7 +354,7 @@ <h2 translate>Resources</h2>
                         <a class="service-details-resource-group-title"
                             ng-class="{'collapsed': !genericObject.isExpanded}"
                             ng-click="vm.toggleOpenGenericObjects(genericObject)">
-                            {{genericObject.name}}
+                            {{genericObject.name}} ({{genericObject.count}})
                         </a>
                         <div class="service-details-resource-list-container"
                                 ng-class="{'collapse': !genericObject.isExpanded}">

From f95d7145e4ab8f331029622b7ed5a543d1a31336 Mon Sep 17 00:00:00 2001
From: Chris Hale <chris.hale@me.com>
Date: Mon, 4 Dec 2017 09:46:17 -0700
Subject: [PATCH 5/5] Updated how the generic objects list is counted

---
 .../app/services/service-details/service-details.component.js   | 1 -
 client/app/services/service-details/service-details.html        | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/client/app/services/service-details/service-details.component.js b/client/app/services/service-details/service-details.component.js
index acb2b6bd2..8373ad506 100644
--- a/client/app/services/service-details/service-details.component.js
+++ b/client/app/services/service-details/service-details.component.js
@@ -125,7 +125,6 @@ function ComponentController ($stateParams, $state, $window, CollectionsApi, Eve
       }
       object.isExpanded = objectViewState
       object.properties = lodash.chunk(properties, 3)
-      object.count = properties.length
       genericObjects[genericObjectType].objects.push(object)
     })
 
diff --git a/client/app/services/service-details/service-details.html b/client/app/services/service-details/service-details.html
index 52afc3a65..6097234e2 100644
--- a/client/app/services/service-details/service-details.html
+++ b/client/app/services/service-details/service-details.html
@@ -354,7 +354,7 @@ <h2 translate>Resources</h2>
                         <a class="service-details-resource-group-title"
                             ng-class="{'collapsed': !genericObject.isExpanded}"
                             ng-click="vm.toggleOpenGenericObjects(genericObject)">
-                            {{genericObject.name}} ({{genericObject.count}})
+                            {{genericObject.name}} ({{genericObject.objects.length}})
                         </a>
                         <div class="service-details-resource-list-container"
                                 ng-class="{'collapse': !genericObject.isExpanded}">