Skip to content
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

Jump to bottom

[release-4.4] Bug 1821849: Hide OpenShift Cluster Manager when branding is azure #4956

Merged
merged 1 commit into from Apr 14, 2020
Merged

[release-4.4] Bug 1821849: Hide OpenShift Cluster Manager when branding is azure #4956

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion frontend/public/components/cluster-settings/cluster-settings.tsx
View file
Open in desktop
Expand Up @@ -274,7 +274,7 @@ export const ClusterVersionDetailsTable: React.SFC<ClusterVersionDetailsTablePro
</div>
</div>
<div className="co-m-pane__body-group">
{window.SERVER_FLAGS.branding !== 'okd' && (
{window.SERVER_FLAGS.branding !== 'okd' && window.SERVER_FLAGS.branding !== 'azure' && (
<p className="co-m-pane__explanation">
View this cluster and manage subscription settings in{' '}
<ExternalLink text="OpenShift Cluster Manager" href={getOCMLink(clusterID)} />.
Expand Down
7 changes: 4 additions & 3 deletions frontend/public/components/dashboard/dashboards-page/cluster-dashboard/details-card.tsx
View file
Open in desktop
Expand Up @@ -156,9 +156,10 @@ export const DetailsCard_ = connect(mapStateToProps)(
isLoading={!clusterVersionLoaded}
>
<div className="co-select-to-copy">{clusterId}</div>
{window.SERVER_FLAGS.branding !== 'okd' && (
<ExternalLink text="OpenShift Cluster Manager" href={getOCMLink(clusterId)} />
)}
{window.SERVER_FLAGS.branding !== 'okd' &&
window.SERVER_FLAGS.branding !== 'azure' && (
<ExternalLink text="OpenShift Cluster Manager" href={getOCMLink(clusterId)} />
)}
</DetailItem>
<DetailItem
title="Provider"
Expand Down
6 changes: 5 additions & 1 deletion frontend/public/components/masthead-toolbar.jsx
View file
Open in desktop
Expand Up @@ -246,7 +246,11 @@ class MastheadToolbarContents_ extends React.Component {
const launcherItems = this._getAdditionalLinks(consoleLinks, 'ApplicationMenu');

const sections = [];
if (clusterID && window.SERVER_FLAGS.branding !== 'okd') {
if (
clusterID &&
window.SERVER_FLAGS.branding !== 'okd' &&
window.SERVER_FLAGS.branding !== 'azure'
) {
sections.push({
name: 'Red Hat Applications',
isSection: true,
Expand Down