Skip to content

Commit

Permalink
Merge pull request #1105 from TimothyAsirJeyasing/RHSTOR-4989-Remove-…
Browse files Browse the repository at this point in the history
…tooltips-display-changes

Remove unnecessary tool-tips and appset specific details
  • Loading branch information
openshift-merge-bot[bot] authored Dec 18, 2023
2 parents d8e08bd + dea6396 commit ec0318d
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 22 deletions.
9 changes: 4 additions & 5 deletions locales/en/plugin__odf-console.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@
"Loading Empty Page": "Loading Empty Page",
"You are not authorized to complete this action. See your cluster administrator for role-based access control information.": "You are not authorized to complete this action. See your cluster administrator for role-based access control information.",
"Not Authorized": "Not Authorized",
"Alerts are displayed for both <1>ApplicationSet</1> and <4>Subscription</4> type applications.": "Alerts are displayed for both <1>ApplicationSet</1> and <4>Subscription</4> type applications.",
"{{ currentStatus }} to {{ preferredCluster }}": "{{ currentStatus }} to {{ preferredCluster }}",
"{{ currentStatus }} to {{ failoverCluster }}": "{{ currentStatus }} to {{ failoverCluster }}",
"Unknown": "Unknown",
Expand All @@ -82,7 +81,7 @@
"Operators health": "Operators health",
"Peer connection": "Peer connection",
" {{ peerConnectedCount }} Connected": " {{ peerConnectedCount }} Connected",
"Total applications (ApplicationSet)": "Total applications (ApplicationSet)",
"Total applications": "Total applications",
" {{ protectedAppSetsCount }} protected apps": " {{ protectedAppSetsCount }} protected apps",
" {{ appsWithIssues }} of {{ protectedAppSetsCount }} apps with issues": " {{ appsWithIssues }} of {{ protectedAppSetsCount }} apps with issues",
"Current value: ": "Current value: ",
Expand All @@ -93,19 +92,19 @@
"The graph displays the total number of block volumes inbound snapshots, by cluster, from all ApplicationSet and Subscription type applications. Applications that use file volumes are excluded in the total snapshot count.": "The graph displays the total number of block volumes inbound snapshots, by cluster, from all ApplicationSet and Subscription type applications. Applications that use file volumes are excluded in the total snapshot count.",
"Block volumes replication throughput": "Block volumes replication throughput",
"The graph displays the average replication throughput inbound, by cluster, from all ApplicationSet and Subscription type applications. Applications that use file volumes are excluded in the replication throughput.": "The graph displays the average replication throughput inbound, by cluster, from all ApplicationSet and Subscription type applications. Applications that use file volumes are excluded in the replication throughput.",
"Volume replication health (ApplicationSet)": "Volume replication health (ApplicationSet)",
"Volume replication health": "Volume replication health",
"Volumes": "Volumes",
"Cluster: {{clusterName}}": "Cluster: {{clusterName}}",
"Select a cluster": "Select a cluster",
"Application:": "Application:",
"Namespace: ": "Namespace: ",
"Protected PVCs (ApplicationSet)": "Protected PVCs (ApplicationSet)",
"Protected PVCs": "Protected PVCs",
"{{ pvcsWithIssueCount }} with issues": "{{ pvcsWithIssueCount }} with issues",
"Operator status": "Operator status",
"Cluster operator": "Cluster operator",
"{{ healthy }} healthy": "{{ healthy }} healthy",
"{{ issues }} with issues": "{{ issues }} with issues",
"The applications count displays the total number of <2>ApplicationSet</2> type applications in all disaster recovery configured clusters.": "The applications count displays the total number of <2>ApplicationSet</2> type applications in all disaster recovery configured clusters.",
"The applications count displays the total number of ApplicationSet and Subscription type applications in all disaster recovery configured clusters.": "The applications count displays the total number of ApplicationSet and Subscription type applications in all disaster recovery configured clusters.",
"{{ protected }} protected": "{{ protected }} protected",
"Systems": "Systems",
"Storage System status": "Storage System status",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,12 @@ import * as React from 'react';
import { filterDRAlerts } from '@odf/mco/utils';
import AlertsPanel from '@odf/shared/alert/AlertsPanel';
import useAlerts from '@odf/shared/monitoring/useAlert';
import { useCustomTranslation } from '@odf/shared/useCustomTranslationHook';
import { Trans } from 'react-i18next';
import { Card, CardBody } from '@patternfly/react-core';
import AlertItem from './alert-item';
import './alert-card.scss';

export const AlertsCard: React.FC = () => {
const [alerts, loaded, loadError] = useAlerts();
const { t } = useCustomTranslation();

return (
<Card data-test="alerts-card">
Expand All @@ -19,12 +16,6 @@ export const AlertsCard: React.FC = () => {
alerts={alerts}
AlertItemComponent={AlertItem}
alertsFilter={filterDRAlerts}
titleToolTip={
<Trans t={t}>
Alerts are displayed for both <b>ApplicationSet</b> and{' '}
<b>Subscription</b> type applications.
</Trans>
}
loaded={loaded}
loadError={loadError}
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ export const ApplicationsSection: React.FC<ApplicationsSectionProps> = ({
return (
<div className="mco-dashboard__contentColumn">
<Text component={TextVariants.h1}>{totalAppSetsCount || 0}</Text>
<StatusText>{t('Total applications (ApplicationSet)')}</StatusText>
<StatusText>{t('Total applications')}</StatusText>
<Text className="text-muted mco-dashboard__statusText--margin">
{t(' {{ protectedAppSetsCount }} protected apps', {
protectedAppSetsCount,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,7 @@ export const VolumeSummarySection: React.FC<VolumeSummarySectionProps> = ({

return (
<div className="mco-dashboard__contentColumn">
<Text component={TextVariants.h3}>
{t('Volume replication health (ApplicationSet)')}
</Text>
<Text component={TextVariants.h3}>{t('Volume replication health')}</Text>
<div className="mco-cluster-app__donut-chart">
<ChartDonut
ariaDesc="Volume replication health"
Expand Down Expand Up @@ -389,7 +387,7 @@ export const ProtectedPVCsSection: React.FC<ProtectedPVCsSectionProps> = ({
return (
<div className="mco-dashboard__contentColumn">
<Text component={TextVariants.h1}>{protectedPVCsCount}</Text>
<StatusText>{t('Protected PVCs (ApplicationSet)')}</StatusText>
<StatusText>{t('Protected PVCs')}</StatusText>
<Text className="text-muted">
{t('{{ pvcsWithIssueCount }} with issues', { pvcsWithIssueCount })}
</Text>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,9 @@ export const SummaryCard: React.FC = () => {
{t('Applications')}
<FieldLevelHelp>
<Trans t={t}>
The applications count displays the total number of{' '}
<b>ApplicationSet</b> type applications in all disaster
recovery configured clusters.
The applications count displays the total number of
ApplicationSet and Subscription type applications in all
disaster recovery configured clusters.
</Trans>
</FieldLevelHelp>
</Text>
Expand Down

0 comments on commit ec0318d

Please sign in to comment.