Fix bug where create dropdown links incorrect when DISABLE_SERVICE_CA…

…TALOG_LANDING_PAGE is true Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1671346
openshift · Feb 1, 2019 · 6e13099 · 6e13099
1 parent 17e499d
commit 6e13099
Show file tree

Hide file tree

Showing 7 changed files with 111 additions and 123 deletions.
diff --git a/app/scripts/controllers/overview.js b/app/scripts/controllers/overview.js
@@ -73,8 +73,6 @@ function OverviewController($scope,
   $scope.projectName = $routeParams.project;
   var isHomePage = $routeParams.isHomePage;
 
-  overview.catalogLandingPageEnabled = !Constants.DISABLE_SERVICE_CATALOG_LANDING_PAGE;
-
   // Filters used by this controller.
   var annotation = $filter('annotation');
   var canI = $filter('canI');

diff --git a/app/scripts/directives/nav.js b/app/scripts/directives/nav.js
@@ -289,8 +289,6 @@ angular.module('openshiftConsole')
           _.set($rootScope, 'view.hasProjectSearch', showMobileSearch);
         };
 
-        $scope.catalogLandingPageEnabled = !Constants.DISABLE_SERVICE_CATALOG_LANDING_PAGE;
-
         var contextSelector = $elem.find('.contextselector');
         $scope.clusterConsoleURL = window.OPENSHIFT_CONFIG.adminConsoleURL;
         contextSelector

diff --git a/app/scripts/extensions/nav/userDropdown.js b/app/scripts/extensions/nav/userDropdown.js
@@ -15,10 +15,12 @@ angular.module('openshiftConsole')
           });
         }
 
-        items.push({
-          type: 'dom',
-          node: '<li><set-home-page></set-home-page></li>'
-        });
+        if (!_.get(window, 'OPENSHIFT_CONSTANTS.DISABLE_SERVICE_CATALOG_LANDING_PAGE')) {
+          items.push({
+            type: 'dom',
+            node: '<li><set-home-page></set-home-page></li>'
+          });
+        }
 
         var msg = 'Log Out';
         if ($rootScope.user.fullName && $rootScope.user.fullName !== $rootScope.user.metadata.name) {

diff --git a/app/scripts/services/catalog.js b/app/scripts/services/catalog.js
@@ -21,8 +21,7 @@ angular.module("openshiftConsole")
 
     // Enable service catalog features if the new experience is enabled and the
     // servicecatalog.k8s.io resources are available.
-    var SERVICE_CATALOG_ENABLED = !Constants.DISABLE_SERVICE_CATALOG_LANDING_PAGE &&
-                                  APIService.apiInfo(serviceBindingsVersion) &&
+    var SERVICE_CATALOG_ENABLED = APIService.apiInfo(serviceBindingsVersion) &&
                                   APIService.apiInfo(serviceClassesVersion) &&
                                   APIService.apiInfo(serviceInstancesVersion) &&
                                   APIService.apiInfo(servicePlansVersion);

diff --git a/app/views/directives/header/header.html b/app/views/directives/header/header.html
@@ -43,13 +43,9 @@
       <span class="hidden-xs caret" aria-hidden="true" title="Add to Project"></span>
     </button>
     <ul role="menu" uib-dropdown-menu class="dropdown-menu dropdown-menu-right">
-      <li ng-if-start="!catalogLandingPageEnabled" role="menuitem"><a ng-href="project/{{currentProjectName}}/create?tab=fromCatalog">Browse Catalog</a></li>
-      <li role="menuitem"><a ng-href="project/{{currentProjectName}}/create?tab=deployImage">Deploy Image</a></li>
-      <li ng-if-end role="menuitem"><a ng-href="project/{{currentProjectName}}/create?tab=fromFile">Import YAML / JSON</a></li>
-
-      <li ng-if-start="catalogLandingPageEnabled" role="menuitem"><a href="{{currentProjectName | catalogURL}}">Browse Catalog</a></li>
+      <li role="menuitem"><a href="{{currentProjectName | catalogURL}}">Browse Catalog</a></li>
       <li role="menuitem"><a href="" ng-click="showOrderingPanel('deployImage')">Deploy Image</a></li>
-      <li ng-if-end role="menuitem"><a href="" ng-click="showOrderingPanel('fromFile')">Import YAML / JSON</a></li>
+      <li role="menuitem"><a href="" ng-click="showOrderingPanel('fromFile')">Import YAML / JSON</a></li>
       <li role="menuitem"><a href="" ng-click="showOrderingPanel('fromProject')">Select from Project</a></li>
     </ul>
   </div>

diff --git a/dist/scripts/scripts.js b/dist/scripts/scripts.js
diff --git a/dist/scripts/templates.js b/dist/scripts/templates.js
@@ -7410,12 +7410,9 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<span class=\"hidden-xs caret\" aria-hidden=\"true\" title=\"Add to Project\"></span>\n" +
     "</button>\n" +
     "<ul role=\"menu\" uib-dropdown-menu class=\"dropdown-menu dropdown-menu-right\">\n" +
-    "<li ng-if-start=\"!catalogLandingPageEnabled\" role=\"menuitem\"><a ng-href=\"project/{{currentProjectName}}/create?tab=fromCatalog\">Browse Catalog</a></li>\n" +
-    "<li role=\"menuitem\"><a ng-href=\"project/{{currentProjectName}}/create?tab=deployImage\">Deploy Image</a></li>\n" +
-    "<li ng-if-end role=\"menuitem\"><a ng-href=\"project/{{currentProjectName}}/create?tab=fromFile\">Import YAML / JSON</a></li>\n" +
-    "<li ng-if-start=\"catalogLandingPageEnabled\" role=\"menuitem\"><a href=\"{{currentProjectName | catalogURL}}\">Browse Catalog</a></li>\n" +
+    "<li role=\"menuitem\"><a href=\"{{currentProjectName | catalogURL}}\">Browse Catalog</a></li>\n" +
     "<li role=\"menuitem\"><a href=\"\" ng-click=\"showOrderingPanel('deployImage')\">Deploy Image</a></li>\n" +
-    "<li ng-if-end role=\"menuitem\"><a href=\"\" ng-click=\"showOrderingPanel('fromFile')\">Import YAML / JSON</a></li>\n" +
+    "<li role=\"menuitem\"><a href=\"\" ng-click=\"showOrderingPanel('fromFile')\">Import YAML / JSON</a></li>\n" +
     "<li role=\"menuitem\"><a href=\"\" ng-click=\"showOrderingPanel('fromProject')\">Select from Project</a></li>\n" +
     "</ul>\n" +
     "</div>\n" +