Skip to content

Commit 6d81c7e

Browse files
patrykkopycinskipatrykkopycinski
committed
Merge branch 'master' of github.com:elastic/kibana into feat/hosts-kpi-search-strategy
2 parents 845f947 + ba8213c commit 6d81c7e

File tree

46 files changed

+827
-831
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+827
-831
lines changed

‎docs/developer/plugin-list.asciidoc‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,12 @@ which also contains the timelion APIs and backend, look at the vis_type_timelion
181181
To integrate with the telemetry services for usage collection of your feature, there are 2 steps:
182182
183183
184+
|{kib-repo}blob/{branch}/src/plugins/vis_default_editor/README.md[visDefaultEditor]
185+
|The default editor is used in most primary visualizations, e.x. Area, Data table, Pie, etc.
186+
It acts as a container for a particular visualization and options tabs. Contains the default "Data" tab in public/components/sidebar/data_tab.tsx.
187+
The plugin exposes the static DefaultEditorController class to consume.
188+
189+
184190
|{kib-repo}blob/{branch}/src/plugins/vis_type_markdown/README.md[visTypeMarkdown]
185191
|The markdown visualization that can be used to place text panels on dashboards.
186192

‎src/plugins/charts/kibana.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
"version": "kibana",
44
"server": true,
55
"ui": true,
6-
"requiredBundles": ["kibanaUtils", "kibanaReact", "data"]
6+
"requiredBundles": ["visDefaultEditor"]
77
}

‎src/plugins/console/server/lib/spec_definitions/js/mappings.ts‎

Lines changed: 58 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -157,58 +157,65 @@ export const mappings = (specService: SpecDefinitionsService) => {
157157

158158
// dates
159159
format: {
160+
// outer array required to for an array of string values
160161
__one_of: [
161-
...[
162-
'date',
163-
'date_time',
164-
'date_time_no_millis',
165-
'ordinal_date',
166-
'ordinal_date_time',
167-
'ordinal_date_time_no_millis',
168-
'time',
169-
'time_no_millis',
170-
't_time',
171-
't_time_no_millis',
172-
'week_date',
173-
'week_date_time',
174-
'week_date_time_no_millis',
175-
].map(function (s) {
176-
return ['basic_' + s, 'strict_' + s];
177-
}),
178-
...[
179-
'date',
180-
'date_hour',
181-
'date_hour_minute',
182-
'date_hour_minute_second',
183-
'date_hour_minute_second_fraction',
184-
'date_hour_minute_second_millis',
185-
'date_optional_time',
186-
'date_time',
187-
'date_time_no_millis',
188-
'hour',
189-
'hour_minute',
190-
'hour_minute_second',
191-
'hour_minute_second_fraction',
192-
'hour_minute_second_millis',
193-
'ordinal_date',
194-
'ordinal_date_time',
195-
'ordinal_date_time_no_millis',
196-
'time',
197-
'time_no_millis',
198-
't_time',
199-
't_time_no_millis',
200-
'week_date',
201-
'week_date_time',
202-
'weekDateTimeNoMillis',
203-
'week_year',
204-
'weekyearWeek',
205-
'weekyearWeekDay',
206-
'year',
207-
'year_month',
208-
'year_month_day',
209-
'epoch_millis',
210-
'epoch_second',
211-
],
162+
[
163+
...[
164+
'date',
165+
'date_time',
166+
'date_time_no_millis',
167+
'ordinal_date',
168+
'ordinal_date_time',
169+
'ordinal_date_time_no_millis',
170+
'time',
171+
'time_no_millis',
172+
't_time',
173+
't_time_no_millis',
174+
'week_date',
175+
'week_date_time',
176+
'week_date_time_no_millis',
177+
].flatMap(function (s) {
178+
return ['basic_' + s, 'strict_' + s];
179+
}),
180+
...[
181+
'date',
182+
'date_hour',
183+
'date_hour_minute',
184+
'date_hour_minute_second',
185+
'date_hour_minute_second_fraction',
186+
'date_hour_minute_second_millis',
187+
'date_optional_time',
188+
'date_time',
189+
'date_time_no_millis',
190+
'hour',
191+
'hour_minute',
192+
'hour_minute_second',
193+
'hour_minute_second_fraction',
194+
'hour_minute_second_millis',
195+
'ordinal_date',
196+
'ordinal_date_time',
197+
'ordinal_date_time_no_millis',
198+
'time',
199+
'time_no_millis',
200+
't_time',
201+
't_time_no_millis',
202+
'week_date',
203+
'week_date_time',
204+
'weekDateTimeNoMillis',
205+
'weekyear',
206+
'strict_weekyear',
207+
'weekyear_week',
208+
'strict_weekyear_week',
209+
'strict_date_optional_time_nanos',
210+
'weekyear_week_day',
211+
'strict_weekyear_week_day',
212+
'year',
213+
'year_month',
214+
'year_month_day',
215+
'epoch_millis',
216+
'epoch_second',
217+
],
218+
].sort(),
212219
],
213220
},
214221

‎src/plugins/input_control_vis/kibana.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
"kibanaVersion": "kibana",
55
"server": true,
66
"ui": true,
7-
"requiredPlugins": ["data", "expressions", "visualizations"],
7+
"requiredPlugins": ["data", "expressions", "visualizations", "visDefaultEditor"],
88
"requiredBundles": ["kibanaReact"]
99
}

‎src/plugins/region_map/kibana.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
],
1515
"requiredBundles": [
1616
"kibanaUtils",
17-
"kibanaReact",
18-
"charts"
17+
"charts",
18+
"visDefaultEditor"
1919
]
2020
}

‎src/plugins/tile_map/kibana.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
],
1515
"requiredBundles": [
1616
"kibanaUtils",
17-
"kibanaReact",
18-
"charts"
17+
"charts",
18+
"visDefaultEditor"
1919
]
2020
}

‎src/plugins/vis_default_editor/kibana.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"id": "visDefaultEditor",
3+
"version": "kibana",
4+
"ui": true,
5+
"requiredBundles": ["kibanaUtils", "kibanaReact", "data"]
6+
}

‎src/plugins/vis_default_editor/public/index.ts‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,11 @@ export * from './editor_size';
2424
export * from './vis_options_props';
2525
export * from './utils';
2626
export { ISchemas, Schemas, Schema } from './schemas';
27+
28+
/** dummy plugin, we just want visDefaultEditor to have its own bundle */
29+
export function plugin() {
30+
return new (class VisDefaultEditor {
31+
setup() {}
32+
start() {}
33+
})();
34+
}

‎src/plugins/vis_type_markdown/kibana.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
"ui": true,
55
"server": true,
66
"requiredPlugins": ["expressions", "visualizations"],
7-
"requiredBundles": ["kibanaUtils", "kibanaReact", "data", "charts", "visualizations", "expressions"]
7+
"requiredBundles": ["kibanaUtils", "kibanaReact", "charts", "visualizations", "expressions", "visDefaultEditor"]
88
}

‎src/plugins/vis_type_metric/kibana.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
"server": true,
66
"ui": true,
77
"requiredPlugins": ["data", "visualizations", "charts", "expressions"],
8-
"requiredBundles": ["kibanaUtils", "kibanaReact"]
8+
"requiredBundles": ["kibanaUtils", "visDefaultEditor"]
99
}

0 commit comments

Comments
 (0)