Merge pull request #2360 from spadgett/list-status

Automatic merge from submit-queue.

Use correct HTTP status from failed DataService.list

Bumps origin-web-common to 0.0.69

Requires openshift/origin-web-common#236
Fixes #2354

app/scripts/controllers/addConfigVolume.js

@@ -143,7 +143,7 @@ angular.module('openshiftConsole')
         DataService.list($scope.configMapVersion, context, null, { errorNotification: false }).then(function(configMapData) {
           $scope.configMaps = orderByDisplayName(configMapData.by("metadata.name"));
         }, function(e) {
-          if (e.code === 403) {
+          if (e.status === 403) {
             $scope.configMaps = [];
             return;
           }
@@ -154,7 +154,7 @@ angular.module('openshiftConsole')
         DataService.list($scope.secretVersion, context, null, { errorNotification: false }).then(function(secretData) {
           $scope.secrets = orderByDisplayName(secretData.by("metadata.name"));
         }, function(e) {
-          if (e.code === 403) {
+          if (e.status === 403) {
             $scope.secrets = [];
             return;
           }

app/scripts/controllers/edit/deploymentConfig.js

@@ -155,7 +155,7 @@ angular.module('openshiftConsole')
               $scope.availableConfigMaps = configMapDataOrdered;
               $scope.valueFromObjects = configMapDataOrdered.concat(secretDataOrdered);
             }, function(e) {
-              if (e.code === 403) {
+              if (e.status === 403) {
                 return;
               }
 
@@ -173,7 +173,7 @@ angular.module('openshiftConsole')
                 secretsArray.unshift("");
               });
             }, function(e) {
-              if (e.code === 403) {
+              if (e.status === 403) {
                 return;
               }
 

app/scripts/directives/deployImage.js

@@ -234,7 +234,7 @@ angular.module("openshiftConsole")
               configMapDataOrdered = orderByDisplayName(configMapData.by("metadata.name"));
               $scope.valueFromNamespace[project.metadata.name] = configMapDataOrdered.concat(secretDataOrdered);
             }, function(e) {
-              if (e.code === 403) {
+              if (e.status === 403) {
                return;
               }
 
@@ -250,7 +250,7 @@ angular.module("openshiftConsole")
               secretDataOrdered = orderByDisplayName(secretData.by("metadata.name"));
               $scope.valueFromNamespace[project.metadata.name] = secretDataOrdered.concat(configMapDataOrdered);
             }, function(e) {
-              if (e.code === 403) {
+              if (e.status === 403) {
                 return;
               }
 

bower.json

@@ -46,7 +46,7 @@
     "angular-moment": "1.0.0",
     "angular-utf8-base64": "0.0.5",
     "file-saver": "1.3.3",
-    "origin-web-common": "0.0.68",
+    "origin-web-common": "0.0.69",
     "origin-web-catalog": "0.0.58"
   },
   "devDependencies": {

dist/scripts/scripts.js

@@ -7358,7 +7358,7 @@ errorNotification: !1
 }).then(function(t) {
 b = g(t.by("metadata.name")), e.availableConfigMaps = b, e.valueFromObjects = b.concat(S);
 }, function(e) {
-403 !== e.code && h("Could not load config maps", v(e));
+403 !== e.status && h("Could not load config maps", v(e));
 }), c.list("secrets", r, null, {
 errorNotification: !1
 }).then(function(t) {
@@ -7370,7 +7370,7 @@ e.secretsByType = _.each(a, function(e) {
 e.unshift("");
 });
 }, function(e) {
-403 !== e.code && h("Could not load secrets", v(e));
+403 !== e.status && h("Could not load secrets", v(e));
 }), y.push(c.watchObject("deploymentconfigs", a.deploymentconfig, r, function(t, n) {
 "MODIFIED" === n && (e.alerts["updated/deleted"] = {
 type: "warning",
@@ -8674,13 +8674,13 @@ errorNotification: !1
 }).then(function(e) {
 a.configMaps = o(e.by("metadata.name"));
 }, function(e) {
-403 !== e.code ? b("Could not load config maps", d(e)) : a.configMaps = [];
+403 !== e.status ? b("Could not load config maps", d(e)) : a.configMaps = [];
 }), c.list(a.secretVersion, r, null, {
 errorNotification: !1
 }).then(function(e) {
 a.secrets = o(e.by("metadata.name"));
 }, function(e) {
-403 !== e.code ? b("Could not load secrets", d(e)) : a.secrets = [];
+403 !== e.status ? b("Could not load secrets", d(e)) : a.secrets = [];
 });
 var f = function(e) {
 return a.attach.allContainers || a.attach.containers[e.name];
@@ -14041,7 +14041,7 @@ errorNotification: !1
 }).then(function(r) {
 t = f(r.by("metadata.name")), n.valueFromNamespace[e.metadata.name] = t.concat(a);
 }, function(e) {
-403 !== e.code && c.addNotification({
+403 !== e.status && c.addNotification({
 id: "deploy-image-list-config-maps-error",
 type: "error",
 message: "Could not load config maps.",
@@ -14054,7 +14054,7 @@ errorNotification: !1
 }).then(function(r) {
 a = f(r.by("metadata.name")), n.valueFromNamespace[e.metadata.name] = a.concat(t);
 }, function(e) {
-403 !== e.code && c.addNotification({
+403 !== e.status && c.addNotification({
 id: "deploy-image-list-secrets-error",
 type: "error",
 message: "Could not load secrets.",

dist/scripts/vendor.js

@@ -73974,7 +73974,7 @@ return e.reject(i);
 } ]), angular.module("openshiftCommonServices").factory("AuthorizationService", [ "$q", "$cacheFactory", "Logger", "$interval", "APIService", "DataService", function(e, t, n, i, r, o) {
 var a = null, s = t("rulesCache", {
 number: 10
-}), l = !1, c = [ "localresourceaccessreviews", "localsubjectaccessreviews", "resourceaccessreviews", "selfsubjectaccessreviews", "selfsubjectrulesreviews", "subjectaccessreviews" ], u = function(e) {
+}), l = !1, c = [ "localresourceaccessreviews", "localsubjectaccessreviews", "resourceaccessreviews", "selfsubjectaccessreviews", "selfsubjectrulesreviews", "subjectaccessreviews", "subjectrulesreviews", "podsecuritypolicyreviews", "podsecuritypolicysubjectreviews", "podsecuritypolicyselfsubjectreviews", "tokenreviews" ], u = function(e) {
 var t = {};
 return _.each(e, function(e) {
 _.each(e.apiGroups, function(n) {
@@ -74589,7 +74589,12 @@ s._listOpComplete(o, e, n, i, t);
 }).error(function(t, n, r, a) {
 s._listInFlight(o, !1);
 var l = s._listDeferred(o);
-delete s._listDeferredMap[o], l.reject(t, n, r, a), _.get(i, "errorNotification", !0) && b("Failed to list " + e, n);
+delete s._listDeferredMap[o], l.reject({
+data: t,
+status: n,
+headers: r,
+config: a
+}), _.get(i, "errorNotification", !0) && b("Failed to list " + e, n);
 });
 }) : t({
 method: "GET",
@@ -74601,7 +74606,12 @@ s._listOpComplete(o, e, n, i, t);
 }).error(function(t, n, r, a) {
 s._listInFlight(o, !1);
 var l = s._listDeferred(o);
-delete s._listDeferredMap[o], l.reject(t, n, r, a), _.get(i, "errorNotification", !0) && b("Failed to list " + e, n);
+delete s._listDeferredMap[o], l.reject({
+data: t,
+status: n,
+headers: r,
+config: a
+}), _.get(i, "errorNotification", !0) && b("Failed to list " + e, n);
 });
 }, f.prototype._listOpComplete = function(e, t, n, i, r) {
 r.items || console.warn("List request for " + t + " returned a null items array.  This is an invalid API response.");