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.

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

Bug 1981417: Change OCM links from cloud. to console.redhat.com #9469

Merged
merged 2 commits into from
Jul 19, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ export const InsightsPopup: React.FC<PrometheusHealthPopupProps> = ({ responses,
<h6 className="pf-c-title pf-m-md">{t('insights-plugin~Fixable issues')}</h6>
<div>
<ExternalLink
href={`https://cloud.redhat.com/openshift/details/${clusterID}#insights`}
href={`https://console.redhat.com/openshift/details/${clusterID}#insights`}
text={t('insights-plugin~View all in OpenShift Cluster Manager')}
/>
</div>
Expand All @@ -116,7 +116,7 @@ export const InsightsPopup: React.FC<PrometheusHealthPopupProps> = ({ responses,
{!isWaitingOrDisabled && !isError && !clusterID && (
<div>
<ExternalLink
href={`https://cloud.redhat.com/openshift/`}
href={`https://console.redhat.com/openshift/`}
text={t('insights-plugin~Go to OpenShift Cluster Manager')}
/>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -680,7 +680,7 @@ export const Kafkas: K8sResourceKind[] = [
message: 'Created',
metadata: {
cloudUI:
'https://cloud.redhat.com/beta/application-services/openshift-streams/kafkas/1qCXzgiGqva0D5bXIB0Gn9g23Ni',
'https://console.redhat.com/beta/application-services/openshift-streams/kafkas/1qCXzgiGqva0D5bXIB0Gn9g23Ni',
provider: 'rhoas',
saslMechanism: 'PLAIN',
securityProtocol: 'SASL_SSL',
Expand Down
4 changes: 2 additions & 2 deletions frontend/packages/rhoas-plugin/locales/en/rhoas-plugin.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
"Red Hat OpenShift Application Services": "Red Hat OpenShift Application Services",
"Problem with creating secret": "Problem with creating secret {{error}}",
"Cannot create service account": "Cannot create service account {{error}}",
"Enter your API token from <2>https://cloud.redhat.com</2>, so we can check what services you have access to based on your subscription.": "Enter your API token from <2>https://cloud.redhat.com</2>, so we can check what services you have access to based on your subscription.",
"Enter your API token from <2>https://console.redhat.com</2>, so we can check what services you have access to based on your subscription.": "Enter your API token from <2>https://console.redhat.com</2>, so we can check what services you have access to based on your subscription.",
"API Token": "API Token",
"Connect": "Connect",
"Reset": "Reset",
"To make sure the instance exists and that you&lsquo;re authorized to access it, you can see your Kafka instances at <2>https://cloud.redhat.com.</2> To discover more managed services, go to the <6>managed services catalog.</6>": "To make sure the instance exists and that you&lsquo;re authorized to access it, you can see your Kafka instances at <2>https://cloud.redhat.com.</2> To discover more managed services, go to the <6>managed services catalog.</6>",
"To make sure the instance exists and that you&lsquo;re authorized to access it, you can see your Kafka instances at <2>https://console.redhat.com.</2> To discover more managed services, go to the <6>managed services catalog.</6>": "To make sure the instance exists and that you&lsquo;re authorized to access it, you can see your Kafka instances at <2>https://console.redhat.com.</2> To discover more managed services, go to the <6>managed services catalog.</6>",
"Could not connect to Kafka instances": "Could not connect to Kafka instances",
"All available Kafka instances are connected to this project": "All available Kafka instances are connected to this project",
"See Kafka instances in topology view": "See Kafka instances in topology view",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,11 @@ export const ServiceToken: React.FC<ServiceTokenProps> = ({ namespace }: Service
<Trans t={t} ns="rhoas-plugin">
Enter your API token from{' '}
<a
href="https://cloud.redhat.com/openshift/token"
href="https://console.redhat.com/openshift/token"
rel="noopener noreferrer"
target="_blank"
>
https://cloud.redhat.com
https://console.redhat.com
</a>
, so we can check what services you have access to based on your subscription.
</Trans>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,12 @@ const ServiceInstance: React.FC<ServiceInstanceProps> = ({
<Trans t={t} ns="rhoas-plugin">
To make sure the instance exists and that you&lsquo;re authorized to access it, you can see
your Kafka instances at{' '}
<a href="https://cloud.redhat.com/openshift/token" rel="noopener noreferrer" target="_blank">
https://cloud.redhat.com.
<a
href="https://console.redhat.com/openshift/token"
rel="noopener noreferrer"
target="_blank"
>
https://console.redhat.com.
</a>{' '}
To discover more managed services, go to the{' '}
<Button
Expand Down
2 changes: 1 addition & 1 deletion frontend/public/module/k8s/cluster-settings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ export const getClusterName = (): string => window.SERVER_FLAGS.kubeAPIServerURL
export const getClusterID = (cv: ClusterVersionKind): string => _.get(cv, 'spec.clusterID');

export const getOCMLink = (clusterID: string): string =>
`https://cloud.redhat.com/openshift/details/${clusterID}`;
`https://console.redhat.com/openshift/details/${clusterID}`;

export const getConditionUpgradeableFalse = (resource) =>
resource.status?.conditions.find(
Expand Down