[SIEM] Fix and consolidate handling of error responses in the client

x-pack/legacy/plugins/siem/public/components/ml/anomaly/use_anomalies_table_data.ts

@@ -10,8 +10,7 @@ import { InfluencerInput, Anomalies, CriteriaFields } from '../types';
 import { hasMlUserPermissions } from '../permissions/has_ml_user_permissions';
 import { MlCapabilitiesContext } from '../permissions/ml_capabilities_provider';
 import { useSiemJobs } from '../../ml_popover/hooks/use_siem_jobs';
-import { useStateToaster } from '../../toasters';
-import { errorToToaster } from '../api/error_to_toaster';
+import { useStateToaster, errorToToaster } from '../../toasters';
 
 import * as i18n from './translations';
 import { useTimeZone, useUiSetting$ } from '../../../lib/kibana';

x-pack/legacy/plugins/siem/public/components/ml/api/anomalies_table_data.ts

@@ -5,7 +5,6 @@
  */
 
 import { Anomalies, InfluencerInput, CriteriaFields } from '../types';
-import { throwIfNotOk } from '../../../hooks/api/api';
 import { KibanaServices } from '../../../lib/kibana';
 
 export interface Body {
@@ -22,17 +21,10 @@ export interface Body {
 }
 
 export const anomaliesTableData = async (body: Body, signal: AbortSignal): Promise<Anomalies> => {
-  const response = await KibanaServices.get().http.fetch<Anomalies>(
-    '/api/ml/results/anomalies_table_data',
-    {
-      method: 'POST',
-      body: JSON.stringify(body),
-      asResponse: true,
-      asSystemRequest: true,
-      signal,
-    }
-  );
-
-  await throwIfNotOk(response.response);
-  return response.body!;
+  return KibanaServices.get().http.fetch<Anomalies>('/api/ml/results/anomalies_table_data', {
+    method: 'POST',
+    body: JSON.stringify(body),
+    asSystemRequest: true,
+    signal,
+  });
 };

x-pack/legacy/plugins/siem/public/components/ml/api/errors.ts

@@ -0,0 +1,20 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { has } from 'lodash/fp';
+
+import { MlError } from '../types';
+
+export interface MlStartJobError {
+  error: MlError;
+  started: boolean;
+}
+
+// use the "in operator" and regular type guards to do a narrow once this issue is fixed below:
+// https://github.com/microsoft/TypeScript/issues/21732
+// Otherwise for now, has will work ok even though it casts 'unknown' to 'any'
+export const isMlStartJobError = (value: unknown): value is MlStartJobError =>
+  has('error.msg', value) && has('error.response', value) && has('error.statusCode', value);

x-pack/legacy/plugins/siem/public/components/ml/api/get_ml_capabilities.ts

@@ -5,7 +5,6 @@
  */
 
 import { InfluencerInput, MlCapabilities } from '../types';
-import { throwIfNotOk } from '../../../hooks/api/api';
 import { KibanaServices } from '../../../lib/kibana';
 
 export interface Body {
@@ -22,16 +21,9 @@ export interface Body {
 }
 
 export const getMlCapabilities = async (signal: AbortSignal): Promise<MlCapabilities> => {
-  const response = await KibanaServices.get().http.fetch<MlCapabilities>(
-    '/api/ml/ml_capabilities',
-    {
-      method: 'GET',
-      asResponse: true,
-      asSystemRequest: true,
-      signal,
-    }
-  );
-
-  await throwIfNotOk(response.response);
-  return response.body!;
+  return KibanaServices.get().http.fetch<MlCapabilities>('/api/ml/ml_capabilities', {
+    method: 'GET',
+    asSystemRequest: true,
+    signal,
+  });
 };

x-pack/legacy/plugins/siem/public/components/ml/api/throw_if_not_ok.test.ts

@@ -5,48 +5,21 @@
  */
 
 import fetchMock from 'fetch-mock';
+
+import { ToasterError } from '../../toasters';
+import { SetupMlResponse } from '../../ml_popover/types';
+import { isMlStartJobError } from './errors';
 import {
-  isMlStartJobError,
-  MessageBody,
-  parseJsonFromBody,
   throwIfErrorAttached,
   throwIfErrorAttachedToSetup,
-  ToasterErrors,
   tryParseResponse,
 } from './throw_if_not_ok';
-import { SetupMlResponse } from '../../ml_popover/types';
 
 describe('throw_if_not_ok', () => {
   afterEach(() => {
     fetchMock.reset();
   });
 
-  describe('#parseJsonFromBody', () => {
-    test('parses a json from the body correctly', async () => {
-      fetchMock.mock('http://example.com', {
-        status: 500,
-        body: {
-          error: 'some error',
-          statusCode: 500,
-          message: 'I am a custom message',
-        },
-      });
-      const response = await fetch('http://example.com');
-      const expected: MessageBody = {
-        error: 'some error',
-        statusCode: 500,
-        message: 'I am a custom message',
-      };
-      await expect(parseJsonFromBody(response)).resolves.toEqual(expected);
-    });
-
-    test('returns null if the body does not exist', async () => {
-      fetchMock.mock('http://example.com', { status: 500, body: 'some text' });
-      const response = await fetch('http://example.com');
-      await expect(parseJsonFromBody(response)).resolves.toEqual(null);
-    });
-  });
-
   describe('#tryParseResponse', () => {
     test('It formats a JSON object', () => {
       const parsed = tryParseResponse(JSON.stringify({ hello: 'how are you?' }));
@@ -119,7 +92,7 @@ describe('throw_if_not_ok', () => {
         },
       };
       expect(() => throwIfErrorAttached(json, ['some-id'])).toThrow(
-        new ToasterErrors(['some message'])
+        new ToasterError(['some message'])
       );
     });
 

x-pack/legacy/plugins/siem/public/components/ml/api/throw_if_not_ok.ts

@@ -4,32 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { has } from 'lodash/fp';
-
 import * as i18n from './translations';
-import { MlError } from '../types';
+import { ToasterError } from '../../toasters';
 import { SetupMlResponse } from '../../ml_popover/types';
-
-export { MessageBody, parseJsonFromBody } from '../../../utils/api';
-
-export interface MlStartJobError {
-  error: MlError;
-  started: boolean;
-}
-
-export type ToasterErrorsType = Error & {
-  messages: string[];
-};
-
-export class ToasterErrors extends Error implements ToasterErrorsType {
-  public messages: string[];
-
-  constructor(messages: string[]) {
-    super(messages[0]);
-    this.name = 'ToasterErrors';
-    this.messages = messages;
-  }
-}
+import { isMlStartJobError } from './errors';
 
 export const tryParseResponse = (response: string): string => {
   try {
@@ -71,7 +49,7 @@ export const throwIfErrorAttachedToSetup = (
 
   const errors = [...jobErrors, ...dataFeedErrors];
   if (errors.length > 0) {
-    throw new ToasterErrors(errors);
+    throw new ToasterError(errors);
   }
 };
 
@@ -93,12 +71,6 @@ export const throwIfErrorAttached = (
     }
   }, []);
   if (errors.length > 0) {
-    throw new ToasterErrors(errors);
+    throw new ToasterError(errors);
   }
 };
-
-// use the "in operator" and regular type guards to do a narrow once this issue is fixed below:
-// https://github.com/microsoft/TypeScript/issues/21732
-// Otherwise for now, has will work ok even though it casts 'unknown' to 'any'
-export const isMlStartJobError = (value: unknown): value is MlStartJobError =>
-  has('error.msg', value) && has('error.response', value) && has('error.statusCode', value);

x-pack/legacy/plugins/siem/public/components/ml/permissions/ml_capabilities_provider.tsx

@@ -9,8 +9,7 @@ import React, { useState, useEffect } from 'react';
 import { MlCapabilities } from '../types';
 import { getMlCapabilities } from '../api/get_ml_capabilities';
 import { emptyMlCapabilities } from '../empty_ml_capabilities';
-import { errorToToaster } from '../api/error_to_toaster';
-import { useStateToaster } from '../../toasters';
+import { errorToToaster, useStateToaster } from '../../toasters';
 
 import * as i18n from './translations';