Merge pull request #800 from benjaminapetersen/membership-list-update

Merged by openshift-bot

Author: OpenShift Bot

app/scripts/controllers/membership.js

@@ -71,15 +71,16 @@ angular
 
       var refreshRoleBindingList = function() {
         DataService
-          .list('rolebindings', requestContext, function(resp) {
+          .list('rolebindings', requestContext, null , {
+            errorNotification: false
+          })
+          .then(function(resp) {
             angular.extend($scope, {
               canShowRoles: true,
               roleBindings: resp.by('metadata.name'),
               subjectKindsForUI: MembershipService.mapRolebindingsForUI(resp.by('metadata.name'), allRoles)
             });
-            resetForm();
-          }, {
-            errorNotification: false
+			      resetForm();
           });
       };
 
@@ -211,21 +212,23 @@ angular
         });
 
 
-      DataService.list('projects', {}, function(resp) {
-        var projects = _.map(resp.by('metadata.name'), function(project) {
-          return project.metadata.name;
-        });
-        angular.extend($scope, {
-          projects: projects,
-          refreshProjects: function(search) {
-            if(search && !_.includes($scope.projects, search)) {
-              $scope.projects = [search].concat(projects);
-            } else {
-              $scope.projects = projects;
+      DataService
+        .list('projects', {})
+        .then(function(resp) {
+          var projects = _.map(resp.by('metadata.name'), function(project) {
+            return project.metadata.name;
+          });
+          angular.extend($scope, {
+            projects: projects,
+            refreshProjects: function(search) {
+              if(search && !_.includes($scope.projects, search)) {
+                $scope.projects = [search].concat(projects);
+              } else {
+                $scope.projects = projects;
+              }
             }
-          }
+          });
         });
-      });
 
       ProjectsService
         .get($routeParams.project)
@@ -311,7 +314,10 @@ angular
               // TODO: this should be by UID, not by Kind-Name, would be less janky.
               // The only catch is matching them up w/Rolebindings, which do not have
               // the UID
-              allRoles = MembershipService.mapRolesForUI(_.first(resp), _.last(resp));
+              allRoles = MembershipService
+                          .mapRolesForUI(
+                            _.first(resp).by('metadata.name'),
+                            _.last(resp).by('metadata.name'));
               var sortedRoles = MembershipService.sortRoles(allRoles);
               var filteredRoles = MembershipService.filterRoles(allRoles);
               var includesRole = function(roleName, roles) {

app/scripts/services/membership/roles.js

@@ -4,37 +4,15 @@ angular
   .module('openshiftConsole')
   .factory('RolesService', function($q, DataService) {
 
-    var listClusterRoles = function(cb, opts) {
-      DataService.list('clusterroles', {}, cb, opts);
-    };
-
-    var listRoles = function(context, cb, opts) {
-      DataService.list('roles', context, cb, opts);
-    };
-
-    // wraps the 2 API list calls in a promise for easier use, similar to above get()
     var listAllRoles = function(context) {
-      var deferred = $q.defer();
-      var result = [];
-
-      var resolve = function(resp) {
-        result.push(resp.by('metadata.name'));
-        if(_.isEqual(result.length, 2)) {
-          deferred.resolve(result);
-        }
-      };
-
-      listRoles(context, function(resp) {
-        resolve(resp);
-      });
-      listClusterRoles(function(resp) {
-        resolve(resp);
-      });
-
-      return deferred.promise;
+      return $q.all([
+        DataService
+          .list('roles', context, null),
+        DataService
+          .list('clusterroles', {}, null)
+      ]);
     };
 
-
     return {
       listAllRoles: listAllRoles
     };

dist/scripts/scripts.js

@@ -2802,22 +2802,11 @@ getSubjectKinds:d,
 mapRolebindingsForUI:e
 };
 } ]), angular.module("openshiftConsole").factory("RolesService", [ "$q", "DataService", function(a, b) {
-var c = function(a, c) {
-b.list("clusterroles", {}, a, c);
-}, d = function(a, c, d) {
-b.list("roles", a, c, d);
-}, e = function(b) {
-var e = a.defer(), f = [], g = function(a) {
-f.push(a.by("metadata.name")), _.isEqual(f.length, 2) && e.resolve(f);
-};
-return d(b, function(a) {
-g(a);
-}), c(function(a) {
-g(a);
-}), e.promise;
+var c = function(c) {
+return a.all([ b.list("roles", c, null), b.list("clusterroles", {}, null) ]);
 };
 return {
-listAllRoles:e
+listAllRoles:c
 };
 } ]), angular.module("openshiftConsole").factory("RoleBindingsService", [ "$q", "DataService", function(a, b) {
 var c = {}, d = function(a, b) {
@@ -4985,14 +4974,14 @@ details:e
 }, u = function() {
 d.disableAddForm = !1, d.newBinding.name = "", d.newBinding.namespace = o, d.newBinding.newRole = null;
 }, v = function() {
-i.list("rolebindings", n, function(a) {
+i.list("rolebindings", n, null, {
+errorNotification:!1
+}).then(function(a) {
 angular.extend(d, {
 canShowRoles:!0,
 roleBindings:a.by("metadata.name"),
 subjectKindsForUI:k.mapRolebindingsForUI(a.by("metadata.name"), r)
 }), u();
-}, {
-errorNotification:!1
 });
 }, w = function(b, c) {
 d.disableAddForm = !0, l.create(b, c, o, n).then(function() {
@@ -5085,7 +5074,7 @@ roleName:c
 };
 g.withUser().then(function(a) {
 d.user = a;
-}), i.list("projects", {}, function(a) {
+}), i.list("projects", {}).then(function(a) {
 var b = _.map(a.by("metadata.name"), function(a) {
 return a.metadata.name;
 });
@@ -5146,7 +5135,7 @@ subjectName:a
 }), m.listAllRoles(n, {
 errorNotification:!1
 }).then(function(a) {
-r = k.mapRolesForUI(_.first(a), _.last(a));
+r = k.mapRolesForUI(_.first(a).by("metadata.name"), _.last(a).by("metadata.name"));
 var b = k.sortRoles(r), c = k.filterRoles(r), e = function(a, b) {
 return _.some(b, {
 metadata:{