Skip to content

Commit 68158fa

Browse files
spadgettspadgett
committed
Support filtering provisioned services on overview
1 parent 69c571a commit 68158fa

File tree

5 files changed

+22
-21
lines changed

5 files changed

+22
-21
lines changed

‎app/scripts/controllers/newOverview.js

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ function OverviewController($scope,
170170
_.size(overview.filteredReplicaSets) +
171171
_.size(overview.filteredStatefulSets) +
172172
_.size(overview.filteredMonopods) +
173-
_.size(overview.state.serviceInstances);
173+
_.size(overview.filteredServiceInstances);
174174
};
175175

176176
// Show the "Get Started" message if the project is empty.
@@ -301,11 +301,15 @@ function OverviewController($scope,
301301
};
302302

303303
var filterByLabel = function(items) {
304-
return LabelFilter.getLabelSelector().select(items);
304+
var labelSelector = LabelFilter.getLabelSelector();
305+
if (labelSelector.isEmpty()) {
306+
return items;
307+
}
308+
return labelSelector.select(items);
305309
};
306310

307311
// Updated on viewBy changes to include the app label when appropriate.
308-
var filterFields = ['metadata.name'];
312+
var filterFields = ['metadata.name', 'spec.serviceClassName'];
309313
var filterByName = function(items) {
310314
return KeywordService.filterForKeywords(items, filterFields, state.filterKeywords);
311315
};
@@ -338,6 +342,7 @@ function OverviewController($scope,
338342
overview.filteredStatefulSets = filterItems(overview.statefulSets);
339343
overview.filteredMonopods = filterItems(overview.monopods);
340344
overview.filteredPipelineBuildConfigs = filterItems(overview.pipelineBuildConfigs);
345+
overview.filteredServiceInstances = filterItems(state.orderedServiceInstances);
341346
overview.filterActive = isFilterActive();
342347
updateApps();
343348
updateShowGetStarted();
@@ -1293,7 +1298,6 @@ function OverviewController($scope,
12931298
state.bindings = bindings.by('metadata.name');
12941299
overview.bindingsByInstanceRef = _.groupBy(state.bindings, 'spec.instanceRef.name');
12951300
refreshSecrets(context);
1296-
updateFilter();
12971301
}, {poll: limitWatches, pollInterval: DEFAULT_POLL_INTERVAL}));
12981302
}
12991303

‎app/views/new-overview.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -355,13 +355,13 @@ <h2>Other Resources</h2>
355355
</div>
356356

357357
<!-- service instances appear the same way no matter the filter listBy option -->
358-
<div ng-if="overview.state.serviceInstances | hashSize">
359-
<h2 ng-if="overview.state.serviceInstances">
358+
<div ng-if="overview.filteredServiceInstances.length">
359+
<h2>
360360
Provisioned Services
361361
</h2>
362362
<div class="list-pf">
363363
<service-instance-row
364-
ng-repeat="serviceInstance in overview.state.orderedServiceInstances"
364+
ng-repeat="serviceInstance in overview.filteredServiceInstances"
365365
api-object="serviceInstance"
366366
bindings="overview.bindingsByInstanceRef[serviceInstance.metadata.name]"
367367
state="overview.state"></service-instance-row>

‎app/views/overview/_service-instance-row.html

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@
77
<div class="list-pf-name">
88
<h3>
99
<span ng-bind-html="row.displayName | highlightKeywords : row.state.filterKeywords"></span>
10-
<div class="list-row-longname">
11-
{{row.apiObject.metadata.name}}
12-
</div>
10+
<div ng-bind-html="row.apiObject.metadata.name | highlightKeywords : row.state.filterKeywords" class="list-row-longname"></div>
1311
</h3>
1412
<div class="status-icons">
1513
<notification-icon ng-if="!row.expanded" alerts="row.notifications"></notification-icon>

‎dist/scripts/scripts.js

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ return _.get(a, "metadata.uid");
5454
}, P = function() {
5555
return _.size(v.deploymentConfigs) + _.size(v.vanillaReplicationControllers) + _.size(v.deployments) + _.size(v.vanillaReplicaSets) + _.size(v.statefulSets) + _.size(v.monopods) + _.size(v.state.serviceInstances);
5656
}, Q = function() {
57-
return _.size(v.filteredDeploymentConfigs) + _.size(v.filteredReplicationControllers) + _.size(v.filteredDeployments) + _.size(v.filteredReplicaSets) + _.size(v.filteredStatefulSets) + _.size(v.filteredMonopods) + _.size(v.state.serviceInstances);
57+
return _.size(v.filteredDeploymentConfigs) + _.size(v.filteredReplicationControllers) + _.size(v.filteredDeployments) + _.size(v.filteredReplicaSets) + _.size(v.filteredStatefulSets) + _.size(v.filteredMonopods) + _.size(v.filteredServiceInstances);
5858
}, R = function() {
5959
v.size = P(), v.filteredSize = Q();
6060
var a = 0 === v.size, b = v.deploymentConfigs && v.replicationControllers && v.deployments && v.replicaSets && v.statefulSets && v.pods && v.state.serviceInstances;
@@ -98,8 +98,9 @@ v.deploymentConfigsNoPipeline = _.sortBy(a, "metadata.name"), v.pipelineViewHasO
9898
}, X = function() {
9999
v.disableFilter = "pipeline" === v.viewBy && _.isEmpty(v.pipelineBuildConfigs);
100100
}, Y = function(a) {
101-
return n.getLabelSelector().select(a);
102-
}, Z = [ "metadata.name" ], aa = function(a) {
101+
var b = n.getLabelSelector();
102+
return b.isEmpty() ? a :b.select(a);
103+
}, Z = [ "metadata.name", "spec.serviceClassName" ], aa = function(a) {
103104
return m.filterForKeywords(a, Z, L.filterKeywords);
104105
}, ba = function(a) {
105106
switch (v.filterBy) {
@@ -119,7 +120,7 @@ case "name":
119120
return !_.isEmpty(L.filterKeywords);
120121
}
121122
}, da = function() {
122-
v.filteredDeploymentConfigs = ba(v.deploymentConfigs), v.filteredReplicationControllers = ba(v.vanillaReplicationControllers), v.filteredDeployments = ba(v.deployments), v.filteredReplicaSets = ba(v.vanillaReplicaSets), v.filteredStatefulSets = ba(v.statefulSets), v.filteredMonopods = ba(v.monopods), v.filteredPipelineBuildConfigs = ba(v.pipelineBuildConfigs), v.filterActive = ca(), V(), R();
123+
v.filteredDeploymentConfigs = ba(v.deploymentConfigs), v.filteredReplicationControllers = ba(v.vanillaReplicationControllers), v.filteredDeployments = ba(v.deployments), v.filteredReplicaSets = ba(v.vanillaReplicaSets), v.filteredStatefulSets = ba(v.statefulSets), v.filteredMonopods = ba(v.monopods), v.filteredPipelineBuildConfigs = ba(v.pipelineBuildConfigs), v.filteredServiceInstances = ba(L.orderedServiceInstances), v.filterActive = ca(), V(), R();
123124
}, ea = c.project + "/overview/view-by";
124125
v.viewBy = localStorage.getItem(ea) || "app", a.$watch(function() {
125126
return v.viewBy;
@@ -469,7 +470,7 @@ pollInterval:x
469470
group:"servicecatalog.k8s.io",
470471
resource:"bindings"
471472
}, c, function(a) {
472-
L.bindings = a.by("metadata.name"), v.bindingsByInstanceRef = _.groupBy(L.bindings, "spec.instanceRef.name"), Va(c), da();
473+
L.bindings = a.by("metadata.name"), v.bindingsByInstanceRef = _.groupBy(L.bindings, "spec.instanceRef.name"), Va(c);
473474
}, {
474475
poll:w,
475476
pollInterval:x

‎dist/scripts/templates.js

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11557,12 +11557,12 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
1155711557
"</div>\n" +
1155811558
"</div>\n" +
1155911559
"\n" +
11560-
"<div ng-if=\"overview.state.serviceInstances | hashSize\">\n" +
11561-
"<h2 ng-if=\"overview.state.serviceInstances\">\n" +
11560+
"<div ng-if=\"overview.filteredServiceInstances.length\">\n" +
11561+
"<h2>\n" +
1156211562
"Provisioned Services\n" +
1156311563
"</h2>\n" +
1156411564
"<div class=\"list-pf\">\n" +
11565-
"<service-instance-row ng-repeat=\"serviceInstance in overview.state.orderedServiceInstances\" api-object=\"serviceInstance\" bindings=\"overview.bindingsByInstanceRef[serviceInstance.metadata.name]\" state=\"overview.state\"></service-instance-row>\n" +
11565+
"<service-instance-row ng-repeat=\"serviceInstance in overview.filteredServiceInstances\" api-object=\"serviceInstance\" bindings=\"overview.bindingsByInstanceRef[serviceInstance.metadata.name]\" state=\"overview.state\"></service-instance-row>\n" +
1156611566
"</div>\n" +
1156711567
"</div>\n" +
1156811568
"</div>\n" +
@@ -12710,9 +12710,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
1271012710
"<div class=\"list-pf-name\">\n" +
1271112711
"<h3>\n" +
1271212712
"<span ng-bind-html=\"row.displayName | highlightKeywords : row.state.filterKeywords\"></span>\n" +
12713-
"<div class=\"list-row-longname\">\n" +
12714-
"{{row.apiObject.metadata.name}}\n" +
12715-
"</div>\n" +
12713+
"<div ng-bind-html=\"row.apiObject.metadata.name | highlightKeywords : row.state.filterKeywords\" class=\"list-row-longname\"></div>\n" +
1271612714
"</h3>\n" +
1271712715
"<div class=\"status-icons\">\n" +
1271812716
"<notification-icon ng-if=\"!row.expanded\" alerts=\"row.notifications\"></notification-icon>\n" +

0 commit comments

Comments
 (0)