Merge pull request #1152 from jwforres/statefulset-filter

Merged by openshift-bot

Author: OpenShift Bot

Diff for: app/scripts/controllers/statefulSets.js

@@ -1,9 +1,10 @@
 'use strict';
 
 angular.module('openshiftConsole')
-  .controller('StatefulSetsController', function($scope, $routeParams, AlertMessageService, DataService, ProjectsService) {
+  .controller('StatefulSetsController', function($scope, $routeParams, AlertMessageService, DataService, ProjectsService, LabelFilter) {
     $scope.projectName = $routeParams.project;
     $scope.alerts = $scope.alerts || {};
+    $scope.labelSuggestions = {};
     $scope.emptyMessage = "Loading...";
 
     // get and clear any alerts
@@ -25,10 +26,34 @@ angular.module('openshiftConsole')
         }, context, function(statefulSets) {
           angular.extend($scope, {
             loaded: true,
-            statefulSets: statefulSets.by('metadata.name')
+            unfilteredStatefulSets: statefulSets.by('metadata.name')
           });
+          $scope.statefulSets = LabelFilter.getLabelSelector().select($scope.unfilteredStatefulSets);
+          LabelFilter.addLabelSuggestionsFromResources($scope.unfilteredStatefulSets, $scope.labelSuggestions);
+          LabelFilter.setLabelSuggestions($scope.labelSuggestions);
+          updateFilterWarning();
         }));
 
+        function updateFilterWarning() {
+          if (!LabelFilter.getLabelSelector().isEmpty() && $.isEmptyObject($scope.statefulSets) && !$.isEmptyObject($scope.unfilteredStatefulSets)) {
+            $scope.alerts["statefulsets"] = {
+              type: "warning",
+              details: "The active filters are hiding all stateful sets."
+            };
+          }
+          else {
+            delete $scope.alerts["statefulsets"];
+          }
+        }
+
+        LabelFilter.onActiveFiltersChanged(function(labelSelector) {
+          // trigger a digest loop
+          $scope.$apply(function() {
+            $scope.statefulSets = labelSelector.select($scope.unfilteredStatefulSets);
+            updateFilterWarning();
+          });
+        });
+
         $scope.$on('$destroy', function(){
           DataService.unwatchAll(watches);
         });

Diff for: app/views/browse/stateful-sets.html

@@ -7,7 +7,6 @@
       <div class="middle-header header-toolbar">
         <div class="container-fluid">
           <breadcrumbs breadcrumbs="breadcrumbs"></breadcrumbs>
-          <alerts alerts="alerts"></alerts>
           <div class="page-header page-header-bleed-right page-header-bleed-left">
             <h1>
               Stateful Sets
@@ -20,11 +19,17 @@ <h1>
               -->
             </h1>
           </div>
+          <div ng-if="!renderOptions.showGetStarted" class="data-toolbar">
+            <div class="data-toolbar-filter">
+              <project-filter></project-filter>
+            </div>
+          </div>
         </div>
       </div>
 
       <div class="middle-content" persist-tab-state>
         <div class="container-fluid">
+          <alerts alerts="alerts"></alerts>
           <div ng-if="!loaded">Loading...</div>
           <div class="row" ng-if="loaded">
             <div class="col-md-12">

Diff for: dist/scripts/scripts.js

@@ -6483,23 +6483,33 @@ e.then(g);
 g.unwatchAll(w);
 });
 }));
-} ]), angular.module("openshiftConsole").controller("StatefulSetsController", [ "$scope", "$routeParams", "AlertMessageService", "DataService", "ProjectsService", function(a, b, c, d, e) {
-a.projectName = b.project, a.alerts = a.alerts || {}, a.emptyMessage = "Loading...", c.getAlerts().forEach(function(b) {
+} ]), angular.module("openshiftConsole").controller("StatefulSetsController", [ "$scope", "$routeParams", "AlertMessageService", "DataService", "ProjectsService", "LabelFilter", function(a, b, c, d, e, f) {
+a.projectName = b.project, a.alerts = a.alerts || {}, a.labelSuggestions = {}, a.emptyMessage = "Loading...", c.getAlerts().forEach(function(b) {
 a.alerts[b.name] = b.data;
 }), c.clearAlerts();
-var f = [];
+var g = [];
 e.get(b.project).then(_.spread(function(b, c) {
-a.project = b, f.push(d.watch({
+function e() {
+f.getLabelSelector().isEmpty() || !$.isEmptyObject(a.statefulSets) || $.isEmptyObject(a.unfilteredStatefulSets) ? delete a.alerts.statefulsets :a.alerts.statefulsets = {
+type:"warning",
+details:"The active filters are hiding all stateful sets."
+};
+}
+a.project = b, g.push(d.watch({
 resource:"statefulsets",
 group:"apps",
 version:"v1beta1"
 }, c, function(b) {
 angular.extend(a, {
 loaded:!0,
-statefulSets:b.by("metadata.name")
+unfilteredStatefulSets:b.by("metadata.name")
+}), a.statefulSets = f.getLabelSelector().select(a.unfilteredStatefulSets), f.addLabelSuggestionsFromResources(a.unfilteredStatefulSets, a.labelSuggestions), f.setLabelSuggestions(a.labelSuggestions), e();
+})), f.onActiveFiltersChanged(function(b) {
+a.$apply(function() {
+a.statefulSets = b.select(a.unfilteredStatefulSets), e();
 });
-})), a.$on("$destroy", function() {
-d.unwatchAll(f);
+}), a.$on("$destroy", function() {
+d.unwatchAll(g);
 });
 }));
 } ]), angular.module("openshiftConsole").controller("StatefulSetController", [ "$filter", "$scope", "$routeParams", "AlertMessageService", "BreadcrumbsService", "DataService", "MetricsService", "ProjectsService", function(a, b, c, d, e, f, g, h) {

Diff for: dist/scripts/templates.js

@@ -4179,17 +4179,22 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<div class=\"middle-header header-toolbar\">\n" +
     "<div class=\"container-fluid\">\n" +
     "<breadcrumbs breadcrumbs=\"breadcrumbs\"></breadcrumbs>\n" +
-    "<alerts alerts=\"alerts\"></alerts>\n" +
     "<div class=\"page-header page-header-bleed-right page-header-bleed-left\">\n" +
     "<h1>\n" +
     "Stateful Sets\n" +
     "\n" +
     "</h1>\n" +
     "</div>\n" +
+    "<div ng-if=\"!renderOptions.showGetStarted\" class=\"data-toolbar\">\n" +
+    "<div class=\"data-toolbar-filter\">\n" +
+    "<project-filter></project-filter>\n" +
+    "</div>\n" +
+    "</div>\n" +
     "</div>\n" +
     "</div>\n" +
     "<div class=\"middle-content\" persist-tab-state>\n" +
     "<div class=\"container-fluid\">\n" +
+    "<alerts alerts=\"alerts\"></alerts>\n" +
     "<div ng-if=\"!loaded\">Loading...</div>\n" +
     "<div class=\"row\" ng-if=\"loaded\">\n" +
     "<div class=\"col-md-12\">\n" +