Make sure there's always a menu item for the current project

Avoids a problem where the wrong project can be shown as selected in the
project bar dropdown when the project is not returned in `ProjectsService.list`.

app/scripts/directives/nav.js

@@ -329,8 +329,23 @@ angular.module('openshiftConsole')
             });
 
             updateProjects().then(function() {
-              $scope.projectName = projectName;
-              $scope.currentProject = _.get(projects, [ projectName ]);
+              if (!$scope.projectName || !projects) {
+                return;
+              }
+
+              if (!projects[$scope.projectName]) {
+                // Make sure there is an entry for the current project in the
+                // dropdown. If it doesn't actually exist, the controller for
+                // the current view is responsible for redirecting to an error
+                // page.
+                projects[$scope.projectName] = {
+                  metadata: {
+                    name: $scope.projectName
+                  }
+                };
+              }
+
+              $scope.currentProject = projects[$scope.projectName];
               updateOptions();
             });
           } else {

app/views/directives/header/header.html

@@ -28,7 +28,7 @@
     <select class="selectpicker form-control" data-selected-text-format="count>3" id="boostrapSelect" title=""></select>
   </div>
   <!-- create buttons show at mobile -->
-  <div class="dropdown add-to-project" ng-show="canIAddToProject" uib-dropdown>
+  <div class="dropdown add-to-project" ng-if="canIAddToProject" uib-dropdown>
     <a class="dropdown-toggle" href="" ng-disabled="currentProject.status.phase != 'Active'" title="Add to Project" uib-dropdown-toggle>
       <i class="fa fa-plus visible-xs-inline-block" aria-hidden="true" title="Add to Project"></i><span class="hidden-xs">Add to Project</span><span class="hidden-xs caret" aria-hidden="true" title="Add to Project"></span>
     </a>

dist/scripts/scripts.js

@@ -10137,7 +10137,11 @@ var e = a.project;
 r.projectName !== e && (r.projectName = e, r.chromeless = "chromeless" === a.view, e && !r.chromeless ? (_.set(n, "view.hasProject", !0), r.canIAddToProject = !1, o.getProjectRules(e).then(function() {
 r.projectName === e && (r.canIAddToProject = o.canIAddToProject(e));
 }), C().then(function() {
-r.projectName = e, r.currentProject = _.get(l, [ e ]), b();
+r.projectName && l && (l[r.projectName] || (l[r.projectName] = {
+metadata: {
+name: r.projectName
+}
+}), r.currentProject = l[r.projectName], b());
 })) : _.set(n, "view.hasProject", !1));
 }), v.selectpicker({
 iconBase: "fa",

dist/scripts/templates.js

@@ -6852,7 +6852,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<select class=\"selectpicker form-control\" data-selected-text-format=\"count>3\" id=\"boostrapSelect\" title=\"\"></select>\n" +
     "</div>\n" +
     "\n" +
-    "<div class=\"dropdown add-to-project\" ng-show=\"canIAddToProject\" uib-dropdown>\n" +
+    "<div class=\"dropdown add-to-project\" ng-if=\"canIAddToProject\" uib-dropdown>\n" +
     "<a class=\"dropdown-toggle\" href=\"\" ng-disabled=\"currentProject.status.phase != 'Active'\" title=\"Add to Project\" uib-dropdown-toggle>\n" +
     "<i class=\"fa fa-plus visible-xs-inline-block\" aria-hidden=\"true\" title=\"Add to Project\"></i><span class=\"hidden-xs\">Add to Project</span><span class=\"hidden-xs caret\" aria-hidden=\"true\" title=\"Add to Project\"></span>\n" +
     "</a>\n" +

test/integration/features/user_creates_project.spec.js

@@ -127,7 +127,7 @@ describe('', () => {
         it('should successfully create a new project', () => {
           goToCreateProjectPage();
           projectHelpers.createProject(project, 'project/' + project['name'] + '/create');
-          h.waitForPresence('.project-bar option[selected]', project['displayName']);
+          h.waitForPresence('.project-bar option[selected][value="' + project['name'] + '"]');
           checkProjectSettings(project['name'], project['displayName'], project['description']);
         });
 

test/integration/page-objects/overview.js

@@ -12,7 +12,7 @@ class OverviewPage extends Page {
   }
   clickAddToProject() {
     let button = element(by.cssContainingText('.add-to-project .dropdown-toggle', 'Add to Project'));
-    h.waitForElem(button);
+    h.waitForElem(button, 10000);
     button.click();
     let menuItem = element(by.cssContainingText('.dropdown-menu a', 'Browse Catalog'));
     h.waitForElem(menuItem);