From 022485c72a29bddf42a75fb728b09cc971947aa3 Mon Sep 17 00:00:00 2001 From: Matthias Wilhelm Date: Tue, 31 Aug 2021 09:45:17 +0200 Subject: [PATCH] Fix tests and types --- .../public/application/apps/doc/components/doc.tsx | 2 +- .../components/source_viewer/source_viewer.test.tsx | 2 +- .../components/source_viewer/source_viewer.tsx | 2 +- .../doc => }/services/use_es_doc_search.test.tsx | 8 ++++---- .../{apps/doc => }/services/use_es_doc_search.ts | 11 ++++++----- 5 files changed, 13 insertions(+), 12 deletions(-) rename src/plugins/discover/public/application/{apps/doc => }/services/use_es_doc_search.test.tsx (96%) rename src/plugins/discover/public/application/{apps/doc => }/services/use_es_doc_search.ts (91%) diff --git a/src/plugins/discover/public/application/apps/doc/components/doc.tsx b/src/plugins/discover/public/application/apps/doc/components/doc.tsx index 9387489c6794c..b184a1cfd238c 100644 --- a/src/plugins/discover/public/application/apps/doc/components/doc.tsx +++ b/src/plugins/discover/public/application/apps/doc/components/doc.tsx @@ -10,10 +10,10 @@ import React from 'react'; import { FormattedMessage, I18nProvider } from '@kbn/i18n/react'; import { EuiCallOut, EuiLink, EuiLoadingSpinner, EuiPageContent, EuiPage } from '@elastic/eui'; import { IndexPatternsContract } from 'src/plugins/data/public'; -import { useEsDocSearch } from '../services/use_es_doc_search'; import { getServices } from '../../../../kibana_services'; import { DocViewer } from '../../../components/doc_viewer/doc_viewer'; import { ElasticRequestState } from '../types'; +import { useEsDocSearch } from '../../../services/use_es_doc_search'; export interface DocProps { /** diff --git a/src/plugins/discover/public/application/components/source_viewer/source_viewer.test.tsx b/src/plugins/discover/public/application/components/source_viewer/source_viewer.test.tsx index edc08c4240fb3..625ac93a335ac 100644 --- a/src/plugins/discover/public/application/components/source_viewer/source_viewer.test.tsx +++ b/src/plugins/discover/public/application/components/source_viewer/source_viewer.test.tsx @@ -9,7 +9,7 @@ import React from 'react'; import { mountWithIntl } from '@kbn/test/jest'; import { SourceViewer } from './source_viewer'; -import * as hooks from '../../apps/doc/components/services/use_es_doc_search'; +import * as hooks from '../../services/use_es_doc_search'; import * as useUiSettingHook from 'src/plugins/kibana_react/public/ui_settings/use_ui_setting'; import { EuiButton, EuiEmptyPrompt, EuiLoadingSpinner } from '@elastic/eui'; import { JsonCodeEditorCommon } from '../json_code_editor/json_code_editor_common'; diff --git a/src/plugins/discover/public/application/components/source_viewer/source_viewer.tsx b/src/plugins/discover/public/application/components/source_viewer/source_viewer.tsx index d22de9e0061ab..1ec595c9d17f2 100644 --- a/src/plugins/discover/public/application/components/source_viewer/source_viewer.tsx +++ b/src/plugins/discover/public/application/components/source_viewer/source_viewer.tsx @@ -12,11 +12,11 @@ import { FormattedMessage } from '@kbn/i18n/react'; import { monaco } from '@kbn/monaco'; import { EuiButton, EuiEmptyPrompt, EuiLoadingSpinner, EuiSpacer, EuiText } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; -import { useEsDocSearch } from '../../apps/doc/services/use_es_doc_search'; import { JSONCodeEditorCommonMemoized } from '../json_code_editor/json_code_editor_common'; import { getServices } from '../../../kibana_services'; import { SEARCH_FIELDS_FROM_SOURCE } from '../../../../common'; import { ElasticRequestState } from '../../apps/doc/types'; +import { useEsDocSearch } from '../../services/use_es_doc_search'; interface SourceViewerProps { id: string; diff --git a/src/plugins/discover/public/application/apps/doc/services/use_es_doc_search.test.tsx b/src/plugins/discover/public/application/services/use_es_doc_search.test.tsx similarity index 96% rename from src/plugins/discover/public/application/apps/doc/services/use_es_doc_search.test.tsx rename to src/plugins/discover/public/application/services/use_es_doc_search.test.tsx index 890e3680ed5b7..3fcb193c5f6f3 100644 --- a/src/plugins/discover/public/application/apps/doc/services/use_es_doc_search.test.tsx +++ b/src/plugins/discover/public/application/services/use_es_doc_search.test.tsx @@ -8,15 +8,15 @@ import { renderHook, act } from '@testing-library/react-hooks'; import { buildSearchBody, useEsDocSearch } from './use_es_doc_search'; -import { DocProps } from '../components/doc'; import { Observable } from 'rxjs'; -import { SEARCH_FIELDS_FROM_SOURCE as mockSearchFieldsFromSource } from '../../../../../common'; import { IndexPattern } from 'src/plugins/data/common'; -import { ElasticRequestState } from '../types'; +import { DocProps } from '../apps/doc/components/doc'; +import { ElasticRequestState } from '../apps/doc/types'; +import { SEARCH_FIELDS_FROM_SOURCE as mockSearchFieldsFromSource } from '../../../common'; const mockSearchResult = new Observable(); -jest.mock('../../../../kibana_services', () => ({ +jest.mock('../../kibana_services', () => ({ getServices: () => ({ data: { search: { diff --git a/src/plugins/discover/public/application/apps/doc/services/use_es_doc_search.ts b/src/plugins/discover/public/application/services/use_es_doc_search.ts similarity index 91% rename from src/plugins/discover/public/application/apps/doc/services/use_es_doc_search.ts rename to src/plugins/discover/public/application/services/use_es_doc_search.ts index 33aa4e6ed6b7c..a2f0cd6f8442b 100644 --- a/src/plugins/discover/public/application/apps/doc/services/use_es_doc_search.ts +++ b/src/plugins/discover/public/application/services/use_es_doc_search.ts @@ -8,11 +8,12 @@ import { useCallback, useEffect, useMemo, useState } from 'react'; import type { estypes } from '@elastic/elasticsearch'; -import { getServices, IndexPattern } from '../../../../kibana_services'; -import { DocProps } from '../components/doc'; -import { ElasticSearchHit } from '../../../doc_views/doc_views_types'; -import { SEARCH_FIELDS_FROM_SOURCE } from '../../../../../common'; -import { ElasticRequestState } from '../types'; +import { IndexPattern } from '../../../../data/common'; +import { DocProps } from '../apps/doc/components/doc'; +import { ElasticRequestState } from '../apps/doc/types'; +import { ElasticSearchHit } from '../doc_views/doc_views_types'; +import { getServices } from '../../kibana_services'; +import { SEARCH_FIELDS_FROM_SOURCE } from '../../../common'; type RequestBody = Pick;