Merge branch 'case-ui-fix' of github.com:angorayc/kibana into case-ui…

…-fix
elastic · Mar 2, 2021 · a6c372c · a6c372c
2 parents 89be6cf + f4624bc
commit a6c372c
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/x-pack/plugins/security_solution/public/cases/components/all_cases/index.test.tsx b/x-pack/plugins/security_solution/public/cases/components/all_cases/index.test.tsx
@@ -14,7 +14,7 @@ import { TestProviders } from '../../../common/mock';
 import { casesStatus, useGetCasesMockState } from '../../containers/mock';
 import * as i18n from './translations';
 
-import { StatusAll, CaseStatuses, CaseType } from '../../../../../case/common/api';
+import { CaseStatuses, CaseType } from '../../../../../case/common/api';
 import { useKibana } from '../../../common/lib/kibana';
 import { getEmptyTagValue } from '../../../common/components/empty_value';
 import { useDeleteCases } from '../../containers/use_delete_cases';
@@ -24,6 +24,7 @@ import { useUpdateCases } from '../../containers/use_bulk_update_case';
 import { useGetActionLicense } from '../../containers/use_get_action_license';
 import { getCasesColumns } from './columns';
 import { AllCases } from '.';
+import { StatusAll } from '../status';
 
 jest.mock('../../containers/use_bulk_update_case');
 jest.mock('../../containers/use_delete_cases');

diff --git a/x-pack/plugins/security_solution/public/cases/components/all_cases/status_filter.test.tsx b/x-pack/plugins/security_solution/public/cases/components/all_cases/status_filter.test.tsx
@@ -9,8 +9,9 @@ import React from 'react';
 import { mount } from 'enzyme';
 import { waitFor } from '@testing-library/react';
 
-import { StatusAll, CaseStatuses } from '../../../../../case/common/api';
+import { CaseStatuses } from '../../../../../case/common/api';
 import { StatusFilter } from './status_filter';
+import { StatusAll } from '../status';
 
 const stats = {
   [StatusAll]: 0,

diff --git a/x-pack/plugins/security_solution/public/cases/containers/api.test.tsx b/x-pack/plugins/security_solution/public/cases/containers/api.test.tsx
@@ -7,7 +7,7 @@
 
 import { KibanaServices } from '../../common/lib/kibana';
 
-import { ConnectorTypes, CommentType, CaseStatuses, StatusAll } from '../../../../case/common/api';
+import { ConnectorTypes, CommentType, CaseStatuses } from '../../../../case/common/api';
 import { CASES_URL } from '../../../../case/common/constants';
 
 import {
@@ -47,6 +47,7 @@ import {
 } from './mock';
 
 import { DEFAULT_FILTER_OPTIONS, DEFAULT_QUERY_PARAMS } from './use_get_cases';
+import { StatusAll } from '../components/status';
 
 const abortCtrl = new AbortController();
 const mockKibanaServices = KibanaServices.get as jest.Mock;

diff --git a/x-pack/plugins/security_solution/public/cases/containers/api.ts b/x-pack/plugins/security_solution/public/cases/containers/api.ts
@@ -8,7 +8,6 @@
 import { assign, omit } from 'lodash';
 
 import {
-  StatusAll,
   CasePatchRequest,
   CasePostRequest,
   CaseResponse,
@@ -45,6 +44,7 @@ import {
 } from '../../../../case/common/api/helpers';
 
 import { KibanaServices } from '../../common/lib/kibana';
+import { StatusAll } from '../components/status';
 
 import {
   ActionLicense,

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,12 +6,12 @@
  */
 
 import { useCallback, useEffect, useReducer, useRef } from 'react';
-import { StatusAll } from '../../../../case/common/api';
 import { DEFAULT_TABLE_ACTIVE_PAGE, DEFAULT_TABLE_LIMIT } from './constants';
 import { AllCases, SortFieldCase, FilterOptions, QueryParams, Case, UpdateByKey } from './types';
 import { errorToToaster, useStateToaster } from '../../common/components/toasters';
 import * as i18n from './translations';
 import { getCases, patchCase } from './api';
+import { StatusAll } from '../components/status';
 
 export interface UseGetCasesState {
   data: AllCases;