Skip to content

Commit

Permalink
Merge branch 'master' into fix/75594
Browse files Browse the repository at this point in the history
  • Loading branch information
elasticmachine authored Aug 31, 2020
2 parents 755a5a1 + 2486a71 commit 81ffec0
Show file tree
Hide file tree
Showing 246 changed files with 6,313 additions and 2,594 deletions.
1 change: 0 additions & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@
/x-pack/plugins/ingest_manager/ @elastic/ingest-management
/x-pack/legacy/plugins/ingest_manager/ @elastic/ingest-management
/x-pack/plugins/observability/ @elastic/observability-ui
/x-pack/legacy/plugins/monitoring/ @elastic/stack-monitoring-ui
/x-pack/plugins/monitoring/ @elastic/stack-monitoring-ui
/x-pack/plugins/uptime @elastic/uptime

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<!-- Do not edit this file. It is automatically generated by API Documenter. -->

[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [ACTION\_GLOBAL\_APPLY\_FILTER](./kibana-plugin-plugins-data-public.action_global_apply_filter.md)

## ACTION\_GLOBAL\_APPLY\_FILTER variable

<b>Signature:</b>

```typescript
ACTION_GLOBAL_APPLY_FILTER = "ACTION_GLOBAL_APPLY_FILTER"
```
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,8 @@
<b>Signature:</b>

```typescript
init(forceFieldRefresh?: boolean): Promise<this>;
init(): Promise<this>;
```

## Parameters

| Parameter | Type | Description |
| --- | --- | --- |
| forceFieldRefresh | <code>boolean</code> | |

<b>Returns:</b>

`Promise<this>`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ export declare class IndexPattern implements IIndexPattern
| [getScriptedFields()](./kibana-plugin-plugins-data-public.indexpattern.getscriptedfields.md) | | |
| [getSourceFiltering()](./kibana-plugin-plugins-data-public.indexpattern.getsourcefiltering.md) | | |
| [getTimeField()](./kibana-plugin-plugins-data-public.indexpattern.gettimefield.md) | | |
| [init(forceFieldRefresh)](./kibana-plugin-plugins-data-public.indexpattern.init.md) | | |
| [init()](./kibana-plugin-plugins-data-public.indexpattern.init.md) | | |
| [initFromSpec(spec)](./kibana-plugin-plugins-data-public.indexpattern.initfromspec.md) | | |
| [isTimeBased()](./kibana-plugin-plugins-data-public.indexpattern.istimebased.md) | | |
| [isTimeBasedWildcard()](./kibana-plugin-plugins-data-public.indexpattern.istimebasedwildcard.md) | | |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@

| Variable | Description |
| --- | --- |
| [ACTION\_GLOBAL\_APPLY\_FILTER](./kibana-plugin-plugins-data-public.action_global_apply_filter.md) | |
| [AggGroupLabels](./kibana-plugin-plugins-data-public.agggrouplabels.md) | |
| [AggGroupNames](./kibana-plugin-plugins-data-public.agggroupnames.md) | |
| [baseFormattersPublic](./kibana-plugin-plugins-data-public.baseformatterspublic.md) | |
Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-es/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"glob": "^7.1.2",
"node-fetch": "^2.6.0",
"simple-git": "^1.91.0",
"tar-fs": "^1.16.3",
"tar-fs": "^2.1.0",
"tree-kill": "^1.2.2",
"yauzl": "^2.10.0"
}
Expand Down
4 changes: 2 additions & 2 deletions packages/kbn-plugin-helpers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
"vinyl-fs": "^3.0.3"
},
"devDependencies": {
"@types/decompress": "^4.2.3",
"@types/extract-zip": "^1.6.2",
"@types/gulp-zip": "^4.0.1",
"@types/inquirer": "^6.5.0",
"decompress": "^4.2.1",
"extract-zip": "^2.0.1",
"typescript": "4.0.2"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import Fs from 'fs';

import execa from 'execa';
import { createStripAnsiSerializer, REPO_ROOT, createReplaceSerializer } from '@kbn/dev-utils';
import decompress from 'decompress';
import extract from 'extract-zip';
import del from 'del';
import globby from 'globby';
import loadJsonFile from 'load-json-file';
Expand Down Expand Up @@ -81,7 +81,7 @@ it('builds a generated plugin into a viable archive', async () => {
info compressing plugin into [fooTestPlugin-7.5.0.zip]"
`);

await decompress(PLUGIN_ARCHIVE, TMP_DIR);
await extract(PLUGIN_ARCHIVE, { dir: TMP_DIR });

const files = await globby(['**/*'], { cwd: TMP_DIR });
files.sort((a, b) => a.localeCompare(b));
Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-test/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"parse-link-header": "^1.0.1",
"rxjs": "^6.5.5",
"strip-ansi": "^5.2.0",
"tar-fs": "^1.16.3",
"tar-fs": "^2.1.0",
"tmp": "^0.1.0",
"xml2js": "^0.4.22",
"zlib": "^1.0.5"
Expand Down
6 changes: 3 additions & 3 deletions src/core/server/ui_settings/integration_tests/lib/servers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,9 @@ export function getServices() {
httpServerMock.createKibanaRequest()
);

const uiSettings = kbnServer.server.uiSettingsServiceFactory({
savedObjectsClient,
});
const uiSettings = kbnServer.newPlatform.start.core.uiSettings.asScopedToClient(
savedObjectsClient
);

services = {
kbnServer,
Expand Down
2 changes: 0 additions & 2 deletions src/legacy/server/kbn_server.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ import { LegacyConfig, ILegacyService, ILegacyInternals } from '../../core/serve
import { UiPlugins } from '../../core/server/plugins';
import { CallClusterWithRequest, ElasticsearchPlugin } from '../core_plugins/elasticsearch';
import { UsageCollectionSetup } from '../../plugins/usage_collection/server';
import { UiSettingsServiceFactoryOptions } from '../../legacy/ui/ui_settings/ui_settings_service_factory';
import { HomeServerPluginSetup } from '../../plugins/home/server';

// lot of legacy code was assuming this type only had these two methods
Expand Down Expand Up @@ -78,7 +77,6 @@ declare module 'hapi' {
name: string,
factoryFn: (request: Request) => Record<string, any>
) => void;
uiSettingsServiceFactory: (options?: UiSettingsServiceFactoryOptions) => IUiSettingsClient;
logWithMetadata: (tags: string[], message: string, meta: Record<string, any>) => void;
newPlatform: KbnServer['newPlatform'];
}
Expand Down
2 changes: 0 additions & 2 deletions src/legacy/ui/ui_mixin.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,8 @@

import { uiAppsMixin } from './ui_apps';
import { uiRenderMixin } from './ui_render';
import { uiSettingsMixin } from './ui_settings';

export async function uiMixin(kbnServer) {
await kbnServer.mixin(uiAppsMixin);
await kbnServer.mixin(uiSettingsMixin);
await kbnServer.mixin(uiRenderMixin);
}
6 changes: 5 additions & 1 deletion src/legacy/ui/ui_render/ui_render_mixin.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import { createHash } from 'crypto';
import Boom from 'boom';
import { i18n } from '@kbn/i18n';
import * as UiSharedDeps from '@kbn/ui-shared-deps';
import { KibanaRequest } from '../../../core/server';
import { AppBootstrap } from './bootstrap';
import { getApmConfig } from '../apm';

Expand Down Expand Up @@ -79,7 +80,10 @@ export function uiRenderMixin(kbnServer, server, config) {
auth: authEnabled ? { mode: 'try' } : false,
},
async handler(request, h) {
const uiSettings = request.getUiSettingsService();
const soClient = kbnServer.newPlatform.start.core.savedObjects.getScopedClient(
KibanaRequest.from(request)
);
const uiSettings = kbnServer.newPlatform.start.core.uiSettings.asScopedToClient(soClient);

const darkMode =
!authEnabled || request.auth.isAuthenticated
Expand Down
20 changes: 0 additions & 20 deletions src/legacy/ui/ui_settings/index.js

This file was deleted.

179 changes: 0 additions & 179 deletions src/legacy/ui/ui_settings/integration_tests/ui_settings_mixin.test.ts

This file was deleted.

Loading

0 comments on commit 81ffec0

Please sign in to comment.