Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
import { dataViewPluginMocks } from '@kbn/data-views-plugin/public/mocks';
import type { DataView } from '@kbn/data-views-plugin/public';
import { indexPatternEditorPluginMock as dataViewEditorPluginMock } from '@kbn/data-view-editor-plugin/public/mocks';
import { DataViewSelector } from '@kbn/unified-search-plugin/public';
import { act } from 'react-dom/test-utils';

const selectedDataView = {
Expand All @@ -29,7 +30,7 @@ const props: DataViewSelectPopoverProps = {
dataView: selectedDataView,
};

const dataViewIds = ['mock-data-logs-id', 'mock-ecommerce-id', 'mock-test-id'];
const dataViewIds = ['mock-data-logs-id', 'mock-ecommerce-id', 'mock-test-id', 'mock-ad-hoc-id'];

const dataViewOptions = [
selectedDataView,
Expand Down Expand Up @@ -59,6 +60,15 @@ const dataViewOptions = [
isPersisted: jest.fn(() => true),
getName: () => 'test',
},
{
id: 'mock-ad-hoc-id',
namespaces: ['default'],
title: 'ad-hoc data view',
typeMeta: {},
isTimeBased: jest.fn(),
isPersisted: jest.fn(() => false),
getName: () => 'ad-hoc data view',
},
];

const mount = () => {
Expand Down Expand Up @@ -98,4 +108,44 @@ describe('DataViewSelectPopover', () => {
const getIdsResult = await dataViewsMock.getIds.mock.results[0].value;
expect(getIdsResult).toBe(dataViewIds);
});

test('should open a popover on click', async () => {
const { wrapper } = mount();

await act(async () => {
await nextTick();
wrapper.update();
});

await wrapper.find('[data-test-subj="selectDataViewExpression"]').first().simulate('click');

expect(wrapper.find(DataViewSelector).prop('dataViewsList')).toMatchInlineSnapshot(`
Array [
Object {
"id": "mock-data-logs-id",
"isAdhoc": false,
"name": undefined,
"title": "kibana_sample_data_logs",
},
Object {
"id": "mock-ecommerce-id",
"isAdhoc": false,
"name": undefined,
"title": "kibana_sample_data_ecommerce",
},
Object {
"id": "mock-test-id",
"isAdhoc": false,
"name": undefined,
"title": "test",
},
Object {
"id": "mock-ad-hoc-id",
"isAdhoc": true,
"name": undefined,
"title": "ad-hoc data view",
},
]
`);
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,9 @@ import {
EuiText,
useEuiPaddingCSS,
} from '@elastic/eui';
import type { DataViewListItem, DataView } from '@kbn/data-views-plugin/public';
import type { DataView } from '@kbn/data-views-plugin/public';
import { DataViewSelector } from '@kbn/unified-search-plugin/public';
import type { DataViewListItemEnhanced } from '@kbn/unified-search-plugin/public/dataview_picker/dataview_list';
import { useTriggerUiActionServices } from '../es_query/util';
import { EsQueryRuleMetaData } from '../es_query/types';

Expand All @@ -32,11 +33,12 @@ export interface DataViewSelectPopoverProps {
onChangeMetaData: (metadata: EsQueryRuleMetaData) => void;
}

const toDataViewListItem = (dataView: DataView): DataViewListItem => {
const toDataViewListItem = (dataView: DataView): DataViewListItemEnhanced => {
return {
id: dataView.id!,
title: dataView.title,
name: dataView.name,
isAdhoc: !dataView.isPersisted(),
};
};

Expand All @@ -47,7 +49,7 @@ export const DataViewSelectPopover: React.FunctionComponent<DataViewSelectPopove
onChangeMetaData,
}) => {
const { dataViews, dataViewEditor } = useTriggerUiActionServices();
const [dataViewItems, setDataViewsItems] = useState<DataViewListItem[]>([]);
const [dataViewItems, setDataViewsItems] = useState<DataViewListItemEnhanced[]>([]);
const [dataViewPopoverOpen, setDataViewPopoverOpen] = useState(false);

const closeDataViewEditor = useRef<() => void | undefined>();
Expand Down