Skip to content

[enterprise-3.10] Fix bug where create dropdown links incorrect when DISABLE_SERVICE_CA… #3113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 1, 2019
Merged

[enterprise-3.10] Fix bug where create dropdown links incorrect when DISABLE_SERVICE_CA… #3113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions app/scripts/controllers/overview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
2 changes: 0 additions & 2 deletions app/scripts/directives/nav.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_CONSTANTS.TECTONIC_URL || window.OPENSHIFT_CONFIG.tectonicURL;
contextSelector
Expand Down
10 changes: 6 additions & 4 deletions app/scripts/extensions/nav/userDropdown.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
3 changes: 1 addition & 2 deletions app/scripts/services/catalog.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
8 changes: 2 additions & 6 deletions app/views/directives/header/header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 2 additions & 1 deletion bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@
"font-awesome": "4.7.0",
"jquery": "3.2.1",
"lodash": "4.17.4",
"matchHeight": "0.7.2"
"matchHeight": "0.7.2",
"bootstrap": "3.3.7"
},
"overrides": {
"angular": {
Expand Down
210 changes: 104 additions & 106 deletions dist/scripts/scripts.js
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 2 additions & 5 deletions dist/scripts/templates.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7406,12 +7406,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" +
Expand Down