diff --git a/dashboards-observability/public/components/app.tsx b/dashboards-observability/public/components/app.tsx index 3cc0da4de..b4d164331 100644 --- a/dashboards-observability/public/components/app.tsx +++ b/dashboards-observability/public/components/app.tsx @@ -13,7 +13,7 @@ import store from '../framework/redux/store'; import { AppPluginStartDependencies } from '../types'; import { Home as ApplicationAnalyticsHome } from './application_analytics/home'; import { Home as CustomPanelsHome } from './custom_panels/home'; -import { EventAnalytics } from './explorer/event_analytics'; +import { EventAnalytics } from './event_analytics'; import { Main as NotebooksHome } from './notebooks/components/main'; import { Home as TraceAnalyticsHome } from './trace_analytics/home'; diff --git a/dashboards-observability/public/components/application_analytics/components/application.tsx b/dashboards-observability/public/components/application_analytics/components/application.tsx index 582d181cd..08ab10f22 100644 --- a/dashboards-observability/public/components/application_analytics/components/application.tsx +++ b/dashboards-observability/public/components/application_analytics/components/application.tsx @@ -36,7 +36,7 @@ import { PanelTitle, } from '../../../../public/components/trace_analytics/components/common/helper_functions'; import { SpanDetailTable } from '../../../../public/components/trace_analytics/components/traces/span_detail_table'; -import { Explorer } from '../../explorer/explorer'; +import { Explorer } from '../../event_analytics/explorer/explorer'; import { Configuration } from './configuration'; import { TAB_CONFIG_ID_TXT_PFX, diff --git a/dashboards-observability/public/components/application_analytics/helpers/utils.tsx b/dashboards-observability/public/components/application_analytics/helpers/utils.tsx index 57c4bf768..40f8e1f98 100644 --- a/dashboards-observability/public/components/application_analytics/helpers/utils.tsx +++ b/dashboards-observability/public/components/application_analytics/helpers/utils.tsx @@ -18,21 +18,21 @@ import { VisualizationType } from '../../../../common/types/custom_panels'; import { NEW_SELECTED_QUERY_TAB, TAB_CREATED_TYPE } from '../../../../common/constants/explorer'; import { APP_ANALYTICS_API_PREFIX } from '../../../../common/constants/application_analytics'; import { HttpSetup } from '../../../../../../src/core/public'; -import { init as initFields, remove as removefields } from '../../explorer/slices/field_slice'; +import { init as initFields, remove as removefields } from '../../event_analytics/redux/slices/field_slice'; import { init as initVisualizationConfig, reset as resetVisualizationConfig, -} from '../../explorer/slices/viualization_config_slice'; +} from '../../event_analytics/redux/slices/viualization_config_slice'; import { init as initQuery, remove as removeQuery, changeQuery, -} from '../../explorer/slices/query_slice'; +} from '../../event_analytics/redux/slices/query_slice'; import { init as initQueryResult, remove as removeQueryResult, -} from '../../explorer/slices/query_result_slice'; -import { addTab, removeTab } from '../../explorer/slices/query_tab_slice'; +} from '../../event_analytics/redux/slices/query_result_slice'; +import { addTab, removeTab } from '../../event_analytics/redux/slices/query_tab_slice'; // Name validation export const isNameValid = (name: string, existingNames: string[]) => { diff --git a/dashboards-observability/public/components/common/search/search.tsx b/dashboards-observability/public/components/common/search/search.tsx index 6c59133d2..46078c69b 100644 --- a/dashboards-observability/public/components/common/search/search.tsx +++ b/dashboards-observability/public/components/common/search/search.tsx @@ -21,7 +21,7 @@ import _ from 'lodash'; import { DatePicker } from './date_picker'; import '@algolia/autocomplete-theme-classic'; import { Autocomplete } from './autocomplete'; -import { SavePanel } from '../../explorer/save_panel'; +import { SavePanel } from '../../event_analytics/explorer/save_panel'; import { PPLReferenceFlyout } from '../helpers'; import { uiSettingsService } from '../../../../common/utils'; import { APP_ANALYTICS_TAB_ID_REGEX } from '../../../../common/constants/explorer'; diff --git a/dashboards-observability/public/components/explorer/__tests__/__snapshots__/no_results.test.tsx.snap b/dashboards-observability/public/components/event_analytics/__tests__/__snapshots__/no_results.test.tsx.snap similarity index 100% rename from dashboards-observability/public/components/explorer/__tests__/__snapshots__/no_results.test.tsx.snap rename to dashboards-observability/public/components/event_analytics/__tests__/__snapshots__/no_results.test.tsx.snap diff --git a/dashboards-observability/public/components/explorer/__tests__/no_results.test.tsx b/dashboards-observability/public/components/event_analytics/__tests__/no_results.test.tsx similarity index 91% rename from dashboards-observability/public/components/explorer/__tests__/no_results.test.tsx rename to dashboards-observability/public/components/event_analytics/__tests__/no_results.test.tsx index b87c8dc13..1bc6c9eb1 100644 --- a/dashboards-observability/public/components/explorer/__tests__/no_results.test.tsx +++ b/dashboards-observability/public/components/event_analytics/__tests__/no_results.test.tsx @@ -7,7 +7,7 @@ import { configure, mount } from 'enzyme'; import Adapter from 'enzyme-adapter-react-16'; import React from 'react'; import { waitFor } from '@testing-library/react'; -import { NoResults } from '../no_results'; +import { NoResults } from '../explorer/no_results'; describe('No result component', () => { configure({ adapter: new Adapter() }); diff --git a/dashboards-observability/public/components/explorer/__tests__/__snapshots__/data_grid.test.tsx.snap b/dashboards-observability/public/components/event_analytics/explorer/__tests__/__snapshots__/data_grid.test.tsx.snap similarity index 100% rename from dashboards-observability/public/components/explorer/__tests__/__snapshots__/data_grid.test.tsx.snap rename to dashboards-observability/public/components/event_analytics/explorer/__tests__/__snapshots__/data_grid.test.tsx.snap diff --git a/dashboards-observability/public/components/explorer/__tests__/data_grid.test.tsx b/dashboards-observability/public/components/event_analytics/explorer/__tests__/data_grid.test.tsx similarity index 86% rename from dashboards-observability/public/components/explorer/__tests__/data_grid.test.tsx rename to dashboards-observability/public/components/event_analytics/explorer/__tests__/data_grid.test.tsx index a45d7ecd9..f659f3243 100644 --- a/dashboards-observability/public/components/explorer/__tests__/data_grid.test.tsx +++ b/dashboards-observability/public/components/event_analytics/explorer/__tests__/data_grid.test.tsx @@ -7,18 +7,18 @@ import { configure, mount } from 'enzyme'; import Adapter from 'enzyme-adapter-react-16'; import React from 'react'; import { waitFor } from '@testing-library/react'; -import { DataGrid } from '../data_grid'; +import { DataGrid } from '../events_views/data_grid'; import { SELECTED_FIELDS, AVAILABLE_FIELDS, UNSELECTED_FIELDS, QUERIED_FIELDS -} from '../../../../common/constants/explorer'; +} from '../../../../../common/constants/explorer'; import { AVAILABLE_FIELDS as SIDEBAR_AVAILABLE_FIELDS, QUERY_FIELDS, DATA_GRID_ROWS -} from '../../../../test/event_analytics_constants'; +} from '../../../../../test/event_analytics_constants'; describe('Datagrid component', () => { configure({ adapter: new Adapter() }); diff --git a/dashboards-observability/public/components/explorer/docTable/__tests__/__snapshots__/docViewer.test.tsx.snap b/dashboards-observability/public/components/event_analytics/explorer/events_views/__tests__/__snapshots__/doc_viewer.test.tsx.snap similarity index 100% rename from dashboards-observability/public/components/explorer/docTable/__tests__/__snapshots__/docViewer.test.tsx.snap rename to dashboards-observability/public/components/event_analytics/explorer/events_views/__tests__/__snapshots__/doc_viewer.test.tsx.snap diff --git a/dashboards-observability/public/components/explorer/docTable/__tests__/__snapshots__/docViewerRow.test.tsx.snap b/dashboards-observability/public/components/event_analytics/explorer/events_views/__tests__/__snapshots__/doc_viewer_row.test.tsx.snap similarity index 100% rename from dashboards-observability/public/components/explorer/docTable/__tests__/__snapshots__/docViewerRow.test.tsx.snap rename to dashboards-observability/public/components/event_analytics/explorer/events_views/__tests__/__snapshots__/doc_viewer_row.test.tsx.snap diff --git a/dashboards-observability/public/components/explorer/docTable/__tests__/docViewer.test.tsx b/dashboards-observability/public/components/event_analytics/explorer/events_views/__tests__/doc_viewer.test.tsx similarity index 100% rename from dashboards-observability/public/components/explorer/docTable/__tests__/docViewer.test.tsx rename to dashboards-observability/public/components/event_analytics/explorer/events_views/__tests__/doc_viewer.test.tsx diff --git a/dashboards-observability/public/components/explorer/docTable/__tests__/docViewerRow.test.tsx b/dashboards-observability/public/components/event_analytics/explorer/events_views/__tests__/doc_viewer_row.test.tsx similarity index 100% rename from dashboards-observability/public/components/explorer/docTable/__tests__/docViewerRow.test.tsx rename to dashboards-observability/public/components/event_analytics/explorer/events_views/__tests__/doc_viewer_row.test.tsx diff --git a/dashboards-observability/public/components/explorer/data_grid.scss b/dashboards-observability/public/components/event_analytics/explorer/events_views/data_grid.scss similarity index 100% rename from dashboards-observability/public/components/explorer/data_grid.scss rename to dashboards-observability/public/components/event_analytics/explorer/events_views/data_grid.scss diff --git a/dashboards-observability/public/components/explorer/data_grid.tsx b/dashboards-observability/public/components/event_analytics/explorer/events_views/data_grid.tsx similarity index 91% rename from dashboards-observability/public/components/explorer/data_grid.tsx rename to dashboards-observability/public/components/event_analytics/explorer/events_views/data_grid.tsx index ad31d3745..d0385a9a0 100644 --- a/dashboards-observability/public/components/explorer/data_grid.tsx +++ b/dashboards-observability/public/components/event_analytics/explorer/events_views/data_grid.tsx @@ -6,11 +6,11 @@ import './data_grid.scss'; import React, { useMemo, useState, useEffect, useRef, RefObject } from 'react'; -import { IExplorerFields } from '../../../common/types/explorer'; -import { DEFAULT_COLUMNS, PAGE_SIZE } from '../../../common/constants/explorer'; -import { getHeaders, getTrs, populateDataGrid } from './utils'; -import { HttpSetup } from '../../../../../src/core/public'; -import PPLService from '../../services/requests/ppl'; +import { IExplorerFields } from '../../../../../common/types/explorer'; +import { DEFAULT_COLUMNS, PAGE_SIZE } from '../../../../../common/constants/explorer'; +import { getHeaders, getTrs, populateDataGrid } from '../../utils'; +import { HttpSetup } from '../../../../../../../src/core/public'; +import PPLService from '../../../../services/requests/ppl'; interface DataGridProps { http: HttpSetup; diff --git a/dashboards-observability/public/components/explorer/docTable/detailTable/docDetailTable.tsx b/dashboards-observability/public/components/event_analytics/explorer/events_views/detail_table/doc_detail_table.tsx similarity index 100% rename from dashboards-observability/public/components/explorer/docTable/detailTable/docDetailTable.tsx rename to dashboards-observability/public/components/event_analytics/explorer/events_views/detail_table/doc_detail_table.tsx diff --git a/dashboards-observability/public/components/explorer/docTable/detailTable/docDetailTitle.tsx b/dashboards-observability/public/components/event_analytics/explorer/events_views/detail_table/doc_detail_title.tsx similarity index 100% rename from dashboards-observability/public/components/explorer/docTable/detailTable/docDetailTitle.tsx rename to dashboards-observability/public/components/event_analytics/explorer/events_views/detail_table/doc_detail_title.tsx diff --git a/dashboards-observability/public/components/explorer/docTable/detailTable/table_row.tsx b/dashboards-observability/public/components/event_analytics/explorer/events_views/detail_table/table_row.tsx similarity index 61% rename from dashboards-observability/public/components/explorer/docTable/detailTable/table_row.tsx rename to dashboards-observability/public/components/event_analytics/explorer/events_views/detail_table/table_row.tsx index 875c29191..865fa9581 100644 --- a/dashboards-observability/public/components/explorer/docTable/detailTable/table_row.tsx +++ b/dashboards-observability/public/components/event_analytics/explorer/events_views/detail_table/table_row.tsx @@ -5,15 +5,10 @@ import classNames from 'classnames'; import React, { ReactNode } from 'react'; -// import { FieldMapping, DocViewFilterFn } from '../../doc_views/doc_views_types'; -import { DocViewTableRowBtnFilterAdd } from './table_row_btn_filter_add'; -import { DocViewTableRowBtnFilterRemove } from './table_row_btn_filter_remove'; -import { DocViewTableRowBtnToggleColumn } from './table_row_btn_toggle_column'; import { DocViewTableRowBtnCollapse } from './table_row_btn_collapse'; -import { DocViewTableRowBtnFilterExists } from './table_row_btn_filter_exists'; import { DocViewTableRowIconNoMapping } from './table_row_icon_no_mapping'; import { DocViewTableRowIconUnderscore } from './table_row_icon_underscore'; -import { FieldName } from '../../../common/field_name/field_name'; +import { FieldName } from '../../../../common/field_name/field_name'; export interface FieldMapping { filterable?: boolean; @@ -53,12 +48,8 @@ export function DocViewTableRow({ displayUnderscoreWarning, isCollapsible, isCollapsed, - isColumnActive, - onFilter, onToggleCollapse, - onToggleColumn, value, - valueRaw, }: Props) { const valueClassName = classNames({ // eslint-disable-next-line @typescript-eslint/naming-convention @@ -68,31 +59,10 @@ export function DocViewTableRow({ return ( - {typeof onFilter === 'function' && (<> - // - // onFilter(fieldMapping, valueRaw, '+')} - // /> - // onFilter(fieldMapping, valueRaw, '-')} - // /> - // {typeof onToggleColumn === 'function' && ( - // - // )} - // onFilter('_exists_', field, '+')} - // scripted={fieldMapping && fieldMapping.scripted} - // /> - // - )} diff --git a/dashboards-observability/public/components/explorer/docTable/detailTable/table_row_btn_collapse.tsx b/dashboards-observability/public/components/event_analytics/explorer/events_views/detail_table/table_row_btn_collapse.tsx similarity index 100% rename from dashboards-observability/public/components/explorer/docTable/detailTable/table_row_btn_collapse.tsx rename to dashboards-observability/public/components/event_analytics/explorer/events_views/detail_table/table_row_btn_collapse.tsx diff --git a/dashboards-observability/public/components/explorer/docTable/detailTable/table_row_icon_no_mapping.tsx b/dashboards-observability/public/components/event_analytics/explorer/events_views/detail_table/table_row_icon_no_mapping.tsx similarity index 100% rename from dashboards-observability/public/components/explorer/docTable/detailTable/table_row_icon_no_mapping.tsx rename to dashboards-observability/public/components/event_analytics/explorer/events_views/detail_table/table_row_icon_no_mapping.tsx diff --git a/dashboards-observability/public/components/explorer/docTable/detailTable/table_row_icon_underscore.tsx b/dashboards-observability/public/components/event_analytics/explorer/events_views/detail_table/table_row_icon_underscore.tsx similarity index 100% rename from dashboards-observability/public/components/explorer/docTable/detailTable/table_row_icon_underscore.tsx rename to dashboards-observability/public/components/event_analytics/explorer/events_views/detail_table/table_row_icon_underscore.tsx diff --git a/dashboards-observability/public/components/explorer/docTable/docView.scss b/dashboards-observability/public/components/event_analytics/explorer/events_views/docView.scss similarity index 100% rename from dashboards-observability/public/components/explorer/docTable/docView.scss rename to dashboards-observability/public/components/event_analytics/explorer/events_views/docView.scss diff --git a/dashboards-observability/public/components/explorer/docTable/docViewRow.tsx b/dashboards-observability/public/components/event_analytics/explorer/events_views/docViewRow.tsx similarity index 95% rename from dashboards-observability/public/components/explorer/docTable/docViewRow.tsx rename to dashboards-observability/public/components/event_analytics/explorer/events_views/docViewRow.tsx index ad612c8b0..7a4f2c3b2 100644 --- a/dashboards-observability/public/components/explorer/docTable/docViewRow.tsx +++ b/dashboards-observability/public/components/event_analytics/explorer/events_views/docViewRow.tsx @@ -9,13 +9,13 @@ import React, { forwardRef, useImperativeHandle, useMemo, useState } from 'react import { toPairs, uniqueId, has, forEach, isEqual } from 'lodash'; import { EuiButtonEmpty, EuiButtonIcon, EuiIcon, EuiLink } from '@elastic/eui'; import { useEffect } from 'react'; -import { IExplorerFields, IField } from '../../../../common/types/explorer'; +import { IExplorerFields, IField } from '../../../../../common/types/explorer'; import { DocFlyout } from './doc_flyout'; -import { HttpStart } from '../../../../../../src/core/public'; -import { OTEL_TRACE_ID, DATE_PICKER_FORMAT } from '../../../../common/constants/explorer'; +import { HttpStart } from '../../../../../../../src/core/public'; +import { OTEL_TRACE_ID, DATE_PICKER_FORMAT } from '../../../../../common/constants/explorer'; import { SurroundingFlyout } from './surrounding_flyout'; -import PPLService from '../../../services/requests/ppl'; -import { isValidTraceId } from '../utils'; +import PPLService from '../../../../services/requests/ppl'; +import { isValidTraceId } from '../../utils'; export interface IDocType { [key: string]: string; diff --git a/dashboards-observability/public/components/explorer/docTable/docViewer.tsx b/dashboards-observability/public/components/event_analytics/explorer/events_views/docViewer.tsx similarity index 92% rename from dashboards-observability/public/components/explorer/docTable/docViewer.tsx rename to dashboards-observability/public/components/event_analytics/explorer/events_views/docViewer.tsx index 240e7fdce..581b30aeb 100644 --- a/dashboards-observability/public/components/explorer/docTable/docViewer.tsx +++ b/dashboards-observability/public/components/event_analytics/explorer/events_views/docViewer.tsx @@ -13,13 +13,13 @@ import { EuiTabbedContent, EuiTabbedContentTab, } from '@elastic/eui'; -import { DocViewTable } from './detailTable/docDetailTable'; +import { DocViewTable } from './detail_table/doc_detail_table'; import { JsonCodeBlock } from './json_code_block/json_code_block'; import { IDocType } from './docViewRow'; -import { HttpSetup } from '../../../../../../src/core/public'; +import { HttpSetup } from '../../../../../../../src/core/public'; import { TraceBlock } from './trace_block/trace_block'; -import { OTEL_TRACE_ID } from '../../../../common/constants/explorer'; -import { isValidTraceId } from '../utils'; +import { OTEL_TRACE_ID } from '../../../../../common/constants/explorer'; +import { isValidTraceId } from '../../utils'; interface IDocViewerProps { http: HttpSetup; diff --git a/dashboards-observability/public/components/explorer/docTable/doc_flyout.tsx b/dashboards-observability/public/components/event_analytics/explorer/events_views/doc_flyout.tsx similarity index 89% rename from dashboards-observability/public/components/explorer/docTable/doc_flyout.tsx rename to dashboards-observability/public/components/event_analytics/explorer/events_views/doc_flyout.tsx index fdff39ea3..beba69089 100644 --- a/dashboards-observability/public/components/explorer/docTable/doc_flyout.tsx +++ b/dashboards-observability/public/components/event_analytics/explorer/events_views/doc_flyout.tsx @@ -16,15 +16,15 @@ import { EuiToolTip, } from '@elastic/eui'; import moment from 'moment'; -import { FlyoutContainers } from '../../common/flyout_containers'; +import { FlyoutContainers } from '../../../common/flyout_containers'; import { IDocType } from './docViewRow'; import { DocViewer } from './docViewer'; -import { uiSettingsService } from '../../../../common/utils'; -import { IExplorerFields } from '../../../../common/types/explorer'; -import { getHeaders, populateDataGrid } from '../utils'; -import { DEFAULT_COLUMNS } from '../../../../common/constants/explorer'; -import { HttpSetup } from '../../../../../../src/core/public'; -import { PPL_STATS_REGEX } from '../../../../common/constants/shared'; +import { uiSettingsService } from '../../../../../common/utils'; +import { IExplorerFields } from '../../../../../common/types/explorer'; +import { getHeaders, populateDataGrid } from '../../utils'; +import { DEFAULT_COLUMNS } from '../../../../../common/constants/explorer'; +import { HttpSetup } from '../../../../../../../src/core/public'; +import { PPL_STATS_REGEX } from '../../../../../common/constants/shared'; interface Props { http: HttpSetup; diff --git a/dashboards-observability/public/components/explorer/docTable/index.ts b/dashboards-observability/public/components/event_analytics/explorer/events_views/index.ts similarity index 100% rename from dashboards-observability/public/components/explorer/docTable/index.ts rename to dashboards-observability/public/components/event_analytics/explorer/events_views/index.ts diff --git a/dashboards-observability/public/components/explorer/docTable/json_code_block/__tests__/__snapshots__/json_code_block.test.tsx.snap b/dashboards-observability/public/components/event_analytics/explorer/events_views/json_code_block/__tests__/__snapshots__/json_code_block.test.tsx.snap similarity index 100% rename from dashboards-observability/public/components/explorer/docTable/json_code_block/__tests__/__snapshots__/json_code_block.test.tsx.snap rename to dashboards-observability/public/components/event_analytics/explorer/events_views/json_code_block/__tests__/__snapshots__/json_code_block.test.tsx.snap diff --git a/dashboards-observability/public/components/explorer/docTable/json_code_block/__tests__/json_code_block.test.tsx b/dashboards-observability/public/components/event_analytics/explorer/events_views/json_code_block/__tests__/json_code_block.test.tsx similarity index 100% rename from dashboards-observability/public/components/explorer/docTable/json_code_block/__tests__/json_code_block.test.tsx rename to dashboards-observability/public/components/event_analytics/explorer/events_views/json_code_block/__tests__/json_code_block.test.tsx diff --git a/dashboards-observability/public/components/explorer/docTable/json_code_block/json_code_block.tsx b/dashboards-observability/public/components/event_analytics/explorer/events_views/json_code_block/json_code_block.tsx similarity index 100% rename from dashboards-observability/public/components/explorer/docTable/json_code_block/json_code_block.tsx rename to dashboards-observability/public/components/event_analytics/explorer/events_views/json_code_block/json_code_block.tsx diff --git a/dashboards-observability/public/components/explorer/docTable/surrounding_flyout.tsx b/dashboards-observability/public/components/event_analytics/explorer/events_views/surrounding_flyout.tsx similarity index 95% rename from dashboards-observability/public/components/explorer/docTable/surrounding_flyout.tsx rename to dashboards-observability/public/components/event_analytics/explorer/events_views/surrounding_flyout.tsx index 5ca0701dc..4c67c3e19 100644 --- a/dashboards-observability/public/components/explorer/docTable/surrounding_flyout.tsx +++ b/dashboards-observability/public/components/event_analytics/explorer/events_views/surrounding_flyout.tsx @@ -21,13 +21,13 @@ import { EuiTitle, EuiToolTip, } from '@elastic/eui'; -import { FlyoutContainers } from '../../common/flyout_containers'; +import { FlyoutContainers } from '../../../common/flyout_containers'; import { IDocType } from './docViewRow'; -import { IExplorerFields, IField } from '../../../../common/types/explorer'; -import { getHeaders, fetchSurroundingData, rangeNumDocs, populateDataGrid } from '../utils'; -import { DEFAULT_COLUMNS } from '../../../../common/constants/explorer'; -import { HttpSetup } from '../../../../../../src/core/public'; -import PPLService from '../../../services/requests/ppl'; +import { IExplorerFields, IField } from '../../../../../common/types/explorer'; +import { getHeaders, fetchSurroundingData, rangeNumDocs, populateDataGrid } from '../../utils'; +import { DEFAULT_COLUMNS } from '../../../../../common/constants/explorer'; +import { HttpSetup } from '../../../../../../../src/core/public'; +import PPLService from '../../../../services/requests/ppl'; interface Props { http: HttpSetup; diff --git a/dashboards-observability/public/components/explorer/docTable/trace_block/trace_block.tsx b/dashboards-observability/public/components/event_analytics/explorer/events_views/trace_block/trace_block.tsx similarity index 78% rename from dashboards-observability/public/components/explorer/docTable/trace_block/trace_block.tsx rename to dashboards-observability/public/components/event_analytics/explorer/events_views/trace_block/trace_block.tsx index 6227666e8..e90476c92 100644 --- a/dashboards-observability/public/components/explorer/docTable/trace_block/trace_block.tsx +++ b/dashboards-observability/public/components/event_analytics/explorer/events_views/trace_block/trace_block.tsx @@ -3,17 +3,17 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { TraceDetailRender } from '../../../application_analytics/components/flyout_components/trace_detail_render'; +import { TraceDetailRender } from '../../../../application_analytics/components/flyout_components/trace_detail_render'; import React, { useEffect } from 'react'; -import { HttpSetup } from '../../../../../../../src/core/public'; +import { HttpSetup } from '../../../../../../../../src/core/public'; import { EuiCallOut, EuiLink } from '@elastic/eui'; -import { TRACE_ANALYTICS_DOCUMENTATION_LINK } from '../../../../../common/constants/trace_analytics'; +import { TRACE_ANALYTICS_DOCUMENTATION_LINK } from '../../../../../../common/constants/trace_analytics'; import { OPEN_TELEMETRY_LOG_CORRELATION_LINK, OTEL_TRACE_ID, -} from '../../../../../common/constants/explorer'; +} from '../../../../../../common/constants/explorer'; import { IDocType } from '../docViewRow'; -import { isValidTraceId } from '../../utils'; +import { isValidTraceId } from '../../../utils'; interface props { http: HttpSetup; diff --git a/dashboards-observability/public/components/explorer/explorer.scss b/dashboards-observability/public/components/event_analytics/explorer/explorer.scss similarity index 100% rename from dashboards-observability/public/components/explorer/explorer.scss rename to dashboards-observability/public/components/event_analytics/explorer/explorer.scss diff --git a/dashboards-observability/public/components/explorer/explorer.tsx b/dashboards-observability/public/components/event_analytics/explorer/explorer.tsx similarity index 97% rename from dashboards-observability/public/components/explorer/explorer.tsx rename to dashboards-observability/public/components/event_analytics/explorer/explorer.tsx index 4f9233cf8..3171f8476 100644 --- a/dashboards-observability/public/components/explorer/explorer.tsx +++ b/dashboards-observability/public/components/event_analytics/explorer/explorer.tsx @@ -24,15 +24,15 @@ import { } from '@elastic/eui'; import dateMath from '@elastic/datemath'; import classNames from 'classnames'; -import { Search } from '../common/search/search'; +import { Search } from '../../common/search/search'; import { CountDistribution } from './visualizations/count_distribution'; -import { DataGrid } from './data_grid'; +import { DataGrid } from './events_views/data_grid'; import { Sidebar } from './sidebar'; import { NoResults } from './no_results'; import { HitsCounter } from './hits_counter/hits_counter'; import { TimechartHeader } from './timechart_header'; import { ExplorerVisualizations } from './visualizations'; -import { IField, IQueryTab, IDefaultTimestampState } from '../../../common/types/explorer'; +import { IField, IQueryTab, IDefaultTimestampState } from '../../../../common/types/explorer'; import { TAB_CHART_TITLE, TAB_EVENT_TITLE, @@ -54,29 +54,29 @@ import { INDEX, FINAL_QUERY, DATE_PICKER_FORMAT, -} from '../../../common/constants/explorer'; -import { PPL_STATS_REGEX, PPL_NEWLINE_REGEX } from '../../../common/constants/shared'; -import { getIndexPatternFromRawQuery, preprocessQuery, buildQuery } from '../../../common/utils'; -import { useFetchEvents, useFetchVisualizations } from './hooks'; -import { changeQuery, changeDateRange, selectQueries } from './slices/query_slice'; -import { selectQueryResult } from './slices/query_result_slice'; -import { selectFields, updateFields, sortFields } from './slices/field_slice'; -import { updateTabName } from './slices/query_tab_slice'; -import { selectCountDistribution } from './slices/count_distribution_slice'; -import { selectExplorerVisualization } from './slices/visualization_slice'; +} from '../../../../common/constants/explorer'; +import { PPL_STATS_REGEX, PPL_NEWLINE_REGEX } from '../../../../common/constants/shared'; +import { getIndexPatternFromRawQuery, preprocessQuery, buildQuery } from '../../../../common/utils'; +import { useFetchEvents, useFetchVisualizations } from '../hooks'; +import { changeQuery, changeDateRange, selectQueries } from '../redux/slices/query_slice'; +import { selectQueryResult } from '../redux/slices/query_result_slice'; +import { selectFields, updateFields, sortFields } from '../redux/slices/field_slice'; +import { updateTabName } from '../redux/slices/query_tab_slice'; +import { selectCountDistribution } from '../redux/slices/count_distribution_slice'; +import { selectExplorerVisualization } from '../redux/slices/visualization_slice'; import { selectVisualizationConfig, change as changeVisualizationConfig, -} from './slices/viualization_config_slice'; -import { change as updateVizConfig } from './slices/viualization_config_slice'; -import { IExplorerProps, IVisualizationContainerProps } from '../../../common/types/explorer'; -import { TabContext } from './hooks'; -import { getVizContainerProps } from '../visualizations/charts/helpers'; +} from '../redux/slices/viualization_config_slice'; +import { change as updateVizConfig } from '../redux/slices/viualization_config_slice'; +import { IExplorerProps, IVisualizationContainerProps } from '../../../../common/types/explorer'; +import { TabContext } from '../hooks'; +import { getVizContainerProps } from '../../visualizations/charts/helpers'; import { parseGetSuggestions, onItemSelect, -} from '../common/search/autocomplete_logic'; -import { formatError } from './utils'; +} from '../../common/search/autocomplete_logic'; +import { formatError } from '../utils'; const TYPE_TAB_MAPPING = { [SAVED_QUERY]: TAB_EVENT_ID, diff --git a/dashboards-observability/public/components/explorer/hits_counter/__tests__/__snapshots__/hits_counter.test.tsx.snap b/dashboards-observability/public/components/event_analytics/explorer/hits_counter/__tests__/__snapshots__/hits_counter.test.tsx.snap similarity index 100% rename from dashboards-observability/public/components/explorer/hits_counter/__tests__/__snapshots__/hits_counter.test.tsx.snap rename to dashboards-observability/public/components/event_analytics/explorer/hits_counter/__tests__/__snapshots__/hits_counter.test.tsx.snap diff --git a/dashboards-observability/public/components/explorer/hits_counter/__tests__/hits_counter.test.tsx b/dashboards-observability/public/components/event_analytics/explorer/hits_counter/__tests__/hits_counter.test.tsx similarity index 100% rename from dashboards-observability/public/components/explorer/hits_counter/__tests__/hits_counter.test.tsx rename to dashboards-observability/public/components/event_analytics/explorer/hits_counter/__tests__/hits_counter.test.tsx diff --git a/dashboards-observability/public/components/explorer/hits_counter/hits_counter.tsx b/dashboards-observability/public/components/event_analytics/explorer/hits_counter/hits_counter.tsx similarity index 96% rename from dashboards-observability/public/components/explorer/hits_counter/hits_counter.tsx rename to dashboards-observability/public/components/event_analytics/explorer/hits_counter/hits_counter.tsx index 8b7d3f1d0..0941658eb 100644 --- a/dashboards-observability/public/components/explorer/hits_counter/hits_counter.tsx +++ b/dashboards-observability/public/components/event_analytics/explorer/hits_counter/hits_counter.tsx @@ -8,7 +8,7 @@ import React from 'react'; import { EuiButtonEmpty, EuiFlexGroup, EuiFlexItem, EuiText } from '@elastic/eui'; import { FormattedMessage, I18nProvider } from '@osd/i18n/react'; import { i18n } from '@osd/i18n'; -import { formatNumWithCommas } from '../../common/helpers'; +import { formatNumWithCommas } from '../../../common/helpers'; export interface HitsCounterProps { /** diff --git a/dashboards-observability/public/components/explorer/hits_counter/index.ts b/dashboards-observability/public/components/event_analytics/explorer/hits_counter/index.ts similarity index 100% rename from dashboards-observability/public/components/explorer/hits_counter/index.ts rename to dashboards-observability/public/components/event_analytics/explorer/hits_counter/index.ts diff --git a/dashboards-observability/public/components/explorer/log_explorer.scss b/dashboards-observability/public/components/event_analytics/explorer/log_explorer.scss similarity index 100% rename from dashboards-observability/public/components/explorer/log_explorer.scss rename to dashboards-observability/public/components/event_analytics/explorer/log_explorer.scss diff --git a/dashboards-observability/public/components/explorer/log_explorer.tsx b/dashboards-observability/public/components/event_analytics/explorer/log_explorer.tsx similarity index 92% rename from dashboards-observability/public/components/explorer/log_explorer.tsx rename to dashboards-observability/public/components/event_analytics/explorer/log_explorer.tsx index dd10d70a7..53bd15be4 100644 --- a/dashboards-observability/public/components/explorer/log_explorer.tsx +++ b/dashboards-observability/public/components/event_analytics/explorer/log_explorer.tsx @@ -11,7 +11,7 @@ import { uniqueId, map, isEmpty } from 'lodash'; import $ from 'jquery'; import { EuiIcon, EuiText, EuiTabbedContentTab, EuiTabbedContent } from '@elastic/eui'; import { Explorer } from './explorer'; -import { ILogExplorerProps } from '../../../common/types/explorer'; +import { ILogExplorerProps } from '../../../../common/types/explorer'; import { TAB_TITLE, TAB_ID_TXT_PFX, @@ -21,11 +21,11 @@ import { TAB_EVENT_ID, TAB_CHART_ID, APP_ANALYTICS_TAB_ID_REGEX, -} from '../../../common/constants/explorer'; -import { selectQueryTabs, setSelectedQueryTab } from './slices/query_tab_slice'; -import { selectQueries } from './slices/query_slice'; -import { selectQueryResult } from './slices/query_result_slice'; -import { initializeTabData, removeTabData } from '../application_analytics/helpers/utils'; +} from '../../../../common/constants/explorer'; +import { selectQueryTabs, setSelectedQueryTab } from '../redux/slices/query_tab_slice'; +import { selectQueries } from '../redux/slices/query_slice'; +import { selectQueryResult } from '../redux/slices/query_result_slice'; +import { initializeTabData, removeTabData } from '../../application_analytics/helpers/utils'; const searchBarConfigs = { [TAB_EVENT_ID]: { diff --git a/dashboards-observability/public/components/explorer/no_results.tsx b/dashboards-observability/public/components/event_analytics/explorer/no_results.tsx similarity index 100% rename from dashboards-observability/public/components/explorer/no_results.tsx rename to dashboards-observability/public/components/event_analytics/explorer/no_results.tsx diff --git a/dashboards-observability/public/components/explorer/save_panel/__tests__/__snapshots__/save_panel.test.tsx.snap b/dashboards-observability/public/components/event_analytics/explorer/save_panel/__tests__/__snapshots__/save_panel.test.tsx.snap similarity index 100% rename from dashboards-observability/public/components/explorer/save_panel/__tests__/__snapshots__/save_panel.test.tsx.snap rename to dashboards-observability/public/components/event_analytics/explorer/save_panel/__tests__/__snapshots__/save_panel.test.tsx.snap diff --git a/dashboards-observability/public/components/explorer/save_panel/__tests__/save_panel.test.tsx b/dashboards-observability/public/components/event_analytics/explorer/save_panel/__tests__/save_panel.test.tsx similarity index 79% rename from dashboards-observability/public/components/explorer/save_panel/__tests__/save_panel.test.tsx rename to dashboards-observability/public/components/event_analytics/explorer/save_panel/__tests__/save_panel.test.tsx index 8a907ac2a..6eec4ca91 100644 --- a/dashboards-observability/public/components/explorer/save_panel/__tests__/save_panel.test.tsx +++ b/dashboards-observability/public/components/event_analytics/explorer/save_panel/__tests__/save_panel.test.tsx @@ -8,9 +8,9 @@ import Adapter from 'enzyme-adapter-react-16'; import React from 'react'; import { waitFor } from '@testing-library/react'; import { SavePanel } from '../save_panel'; -import { SELECTED_PANELS_OPTIONS } from '../../../../../test/event_analytics_constants'; -import SavedObjects from '../../../../services/saved_objects/event_analytics/saved_objects'; -import httpClientMock from '../../../../../test/__mocks__/httpClientMock'; +import { SELECTED_PANELS_OPTIONS } from '../../../../../../test/event_analytics_constants'; +import SavedObjects from '../../../../../services/saved_objects/event_analytics/saved_objects'; +import httpClientMock from '../../../../../../test/__mocks__/httpClientMock'; describe('Saved query table component', () => { configure({ adapter: new Adapter() }); diff --git a/dashboards-observability/public/components/explorer/save_panel/index.ts b/dashboards-observability/public/components/event_analytics/explorer/save_panel/index.ts similarity index 100% rename from dashboards-observability/public/components/explorer/save_panel/index.ts rename to dashboards-observability/public/components/event_analytics/explorer/save_panel/index.ts diff --git a/dashboards-observability/public/components/explorer/save_panel/save_panel.tsx b/dashboards-observability/public/components/event_analytics/explorer/save_panel/save_panel.tsx similarity index 96% rename from dashboards-observability/public/components/explorer/save_panel/save_panel.tsx rename to dashboards-observability/public/components/event_analytics/explorer/save_panel/save_panel.tsx index e18022db5..c0b4793b5 100644 --- a/dashboards-observability/public/components/explorer/save_panel/save_panel.tsx +++ b/dashboards-observability/public/components/event_analytics/explorer/save_panel/save_panel.tsx @@ -8,7 +8,7 @@ import { useDispatch, useSelector } from 'react-redux'; import { EuiTitle, EuiComboBox, EuiFormRow, EuiSpacer, EuiFieldText } from '@elastic/eui'; import { useEffect } from 'react'; import { isEmpty } from 'lodash'; -import SavedObjects from '../../../services/saved_objects/event_analytics/saved_objects'; +import SavedObjects from '../../../../services/saved_objects/event_analytics/saved_objects'; interface ISavedPanelProps { selectedOptions: any; diff --git a/dashboards-observability/public/components/explorer/sidebar/__tests__/__snapshots__/field.test.tsx.snap b/dashboards-observability/public/components/event_analytics/explorer/sidebar/__tests__/__snapshots__/field.test.tsx.snap similarity index 100% rename from dashboards-observability/public/components/explorer/sidebar/__tests__/__snapshots__/field.test.tsx.snap rename to dashboards-observability/public/components/event_analytics/explorer/sidebar/__tests__/__snapshots__/field.test.tsx.snap diff --git a/dashboards-observability/public/components/explorer/sidebar/__tests__/__snapshots__/sidebar.test.tsx.snap b/dashboards-observability/public/components/event_analytics/explorer/sidebar/__tests__/__snapshots__/sidebar.test.tsx.snap similarity index 100% rename from dashboards-observability/public/components/explorer/sidebar/__tests__/__snapshots__/sidebar.test.tsx.snap rename to dashboards-observability/public/components/event_analytics/explorer/sidebar/__tests__/__snapshots__/sidebar.test.tsx.snap diff --git a/dashboards-observability/public/components/explorer/sidebar/__tests__/field.test.tsx b/dashboards-observability/public/components/event_analytics/explorer/sidebar/__tests__/field.test.tsx similarity index 92% rename from dashboards-observability/public/components/explorer/sidebar/__tests__/field.test.tsx rename to dashboards-observability/public/components/event_analytics/explorer/sidebar/__tests__/field.test.tsx index c6660d934..472812664 100644 --- a/dashboards-observability/public/components/explorer/sidebar/__tests__/field.test.tsx +++ b/dashboards-observability/public/components/event_analytics/explorer/sidebar/__tests__/field.test.tsx @@ -8,7 +8,7 @@ import Adapter from 'enzyme-adapter-react-16'; import React from 'react'; import { waitFor } from '@testing-library/react'; import { Field } from '../field'; -import { AGENT_FIELD } from '../../../../../test/event_analytics_constants'; +import { AGENT_FIELD } from '../../../../../../test/event_analytics_constants'; describe('Field component', () => { configure({ adapter: new Adapter() }); diff --git a/dashboards-observability/public/components/explorer/sidebar/__tests__/sidebar.test.tsx b/dashboards-observability/public/components/event_analytics/explorer/sidebar/__tests__/sidebar.test.tsx similarity index 95% rename from dashboards-observability/public/components/explorer/sidebar/__tests__/sidebar.test.tsx rename to dashboards-observability/public/components/event_analytics/explorer/sidebar/__tests__/sidebar.test.tsx index 0e8e23ec4..6e1b9c5c7 100644 --- a/dashboards-observability/public/components/explorer/sidebar/__tests__/sidebar.test.tsx +++ b/dashboards-observability/public/components/event_analytics/explorer/sidebar/__tests__/sidebar.test.tsx @@ -13,13 +13,13 @@ import { AVAILABLE_FIELDS, UNSELECTED_FIELDS, QUERIED_FIELDS -} from '../../../../../common/constants/explorer'; +} from '../../../../../../common/constants/explorer'; import { AVAILABLE_FIELDS as SIDEBAR_AVAILABLE_FIELDS, QUERY_FIELDS, JSON_DATA, JSON_DATA_ALL -} from '../../../../../test/event_analytics_constants'; +} from '../../../../../../test/event_analytics_constants'; describe('Siderbar component', () => { configure({ adapter: new Adapter() }); diff --git a/dashboards-observability/public/components/explorer/sidebar/field.tsx b/dashboards-observability/public/components/event_analytics/explorer/sidebar/field.tsx similarity index 96% rename from dashboards-observability/public/components/explorer/sidebar/field.tsx rename to dashboards-observability/public/components/event_analytics/explorer/sidebar/field.tsx index 3b6b127ae..efeacf5c1 100644 --- a/dashboards-observability/public/components/explorer/sidebar/field.tsx +++ b/dashboards-observability/public/components/event_analytics/explorer/sidebar/field.tsx @@ -19,9 +19,9 @@ import { EuiFlexItem, EuiTitle, } from '@elastic/eui'; -import { FieldButton } from '../../common/field_button'; -import { FieldIcon } from '../../common/field_icon'; -import { IField } from '../../../../common/types/explorer'; +import { FieldButton } from '../../../common/field_button'; +import { FieldIcon } from '../../../common/field_icon'; +import { IField } from '../../../../../common/types/explorer'; import { FieldInsights } from './field_insights'; interface IFieldProps { diff --git a/dashboards-observability/public/components/explorer/sidebar/field_insights.tsx b/dashboards-observability/public/components/event_analytics/explorer/sidebar/field_insights.tsx similarity index 96% rename from dashboards-observability/public/components/explorer/sidebar/field_insights.tsx rename to dashboards-observability/public/components/event_analytics/explorer/sidebar/field_insights.tsx index 90b3c958e..6a682cc5c 100644 --- a/dashboards-observability/public/components/explorer/sidebar/field_insights.tsx +++ b/dashboards-observability/public/components/event_analytics/explorer/sidebar/field_insights.tsx @@ -6,8 +6,8 @@ import React, { useMemo, useState, useContext, useEffect } from 'react'; import { indexOf, last } from 'lodash'; import { EuiFlexGroup, EuiFlexItem, EuiLink, EuiBasicTable } from '@elastic/eui'; -import { getIndexPatternFromRawQuery } from '../../../../common/utils/query_utils'; -import { TabContext } from '../hooks/use_tab_context'; +import { getIndexPatternFromRawQuery } from '../../../../../common/utils/query_utils'; +import { TabContext } from '../../hooks/use_tab_context'; export const FieldInsights = ({ field, query }: any) => { const { pplService } = useContext(TabContext); diff --git a/dashboards-observability/public/components/explorer/sidebar/index.ts b/dashboards-observability/public/components/event_analytics/explorer/sidebar/index.ts similarity index 100% rename from dashboards-observability/public/components/explorer/sidebar/index.ts rename to dashboards-observability/public/components/event_analytics/explorer/sidebar/index.ts diff --git a/dashboards-observability/public/components/explorer/sidebar/sidebar.scss b/dashboards-observability/public/components/event_analytics/explorer/sidebar/sidebar.scss similarity index 100% rename from dashboards-observability/public/components/explorer/sidebar/sidebar.scss rename to dashboards-observability/public/components/event_analytics/explorer/sidebar/sidebar.scss diff --git a/dashboards-observability/public/components/explorer/sidebar/sidebar.tsx b/dashboards-observability/public/components/event_analytics/explorer/sidebar/sidebar.tsx similarity index 99% rename from dashboards-observability/public/components/explorer/sidebar/sidebar.tsx rename to dashboards-observability/public/components/event_analytics/explorer/sidebar/sidebar.tsx index be58d19b1..9a49ca926 100644 --- a/dashboards-observability/public/components/explorer/sidebar/sidebar.tsx +++ b/dashboards-observability/public/components/event_analytics/explorer/sidebar/sidebar.tsx @@ -12,7 +12,7 @@ import { i18n } from '@osd/i18n'; import { FormattedMessage, I18nProvider } from '@osd/i18n/react'; import { cssNumber } from 'jquery'; import { Field } from './field'; -import { IExplorerFields, IField } from '../../../../common/types/explorer'; +import { IExplorerFields, IField } from '../../../../../common/types/explorer'; interface ISidebarProps { explorerFields: IExplorerFields; diff --git a/dashboards-observability/public/components/explorer/timechart_header/__tests__/__snapshots__/timechart_header.test.tsx.snap b/dashboards-observability/public/components/event_analytics/explorer/timechart_header/__tests__/__snapshots__/timechart_header.test.tsx.snap similarity index 96% rename from dashboards-observability/public/components/explorer/timechart_header/__tests__/__snapshots__/timechart_header.test.tsx.snap rename to dashboards-observability/public/components/event_analytics/explorer/timechart_header/__tests__/__snapshots__/timechart_header.test.tsx.snap index af8ade96a..9c302d242 100644 --- a/dashboards-observability/public/components/explorer/timechart_header/__tests__/__snapshots__/timechart_header.test.tsx.snap +++ b/dashboards-observability/public/components/event_analytics/explorer/timechart_header/__tests__/__snapshots__/timechart_header.test.tsx.snap @@ -172,7 +172,7 @@ exports[`Time chart header component Renders Time chart header component 1`] = `