Skip to content

Commit 5910a95

Browse files
ashwin-pcNicksqainabbyhu2000
authored
[CCI] Fix EUI/OUI type errors (#3798) (#4861)
* Update find_test_subject imports for tests * Update to available imports for findTestSubject * Fix available import for Query and custom icon * Add changelog entry * Add ts-ignore --------- (cherry picked from commit 0e25f2e) Signed-off-by: Alexei Karikov <karikov.alist.ru@gmail.com> Signed-off-by: Ashwin P Chandran <ashwinpc@amazon.com> Co-authored-by: Alexei Karikov <karikov.alist.ru@gmail.com> Co-authored-by: Qingyang(Abby) Hu <abigailhu2000@gmail.com>
1 parent 5a07a92 commit 5910a95

File tree

23 files changed

+24
-22
lines changed

23 files changed

+24
-22
lines changed

CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# CHANGELOG
2+
23
Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
34

45
## [Unreleased] (https://github.com/opensearch-project/OpenSearch-Dashboards/compare/2.8.0...HEAD)
@@ -166,6 +167,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
166167
- [Multiple DataSource] Refactor dev tool console to use opensearch-js client to send requests ([#3544](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3544))
167168
- [Multiple DataSource] Present the authentication type choices in a drop-down ([#3693](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3693))
168169
- [Table Visualization] Move format table, consolidate types and add unit tests ([#3397](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3397))
170+
- Fix EUI/OUI type errors ([#3798](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3798))
169171

170172
### 🔩 Tests
171173

src/plugins/advanced_settings/public/management_app/components/field/field.test.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import { FieldSetting } from '../../types';
3636
import { UiSettingsType, StringValidation } from '../../../../../../core/public';
3737
import { notificationServiceMock, docLinksServiceMock } from '../../../../../../core/public/mocks';
3838

39-
import { findTestSubject } from '@elastic/eui/lib/test';
39+
import { findTestSubject } from 'test_utils/helpers';
4040
import { Field, getEditableValue } from './field';
4141

4242
jest.mock('brace/theme/textmate', () => 'brace/theme/textmate');

src/plugins/advanced_settings/public/management_app/components/form/form.test.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import ReactDOM from 'react-dom';
3333
import { shallowWithI18nProvider, mountWithI18nProvider } from 'test_utils/enzyme_helpers';
3434
import { UiSettingsType } from '../../../../../../core/public';
3535

36-
import { findTestSubject } from '@elastic/eui/lib/test';
36+
import { findTestSubject } from 'test_utils/helpers';
3737

3838
import { notificationServiceMock } from '../../../../../../core/public/mocks';
3939
import { SettingsChanges } from '../../types';

src/plugins/advanced_settings/public/management_app/components/search/search.test.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import React from 'react';
3232
import { shallowWithI18nProvider, mountWithI18nProvider } from 'test_utils/enzyme_helpers';
3333

34-
import { findTestSubject } from '@elastic/eui/lib/test';
34+
import { findTestSubject } from 'test_utils/helpers';
3535

3636
import { Query } from '@elastic/eui';
3737
import { Search } from './search';

src/plugins/advanced_settings/public/management_app/components/search/search.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
import React, { Fragment, PureComponent } from 'react';
3232
import { i18n } from '@osd/i18n';
3333
import { EuiSearchBar, EuiFormErrorText, Query } from '@elastic/eui';
34-
3534
import { getCategoryName } from '../../lib';
3635

3736
interface SearchProps {
@@ -111,6 +110,7 @@ export class Search extends PureComponent<SearchProps> {
111110

112111
return (
113112
<Fragment>
113+
{/* @ts-ignore The Query types that typescript complains about here are identical and is a false flag. Once OUI migration is complete, this ignore can be removed */}
114114
<EuiSearchBar box={box} filters={filters} onChange={this.onChange} query={query} />
115115
{queryParseError}
116116
</Fragment>

src/plugins/data/public/ui/shard_failure_modal/shard_failure_open_modal_button.test.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import { mountWithIntl } from 'test_utils/enzyme_helpers';
3434
import ShardFailureOpenModalButton from './shard_failure_open_modal_button';
3535
import { shardFailureRequest } from './__mocks__/shard_failure_request';
3636
import { shardFailureResponse } from './__mocks__/shard_failure_response';
37-
import { findTestSubject } from '@elastic/eui/lib/test';
37+
import { findTestSubject } from 'test_utils/helpers';
3838

3939
describe('ShardFailureOpenModalButton', () => {
4040
it('triggers the openModal function when "Show details" button is clicked', () => {

src/plugins/discover/public/application/components/chart/hits_counter/hits_counter.test.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import React from 'react';
3232
import { mountWithIntl } from 'test_utils/enzyme_helpers';
3333
import { ReactWrapper } from 'enzyme';
3434
import { HitsCounter, HitsCounterProps } from './hits_counter';
35-
import { findTestSubject } from '@elastic/eui/lib/test';
35+
import { findTestSubject } from 'test_utils/helpers';
3636

3737
describe('hits counter', function () {
3838
let props: HitsCounterProps;

src/plugins/discover/public/application/components/chart/timechart_header/timechart_header.test.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import { mountWithIntl } from 'test_utils/enzyme_helpers';
3333
import { ReactWrapper } from 'enzyme';
3434
import { TimechartHeader, TimechartHeaderProps } from './timechart_header';
3535
import { EuiIconTip } from '@elastic/eui';
36-
import { findTestSubject } from '@elastic/eui/lib/test';
36+
import { findTestSubject } from 'test_utils/helpers';
3737

3838
describe('timechart header', function () {
3939
let props: TimechartHeaderProps;

src/plugins/discover/public/application/components/doc/doc.test.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import React from 'react';
3333
import { act } from 'react-dom/test-utils';
3434
import { mountWithIntl } from 'test_utils/enzyme_helpers';
3535
import { ReactWrapper } from 'enzyme';
36-
import { findTestSubject } from '@elastic/eui/lib/test';
36+
import { findTestSubject } from 'test_utils/helpers';
3737
import { Doc, DocProps } from './doc';
3838

3939
const mockSearchApi = jest.fn();

src/plugins/discover/public/application/components/doc_viewer/doc_viewer.test.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import React from 'react';
3232
import { mount, shallow } from 'enzyme';
3333
import { DocViewer } from './doc_viewer';
34-
import { findTestSubject } from '@elastic/eui/lib/test';
34+
import { findTestSubject } from 'test_utils/helpers';
3535
import { getDocViewsRegistry } from '../../../opensearch_dashboards_services';
3636
import { DocViewRenderProps } from '../../../doc_views/doc_views_types';
3737

src/plugins/discover/public/application/components/loading_spinner/loading_spinner.test.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import React from 'react';
3232
import { mountWithIntl } from 'test_utils/enzyme_helpers';
3333
import { ReactWrapper } from 'enzyme';
3434
import { LoadingSpinner } from './loading_spinner';
35-
import { findTestSubject } from '@elastic/eui/lib/test';
35+
import { findTestSubject } from 'test_utils/helpers';
3636

3737
describe('loading spinner', function () {
3838
let component: ReactWrapper;

src/plugins/discover/public/application/components/table/table.test.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
import React from 'react';
3232
import { mount } from 'enzyme';
33-
import { findTestSubject } from '@elastic/eui/lib/test';
33+
import { findTestSubject } from 'test_utils/helpers';
3434
import { DocViewTable } from './table';
3535
import { indexPatterns, IndexPattern } from '../../../../../data/public';
3636

src/plugins/discover_legacy/public/application/angular/context/components/action_bar/action_bar.test.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import React from 'react';
3232
import { mountWithIntl } from 'test_utils/enzyme_helpers';
3333
import { ActionBar, ActionBarProps } from './action_bar';
34-
import { findTestSubject } from '@elastic/eui/lib/test';
34+
import { findTestSubject } from 'test_utils/helpers';
3535
import { MAX_CONTEXT_SIZE, MIN_CONTEXT_SIZE } from '../../query_parameters/constants';
3636

3737
describe('Test Discover Context ActionBar for successor | predecessor records', () => {

src/plugins/discover_legacy/public/application/angular/doc_table/components/pager/tool_bar_pager_buttons.test.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import React from 'react';
3232
import { mountWithIntl, shallowWithIntl } from 'test_utils/enzyme_helpers';
3333
import { ToolBarPagerButtons } from './tool_bar_pager_buttons';
34-
import { findTestSubject } from '@elastic/eui/lib/test';
34+
import { findTestSubject } from 'test_utils/helpers';
3535

3636
test('it renders ToolBarPagerButtons', () => {
3737
const props = {

src/plugins/discover_legacy/public/application/angular/doc_table/components/table_header/table_header.test.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import React from 'react';
3232
import { mountWithIntl } from 'test_utils/enzyme_helpers';
3333
import { TableHeader } from './table_header';
34-
import { findTestSubject } from '@elastic/eui/lib/test';
34+
import { findTestSubject } from 'test_utils/helpers';
3535
import { SortOrder } from './helpers';
3636
import { IndexPattern, IFieldType } from '../../../../../opensearch_dashboards_services';
3737

src/plugins/discover_legacy/public/application/components/context_error_message/context_error_message.test.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import { ReactWrapper } from 'enzyme';
3434
import { ContextErrorMessage } from './context_error_message';
3535
// @ts-ignore
3636
import { FAILURE_REASONS, LOADING_STATUS } from '../../angular/context/query';
37-
import { findTestSubject } from '@elastic/eui/lib/test';
37+
import { findTestSubject } from 'test_utils/helpers';
3838

3939
describe('loading spinner', function () {
4040
let component: ReactWrapper;

src/plugins/embeddable/public/lib/embeddables/embeddable_root.test.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import React from 'react';
3232
import { HelloWorldEmbeddable } from '../../../../../../examples/embeddable_examples/public';
3333
import { EmbeddableRoot } from './embeddable_root';
3434
import { mount } from 'enzyme';
35-
import { findTestSubject } from '@elastic/eui/lib/test';
35+
import { findTestSubject } from 'test_utils/helpers';
3636

3737
test('EmbeddableRoot renders an embeddable', async () => {
3838
const embeddable = new HelloWorldEmbeddable({ id: 'hello' });

src/plugins/embeddable/public/lib/panel/embeddable_panel.test.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import React from 'react';
3232
import { mount } from 'enzyme';
3333
import { nextTick } from 'test_utils/enzyme_helpers';
3434

35-
import { findTestSubject } from '@elastic/eui/lib/test';
35+
import { findTestSubject } from 'test_utils/helpers';
3636
import { I18nProvider } from '@osd/i18n/react';
3737
import { CONTEXT_MENU_TRIGGER } from '../triggers';
3838
import { Action, UiActionsStart, ActionType } from '../../../../ui_actions/public';

src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_flyout.test.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ import { ContainerInput } from '../../../../containers';
4141
import { mountWithIntl as mount } from 'test_utils/enzyme_helpers';
4242
import { ReactWrapper } from 'enzyme';
4343
import { coreMock } from '../../../../../../../../core/public/mocks';
44-
import { findTestSubject } from '@elastic/eui/lib/test';
44+
import { findTestSubject } from 'test_utils/helpers';
4545
import { embeddablePluginMock } from '../../../../../mocks';
4646

4747
function DummySavedObjectFinder(props: { children: React.ReactNode }) {

src/plugins/input_control_vis/public/components/editor/controls_tab.test.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
import React from 'react';
3232
import { shallowWithIntl, mountWithIntl } from 'test_utils/enzyme_helpers';
33-
import { findTestSubject } from '@elastic/eui/lib/test';
33+
import { findTestSubject } from 'test_utils/helpers';
3434
import { getDepsMock, getIndexPatternMock } from '../../test_utils';
3535
import { ControlsTab, ControlsTabUiProps } from './controls_tab';
3636
import { Vis } from '../../../../visualizations/public';

src/plugins/input_control_vis/public/components/editor/list_control_editor.test.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import React from 'react';
3232
import sinon from 'sinon';
3333
import { shallow } from 'enzyme';
3434

35-
import { findTestSubject } from '@elastic/eui/lib/test';
35+
import { findTestSubject } from 'test_utils/helpers';
3636

3737
import { mountWithIntl, shallowWithIntl } from 'test_utils/enzyme_helpers';
3838
import { getIndexPatternMock } from '../../test_utils/get_index_pattern_mock';

src/plugins/input_control_vis/public/components/editor/range_control_editor.test.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import { shallow } from 'enzyme';
3333
import { SinonSpy, spy, assert } from 'sinon';
3434
import { mountWithIntl } from 'test_utils/enzyme_helpers';
3535

36-
import { findTestSubject } from '@elastic/eui/lib/test';
36+
import { findTestSubject } from 'test_utils/helpers';
3737

3838
import { RangeControlEditor } from './range_control_editor';
3939
import { ControlParams } from '../../editor_utils';

src/plugins/input_control_vis/public/components/vis/input_control_vis.test.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import React from 'react';
3232
import sinon from 'sinon';
3333
import { shallow } from 'enzyme';
3434
import { mountWithIntl } from 'test_utils/enzyme_helpers';
35-
import { findTestSubject } from '@elastic/eui/lib/test';
35+
import { findTestSubject } from 'test_utils/helpers';
3636

3737
import { InputControlVis } from './input_control_vis';
3838
import { ListControl } from '../../control/list_control_factory';

0 commit comments

Comments
 (0)