remove usage of deprecated onError

elastic · Oct 24, 2024 · 4c8f844 · 4c8f844
1 parent a194211
commit 4c8f844
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 26 deletions.
diff --git a/x-pack/plugins/data_usage/public/app/components/data_usage_metrics.tsx b/x-pack/plugins/data_usage/public/app/components/data_usage_metrics.tsx
@@ -8,6 +8,7 @@
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { css } from '@emotion/react';
 import { EuiFlexGroup, EuiFlexItem, EuiLoadingElastic } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
 import { Charts } from './charts';
 import { useBreadcrumbs } from '../../utils/use_breadcrumbs';
 import { useKibanaContextForPlugin } from '../../utils/use_kibana';
@@ -29,7 +30,7 @@ const FlexItemWithCss = ({ children }: { children: React.ReactNode }) => (
 
 export const DataUsageMetrics = () => {
   const {
-    services: { chrome, appParams },
+    services: { chrome, appParams, notifications },
   } = useKibanaContextForPlugin();
   useBreadcrumbs([{ text: PLUGIN_NAME }], appParams, chrome);
 
@@ -43,7 +44,11 @@ export const DataUsageMetrics = () => {
     setUrlDateRangeFilter,
   } = useDataUsageMetricsUrlParams();
 
-  const { data: dataStreams, isFetching: isFetchingDataStreams } = useGetDataUsageDataStreams({
+  const {
+    error: errorFetchingDataStreams,
+    data: dataStreams,
+    isFetching: isFetchingDataStreams,
+  } = useGetDataUsageDataStreams({
     selectedDataStreams: dataStreamsFromUrl,
     options: {
       enabled: true,
@@ -93,6 +98,7 @@ export const DataUsageMetrics = () => {
   const { dateRangePickerState, onRefreshChange, onTimeChange } = useDateRangePicker();
 
   const {
+    error: errorFetchingDataUsageMetrics,
     data,
     isFetching,
     isFetched,
@@ -157,6 +163,23 @@ export const DataUsageMetrics = () => {
     onChangeMetricTypesFilter,
   ]);
 
+  if (errorFetchingDataUsageMetrics) {
+    notifications.toasts.addDanger({
+      title: i18n.translate('xpack.dataUsage.getMetrics.addFailure.toast.title', {
+        defaultMessage: 'Error getting usage metrics',
+      }),
+      text: errorFetchingDataUsageMetrics.message,
+    });
+  }
+  if (errorFetchingDataStreams) {
+    notifications.toasts.addDanger({
+      title: i18n.translate('xpack.dataUsage.getDataStreams.addFailure.toast.title', {
+        defaultMessage: 'Error getting data streams',
+      }),
+      text: errorFetchingDataStreams.message,
+    });
+  }
+
   return (
     <EuiFlexGroup alignItems="flexStart" direction="column">
       <FlexItemWithCss>

diff --git a/x-pack/plugins/data_usage/public/hooks/use_get_data_streams.ts b/x-pack/plugins/data_usage/public/hooks/use_get_data_streams.ts
@@ -6,7 +6,6 @@
  */
 
 import type { UseQueryOptions, UseQueryResult } from '@tanstack/react-query';
-import { i18n } from '@kbn/i18n';
 import { useQuery } from '@tanstack/react-query';
 import type { IHttpFetchError } from '@kbn/core-http-browser';
 import { DATA_USAGE_DATA_STREAMS_API_ROUTE } from '../../common';
@@ -33,9 +32,6 @@ export const useGetDataUsageDataStreams = ({
   options?: UseQueryOptions<GetDataUsageDataStreamsResponse, IHttpFetchError>;
 }): UseQueryResult<GetDataUsageDataStreamsResponse, IHttpFetchError> => {
   const http = useKibanaContextForPlugin().services.http;
-  const {
-    services: { notifications },
-  } = useKibanaContextForPlugin();
 
   return useQuery<GetDataUsageDataStreamsResponse, IHttpFetchError>({
     queryKey: ['get-data-usage-data-streams'],
@@ -87,13 +83,5 @@ export const useGetDataUsageDataStreams = ({
           : PAGING_PARAMS.default
       );
     },
-    onError: (error: IHttpFetchError) => {
-      notifications.toasts.addDanger({
-        title: i18n.translate('xpack.dataUsage.getDataStreams.addFailure.toast.title', {
-          defaultMessage: 'Error getting data streams',
-        }),
-        text: error.message,
-      });
-    },
   });
 };
diff --git a/x-pack/plugins/data_usage/public/hooks/use_get_usage_metrics.ts b/x-pack/plugins/data_usage/public/hooks/use_get_usage_metrics.ts
@@ -6,7 +6,6 @@
  */
 
 import type { UseQueryOptions, UseQueryResult } from '@tanstack/react-query';
-import { i18n } from '@kbn/i18n';
 import { useQuery } from '@tanstack/react-query';
 import type { IHttpFetchError } from '@kbn/core-http-browser';
 import { UsageMetricsRequestBody, UsageMetricsResponseSchemaBody } from '../../common/rest_types';
@@ -23,9 +22,6 @@ export const useGetDataUsageMetrics = (
   options: UseQueryOptions<UsageMetricsResponseSchemaBody, IHttpFetchError<ErrorType>> = {}
 ): UseQueryResult<UsageMetricsResponseSchemaBody, IHttpFetchError<ErrorType>> => {
   const http = useKibanaContextForPlugin().services.http;
-  const {
-    services: { notifications },
-  } = useKibanaContextForPlugin();
 
   return useQuery<UsageMetricsResponseSchemaBody, IHttpFetchError<ErrorType>>({
     queryKey: ['get-data-usage-metrics', body],
@@ -43,13 +39,5 @@ export const useGetDataUsageMetrics = (
         }),
       });
     },
-    onError: (error: IHttpFetchError<ErrorType>) => {
-      notifications.toasts.addDanger({
-        title: i18n.translate('xpack.dataUsage.getMetrics.addFailure.toast.title', {
-          defaultMessage: 'Error getting usage metrics',
-        }),
-        text: error.message,
-      });
-    },
   });
 };