;
diff --git a/src/plugins/home/server/services/tutorials/lib/tutorial_schema.ts b/src/plugins/home/server/services/tutorials/lib/tutorial_schema.ts
index 32e5483b8b070..bf28212624a4d 100644
--- a/src/plugins/home/server/services/tutorials/lib/tutorial_schema.ts
+++ b/src/plugins/home/server/services/tutorials/lib/tutorial_schema.ts
@@ -110,6 +110,7 @@ export const tutorialSchema = {
.required(),
category: Joi.string().valid(Object.values(TUTORIAL_CATEGORY)).required(),
name: Joi.string().required(),
+ moduleName: Joi.string(),
isBeta: Joi.boolean().default(false),
shortDescription: Joi.string().required(),
euiIconType: Joi.string(), // EUI icon type string, one of https://elastic.github.io/eui/#/icons
diff --git a/src/plugins/home/server/services/tutorials/lib/tutorials_registry_types.ts b/src/plugins/home/server/services/tutorials/lib/tutorials_registry_types.ts
index 210d563696667..a6b70cd70c02d 100644
--- a/src/plugins/home/server/services/tutorials/lib/tutorials_registry_types.ts
+++ b/src/plugins/home/server/services/tutorials/lib/tutorials_registry_types.ts
@@ -80,6 +80,7 @@ export interface TutorialSchema {
id: string;
category: TutorialsCategory;
name: string;
+ moduleName?: string;
isBeta?: boolean;
shortDescription: string;
euiIconType?: IconType; // EUI icon type string, one of https://elastic.github.io/eui/#/display/icons;
diff --git a/src/plugins/home/server/services/tutorials/tutorials_registry.test.ts b/src/plugins/home/server/services/tutorials/tutorials_registry.test.ts
index 8144fef2d92e4..b91a265da7d18 100644
--- a/src/plugins/home/server/services/tutorials/tutorials_registry.test.ts
+++ b/src/plugins/home/server/services/tutorials/tutorials_registry.test.ts
@@ -54,6 +54,7 @@ const VALID_TUTORIAL: TutorialSchema = {
id: 'test',
category: 'logging' as TutorialsCategory,
name: 'new tutorial provider',
+ moduleName: 'test',
isBeta: false,
shortDescription: 'short description',
euiIconType: 'alert',
diff --git a/src/plugins/home/server/tutorials/activemq_logs/index.ts b/src/plugins/home/server/tutorials/activemq_logs/index.ts
index e85100996d4a1..c11c070637ae1 100644
--- a/src/plugins/home/server/tutorials/activemq_logs/index.ts
+++ b/src/plugins/home/server/tutorials/activemq_logs/index.ts
@@ -37,6 +37,7 @@ export function activemqLogsSpecProvider(context: TutorialContext): TutorialSche
name: i18n.translate('home.tutorials.activemqLogs.nameTitle', {
defaultMessage: 'ActiveMQ logs',
}),
+ moduleName,
category: TutorialsCategory.LOGGING,
shortDescription: i18n.translate('home.tutorials.activemqLogs.shortDescription', {
defaultMessage: 'Collect ActiveMQ logs with Filebeat.',
diff --git a/src/plugins/home/server/tutorials/activemq_metrics/index.ts b/src/plugins/home/server/tutorials/activemq_metrics/index.ts
index 088c5db4c6137..e00ffb4773bea 100644
--- a/src/plugins/home/server/tutorials/activemq_metrics/index.ts
+++ b/src/plugins/home/server/tutorials/activemq_metrics/index.ts
@@ -36,6 +36,7 @@ export function activemqMetricsSpecProvider(context: TutorialContext): TutorialS
name: i18n.translate('home.tutorials.activemqMetrics.nameTitle', {
defaultMessage: 'ActiveMQ metrics',
}),
+ moduleName,
category: TutorialsCategory.METRICS,
shortDescription: i18n.translate('home.tutorials.activemqMetrics.shortDescription', {
defaultMessage: 'Fetch monitoring metrics from ActiveMQ instances.',
diff --git a/src/plugins/home/server/tutorials/aerospike_metrics/index.ts b/src/plugins/home/server/tutorials/aerospike_metrics/index.ts
index 58ab2dcf0986f..c65022c1875c4 100644
--- a/src/plugins/home/server/tutorials/aerospike_metrics/index.ts
+++ b/src/plugins/home/server/tutorials/aerospike_metrics/index.ts
@@ -36,6 +36,7 @@ export function aerospikeMetricsSpecProvider(context: TutorialContext): Tutorial
name: i18n.translate('home.tutorials.aerospikeMetrics.nameTitle', {
defaultMessage: 'Aerospike metrics',
}),
+ moduleName,
isBeta: false,
category: TutorialsCategory.METRICS,
shortDescription: i18n.translate('home.tutorials.aerospikeMetrics.shortDescription', {
diff --git a/src/plugins/home/server/tutorials/apache_logs/index.ts b/src/plugins/home/server/tutorials/apache_logs/index.ts
index 434f0b0b83f98..94fa9ad1258ec 100644
--- a/src/plugins/home/server/tutorials/apache_logs/index.ts
+++ b/src/plugins/home/server/tutorials/apache_logs/index.ts
@@ -37,6 +37,7 @@ export function apacheLogsSpecProvider(context: TutorialContext): TutorialSchema
name: i18n.translate('home.tutorials.apacheLogs.nameTitle', {
defaultMessage: 'Apache logs',
}),
+ moduleName,
category: TutorialsCategory.LOGGING,
shortDescription: i18n.translate('home.tutorials.apacheLogs.shortDescription', {
defaultMessage: 'Collect and parse access and error logs created by the Apache HTTP server.',
diff --git a/src/plugins/home/server/tutorials/apache_metrics/index.ts b/src/plugins/home/server/tutorials/apache_metrics/index.ts
index 1521c9820c400..91de90b9f6c6b 100644
--- a/src/plugins/home/server/tutorials/apache_metrics/index.ts
+++ b/src/plugins/home/server/tutorials/apache_metrics/index.ts
@@ -36,6 +36,7 @@ export function apacheMetricsSpecProvider(context: TutorialContext): TutorialSch
name: i18n.translate('home.tutorials.apacheMetrics.nameTitle', {
defaultMessage: 'Apache metrics',
}),
+ moduleName,
category: TutorialsCategory.METRICS,
shortDescription: i18n.translate('home.tutorials.apacheMetrics.shortDescription', {
defaultMessage: 'Fetch internal metrics from the Apache 2 HTTP server.',
diff --git a/src/plugins/home/server/tutorials/auditbeat/index.ts b/src/plugins/home/server/tutorials/auditbeat/index.ts
index 214fda5a7cc53..44a97bfce6cef 100644
--- a/src/plugins/home/server/tutorials/auditbeat/index.ts
+++ b/src/plugins/home/server/tutorials/auditbeat/index.ts
@@ -31,11 +31,13 @@ import {
export function auditbeatSpecProvider(context: TutorialContext): TutorialSchema {
const platforms = ['OSX', 'DEB', 'RPM', 'WINDOWS'] as const;
+ const moduleName = 'auditbeat';
return {
id: 'auditbeat',
name: i18n.translate('home.tutorials.auditbeat.nameTitle', {
defaultMessage: 'Auditbeat',
}),
+ moduleName,
category: TutorialsCategory.SECURITY_SOLUTION,
shortDescription: i18n.translate('home.tutorials.auditbeat.shortDescription', {
defaultMessage: 'Collect audit data from your hosts.',
diff --git a/src/plugins/home/server/tutorials/aws_logs/index.ts b/src/plugins/home/server/tutorials/aws_logs/index.ts
index 2fa22fa2c2d70..b875d93952c7a 100644
--- a/src/plugins/home/server/tutorials/aws_logs/index.ts
+++ b/src/plugins/home/server/tutorials/aws_logs/index.ts
@@ -37,6 +37,7 @@ export function awsLogsSpecProvider(context: TutorialContext): TutorialSchema {
name: i18n.translate('home.tutorials.awsLogs.nameTitle', {
defaultMessage: 'AWS S3 based logs',
}),
+ moduleName,
category: TutorialsCategory.LOGGING,
shortDescription: i18n.translate('home.tutorials.awsLogs.shortDescription', {
defaultMessage: 'Collect AWS logs from S3 bucket with Filebeat.',
diff --git a/src/plugins/home/server/tutorials/aws_metrics/index.ts b/src/plugins/home/server/tutorials/aws_metrics/index.ts
index c52620e150b5f..549e98280bef2 100644
--- a/src/plugins/home/server/tutorials/aws_metrics/index.ts
+++ b/src/plugins/home/server/tutorials/aws_metrics/index.ts
@@ -36,6 +36,7 @@ export function awsMetricsSpecProvider(context: TutorialContext): TutorialSchema
name: i18n.translate('home.tutorials.awsMetrics.nameTitle', {
defaultMessage: 'AWS metrics',
}),
+ moduleName,
category: TutorialsCategory.METRICS,
shortDescription: i18n.translate('home.tutorials.awsMetrics.shortDescription', {
defaultMessage:
diff --git a/src/plugins/home/server/tutorials/azure_logs/index.ts b/src/plugins/home/server/tutorials/azure_logs/index.ts
index 06aef411775f1..3624bea96b465 100644
--- a/src/plugins/home/server/tutorials/azure_logs/index.ts
+++ b/src/plugins/home/server/tutorials/azure_logs/index.ts
@@ -37,6 +37,7 @@ export function azureLogsSpecProvider(context: TutorialContext): TutorialSchema
name: i18n.translate('home.tutorials.azureLogs.nameTitle', {
defaultMessage: 'Azure logs',
}),
+ moduleName,
isBeta: true,
category: TutorialsCategory.LOGGING,
shortDescription: i18n.translate('home.tutorials.azureLogs.shortDescription', {
diff --git a/src/plugins/home/server/tutorials/azure_metrics/index.ts b/src/plugins/home/server/tutorials/azure_metrics/index.ts
index c11b3ac0139ba..ac92d70fc64f5 100644
--- a/src/plugins/home/server/tutorials/azure_metrics/index.ts
+++ b/src/plugins/home/server/tutorials/azure_metrics/index.ts
@@ -36,6 +36,7 @@ export function azureMetricsSpecProvider(context: TutorialContext): TutorialSche
name: i18n.translate('home.tutorials.azureMetrics.nameTitle', {
defaultMessage: 'Azure metrics',
}),
+ moduleName,
isBeta: false,
category: TutorialsCategory.METRICS,
shortDescription: i18n.translate('home.tutorials.azureMetrics.shortDescription', {
diff --git a/src/plugins/home/server/tutorials/ceph_metrics/index.ts b/src/plugins/home/server/tutorials/ceph_metrics/index.ts
index 968a0a3f66b0a..71e540454bc3a 100644
--- a/src/plugins/home/server/tutorials/ceph_metrics/index.ts
+++ b/src/plugins/home/server/tutorials/ceph_metrics/index.ts
@@ -36,6 +36,7 @@ export function cephMetricsSpecProvider(context: TutorialContext): TutorialSchem
name: i18n.translate('home.tutorials.cephMetrics.nameTitle', {
defaultMessage: 'Ceph metrics',
}),
+ moduleName,
isBeta: false,
category: TutorialsCategory.METRICS,
shortDescription: i18n.translate('home.tutorials.cephMetrics.shortDescription', {
diff --git a/src/plugins/home/server/tutorials/cisco_logs/index.ts b/src/plugins/home/server/tutorials/cisco_logs/index.ts
index 2322f503b80ce..b771744a069c3 100644
--- a/src/plugins/home/server/tutorials/cisco_logs/index.ts
+++ b/src/plugins/home/server/tutorials/cisco_logs/index.ts
@@ -37,6 +37,7 @@ export function ciscoLogsSpecProvider(context: TutorialContext): TutorialSchema
name: i18n.translate('home.tutorials.ciscoLogs.nameTitle', {
defaultMessage: 'Cisco',
}),
+ moduleName,
category: TutorialsCategory.SECURITY_SOLUTION,
shortDescription: i18n.translate('home.tutorials.ciscoLogs.shortDescription', {
defaultMessage: 'Collect and parse logs received from Cisco ASA firewalls.',
diff --git a/src/plugins/home/server/tutorials/cloudwatch_logs/index.ts b/src/plugins/home/server/tutorials/cloudwatch_logs/index.ts
index 9d33d9bf786d0..fb7b07c5dc1af 100644
--- a/src/plugins/home/server/tutorials/cloudwatch_logs/index.ts
+++ b/src/plugins/home/server/tutorials/cloudwatch_logs/index.ts
@@ -30,11 +30,13 @@ import {
} from '../../services/tutorials/lib/tutorials_registry_types';
export function cloudwatchLogsSpecProvider(context: TutorialContext): TutorialSchema {
+ const moduleName = 'aws';
return {
id: 'cloudwatchLogs',
name: i18n.translate('home.tutorials.cloudwatchLogs.nameTitle', {
defaultMessage: 'AWS Cloudwatch logs',
}),
+ moduleName,
category: TutorialsCategory.LOGGING,
shortDescription: i18n.translate('home.tutorials.cloudwatchLogs.shortDescription', {
defaultMessage: 'Collect Cloudwatch logs with Functionbeat.',
diff --git a/src/plugins/home/server/tutorials/cockroachdb_metrics/index.ts b/src/plugins/home/server/tutorials/cockroachdb_metrics/index.ts
index 96c02f24e347a..1cb318c83bd34 100644
--- a/src/plugins/home/server/tutorials/cockroachdb_metrics/index.ts
+++ b/src/plugins/home/server/tutorials/cockroachdb_metrics/index.ts
@@ -36,6 +36,7 @@ export function cockroachdbMetricsSpecProvider(context: TutorialContext): Tutori
name: i18n.translate('home.tutorials.cockroachdbMetrics.nameTitle', {
defaultMessage: 'CockroachDB metrics',
}),
+ moduleName,
category: TutorialsCategory.METRICS,
shortDescription: i18n.translate('home.tutorials.cockroachdbMetrics.shortDescription', {
defaultMessage: 'Fetch monitoring metrics from the CockroachDB server.',
diff --git a/src/plugins/home/server/tutorials/consul_metrics/index.ts b/src/plugins/home/server/tutorials/consul_metrics/index.ts
index 8bf4333cb018f..e389db502a769 100644
--- a/src/plugins/home/server/tutorials/consul_metrics/index.ts
+++ b/src/plugins/home/server/tutorials/consul_metrics/index.ts
@@ -36,6 +36,7 @@ export function consulMetricsSpecProvider(context: TutorialContext): TutorialSch
name: i18n.translate('home.tutorials.consulMetrics.nameTitle', {
defaultMessage: 'Consul metrics',
}),
+ moduleName,
category: TutorialsCategory.METRICS,
shortDescription: i18n.translate('home.tutorials.consulMetrics.shortDescription', {
defaultMessage: 'Fetch monitoring metrics from the Consul server.',
diff --git a/src/plugins/home/server/tutorials/coredns_logs/index.ts b/src/plugins/home/server/tutorials/coredns_logs/index.ts
index 4304fb7acb907..7fc8a2402d216 100644
--- a/src/plugins/home/server/tutorials/coredns_logs/index.ts
+++ b/src/plugins/home/server/tutorials/coredns_logs/index.ts
@@ -37,6 +37,7 @@ export function corednsLogsSpecProvider(context: TutorialContext): TutorialSchem
name: i18n.translate('home.tutorials.corednsLogs.nameTitle', {
defaultMessage: 'CoreDNS logs',
}),
+ moduleName,
category: TutorialsCategory.SECURITY_SOLUTION,
shortDescription: i18n.translate('home.tutorials.corednsLogs.shortDescription', {
defaultMessage: 'Collect the logs created by Coredns.',
diff --git a/src/plugins/home/server/tutorials/coredns_metrics/index.ts b/src/plugins/home/server/tutorials/coredns_metrics/index.ts
index 44bd0cb3999f6..c6589715ba9ce 100644
--- a/src/plugins/home/server/tutorials/coredns_metrics/index.ts
+++ b/src/plugins/home/server/tutorials/coredns_metrics/index.ts
@@ -36,6 +36,7 @@ export function corednsMetricsSpecProvider(context: TutorialContext): TutorialSc
name: i18n.translate('home.tutorials.corednsMetrics.nameTitle', {
defaultMessage: 'CoreDNS metrics',
}),
+ moduleName,
category: TutorialsCategory.METRICS,
shortDescription: i18n.translate('home.tutorials.corednsMetrics.shortDescription', {
defaultMessage: 'Fetch monitoring metrics from the CoreDNS server.',
diff --git a/src/plugins/home/server/tutorials/couchbase_metrics/index.ts b/src/plugins/home/server/tutorials/couchbase_metrics/index.ts
index efd59029c9c50..370541c9324d8 100644
--- a/src/plugins/home/server/tutorials/couchbase_metrics/index.ts
+++ b/src/plugins/home/server/tutorials/couchbase_metrics/index.ts
@@ -36,6 +36,7 @@ export function couchbaseMetricsSpecProvider(context: TutorialContext): Tutorial
name: i18n.translate('home.tutorials.couchbaseMetrics.nameTitle', {
defaultMessage: 'Couchbase metrics',
}),
+ moduleName,
isBeta: false,
category: TutorialsCategory.METRICS,
shortDescription: i18n.translate('home.tutorials.couchbaseMetrics.shortDescription', {
diff --git a/src/plugins/home/server/tutorials/couchdb_metrics/index.ts b/src/plugins/home/server/tutorials/couchdb_metrics/index.ts
index 1fbaa44817226..8d70fcf2a6cd7 100644
--- a/src/plugins/home/server/tutorials/couchdb_metrics/index.ts
+++ b/src/plugins/home/server/tutorials/couchdb_metrics/index.ts
@@ -36,6 +36,7 @@ export function couchdbMetricsSpecProvider(context: TutorialContext): TutorialSc
name: i18n.translate('home.tutorials.couchdbMetrics.nameTitle', {
defaultMessage: 'CouchDB metrics',
}),
+ moduleName,
category: TutorialsCategory.METRICS,
shortDescription: i18n.translate('home.tutorials.couchdbMetrics.shortDescription', {
defaultMessage: 'Fetch monitoring metrics from the CouchdB server.',
diff --git a/src/plugins/home/server/tutorials/docker_metrics/index.ts b/src/plugins/home/server/tutorials/docker_metrics/index.ts
index 8c603697c4713..2e0c3ccb642dd 100644
--- a/src/plugins/home/server/tutorials/docker_metrics/index.ts
+++ b/src/plugins/home/server/tutorials/docker_metrics/index.ts
@@ -36,6 +36,7 @@ export function dockerMetricsSpecProvider(context: TutorialContext): TutorialSch
name: i18n.translate('home.tutorials.dockerMetrics.nameTitle', {
defaultMessage: 'Docker metrics',
}),
+ moduleName,
category: TutorialsCategory.METRICS,
shortDescription: i18n.translate('home.tutorials.dockerMetrics.shortDescription', {
defaultMessage: 'Fetch metrics about your Docker containers.',
diff --git a/src/plugins/home/server/tutorials/dropwizard_metrics/index.ts b/src/plugins/home/server/tutorials/dropwizard_metrics/index.ts
index 008a7a9b3a697..d74db4b2ad958 100644
--- a/src/plugins/home/server/tutorials/dropwizard_metrics/index.ts
+++ b/src/plugins/home/server/tutorials/dropwizard_metrics/index.ts
@@ -36,6 +36,7 @@ export function dropwizardMetricsSpecProvider(context: TutorialContext): Tutoria
name: i18n.translate('home.tutorials.dropwizardMetrics.nameTitle', {
defaultMessage: 'Dropwizard metrics',
}),
+ moduleName,
isBeta: false,
category: TutorialsCategory.METRICS,
shortDescription: i18n.translate('home.tutorials.dropwizardMetrics.shortDescription', {
diff --git a/src/plugins/home/server/tutorials/elasticsearch_logs/index.ts b/src/plugins/home/server/tutorials/elasticsearch_logs/index.ts
index 515b06ea82a5e..f6c280d29f67f 100644
--- a/src/plugins/home/server/tutorials/elasticsearch_logs/index.ts
+++ b/src/plugins/home/server/tutorials/elasticsearch_logs/index.ts
@@ -37,6 +37,7 @@ export function elasticsearchLogsSpecProvider(context: TutorialContext): Tutoria
name: i18n.translate('home.tutorials.elasticsearchLogs.nameTitle', {
defaultMessage: 'Elasticsearch logs',
}),
+ moduleName,
category: TutorialsCategory.LOGGING,
isBeta: true,
shortDescription: i18n.translate('home.tutorials.elasticsearchLogs.shortDescription', {
diff --git a/src/plugins/home/server/tutorials/elasticsearch_metrics/index.ts b/src/plugins/home/server/tutorials/elasticsearch_metrics/index.ts
index ea6dcf86d23e2..38713056e0640 100644
--- a/src/plugins/home/server/tutorials/elasticsearch_metrics/index.ts
+++ b/src/plugins/home/server/tutorials/elasticsearch_metrics/index.ts
@@ -36,6 +36,7 @@ export function elasticsearchMetricsSpecProvider(context: TutorialContext): Tuto
name: i18n.translate('home.tutorials.elasticsearchMetrics.nameTitle', {
defaultMessage: 'Elasticsearch metrics',
}),
+ moduleName,
isBeta: false,
category: TutorialsCategory.METRICS,
shortDescription: i18n.translate('home.tutorials.elasticsearchMetrics.shortDescription', {
diff --git a/src/plugins/home/server/tutorials/envoyproxy_logs/index.ts b/src/plugins/home/server/tutorials/envoyproxy_logs/index.ts
index a9b9c33d61bdf..0cf032e6b90c1 100644
--- a/src/plugins/home/server/tutorials/envoyproxy_logs/index.ts
+++ b/src/plugins/home/server/tutorials/envoyproxy_logs/index.ts
@@ -37,6 +37,7 @@ export function envoyproxyLogsSpecProvider(context: TutorialContext): TutorialSc
name: i18n.translate('home.tutorials.envoyproxyLogs.nameTitle', {
defaultMessage: 'Envoyproxy',
}),
+ moduleName,
category: TutorialsCategory.SECURITY_SOLUTION,
shortDescription: i18n.translate('home.tutorials.envoyproxyLogs.shortDescription', {
defaultMessage: 'Collect and parse logs received from the Envoy proxy.',
diff --git a/src/plugins/home/server/tutorials/envoyproxy_metrics/index.ts b/src/plugins/home/server/tutorials/envoyproxy_metrics/index.ts
index adc7a494200c1..9b453370fb802 100644
--- a/src/plugins/home/server/tutorials/envoyproxy_metrics/index.ts
+++ b/src/plugins/home/server/tutorials/envoyproxy_metrics/index.ts
@@ -36,6 +36,7 @@ export function envoyproxyMetricsSpecProvider(context: TutorialContext): Tutoria
name: i18n.translate('home.tutorials.envoyproxyMetrics.nameTitle', {
defaultMessage: 'Envoy Proxy metrics',
}),
+ moduleName,
category: TutorialsCategory.METRICS,
shortDescription: i18n.translate('home.tutorials.envoyproxyMetrics.shortDescription', {
defaultMessage: 'Fetch monitoring metrics from Envoy Proxy.',
diff --git a/src/plugins/home/server/tutorials/etcd_metrics/index.ts b/src/plugins/home/server/tutorials/etcd_metrics/index.ts
index 2956473b6643b..48bdba5abb4b3 100644
--- a/src/plugins/home/server/tutorials/etcd_metrics/index.ts
+++ b/src/plugins/home/server/tutorials/etcd_metrics/index.ts
@@ -36,6 +36,7 @@ export function etcdMetricsSpecProvider(context: TutorialContext): TutorialSchem
name: i18n.translate('home.tutorials.etcdMetrics.nameTitle', {
defaultMessage: 'Etcd metrics',
}),
+ moduleName,
isBeta: false,
category: TutorialsCategory.METRICS,
shortDescription: i18n.translate('home.tutorials.etcdMetrics.shortDescription', {
diff --git a/src/plugins/home/server/tutorials/golang_metrics/index.ts b/src/plugins/home/server/tutorials/golang_metrics/index.ts
index c53f8b2bba281..e5ecbb9eb583b 100644
--- a/src/plugins/home/server/tutorials/golang_metrics/index.ts
+++ b/src/plugins/home/server/tutorials/golang_metrics/index.ts
@@ -36,6 +36,7 @@ export function golangMetricsSpecProvider(context: TutorialContext): TutorialSch
name: i18n.translate('home.tutorials.golangMetrics.nameTitle', {
defaultMessage: 'Golang metrics',
}),
+ moduleName,
isBeta: true,
category: TutorialsCategory.METRICS,
shortDescription: i18n.translate('home.tutorials.golangMetrics.shortDescription', {
diff --git a/src/plugins/home/server/tutorials/googlecloud_metrics/index.ts b/src/plugins/home/server/tutorials/googlecloud_metrics/index.ts
index 504ede04c12d8..42dc0720c10e0 100644
--- a/src/plugins/home/server/tutorials/googlecloud_metrics/index.ts
+++ b/src/plugins/home/server/tutorials/googlecloud_metrics/index.ts
@@ -36,6 +36,7 @@ export function googlecloudMetricsSpecProvider(context: TutorialContext): Tutori
name: i18n.translate('home.tutorials.googlecloudMetrics.nameTitle', {
defaultMessage: 'Google Cloud metrics',
}),
+ moduleName,
category: TutorialsCategory.METRICS,
shortDescription: i18n.translate('home.tutorials.googlecloudMetrics.shortDescription', {
defaultMessage:
diff --git a/src/plugins/home/server/tutorials/haproxy_metrics/index.ts b/src/plugins/home/server/tutorials/haproxy_metrics/index.ts
index f06dfaa93063c..49e2ec4390db9 100644
--- a/src/plugins/home/server/tutorials/haproxy_metrics/index.ts
+++ b/src/plugins/home/server/tutorials/haproxy_metrics/index.ts
@@ -36,6 +36,7 @@ export function haproxyMetricsSpecProvider(context: TutorialContext): TutorialSc
name: i18n.translate('home.tutorials.haproxyMetrics.nameTitle', {
defaultMessage: 'HAProxy metrics',
}),
+ moduleName,
isBeta: false,
category: TutorialsCategory.METRICS,
shortDescription: i18n.translate('home.tutorials.haproxyMetrics.shortDescription', {
diff --git a/src/plugins/home/server/tutorials/ibmmq_logs/index.ts b/src/plugins/home/server/tutorials/ibmmq_logs/index.ts
index 5739c03954def..8f67b88c3fcf2 100644
--- a/src/plugins/home/server/tutorials/ibmmq_logs/index.ts
+++ b/src/plugins/home/server/tutorials/ibmmq_logs/index.ts
@@ -37,6 +37,7 @@ export function ibmmqLogsSpecProvider(context: TutorialContext): TutorialSchema
name: i18n.translate('home.tutorials.ibmmqLogs.nameTitle', {
defaultMessage: 'IBM MQ logs',
}),
+ moduleName,
category: TutorialsCategory.LOGGING,
shortDescription: i18n.translate('home.tutorials.ibmmqLogs.shortDescription', {
defaultMessage: 'Collect IBM MQ logs with Filebeat.',
diff --git a/src/plugins/home/server/tutorials/ibmmq_metrics/index.ts b/src/plugins/home/server/tutorials/ibmmq_metrics/index.ts
index 4f20b2d0684fc..dc941233b0233 100644
--- a/src/plugins/home/server/tutorials/ibmmq_metrics/index.ts
+++ b/src/plugins/home/server/tutorials/ibmmq_metrics/index.ts
@@ -36,6 +36,7 @@ export function ibmmqMetricsSpecProvider(context: TutorialContext): TutorialSche
name: i18n.translate('home.tutorials.ibmmqMetrics.nameTitle', {
defaultMessage: 'IBM MQ metrics',
}),
+ moduleName,
category: TutorialsCategory.METRICS,
shortDescription: i18n.translate('home.tutorials.ibmmqMetrics.shortDescription', {
defaultMessage: 'Fetch monitoring metrics from IBM MQ instances.',
diff --git a/src/plugins/home/server/tutorials/iis_logs/index.ts b/src/plugins/home/server/tutorials/iis_logs/index.ts
index fee8d036db757..12411fc792e64 100644
--- a/src/plugins/home/server/tutorials/iis_logs/index.ts
+++ b/src/plugins/home/server/tutorials/iis_logs/index.ts
@@ -37,6 +37,7 @@ export function iisLogsSpecProvider(context: TutorialContext): TutorialSchema {
name: i18n.translate('home.tutorials.iisLogs.nameTitle', {
defaultMessage: 'IIS logs',
}),
+ moduleName,
category: TutorialsCategory.LOGGING,
shortDescription: i18n.translate('home.tutorials.iisLogs.shortDescription', {
defaultMessage: 'Collect and parse access and error logs created by the IIS HTTP server.',
diff --git a/src/plugins/home/server/tutorials/iis_metrics/index.ts b/src/plugins/home/server/tutorials/iis_metrics/index.ts
index 46621677a67ce..d6dc5a2e33704 100644
--- a/src/plugins/home/server/tutorials/iis_metrics/index.ts
+++ b/src/plugins/home/server/tutorials/iis_metrics/index.ts
@@ -36,6 +36,7 @@ export function iisMetricsSpecProvider(context: TutorialContext): TutorialSchema
name: i18n.translate('home.tutorials.iisMetrics.nameTitle', {
defaultMessage: 'IIS Metrics',
}),
+ moduleName,
category: TutorialsCategory.METRICS,
shortDescription: i18n.translate('home.tutorials.iisMetrics.shortDescription', {
defaultMessage: 'Collect IIS server related metrics.',
diff --git a/src/plugins/home/server/tutorials/iptables_logs/index.ts b/src/plugins/home/server/tutorials/iptables_logs/index.ts
index fd84894dae850..b3be133767447 100644
--- a/src/plugins/home/server/tutorials/iptables_logs/index.ts
+++ b/src/plugins/home/server/tutorials/iptables_logs/index.ts
@@ -37,6 +37,7 @@ export function iptablesLogsSpecProvider(context: TutorialContext): TutorialSche
name: i18n.translate('home.tutorials.iptablesLogs.nameTitle', {
defaultMessage: 'Iptables / Ubiquiti',
}),
+ moduleName,
category: TutorialsCategory.SECURITY_SOLUTION,
shortDescription: i18n.translate('home.tutorials.iptablesLogs.shortDescription', {
defaultMessage: 'Collect and parse iptables and ip6tables logs or from Ubiqiti firewalls.',
diff --git a/src/plugins/home/server/tutorials/kafka_logs/index.ts b/src/plugins/home/server/tutorials/kafka_logs/index.ts
index 746e65b71008c..aac172520829c 100644
--- a/src/plugins/home/server/tutorials/kafka_logs/index.ts
+++ b/src/plugins/home/server/tutorials/kafka_logs/index.ts
@@ -37,6 +37,7 @@ export function kafkaLogsSpecProvider(context: TutorialContext): TutorialSchema
name: i18n.translate('home.tutorials.kafkaLogs.nameTitle', {
defaultMessage: 'Kafka logs',
}),
+ moduleName,
category: TutorialsCategory.LOGGING,
shortDescription: i18n.translate('home.tutorials.kafkaLogs.shortDescription', {
defaultMessage: 'Collect and parse logs created by Kafka.',
diff --git a/src/plugins/home/server/tutorials/kafka_metrics/index.ts b/src/plugins/home/server/tutorials/kafka_metrics/index.ts
index 55860a3ab649a..1b0ce44db6550 100644
--- a/src/plugins/home/server/tutorials/kafka_metrics/index.ts
+++ b/src/plugins/home/server/tutorials/kafka_metrics/index.ts
@@ -36,6 +36,7 @@ export function kafkaMetricsSpecProvider(context: TutorialContext): TutorialSche
name: i18n.translate('home.tutorials.kafkaMetrics.nameTitle', {
defaultMessage: 'Kafka metrics',
}),
+ moduleName,
isBeta: false,
category: TutorialsCategory.METRICS,
shortDescription: i18n.translate('home.tutorials.kafkaMetrics.shortDescription', {
diff --git a/src/plugins/home/server/tutorials/kibana_metrics/index.ts b/src/plugins/home/server/tutorials/kibana_metrics/index.ts
index fa966ac724a73..d595859959aca 100644
--- a/src/plugins/home/server/tutorials/kibana_metrics/index.ts
+++ b/src/plugins/home/server/tutorials/kibana_metrics/index.ts
@@ -36,6 +36,7 @@ export function kibanaMetricsSpecProvider(context: TutorialContext): TutorialSch
name: i18n.translate('home.tutorials.kibanaMetrics.nameTitle', {
defaultMessage: 'Kibana metrics',
}),
+ moduleName,
isBeta: false,
category: TutorialsCategory.METRICS,
shortDescription: i18n.translate('home.tutorials.kibanaMetrics.shortDescription', {
diff --git a/src/plugins/home/server/tutorials/kubernetes_metrics/index.ts b/src/plugins/home/server/tutorials/kubernetes_metrics/index.ts
index bcea7f1221e1f..a4ce9cfab5f62 100644
--- a/src/plugins/home/server/tutorials/kubernetes_metrics/index.ts
+++ b/src/plugins/home/server/tutorials/kubernetes_metrics/index.ts
@@ -36,6 +36,7 @@ export function kubernetesMetricsSpecProvider(context: TutorialContext): Tutoria
name: i18n.translate('home.tutorials.kubernetesMetrics.nameTitle', {
defaultMessage: 'Kubernetes metrics',
}),
+ moduleName,
category: TutorialsCategory.METRICS,
shortDescription: i18n.translate('home.tutorials.kubernetesMetrics.shortDescription', {
defaultMessage: 'Fetch metrics from your Kubernetes installation.',
diff --git a/src/plugins/home/server/tutorials/logstash_logs/index.ts b/src/plugins/home/server/tutorials/logstash_logs/index.ts
index 69e498ac59459..32982cd1055a4 100644
--- a/src/plugins/home/server/tutorials/logstash_logs/index.ts
+++ b/src/plugins/home/server/tutorials/logstash_logs/index.ts
@@ -37,6 +37,7 @@ export function logstashLogsSpecProvider(context: TutorialContext): TutorialSche
name: i18n.translate('home.tutorials.logstashLogs.nameTitle', {
defaultMessage: 'Logstash logs',
}),
+ moduleName,
category: TutorialsCategory.LOGGING,
shortDescription: i18n.translate('home.tutorials.logstashLogs.shortDescription', {
defaultMessage: 'Collect and parse debug and slow logs created by Logstash itself.',
diff --git a/src/plugins/home/server/tutorials/logstash_metrics/index.ts b/src/plugins/home/server/tutorials/logstash_metrics/index.ts
index 383273a8c365c..11272b7ceef6b 100644
--- a/src/plugins/home/server/tutorials/logstash_metrics/index.ts
+++ b/src/plugins/home/server/tutorials/logstash_metrics/index.ts
@@ -36,6 +36,7 @@ export function logstashMetricsSpecProvider(context: TutorialContext): TutorialS
name: i18n.translate('home.tutorials.logstashMetrics.nameTitle', {
defaultMessage: 'Logstash metrics',
}),
+ moduleName,
isBeta: false,
category: TutorialsCategory.METRICS,
shortDescription: i18n.translate('home.tutorials.logstashMetrics.shortDescription', {
diff --git a/src/plugins/home/server/tutorials/memcached_metrics/index.ts b/src/plugins/home/server/tutorials/memcached_metrics/index.ts
index 94451556ad34c..c724b790f84a6 100644
--- a/src/plugins/home/server/tutorials/memcached_metrics/index.ts
+++ b/src/plugins/home/server/tutorials/memcached_metrics/index.ts
@@ -36,6 +36,7 @@ export function memcachedMetricsSpecProvider(context: TutorialContext): Tutorial
name: i18n.translate('home.tutorials.memcachedMetrics.nameTitle', {
defaultMessage: 'Memcached metrics',
}),
+ moduleName,
isBeta: false,
category: TutorialsCategory.METRICS,
shortDescription: i18n.translate('home.tutorials.memcachedMetrics.shortDescription', {
diff --git a/src/plugins/home/server/tutorials/mongodb_metrics/index.ts b/src/plugins/home/server/tutorials/mongodb_metrics/index.ts
index f02695e207dd3..2f39a048f2f15 100644
--- a/src/plugins/home/server/tutorials/mongodb_metrics/index.ts
+++ b/src/plugins/home/server/tutorials/mongodb_metrics/index.ts
@@ -36,6 +36,7 @@ export function mongodbMetricsSpecProvider(context: TutorialContext): TutorialSc
name: i18n.translate('home.tutorials.mongodbMetrics.nameTitle', {
defaultMessage: 'MongoDB metrics',
}),
+ moduleName,
category: TutorialsCategory.METRICS,
shortDescription: i18n.translate('home.tutorials.mongodbMetrics.shortDescription', {
defaultMessage: 'Fetch internal metrics from MongoDB.',
diff --git a/src/plugins/home/server/tutorials/mssql_metrics/index.ts b/src/plugins/home/server/tutorials/mssql_metrics/index.ts
index 4b418587f78b2..1a1f047a12848 100644
--- a/src/plugins/home/server/tutorials/mssql_metrics/index.ts
+++ b/src/plugins/home/server/tutorials/mssql_metrics/index.ts
@@ -36,6 +36,7 @@ export function mssqlMetricsSpecProvider(context: TutorialContext): TutorialSche
name: i18n.translate('home.tutorials.mssqlMetrics.nameTitle', {
defaultMessage: 'Microsoft SQL Server Metrics',
}),
+ moduleName,
category: TutorialsCategory.METRICS,
shortDescription: i18n.translate('home.tutorials.mssqlMetrics.shortDescription', {
defaultMessage: 'Fetch monitoring metrics from a Microsoft SQL Server instance',
diff --git a/src/plugins/home/server/tutorials/munin_metrics/index.ts b/src/plugins/home/server/tutorials/munin_metrics/index.ts
index 3dbb34cb22031..8434d916daa1f 100644
--- a/src/plugins/home/server/tutorials/munin_metrics/index.ts
+++ b/src/plugins/home/server/tutorials/munin_metrics/index.ts
@@ -36,6 +36,7 @@ export function muninMetricsSpecProvider(context: TutorialContext): TutorialSche
name: i18n.translate('home.tutorials.muninMetrics.nameTitle', {
defaultMessage: 'Munin metrics',
}),
+ moduleName,
euiIconType: '/plugins/home/assets/logos/munin.svg',
isBeta: true,
category: TutorialsCategory.METRICS,
diff --git a/src/plugins/home/server/tutorials/mysql_logs/index.ts b/src/plugins/home/server/tutorials/mysql_logs/index.ts
index 178a371f9212e..37bbf409b91c5 100644
--- a/src/plugins/home/server/tutorials/mysql_logs/index.ts
+++ b/src/plugins/home/server/tutorials/mysql_logs/index.ts
@@ -37,6 +37,7 @@ export function mysqlLogsSpecProvider(context: TutorialContext): TutorialSchema
name: i18n.translate('home.tutorials.mysqlLogs.nameTitle', {
defaultMessage: 'MySQL logs',
}),
+ moduleName,
category: TutorialsCategory.LOGGING,
shortDescription: i18n.translate('home.tutorials.mysqlLogs.shortDescription', {
defaultMessage: 'Collect and parse error and slow logs created by MySQL.',
diff --git a/src/plugins/home/server/tutorials/mysql_metrics/index.ts b/src/plugins/home/server/tutorials/mysql_metrics/index.ts
index 1148caeb441f8..89f5edf22a7b6 100644
--- a/src/plugins/home/server/tutorials/mysql_metrics/index.ts
+++ b/src/plugins/home/server/tutorials/mysql_metrics/index.ts
@@ -36,6 +36,7 @@ export function mysqlMetricsSpecProvider(context: TutorialContext): TutorialSche
name: i18n.translate('home.tutorials.mysqlMetrics.nameTitle', {
defaultMessage: 'MySQL metrics',
}),
+ moduleName,
category: TutorialsCategory.METRICS,
shortDescription: i18n.translate('home.tutorials.mysqlMetrics.shortDescription', {
defaultMessage: 'Fetch internal metrics from MySQL.',
diff --git a/src/plugins/home/server/tutorials/nats_logs/index.ts b/src/plugins/home/server/tutorials/nats_logs/index.ts
index 17c37755b6bc3..f00ddd6ca8879 100644
--- a/src/plugins/home/server/tutorials/nats_logs/index.ts
+++ b/src/plugins/home/server/tutorials/nats_logs/index.ts
@@ -37,6 +37,7 @@ export function natsLogsSpecProvider(context: TutorialContext): TutorialSchema {
name: i18n.translate('home.tutorials.natsLogs.nameTitle', {
defaultMessage: 'NATS logs',
}),
+ moduleName,
category: TutorialsCategory.LOGGING,
isBeta: true,
shortDescription: i18n.translate('home.tutorials.natsLogs.shortDescription', {
diff --git a/src/plugins/home/server/tutorials/nats_metrics/index.ts b/src/plugins/home/server/tutorials/nats_metrics/index.ts
index bce08e85c6977..cda011297d2c6 100644
--- a/src/plugins/home/server/tutorials/nats_metrics/index.ts
+++ b/src/plugins/home/server/tutorials/nats_metrics/index.ts
@@ -36,6 +36,7 @@ export function natsMetricsSpecProvider(context: TutorialContext): TutorialSchem
name: i18n.translate('home.tutorials.natsMetrics.nameTitle', {
defaultMessage: 'NATS metrics',
}),
+ moduleName,
category: TutorialsCategory.METRICS,
shortDescription: i18n.translate('home.tutorials.natsMetrics.shortDescription', {
defaultMessage: 'Fetch monitoring metrics from the Nats server.',
diff --git a/src/plugins/home/server/tutorials/netflow/index.ts b/src/plugins/home/server/tutorials/netflow/index.ts
index ec0aa8953b146..5be30bbb152b7 100644
--- a/src/plugins/home/server/tutorials/netflow/index.ts
+++ b/src/plugins/home/server/tutorials/netflow/index.ts
@@ -25,9 +25,11 @@ import { createElasticCloudInstructions } from './elastic_cloud';
import { createOnPremElasticCloudInstructions } from './on_prem_elastic_cloud';
export function netflowSpecProvider() {
+ const moduleName = 'netflow';
return {
id: 'netflow',
name: 'Netflow',
+ moduleName,
category: TutorialsCategory.SECURITY_SOLUTION,
shortDescription: i18n.translate('home.tutorials.netflow.tutorialShortDescription', {
defaultMessage: 'Collect Netflow records sent by a Netflow exporter.',
diff --git a/src/plugins/home/server/tutorials/nginx_logs/index.ts b/src/plugins/home/server/tutorials/nginx_logs/index.ts
index 37d0cc106bfe5..f357e77fc25ca 100644
--- a/src/plugins/home/server/tutorials/nginx_logs/index.ts
+++ b/src/plugins/home/server/tutorials/nginx_logs/index.ts
@@ -37,6 +37,7 @@ export function nginxLogsSpecProvider(context: TutorialContext): TutorialSchema
name: i18n.translate('home.tutorials.nginxLogs.nameTitle', {
defaultMessage: 'Nginx logs',
}),
+ moduleName,
category: TutorialsCategory.LOGGING,
shortDescription: i18n.translate('home.tutorials.nginxLogs.shortDescription', {
defaultMessage: 'Collect and parse access and error logs created by the Nginx HTTP server.',
diff --git a/src/plugins/home/server/tutorials/nginx_metrics/index.ts b/src/plugins/home/server/tutorials/nginx_metrics/index.ts
index 8671f7218ffc8..09031883cef1c 100644
--- a/src/plugins/home/server/tutorials/nginx_metrics/index.ts
+++ b/src/plugins/home/server/tutorials/nginx_metrics/index.ts
@@ -36,6 +36,7 @@ export function nginxMetricsSpecProvider(context: TutorialContext): TutorialSche
name: i18n.translate('home.tutorials.nginxMetrics.nameTitle', {
defaultMessage: 'Nginx metrics',
}),
+ moduleName,
category: TutorialsCategory.METRICS,
shortDescription: i18n.translate('home.tutorials.nginxMetrics.shortDescription', {
defaultMessage: 'Fetch internal metrics from the Nginx HTTP server.',
diff --git a/src/plugins/home/server/tutorials/openmetrics_metrics/index.ts b/src/plugins/home/server/tutorials/openmetrics_metrics/index.ts
index eb539e15c1bcd..197821f24dddb 100644
--- a/src/plugins/home/server/tutorials/openmetrics_metrics/index.ts
+++ b/src/plugins/home/server/tutorials/openmetrics_metrics/index.ts
@@ -36,6 +36,7 @@ export function openmetricsMetricsSpecProvider(context: TutorialContext): Tutori
name: i18n.translate('home.tutorials.openmetricsMetrics.nameTitle', {
defaultMessage: 'OpenMetrics metrics',
}),
+ moduleName,
category: TutorialsCategory.METRICS,
shortDescription: i18n.translate('home.tutorials.openmetricsMetrics.shortDescription', {
defaultMessage: 'Fetch metrics from an endpoint that serves metrics in OpenMetrics format.',
diff --git a/src/plugins/home/server/tutorials/oracle_metrics/index.ts b/src/plugins/home/server/tutorials/oracle_metrics/index.ts
index 3144b0a21aab5..d2ddd19b930a2 100644
--- a/src/plugins/home/server/tutorials/oracle_metrics/index.ts
+++ b/src/plugins/home/server/tutorials/oracle_metrics/index.ts
@@ -36,6 +36,7 @@ export function oracleMetricsSpecProvider(context: TutorialContext): TutorialSch
name: i18n.translate('home.tutorials.oracleMetrics.nameTitle', {
defaultMessage: 'oracle metrics',
}),
+ moduleName,
isBeta: false,
category: TutorialsCategory.METRICS,
shortDescription: i18n.translate('home.tutorials.oracleMetrics.shortDescription', {
diff --git a/src/plugins/home/server/tutorials/osquery_logs/index.ts b/src/plugins/home/server/tutorials/osquery_logs/index.ts
index 8781d6201a771..c4869a889a085 100644
--- a/src/plugins/home/server/tutorials/osquery_logs/index.ts
+++ b/src/plugins/home/server/tutorials/osquery_logs/index.ts
@@ -37,6 +37,7 @@ export function osqueryLogsSpecProvider(context: TutorialContext): TutorialSchem
name: i18n.translate('home.tutorials.osqueryLogs.nameTitle', {
defaultMessage: 'Osquery logs',
}),
+ moduleName,
category: TutorialsCategory.SECURITY_SOLUTION,
shortDescription: i18n.translate('home.tutorials.osqueryLogs.shortDescription', {
defaultMessage: 'Collect the result logs created by osqueryd.',
diff --git a/src/plugins/home/server/tutorials/php_fpm_metrics/index.ts b/src/plugins/home/server/tutorials/php_fpm_metrics/index.ts
index 975b549c9520b..470cfed2176fd 100644
--- a/src/plugins/home/server/tutorials/php_fpm_metrics/index.ts
+++ b/src/plugins/home/server/tutorials/php_fpm_metrics/index.ts
@@ -36,6 +36,7 @@ export function phpfpmMetricsSpecProvider(context: TutorialContext): TutorialSch
name: i18n.translate('home.tutorials.phpFpmMetrics.nameTitle', {
defaultMessage: 'PHP-FPM metrics',
}),
+ moduleName,
category: TutorialsCategory.METRICS,
isBeta: false,
shortDescription: i18n.translate('home.tutorials.phpFpmMetrics.shortDescription', {
diff --git a/src/plugins/home/server/tutorials/postgresql_logs/index.ts b/src/plugins/home/server/tutorials/postgresql_logs/index.ts
index 0c28061985819..e158dedcb03e0 100644
--- a/src/plugins/home/server/tutorials/postgresql_logs/index.ts
+++ b/src/plugins/home/server/tutorials/postgresql_logs/index.ts
@@ -37,6 +37,7 @@ export function postgresqlLogsSpecProvider(context: TutorialContext): TutorialSc
name: i18n.translate('home.tutorials.postgresqlLogs.nameTitle', {
defaultMessage: 'PostgreSQL logs',
}),
+ moduleName,
category: TutorialsCategory.LOGGING,
shortDescription: i18n.translate('home.tutorials.postgresqlLogs.shortDescription', {
defaultMessage: 'Collect and parse error and slow logs created by PostgreSQL.',
diff --git a/src/plugins/home/server/tutorials/postgresql_metrics/index.ts b/src/plugins/home/server/tutorials/postgresql_metrics/index.ts
index f9bb9d249e755..1add49c10c2a7 100644
--- a/src/plugins/home/server/tutorials/postgresql_metrics/index.ts
+++ b/src/plugins/home/server/tutorials/postgresql_metrics/index.ts
@@ -36,6 +36,7 @@ export function postgresqlMetricsSpecProvider(context: TutorialContext): Tutoria
name: i18n.translate('home.tutorials.postgresqlMetrics.nameTitle', {
defaultMessage: 'PostgreSQL metrics',
}),
+ moduleName,
category: TutorialsCategory.METRICS,
isBeta: false,
shortDescription: i18n.translate('home.tutorials.postgresqlMetrics.shortDescription', {
diff --git a/src/plugins/home/server/tutorials/prometheus_metrics/index.ts b/src/plugins/home/server/tutorials/prometheus_metrics/index.ts
index 06e8a138049d5..900c5da7cdbe3 100644
--- a/src/plugins/home/server/tutorials/prometheus_metrics/index.ts
+++ b/src/plugins/home/server/tutorials/prometheus_metrics/index.ts
@@ -36,6 +36,7 @@ export function prometheusMetricsSpecProvider(context: TutorialContext): Tutoria
name: i18n.translate('home.tutorials.prometheusMetrics.nameTitle', {
defaultMessage: 'Prometheus metrics',
}),
+ moduleName,
isBeta: false,
category: TutorialsCategory.METRICS,
shortDescription: i18n.translate('home.tutorials.prometheusMetrics.shortDescription', {
diff --git a/src/plugins/home/server/tutorials/rabbitmq_metrics/index.ts b/src/plugins/home/server/tutorials/rabbitmq_metrics/index.ts
index a646068e4ff34..df0aa57d9feac 100644
--- a/src/plugins/home/server/tutorials/rabbitmq_metrics/index.ts
+++ b/src/plugins/home/server/tutorials/rabbitmq_metrics/index.ts
@@ -36,6 +36,7 @@ export function rabbitmqMetricsSpecProvider(context: TutorialContext): TutorialS
name: i18n.translate('home.tutorials.rabbitmqMetrics.nameTitle', {
defaultMessage: 'RabbitMQ metrics',
}),
+ moduleName,
category: TutorialsCategory.METRICS,
shortDescription: i18n.translate('home.tutorials.rabbitmqMetrics.shortDescription', {
defaultMessage: 'Fetch internal metrics from the RabbitMQ server.',
diff --git a/src/plugins/home/server/tutorials/redis_logs/index.ts b/src/plugins/home/server/tutorials/redis_logs/index.ts
index e017fae0499a3..785118b9e5d09 100644
--- a/src/plugins/home/server/tutorials/redis_logs/index.ts
+++ b/src/plugins/home/server/tutorials/redis_logs/index.ts
@@ -37,6 +37,7 @@ export function redisLogsSpecProvider(context: TutorialContext): TutorialSchema
name: i18n.translate('home.tutorials.redisLogs.nameTitle', {
defaultMessage: 'Redis logs',
}),
+ moduleName,
category: TutorialsCategory.LOGGING,
shortDescription: i18n.translate('home.tutorials.redisLogs.shortDescription', {
defaultMessage: 'Collect and parse error and slow logs created by Redis.',
diff --git a/src/plugins/home/server/tutorials/redis_metrics/index.ts b/src/plugins/home/server/tutorials/redis_metrics/index.ts
index bcc4d9bb0b67b..11d05029844b2 100644
--- a/src/plugins/home/server/tutorials/redis_metrics/index.ts
+++ b/src/plugins/home/server/tutorials/redis_metrics/index.ts
@@ -36,6 +36,7 @@ export function redisMetricsSpecProvider(context: TutorialContext): TutorialSche
name: i18n.translate('home.tutorials.redisMetrics.nameTitle', {
defaultMessage: 'Redis metrics',
}),
+ moduleName,
category: TutorialsCategory.METRICS,
shortDescription: i18n.translate('home.tutorials.redisMetrics.shortDescription', {
defaultMessage: 'Fetch internal metrics from Redis.',
diff --git a/src/plugins/home/server/tutorials/redisenterprise_metrics/index.ts b/src/plugins/home/server/tutorials/redisenterprise_metrics/index.ts
index ffbb5ab75da87..0bc7769f950ed 100644
--- a/src/plugins/home/server/tutorials/redisenterprise_metrics/index.ts
+++ b/src/plugins/home/server/tutorials/redisenterprise_metrics/index.ts
@@ -36,6 +36,7 @@ export function redisenterpriseMetricsSpecProvider(context: TutorialContext): Tu
name: i18n.translate('home.tutorials.redisenterpriseMetrics.nameTitle', {
defaultMessage: 'Redis Enterprise metrics',
}),
+ moduleName,
category: TutorialsCategory.METRICS,
shortDescription: i18n.translate('home.tutorials.redisenterpriseMetrics.shortDescription', {
defaultMessage: 'Fetch monitoring metrics from Redis Enterprise Server.',
diff --git a/src/plugins/home/server/tutorials/stan_metrics/index.ts b/src/plugins/home/server/tutorials/stan_metrics/index.ts
index 616bc7450249e..b1ad3e9c1404a 100644
--- a/src/plugins/home/server/tutorials/stan_metrics/index.ts
+++ b/src/plugins/home/server/tutorials/stan_metrics/index.ts
@@ -36,6 +36,7 @@ export function stanMetricsSpecProvider(context: TutorialContext): TutorialSchem
name: i18n.translate('home.tutorials.stanMetrics.nameTitle', {
defaultMessage: 'STAN metrics',
}),
+ moduleName,
category: TutorialsCategory.METRICS,
shortDescription: i18n.translate('home.tutorials.stanMetrics.shortDescription', {
defaultMessage: 'Fetch monitoring metrics from the STAN server.',
diff --git a/src/plugins/home/server/tutorials/statsd_metrics/index.ts b/src/plugins/home/server/tutorials/statsd_metrics/index.ts
index 1dc297e78c791..9e9d7d6fd3e23 100644
--- a/src/plugins/home/server/tutorials/statsd_metrics/index.ts
+++ b/src/plugins/home/server/tutorials/statsd_metrics/index.ts
@@ -33,6 +33,7 @@ export function statsdMetricsSpecProvider(context: TutorialContext): TutorialSch
name: i18n.translate('home.tutorials.statsdMetrics.nameTitle', {
defaultMessage: 'Statsd metrics',
}),
+ moduleName,
category: TutorialsCategory.METRICS,
shortDescription: i18n.translate('home.tutorials.statsdMetrics.shortDescription', {
defaultMessage: 'Fetch monitoring metrics from statsd.',
diff --git a/src/plugins/home/server/tutorials/suricata_logs/index.ts b/src/plugins/home/server/tutorials/suricata_logs/index.ts
index 6bcfc1d43a250..eec81b9496647 100644
--- a/src/plugins/home/server/tutorials/suricata_logs/index.ts
+++ b/src/plugins/home/server/tutorials/suricata_logs/index.ts
@@ -37,6 +37,7 @@ export function suricataLogsSpecProvider(context: TutorialContext): TutorialSche
name: i18n.translate('home.tutorials.suricataLogs.nameTitle', {
defaultMessage: 'Suricata logs',
}),
+ moduleName,
category: TutorialsCategory.SECURITY_SOLUTION,
shortDescription: i18n.translate('home.tutorials.suricataLogs.shortDescription', {
defaultMessage: 'Collect the result logs created by Suricata IDS/IPS/NSM.',
diff --git a/src/plugins/home/server/tutorials/system_logs/index.ts b/src/plugins/home/server/tutorials/system_logs/index.ts
index 9bad70699a6ed..f39df25461a5f 100644
--- a/src/plugins/home/server/tutorials/system_logs/index.ts
+++ b/src/plugins/home/server/tutorials/system_logs/index.ts
@@ -37,6 +37,7 @@ export function systemLogsSpecProvider(context: TutorialContext): TutorialSchema
name: i18n.translate('home.tutorials.systemLogs.nameTitle', {
defaultMessage: 'System logs',
}),
+ moduleName,
category: TutorialsCategory.LOGGING,
shortDescription: i18n.translate('home.tutorials.systemLogs.shortDescription', {
defaultMessage: 'Collect and parse logs written by the local Syslog server.',
diff --git a/src/plugins/home/server/tutorials/system_metrics/index.ts b/src/plugins/home/server/tutorials/system_metrics/index.ts
index ef1a84ecdbf10..6bdaaa34a9b2c 100644
--- a/src/plugins/home/server/tutorials/system_metrics/index.ts
+++ b/src/plugins/home/server/tutorials/system_metrics/index.ts
@@ -36,6 +36,7 @@ export function systemMetricsSpecProvider(context: TutorialContext): TutorialSch
name: i18n.translate('home.tutorials.systemMetrics.nameTitle', {
defaultMessage: 'System metrics',
}),
+ moduleName,
category: TutorialsCategory.METRICS,
shortDescription: i18n.translate('home.tutorials.systemMetrics.shortDescription', {
defaultMessage: 'Collect CPU, memory, network, and disk statistics from the host.',
diff --git a/src/plugins/home/server/tutorials/traefik_logs/index.ts b/src/plugins/home/server/tutorials/traefik_logs/index.ts
index 1876edd6c0bf7..0a84dcb081883 100644
--- a/src/plugins/home/server/tutorials/traefik_logs/index.ts
+++ b/src/plugins/home/server/tutorials/traefik_logs/index.ts
@@ -37,6 +37,7 @@ export function traefikLogsSpecProvider(context: TutorialContext): TutorialSchem
name: i18n.translate('home.tutorials.traefikLogs.nameTitle', {
defaultMessage: 'Traefik logs',
}),
+ moduleName,
category: TutorialsCategory.LOGGING,
shortDescription: i18n.translate('home.tutorials.traefikLogs.shortDescription', {
defaultMessage: 'Collect and parse access logs created by the Traefik Proxy.',
diff --git a/src/plugins/home/server/tutorials/traefik_metrics/index.ts b/src/plugins/home/server/tutorials/traefik_metrics/index.ts
index a97ee3ab9758a..4048719239a10 100644
--- a/src/plugins/home/server/tutorials/traefik_metrics/index.ts
+++ b/src/plugins/home/server/tutorials/traefik_metrics/index.ts
@@ -33,6 +33,7 @@ export function traefikMetricsSpecProvider(context: TutorialContext): TutorialSc
name: i18n.translate('home.tutorials.traefikMetrics.nameTitle', {
defaultMessage: 'Traefik metrics',
}),
+ moduleName,
category: TutorialsCategory.METRICS,
shortDescription: i18n.translate('home.tutorials.traefikMetrics.shortDescription', {
defaultMessage: 'Fetch monitoring metrics from Traefik.',
diff --git a/src/plugins/home/server/tutorials/uptime_monitors/index.ts b/src/plugins/home/server/tutorials/uptime_monitors/index.ts
index fa854a1c23505..7366583e59778 100644
--- a/src/plugins/home/server/tutorials/uptime_monitors/index.ts
+++ b/src/plugins/home/server/tutorials/uptime_monitors/index.ts
@@ -30,11 +30,13 @@ import {
} from '../../services/tutorials/lib/tutorials_registry_types';
export function uptimeMonitorsSpecProvider(context: TutorialContext): TutorialSchema {
+ const moduleName = 'uptime';
return {
id: 'uptimeMonitors',
name: i18n.translate('home.tutorials.uptimeMonitors.nameTitle', {
defaultMessage: 'Uptime Monitors',
}),
+ moduleName,
category: TutorialsCategory.METRICS,
shortDescription: i18n.translate('home.tutorials.uptimeMonitors.shortDescription', {
defaultMessage: 'Monitor services for their availability',
diff --git a/src/plugins/home/server/tutorials/uwsgi_metrics/index.ts b/src/plugins/home/server/tutorials/uwsgi_metrics/index.ts
index bbe4ea78ee87c..f6398be3550fd 100644
--- a/src/plugins/home/server/tutorials/uwsgi_metrics/index.ts
+++ b/src/plugins/home/server/tutorials/uwsgi_metrics/index.ts
@@ -36,6 +36,7 @@ export function uwsgiMetricsSpecProvider(context: TutorialContext): TutorialSche
name: i18n.translate('home.tutorials.uwsgiMetrics.nameTitle', {
defaultMessage: 'uWSGI metrics',
}),
+ moduleName,
category: TutorialsCategory.METRICS,
shortDescription: i18n.translate('home.tutorials.uwsgiMetrics.shortDescription', {
defaultMessage: 'Fetch internal metrics from the uWSGI server.',
diff --git a/src/plugins/home/server/tutorials/vsphere_metrics/index.ts b/src/plugins/home/server/tutorials/vsphere_metrics/index.ts
index 4450ab3040750..5e1191ffdf8ce 100644
--- a/src/plugins/home/server/tutorials/vsphere_metrics/index.ts
+++ b/src/plugins/home/server/tutorials/vsphere_metrics/index.ts
@@ -36,6 +36,7 @@ export function vSphereMetricsSpecProvider(context: TutorialContext): TutorialSc
name: i18n.translate('home.tutorials.vsphereMetrics.nameTitle', {
defaultMessage: 'vSphere metrics',
}),
+ moduleName,
category: TutorialsCategory.METRICS,
shortDescription: i18n.translate('home.tutorials.vsphereMetrics.shortDescription', {
defaultMessage: 'Fetch internal metrics from vSphere.',
diff --git a/src/plugins/home/server/tutorials/windows_event_logs/index.ts b/src/plugins/home/server/tutorials/windows_event_logs/index.ts
index c2ea9ff3015e4..80f7a58ae14be 100644
--- a/src/plugins/home/server/tutorials/windows_event_logs/index.ts
+++ b/src/plugins/home/server/tutorials/windows_event_logs/index.ts
@@ -30,11 +30,13 @@ import {
} from '../../services/tutorials/lib/tutorials_registry_types';
export function windowsEventLogsSpecProvider(context: TutorialContext): TutorialSchema {
+ const moduleName = 'windows';
return {
id: 'windowsEventLogs',
name: i18n.translate('home.tutorials.windowsEventLogs.nameTitle', {
defaultMessage: 'Windows Event Log',
}),
+ moduleName,
isBeta: false,
category: TutorialsCategory.SECURITY_SOLUTION,
shortDescription: i18n.translate('home.tutorials.windowsEventLogs.shortDescription', {
diff --git a/src/plugins/home/server/tutorials/windows_metrics/index.ts b/src/plugins/home/server/tutorials/windows_metrics/index.ts
index 5333a7b1badf6..18cdcdc985e54 100644
--- a/src/plugins/home/server/tutorials/windows_metrics/index.ts
+++ b/src/plugins/home/server/tutorials/windows_metrics/index.ts
@@ -36,6 +36,7 @@ export function windowsMetricsSpecProvider(context: TutorialContext): TutorialSc
name: i18n.translate('home.tutorials.windowsMetrics.nameTitle', {
defaultMessage: 'Windows metrics',
}),
+ moduleName,
isBeta: false,
category: TutorialsCategory.METRICS,
shortDescription: i18n.translate('home.tutorials.windowsMetrics.shortDescription', {
diff --git a/src/plugins/home/server/tutorials/zeek_logs/index.ts b/src/plugins/home/server/tutorials/zeek_logs/index.ts
index c273a93b1b0d5..e39dcd3409490 100644
--- a/src/plugins/home/server/tutorials/zeek_logs/index.ts
+++ b/src/plugins/home/server/tutorials/zeek_logs/index.ts
@@ -37,6 +37,7 @@ export function zeekLogsSpecProvider(context: TutorialContext): TutorialSchema {
name: i18n.translate('home.tutorials.zeekLogs.nameTitle', {
defaultMessage: 'Zeek logs',
}),
+ moduleName,
category: TutorialsCategory.SECURITY_SOLUTION,
shortDescription: i18n.translate('home.tutorials.zeekLogs.shortDescription', {
defaultMessage: 'Collect the logs created by Zeek/Bro.',
diff --git a/src/plugins/home/server/tutorials/zookeeper_metrics/index.ts b/src/plugins/home/server/tutorials/zookeeper_metrics/index.ts
index ae146d192432b..a39540b7399e5 100644
--- a/src/plugins/home/server/tutorials/zookeeper_metrics/index.ts
+++ b/src/plugins/home/server/tutorials/zookeeper_metrics/index.ts
@@ -36,6 +36,7 @@ export function zookeeperMetricsSpecProvider(context: TutorialContext): Tutorial
name: i18n.translate('home.tutorials.zookeeperMetrics.nameTitle', {
defaultMessage: 'Zookeeper metrics',
}),
+ moduleName,
euiIconType: '/plugins/home/assets/logos/zookeeper.svg',
isBeta: false,
category: TutorialsCategory.METRICS,
diff --git a/src/plugins/index_pattern_management/kibana.json b/src/plugins/index_pattern_management/kibana.json
index 23adef2626a72..d0ad6a96065c3 100644
--- a/src/plugins/index_pattern_management/kibana.json
+++ b/src/plugins/index_pattern_management/kibana.json
@@ -3,5 +3,6 @@
"version": "kibana",
"server": true,
"ui": true,
- "requiredPlugins": ["management", "data", "kibanaLegacy"]
+ "requiredPlugins": ["management", "data", "kibanaLegacy"],
+ "requiredBundles": ["kibanaReact", "kibanaUtils"]
}
diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/__snapshots__/create_index_pattern_wizard.test.tsx.snap b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/__snapshots__/create_index_pattern_wizard.test.tsx.snap
index 70200e03c0dbe..6d79515c172fe 100644
--- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/__snapshots__/create_index_pattern_wizard.test.tsx.snap
+++ b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/__snapshots__/create_index_pattern_wizard.test.tsx.snap
@@ -5,6 +5,7 @@ exports[`CreateIndexPatternWizard defaults to the loading state 1`] = `
@@ -52,6 +53,7 @@ exports[`CreateIndexPatternWizard renders index pattern step when there are indi
@@ -66,6 +68,7 @@ exports[`CreateIndexPatternWizard renders the empty state when there are no indi
/>
@@ -107,6 +110,7 @@ exports[`CreateIndexPatternWizard renders time field step when step is set to 2
@@ -148,6 +152,7 @@ exports[`CreateIndexPatternWizard renders when there are no indices but there ar
@@ -162,6 +167,7 @@ exports[`CreateIndexPatternWizard shows system indices even if there are no othe
/>
diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/header/__snapshots__/header.test.tsx.snap b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/header/__snapshots__/header.test.tsx.snap
index 6a2fd1000e6b4..0c89fb494b6ac 100644
--- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/header/__snapshots__/header.test.tsx.snap
+++ b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/header/__snapshots__/header.test.tsx.snap
@@ -49,7 +49,7 @@ exports[`Header should render a different name, prompt, and beta tag if provided
>
multiple
- data souces,
+ data sources,
multiple
- data souces,
+ data sources,
multiple
- data souces,
+ data sources,
multiple,
single: filebeat-4-3-22,
diff --git a/src/plugins/index_pattern_management/public/components/edit_index_pattern/source_filters_table/components/table/table.test.tsx b/src/plugins/index_pattern_management/public/components/edit_index_pattern/source_filters_table/components/table/table.test.tsx
index ab5a253a98e29..e43ee2e55eeca 100644
--- a/src/plugins/index_pattern_management/public/components/edit_index_pattern/source_filters_table/components/table/table.test.tsx
+++ b/src/plugins/index_pattern_management/public/components/edit_index_pattern/source_filters_table/components/table/table.test.tsx
@@ -21,7 +21,7 @@ import React, { ReactElement } from 'react';
import { shallow, ShallowWrapper } from 'enzyme';
import { Table, TableProps, TableState } from './table';
-import { EuiTableFieldDataColumnType, keyCodes } from '@elastic/eui';
+import { EuiTableFieldDataColumnType, keys } from '@elastic/eui';
import { IIndexPattern } from 'src/plugins/data/public';
import { SourceFiltersTableFilter } from '../../types';
@@ -250,7 +250,7 @@ describe('Table', () => {
);
// Press the enter key
- filterNameTableCell.find('EuiFieldText').simulate('keydown', { keyCode: keyCodes.ENTER });
+ filterNameTableCell.find('EuiFieldText').simulate('keydown', { key: keys.ENTER });
expect(saveFilter).toBeCalled();
// It should reset
@@ -289,7 +289,7 @@ describe('Table', () => {
);
// Press the ESCAPE key
- filterNameTableCell.find('EuiFieldText').simulate('keydown', { keyCode: keyCodes.ESCAPE });
+ filterNameTableCell.find('EuiFieldText').simulate('keydown', { key: keys.ESCAPE });
expect(saveFilter).not.toBeCalled();
// It should reset
diff --git a/src/plugins/index_pattern_management/public/components/edit_index_pattern/source_filters_table/components/table/table.tsx b/src/plugins/index_pattern_management/public/components/edit_index_pattern/source_filters_table/components/table/table.tsx
index 04998d9f7dafe..f73d756f28116 100644
--- a/src/plugins/index_pattern_management/public/components/edit_index_pattern/source_filters_table/components/table/table.tsx
+++ b/src/plugins/index_pattern_management/public/components/edit_index_pattern/source_filters_table/components/table/table.tsx
@@ -20,7 +20,7 @@
import React, { Component } from 'react';
import {
- keyCodes,
+ keys,
EuiBasicTableColumn,
EuiInMemoryTable,
EuiFieldText,
@@ -111,15 +111,15 @@ export class Table extends Component {
onEditingFilterChange = (e: React.ChangeEvent) =>
this.setState({ editingFilterValue: e.target.value });
- onEditFieldKeyDown = ({ keyCode }: React.KeyboardEvent) => {
- if (keyCodes.ENTER === keyCode && this.state.editingFilterId && this.state.editingFilterValue) {
+ onEditFieldKeyDown = ({ key }: React.KeyboardEvent) => {
+ if (keys.ENTER === key && this.state.editingFilterId && this.state.editingFilterValue) {
this.props.saveFilter({
clientId: this.state.editingFilterId,
value: this.state.editingFilterValue,
});
this.stopEditingFilter();
}
- if (keyCodes.ESCAPE === keyCode) {
+ if (keys.ESCAPE === key) {
this.stopEditingFilter();
}
};
diff --git a/src/plugins/input_control_vis/kibana.json b/src/plugins/input_control_vis/kibana.json
index 4a4ec328c1352..6928eb19d02e1 100644
--- a/src/plugins/input_control_vis/kibana.json
+++ b/src/plugins/input_control_vis/kibana.json
@@ -4,5 +4,6 @@
"kibanaVersion": "kibana",
"server": true,
"ui": true,
- "requiredPlugins": ["data", "expressions", "visualizations"]
+ "requiredPlugins": ["data", "expressions", "visualizations"],
+ "requiredBundles": ["kibanaReact"]
}
diff --git a/src/plugins/inspector/kibana.json b/src/plugins/inspector/kibana.json
index 99a38d2928df6..90e5d60250728 100644
--- a/src/plugins/inspector/kibana.json
+++ b/src/plugins/inspector/kibana.json
@@ -3,5 +3,6 @@
"version": "kibana",
"server": false,
"ui": true,
- "extraPublicDirs": ["common", "common/adapters/request"]
+ "extraPublicDirs": ["common", "common/adapters/request"],
+ "requiredBundles": ["kibanaReact"]
}
diff --git a/src/plugins/inspector/public/views/data/components/__snapshots__/data_view.test.tsx.snap b/src/plugins/inspector/public/views/data/components/__snapshots__/data_view.test.tsx.snap
index adea7831d6b80..2632afff2f63b 100644
--- a/src/plugins/inspector/public/views/data/components/__snapshots__/data_view.test.tsx.snap
+++ b/src/plugins/inspector/public/views/data/components/__snapshots__/data_view.test.tsx.snap
@@ -269,7 +269,9 @@ exports[`Inspector Data View component should render empty state 1`] = `
-
+
diff --git a/src/plugins/kibana_legacy/public/utils/kbn_accessible_click.js b/src/plugins/kibana_legacy/public/utils/kbn_accessible_click.js
index ba1363ef06285..2dbf4002da748 100644
--- a/src/plugins/kibana_legacy/public/utils/kbn_accessible_click.js
+++ b/src/plugins/kibana_legacy/public/utils/kbn_accessible_click.js
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-import { accessibleClickKeys, keyCodes } from '@elastic/eui';
+import { accessibleClickKeys, keys } from '@elastic/eui';
export function KbnAccessibleClickProvider() {
return {
@@ -24,7 +24,7 @@ export function KbnAccessibleClickProvider() {
controller: ($element) => {
$element.on('keydown', (e) => {
// Prevent a scroll from occurring if the user has hit space.
- if (e.keyCode === keyCodes.SPACE) {
+ if (e.key === keys.SPACE) {
e.preventDefault();
}
});
@@ -60,7 +60,7 @@ export function KbnAccessibleClickProvider() {
element.on('keyup', (e) => {
// Support keyboard accessibility by emulating mouse click on ENTER or SPACE keypress.
- if (accessibleClickKeys[e.keyCode]) {
+ if (accessibleClickKeys[e.key]) {
// Delegate to the click handler on the element (assumed to be ng-click).
element.click();
}
diff --git a/src/plugins/kibana_react/kibana.json b/src/plugins/kibana_react/kibana.json
index 0add1bee84ae0..a507fe457b633 100644
--- a/src/plugins/kibana_react/kibana.json
+++ b/src/plugins/kibana_react/kibana.json
@@ -1,5 +1,6 @@
{
"id": "kibanaReact",
"version": "kibana",
- "ui": true
+ "ui": true,
+ "requiredBundles": ["kibanaUtils"]
}
diff --git a/src/plugins/kibana_react/public/exit_full_screen_button/exit_full_screen_button.test.tsx b/src/plugins/kibana_react/public/exit_full_screen_button/exit_full_screen_button.test.tsx
index 8f264a6bafca7..03af32712afa5 100644
--- a/src/plugins/kibana_react/public/exit_full_screen_button/exit_full_screen_button.test.tsx
+++ b/src/plugins/kibana_react/public/exit_full_screen_button/exit_full_screen_button.test.tsx
@@ -20,7 +20,7 @@
import React from 'react';
import sinon from 'sinon';
import { ExitFullScreenButton } from './exit_full_screen_button';
-import { keyCodes } from '@elastic/eui';
+import { keys } from '@elastic/eui';
import { mount } from 'enzyme';
test('is rendered', () => {
@@ -45,7 +45,7 @@ describe('onExitFullScreenMode', () => {
mount();
- const escapeKeyEvent = new KeyboardEvent('keydown', { keyCode: keyCodes.ESCAPE } as any);
+ const escapeKeyEvent = new KeyboardEvent('keydown', { key: keys.ESCAPE } as any);
document.dispatchEvent(escapeKeyEvent);
sinon.assert.calledOnce(onExitHandler);
diff --git a/src/plugins/kibana_react/public/exit_full_screen_button/exit_full_screen_button.tsx b/src/plugins/kibana_react/public/exit_full_screen_button/exit_full_screen_button.tsx
index 2a359b7cca5d1..3a1a34f1fc3be 100644
--- a/src/plugins/kibana_react/public/exit_full_screen_button/exit_full_screen_button.tsx
+++ b/src/plugins/kibana_react/public/exit_full_screen_button/exit_full_screen_button.tsx
@@ -19,7 +19,7 @@
import { i18n } from '@kbn/i18n';
import React, { PureComponent } from 'react';
-import { EuiScreenReaderOnly, keyCodes } from '@elastic/eui';
+import { EuiScreenReaderOnly, keys } from '@elastic/eui';
import { EuiIcon, EuiFlexGroup, EuiFlexItem, EuiText } from '@elastic/eui';
export interface ExitFullScreenButtonProps {
@@ -30,7 +30,7 @@ import './index.scss';
class ExitFullScreenButtonUi extends PureComponent {
public onKeyDown = (e: KeyboardEvent) => {
- if (e.keyCode === keyCodes.ESCAPE) {
+ if (e.key === keys.ESCAPE) {
this.props.onExitFullScreenMode();
}
};
diff --git a/src/plugins/kibana_react/public/split_panel/containers/panel_container.tsx b/src/plugins/kibana_react/public/split_panel/containers/panel_container.tsx
index 45fe20095fd83..a44ed04c7bc79 100644
--- a/src/plugins/kibana_react/public/split_panel/containers/panel_container.tsx
+++ b/src/plugins/kibana_react/public/split_panel/containers/panel_container.tsx
@@ -19,7 +19,7 @@
import React, { Children, ReactNode, useRef, useState, useCallback, useEffect } from 'react';
-import { keyCodes } from '@elastic/eui';
+import { keys } from '@elastic/eui';
import { PanelContextProvider } from '../context';
import { Resizer, ResizerMouseEvent, ResizerKeyDownEvent } from '../components/resizer';
import { PanelRegistry } from '../registry';
@@ -70,16 +70,16 @@ export function PanelsContainer({
const handleKeyDown = useCallback(
(ev: ResizerKeyDownEvent) => {
- const { keyCode } = ev;
+ const { key } = ev;
- if (keyCode === keyCodes.LEFT || keyCode === keyCodes.RIGHT) {
+ if (key === keys.ARROW_LEFT || key === keys.ARROW_RIGHT) {
ev.preventDefault();
const { current: registry } = registryRef;
const [left, right] = registry.getPanels();
- const leftPercent = left.width - (keyCode === keyCodes.LEFT ? 1 : -1);
- const rightPercent = right.width - (keyCode === keyCodes.RIGHT ? 1 : -1);
+ const leftPercent = left.width - (key === keys.ARROW_LEFT ? 1 : -1);
+ const rightPercent = right.width - (key === keys.ARROW_RIGHT ? 1 : -1);
left.setWidth(leftPercent);
right.setWidth(rightPercent);
diff --git a/src/plugins/management/kibana.json b/src/plugins/management/kibana.json
index cc411a8c6a25c..f48158e98ff3f 100644
--- a/src/plugins/management/kibana.json
+++ b/src/plugins/management/kibana.json
@@ -3,5 +3,6 @@
"version": "kibana",
"server": true,
"ui": true,
- "requiredPlugins": ["kibanaLegacy", "home"]
+ "requiredPlugins": ["kibanaLegacy", "home"],
+ "requiredBundles": ["kibanaReact"]
}
diff --git a/src/plugins/maps_legacy/kibana.json b/src/plugins/maps_legacy/kibana.json
index cd503883164ac..d9bf33e661368 100644
--- a/src/plugins/maps_legacy/kibana.json
+++ b/src/plugins/maps_legacy/kibana.json
@@ -4,5 +4,6 @@
"kibanaVersion": "kibana",
"configPath": ["map"],
"ui": true,
- "server": true
+ "server": true,
+ "requiredBundles": ["kibanaReact", "charts"]
}
diff --git a/src/plugins/region_map/kibana.json b/src/plugins/region_map/kibana.json
index ac7e1f8659d66..6e1980c327dc0 100644
--- a/src/plugins/region_map/kibana.json
+++ b/src/plugins/region_map/kibana.json
@@ -11,5 +11,10 @@
"mapsLegacy",
"kibanaLegacy",
"data"
+ ],
+ "requiredBundles": [
+ "kibanaUtils",
+ "kibanaReact",
+ "charts"
]
}
diff --git a/src/plugins/saved_objects/kibana.json b/src/plugins/saved_objects/kibana.json
index 7ae1b84eecad8..589aafbd2aaf5 100644
--- a/src/plugins/saved_objects/kibana.json
+++ b/src/plugins/saved_objects/kibana.json
@@ -3,5 +3,9 @@
"version": "kibana",
"server": true,
"ui": true,
- "requiredPlugins": ["data"]
+ "requiredPlugins": ["data"],
+ "requiredBundles": [
+ "kibanaUtils",
+ "kibanaReact"
+ ]
}
diff --git a/src/plugins/saved_objects_management/kibana.json b/src/plugins/saved_objects_management/kibana.json
index 6184d890c415c..0270c1d8f5d39 100644
--- a/src/plugins/saved_objects_management/kibana.json
+++ b/src/plugins/saved_objects_management/kibana.json
@@ -5,5 +5,6 @@
"ui": true,
"requiredPlugins": ["home", "management", "data"],
"optionalPlugins": ["dashboard", "visualizations", "discover"],
- "extraPublicDirs": ["public/lib"]
+ "extraPublicDirs": ["public/lib"],
+ "requiredBundles": ["kibanaReact"]
}
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/table.test.tsx b/src/plugins/saved_objects_management/public/management_section/objects_table/components/table.test.tsx
index 6b209a62e1b98..6256e5fcd49c5 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/components/table.test.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/table.test.tsx
@@ -21,7 +21,7 @@ import React from 'react';
import { shallowWithI18nProvider, mountWithI18nProvider } from 'test_utils/enzyme_helpers';
// @ts-expect-error
import { findTestSubject } from '@elastic/eui/lib/test';
-import { keyCodes } from '@elastic/eui';
+import { keys } from '@elastic/eui';
import { httpServiceMock } from '../../../../../../core/public/mocks';
import { actionServiceMock } from '../../../services/action_service.mock';
import { Table, TableProps } from './table';
@@ -100,14 +100,14 @@ describe('Table', () => {
const searchBar = findTestSubject(component, 'savedObjectSearchBar');
// Send invalid query
- searchBar.simulate('keyup', { keyCode: keyCodes.ENTER, target: { value: '?' } });
+ searchBar.simulate('keyup', { key: keys.ENTER, target: { value: '?' } });
expect(onQueryChangeMock).toHaveBeenCalledTimes(0);
expect(component.state().isSearchTextValid).toBe(false);
onQueryChangeMock.mockReset();
// Send valid query to ensure component can recover from invalid query
- searchBar.simulate('keyup', { keyCode: keyCodes.ENTER, target: { value: 'I am valid' } });
+ searchBar.simulate('keyup', { key: keys.ENTER, target: { value: 'I am valid' } });
expect(onQueryChangeMock).toHaveBeenCalledTimes(1);
expect(component.state().isSearchTextValid).toBe(true);
});
diff --git a/src/plugins/share/kibana.json b/src/plugins/share/kibana.json
index dce2ac9281aba..7760ea321992d 100644
--- a/src/plugins/share/kibana.json
+++ b/src/plugins/share/kibana.json
@@ -2,5 +2,6 @@
"id": "share",
"version": "kibana",
"server": true,
- "ui": true
+ "ui": true,
+ "requiredBundles": ["kibanaUtils"]
}
diff --git a/src/plugins/telemetry/kibana.json b/src/plugins/telemetry/kibana.json
index a497597762520..520ca6076dbbd 100644
--- a/src/plugins/telemetry/kibana.json
+++ b/src/plugins/telemetry/kibana.json
@@ -9,5 +9,9 @@
],
"extraPublicDirs": [
"common/constants"
+ ],
+ "requiredBundles": [
+ "kibanaUtils",
+ "kibanaReact"
]
}
diff --git a/src/plugins/tile_map/kibana.json b/src/plugins/tile_map/kibana.json
index bb8ef5a246549..9881a2dd72308 100644
--- a/src/plugins/tile_map/kibana.json
+++ b/src/plugins/tile_map/kibana.json
@@ -11,5 +11,10 @@
"mapsLegacy",
"kibanaLegacy",
"data"
+ ],
+ "requiredBundles": [
+ "kibanaUtils",
+ "kibanaReact",
+ "charts"
]
}
diff --git a/src/plugins/ui_actions/kibana.json b/src/plugins/ui_actions/kibana.json
index 907cbabbdf9c9..7b24b3cc5c48b 100644
--- a/src/plugins/ui_actions/kibana.json
+++ b/src/plugins/ui_actions/kibana.json
@@ -5,5 +5,8 @@
"ui": true,
"extraPublicDirs": [
"public/tests/test_samples"
+ ],
+ "requiredBundles": [
+ "kibanaReact"
]
}
diff --git a/src/plugins/usage_collection/kibana.json b/src/plugins/usage_collection/kibana.json
index ae86b6c5d7ad1..6ef78018c7d7f 100644
--- a/src/plugins/usage_collection/kibana.json
+++ b/src/plugins/usage_collection/kibana.json
@@ -3,5 +3,8 @@
"configPath": ["usageCollection"],
"version": "kibana",
"server": true,
- "ui": true
+ "ui": true,
+ "requiredBundles": [
+ "kibanaUtils"
+ ]
}
diff --git a/src/plugins/vis_default_editor/public/components/sidebar/sidebar.tsx b/src/plugins/vis_default_editor/public/components/sidebar/sidebar.tsx
index c41315e7bc0dc..bcbc5afec1fdc 100644
--- a/src/plugins/vis_default_editor/public/components/sidebar/sidebar.tsx
+++ b/src/plugins/vis_default_editor/public/components/sidebar/sidebar.tsx
@@ -20,7 +20,7 @@
import React, { useMemo, useState, useCallback, KeyboardEventHandler, useEffect } from 'react';
import { get, isEqual } from 'lodash';
import { i18n } from '@kbn/i18n';
-import { keyCodes, EuiButtonIcon, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
+import { keys, EuiButtonIcon, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
import { EventEmitter } from 'events';
import {
@@ -119,7 +119,7 @@ function DefaultEditorSideBar({
const onSubmit: KeyboardEventHandler = useCallback(
(event) => {
- if (event.ctrlKey && event.keyCode === keyCodes.ENTER) {
+ if (event.ctrlKey && event.key === keys.ENTER) {
event.preventDefault();
event.stopPropagation();
diff --git a/src/plugins/vis_type_markdown/kibana.json b/src/plugins/vis_type_markdown/kibana.json
index d52e22118ccf0..9241f5eeee837 100644
--- a/src/plugins/vis_type_markdown/kibana.json
+++ b/src/plugins/vis_type_markdown/kibana.json
@@ -3,5 +3,6 @@
"version": "kibana",
"ui": true,
"server": true,
- "requiredPlugins": ["expressions", "visualizations"]
+ "requiredPlugins": ["expressions", "visualizations"],
+ "requiredBundles": ["kibanaUtils", "kibanaReact", "data", "charts"]
}
diff --git a/src/plugins/vis_type_metric/kibana.json b/src/plugins/vis_type_metric/kibana.json
index 24135d257b317..b2ebc91471e9d 100644
--- a/src/plugins/vis_type_metric/kibana.json
+++ b/src/plugins/vis_type_metric/kibana.json
@@ -4,5 +4,6 @@
"kibanaVersion": "kibana",
"server": true,
"ui": true,
- "requiredPlugins": ["data", "visualizations", "charts","expressions"]
+ "requiredPlugins": ["data", "visualizations", "charts","expressions"],
+ "requiredBundles": ["kibanaUtils", "kibanaReact"]
}
diff --git a/src/plugins/vis_type_metric/public/components/metric_vis_value.tsx b/src/plugins/vis_type_metric/public/components/metric_vis_value.tsx
index 79876377c8e44..267d92abe2c75 100644
--- a/src/plugins/vis_type_metric/public/components/metric_vis_value.tsx
+++ b/src/plugins/vis_type_metric/public/components/metric_vis_value.tsx
@@ -20,7 +20,7 @@
import React, { Component, KeyboardEvent } from 'react';
import classNames from 'classnames';
-import { EuiKeyboardAccessible, keyCodes } from '@elastic/eui';
+import { EuiKeyboardAccessible, keys } from '@elastic/eui';
import { MetricVisMetric } from '../types';
@@ -39,7 +39,7 @@ export class MetricVisValue extends Component {
};
onKeyPress = (event: KeyboardEvent) => {
- if (event.keyCode === keyCodes.ENTER) {
+ if (event.key === keys.ENTER) {
this.onClick();
}
};
diff --git a/src/plugins/vis_type_table/kibana.json b/src/plugins/vis_type_table/kibana.json
index ed098d7161403..b3c1556429077 100644
--- a/src/plugins/vis_type_table/kibana.json
+++ b/src/plugins/vis_type_table/kibana.json
@@ -8,5 +8,11 @@
"visualizations",
"data",
"kibanaLegacy"
+ ],
+ "requiredBundles": [
+ "kibanaUtils",
+ "kibanaReact",
+ "share",
+ "charts"
]
}
diff --git a/src/plugins/vis_type_tagcloud/kibana.json b/src/plugins/vis_type_tagcloud/kibana.json
index dbc9a1b9ef692..86f72ebfa936d 100644
--- a/src/plugins/vis_type_tagcloud/kibana.json
+++ b/src/plugins/vis_type_tagcloud/kibana.json
@@ -3,5 +3,6 @@
"version": "kibana",
"ui": true,
"server": true,
- "requiredPlugins": ["data", "expressions", "visualizations", "charts"]
+ "requiredPlugins": ["data", "expressions", "visualizations", "charts"],
+ "requiredBundles": ["kibanaUtils", "kibanaReact"]
}
diff --git a/src/plugins/vis_type_timelion/kibana.json b/src/plugins/vis_type_timelion/kibana.json
index 85c282c51a2e7..6946568f5d809 100644
--- a/src/plugins/vis_type_timelion/kibana.json
+++ b/src/plugins/vis_type_timelion/kibana.json
@@ -4,5 +4,6 @@
"kibanaVersion": "kibana",
"server": true,
"ui": true,
- "requiredPlugins": ["visualizations", "data", "expressions"]
+ "requiredPlugins": ["visualizations", "data", "expressions"],
+ "requiredBundles": ["kibanaUtils", "kibanaReact"]
}
diff --git a/src/plugins/vis_type_timeseries/kibana.json b/src/plugins/vis_type_timeseries/kibana.json
index 9053d2543e0d0..f2284726c463f 100644
--- a/src/plugins/vis_type_timeseries/kibana.json
+++ b/src/plugins/vis_type_timeseries/kibana.json
@@ -5,5 +5,6 @@
"server": true,
"ui": true,
"requiredPlugins": ["charts", "data", "expressions", "visualizations"],
- "optionalPlugins": ["usageCollection"]
+ "optionalPlugins": ["usageCollection"],
+ "requiredBundles": ["kibanaUtils", "kibanaReact"]
}
diff --git a/src/plugins/vis_type_timeseries/public/application/components/color_rules.test.js b/src/plugins/vis_type_timeseries/public/application/components/color_rules.test.js
index eae354f7cc8ec..db6024d48be12 100644
--- a/src/plugins/vis_type_timeseries/public/application/components/color_rules.test.js
+++ b/src/plugins/vis_type_timeseries/public/application/components/color_rules.test.js
@@ -20,7 +20,7 @@
import React from 'react';
import { collectionActions } from './lib/collection_actions';
import { ColorRules } from './color_rules';
-import { keyCodes } from '@elastic/eui';
+import { keys } from '@elastic/eui';
import { findTestSubject } from '@elastic/eui/lib/test';
import { mountWithIntl } from 'test_utils/enzyme_helpers';
@@ -63,9 +63,9 @@ describe('src/legacy/core_plugins/metrics/public/components/color_rules.test.js'
collectionActions.handleChange = jest.fn();
const wrapper = mountWithIntl();
const operatorInput = findTestSubject(wrapper, 'colorRuleOperator');
- operatorInput.simulate('keyDown', { keyCode: keyCodes.DOWN });
- operatorInput.simulate('keyDown', { keyCode: keyCodes.DOWN });
- operatorInput.simulate('keyDown', { keyCode: keyCodes.ENTER });
+ operatorInput.simulate('keyDown', { key: keys.ARROW_DOWN });
+ operatorInput.simulate('keyDown', { key: keys.ARROW_DOWN });
+ operatorInput.simulate('keyDown', { key: keys.ENTER });
expect(collectionActions.handleChange.mock.calls[0][1].operator).toEqual('gt');
const numberInput = findTestSubject(wrapper, 'colorRuleValue');
diff --git a/src/plugins/vis_type_timeseries/public/application/components/vis_editor_visualization.js b/src/plugins/vis_type_timeseries/public/application/components/vis_editor_visualization.js
index 23a9555da2452..9c2b947bda08e 100644
--- a/src/plugins/vis_type_timeseries/public/application/components/vis_editor_visualization.js
+++ b/src/plugins/vis_type_timeseries/public/application/components/vis_editor_visualization.js
@@ -19,7 +19,7 @@
import PropTypes from 'prop-types';
import React, { Component } from 'react';
import { get } from 'lodash';
-import { keyCodes, EuiFlexGroup, EuiFlexItem, EuiButton, EuiText, EuiSwitch } from '@elastic/eui';
+import { keys, EuiFlexGroup, EuiFlexItem, EuiButton, EuiText, EuiSwitch } from '@elastic/eui';
import { FormattedMessage, injectI18n } from '@kbn/i18n/react';
import {
getInterval,
@@ -96,11 +96,11 @@ class VisEditorVisualizationUI extends Component {
* defined minimum width (MIN_CHART_HEIGHT).
*/
onSizeHandleKeyDown = (ev) => {
- const { keyCode } = ev;
- if (keyCode === keyCodes.UP || keyCode === keyCodes.DOWN) {
+ const { key } = ev;
+ if (key === keys.ARROW_UP || key === keys.ARROW_DOWN) {
ev.preventDefault();
this.setState((prevState) => {
- const newHeight = prevState.height + (keyCode === keyCodes.UP ? -15 : 15);
+ const newHeight = prevState.height + (key === keys.ARROW_UP ? -15 : 15);
return {
height: Math.max(MIN_CHART_HEIGHT, newHeight),
};
diff --git a/src/plugins/vis_type_vega/kibana.json b/src/plugins/vis_type_vega/kibana.json
index f1f82e7f5b7ad..d7a92de627a99 100644
--- a/src/plugins/vis_type_vega/kibana.json
+++ b/src/plugins/vis_type_vega/kibana.json
@@ -3,5 +3,6 @@
"version": "kibana",
"server": true,
"ui": true,
- "requiredPlugins": ["data", "visualizations", "mapsLegacy", "expressions"]
+ "requiredPlugins": ["data", "visualizations", "mapsLegacy", "expressions"],
+ "requiredBundles": ["kibanaUtils", "kibanaReact"]
}
diff --git a/src/plugins/vis_type_vislib/kibana.json b/src/plugins/vis_type_vislib/kibana.json
index cad0ebe01494a..7cba2e0d6a6b4 100644
--- a/src/plugins/vis_type_vislib/kibana.json
+++ b/src/plugins/vis_type_vislib/kibana.json
@@ -4,5 +4,6 @@
"server": true,
"ui": true,
"requiredPlugins": ["charts", "data", "expressions", "visualizations", "kibanaLegacy"],
- "optionalPlugins": ["visTypeXy"]
+ "optionalPlugins": ["visTypeXy"],
+ "requiredBundles": ["kibanaUtils", "kibanaReact"]
}
diff --git a/src/plugins/vis_type_vislib/public/vislib/components/legend/legend.tsx b/src/plugins/vis_type_vislib/public/vislib/components/legend/legend.tsx
index f7e44ed278787..129fdd2ade9bd 100644
--- a/src/plugins/vis_type_vislib/public/vislib/components/legend/legend.tsx
+++ b/src/plugins/vis_type_vislib/public/vislib/components/legend/legend.tsx
@@ -21,7 +21,7 @@ import classNames from 'classnames';
import { compact, uniqBy, map, every, isUndefined } from 'lodash';
import { i18n } from '@kbn/i18n';
-import { EuiPopoverProps, EuiIcon, keyCodes, htmlIdGenerator } from '@elastic/eui';
+import { EuiPopoverProps, EuiIcon, keys, htmlIdGenerator } from '@elastic/eui';
import { getDataActions } from '../../../services';
import { CUSTOM_LEGEND_VIS_TYPES, LegendItem } from './models';
@@ -75,7 +75,7 @@ export class VisLegend extends PureComponent {
};
setColor = (label: string, color: string) => (event: BaseSyntheticEvent) => {
- if ((event as KeyboardEvent).keyCode && (event as KeyboardEvent).keyCode !== keyCodes.ENTER) {
+ if ((event as KeyboardEvent).key && (event as KeyboardEvent).key !== keys.ENTER) {
return;
}
@@ -106,11 +106,7 @@ export class VisLegend extends PureComponent {
};
toggleDetails = (label: string | null) => (event?: BaseSyntheticEvent) => {
- if (
- event &&
- (event as KeyboardEvent).keyCode &&
- (event as KeyboardEvent).keyCode !== keyCodes.ENTER
- ) {
+ if (event && (event as KeyboardEvent).key && (event as KeyboardEvent).key !== keys.ENTER) {
return;
}
this.setState({ selectedLabel: this.state.selectedLabel === label ? null : label });
diff --git a/src/plugins/vis_type_vislib/public/vislib/components/legend/legend_item.tsx b/src/plugins/vis_type_vislib/public/vislib/components/legend/legend_item.tsx
index 70b7a8ee335db..b440384899d5f 100644
--- a/src/plugins/vis_type_vislib/public/vislib/components/legend/legend_item.tsx
+++ b/src/plugins/vis_type_vislib/public/vislib/components/legend/legend_item.tsx
@@ -24,7 +24,7 @@ import { i18n } from '@kbn/i18n';
import { FormattedMessage } from '@kbn/i18n/react';
import {
EuiPopover,
- keyCodes,
+ keys,
EuiIcon,
EuiSpacer,
EuiButtonEmpty,
@@ -67,7 +67,7 @@ const VisLegendItemComponent = ({
* This will close the details panel of this legend entry when pressing Escape.
*/
const onLegendEntryKeydown = (event: KeyboardEvent) => {
- if (event.keyCode === keyCodes.ESCAPE) {
+ if (event.key === keys.ESCAPE) {
event.preventDefault();
event.stopPropagation();
onSelect(null)();
diff --git a/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/lib/chart_title.js b/src/plugins/vis_type_vislib/public/vislib/lib/chart_title.test.js
similarity index 73%
rename from src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/lib/chart_title.js
rename to src/plugins/vis_type_vislib/public/vislib/lib/chart_title.test.js
index 6790c49691dfd..d8d5087f8c380 100644
--- a/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/lib/chart_title.js
+++ b/src/plugins/vis_type_vislib/public/vislib/lib/chart_title.test.js
@@ -19,11 +19,15 @@
import d3 from 'd3';
import _ from 'lodash';
-import expect from '@kbn/expect';
+import {
+ setHTMLElementClientSizes,
+ setSVGElementGetBBox,
+ setSVGElementGetComputedTextLength,
+} from '../../../../../test_utils/public';
-import { ChartTitle } from '../../../../../../../plugins/vis_type_vislib/public/vislib/lib/chart_title';
-import { VisConfig } from '../../../../../../../plugins/vis_type_vislib/public/vislib/lib/vis_config';
-import { getMockUiState } from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mocks';
+import { ChartTitle } from './chart_title';
+import { VisConfig } from './vis_config';
+import { getMockUiState } from '../../fixtures/mocks';
describe('Vislib ChartTitle Class Test Suite', function () {
let mockUiState;
@@ -88,6 +92,16 @@ describe('Vislib ChartTitle Class Test Suite', function () {
yAxisLabel: 'Count',
};
+ let mockedHTMLElementClientSizes;
+ let mockedSVGElementGetBBox;
+ let mockedSVGElementGetComputedTextLength;
+
+ beforeAll(() => {
+ mockedHTMLElementClientSizes = setHTMLElementClientSizes(512, 512);
+ mockedSVGElementGetBBox = setSVGElementGetBBox(100);
+ mockedSVGElementGetComputedTextLength = setSVGElementGetComputedTextLength(100);
+ });
+
beforeEach(() => {
mockUiState = getMockUiState();
el = d3.select('body').append('div').attr('class', 'visWrapper').datum(data);
@@ -113,23 +127,29 @@ describe('Vislib ChartTitle Class Test Suite', function () {
el.remove();
});
+ afterAll(() => {
+ mockedHTMLElementClientSizes.mockRestore();
+ mockedSVGElementGetBBox.mockRestore();
+ mockedSVGElementGetComputedTextLength.mockRestore();
+ });
+
describe('render Method', function () {
beforeEach(function () {
chartTitle.render();
});
- it('should append an svg to div', function () {
- expect(el.select('.chart-title').selectAll('svg').length).to.be(1);
+ test('should append an svg to div', function () {
+ expect(el.select('.chart-title').selectAll('svg').length).toBe(1);
});
- it('should append text', function () {
- expect(!!el.select('.chart-title').selectAll('svg').selectAll('text')).to.be(true);
+ test('should append text', function () {
+ expect(!!el.select('.chart-title').selectAll('svg').selectAll('text')).toBe(true);
});
});
describe('draw Method', function () {
- it('should be a function', function () {
- expect(_.isFunction(chartTitle.draw())).to.be(true);
+ test('should be a function', function () {
+ expect(_.isFunction(chartTitle.draw())).toBe(true);
});
});
});
diff --git a/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/lib/dispatch.js b/src/plugins/vis_type_vislib/public/vislib/lib/dispatch.test.js
similarity index 67%
rename from src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/lib/dispatch.js
rename to src/plugins/vis_type_vislib/public/vislib/lib/dispatch.test.js
index 20281d8479ab4..9c714af4d8434 100644
--- a/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/lib/dispatch.js
+++ b/src/plugins/vis_type_vislib/public/vislib/lib/dispatch.test.js
@@ -19,13 +19,21 @@
import _ from 'lodash';
import d3 from 'd3';
-import expect from '@kbn/expect';
+import {
+ setHTMLElementClientSizes,
+ setSVGElementGetBBox,
+ setSVGElementGetComputedTextLength,
+} from '../../../../../test_utils/public';
// Data
-import data from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_series';
+import data from '../../fixtures/mock_data/date_histogram/_series';
-import { getMockUiState } from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mocks';
-import { getVis } from '../_vis_fixture';
+import { getMockUiState } from '../../fixtures/mocks';
+import { getVis } from '../visualizations/_vis_fixture';
+
+let mockedHTMLElementClientSizes;
+let mockedSVGElementGetBBox;
+let mockedSVGElementGetComputedTextLength;
describe('Vislib Dispatch Class Test Suite', function () {
function destroyVis(vis) {
@@ -36,6 +44,18 @@ describe('Vislib Dispatch Class Test Suite', function () {
return d3.select(element).data(new Array(n)).enter().append(type);
}
+ beforeAll(() => {
+ mockedHTMLElementClientSizes = setHTMLElementClientSizes(512, 512);
+ mockedSVGElementGetBBox = setSVGElementGetBBox(100);
+ mockedSVGElementGetComputedTextLength = setSVGElementGetComputedTextLength(100);
+ });
+
+ afterAll(() => {
+ mockedHTMLElementClientSizes.mockRestore();
+ mockedSVGElementGetBBox.mockRestore();
+ mockedSVGElementGetComputedTextLength.mockRestore();
+ });
+
describe('', function () {
let vis;
let mockUiState;
@@ -50,13 +70,13 @@ describe('Vislib Dispatch Class Test Suite', function () {
destroyVis(vis);
});
- it('implements on, off, emit methods', function () {
+ test('implements on, off, emit methods', function () {
const events = _.map(vis.handler.charts, 'events');
- expect(events.length).to.be.above(0);
+ expect(events.length).toBeGreaterThan(0);
events.forEach(function (dispatch) {
- expect(dispatch).to.have.property('on');
- expect(dispatch).to.have.property('off');
- expect(dispatch).to.have.property('emit');
+ expect(dispatch).toHaveProperty('on');
+ expect(dispatch).toHaveProperty('off');
+ expect(dispatch).toHaveProperty('emit');
});
});
});
@@ -77,15 +97,15 @@ describe('Vislib Dispatch Class Test Suite', function () {
});
describe('addEvent method', function () {
- it('returns a function that binds the passed event to a selection', function () {
+ test('returns a function that binds the passed event to a selection', function () {
const chart = _.first(vis.handler.charts);
const apply = chart.events.addEvent('event', _.noop);
- expect(apply).to.be.a('function');
+ expect(apply).toBeInstanceOf(Function);
const els = getEls(vis.element, 3, 'div');
apply(els);
els.each(function () {
- expect(d3.select(this).on('event')).to.be(_.noop);
+ expect(d3.select(this).on('event')).toBe(_.noop);
});
});
});
@@ -94,21 +114,21 @@ describe('Vislib Dispatch Class Test Suite', function () {
// checking that they return function which bind the events expected
function checkBoundAddMethod(name, event) {
describe(name + ' method', function () {
- it('should be a function', function () {
+ test('should be a function', function () {
vis.handler.charts.forEach(function (chart) {
- expect(chart.events[name]).to.be.a('function');
+ expect(chart.events[name]).toBeInstanceOf(Function);
});
});
- it('returns a function that binds ' + event + ' events to a selection', function () {
+ test('returns a function that binds ' + event + ' events to a selection', function () {
const chart = _.first(vis.handler.charts);
const apply = chart.events[name](chart.series[0].chartEl);
- expect(apply).to.be.a('function');
+ expect(apply).toBeInstanceOf(Function);
const els = getEls(vis.element, 3, 'div');
apply(els);
els.each(function () {
- expect(d3.select(this).on(event)).to.be.a('function');
+ expect(d3.select(this).on(event)).toBeInstanceOf(Function);
});
});
});
@@ -119,26 +139,26 @@ describe('Vislib Dispatch Class Test Suite', function () {
checkBoundAddMethod('addClickEvent', 'click');
describe('addMousePointer method', function () {
- it('should be a function', function () {
+ test('should be a function', function () {
vis.handler.charts.forEach(function (chart) {
const pointer = chart.events.addMousePointer;
- expect(_.isFunction(pointer)).to.be(true);
+ expect(_.isFunction(pointer)).toBe(true);
});
});
});
describe('clickEvent handler', () => {
describe('for pie chart', () => {
- it('prepares data points', () => {
+ test('prepares data points', () => {
const expectedResponse = [{ column: 0, row: 0, table: {}, value: 0 }];
const d = { rawData: { column: 0, row: 0, table: {}, value: 0 } };
const chart = _.first(vis.handler.charts);
const response = chart.events.clickEventResponse(d, { isSlices: true });
- expect(response.data).to.eql(expectedResponse);
+ expect(response.data).toEqual(expectedResponse);
});
- it('remove invalid points', () => {
+ test('remove invalid points', () => {
const expectedResponse = [{ column: 0, row: 0, table: {}, value: 0 }];
const d = {
rawData: { column: 0, row: 0, table: {}, value: 0 },
@@ -146,20 +166,20 @@ describe('Vislib Dispatch Class Test Suite', function () {
};
const chart = _.first(vis.handler.charts);
const response = chart.events.clickEventResponse(d, { isSlices: true });
- expect(response.data).to.eql(expectedResponse);
+ expect(response.data).toEqual(expectedResponse);
});
});
describe('for xy charts', () => {
- it('prepares data points', () => {
+ test('prepares data points', () => {
const expectedResponse = [{ column: 0, row: 0, table: {}, value: 0 }];
const d = { xRaw: { column: 0, row: 0, table: {}, value: 0 } };
const chart = _.first(vis.handler.charts);
const response = chart.events.clickEventResponse(d, { isSlices: false });
- expect(response.data).to.eql(expectedResponse);
+ expect(response.data).toEqual(expectedResponse);
});
- it('remove invalid points', () => {
+ test('remove invalid points', () => {
const expectedResponse = [{ column: 0, row: 0, table: {}, value: 0 }];
const d = {
xRaw: { column: 0, row: 0, table: {}, value: 0 },
@@ -167,35 +187,35 @@ describe('Vislib Dispatch Class Test Suite', function () {
};
const chart = _.first(vis.handler.charts);
const response = chart.events.clickEventResponse(d, { isSlices: false });
- expect(response.data).to.eql(expectedResponse);
+ expect(response.data).toEqual(expectedResponse);
});
});
});
});
describe('Custom event handlers', function () {
- it('should attach whatever gets passed on vis.on() to chart.events', function (done) {
+ test('should attach whatever gets passed on vis.on() to chart.events', function (done) {
const vis = getVis();
const mockUiState = getMockUiState();
vis.on('someEvent', _.noop);
vis.render(data, mockUiState);
vis.handler.charts.forEach(function (chart) {
- expect(chart.events.listenerCount('someEvent')).to.be(1);
+ expect(chart.events.listenerCount('someEvent')).toBe(1);
});
destroyVis(vis);
done();
});
- it('can be added after rendering', function () {
+ test('can be added after rendering', function () {
const vis = getVis();
const mockUiState = getMockUiState();
vis.render(data, mockUiState);
vis.on('someEvent', _.noop);
vis.handler.charts.forEach(function (chart) {
- expect(chart.events.listenerCount('someEvent')).to.be(1);
+ expect(chart.events.listenerCount('someEvent')).toBe(1);
});
destroyVis(vis);
diff --git a/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/lib/handler/handler.js b/src/plugins/vis_type_vislib/public/vislib/lib/handler.test.js
similarity index 58%
rename from src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/lib/handler/handler.js
rename to src/plugins/vis_type_vislib/public/vislib/lib/handler.test.js
index e4f75c47e621c..d50c70de1bb48 100644
--- a/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/lib/handler/handler.js
+++ b/src/plugins/vis_type_vislib/public/vislib/lib/handler.test.js
@@ -17,25 +17,38 @@
* under the License.
*/
-import expect from '@kbn/expect';
import $ from 'jquery';
+import {
+ setHTMLElementClientSizes,
+ setSVGElementGetBBox,
+ setSVGElementGetComputedTextLength,
+} from '../../../../../test_utils/public';
// Data
-import series from '../../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_series';
-import columns from '../../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_columns';
-import rows from '../../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_rows';
-import stackedSeries from '../../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_stacked_series';
-import { getMockUiState } from '../../../../../../../../plugins/vis_type_vislib/public/fixtures/mocks';
-import { getVis } from '../../_vis_fixture';
+import series from '../../fixtures/mock_data/date_histogram/_series';
+import columns from '../../fixtures/mock_data/date_histogram/_columns';
+import rows from '../../fixtures/mock_data/date_histogram/_rows';
+import stackedSeries from '../../fixtures/mock_data/date_histogram/_stacked_series';
+import { getMockUiState } from '../../fixtures/mocks';
+import { getVis } from '../visualizations/_vis_fixture';
const dateHistogramArray = [series, columns, rows, stackedSeries];
const names = ['series', 'columns', 'rows', 'stackedSeries'];
+let mockedHTMLElementClientSizes;
+let mockedSVGElementGetBBox;
+let mockedSVGElementGetComputedTextLength;
dateHistogramArray.forEach(function (data, i) {
describe('Vislib Handler Test Suite for ' + names[i] + ' Data', function () {
const events = ['click', 'brush'];
let vis;
+ beforeAll(() => {
+ mockedHTMLElementClientSizes = setHTMLElementClientSizes(512, 512);
+ mockedSVGElementGetBBox = setSVGElementGetBBox(100);
+ mockedSVGElementGetComputedTextLength = setSVGElementGetComputedTextLength(100);
+ });
+
beforeEach(() => {
vis = getVis();
vis.render(data, getMockUiState());
@@ -45,11 +58,17 @@ dateHistogramArray.forEach(function (data, i) {
vis.destroy();
});
+ afterAll(() => {
+ mockedHTMLElementClientSizes.mockRestore();
+ mockedSVGElementGetBBox.mockRestore();
+ mockedSVGElementGetComputedTextLength.mockRestore();
+ });
+
describe('render Method', function () {
- it('should render charts', function () {
- expect(vis.handler.charts.length).to.be.greaterThan(0);
+ test('should render charts', function () {
+ expect(vis.handler.charts.length).toBeGreaterThan(0);
vis.handler.charts.forEach(function (chart) {
- expect($(chart.chartEl).find('svg').length).to.be(1);
+ expect($(chart.chartEl).find('svg').length).toBe(1);
});
});
});
@@ -67,10 +86,10 @@ dateHistogramArray.forEach(function (data, i) {
});
});
- it('should add events to chart and emit to the Events class', function () {
+ test('should add events to chart and emit to the Events class', function () {
charts.forEach(function (chart) {
events.forEach(function (event) {
- expect(chart.events.listenerCount(event)).to.be.above(0);
+ expect(chart.events.listenerCount(event)).toBeGreaterThan(0);
});
});
});
@@ -89,10 +108,10 @@ dateHistogramArray.forEach(function (data, i) {
});
});
- it('should remove events from the chart', function () {
+ test('should remove events from the chart', function () {
charts.forEach(function (chart) {
events.forEach(function (event) {
- expect(chart.events.listenerCount(event)).to.be(0);
+ expect(chart.events.listenerCount(event)).toBe(0);
});
});
});
@@ -103,8 +122,8 @@ dateHistogramArray.forEach(function (data, i) {
vis.handler.removeAll(vis.element);
});
- it('should remove all DOM elements from the el', function () {
- expect($(vis.element).children().length).to.be(0);
+ test('should remove all DOM elements from the el', function () {
+ expect($(vis.element).children().length).toBe(0);
});
});
@@ -113,9 +132,9 @@ dateHistogramArray.forEach(function (data, i) {
vis.handler.error('This is an error!');
});
- it('should return an error classed DOM element with a text message', function () {
- expect($(vis.element).find('.error').length).to.be(1);
- expect($('.error h4').html()).to.be('This is an error!');
+ test('should return an error classed DOM element with a text message', function () {
+ expect($(vis.element).find('.error').length).toBe(1);
+ expect($('.error h4').html()).toBe('This is an error!');
});
});
@@ -124,21 +143,21 @@ dateHistogramArray.forEach(function (data, i) {
vis.handler.destroy();
});
- it('should destroy all the charts in the visualization', function () {
- expect(vis.handler.charts.length).to.be(0);
+ test('should destroy all the charts in the visualization', function () {
+ expect(vis.handler.charts.length).toBe(0);
});
});
describe('event proxying', function () {
- it('should only pass the original event object to downstream handlers', function (done) {
+ test('should only pass the original event object to downstream handlers', function (done) {
const event = {};
const chart = vis.handler.charts[0];
const mockEmitter = function () {
const args = Array.from(arguments);
- expect(args.length).to.be(2);
- expect(args[0]).to.be('click');
- expect(args[1]).to.be(event);
+ expect(args.length).toBe(2);
+ expect(args[0]).toBe('click');
+ expect(args[1]).toBe(event);
done();
};
diff --git a/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/lib/layout/layout.js b/src/plugins/vis_type_vislib/public/vislib/lib/layout/layout.test.js
similarity index 55%
rename from src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/lib/layout/layout.js
rename to src/plugins/vis_type_vislib/public/vislib/lib/layout/layout.test.js
index 7ad962fefc341..824d7073d6db5 100644
--- a/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/lib/layout/layout.js
+++ b/src/plugins/vis_type_vislib/public/vislib/lib/layout/layout.test.js
@@ -18,22 +18,30 @@
*/
import d3 from 'd3';
-import expect from '@kbn/expect';
import $ from 'jquery';
+import {
+ setHTMLElementClientSizes,
+ setSVGElementGetBBox,
+ setSVGElementGetComputedTextLength,
+} from '../../../../../../test_utils/public';
// Data
-import series from '../../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_series';
-import columns from '../../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_columns';
-import rows from '../../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_rows';
-import stackedSeries from '../../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_stacked_series';
-import { getMockUiState } from '../../../../../../../../plugins/vis_type_vislib/public/fixtures/mocks';
-import { Layout } from '../../../../../../../../plugins/vis_type_vislib/public/vislib/lib/layout/layout';
-import { VisConfig } from '../../../../../../../../plugins/vis_type_vislib/public/vislib/lib/vis_config';
-import { getVis } from '../../_vis_fixture';
+import series from '../../../fixtures/mock_data/date_histogram/_series';
+import columns from '../../../fixtures/mock_data/date_histogram/_columns';
+import rows from '../../../fixtures/mock_data/date_histogram/_rows';
+import stackedSeries from '../../../fixtures/mock_data/date_histogram/_stacked_series';
+import { getMockUiState } from '../../../fixtures/mocks';
+import { Layout } from './layout';
+import { VisConfig } from '../vis_config';
+import { getVis } from '../../visualizations/_vis_fixture';
const dateHistogramArray = [series, columns, rows, stackedSeries];
const names = ['series', 'columns', 'rows', 'stackedSeries'];
+let mockedHTMLElementClientSizes;
+let mockedSVGElementGetBBox;
+let mockedSVGElementGetComputedTextLength;
+
dateHistogramArray.forEach(function (data, i) {
describe('Vislib Layout Class Test Suite for ' + names[i] + ' Data', function () {
let vis;
@@ -41,6 +49,12 @@ dateHistogramArray.forEach(function (data, i) {
let numberOfCharts;
let testLayout;
+ beforeAll(() => {
+ mockedHTMLElementClientSizes = setHTMLElementClientSizes(512, 512);
+ mockedSVGElementGetBBox = setSVGElementGetBBox(100);
+ mockedSVGElementGetComputedTextLength = setSVGElementGetComputedTextLength(100);
+ });
+
beforeEach(() => {
vis = getVis();
mockUiState = getMockUiState();
@@ -52,19 +66,25 @@ dateHistogramArray.forEach(function (data, i) {
vis.destroy();
});
+ afterAll(() => {
+ mockedHTMLElementClientSizes.mockRestore();
+ mockedSVGElementGetBBox.mockRestore();
+ mockedSVGElementGetComputedTextLength.mockRestore();
+ });
+
describe('createLayout Method', function () {
- it('should append all the divs', function () {
- expect($(vis.element).find('.visWrapper').length).to.be(1);
- expect($(vis.element).find('.visAxis--y').length).to.be(2);
- expect($(vis.element).find('.visWrapper__column').length).to.be(1);
- expect($(vis.element).find('.visAxis__column--y').length).to.be(2);
- expect($(vis.element).find('.y-axis-title').length).to.be.above(0);
- expect($(vis.element).find('.visAxis__splitAxes--y').length).to.be(2);
- expect($(vis.element).find('.visAxis__spacer--y').length).to.be(4);
- expect($(vis.element).find('.visWrapper__chart').length).to.be(numberOfCharts);
- expect($(vis.element).find('.visAxis--x').length).to.be(2);
- expect($(vis.element).find('.visAxis__splitAxes--x').length).to.be(2);
- expect($(vis.element).find('.x-axis-title').length).to.be.above(0);
+ test('should append all the divs', function () {
+ expect($(vis.element).find('.visWrapper').length).toBe(1);
+ expect($(vis.element).find('.visAxis--y').length).toBe(2);
+ expect($(vis.element).find('.visWrapper__column').length).toBe(1);
+ expect($(vis.element).find('.visAxis__column--y').length).toBe(2);
+ expect($(vis.element).find('.y-axis-title').length).toBeGreaterThan(0);
+ expect($(vis.element).find('.visAxis__splitAxes--y').length).toBe(2);
+ expect($(vis.element).find('.visAxis__spacer--y').length).toBe(4);
+ expect($(vis.element).find('.visWrapper__chart').length).toBe(numberOfCharts);
+ expect($(vis.element).find('.visAxis--x').length).toBe(2);
+ expect($(vis.element).find('.visAxis__splitAxes--x').length).toBe(2);
+ expect($(vis.element).find('.x-axis-title').length).toBeGreaterThan(0);
});
});
@@ -82,44 +102,44 @@ dateHistogramArray.forEach(function (data, i) {
testLayout = new Layout(visConfig);
});
- it('should append a div with the correct class name', function () {
- expect($(vis.element).find('.chart').length).to.be(numberOfCharts);
+ test('should append a div with the correct class name', function () {
+ expect($(vis.element).find('.chart').length).toBe(numberOfCharts);
});
- it('should bind data to the DOM element', function () {
- expect(!!$(vis.element).find('.chart').data()).to.be(true);
+ test('should bind data to the DOM element', function () {
+ expect(!!$(vis.element).find('.chart').data()).toBe(true);
});
- it('should create children', function () {
- expect(typeof $(vis.element).find('.x-axis-div')).to.be('object');
+ test('should create children', function () {
+ expect(typeof $(vis.element).find('.x-axis-div')).toBe('object');
});
- it('should call split function when provided', function () {
- expect(typeof $(vis.element).find('.x-axis-div')).to.be('object');
+ test('should call split function when provided', function () {
+ expect(typeof $(vis.element).find('.x-axis-div')).toBe('object');
});
- it('should throw errors when incorrect arguments provided', function () {
+ test('should throw errors when incorrect arguments provided', function () {
expect(function () {
testLayout.layout({
parent: vis.element,
type: undefined,
class: 'chart',
});
- }).to.throwError();
+ }).toThrowError();
expect(function () {
testLayout.layout({
type: 'div',
class: 'chart',
});
- }).to.throwError();
+ }).toThrowError();
expect(function () {
testLayout.layout({
parent: 'histogram',
type: 'div',
});
- }).to.throwError();
+ }).toThrowError();
expect(function () {
testLayout.layout({
@@ -129,7 +149,7 @@ dateHistogramArray.forEach(function (data, i) {
},
class: 'chart',
});
- }).to.throwError();
+ }).toThrowError();
});
});
@@ -139,9 +159,9 @@ dateHistogramArray.forEach(function (data, i) {
vis.handler.layout.appendElem('.visChart', 'div', 'test');
});
- it('should append DOM element to el with a class name', function () {
- expect(typeof $(vis.element).find('.column')).to.be('object');
- expect(typeof $(vis.element).find('.test')).to.be('object');
+ test('should append DOM element to el with a class name', function () {
+ expect(typeof $(vis.element).find('.column')).toBe('object');
+ expect(typeof $(vis.element).find('.test')).toBe('object');
});
});
@@ -151,8 +171,8 @@ dateHistogramArray.forEach(function (data, i) {
vis.handler.layout.removeAll(vis.element);
});
- it('should remove all DOM elements from the el', function () {
- expect($(vis.element).children().length).to.be(0);
+ test('should remove all DOM elements from the el', function () {
+ expect($(vis.element).children().length).toBe(0);
});
});
});
diff --git a/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/vis.js b/src/plugins/vis_type_vislib/public/vislib/vis.test.js
similarity index 56%
rename from src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/vis.js
rename to src/plugins/vis_type_vislib/public/vislib/vis.test.js
index 36decdc415ed8..0c4fac97ccb9c 100644
--- a/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/vis.js
+++ b/src/plugins/vis_type_vislib/public/vislib/vis.test.js
@@ -19,18 +19,25 @@
import _ from 'lodash';
import $ from 'jquery';
-import expect from '@kbn/expect';
-
-import series from '../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_series';
-import columns from '../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_columns';
-import rows from '../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_rows';
-import stackedSeries from '../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_stacked_series';
-import { getMockUiState } from '../../../../../../plugins/vis_type_vislib/public/fixtures/mocks';
-import { getVis } from './_vis_fixture';
+import {
+ setHTMLElementClientSizes,
+ setSVGElementGetBBox,
+ setSVGElementGetComputedTextLength,
+} from '../../../../test_utils/public';
+import series from '../fixtures/mock_data/date_histogram/_series';
+import columns from '../fixtures/mock_data/date_histogram/_columns';
+import rows from '../fixtures/mock_data/date_histogram/_rows';
+import stackedSeries from '../fixtures/mock_data/date_histogram/_stacked_series';
+import { getMockUiState } from '../fixtures/mocks';
+import { getVis } from './visualizations/_vis_fixture';
const dataArray = [series, columns, rows, stackedSeries];
const names = ['series', 'columns', 'rows', 'stackedSeries'];
+let mockedHTMLElementClientSizes;
+let mockedSVGElementGetBBox;
+let mockedSVGElementGetComputedTextLength;
+
dataArray.forEach(function (data, i) {
describe('Vislib Vis Test Suite for ' + names[i] + ' Data', function () {
const beforeEvent = 'click';
@@ -40,6 +47,12 @@ dataArray.forEach(function (data, i) {
let secondVis;
let numberOfCharts;
+ beforeAll(() => {
+ mockedHTMLElementClientSizes = setHTMLElementClientSizes(512, 512);
+ mockedSVGElementGetBBox = setSVGElementGetBBox(100);
+ mockedSVGElementGetComputedTextLength = setSVGElementGetComputedTextLength(100);
+ });
+
beforeEach(() => {
vis = getVis();
secondVis = getVis();
@@ -51,34 +64,40 @@ dataArray.forEach(function (data, i) {
secondVis.destroy();
});
+ afterAll(() => {
+ mockedHTMLElementClientSizes.mockRestore();
+ mockedSVGElementGetBBox.mockRestore();
+ mockedSVGElementGetComputedTextLength.mockRestore();
+ });
+
describe('render Method', function () {
beforeEach(function () {
vis.render(data, mockUiState);
numberOfCharts = vis.handler.charts.length;
});
- it('should bind data to this object', function () {
- expect(_.isObject(vis.data)).to.be(true);
+ test('should bind data to this object', function () {
+ expect(_.isObject(vis.data)).toBe(true);
});
- it('should instantiate a handler object', function () {
- expect(_.isObject(vis.handler)).to.be(true);
+ test('should instantiate a handler object', function () {
+ expect(_.isObject(vis.handler)).toBe(true);
});
- it('should append a chart', function () {
- expect($('.chart').length).to.be(numberOfCharts);
+ test('should append a chart', function () {
+ expect($('.chart').length).toBe(numberOfCharts);
});
- it('should throw an error if no data is provided', function () {
+ test('should throw an error if no data is provided', function () {
expect(function () {
vis.render(null, mockUiState);
- }).to.throwError();
+ }).toThrowError();
});
});
describe('getLegendColors method', () => {
- it('should return null if no colors are defined', () => {
- expect(vis.getLegendColors()).to.equal(null);
+ test('should return null if no colors are defined', () => {
+ expect(vis.getLegendColors()).toEqual(null);
});
});
@@ -89,12 +108,12 @@ dataArray.forEach(function (data, i) {
secondVis.destroy();
});
- it('should remove all DOM elements from el', function () {
- expect($(secondVis.el).find('.visWrapper').length).to.be(0);
+ test('should remove all DOM elements from el', function () {
+ expect($(secondVis.el).find('.visWrapper').length).toBe(0);
});
- it('should not remove visualizations that have not been destroyed', function () {
- expect($(vis.element).find('.visWrapper').length).to.be(1);
+ test('should not remove visualizations that have not been destroyed', function () {
+ expect($(vis.element).find('.visWrapper').length).toBe(1);
});
});
@@ -105,9 +124,9 @@ dataArray.forEach(function (data, i) {
vis.set('offset', 'wiggle');
});
- it('should set an attribute', function () {
- expect(vis.get('addLegend')).to.be(false);
- expect(vis.get('offset')).to.be('wiggle');
+ test('should set an attribute', function () {
+ expect(vis.get('addLegend')).toBe(false);
+ expect(vis.get('offset')).toBe('wiggle');
});
});
@@ -116,10 +135,10 @@ dataArray.forEach(function (data, i) {
vis.render(data, mockUiState);
});
- it('should get attribute values', function () {
- expect(vis.get('addLegend')).to.be(true);
- expect(vis.get('addTooltip')).to.be(true);
- expect(vis.get('type')).to.be('point_series');
+ test('should get attribute values', function () {
+ expect(vis.get('addLegend')).toBe(true);
+ expect(vis.get('addTooltip')).toBe(true);
+ expect(vis.get('type')).toBe('point_series');
});
});
@@ -148,22 +167,22 @@ dataArray.forEach(function (data, i) {
vis.removeAllListeners(afterEvent);
});
- it('should add an event and its listeners', function () {
+ test('should add an event and its listeners', function () {
listeners.forEach(function (listener) {
- expect(vis.listeners(beforeEvent)).to.contain(listener);
+ expect(vis.listeners(beforeEvent)).toContain(listener);
});
listeners.forEach(function (listener) {
- expect(vis.listeners(afterEvent)).to.contain(listener);
+ expect(vis.listeners(afterEvent)).toContain(listener);
});
});
- it('should cause a listener for each event to be attached to each chart', function () {
+ test('should cause a listener for each event to be attached to each chart', function () {
const charts = vis.handler.charts;
charts.forEach(function (chart) {
- expect(chart.events.listenerCount(beforeEvent)).to.be.above(0);
- expect(chart.events.listenerCount(afterEvent)).to.be.above(0);
+ expect(chart.events.listenerCount(beforeEvent)).toBeGreaterThan(0);
+ expect(chart.events.listenerCount(afterEvent)).toBeGreaterThan(0);
});
});
});
@@ -205,45 +224,45 @@ dataArray.forEach(function (data, i) {
vis.removeAllListeners(afterEvent);
});
- it('should remove a listener', function () {
+ test('should remove a listener', function () {
const charts = vis.handler.charts;
- expect(vis.listeners(beforeEvent)).to.not.contain(listener1);
- expect(vis.listeners(beforeEvent)).to.contain(listener2);
+ expect(vis.listeners(beforeEvent)).not.toContain(listener1);
+ expect(vis.listeners(beforeEvent)).toContain(listener2);
- expect(vis.listeners(afterEvent)).to.not.contain(listener1);
- expect(vis.listeners(afterEvent)).to.contain(listener2);
+ expect(vis.listeners(afterEvent)).not.toContain(listener1);
+ expect(vis.listeners(afterEvent)).toContain(listener2);
// Events should still be attached to charts
charts.forEach(function (chart) {
- expect(chart.events.listenerCount(beforeEvent)).to.be.above(0);
- expect(chart.events.listenerCount(afterEvent)).to.be.above(0);
+ expect(chart.events.listenerCount(beforeEvent)).toBeGreaterThan(0);
+ expect(chart.events.listenerCount(afterEvent)).toBeGreaterThan(0);
});
});
- it('should remove the event and all listeners when only event passed an argument', function () {
+ test('should remove the event and all listeners when only event passed an argument', function () {
const charts = vis.handler.charts;
vis.removeAllListeners(afterEvent);
// should remove 'brush' event
- expect(vis.listeners(beforeEvent)).to.contain(listener2);
- expect(vis.listeners(afterEvent)).to.not.contain(listener2);
+ expect(vis.listeners(beforeEvent)).toContain(listener2);
+ expect(vis.listeners(afterEvent)).not.toContain(listener2);
// should remove the event from the charts
charts.forEach(function (chart) {
- expect(chart.events.listenerCount(beforeEvent)).to.be.above(0);
- expect(chart.events.listenerCount(afterEvent)).to.be(0);
+ expect(chart.events.listenerCount(beforeEvent)).toBeGreaterThan(0);
+ expect(chart.events.listenerCount(afterEvent)).toBe(0);
});
});
- it('should remove the event from the chart when the last listener is removed', function () {
+ test('should remove the event from the chart when the last listener is removed', function () {
const charts = vis.handler.charts;
vis.off(afterEvent, listener2);
- expect(vis.listenerCount(afterEvent)).to.be(0);
+ expect(vis.listenerCount(afterEvent)).toBe(0);
charts.forEach(function (chart) {
- expect(chart.events.listenerCount(afterEvent)).to.be(0);
+ expect(chart.events.listenerCount(afterEvent)).toBe(0);
});
});
});
diff --git a/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/_vis_fixture.js b/src/plugins/vis_type_vislib/public/vislib/visualizations/_vis_fixture.js
similarity index 83%
rename from src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/_vis_fixture.js
rename to src/plugins/vis_type_vislib/public/vislib/visualizations/_vis_fixture.js
index 7a68e847f13b1..0ffa53fc7ca9c 100644
--- a/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/_vis_fixture.js
+++ b/src/plugins/vis_type_vislib/public/vislib/visualizations/_vis_fixture.js
@@ -19,11 +19,10 @@
import _ from 'lodash';
import $ from 'jquery';
+import { coreMock } from '../../../../../core/public/mocks';
+import { chartPluginMock } from '../../../../charts/public/mocks';
-import { Vis } from '../../../../../../plugins/vis_type_vislib/public/vislib/vis';
-
-// TODO: Remove when converted to jest mocks
-import { ColorsService } from '../../../../../../plugins/charts/public/services';
+import { Vis } from '../vis';
const $visCanvas = $('')
.attr('id', 'vislib-vis-fixtures')
@@ -55,15 +54,12 @@ afterEach(function () {
});
const getDeps = () => {
- const uiSettings = new Map();
- const colors = new ColorsService();
- colors.init(uiSettings);
+ const mockUiSettings = coreMock.createSetup().uiSettings;
+ const charts = chartPluginMock.createStartContract();
return {
- uiSettings,
- charts: {
- colors,
- },
+ uiSettings: mockUiSettings,
+ charts: charts,
};
};
diff --git a/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/visualizations/chart.js b/src/plugins/vis_type_vislib/public/vislib/visualizations/chart.test.js
similarity index 77%
rename from src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/visualizations/chart.js
rename to src/plugins/vis_type_vislib/public/vislib/visualizations/chart.test.js
index 2b41ce5d1a5c6..94c9693819b69 100644
--- a/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/visualizations/chart.js
+++ b/src/plugins/vis_type_vislib/public/vislib/visualizations/chart.test.js
@@ -18,11 +18,10 @@
*/
import d3 from 'd3';
-import expect from '@kbn/expect';
-
-import { Chart } from '../../../../../../../plugins/vis_type_vislib/public/vislib/visualizations/_chart';
-import { getMockUiState } from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mocks';
-import { getVis } from '../_vis_fixture';
+import { setHTMLElementClientSizes, setSVGElementGetBBox } from '../../../../../test_utils/public';
+import { Chart } from './_chart';
+import { getMockUiState } from '../../fixtures/mocks';
+import { getVis } from './_vis_fixture';
describe('Vislib _chart Test Suite', function () {
let vis;
@@ -106,6 +105,14 @@ describe('Vislib _chart Test Suite', function () {
yAxisLabel: 'Count',
};
+ let mockedHTMLElementClientSizes;
+ let mockedSVGElementGetBBox;
+
+ beforeAll(() => {
+ mockedHTMLElementClientSizes = setHTMLElementClientSizes(512, 512);
+ mockedSVGElementGetBBox = setSVGElementGetBBox(100);
+ });
+
beforeEach(() => {
el = d3.select('body').append('div').attr('class', 'column-chart');
@@ -127,11 +134,16 @@ describe('Vislib _chart Test Suite', function () {
vis.destroy();
});
- it('should be a constructor for visualization modules', function () {
- expect(myChart instanceof Chart).to.be(true);
+ afterAll(() => {
+ mockedHTMLElementClientSizes.mockRestore();
+ mockedSVGElementGetBBox.mockRestore();
+ });
+
+ test('should be a constructor for visualization modules', function () {
+ expect(myChart instanceof Chart).toBe(true);
});
- it('should have a render method', function () {
- expect(typeof myChart.render === 'function').to.be(true);
+ test('should have a render method', function () {
+ expect(typeof myChart.render === 'function').toBe(true);
});
});
diff --git a/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/visualizations/gauge_chart.js b/src/plugins/vis_type_vislib/public/vislib/visualizations/gauge_chart.test.js
similarity index 65%
rename from src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/visualizations/gauge_chart.js
rename to src/plugins/vis_type_vislib/public/vislib/visualizations/gauge_chart.test.js
index 7c588800ae659..6fdc2a134b820 100644
--- a/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/visualizations/gauge_chart.js
+++ b/src/plugins/vis_type_vislib/public/vislib/visualizations/gauge_chart.test.js
@@ -19,11 +19,11 @@
import $ from 'jquery';
import _ from 'lodash';
-import expect from '@kbn/expect';
+import { setHTMLElementClientSizes, setSVGElementGetBBox } from '../../../../../test_utils/public';
-import data from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/terms/_series_multiple';
-import { getMockUiState } from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mocks';
-import { getVis } from '../_vis_fixture';
+import data from '../../fixtures/mock_data/terms/_series_multiple';
+import { getMockUiState } from '../../fixtures/mocks';
+import { getVis } from './_vis_fixture';
describe('Vislib Gauge Chart Test Suite', function () {
let vis;
@@ -82,6 +82,14 @@ describe('Vislib Gauge Chart Test Suite', function () {
chartEl = vis.handler.charts[0].chartEl;
}
+ let mockedHTMLElementClientSizes;
+ let mockedSVGElementGetBBox;
+
+ beforeAll(() => {
+ mockedHTMLElementClientSizes = setHTMLElementClientSizes(512, 512);
+ mockedSVGElementGetBBox = setSVGElementGetBBox(100);
+ });
+
beforeEach(() => {
generateVis();
});
@@ -91,55 +99,60 @@ describe('Vislib Gauge Chart Test Suite', function () {
$('.visChart').remove();
});
- it('creates meter gauge', function () {
- expect($(chartEl).find('svg').length).to.equal(5);
- expect($(chartEl).find('svg > g > g > text').text()).to.equal('2820231918357341352');
+ afterAll(function () {
+ mockedHTMLElementClientSizes.mockRestore();
+ mockedSVGElementGetBBox.mockRestore();
+ });
+
+ test('creates meter gauge', function () {
+ expect($(chartEl).find('svg').length).toEqual(5);
+ expect($(chartEl).find('svg > g > g > text').text()).toEqual('2820231918357341352');
});
- it('creates circle gauge', function () {
+ test('creates circle gauge', function () {
generateVis({
gauge: {
minAngle: 0,
maxAngle: 2 * Math.PI,
},
});
- expect($(chartEl).find('svg').length).to.equal(5);
+ expect($(chartEl).find('svg').length).toEqual(5);
});
- it('creates gauge with automatic mode', function () {
+ test('creates gauge with automatic mode', function () {
generateVis({
gauge: {
alignment: 'automatic',
},
});
- expect($(chartEl).find('svg').width()).to.equal(197);
+ expect($(chartEl).find('svg')[0].getAttribute('width')).toEqual('97');
});
- it('creates gauge with vertical mode', function () {
+ test('creates gauge with vertical mode', function () {
generateVis({
gauge: {
alignment: 'vertical',
},
});
- expect($(chartEl).find('svg').width()).to.equal($(chartEl).width());
+ expect($(chartEl).find('svg').width()).toEqual($(chartEl).width());
});
- it('applies range settings correctly', function () {
+ test('applies range settings correctly', function () {
const paths = $(chartEl).find('svg > g > g:nth-child(1) > path:nth-child(2)');
const fills = [];
paths.each(function () {
fills.push(this.style.fill);
});
- expect(fills).to.eql([
- 'rgb(165, 0, 38)',
- 'rgb(255, 255, 190)',
- 'rgb(255, 255, 190)',
- 'rgb(0, 104, 55)',
- 'rgb(0, 104, 55)',
+ expect(fills).toEqual([
+ 'rgb(165,0,38)',
+ 'rgb(255,255,190)',
+ 'rgb(255,255,190)',
+ 'rgb(0,104,55)',
+ 'rgb(0,104,55)',
]);
});
- it('applies color schema correctly', function () {
+ test('applies color schema correctly', function () {
generateVis({
gauge: {
colorSchema: 'Blues',
@@ -150,12 +163,12 @@ describe('Vislib Gauge Chart Test Suite', function () {
paths.each(function () {
fills.push(this.style.fill);
});
- expect(fills).to.eql([
- 'rgb(8, 48, 107)',
- 'rgb(107, 174, 214)',
- 'rgb(107, 174, 214)',
- 'rgb(247, 251, 255)',
- 'rgb(247, 251, 255)',
+ expect(fills).toEqual([
+ 'rgb(8,48,107)',
+ 'rgb(107,174,214)',
+ 'rgb(107,174,214)',
+ 'rgb(247,251,255)',
+ 'rgb(247,251,255)',
]);
});
});
diff --git a/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/visualizations/pie_chart.js b/src/plugins/vis_type_vislib/public/vislib/visualizations/pie_chart.test.js
similarity index 65%
rename from src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/visualizations/pie_chart.js
rename to src/plugins/vis_type_vislib/public/vislib/visualizations/pie_chart.test.js
index d245905729c7e..e2da33d0808ba 100644
--- a/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/visualizations/pie_chart.js
+++ b/src/plugins/vis_type_vislib/public/vislib/visualizations/pie_chart.test.js
@@ -20,16 +20,25 @@
import d3 from 'd3';
import _ from 'lodash';
import $ from 'jquery';
-import expect from '@kbn/expect';
-
-import { getMockUiState } from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mocks';
-import { getVis } from '../_vis_fixture';
+import {
+ setHTMLElementClientSizes,
+ setSVGElementGetBBox,
+ setSVGElementGetComputedTextLength,
+} from '../../../../../test_utils/public';
+import { getMockUiState } from '../../fixtures/mocks';
+import { getVis } from './_vis_fixture';
import { pieChartMockData } from './pie_chart_mock_data';
const names = ['rows', 'columns', 'slices'];
const sizes = [0, 5, 15, 30, 60, 120];
+let mockedHTMLElementClientSizes = {};
+let mockWidth;
+let mockHeight;
+let mockedSVGElementGetBBox;
+let mockedSVGElementGetComputedTextLength;
+
describe('No global chart settings', function () {
const visLibParams1 = {
el: '
',
@@ -40,6 +49,14 @@ describe('No global chart settings', function () {
let chart1;
let mockUiState;
+ beforeAll(() => {
+ mockedHTMLElementClientSizes = setHTMLElementClientSizes(512, 512);
+ mockedSVGElementGetBBox = setSVGElementGetBBox(100);
+ mockedSVGElementGetComputedTextLength = setSVGElementGetComputedTextLength(100);
+ mockWidth = jest.spyOn($.prototype, 'width').mockReturnValue(120);
+ mockHeight = jest.spyOn($.prototype, 'height').mockReturnValue(120);
+ });
+
beforeEach(() => {
chart1 = getVis(visLibParams1);
mockUiState = getMockUiState();
@@ -53,8 +70,16 @@ describe('No global chart settings', function () {
chart1.destroy();
});
- it('should render chart titles for all charts', function () {
- expect($(chart1.element).find('.visAxis__splitTitles--y').length).to.be(1);
+ afterAll(() => {
+ mockedHTMLElementClientSizes.mockRestore();
+ mockedSVGElementGetBBox.mockRestore();
+ mockedSVGElementGetComputedTextLength.mockRestore();
+ mockWidth.mockRestore();
+ mockHeight.mockRestore();
+ });
+
+ test('should render chart titles for all charts', function () {
+ expect($(chart1.element).find('.visAxis__splitTitles--y').length).toBe(1);
});
describe('_validatePieData method', function () {
@@ -76,24 +101,54 @@ describe('No global chart settings', function () {
{ slices: { children: [{}] } },
];
- it('should throw an error when all charts contain zeros', function () {
+ test('should throw an error when all charts contain zeros', function () {
expect(function () {
chart1.handler.ChartClass.prototype._validatePieData(allZeros);
- }).to.throwError();
+ }).toThrowError();
});
- it('should not throw an error when only some or no charts contain zeros', function () {
+ test('should not throw an error when only some or no charts contain zeros', function () {
expect(function () {
chart1.handler.ChartClass.prototype._validatePieData(someZeros);
- }).to.not.throwError();
+ }).not.toThrowError();
expect(function () {
chart1.handler.ChartClass.prototype._validatePieData(noZeros);
- }).to.not.throwError();
+ }).not.toThrowError();
});
});
});
describe('Vislib PieChart Class Test Suite', function () {
+ beforeAll(() => {
+ mockedHTMLElementClientSizes = setHTMLElementClientSizes(512, 512);
+ mockedSVGElementGetBBox = setSVGElementGetBBox(100);
+ mockedSVGElementGetComputedTextLength = setSVGElementGetComputedTextLength(100);
+ let width = 120;
+ let height = 120;
+ const mockWidth = jest.spyOn($.prototype, 'width');
+ mockWidth.mockImplementation((size) => {
+ if (size === undefined) {
+ return width;
+ }
+ width = size;
+ });
+ const mockHeight = jest.spyOn($.prototype, 'height');
+ mockHeight.mockImplementation((size) => {
+ if (size === undefined) {
+ return height;
+ }
+ height = size;
+ });
+ });
+
+ afterAll(() => {
+ mockedHTMLElementClientSizes.mockRestore();
+ mockedSVGElementGetBBox.mockRestore();
+ mockedSVGElementGetComputedTextLength.mockRestore();
+ mockWidth.mockRestore();
+ mockHeight.mockRestore();
+ });
+
['rowData', 'columnData', 'sliceData'].forEach(function (aggItem, i) {
describe('Vislib PieChart Class Test Suite for ' + names[i] + ' data', function () {
const mockPieData = pieChartMockData[aggItem];
@@ -132,15 +187,15 @@ describe('Vislib PieChart Class Test Suite', function () {
});
});
- it('should attach a click event', function () {
+ test('should attach a click event', function () {
vis.handler.charts.forEach(function () {
- expect(onClick).to.be(true);
+ expect(onClick).toBe(true);
});
});
- it('should attach a hover event', function () {
+ test('should attach a hover event', function () {
vis.handler.charts.forEach(function () {
- expect(onMouseOver).to.be(true);
+ expect(onMouseOver).toBe(true);
});
});
});
@@ -151,25 +206,25 @@ describe('Vislib PieChart Class Test Suite', function () {
let svg;
let slices;
- it('should return an SVG object', function () {
+ test('should return an SVG object', function () {
vis.handler.charts.forEach(function (chart) {
$(chart.chartEl).find('svg').empty();
width = $(chart.chartEl).width();
height = $(chart.chartEl).height();
svg = d3.select($(chart.chartEl).find('svg')[0]);
slices = chart.chartData.slices;
- expect(_.isObject(chart.addPath(width, height, svg, slices))).to.be(true);
+ expect(_.isObject(chart.addPath(width, height, svg, slices))).toBe(true);
});
});
- it('should draw path elements', function () {
+ test('should draw path elements', function () {
vis.handler.charts.forEach(function (chart) {
// test whether path elements are drawn
- expect($(chart.chartEl).find('path').length).to.be.greaterThan(0);
+ expect($(chart.chartEl).find('path').length).toBeGreaterThan(0);
});
});
- it('should draw labels', function () {
+ test('should draw labels', function () {
vis.handler.charts.forEach(function (chart) {
$(chart.chartEl).find('svg').empty();
width = $(chart.chartEl).width();
@@ -178,22 +233,22 @@ describe('Vislib PieChart Class Test Suite', function () {
slices = chart.chartData.slices;
chart._attr.labels.show = true;
chart.addPath(width, height, svg, slices);
- expect($(chart.chartEl).find('text.label-text').length).to.be.greaterThan(0);
+ expect($(chart.chartEl).find('text.label-text').length).toBeGreaterThan(0);
});
});
});
describe('draw method', function () {
- it('should return a function', function () {
+ test('should return a function', function () {
vis.handler.charts.forEach(function (chart) {
- expect(_.isFunction(chart.draw())).to.be(true);
+ expect(_.isFunction(chart.draw())).toBe(true);
});
});
});
sizes.forEach(function (size) {
describe('containerTooSmall error', function () {
- it('should throw an error', function () {
+ test('should throw an error', function () {
// 20px is the minimum height and width
vis.handler.charts.forEach(function (chart) {
$(chart.chartEl).height(size);
@@ -202,12 +257,12 @@ describe('Vislib PieChart Class Test Suite', function () {
if (size < 20) {
expect(function () {
chart.render();
- }).to.throwError();
+ }).toThrowError();
}
});
});
- it('should not throw an error', function () {
+ test('should not throw an error', function () {
vis.handler.charts.forEach(function (chart) {
$(chart.chartEl).height(size);
$(chart.chartEl).width(size);
@@ -215,7 +270,7 @@ describe('Vislib PieChart Class Test Suite', function () {
if (size > 20) {
expect(function () {
chart.render();
- }).to.not.throwError();
+ }).not.toThrowError();
}
});
});
diff --git a/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/visualizations/pie_chart_mock_data.js b/src/plugins/vis_type_vislib/public/vislib/visualizations/pie_chart_mock_data.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/visualizations/pie_chart_mock_data.js
rename to src/plugins/vis_type_vislib/public/vislib/visualizations/pie_chart_mock_data.js
diff --git a/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/visualizations/area_chart.js b/src/plugins/vis_type_vislib/public/vislib/visualizations/point_series/area_chart.test.js
similarity index 64%
rename from src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/visualizations/area_chart.js
rename to src/plugins/vis_type_vislib/public/vislib/visualizations/point_series/area_chart.test.js
index fd2240c0c64c5..3cd58060978ee 100644
--- a/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/visualizations/area_chart.js
+++ b/src/plugins/vis_type_vislib/public/vislib/visualizations/point_series/area_chart.test.js
@@ -20,18 +20,22 @@
import d3 from 'd3';
import _ from 'lodash';
import $ from 'jquery';
-import expect from '@kbn/expect';
+import {
+ setHTMLElementClientSizes,
+ setSVGElementGetBBox,
+ setSVGElementGetComputedTextLength,
+} from '../../../../../../test_utils/public';
-import { getMockUiState } from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mocks';
+import { getMockUiState } from '../../../fixtures/mocks';
import { getVis } from '../_vis_fixture';
const dataTypesArray = {
- 'series pos': require('../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_series'),
- 'series pos neg': require('../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_series_pos_neg'),
- 'series neg': require('../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_series_neg'),
- 'term columns': require('../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/terms/_columns'),
- 'range rows': require('../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/range/_rows'),
- stackedSeries: require('../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_stacked_series'),
+ 'series pos': import('../../../fixtures/mock_data/date_histogram/_series'),
+ 'series pos neg': import('../../../fixtures/mock_data/date_histogram/_series_pos_neg'),
+ 'series neg': import('../../../fixtures/mock_data/date_histogram/_series_neg'),
+ 'term columns': import('../../../fixtures/mock_data/terms/_columns'),
+ 'range rows': import('../../../fixtures/mock_data/range/_rows'),
+ stackedSeries: import('../../../fixtures/mock_data/date_histogram/_stacked_series'),
};
const visLibParams = {
@@ -41,22 +45,38 @@ const visLibParams = {
mode: 'stacked',
};
+let mockedHTMLElementClientSizes;
+let mockedSVGElementGetBBox;
+let mockedSVGElementGetComputedTextLength;
+
_.forOwn(dataTypesArray, function (dataType, dataTypeName) {
describe('Vislib Area Chart Test Suite for ' + dataTypeName + ' Data', function () {
let vis;
let mockUiState;
- beforeEach(() => {
+ beforeAll(() => {
+ mockedHTMLElementClientSizes = setHTMLElementClientSizes(512, 512);
+ mockedSVGElementGetBBox = setSVGElementGetBBox(100);
+ mockedSVGElementGetComputedTextLength = setSVGElementGetComputedTextLength(100);
+ });
+
+ beforeEach(async () => {
vis = getVis(visLibParams);
mockUiState = getMockUiState();
vis.on('brush', _.noop);
- vis.render(dataType, mockUiState);
+ vis.render(await dataType, mockUiState);
});
afterEach(function () {
vis.destroy();
});
+ afterAll(() => {
+ mockedHTMLElementClientSizes.mockRestore();
+ mockedSVGElementGetBBox.mockRestore();
+ mockedSVGElementGetComputedTextLength.mockRestore();
+ });
+
describe('stackData method', function () {
let stackedData;
let isStacked;
@@ -73,15 +93,15 @@ _.forOwn(dataTypesArray, function (dataType, dataTypeName) {
});
});
- it('should append a d.y0 key to the data object', function () {
- expect(isStacked).to.be(true);
+ test('should append a d.y0 key to the data object', function () {
+ expect(isStacked).toBe(true);
});
});
describe('addPath method', function () {
- it('should append a area paths', function () {
+ test('should append a area paths', function () {
vis.handler.charts.forEach(function (chart) {
- expect($(chart.chartEl).find('path').length).to.be.greaterThan(0);
+ expect($(chart.chartEl).find('path').length).toBeGreaterThan(0);
});
});
});
@@ -101,9 +121,9 @@ _.forOwn(dataTypesArray, function (dataType, dataTypeName) {
});
});
- it('should attach a hover event', function () {
+ test('should attach a hover event', function () {
vis.handler.charts.forEach(function () {
- expect(onMouseOver).to.be(true);
+ expect(onMouseOver).toBe(true);
});
});
});
@@ -134,33 +154,33 @@ _.forOwn(dataTypesArray, function (dataType, dataTypeName) {
// listeners, however, I was not able to test for the listener
// function being present. I will need to update this test
// in the future.
- it('should attach a brush g element', function () {
+ test('should attach a brush g element', function () {
vis.handler.charts.forEach(function () {
- expect(onBrush).to.be(true);
+ expect(onBrush).toBe(true);
});
});
- it('should attach a click event', function () {
+ test('should attach a click event', function () {
vis.handler.charts.forEach(function () {
- expect(onClick).to.be(true);
+ expect(onClick).toBe(true);
});
});
- it('should attach a hover event', function () {
+ test('should attach a hover event', function () {
vis.handler.charts.forEach(function () {
- expect(onMouseOver).to.be(true);
+ expect(onMouseOver).toBe(true);
});
});
});
describe('addCircles method', function () {
- it('should append circles', function () {
+ test('should append circles', function () {
vis.handler.charts.forEach(function (chart) {
- expect($(chart.chartEl).find('circle').length).to.be.greaterThan(0);
+ expect($(chart.chartEl).find('circle').length).toBeGreaterThan(0);
});
});
- it('should not draw circles where d.y === 0', function () {
+ test('should not draw circles where d.y === 0', function () {
vis.handler.charts.forEach(function (chart) {
const series = chart.chartData.series;
const isZero = series.some(function (d) {
@@ -172,80 +192,80 @@ _.forOwn(dataTypesArray, function (dataType, dataTypeName) {
});
if (isZero) {
- expect(isNotDrawn).to.be(false);
+ expect(isNotDrawn).toBe(false);
}
});
});
});
describe('draw method', function () {
- it('should return a function', function () {
+ test('should return a function', function () {
vis.handler.charts.forEach(function (chart) {
- expect(_.isFunction(chart.draw())).to.be(true);
+ expect(_.isFunction(chart.draw())).toBe(true);
});
});
- it('should return a yMin and yMax', function () {
+ test('should return a yMin and yMax', function () {
vis.handler.charts.forEach(function (chart) {
const yAxis = chart.handler.valueAxes[0];
const domain = yAxis.getScale().domain();
- expect(domain[0]).to.not.be(undefined);
- expect(domain[1]).to.not.be(undefined);
+ expect(domain[0]).not.toBe(undefined);
+ expect(domain[1]).not.toBe(undefined);
});
});
- it('should render a zero axis line', function () {
+ test('should render a zero axis line', function () {
vis.handler.charts.forEach(function (chart) {
const yAxis = chart.handler.valueAxes[0];
if (yAxis.yMin < 0 && yAxis.yMax > 0) {
- expect($(chart.chartEl).find('line.zero-line').length).to.be(1);
+ expect($(chart.chartEl).find('line.zero-line').length).toBe(1);
}
});
});
});
describe('defaultYExtents is true', function () {
- beforeEach(function () {
+ beforeEach(async function () {
vis.visConfigArgs.defaultYExtents = true;
- vis.render(dataType, mockUiState);
+ vis.render(await dataType, mockUiState);
});
- it('should return yAxis extents equal to data extents', function () {
+ test('should return yAxis extents equal to data extents', function () {
vis.handler.charts.forEach(function (chart) {
const yAxis = chart.handler.valueAxes[0];
const min = vis.handler.valueAxes[0].axisScale.getYMin();
const max = vis.handler.valueAxes[0].axisScale.getYMax();
const domain = yAxis.getScale().domain();
- expect(domain[0]).to.equal(min);
- expect(domain[1]).to.equal(max);
+ expect(domain[0]).toEqual(min);
+ expect(domain[1]).toEqual(max);
});
});
});
[0, 2, 4, 8].forEach(function (boundsMarginValue) {
describe('defaultYExtents is true and boundsMargin is defined', function () {
- beforeEach(function () {
+ beforeEach(async function () {
vis.visConfigArgs.defaultYExtents = true;
vis.visConfigArgs.boundsMargin = boundsMarginValue;
- vis.render(dataType, mockUiState);
+ vis.render(await dataType, mockUiState);
});
- it('should return yAxis extents equal to data extents with boundsMargin', function () {
+ test('should return yAxis extents equal to data extents with boundsMargin', function () {
vis.handler.charts.forEach(function (chart) {
const yAxis = chart.handler.valueAxes[0];
const min = vis.handler.valueAxes[0].axisScale.getYMin();
const max = vis.handler.valueAxes[0].axisScale.getYMax();
const domain = yAxis.getScale().domain();
if (min < 0 && max < 0) {
- expect(domain[0]).to.equal(min);
- expect(domain[1] - boundsMarginValue).to.equal(max);
+ expect(domain[0]).toEqual(min);
+ expect(domain[1] - boundsMarginValue).toEqual(max);
} else if (min > 0 && max > 0) {
- expect(domain[0] + boundsMarginValue).to.equal(min);
- expect(domain[1]).to.equal(max);
+ expect(domain[0] + boundsMarginValue).toEqual(min);
+ expect(domain[1]).toEqual(max);
} else {
- expect(domain[0]).to.equal(min);
- expect(domain[1]).to.equal(max);
+ expect(domain[0]).toEqual(min);
+ expect(domain[1]).toEqual(max);
}
});
});
diff --git a/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/visualizations/column_chart.js b/src/plugins/vis_type_vislib/public/vislib/visualizations/point_series/column_chart.test.js
similarity index 59%
rename from src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/visualizations/column_chart.js
rename to src/plugins/vis_type_vislib/public/vislib/visualizations/point_series/column_chart.test.js
index 6b7ccaed25d49..f3d8d66df2d85 100644
--- a/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/visualizations/column_chart.js
+++ b/src/plugins/vis_type_vislib/public/vislib/visualizations/point_series/column_chart.test.js
@@ -20,20 +20,24 @@
import _ from 'lodash';
import d3 from 'd3';
import $ from 'jquery';
-import expect from '@kbn/expect';
+import {
+ setHTMLElementClientSizes,
+ setSVGElementGetBBox,
+ setSVGElementGetComputedTextLength,
+} from '../../../../../../test_utils/public';
// Data
-import series from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_series';
-import seriesPosNeg from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_series_pos_neg';
-import seriesNeg from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_series_neg';
-import termsColumns from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/terms/_columns';
-import histogramRows from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/histogram/_rows';
-import stackedSeries from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_stacked_series';
-
-import { seriesMonthlyInterval } from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_series_monthly_interval';
-import { rowsSeriesWithHoles } from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_rows_series_with_holes';
-import rowsWithZeros from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_rows';
-import { getMockUiState } from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mocks';
+import series from '../../../fixtures/mock_data/date_histogram/_series';
+import seriesPosNeg from '../../../fixtures/mock_data/date_histogram/_series_pos_neg';
+import seriesNeg from '../../../fixtures/mock_data/date_histogram/_series_neg';
+import termsColumns from '../../../fixtures/mock_data/terms/_columns';
+import histogramRows from '../../../fixtures/mock_data/histogram/_rows';
+import stackedSeries from '../../../fixtures/mock_data/date_histogram/_stacked_series';
+
+import { seriesMonthlyInterval } from '../../../fixtures/mock_data/date_histogram/_series_monthly_interval';
+import { rowsSeriesWithHoles } from '../../../fixtures/mock_data/date_histogram/_rows_series_with_holes';
+import rowsWithZeros from '../../../fixtures/mock_data/date_histogram/_rows';
+import { getMockUiState } from '../../../fixtures/mocks';
import { getVis } from '../_vis_fixture';
// tuple, with the format [description, mode, data]
@@ -46,6 +50,10 @@ const dataTypesArray = [
['stackedSeries', 'stacked', stackedSeries],
];
+let mockedHTMLElementClientSizes;
+let mockedSVGElementGetBBox;
+let mockedSVGElementGetComputedTextLength;
+
dataTypesArray.forEach(function (dataType) {
const name = dataType[0];
const mode = dataType[1];
@@ -66,6 +74,12 @@ dataTypesArray.forEach(function (dataType) {
},
};
+ beforeAll(() => {
+ mockedHTMLElementClientSizes = setHTMLElementClientSizes(512, 512);
+ mockedSVGElementGetBBox = setSVGElementGetBBox(100);
+ mockedSVGElementGetComputedTextLength = setSVGElementGetComputedTextLength(100);
+ });
+
beforeEach(() => {
vis = getVis(visLibParams);
mockUiState = getMockUiState();
@@ -77,6 +91,12 @@ dataTypesArray.forEach(function (dataType) {
vis.destroy();
});
+ afterAll(() => {
+ mockedHTMLElementClientSizes.mockRestore();
+ mockedSVGElementGetBBox.mockRestore();
+ mockedSVGElementGetComputedTextLength.mockRestore();
+ });
+
describe('stackData method', function () {
let stackedData;
let isStacked;
@@ -93,21 +113,21 @@ dataTypesArray.forEach(function (dataType) {
});
});
- it('should stack values when mode is stacked', function () {
+ test('should stack values when mode is stacked', function () {
if (mode === 'stacked') {
- expect(isStacked).to.be(true);
+ expect(isStacked).toBe(true);
}
});
- it('should stack values when mode is percentage', function () {
+ test('should stack values when mode is percentage', function () {
if (mode === 'percentage') {
- expect(isStacked).to.be(true);
+ expect(isStacked).toBe(true);
}
});
});
describe('addBars method', function () {
- it('should append rects', function () {
+ test('should append rects', function () {
let numOfSeries;
let numOfValues;
let product;
@@ -116,7 +136,7 @@ dataTypesArray.forEach(function (dataType) {
numOfSeries = chart.chartData.series.length;
numOfValues = chart.chartData.series[0].values.length;
product = numOfSeries * numOfValues;
- expect($(chart.chartEl).find('.series rect')).to.have.length(product);
+ expect($(chart.chartEl).find('.series rect')).toHaveLength(product);
});
});
});
@@ -138,53 +158,53 @@ dataTypesArray.forEach(function (dataType) {
};
}
- it('should attach the brush if data is a set is ordered', function () {
+ test('should attach the brush if data is a set is ordered', function () {
vis.handler.charts.forEach(function (chart) {
const has = checkChart(chart);
const ordered = vis.handler.data.get('ordered');
const allowBrushing = Boolean(ordered);
- expect(has.brush).to.be(allowBrushing);
+ expect(has.brush).toBe(allowBrushing);
});
});
- it('should attach a click event', function () {
+ test('should attach a click event', function () {
vis.handler.charts.forEach(function (chart) {
const has = checkChart(chart);
- expect(has.click).to.be(true);
+ expect(has.click).toBe(true);
});
});
- it('should attach a hover event', function () {
+ test('should attach a hover event', function () {
vis.handler.charts.forEach(function (chart) {
const has = checkChart(chart);
- expect(has.mouseOver).to.be(true);
+ expect(has.mouseOver).toBe(true);
});
});
});
describe('draw method', function () {
- it('should return a function', function () {
+ test('should return a function', function () {
vis.handler.charts.forEach(function (chart) {
- expect(_.isFunction(chart.draw())).to.be(true);
+ expect(_.isFunction(chart.draw())).toBe(true);
});
});
- it('should return a yMin and yMax', function () {
+ test('should return a yMin and yMax', function () {
vis.handler.charts.forEach(function (chart) {
const yAxis = chart.handler.valueAxes[0];
const domain = yAxis.getScale().domain();
- expect(domain[0]).to.not.be(undefined);
- expect(domain[1]).to.not.be(undefined);
+ expect(domain[0]).not.toBe(undefined);
+ expect(domain[1]).not.toBe(undefined);
});
});
- it('should render a zero axis line', function () {
+ test('should render a zero axis line', function () {
vis.handler.charts.forEach(function (chart) {
const yAxis = chart.handler.valueAxes[0];
if (yAxis.yMin < 0 && yAxis.yMax > 0) {
- expect($(chart.chartEl).find('line.zero-line').length).to.be(1);
+ expect($(chart.chartEl).find('line.zero-line').length).toBe(1);
}
});
});
@@ -196,14 +216,14 @@ dataTypesArray.forEach(function (dataType) {
vis.render(data, mockUiState);
});
- it('should return yAxis extents equal to data extents', function () {
+ test('should return yAxis extents equal to data extents', function () {
vis.handler.charts.forEach(function (chart) {
const yAxis = chart.handler.valueAxes[0];
const min = vis.handler.valueAxes[0].axisScale.getYMin();
const max = vis.handler.valueAxes[0].axisScale.getYMax();
const domain = yAxis.getScale().domain();
- expect(domain[0]).to.equal(min);
- expect(domain[1]).to.equal(max);
+ expect(domain[0]).toEqual(min);
+ expect(domain[1]).toEqual(max);
});
});
});
@@ -215,21 +235,21 @@ dataTypesArray.forEach(function (dataType) {
vis.render(data, mockUiState);
});
- it('should return yAxis extents equal to data extents with boundsMargin', function () {
+ test('should return yAxis extents equal to data extents with boundsMargin', function () {
vis.handler.charts.forEach(function (chart) {
const yAxis = chart.handler.valueAxes[0];
const min = vis.handler.valueAxes[0].axisScale.getYMin();
const max = vis.handler.valueAxes[0].axisScale.getYMax();
const domain = yAxis.getScale().domain();
if (min < 0 && max < 0) {
- expect(domain[0]).to.equal(min);
- expect(domain[1] - boundsMarginValue).to.equal(max);
+ expect(domain[0]).toEqual(min);
+ expect(domain[1] - boundsMarginValue).toEqual(max);
} else if (min > 0 && max > 0) {
- expect(domain[0] + boundsMarginValue).to.equal(min);
- expect(domain[1]).to.equal(max);
+ expect(domain[0] + boundsMarginValue).toEqual(min);
+ expect(domain[1]).toEqual(max);
} else {
- expect(domain[0]).to.equal(min);
- expect(domain[1]).to.equal(max);
+ expect(domain[0]).toEqual(min);
+ expect(domain[1]).toEqual(max);
}
});
});
@@ -249,6 +269,12 @@ describe('stackData method - data set with zeros in percentage mode', function (
zeroFill: true,
};
+ beforeAll(() => {
+ mockedHTMLElementClientSizes = setHTMLElementClientSizes(512, 512);
+ mockedSVGElementGetBBox = setSVGElementGetBBox(100);
+ mockedSVGElementGetComputedTextLength = setSVGElementGetComputedTextLength(100);
+ });
+
beforeEach(() => {
vis = getVis(visLibParams);
mockUiState = getMockUiState();
@@ -259,29 +285,35 @@ describe('stackData method - data set with zeros in percentage mode', function (
vis.destroy();
});
- it('should not mutate the injected zeros', function () {
+ afterAll(() => {
+ mockedHTMLElementClientSizes.mockRestore();
+ mockedSVGElementGetBBox.mockRestore();
+ mockedSVGElementGetComputedTextLength.mockRestore();
+ });
+
+ test('should not mutate the injected zeros', function () {
vis.render(seriesMonthlyInterval, mockUiState);
- expect(vis.handler.charts).to.have.length(1);
+ expect(vis.handler.charts).toHaveLength(1);
const chart = vis.handler.charts[0];
- expect(chart.chartData.series).to.have.length(1);
+ expect(chart.chartData.series).toHaveLength(1);
const series = chart.chartData.series[0].values;
// with the interval set in seriesMonthlyInterval data, the point at x=1454309600000 does not exist
const point = _.find(series, ['x', 1454309600000]);
- expect(point).to.not.be(undefined);
- expect(point.y).to.be(0);
+ expect(point).not.toBe(undefined);
+ expect(point.y).toBe(0);
});
- it('should not mutate zeros that exist in the data', function () {
+ test('should not mutate zeros that exist in the data', function () {
vis.render(rowsWithZeros, mockUiState);
- expect(vis.handler.charts).to.have.length(2);
+ expect(vis.handler.charts).toHaveLength(2);
const chart = vis.handler.charts[0];
- expect(chart.chartData.series).to.have.length(5);
+ expect(chart.chartData.series).toHaveLength(5);
const series = chart.chartData.series[0].values;
const point = _.find(series, ['x', 1415826240000]);
- expect(point).to.not.be(undefined);
- expect(point.y).to.be(0);
+ expect(point).not.toBe(undefined);
+ expect(point.y).toBe(0);
});
});
@@ -296,6 +328,12 @@ describe('datumWidth - split chart data set with holes', function () {
zeroFill: true,
};
+ beforeAll(() => {
+ mockedHTMLElementClientSizes = setHTMLElementClientSizes(512, 512);
+ mockedSVGElementGetBBox = setSVGElementGetBBox(100);
+ mockedSVGElementGetComputedTextLength = setSVGElementGetComputedTextLength(100);
+ });
+
beforeEach(() => {
vis = getVis(visLibParams);
mockUiState = getMockUiState();
@@ -307,14 +345,20 @@ describe('datumWidth - split chart data set with holes', function () {
vis.destroy();
});
- it('should not have bar widths that span multiple time bins', function () {
- expect(vis.handler.charts.length).to.equal(1);
+ afterAll(() => {
+ mockedHTMLElementClientSizes.mockRestore();
+ mockedSVGElementGetBBox.mockRestore();
+ mockedSVGElementGetComputedTextLength.mockRestore();
+ });
+
+ test('should not have bar widths that span multiple time bins', function () {
+ expect(vis.handler.charts.length).toEqual(1);
const chart = vis.handler.charts[0];
const rects = $(chart.chartEl).find('.series rect');
const MAX_WIDTH_IN_PIXELS = 27;
rects.each(function () {
- const width = $(this).attr('width');
- expect(width).to.be.lessThan(MAX_WIDTH_IN_PIXELS);
+ const width = parseInt($(this).attr('width'), 10);
+ expect(width).toBeLessThan(MAX_WIDTH_IN_PIXELS);
});
});
});
@@ -330,6 +374,15 @@ describe('datumWidth - monthly interval', function () {
zeroFill: true,
};
+ let mockWidth;
+
+ beforeAll(() => {
+ mockedHTMLElementClientSizes = setHTMLElementClientSizes(512, 512);
+ mockedSVGElementGetBBox = setSVGElementGetBBox(100);
+ mockedSVGElementGetComputedTextLength = setSVGElementGetComputedTextLength(100);
+ mockWidth = jest.spyOn($.prototype, 'width').mockReturnValue(900);
+ });
+
beforeEach(() => {
vis = getVis(visLibParams);
mockUiState = getMockUiState();
@@ -341,12 +394,19 @@ describe('datumWidth - monthly interval', function () {
vis.destroy();
});
- it('should vary bar width when date histogram intervals are not equal', function () {
- expect(vis.handler.charts.length).to.equal(1);
+ afterAll(() => {
+ mockedHTMLElementClientSizes.mockRestore();
+ mockedSVGElementGetBBox.mockRestore();
+ mockedSVGElementGetComputedTextLength.mockRestore();
+ mockWidth.mockRestore();
+ });
+
+ test('should vary bar width when date histogram intervals are not equal', function () {
+ expect(vis.handler.charts.length).toEqual(1);
const chart = vis.handler.charts[0];
const rects = $(chart.chartEl).find('.series rect');
- const januaryBarWidth = $(rects.get(0)).attr('width');
- const februaryBarWidth = $(rects.get(1)).attr('width');
- expect(februaryBarWidth).to.be.lessThan(januaryBarWidth);
+ const januaryBarWidth = parseInt($(rects.get(0)).attr('width'), 10);
+ const februaryBarWidth = parseInt($(rects.get(1)).attr('width'), 10);
+ expect(februaryBarWidth).toBeLessThan(januaryBarWidth);
});
});
diff --git a/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/visualizations/heatmap_chart.js b/src/plugins/vis_type_vislib/public/vislib/visualizations/point_series/heatmap_chart.test.js
similarity index 65%
rename from src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/visualizations/heatmap_chart.js
rename to src/plugins/vis_type_vislib/public/vislib/visualizations/point_series/heatmap_chart.test.js
index 9fa51fb59ed48..8c727d225c6c3 100644
--- a/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/visualizations/heatmap_chart.js
+++ b/src/plugins/vis_type_vislib/public/vislib/visualizations/point_series/heatmap_chart.test.js
@@ -20,15 +20,19 @@
import _ from 'lodash';
import $ from 'jquery';
import d3 from 'd3';
-import expect from '@kbn/expect';
+import {
+ setHTMLElementClientSizes,
+ setSVGElementGetBBox,
+ setSVGElementGetComputedTextLength,
+} from '../../../../../../test_utils/public';
// Data
-import series from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_series';
-import seriesPosNeg from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_series_pos_neg';
-import seriesNeg from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_series_neg';
-import termsColumns from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/terms/_columns';
-import stackedSeries from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_stacked_series';
-import { getMockUiState } from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mocks';
+import series from '../../../fixtures/mock_data/date_histogram/_series';
+import seriesPosNeg from '../../../fixtures/mock_data/date_histogram/_series_pos_neg';
+import seriesNeg from '../../../fixtures/mock_data/date_histogram/_series_neg';
+import termsColumns from '../../../fixtures/mock_data/terms/_columns';
+import stackedSeries from '../../../fixtures/mock_data/date_histogram/_stacked_series';
+import { getMockUiState } from '../../../fixtures/mocks';
import { getVis } from '../_vis_fixture';
// tuple, with the format [description, mode, data]
@@ -40,7 +44,26 @@ const dataTypesArray = [
['stackedSeries', stackedSeries],
];
+let mockedHTMLElementClientSizes;
+let mockedSVGElementGetBBox;
+let mockedSVGElementGetComputedTextLength;
+let mockWidth;
+
describe('Vislib Heatmap Chart Test Suite', function () {
+ beforeAll(() => {
+ mockedHTMLElementClientSizes = setHTMLElementClientSizes(512, 512);
+ mockedSVGElementGetBBox = setSVGElementGetBBox(100);
+ mockedSVGElementGetComputedTextLength = setSVGElementGetComputedTextLength(100);
+ mockWidth = jest.spyOn($.prototype, 'width').mockReturnValue(900);
+ });
+
+ afterAll(() => {
+ mockedHTMLElementClientSizes.mockRestore();
+ mockedSVGElementGetBBox.mockRestore();
+ mockedSVGElementGetComputedTextLength.mockRestore();
+ mockWidth.mockRestore();
+ });
+
dataTypesArray.forEach(function (dataType) {
const name = dataType[0];
const data = dataType[1];
@@ -76,7 +99,7 @@ describe('Vislib Heatmap Chart Test Suite', function () {
vis.destroy();
});
- it('category axes should be rendered in reverse order', () => {
+ test('category axes should be rendered in reverse order', () => {
const renderedCategoryAxes = vis.handler.renderArray.filter((item) => {
return (
item.constructor &&
@@ -84,22 +107,22 @@ describe('Vislib Heatmap Chart Test Suite', function () {
item.axisConfig.get('type') === 'category'
);
});
- expect(vis.handler.categoryAxes.length).to.equal(renderedCategoryAxes.length);
- expect(vis.handler.categoryAxes[0].axisConfig.get('id')).to.equal(
+ expect(vis.handler.categoryAxes.length).toEqual(renderedCategoryAxes.length);
+ expect(vis.handler.categoryAxes[0].axisConfig.get('id')).toEqual(
renderedCategoryAxes[1].axisConfig.get('id')
);
- expect(vis.handler.categoryAxes[1].axisConfig.get('id')).to.equal(
+ expect(vis.handler.categoryAxes[1].axisConfig.get('id')).toEqual(
renderedCategoryAxes[0].axisConfig.get('id')
);
});
describe('addSquares method', function () {
- it('should append rects', function () {
+ test('should append rects', function () {
vis.handler.charts.forEach(function (chart) {
const numOfRects = chart.chartData.series.reduce((result, series) => {
return result + series.values.length;
}, 0);
- expect($(chart.chartEl).find('.series rect')).to.have.length(numOfRects);
+ expect($(chart.chartEl).find('.series rect')).toHaveLength(numOfRects);
});
});
});
@@ -120,53 +143,53 @@ describe('Vislib Heatmap Chart Test Suite', function () {
};
}
- it('should attach the brush if data is a set of ordered dates', function () {
+ test('should attach the brush if data is a set of ordered dates', function () {
vis.handler.charts.forEach(function (chart) {
const has = checkChart(chart);
const ordered = vis.handler.data.get('ordered');
const date = Boolean(ordered && ordered.date);
- expect(has.brush).to.be(date);
+ expect(has.brush).toBe(date);
});
});
- it('should attach a click event', function () {
+ test('should attach a click event', function () {
vis.handler.charts.forEach(function (chart) {
const has = checkChart(chart);
- expect(has.click).to.be(true);
+ expect(has.click).toBe(true);
});
});
- it('should attach a hover event', function () {
+ test('should attach a hover event', function () {
vis.handler.charts.forEach(function (chart) {
const has = checkChart(chart);
- expect(has.mouseOver).to.be(true);
+ expect(has.mouseOver).toBe(true);
});
});
});
describe('draw method', function () {
- it('should return a function', function () {
+ test('should return a function', function () {
vis.handler.charts.forEach(function (chart) {
- expect(_.isFunction(chart.draw())).to.be(true);
+ expect(_.isFunction(chart.draw())).toBe(true);
});
});
- it('should return a yMin and yMax', function () {
+ test('should return a yMin and yMax', function () {
vis.handler.charts.forEach(function (chart) {
const yAxis = chart.handler.valueAxes[0];
const domain = yAxis.getScale().domain();
- expect(domain[0]).to.not.be(undefined);
- expect(domain[1]).to.not.be(undefined);
+ expect(domain[0]).not.toBe(undefined);
+ expect(domain[1]).not.toBe(undefined);
});
});
});
- it('should define default colors', function () {
- expect(mockUiState.get('vis.defaultColors')).to.not.be(undefined);
+ test('should define default colors', function () {
+ expect(mockUiState.get('vis.defaultColors')).not.toBe(undefined);
});
- it('should set custom range', function () {
+ test('should set custom range', function () {
vis.destroy();
generateVis({
setColorRange: true,
@@ -178,14 +201,14 @@ describe('Vislib Heatmap Chart Test Suite', function () {
],
});
const labels = vis.getLegendLabels();
- expect(labels[0]).to.be('0 - 200');
- expect(labels[1]).to.be('200 - 400');
- expect(labels[2]).to.be('400 - 500');
- expect(labels[3]).to.be('500 - Infinity');
+ expect(labels[0]).toBe('0 - 200');
+ expect(labels[1]).toBe('200 - 400');
+ expect(labels[2]).toBe('400 - 500');
+ expect(labels[3]).toBe('500 - Infinity');
});
- it('should show correct Y axis title', function () {
- expect(vis.handler.categoryAxes[1].axisConfig.get('title.text')).to.equal('');
+ test('should show correct Y axis title', function () {
+ expect(vis.handler.categoryAxes[1].axisConfig.get('title.text')).toEqual('');
});
});
});
diff --git a/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/visualizations/line_chart.js b/src/plugins/vis_type_vislib/public/vislib/visualizations/point_series/line_chart.test.js
similarity index 67%
rename from src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/visualizations/line_chart.js
rename to src/plugins/vis_type_vislib/public/vislib/visualizations/point_series/line_chart.test.js
index dae92c831cd8d..a84c74c095051 100644
--- a/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/visualizations/line_chart.js
+++ b/src/plugins/vis_type_vislib/public/vislib/visualizations/point_series/line_chart.test.js
@@ -18,18 +18,22 @@
*/
import d3 from 'd3';
-import expect from '@kbn/expect';
import $ from 'jquery';
import _ from 'lodash';
+import {
+ setHTMLElementClientSizes,
+ setSVGElementGetBBox,
+ setSVGElementGetComputedTextLength,
+} from '../../../../../../test_utils/public';
// Data
-import seriesPos from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_series';
-import seriesPosNeg from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_series_pos_neg';
-import seriesNeg from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_series_neg';
-import histogramColumns from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/histogram/_columns';
-import rangeRows from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/range/_rows';
-import termSeries from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/terms/_series';
-import { getMockUiState } from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mocks';
+import seriesPos from '../../../fixtures/mock_data/date_histogram/_series';
+import seriesPosNeg from '../../../fixtures/mock_data/date_histogram/_series_pos_neg';
+import seriesNeg from '../../../fixtures/mock_data/date_histogram/_series_neg';
+import histogramColumns from '../../../fixtures/mock_data/histogram/_columns';
+import rangeRows from '../../../fixtures/mock_data/range/_rows';
+import termSeries from '../../../fixtures/mock_data/terms/_series';
+import { getMockUiState } from '../../../fixtures/mocks';
import { getVis } from '../_vis_fixture';
const dataTypes = [
@@ -41,7 +45,23 @@ const dataTypes = [
['term series', termSeries],
];
+let mockedHTMLElementClientSizes;
+let mockedSVGElementGetBBox;
+let mockedSVGElementGetComputedTextLength;
+
describe('Vislib Line Chart', function () {
+ beforeAll(() => {
+ mockedHTMLElementClientSizes = setHTMLElementClientSizes(512, 512);
+ mockedSVGElementGetBBox = setSVGElementGetBBox(100);
+ mockedSVGElementGetComputedTextLength = setSVGElementGetComputedTextLength(100);
+ });
+
+ afterAll(() => {
+ mockedHTMLElementClientSizes.mockRestore();
+ mockedSVGElementGetBBox.mockRestore();
+ mockedSVGElementGetComputedTextLength.mockRestore();
+ });
+
dataTypes.forEach(function (type) {
const name = type[0];
const data = type[1];
@@ -94,37 +114,37 @@ describe('Vislib Line Chart', function () {
// listeners, however, I was not able to test for the listener
// function being present. I will need to update this test
// in the future.
- it('should attach a brush g element', function () {
+ test('should attach a brush g element', function () {
vis.handler.charts.forEach(function () {
- expect(onBrush).to.be(true);
+ expect(onBrush).toBe(true);
});
});
- it('should attach a click event', function () {
+ test('should attach a click event', function () {
vis.handler.charts.forEach(function () {
- expect(onClick).to.be(true);
+ expect(onClick).toBe(true);
});
});
- it('should attach a hover event', function () {
+ test('should attach a hover event', function () {
vis.handler.charts.forEach(function () {
- expect(onMouseOver).to.be(true);
+ expect(onMouseOver).toBe(true);
});
});
});
describe('addCircles method', function () {
- it('should append circles', function () {
+ test('should append circles', function () {
vis.handler.charts.forEach(function (chart) {
- expect($(chart.chartEl).find('circle').length).to.be.greaterThan(0);
+ expect($(chart.chartEl).find('circle').length).toBeGreaterThan(0);
});
});
});
describe('addLines method', function () {
- it('should append a paths', function () {
+ test('should append a paths', function () {
vis.handler.charts.forEach(function (chart) {
- expect($(chart.chartEl).find('path').length).to.be.greaterThan(0);
+ expect($(chart.chartEl).find('path').length).toBeGreaterThan(0);
});
});
});
@@ -132,7 +152,7 @@ describe('Vislib Line Chart', function () {
// Cannot seem to get these tests to work on the box
// They however pass in the browsers
//describe('addClipPath method', function () {
- // it('should append a clipPath', function () {
+ // test('should append a clipPath', function () {
// vis.handler.charts.forEach(function (chart) {
// expect($(chart.chartEl).find('clipPath').length).to.be(1);
// });
@@ -140,27 +160,27 @@ describe('Vislib Line Chart', function () {
//});
describe('draw method', function () {
- it('should return a function', function () {
+ test('should return a function', function () {
vis.handler.charts.forEach(function (chart) {
- expect(chart.draw()).to.be.a(Function);
+ expect(chart.draw()).toBeInstanceOf(Function);
});
});
- it('should return a yMin and yMax', function () {
+ test('should return a yMin and yMax', function () {
vis.handler.charts.forEach(function (chart) {
const yAxis = chart.handler.valueAxes[0];
const domain = yAxis.getScale().domain();
- expect(domain[0]).to.not.be(undefined);
- expect(domain[1]).to.not.be(undefined);
+ expect(domain[0]).not.toBe(undefined);
+ expect(domain[1]).not.toBe(undefined);
});
});
- it('should render a zero axis line', function () {
+ test('should render a zero axis line', function () {
vis.handler.charts.forEach(function (chart) {
const yAxis = chart.handler.valueAxes[0];
if (yAxis.yMin < 0 && yAxis.yMax > 0) {
- expect($(chart.chartEl).find('line.zero-line').length).to.be(1);
+ expect($(chart.chartEl).find('line.zero-line').length).toBe(1);
}
});
});
@@ -172,14 +192,14 @@ describe('Vislib Line Chart', function () {
vis.render(data, mockUiState);
});
- it('should return yAxis extents equal to data extents', function () {
+ test('should return yAxis extents equal to data extents', function () {
vis.handler.charts.forEach(function (chart) {
const yAxis = chart.handler.valueAxes[0];
const min = vis.handler.valueAxes[0].axisScale.getYMin();
const max = vis.handler.valueAxes[0].axisScale.getYMax();
const domain = yAxis.getScale().domain();
- expect(domain[0]).to.equal(min);
- expect(domain[1]).to.equal(max);
+ expect(domain[0]).toEqual(min);
+ expect(domain[1]).toEqual(max);
});
});
});
@@ -191,21 +211,21 @@ describe('Vislib Line Chart', function () {
vis.render(data, mockUiState);
});
- it('should return yAxis extents equal to data extents with boundsMargin', function () {
+ test('should return yAxis extents equal to data extents with boundsMargin', function () {
vis.handler.charts.forEach(function (chart) {
const yAxis = chart.handler.valueAxes[0];
const min = vis.handler.valueAxes[0].axisScale.getYMin();
const max = vis.handler.valueAxes[0].axisScale.getYMax();
const domain = yAxis.getScale().domain();
if (min < 0 && max < 0) {
- expect(domain[0]).to.equal(min);
- expect(domain[1] - boundsMarginValue).to.equal(max);
+ expect(domain[0]).toEqual(min);
+ expect(domain[1] - boundsMarginValue).toEqual(max);
} else if (min > 0 && max > 0) {
- expect(domain[0] + boundsMarginValue).to.equal(min);
- expect(domain[1]).to.equal(max);
+ expect(domain[0] + boundsMarginValue).toEqual(min);
+ expect(domain[1]).toEqual(max);
} else {
- expect(domain[0]).to.equal(min);
- expect(domain[1]).to.equal(max);
+ expect(domain[0]).toEqual(min);
+ expect(domain[1]).toEqual(max);
}
});
});
diff --git a/src/plugins/visualizations/kibana.json b/src/plugins/visualizations/kibana.json
index f3f9cbd8341ec..da3edfbdd3bf5 100644
--- a/src/plugins/visualizations/kibana.json
+++ b/src/plugins/visualizations/kibana.json
@@ -3,5 +3,6 @@
"version": "kibana",
"server": true,
"ui": true,
- "requiredPlugins": ["data", "expressions", "uiActions", "embeddable", "usageCollection", "inspector"]
+ "requiredPlugins": ["data", "expressions", "uiActions", "embeddable", "usageCollection", "inspector"],
+ "requiredBundles": ["kibanaUtils", "discover", "savedObjects"]
}
diff --git a/src/plugins/visualizations/public/wizard/__snapshots__/new_vis_modal.test.tsx.snap b/src/plugins/visualizations/public/wizard/__snapshots__/new_vis_modal.test.tsx.snap
index 53ef164685a1c..5458c88974572 100644
--- a/src/plugins/visualizations/public/wizard/__snapshots__/new_vis_modal.test.tsx.snap
+++ b/src/plugins/visualizations/public/wizard/__snapshots__/new_vis_modal.test.tsx.snap
@@ -139,7 +139,7 @@ exports[`NewVisModal filter for visualization types should render as expected 1`
2 types found
-
+
+
+
+
+
+