From 4b40c95c67360faeb7421958810bafddc5d8d598 Mon Sep 17 00:00:00 2001
From: Joe Reuter <johannes.reuter@elastic.co>
Date: Fri, 14 Feb 2025 11:32:58 +0100
Subject: [PATCH] better error handling

---
 .../components/schema_editor/flyout/sample_preview_table.tsx | 2 +-
 .../components/schema_editor/hooks/use_schema_fields.ts      | 5 +++--
 .../public/components/stream_detail_lifecycle/index.tsx      | 3 ++-
 .../public/components/stream_detail_lifecycle/modal.tsx      | 3 ++-
 .../public/components/stream_detail_routing/control_bar.tsx  | 3 ++-
 .../observability/plugins/streams_app/public/util/errors.ts  | 3 ++-
 6 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/x-pack/solutions/observability/plugins/streams_app/public/components/schema_editor/flyout/sample_preview_table.tsx b/x-pack/solutions/observability/plugins/streams_app/public/components/schema_editor/flyout/sample_preview_table.tsx
index ca47b31ac0f34..5ba2d713f4274 100644
--- a/x-pack/solutions/observability/plugins/streams_app/public/components/schema_editor/flyout/sample_preview_table.tsx
+++ b/x-pack/solutions/observability/plugins/streams_app/public/components/schema_editor/flyout/sample_preview_table.tsx
@@ -83,7 +83,7 @@ const SamplePreviewTableContent = ({
   }
 
   if ((value && value.status === 'failure') || error) {
-    const formattedError = getFormattedError(error);
+    const formattedError = error && getFormattedError(error);
     return (
       <EuiCallOut
         color="danger"
diff --git a/x-pack/solutions/observability/plugins/streams_app/public/components/schema_editor/hooks/use_schema_fields.ts b/x-pack/solutions/observability/plugins/streams_app/public/components/schema_editor/hooks/use_schema_fields.ts
index 5a1c905fc79c8..d8b79bffa818b 100644
--- a/x-pack/solutions/observability/plugins/streams_app/public/components/schema_editor/hooks/use_schema_fields.ts
+++ b/x-pack/solutions/observability/plugins/streams_app/public/components/schema_editor/hooks/use_schema_fields.ts
@@ -14,6 +14,7 @@ import { useStreamsAppFetch } from '../../../hooks/use_streams_app_fetch';
 import { useKibana } from '../../../hooks/use_kibana';
 import { SchemaField, isSchemaFieldTyped } from '../types';
 import { convertToFieldDefinitionConfig } from '../utils';
+import { getFormattedError } from '../../../util/errors';
 
 export const useSchemaFields = ({
   definition,
@@ -137,7 +138,7 @@ export const useSchemaFields = ({
             defaultMessage: 'Something went wrong editing the {field} field',
             values: { field: field.name },
           }),
-          toastMessage: error.message,
+          toastMessage: getFormattedError(error).message,
           toastLifeTimeMs: 5000,
         });
       }
@@ -185,7 +186,7 @@ export const useSchemaFields = ({
             defaultMessage: 'Something went wrong unmapping the {field} field',
             values: { field: fieldName },
           }),
-          toastMessage: error.message,
+          toastMessage: getFormattedError(error).message,
           toastLifeTimeMs: 5000,
         });
       }
diff --git a/x-pack/solutions/observability/plugins/streams_app/public/components/stream_detail_lifecycle/index.tsx b/x-pack/solutions/observability/plugins/streams_app/public/components/stream_detail_lifecycle/index.tsx
index 230d4e17eb15a..726c3c389d43b 100644
--- a/x-pack/solutions/observability/plugins/streams_app/public/components/stream_detail_lifecycle/index.tsx
+++ b/x-pack/solutions/observability/plugins/streams_app/public/components/stream_detail_lifecycle/index.tsx
@@ -27,6 +27,7 @@ import { useKibana } from '../../hooks/use_kibana';
 import { EditLifecycleModal, LifecycleEditAction } from './modal';
 import { RetentionSummary } from './summary';
 import { RetentionMetadata } from './metadata';
+import { getFormattedError } from '../../util/errors';
 
 function useLifecycleState({
   definition,
@@ -156,7 +157,7 @@ export function StreamDetailLifecycle({
         title: i18n.translate('xpack.streams.streamDetailLifecycle.failed', {
           defaultMessage: 'Failed to update lifecycle',
         }),
-        toastMessage: 'body' in error ? error.body.message : error.message,
+        toastMessage: getFormattedError(error).message,
       });
     } finally {
       setUpdateInProgress(false);
diff --git a/x-pack/solutions/observability/plugins/streams_app/public/components/stream_detail_lifecycle/modal.tsx b/x-pack/solutions/observability/plugins/streams_app/public/components/stream_detail_lifecycle/modal.tsx
index f8866f75d31a2..7f72b5824da88 100644
--- a/x-pack/solutions/observability/plugins/streams_app/public/components/stream_detail_lifecycle/modal.tsx
+++ b/x-pack/solutions/observability/plugins/streams_app/public/components/stream_detail_lifecycle/modal.tsx
@@ -57,6 +57,7 @@ import { useBoolean } from '@kbn/react-hooks';
 import useToggle from 'react-use/lib/useToggle';
 import { useStreamsAppRouter } from '../../hooks/use_streams_app_router';
 import { useWiredStreams } from '../../hooks/use_wired_streams';
+import { getFormattedError } from '../../util/errors';
 
 export type LifecycleEditAction = 'none' | 'dsl' | 'ilm' | 'inherit';
 
@@ -297,7 +298,7 @@ function IlmModal({
         setPolicies(policyOptions);
       })
       .catch((error) => {
-        setErrorMessage('body' in error ? error.body.message : error.message);
+        setErrorMessage(getFormattedError(error).message);
       })
       .finally(() => setIsLoading(false));
 
diff --git a/x-pack/solutions/observability/plugins/streams_app/public/components/stream_detail_routing/control_bar.tsx b/x-pack/solutions/observability/plugins/streams_app/public/components/stream_detail_routing/control_bar.tsx
index d2b5007219628..ac9a648921d44 100644
--- a/x-pack/solutions/observability/plugins/streams_app/public/components/stream_detail_routing/control_bar.tsx
+++ b/x-pack/solutions/observability/plugins/streams_app/public/components/stream_detail_routing/control_bar.tsx
@@ -15,6 +15,7 @@ import { useKibana } from '../../hooks/use_kibana';
 import { useStreamsAppRouter } from '../../hooks/use_streams_app_router';
 import { emptyEqualsToAlways } from '../../util/condition';
 import { useRoutingState } from './hooks/routing_state';
+import { getFormattedError } from '../../util/errors';
 
 export function ControlBar({
   definition,
@@ -158,7 +159,7 @@ export function ControlBar({
         title: i18n.translate('xpack.streams.failedToSave', {
           defaultMessage: 'Failed to save',
         }),
-        toastMessage: 'body' in error ? error.body.message : error.message,
+        toastMessage: getFormattedError(error).message,
       });
       routingAppState.setLastDisplayedToast(toast);
     }
diff --git a/x-pack/solutions/observability/plugins/streams_app/public/util/errors.ts b/x-pack/solutions/observability/plugins/streams_app/public/util/errors.ts
index e215ad1bb7f97..9509f1ecb7634 100644
--- a/x-pack/solutions/observability/plugins/streams_app/public/util/errors.ts
+++ b/x-pack/solutions/observability/plugins/streams_app/public/util/errors.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-export const getFormattedError = (error?: Error) => {
+export const getFormattedError = (error: Error) => {
   if (
     error &&
     'body' in error &&
@@ -16,4 +16,5 @@ export const getFormattedError = (error?: Error) => {
   ) {
     return new Error(error.body.message);
   }
+  return error;
 };