Added 'no projects and cant create' empty state to process-template, …

…deploy-image, and from-file
openshift · Oct 25, 2017 · 7c3fad3 · 7c3fad3
1 parent bae09d0
commit 7c3fad3
Show file tree

Hide file tree

Showing 11 changed files with 558 additions and 502 deletions.
diff --git a/app/scripts/directives/deployImage.js b/app/scripts/directives/deployImage.js
@@ -25,6 +25,7 @@ angular.module("openshiftConsole")
       controller: function($scope) {
         // Must be initialized the controller. The link function is too late.
         $scope.forms = {};
+        $scope.noProjectsCantCreate = false;
       },
       link: function($scope) {
         $scope.input = {
@@ -44,6 +45,10 @@ angular.module("openshiftConsole")
           value: ''
         }];
 
+        $scope.$on('no-projects-cannot-create', function() {
+          $scope.noProjectsCantCreate = true;
+        });
+
         var orderByDisplayName = $filter('orderByDisplayName');
         var getErrorDetails = $filter('getErrorDetails');
 

diff --git a/app/scripts/directives/deployImageDialog.js b/app/scripts/directives/deployImageDialog.js
@@ -27,6 +27,10 @@
       if (!$routeParams.project) {
         ctrl.showProjectName = true;
       }
+      $scope.$on('no-projects-cannot-create', function() {
+        ctrl.deployForm.$setValidity('required', false);
+        ctrl.deployImageNewAppCreated = false;
+      });
     };
 
     ctrl.deployImage = function() {

diff --git a/app/scripts/directives/fromFile.js b/app/scripts/directives/fromFile.js
@@ -23,10 +23,16 @@ angular.module("openshiftConsole")
       templateUrl: "views/directives/from-file.html",
       controller: function($scope) {
         var aceEditorSession;
+        $scope.noProjectsCantCreate = false;
+
         var humanizeKind = $filter('humanizeKind');
         var getErrorDetails = $filter('getErrorDetails');
         TaskList.clear();
 
+        $scope.$on('no-projects-cannot-create', function() {
+          $scope.noProjectsCantCreate = true;
+        });
+
         $scope.input = {
           selectedProject: $scope.project
         };

diff --git a/app/scripts/directives/fromFileDialog.js b/app/scripts/directives/fromFileDialog.js
@@ -31,6 +31,9 @@
       if (!$routeParams.project) {
         ctrl.showProjectName = true;
       }
+      $scope.$on('no-projects-cannot-create', function() {
+        ctrl.importForm.$setValidity('required', false);
+      });
     };
 
     function getIconClass() {

diff --git a/app/scripts/directives/processTemplate.js b/app/scripts/directives/processTemplate.js
@@ -50,6 +50,8 @@
     var displayName = $filter('displayName');
     var humanize = $filter('humanize');
 
+    ctrl.noProjectsCantCreate = false;
+
     function getHelpLinks(template) {
       var helpLinkName = /^helplink\.(.*)\.title$/;
       var helpLinkURL = /^helplink\.(.*)\.url$/;
@@ -80,6 +82,11 @@
       ctrl.template = angular.copy(ctrl.template);
       ctrl.templateDisplayName = displayName(ctrl.template);
       ctrl.selectedProject = ctrl.project;
+
+      $scope.$on('no-projects-cannot-create', function() {
+        ctrl.noProjectsCantCreate = true;
+      });
+
       setTemplateParams();
     };
 

diff --git a/app/scripts/directives/processTemplateDialog.js b/app/scripts/directives/processTemplateDialog.js
@@ -91,6 +91,11 @@
       }
       listProjects();
 
+      ctrl.noProjectsCantCreate = false;
+      $scope.$on('no-projects-cannot-create', function() {
+        ctrl.noProjectsCantCreate = true;
+      });
+
       ctrl.projectEmptyState = {
         title: 'No Project Selected',
         info: 'Please select a project from the dropdown to load Templates from that project.'
@@ -272,7 +277,7 @@
       ctrl.resultsStep.allowed = ctrl.configStep.valid;
 
       validityWatcher = $scope.$watch("$ctrl.form.$valid", function(isValid) {
-        ctrl.configStep.valid = isValid && ctrl.selectedProject;
+        ctrl.configStep.valid = isValid && !ctrl.noProjectsCantCreate && ctrl.selectedProject;
         ctrl.resultsStep.allowed = isValid;
       });
     }