Do not allow 'Select from Project' when there are no projects

openshift · Oct 30, 2017 · 71a047b · 71a047b
1 parent fe5fdfe
commit 71a047b
Show file tree

Hide file tree

Showing 6 changed files with 177 additions and 153 deletions.
diff --git a/app/scripts/controllers/landingPage.js b/app/scripts/controllers/landingPage.js
@@ -11,6 +11,7 @@ angular.module('openshiftConsole')
                        DataService,
                        Navigate,
                        NotificationsService,
+                       ProjectsService,
                        RecentlyViewedServiceItems,
                        GuidedTourService,
                        HTMLService,
@@ -20,6 +21,7 @@ angular.module('openshiftConsole')
                        $location) {
     var tourConfig = _.get(Constants, 'GUIDED_TOURS.landing_page_tour');
     var tourEnabled = tourConfig && tourConfig.enabled && tourConfig.steps;
+    var watches = [];
 
     $scope.saasOfferings = Constants.SAAS_OFFERINGS;
 
@@ -103,12 +105,21 @@ angular.module('openshiftConsole')
         $scope.catalogItems = items;
         dataLoaded();
       }));
+      ProjectsService.list().then(function(projectData) {
+        var projects = _.toArray(projectData.by('metadata.name'));
+        $scope.projectsExist = _.size(projects) > 0;
+        watches.push(ProjectsService.watch($scope, function(projectData){
+          var projects = _.toArray(projectData.by('metadata.name'));
+          $scope.projectsExist = _.size(projects) > 0;
+        }));
+      });
     });
 
     $scope.$on('$destroy', function() {
       // If the template dialog was open when the scope was destroyed, still
       // add the item to recently-viewed. No-op if the dialog is not open.
       addTemplateToRecentlyViewed();
+      DataService.unwatchAll(watches);
     });
 
     function findParamServiceItem() {

diff --git a/app/scripts/directives/processTemplateDialog.js b/app/scripts/directives/processTemplateDialog.js
@@ -98,7 +98,7 @@
 
       ctrl.projectEmptyState = {
         title: 'No Project Selected',
-        info: 'Please select a project from the dropdown to load Templates from that project.'
+        info: 'Please select a project from the dropdown to load templates from that project.'
       };
 
       ctrl.templatesEmptyState = {
@@ -326,6 +326,12 @@
       ctrl.searchEnabled = !_.isEmpty(filteredProjects);
 
       ctrl.templateProjects = RecentlyViewedProjectsService.orderByMostRecentlyViewed(projects);
+      ctrl.numTemplateProjects = _.size(ctrl.templateProjects);
+
+      if (ctrl.numTemplateProjects === 1) {
+        ctrl.templateProject = _.head(ctrl.templateProjects);
+        ctrl.templateProjectChange();
+      }
     };
 
     function listProjects() {

diff --git a/app/views/directives/process-template-dialog/process-template-select.html b/app/views/directives/process-template-dialog/process-template-select.html
@@ -3,6 +3,7 @@
     <div class="select-project-for-template">
       <h2>Select from Project</h2>
       <ui-select
+        ng-disabled="$ctrl.numTemplateProjects < 2"
         name="selectProject"
         ng-model="$ctrl.templateProject"
         ng-change="$ctrl.templateProjectChange()"

diff --git a/app/views/landing-page.html b/app/views/landing-page.html
@@ -20,7 +20,7 @@
                        base-project-url="project"
                        on-deploy-image-selected="deployImageSelected"
                        on-from-file-selected="fromFileSelected"
-                       on-create-from-project="fromProjectSelected">
+                       on-create-from-project="projectsExist ? fromProjectSelected : undefined">
         </services-view>
       </landingbody>
       <landingside>