Fix bug with AbortError check

elastic · Feb 25, 2021 · cbdd68a · cbdd68a
1 parent a05b837
commit cbdd68a
Show file tree

Hide file tree

Showing 21 changed files with 22 additions and 42 deletions.
diff --git a/...ecurity_solution/public/cases/components/connectors/jira/use_get_fields_by_issue_type.tsx b/...ecurity_solution/public/cases/components/connectors/jira/use_get_fields_by_issue_type.tsx
@@ -7,7 +7,6 @@
 
 import { useState, useEffect, useRef } from 'react';
 import { HttpSetup, ToastsApi } from 'kibana/public';
-import { AbortError } from '../../../../../../../../src/plugins/kibana_utils/common';
 import { ActionConnector } from '../../../containers/types';
 import { getFieldsByIssueType } from './api';
 import { Fields } from './types';
@@ -70,7 +69,7 @@ export const useGetFieldsByIssueType = ({
       } catch (error) {
         if (!didCancel.current) {
           setIsLoading(false);
-          if (!(error instanceof AbortError)) {
+          if (error.name !== 'AbortError') {
             toastNotifications.addDanger({
               title: i18n.FIELDS_API_ERROR,
               text: error.message,

diff --git a/...plugins/security_solution/public/cases/components/connectors/jira/use_get_issue_types.tsx b/...plugins/security_solution/public/cases/components/connectors/jira/use_get_issue_types.tsx
@@ -73,7 +73,7 @@ export const useGetIssueTypes = ({
       } catch (error) {
         if (!didCancel.current) {
           setIsLoading(false);
-          if (!(error.name === 'AbortError')) {
+          if (error.name !== 'AbortError') {
             toastNotifications.addDanger({
               title: i18n.ISSUE_TYPES_API_ERROR,
               text: error.message,

diff --git a/x-pack/plugins/security_solution/public/cases/components/connectors/jira/use_get_issues.tsx b/x-pack/plugins/security_solution/public/cases/components/connectors/jira/use_get_issues.tsx
@@ -8,7 +8,6 @@
 import { isEmpty, debounce } from 'lodash/fp';
 import { useState, useEffect, useRef } from 'react';
 import { HttpSetup, ToastsApi } from 'kibana/public';
-import { AbortError } from '../../../../../../../../src/plugins/kibana_utils/common';
 import { ActionConnector } from '../../../containers/types';
 import { getIssues } from './api';
 import { Issues } from './types';
@@ -71,7 +70,7 @@ export const useGetIssues = ({
       } catch (error) {
         if (!didCancel.current) {
           setIsLoading(false);
-          if (!(error instanceof AbortError)) {
+          if (error.name !== 'AbortError') {
             toastNotifications.addDanger({
               title: i18n.ISSUES_API_ERROR,
               text: error.message,

diff --git a/...lugins/security_solution/public/cases/components/connectors/jira/use_get_single_issue.tsx b/...lugins/security_solution/public/cases/components/connectors/jira/use_get_single_issue.tsx
@@ -7,7 +7,6 @@
 
 import { useState, useEffect, useRef } from 'react';
 import { HttpSetup, ToastsApi } from 'kibana/public';
-import { AbortError } from '../../../../../../../../src/plugins/kibana_utils/common';
 import { ActionConnector } from '../../../containers/types';
 import { getIssue } from './api';
 import { Issue } from './types';
@@ -69,7 +68,7 @@ export const useGetSingleIssue = ({
       } catch (error) {
         if (!didCancel.current) {
           setIsLoading(false);
-          if (!(error instanceof AbortError)) {
+          if (error.name !== 'AbortError') {
             toastNotifications.addDanger({
               title: i18n.GET_ISSUE_API_ERROR(id),
               text: error.message,

diff --git a/...security_solution/public/cases/components/connectors/resilient/use_get_incident_types.tsx b/...security_solution/public/cases/components/connectors/resilient/use_get_incident_types.tsx
@@ -7,7 +7,6 @@
 
 import { useState, useEffect, useRef } from 'react';
 import { HttpSetup, ToastsApi } from 'kibana/public';
-import { AbortError } from '../../../../../../../../src/plugins/kibana_utils/common';
 import { ActionConnector } from '../../../containers/types';
 import { getIncidentTypes } from './api';
 import * as i18n from './translations';
@@ -68,7 +67,7 @@ export const useGetIncidentTypes = ({
       } catch (error) {
         if (!didCancel.current) {
           setIsLoading(false);
-          if (!(error instanceof AbortError)) {
+          if (error.name !== 'AbortError') {
             toastNotifications.addDanger({
               title: i18n.INCIDENT_TYPES_API_ERROR,
               text: error.message,

diff --git a/...ugins/security_solution/public/cases/components/connectors/resilient/use_get_severity.tsx b/...ugins/security_solution/public/cases/components/connectors/resilient/use_get_severity.tsx
@@ -7,7 +7,6 @@
 
 import { useState, useEffect, useRef } from 'react';
 import { HttpSetup, ToastsApi } from 'kibana/public';
-import { AbortError } from '../../../../../../../../src/plugins/kibana_utils/common';
 import { ActionConnector } from '../../../containers/types';
 import { getSeverity } from './api';
 import * as i18n from './translations';
@@ -65,7 +64,7 @@ export const useGetSeverity = ({ http, toastNotifications, connector }: Props):
       } catch (error) {
         if (!didCancel.current) {
           setIsLoading(false);
-          if (!(error instanceof AbortError)) {
+          if (error.name !== 'AbortError') {
             toastNotifications.addDanger({
               title: i18n.SEVERITY_API_ERROR,
               text: error.message,

diff --git a/...ugins/security_solution/public/cases/components/connectors/servicenow/use_get_choices.tsx b/...ugins/security_solution/public/cases/components/connectors/servicenow/use_get_choices.tsx
@@ -7,7 +7,6 @@
 
 import { useState, useEffect, useRef } from 'react';
 import { HttpSetup, ToastsApi } from 'kibana/public';
-import { AbortError } from '../../../../../../../../src/plugins/kibana_utils/common';
 import { ActionConnector } from '../../../containers/types';
 import { getChoices } from './api';
 import { Choice } from './types';
@@ -74,7 +73,7 @@ export const useGetChoices = ({
       } catch (error) {
         if (!didCancel.current) {
           setIsLoading(false);
-          if (!(error instanceof AbortError)) {
+          if (error.name !== 'AbortError') {
             toastNotifications.addDanger({
               title: i18n.CHOICES_API_ERROR,
               text: error.message,

diff --git a/x-pack/plugins/security_solution/public/cases/containers/use_bulk_update_case.tsx b/x-pack/plugins/security_solution/public/cases/containers/use_bulk_update_case.tsx
@@ -6,7 +6,6 @@
  */
 
 import { useCallback, useReducer, useRef, useEffect } from 'react';
-import { AbortError } from '../../../../../../src/plugins/kibana_utils/common';
 import { CaseStatuses } from '../../../../case/common/api';
 import {
   displaySuccessToast,
@@ -117,7 +116,7 @@ export const useUpdateCases = (): UseUpdateCases => {
       }
     } catch (error) {
       if (!didCancel.current) {
-        if (!(error instanceof AbortError)) {
+        if (error.name !== 'AbortError') {
           errorToToaster({
             title: i18n.ERROR_TITLE,
             error: error.body && error.body.message ? new Error(error.body.message) : error,

diff --git a/x-pack/plugins/security_solution/public/cases/containers/use_delete_cases.tsx b/x-pack/plugins/security_solution/public/cases/containers/use_delete_cases.tsx
@@ -6,7 +6,6 @@
  */
 
 import { useCallback, useReducer, useRef, useEffect } from 'react';
-import { AbortError } from '../../../../../../src/plugins/kibana_utils/common';
 import {
   displaySuccessToast,
   errorToToaster,
@@ -106,7 +105,7 @@ export const useDeleteCases = (): UseDeleteCase => {
       }
     } catch (error) {
       if (!didCancel.current) {
-        if (!(error instanceof AbortError)) {
+        if (error.name !== 'AbortError') {
           errorToToaster({
             title: i18n.ERROR_DELETING,
             error: error.body && error.body.message ? new Error(error.body.message) : error,

diff --git a/x-pack/plugins/security_solution/public/cases/containers/use_get_action_license.tsx b/x-pack/plugins/security_solution/public/cases/containers/use_get_action_license.tsx
@@ -7,7 +7,6 @@
 
 import { useCallback, useEffect, useState, useRef } from 'react';
 
-import { AbortError } from '../../../../../../src/plugins/kibana_utils/common';
 import { errorToToaster, useStateToaster } from '../../common/components/toasters';
 import { getActionLicense } from './api';
 import * as i18n from './translations';
@@ -54,7 +53,7 @@ export const useGetActionLicense = (): ActionLicenseState => {
       }
     } catch (error) {
       if (!didCancel.current) {
-        if (!(error instanceof AbortError)) {
+        if (error.name !== 'AbortError') {
           errorToToaster({
             title: i18n.ERROR_TITLE,
             error: error.body && error.body.message ? new Error(error.body.message) : error,

diff --git a/x-pack/plugins/security_solution/public/cases/containers/use_get_case.tsx b/x-pack/plugins/security_solution/public/cases/containers/use_get_case.tsx
@@ -8,7 +8,6 @@
 import { useEffect, useReducer, useCallback, useRef } from 'react';
 import { CaseStatuses, CaseType } from '../../../../case/common/api';
 
-import { AbortError } from '../../../../../../src/plugins/kibana_utils/common';
 import { Case } from './types';
 import * as i18n from './translations';
 import { errorToToaster, useStateToaster } from '../../common/components/toasters';
@@ -119,7 +118,7 @@ export const useGetCase = (caseId: string, subCaseId?: string): UseGetCase => {
       }
     } catch (error) {
       if (!didCancel.current) {
-        if (!(error instanceof AbortError)) {
+        if (error.name !== 'AbortError') {
           errorToToaster({
             title: i18n.ERROR_TITLE,
             error: error.body && error.body.message ? new Error(error.body.message) : error,

diff --git a/x-pack/plugins/security_solution/public/cases/containers/use_get_case_user_actions.tsx b/x-pack/plugins/security_solution/public/cases/containers/use_get_case_user_actions.tsx
@@ -9,7 +9,6 @@ import { isEmpty, uniqBy } from 'lodash/fp';
 import { useCallback, useEffect, useState, useRef } from 'react';
 import deepEqual from 'fast-deep-equal';
 
-import { AbortError } from '../../../../../../src/plugins/kibana_utils/common';
 import { errorToToaster, useStateToaster } from '../../common/components/toasters';
 import { CaseFullExternalService } from '../../../../case/common/api/cases';
 import { getCaseUserActions, getSubCaseUserActions } from './api';
@@ -288,7 +287,7 @@ export const useGetCaseUserActions = (
         }
       } catch (error) {
         if (!didCancel.current) {
-          if (!(error instanceof AbortError)) {
+          if (error.name !== 'AbortError') {
             errorToToaster({
               title: i18n.ERROR_TITLE,
               error: error.body && error.body.message ? new Error(error.body.message) : error,

diff --git a/x-pack/plugins/security_solution/public/cases/containers/use_get_cases.tsx b/x-pack/plugins/security_solution/public/cases/containers/use_get_cases.tsx
@@ -6,7 +6,6 @@
  */
 
 import { useCallback, useEffect, useReducer, useRef } from 'react';
-import { AbortError } from '../../../../../../src/plugins/kibana_utils/common';
 import { CaseStatuses } from '../../../../case/common/api';
 import { DEFAULT_TABLE_ACTIVE_PAGE, DEFAULT_TABLE_LIMIT } from './constants';
 import { AllCases, SortFieldCase, FilterOptions, QueryParams, Case, UpdateByKey } from './types';
@@ -178,7 +177,7 @@ export const useGetCases = (initialQueryParams?: QueryParams): UseGetCases => {
       }
     } catch (error) {
       if (!didCancelFetchCases.current) {
-        if (!(error instanceof AbortError)) {
+        if (error.name !== 'AbortError') {
           errorToToaster({
             title: i18n.ERROR_TITLE,
             error: error.body && error.body.message ? new Error(error.body.message) : error,
@@ -214,7 +213,7 @@ export const useGetCases = (initialQueryParams?: QueryParams): UseGetCases => {
         }
       } catch (error) {
         if (!didCancelUpdateCases.current) {
-          if (!(error instanceof AbortError)) {
+          if (error.name !== 'AbortError') {
             errorToToaster({ title: i18n.ERROR_TITLE, error, dispatchToaster });
           }
           dispatch({ type: 'FETCH_FAILURE', payload: 'caseUpdate' });

diff --git a/x-pack/plugins/security_solution/public/cases/containers/use_get_cases_status.tsx b/x-pack/plugins/security_solution/public/cases/containers/use_get_cases_status.tsx
@@ -7,7 +7,6 @@
 
 import { useCallback, useEffect, useState, useRef } from 'react';
 
-import { AbortError } from '../../../../../../src/plugins/kibana_utils/common';
 import { errorToToaster, useStateToaster } from '../../common/components/toasters';
 import { getCasesStatus } from './api';
 import * as i18n from './translations';
@@ -57,7 +56,7 @@ export const useGetCasesStatus = (): UseGetCasesStatus => {
       }
     } catch (error) {
       if (!didCancel.current) {
-        if (!(error instanceof AbortError)) {
+        if (error.name !== 'AbortError') {
           errorToToaster({
             title: i18n.ERROR_TITLE,
             error: error.body && error.body.message ? new Error(error.body.message) : error,

diff --git a/x-pack/plugins/security_solution/public/cases/containers/use_get_reporters.tsx b/x-pack/plugins/security_solution/public/cases/containers/use_get_reporters.tsx
@@ -8,7 +8,6 @@
 import { useCallback, useEffect, useState, useRef } from 'react';
 import { isEmpty } from 'lodash/fp';
 
-import { AbortError } from '../../../../../../src/plugins/kibana_utils/common';
 import { User } from '../../../../case/common/api';
 import { errorToToaster, useStateToaster } from '../../common/components/toasters';
 import { getReporters } from './api';
@@ -64,7 +63,7 @@ export const useGetReporters = (): UseGetReporters => {
       }
     } catch (error) {
       if (!didCancel.current) {
-        if (!(error instanceof AbortError)) {
+        if (error.name !== 'AbortError') {
           errorToToaster({
             title: i18n.ERROR_TITLE,
             error: error.body && error.body.message ? new Error(error.body.message) : error,

diff --git a/x-pack/plugins/security_solution/public/cases/containers/use_get_tags.tsx b/x-pack/plugins/security_solution/public/cases/containers/use_get_tags.tsx
@@ -6,7 +6,6 @@
  */
 
 import { useEffect, useReducer, useRef, useCallback } from 'react';
-import { AbortError } from '../../../../../../src/plugins/kibana_utils/common';
 import { errorToToaster, useStateToaster } from '../../common/components/toasters';
 import { getTags } from './api';
 import * as i18n from './translations';
@@ -76,7 +75,7 @@ export const useGetTags = (): UseGetTags => {
       }
     } catch (error) {
       if (!didCancel.current) {
-        if (!(error instanceof AbortError)) {
+        if (error.name !== 'AbortError') {
           errorToToaster({
             title: i18n.ERROR_TITLE,
             error: error.body && error.body.message ? new Error(error.body.message) : error,

diff --git a/x-pack/plugins/security_solution/public/cases/containers/use_post_case.tsx b/x-pack/plugins/security_solution/public/cases/containers/use_post_case.tsx
@@ -6,7 +6,6 @@
  */
 
 import { useReducer, useCallback, useRef, useEffect } from 'react';
-import { AbortError } from '../../../../../../src/plugins/kibana_utils/common';
 import { CasePostRequest } from '../../../../case/common/api';
 import { errorToToaster, useStateToaster } from '../../common/components/toasters';
 import { postCase } from './api';
@@ -69,7 +68,7 @@ export const usePostCase = (): UsePostCase => {
       return response;
     } catch (error) {
       if (!didCancel.current) {
-        if (!(error instanceof AbortError)) {
+        if (error.name !== 'AbortError') {
           errorToToaster({
             title: i18n.ERROR_TITLE,
             error: error.body && error.body.message ? new Error(error.body.message) : error,

diff --git a/x-pack/plugins/security_solution/public/cases/containers/use_post_comment.tsx b/x-pack/plugins/security_solution/public/cases/containers/use_post_comment.tsx
@@ -6,7 +6,6 @@
  */
 
 import { useReducer, useCallback, useRef, useEffect } from 'react';
-import { AbortError } from '../../../../../../src/plugins/kibana_utils/common';
 import { CommentRequest } from '../../../../case/common/api';
 import { errorToToaster, useStateToaster } from '../../common/components/toasters';
 
@@ -79,7 +78,7 @@ export const usePostComment = (): UsePostComment => {
         }
       } catch (error) {
         if (!didCancel.current) {
-          if (!(error instanceof AbortError)) {
+          if (error.name !== 'AbortError') {
             errorToToaster({
               title: i18n.ERROR_TITLE,
               error: error.body && error.body.message ? new Error(error.body.message) : error,

diff --git a/x-pack/plugins/security_solution/public/cases/containers/use_post_push_to_service.tsx b/x-pack/plugins/security_solution/public/cases/containers/use_post_push_to_service.tsx
@@ -6,7 +6,6 @@
  */
 
 import { useReducer, useCallback, useRef, useEffect } from 'react';
-import { AbortError } from '../../../../../../src/plugins/kibana_utils/common';
 import { CaseConnector } from '../../../../case/common/api';
 import {
   errorToToaster,
@@ -91,7 +90,7 @@ export const usePostPushToService = (): UsePostPushToService => {
         return response;
       } catch (error) {
         if (!cancel.current) {
-          if (!(error instanceof AbortError)) {
+          if (error.name !== 'AbortError') {
             errorToToaster({
               title: i18n.ERROR_TITLE,
               error: error.body && error.body.message ? new Error(error.body.message) : error,

diff --git a/x-pack/plugins/security_solution/public/cases/containers/use_update_case.tsx b/x-pack/plugins/security_solution/public/cases/containers/use_update_case.tsx
@@ -7,7 +7,6 @@
 
 import { useReducer, useCallback, useRef, useEffect } from 'react';
 
-import { AbortError } from '../../../../../../src/plugins/kibana_utils/common';
 import { errorToToaster, useStateToaster } from '../../common/components/toasters';
 
 import { patchCase, patchSubCase } from './api';
@@ -124,7 +123,7 @@ export const useUpdateCase = ({
         }
       } catch (error) {
         if (!didCancel.current) {
-          if (!(error instanceof AbortError)) {
+          if (error.name !== 'AbortError') {
             errorToToaster({
               title: i18n.ERROR_TITLE,
               error: error.body && error.body.message ? new Error(error.body.message) : error,

diff --git a/x-pack/plugins/security_solution/public/cases/containers/use_update_comment.tsx b/x-pack/plugins/security_solution/public/cases/containers/use_update_comment.tsx
@@ -6,7 +6,6 @@
  */
 
 import { useReducer, useCallback, useRef, useEffect } from 'react';
-import { AbortError } from '../../../../../../src/plugins/kibana_utils/common';
 import { errorToToaster, useStateToaster } from '../../common/components/toasters';
 import { patchComment } from './api';
 import * as i18n from './translations';
@@ -106,7 +105,7 @@ export const useUpdateComment = (): UseUpdateComment => {
         }
       } catch (error) {
         if (!didCancel.current) {
-          if (!(error instanceof AbortError)) {
+          if (error.name !== 'AbortError') {
             errorToToaster({
               title: i18n.ERROR_TITLE,
               error: error.body && error.body.message ? new Error(error.body.message) : error,