Skip to content

Commit 6750dfb

Browse files
Merge branch 'master' into app-security-redirect
2 parents ed8d96c + e143905 commit 6750dfb

File tree

47 files changed

+824
-897
lines changed

Some content is hidden

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

47 files changed

+824
-897
lines changed

.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ target
3333
/x-pack/plugins/canvas/shareable_runtime/build
3434
/x-pack/plugins/canvas/storybook
3535
/x-pack/plugins/monitoring/public/lib/jquery_flot
36+
/x-pack/plugins/reporting/server/export_types/printable_pdf/server/lib/pdf/assets/**
3637
/x-pack/legacy/plugins/infra/common/graphql/types.ts
3738
/x-pack/legacy/plugins/infra/public/graphql/types.ts
3839
/x-pack/legacy/plugins/infra/server/graphql/types.ts
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<!-- Do not edit this file. It is automatically generated by API Documenter. -->
2+
3+
[Home](./index.md) &gt; [kibana-plugin-core-public](./kibana-plugin-core-public.md) &gt; [ChromeStart](./kibana-plugin-core-public.chromestart.md) &gt; [getCustomNavLink$](./kibana-plugin-core-public.chromestart.getcustomnavlink_.md)
4+
5+
## ChromeStart.getCustomNavLink$() method
6+
7+
Get an observable of the current custom nav link
8+
9+
<b>Signature:</b>
10+
11+
```typescript
12+
getCustomNavLink$(): Observable<Partial<ChromeNavLink> | undefined>;
13+
```
14+
<b>Returns:</b>
15+
16+
`Observable<Partial<ChromeNavLink> | undefined>`
17+

docs/development/core/public/kibana-plugin-core-public.chromestart.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ core.chrome.setHelpExtension(elem => {
5555
| [getBadge$()](./kibana-plugin-core-public.chromestart.getbadge_.md) | Get an observable of the current badge |
5656
| [getBrand$()](./kibana-plugin-core-public.chromestart.getbrand_.md) | Get an observable of the current brand information. |
5757
| [getBreadcrumbs$()](./kibana-plugin-core-public.chromestart.getbreadcrumbs_.md) | Get an observable of the current list of breadcrumbs |
58+
| [getCustomNavLink$()](./kibana-plugin-core-public.chromestart.getcustomnavlink_.md) | Get an observable of the current custom nav link |
5859
| [getHelpExtension$()](./kibana-plugin-core-public.chromestart.gethelpextension_.md) | Get an observable of the current custom help conttent |
5960
| [getIsNavDrawerLocked$()](./kibana-plugin-core-public.chromestart.getisnavdrawerlocked_.md) | Get an observable of the current locked state of the nav drawer. |
6061
| [getIsVisible$()](./kibana-plugin-core-public.chromestart.getisvisible_.md) | Get an observable of the current visibility state of the chrome. |
@@ -64,6 +65,7 @@ core.chrome.setHelpExtension(elem => {
6465
| [setBadge(badge)](./kibana-plugin-core-public.chromestart.setbadge.md) | Override the current badge |
6566
| [setBrand(brand)](./kibana-plugin-core-public.chromestart.setbrand.md) | Set the brand configuration. |
6667
| [setBreadcrumbs(newBreadcrumbs)](./kibana-plugin-core-public.chromestart.setbreadcrumbs.md) | Override the current set of breadcrumbs |
68+
| [setCustomNavLink(newCustomNavLink)](./kibana-plugin-core-public.chromestart.setcustomnavlink.md) | Override the current set of custom nav link |
6769
| [setHelpExtension(helpExtension)](./kibana-plugin-core-public.chromestart.sethelpextension.md) | Override the current set of custom help content |
6870
| [setHelpSupportUrl(url)](./kibana-plugin-core-public.chromestart.sethelpsupporturl.md) | Override the default support URL shown in the help menu |
6971
| [setIsVisible(isVisible)](./kibana-plugin-core-public.chromestart.setisvisible.md) | Set the temporary visibility for the chrome. This does nothing if the chrome is hidden by default and should be used to hide the chrome for things like full-screen modes with an exit button. |
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<!-- Do not edit this file. It is automatically generated by API Documenter. -->
2+
3+
[Home](./index.md) &gt; [kibana-plugin-core-public](./kibana-plugin-core-public.md) &gt; [ChromeStart](./kibana-plugin-core-public.chromestart.md) &gt; [setCustomNavLink](./kibana-plugin-core-public.chromestart.setcustomnavlink.md)
4+
5+
## ChromeStart.setCustomNavLink() method
6+
7+
Override the current set of custom nav link
8+
9+
<b>Signature:</b>
10+
11+
```typescript
12+
setCustomNavLink(newCustomNavLink?: Partial<ChromeNavLink>): void;
13+
```
14+
15+
## Parameters
16+
17+
| Parameter | Type | Description |
18+
| --- | --- | --- |
19+
| newCustomNavLink | <code>Partial&lt;ChromeNavLink&gt;</code> | |
20+
21+
<b>Returns:</b>
22+
23+
`void`
24+

docs/development/core/server/kibana-plugin-core-server.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
150150
| [SavedObjectsBulkUpdateResponse](./kibana-plugin-core-server.savedobjectsbulkupdateresponse.md) | |
151151
| [SavedObjectsClientProviderOptions](./kibana-plugin-core-server.savedobjectsclientprovideroptions.md) | Options to control the creation of the Saved Objects Client. |
152152
| [SavedObjectsClientWrapperOptions](./kibana-plugin-core-server.savedobjectsclientwrapperoptions.md) | Options passed to each SavedObjectsClientWrapperFactory to aid in creating the wrapper instance. |
153-
| [SavedObjectsComplexFieldMapping](./kibana-plugin-core-server.savedobjectscomplexfieldmapping.md) | See [SavedObjectsFieldMapping](./kibana-plugin-core-server.savedobjectsfieldmapping.md) for documentation. |
153+
| [SavedObjectsComplexFieldMapping](./kibana-plugin-core-server.savedobjectscomplexfieldmapping.md) | See [SavedObjectsFieldMapping](./kibana-plugin-core-server.savedobjectsfieldmapping.md) for documentation.<!-- -->Note: this type intentially doesn't include a type definition for defining the <code>dynamic</code> mapping parameter. Saved Object fields should always inherit the <code>dynamic: 'strict'</code> paramater. If you are unsure of the shape of your data use <code>type: 'object', enabled: false</code> instead. |
154154
| [SavedObjectsCoreFieldMapping](./kibana-plugin-core-server.savedobjectscorefieldmapping.md) | See [SavedObjectsFieldMapping](./kibana-plugin-core-server.savedobjectsfieldmapping.md) for documentation. |
155155
| [SavedObjectsCreateOptions](./kibana-plugin-core-server.savedobjectscreateoptions.md) | |
156156
| [SavedObjectsDeleteByNamespaceOptions](./kibana-plugin-core-server.savedobjectsdeletebynamespaceoptions.md) | |

docs/development/core/server/kibana-plugin-core-server.savedobjectscomplexfieldmapping.dynamic.md

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

docs/development/core/server/kibana-plugin-core-server.savedobjectscomplexfieldmapping.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66

77
See [SavedObjectsFieldMapping](./kibana-plugin-core-server.savedobjectsfieldmapping.md) for documentation.
88

9+
Note: this type intentially doesn't include a type definition for defining the `dynamic` mapping parameter. Saved Object fields should always inherit the `dynamic: 'strict'` paramater. If you are unsure of the shape of your data use `type: 'object', enabled: false` instead.
10+
911
<b>Signature:</b>
1012

1113
```typescript
@@ -16,7 +18,6 @@ export interface SavedObjectsComplexFieldMapping
1618

1719
| Property | Type | Description |
1820
| --- | --- | --- |
19-
| [dynamic](./kibana-plugin-core-server.savedobjectscomplexfieldmapping.dynamic.md) | <code>string</code> | |
2021
| [properties](./kibana-plugin-core-server.savedobjectscomplexfieldmapping.properties.md) | <code>SavedObjectsMappingProperties</code> | |
2122
| [type](./kibana-plugin-core-server.savedobjectscomplexfieldmapping.type.md) | <code>string</code> | |
2223

src/core/server/saved_objects/mappings/types.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,10 +145,14 @@ export interface SavedObjectsCoreFieldMapping {
145145
/**
146146
* See {@link SavedObjectsFieldMapping} for documentation.
147147
*
148+
* Note: this type intentially doesn't include a type definition for defining
149+
* the `dynamic` mapping parameter. Saved Object fields should always inherit
150+
* the `dynamic: 'strict'` paramater. If you are unsure of the shape of your
151+
* data use `type: 'object', enabled: false` instead.
152+
*
148153
* @public
149154
*/
150155
export interface SavedObjectsComplexFieldMapping {
151-
dynamic?: string;
152156
type?: string;
153157
properties: SavedObjectsMappingProperties;
154158
}

src/core/server/saved_objects/migrations/core/build_active_mappings.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,8 @@ function defaultMapping(): IndexMapping {
130130
dynamic: 'strict',
131131
properties: {
132132
migrationVersion: {
133+
// Saved Objects can't redefine dynamic, but we cheat here to support migrations
134+
// @ts-expect-error
133135
dynamic: 'true',
134136
type: 'object',
135137
},

src/core/server/server.api.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1970,8 +1970,6 @@ export interface SavedObjectsClientWrapperOptions {
19701970

19711971
// @public
19721972
export interface SavedObjectsComplexFieldMapping {
1973-
// (undocumented)
1974-
dynamic?: string;
19751973
// (undocumented)
19761974
properties: SavedObjectsMappingProperties;
19771975
// (undocumented)

0 commit comments

Comments
 (0)