Merge pull request #1446 from spadgett/pipeline-other-resources

Merged by openshift-bot
openshift · Apr 19, 2017 · 75d1c56 · 75d1c56
2 parents 69c571a + 1d40a78
commit 75d1c56
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 44 deletions.
diff --git a/app/views/new-overview.html b/app/views/new-overview.html
@@ -310,47 +310,47 @@ <h2>
                          hide-pipelines="true">
                     </overview-list-row>
                   </div>
+                </div>
 
-                  <!-- Currently we only filter the pipelines. -->
-                  <div class="list-pf" ng-if="overview.pipelineViewHasOtherResources && !overview.filterActive">
-                    <h2>Other Resources</h2>
-                    <overview-list-row
-                         ng-repeat="deploymentConfig in overview.deploymentConfigsNoPipeline track by (deploymentConfig | uid)"
-                         ng-init="dcName = deploymentConfig.metadata.name"
-                         api-object="deploymentConfig"
-                         current="overview.currentByDeploymentConfig[dcName]"
-                         previous="overview.getPreviousReplicationController(deploymentConfig)"
-                         state="overview.state">
-                    </overview-list-row>
-                    <overview-list-row
-                         ng-repeat="deployment in overview.deployments track by (deployment | uid)"
-                         api-object="deployment"
-                         current="overview.currentByDeployment[deployment.metadata.name]"
-                         previous="overview.replicaSetsByDeployment[deployment.metadata.name][1]"
-                         state="overview.state">
-                    </overview-list-row>
-                    <overview-list-row
-                         ng-repeat="replicationController in overview.vanillaReplicationControllers track by (replicationController | uid)"
-                         api-object="replicationController"
-                         current="replicationController"
-                         state="overview.state">
-                    </overview-list-row>
-                    <overview-list-row
-                         ng-repeat="replicaSet in overview.vanillaReplicaSets track by (replicaSet | uid)"
-                         api-object="replicaSet"
-                         state="overview.state">
-                    </overview-list-row>
-                    <overview-list-row
-                         ng-repeat="statefulSet in overview.statefulSets track by (statefulSet | uid)"
-                         api-object="statefulSet"
-                         state="overview.state">
-                    </overview-list-row>
-                    <overview-list-row
-                         ng-repeat="pod in overview.monopods track by (pod | uid)"
-                         api-object="pod"
-                         state="overview.state">
-                    </overview-list-row>
-                  </div>
+                <!-- Currently we only filter the pipelines. Hide "Other Resources" if a pipeline filter is active or if we're showing the pipeline empty state message. -->
+                <div class="list-pf" ng-if="overview.pipelineBuildConfigs.length && overview.pipelineViewHasOtherResources && !overview.filterActive">
+                  <h2>Other Resources</h2>
+                  <overview-list-row
+                       ng-repeat="deploymentConfig in overview.deploymentConfigsNoPipeline track by (deploymentConfig | uid)"
+                       ng-init="dcName = deploymentConfig.metadata.name"
+                       api-object="deploymentConfig"
+                       current="overview.currentByDeploymentConfig[dcName]"
+                       previous="overview.getPreviousReplicationController(deploymentConfig)"
+                       state="overview.state">
+                  </overview-list-row>
+                  <overview-list-row
+                       ng-repeat="deployment in overview.deployments track by (deployment | uid)"
+                       api-object="deployment"
+                       current="overview.currentByDeployment[deployment.metadata.name]"
+                       previous="overview.replicaSetsByDeployment[deployment.metadata.name][1]"
+                       state="overview.state">
+                  </overview-list-row>
+                  <overview-list-row
+                       ng-repeat="replicationController in overview.vanillaReplicationControllers track by (replicationController | uid)"
+                       api-object="replicationController"
+                       current="replicationController"
+                       state="overview.state">
+                  </overview-list-row>
+                  <overview-list-row
+                       ng-repeat="replicaSet in overview.vanillaReplicaSets track by (replicaSet | uid)"
+                       api-object="replicaSet"
+                       state="overview.state">
+                  </overview-list-row>
+                  <overview-list-row
+                       ng-repeat="statefulSet in overview.statefulSets track by (statefulSet | uid)"
+                       api-object="statefulSet"
+                       state="overview.state">
+                  </overview-list-row>
+                  <overview-list-row
+                       ng-repeat="pod in overview.monopods track by (pod | uid)"
+                       api-object="pod"
+                       state="overview.state">
+                  </overview-list-row>
                 </div>
               </div>
 

diff --git a/app/views/pipelines.html b/app/views/pipelines.html
@@ -84,7 +84,7 @@ <h2>{{buildConfigName}}</h2>
                 </div>
               </div>
               <div ng-if="buildsLoaded && !(interestingBuildsByConfig[buildConfigName] | hashSize)">
-                <p>
+                <p class="mar-bottom-xxl">
                   No pipeline builds have run for {{buildConfigName}}.
                   <span ng-if="buildConfig.spec.strategy.jenkinsPipelineStrategy.jenkinsfile">
                     View the <a ng-href="{{(buildConfig | navigateResourceURL) + '?tab=configuration'}}">Jenkinsfile</a> to see what stages will run.

diff --git a/dist/scripts/templates.js b/dist/scripts/templates.js
@@ -11538,8 +11538,9 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<overview-list-row ng-repeat=\"dcName in overview.deploymentConfigsByPipeline[pipeline.metadata.name]\" api-object=\"overview.deploymentConfigs[dcName]\" current=\"overview.currentByDeploymentConfig[dcName]\" previous=\"overview.getPreviousReplicationController(deploymentConfig)\" state=\"overview.state\" hide-pipelines=\"true\">\n" +
     "</overview-list-row>\n" +
     "</div>\n" +
+    "</div>\n" +
     "\n" +
-    "<div class=\"list-pf\" ng-if=\"overview.pipelineViewHasOtherResources && !overview.filterActive\">\n" +
+    "<div class=\"list-pf\" ng-if=\"overview.pipelineBuildConfigs.length && overview.pipelineViewHasOtherResources && !overview.filterActive\">\n" +
     "<h2>Other Resources</h2>\n" +
     "<overview-list-row ng-repeat=\"deploymentConfig in overview.deploymentConfigsNoPipeline track by (deploymentConfig | uid)\" ng-init=\"dcName = deploymentConfig.metadata.name\" api-object=\"deploymentConfig\" current=\"overview.currentByDeploymentConfig[dcName]\" previous=\"overview.getPreviousReplicationController(deploymentConfig)\" state=\"overview.state\">\n" +
     "</overview-list-row>\n" +
@@ -11555,7 +11556,6 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</overview-list-row>\n" +
     "</div>\n" +
     "</div>\n" +
-    "</div>\n" +
     "\n" +
     "<div ng-if=\"overview.state.serviceInstances | hashSize\">\n" +
     "<h2 ng-if=\"overview.state.serviceInstances\">\n" +
@@ -12991,7 +12991,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</div>\n" +
     "</div>\n" +
     "<div ng-if=\"buildsLoaded && !(interestingBuildsByConfig[buildConfigName] | hashSize)\">\n" +
-    "<p>\n" +
+    "<p class=\"mar-bottom-xxl\">\n" +
     "No pipeline builds have run for {{buildConfigName}}.\n" +
     "<span ng-if=\"buildConfig.spec.strategy.jenkinsPipelineStrategy.jenkinsfile\">\n" +
     "View the <a ng-href=\"{{(buildConfig | navigateResourceURL) + '?tab=configuration'}}\">Jenkinsfile</a> to see what stages will run.\n" +