Skip to content

Commit 75d1c56

Browse files
author
OpenShift Bot
authored
Merge pull request #1446 from spadgett/pipeline-other-resources
Merged by openshift-bot
2 parents 69c571a + 1d40a78 commit 75d1c56

File tree

3 files changed

+44
-44
lines changed

3 files changed

+44
-44
lines changed

‎app/views/new-overview.html

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -310,47 +310,47 @@ <h2>
310310
hide-pipelines="true">
311311
</overview-list-row>
312312
</div>
313+
</div>
313314

314-
<!-- Currently we only filter the pipelines. -->
315-
<div class="list-pf" ng-if="overview.pipelineViewHasOtherResources && !overview.filterActive">
316-
<h2>Other Resources</h2>
317-
<overview-list-row
318-
ng-repeat="deploymentConfig in overview.deploymentConfigsNoPipeline track by (deploymentConfig | uid)"
319-
ng-init="dcName = deploymentConfig.metadata.name"
320-
api-object="deploymentConfig"
321-
current="overview.currentByDeploymentConfig[dcName]"
322-
previous="overview.getPreviousReplicationController(deploymentConfig)"
323-
state="overview.state">
324-
</overview-list-row>
325-
<overview-list-row
326-
ng-repeat="deployment in overview.deployments track by (deployment | uid)"
327-
api-object="deployment"
328-
current="overview.currentByDeployment[deployment.metadata.name]"
329-
previous="overview.replicaSetsByDeployment[deployment.metadata.name][1]"
330-
state="overview.state">
331-
</overview-list-row>
332-
<overview-list-row
333-
ng-repeat="replicationController in overview.vanillaReplicationControllers track by (replicationController | uid)"
334-
api-object="replicationController"
335-
current="replicationController"
336-
state="overview.state">
337-
</overview-list-row>
338-
<overview-list-row
339-
ng-repeat="replicaSet in overview.vanillaReplicaSets track by (replicaSet | uid)"
340-
api-object="replicaSet"
341-
state="overview.state">
342-
</overview-list-row>
343-
<overview-list-row
344-
ng-repeat="statefulSet in overview.statefulSets track by (statefulSet | uid)"
345-
api-object="statefulSet"
346-
state="overview.state">
347-
</overview-list-row>
348-
<overview-list-row
349-
ng-repeat="pod in overview.monopods track by (pod | uid)"
350-
api-object="pod"
351-
state="overview.state">
352-
</overview-list-row>
353-
</div>
315+
<!-- 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. -->
316+
<div class="list-pf" ng-if="overview.pipelineBuildConfigs.length && overview.pipelineViewHasOtherResources && !overview.filterActive">
317+
<h2>Other Resources</h2>
318+
<overview-list-row
319+
ng-repeat="deploymentConfig in overview.deploymentConfigsNoPipeline track by (deploymentConfig | uid)"
320+
ng-init="dcName = deploymentConfig.metadata.name"
321+
api-object="deploymentConfig"
322+
current="overview.currentByDeploymentConfig[dcName]"
323+
previous="overview.getPreviousReplicationController(deploymentConfig)"
324+
state="overview.state">
325+
</overview-list-row>
326+
<overview-list-row
327+
ng-repeat="deployment in overview.deployments track by (deployment | uid)"
328+
api-object="deployment"
329+
current="overview.currentByDeployment[deployment.metadata.name]"
330+
previous="overview.replicaSetsByDeployment[deployment.metadata.name][1]"
331+
state="overview.state">
332+
</overview-list-row>
333+
<overview-list-row
334+
ng-repeat="replicationController in overview.vanillaReplicationControllers track by (replicationController | uid)"
335+
api-object="replicationController"
336+
current="replicationController"
337+
state="overview.state">
338+
</overview-list-row>
339+
<overview-list-row
340+
ng-repeat="replicaSet in overview.vanillaReplicaSets track by (replicaSet | uid)"
341+
api-object="replicaSet"
342+
state="overview.state">
343+
</overview-list-row>
344+
<overview-list-row
345+
ng-repeat="statefulSet in overview.statefulSets track by (statefulSet | uid)"
346+
api-object="statefulSet"
347+
state="overview.state">
348+
</overview-list-row>
349+
<overview-list-row
350+
ng-repeat="pod in overview.monopods track by (pod | uid)"
351+
api-object="pod"
352+
state="overview.state">
353+
</overview-list-row>
354354
</div>
355355
</div>
356356

‎app/views/pipelines.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ <h2>{{buildConfigName}}</h2>
8484
</div>
8585
</div>
8686
<div ng-if="buildsLoaded && !(interestingBuildsByConfig[buildConfigName] | hashSize)">
87-
<p>
87+
<p class="mar-bottom-xxl">
8888
No pipeline builds have run for {{buildConfigName}}.
8989
<span ng-if="buildConfig.spec.strategy.jenkinsPipelineStrategy.jenkinsfile">
9090
View the <a ng-href="{{(buildConfig | navigateResourceURL) + '?tab=configuration'}}">Jenkinsfile</a> to see what stages will run.

‎dist/scripts/templates.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11538,8 +11538,9 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
1153811538
"<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" +
1153911539
"</overview-list-row>\n" +
1154011540
"</div>\n" +
11541+
"</div>\n" +
1154111542
"\n" +
11542-
"<div class=\"list-pf\" ng-if=\"overview.pipelineViewHasOtherResources && !overview.filterActive\">\n" +
11543+
"<div class=\"list-pf\" ng-if=\"overview.pipelineBuildConfigs.length && overview.pipelineViewHasOtherResources && !overview.filterActive\">\n" +
1154311544
"<h2>Other Resources</h2>\n" +
1154411545
"<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" +
1154511546
"</overview-list-row>\n" +
@@ -11555,7 +11556,6 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
1155511556
"</overview-list-row>\n" +
1155611557
"</div>\n" +
1155711558
"</div>\n" +
11558-
"</div>\n" +
1155911559
"\n" +
1156011560
"<div ng-if=\"overview.state.serviceInstances | hashSize\">\n" +
1156111561
"<h2 ng-if=\"overview.state.serviceInstances\">\n" +
@@ -12991,7 +12991,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
1299112991
"</div>\n" +
1299212992
"</div>\n" +
1299312993
"<div ng-if=\"buildsLoaded && !(interestingBuildsByConfig[buildConfigName] | hashSize)\">\n" +
12994-
"<p>\n" +
12994+
"<p class=\"mar-bottom-xxl\">\n" +
1299512995
"No pipeline builds have run for {{buildConfigName}}.\n" +
1299612996
"<span ng-if=\"buildConfig.spec.strategy.jenkinsPipelineStrategy.jenkinsfile\">\n" +
1299712997
"View the <a ng-href=\"{{(buildConfig | navigateResourceURL) + '?tab=configuration'}}\">Jenkinsfile</a> to see what stages will run.\n" +

0 commit comments

Comments
 (0)