Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Upgrade Assistant] Reorganize folder structure #94843

Merged
merged 11 commits into from
Mar 24, 2021
Merged

[Upgrade Assistant] Reorganize folder structure #94843

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c59c3e1
reorganize UA folder structure
alisonelizabeth Mar 15, 2021
dd229cc
Merge branch 'master' of https://github.com/elastic/kibana into ua/re…
alisonelizabeth Mar 17, 2021
3f65c8c
fix paths
alisonelizabeth Mar 18, 2021
7f189a2
update tests
alisonelizabeth Mar 18, 2021
805527c
Merge branch 'master' of https://github.com/elastic/kibana into ua/re…
alisonelizabeth Mar 18, 2021
4bb9349
Merge branch 'master' of https://github.com/elastic/kibana into ua/re…
alisonelizabeth Mar 18, 2021
72e9ac6
fix merge conflicts
alisonelizabeth Mar 18, 2021
706e24d
fix tests
alisonelizabeth Mar 18, 2021
fca2aa3
Merge branch 'master' into ua/reorganize_folder_structure
kibanamachine Mar 22, 2021
6f13a80
Merge branch 'master' of https://github.com/elastic/kibana into ua/re…
alisonelizabeth Mar 24, 2021
4eb1426
address review feedback
alisonelizabeth Mar 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions x-pack/plugins/upgrade_assistant/public/application/components/_index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@import 'tabs/checkup/index';
@import 'tabs/overview/index';
@import 'elasticsearch/index';
@import 'overview/index';
0 ...bs/__fixtures__/checkup_api_response.json → ...ch/__fixtures__/checkup_api_response.json
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions ...p/__snapshots__/checkup_tab.test.tsx.snap → ...snapshots__/deprecation_tab.test.tsx.snap
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...up/__snapshots__/filter_bar.test.tsx.snap → ...ch/__snapshots__/filter_bar.test.tsx.snap
View file
Open in desktop
File renamed without changes.
0 .../__snapshots__/group_by_bar.test.tsx.snap → .../__snapshots__/group_by_bar.test.tsx.snap
View file
Open in desktop
File renamed without changes.
0 ...ation/components/tabs/checkup/_index.scss → ...tion/components/elasticsearch/_index.scss
View file
Open in desktop
File renamed without changes.
10 changes: 6 additions & 4 deletions ...ion/components/tabs/checkup/constants.tsx → ...on/components/elasticsearch/constants.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,18 @@

import { IconColor } from '@elastic/eui';
import { invert } from 'lodash';
import { DeprecationInfo } from '../../../../../common/types';
import { DeprecationInfo } from '../../../../common/types';

export const LEVEL_MAP: { [level: string]: number } = {
warning: 0,
critical: 1,
};

export const REVERSE_LEVEL_MAP: { [idx: number]: DeprecationInfo['level'] } = invert(
LEVEL_MAP
) as any;
interface ReverseLevelMap {
[idx: number]: DeprecationInfo['level'];
}

export const REVERSE_LEVEL_MAP: ReverseLevelMap = invert(LEVEL_MAP) as ReverseLevelMap;

export const COLOR_MAP: { [level: string]: IconColor } = {
warning: 'default',
Expand Down
7 changes: 3 additions & 4 deletions ...tion/components/tabs/checkup/controls.tsx → ...ion/components/elasticsearch/controls.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,12 @@ import React, { FunctionComponent, useState } from 'react';
import { i18n } from '@kbn/i18n';
import { EuiButton, EuiFieldSearch, EuiFlexGroup, EuiFlexItem, EuiCallOut } from '@elastic/eui';
import { FormattedMessage } from '@kbn/i18n/react';
import { DeprecationInfo } from '../../../../../common/types';
import { GroupByOption, LevelFilterOption, LoadingState } from '../../types';
import { DeprecationInfo } from '../../../../common/types';
import { validateRegExpString } from '../../lib/utils';
import { GroupByOption, LevelFilterOption, LoadingState } from '../types';
import { FilterBar } from './filter_bar';
import { GroupByBar } from './group_by_bar';

import { validateRegExpString } from '../../../utils';

interface CheckupControlsProps {
allDeprecations?: DeprecationInfo[];
loadingState: LoadingState;
Expand Down
18 changes: 9 additions & 9 deletions ...ponents/tabs/checkup/checkup_tab.test.tsx → ...ts/elasticsearch/deprecation_tab.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@

import { shallow } from 'enzyme';
import React from 'react';
import { mockKibanaSemverVersion } from '../../../../../common/constants';
import { mockKibanaSemverVersion } from '../../../../common/constants';

import { LoadingState } from '../../types';
import AssistanceData from '../__fixtures__/checkup_api_response.json';
import { CheckupTab } from './checkup_tab';
import { LoadingState } from '../types';
import AssistanceData from './__fixtures__/checkup_api_response.json';
import { DeprecationTab } from './deprecation_tab';

const defaultProps = {
checkupLabel: 'index',
Expand All @@ -22,7 +22,7 @@ const defaultProps = {
setSelectedTabIndex: jest.fn(),
};

jest.mock('../../../app_context', () => {
jest.mock('../../app_context', () => {
return {
useAppContext: () => {
return {
Expand All @@ -43,16 +43,16 @@ jest.mock('../../../app_context', () => {
/**
* Mostly a dumb container with copy, test the three main states.
*/
describe('CheckupTab', () => {
describe('DeprecationTab', () => {
test('render with deprecations', () => {
// @ts-expect-error mock data is too loosely typed
expect(shallow(<CheckupTab {...defaultProps} />)).toMatchSnapshot();
expect(shallow(<DeprecationTab {...defaultProps} />)).toMatchSnapshot();
});

test('render without deprecations', () => {
expect(
shallow(
<CheckupTab
<DeprecationTab
{...{ ...defaultProps, deprecations: undefined, loadingState: LoadingState.Loading }}
/>
)
Expand All @@ -62,7 +62,7 @@ describe('CheckupTab', () => {
test('render with error', () => {
expect(
shallow(
<CheckupTab
<DeprecationTab
{...{
...defaultProps,
deprecations: undefined,
Expand Down
13 changes: 4 additions & 9 deletions ...n/components/tabs/checkup/checkup_tab.tsx → ...ponents/elasticsearch/deprecation_tab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,9 @@ import {
} from '@elastic/eui';
import { FormattedMessage } from '@kbn/i18n/react';

import { LoadingErrorBanner } from '../../error_banner';
import { useAppContext } from '../../../app_context';
import {
GroupByOption,
LevelFilterOption,
LoadingState,
UpgradeAssistantTabProps,
} from '../../types';
import { LoadingErrorBanner } from '../error_banner';
import { useAppContext } from '../../app_context';
import { GroupByOption, LevelFilterOption, LoadingState, UpgradeAssistantTabProps } from '../types';
import { CheckupControls } from './controls';
import { GroupedDeprecations } from './deprecations/grouped';

Expand All @@ -39,7 +34,7 @@ export interface CheckupTabProps extends UpgradeAssistantTabProps {
* Displays a list of deprecations that filterable and groupable. Can be used for cluster,
* nodes, or indices checkups.
*/
export const CheckupTab: FunctionComponent<CheckupTabProps> = ({
export const DeprecationTab: FunctionComponent<CheckupTabProps> = ({
alertBanner,
checkupLabel,
deprecations,
Expand Down
0 ...ents/tabs/checkup/deprecations/_cell.scss → ...nts/elasticsearch/deprecations/_cell.scss
View file
Open in desktop
File renamed without changes.
0 ...s/checkup/deprecations/_deprecations.scss → ...ticsearch/deprecations/_deprecations.scss
View file
Open in desktop
File renamed without changes.
0 ...nts/tabs/checkup/deprecations/_index.scss → ...ts/elasticsearch/deprecations/_index.scss
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...onents/tabs/checkup/deprecations/cell.tsx → ...nents/elasticsearch/deprecations/cell.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ import {
EuiTitle,
} from '@elastic/eui';
import { FormattedMessage } from '@kbn/i18n/react';
import { EnrichedDeprecationInfo } from '../../../../../common/types';
import { AppContext } from '../../../app_context';
import { ReindexButton } from './reindex';
import { AppContext } from '../../../../app_context';
import { EnrichedDeprecationInfo } from '../../../../../../common/types';
import { FixIndexSettingsButton } from './index_settings';

interface DeprecationCellProps {
Expand Down
2 changes: 1 addition & 1 deletion ...bs/checkup/deprecations/count_summary.tsx → ...sticsearch/deprecations/count_summary.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import React, { Fragment, FunctionComponent } from 'react';
import { EuiText } from '@elastic/eui';
import { FormattedMessage } from '@kbn/i18n/react';

import { EnrichedDeprecationInfo } from '../../../../../../common/types';
import { EnrichedDeprecationInfo } from '../../../../../common/types';

export const DeprecationCountSummary: FunctionComponent<{
deprecations: EnrichedDeprecationInfo[];
Expand Down
4 changes: 2 additions & 2 deletions ...abs/checkup/deprecations/grouped.test.tsx → ...asticsearch/deprecations/grouped.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import React from 'react';
import { mountWithIntl, shallowWithIntl } from '@kbn/test/jest';
import { EuiBadge, EuiPagination } from '@elastic/eui';

import { DeprecationInfo, EnrichedDeprecationInfo } from '../../../../../../common/types';
import { GroupByOption, LevelFilterOption } from '../../../types';
import { DeprecationInfo, EnrichedDeprecationInfo } from '../../../../../common/types';
import { GroupByOption, LevelFilterOption } from '../../types';
import { DeprecationAccordion, filterDeps, GroupedDeprecations } from './grouped';

describe('filterDeps', () => {
Expand Down
4 changes: 2 additions & 2 deletions ...nts/tabs/checkup/deprecations/grouped.tsx → ...ts/elasticsearch/deprecations/grouped.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import {
} from '@elastic/eui';
import { FormattedMessage } from '@kbn/i18n/react';

import { DeprecationInfo, EnrichedDeprecationInfo } from '../../../../../../common/types';
import { GroupByOption, LevelFilterOption } from '../../../types';
import { DeprecationInfo, EnrichedDeprecationInfo } from '../../../../../common/types';
import { GroupByOption, LevelFilterOption } from '../../types';

import { DeprecationCountSummary } from './count_summary';
import { DeprecationHealth } from './health';
Expand Down
2 changes: 1 addition & 1 deletion ...ents/tabs/checkup/deprecations/health.tsx → ...nts/elasticsearch/deprecations/health.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import React, { FunctionComponent } from 'react';
import { EuiBadge, EuiToolTip } from '@elastic/eui';
import { i18n } from '@kbn/i18n';

import { DeprecationInfo } from '../../../../../../common/types';
import { DeprecationInfo } from '../../../../../common/types';
import { COLOR_MAP, LEVEL_MAP, REVERSE_LEVEL_MAP } from '../constants';

const LocalizedLevels: { [level: string]: string } = {
Expand Down
0 ...nents/tabs/checkup/deprecations/index.tsx → ...ents/elasticsearch/deprecations/index.tsx
View file
Open in desktop
File renamed without changes.
0 ...up/deprecations/index_settings/button.tsx → ...ch/deprecations/index_settings/button.tsx
View file
Open in desktop
File renamed without changes.
0 ...ckup/deprecations/index_settings/index.ts → ...arch/deprecations/index_settings/index.ts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...dex_settings/remove_settings_provider.tsx → ...dex_settings/remove_settings_provider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import React, { useState, useRef } from 'react';
import { i18n } from '@kbn/i18n';
import { EuiCode, EuiConfirmModal } from '@elastic/eui';
import { useAppContext } from '../../../../../app_context';
import { useAppContext } from '../../../../app_context';

interface Props {
children: (
Expand Down
0 ...checkup/deprecations/index_table.test.tsx → ...csearch/deprecations/index_table.test.tsx
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...tabs/checkup/deprecations/index_table.tsx → ...lasticsearch/deprecations/index_table.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import React from 'react';

import { EuiBasicTable } from '@elastic/eui';
import { i18n } from '@kbn/i18n';
import { EnrichedDeprecationInfo } from '../../../../../common/types';
import { AppContext } from '../../../app_context';
import { ReindexButton } from './reindex';
import { AppContext } from '../../../../app_context';
import { EnrichedDeprecationInfo } from '../../../../../../common/types';
import { FixIndexSettingsButton } from './index_settings';

const PAGE_SIZES = [10, 25, 50, 100, 250, 500, 1000];
Expand Down
4 changes: 2 additions & 2 deletions ...s/tabs/checkup/deprecations/list.test.tsx → .../elasticsearch/deprecations/list.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
import { shallow } from 'enzyme';
import React from 'react';

import { EnrichedDeprecationInfo } from '../../../../../../common/types';
import { GroupByOption } from '../../../types';
import { EnrichedDeprecationInfo } from '../../../../../common/types';
import { GroupByOption } from '../../types';
import { DeprecationList } from './list';

describe('DeprecationList', () => {
Expand Down
4 changes: 2 additions & 2 deletions ...onents/tabs/checkup/deprecations/list.tsx → ...nents/elasticsearch/deprecations/list.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@

import React, { FunctionComponent } from 'react';

import { DeprecationInfo, EnrichedDeprecationInfo } from '../../../../../../common/types';
import { GroupByOption } from '../../../types';
import { DeprecationInfo, EnrichedDeprecationInfo } from '../../../../../common/types';
import { GroupByOption } from '../../types';

import { COLOR_MAP, LEVEL_MAP } from '../constants';
import { DeprecationCell } from './cell';
Expand Down
0 ...checkup/deprecations/reindex/_button.scss → ...csearch/deprecations/reindex/_button.scss
View file
Open in desktop
File renamed without changes.
0 .../checkup/deprecations/reindex/_index.scss → ...icsearch/deprecations/reindex/_index.scss
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...s/checkup/deprecations/reindex/button.tsx → ...ticsearch/deprecations/reindex/button.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ import {
EnrichedDeprecationInfo,
ReindexStatus,
UIReindexOption,
} from '../../../../../../../common/types';
import { LoadingState } from '../../../../types';
} from '../../../../../../common/types';
import { LoadingState } from '../../../types';
import { ReindexFlyout } from './flyout';
import { ReindexPollingService, ReindexState } from './polling_service';

Expand Down
0 ..._snapshots__/checklist_step.test.tsx.snap → ..._snapshots__/checklist_step.test.tsx.snap
View file
Open in desktop
File renamed without changes.
0 .../__snapshots__/warning_step.test.tsx.snap → .../__snapshots__/warning_step.test.tsx.snap
View file
Open in desktop
File renamed without changes.
0 ...p/deprecations/reindex/flyout/_index.scss → ...h/deprecations/reindex/flyout/_index.scss
View file
Open in desktop
File renamed without changes.
0 ...ations/reindex/flyout/_step_progress.scss → ...ations/reindex/flyout/_step_progress.scss
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...ns/reindex/flyout/checklist_step.test.tsx → ...ns/reindex/flyout/checklist_step.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import { shallow } from 'enzyme';
import { cloneDeep } from 'lodash';
import React from 'react';

import { ReindexStatus } from '../../../../../../../../common/types';
import { LoadingState } from '../../../../../types';
import { ReindexStatus } from '../../../../../../../common/types';
import { LoadingState } from '../../../../types';
import { ReindexState } from '../polling_service';
import { ChecklistFlyoutStep } from './checklist_step';

Expand Down
4 changes: 2 additions & 2 deletions ...cations/reindex/flyout/checklist_step.tsx → ...cations/reindex/flyout/checklist_step.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import {
} from '@elastic/eui';
import { FormattedMessage } from '@kbn/i18n/react';

import { ReindexStatus } from '../../../../../../../../common/types';
import { LoadingState } from '../../../../../types';
import { ReindexStatus } from '../../../../../../../common/types';
import { LoadingState } from '../../../../types';
import { ReindexState } from '../polling_service';
import { ReindexProgress } from './progress';

Expand Down
2 changes: 1 addition & 1 deletion ...deprecations/reindex/flyout/container.tsx → ...deprecations/reindex/flyout/container.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import {
EuiTitle,
} from '@elastic/eui';

import { EnrichedDeprecationInfo, ReindexStatus } from '../../../../../../../../common/types';
import { EnrichedDeprecationInfo, ReindexStatus } from '../../../../../../../common/types';

import { ReindexState } from '../polling_service';
import { ChecklistFlyoutStep } from './checklist_step';
Expand Down
0 ...kup/deprecations/reindex/flyout/index.tsx → ...rch/deprecations/reindex/flyout/index.tsx
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ecations/reindex/flyout/progress.test.tsx → ...ecations/reindex/flyout/progress.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import { shallow } from 'enzyme';
import React from 'react';

import { IndexGroup, ReindexStatus, ReindexStep } from '../../../../../../../../common/types';
import { IndexGroup, ReindexStatus, ReindexStep } from '../../../../../../../common/types';
import { ReindexState } from '../polling_service';
import { ReindexProgress } from './progress';

Expand Down
4 changes: 2 additions & 2 deletions .../deprecations/reindex/flyout/progress.tsx → .../deprecations/reindex/flyout/progress.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ import {
} from '@elastic/eui';
import { FormattedMessage } from '@kbn/i18n/react';

import { IndexGroup, ReindexStatus, ReindexStep } from '../../../../../../../../common/types';
import { LoadingState } from '../../../../../types';
import { IndexGroup, ReindexStatus, ReindexStep } from '../../../../../../../common/types';
import { LoadingState } from '../../../../types';
import { ReindexState } from '../polling_service';
import { StepProgress, StepProgressStep } from './step_progress';

Expand Down
0 ...ecations/reindex/flyout/step_progress.tsx → ...ecations/reindex/flyout/step_progress.tsx
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions ...ions/reindex/flyout/warning_step.test.tsx → ...ions/reindex/flyout/warning_step.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ import { I18nProvider } from '@kbn/i18n/react';
import { mount, shallow } from 'enzyme';
import React from 'react';

import { ReindexWarning } from '../../../../../../../../common/types';
import { mockKibanaSemverVersion } from '../../../../../../../../common/constants';
import { ReindexWarning } from '../../../../../../../common/types';
import { mockKibanaSemverVersion } from '../../../../../../../common/constants';

import { idForWarning, WarningsFlyoutStep } from './warnings_step';

jest.mock('../../../../../../app_context', () => {
jest.mock('../../../../../app_context', () => {
const { docLinksServiceMock } = jest.requireActual(
'../../../../../../../../../../../src/core/public/doc_links/doc_links_service.mock'
'../../../../../../../../../../src/core/public/doc_links/doc_links_service.mock'
);

return {
Expand Down
2 changes: 1 addition & 1 deletion .../reindex/flyout/warning_step_checkbox.tsx → .../reindex/flyout/warning_step_checkbox.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import {
} from '@elastic/eui';
import { FormattedMessage } from '@kbn/i18n/react';
import { DocLinksStart } from 'kibana/public';
import { ReindexWarning, ReindexWarningTypes } from '../../../../../../../../common/types';
import { ReindexWarning, ReindexWarningTypes } from '../../../../../../../common/types';

export const hasReindexWarning = (
warnings: ReindexWarning[],
Expand Down
4 changes: 2 additions & 2 deletions ...ecations/reindex/flyout/warnings_step.tsx → ...ecations/reindex/flyout/warnings_step.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import {
} from '@elastic/eui';
import { FormattedMessage } from '@kbn/i18n/react';

import { ReindexWarning, ReindexWarningTypes } from '../../../../../../../../common/types';
import { useAppContext } from '../../../../../../app_context';
import { ReindexWarning, ReindexWarningTypes } from '../../../../../../../common/types';
import { useAppContext } from '../../../../../app_context';
import {
CustomTypeNameWarningCheckbox,
DeprecatedSettingWarningCheckbox,
Expand Down
0 ...bs/checkup/deprecations/reindex/index.tsx → ...sticsearch/deprecations/reindex/index.tsx
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...recations/reindex/polling_service.test.ts → ...recations/reindex/polling_service.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

import { ReindexStatus, ReindexStep } from '../../../../../../../common/types';
import { ReindexStatus, ReindexStep } from '../../../../../../common/types';
import { ReindexPollingService } from './polling_service';
import { httpServiceMock } from 'src/core/public/mocks';

Expand Down
4 changes: 2 additions & 2 deletions ...p/deprecations/reindex/polling_service.ts → ...h/deprecations/reindex/polling_service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import {
ReindexStatus,
ReindexStep,
ReindexWarning,
} from '../../../../../../../common/types';
import { LoadingState } from '../../../../types';
} from '../../../../../../common/types';
import { LoadingState } from '../../../types';

const POLL_INTERVAL = 1000;

Expand Down
4 changes: 2 additions & 2 deletions ...mponents/tabs/checkup/filter_bar.test.tsx → ...ponents/elasticsearch/filter_bar.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@

import { mount, shallow } from 'enzyme';
import React from 'react';
import { DeprecationInfo } from '../../../../../common/types';
import { DeprecationInfo } from '../../../../common/types';

import { LevelFilterOption } from '../../types';
import { LevelFilterOption } from '../types';
import { FilterBar } from './filter_bar';

const defaultProps = {
Expand Down
4 changes: 2 additions & 2 deletions ...on/components/tabs/checkup/filter_bar.tsx → ...n/components/elasticsearch/filter_bar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import React from 'react';
import { EuiFilterButton, EuiFilterGroup, EuiFlexItem } from '@elastic/eui';
import { i18n } from '@kbn/i18n';

import { DeprecationInfo } from '../../../../../common/types';
import { LevelFilterOption } from '../../types';
import { DeprecationInfo } from '../../../../common/types';
import { LevelFilterOption } from '../types';

const LocalizedOptions: { [option: string]: string } = {
all: i18n.translate('xpack.upgradeAssistant.checkupTab.controls.filterBar.allButtonLabel', {
Expand Down
2 changes: 1 addition & 1 deletion ...onents/tabs/checkup/group_by_bar.test.tsx → ...nents/elasticsearch/group_by_bar.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import { mount, shallow } from 'enzyme';
import React from 'react';

import { GroupByOption } from '../../types';
import { GroupByOption } from '../types';
import { GroupByBar } from './group_by_bar';

const defaultProps = {
Expand Down
Loading