From 5b47bd8b9c2b0ee577710c0c3c2a278e7c8ad1d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Louv-Jansen?= Date: Tue, 8 Sep 2020 23:33:41 +0200 Subject: [PATCH] Fix typescript issues --- .../lib/rum_client/get_page_view_trends.ts | 18 ++++++++---------- .../translations/translations/ja-JP.json | 5 ----- .../translations/translations/zh-CN.json | 5 ----- 3 files changed, 8 insertions(+), 20 deletions(-) diff --git a/x-pack/plugins/apm/server/lib/rum_client/get_page_view_trends.ts b/x-pack/plugins/apm/server/lib/rum_client/get_page_view_trends.ts index 114137e9fad17ee..da1483b3819f6ce 100644 --- a/x-pack/plugins/apm/server/lib/rum_client/get_page_view_trends.ts +++ b/x-pack/plugins/apm/server/lib/rum_client/get_page_view_trends.ts @@ -68,17 +68,15 @@ export async function getPageViewTrends({ x: xVal, y: bCount, }; - if (breakdownItem) { - const categoryBuckets = (bucket.breakdown as any).buckets; - categoryBuckets.forEach( - ({ key, doc_count: docCount }: { key: string; doc_count: number }) => { - if (key === 'Other') { - res[key + `(${breakdownItem?.name})`] = docCount; - } else { - res[key] = docCount; - } + if ('breakdown' in bucket) { + const categoryBuckets = bucket.breakdown.buckets; + categoryBuckets.forEach(({ key, doc_count: docCount }) => { + if (key === 'Other') { + res[key + `(${breakdownItem?.name})`] = docCount; + } else { + res[key] = docCount; } - ); + }); } return res; diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json index 80bd52f81158419..b9262052cfaf845 100644 --- a/x-pack/plugins/translations/translations/ja-JP.json +++ b/x-pack/plugins/translations/translations/ja-JP.json @@ -4622,7 +4622,6 @@ "xpack.apm.agentMetrics.java.threadCount": "平均カウント", "xpack.apm.agentMetrics.java.threadCountChartTitle": "スレッド数", "xpack.apm.agentMetrics.java.threadCountMax": "最高カウント", - "xpack.apm.alertTypes.errorRate": "エラー率", "xpack.apm.alertTypes.transactionDuration": "トランザクション期間", "xpack.apm.anomaly_detection.error.invalid_license": "異常検知を使用するには、Elastic Platinumライセンスのサブスクリプションが必要です。このライセンスがあれば、機械学習を活用して、サービスを監視できます。", "xpack.apm.anomaly_detection.error.missing_read_privileges": "異常検知ジョブを表示するには、機械学習およびAPMの「読み取り」権限が必要です", @@ -4681,8 +4680,6 @@ "xpack.apm.errorGroupDetails.relatedTransactionSample": "関連トランザクションサンプル", "xpack.apm.errorGroupDetails.unhandledLabel": "未対応", "xpack.apm.errorGroupDetails.viewOccurrencesInDiscoverButtonLabel": "ディスカバリで {occurrencesCount} 件の{occurrencesCount, plural, one {ドキュメント} other {ドキュメント}}を表示。", - "xpack.apm.errorRateAlert.name": "エラー率", - "xpack.apm.errorRateAlert.thresholdMet": "しきい値一致", "xpack.apm.errorRateAlertTrigger.environment": "環境", "xpack.apm.errorRateAlertTrigger.errors": "エラー", "xpack.apm.errorRateAlertTrigger.isAbove": "の下限は", @@ -4807,7 +4804,6 @@ "xpack.apm.selectPlaceholder": "オプションを選択:", "xpack.apm.serviceDetails.alertsMenu.alerts": "アラート", "xpack.apm.serviceDetails.alertsMenu.createThresholdAlert": "しきい値アラートを作成", - "xpack.apm.serviceDetails.alertsMenu.errorRate": "エラー率", "xpack.apm.serviceDetails.alertsMenu.transactionDuration": "トランザクション期間", "xpack.apm.serviceDetails.alertsMenu.viewActiveAlerts": "アクティブアラートを表示", "xpack.apm.serviceDetails.errorsTabLabel": "エラー", @@ -5037,7 +5033,6 @@ "xpack.apm.transactionDurationAlert.aggregationType.99th": "99 パーセンタイル", "xpack.apm.transactionDurationAlert.aggregationType.avg": "平均", "xpack.apm.transactionDurationAlert.name": "トランザクション期間", - "xpack.apm.transactionDurationAlert.thresholdMet": "しきい値一致", "xpack.apm.transactionDurationAlertTrigger.environment": "環境", "xpack.apm.transactionDurationAlertTrigger.isAbove": "の下限は", "xpack.apm.transactionDurationAlertTrigger.ms": "ms", diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json index 688c0350d53b8d7..aba7a073981cbed 100644 --- a/x-pack/plugins/translations/translations/zh-CN.json +++ b/x-pack/plugins/translations/translations/zh-CN.json @@ -4623,7 +4623,6 @@ "xpack.apm.agentMetrics.java.threadCount": "平均计数", "xpack.apm.agentMetrics.java.threadCountChartTitle": "线程计数", "xpack.apm.agentMetrics.java.threadCountMax": "最大计数", - "xpack.apm.alertTypes.errorRate": "错误率", "xpack.apm.alertTypes.transactionDuration": "事务持续时间", "xpack.apm.anomaly_detection.error.invalid_license": "要使用异常检测，必须订阅 Elastic 白金级许可证。有了该许可证，您便可借助 Machine Learning 监测服务。", "xpack.apm.anomaly_detection.error.missing_read_privileges": "必须对 Machine Learning 和 APM 具有“读”权限，才能查看“异常检测”作业", @@ -4682,8 +4681,6 @@ "xpack.apm.errorGroupDetails.relatedTransactionSample": "相关的事务样本", "xpack.apm.errorGroupDetails.unhandledLabel": "未处理", "xpack.apm.errorGroupDetails.viewOccurrencesInDiscoverButtonLabel": "在 Discover 查看 {occurrencesCount} 个 {occurrencesCount, plural, one {匹配项} other {匹配项}}。", - "xpack.apm.errorRateAlert.name": "错误率", - "xpack.apm.errorRateAlert.thresholdMet": "阈值已达到", "xpack.apm.errorRateAlertTrigger.environment": "环境", "xpack.apm.errorRateAlertTrigger.errors": "错误", "xpack.apm.errorRateAlertTrigger.isAbove": "高于", @@ -4810,7 +4807,6 @@ "xpack.apm.selectPlaceholder": "选择选项：", "xpack.apm.serviceDetails.alertsMenu.alerts": "告警", "xpack.apm.serviceDetails.alertsMenu.createThresholdAlert": "创建阈值告警", - "xpack.apm.serviceDetails.alertsMenu.errorRate": "错误率", "xpack.apm.serviceDetails.alertsMenu.transactionDuration": "事务持续时间", "xpack.apm.serviceDetails.alertsMenu.viewActiveAlerts": "查看活动的告警", "xpack.apm.serviceDetails.errorsTabLabel": "错误", @@ -5040,7 +5036,6 @@ "xpack.apm.transactionDurationAlert.aggregationType.99th": "第 99 个百分位", "xpack.apm.transactionDurationAlert.aggregationType.avg": "平均值", "xpack.apm.transactionDurationAlert.name": "事务持续时间", - "xpack.apm.transactionDurationAlert.thresholdMet": "阈值已达到", "xpack.apm.transactionDurationAlertTrigger.environment": "环境", "xpack.apm.transactionDurationAlertTrigger.isAbove": "高于", "xpack.apm.transactionDurationAlertTrigger.ms": "ms",