Merge pull request #260 from dtaylor113/project-service-update

ProjectsService:  Added 'opts.skipErrorNotFound' handling

dist/origin-web-common-services.js

@@ -3169,7 +3169,7 @@ angular.module('openshiftCommonServices')
       };
 
       return {
-        get: function(projectName) {
+        get: function(projectName, opts) {
           return  AuthService
                     .withUser()
                     .then(function() {
@@ -3197,6 +3197,9 @@ angular.module('openshiftCommonServices')
                                         });
                               }, function(e) {
                                 context.projectPromise.reject(e);
+                                if ((e.status === 403 || e.status === 404) && _.get(opts, 'skipErrorNotFound')) {
+                                  return $q.reject({notFound: true});
+                                }
                                 var description = 'The project could not be loaded.';
                                 var type = 'error';
                                 if(e.status === 403) {

dist/origin-web-common.js

@@ -5219,7 +5219,7 @@ angular.module('openshiftCommonServices')
       };
 
       return {
-        get: function(projectName) {
+        get: function(projectName, opts) {
           return  AuthService
                     .withUser()
                     .then(function() {
@@ -5247,6 +5247,9 @@ angular.module('openshiftCommonServices')
                                         });
                               }, function(e) {
                                 context.projectPromise.reject(e);
+                                if ((e.status === 403 || e.status === 404) && _.get(opts, 'skipErrorNotFound')) {
+                                  return $q.reject({notFound: true});
+                                }
                                 var description = 'The project could not be loaded.';
                                 var type = 'error';
                                 if(e.status === 403) {

dist/origin-web-common.min.js

@@ -2336,7 +2336,7 @@ resource.metadata.annotations[path] || delete resource.metadata.annotations[path
 }), resource;
 };
 return {
-get:function(projectName) {
+get:function(projectName, opts) {
 return AuthService.withUser().then(function() {
 var context = {
 projectPromise:$.Deferred(),
@@ -2350,7 +2350,9 @@ return AuthorizationService.getProjectRules(projectName).then(function() {
 return context.project = project, context.projectPromise.resolve(project), RecentlyViewedProjectsService.addProjectUID(project.metadata.uid), cachedProjectData && cachedProjectData.update(project, "MODIFIED"), [ project, context ];
 });
 }, function(e) {
-context.projectPromise.reject(e);
+if (context.projectPromise.reject(e), (403 === e.status || 404 === e.status) && _.get(opts, "skipErrorNotFound")) return $q.reject({
+notFound:!0
+});
 var description = "The project could not be loaded.", type = "error";
 return 403 === e.status ? (description = "The project " + context.projectName + " does not exist or you are not authorized to view it.", type = "access_denied") :404 === e.status && (description = "The project " + context.projectName + " does not exist.", type = "not_found"), $location.url(URI("error").query({
 error:type,

src/services/projects.js

@@ -42,7 +42,7 @@ angular.module('openshiftCommonServices')
       };
 
       return {
-        get: function(projectName) {
+        get: function(projectName, opts) {
           return  AuthService
                     .withUser()
                     .then(function() {
@@ -70,6 +70,9 @@ angular.module('openshiftCommonServices')
                                         });
                               }, function(e) {
                                 context.projectPromise.reject(e);
+                                if ((e.status === 403 || e.status === 404) && _.get(opts, 'skipErrorNotFound')) {
+                                  return $q.reject({notFound: true});
+                                }
                                 var description = 'The project could not be loaded.';
                                 var type = 'error';
                                 if(e.status === 403) {