Skip to content

Commit 045900e

Browse files
spalgerspalger
committed
Merge branch 'master' of github.com:elastic/kibana into fix/determine-correct-merge-base
2 parents b7a6cb0 + 0d71ed2 commit 045900e

File tree

316 files changed

+3293
-2950
lines changed

Some content is hidden

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

316 files changed

+3293
-2950
lines changed

‎src/core/MIGRATION.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1240,6 +1240,7 @@ import { npStart: { plugins } } from 'ui/new_platform';
12401240
| `ui/filter_manager` | `plugins.data.filter` | -- |
12411241
| `ui/index_patterns` | `plugins.data.indexPatterns` |
12421242
| `import 'ui/management'` | `plugins.management.sections` | |
1243+
| `import 'ui/registry/field_format_editors'` | `plugins.indexPatternManagement.fieldFormatEditors` | |
12431244
| `ui/registry/field_formats` | `plugins.data.fieldFormats` | |
12441245
| `ui/registry/feature_catalogue` | `plugins.home.featureCatalogue.register` | Must add `home` as a dependency in your kibana.json. |
12451246
| `ui/registry/vis_types` | `plugins.visualizations` | -- |

‎src/core/public/chrome/chrome_service.test.ts‎

Lines changed: 108 additions & 106 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,9 @@ describe('start', () => {
9797
expect(startDeps.notifications.toasts.addWarning.mock.calls).toMatchInlineSnapshot(`
9898
Array [
9999
Array [
100-
"Your browser does not meet the security requirements for Kibana.",
100+
Object {
101+
"title": [Function],
102+
},
101103
],
102104
]
103105
`);
@@ -146,18 +148,18 @@ describe('start', () => {
146148
service.stop();
147149

148150
await expect(promise).resolves.toMatchInlineSnapshot(`
149-
Array [
150-
Object {},
151-
Object {
152-
"logo": "big logo",
153-
"smallLogo": "not so big logo",
154-
},
155-
Object {
156-
"logo": "big logo without small logo",
157-
"smallLogo": undefined,
158-
},
159-
]
160-
`);
151+
Array [
152+
Object {},
153+
Object {
154+
"logo": "big logo",
155+
"smallLogo": "not so big logo",
156+
},
157+
Object {
158+
"logo": "big logo without small logo",
159+
"smallLogo": undefined,
160+
},
161+
]
162+
`);
161163
});
162164
});
163165

@@ -175,13 +177,13 @@ describe('start', () => {
175177
service.stop();
176178

177179
await expect(promise).resolves.toMatchInlineSnapshot(`
178-
Array [
179-
false,
180-
false,
181-
false,
182-
false,
183-
]
184-
`);
180+
Array [
181+
false,
182+
false,
183+
false,
184+
false,
185+
]
186+
`);
185187
});
186188

187189
it('emits false until manually overridden when in embed mode', async () => {
@@ -203,13 +205,13 @@ describe('start', () => {
203205
service.stop();
204206

205207
await expect(promise).resolves.toMatchInlineSnapshot(`
206-
Array [
207-
false,
208-
false,
209-
true,
210-
false,
211-
]
212-
`);
208+
Array [
209+
false,
210+
false,
211+
true,
212+
false,
213+
]
214+
`);
213215
});
214216

215217
it('application-specified visibility on mount', async () => {
@@ -230,13 +232,13 @@ describe('start', () => {
230232
service.stop();
231233

232234
await expect(promise).resolves.toMatchInlineSnapshot(`
233-
Array [
234-
false,
235-
true,
236-
false,
237-
true,
238-
]
239-
`);
235+
Array [
236+
false,
237+
true,
238+
false,
239+
true,
240+
]
241+
`);
240242
});
241243

242244
it('changing visibility has no effect on chrome-hiding application', async () => {
@@ -253,12 +255,12 @@ describe('start', () => {
253255
service.stop();
254256

255257
await expect(promise).resolves.toMatchInlineSnapshot(`
256-
Array [
257-
false,
258-
false,
259-
false,
260-
]
261-
`);
258+
Array [
259+
false,
260+
false,
261+
false,
262+
]
263+
`);
262264
});
263265
});
264266

@@ -280,36 +282,36 @@ describe('start', () => {
280282
service.stop();
281283

282284
await expect(promise).resolves.toMatchInlineSnapshot(`
283-
Array [
284-
Array [],
285-
Array [
286-
"foo",
287-
],
288-
Array [
289-
"foo",
290-
],
291-
Array [
292-
"foo",
293-
"bar",
294-
],
295-
Array [
296-
"foo",
297-
"bar",
298-
],
299-
Array [
300-
"foo",
301-
"bar",
302-
"baz",
303-
],
304-
Array [
305-
"foo",
306-
"baz",
307-
],
308-
Array [
309-
"baz",
310-
],
311-
]
312-
`);
285+
Array [
286+
Array [],
287+
Array [
288+
"foo",
289+
],
290+
Array [
291+
"foo",
292+
],
293+
Array [
294+
"foo",
295+
"bar",
296+
],
297+
Array [
298+
"foo",
299+
"bar",
300+
],
301+
Array [
302+
"foo",
303+
"bar",
304+
"baz",
305+
],
306+
Array [
307+
"foo",
308+
"baz",
309+
],
310+
Array [
311+
"baz",
312+
],
313+
]
314+
`);
313315
});
314316
});
315317

@@ -327,19 +329,19 @@ describe('start', () => {
327329
service.stop();
328330

329331
await expect(promise).resolves.toMatchInlineSnapshot(`
330-
Array [
331-
undefined,
332-
Object {
333-
"text": "foo",
334-
"tooltip": "foo's tooltip",
335-
},
336-
Object {
337-
"text": "bar",
338-
"tooltip": "bar's tooltip",
339-
},
340-
undefined,
341-
]
342-
`);
332+
Array [
333+
undefined,
334+
Object {
335+
"text": "foo",
336+
"tooltip": "foo's tooltip",
337+
},
338+
Object {
339+
"text": "bar",
340+
"tooltip": "bar's tooltip",
341+
},
342+
undefined,
343+
]
344+
`);
343345
});
344346
});
345347

@@ -358,29 +360,29 @@ describe('start', () => {
358360
service.stop();
359361

360362
await expect(promise).resolves.toMatchInlineSnapshot(`
361-
Array [
362-
Array [],
363-
Array [
364-
Object {
365-
"text": "foo",
366-
},
367-
Object {
368-
"text": "bar",
369-
},
370-
],
371-
Array [
372-
Object {
373-
"text": "foo",
374-
},
375-
],
376-
Array [
377-
Object {
378-
"text": "bar",
379-
},
380-
],
381-
Array [],
382-
]
383-
`);
363+
Array [
364+
Array [],
365+
Array [
366+
Object {
367+
"text": "foo",
368+
},
369+
Object {
370+
"text": "bar",
371+
},
372+
],
373+
Array [
374+
Object {
375+
"text": "foo",
376+
},
377+
],
378+
Array [
379+
Object {
380+
"text": "bar",
381+
},
382+
],
383+
Array [],
384+
]
385+
`);
384386
});
385387
});
386388

‎src/core/public/chrome/chrome_service.tsx‎

Lines changed: 40 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,13 @@
1818
*/
1919

2020
import { Breadcrumb as EuiBreadcrumb, IconType } from '@elastic/eui';
21-
import { i18n } from '@kbn/i18n';
2221
import React from 'react';
22+
import { FormattedMessage } from '@kbn/i18n/react';
2323
import { BehaviorSubject, combineLatest, merge, Observable, of, ReplaySubject } from 'rxjs';
2424
import { flatMap, map, takeUntil } from 'rxjs/operators';
2525
import { parse } from 'url';
26+
import { EuiLink } from '@elastic/eui';
27+
import { mountReactNode } from '../utils/mount';
2628
import { InternalApplicationStart } from '../application';
2729
import { DocLinksStart } from '../doc_links';
2830
import { HttpStart } from '../http';
@@ -165,12 +167,44 @@ export class ChromeService {
165167
// Can delete
166168
const getNavType$ = uiSettings.get$('pageNavigation').pipe(takeUntil(this.stop$));
167169

170+
const isIE = () => {
171+
const ua = window.navigator.userAgent;
172+
const msie = ua.indexOf('MSIE '); // IE 10 or older
173+
const trident = ua.indexOf('Trident/'); // IE 11
174+
175+
return msie > 0 || trident > 0;
176+
};
177+
168178
if (!this.params.browserSupportsCsp && injectedMetadata.getCspConfig().warnLegacyBrowsers) {
169-
notifications.toasts.addWarning(
170-
i18n.translate('core.chrome.legacyBrowserWarning', {
171-
defaultMessage: 'Your browser does not meet the security requirements for Kibana.',
172-
})
173-
);
179+
notifications.toasts.addWarning({
180+
title: mountReactNode(
181+
<FormattedMessage
182+
id="core.chrome.legacyBrowserWarning"
183+
defaultMessage="Your browser does not meet the security requirements for Kibana."
184+
/>
185+
),
186+
});
187+
188+
if (isIE()) {
189+
notifications.toasts.addWarning({
190+
title: mountReactNode(
191+
<FormattedMessage
192+
id="core.chrome.browserDeprecationWarning"
193+
defaultMessage="Support for Internet Explorer will be dropped in future versions of this software, please check {link}."
194+
values={{
195+
link: (
196+
<EuiLink target="_blank" href="https://www.elastic.co/support/matrix" external>
197+
<FormattedMessage
198+
id="core.chrome.browserDeprecationLink"
199+
defaultMessage="the support matrix on our website"
200+
/>
201+
</EuiLink>
202+
),
203+
}}
204+
/>
205+
),
206+
});
207+
}
174208
}
175209

176210
return {

‎src/legacy/core_plugins/kibana/public/management/index.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import React from 'react';
2121
import { render, unmountComponentAtNode } from 'react-dom';
2222
import { FormattedMessage } from '@kbn/i18n/react';
2323

24-
import './sections';
2524
import uiRoutes from 'ui/routes';
2625
import { I18nContext } from 'ui/i18n';
2726
import { uiModules } from 'ui/modules';

‎src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/angular_template.html‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)