{
- if (el && !el.dataset.dynamicScroll) {
+ if (documents && el && !el.dataset.dynamicScroll) {
el.dataset.dynamicScroll = 'true';
setScrollContainer(el);
}
@@ -352,7 +354,7 @@ export function DiscoverSidebar({
onScroll={throttle(lazyScroll, 100)}
className="eui-yScroll"
>
- {fields.length > 0 && (
+ {Array.isArray(fields) && fields.length > 0 && (
-
-
+
- {
- setTableOptions({
- pageIndex: newTableOptions.page?.index ?? 0,
- sort: newTableOptions.sort
- ? {
- field: newTableOptions.sort.field as SortField,
- direction: newTableOptions.sort.direction,
- }
- : DEFAULT_SORT,
- });
- }}
- sorting={{
- enableAllColumns: true,
- sort,
- }}
- />
-
-
+ noItemsMessage={
+ status === FETCH_STATUS.LOADING
+ ? i18n.translate(
+ 'xpack.apm.serviceOverview.errorsTable.loading',
+ { defaultMessage: 'Loading...' }
+ )
+ : i18n.translate(
+ 'xpack.apm.serviceOverview.errorsTable.noResults',
+ { defaultMessage: 'No errors found' }
+ )
+ }
+ columns={columns}
+ items={items}
+ pagination={{
+ pageIndex,
+ pageSize: PAGE_SIZE,
+ totalItemCount: totalItems,
+ pageSizeOptions: [PAGE_SIZE],
+ hidePerPageOptions: true,
+ }}
+ loading={status === FETCH_STATUS.LOADING}
+ onChange={(newTableOptions: {
+ page?: {
+ index: number;
+ };
+ sort?: { field: string; direction: SortDirection };
+ }) => {
+ setTableOptions({
+ pageIndex: newTableOptions.page?.index ?? 0,
+ sort: newTableOptions.sort
+ ? {
+ field: newTableOptions.sort.field as SortField,
+ direction: newTableOptions.sort.direction,
+ }
+ : DEFAULT_SORT,
+ });
+ }}
+ sorting={{
+ enableAllColumns: true,
+ sort,
+ }}
+ />
+
);
diff --git a/x-pack/plugins/apm/public/components/app/service_overview/service_overview_instances_table/index.tsx b/x-pack/plugins/apm/public/components/app/service_overview/service_overview_instances_table/index.tsx
index 9312a3c68a1ec..1df6803fdbbb1 100644
--- a/x-pack/plugins/apm/public/components/app/service_overview/service_overview_instances_table/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_overview/service_overview_instances_table/index.tsx
@@ -17,7 +17,6 @@ import { useApmServiceContext } from '../../../../context/apm_service/use_apm_se
import { useUrlParams } from '../../../../context/url_params_context/use_url_params';
import { FETCH_STATUS } from '../../../../hooks/use_fetcher';
import { APIReturnType } from '../../../../services/rest/createCallApmApi';
-import { TableFetchWrapper } from '../../../shared/table_fetch_wrapper';
import {
PAGE_SIZE,
SortDirection,
@@ -156,33 +155,39 @@ export function ServiceOverviewInstancesTable({
-
-
-
-
+
+
);
diff --git a/x-pack/plugins/apm/public/components/app/trace_overview/index.tsx b/x-pack/plugins/apm/public/components/app/trace_overview/index.tsx
index 5286b821dd23f..63cd27cba41e8 100644
--- a/x-pack/plugins/apm/public/components/app/trace_overview/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/trace_overview/index.tsx
@@ -65,6 +65,7 @@ export function TraceOverview() {
> = [
@@ -124,10 +125,11 @@ const noItemsMessage = (
/>
);
-export function TraceList({ items = [], isLoading }: Props) {
+export function TraceList({ items = [], isLoading, isFailure }: Props) {
return (
-
-
-
-
+
+
);
diff --git a/x-pack/plugins/apm/public/components/shared/managed_table/__snapshots__/managed_table.test.tsx.snap b/x-pack/plugins/apm/public/components/shared/managed_table/__snapshots__/managed_table.test.tsx.snap
index 1e01c00543949..e4674b3add880 100644
--- a/x-pack/plugins/apm/public/components/shared/managed_table/__snapshots__/managed_table.test.tsx.snap
+++ b/x-pack/plugins/apm/public/components/shared/managed_table/__snapshots__/managed_table.test.tsx.snap
@@ -17,6 +17,7 @@ exports[`ManagedTable should render a page-full of items, with defaults 1`] = `
},
]
}
+ error=""
items={
Array [
Object {
@@ -74,6 +75,7 @@ exports[`ManagedTable should render when specifying initial values 1`] = `
},
]
}
+ error=""
items={
Array [
Object {
diff --git a/x-pack/plugins/apm/public/components/shared/managed_table/index.tsx b/x-pack/plugins/apm/public/components/shared/managed_table/index.tsx
index f7009956bcf84..54f0aebbe818c 100644
--- a/x-pack/plugins/apm/public/components/shared/managed_table/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/managed_table/index.tsx
@@ -43,6 +43,7 @@ interface Props {
) => T[];
pagination?: boolean;
isLoading?: boolean;
+ error?: boolean;
}
function defaultSortFn(
@@ -68,6 +69,7 @@ function UnoptimizedManagedTable(props: Props) {
sortFn = defaultSortFn,
pagination = true,
isLoading = false,
+ error = false,
} = props;
const {
@@ -138,6 +140,13 @@ function UnoptimizedManagedTable(props: Props) {
return (
>} // EuiBasicTableColumn is stricter than ITableColumn
diff --git a/x-pack/plugins/apm/public/components/shared/table_fetch_wrapper/index.tsx b/x-pack/plugins/apm/public/components/shared/table_fetch_wrapper/index.tsx
deleted file mode 100644
index 8a87ede9b3daa..0000000000000
--- a/x-pack/plugins/apm/public/components/shared/table_fetch_wrapper/index.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React, { ReactNode } from 'react';
-import { FETCH_STATUS } from '../../../hooks/use_fetcher';
-import { ErrorStatePrompt } from '../ErrorStatePrompt';
-
-export function TableFetchWrapper({
- status,
- children,
-}: {
- status: FETCH_STATUS;
- children: ReactNode;
-}) {
- if (status === FETCH_STATUS.FAILURE) {
- return
-
-
+
- {
- setTableOptions({
- pageIndex: newTableOptions.page?.index ?? 0,
- sort: newTableOptions.sort
- ? {
- field: newTableOptions.sort.field as SortField,
- direction: newTableOptions.sort.direction,
- }
- : DEFAULT_SORT,
- });
- }}
- />
-
-
+ loading={isLoading}
+ error={
+ status === FETCH_STATUS.FAILURE
+ ? i18n.translate('xpack.apm.transactionsTable.errorMessage', {
+ defaultMessage: 'Failed to fetch',
+ })
+ : ''
+ }
+ items={transactionGroups}
+ columns={columns}
+ pagination={pagination}
+ sorting={{ sort: { field, direction } }}
+ onChange={(newTableOptions: {
+ page?: {
+ index: number;
+ };
+ sort?: { field: string; direction: SortDirection };
+ }) => {
+ setTableOptions({
+ pageIndex: newTableOptions.page?.index ?? 0,
+ sort: newTableOptions.sort
+ ? {
+ field: newTableOptions.sort.field as SortField,
+ direction: newTableOptions.sort.direction,
+ }
+ : DEFAULT_SORT,
+ });
+ }}
+ />
+
diff --git a/x-pack/plugins/apm/scripts/optimize-tsconfig/tsconfig.json b/x-pack/plugins/apm/scripts/optimize-tsconfig/tsconfig.json
index 40d42298b967b..31f756eeabde3 100644
--- a/x-pack/plugins/apm/scripts/optimize-tsconfig/tsconfig.json
+++ b/x-pack/plugins/apm/scripts/optimize-tsconfig/tsconfig.json
@@ -7,7 +7,6 @@
],
"exclude": [
"**/__fixtures__/**/*",
- "./x-pack/plugins/apm/e2e",
"./x-pack/plugins/apm/ftr_e2e"
],
"compilerOptions": {
diff --git a/x-pack/plugins/apm/e2e/cypress/integration/snapshots.ts b/x-pack/plugins/apm/typings/es_schemas/raw/fields/event_outcome.ts
similarity index 80%
rename from x-pack/plugins/apm/e2e/cypress/integration/snapshots.ts
rename to x-pack/plugins/apm/typings/es_schemas/raw/fields/event_outcome.ts
index 64946c113e777..d0ca41fcba4ed 100644
--- a/x-pack/plugins/apm/e2e/cypress/integration/snapshots.ts
+++ b/x-pack/plugins/apm/typings/es_schemas/raw/fields/event_outcome.ts
@@ -5,6 +5,4 @@
* 2.0.
*/
-module.exports = {
- __version: '4.9.0',
-};
+export type EventOutcome = 'success' | 'failure' | 'unknown';
diff --git a/x-pack/plugins/apm/typings/es_schemas/raw/span_raw.ts b/x-pack/plugins/apm/typings/es_schemas/raw/span_raw.ts
index 1de497f2c7cd7..01bc0ed52ecae 100644
--- a/x-pack/plugins/apm/typings/es_schemas/raw/span_raw.ts
+++ b/x-pack/plugins/apm/typings/es_schemas/raw/span_raw.ts
@@ -6,6 +6,7 @@
*/
import { APMBaseDoc } from './apm_base_doc';
+import { EventOutcome } from './fields/event_outcome';
import { Stackframe } from './fields/stackframe';
import { TimestampUs } from './fields/timestamp_us';
@@ -17,7 +18,7 @@ interface Processor {
export interface SpanRaw extends APMBaseDoc {
processor: Processor;
trace: { id: string }; // trace is required
- event?: { outcome?: 'success' | 'failure' };
+ event?: { outcome?: EventOutcome };
service: {
name: string;
environment?: string;
diff --git a/x-pack/plugins/apm/typings/es_schemas/raw/transaction_raw.ts b/x-pack/plugins/apm/typings/es_schemas/raw/transaction_raw.ts
index d6154d7ad4d23..34c391134b604 100644
--- a/x-pack/plugins/apm/typings/es_schemas/raw/transaction_raw.ts
+++ b/x-pack/plugins/apm/typings/es_schemas/raw/transaction_raw.ts
@@ -8,6 +8,7 @@
import { APMBaseDoc } from './apm_base_doc';
import { Cloud } from './fields/cloud';
import { Container } from './fields/container';
+import { EventOutcome } from './fields/event_outcome';
import { Host } from './fields/host';
import { Http } from './fields/http';
import { Kubernetes } from './fields/kubernetes';
@@ -28,7 +29,7 @@ export interface TransactionRaw extends APMBaseDoc {
processor: Processor;
timestamp: TimestampUs;
trace: { id: string }; // trace is required
- event?: { outcome?: 'success' | 'failure' };
+ event?: { outcome?: EventOutcome };
transaction: {
duration: { us: number };
id: string;
diff --git a/x-pack/plugins/cloud/public/fullstory.ts b/x-pack/plugins/cloud/public/fullstory.ts
index 25d5320a063bd..4f76abf540cae 100644
--- a/x-pack/plugins/cloud/public/fullstory.ts
+++ b/x-pack/plugins/cloud/public/fullstory.ts
@@ -14,8 +14,11 @@ export interface FullStoryDeps {
packageInfo: PackageInfo;
}
+export type FullstoryUserVars = Record;
+
export interface FullStoryApi {
- identify(userId: string, userVars?: Record): void;
+ identify(userId: string, userVars?: FullstoryUserVars): void;
+ setUserVars(userVars?: FullstoryUserVars): void;
event(eventName: string, eventProperties: Record): void;
}
diff --git a/x-pack/plugins/cloud/public/plugin.test.mocks.ts b/x-pack/plugins/cloud/public/plugin.test.mocks.ts
index 4eb206d07bf85..b79fb1bc65130 100644
--- a/x-pack/plugins/cloud/public/plugin.test.mocks.ts
+++ b/x-pack/plugins/cloud/public/plugin.test.mocks.ts
@@ -10,6 +10,7 @@ import type { FullStoryDeps, FullStoryApi, FullStoryService } from './fullstory'
export const fullStoryApiMock: jest.Mocked = {
event: jest.fn(),
+ setUserVars: jest.fn(),
identify: jest.fn(),
};
export const initializeFullStoryMock = jest.fn(() => ({
diff --git a/x-pack/plugins/cloud/public/plugin.test.ts b/x-pack/plugins/cloud/public/plugin.test.ts
index 835a52cb814c8..f3d5bd902c6d7 100644
--- a/x-pack/plugins/cloud/public/plugin.test.ts
+++ b/x-pack/plugins/cloud/public/plugin.test.ts
@@ -11,6 +11,7 @@ import { homePluginMock } from 'src/plugins/home/public/mocks';
import { securityMock } from '../../security/public/mocks';
import { fullStoryApiMock, initializeFullStoryMock } from './plugin.test.mocks';
import { CloudPlugin, CloudConfigType, loadFullStoryUserId } from './plugin';
+import { Observable, Subject } from 'rxjs';
describe('Cloud Plugin', () => {
describe('#setup', () => {
@@ -23,10 +24,12 @@ describe('Cloud Plugin', () => {
config = {},
securityEnabled = true,
currentUserProps = {},
+ currentAppId$ = undefined,
}: {
config?: Partial;
securityEnabled?: boolean;
currentUserProps?: Record;
+ currentAppId$?: Observable;
}) => {
const initContext = coreMock.createPluginInitializerContext({
id: 'cloudId',
@@ -39,9 +42,15 @@ describe('Cloud Plugin', () => {
},
...config,
});
+
const plugin = new CloudPlugin(initContext);
const coreSetup = coreMock.createSetup();
+ const coreStart = coreMock.createStart();
+ if (currentAppId$) {
+ coreStart.application.currentAppId$ = currentAppId$;
+ }
+ coreSetup.getStartServices.mockResolvedValue([coreStart, {}, undefined]);
const securitySetup = securityMock.createSetup();
securitySetup.authc.getCurrentUser.mockResolvedValue(
securityMock.createMockAuthenticatedUser(currentUserProps)
@@ -78,10 +87,46 @@ describe('Cloud Plugin', () => {
});
expect(fullStoryApiMock.identify).toHaveBeenCalledWith(
- '03ac674216f3e15c761ee1a5e255f067953623c8b388b4459e13f978d7c846f4'
+ '03ac674216f3e15c761ee1a5e255f067953623c8b388b4459e13f978d7c846f4',
+ {
+ version_str: 'version',
+ version_major_int: -1,
+ version_minor_int: -1,
+ version_patch_int: -1,
+ }
);
});
+ it('calls FS.setUserVars everytime an app changes', async () => {
+ const currentAppId$ = new Subject();
+ const { plugin } = await setupPlugin({
+ config: { full_story: { enabled: true, org_id: 'foo' } },
+ currentUserProps: {
+ username: '1234',
+ },
+ currentAppId$,
+ });
+
+ expect(fullStoryApiMock.setUserVars).not.toHaveBeenCalled();
+ currentAppId$.next('App1');
+ expect(fullStoryApiMock.setUserVars).toHaveBeenCalledWith({
+ app_id_str: 'App1',
+ });
+ currentAppId$.next();
+ expect(fullStoryApiMock.setUserVars).toHaveBeenCalledWith({
+ app_id_str: 'unknown',
+ });
+
+ currentAppId$.next('App2');
+ expect(fullStoryApiMock.setUserVars).toHaveBeenCalledWith({
+ app_id_str: 'App2',
+ });
+
+ expect(currentAppId$.observers.length).toBe(1);
+ plugin.stop();
+ expect(currentAppId$.observers.length).toBe(0);
+ });
+
it('does not call FS.identify when security is not available', async () => {
await setupPlugin({
config: { full_story: { enabled: true, org_id: 'foo' } },
diff --git a/x-pack/plugins/cloud/public/plugin.ts b/x-pack/plugins/cloud/public/plugin.ts
index 29befcee397dd..6053f2eb5b8c3 100644
--- a/x-pack/plugins/cloud/public/plugin.ts
+++ b/x-pack/plugins/cloud/public/plugin.ts
@@ -12,8 +12,10 @@ import {
PluginInitializerContext,
HttpStart,
IBasePath,
+ ApplicationStart,
} from 'src/core/public';
import { i18n } from '@kbn/i18n';
+import { Subscription } from 'rxjs';
import type {
AuthenticatedUser,
SecurityPluginSetup,
@@ -58,9 +60,15 @@ export interface CloudSetup {
isCloudEnabled: boolean;
}
+interface SetupFullstoryDeps extends CloudSetupDependencies {
+ application?: Promise;
+ basePath: IBasePath;
+}
+
export class CloudPlugin implements Plugin {
private config!: CloudConfigType;
private isCloudEnabled: boolean;
+ private appSubscription?: Subscription;
constructor(private readonly initializerContext: PluginInitializerContext) {
this.config = this.initializerContext.config.get();
@@ -68,7 +76,10 @@ export class CloudPlugin implements Plugin {
}
public setup(core: CoreSetup, { home, security }: CloudSetupDependencies) {
- this.setupFullstory({ basePath: core.http.basePath, security }).catch((e) =>
+ const application = core.getStartServices().then(([coreStart]) => {
+ return coreStart.application;
+ });
+ this.setupFullstory({ basePath: core.http.basePath, security, application }).catch((e) =>
// eslint-disable-next-line no-console
console.debug(`Error setting up FullStory: ${e.toString()}`)
);
@@ -138,6 +149,10 @@ export class CloudPlugin implements Plugin {
.catch(() => setLinks(true));
}
+ public stop() {
+ this.appSubscription?.unsubscribe();
+ }
+
/**
* Determines if the current user should see links back to Cloud.
* This isn't a true authorization check, but rather a heuristic to
@@ -164,10 +179,7 @@ export class CloudPlugin implements Plugin {
return user?.roles.includes('superuser') ?? true;
}
- private async setupFullstory({
- basePath,
- security,
- }: CloudSetupDependencies & { basePath: IBasePath }) {
+ private async setupFullstory({ basePath, security, application }: SetupFullstoryDeps) {
const { enabled, org_id: orgId } = this.config.full_story;
if (!enabled || !orgId) {
return; // do not load any fullstory code in the browser if not enabled
@@ -198,7 +210,35 @@ export class CloudPlugin implements Plugin {
if (userId) {
// Do the hashing here to keep it at clear as possible in our source code that we do not send literal user IDs
const hashedId = sha256(userId.toString());
- fullStory.identify(hashedId);
+ application
+ ?.then(async () => {
+ const appStart = await application;
+ this.appSubscription = appStart.currentAppId$.subscribe((appId) => {
+ // Update the current application every time it changes
+ fullStory.setUserVars({
+ app_id_str: appId ?? 'unknown',
+ });
+ });
+ })
+ .catch((e) => {
+ // eslint-disable-next-line no-console
+ console.error(
+ `[cloud.full_story] Could not retrieve application service due to error: ${e.toString()}`,
+ e
+ );
+ });
+ const kibanaVer = this.initializerContext.env.packageInfo.version;
+ // TODO: use semver instead
+ const parsedVer = (kibanaVer.indexOf('.') > -1 ? kibanaVer.split('.') : []).map((s) =>
+ parseInt(s, 10)
+ );
+ // `str` suffix is required for evn vars, see docs: https://help.fullstory.com/hc/en-us/articles/360020623234
+ fullStory.identify(hashedId, {
+ version_str: kibanaVer,
+ version_major_int: parsedVer[0] ?? -1,
+ version_minor_int: parsedVer[1] ?? -1,
+ version_patch_int: parsedVer[2] ?? -1,
+ });
}
} catch (e) {
// eslint-disable-next-line no-console
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/geo_point_content_with_map/geo_point_content_with_map.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/geo_point_content_with_map/geo_point_content_with_map.tsx
index 42245742f8b7d..082083fa92ff2 100644
--- a/x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/geo_point_content_with_map/geo_point_content_with_map.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/geo_point_content_with_map/geo_point_content_with_map.tsx
@@ -7,7 +7,7 @@
import React, { FC, useEffect, useState } from 'react';
import { EuiFlexItem } from '@elastic/eui';
-import { IndexPattern } from '../../../../../../../../../src/plugins/data/common/index_patterns/index_patterns';
+import { IndexPattern } from '../../../../../../../../../src/plugins/data/common';
import { CombinedQuery } from '../../../../index_data_visualizer/types/combined_query';
import { ExpandedRowContent } from '../../stats_table/components/field_data_expanded_row/expanded_row_content';
import { DocumentStatsTable } from '../../stats_table/components/field_data_expanded_row/document_stats';
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/index_based_expanded_row.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/index_based_expanded_row.tsx
index 6406012a0540b..ca9c8301bcfba 100644
--- a/x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/index_based_expanded_row.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/index_based_expanded_row.tsx
@@ -19,7 +19,7 @@ import {
} from '../stats_table/components/field_data_expanded_row';
import { NotInDocsContent } from '../not_in_docs_content';
import { FieldVisConfig } from '../stats_table/types';
-import { IndexPattern } from '../../../../../../../../src/plugins/data/common/index_patterns/index_patterns';
+import { IndexPattern } from '../../../../../../../../src/plugins/data/common';
import { CombinedQuery } from '../../../index_data_visualizer/types/combined_query';
import { LoadingIndicator } from '../loading_indicator';
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/field_data_row/action_menu/actions.ts b/x-pack/plugins/data_visualizer/public/application/common/components/field_data_row/action_menu/actions.ts
index a77ca1d589349..1fee95aeb5bfa 100644
--- a/x-pack/plugins/data_visualizer/public/application/common/components/field_data_row/action_menu/actions.ts
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/field_data_row/action_menu/actions.ts
@@ -9,7 +9,7 @@ import { i18n } from '@kbn/i18n';
import { Action } from '@elastic/eui/src/components/basic_table/action_types';
import { MutableRefObject } from 'react';
import { getCompatibleLensDataType, getLensAttributes } from './lens_utils';
-import { IndexPattern } from '../../../../../../../../../src/plugins/data/common/index_patterns/index_patterns';
+import { IndexPattern } from '../../../../../../../../../src/plugins/data/common';
import { CombinedQuery } from '../../../../index_data_visualizer/types/combined_query';
import { FieldVisConfig } from '../../stats_table/types';
import { DataVisualizerKibanaReactContextValue } from '../../../../kibana_context';
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/field_data_row/action_menu/lens_utils.ts b/x-pack/plugins/data_visualizer/public/application/common/components/field_data_row/action_menu/lens_utils.ts
index 0b0c0e8fe3f09..3f80bbefcc259 100644
--- a/x-pack/plugins/data_visualizer/public/application/common/components/field_data_row/action_menu/lens_utils.ts
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/field_data_row/action_menu/lens_utils.ts
@@ -6,7 +6,7 @@
*/
import { i18n } from '@kbn/i18n';
-import type { IndexPattern } from '../../../../../../../../../src/plugins/data/common/index_patterns/index_patterns';
+import type { IndexPattern } from '../../../../../../../../../src/plugins/data/common';
import type { CombinedQuery } from '../../../../index_data_visualizer/types/combined_query';
import type {
IndexPatternColumn,
diff --git a/x-pack/plugins/data_visualizer/public/application/common/util/field_types_utils.ts b/x-pack/plugins/data_visualizer/public/application/common/util/field_types_utils.ts
index 98d43059e5ee3..54e0b2d5310f3 100644
--- a/x-pack/plugins/data_visualizer/public/application/common/util/field_types_utils.ts
+++ b/x-pack/plugins/data_visualizer/public/application/common/util/field_types_utils.ts
@@ -7,7 +7,7 @@
import { i18n } from '@kbn/i18n';
import { JOB_FIELD_TYPES } from '../../../../common';
-import type { IndexPatternField } from '../../../../../../../src/plugins/data/common/index_patterns/fields';
+import type { IndexPatternField } from '../../../../../../../src/plugins/data/common';
import { KBN_FIELD_TYPES } from '../../../../../../../src/plugins/data/common';
export const jobTypeAriaLabels = {
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/actions_panel/actions_panel.tsx b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/actions_panel/actions_panel.tsx
index 48410aff54577..bc68bdf4b6ce0 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/actions_panel/actions_panel.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/actions_panel/actions_panel.tsx
@@ -14,7 +14,7 @@ import {
DISCOVER_APP_URL_GENERATOR,
DiscoverUrlGeneratorState,
} from '../../../../../../../../src/plugins/discover/public';
-import type { IndexPattern } from '../../../../../../../../src/plugins/data/common/index_patterns';
+import type { IndexPattern } from '../../../../../../../../src/plugins/data/common';
import { useDataVisualizerKibana } from '../../../kibana_context';
import { useUrlState } from '../../../common/util/url_state';
import { LinkCard } from '../../../common/components/link_card';
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/index_pattern_management/index_pattern_management.tsx b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/index_pattern_management/index_pattern_management.tsx
index cb81640f328c5..3cec1141a4d35 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/index_pattern_management/index_pattern_management.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/index_pattern_management/index_pattern_management.tsx
@@ -8,7 +8,7 @@
import React, { useEffect, useRef, useState } from 'react';
import { EuiButtonIcon, EuiContextMenuItem, EuiContextMenuPanel, EuiPopover } from '@elastic/eui';
import { i18n } from '@kbn/i18n';
-import { IndexPattern } from '../../../../../../../../src/plugins/data/common/index_patterns/index_patterns';
+import { IndexPattern } from '../../../../../../../../src/plugins/data/common';
import { useDataVisualizerKibana } from '../../../kibana_context';
import { dataVisualizerRefresh$, Refresh } from '../../services/timefilter_refresh_service';
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/search_panel.tsx b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/search_panel.tsx
index 191c27b1807d0..91ec1e449bb38 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/search_panel.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/search_panel.tsx
@@ -13,7 +13,7 @@ import { QueryStringInput } from '../../../../../../../../src/plugins/data/publi
import { ShardSizeFilter } from './shard_size_select';
import { DataVisualizerFieldNamesFilter } from './field_name_filter';
import { DatavisualizerFieldTypeFilter } from './field_type_filter';
-import { IndexPattern } from '../../../../../../../../src/plugins/data/common/index_patterns/index_patterns';
+import { IndexPattern } from '../../../../../../../../src/plugins/data/common';
import { JobFieldType } from '../../../../../common/types';
import {
ErrorMessage,
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/data_loader/data_loader.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/data_loader/data_loader.ts
index 1b92eaddd1343..c4db51dcd81bc 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/data_loader/data_loader.ts
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/data_loader/data_loader.ts
@@ -9,7 +9,7 @@
import { CoreSetup } from 'kibana/public';
import { estypes } from '@elastic/elasticsearch';
import { i18n } from '@kbn/i18n';
-import { IndexPattern } from '../../../../../../../src/plugins/data/common/index_patterns/index_patterns';
+import { IndexPattern } from '../../../../../../../src/plugins/data/common';
import { NON_AGGREGATABLE_FIELD_TYPES, OMIT_FIELDS } from '../../../../common/constants';
import { FieldRequestConfig } from '../../../../common/types';
import { getVisualizerFieldStats, getVisualizerOverallStats } from '../services/visualizer_stats';
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/index_data_visualizer.tsx b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/index_data_visualizer.tsx
index 2835588625a6e..9a8987967fe69 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/index_data_visualizer.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/index_data_visualizer.tsx
@@ -29,7 +29,7 @@ import {
isRisonSerializationRequired,
} from '../common/util/url_state';
import { useDataVisualizerKibana } from '../kibana_context';
-import { IndexPattern } from '../../../../../../src/plugins/data/common/index_patterns/index_patterns';
+import { IndexPattern } from '../../../../../../src/plugins/data/common';
import { ResultLink } from '../common/components/results_links';
export type IndexDataVisualizerSpec = typeof IndexDataVisualizer;
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/utils/saved_search_utils.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/utils/saved_search_utils.ts
index cfe127aec543e..cb80e491fc7e5 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/utils/saved_search_utils.ts
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/utils/saved_search_utils.ts
@@ -17,7 +17,7 @@ import {
} from '@kbn/es-query';
import { estypes } from '@elastic/elasticsearch';
import { SavedSearchSavedObject } from '../../../../common/types';
-import { IndexPattern } from '../../../../../../../src/plugins/data/common/index_patterns/index_patterns';
+import { IndexPattern } from '../../../../../../../src/plugins/data/common';
import { SEARCH_QUERY_LANGUAGE, SearchQueryLanguage } from '../types/combined_query';
import { getEsQueryConfig, Query } from '../../../../../../../src/plugins/data/public';
diff --git a/x-pack/plugins/enterprise_search/README.md b/x-pack/plugins/enterprise_search/README.md
index 5c8d767de3099..64855dc1395ab 100644
--- a/x-pack/plugins/enterprise_search/README.md
+++ b/x-pack/plugins/enterprise_search/README.md
@@ -2,9 +2,7 @@
## Overview
-This plugin provides beta Kibana user interfaces for managing the Enterprise Search solution and its products, App Search and Workplace Search.
-
-> :warning: The Kibana interface for Enterprise Search is a beta feature. It is subject to change and is not covered by the same level of support as generally available features. This interface will become the sole management panel for Enterprise Search with the 8.0 release. Until then, the standalone Enterprise Search UI remains available and supported.
+This plugin provides Kibana user interfaces for managing the Enterprise Search solution and its products, App Search and Workplace Search.
### App Search
diff --git a/x-pack/plugins/enterprise_search/common/constants.ts b/x-pack/plugins/enterprise_search/common/constants.ts
index f162f5810cb61..bc60c917094f8 100644
--- a/x-pack/plugins/enterprise_search/common/constants.ts
+++ b/x-pack/plugins/enterprise_search/common/constants.ts
@@ -55,6 +55,7 @@ export const WORKPLACE_SEARCH_PLUGIN = {
}
),
URL: '/app/enterprise_search/workplace_search',
+ NON_ADMIN_URL: '/app/enterprise_search/workplace_search/p',
SUPPORT_URL: 'https://discuss.elastic.co/c/enterprise-search/workplace-search/',
};
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/product_card/product_card.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/product_card/product_card.tsx
index c8dd9523f62f4..33b7658788f62 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/product_card/product_card.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/product_card/product_card.tsx
@@ -28,9 +28,10 @@ interface ProductCardProps {
URL: string;
};
image: string;
+ url?: string;
}
-export const ProductCard: React.FC = ({ product, image }) => {
+export const ProductCard: React.FC = ({ product, image, url }) => {
const { sendEnterpriseSearchTelemetry } = useActions(TelemetryLogic);
const { config } = useValues(KibanaLogic);
@@ -68,7 +69,7 @@ export const ProductCard: React.FC = ({ product, image }) => {
footer={
sendEnterpriseSearchTelemetry({
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/product_selector/product_selector.test.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/product_selector/product_selector.test.tsx
index ee0209c1a124d..c713507083b08 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/product_selector/product_selector.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/product_selector/product_selector.test.tsx
@@ -11,6 +11,8 @@ import React from 'react';
import { shallow } from 'enzyme';
+import { WORKPLACE_SEARCH_PLUGIN } from '../../../../../common/constants';
+
import { LicenseCallout } from '../license_callout';
import { ProductCard } from '../product_card';
import { SetupGuideCta } from '../setup_guide';
@@ -18,10 +20,15 @@ import { TrialCallout } from '../trial_callout';
import { ProductSelector } from './';
+const props = {
+ access: {},
+ isWorkplaceSearchAdmin: true,
+};
+
describe('ProductSelector', () => {
it('renders the overview page, product cards, & setup guide CTAs with no host set', () => {
setMockValues({ config: { host: '' } });
- const wrapper = shallow( = ({ access }) => {
+export const ProductSelector: React.FC = ({
+ access,
+ isWorkplaceSearchAdmin,
+}) => {
const { hasAppSearchAccess, hasWorkplaceSearchAccess } = access;
const { config } = useValues(KibanaLogic);
@@ -44,6 +48,10 @@ export const ProductSelector: React.FC = ({ access }) => {
const shouldShowAppSearchCard = !config.host || hasAppSearchAccess;
const shouldShowWorkplaceSearchCard = !config.host || hasWorkplaceSearchAccess;
+ const WORKPLACE_SEARCH_URL = isWorkplaceSearchAdmin
+ ? WORKPLACE_SEARCH_PLUGIN.URL
+ : WORKPLACE_SEARCH_PLUGIN.NON_ADMIN_URL;
+
return (
= ({ access }) => {
)}
{shouldShowWorkplaceSearchCard && (
-
)}
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/index.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search/index.tsx
index b1aab0dacabde..17387ae482325 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/index.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search/index.tsx
@@ -19,11 +19,12 @@ import { ProductSelector } from './components/product_selector';
import { SetupGuide } from './components/setup_guide';
import { ROOT_PATH, SETUP_GUIDE_PATH } from './routes';
-export const EnterpriseSearch: React.FC = ({ access = {} }) => {
+export const EnterpriseSearch: React.FC = ({ access = {}, workplaceSearch }) => {
const { errorConnecting } = useValues(HttpLogic);
const { config } = useValues(KibanaLogic);
const showErrorConnecting = !!(config.host && errorConnecting);
+ const isWorkplaceSearchAdmin = !!workplaceSearch?.account?.isAdmin;
return (
@@ -31,7 +32,11 @@ export const EnterpriseSearch: React.FC = ({ access = {} }) => {
- {showErrorConnecting ?
);
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/error_state/error_state_prompt.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/error_state/error_state_prompt.tsx
index 282c7ca5721cb..3fbae0a564c17 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/error_state/error_state_prompt.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/error_state/error_state_prompt.tsx
@@ -13,7 +13,6 @@ import { EuiEmptyPrompt, EuiCode } from '@elastic/eui';
import { FormattedMessage } from '@kbn/i18n/react';
import { KibanaLogic } from '../kibana';
-import { BetaNotification } from '../layout/beta';
import { EuiButtonTo } from '../react_router_helpers';
import './error_state_prompt.scss';
@@ -100,7 +99,6 @@ export const ErrorStatePrompt: React.FC = () => {
defaultMessage="Review setup guide"
/>
,
- = ({ buttonProps }) => {
- const [isPopoverOpen, setIsPopoverOpen] = useState(false);
- const togglePopover = () => setIsPopoverOpen((isOpen) => !isOpen);
- const closePopover = () => setIsPopoverOpen(false);
-
- return (
-
- {i18n.translate('xpack.enterpriseSearch.beta.buttonLabel', {
- defaultMessage: 'This is a beta user interface',
- })}
-
- }
- isOpen={isPopoverOpen}
- closePopover={closePopover}
- anchorPosition="rightDown"
- repositionOnScroll
- >
-
- {i18n.translate('xpack.enterpriseSearch.beta.popover.title', {
- defaultMessage: 'Enterprise Search in Kibana is a beta user interface',
- })}
-
-
-
- Learn more
-
- ),
- standaloneUILink: (
- switch to the Enterprise Search UI
- ),
- }}
- />
-
-
- );
-};
-
-export const appendBetaNotificationItem = (sideNav: KibanaPageTemplateProps['solutionNav']) => {
- if (sideNav) {
- sideNav.items.push({
- id: 'beta',
- name: '',
- renderItem: () => = ({
const hasCustomEmptyState = !!emptyState;
const showCustomEmptyState = hasCustomEmptyState && isEmptyState;
- appendBetaNotificationItem(solutionNav);
-
return (
= ({
}}
isEmptyState={isEmptyState && !isLoading}
solutionNav={solutionNav ? { icon: 'logoEnterpriseSearch', ...solutionNav } : undefined}
- pageSideBarProps={{ className: 'betaSidebarNotification' }}
>
{setPageChrome}
{readOnlyMode && (
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/credential_item/credential_item.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/credential_item/credential_item.tsx
index 61eaa4e42f8dd..e4067e1f98e5d 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/credential_item/credential_item.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/credential_item/credential_item.tsx
@@ -19,6 +19,21 @@ import {
EuiFieldPassword,
EuiToolTip,
} from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+
+export const COPY_TOOLTIP = i18n.translate(
+ 'xpack.enterpriseSearch.workplaceSearch.credentialItem.copy.tooltip',
+ {
+ defaultMessage: 'Copy to clipboard',
+ }
+);
+
+export const COPIED_TOOLTIP = i18n.translate(
+ 'xpack.enterpriseSearch.workplaceSearch.credentialItem.copied.tooltip',
+ {
+ defaultMessage: 'Copied!',
+ }
+);
interface CredentialItemProps {
label: string;
@@ -37,6 +52,14 @@ export const CredentialItem: React.FC = ({
}) => {
const [isVisible, setIsVisible] = useState(false);
+ const SHOW_CREDENTIAL_TOOLTIP = i18n.translate(
+ 'xpack.enterpriseSearch.workplaceSearch.credentialItem.show.tooltip',
+ {
+ defaultMessage: 'Show {credential}.',
+ values: { credential: label },
+ }
+ );
+
return (
= ({
{!hideCopy && (
-
+
{(copy) => (
= ({
)}
-
+
setIsVisible(!isVisible)}
iconType={isVisible ? 'eyeClosed' : 'eye'}
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/license_callout/license_callout.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/license_callout/license_callout.tsx
index f278cda96ae83..270daf195bd38 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/license_callout/license_callout.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/license_callout/license_callout.tsx
@@ -9,6 +9,7 @@ import React from 'react';
import { EuiLink, EuiFlexItem, EuiFlexGroup, EuiText } from '@elastic/eui';
+import { EXPLORE_PLATINUM_FEATURES_LINK } from '../../../constants';
import { ENT_SEARCH_LICENSE_MANAGEMENT } from '../../../routes';
interface LicenseCalloutProps {
@@ -20,7 +21,7 @@ export const LicenseCallout: React.FC = ({ message }) => {
<>
{message}{' '}
- Explore Platinum features
+ {EXPLORE_PLATINUM_FEATURES_LINK}
);
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/constants.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/constants.ts
index d4fa2059f62fb..3666a794617ac 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/constants.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/constants.ts
@@ -583,8 +583,8 @@ export const NON_PLATINUM_OAUTH_DESCRIPTION = i18n.translate(
}
);
-export const NON_PLATINUM_OAUTH_LINK = i18n.translate(
- 'xpack.enterpriseSearch.workplaceSearch.nonPlatinumOauthLinkLabel',
+export const EXPLORE_PLATINUM_FEATURES_LINK = i18n.translate(
+ 'xpack.enterpriseSearch.workplaceSearch.explorePlatinumFeatures.link',
{
defaultMessage: 'Explore Platinum features',
}
@@ -734,6 +734,10 @@ export const FIELD_LABEL = i18n.translate('xpack.enterpriseSearch.workplaceSearc
defaultMessage: 'Field',
});
+export const LABEL_LABEL = i18n.translate('xpack.enterpriseSearch.workplaceSearch.label.label', {
+ defaultMessage: 'Label',
+});
+
export const DESCRIPTION_LABEL = i18n.translate(
'xpack.enterpriseSearch.workplaceSearch.description.label',
{
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/config_completed.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/config_completed.tsx
index 965d71abd5101..18e147100a410 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/config_completed.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/config_completed.tsx
@@ -30,6 +30,7 @@ import {
} from '../../../../routes';
import {
+ CONFIG_COMPLETED_PRIVATE_SOURCES_DISABLED_LINK,
CONFIG_COMPLETED_PRIVATE_SOURCES_DOCS_LINK,
CONFIG_COMPLETED_CONFIGURE_NEW_BUTTON,
} from './constants';
@@ -114,7 +115,7 @@ export const ConfigCompleted: React.FC = ({
values={{
securityLink: (
- enable private source connection
+ {CONFIG_COMPLETED_PRIVATE_SOURCES_DISABLED_LINK}
),
}}
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/configuration_intro.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/configuration_intro.tsx
index d17e8b84efb2b..15941f14d5ab1 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/configuration_intro.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/configuration_intro.tsx
@@ -28,6 +28,7 @@ import {
CONFIG_INTRO_STEPS_TEXT,
CONFIG_INTRO_STEP1_HEADING,
CONFIG_INTRO_STEP1_TEXT,
+ CONFIG_INTRO_STEP1_BADGE,
CONFIG_INTRO_STEP2_HEADING,
CONFIG_INTRO_STEP2_TITLE,
CONFIG_INTRO_STEP2_TEXT,
@@ -108,7 +109,9 @@ export const ConfigurationIntro: React.FC = ({
id="xpack.enterpriseSearch.workplaceSearch.contentSource.configIntro.step1.title"
defaultMessage="Configure an OAuth application {badge}"
values={{
- badge: One-Time Action ,
+ badge: (
+ {CONFIG_INTRO_STEP1_BADGE}
+ ),
}}
/>
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/configure_custom.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/configure_custom.tsx
index b142ddcf4937e..1529875e66af5 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/configure_custom.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/configure_custom.tsx
@@ -22,8 +22,10 @@ import { FormattedMessage } from '@kbn/i18n/react';
import { CUSTOM_SOURCE_DOCS_URL } from '../../../../routes';
+import { SOURCE_NAME_LABEL } from '../../constants';
+
import { AddSourceLogic } from './add_source_logic';
-import { CONFIG_CUSTOM_BUTTON } from './constants';
+import { CONFIG_CUSTOM_BUTTON, CONFIG_CUSTOM_LINK_TEXT } from './constants';
interface ConfigureCustomProps {
header: React.ReactNode;
@@ -57,12 +59,12 @@ export const ConfigureCustom: React.FC = ({
+
= ({
- {SOURCE_FEATURES_EXPLORE_BUTTON}
+ {EXPLORE_PLATINUM_FEATURES_LINK}
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/constants.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/constants.ts
index 2bf185ee048bd..a2e6de8d9c7f5 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/constants.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/constants.ts
@@ -101,6 +101,13 @@ export const AVAILABLE_SOURCE_CUSTOM_SOURCE_BUTTON = i18n.translate(
}
);
+export const CONFIG_COMPLETED_PRIVATE_SOURCES_DISABLED_LINK = i18n.translate(
+ 'xpack.enterpriseSearch.workplaceSearch.contentSource.configCompleted.privateDisabled.link',
+ {
+ defaultMessage: 'enable private source connection',
+ }
+);
+
export const CONFIG_COMPLETED_PRIVATE_SOURCES_DOCS_LINK = i18n.translate(
'xpack.enterpriseSearch.workplaceSearch.contentSource.configCompleted.privateDisabled.button',
{
@@ -136,6 +143,13 @@ export const CONFIG_INTRO_STEP1_HEADING = i18n.translate(
}
);
+export const CONFIG_INTRO_STEP1_BADGE = i18n.translate(
+ 'xpack.enterpriseSearch.workplaceSearch.contentSource.configIntro.step1.badge',
+ {
+ defaultMessage: 'One-Time Action',
+ }
+);
+
export const CONFIG_INTRO_STEP1_TEXT = i18n.translate(
'xpack.enterpriseSearch.workplaceSearch.contentSource.configIntro.step1.text',
{
@@ -173,6 +187,13 @@ export const CONFIG_CUSTOM_BUTTON = i18n.translate(
}
);
+export const CONFIG_CUSTOM_LINK_TEXT = i18n.translate(
+ 'xpack.enterpriseSearch.workplaceSearch.contentSource.configCustom.docs.link.text',
+ {
+ defaultMessage: 'Read the documentation',
+ }
+);
+
export const CONFIG_OAUTH_LABEL = i18n.translate(
'xpack.enterpriseSearch.workplaceSearch.contentSource.configOauth.label',
{
@@ -293,6 +314,13 @@ export const SAVE_CUSTOM_VISUAL_WALKTHROUGH_TITLE = i18n.translate(
}
);
+export const SAVE_CUSTOM_VISUAL_WALKTHROUGH_LINK = i18n.translate(
+ 'xpack.enterpriseSearch.workplaceSearch.contentSource.saveCustom.visualWalkthrough.link',
+ {
+ defaultMessage: 'Check out the documentation',
+ }
+);
+
export const SAVE_CUSTOM_STYLING_RESULTS_TITLE = i18n.translate(
'xpack.enterpriseSearch.workplaceSearch.contentSource.saveCustom.stylingResults.title',
{
@@ -300,6 +328,13 @@ export const SAVE_CUSTOM_STYLING_RESULTS_TITLE = i18n.translate(
}
);
+export const SAVE_CUSTOM_STYLING_RESULTS_LINK = i18n.translate(
+ 'xpack.enterpriseSearch.workplaceSearch.contentSource.saveCustom.stylingResults.link',
+ {
+ defaultMessage: 'Display Settings',
+ }
+);
+
export const SAVE_CUSTOM_DOC_PERMISSIONS_TITLE = i18n.translate(
'xpack.enterpriseSearch.workplaceSearch.contentSource.saveCustom.docPermissions.title',
{
@@ -307,6 +342,13 @@ export const SAVE_CUSTOM_DOC_PERMISSIONS_TITLE = i18n.translate(
}
);
+export const SAVE_CUSTOM_DOC_PERMISSIONS_LINK = i18n.translate(
+ 'xpack.enterpriseSearch.workplaceSearch.contentSource.saveCustom.docPermissions.link',
+ {
+ defaultMessage: 'Document-level permissions',
+ }
+);
+
export const INCLUDED_FEATURES_TITLE = i18n.translate(
'xpack.enterpriseSearch.workplaceSearch.contentSource.includedFeaturesTitle',
{
@@ -314,31 +356,80 @@ export const INCLUDED_FEATURES_TITLE = i18n.translate(
}
);
-export const SOURCE_FEATURES_SEARCHABLE = i18n.translate(
- 'xpack.enterpriseSearch.workplaceSearch.contentSource.sourceFeatures.searchable.text',
+export const SOURCE_FEATURES_SYNC_FREQUENCY_TITLE = i18n.translate(
+ 'xpack.enterpriseSearch.workplaceSearch.contentSource.sourceFeatures.syncFrequency.title',
+ {
+ defaultMessage: 'Syncs every 2 hours',
+ }
+);
+
+export const SOURCE_FEATURES_SYNC_FREQUENCY_TIME = i18n.translate(
+ 'xpack.enterpriseSearch.workplaceSearch.contentSource.sourceFeatures.syncFrequency.time',
+ {
+ defaultMessage: '2 hours',
+ }
+);
+
+export const SOURCE_FEATURES_SYNCED_ITEMS_TITLE = i18n.translate(
+ 'xpack.enterpriseSearch.workplaceSearch.contentSource.sourceFeatures.syncedItems.title',
+ {
+ defaultMessage: 'Synced items',
+ }
+);
+
+export const SOURCE_FEATURES_SEARCHABLE_TITLE = i18n.translate(
+ 'xpack.enterpriseSearch.workplaceSearch.contentSource.sourceFeatures.searchable.title',
+ {
+ defaultMessage: 'Searchable content',
+ }
+);
+
+export const SOURCE_FEATURES_SEARCHABLE_DESCRIPTION = i18n.translate(
+ 'xpack.enterpriseSearch.workplaceSearch.contentSource.sourceFeatures.searchable.description',
{
defaultMessage: 'The following items are searchable:',
}
);
-export const SOURCE_FEATURES_REMOTE_FEATURE = i18n.translate(
- 'xpack.enterpriseSearch.workplaceSearch.contentSource.sourceFeatures.remote.text',
+export const SOURCE_FEATURES_REMOTE_FEATURE_TITLE = i18n.translate(
+ 'xpack.enterpriseSearch.workplaceSearch.contentSource.sourceFeatures.remote.title',
+ {
+ defaultMessage: 'Always up-to-date',
+ }
+);
+
+export const SOURCE_FEATURES_REMOTE_FEATURE_DESCRIPTION = i18n.translate(
+ 'xpack.enterpriseSearch.workplaceSearch.contentSource.sourceFeatures.remote.description',
{
defaultMessage:
'Message data and other information is searchable in real-time from the Workplace Search experience.',
}
);
-export const SOURCE_FEATURES_PRIVATE_FEATURE = i18n.translate(
- 'xpack.enterpriseSearch.workplaceSearch.contentSource.sourceFeatures.private.text',
+export const SOURCE_FEATURES_PRIVATE_FEATURE_TITLE = i18n.translate(
+ 'xpack.enterpriseSearch.workplaceSearch.contentSource.sourceFeatures.private.title',
+ {
+ defaultMessage: 'Always private',
+ }
+);
+
+export const SOURCE_FEATURES_PRIVATE_FEATURE_DESCRIPTION = i18n.translate(
+ 'xpack.enterpriseSearch.workplaceSearch.contentSource.sourceFeatures.private.description',
{
defaultMessage:
'Results returned are specific and relevant to you. Connecting this source does not expose your personal data to other search users - only you.',
}
);
-export const SOURCE_FEATURES_GLOBAL_ACCESS_PERMISSIONS_FEATURE = i18n.translate(
- 'xpack.enterpriseSearch.workplaceSearch.contentSource.sourceFeatures.globalAccessPermissions.text',
+export const SOURCE_FEATURES_GLOBAL_ACCESS_PERMISSIONS_FEATURE_TITLE = i18n.translate(
+ 'xpack.enterpriseSearch.workplaceSearch.contentSource.sourceFeatures.globalAccessPermissions.title',
+ {
+ defaultMessage: 'Global access permissions',
+ }
+);
+
+export const SOURCE_FEATURES_GLOBAL_ACCESS_PERMISSIONS_FEATURE_DESCRIPTION = i18n.translate(
+ 'xpack.enterpriseSearch.workplaceSearch.contentSource.sourceFeatures.globalAccessPermissions.description',
{
defaultMessage:
'All documents accessible to the connecting service user will be synchronized and made available to the organization’s users, or group’s users. Documents are immediately available for search',
@@ -360,12 +451,6 @@ export const SOURCE_FEATURES_DOCUMENT_LEVEL_PERMISSIONS_FEATURE = i18n.translate
}
);
-export const SOURCE_FEATURES_EXPLORE_BUTTON = i18n.translate(
- 'xpack.enterpriseSearch.workplaceSearch.contentSource.sourceFeatures.explore.button',
- {
- defaultMessage: 'Explore Platinum features',
- }
-);
export const CONNECT_WHICH_OPTION_LINK = i18n.translate(
'xpack.enterpriseSearch.workplaceSearch.contentSource.connect.whichOption.link',
{
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/save_custom.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/save_custom.tsx
index bbece2f68c717..dbec5d1808167 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/save_custom.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/save_custom.tsx
@@ -46,8 +46,11 @@ import {
SAVE_CUSTOM_API_KEYS_TITLE,
SAVE_CUSTOM_API_KEYS_BODY,
SAVE_CUSTOM_VISUAL_WALKTHROUGH_TITLE,
+ SAVE_CUSTOM_VISUAL_WALKTHROUGH_LINK,
SAVE_CUSTOM_STYLING_RESULTS_TITLE,
+ SAVE_CUSTOM_STYLING_RESULTS_LINK,
SAVE_CUSTOM_DOC_PERMISSIONS_TITLE,
+ SAVE_CUSTOM_DOC_PERMISSIONS_LINK,
} from './constants';
interface SaveCustomProps {
@@ -140,7 +143,7 @@ export const SaveCustom: React.FC = ({
values={{
link: (
- Check out the documentation
+ {SAVE_CUSTOM_VISUAL_WALKTHROUGH_LINK}
),
}}
@@ -168,7 +171,7 @@ export const SaveCustom: React.FC = ({
isOrganization
)}
>
- Display Settings
+ {SAVE_CUSTOM_STYLING_RESULTS_LINK}
),
}}
@@ -193,7 +196,7 @@ export const SaveCustom: React.FC = ({
values={{
link: (
- Document-level permissions
+ {SAVE_CUSTOM_DOC_PERMISSIONS_LINK}
),
}}
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/source_features.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/source_features.tsx
index 02856320aa535..940cb9cb7372a 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/source_features.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/source_features.tsx
@@ -26,10 +26,17 @@ import { Features, FeatureIds } from '../../../../types';
import {
INCLUDED_FEATURES_TITLE,
- SOURCE_FEATURES_SEARCHABLE,
- SOURCE_FEATURES_REMOTE_FEATURE,
- SOURCE_FEATURES_PRIVATE_FEATURE,
- SOURCE_FEATURES_GLOBAL_ACCESS_PERMISSIONS_FEATURE,
+ SOURCE_FEATURES_SYNC_FREQUENCY_TITLE,
+ SOURCE_FEATURES_SYNC_FREQUENCY_TIME,
+ SOURCE_FEATURES_SYNCED_ITEMS_TITLE,
+ SOURCE_FEATURES_SEARCHABLE_TITLE,
+ SOURCE_FEATURES_SEARCHABLE_DESCRIPTION,
+ SOURCE_FEATURES_REMOTE_FEATURE_TITLE,
+ SOURCE_FEATURES_REMOTE_FEATURE_DESCRIPTION,
+ SOURCE_FEATURES_PRIVATE_FEATURE_TITLE,
+ SOURCE_FEATURES_PRIVATE_FEATURE_DESCRIPTION,
+ SOURCE_FEATURES_GLOBAL_ACCESS_PERMISSIONS_FEATURE_TITLE,
+ SOURCE_FEATURES_GLOBAL_ACCESS_PERMISSIONS_FEATURE_DESCRIPTION,
} from './constants';
interface ConnectInstanceProps {
@@ -76,7 +83,7 @@ export const SourceFeatures: React.FC = ({ features, objTy
};
const SyncFrequencyFeature = (
-
+
= ({ features, objTy
);
const SyncedItemsFeature = (
-
+
<>
-
@@ -111,10 +118,10 @@ export const SourceFeatures: React.FC = ({ features, objTy
);
const SearchableContentFeature = (
-
+
-
{selectedFields &&
selectedFields.length > 0 &&
@@ -500,3 +502,5 @@ export function DiscoverSidebar({
);
}
+
+export const DiscoverSidebar = memo(DiscoverSidebarComponent);
diff --git a/src/plugins/discover/public/application/apps/main/components/sidebar/discover_sidebar_responsive.tsx b/src/plugins/discover/public/application/apps/main/components/sidebar/discover_sidebar_responsive.tsx
index 7533a54ade405..90a3d33ddbe67 100644
--- a/src/plugins/discover/public/application/apps/main/components/sidebar/discover_sidebar_responsive.tsx
+++ b/src/plugins/discover/public/application/apps/main/components/sidebar/discover_sidebar_responsive.tsx
@@ -114,6 +114,7 @@ export interface DiscoverSidebarResponsiveProps {
* Mobile: Index pattern selector is visible and a button to trigger a flyout with all elements
*/
export function DiscoverSidebarResponsive(props: DiscoverSidebarResponsiveProps) {
+ const { selectedIndexPattern, onEditRuntimeField, useNewFieldsApi, onChangeIndexPattern } = props;
const [fieldFilter, setFieldFilter] = useState(getDefaultFieldFilter());
const [isFlyoutVisible, setIsFlyoutVisible] = useState(false);
/**
@@ -125,7 +126,7 @@ export function DiscoverSidebarResponsive(props: DiscoverSidebarResponsiveProps)
fieldCounts.current = calcFieldCounts(
{},
props.documents$.getValue().result,
- props.selectedIndexPattern
+ selectedIndexPattern
);
}
@@ -137,20 +138,20 @@ export function DiscoverSidebarResponsive(props: DiscoverSidebarResponsiveProps)
fieldCounts.current = calcFieldCounts(
next.result.length && fieldCounts.current ? fieldCounts.current : {},
next.result,
- props.selectedIndexPattern!
+ selectedIndexPattern!
);
}
setDocumentState({ ...documentState, ...next });
}
});
return () => subscription.unsubscribe();
- }, [props.documents$, props.selectedIndexPattern, documentState, setDocumentState]);
+ }, [props.documents$, selectedIndexPattern, documentState, setDocumentState]);
useEffect(() => {
// when index pattern changes fieldCounts needs to be cleaned up to prevent displaying
// fields of the previous index pattern
fieldCounts.current = {};
- }, [props.selectedIndexPattern]);
+ }, [selectedIndexPattern]);
const closeFieldEditor = useRef<() => void | undefined>();
@@ -174,34 +175,44 @@ export function DiscoverSidebarResponsive(props: DiscoverSidebarResponsiveProps)
setIsFlyoutVisible(false);
}, []);
- if (!props.selectedIndexPattern) {
- return null;
- }
-
const { indexPatternFieldEditor } = props.services;
- const indexPatternFieldEditPermission = indexPatternFieldEditor?.userPermissions.editIndexPattern();
- const canEditIndexPatternField = !!indexPatternFieldEditPermission && props.useNewFieldsApi;
- const editField = (fieldName?: string) => {
- if (!canEditIndexPatternField || !props.selectedIndexPattern) {
- return;
- }
- const ref = indexPatternFieldEditor.openEditor({
- ctx: {
- indexPattern: props.selectedIndexPattern,
- },
- fieldName,
- onSave: async () => {
- props.onEditRuntimeField();
- },
- });
- if (setFieldEditorRef) {
- setFieldEditorRef(ref);
- }
- if (closeFlyout) {
- closeFlyout();
- }
- };
+ const editField = useCallback(
+ (fieldName?: string) => {
+ const indexPatternFieldEditPermission = indexPatternFieldEditor?.userPermissions.editIndexPattern();
+ const canEditIndexPatternField = !!indexPatternFieldEditPermission && useNewFieldsApi;
+ if (!canEditIndexPatternField || !selectedIndexPattern) {
+ return;
+ }
+ const ref = indexPatternFieldEditor.openEditor({
+ ctx: {
+ indexPattern: selectedIndexPattern,
+ },
+ fieldName,
+ onSave: async () => {
+ onEditRuntimeField();
+ },
+ });
+ if (setFieldEditorRef) {
+ setFieldEditorRef(ref);
+ }
+ if (closeFlyout) {
+ closeFlyout();
+ }
+ },
+ [
+ closeFlyout,
+ indexPatternFieldEditor,
+ selectedIndexPattern,
+ setFieldEditorRef,
+ onEditRuntimeField,
+ useNewFieldsApi,
+ ]
+ );
+
+ if (!selectedIndexPattern) {
+ return null;
+ }
return (
<>
@@ -209,7 +220,7 @@ export function DiscoverSidebarResponsive(props: DiscoverSidebarResponsiveProps)
o.attributes.title)}
/>
@@ -296,7 +307,7 @@ export function DiscoverSidebarResponsive(props: DiscoverSidebarResponsiveProps)
,
+ fieldCounts: Record | undefined,
fieldFilterState: FieldFilterState,
useNewFieldsApi: boolean
): GroupedFields {
diff --git a/src/plugins/discover/public/application/apps/main/components/top_nav/on_save_search.tsx b/src/plugins/discover/public/application/apps/main/components/top_nav/on_save_search.tsx
index c3d1df096c32f..c68b1ab7b844c 100644
--- a/src/plugins/discover/public/application/apps/main/components/top_nav/on_save_search.tsx
+++ b/src/plugins/discover/public/application/apps/main/components/top_nav/on_save_search.tsx
@@ -10,7 +10,7 @@ import React from 'react';
import { i18n } from '@kbn/i18n';
import { SavedObjectSaveModal, showSaveModal } from '../../../../../../../saved_objects/public';
import { SavedSearch } from '../../../../../saved_searches';
-import { IndexPattern } from '../../../../../../../data/common/index_patterns/index_patterns';
+import { IndexPattern } from '../../../../../../../data/common';
import { DiscoverServices } from '../../../../../build_services';
import { GetStateReturn } from '../../services/discover_state';
import { setBreadcrumbsTitle } from '../../../../helpers/breadcrumbs';
diff --git a/src/plugins/discover/public/application/apps/main/utils/get_switch_index_pattern_app_state.test.ts b/src/plugins/discover/public/application/apps/main/utils/get_switch_index_pattern_app_state.test.ts
index 9f9071ed403ce..83107d6c57ab8 100644
--- a/src/plugins/discover/public/application/apps/main/utils/get_switch_index_pattern_app_state.test.ts
+++ b/src/plugins/discover/public/application/apps/main/utils/get_switch_index_pattern_app_state.test.ts
@@ -7,7 +7,7 @@
*/
import { getSwitchIndexPatternAppState } from './get_switch_index_pattern_app_state';
-import { IndexPattern } from '../../../../../../data/common/index_patterns';
+import { IndexPattern } from '../../../../../../data/common';
/**
* Helper function returning an index pattern
diff --git a/src/plugins/discover/public/application/components/discover_grid/discover_grid.scss b/src/plugins/discover/public/application/components/discover_grid/discover_grid.scss
index 48b99458377ad..0204433a5ba1c 100644
--- a/src/plugins/discover/public/application/components/discover_grid/discover_grid.scss
+++ b/src/plugins/discover/public/application/components/discover_grid/discover_grid.scss
@@ -86,6 +86,21 @@
.dscDiscoverGrid__descriptionListDescription {
word-break: normal !important;
+
+ // Special handling for images coming from the image field formatter
+ img {
+ // Align the images vertically centered with the text
+ vertical-align: middle;
+ // Set the maximum height to the line-height. The used function is the same
+ // function used to calculate the line-height for the EuiDescriptionList Description.
+ // !important is required to overwrite the max-height on the element from the field formatter
+ max-height: lineHeightFromBaseline(2) !important;
+ // An arbitrary amount of width we don't want to go over, to not have very wide images.
+ // For most width-height-ratios that will never be hit, because we'd usually limit
+ // it by the way smaller height. But images with very large width and very small height
+ // might be limited by that.
+ max-width: ($euiSizeXXL * 12.5) !important;
+ }
}
@include euiBreakpoint('xs', 's', 'm') {
diff --git a/src/plugins/discover/public/application/components/discover_grid/discover_grid_cell_actions.tsx b/src/plugins/discover/public/application/components/discover_grid/discover_grid_cell_actions.tsx
index ab80cd3e7b461..b1823eb3d668c 100644
--- a/src/plugins/discover/public/application/components/discover_grid/discover_grid_cell_actions.tsx
+++ b/src/plugins/discover/public/application/components/discover_grid/discover_grid_cell_actions.tsx
@@ -9,7 +9,7 @@
import React, { useContext } from 'react';
import { EuiDataGridColumnCellActionProps } from '@elastic/eui';
import { i18n } from '@kbn/i18n';
-import { IndexPatternField } from '../../../../../data/common/index_patterns/fields';
+import { IndexPatternField } from '../../../../../data/common';
import { DiscoverGridContext } from './discover_grid_context';
export const FilterInBtn = ({
diff --git a/src/plugins/discover/public/application/components/discover_grid/get_render_cell_value.tsx b/src/plugins/discover/public/application/components/discover_grid/get_render_cell_value.tsx
index f62b8b411e2bf..ecef98915ff65 100644
--- a/src/plugins/discover/public/application/components/discover_grid/get_render_cell_value.tsx
+++ b/src/plugins/discover/public/application/components/discover_grid/get_render_cell_value.tsx
@@ -110,6 +110,9 @@ export const getRenderCellValueFn = (
});
return (
+ // If you change the styling of this list (specifically something that will change the line-height)
+ // make sure to adjust the img overwrites attached to dscDiscoverGrid__descriptionListDescription
+ // in discover_grid.scss
{[...highlightPairs, ...sourcePairs].slice(0, maxDocFieldsDisplayed).map(([key, value]) => (
diff --git a/src/plugins/interactive_setup/public/single_chars_field.tsx b/src/plugins/interactive_setup/public/single_chars_field.tsx
index 8d5cd2854c0aa..18ecd38e6483a 100644
--- a/src/plugins/interactive_setup/public/single_chars_field.tsx
+++ b/src/plugins/interactive_setup/public/single_chars_field.tsx
@@ -12,6 +12,7 @@ import React, { useEffect, useRef } from 'react';
import useList from 'react-use/lib/useList';
import useUpdateEffect from 'react-use/lib/useUpdateEffect';
+import { i18n } from '@kbn/i18n';
import { euiThemeVars } from '@kbn/ui-shared-deps/theme';
export interface SingleCharsFieldProps {
@@ -124,6 +125,10 @@ export const SingleCharsField: FunctionComponent = ({
maxLength={1}
isInvalid={isInvalid}
style={{ textAlign: 'center' }}
+ aria-label={i18n.translate('interactiveSetup.singleCharsField.digitLabel', {
+ defaultMessage: 'Digit {index}',
+ values: { index: i + 1 },
+ })}
/>
);
diff --git a/src/plugins/interactive_setup/public/verification_code_form.test.tsx b/src/plugins/interactive_setup/public/verification_code_form.test.tsx
new file mode 100644
index 0000000000000..2b7f1a86fcfad
--- /dev/null
+++ b/src/plugins/interactive_setup/public/verification_code_form.test.tsx
@@ -0,0 +1,83 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { fireEvent, render, waitFor } from '@testing-library/react';
+import React from 'react';
+
+import { coreMock } from 'src/core/public/mocks';
+
+import { Providers } from './plugin';
+import { VerificationCodeForm } from './verification_code_form';
+
+jest.mock('@elastic/eui/lib/services/accessibility/html_id_generator', () => ({
+ htmlIdGenerator: () => () => `id-${Math.random()}`,
+}));
+
+describe('VerificationCodeForm', () => {
+ jest.setTimeout(20_000);
+
+ it('calls enrollment API when submitting form', async () => {
+ const coreStart = coreMock.createStart();
+ coreStart.http.post.mockResolvedValue({});
+
+ const onSuccess = jest.fn();
+
+ const { findByRole, findByLabelText } = render(
+
+
+ );
+ fireEvent.input(await findByLabelText('Digit 1'), {
+ target: { value: '1' },
+ });
+ fireEvent.input(await findByLabelText('Digit 2'), {
+ target: { value: '2' },
+ });
+ fireEvent.input(await findByLabelText('Digit 3'), {
+ target: { value: '3' },
+ });
+ fireEvent.input(await findByLabelText('Digit 4'), {
+ target: { value: '4' },
+ });
+ fireEvent.input(await findByLabelText('Digit 5'), {
+ target: { value: '5' },
+ });
+ fireEvent.input(await findByLabelText('Digit 6'), {
+ target: { value: '6' },
+ });
+ fireEvent.click(await findByRole('button', { name: 'Verify', hidden: true }));
+
+ await waitFor(() => {
+ expect(coreStart.http.post).toHaveBeenLastCalledWith('/internal/interactive_setup/verify', {
+ body: JSON.stringify({ code: '123456' }),
+ });
+ expect(onSuccess).toHaveBeenCalled();
+ });
+ });
+
+ it('validates form', async () => {
+ const coreStart = coreMock.createStart();
+ const onSuccess = jest.fn();
+
+ const { findAllByText, findByRole, findByLabelText } = render(
+
+
+ );
+
+ fireEvent.click(await findByRole('button', { name: 'Verify', hidden: true }));
+
+ await findAllByText(/Enter a verification code/i);
+
+ fireEvent.input(await findByLabelText('Digit 1'), {
+ target: { value: '1' },
+ });
+
+ await findAllByText(/Enter all six digits/i);
+ });
+});
diff --git a/src/plugins/interactive_setup/public/verification_code_form.tsx b/src/plugins/interactive_setup/public/verification_code_form.tsx
index 8f4a9ea8c5d01..8bea8229baec3 100644
--- a/src/plugins/interactive_setup/public/verification_code_form.tsx
+++ b/src/plugins/interactive_setup/public/verification_code_form.tsx
@@ -9,6 +9,7 @@
import {
EuiButton,
EuiCallOut,
+ EuiCode,
EuiEmptyPrompt,
EuiForm,
EuiFormRow,
@@ -69,8 +70,8 @@ export const VerificationCodeForm: FunctionComponent
}),
});
} catch (error) {
- if (error.response?.status === 403) {
- form.setError('code', error.body?.message);
+ if ((error as IHttpFetchError).response?.status === 403) {
+ form.setError('code', (error as IHttpFetchError).body?.message);
return;
} else {
throw error;
@@ -111,7 +112,10 @@ export const VerificationCodeForm: FunctionComponent
+ {hasNegativeValues
+ ? i18n.translate('visTypePie.negativeValuesFound', {
+ defaultMessage: "Pie/donut charts can't render with negative values.",
+ })
+ : i18n.translate('visTypePie.noResultsFoundTitle', {
+ defaultMessage: 'No results found',
+ })}
+
+ }
+ />
+ );
+};
diff --git a/src/plugins/vis_types/pie/public/pie_component.test.tsx b/src/plugins/vis_types/pie/public/pie_component.test.tsx
index c70cad285f2ae..846daa1e45710 100644
--- a/src/plugins/vis_types/pie/public/pie_component.test.tsx
+++ b/src/plugins/vis_types/pie/public/pie_component.test.tsx
@@ -10,6 +10,7 @@ import React from 'react';
import { Settings, TooltipType, SeriesIdentifier } from '@elastic/charts';
import { chartPluginMock } from '../../../charts/public/mocks';
import { dataPluginMock } from '../../../data/public/mocks';
+import type { Datatable } from '../../../expressions/public';
import { shallow, mount } from 'enzyme';
import { findTestSubject } from '@elastic/eui/lib/test';
import { act } from 'react-dom/test-utils';
@@ -120,4 +121,64 @@ describe('PieComponent', function () {
]);
expect(wrapperProps.fireEvent).toHaveBeenCalled();
});
+
+ it('renders the no results component if all the values are zero', () => {
+ const newVisData = ({
+ type: 'datatable',
+ columns: [
+ {
+ id: 'col-1-1',
+ name: 'Count',
+ },
+ {
+ id: 'col-0-2',
+ name: 'filters',
+ },
+ ],
+ rows: [
+ {
+ 'col-0-2': 'Carrier : "JetBeats" ',
+ 'col-1-1': 0,
+ },
+ {
+ 'col-0-2': 'Carrier : "ES-Air" ',
+ 'col-1-1': 0,
+ },
+ ],
+ } as unknown) as Datatable;
+ const newProps = { ...wrapperProps, visData: newVisData };
+ const component = mount(/src/plugins/vis_type_table'],
+ rootDir: '../../../..',
+ roots: ['/src/plugins/vis_types/table'],
testRunner: 'jasmine2',
- coverageDirectory: '/target/kibana-coverage/jest/src/plugins/vis_type_table',
+ coverageDirectory: '/target/kibana-coverage/jest/src/plugins/vis_types/table',
coverageReporters: ['text', 'html'],
collectCoverageFrom: [
- '/src/plugins/vis_type_table/{common,public,server}/**/*.{js,ts,tsx}',
+ '/src/plugins/vis_types/table/{common,public,server}/**/*.{js,ts,tsx}',
],
};
diff --git a/src/plugins/vis_type_table/kibana.json b/src/plugins/vis_types/table/kibana.json
similarity index 100%
rename from src/plugins/vis_type_table/kibana.json
rename to src/plugins/vis_types/table/kibana.json
diff --git a/src/plugins/vis_type_table/public/__snapshots__/table_vis_fn.test.ts.snap b/src/plugins/vis_types/table/public/__snapshots__/table_vis_fn.test.ts.snap
similarity index 100%
rename from src/plugins/vis_type_table/public/__snapshots__/table_vis_fn.test.ts.snap
rename to src/plugins/vis_types/table/public/__snapshots__/table_vis_fn.test.ts.snap
diff --git a/src/plugins/vis_type_table/public/components/__snapshots__/table_vis_basic.test.tsx.snap b/src/plugins/vis_types/table/public/components/__snapshots__/table_vis_basic.test.tsx.snap
similarity index 100%
rename from src/plugins/vis_type_table/public/components/__snapshots__/table_vis_basic.test.tsx.snap
rename to src/plugins/vis_types/table/public/components/__snapshots__/table_vis_basic.test.tsx.snap
diff --git a/src/plugins/vis_type_table/public/components/__snapshots__/table_vis_cell.test.tsx.snap b/src/plugins/vis_types/table/public/components/__snapshots__/table_vis_cell.test.tsx.snap
similarity index 100%
rename from src/plugins/vis_type_table/public/components/__snapshots__/table_vis_cell.test.tsx.snap
rename to src/plugins/vis_types/table/public/components/__snapshots__/table_vis_cell.test.tsx.snap
diff --git a/src/plugins/vis_type_table/public/components/index.ts b/src/plugins/vis_types/table/public/components/index.ts
similarity index 100%
rename from src/plugins/vis_type_table/public/components/index.ts
rename to src/plugins/vis_types/table/public/components/index.ts
diff --git a/src/plugins/vis_type_table/public/components/table_vis_basic.test.tsx b/src/plugins/vis_types/table/public/components/table_vis_basic.test.tsx
similarity index 100%
rename from src/plugins/vis_type_table/public/components/table_vis_basic.test.tsx
rename to src/plugins/vis_types/table/public/components/table_vis_basic.test.tsx
diff --git a/src/plugins/vis_type_table/public/components/table_vis_basic.tsx b/src/plugins/vis_types/table/public/components/table_vis_basic.tsx
similarity index 100%
rename from src/plugins/vis_type_table/public/components/table_vis_basic.tsx
rename to src/plugins/vis_types/table/public/components/table_vis_basic.tsx
diff --git a/src/plugins/vis_type_table/public/components/table_vis_cell.test.tsx b/src/plugins/vis_types/table/public/components/table_vis_cell.test.tsx
similarity index 100%
rename from src/plugins/vis_type_table/public/components/table_vis_cell.test.tsx
rename to src/plugins/vis_types/table/public/components/table_vis_cell.test.tsx
diff --git a/src/plugins/vis_type_table/public/components/table_vis_cell.tsx b/src/plugins/vis_types/table/public/components/table_vis_cell.tsx
similarity index 100%
rename from src/plugins/vis_type_table/public/components/table_vis_cell.tsx
rename to src/plugins/vis_types/table/public/components/table_vis_cell.tsx
diff --git a/src/plugins/vis_type_table/public/components/table_vis_columns.tsx b/src/plugins/vis_types/table/public/components/table_vis_columns.tsx
similarity index 100%
rename from src/plugins/vis_type_table/public/components/table_vis_columns.tsx
rename to src/plugins/vis_types/table/public/components/table_vis_columns.tsx
diff --git a/src/plugins/vis_type_table/public/components/table_vis_controls.tsx b/src/plugins/vis_types/table/public/components/table_vis_controls.tsx
similarity index 96%
rename from src/plugins/vis_type_table/public/components/table_vis_controls.tsx
rename to src/plugins/vis_types/table/public/components/table_vis_controls.tsx
index 01dd693a31ff8..28e4b84796d98 100644
--- a/src/plugins/vis_type_table/public/components/table_vis_controls.tsx
+++ b/src/plugins/vis_types/table/public/components/table_vis_controls.tsx
@@ -19,13 +19,13 @@ import { i18n } from '@kbn/i18n';
import { DatatableColumn, DatatableRow } from 'src/plugins/expressions';
import { CoreStart } from 'kibana/public';
-import { useKibana } from '../../../kibana_react/public';
-import { exporters } from '../../../data/public';
+import { useKibana } from '../../../../kibana_react/public';
+import { exporters } from '../../../../data/public';
import {
CSV_SEPARATOR_SETTING,
CSV_QUOTE_VALUES_SETTING,
downloadFileAs,
-} from '../../../share/public';
+} from '../../../../share/public';
import { getFormatService } from '../services';
interface TableVisControlsProps {
diff --git a/src/plugins/vis_type_table/public/components/table_vis_options.tsx b/src/plugins/vis_types/table/public/components/table_vis_options.tsx
similarity index 96%
rename from src/plugins/vis_type_table/public/components/table_vis_options.tsx
rename to src/plugins/vis_types/table/public/components/table_vis_options.tsx
index 2906a51e5d05f..8a6b8586fce7d 100644
--- a/src/plugins/vis_type_table/public/components/table_vis_options.tsx
+++ b/src/plugins/vis_types/table/public/components/table_vis_options.tsx
@@ -13,8 +13,12 @@ import { i18n } from '@kbn/i18n';
import { FormattedMessage } from '@kbn/i18n/react';
import { VisEditorOptionsProps } from 'src/plugins/visualizations/public';
-import { search } from '../../../data/public';
-import { SwitchOption, SelectOption, NumberInputOption } from '../../../vis_default_editor/public';
+import { search } from '../../../../data/public';
+import {
+ SwitchOption,
+ SelectOption,
+ NumberInputOption,
+} from '../../../../vis_default_editor/public';
import { TableVisParams } from '../../common';
import { totalAggregations } from './utils';
diff --git a/src/plugins/vis_type_table/public/components/table_vis_options_lazy.tsx b/src/plugins/vis_types/table/public/components/table_vis_options_lazy.tsx
similarity index 100%
rename from src/plugins/vis_type_table/public/components/table_vis_options_lazy.tsx
rename to src/plugins/vis_types/table/public/components/table_vis_options_lazy.tsx
diff --git a/src/plugins/vis_type_table/public/components/table_vis_split.tsx b/src/plugins/vis_types/table/public/components/table_vis_split.tsx
similarity index 100%
rename from src/plugins/vis_type_table/public/components/table_vis_split.tsx
rename to src/plugins/vis_types/table/public/components/table_vis_split.tsx
diff --git a/src/plugins/vis_type_table/public/components/table_visualization.scss b/src/plugins/vis_types/table/public/components/table_visualization.scss
similarity index 100%
rename from src/plugins/vis_type_table/public/components/table_visualization.scss
rename to src/plugins/vis_types/table/public/components/table_visualization.scss
diff --git a/src/plugins/vis_type_table/public/components/table_visualization.test.tsx b/src/plugins/vis_types/table/public/components/table_visualization.test.tsx
similarity index 97%
rename from src/plugins/vis_type_table/public/components/table_visualization.test.tsx
rename to src/plugins/vis_types/table/public/components/table_visualization.test.tsx
index 44c315cdbd9e4..0de7e8c15105a 100644
--- a/src/plugins/vis_type_table/public/components/table_visualization.test.tsx
+++ b/src/plugins/vis_types/table/public/components/table_visualization.test.tsx
@@ -13,7 +13,7 @@ jest.mock('../utils', () => ({
import React from 'react';
import { shallow } from 'enzyme';
import { IInterpreterRenderHandlers } from 'src/plugins/expressions';
-import { coreMock } from '../../../../core/public/mocks';
+import { coreMock } from '../../../../../core/public/mocks';
import { TableVisConfig, TableVisData } from '../types';
import TableVisualizationComponent from './table_visualization';
import { useUiState } from '../utils';
diff --git a/src/plugins/vis_type_table/public/components/table_visualization.tsx b/src/plugins/vis_types/table/public/components/table_visualization.tsx
similarity index 96%
rename from src/plugins/vis_type_table/public/components/table_visualization.tsx
rename to src/plugins/vis_types/table/public/components/table_visualization.tsx
index c5a4f42cbb65e..356913146890b 100644
--- a/src/plugins/vis_type_table/public/components/table_visualization.tsx
+++ b/src/plugins/vis_types/table/public/components/table_visualization.tsx
@@ -13,7 +13,7 @@ import classNames from 'classnames';
import { CoreStart } from 'kibana/public';
import { IInterpreterRenderHandlers } from 'src/plugins/expressions';
import type { PersistedState } from 'src/plugins/visualizations/public';
-import { KibanaContextProvider } from '../../../kibana_react/public';
+import { KibanaContextProvider } from '../../../../kibana_react/public';
import { TableVisConfig, TableVisData } from '../types';
import { TableVisBasic } from './table_vis_basic';
import { TableVisSplit } from './table_vis_split';
diff --git a/src/plugins/vis_type_table/public/components/utils.ts b/src/plugins/vis_types/table/public/components/utils.ts
similarity index 100%
rename from src/plugins/vis_type_table/public/components/utils.ts
rename to src/plugins/vis_types/table/public/components/utils.ts
diff --git a/src/plugins/vis_type_table/public/index.ts b/src/plugins/vis_types/table/public/index.ts
similarity index 100%
rename from src/plugins/vis_type_table/public/index.ts
rename to src/plugins/vis_types/table/public/index.ts
diff --git a/src/plugins/vis_type_table/public/plugin.ts b/src/plugins/vis_types/table/public/plugin.ts
similarity index 81%
rename from src/plugins/vis_type_table/public/plugin.ts
rename to src/plugins/vis_types/table/public/plugin.ts
index 2ae8b68bba701..fa02550f5048d 100644
--- a/src/plugins/vis_type_table/public/plugin.ts
+++ b/src/plugins/vis_types/table/public/plugin.ts
@@ -7,11 +7,11 @@
*/
import { CoreSetup, CoreStart, Plugin } from 'kibana/public';
-import { Plugin as ExpressionsPublicPlugin } from '../../expressions/public';
-import { VisualizationsSetup } from '../../visualizations/public';
-import { UsageCollectionSetup } from '../../usage_collection/public';
+import { Plugin as ExpressionsPublicPlugin } from '../../../expressions/public';
+import { VisualizationsSetup } from '../../../visualizations/public';
+import { UsageCollectionSetup } from '../../../usage_collection/public';
-import { DataPublicPluginStart } from '../../data/public';
+import { DataPublicPluginStart } from '../../../data/public';
import { setFormatService } from './services';
import { registerTableVis } from './register_vis';
diff --git a/src/plugins/vis_type_table/public/register_vis.ts b/src/plugins/vis_types/table/public/register_vis.ts
similarity index 100%
rename from src/plugins/vis_type_table/public/register_vis.ts
rename to src/plugins/vis_types/table/public/register_vis.ts
diff --git a/src/plugins/vis_type_table/public/services.ts b/src/plugins/vis_types/table/public/services.ts
similarity index 79%
rename from src/plugins/vis_type_table/public/services.ts
rename to src/plugins/vis_types/table/public/services.ts
index 3122e65714ac8..d4d83c9e92c67 100644
--- a/src/plugins/vis_type_table/public/services.ts
+++ b/src/plugins/vis_types/table/public/services.ts
@@ -6,8 +6,8 @@
* Side Public License, v 1.
*/
-import { createGetterSetter } from '../../kibana_utils/public';
-import { DataPublicPluginStart } from '../../data/public';
+import { createGetterSetter } from '../../../kibana_utils/public';
+import { DataPublicPluginStart } from '../../../data/public';
export const [getFormatService, setFormatService] = createGetterSetter<
DataPublicPluginStart['fieldFormats']
diff --git a/src/plugins/vis_type_table/public/table_vis_fn.test.ts b/src/plugins/vis_types/table/public/table_vis_fn.test.ts
similarity index 92%
rename from src/plugins/vis_type_table/public/table_vis_fn.test.ts
rename to src/plugins/vis_types/table/public/table_vis_fn.test.ts
index c6eb8601824ec..8b08bca160478 100644
--- a/src/plugins/vis_type_table/public/table_vis_fn.test.ts
+++ b/src/plugins/vis_types/table/public/table_vis_fn.test.ts
@@ -9,8 +9,8 @@
import { createTableVisFn } from './table_vis_fn';
import { tableVisResponseHandler } from './utils';
-import { functionWrapper } from '../../expressions/common/expression_functions/specs/tests/utils';
-import { Datatable } from '../../expressions/common/expression_types/specs';
+import { functionWrapper } from '../../../expressions/common/expression_functions/specs/tests/utils';
+import { Datatable } from '../../../expressions/common/expression_types/specs';
jest.mock('./utils', () => ({
tableVisResponseHandler: jest.fn().mockReturnValue({
diff --git a/src/plugins/vis_type_table/public/table_vis_fn.ts b/src/plugins/vis_types/table/public/table_vis_fn.ts
similarity index 97%
rename from src/plugins/vis_type_table/public/table_vis_fn.ts
rename to src/plugins/vis_types/table/public/table_vis_fn.ts
index 9473a9a2663ab..ebddb0b4b7fef 100644
--- a/src/plugins/vis_type_table/public/table_vis_fn.ts
+++ b/src/plugins/vis_types/table/public/table_vis_fn.ts
@@ -7,8 +7,8 @@
*/
import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition, Datatable, Render } from '../../expressions/public';
-import { prepareLogTable, Dimension } from '../../visualizations/public';
+import { ExpressionFunctionDefinition, Datatable, Render } from '../../../expressions/public';
+import { prepareLogTable, Dimension } from '../../../visualizations/public';
import { TableVisData, TableVisConfig } from './types';
import { VIS_TYPE_TABLE } from '../common';
import { tableVisResponseHandler } from './utils';
diff --git a/src/plugins/vis_type_table/public/table_vis_renderer.tsx b/src/plugins/vis_types/table/public/table_vis_renderer.tsx
similarity index 89%
rename from src/plugins/vis_type_table/public/table_vis_renderer.tsx
rename to src/plugins/vis_types/table/public/table_vis_renderer.tsx
index 257755de62d0d..e9f2002b71062 100644
--- a/src/plugins/vis_type_table/public/table_vis_renderer.tsx
+++ b/src/plugins/vis_types/table/public/table_vis_renderer.tsx
@@ -10,8 +10,8 @@ import React, { lazy } from 'react';
import { render, unmountComponentAtNode } from 'react-dom';
import { CoreStart } from 'kibana/public';
-import { VisualizationContainer } from '../../visualizations/public';
-import { ExpressionRenderDefinition } from '../../expressions/common/expression_renderers';
+import { VisualizationContainer } from '../../../visualizations/public';
+import { ExpressionRenderDefinition } from '../../../expressions/common/expression_renderers';
import { TableVisRenderValue } from './table_vis_fn';
const TableVisualizationComponent = lazy(() => import('./components/table_visualization'));
diff --git a/src/plugins/vis_type_table/public/table_vis_type.ts b/src/plugins/vis_types/table/public/table_vis_type.ts
similarity index 94%
rename from src/plugins/vis_type_table/public/table_vis_type.ts
rename to src/plugins/vis_types/table/public/table_vis_type.ts
index a49748fe86c96..4664e87cea79b 100644
--- a/src/plugins/vis_type_table/public/table_vis_type.ts
+++ b/src/plugins/vis_types/table/public/table_vis_type.ts
@@ -8,8 +8,8 @@
import { i18n } from '@kbn/i18n';
-import { AggGroupNames } from '../../data/public';
-import { VIS_EVENT_TO_TRIGGER, VisTypeDefinition } from '../../visualizations/public';
+import { AggGroupNames } from '../../../data/public';
+import { VIS_EVENT_TO_TRIGGER, VisTypeDefinition } from '../../../visualizations/public';
import { TableVisParams, VIS_TYPE_TABLE } from '../common';
import { TableOptions } from './components/table_vis_options_lazy';
import { toExpressionAst } from './to_ast';
diff --git a/src/plugins/vis_type_table/public/to_ast.test.ts b/src/plugins/vis_types/table/public/to_ast.test.ts
similarity index 95%
rename from src/plugins/vis_type_table/public/to_ast.test.ts
rename to src/plugins/vis_types/table/public/to_ast.test.ts
index 32b2b5939ed89..e8f987909a534 100644
--- a/src/plugins/vis_type_table/public/to_ast.test.ts
+++ b/src/plugins/vis_types/table/public/to_ast.test.ts
@@ -9,7 +9,7 @@
import { Vis } from 'src/plugins/visualizations/public';
import { toExpressionAst } from './to_ast';
import { AggTypes, TableVisParams } from '../common';
-import { buildExpressionFunction } from '../../expressions/public';
+import { buildExpressionFunction } from '../../../expressions/public';
const mockSchemas = {
metric: [{ accessor: 1, format: { id: 'number' }, params: {}, label: 'Count', aggType: 'count' }],
@@ -32,11 +32,11 @@ const mockTableExpression = {
toAst: jest.fn(),
};
-jest.mock('../../visualizations/public', () => ({
+jest.mock('../../../visualizations/public', () => ({
getVisSchemas: () => mockSchemas,
}));
-jest.mock('../../expressions/public', () => ({
+jest.mock('../../../expressions/public', () => ({
buildExpression: jest.fn(() => mockTableExpression),
buildExpressionFunction: jest.fn(() => mockTableExpressionFunction),
}));
diff --git a/src/plugins/vis_type_table/public/to_ast.ts b/src/plugins/vis_types/table/public/to_ast.ts
similarity index 97%
rename from src/plugins/vis_type_table/public/to_ast.ts
rename to src/plugins/vis_types/table/public/to_ast.ts
index f7fb620db1ca6..8e1c92c8dde4f 100644
--- a/src/plugins/vis_type_table/public/to_ast.ts
+++ b/src/plugins/vis_types/table/public/to_ast.ts
@@ -9,9 +9,9 @@
import {
EsaggsExpressionFunctionDefinition,
IndexPatternLoadExpressionFunctionDefinition,
-} from '../../data/public';
-import { buildExpression, buildExpressionFunction } from '../../expressions/public';
-import { getVisSchemas, SchemaConfig, VisToExpressionAst } from '../../visualizations/public';
+} from '../../../data/public';
+import { buildExpression, buildExpressionFunction } from '../../../expressions/public';
+import { getVisSchemas, SchemaConfig, VisToExpressionAst } from '../../../visualizations/public';
import { TableVisParams } from '../common';
import { TableExpressionFunctionDefinition } from './table_vis_fn';
diff --git a/src/plugins/vis_type_table/public/types.ts b/src/plugins/vis_types/table/public/types.ts
similarity index 100%
rename from src/plugins/vis_type_table/public/types.ts
rename to src/plugins/vis_types/table/public/types.ts
diff --git a/src/plugins/vis_type_table/public/utils/add_percentage_column.test.ts b/src/plugins/vis_types/table/public/utils/add_percentage_column.test.ts
similarity index 100%
rename from src/plugins/vis_type_table/public/utils/add_percentage_column.test.ts
rename to src/plugins/vis_types/table/public/utils/add_percentage_column.test.ts
diff --git a/src/plugins/vis_type_table/public/utils/add_percentage_column.ts b/src/plugins/vis_types/table/public/utils/add_percentage_column.ts
similarity index 100%
rename from src/plugins/vis_type_table/public/utils/add_percentage_column.ts
rename to src/plugins/vis_types/table/public/utils/add_percentage_column.ts
diff --git a/src/plugins/vis_type_table/public/utils/create_formatted_table.test.ts b/src/plugins/vis_types/table/public/utils/create_formatted_table.test.ts
similarity index 100%
rename from src/plugins/vis_type_table/public/utils/create_formatted_table.test.ts
rename to src/plugins/vis_types/table/public/utils/create_formatted_table.test.ts
diff --git a/src/plugins/vis_type_table/public/utils/create_formatted_table.ts b/src/plugins/vis_types/table/public/utils/create_formatted_table.ts
similarity index 100%
rename from src/plugins/vis_type_table/public/utils/create_formatted_table.ts
rename to src/plugins/vis_types/table/public/utils/create_formatted_table.ts
diff --git a/src/plugins/vis_type_table/public/utils/index.ts b/src/plugins/vis_types/table/public/utils/index.ts
similarity index 100%
rename from src/plugins/vis_type_table/public/utils/index.ts
rename to src/plugins/vis_types/table/public/utils/index.ts
diff --git a/src/plugins/vis_type_table/public/utils/table_vis_response_handler.test.ts b/src/plugins/vis_types/table/public/utils/table_vis_response_handler.test.ts
similarity index 100%
rename from src/plugins/vis_type_table/public/utils/table_vis_response_handler.test.ts
rename to src/plugins/vis_types/table/public/utils/table_vis_response_handler.test.ts
diff --git a/src/plugins/vis_type_table/public/utils/table_vis_response_handler.ts b/src/plugins/vis_types/table/public/utils/table_vis_response_handler.ts
similarity index 100%
rename from src/plugins/vis_type_table/public/utils/table_vis_response_handler.ts
rename to src/plugins/vis_types/table/public/utils/table_vis_response_handler.ts
diff --git a/src/plugins/vis_type_table/public/utils/use/index.ts b/src/plugins/vis_types/table/public/utils/use/index.ts
similarity index 100%
rename from src/plugins/vis_type_table/public/utils/use/index.ts
rename to src/plugins/vis_types/table/public/utils/use/index.ts
diff --git a/src/plugins/vis_type_table/public/utils/use/use_pagination.test.ts b/src/plugins/vis_types/table/public/utils/use/use_pagination.test.ts
similarity index 100%
rename from src/plugins/vis_type_table/public/utils/use/use_pagination.test.ts
rename to src/plugins/vis_types/table/public/utils/use/use_pagination.test.ts
diff --git a/src/plugins/vis_type_table/public/utils/use/use_pagination.ts b/src/plugins/vis_types/table/public/utils/use/use_pagination.ts
similarity index 100%
rename from src/plugins/vis_type_table/public/utils/use/use_pagination.ts
rename to src/plugins/vis_types/table/public/utils/use/use_pagination.ts
diff --git a/src/plugins/vis_type_table/public/utils/use/use_ui_state.test.ts b/src/plugins/vis_types/table/public/utils/use/use_ui_state.test.ts
similarity index 100%
rename from src/plugins/vis_type_table/public/utils/use/use_ui_state.test.ts
rename to src/plugins/vis_types/table/public/utils/use/use_ui_state.test.ts
diff --git a/src/plugins/vis_type_table/public/utils/use/use_ui_state.ts b/src/plugins/vis_types/table/public/utils/use/use_ui_state.ts
similarity index 100%
rename from src/plugins/vis_type_table/public/utils/use/use_ui_state.ts
rename to src/plugins/vis_types/table/public/utils/use/use_ui_state.ts
diff --git a/src/plugins/vis_type_table/server/index.ts b/src/plugins/vis_types/table/server/index.ts
similarity index 100%
rename from src/plugins/vis_type_table/server/index.ts
rename to src/plugins/vis_types/table/server/index.ts
diff --git a/src/plugins/vis_type_table/server/usage_collector/get_stats.test.ts b/src/plugins/vis_types/table/server/usage_collector/get_stats.test.ts
similarity index 96%
rename from src/plugins/vis_type_table/server/usage_collector/get_stats.test.ts
rename to src/plugins/vis_types/table/server/usage_collector/get_stats.test.ts
index 76f067e3a23d7..4c91def40300e 100644
--- a/src/plugins/vis_type_table/server/usage_collector/get_stats.test.ts
+++ b/src/plugins/vis_types/table/server/usage_collector/get_stats.test.ts
@@ -7,7 +7,7 @@
*/
import { getStats } from './get_stats';
-import type { SavedObjectsClientContract } from '../../../../core/server';
+import type { SavedObjectsClientContract } from '../../../../../core/server';
const mockVisualizations = {
saved_objects: [
diff --git a/src/plugins/vis_type_table/server/usage_collector/get_stats.ts b/src/plugins/vis_types/table/server/usage_collector/get_stats.ts
similarity index 95%
rename from src/plugins/vis_type_table/server/usage_collector/get_stats.ts
rename to src/plugins/vis_types/table/server/usage_collector/get_stats.ts
index ef948c2d7b70b..ac8d759c94c76 100644
--- a/src/plugins/vis_type_table/server/usage_collector/get_stats.ts
+++ b/src/plugins/vis_types/table/server/usage_collector/get_stats.ts
@@ -12,8 +12,8 @@ import type {
ISavedObjectsRepository,
SavedObjectsClientContract,
SavedObjectsFindResult,
-} from '../../../../core/server';
-import type { SavedVisState } from '../../../visualizations/common';
+} from '../../../../../core/server';
+import type { SavedVisState } from '../../../../visualizations/common';
export interface VisTypeTableUsage {
/**
diff --git a/src/plugins/vis_type_table/server/usage_collector/index.ts b/src/plugins/vis_types/table/server/usage_collector/index.ts
similarity index 100%
rename from src/plugins/vis_type_table/server/usage_collector/index.ts
rename to src/plugins/vis_types/table/server/usage_collector/index.ts
diff --git a/src/plugins/vis_type_table/server/usage_collector/register_usage_collector.test.ts b/src/plugins/vis_types/table/server/usage_collector/register_usage_collector.test.ts
similarity index 97%
rename from src/plugins/vis_type_table/server/usage_collector/register_usage_collector.test.ts
rename to src/plugins/vis_types/table/server/usage_collector/register_usage_collector.test.ts
index d32435ac45406..b65c698f219a6 100644
--- a/src/plugins/vis_type_table/server/usage_collector/register_usage_collector.test.ts
+++ b/src/plugins/vis_types/table/server/usage_collector/register_usage_collector.test.ts
@@ -9,7 +9,7 @@
import {
createUsageCollectionSetupMock,
createCollectorFetchContextMock,
-} from '../../../usage_collection/server/mocks';
+} from '../../../../usage_collection/server/mocks';
import { registerVisTypeTableUsageCollector } from './register_usage_collector';
import { getStats } from './get_stats';
diff --git a/src/plugins/vis_type_table/server/usage_collector/register_usage_collector.ts b/src/plugins/vis_types/table/server/usage_collector/register_usage_collector.ts
similarity index 92%
rename from src/plugins/vis_type_table/server/usage_collector/register_usage_collector.ts
rename to src/plugins/vis_types/table/server/usage_collector/register_usage_collector.ts
index 74044c9ae70c0..ed176fc9222bc 100644
--- a/src/plugins/vis_type_table/server/usage_collector/register_usage_collector.ts
+++ b/src/plugins/vis_types/table/server/usage_collector/register_usage_collector.ts
@@ -7,7 +7,7 @@
*/
import { getStats, VisTypeTableUsage } from './get_stats';
-import type { UsageCollectionSetup } from '../../../usage_collection/server';
+import type { UsageCollectionSetup } from '../../../../usage_collection/server';
export function registerVisTypeTableUsageCollector(collectorSet: UsageCollectionSetup) {
const collector = collectorSet.makeUsageCollector({
diff --git a/src/plugins/vis_types/table/tsconfig.json b/src/plugins/vis_types/table/tsconfig.json
new file mode 100644
index 0000000000000..9325064d571d0
--- /dev/null
+++ b/src/plugins/vis_types/table/tsconfig.json
@@ -0,0 +1,28 @@
+{
+ "extends": "../../../../tsconfig.base.json",
+ "compilerOptions": {
+ "outDir": "./target/types",
+ "emitDeclarationOnly": true,
+ "declaration": true,
+ "declarationMap": true
+ },
+ "include": [
+ "common/**/*",
+ "public/**/*",
+ "server/**/*",
+ "*.ts"
+ ],
+ "references": [
+ { "path": "../../../core/tsconfig.json" },
+ { "path": "../../data/tsconfig.json" },
+ { "path": "../../visualizations/tsconfig.json" },
+ { "path": "../../share/tsconfig.json" },
+ { "path": "../../usage_collection/tsconfig.json" },
+ { "path": "../../expressions/tsconfig.json" },
+ { "path": "../../kibana_utils/tsconfig.json" },
+ { "path": "../../kibana_legacy/tsconfig.json" },
+ { "path": "../../kibana_react/tsconfig.json" },
+ { "path": "../../vis_default_editor/tsconfig.json" },
+ { "path": "../../field_formats/tsconfig.json" }
+ ]
+}
diff --git a/src/plugins/vis_types/timelion/README.md b/src/plugins/vis_types/timelion/README.md
new file mode 100644
index 0000000000000..145774e768e9e
--- /dev/null
+++ b/src/plugins/vis_types/timelion/README.md
@@ -0,0 +1,6 @@
+# Vis type Timelion
+
+Contains the timelion visualization and the timelion backend.
+
+# Generate a parser
+If your grammar was changed in `packages/@kbn-timelion-grammar` you need to re-generate the static parser. You can do this with `yarn kbn build`.
\ No newline at end of file
diff --git a/src/plugins/vis_type_timelion/common/constants.ts b/src/plugins/vis_types/timelion/common/constants.ts
similarity index 100%
rename from src/plugins/vis_type_timelion/common/constants.ts
rename to src/plugins/vis_types/timelion/common/constants.ts
diff --git a/src/plugins/vis_type_timelion/common/lib/calculate_interval.test.ts b/src/plugins/vis_types/timelion/common/lib/calculate_interval.test.ts
similarity index 100%
rename from src/plugins/vis_type_timelion/common/lib/calculate_interval.test.ts
rename to src/plugins/vis_types/timelion/common/lib/calculate_interval.test.ts
diff --git a/src/plugins/vis_type_timelion/common/lib/calculate_interval.ts b/src/plugins/vis_types/timelion/common/lib/calculate_interval.ts
similarity index 100%
rename from src/plugins/vis_type_timelion/common/lib/calculate_interval.ts
rename to src/plugins/vis_types/timelion/common/lib/calculate_interval.ts
diff --git a/src/plugins/vis_type_timelion/common/lib/index.ts b/src/plugins/vis_types/timelion/common/lib/index.ts
similarity index 100%
rename from src/plugins/vis_type_timelion/common/lib/index.ts
rename to src/plugins/vis_types/timelion/common/lib/index.ts
diff --git a/src/plugins/vis_type_timelion/common/lib/to_milliseconds.ts b/src/plugins/vis_types/timelion/common/lib/to_milliseconds.ts
similarity index 100%
rename from src/plugins/vis_type_timelion/common/lib/to_milliseconds.ts
rename to src/plugins/vis_types/timelion/common/lib/to_milliseconds.ts
diff --git a/src/plugins/vis_type_timelion/common/parser.ts b/src/plugins/vis_types/timelion/common/parser.ts
similarity index 96%
rename from src/plugins/vis_type_timelion/common/parser.ts
rename to src/plugins/vis_types/timelion/common/parser.ts
index b6c16a6f7b4ed..dc1bbf1e42440 100644
--- a/src/plugins/vis_type_timelion/common/parser.ts
+++ b/src/plugins/vis_types/timelion/common/parser.ts
@@ -7,7 +7,7 @@
*/
// @ts-ignore
-import { parse } from './_generated_/chain';
+import { parse } from '@kbn/timelion-grammar';
export interface ExpressionLocation {
min: number;
diff --git a/src/plugins/vis_type_timelion/common/parser_async.ts b/src/plugins/vis_types/timelion/common/parser_async.ts
similarity index 100%
rename from src/plugins/vis_type_timelion/common/parser_async.ts
rename to src/plugins/vis_types/timelion/common/parser_async.ts
diff --git a/src/plugins/vis_type_timelion/common/types.ts b/src/plugins/vis_types/timelion/common/types.ts
similarity index 100%
rename from src/plugins/vis_type_timelion/common/types.ts
rename to src/plugins/vis_types/timelion/common/types.ts
diff --git a/src/plugins/vis_type_timelion/common/vis_data.ts b/src/plugins/vis_types/timelion/common/vis_data.ts
similarity index 100%
rename from src/plugins/vis_type_timelion/common/vis_data.ts
rename to src/plugins/vis_types/timelion/common/vis_data.ts
diff --git a/src/plugins/vis_type_timelion/config.ts b/src/plugins/vis_types/timelion/config.ts
similarity index 100%
rename from src/plugins/vis_type_timelion/config.ts
rename to src/plugins/vis_types/timelion/config.ts
diff --git a/src/plugins/vis_type_timelion/jest.config.js b/src/plugins/vis_types/timelion/jest.config.js
similarity index 72%
rename from src/plugins/vis_type_timelion/jest.config.js
rename to src/plugins/vis_types/timelion/jest.config.js
index 5da416935adb9..a6c7d7b3f230f 100644
--- a/src/plugins/vis_type_timelion/jest.config.js
+++ b/src/plugins/vis_types/timelion/jest.config.js
@@ -8,11 +8,11 @@
module.exports = {
preset: '@kbn/test',
- rootDir: '../../..',
- roots: ['/src/plugins/vis_type_timelion'],
- coverageDirectory: '/target/kibana-coverage/jest/src/plugins/vis_type_timelion',
+ rootDir: '../../../..',
+ roots: ['/src/plugins/vis_types/timelion'],
+ coverageDirectory: '/target/kibana-coverage/jest/src/plugins/vis_types/timelion',
coverageReporters: ['text', 'html'],
collectCoverageFrom: [
- '/src/plugins/vis_type_timelion/{common,public,server}/**/*.{js,ts,tsx}',
+ '/src/plugins/vis_types/timelion/{common,public,server}/**/*.{js,ts,tsx}',
],
};
diff --git a/src/plugins/vis_type_timelion/kibana.json b/src/plugins/vis_types/timelion/kibana.json
similarity index 100%
rename from src/plugins/vis_type_timelion/kibana.json
rename to src/plugins/vis_types/timelion/kibana.json
diff --git a/src/plugins/vis_type_timelion/public/__snapshots__/to_ast.test.ts.snap b/src/plugins/vis_types/timelion/public/__snapshots__/to_ast.test.ts.snap
similarity index 100%
rename from src/plugins/vis_type_timelion/public/__snapshots__/to_ast.test.ts.snap
rename to src/plugins/vis_types/timelion/public/__snapshots__/to_ast.test.ts.snap
diff --git a/src/plugins/vis_type_timelion/public/components/index.ts b/src/plugins/vis_types/timelion/public/components/index.ts
similarity index 100%
rename from src/plugins/vis_type_timelion/public/components/index.ts
rename to src/plugins/vis_types/timelion/public/components/index.ts
diff --git a/src/plugins/vis_type_timelion/public/components/series/area.tsx b/src/plugins/vis_types/timelion/public/components/series/area.tsx
similarity index 100%
rename from src/plugins/vis_type_timelion/public/components/series/area.tsx
rename to src/plugins/vis_types/timelion/public/components/series/area.tsx
diff --git a/src/plugins/vis_type_timelion/public/components/series/bar.tsx b/src/plugins/vis_types/timelion/public/components/series/bar.tsx
similarity index 100%
rename from src/plugins/vis_type_timelion/public/components/series/bar.tsx
rename to src/plugins/vis_types/timelion/public/components/series/bar.tsx
diff --git a/src/plugins/vis_type_timelion/public/components/series/index.ts b/src/plugins/vis_types/timelion/public/components/series/index.ts
similarity index 100%
rename from src/plugins/vis_type_timelion/public/components/series/index.ts
rename to src/plugins/vis_types/timelion/public/components/series/index.ts
diff --git a/src/plugins/vis_type_timelion/public/components/timelion_expression_input.tsx b/src/plugins/vis_types/timelion/public/components/timelion_expression_input.tsx
similarity index 98%
rename from src/plugins/vis_type_timelion/public/components/timelion_expression_input.tsx
rename to src/plugins/vis_types/timelion/public/components/timelion_expression_input.tsx
index 569ddf03c941b..dd949f57bce28 100644
--- a/src/plugins/vis_type_timelion/public/components/timelion_expression_input.tsx
+++ b/src/plugins/vis_types/timelion/public/components/timelion_expression_input.tsx
@@ -11,7 +11,7 @@ import { EuiFormLabel } from '@elastic/eui';
import { FormattedMessage } from '@kbn/i18n/react';
import { monaco } from '@kbn/monaco';
-import { CodeEditor, useKibana } from '../../../kibana_react/public';
+import { CodeEditor, useKibana } from '../../../../kibana_react/public';
import { suggest, getSuggestion } from './timelion_expression_input_helpers';
import { getArgValueSuggestions } from '../helpers/arg_value_suggestions';
import { ITimelionFunction, TimelionFunctionArgs } from '../../common/types';
diff --git a/src/plugins/vis_type_timelion/public/components/timelion_expression_input_helpers.test.ts b/src/plugins/vis_types/timelion/public/components/timelion_expression_input_helpers.test.ts
similarity index 100%
rename from src/plugins/vis_type_timelion/public/components/timelion_expression_input_helpers.test.ts
rename to src/plugins/vis_types/timelion/public/components/timelion_expression_input_helpers.test.ts
diff --git a/src/plugins/vis_type_timelion/public/components/timelion_expression_input_helpers.ts b/src/plugins/vis_types/timelion/public/components/timelion_expression_input_helpers.ts
similarity index 100%
rename from src/plugins/vis_type_timelion/public/components/timelion_expression_input_helpers.ts
rename to src/plugins/vis_types/timelion/public/components/timelion_expression_input_helpers.ts
diff --git a/src/plugins/vis_type_timelion/public/components/timelion_interval.tsx b/src/plugins/vis_types/timelion/public/components/timelion_interval.tsx
similarity index 96%
rename from src/plugins/vis_type_timelion/public/components/timelion_interval.tsx
rename to src/plugins/vis_types/timelion/public/components/timelion_interval.tsx
index 047de1bdb0708..fc080ff578bee 100644
--- a/src/plugins/vis_type_timelion/public/components/timelion_interval.tsx
+++ b/src/plugins/vis_types/timelion/public/components/timelion_interval.tsx
@@ -10,9 +10,9 @@ import React, { useMemo, useCallback } from 'react';
import { EuiFormRow, EuiComboBox, EuiComboBoxOptionOption } from '@elastic/eui';
import { i18n } from '@kbn/i18n';
-import { search } from '../../../data/public';
+import { search } from '../../../../data/public';
const { isValidEsInterval } = search.aggs;
-import { useValidation } from '../../../vis_default_editor/public';
+import { useValidation } from '../../../../vis_default_editor/public';
const intervalOptions = [
{
diff --git a/src/plugins/vis_type_timelion/public/components/timelion_vis.scss b/src/plugins/vis_types/timelion/public/components/timelion_vis.scss
similarity index 100%
rename from src/plugins/vis_type_timelion/public/components/timelion_vis.scss
rename to src/plugins/vis_types/timelion/public/components/timelion_vis.scss
diff --git a/src/plugins/vis_type_timelion/public/components/timelion_vis_component.tsx b/src/plugins/vis_types/timelion/public/components/timelion_vis_component.tsx
similarity index 95%
rename from src/plugins/vis_type_timelion/public/components/timelion_vis_component.tsx
rename to src/plugins/vis_types/timelion/public/components/timelion_vis_component.tsx
index 3cc335392b7c4..9a15159b33a1d 100644
--- a/src/plugins/vis_type_timelion/public/components/timelion_vis_component.tsx
+++ b/src/plugins/vis_types/timelion/public/components/timelion_vis_component.tsx
@@ -19,8 +19,8 @@ import {
} from '@elastic/charts';
import { EuiTitle } from '@elastic/eui';
-import { useKibana } from '../../../kibana_react/public';
-import { useActiveCursor } from '../../../charts/public';
+import { useKibana } from '../../../../kibana_react/public';
+import { useActiveCursor } from '../../../../charts/public';
import { AreaSeriesComponent, BarSeriesComponent } from './series';
@@ -36,9 +36,9 @@ import { colors } from '../helpers/chart_constants';
import { getCharts } from '../helpers/plugin_services';
import type { Sheet } from '../helpers/timelion_request_handler';
-import type { IInterpreterRenderHandlers } from '../../../expressions';
+import type { IInterpreterRenderHandlers } from '../../../../expressions';
import type { TimelionVisDependencies } from '../plugin';
-import type { RangeFilterParams } from '../../../data/public';
+import type { RangeFilterParams } from '../../../../data/public';
import type { Series } from '../helpers/timelion_request_handler';
import './timelion_vis.scss';
diff --git a/src/plugins/vis_type_timelion/public/helpers/arg_value_suggestions.ts b/src/plugins/vis_types/timelion/public/helpers/arg_value_suggestions.ts
similarity index 99%
rename from src/plugins/vis_type_timelion/public/helpers/arg_value_suggestions.ts
rename to src/plugins/vis_types/timelion/public/helpers/arg_value_suggestions.ts
index 8685ed3102fa6..b2f60b4092bf7 100644
--- a/src/plugins/vis_type_timelion/public/helpers/arg_value_suggestions.ts
+++ b/src/plugins/vis_types/timelion/public/helpers/arg_value_suggestions.ts
@@ -10,7 +10,7 @@ import { get } from 'lodash';
import { getIndexPatterns } from './plugin_services';
import { TimelionFunctionArgs } from '../../common/types';
import { TimelionExpressionFunction, TimelionExpressionArgument } from '../../common/parser';
-import { indexPatterns as indexPatternsUtils, KBN_FIELD_TYPES } from '../../../data/public';
+import { indexPatterns as indexPatternsUtils, KBN_FIELD_TYPES } from '../../../../data/public';
export function getArgValueSuggestions() {
const indexPatterns = getIndexPatterns();
diff --git a/src/plugins/vis_type_timelion/public/helpers/chart_constants.ts b/src/plugins/vis_types/timelion/public/helpers/chart_constants.ts
similarity index 100%
rename from src/plugins/vis_type_timelion/public/helpers/chart_constants.ts
rename to src/plugins/vis_types/timelion/public/helpers/chart_constants.ts
diff --git a/src/plugins/vis_type_timelion/public/helpers/get_timezone.ts b/src/plugins/vis_types/timelion/public/helpers/get_timezone.ts
similarity index 100%
rename from src/plugins/vis_type_timelion/public/helpers/get_timezone.ts
rename to src/plugins/vis_types/timelion/public/helpers/get_timezone.ts
diff --git a/src/plugins/vis_type_timelion/public/helpers/panel_utils.ts b/src/plugins/vis_types/timelion/public/helpers/panel_utils.ts
similarity index 100%
rename from src/plugins/vis_type_timelion/public/helpers/panel_utils.ts
rename to src/plugins/vis_types/timelion/public/helpers/panel_utils.ts
diff --git a/src/plugins/vis_type_timelion/public/helpers/plugin_services.ts b/src/plugins/vis_types/timelion/public/helpers/plugin_services.ts
similarity index 91%
rename from src/plugins/vis_type_timelion/public/helpers/plugin_services.ts
rename to src/plugins/vis_types/timelion/public/helpers/plugin_services.ts
index 58fcf510ff792..0e9014437b325 100644
--- a/src/plugins/vis_type_timelion/public/helpers/plugin_services.ts
+++ b/src/plugins/vis_types/timelion/public/helpers/plugin_services.ts
@@ -8,7 +8,7 @@
import type { IndexPatternsContract, ISearchStart } from 'src/plugins/data/public';
import type { ChartsPluginStart } from 'src/plugins/charts/public';
-import { createGetterSetter } from '../../../kibana_utils/public';
+import { createGetterSetter } from '../../../../kibana_utils/public';
export const [getIndexPatterns, setIndexPatterns] = createGetterSetter(
'IndexPatterns'
diff --git a/src/plugins/vis_type_timelion/public/helpers/tick_formatters.test.ts b/src/plugins/vis_types/timelion/public/helpers/tick_formatters.test.ts
similarity index 100%
rename from src/plugins/vis_type_timelion/public/helpers/tick_formatters.test.ts
rename to src/plugins/vis_types/timelion/public/helpers/tick_formatters.test.ts
diff --git a/src/plugins/vis_type_timelion/public/helpers/tick_formatters.ts b/src/plugins/vis_types/timelion/public/helpers/tick_formatters.ts
similarity index 100%
rename from src/plugins/vis_type_timelion/public/helpers/tick_formatters.ts
rename to src/plugins/vis_types/timelion/public/helpers/tick_formatters.ts
diff --git a/src/plugins/vis_type_timelion/public/helpers/tick_generator.test.ts b/src/plugins/vis_types/timelion/public/helpers/tick_generator.test.ts
similarity index 100%
rename from src/plugins/vis_type_timelion/public/helpers/tick_generator.test.ts
rename to src/plugins/vis_types/timelion/public/helpers/tick_generator.test.ts
diff --git a/src/plugins/vis_type_timelion/public/helpers/tick_generator.ts b/src/plugins/vis_types/timelion/public/helpers/tick_generator.ts
similarity index 100%
rename from src/plugins/vis_type_timelion/public/helpers/tick_generator.ts
rename to src/plugins/vis_types/timelion/public/helpers/tick_generator.ts
diff --git a/src/plugins/vis_type_timelion/public/helpers/timelion_request_handler.ts b/src/plugins/vis_types/timelion/public/helpers/timelion_request_handler.ts
similarity index 99%
rename from src/plugins/vis_type_timelion/public/helpers/timelion_request_handler.ts
rename to src/plugins/vis_types/timelion/public/helpers/timelion_request_handler.ts
index ffadfde6204de..e44d74cfd72ab 100644
--- a/src/plugins/vis_type_timelion/public/helpers/timelion_request_handler.ts
+++ b/src/plugins/vis_types/timelion/public/helpers/timelion_request_handler.ts
@@ -8,7 +8,7 @@
import { i18n } from '@kbn/i18n';
import type { KibanaExecutionContext } from 'kibana/public';
-import { KibanaContext, TimeRange, Filter, esQuery, Query } from '../../../data/public';
+import { KibanaContext, TimeRange, Filter, esQuery, Query } from '../../../../data/public';
import { TimelionVisDependencies } from '../plugin';
import { getTimezone } from './get_timezone';
import { TimelionVisParams } from '../timelion_vis_fn';
diff --git a/src/plugins/vis_type_timelion/public/helpers/xaxis_formatter.ts b/src/plugins/vis_types/timelion/public/helpers/xaxis_formatter.ts
similarity index 100%
rename from src/plugins/vis_type_timelion/public/helpers/xaxis_formatter.ts
rename to src/plugins/vis_types/timelion/public/helpers/xaxis_formatter.ts
diff --git a/src/plugins/vis_type_timelion/public/index.ts b/src/plugins/vis_types/timelion/public/index.ts
similarity index 100%
rename from src/plugins/vis_type_timelion/public/index.ts
rename to src/plugins/vis_types/timelion/public/index.ts
diff --git a/src/plugins/vis_type_timelion/public/legacy/panel_utils.ts b/src/plugins/vis_types/timelion/public/legacy/panel_utils.ts
similarity index 100%
rename from src/plugins/vis_type_timelion/public/legacy/panel_utils.ts
rename to src/plugins/vis_types/timelion/public/legacy/panel_utils.ts
diff --git a/src/plugins/vis_type_timelion/public/legacy/tick_formatters.test.ts b/src/plugins/vis_types/timelion/public/legacy/tick_formatters.test.ts
similarity index 100%
rename from src/plugins/vis_type_timelion/public/legacy/tick_formatters.test.ts
rename to src/plugins/vis_types/timelion/public/legacy/tick_formatters.test.ts
diff --git a/src/plugins/vis_type_timelion/public/legacy/tick_formatters.ts b/src/plugins/vis_types/timelion/public/legacy/tick_formatters.ts
similarity index 100%
rename from src/plugins/vis_type_timelion/public/legacy/tick_formatters.ts
rename to src/plugins/vis_types/timelion/public/legacy/tick_formatters.ts
diff --git a/src/plugins/vis_type_timelion/public/legacy/timelion_vis.scss b/src/plugins/vis_types/timelion/public/legacy/timelion_vis.scss
similarity index 100%
rename from src/plugins/vis_type_timelion/public/legacy/timelion_vis.scss
rename to src/plugins/vis_types/timelion/public/legacy/timelion_vis.scss
diff --git a/src/plugins/vis_type_timelion/public/legacy/timelion_vis_component.tsx b/src/plugins/vis_types/timelion/public/legacy/timelion_vis_component.tsx
similarity index 98%
rename from src/plugins/vis_type_timelion/public/legacy/timelion_vis_component.tsx
rename to src/plugins/vis_types/timelion/public/legacy/timelion_vis_component.tsx
index ddac86fa73bee..1fdb1b37f1c8b 100644
--- a/src/plugins/vis_type_timelion/public/legacy/timelion_vis_component.tsx
+++ b/src/plugins/vis_types/timelion/public/legacy/timelion_vis_component.tsx
@@ -13,7 +13,7 @@ import { debounce, compact, get, each, cloneDeep, last, map } from 'lodash';
import { useResizeObserver } from '@elastic/eui';
import { IInterpreterRenderHandlers } from 'src/plugins/expressions';
-import { useKibana } from '../../../kibana_react/public';
+import { useKibana } from '../../../../kibana_react/public';
import { DEFAULT_TIME_FORMAT } from '../../common/lib';
import {
@@ -31,7 +31,7 @@ import { tickFormatters } from './tick_formatters';
import { generateTicksProvider } from '../helpers/tick_generator';
import type { TimelionVisDependencies } from '../plugin';
-import type { RangeFilterParams } from '../../../data/common';
+import type { RangeFilterParams } from '../../../../data/common';
import './timelion_vis.scss';
diff --git a/src/plugins/vis_type_timelion/public/plugin.ts b/src/plugins/vis_types/timelion/public/plugin.ts
similarity index 100%
rename from src/plugins/vis_type_timelion/public/plugin.ts
rename to src/plugins/vis_types/timelion/public/plugin.ts
diff --git a/src/plugins/vis_type_timelion/public/timelion_options.scss b/src/plugins/vis_types/timelion/public/timelion_options.scss
similarity index 100%
rename from src/plugins/vis_type_timelion/public/timelion_options.scss
rename to src/plugins/vis_types/timelion/public/timelion_options.scss
diff --git a/src/plugins/vis_type_timelion/public/timelion_options.tsx b/src/plugins/vis_types/timelion/public/timelion_options.tsx
similarity index 96%
rename from src/plugins/vis_type_timelion/public/timelion_options.tsx
rename to src/plugins/vis_types/timelion/public/timelion_options.tsx
index ed22efb38be1c..7879eb88e0bd2 100644
--- a/src/plugins/vis_type_timelion/public/timelion_options.tsx
+++ b/src/plugins/vis_types/timelion/public/timelion_options.tsx
@@ -10,7 +10,7 @@ import React, { useCallback } from 'react';
import { EuiPanel } from '@elastic/eui';
import { VisEditorOptionsProps } from 'src/plugins/visualizations/public';
-import { KibanaContextProvider } from '../../kibana_react/public';
+import { KibanaContextProvider } from '../../../kibana_react/public';
import { TimelionVisParams } from './timelion_vis_fn';
import { TimelionInterval, TimelionExpressionInput } from './components';
diff --git a/src/plugins/vis_type_timelion/public/timelion_vis_fn.ts b/src/plugins/vis_types/timelion/public/timelion_vis_fn.ts
similarity index 96%
rename from src/plugins/vis_type_timelion/public/timelion_vis_fn.ts
rename to src/plugins/vis_types/timelion/public/timelion_vis_fn.ts
index 2f775728667b6..dd3dfd5cd60a0 100644
--- a/src/plugins/vis_type_timelion/public/timelion_vis_fn.ts
+++ b/src/plugins/vis_types/timelion/public/timelion_vis_fn.ts
@@ -15,7 +15,7 @@ import {
} from './helpers/timelion_request_handler';
import { TIMELION_VIS_NAME } from './timelion_vis_type';
import { TimelionVisDependencies } from './plugin';
-import { KibanaContext, Filter, Query, TimeRange } from '../../data/public';
+import { KibanaContext, Filter, Query, TimeRange } from '../../../data/public';
type Input = KibanaContext | null;
type Output = Promise>;
diff --git a/src/plugins/vis_type_timelion/public/timelion_vis_renderer.tsx b/src/plugins/vis_types/timelion/public/timelion_vis_renderer.tsx
similarity index 92%
rename from src/plugins/vis_type_timelion/public/timelion_vis_renderer.tsx
rename to src/plugins/vis_types/timelion/public/timelion_vis_renderer.tsx
index b14055a4d6b63..c74c0f2ee6c2d 100644
--- a/src/plugins/vis_type_timelion/public/timelion_vis_renderer.tsx
+++ b/src/plugins/vis_types/timelion/public/timelion_vis_renderer.tsx
@@ -10,12 +10,12 @@ import React, { lazy } from 'react';
import { render, unmountComponentAtNode } from 'react-dom';
import { ExpressionRenderDefinition } from 'src/plugins/expressions';
-import { KibanaContextProvider } from '../../kibana_react/public';
-import { VisualizationContainer } from '../../visualizations/public';
+import { KibanaContextProvider } from '../../../kibana_react/public';
+import { VisualizationContainer } from '../../../visualizations/public';
import { TimelionVisDependencies } from './plugin';
import { TimelionRenderValue } from './timelion_vis_fn';
import { UI_SETTINGS } from '../common/constants';
-import { RangeFilterParams } from '../../data/public';
+import { RangeFilterParams } from '../../../data/public';
const TimelionVisComponent = lazy(() => import('./components/timelion_vis_component'));
const TimelionVisLegacyComponent = lazy(() => import('./legacy/timelion_vis_component'));
diff --git a/src/plugins/vis_type_timelion/public/timelion_vis_type.tsx b/src/plugins/vis_types/timelion/public/timelion_vis_type.tsx
similarity index 93%
rename from src/plugins/vis_type_timelion/public/timelion_vis_type.tsx
rename to src/plugins/vis_types/timelion/public/timelion_vis_type.tsx
index d607a26485afe..3462ae8df5cd5 100644
--- a/src/plugins/vis_type_timelion/public/timelion_vis_type.tsx
+++ b/src/plugins/vis_types/timelion/public/timelion_vis_type.tsx
@@ -9,7 +9,7 @@
import React, { lazy } from 'react';
import { i18n } from '@kbn/i18n';
-import { DefaultEditorSize } from '../../vis_default_editor/public';
+import { DefaultEditorSize } from '../../../vis_default_editor/public';
import { TimelionOptionsProps } from './timelion_options';
import { TimelionVisDependencies } from './plugin';
import { toExpressionAst } from './to_ast';
@@ -17,7 +17,7 @@ import { getIndexPatterns } from './helpers/plugin_services';
import { parseTimelionExpressionAsync } from '../common/parser_async';
-import { VIS_EVENT_TO_TRIGGER, VisParams } from '../../visualizations/public';
+import { VIS_EVENT_TO_TRIGGER, VisParams } from '../../../visualizations/public';
const TimelionOptions = lazy(() => import('./timelion_options'));
diff --git a/src/plugins/vis_type_timelion/public/to_ast.test.ts b/src/plugins/vis_types/timelion/public/to_ast.test.ts
similarity index 100%
rename from src/plugins/vis_type_timelion/public/to_ast.test.ts
rename to src/plugins/vis_types/timelion/public/to_ast.test.ts
diff --git a/src/plugins/vis_type_timelion/public/to_ast.ts b/src/plugins/vis_types/timelion/public/to_ast.ts
similarity index 91%
rename from src/plugins/vis_type_timelion/public/to_ast.ts
rename to src/plugins/vis_types/timelion/public/to_ast.ts
index c743d9ce78f32..cf0a24a0e3d3e 100644
--- a/src/plugins/vis_type_timelion/public/to_ast.ts
+++ b/src/plugins/vis_types/timelion/public/to_ast.ts
@@ -6,8 +6,8 @@
* Side Public License, v 1.
*/
-import { buildExpression, buildExpressionFunction } from '../../expressions/public';
-import { Vis } from '../../visualizations/public';
+import { buildExpression, buildExpressionFunction } from '../../../expressions/public';
+import { Vis } from '../../../visualizations/public';
import { TimelionExpressionFunctionDefinition, TimelionVisParams } from './timelion_vis_fn';
export const toExpressionAst = (vis: Vis) => {
diff --git a/src/plugins/vis_type_timelion/server/fit_functions/average.js b/src/plugins/vis_types/timelion/server/fit_functions/average.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/fit_functions/average.js
rename to src/plugins/vis_types/timelion/server/fit_functions/average.js
diff --git a/src/plugins/vis_type_timelion/server/fit_functions/average.test.js b/src/plugins/vis_types/timelion/server/fit_functions/average.test.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/fit_functions/average.test.js
rename to src/plugins/vis_types/timelion/server/fit_functions/average.test.js
diff --git a/src/plugins/vis_type_timelion/server/fit_functions/carry.js b/src/plugins/vis_types/timelion/server/fit_functions/carry.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/fit_functions/carry.js
rename to src/plugins/vis_types/timelion/server/fit_functions/carry.js
diff --git a/src/plugins/vis_type_timelion/server/fit_functions/carry.test.js b/src/plugins/vis_types/timelion/server/fit_functions/carry.test.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/fit_functions/carry.test.js
rename to src/plugins/vis_types/timelion/server/fit_functions/carry.test.js
diff --git a/src/plugins/vis_type_timelion/server/fit_functions/nearest.js b/src/plugins/vis_types/timelion/server/fit_functions/nearest.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/fit_functions/nearest.js
rename to src/plugins/vis_types/timelion/server/fit_functions/nearest.js
diff --git a/src/plugins/vis_type_timelion/server/fit_functions/none.js b/src/plugins/vis_types/timelion/server/fit_functions/none.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/fit_functions/none.js
rename to src/plugins/vis_types/timelion/server/fit_functions/none.js
diff --git a/src/plugins/vis_type_timelion/server/fit_functions/scale.js b/src/plugins/vis_types/timelion/server/fit_functions/scale.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/fit_functions/scale.js
rename to src/plugins/vis_types/timelion/server/fit_functions/scale.js
diff --git a/src/plugins/vis_type_timelion/server/handlers/chain_runner.js b/src/plugins/vis_types/timelion/server/handlers/chain_runner.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/handlers/chain_runner.js
rename to src/plugins/vis_types/timelion/server/handlers/chain_runner.js
diff --git a/src/plugins/vis_type_timelion/server/handlers/lib/arg_type.js b/src/plugins/vis_types/timelion/server/handlers/lib/arg_type.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/handlers/lib/arg_type.js
rename to src/plugins/vis_types/timelion/server/handlers/lib/arg_type.js
diff --git a/src/plugins/vis_type_timelion/server/handlers/lib/index_arguments.js b/src/plugins/vis_types/timelion/server/handlers/lib/index_arguments.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/handlers/lib/index_arguments.js
rename to src/plugins/vis_types/timelion/server/handlers/lib/index_arguments.js
diff --git a/src/plugins/vis_type_timelion/server/handlers/lib/parse_sheet.js b/src/plugins/vis_types/timelion/server/handlers/lib/parse_sheet.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/handlers/lib/parse_sheet.js
rename to src/plugins/vis_types/timelion/server/handlers/lib/parse_sheet.js
diff --git a/src/plugins/vis_type_timelion/server/handlers/lib/parse_sheet.test.js b/src/plugins/vis_types/timelion/server/handlers/lib/parse_sheet.test.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/handlers/lib/parse_sheet.test.js
rename to src/plugins/vis_types/timelion/server/handlers/lib/parse_sheet.test.js
diff --git a/src/plugins/vis_type_timelion/server/handlers/lib/preprocess_chain.js b/src/plugins/vis_types/timelion/server/handlers/lib/preprocess_chain.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/handlers/lib/preprocess_chain.js
rename to src/plugins/vis_types/timelion/server/handlers/lib/preprocess_chain.js
diff --git a/src/plugins/vis_type_timelion/server/handlers/lib/reposition_arguments.js b/src/plugins/vis_types/timelion/server/handlers/lib/reposition_arguments.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/handlers/lib/reposition_arguments.js
rename to src/plugins/vis_types/timelion/server/handlers/lib/reposition_arguments.js
diff --git a/src/plugins/vis_type_timelion/server/handlers/lib/tl_config.js b/src/plugins/vis_types/timelion/server/handlers/lib/tl_config.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/handlers/lib/tl_config.js
rename to src/plugins/vis_types/timelion/server/handlers/lib/tl_config.js
diff --git a/src/plugins/vis_type_timelion/server/handlers/lib/validate_arg.js b/src/plugins/vis_types/timelion/server/handlers/lib/validate_arg.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/handlers/lib/validate_arg.js
rename to src/plugins/vis_types/timelion/server/handlers/lib/validate_arg.js
diff --git a/src/plugins/vis_type_timelion/server/handlers/lib/validate_time.js b/src/plugins/vis_types/timelion/server/handlers/lib/validate_time.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/handlers/lib/validate_time.js
rename to src/plugins/vis_types/timelion/server/handlers/lib/validate_time.js
diff --git a/src/plugins/vis_type_timelion/server/index.ts b/src/plugins/vis_types/timelion/server/index.ts
similarity index 95%
rename from src/plugins/vis_type_timelion/server/index.ts
rename to src/plugins/vis_types/timelion/server/index.ts
index 5c5cf8b481f94..396ef8b61c7bc 100644
--- a/src/plugins/vis_type_timelion/server/index.ts
+++ b/src/plugins/vis_types/timelion/server/index.ts
@@ -6,7 +6,7 @@
* Side Public License, v 1.
*/
-import { PluginConfigDescriptor, PluginInitializerContext } from '../../../../src/core/server';
+import { PluginConfigDescriptor, PluginInitializerContext } from '../../../../../src/core/server';
import { configSchema, ConfigSchema } from '../config';
import { TimelionPlugin } from './plugin';
diff --git a/src/plugins/vis_type_timelion/server/lib/alter.js b/src/plugins/vis_types/timelion/server/lib/alter.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/lib/alter.js
rename to src/plugins/vis_types/timelion/server/lib/alter.js
diff --git a/src/plugins/vis_type_timelion/server/lib/as_sorted.js b/src/plugins/vis_types/timelion/server/lib/as_sorted.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/lib/as_sorted.js
rename to src/plugins/vis_types/timelion/server/lib/as_sorted.js
diff --git a/src/plugins/vis_type_timelion/server/lib/build_target.js b/src/plugins/vis_types/timelion/server/lib/build_target.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/lib/build_target.js
rename to src/plugins/vis_types/timelion/server/lib/build_target.js
diff --git a/src/plugins/vis_type_timelion/server/lib/classes/chainable.js b/src/plugins/vis_types/timelion/server/lib/classes/chainable.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/lib/classes/chainable.js
rename to src/plugins/vis_types/timelion/server/lib/classes/chainable.js
diff --git a/src/plugins/vis_type_timelion/server/lib/classes/datasource.js b/src/plugins/vis_types/timelion/server/lib/classes/datasource.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/lib/classes/datasource.js
rename to src/plugins/vis_types/timelion/server/lib/classes/datasource.js
diff --git a/src/plugins/vis_type_timelion/server/lib/classes/timelion_function.d.ts b/src/plugins/vis_types/timelion/server/lib/classes/timelion_function.d.ts
similarity index 100%
rename from src/plugins/vis_type_timelion/server/lib/classes/timelion_function.d.ts
rename to src/plugins/vis_types/timelion/server/lib/classes/timelion_function.d.ts
diff --git a/src/plugins/vis_type_timelion/server/lib/classes/timelion_function.js b/src/plugins/vis_types/timelion/server/lib/classes/timelion_function.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/lib/classes/timelion_function.js
rename to src/plugins/vis_types/timelion/server/lib/classes/timelion_function.js
diff --git a/src/plugins/vis_type_timelion/server/lib/config_manager.ts b/src/plugins/vis_types/timelion/server/lib/config_manager.ts
similarity index 100%
rename from src/plugins/vis_type_timelion/server/lib/config_manager.ts
rename to src/plugins/vis_types/timelion/server/lib/config_manager.ts
diff --git a/src/plugins/vis_type_timelion/server/lib/functions_md.js b/src/plugins/vis_types/timelion/server/lib/functions_md.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/lib/functions_md.js
rename to src/plugins/vis_types/timelion/server/lib/functions_md.js
diff --git a/src/plugins/vis_type_timelion/server/lib/get_namespaced_settings.js b/src/plugins/vis_types/timelion/server/lib/get_namespaced_settings.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/lib/get_namespaced_settings.js
rename to src/plugins/vis_types/timelion/server/lib/get_namespaced_settings.js
diff --git a/src/plugins/vis_type_timelion/server/lib/load_functions.d.ts b/src/plugins/vis_types/timelion/server/lib/load_functions.d.ts
similarity index 100%
rename from src/plugins/vis_type_timelion/server/lib/load_functions.d.ts
rename to src/plugins/vis_types/timelion/server/lib/load_functions.d.ts
diff --git a/src/plugins/vis_type_timelion/server/lib/load_functions.js b/src/plugins/vis_types/timelion/server/lib/load_functions.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/lib/load_functions.js
rename to src/plugins/vis_types/timelion/server/lib/load_functions.js
diff --git a/src/plugins/vis_type_timelion/server/lib/load_functions.test.js b/src/plugins/vis_types/timelion/server/lib/load_functions.test.js
similarity index 92%
rename from src/plugins/vis_type_timelion/server/lib/load_functions.test.js
rename to src/plugins/vis_types/timelion/server/lib/load_functions.test.js
index 0f63c92cc05a8..1508670523733 100644
--- a/src/plugins/vis_type_timelion/server/lib/load_functions.test.js
+++ b/src/plugins/vis_types/timelion/server/lib/load_functions.test.js
@@ -6,7 +6,7 @@
* Side Public License, v 1.
*/
-const fn = require(`src/plugins/vis_type_timelion/server/lib/load_functions`);
+const fn = require(`src/plugins/vis_types/timelion/server/lib/load_functions`);
const expect = require('chai').expect;
diff --git a/src/plugins/vis_type_timelion/server/lib/offset_time.js b/src/plugins/vis_types/timelion/server/lib/offset_time.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/lib/offset_time.js
rename to src/plugins/vis_types/timelion/server/lib/offset_time.js
diff --git a/src/plugins/vis_type_timelion/server/lib/offset_time.test.js b/src/plugins/vis_types/timelion/server/lib/offset_time.test.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/lib/offset_time.test.js
rename to src/plugins/vis_types/timelion/server/lib/offset_time.test.js
diff --git a/src/plugins/vis_type_timelion/server/lib/process_function_definition.js b/src/plugins/vis_types/timelion/server/lib/process_function_definition.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/lib/process_function_definition.js
rename to src/plugins/vis_types/timelion/server/lib/process_function_definition.js
diff --git a/src/plugins/vis_type_timelion/server/lib/reduce.js b/src/plugins/vis_types/timelion/server/lib/reduce.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/lib/reduce.js
rename to src/plugins/vis_types/timelion/server/lib/reduce.js
diff --git a/src/plugins/vis_type_timelion/server/lib/split_interval.js b/src/plugins/vis_types/timelion/server/lib/split_interval.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/lib/split_interval.js
rename to src/plugins/vis_types/timelion/server/lib/split_interval.js
diff --git a/src/plugins/vis_type_timelion/server/lib/unzip_pairs.js b/src/plugins/vis_types/timelion/server/lib/unzip_pairs.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/lib/unzip_pairs.js
rename to src/plugins/vis_types/timelion/server/lib/unzip_pairs.js
diff --git a/src/plugins/vis_type_timelion/server/plugin.ts b/src/plugins/vis_types/timelion/server/plugin.ts
similarity index 94%
rename from src/plugins/vis_type_timelion/server/plugin.ts
rename to src/plugins/vis_types/timelion/server/plugin.ts
index 5bbb5dd1819c4..b44aad5575b19 100644
--- a/src/plugins/vis_type_timelion/server/plugin.ts
+++ b/src/plugins/vis_types/timelion/server/plugin.ts
@@ -9,8 +9,11 @@
import { i18n } from '@kbn/i18n';
import { TypeOf } from '@kbn/config-schema';
-import type { PluginStart, DataRequestHandlerContext } from '../../../../src/plugins/data/server';
-import { CoreSetup, PluginInitializerContext, Plugin } from '../../../../src/core/server';
+import type {
+ PluginStart,
+ DataRequestHandlerContext,
+} from '../../../../../src/plugins/data/server';
+import { CoreSetup, PluginInitializerContext, Plugin } from '../../../../../src/core/server';
import { configSchema } from '../config';
import loadFunctions from './lib/load_functions';
import { functionsRoute } from './routes/functions';
diff --git a/src/plugins/vis_type_timelion/server/routes/functions.ts b/src/plugins/vis_types/timelion/server/routes/functions.ts
similarity index 100%
rename from src/plugins/vis_type_timelion/server/routes/functions.ts
rename to src/plugins/vis_types/timelion/server/routes/functions.ts
diff --git a/src/plugins/vis_type_timelion/server/routes/run.ts b/src/plugins/vis_types/timelion/server/routes/run.ts
similarity index 100%
rename from src/plugins/vis_type_timelion/server/routes/run.ts
rename to src/plugins/vis_types/timelion/server/routes/run.ts
diff --git a/src/plugins/vis_type_timelion/server/routes/validate_es.ts b/src/plugins/vis_types/timelion/server/routes/validate_es.ts
similarity index 96%
rename from src/plugins/vis_type_timelion/server/routes/validate_es.ts
rename to src/plugins/vis_types/timelion/server/routes/validate_es.ts
index 70eacc5ce8518..1e894e09c6e1b 100644
--- a/src/plugins/vis_type_timelion/server/routes/validate_es.ts
+++ b/src/plugins/vis_types/timelion/server/routes/validate_es.ts
@@ -8,7 +8,7 @@
import _ from 'lodash';
import { IRouter } from 'kibana/server';
-import type { DataRequestHandlerContext } from '../../../data/server';
+import type { DataRequestHandlerContext } from '../../../../data/server';
export function validateEsRoute(router: IRouter) {
router.get(
diff --git a/src/plugins/vis_type_timelion/server/series_functions/abs.js b/src/plugins/vis_types/timelion/server/series_functions/abs.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/abs.js
rename to src/plugins/vis_types/timelion/server/series_functions/abs.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/abs.test.js b/src/plugins/vis_types/timelion/server/series_functions/abs.test.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/abs.test.js
rename to src/plugins/vis_types/timelion/server/series_functions/abs.test.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/aggregate/aggregate.test.js b/src/plugins/vis_types/timelion/server/series_functions/aggregate/aggregate.test.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/aggregate/aggregate.test.js
rename to src/plugins/vis_types/timelion/server/series_functions/aggregate/aggregate.test.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/aggregate/avg.js b/src/plugins/vis_types/timelion/server/series_functions/aggregate/avg.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/aggregate/avg.js
rename to src/plugins/vis_types/timelion/server/series_functions/aggregate/avg.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/aggregate/cardinality.js b/src/plugins/vis_types/timelion/server/series_functions/aggregate/cardinality.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/aggregate/cardinality.js
rename to src/plugins/vis_types/timelion/server/series_functions/aggregate/cardinality.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/aggregate/first.js b/src/plugins/vis_types/timelion/server/series_functions/aggregate/first.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/aggregate/first.js
rename to src/plugins/vis_types/timelion/server/series_functions/aggregate/first.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/aggregate/index.js b/src/plugins/vis_types/timelion/server/series_functions/aggregate/index.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/aggregate/index.js
rename to src/plugins/vis_types/timelion/server/series_functions/aggregate/index.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/aggregate/last.js b/src/plugins/vis_types/timelion/server/series_functions/aggregate/last.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/aggregate/last.js
rename to src/plugins/vis_types/timelion/server/series_functions/aggregate/last.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/aggregate/max.js b/src/plugins/vis_types/timelion/server/series_functions/aggregate/max.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/aggregate/max.js
rename to src/plugins/vis_types/timelion/server/series_functions/aggregate/max.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/aggregate/min.js b/src/plugins/vis_types/timelion/server/series_functions/aggregate/min.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/aggregate/min.js
rename to src/plugins/vis_types/timelion/server/series_functions/aggregate/min.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/aggregate/sum.js b/src/plugins/vis_types/timelion/server/series_functions/aggregate/sum.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/aggregate/sum.js
rename to src/plugins/vis_types/timelion/server/series_functions/aggregate/sum.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/bars.js b/src/plugins/vis_types/timelion/server/series_functions/bars.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/bars.js
rename to src/plugins/vis_types/timelion/server/series_functions/bars.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/bars.test.js b/src/plugins/vis_types/timelion/server/series_functions/bars.test.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/bars.test.js
rename to src/plugins/vis_types/timelion/server/series_functions/bars.test.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/color.js b/src/plugins/vis_types/timelion/server/series_functions/color.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/color.js
rename to src/plugins/vis_types/timelion/server/series_functions/color.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/color.test.js b/src/plugins/vis_types/timelion/server/series_functions/color.test.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/color.test.js
rename to src/plugins/vis_types/timelion/server/series_functions/color.test.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/condition.js b/src/plugins/vis_types/timelion/server/series_functions/condition.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/condition.js
rename to src/plugins/vis_types/timelion/server/series_functions/condition.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/condition.test.js b/src/plugins/vis_types/timelion/server/series_functions/condition.test.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/condition.test.js
rename to src/plugins/vis_types/timelion/server/series_functions/condition.test.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/cusum.js b/src/plugins/vis_types/timelion/server/series_functions/cusum.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/cusum.js
rename to src/plugins/vis_types/timelion/server/series_functions/cusum.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/cusum.test.js b/src/plugins/vis_types/timelion/server/series_functions/cusum.test.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/cusum.test.js
rename to src/plugins/vis_types/timelion/server/series_functions/cusum.test.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/derivative.js b/src/plugins/vis_types/timelion/server/series_functions/derivative.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/derivative.js
rename to src/plugins/vis_types/timelion/server/series_functions/derivative.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/derivative.test.js b/src/plugins/vis_types/timelion/server/series_functions/derivative.test.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/derivative.test.js
rename to src/plugins/vis_types/timelion/server/series_functions/derivative.test.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/divide.js b/src/plugins/vis_types/timelion/server/series_functions/divide.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/divide.js
rename to src/plugins/vis_types/timelion/server/series_functions/divide.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/divide.test.js b/src/plugins/vis_types/timelion/server/series_functions/divide.test.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/divide.test.js
rename to src/plugins/vis_types/timelion/server/series_functions/divide.test.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/es/es.test.js b/src/plugins/vis_types/timelion/server/series_functions/es/es.test.js
similarity index 99%
rename from src/plugins/vis_type_timelion/server/series_functions/es/es.test.js
rename to src/plugins/vis_types/timelion/server/series_functions/es/es.test.js
index c2940c6d7731a..f55ee31f39799 100644
--- a/src/plugins/vis_type_timelion/server/series_functions/es/es.test.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/es/es.test.js
@@ -17,7 +17,7 @@ import esResponse from '../fixtures/es_response';
import _ from 'lodash';
import sinon from 'sinon';
import invoke from '../helpers/invoke_series_fn.js';
-import { UI_SETTINGS } from '../../../../data/server';
+import { UI_SETTINGS } from '../../../../../data/server';
describe('es', () => {
let tlConfig;
diff --git a/src/plugins/vis_type_timelion/server/series_functions/es/index.js b/src/plugins/vis_types/timelion/server/series_functions/es/index.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/es/index.js
rename to src/plugins/vis_types/timelion/server/series_functions/es/index.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/es/lib/agg_body.js b/src/plugins/vis_types/timelion/server/series_functions/es/lib/agg_body.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/es/lib/agg_body.js
rename to src/plugins/vis_types/timelion/server/series_functions/es/lib/agg_body.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/es/lib/agg_response_to_series_list.js b/src/plugins/vis_types/timelion/server/series_functions/es/lib/agg_response_to_series_list.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/es/lib/agg_response_to_series_list.js
rename to src/plugins/vis_types/timelion/server/series_functions/es/lib/agg_response_to_series_list.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/es/lib/build_request.js b/src/plugins/vis_types/timelion/server/series_functions/es/lib/build_request.js
similarity index 97%
rename from src/plugins/vis_type_timelion/server/series_functions/es/lib/build_request.js
rename to src/plugins/vis_types/timelion/server/series_functions/es/lib/build_request.js
index 7d55a772c7fc1..20e3f71801854 100644
--- a/src/plugins/vis_type_timelion/server/series_functions/es/lib/build_request.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/es/lib/build_request.js
@@ -10,7 +10,7 @@ import _ from 'lodash';
import moment from 'moment';
import { buildAggBody } from './agg_body';
import createDateAgg from './create_date_agg';
-import { UI_SETTINGS } from '../../../../../data/server';
+import { UI_SETTINGS } from '../../../../../../data/server';
export default function buildRequest(config, tlConfig, scriptFields, runtimeFields, timeout) {
const bool = { must: [] };
diff --git a/src/plugins/vis_type_timelion/server/series_functions/es/lib/create_date_agg.js b/src/plugins/vis_types/timelion/server/series_functions/es/lib/create_date_agg.js
similarity index 97%
rename from src/plugins/vis_type_timelion/server/series_functions/es/lib/create_date_agg.js
rename to src/plugins/vis_types/timelion/server/series_functions/es/lib/create_date_agg.js
index bd6cf8a4b7c5e..e12ad035a2b61 100644
--- a/src/plugins/vis_type_timelion/server/series_functions/es/lib/create_date_agg.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/es/lib/create_date_agg.js
@@ -7,7 +7,7 @@
*/
import { buildAggBody } from './agg_body';
-import { search, METRIC_TYPES } from '../../../../../data/server';
+import { search, METRIC_TYPES } from '../../../../../../data/server';
const { dateHistogramInterval } = search.aggs;
diff --git a/src/plugins/vis_type_timelion/server/series_functions/first.js b/src/plugins/vis_types/timelion/server/series_functions/first.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/first.js
rename to src/plugins/vis_types/timelion/server/series_functions/first.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/first.test.js b/src/plugins/vis_types/timelion/server/series_functions/first.test.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/first.test.js
rename to src/plugins/vis_types/timelion/server/series_functions/first.test.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/fit.js b/src/plugins/vis_types/timelion/server/series_functions/fit.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/fit.js
rename to src/plugins/vis_types/timelion/server/series_functions/fit.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/fit.test.js b/src/plugins/vis_types/timelion/server/series_functions/fit.test.js
similarity index 98%
rename from src/plugins/vis_type_timelion/server/series_functions/fit.test.js
rename to src/plugins/vis_types/timelion/server/series_functions/fit.test.js
index 7e853d4d74e49..b755a3f80e338 100644
--- a/src/plugins/vis_type_timelion/server/series_functions/fit.test.js
+++ b/src/plugins/vis_types/timelion/server/series_functions/fit.test.js
@@ -6,7 +6,7 @@
* Side Public License, v 1.
*/
-const fn = require(`src/plugins/vis_type_timelion/server/series_functions/fit`);
+const fn = require(`src/plugins/vis_types/timelion/server/series_functions/fit`);
import moment from 'moment';
const expect = require('chai').expect;
import invoke from './helpers/invoke_series_fn.js';
diff --git a/src/plugins/vis_type_timelion/server/series_functions/fixtures/bucket_list.js b/src/plugins/vis_types/timelion/server/series_functions/fixtures/bucket_list.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/fixtures/bucket_list.js
rename to src/plugins/vis_types/timelion/server/series_functions/fixtures/bucket_list.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/fixtures/es_response.js b/src/plugins/vis_types/timelion/server/series_functions/fixtures/es_response.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/fixtures/es_response.js
rename to src/plugins/vis_types/timelion/server/series_functions/fixtures/es_response.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/fixtures/series_list.js b/src/plugins/vis_types/timelion/server/series_functions/fixtures/series_list.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/fixtures/series_list.js
rename to src/plugins/vis_types/timelion/server/series_functions/fixtures/series_list.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/fixtures/tl_config.js b/src/plugins/vis_types/timelion/server/series_functions/fixtures/tl_config.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/fixtures/tl_config.js
rename to src/plugins/vis_types/timelion/server/series_functions/fixtures/tl_config.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/graphite.js b/src/plugins/vis_types/timelion/server/series_functions/graphite.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/graphite.js
rename to src/plugins/vis_types/timelion/server/series_functions/graphite.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/graphite.test.js b/src/plugins/vis_types/timelion/server/series_functions/graphite.test.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/graphite.test.js
rename to src/plugins/vis_types/timelion/server/series_functions/graphite.test.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/helpers/get_series.js b/src/plugins/vis_types/timelion/server/series_functions/helpers/get_series.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/helpers/get_series.js
rename to src/plugins/vis_types/timelion/server/series_functions/helpers/get_series.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/helpers/get_series_list.js b/src/plugins/vis_types/timelion/server/series_functions/helpers/get_series_list.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/helpers/get_series_list.js
rename to src/plugins/vis_types/timelion/server/series_functions/helpers/get_series_list.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/helpers/get_single_series_list.js b/src/plugins/vis_types/timelion/server/series_functions/helpers/get_single_series_list.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/helpers/get_single_series_list.js
rename to src/plugins/vis_types/timelion/server/series_functions/helpers/get_single_series_list.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/helpers/invoke_series_fn.js b/src/plugins/vis_types/timelion/server/series_functions/helpers/invoke_series_fn.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/helpers/invoke_series_fn.js
rename to src/plugins/vis_types/timelion/server/series_functions/helpers/invoke_series_fn.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/hide.js b/src/plugins/vis_types/timelion/server/series_functions/hide.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/hide.js
rename to src/plugins/vis_types/timelion/server/series_functions/hide.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/hide.test.js b/src/plugins/vis_types/timelion/server/series_functions/hide.test.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/hide.test.js
rename to src/plugins/vis_types/timelion/server/series_functions/hide.test.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/holt/index.js b/src/plugins/vis_types/timelion/server/series_functions/holt/index.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/holt/index.js
rename to src/plugins/vis_types/timelion/server/series_functions/holt/index.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/holt/lib/des.js b/src/plugins/vis_types/timelion/server/series_functions/holt/lib/des.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/holt/lib/des.js
rename to src/plugins/vis_types/timelion/server/series_functions/holt/lib/des.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/holt/lib/ses.js b/src/plugins/vis_types/timelion/server/series_functions/holt/lib/ses.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/holt/lib/ses.js
rename to src/plugins/vis_types/timelion/server/series_functions/holt/lib/ses.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/holt/lib/tes.js b/src/plugins/vis_types/timelion/server/series_functions/holt/lib/tes.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/holt/lib/tes.js
rename to src/plugins/vis_types/timelion/server/series_functions/holt/lib/tes.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/label.js b/src/plugins/vis_types/timelion/server/series_functions/label.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/label.js
rename to src/plugins/vis_types/timelion/server/series_functions/label.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/label.test.js b/src/plugins/vis_types/timelion/server/series_functions/label.test.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/label.test.js
rename to src/plugins/vis_types/timelion/server/series_functions/label.test.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/legend.js b/src/plugins/vis_types/timelion/server/series_functions/legend.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/legend.js
rename to src/plugins/vis_types/timelion/server/series_functions/legend.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/legend.test.js b/src/plugins/vis_types/timelion/server/series_functions/legend.test.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/legend.test.js
rename to src/plugins/vis_types/timelion/server/series_functions/legend.test.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/lines.js b/src/plugins/vis_types/timelion/server/series_functions/lines.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/lines.js
rename to src/plugins/vis_types/timelion/server/series_functions/lines.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/lines.test.js b/src/plugins/vis_types/timelion/server/series_functions/lines.test.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/lines.test.js
rename to src/plugins/vis_types/timelion/server/series_functions/lines.test.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/log.js b/src/plugins/vis_types/timelion/server/series_functions/log.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/log.js
rename to src/plugins/vis_types/timelion/server/series_functions/log.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/log.test.js b/src/plugins/vis_types/timelion/server/series_functions/log.test.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/log.test.js
rename to src/plugins/vis_types/timelion/server/series_functions/log.test.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/max.js b/src/plugins/vis_types/timelion/server/series_functions/max.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/max.js
rename to src/plugins/vis_types/timelion/server/series_functions/max.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/max.test.js b/src/plugins/vis_types/timelion/server/series_functions/max.test.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/max.test.js
rename to src/plugins/vis_types/timelion/server/series_functions/max.test.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/min.js b/src/plugins/vis_types/timelion/server/series_functions/min.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/min.js
rename to src/plugins/vis_types/timelion/server/series_functions/min.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/min.test.js b/src/plugins/vis_types/timelion/server/series_functions/min.test.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/min.test.js
rename to src/plugins/vis_types/timelion/server/series_functions/min.test.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/movingaverage.js b/src/plugins/vis_types/timelion/server/series_functions/movingaverage.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/movingaverage.js
rename to src/plugins/vis_types/timelion/server/series_functions/movingaverage.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/movingaverage.test.js b/src/plugins/vis_types/timelion/server/series_functions/movingaverage.test.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/movingaverage.test.js
rename to src/plugins/vis_types/timelion/server/series_functions/movingaverage.test.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/movingstd.js b/src/plugins/vis_types/timelion/server/series_functions/movingstd.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/movingstd.js
rename to src/plugins/vis_types/timelion/server/series_functions/movingstd.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/movingstd.test.js b/src/plugins/vis_types/timelion/server/series_functions/movingstd.test.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/movingstd.test.js
rename to src/plugins/vis_types/timelion/server/series_functions/movingstd.test.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/multiply.js b/src/plugins/vis_types/timelion/server/series_functions/multiply.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/multiply.js
rename to src/plugins/vis_types/timelion/server/series_functions/multiply.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/multiply.test.js b/src/plugins/vis_types/timelion/server/series_functions/multiply.test.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/multiply.test.js
rename to src/plugins/vis_types/timelion/server/series_functions/multiply.test.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/points.js b/src/plugins/vis_types/timelion/server/series_functions/points.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/points.js
rename to src/plugins/vis_types/timelion/server/series_functions/points.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/points.test.js b/src/plugins/vis_types/timelion/server/series_functions/points.test.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/points.test.js
rename to src/plugins/vis_types/timelion/server/series_functions/points.test.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/precision.js b/src/plugins/vis_types/timelion/server/series_functions/precision.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/precision.js
rename to src/plugins/vis_types/timelion/server/series_functions/precision.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/precision.test.js b/src/plugins/vis_types/timelion/server/series_functions/precision.test.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/precision.test.js
rename to src/plugins/vis_types/timelion/server/series_functions/precision.test.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/props.js b/src/plugins/vis_types/timelion/server/series_functions/props.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/props.js
rename to src/plugins/vis_types/timelion/server/series_functions/props.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/quandl.js b/src/plugins/vis_types/timelion/server/series_functions/quandl.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/quandl.js
rename to src/plugins/vis_types/timelion/server/series_functions/quandl.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/quandl.test.js b/src/plugins/vis_types/timelion/server/series_functions/quandl.test.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/quandl.test.js
rename to src/plugins/vis_types/timelion/server/series_functions/quandl.test.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/range.js b/src/plugins/vis_types/timelion/server/series_functions/range.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/range.js
rename to src/plugins/vis_types/timelion/server/series_functions/range.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/range.test.js b/src/plugins/vis_types/timelion/server/series_functions/range.test.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/range.test.js
rename to src/plugins/vis_types/timelion/server/series_functions/range.test.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/scale_interval.js b/src/plugins/vis_types/timelion/server/series_functions/scale_interval.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/scale_interval.js
rename to src/plugins/vis_types/timelion/server/series_functions/scale_interval.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/scale_interval.test.js b/src/plugins/vis_types/timelion/server/series_functions/scale_interval.test.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/scale_interval.test.js
rename to src/plugins/vis_types/timelion/server/series_functions/scale_interval.test.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/static.js b/src/plugins/vis_types/timelion/server/series_functions/static.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/static.js
rename to src/plugins/vis_types/timelion/server/series_functions/static.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/static.test.js b/src/plugins/vis_types/timelion/server/series_functions/static.test.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/static.test.js
rename to src/plugins/vis_types/timelion/server/series_functions/static.test.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/subtract.js b/src/plugins/vis_types/timelion/server/series_functions/subtract.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/subtract.js
rename to src/plugins/vis_types/timelion/server/series_functions/subtract.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/subtract.test.js b/src/plugins/vis_types/timelion/server/series_functions/subtract.test.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/subtract.test.js
rename to src/plugins/vis_types/timelion/server/series_functions/subtract.test.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/sum.js b/src/plugins/vis_types/timelion/server/series_functions/sum.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/sum.js
rename to src/plugins/vis_types/timelion/server/series_functions/sum.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/sum.test.js b/src/plugins/vis_types/timelion/server/series_functions/sum.test.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/sum.test.js
rename to src/plugins/vis_types/timelion/server/series_functions/sum.test.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/title.js b/src/plugins/vis_types/timelion/server/series_functions/title.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/title.js
rename to src/plugins/vis_types/timelion/server/series_functions/title.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/title.test.js b/src/plugins/vis_types/timelion/server/series_functions/title.test.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/title.test.js
rename to src/plugins/vis_types/timelion/server/series_functions/title.test.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/trend/index.js b/src/plugins/vis_types/timelion/server/series_functions/trend/index.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/trend/index.js
rename to src/plugins/vis_types/timelion/server/series_functions/trend/index.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/trend/lib/regress.js b/src/plugins/vis_types/timelion/server/series_functions/trend/lib/regress.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/trend/lib/regress.js
rename to src/plugins/vis_types/timelion/server/series_functions/trend/lib/regress.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/trim.js b/src/plugins/vis_types/timelion/server/series_functions/trim.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/trim.js
rename to src/plugins/vis_types/timelion/server/series_functions/trim.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/trim.test.js b/src/plugins/vis_types/timelion/server/series_functions/trim.test.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/trim.test.js
rename to src/plugins/vis_types/timelion/server/series_functions/trim.test.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/worldbank.js b/src/plugins/vis_types/timelion/server/series_functions/worldbank.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/worldbank.js
rename to src/plugins/vis_types/timelion/server/series_functions/worldbank.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/worldbank_indicators.js b/src/plugins/vis_types/timelion/server/series_functions/worldbank_indicators.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/worldbank_indicators.js
rename to src/plugins/vis_types/timelion/server/series_functions/worldbank_indicators.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/yaxis.js b/src/plugins/vis_types/timelion/server/series_functions/yaxis.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/yaxis.js
rename to src/plugins/vis_types/timelion/server/series_functions/yaxis.js
diff --git a/src/plugins/vis_type_timelion/server/series_functions/yaxis.test.js b/src/plugins/vis_types/timelion/server/series_functions/yaxis.test.js
similarity index 100%
rename from src/plugins/vis_type_timelion/server/series_functions/yaxis.test.js
rename to src/plugins/vis_types/timelion/server/series_functions/yaxis.test.js
diff --git a/src/plugins/vis_type_timelion/server/timelion.json b/src/plugins/vis_types/timelion/server/timelion.json
similarity index 100%
rename from src/plugins/vis_type_timelion/server/timelion.json
rename to src/plugins/vis_types/timelion/server/timelion.json
diff --git a/src/plugins/vis_type_timelion/server/types.ts b/src/plugins/vis_types/timelion/server/types.ts
similarity index 100%
rename from src/plugins/vis_type_timelion/server/types.ts
rename to src/plugins/vis_types/timelion/server/types.ts
diff --git a/src/plugins/vis_type_timelion/server/ui_settings.ts b/src/plugins/vis_types/timelion/server/ui_settings.ts
similarity index 100%
rename from src/plugins/vis_type_timelion/server/ui_settings.ts
rename to src/plugins/vis_types/timelion/server/ui_settings.ts
diff --git a/src/plugins/vis_types/timelion/tsconfig.json b/src/plugins/vis_types/timelion/tsconfig.json
new file mode 100644
index 0000000000000..8613f381e5e4f
--- /dev/null
+++ b/src/plugins/vis_types/timelion/tsconfig.json
@@ -0,0 +1,24 @@
+{
+ "extends": "../../../../tsconfig.base.json",
+ "compilerOptions": {
+ "outDir": "./target/types",
+ "emitDeclarationOnly": true,
+ "declaration": true,
+ "declarationMap": true
+ },
+ "include": [
+ "common/**/*",
+ "public/**/*",
+ "server/**/*",
+ "*.ts"
+ ],
+ "references": [
+ { "path": "../../../core/tsconfig.json" },
+ { "path": "../../visualizations/tsconfig.json" },
+ { "path": "../../data/tsconfig.json" },
+ { "path": "../../expressions/tsconfig.json" },
+ { "path": "../../kibana_utils/tsconfig.json" },
+ { "path": "../../kibana_react/tsconfig.json" },
+ { "path": "../../vis_default_editor/tsconfig.json" },
+ ]
+}
diff --git a/tasks/config/peg.js b/tasks/config/peg.js
index 0c299ae5748dd..906767d6db285 100644
--- a/tasks/config/peg.js
+++ b/tasks/config/peg.js
@@ -6,9 +6,4 @@
* Side Public License, v 1.
*/
-module.exports = {
- timelion_chain: {
- src: 'src/plugins/vis_type_timelion/common/chain.peg',
- dest: 'src/plugins/vis_type_timelion/common/_generated_/chain.js',
- },
-};
+module.exports = {};
diff --git a/test/functional/apps/management/_field_formatter.ts b/test/functional/apps/management/_field_formatter.ts
index 65b1f4d324fb1..e070b262af9ed 100644
--- a/test/functional/apps/management/_field_formatter.ts
+++ b/test/functional/apps/management/_field_formatter.ts
@@ -12,7 +12,6 @@ import { FIELD_FORMAT_IDS } from '../../../../src/plugins/field_formats/common';
import { WebElementWrapper } from '../../services/lib/web_element_wrapper';
export default function ({ getService, getPageObjects }: FtrProviderContext) {
- const esArchiver = getService('esArchiver');
const kibanaServer = getService('kibanaServer');
const browser = getService('browser');
const PageObjects = getPageObjects(['settings', 'common']);
@@ -32,13 +31,12 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
'test_field_formatters',
'test_logstash_reader',
]);
- await esArchiver.load('test/functional/fixtures/es_archiver/discover');
+ await kibanaServer.importExport.load('test/functional/fixtures/kbn_archiver/discover');
await kibanaServer.uiSettings.replace({});
});
after(async function afterAll() {
- await PageObjects.settings.navigateTo();
- await esArchiver.emptyKibanaIndex();
+ await kibanaServer.importExport.unload('test/functional/fixtures/kbn_archiver/discover');
});
describe('set and change field formatter', function describeIndexTests() {
diff --git a/test/functional/apps/management/_handle_version_conflict.js b/test/functional/apps/management/_handle_version_conflict.js
index 82723ad7ce967..f73489a5185b5 100644
--- a/test/functional/apps/management/_handle_version_conflict.js
+++ b/test/functional/apps/management/_handle_version_conflict.js
@@ -19,7 +19,7 @@ import expect from '@kbn/expect';
export default function ({ getService, getPageObjects }) {
const testSubjects = getService('testSubjects');
- const esArchiver = getService('esArchiver');
+ const kibanaServer = getService('kibanaServer');
const browser = getService('browser');
const es = getService('es');
const retry = getService('retry');
@@ -30,7 +30,11 @@ export default function ({ getService, getPageObjects }) {
describe('index version conflict', function describeIndexTests() {
before(async function () {
await browser.setWindowSize(1200, 800);
- await esArchiver.load('test/functional/fixtures/es_archiver/discover');
+ await kibanaServer.importExport.load('test/functional/fixtures/kbn_archiver/discover');
+ });
+
+ after(async () => {
+ await kibanaServer.importExport.unload('test/functional/fixtures/kbn_archiver/discover');
});
it('Should be able to surface version conflict notification while creating scripted field', async function () {
diff --git a/test/functional/apps/management/_index_patterns_empty.ts b/test/functional/apps/management/_index_patterns_empty.ts
index 038039275b843..e086a6ca18213 100644
--- a/test/functional/apps/management/_index_patterns_empty.ts
+++ b/test/functional/apps/management/_index_patterns_empty.ts
@@ -32,6 +32,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
path: '/logstash-a',
method: 'DELETE',
});
+ await kibanaServer.savedObjects.clean({ types: ['index-pattern'] });
});
// create index pattern and return to verify list
diff --git a/test/functional/apps/management/_mgmt_import_saved_objects.js b/test/functional/apps/management/_mgmt_import_saved_objects.js
index b7bca79a25940..cf30b6f4ccf0d 100644
--- a/test/functional/apps/management/_mgmt_import_saved_objects.js
+++ b/test/functional/apps/management/_mgmt_import_saved_objects.js
@@ -10,21 +10,21 @@ import expect from '@kbn/expect';
import path from 'path';
export default function ({ getService, getPageObjects }) {
- const esArchiver = getService('esArchiver');
+ const kibanaServer = getService('kibanaServer');
const PageObjects = getPageObjects(['common', 'settings', 'header', 'savedObjects']);
//in 6.4.0 bug the Saved Search conflict would be resolved and get imported but the visualization
//that referenced the saved search was not imported.( https://github.com/elastic/kibana/issues/22238)
describe('mgmt saved objects', function describeIndexTests() {
- beforeEach(async function () {
- await esArchiver.emptyKibanaIndex();
- await esArchiver.load('test/functional/fixtures/es_archiver/discover');
+ before(async () => {
+ await kibanaServer.importExport.load('test/functional/fixtures/kbn_archiver/discover');
await PageObjects.settings.navigateTo();
});
- afterEach(async function () {
- await esArchiver.unload('test/functional/fixtures/es_archiver/discover');
+ after(async () => {
+ await kibanaServer.importExport.unload('test/functional/fixtures/kbn_archiver/discover');
+ await kibanaServer.savedObjects.clean({ types: ['search', 'visualization'] });
});
it('should import saved objects mgmt', async function () {
diff --git a/test/functional/apps/management/_runtime_fields.js b/test/functional/apps/management/_runtime_fields.js
index 745a3f9b079a4..09fa924b0b870 100644
--- a/test/functional/apps/management/_runtime_fields.js
+++ b/test/functional/apps/management/_runtime_fields.js
@@ -9,7 +9,6 @@
import expect from '@kbn/expect';
export default function ({ getService, getPageObjects }) {
- const esArchiver = getService('esArchiver');
const kibanaServer = getService('kibanaServer');
const log = getService('log');
const browser = getService('browser');
@@ -23,16 +22,12 @@ export default function ({ getService, getPageObjects }) {
before(async function () {
await browser.setWindowSize(1200, 800);
- await esArchiver.load('test/functional/fixtures/es_archiver/discover');
- // delete .kibana index and then wait for Kibana to re-create it
+ await kibanaServer.importExport.load('test/functional/fixtures/kbn_archiver/discover');
await kibanaServer.uiSettings.replace({});
- await kibanaServer.uiSettings.update({});
});
after(async function afterAll() {
- await PageObjects.settings.navigateTo();
- await PageObjects.settings.clickKibanaIndexPatterns();
- await PageObjects.settings.removeLogstashIndexPatternIfExist();
+ await kibanaServer.importExport.unload('test/functional/fixtures/kbn_archiver/discover');
});
describe('create runtime field', function describeIndexTests() {
diff --git a/test/functional/apps/management/_scripted_fields.js b/test/functional/apps/management/_scripted_fields.js
index 2ff9e55c59ebb..4aa06f4cd9ad7 100644
--- a/test/functional/apps/management/_scripted_fields.js
+++ b/test/functional/apps/management/_scripted_fields.js
@@ -25,7 +25,6 @@
import expect from '@kbn/expect';
export default function ({ getService, getPageObjects }) {
- const esArchiver = getService('esArchiver');
const kibanaServer = getService('kibanaServer');
const log = getService('log');
const browser = getService('browser');
@@ -46,16 +45,14 @@ export default function ({ getService, getPageObjects }) {
before(async function () {
await browser.setWindowSize(1200, 800);
- await esArchiver.load('test/functional/fixtures/es_archiver/discover');
- // delete .kibana index and then wait for Kibana to re-create it
+ await kibanaServer.importExport.load('test/functional/fixtures/kbn_archiver/discover');
await kibanaServer.uiSettings.replace({});
await kibanaServer.uiSettings.update({ 'doc_table:legacy': true });
});
after(async function afterAll() {
- await PageObjects.settings.navigateTo();
- await PageObjects.settings.clickKibanaIndexPatterns();
- await PageObjects.settings.removeLogstashIndexPatternIfExist();
+ await kibanaServer.importExport.unload('test/functional/fixtures/kbn_archiver/discover');
+ await kibanaServer.uiSettings.replace({});
});
it('should not allow saving of invalid scripts', async function () {
@@ -125,7 +122,7 @@ export default function ({ getService, getPageObjects }) {
'painless',
'number',
null,
- '1',
+ '100',
script
);
await retry.try(async function () {
diff --git a/x-pack/plugins/apm/common/__snapshots__/elasticsearch_fieldnames.test.ts.snap b/x-pack/plugins/apm/common/__snapshots__/elasticsearch_fieldnames.test.ts.snap
index 141d94e2b168f..c4658ae2ac22c 100644
--- a/x-pack/plugins/apm/common/__snapshots__/elasticsearch_fieldnames.test.ts.snap
+++ b/x-pack/plugins/apm/common/__snapshots__/elasticsearch_fieldnames.test.ts.snap
@@ -304,7 +304,7 @@ exports[`Span ERROR_LOG_MESSAGE 1`] = `undefined`;
exports[`Span ERROR_PAGE_URL 1`] = `undefined`;
-exports[`Span EVENT_OUTCOME 1`] = `undefined`;
+exports[`Span EVENT_OUTCOME 1`] = `"unknown"`;
exports[`Span FCP_FIELD 1`] = `undefined`;
@@ -541,7 +541,7 @@ exports[`Transaction ERROR_LOG_MESSAGE 1`] = `undefined`;
exports[`Transaction ERROR_PAGE_URL 1`] = `undefined`;
-exports[`Transaction EVENT_OUTCOME 1`] = `undefined`;
+exports[`Transaction EVENT_OUTCOME 1`] = `"unknown"`;
exports[`Transaction FCP_FIELD 1`] = `undefined`;
diff --git a/x-pack/plugins/apm/common/elasticsearch_fieldnames.test.ts b/x-pack/plugins/apm/common/elasticsearch_fieldnames.test.ts
index 6b24b43e9707d..debf75f79ec7e 100644
--- a/x-pack/plugins/apm/common/elasticsearch_fieldnames.test.ts
+++ b/x-pack/plugins/apm/common/elasticsearch_fieldnames.test.ts
@@ -30,6 +30,7 @@ describe('Transaction', () => {
provider: 'gcp',
region: 'europe-west1',
},
+ event: { outcome: 'unknown' },
http: {
request: { method: 'GET' },
response: { status_code: 200 },
@@ -87,6 +88,7 @@ describe('Span', () => {
provider: 'gcp',
region: 'europe-west1',
},
+ event: { outcome: 'unknown' },
processor: {
name: 'transaction',
event: 'span',
diff --git a/x-pack/plugins/apm/e2e/.gitignore b/x-pack/plugins/apm/e2e/.gitignore
deleted file mode 100644
index 5042f0bca0300..0000000000000
--- a/x-pack/plugins/apm/e2e/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-cypress/screenshots/*
-cypress/test-results
-cypress/videos/*
-/snapshots.js
-tmp
diff --git a/x-pack/plugins/apm/e2e/README.md b/x-pack/plugins/apm/e2e/README.md
deleted file mode 100644
index 3517c74e950c7..0000000000000
--- a/x-pack/plugins/apm/e2e/README.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# End-To-End (e2e) Test for APM UI
-
-**Run E2E tests**
-
-
-```sh
-# In one terminal
-node ./scripts/kibana --no-base-path --dev --no-dev-config --config x-pack/plugins/apm/e2e/ci/kibana.e2e.yml
-# In another terminal
-x-pack/plugins/apm/e2e/run-e2e.sh
-```
-
-Starts kibana, APM Server, Elasticsearch (with sample data) and runs the tests.
-
-If you see errors about not all events being ingested correctly try running `cd kibana/x-pack/plugins/apm/e2e/tmp/apm-integration-testing && docker-compose down -v`
diff --git a/x-pack/plugins/apm/e2e/ci/kibana.e2e.yml b/x-pack/plugins/apm/e2e/ci/kibana.e2e.yml
deleted file mode 100644
index 19f3f7c8978fa..0000000000000
--- a/x-pack/plugins/apm/e2e/ci/kibana.e2e.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-# Kibana
-server.port: 5701
-xpack.security.encryptionKey: 'something_at_least_32_characters'
-csp.strict: false
-logging.verbose: true
-
-# Elasticsearch
-# Started via apm-integration-testing
-# ./scripts/compose.py start master --no-kibana --elasticsearch-port 9201 --apm-server-port 8201
-elasticsearch.hosts: http://localhost:9201
-elasticsearch.username: 'kibana_system_user'
-elasticsearch.password: 'changeme'
-
-# APM index pattern
-apm_oss.indexPattern: apm-*
-
-# APM Indices
-apm_oss.errorIndices: apm-*-error*
-apm_oss.sourcemapIndices: apm-*-sourcemap
-apm_oss.transactionIndices: apm-*-transaction*
-apm_oss.spanIndices: apm-*-span*
-apm_oss.metricsIndices: apm-*-metric*
-apm_oss.onboardingIndices: apm-*-onboarding*
-
-# APM options
-xpack.apm.enabled: true
-xpack.apm.serviceMapEnabled: false
-xpack.apm.autocreateApmIndexPattern: true
-xpack.apm.ui.enabled: true
-xpack.apm.ui.transactionGroupBucketSize: 100
-xpack.apm.ui.maxTraceItems: 1000
diff --git a/x-pack/plugins/apm/e2e/ci/prepare-kibana.sh b/x-pack/plugins/apm/e2e/ci/prepare-kibana.sh
deleted file mode 100755
index 9e6198bcc526d..0000000000000
--- a/x-pack/plugins/apm/e2e/ci/prepare-kibana.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-E2E_DIR=x-pack/plugins/apm/e2e
-echo "1/2 Install dependencies..."
-# shellcheck disable=SC1091
-source src/dev/ci_setup/setup_env.sh true
-yarn kbn bootstrap
-
-echo "2/2 Start Kibana..."
-## Might help to avoid FATAL ERROR: Ineffective mark-compacts near heap limit Allocation failed - JavaScript heap out of memory
-export NODE_OPTIONS="--max-old-space-size=4096"
-nohup node ./scripts/kibana --no-base-path --no-watch --dev --no-dev-config --config ${E2E_DIR}/ci/kibana.e2e.yml > ${E2E_DIR}/kibana.log 2>&1 &
diff --git a/x-pack/plugins/apm/e2e/ci/run-e2e.sh b/x-pack/plugins/apm/e2e/ci/run-e2e.sh
deleted file mode 100755
index c40ab5d646477..0000000000000
--- a/x-pack/plugins/apm/e2e/ci/run-e2e.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-##
-## This is a wrapper to configure the environment with the right tools in the CI
-## and run the e2e steps.
-##
-
-E2E_DIR="${0%/*}/.."
-# shellcheck disable=SC1091
-source src/dev/ci_setup/setup_env.sh true
-set -ex
-"${E2E_DIR}"/run-e2e.sh
diff --git a/x-pack/plugins/apm/e2e/cypress.json b/x-pack/plugins/apm/e2e/cypress.json
deleted file mode 100644
index 19e09e6ad5bbf..0000000000000
--- a/x-pack/plugins/apm/e2e/cypress.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "nodeVersion": "system",
- "baseUrl": "http://localhost:5701",
- "trashAssetsBeforeRuns": false,
- "fileServerFolder": "../",
- "fixturesFolder": "./cypress/fixtures",
- "integrationFolder": "./cypress/integration",
- "pluginsFile": "./cypress/plugins/index.js",
- "screenshotsFolder": "./cypress/screenshots",
- "supportFile": "./cypress/support/index.ts",
- "video": true,
- "videoCompression": false,
- "videosFolder": "./cypress/videos",
- "useRelativeSnapshots": true,
- "reporter": "junit",
- "reporterOptions": {
- "mochaFile": "./cypress/test-results/[hash]-e2e-tests.xml",
- "toConsole": false
- },
- "testFiles": "**/*.{feature,features}",
- "env": {
- "elasticsearch_username": "admin",
- "elasticsearch_password": "changeme"
- },
- "viewportWidth": 1920,
- "viewportHeight": 1080
-}
diff --git a/x-pack/plugins/apm/e2e/cypress/fixtures/example.json b/x-pack/plugins/apm/e2e/cypress/fixtures/example.json
deleted file mode 100644
index da18d9352a17d..0000000000000
--- a/x-pack/plugins/apm/e2e/cypress/fixtures/example.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "name": "Using fixtures to represent data",
- "email": "hello@cypress.io",
- "body": "Fixtures are a great way to mock data for responses to routes"
-}
\ No newline at end of file
diff --git a/x-pack/plugins/apm/e2e/cypress/integration/csm_dashboard.feature b/x-pack/plugins/apm/e2e/cypress/integration/csm_dashboard.feature
deleted file mode 100644
index 0028f40a68d90..0000000000000
--- a/x-pack/plugins/apm/e2e/cypress/integration/csm_dashboard.feature
+++ /dev/null
@@ -1,34 +0,0 @@
-Feature: CSM Dashboard
-
- Scenario: Client metrics
- When a user browses the APM UI application for RUM Data
- Then should have correct client metrics
-
- Scenario: JS Errors
- When a user browses the APM UI application for RUM Data
- Then it displays list of relevant js errors
-
- Scenario: Percentile select
- When the user changes the selected percentile
- Then it displays client metric related to that percentile
-
- Scenario Outline: CSM page filters
- When the user filters by ""
- Then it filters the client metrics ""
- Examples:
- | filterName |
- | OS |
- | Location |
-
- Scenario: Display CSM Data components
- When a user browses the APM UI application for RUM Data
- Then should display percentile for page load chart
- And should display tooltip on hover
-
- Scenario: Search by url filter focus
- When a user clicks inside url search field
- Then it displays top pages in the suggestion popover
-
- Scenario: Search by url filter
- When a user enters a query in url search field
- Then it should filter results based on query
diff --git a/x-pack/plugins/apm/e2e/cypress/integration/helpers.ts b/x-pack/plugins/apm/e2e/cypress/integration/helpers.ts
deleted file mode 100644
index 333f047b72658..0000000000000
--- a/x-pack/plugins/apm/e2e/cypress/integration/helpers.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-const BASE_URL = Cypress.config().baseUrl;
-
-/** The default time in ms to wait for a Cypress command to complete */
-export const DEFAULT_TIMEOUT = 60 * 1000;
-
-export function loginAndWaitForPage(
- url: string,
- dateRange: { to: string; from: string },
- selectedService?: string
-) {
- const username = Cypress.env('elasticsearch_username');
- const password = Cypress.env('elasticsearch_password');
-
- cy.log(`Authenticating via ${username} / ${password}`);
-
- let fullUrl = `${BASE_URL}${url}?rangeFrom=${dateRange.from}&rangeTo=${dateRange.to}`;
-
- if (selectedService) {
- fullUrl += `&serviceName=${selectedService}`;
- }
- cy.visit(fullUrl, { auth: { username, password } });
-
- cy.viewport('macbook-15');
-
- // wait for loading spinner to disappear
- cy.get('#kbn_loading_message', { timeout: DEFAULT_TIMEOUT }).should(
- 'not.exist'
- );
-}
diff --git a/x-pack/plugins/apm/e2e/cypress/integration/snapshots.js b/x-pack/plugins/apm/e2e/cypress/integration/snapshots.js
deleted file mode 100644
index fc390a64de28c..0000000000000
--- a/x-pack/plugins/apm/e2e/cypress/integration/snapshots.js
+++ /dev/null
@@ -1,3 +0,0 @@
-module.exports = {
- "__version": "6.8.0"
-}
diff --git a/x-pack/plugins/apm/e2e/cypress/plugins/index.js b/x-pack/plugins/apm/e2e/cypress/plugins/index.js
deleted file mode 100644
index bec342118ed5b..0000000000000
--- a/x-pack/plugins/apm/e2e/cypress/plugins/index.js
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-// ***********************************************************
-// This example plugins/index.js can be used to load plugins
-//
-// You can change the location of this file or turn off loading
-// the plugins file with the 'pluginsFile' configuration option.
-//
-// You can read more here:
-// https://on.cypress.io/plugins-guide
-// ***********************************************************
-
-// This function is called when a project is opened or re-opened (e.g. due to
-// the project's config changing)
-
-// eslint-disable-next-line import/no-extraneous-dependencies
-const wp = require('@cypress/webpack-preprocessor');
-const fs = require('fs');
-
-module.exports = (on) => {
- const options = {
- webpackOptions: require('../webpack.config.js'),
- };
- on('file:preprocessor', wp(options));
-
- // readFileMaybe
- on('task', {
- // ESLint thinks this is a react component for some reason.
- // eslint-disable-next-line react/function-component-definition
- readFileMaybe(filename) {
- if (fs.existsSync(filename)) {
- return fs.readFileSync(filename, 'utf8');
- }
-
- return null;
- },
- });
-};
diff --git a/x-pack/plugins/apm/e2e/cypress/support/commands.js b/x-pack/plugins/apm/e2e/cypress/support/commands.js
deleted file mode 100644
index 73895fbbec589..0000000000000
--- a/x-pack/plugins/apm/e2e/cypress/support/commands.js
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-// ***********************************************
-// This example commands.js shows you how to
-// create various custom commands and overwrite
-// existing commands.
-//
-// For more comprehensive examples of custom
-// commands please read more here:
-// https://on.cypress.io/custom-commands
-// ***********************************************
-//
-//
-// -- This is a parent command --
-// Cypress.Commands.add("login", (email, password) => { ... })
-//
-//
-// -- This is a child command --
-// Cypress.Commands.add("drag", { prevSubject: 'element'}, (subject, options) => { ... })
-//
-//
-// -- This is a dual command --
-// Cypress.Commands.add("dismiss", { prevSubject: 'optional'}, (subject, options) => { ... })
-//
-//
-// -- This is will overwrite an existing command --
-// Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... })
diff --git a/x-pack/plugins/apm/e2e/cypress/support/index.ts b/x-pack/plugins/apm/e2e/cypress/support/index.ts
deleted file mode 100644
index 020156fb27915..0000000000000
--- a/x-pack/plugins/apm/e2e/cypress/support/index.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-// ***********************************************************
-// This example support/index.js is processed and
-// loaded automatically before your test files.
-//
-// This is a great place to put global configuration and
-// behavior that modifies Cypress.
-//
-// You can change the location of this file or turn off
-// automatically serving support files with the
-// 'supportFile' configuration option.
-//
-// You can read more here:
-// https://on.cypress.io/configuration
-// ***********************************************************
-
-import './commands';
-
-// @ts-expect-error
-import { register } from '@cypress/snapshot';
-
-register();
diff --git a/x-pack/plugins/apm/e2e/cypress/support/step_definitions/csm/breakdown_filter.ts b/x-pack/plugins/apm/e2e/cypress/support/step_definitions/csm/breakdown_filter.ts
deleted file mode 100644
index 5b4934eac1f71..0000000000000
--- a/x-pack/plugins/apm/e2e/cypress/support/step_definitions/csm/breakdown_filter.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { Given, When, Then } from 'cypress-cucumber-preprocessor/steps';
-import { DEFAULT_TIMEOUT } from './csm_dashboard';
-import { waitForLoadingToFinish } from './utils';
-
-/** The default time in ms to wait for a Cypress command to complete */
-
-Given(`a user clicks the page load breakdown filter`, () => {
- waitForLoadingToFinish();
- cy.get('.euiStat__title-isLoading').should('not.exist');
- const breakDownBtn = cy.get(
- '[data-test-subj=pldBreakdownFilter]',
- DEFAULT_TIMEOUT
- );
- breakDownBtn.click();
-});
-
-When(`the user selected the breakdown`, () => {
- cy.get('[id="user_agent.name"]', DEFAULT_TIMEOUT).click();
- // click outside popover to close it
- cy.get('[data-cy=pageLoadDist]').click();
-});
-
-Then(`breakdown series should appear in chart`, () => {
- cy.get('.euiLoadingChart').should('not.exist');
-
- cy.get('[data-cy=pageLoadDist]').within(() => {
- cy.get('button.echLegendItem__label[title=Chrome] ', DEFAULT_TIMEOUT)
- .invoke('text')
- .should('eq', 'Chrome');
-
- cy.get('button.echLegendItem__label', DEFAULT_TIMEOUT).should(
- 'have.text',
- 'ChromeChrome Mobile WebViewSafariFirefoxMobile SafariChrome MobileChrome Mobile iOSOverall'
- );
- });
-});
diff --git a/x-pack/plugins/apm/e2e/cypress/support/step_definitions/csm/client_metrics_helper.ts b/x-pack/plugins/apm/e2e/cypress/support/step_definitions/csm/client_metrics_helper.ts
deleted file mode 100644
index 1ff6ccd423070..0000000000000
--- a/x-pack/plugins/apm/e2e/cypress/support/step_definitions/csm/client_metrics_helper.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { DEFAULT_TIMEOUT } from './csm_dashboard';
-import { waitForLoadingToFinish } from './utils';
-
-/**
- * Verifies the behavior of the client metrics component
- * @param metrics array of three elements
- * @param checkTitleStatus if it's needed to check title elements
- */
-export function verifyClientMetrics(
- metrics: string[],
- checkTitleStatus: boolean
-) {
- const clientMetricsSelector = '[data-cy=client-metrics] .euiStat__title';
-
- waitForLoadingToFinish();
-
- if (checkTitleStatus) {
- cy.get('.euiStat__title', DEFAULT_TIMEOUT).should('be.visible');
- cy.get('.euiSelect-isLoading').should('not.exist');
- }
-
- cy.get('.euiStat__title-isLoading').should('not.exist');
-
- cy.get(clientMetricsSelector).eq(0).should('have.text', metrics[0]);
-
- cy.get(clientMetricsSelector).eq(1).should('have.text', metrics[1]);
-
- cy.get(clientMetricsSelector).eq(2).should('have.text', metrics[2]);
-}
diff --git a/x-pack/plugins/apm/e2e/cypress/support/step_definitions/csm/csm_dashboard.ts b/x-pack/plugins/apm/e2e/cypress/support/step_definitions/csm/csm_dashboard.ts
deleted file mode 100644
index 47154ee214dc4..0000000000000
--- a/x-pack/plugins/apm/e2e/cypress/support/step_definitions/csm/csm_dashboard.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { Given, Then } from 'cypress-cucumber-preprocessor/steps';
-import { loginAndWaitForPage } from '../../../integration/helpers';
-import { verifyClientMetrics } from './client_metrics_helper';
-import { waitForLoadingToFinish } from './utils';
-
-/** The default time in ms to wait for a Cypress command to complete */
-export const DEFAULT_TIMEOUT = { timeout: 60 * 1000 };
-
-Given(`a user browses the APM UI application for RUM Data`, () => {
- // Open UX landing page
- const RANGE_FROM = 'now-24h';
- const RANGE_TO = 'now';
- loginAndWaitForPage(
- `/app/ux`,
- {
- from: RANGE_FROM,
- to: RANGE_TO,
- },
- 'client'
- );
-});
-
-Then(`should have correct client metrics`, () => {
- const metrics = ['80 ms', '4 ms', '76 ms', '55'];
-
- verifyClientMetrics(metrics, true);
-});
-
-Then(`should display percentile for page load chart`, () => {
- const pMarkers = '[data-cy=percentile-markers] span';
-
- cy.get('.euiLoadingChart', DEFAULT_TIMEOUT).should('be.visible');
-
- waitForLoadingToFinish();
-
- cy.get('.euiStat__title-isLoading').should('not.exist');
-
- cy.get(pMarkers).eq(0).should('have.text', '50th');
-
- cy.get(pMarkers).eq(1).should('have.text', '75th');
-
- cy.get(pMarkers).eq(2).should('have.text', '90th');
-
- cy.get(pMarkers).eq(3).should('have.text', '95th');
-});
-
-Then(`should display chart legend`, () => {
- const chartLegend = 'button.echLegendItem__label';
-
- waitForLoadingToFinish();
- cy.get('.euiLoadingChart').should('not.exist');
-
- cy.get('[data-cy=pageLoadDist]').within(() => {
- cy.get(chartLegend, DEFAULT_TIMEOUT).eq(0).should('have.text', 'Overall');
- });
-});
-
-Then(`should display tooltip on hover`, () => {
- cy.get('.euiLoadingChart').should('not.exist');
-
- const pMarkers = '[data-cy=percentile-markers] span.euiToolTipAnchor';
-
- waitForLoadingToFinish();
- cy.get('.euiLoadingChart').should('not.exist');
-
- const marker = cy.get(pMarkers, DEFAULT_TIMEOUT).eq(0);
- marker.invoke('show');
- marker.trigger('mouseover', { force: true });
- cy.get('span[data-cy=percentileTooltipTitle]').should('be.visible');
-});
diff --git a/x-pack/plugins/apm/e2e/cypress/support/step_definitions/csm/csm_filters.ts b/x-pack/plugins/apm/e2e/cypress/support/step_definitions/csm/csm_filters.ts
deleted file mode 100644
index 168976d96ddc7..0000000000000
--- a/x-pack/plugins/apm/e2e/cypress/support/step_definitions/csm/csm_filters.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { When, Then } from 'cypress-cucumber-preprocessor/steps';
-import { DEFAULT_TIMEOUT } from './csm_dashboard';
-import { verifyClientMetrics } from './client_metrics_helper';
-import { waitForLoadingToFinish } from './utils';
-
-When(/^the user filters by "([^"]*)"$/, (filterName) => {
- waitForLoadingToFinish();
- cy.get('.euiStat__title-isLoading').should('not.exist');
-
- cy.get(
- `button[aria-label="expands filter group for ${filterName} filter"]`
- ).click();
-
- cy.get(`.euiPopover__panel-isOpen`, DEFAULT_TIMEOUT).within(() => {
- if (filterName === 'OS') {
- const osItem = cy.get('li.euiSelectableListItem', DEFAULT_TIMEOUT).eq(2);
- osItem.should('have.text', 'Mac OS X24 ');
- osItem.click();
-
- // sometimes click doesn't work as expected so we need to retry here
- osItem.invoke('attr', 'aria-selected').then((val) => {
- if (val === 'false') {
- cy.get('li.euiSelectableListItem', DEFAULT_TIMEOUT).eq(2).click();
- }
- });
- } else {
- const deItem = cy.get('li.euiSelectableListItem', DEFAULT_TIMEOUT).eq(0);
- deItem.should('have.text', 'DE84 ');
- deItem.click();
-
- // sometimes click doesn't work as expected so we need to retry here
- deItem.invoke('attr', 'aria-selected').then((val) => {
- if (val === 'false') {
- cy.get('li.euiSelectableListItem', DEFAULT_TIMEOUT).eq(0).click();
- }
- });
- }
- cy.contains('Apply').click();
- });
-
- cy.get(`.globalFilterLabel__value`, DEFAULT_TIMEOUT).contains(
- filterName === 'OS' ? 'Mac OS X' : 'DE'
- );
-});
-
-Then(/^it filters the client metrics "([^"]*)"$/, (filterName) => {
- waitForLoadingToFinish();
- cy.get('.euiStat__title-isLoading').should('not.exist');
-
- const data =
- filterName === 'OS'
- ? ['82 ms', '5 ms', '77 ms', '8']
- : ['75 ms', '4 ms', '71 ms', '28'];
-
- verifyClientMetrics(data, true);
-
- cy.get('[data-cy=clearFilters]', DEFAULT_TIMEOUT).click();
-});
diff --git a/x-pack/plugins/apm/e2e/cypress/support/step_definitions/csm/js_errors.ts b/x-pack/plugins/apm/e2e/cypress/support/step_definitions/csm/js_errors.ts
deleted file mode 100644
index 6bffb96be7f4a..0000000000000
--- a/x-pack/plugins/apm/e2e/cypress/support/step_definitions/csm/js_errors.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { Then } from 'cypress-cucumber-preprocessor/steps';
-import { DEFAULT_TIMEOUT } from './csm_dashboard';
-import { getDataTestSubj } from './utils';
-
-Then(`it displays list of relevant js errors`, () => {
- cy.get('.euiBasicTable-loading').should('not.exist');
- cy.get('.euiStat__title-isLoading').should('not.exist');
-
- getDataTestSubj('uxJsErrorsTotal').should('have.text', 'Total errors112');
-
- getDataTestSubj('uxJsErrorTable').within(() => {
- cy.get('tr.euiTableRow', DEFAULT_TIMEOUT)
- .eq(0)
- .invoke('text')
- .should('eq', 'Error messageTest CaptureErrorImpacted page loads100.0 %');
- });
-});
diff --git a/x-pack/plugins/apm/e2e/cypress/support/step_definitions/csm/percentile_select.ts b/x-pack/plugins/apm/e2e/cypress/support/step_definitions/csm/percentile_select.ts
deleted file mode 100644
index 22e6210590192..0000000000000
--- a/x-pack/plugins/apm/e2e/cypress/support/step_definitions/csm/percentile_select.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { When, Then } from 'cypress-cucumber-preprocessor/steps';
-import { verifyClientMetrics } from './client_metrics_helper';
-import { getDataTestSubj } from './utils';
-
-When('the user changes the selected percentile', () => {
- getDataTestSubj('uxPercentileSelect').select('95');
-});
-
-Then(`it displays client metric related to that percentile`, () => {
- const metrics = ['165 ms', '14 ms', '151 ms', '55'];
-
- verifyClientMetrics(metrics, false);
-
- getDataTestSubj('uxPercentileSelect').select('50');
-});
diff --git a/x-pack/plugins/apm/e2e/cypress/support/step_definitions/csm/service_name_filter.ts b/x-pack/plugins/apm/e2e/cypress/support/step_definitions/csm/service_name_filter.ts
deleted file mode 100644
index 26c3fade5afaa..0000000000000
--- a/x-pack/plugins/apm/e2e/cypress/support/step_definitions/csm/service_name_filter.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { When, Then } from 'cypress-cucumber-preprocessor/steps';
-import { verifyClientMetrics } from './client_metrics_helper';
-import { DEFAULT_TIMEOUT } from './csm_dashboard';
-import { waitForLoadingToFinish } from './utils';
-
-When('the user changes the selected service name', () => {
- waitForLoadingToFinish();
- cy.get(`[data-cy=serviceNameFilter]`, DEFAULT_TIMEOUT).select('client');
-});
-
-Then(`it displays relevant client metrics`, () => {
- const metrics = ['80 ms', '4 ms', '76 ms', '55'];
-
- verifyClientMetrics(metrics, false);
-});
diff --git a/x-pack/plugins/apm/e2e/cypress/support/step_definitions/csm/url_search_filter.ts b/x-pack/plugins/apm/e2e/cypress/support/step_definitions/csm/url_search_filter.ts
deleted file mode 100644
index a277ff5a9a136..0000000000000
--- a/x-pack/plugins/apm/e2e/cypress/support/step_definitions/csm/url_search_filter.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { When, Then } from 'cypress-cucumber-preprocessor/steps';
-import { DEFAULT_TIMEOUT } from './csm_dashboard';
-import { waitForLoadingToFinish } from './utils';
-
-When(`a user clicks inside url search field`, () => {
- waitForLoadingToFinish();
- cy.get('.euiStat__title-isLoading').should('not.exist');
- cy.get('span[data-cy=csmUrlFilter]', DEFAULT_TIMEOUT).within(() => {
- cy.get('input.euiFieldSearch').click();
- });
-});
-
-Then(`it displays top pages in the suggestion popover`, () => {
- waitForLoadingToFinish();
-
- cy.get('div.euiPopover__panel-isOpen', DEFAULT_TIMEOUT).within(() => {
- const listOfUrls = cy.get('li.euiSelectableListItem');
- listOfUrls.should('have.length', 5);
-
- const actualUrlsText = [
- 'http://opbeans-node:3000/dashboardTotal page views: 17Page load duration: 109 ms (median)',
- 'http://opbeans-node:3000/ordersTotal page views: 14Page load duration: 72 ms (median)',
- ];
-
- cy.get('li.euiSelectableListItem')
- .eq(0)
- .should('have.text', actualUrlsText[0]);
- cy.get('li.euiSelectableListItem')
- .eq(1)
- .should('have.text', actualUrlsText[1]);
- });
-});
-
-When(`a user enters a query in url search field`, () => {
- waitForLoadingToFinish();
-
- cy.get('[data-cy=csmUrlFilter]').within(() => {
- cy.get('input.euiSelectableSearch').type('cus');
- });
-
- waitForLoadingToFinish();
-});
-
-Then(`it should filter results based on query`, () => {
- waitForLoadingToFinish();
-
- cy.get('div.euiPopover__panel-isOpen', DEFAULT_TIMEOUT).within(() => {
- const listOfUrls = cy.get('li.euiSelectableListItem');
- listOfUrls.should('have.length', 1);
-
- const actualUrlsText = [
- 'http://opbeans-node:3000/customersTotal page views: 10Page load duration: 76 ms (median)',
- ];
-
- cy.get('li.euiSelectableListItem')
- .eq(0)
- .should('have.text', actualUrlsText[0]);
- });
-});
diff --git a/x-pack/plugins/apm/e2e/cypress/support/step_definitions/csm/utils.ts b/x-pack/plugins/apm/e2e/cypress/support/step_definitions/csm/utils.ts
deleted file mode 100644
index 962f36978d87b..0000000000000
--- a/x-pack/plugins/apm/e2e/cypress/support/step_definitions/csm/utils.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { DEFAULT_TIMEOUT } from './csm_dashboard';
-
-export function waitForLoadingToFinish() {
- cy.get('[data-test-subj=globalLoadingIndicator-hidden]', DEFAULT_TIMEOUT);
-}
-
-export function getDataTestSubj(dataTestSubj: string) {
- waitForLoadingToFinish();
-
- return cy.get(`[data-test-subj=${dataTestSubj}]`, DEFAULT_TIMEOUT);
-}
diff --git a/x-pack/plugins/apm/e2e/cypress/webpack.config.js b/x-pack/plugins/apm/e2e/cypress/webpack.config.js
deleted file mode 100644
index afeb527cd6b08..0000000000000
--- a/x-pack/plugins/apm/e2e/cypress/webpack.config.js
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-module.exports = {
- resolve: {
- extensions: ['.ts', '.js'],
- symlinks: false,
- },
- node: { fs: 'empty', child_process: 'empty', readline: 'empty' },
- module: {
- rules: [
- {
- test: /\.ts$/,
- exclude: [/node_modules/],
- include: [/e2e\/cypress/],
- use: [
- {
- loader: 'ts-loader',
- },
- ],
- },
- {
- test: /\.feature$/,
- use: [
- {
- loader: 'cypress-cucumber-preprocessor/loader',
- },
- ],
- },
- {
- test: /\.features$/,
- use: [
- {
- loader: 'cypress-cucumber-preprocessor/lib/featuresLoader',
- },
- ],
- },
- ],
- },
-};
diff --git a/x-pack/plugins/apm/e2e/ingest-data/replay.js b/x-pack/plugins/apm/e2e/ingest-data/replay.js
deleted file mode 100644
index 7cda2a8064f7f..0000000000000
--- a/x-pack/plugins/apm/e2e/ingest-data/replay.js
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-/* eslint-disable no-console */
-
-/* eslint-disable import/no-extraneous-dependencies */
-
-/**
- * This script is useful for ingesting previously generated APM data into Elasticsearch via APM Server
- *
- * You can either:
- * 1. Download a static test data file from: https://storage.googleapis.com/apm-ui-e2e-static-data/events.json
- * 2. Or, generate the test data file yourself:
- * git clone https://github.com/elastic/apm-integration-testing.git
- * ./scripts/compose.py start master --no-kibana --with-opbeans-node --apm-server-record
- * docker cp localtesting_8.0.0_apm-server-2:/app/events.json . && cat events.json | wc -l
- *
- *
- *
- * Run the script:
- *
- * node replay.js --server-url --secret-token --events ./events.json
- *
- ************/
-
-const { promisify } = require('util');
-const fs = require('fs');
-const path = require('path');
-const axios = require('axios');
-const readFile = promisify(fs.readFile);
-const pLimit = require('p-limit');
-const pRetry = require('p-retry');
-const { argv } = require('yargs');
-const ora = require('ora');
-const userAgents = require('./user_agents');
-const userIps = require('./rum_ips');
-
-const APM_SERVER_URL = argv.serverUrl;
-const SECRET_TOKEN = argv.secretToken;
-const EVENTS_PATH = argv.events;
-
-if (!APM_SERVER_URL) {
- console.log('`--server-url` is required');
- process.exit(1);
-}
-
-if (!EVENTS_PATH) {
- console.log('`--events` is required');
- process.exit(1);
-}
-
-const requestProgress = {
- succeeded: 0,
- failed: 0,
- total: 0,
-};
-
-const spinner = ora({ text: 'Warming up...', stream: process.stdout });
-
-function incrementSpinnerCount({ success }) {
- success ? requestProgress.succeeded++ : requestProgress.failed++;
- const remaining =
- requestProgress.total -
- (requestProgress.succeeded + requestProgress.failed);
-
- spinner.text = `Remaining: ${remaining}. Succeeded: ${requestProgress.succeeded}. Failed: ${requestProgress.failed}.`;
-}
-let iterIndex = 0;
-
-function setItemMetaAndHeaders(item) {
- const headers = {
- 'content-type': 'application/x-ndjson',
- };
-
- if (SECRET_TOKEN) {
- headers.Authorization = `Bearer ${SECRET_TOKEN}`;
- }
-
- if (item.url === '/intake/v2/rum/events') {
- if (iterIndex === userAgents.length) {
- // set some event agent to opbean
- setRumAgent(item);
- iterIndex = 0;
- }
- headers['User-Agent'] = userAgents[iterIndex];
- headers['X-Forwarded-For'] = userIps[iterIndex];
- iterIndex++;
- }
- return headers;
-}
-
-function setRumAgent(item) {
- if (item.body) {
- item.body = item.body.replace(
- '"name":"client"',
- '"name":"elastic-frontend"'
- );
- }
-}
-
-async function insertItem(item, headers) {
- try {
- const url = `${APM_SERVER_URL}${item.url}`;
-
- await axios({
- method: item.method,
- url,
- headers,
- data: item.body,
- });
- } catch (e) {
- console.error(
- `${e.response ? JSON.stringify(e.response.data) : e.message}`
- );
- throw e;
- }
-}
-
-async function init() {
- const content = await readFile(path.resolve(EVENTS_PATH));
- const items = content
- .toString()
- .split('\n')
- .filter((item) => item)
- .map((item) => JSON.parse(item))
- .filter((item) => {
- return (
- item.url === '/intake/v2/events' || item.url === '/intake/v2/rum/events'
- );
- });
-
- spinner.start();
- requestProgress.total = items.length;
-
- const limit = pLimit(20); // number of concurrent requests
- await Promise.all(
- items.map(async (item) => {
- try {
- const headers = setItemMetaAndHeaders(item);
- // retry 5 times with exponential backoff
- await pRetry(() => limit(() => insertItem(item, headers)), {
- retries: 5,
- });
- incrementSpinnerCount({ success: true });
- } catch (e) {
- incrementSpinnerCount({ success: false });
- }
- })
- );
-}
-
-init()
- .then(() => {
- if (requestProgress.succeeded === requestProgress.total) {
- spinner.succeed(
- `Successfully ingested ${requestProgress.succeeded} of ${requestProgress.total} events`
- );
- process.exit(0);
- } else {
- spinner.fail(
- `Ingested ${requestProgress.succeeded} of ${requestProgress.total} events`
- );
- process.exit(1);
- }
- })
- .catch((e) => {
- console.log('An error occurred:', e);
- process.exit(1);
- });
diff --git a/x-pack/plugins/apm/e2e/ingest-data/rum_ips.js b/x-pack/plugins/apm/e2e/ingest-data/rum_ips.js
deleted file mode 100644
index 43bb01a7a23f5..0000000000000
--- a/x-pack/plugins/apm/e2e/ingest-data/rum_ips.js
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-const IPS = [
- '89.191.86.214', // check24.de
- '167.40.79.24', // canada.ca
- '151.101.130.217', // elastic.co
- '185.143.68.17',
- '151.101.130.217',
- '185.143.68.17',
- '185.143.68.17',
- '151.101.130.217',
- '185.143.68.17',
-];
-
-module.exports = IPS;
diff --git a/x-pack/plugins/apm/e2e/ingest-data/user_agents.js b/x-pack/plugins/apm/e2e/ingest-data/user_agents.js
deleted file mode 100644
index f8829875bc79e..0000000000000
--- a/x-pack/plugins/apm/e2e/ingest-data/user_agents.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-/* eslint-disable no-console */
-
-/* eslint-disable import/no-extraneous-dependencies */
-
-const UserAgents = [
- 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.97 Safari/537.36',
- 'Mozilla/5.0 (Linux; Android 8.0.0; SM-G960F Build/R16NW) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/62.0.3202.84 Mobile Safari/537.36',
- 'Mozilla/5.0 (iPhone; CPU iPhone OS 12_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/69.0.3497.105 Mobile/15E148 Safari/605.1',
- 'Mozilla/5.0 (iPhone; CPU iPhone OS 12_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/12.0 Mobile/15E148 Safari/604.1',
- 'Mozilla/5.0 (Linux; Android 7.0; Pixel C Build/NRD90M; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/52.0.2743.98 Safari/537.36',
- 'Mozilla/5.0 (X11; CrOS x86_64 8172.45.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.64 Safari/537.36',
- 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_2) AppleWebKit/601.3.9 (KHTML, like Gecko) Version/9.0.2 Safari/601.3.9',
- 'Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:15.0) Gecko/20100101 Firefox/15.0.1',
- 'Mozilla/5.0 (CrKey armv7l 1.5.16041) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/31.0.1650.0 Safari/537.36',
-];
-
-module.exports = UserAgents;
diff --git a/x-pack/plugins/apm/e2e/run-e2e.sh b/x-pack/plugins/apm/e2e/run-e2e.sh
deleted file mode 100755
index 1b3afb4823426..0000000000000
--- a/x-pack/plugins/apm/e2e/run-e2e.sh
+++ /dev/null
@@ -1,176 +0,0 @@
-#!/usr/bin/env bash
-
-# variables
-KIBANA_PORT=5701
-ELASTICSEARCH_PORT=9201
-APM_SERVER_PORT=8201
-
-# ensure Docker is running
-docker ps &> /dev/null
-if [ $? -ne 0 ]; then
- echo "⚠️ Please start Docker"
- exit 1
-fi
-
-# formatting
-bold=$(tput bold)
-normal=$(tput sgr0)
-
-# paths
-E2E_DIR="${0%/*}"
-TMP_DIR="tmp"
-APM_IT_DIR="tmp/apm-integration-testing"
-WAIT_ON_BIN="../../../../node_modules/.bin/wait-on"
-CYPRESS_BIN="../../../../node_modules/.bin/cypress"
-
-cd ${E2E_DIR}
-
-KIBANA_VERSION=$(node -p "require('../../../package.json').version")
-
-#
-# Ask user to start Kibana
-##################################################
-echo "" # newline
-echo "${bold}To start Kibana please run the following command:${normal}
-node ./scripts/kibana --no-base-path --dev --no-dev-config --config x-pack/plugins/apm/e2e/ci/kibana.e2e.yml"
-
-#
-# Create tmp folder
-##################################################
-echo "" # newline
-echo "${bold}Temporary folder${normal}"
-echo "Temporary files will be stored in: ${E2E_DIR}${TMP_DIR}"
-mkdir -p ${TMP_DIR}
-
-#
-# apm-integration-testing
-##################################################
-echo "" # newline
-echo "${bold}apm-integration-testing (logs: ${E2E_DIR}${TMP_DIR}/apm-it.log)${normal}"
-
-# pull if folder already exists
-if [ -d ${APM_IT_DIR} ]; then
- echo "Pulling from master..."
- git -C ${APM_IT_DIR} pull &> ${TMP_DIR}/apm-it.log
-
-# clone if folder does not exists
-else
- echo "Cloning repository"
- git clone "https://github.com/elastic/apm-integration-testing.git" ${APM_IT_DIR} &> ${TMP_DIR}/apm-it.log
-fi
-
-# Stop if clone/pull failed
-if [ $? -ne 0 ]; then
- echo "⚠️ Initializing apm-integration-testing failed."
- exit 1
-fi
-
-# Start apm-integration-testing
-echo "Starting docker-compose"
-echo "Using stack version: ${KIBANA_VERSION}"
-${APM_IT_DIR}/scripts/compose.py start $KIBANA_VERSION \
- --no-kibana \
- --elasticsearch-port $ELASTICSEARCH_PORT \
- --apm-server-port=$APM_SERVER_PORT \
- --elasticsearch-heap 4g \
- --apm-server-opt queue.mem.events=8192 \
- --apm-server-opt output.elasticsearch.bulk_max_size=4096 \
- &> ${TMP_DIR}/apm-it.log
-
-# Stop if apm-integration-testing failed to start correctly
-if [ $? -ne 0 ]; then
- echo "⚠️ apm-integration-testing could not be started"
- echo "" # newline
- echo "As a last resort, reset docker with:"
- echo "" # newline
- echo "cd ${E2E_DIR}${APM_IT_DIR} && scripts/compose.py stop && docker system prune --all --force --volumes"
- echo "" # newline
-
- # output logs for excited docker containers
- cd ${APM_IT_DIR} && docker-compose ps --filter "status=exited" -q | xargs -L1 docker logs --tail=10 && cd -
-
- echo "" # newline
- echo "Find the full logs in ${E2E_DIR}${TMP_DIR}/apm-it.log"
- exit 1
-fi
-
-#
-# Static mock data
-##################################################
-echo "" # newline
-echo "${bold}Static mock data (logs: ${E2E_DIR}${TMP_DIR}/ingest-data.log)${normal}"
-
-STATIC_MOCK_FILENAME='2020-06-12.json'
-
-# Download static data if not already done
-if [ ! -e "${TMP_DIR}/${STATIC_MOCK_FILENAME}" ]; then
- echo "Downloading ${STATIC_MOCK_FILENAME}..."
- curl --silent https://storage.googleapis.com/apm-ui-e2e-static-data/${STATIC_MOCK_FILENAME} --output ${TMP_DIR}/${STATIC_MOCK_FILENAME}
-fi
-
-# echo "Deleting existing indices (apm* and .apm*)"
-curl --silent --user admin:changeme -XDELETE "localhost:${ELASTICSEARCH_PORT}/.apm*" > /dev/null
-curl --silent --user admin:changeme -XDELETE "localhost:${ELASTICSEARCH_PORT}/apm*" > /dev/null
-
-# Ingest data into APM Server
-node ingest-data/replay.js --server-url http://localhost:$APM_SERVER_PORT --events ${TMP_DIR}/${STATIC_MOCK_FILENAME} 2>> ${TMP_DIR}/ingest-data.log
-
-# Abort if not all events were ingested correctly
-if [ $? -ne 0 ]; then
- echo "⚠️ Not all events were ingested correctly. This might affect test tests."
- echo "Aborting. Please try again."
- echo "" # newline
- echo "Full logs in ${E2E_DIR}${TMP_DIR}/ingest-data.log:"
-
- # output logs for excited docker containers
- cd ${APM_IT_DIR} && docker-compose ps --filter "status=exited" -q | xargs -L1 docker logs --tail=3 && cd -
-
- # stop docker containers
- cd ${APM_IT_DIR} && ./scripts/compose.py stop > /dev/null && cd -
- exit 1
-fi
-
-# create empty snapshot file if it doesn't exist
-SNAPSHOTS_FILE=cypress/integration/snapshots.js
-if [ ! -f ${SNAPSHOTS_FILE} ]; then
- echo "{}" > ${SNAPSHOTS_FILE}
-fi
-
-#
-# Wait for Kibana to start
-##################################################
-echo "" # newline
-echo "${bold}Waiting for Kibana to start...${normal}"
-echo "Note: you need to start Kibana manually. Find the instructions at the top."
-$WAIT_ON_BIN -i 500 -w 500 http-get://admin:changeme@localhost:$KIBANA_PORT/api/status > /dev/null
-
-## Workaround to wait for the http server running
-## See: https://github.com/elastic/kibana/issues/66326
-if [ -e kibana.log ] ; then
- grep -m 1 "Kibana is now available" <(tail -f -n +1 kibana.log)
- echo "✅ Kibana server running..."
- grep -m 1 "bundles compiled successfully" <(tail -f -n +1 kibana.log)
- echo "✅ Kibana bundles have been compiled..."
-fi
-
-
-echo "✅ Setup completed successfully. Running tests..."
-
-#
-# run cypress tests
-##################################################
-$CYPRESS_BIN run --config pageLoadTimeout=100000,watchForFileChanges=true
-e2e_status=$?
-
-#
-# Run interactively
-##################################################
-echo "${bold}If you want to run the test interactively, run:${normal}"
-echo "" # newline
-echo "cd ${E2E_DIR} && ${CYPRESS_BIN} open --config pageLoadTimeout=100000,watchForFileChanges=true"
-
-# Report the e2e status at the very end
-if [ $e2e_status -ne 0 ]; then
- echo "⚠️ Running tests failed."
- exit 1
-fi
diff --git a/x-pack/plugins/apm/e2e/tsconfig.json b/x-pack/plugins/apm/e2e/tsconfig.json
deleted file mode 100644
index 2560a15df9224..0000000000000
--- a/x-pack/plugins/apm/e2e/tsconfig.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "extends": "../../../../tsconfig.base.json",
- "include": ["**/*"],
- "exclude": ["tmp", "target/**/*"],
- "compilerOptions": {
- "outDir": "target/types",
- "types": ["cypress", "node"]
- }
-}
diff --git a/x-pack/plugins/apm/jest.config.js b/x-pack/plugins/apm/jest.config.js
index 77639cb58d497..4fd2e72776943 100644
--- a/x-pack/plugins/apm/jest.config.js
+++ b/x-pack/plugins/apm/jest.config.js
@@ -12,7 +12,6 @@ module.exports = {
rootDir: path.resolve(__dirname, '../../..'),
roots: ['/x-pack/plugins/apm'],
setupFiles: ['/x-pack/plugins/apm/.storybook/jest_setup.js'],
- testPathIgnorePatterns: ['/x-pack/plugins/apm/e2e/'],
coverageDirectory: '/target/kibana-coverage/jest/x-pack/plugins/apm',
coverageReporters: ['text', 'html'],
collectCoverageFrom: [
diff --git a/x-pack/plugins/apm/public/components/app/RumDashboard/ImpactfulMetrics/JSErrors.tsx b/x-pack/plugins/apm/public/components/app/RumDashboard/ImpactfulMetrics/JSErrors.tsx
index a7b1d99072d26..c8956c091d267 100644
--- a/x-pack/plugins/apm/public/components/app/RumDashboard/ImpactfulMetrics/JSErrors.tsx
+++ b/x-pack/plugins/apm/public/components/app/RumDashboard/ImpactfulMetrics/JSErrors.tsx
@@ -16,9 +16,10 @@ import {
EuiToolTip,
} from '@elastic/eui';
import numeral from '@elastic/numeral';
+import { i18n } from '@kbn/i18n';
import { FormattedMessage } from '@kbn/i18n/react';
import { useUrlParams } from '../../../../context/url_params_context/use_url_params';
-import { useFetcher } from '../../../../hooks/use_fetcher';
+import { FETCH_STATUS, useFetcher } from '../../../../hooks/use_fetcher';
import { I18LABELS } from '../translations';
import { CsmSharedContext } from '../CsmSharedContext';
import { ErrorDetailLink } from '../../../shared/Links/apm/ErrorDetailLink';
@@ -125,14 +126,21 @@ export function JSErrors() {
)
}
description={I18LABELS.totalErrors}
- isLoading={status !== 'success'}
+ isLoading={status === FETCH_STATUS.LOADING}
/>
({
status === FETCH_STATUS.LOADING ? loadingText : noDataText
}
loading={status === FETCH_STATUS.LOADING}
+ error={status === FETCH_STATUS.FAILURE ? errorMessage : ''}
columns={columns}
rowProps={(term) => {
return {
@@ -121,3 +122,8 @@ const noDataText = i18n.translate(
'xpack.apm.correlations.correlationsTable.noDataText',
{ defaultMessage: 'No data' }
);
+
+const errorMessage = i18n.translate(
+ 'xpack.apm.correlations.correlationsTable.errorMessage',
+ { defaultMessage: 'Failed to fetch' }
+);
diff --git a/x-pack/plugins/apm/public/components/app/service_inventory/index.tsx b/x-pack/plugins/apm/public/components/app/service_inventory/index.tsx
index 2cdb808622854..0b505c4f5ade8 100644
--- a/x-pack/plugins/apm/public/components/app/service_inventory/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_inventory/index.tsx
@@ -5,7 +5,12 @@
* 2.0.
*/
-import { EuiFlexGroup, EuiFlexItem, EuiLink } from '@elastic/eui';
+import {
+ EuiFlexGroup,
+ EuiFlexItem,
+ EuiLink,
+ EuiEmptyPrompt,
+} from '@elastic/eui';
import { i18n } from '@kbn/i18n';
import React, { useEffect } from 'react';
import uuid from 'uuid';
@@ -20,7 +25,6 @@ import { useTimeRange } from '../../../hooks/use_time_range';
import { useUpgradeAssistantHref } from '../../shared/Links/kibana';
import { SearchBar } from '../../shared/search_bar';
import { getTimeRangeComparison } from '../../shared/time_comparison/get_time_range_comparison';
-import { NoServicesMessage } from './no_services_message';
import { ServiceList } from './service_list';
import { MLCallout } from './service_list/MLCallout';
@@ -179,6 +183,21 @@ export function ServiceInventory() {
canCreateJob &&
!userHasDismissedCallout;
+ const isLoading = mainStatisticsStatus === FETCH_STATUS.LOADING;
+ const isFailure = mainStatisticsStatus === FETCH_STATUS.FAILURE;
+ const noItemsMessage = (
+
+ {i18n.translate('xpack.apm.servicesTable.notFoundLabel', {
+ defaultMessage: 'No services found',
+ })}
+
+ }
+ titleSize="s"
+ />
+ );
+
return (
<>
diff --git a/x-pack/plugins/apm/public/components/app/service_inventory/no_services_message.test.tsx b/x-pack/plugins/apm/public/components/app/service_inventory/no_services_message.test.tsx
deleted file mode 100644
index 3a3ddcc558679..0000000000000
--- a/x-pack/plugins/apm/public/components/app/service_inventory/no_services_message.test.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { render } from '@testing-library/react';
-import React, { ReactNode } from 'react';
-import { MockApmPluginContextWrapper } from '../../../context/apm_plugin/mock_apm_plugin_context';
-import { FETCH_STATUS } from '../../../hooks/use_fetcher';
-import { NoServicesMessage } from './no_services_message';
-
-function Wrapper({ children }: { children?: ReactNode }) {
- return {children} ;
-}
-
-describe('NoServicesMessage', () => {
- Object.values(FETCH_STATUS).forEach((status) => {
- [true, false].forEach((historicalDataFound) => {
- describe(`when status is ${status}`, () => {
- describe(`when historicalDataFound is ${historicalDataFound}`, () => {
- it('renders', () => {
- expect(() =>
- render(
- {i18n.translate('xpack.apm.servicesTable.notFoundLabel', {
- defaultMessage: 'No services found',
- })}
-
- }
- titleSize="s"
- />
- );
-}
diff --git a/x-pack/plugins/apm/public/components/app/service_inventory/service_list/index.tsx b/x-pack/plugins/apm/public/components/app/service_inventory/service_list/index.tsx
index e085c5794f80a..17dfee35e221b 100644
--- a/x-pack/plugins/apm/public/components/app/service_inventory/service_list/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_inventory/service_list/index.tsx
@@ -214,6 +214,7 @@ interface Props {
comparisonData?: ServicesDetailedStatisticsAPIResponse;
noItemsMessage?: React.ReactNode;
isLoading: boolean;
+ isFailure?: boolean;
}
export function ServiceList({
@@ -221,6 +222,7 @@ export function ServiceList({
noItemsMessage,
comparisonData,
isLoading,
+ isFailure,
}: Props) {
const breakpoints = useBreakpoints();
const displayHealthStatus = items.some((item) => 'healthStatus' in item);
@@ -296,6 +298,7 @@ export function ServiceList({
-
);
};
diff --git a/src/plugins/vis_type_table/README.md b/src/plugins/vis_types/table/README.md
similarity index 100%
rename from src/plugins/vis_type_table/README.md
rename to src/plugins/vis_types/table/README.md
diff --git a/src/plugins/vis_type_table/common/index.ts b/src/plugins/vis_types/table/common/index.ts
similarity index 100%
rename from src/plugins/vis_type_table/common/index.ts
rename to src/plugins/vis_types/table/common/index.ts
diff --git a/src/plugins/vis_type_table/common/types.ts b/src/plugins/vis_types/table/common/types.ts
similarity index 100%
rename from src/plugins/vis_type_table/common/types.ts
rename to src/plugins/vis_types/table/common/types.ts
diff --git a/src/plugins/vis_type_table/config.ts b/src/plugins/vis_types/table/config.ts
similarity index 100%
rename from src/plugins/vis_type_table/config.ts
rename to src/plugins/vis_types/table/config.ts
diff --git a/src/plugins/vis_type_table/jest.config.js b/src/plugins/vis_types/table/jest.config.js
similarity index 74%
rename from src/plugins/vis_type_table/jest.config.js
rename to src/plugins/vis_types/table/jest.config.js
index a5a925eada3f1..cc6c194aa7cb4 100644
--- a/src/plugins/vis_type_table/jest.config.js
+++ b/src/plugins/vis_types/table/jest.config.js
@@ -8,12 +8,12 @@
module.exports = {
preset: '@kbn/test',
- rootDir: '../../..',
- roots: ['
-
- getSliceValue(d, metricColumn)}
+ percentFormatter={(d: number) => percentFormatter.convert(d / 100)}
+ valueGetter={
+ !visParams.labels.show ||
+ visParams.labels.valuesFormat === ValueFormats.VALUE ||
+ !visParams.labels.values
+ ? undefined
+ : 'percent'
+ }
+ valueFormatter={(d: number) =>
+ !visParams.labels.show || !visParams.labels.values
+ ? ''
+ : metricFieldFormatter.convert(d)
+ }
+ layers={layers}
+ config={config}
+ topGroove={!visParams.labels.show ? 0 : undefined}
+ />
+
+
+ )}
+ {
- handleSliceClick(
- args[0][0] as LayerValue[],
- bucketColumns,
- visData,
- splitChartDimension,
- splitChartFormatter
- );
- }}
- legendAction={getLegendActions(
- canFilter,
- getLegendActionEventData(visData),
- handleLegendAction,
- visParams,
- services.actions,
- services.fieldFormats
- )}
- theme={[
- chartTheme,
- {
- legend: {
- labelOptions: {
- maxLines: visParams.truncateLegend ? visParams.maxLegendLines ?? 1 : 0,
+ />
+
+ {
+ handleSliceClick(
+ args[0][0] as LayerValue[],
+ bucketColumns,
+ visData,
+ splitChartDimension,
+ splitChartFormatter
+ );
+ }}
+ legendAction={getLegendActions(
+ canFilter,
+ getLegendActionEventData(visData),
+ handleLegendAction,
+ visParams,
+ services.actions,
+ services.fieldFormats
+ )}
+ theme={[
+ chartTheme,
+ {
+ legend: {
+ labelOptions: {
+ maxLines: visParams.truncateLegend ? visParams.maxLegendLines ?? 1 : 0,
+ },
},
},
- },
- ]}
- baseTheme={chartBaseTheme}
- onRenderChange={onRenderChange}
- />
- getSliceValue(d, metricColumn)}
- percentFormatter={(d: number) => percentFormatter.convert(d / 100)}
- valueGetter={
- !visParams.labels.show ||
- visParams.labels.valuesFormat === ValueFormats.VALUE ||
- !visParams.labels.values
- ? undefined
- : 'percent'
- }
- valueFormatter={(d: number) =>
- !visParams.labels.show || !visParams.labels.values
- ? ''
- : metricFieldFormatter.convert(d)
- }
- layers={layers}
- config={config}
- topGroove={!visParams.labels.show ? 0 : undefined}
- />
-
-
+ ]}
+ baseTheme={chartBaseTheme}
+ onRenderChange={onRenderChange}
+ />
+ {wrapper.prop('button')}
).childAt(0);
- };
-
- it('renders', () => {
- const wrapper = shallow(
-
-
-
- - {i18n.translate('xpack.enterpriseSearch.beta.popover.description', { - defaultMessage: - 'The Kibana interface for Enterprise Search is a beta feature. It is subject to change and is not covered by the same level of support as generally available features. This interface will become the sole management panel for Enterprise Search with the 8.0 release. Until then, the standalone Enterprise Search UI remains available and supported.', - })} -
-{helpText}
{SOURCE_FEATURES_SEARCHABLE}
+{SOURCE_FEATURES_SEARCHABLE_DESCRIPTION}
{SOURCE_FEATURES_SEARCHABLE}
+{SOURCE_FEATURES_SEARCHABLE_DESCRIPTION}
-
@@ -127,25 +134,25 @@ export const SourceFeatures: React.FC
{SOURCE_FEATURES_REMOTE_FEATURE}
+{SOURCE_FEATURES_REMOTE_FEATURE_DESCRIPTION}
{SOURCE_FEATURES_PRIVATE_FEATURE}
+{SOURCE_FEATURES_PRIVATE_FEATURE_DESCRIPTION}
{SOURCE_FEATURES_GLOBAL_ACCESS_PERMISSIONS_FEATURE}
+{SOURCE_FEATURES_GLOBAL_ACCESS_PERMISSIONS_FEATURE_DESCRIPTION}
{CONTENT_SUMMARY_TITLE}
{GROUP_ACCESS_TITLE}
{renderOverview(data)}
+