[Upgrade Assistant] Remove unnecessary EuiScreenReaderOnly from stat …

…panels (elastic#111518) * Remove EuiScreenReaderOnly implementations * Remove unused translations * Remove extra string after merge conflict
sabarasaba · Oct 20, 2021 · 92dfe5c · 92dfe5c
1 parent 806a663
commit 92dfe5c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 108 deletions.
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
@@ -25396,10 +25396,7 @@
     "xpack.upgradeAssistant.esDeprecations.mlSnapshots.flyout.upgradeSnapshotErrorTitle": "スナップショットのアップグレードエラー",
     "xpack.upgradeAssistant.esDeprecations.pageDescription": "廃止予定のクラスターとインデックス設定をレビューします。アップグレード前に重要な問題を解決する必要があります。",
     "xpack.upgradeAssistant.esDeprecations.pageTitle": "Elasticsearch",
-    "xpack.upgradeAssistant.esDeprecationStats.criticalDeprecationsLabel": "このクラスター{criticalDeprecations}には重大な廃止予定があります",
     "xpack.upgradeAssistant.esDeprecationStats.criticalDeprecationsTitle": "重大",
-    "xpack.upgradeAssistant.esDeprecationStats.loadingText": "Elasticsearchの廃止統計情報を読み込んでいます...",
-    "xpack.upgradeAssistant.esDeprecationStats.noDeprecationsText": "警告なし。準備ができました。",
     "xpack.upgradeAssistant.esDeprecationStats.statsTitle": "Elasticsearch",
     "xpack.upgradeAssistant.kibanaDeprecations.deprecationLabel": "Kibana",
     "xpack.upgradeAssistant.kibanaDeprecations.docLinkText": "ドキュメント",
@@ -25408,7 +25405,6 @@
     "xpack.upgradeAssistant.kibanaDeprecationStats.criticalDeprecationsLabel": "Kibanaには{criticalDeprecations}個の重大な廃止予定があります",
     "xpack.upgradeAssistant.kibanaDeprecationStats.criticalDeprecationsTitle": "重大",
     "xpack.upgradeAssistant.kibanaDeprecationStats.loadingErrorMessage": "Kibana廃止予定の取得中にエラーが発生しました。",
-    "xpack.upgradeAssistant.kibanaDeprecationStats.loadingText": "Kibana廃止予定統計情報を読み込んでいます…",
     "xpack.upgradeAssistant.kibanaDeprecationStats.statsTitle": "Kibana",
     "xpack.upgradeAssistant.kibanaDeprecationStats.warningDeprecationsTitle": "警告",
     "xpack.upgradeAssistant.noDeprecationsPrompt.nextStepsDescription": "他のスタック廃止予定については、{overviewButton}を確認してください。",

diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
@@ -25828,20 +25828,14 @@
     "xpack.upgradeAssistant.esDeprecations.mlSnapshots.flyout.upgradeSnapshotErrorTitle": "升级快照时出错",
     "xpack.upgradeAssistant.esDeprecations.pageDescription": "查看已弃用的群集和索引设置。在升级之前必须解决任何紧急问题。",
     "xpack.upgradeAssistant.esDeprecations.pageTitle": "Elasticsearch",
-    "xpack.upgradeAssistant.esDeprecationStats.criticalDeprecationsLabel": "此集群具有 {criticalDeprecations} 个关键弃用",
     "xpack.upgradeAssistant.esDeprecationStats.criticalDeprecationsTitle": "紧急",
-    "xpack.upgradeAssistant.esDeprecationStats.loadingText": "正在加载 Elasticsearch 弃用统计……",
-    "xpack.upgradeAssistant.esDeprecationStats.noDeprecationsText": "无警告。已就绪！",
     "xpack.upgradeAssistant.esDeprecationStats.statsTitle": "Elasticsearch",
     "xpack.upgradeAssistant.kibanaDeprecations.deprecationLabel": "Kibana",
     "xpack.upgradeAssistant.kibanaDeprecations.docLinkText": "文档",
     "xpack.upgradeAssistant.kibanaDeprecations.loadingText": "正在加载弃用……",
     "xpack.upgradeAssistant.kibanaDeprecations.pageTitle": "Kibana",
-    "xpack.upgradeAssistant.kibanaDeprecationStats.criticalDeprecationsLabel": "Kibana 具有 {criticalDeprecations} 个关键弃用",
     "xpack.upgradeAssistant.kibanaDeprecationStats.criticalDeprecationsTitle": "紧急",
-    "xpack.upgradeAssistant.kibanaDeprecationStats.getWarningDeprecationsMessage": "Kibana 有 {warningDeprecations} 个警告{warningDeprecations, plural, other {弃用}}",
     "xpack.upgradeAssistant.kibanaDeprecationStats.loadingErrorMessage": "检索 Kibana 弃用时发生错误。",
-    "xpack.upgradeAssistant.kibanaDeprecationStats.loadingText": "正在加载 Kibana 弃用统计……",
     "xpack.upgradeAssistant.kibanaDeprecationStats.statsTitle": "Kibana",
     "xpack.upgradeAssistant.kibanaDeprecationStats.warningDeprecationsTitle": "警告",
     "xpack.upgradeAssistant.noDeprecationsPrompt.nextStepsDescription": "查看{overviewButton}以了解其他 Stack 弃用。",

diff --git a/...de_assistant/public/application/components/overview/fix_issues_step/es_stats/es_stats.tsx b/...de_assistant/public/application/components/overview/fix_issues_step/es_stats/es_stats.tsx
@@ -8,14 +8,7 @@
 import React, { FunctionComponent } from 'react';
 import { useHistory } from 'react-router-dom';
 
-import {
-  EuiStat,
-  EuiSpacer,
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiCard,
-  EuiScreenReaderOnly,
-} from '@elastic/eui';
+import { EuiStat, EuiSpacer, EuiFlexGroup, EuiFlexItem, EuiCard } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
 import { reactRouterNavigate } from '../../../../../../../../../src/plugins/kibana_react/public';
@@ -40,24 +33,6 @@ const i18nTexts = {
       defaultMessage: 'Critical',
     }
   ),
-  loadingText: i18n.translate('xpack.upgradeAssistant.esDeprecationStats.loadingText', {
-    defaultMessage: 'Loading Elasticsearch deprecation stats…',
-  }),
-  getCriticalDeprecationsMessage: (criticalDeprecations: number) =>
-    i18n.translate('xpack.upgradeAssistant.esDeprecationStats.criticalDeprecationsLabel', {
-      defaultMessage: 'This cluster has {criticalDeprecations} critical deprecations',
-      values: {
-        criticalDeprecations,
-      },
-    }),
-  getWarningDeprecationMessage: (warningDeprecations: number) =>
-    i18n.translate('xpack.upgradeAssistant.esDeprecationStats.warningDeprecationsTooltip', {
-      defaultMessage:
-        'This cluster has {warningDeprecations} non-critical {warningDeprecations, plural, one {deprecation} other {deprecations}}',
-      values: {
-        warningDeprecations,
-      },
-    }),
 };
 
 export const ESDeprecationStats: FunctionComponent = () => {
@@ -107,17 +82,7 @@ export const ESDeprecationStats: FunctionComponent = () => {
               description={i18nTexts.criticalDeprecationsTitle}
               titleColor="danger"
               isLoading={isLoading}
-            >
-              {error === null && (
-                <EuiScreenReaderOnly>
-                  <p>
-                    {isLoading
-                      ? i18nTexts.loadingText
-                      : i18nTexts.getCriticalDeprecationsMessage(criticalDeprecations.length)}
-                  </p>
-                </EuiScreenReaderOnly>
-              )}
-            </EuiStat>
+            />
           </EuiFlexItem>
         )}
 
@@ -129,17 +94,7 @@ export const ESDeprecationStats: FunctionComponent = () => {
               titleElement="span"
               description={i18nTexts.warningDeprecationsTitle}
               isLoading={isLoading}
-            >
-              {!error && (
-                <EuiScreenReaderOnly>
-                  <p>
-                    {isLoading
-                      ? i18nTexts.loadingText
-                      : i18nTexts.getWarningDeprecationMessage(warningDeprecations.length)}
-                  </p>
-                </EuiScreenReaderOnly>
-              )}
-            </EuiStat>
+            />
           </EuiFlexItem>
         )}
       </EuiFlexGroup>

diff --git a/...tant/public/application/components/overview/fix_issues_step/kibana_stats/kibana_stats.tsx b/...tant/public/application/components/overview/fix_issues_step/kibana_stats/kibana_stats.tsx
@@ -8,15 +8,7 @@
 import React, { FunctionComponent, useEffect, useState } from 'react';
 import { useHistory } from 'react-router-dom';
 
-import {
-  EuiCard,
-  EuiStat,
-  EuiSpacer,
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiIconTip,
-  EuiScreenReaderOnly,
-} from '@elastic/eui';
+import { EuiCard, EuiStat, EuiSpacer, EuiFlexGroup, EuiFlexItem, EuiIconTip } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
 import type { DomainDeprecationDetails } from 'kibana/public';
@@ -47,25 +39,6 @@ const i18nTexts = {
       defaultMessage: 'An error occurred while retrieving Kibana deprecations.',
     }
   ),
-  loadingText: i18n.translate('xpack.upgradeAssistant.kibanaDeprecationStats.loadingText', {
-    defaultMessage: 'Loading Kibana deprecation stats…',
-  }),
-  getCriticalDeprecationsMessage: (criticalDeprecations: number) =>
-    i18n.translate('xpack.upgradeAssistant.kibanaDeprecationStats.criticalDeprecationsLabel', {
-      defaultMessage:
-        'Kibana has {criticalDeprecations} critical {criticalDeprecations, plural, one {deprecation} other {deprecations}}',
-      values: {
-        criticalDeprecations,
-      },
-    }),
-  getWarningDeprecationsMessage: (warningDeprecations: number) =>
-    i18n.translate('xpack.upgradeAssistant.kibanaDeprecationStats.getWarningDeprecationsMessage', {
-      defaultMessage:
-        'Kibana has {warningDeprecations} warning {warningDeprecations, plural, one {deprecation} other {deprecations}}',
-      values: {
-        warningDeprecations,
-      },
-    }),
 };
 
 export const KibanaDeprecationStats: FunctionComponent = () => {
@@ -151,17 +124,7 @@ export const KibanaDeprecationStats: FunctionComponent = () => {
               description={i18nTexts.criticalDeprecationsTitle}
               titleColor="danger"
               isLoading={isLoading}
-            >
-              {error === undefined && (
-                <EuiScreenReaderOnly>
-                  <p>
-                    {isLoading
-                      ? i18nTexts.loadingText
-                      : i18nTexts.getCriticalDeprecationsMessage(criticalDeprecationsCount)}
-                  </p>
-                </EuiScreenReaderOnly>
-              )}
-            </EuiStat>
+            />
           </EuiFlexItem>
         )}
 
@@ -173,17 +136,7 @@ export const KibanaDeprecationStats: FunctionComponent = () => {
               titleElement="span"
               description={i18nTexts.warningDeprecationsTitle}
               isLoading={isLoading}
-            >
-              {!error && (
-                <EuiScreenReaderOnly>
-                  <p>
-                    {isLoading
-                      ? i18nTexts.loadingText
-                      : i18nTexts.getWarningDeprecationsMessage(warningDeprecationsCount)}
-                  </p>
-                </EuiScreenReaderOnly>
-              )}
-            </EuiStat>
+            />
           </EuiFlexItem>
         )}
       </EuiFlexGroup>