Skip to content

Commit 2acfc3e

Browse files
mshustovmshustov
committed
Merge branch 'master' into so-types
2 parents 22ccf3d + 29ac6fe commit 2acfc3e

111 files changed

Lines changed: 2354 additions & 744 deletions

File tree

Some content is hidden

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

‎src/core/types/saved_objects.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,3 @@ export type SavedObjectAttribute = SavedObjectAttributeSingle | SavedObjectAttri
4646
export interface SavedObjectAttributes {
4747
[key: string]: SavedObjectAttribute;
4848
}
49-
50-
export type SavedObjectAttributesType = Record<string, unknown>;

‎src/dev/i18n/__snapshots__/integrate_locale_files.test.ts.snap‎

Lines changed: 4 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/dev/i18n/extract_default_translations.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,9 @@ export async function matchEntriesWithExctractors(inputPath, options = {}) {
6363
const ignore = [
6464
'**/node_modules/**',
6565
'**/__tests__/**',
66+
'**/dist/**',
67+
'**/target/**',
68+
'**/vendor/**',
6669
'**/*.test.{js,jsx,ts,tsx}',
6770
'**/*.d.ts',
6871
].concat(additionalIgnore);

‎src/dev/i18n/serializers/__snapshots__/json.test.ts.snap‎

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/dev/i18n/serializers/json.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,5 @@ export const serializeToJson: Serializer = (messages, formats = i18n.formats) =>
3434
}
3535
}
3636

37-
return JSON.stringify(resultJsonObject, undefined, 2);
37+
return JSON.stringify(resultJsonObject, undefined, 2).concat('\n');
3838
};

‎src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@ <h1 class="euiScreenReaderOnly">{{screenTitle}}</h1>
190190
data-shared-item
191191
data-title="{{opts.savedSearch.lastSavedTitle}}"
192192
data-description="{{opts.savedSearch.description}}"
193+
data-test-subj="discoverDocTable"
193194
minimum-visible-rows="minimumVisibleRows"
194195
render-complete
195196
on-add-column="addColumn"

‎src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/discover_index_pattern.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
*/
1919
import React, { useState } from 'react';
2020
import { SavedObject } from 'kibana/server';
21-
import { SavedObjectIndexPattern } from 'src/plugins/data/public';
21+
import { IndexPatternAttributes } from 'src/plugins/data/public';
2222
import { I18nProvider } from '@kbn/i18n/react';
2323

2424
import { IndexPatternRef } from './types';
@@ -27,11 +27,11 @@ export interface DiscoverIndexPatternProps {
2727
/**
2828
* list of available index patterns, if length > 1, component offers a "change" link
2929
*/
30-
indexPatternList: Array<SavedObject<SavedObjectIndexPattern>>;
30+
indexPatternList: Array<SavedObject<IndexPatternAttributes>>;
3131
/**
3232
* currently selected index pattern, due to angular issues it's undefined at first rendering
3333
*/
34-
selectedIndexPattern: SavedObject<SavedObjectIndexPattern>;
34+
selectedIndexPattern: SavedObject<IndexPatternAttributes>;
3535
/**
3636
* triggered when user selects a new index pattern
3737
*/

‎src/legacy/core_plugins/kibana/public/home/kibana_services.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@ import { TelemetryPluginStart } from '../../../../../plugins/telemetry/public';
3131
import {
3232
Environment,
3333
HomePublicPluginSetup,
34+
TutorialStart,
3435
HomePublicPluginStart,
3536
} from '../../../../../plugins/home/public';
3637
import { KibanaLegacySetup } from '../../../../../plugins/kibana_legacy/public';
3738

3839
export interface HomeKibanaServices {
3940
indexPatternService: any;
4041
kibanaVersion: string;
41-
getInjected: (name: string, defaultValue?: any) => unknown;
4242
chrome: ChromeStart;
4343
uiSettings: IUiSettingsClient;
4444
config: KibanaLegacySetup['config'];
@@ -54,6 +54,7 @@ export interface HomeKibanaServices {
5454
addBasePath: (url: string) => string;
5555
environment: Environment;
5656
telemetry?: TelemetryPluginStart;
57+
tutorialVariables: TutorialStart['get'];
5758
}
5859

5960
let services: HomeKibanaServices | null = null;

‎src/legacy/core_plugins/kibana/public/home/np_ready/components/home.test.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import { FeatureCatalogueCategory } from '../../../../../../../plugins/home/publ
2929
jest.mock('../../kibana_services', () => ({
3030
getServices: () => ({
3131
getBasePath: () => 'path',
32-
getInjected: () => '',
32+
tutorialVariables: () => ({}),
3333
homeConfig: { disableWelcomeScreen: false },
3434
}),
3535
}));

‎src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/replace_template_strings.js‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,15 @@ mustacheWriter.escapedValue = function escapedValue(token, context) {
3333
};
3434

3535
export function replaceTemplateStrings(text, params = {}) {
36-
const { getInjected, kibanaVersion, docLinks } = getServices();
36+
const { tutorialVariables, kibanaVersion, docLinks } = getServices();
3737

3838
const variables = {
3939
// '{' and '}' can not be used in template since they are used as template tags.
4040
// Must use '{curlyOpen}'' and '{curlyClose}'
4141
curlyOpen: '{',
4242
curlyClose: '}',
4343
config: {
44-
cloud: {
45-
id: getInjected('cloudId'),
46-
},
44+
...tutorialVariables(),
4745
docs: {
4846
base_url: docLinks.ELASTIC_WEBSITE_URL,
4947
beats: {

0 commit comments

Comments
 (0)