From b413d9d5bf56590539ef3a457e845c8c57b6de11 Mon Sep 17 00:00:00 2001 From: Alexey Antonov Date: Thu, 4 Feb 2021 12:16:16 +0300 Subject: [PATCH 01/69] [TSVB] Disable runtime fields showing up in TSVB (#90163) * [TSVB] Disable runtime fields showing up in TSVB * add tests Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> --- .../abstract_search_strategy.test.ts | 69 ++++++++++++++++++- .../strategies/abstract_search_strategy.ts | 20 +++--- 2 files changed, 79 insertions(+), 10 deletions(-) diff --git a/src/plugins/vis_type_timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.test.ts b/src/plugins/vis_type_timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.test.ts index e433a5817218d..017fa6837f562 100644 --- a/src/plugins/vis_type_timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.test.ts +++ b/src/plugins/vis_type_timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.test.ts @@ -7,9 +7,14 @@ */ import { from } from 'rxjs'; -import { AbstractSearchStrategy, ReqFacade } from './abstract_search_strategy'; +import { + AbstractSearchStrategy, + ReqFacade, + toSanitizedFieldType, +} from './abstract_search_strategy'; import type { VisPayload } from '../../../../common/types'; import type { IFieldType } from '../../../../../data/common'; +import type { FieldSpec, RuntimeField } from '../../../../../data/common'; class FooSearchStrategy extends AbstractSearchStrategy {} @@ -91,4 +96,66 @@ describe('AbstractSearchStrategy', () => { } ); }); + + describe('toSanitizedFieldType', () => { + const mockedField = { + lang: 'lang', + conflictDescriptions: {}, + aggregatable: true, + name: 'name', + type: 'type', + esTypes: ['long', 'geo'], + } as FieldSpec; + + test('should sanitize fields ', async () => { + const fields = [mockedField] as FieldSpec[]; + + expect(toSanitizedFieldType(fields)).toMatchInlineSnapshot(` + Array [ + Object { + "label": "name", + "name": "name", + "type": "type", + }, + ] + `); + }); + + test('should filter runtime fields', async () => { + const fields: FieldSpec[] = [ + { + ...mockedField, + runtimeField: {} as RuntimeField, + }, + ]; + + expect(toSanitizedFieldType(fields)).toMatchInlineSnapshot(`Array []`); + }); + + test('should filter non-aggregatable fields', async () => { + const fields: FieldSpec[] = [ + { + ...mockedField, + aggregatable: false, + }, + ]; + + expect(toSanitizedFieldType(fields)).toMatchInlineSnapshot(`Array []`); + }); + + test('should filter nested fields', async () => { + const fields: FieldSpec[] = [ + { + ...mockedField, + subType: { + nested: { + path: 'path', + }, + }, + }, + ]; + + expect(toSanitizedFieldType(fields)).toMatchInlineSnapshot(`Array []`); + }); + }); }); diff --git a/src/plugins/vis_type_timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.ts b/src/plugins/vis_type_timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.ts index 92c6acb3590fa..620f494021f0f 100644 --- a/src/plugins/vis_type_timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.ts +++ b/src/plugins/vis_type_timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.ts @@ -8,13 +8,11 @@ import type { FakeRequest, IUiSettingsClient, SavedObjectsClientContract } from 'kibana/server'; -import { indexPatterns } from '../../../../../data/server'; +import { indexPatterns, IndexPatternsFetcher } from '../../../../../data/server'; import type { Framework } from '../../../plugin'; -import type { IndexPatternsFetcher, IFieldType } from '../../../../../data/server'; -import type { VisPayload } from '../../../../common/types'; -import type { IndexPatternsService } from '../../../../../data/common'; -import type { SanitizedFieldType } from '../../../../common/types'; +import type { FieldSpec, IndexPatternsService } from '../../../../../data/common'; +import type { VisPayload, SanitizedFieldType } from '../../../../common/types'; import type { VisTypeTimeseriesRequestHandlerContext } from '../../../types'; /** @@ -36,11 +34,15 @@ export interface ReqFacade extends FakeRequest { getIndexPatternsService: () => Promise; } -const toSanitizedFieldType = (fields: IFieldType[]) => { +export const toSanitizedFieldType = (fields: FieldSpec[]) => { return fields - .filter((field) => field.aggregatable && !indexPatterns.isNestedField(field)) + .filter( + (field) => + // Make sure to only include mapped fields, e.g. no index pattern runtime fields + !field.runtimeField && field.aggregatable && !indexPatterns.isNestedField(field) + ) .map( - (field: IFieldType) => + (field) => ({ name: field.name, label: field.customLabel ?? field.name, @@ -95,7 +97,7 @@ export abstract class AbstractSearchStrategy { return toSanitizedFieldType( kibanaIndexPattern - ? kibanaIndexPattern.fields.getAll() + ? kibanaIndexPattern.getNonScriptedFields() : await indexPatternsFetcher!.getFieldsForWildcard({ pattern: indexPattern, fieldCapsOptions: { allow_no_indices: true }, From caf9d833a7796a563bb84810763f22ee373cd7cc Mon Sep 17 00:00:00 2001 From: Joe Reuter Date: Thu, 4 Feb 2021 11:36:01 +0100 Subject: [PATCH 02/69] add tsconfig for dashboard mode (#89855) --- x-pack/plugins/dashboard_mode/tsconfig.json | 23 +++++++++++++++++++++ x-pack/test/tsconfig.json | 1 + x-pack/tsconfig.json | 2 ++ x-pack/tsconfig.refs.json | 1 + 4 files changed, 27 insertions(+) create mode 100644 x-pack/plugins/dashboard_mode/tsconfig.json diff --git a/x-pack/plugins/dashboard_mode/tsconfig.json b/x-pack/plugins/dashboard_mode/tsconfig.json new file mode 100644 index 0000000000000..6e4ed11ffa7ff --- /dev/null +++ b/x-pack/plugins/dashboard_mode/tsconfig.json @@ -0,0 +1,23 @@ +{ + "extends": "../../../tsconfig.base.json", + "compilerOptions": { + "composite": true, + "outDir": "./target/types", + "emitDeclarationOnly": true, + "declaration": true, + "declarationMap": true, + }, + "include": [ + "common/**/*", + "public/**/*", + "server/**/*", + "../../../typings/**/*" + ], + "references": [ + { "path": "../../../src/core/tsconfig.json" }, + { "path": "../../../src/plugins/dashboard/tsconfig.json" }, + { "path": "../../../src/plugins/kibana_legacy/tsconfig.json" }, + { "path": "../../../src/plugins/url_forwarding/tsconfig.json" }, + { "path": "../security/tsconfig.json" } + ] +} diff --git a/x-pack/test/tsconfig.json b/x-pack/test/tsconfig.json index c5723d10109f6..10943b3a2929f 100644 --- a/x-pack/test/tsconfig.json +++ b/x-pack/test/tsconfig.json @@ -44,6 +44,7 @@ { "path": "../plugins/code/tsconfig.json" }, { "path": "../plugins/console_extensions/tsconfig.json" }, { "path": "../plugins/data_enhanced/tsconfig.json" }, + { "path": "../plugins/dashboard_mode/tsconfig.json" }, { "path": "../plugins/enterprise_search/tsconfig.json" }, { "path": "../plugins/global_search/tsconfig.json" }, { "path": "../plugins/global_search_providers/tsconfig.json" }, diff --git a/x-pack/tsconfig.json b/x-pack/tsconfig.json index 624a65bb4df82..6fabd16752dfa 100644 --- a/x-pack/tsconfig.json +++ b/x-pack/tsconfig.json @@ -12,6 +12,7 @@ "plugins/code/**/*", "plugins/data_enhanced/**/*", "plugins/discover_enhanced/**/*", + "plugins/dashboard_mode/**/*", "plugins/dashboard_enhanced/**/*", "plugins/global_search/**/*", "plugins/global_search_providers/**/*", @@ -104,6 +105,7 @@ { "path": "./plugins/code/tsconfig.json" }, { "path": "./plugins/console_extensions/tsconfig.json" }, { "path": "./plugins/data_enhanced/tsconfig.json" }, + { "path": "./plugins/dashboard_mode/tsconfig.json" }, { "path": "./plugins/discover_enhanced/tsconfig.json" }, { "path": "./plugins/embeddable_enhanced/tsconfig.json" }, { "path": "./plugins/encrypted_saved_objects/tsconfig.json" }, diff --git a/x-pack/tsconfig.refs.json b/x-pack/tsconfig.refs.json index fbe8d7dd9af7c..e35cfe4e024a2 100644 --- a/x-pack/tsconfig.refs.json +++ b/x-pack/tsconfig.refs.json @@ -10,6 +10,7 @@ { "path": "./plugins/console_extensions/tsconfig.json" }, { "path": "./plugins/dashboard_enhanced/tsconfig.json" }, { "path": "./plugins/data_enhanced/tsconfig.json" }, + { "path": "./plugins/dashboard_mode/tsconfig.json" }, { "path": "./plugins/discover_enhanced/tsconfig.json" }, { "path": "./plugins/embeddable_enhanced/tsconfig.json" }, { "path": "./plugins/encrypted_saved_objects/tsconfig.json" }, From 1818dd7f4a9a99df6e67c9de07f430bd33c08205 Mon Sep 17 00:00:00 2001 From: Joe Reuter Date: Thu, 4 Feb 2021 11:37:50 +0100 Subject: [PATCH 03/69] memoize editor frame (#89865) --- x-pack/plugins/lens/public/app_plugin/app.tsx | 163 +++++++++++++----- 1 file changed, 117 insertions(+), 46 deletions(-) diff --git a/x-pack/plugins/lens/public/app_plugin/app.tsx b/x-pack/plugins/lens/public/app_plugin/app.tsx index 471581cb25726..7e95479887dbd 100644 --- a/x-pack/plugins/lens/public/app_plugin/app.tsx +++ b/x-pack/plugins/lens/public/app_plugin/app.tsx @@ -8,9 +8,11 @@ import './app.scss'; import _ from 'lodash'; -import React, { useState, useEffect, useCallback } from 'react'; +import React, { useState, useEffect, useCallback, useRef } from 'react'; import { i18n } from '@kbn/i18n'; -import { NotificationsStart } from 'kibana/public'; +import { NotificationsStart, Toast } from 'kibana/public'; +import { VisualizeFieldContext } from 'src/plugins/ui_actions/public'; +import { Datatable } from 'src/plugins/expressions/public'; import { EuiBreadcrumb } from '@elastic/eui'; import { downloadMultipleAs } from '../../../../../src/plugins/share/public'; import { @@ -26,21 +28,27 @@ import { injectFilterReferences } from '../persistence'; import { NativeRenderer } from '../native_renderer'; import { trackUiEvent } from '../lens_ui_telemetry'; import { + DataPublicPluginStart, esFilters, exporters, + Filter, IndexPattern as IndexPatternInstance, IndexPatternsContract, + Query, + SavedQuery, syncQueryStateWithUrl, } from '../../../../../src/plugins/data/public'; import { LENS_EMBEDDABLE_TYPE, getFullPath } from '../../common'; import { LensAppProps, LensAppServices, LensAppState } from './types'; import { getLensTopNavConfig } from './lens_top_nav'; +import { Document } from '../persistence'; import { SaveModal } from './save_modal'; import { LensByReferenceInput, LensEmbeddableInput, } from '../editor_frame_service/embeddable/embeddable'; import { useTimeRange } from './time_range'; +import { EditorFrameInstance } from '../types'; export function App({ history, @@ -515,6 +523,12 @@ export function App({ } }; + const lastKnownDocRef = useRef(state.lastKnownDoc); + lastKnownDocRef.current = state.lastKnownDoc; + + const activeDataRef = useRef(state.activeData); + activeDataRef.current = state.activeData; + const { TopNavMenu } = navigation.ui; const savingPermitted = Boolean(state.isSaveable && application.capabilities.visualize.save); @@ -660,50 +674,24 @@ export function App({ /> {(!state.isLoading || state.persistedDoc) && ( - { - if (isSaveable !== state.isSaveable) { - setState((s) => ({ ...s, isSaveable })); - } - if (!_.isEqual(state.persistedDoc, doc) && !_.isEqual(state.lastKnownDoc, doc)) { - setState((s) => ({ ...s, lastKnownDoc: doc })); - } - if (!_.isEqual(state.activeData, activeData)) { - setState((s) => ({ ...s, activeData })); - } - - // Update the cached index patterns if the user made a change to any of them - if ( - state.indexPatternsForTopNav.length !== filterableIndexPatterns.length || - filterableIndexPatterns.some( - (id) => - !state.indexPatternsForTopNav.find((indexPattern) => indexPattern.id === id) - ) - ) { - getAllIndexPatterns( - filterableIndexPatterns, - data.indexPatterns, - notifications - ).then((indexPatterns) => { - if (indexPatterns) { - setState((s) => ({ ...s, indexPatternsForTopNav: indexPatterns })); - } - }); - } - }, - }} + )} @@ -732,6 +720,89 @@ export function App({ ); } +const MemoizedEditorFrameWrapper = React.memo(function EditorFrameWrapper({ + editorFrame, + query, + filters, + searchSessionId, + isSaveable: oldIsSaveable, + savedQuery, + persistedDoc, + indexPatterns: indexPatternsForTopNav, + resolvedDateRange, + onError, + showNoDataPopover, + initialContext, + setState, + data, + notifications, + lastKnownDoc, + activeData: activeDataRef, +}: { + editorFrame: EditorFrameInstance; + searchSessionId: string; + query: Query; + filters: Filter[]; + isSaveable: boolean; + savedQuery?: SavedQuery; + persistedDoc?: Document | undefined; + indexPatterns: IndexPatternInstance[]; + resolvedDateRange: { fromDate: string; toDate: string }; + onError: (e: { message: string }) => Toast; + showNoDataPopover: () => void; + initialContext: VisualizeFieldContext | undefined; + setState: React.Dispatch>; + data: DataPublicPluginStart; + notifications: NotificationsStart; + lastKnownDoc: React.MutableRefObject; + activeData: React.MutableRefObject | undefined>; +}) { + return ( + { + if (isSaveable !== oldIsSaveable) { + setState((s) => ({ ...s, isSaveable })); + } + if (!_.isEqual(persistedDoc, doc) && !_.isEqual(lastKnownDoc.current, doc)) { + setState((s) => ({ ...s, lastKnownDoc: doc })); + } + if (!_.isEqual(activeDataRef.current, activeData)) { + setState((s) => ({ ...s, activeData })); + } + + // Update the cached index patterns if the user made a change to any of them + if ( + indexPatternsForTopNav.length !== filterableIndexPatterns.length || + filterableIndexPatterns.some( + (id) => !indexPatternsForTopNav.find((indexPattern) => indexPattern.id === id) + ) + ) { + getAllIndexPatterns(filterableIndexPatterns, data.indexPatterns, notifications).then( + (indexPatterns) => { + if (indexPatterns) { + setState((s) => ({ ...s, indexPatternsForTopNav: indexPatterns })); + } + } + ); + } + }, + }} + /> + ); +}); + export async function getAllIndexPatterns( ids: string[], indexPatternsService: IndexPatternsContract, From 72670ebc77442a54869f94e7bea2f1f8f3499461 Mon Sep 17 00:00:00 2001 From: Luke Elmers Date: Thu, 4 Feb 2021 06:05:06 -0700 Subject: [PATCH 04/69] [core.logging] Add response logs to the KP logging system. (#87939) --- docs/migration/migrate_8_0.asciidoc | 11 +- .../src/get_logging_config.ts | 13 +- packages/kbn-legacy-logging/src/log_events.ts | 4 +- packages/kbn-legacy-logging/src/log_format.ts | 33 +- .../src/log_format_json.test.ts | 63 ++-- .../src/utils/get_payload_size.test.ts | 101 ++++++ .../src/utils/get_payload_size.ts | 64 ++++ .../kbn-legacy-logging/src/utils/index.ts | 1 + .../deprecation/core_deprecations.test.ts | 44 ++- .../config/deprecation/core_deprecations.ts | 16 +- src/core/server/http/http_server.ts | 26 +- .../http/integration_tests/logging.test.ts | 338 ++++++++++++++++++ .../http/logging/get_payload_size.test.ts | 204 +++++++++++ .../server/http/logging/get_payload_size.ts | 73 ++++ .../http/logging/get_response_log.test.ts | 247 +++++++++++++ .../server/http/logging/get_response_log.ts | 92 +++++ src/core/server/http/logging/index.ts | 9 + src/core/server/logging/README.md | 44 +++ src/core/server/logging/ecs.ts | 65 +++- src/core/server/logging/index.ts | 8 +- .../metrics/logging/get_ops_metrics_log.ts | 4 +- 21 files changed, 1393 insertions(+), 67 deletions(-) create mode 100644 packages/kbn-legacy-logging/src/utils/get_payload_size.test.ts create mode 100644 packages/kbn-legacy-logging/src/utils/get_payload_size.ts create mode 100644 src/core/server/http/integration_tests/logging.test.ts create mode 100644 src/core/server/http/logging/get_payload_size.test.ts create mode 100644 src/core/server/http/logging/get_payload_size.ts create mode 100644 src/core/server/http/logging/get_response_log.test.ts create mode 100644 src/core/server/http/logging/get_response_log.ts create mode 100644 src/core/server/http/logging/index.ts diff --git a/docs/migration/migrate_8_0.asciidoc b/docs/migration/migrate_8_0.asciidoc index 649d4fe951263..14eff4594c813 100644 --- a/docs/migration/migrate_8_0.asciidoc +++ b/docs/migration/migrate_8_0.asciidoc @@ -58,7 +58,16 @@ for example, `logstash-*`. ==== Responses are never logged by default *Details:* Previously responses would be logged if either `logging.json` was true, `logging.dest` was specified, or a `TTY` was detected. -*Impact:* To restore the previous behavior, in kibana.yml set `logging.events.response=*`. +*Impact:* To restore the previous behavior, in kibana.yml enable `debug` logs for the `http.server.response` context under `logging.loggers`: +[source,yaml] +------------------- +logging: + loggers: + - context: http.server.response + appenders: [console] + level: debug +------------------- +See https://github.com/elastic/kibana/pull/87939 for more details. [float] ==== `xpack.security.authProviders` is no longer valid diff --git a/packages/kbn-legacy-logging/src/get_logging_config.ts b/packages/kbn-legacy-logging/src/get_logging_config.ts index 900a5a27d93c6..f74bc5904e24b 100644 --- a/packages/kbn-legacy-logging/src/get_logging_config.ts +++ b/packages/kbn-legacy-logging/src/get_logging_config.ts @@ -27,14 +27,14 @@ export function getLoggingConfiguration(config: LegacyLoggingConfig, opsInterval }); } else if (config.verbose) { _.defaults(events, { + error: '*', log: '*', - // To avoid duplicate logs, we explicitly disable this in verbose - // mode as it is already provided by the new logging config under - // the `metrics.ops` context. + // To avoid duplicate logs, we explicitly disable these in verbose + // mode as they are already provided by the new logging config under + // the `http.server.response` and `metrics.ops` contexts. ops: '!', - request: '*', - response: '*', - error: '*', + request: '!', + response: '!', }); } else { _.defaults(events, { @@ -75,6 +75,7 @@ export function getLoggingConfiguration(config: LegacyLoggingConfig, opsInterval }, includes: { request: ['headers', 'payload'], + response: ['headers', 'payload'], }, reporters: { logReporter: [loggerStream], diff --git a/packages/kbn-legacy-logging/src/log_events.ts b/packages/kbn-legacy-logging/src/log_events.ts index bb5bc245d14fb..193bfbea42ace 100644 --- a/packages/kbn-legacy-logging/src/log_events.ts +++ b/packages/kbn-legacy-logging/src/log_events.ts @@ -6,6 +6,7 @@ * Side Public License, v 1. */ +import type { ResponseObject } from '@hapi/hapi'; import { EventData, isEventData } from './metadata'; export interface BaseEvent { @@ -21,7 +22,8 @@ export interface ResponseEvent extends BaseEvent { statusCode: number; path: string; headers: Record; - responsePayload: string; + responseHeaders: Record; + responsePayload: ResponseObject['source']; responseTime: string; query: Record; } diff --git a/packages/kbn-legacy-logging/src/log_format.ts b/packages/kbn-legacy-logging/src/log_format.ts index ec2628a4389a3..a0eaf023dff19 100644 --- a/packages/kbn-legacy-logging/src/log_format.ts +++ b/packages/kbn-legacy-logging/src/log_format.ts @@ -12,15 +12,14 @@ import _ from 'lodash'; import queryString from 'query-string'; import numeral from '@elastic/numeral'; import chalk from 'chalk'; -// @ts-expect-error missing type def -import stringify from 'json-stringify-safe'; import { inspect } from 'util'; -import { applyFiltersToKeys } from './utils'; +import { applyFiltersToKeys, getResponsePayloadBytes } from './utils'; import { getLogEventData } from './metadata'; import { LegacyLoggingConfig } from './schema'; import { AnyEvent, + ResponseEvent, isResponseEvent, isOpsEvent, isErrorEvent, @@ -70,6 +69,23 @@ export abstract class BaseLogFormat extends Stream.Transform { next(); } + getContentLength({ responsePayload, responseHeaders }: ResponseEvent): number | undefined { + try { + return getResponsePayloadBytes(responsePayload, responseHeaders); + } catch (e) { + // We intentionally swallow any errors as this information is + // only a nicety for logging purposes, and should not cause the + // server to crash if it cannot be determined. + this.push( + this.format({ + type: 'log', + tags: ['warning', 'logging'], + message: `Failed to calculate response payload bytes. [${e}]`, + }) + '\n' + ); + } + } + extractAndFormatTimestamp(data: Record, format?: string) { const { timezone } = this.config; const date = moment(data['@timestamp']); @@ -100,15 +116,10 @@ export abstract class BaseLogFormat extends Stream.Transform { referer: source.referer, }; - const contentLength = - event.responsePayload === 'object' - ? stringify(event.responsePayload).length - : String(event.responsePayload).length; - data.res = { statusCode: event.statusCode, responseTime: event.responseTime, - contentLength, + contentLength: this.getContentLength(event), }; const query = queryString.stringify(event.query, { sort: false }); @@ -122,7 +133,9 @@ export abstract class BaseLogFormat extends Stream.Transform { data.message += levelColor(data.res.statusCode); data.message += ' '; data.message += chalk.gray(data.res.responseTime + 'ms'); - data.message += chalk.gray(' - ' + numeral(contentLength).format('0.0b')); + if (data.res.contentLength) { + data.message += chalk.gray(' - ' + numeral(data.res.contentLength).format('0.0b')); + } } else if (isOpsEvent(event)) { _.defaults(data, _.pick(event, ['pid', 'os', 'proc', 'load'])); data.message = chalk.gray('memory: '); diff --git a/packages/kbn-legacy-logging/src/log_format_json.test.ts b/packages/kbn-legacy-logging/src/log_format_json.test.ts index edeb8187d7ac1..3255c5d17bb30 100644 --- a/packages/kbn-legacy-logging/src/log_format_json.test.ts +++ b/packages/kbn-legacy-logging/src/log_format_json.test.ts @@ -39,30 +39,45 @@ describe('KbnLoggerJsonFormat', () => { expect(message).toBe('undefined'); }); - it('response', async () => { - const event = { - ...makeEvent('response'), - statusCode: 200, - contentLength: 800, - responseTime: 12000, - method: 'GET', - path: '/path/to/resource', - responsePayload: '1234567879890', - source: { - remoteAddress: '127.0.0.1', - userAgent: 'Test Thing', - referer: 'elastic.co', - }, - }; - const result = await createPromiseFromStreams([createListStream([event]), format]); - const { type, method, statusCode, message, req } = JSON.parse(result); - - expect(type).toBe('response'); - expect(method).toBe('GET'); - expect(statusCode).toBe(200); - expect(message).toBe('GET /path/to/resource 200 12000ms - 13.0B'); - expect(req.remoteAddress).toBe('127.0.0.1'); - expect(req.userAgent).toBe('Test Thing'); + describe('response', () => { + it('handles a response object', async () => { + const event = { + ...makeEvent('response'), + statusCode: 200, + contentLength: 800, + responseTime: 12000, + method: 'GET', + path: '/path/to/resource', + responsePayload: '1234567879890', + source: { + remoteAddress: '127.0.0.1', + userAgent: 'Test Thing', + referer: 'elastic.co', + }, + }; + const result = await createPromiseFromStreams([createListStream([event]), format]); + const { type, method, statusCode, message, req } = JSON.parse(result); + + expect(type).toBe('response'); + expect(method).toBe('GET'); + expect(statusCode).toBe(200); + expect(message).toBe('GET /path/to/resource 200 12000ms - 13.0B'); + expect(req.remoteAddress).toBe('127.0.0.1'); + expect(req.userAgent).toBe('Test Thing'); + }); + + it('leaves payload size empty if not available', async () => { + const event = { + ...makeEvent('response'), + statusCode: 200, + responseTime: 12000, + method: 'GET', + path: '/path/to/resource', + responsePayload: null, + }; + const result = await createPromiseFromStreams([createListStream([event]), format]); + expect(JSON.parse(result).message).toBe('GET /path/to/resource 200 12000ms'); + }); }); it('ops', async () => { diff --git a/packages/kbn-legacy-logging/src/utils/get_payload_size.test.ts b/packages/kbn-legacy-logging/src/utils/get_payload_size.test.ts new file mode 100644 index 0000000000000..c70f95b9ddc11 --- /dev/null +++ b/packages/kbn-legacy-logging/src/utils/get_payload_size.test.ts @@ -0,0 +1,101 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0 and the Server Side Public License, v 1; you may not use this file except + * in compliance with, at your election, the Elastic License 2.0 or the Server + * Side Public License, v 1. + */ + +import mockFs from 'mock-fs'; +import { createReadStream } from 'fs'; + +import { getResponsePayloadBytes } from './get_payload_size'; + +describe('getPayloadSize', () => { + describe('handles Buffers', () => { + test('with ascii characters', () => { + const payload = 'heya'; + const result = getResponsePayloadBytes(Buffer.from(payload)); + expect(result).toBe(4); + }); + + test('with special characters', () => { + const payload = '¡hola!'; + const result = getResponsePayloadBytes(Buffer.from(payload)); + expect(result).toBe(7); + }); + }); + + describe('handles fs streams', () => { + afterEach(() => mockFs.restore()); + + test('with ascii characters', async () => { + mockFs({ 'test.txt': 'heya' }); + const readStream = createReadStream('test.txt'); + + let data = ''; + for await (const chunk of readStream) { + data += chunk; + } + + const result = getResponsePayloadBytes(readStream); + expect(result).toBe(Buffer.byteLength(data)); + }); + + test('with special characters', async () => { + mockFs({ 'test.txt': '¡hola!' }); + const readStream = createReadStream('test.txt'); + + let data = ''; + for await (const chunk of readStream) { + data += chunk; + } + + const result = getResponsePayloadBytes(readStream); + expect(result).toBe(Buffer.byteLength(data)); + }); + }); + + describe('handles plain responses', () => { + test('when source is text', () => { + const result = getResponsePayloadBytes('heya'); + expect(result).toBe(4); + }); + + test('when source contains special characters', () => { + const result = getResponsePayloadBytes('¡hola!'); + expect(result).toBe(7); + }); + + test('when source is object', () => { + const payload = { message: 'heya' }; + const result = getResponsePayloadBytes(payload); + expect(result).toBe(JSON.stringify(payload).length); + }); + }); + + describe('handles content-length header', () => { + test('always provides content-length header if available', () => { + const headers = { 'content-length': '123' }; + const result = getResponsePayloadBytes('heya', headers); + expect(result).toBe(123); + }); + + test('uses first value when hapi header is an array', () => { + const headers = { 'content-length': ['123', '456'] }; + const result = getResponsePayloadBytes(null, headers); + expect(result).toBe(123); + }); + + test('returns undefined if length is NaN', () => { + const headers = { 'content-length': 'oops' }; + const result = getResponsePayloadBytes(null, headers); + expect(result).toBeUndefined(); + }); + }); + + test('defaults to undefined', () => { + const result = getResponsePayloadBytes(null); + expect(result).toBeUndefined(); + }); +}); diff --git a/packages/kbn-legacy-logging/src/utils/get_payload_size.ts b/packages/kbn-legacy-logging/src/utils/get_payload_size.ts new file mode 100644 index 0000000000000..de96ad7002731 --- /dev/null +++ b/packages/kbn-legacy-logging/src/utils/get_payload_size.ts @@ -0,0 +1,64 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0 and the Server Side Public License, v 1; you may not use this file except + * in compliance with, at your election, the Elastic License 2.0 or the Server + * Side Public License, v 1. + */ + +import type { ReadStream } from 'fs'; +import type { ResponseObject } from '@hapi/hapi'; + +const isBuffer = (obj: unknown): obj is Buffer => Buffer.isBuffer(obj); +const isObject = (obj: unknown): obj is Record => + typeof obj === 'object' && obj !== null; +const isFsReadStream = (obj: unknown): obj is ReadStream => + typeof obj === 'object' && obj !== null && 'bytesRead' in obj; +const isString = (obj: unknown): obj is string => typeof obj === 'string'; + +/** + * Attempts to determine the size (in bytes) of a hapi/good + * responsePayload based on the payload type. Falls back to + * `undefined` if the size cannot be determined. + * + * This is similar to the implementation in `core/server/http/logging`, + * however it uses more duck typing as we do not have access to the + * entire hapi request object like we do in the HttpServer. + * + * @param headers responseHeaders from hapi/good event + * @param payload responsePayload from hapi/good event + * + * @internal + */ +export function getResponsePayloadBytes( + payload: ResponseObject['source'], + headers: Record = {} +): number | undefined { + const contentLength = headers['content-length']; + if (contentLength) { + const val = parseInt( + // hapi response headers can be `string | string[]`, so we need to handle both cases + Array.isArray(contentLength) ? String(contentLength) : contentLength, + 10 + ); + return !isNaN(val) ? val : undefined; + } + + if (isBuffer(payload)) { + return payload.byteLength; + } + + if (isFsReadStream(payload)) { + return payload.bytesRead; + } + + if (isString(payload)) { + return Buffer.byteLength(payload); + } + + if (isObject(payload)) { + return Buffer.byteLength(JSON.stringify(payload)); + } + + return undefined; +} diff --git a/packages/kbn-legacy-logging/src/utils/index.ts b/packages/kbn-legacy-logging/src/utils/index.ts index 166fac130f771..3036671121fe0 100644 --- a/packages/kbn-legacy-logging/src/utils/index.ts +++ b/packages/kbn-legacy-logging/src/utils/index.ts @@ -7,3 +7,4 @@ */ export { applyFiltersToKeys } from './apply_filters_to_keys'; +export { getResponsePayloadBytes } from './get_payload_size'; diff --git a/src/core/server/config/deprecation/core_deprecations.test.ts b/src/core/server/config/deprecation/core_deprecations.test.ts index 53ce11a3dd3f4..70ca91b0d6317 100644 --- a/src/core/server/config/deprecation/core_deprecations.test.ts +++ b/src/core/server/config/deprecation/core_deprecations.test.ts @@ -244,7 +244,49 @@ describe('core deprecations', () => { }); expect(messages).toMatchInlineSnapshot(` Array [ - "\\"logging.events.ops\\" has been deprecated and will be removed in 8.0. To access ops data moving forward, please enable debug logs for the \\"metrics.ops\\" context in your logging configuration.", + "\\"logging.events.ops\\" has been deprecated and will be removed in 8.0. To access ops data moving forward, please enable debug logs for the \\"metrics.ops\\" context in your logging configuration. For more details, see https://github.com/elastic/kibana/blob/master/src/core/server/logging/README.md", + ] + `); + }); + + it('does not warn when other events are configured', () => { + const { messages } = applyCoreDeprecations({ + logging: { events: { log: '*' } }, + }); + expect(messages).toEqual([]); + }); + }); + + describe('logging.events.request and logging.events.response', () => { + it('warns when request and response events are used', () => { + const { messages } = applyCoreDeprecations({ + logging: { events: { request: '*', response: '*' } }, + }); + expect(messages).toMatchInlineSnapshot(` + Array [ + "\\"logging.events.request\\" and \\"logging.events.response\\" have been deprecated and will be removed in 8.0. To access request and/or response data moving forward, please enable debug logs for the \\"http.server.response\\" context in your logging configuration. For more details, see https://github.com/elastic/kibana/blob/master/src/core/server/logging/README.md", + ] + `); + }); + + it('warns when only request event is used', () => { + const { messages } = applyCoreDeprecations({ + logging: { events: { request: '*' } }, + }); + expect(messages).toMatchInlineSnapshot(` + Array [ + "\\"logging.events.request\\" and \\"logging.events.response\\" have been deprecated and will be removed in 8.0. To access request and/or response data moving forward, please enable debug logs for the \\"http.server.response\\" context in your logging configuration. For more details, see https://github.com/elastic/kibana/blob/master/src/core/server/logging/README.md", + ] + `); + }); + + it('warns when only response event is used', () => { + const { messages } = applyCoreDeprecations({ + logging: { events: { response: '*' } }, + }); + expect(messages).toMatchInlineSnapshot(` + Array [ + "\\"logging.events.request\\" and \\"logging.events.response\\" have been deprecated and will be removed in 8.0. To access request and/or response data moving forward, please enable debug logs for the \\"http.server.response\\" context in your logging configuration. For more details, see https://github.com/elastic/kibana/blob/master/src/core/server/logging/README.md", ] `); }); diff --git a/src/core/server/config/deprecation/core_deprecations.ts b/src/core/server/config/deprecation/core_deprecations.ts index 36e91b0ffbddb..0db53cdb2e8be 100644 --- a/src/core/server/config/deprecation/core_deprecations.ts +++ b/src/core/server/config/deprecation/core_deprecations.ts @@ -108,7 +108,20 @@ const opsLoggingEventDeprecation: ConfigDeprecation = (settings, fromPath, log) log( '"logging.events.ops" has been deprecated and will be removed ' + 'in 8.0. To access ops data moving forward, please enable debug logs for the ' + - '"metrics.ops" context in your logging configuration.' + '"metrics.ops" context in your logging configuration. For more details, see ' + + 'https://github.com/elastic/kibana/blob/master/src/core/server/logging/README.md' + ); + } + return settings; +}; + +const requestLoggingEventDeprecation: ConfigDeprecation = (settings, fromPath, log) => { + if (has(settings, 'logging.events.request') || has(settings, 'logging.events.response')) { + log( + '"logging.events.request" and "logging.events.response" have been deprecated and will be removed ' + + 'in 8.0. To access request and/or response data moving forward, please enable debug logs for the ' + + '"http.server.response" context in your logging configuration. For more details, see ' + + 'https://github.com/elastic/kibana/blob/master/src/core/server/logging/README.md' ); } return settings; @@ -149,4 +162,5 @@ export const coreDeprecationProvider: ConfigDeprecationProvider = ({ rename, unu cspRulesDeprecation, mapManifestServiceUrlDeprecation, opsLoggingEventDeprecation, + requestLoggingEventDeprecation, ]; diff --git a/src/core/server/http/http_server.ts b/src/core/server/http/http_server.ts index a6842e8d573e8..8435050a238c6 100644 --- a/src/core/server/http/http_server.ts +++ b/src/core/server/http/http_server.ts @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -import { Server } from '@hapi/hapi'; +import { Server, Request } from '@hapi/hapi'; import HapiStaticFiles from '@hapi/inert'; import url from 'url'; import uuid from 'uuid'; @@ -33,6 +33,7 @@ import { import { IsAuthenticated, AuthStateStorage, GetAuthState } from './auth_state_storage'; import { AuthHeadersStorage, GetAuthHeaders } from './auth_headers_storage'; import { BasePath } from './base_path_service'; +import { getEcsResponseLog } from './logging'; import { HttpServiceSetup, HttpServerInfo } from './types'; /** @internal */ @@ -76,6 +77,7 @@ export class HttpServer { private registeredRouters = new Set(); private authRegistered = false; private cookieSessionStorageCreated = false; + private handleServerResponseEvent?: (req: Request) => void; private stopped = false; private readonly log: Logger; @@ -112,6 +114,7 @@ export class HttpServer { const basePathService = new BasePath(config.basePath, config.publicBaseUrl); this.setupBasePathRewrite(config, basePathService); this.setupConditionalCompression(config); + this.setupResponseLogging(); this.setupRequestStateAssignment(config); return { @@ -216,6 +219,9 @@ export class HttpServer { const hasStarted = this.server.info.started > 0; if (hasStarted) { this.log.debug('stopping http server'); + if (this.handleServerResponseEvent) { + this.server.events.removeListener('response', this.handleServerResponseEvent); + } await this.server.stop(); } } @@ -282,6 +288,24 @@ export class HttpServer { } } + private setupResponseLogging() { + if (this.server === undefined) { + throw new Error('Server is not created yet'); + } + if (this.stopped) { + this.log.warn(`setupResponseLogging called after stop`); + } + + const log = this.logger.get('http', 'server', 'response'); + + this.handleServerResponseEvent = (request) => { + const { message, ...meta } = getEcsResponseLog(request, this.log); + log.debug(message!, meta); + }; + + this.server.events.on('response', this.handleServerResponseEvent); + } + private setupRequestStateAssignment(config: HttpConfig) { this.server!.ext('onRequest', (request, responseToolkit) => { request.app = { diff --git a/src/core/server/http/integration_tests/logging.test.ts b/src/core/server/http/integration_tests/logging.test.ts new file mode 100644 index 0000000000000..ba265c1ff61bc --- /dev/null +++ b/src/core/server/http/integration_tests/logging.test.ts @@ -0,0 +1,338 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0 and the Server Side Public License, v 1; you may not use this file except + * in compliance with, at your election, the Elastic License 2.0 or the Server + * Side Public License, v 1. + */ + +import { schema } from '@kbn/config-schema'; +import * as kbnTestServer from '../../../test_helpers/kbn_server'; + +describe('request logging', () => { + let mockConsoleLog: jest.SpyInstance; + + beforeAll(() => { + mockConsoleLog = jest.spyOn(global.console, 'log'); + }); + + afterEach(() => { + mockConsoleLog.mockClear(); + }); + + afterAll(() => { + mockConsoleLog.mockRestore(); + }); + + describe('http server response logging', () => { + describe('configuration', () => { + it('does not log with a default config', async () => { + const root = kbnTestServer.createRoot({ plugins: { initialize: false } }); + const { http } = await root.setup(); + + http + .createRouter('/') + .get( + { path: '/ping', validate: false, options: { authRequired: 'optional' } }, + (context, req, res) => res.ok({ body: 'pong' }) + ); + await root.start(); + + await kbnTestServer.request.get(root, '/ping').expect(200, 'pong'); + expect(mockConsoleLog).not.toHaveBeenCalled(); + + await root.shutdown(); + }); + + it('logs at the correct level and with the correct context', async () => { + const root = kbnTestServer.createRoot({ + logging: { + silent: true, + appenders: { + 'test-console': { + kind: 'console', + layout: { + kind: 'pattern', + pattern: '%level|%logger|%message|%meta', + }, + }, + }, + loggers: [ + { + context: 'http.server.response', + appenders: ['test-console'], + level: 'debug', + }, + ], + }, + plugins: { + initialize: false, + }, + }); + const { http } = await root.setup(); + + http + .createRouter('/') + .get( + { path: '/ping', validate: false, options: { authRequired: 'optional' } }, + (context, req, res) => res.ok({ body: 'pong' }) + ); + await root.start(); + + await kbnTestServer.request.get(root, '/ping').expect(200, 'pong'); + expect(mockConsoleLog).toHaveBeenCalledTimes(1); + const [level, logger] = mockConsoleLog.mock.calls[0][0].split('|'); + expect(level).toBe('DEBUG'); + expect(logger).toBe('http.server.response'); + + await root.shutdown(); + }); + }); + + describe('content', () => { + let root: ReturnType; + const config = { + logging: { + silent: true, + appenders: { + 'test-console': { + kind: 'console', + layout: { + kind: 'pattern', + pattern: '%level|%logger|%message|%meta', + }, + }, + }, + loggers: [ + { + context: 'http.server.response', + appenders: ['test-console'], + level: 'debug', + }, + ], + }, + plugins: { + initialize: false, + }, + }; + + beforeEach(() => { + root = kbnTestServer.createRoot(config); + }); + + afterEach(async () => { + await root.shutdown(); + }); + + it('handles a GET request', async () => { + const { http } = await root.setup(); + + http + .createRouter('/') + .get( + { path: '/ping', validate: false, options: { authRequired: 'optional' } }, + (context, req, res) => res.ok({ body: 'pong' }) + ); + await root.start(); + + await kbnTestServer.request.get(root, '/ping').expect(200, 'pong'); + expect(mockConsoleLog).toHaveBeenCalledTimes(1); + const [, , message, meta] = mockConsoleLog.mock.calls[0][0].split('|'); + // some of the contents of the message are variable based on environment, such as + // response time, so we are only performing assertions against parts of the string + expect(message.includes('GET /ping 200')).toBe(true); + expect(JSON.parse(meta).http.request.method).toBe('GET'); + expect(JSON.parse(meta).url.path).toBe('/ping'); + expect(JSON.parse(meta).http.response.status_code).toBe(200); + }); + + it('handles a POST request', async () => { + const { http } = await root.setup(); + + http.createRouter('/').post( + { + path: '/ping', + validate: { + body: schema.object({ message: schema.string() }), + }, + options: { + authRequired: 'optional', + body: { + accepts: ['application/json'], + }, + timeout: { payload: 100 }, + }, + }, + (context, req, res) => res.ok({ body: { message: req.body.message } }) + ); + await root.start(); + + await kbnTestServer.request + .post(root, '/ping') + .set('Content-Type', 'application/json') + .send({ message: 'hi' }) + .expect(200); + expect(mockConsoleLog).toHaveBeenCalledTimes(1); + const [, , message] = mockConsoleLog.mock.calls[0][0].split('|'); + expect(message.includes('POST /ping 200')).toBe(true); + }); + + it('handles an error response', async () => { + const { http } = await root.setup(); + + http + .createRouter('/') + .get( + { path: '/a', validate: false, options: { authRequired: 'optional' } }, + (context, req, res) => res.ok({ body: 'pong' }) + ); + await root.start(); + + await kbnTestServer.request.get(root, '/b').expect(404); + expect(mockConsoleLog).toHaveBeenCalledTimes(1); + const [, , message, meta] = mockConsoleLog.mock.calls[0][0].split('|'); + // some of the contents of the message are variable based on environment, such as + // response time, so we are only performing assertions against parts of the string + expect(message.includes('GET /b 404')).toBe(true); + expect(JSON.parse(meta).http.response.status_code).toBe(404); + }); + + it('handles query strings', async () => { + const { http } = await root.setup(); + + http + .createRouter('/') + .get( + { path: '/ping', validate: false, options: { authRequired: 'optional' } }, + (context, req, res) => res.ok({ body: 'pong' }) + ); + await root.start(); + + await kbnTestServer.request.get(root, '/ping').query({ hey: 'ya' }).expect(200, 'pong'); + expect(mockConsoleLog).toHaveBeenCalledTimes(1); + const [, , message, meta] = mockConsoleLog.mock.calls[0][0].split('|'); + expect(message.includes('GET /ping?hey=ya 200')).toBe(true); + expect(JSON.parse(meta).url.query).toBe('hey=ya'); + }); + + it('correctly calculates response payload', async () => { + const { http } = await root.setup(); + + http + .createRouter('/') + .get( + { path: '/ping', validate: false, options: { authRequired: 'optional' } }, + (context, req, res) => res.ok({ body: 'pong' }) + ); + await root.start(); + + const response = await kbnTestServer.request.get(root, '/ping').expect(200, 'pong'); + expect(mockConsoleLog).toHaveBeenCalledTimes(1); + const [, , , meta] = mockConsoleLog.mock.calls[0][0].split('|'); + expect(JSON.parse(meta).http.response.body.bytes).toBe(response.text.length); + }); + + describe('handles request/response headers', () => { + it('includes request/response headers in log entry', async () => { + const { http } = await root.setup(); + + http + .createRouter('/') + .get( + { path: '/ping', validate: false, options: { authRequired: 'optional' } }, + (context, req, res) => res.ok({ headers: { bar: 'world' }, body: 'pong' }) + ); + await root.start(); + + await kbnTestServer.request.get(root, '/ping').set('foo', 'hello').expect(200); + expect(mockConsoleLog).toHaveBeenCalledTimes(1); + const [, , , meta] = mockConsoleLog.mock.calls[0][0].split('|'); + expect(JSON.parse(meta).http.request.headers.foo).toBe('hello'); + expect(JSON.parse(meta).http.response.headers.bar).toBe('world'); + }); + + it('filters sensitive request headers', async () => { + const { http } = await root.setup(); + + http.createRouter('/').post( + { + path: '/ping', + validate: { + body: schema.object({ message: schema.string() }), + }, + options: { + authRequired: 'optional', + body: { + accepts: ['application/json'], + }, + timeout: { payload: 100 }, + }, + }, + (context, req, res) => res.ok({ body: { message: req.body.message } }) + ); + await root.start(); + + await kbnTestServer.request + .post(root, '/ping') + .set('content-type', 'application/json') + .set('authorization', 'abc') + .send({ message: 'hi' }) + .expect(200); + expect(mockConsoleLog).toHaveBeenCalledTimes(1); + const [, , , meta] = mockConsoleLog.mock.calls[0][0].split('|'); + expect(JSON.parse(meta).http.request.headers.authorization).toBe('[REDACTED]'); + }); + + it('filters sensitive response headers', async () => { + const { http } = await root.setup(); + + http.createRouter('/').post( + { + path: '/ping', + validate: { + body: schema.object({ message: schema.string() }), + }, + options: { + authRequired: 'optional', + body: { + accepts: ['application/json'], + }, + timeout: { payload: 100 }, + }, + }, + (context, req, res) => + res.ok({ headers: { 'set-cookie': ['123'] }, body: { message: req.body.message } }) + ); + await root.start(); + + await kbnTestServer.request + .post(root, '/ping') + .set('Content-Type', 'application/json') + .send({ message: 'hi' }) + .expect(200); + expect(mockConsoleLog).toHaveBeenCalledTimes(1); + const [, , , meta] = mockConsoleLog.mock.calls[0][0].split('|'); + expect(JSON.parse(meta).http.response.headers['set-cookie']).toBe('[REDACTED]'); + }); + }); + + it('handles user agent', async () => { + const { http } = await root.setup(); + + http + .createRouter('/') + .get( + { path: '/ping', validate: false, options: { authRequired: 'optional' } }, + (context, req, res) => res.ok({ body: 'pong' }) + ); + await root.start(); + + await kbnTestServer.request.get(root, '/ping').set('user-agent', 'world').expect(200); + expect(mockConsoleLog).toHaveBeenCalledTimes(1); + const [, , , meta] = mockConsoleLog.mock.calls[0][0].split('|'); + expect(JSON.parse(meta).http.request.headers['user-agent']).toBe('world'); + expect(JSON.parse(meta).user_agent.original).toBe('world'); + }); + }); + }); +}); diff --git a/src/core/server/http/logging/get_payload_size.test.ts b/src/core/server/http/logging/get_payload_size.test.ts new file mode 100644 index 0000000000000..a4ab8919e8b6d --- /dev/null +++ b/src/core/server/http/logging/get_payload_size.test.ts @@ -0,0 +1,204 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0 and the Server Side Public License, v 1; you may not use this file except + * in compliance with, at your election, the Elastic License 2.0 or the Server + * Side Public License, v 1. + */ + +import type { Request } from '@hapi/hapi'; +import Boom from '@hapi/boom'; + +import mockFs from 'mock-fs'; +import { createReadStream } from 'fs'; + +import { loggerMock, MockedLogger } from '../../logging/logger.mock'; + +import { getResponsePayloadBytes } from './get_payload_size'; + +type Response = Request['response']; + +describe('getPayloadSize', () => { + let logger: MockedLogger; + + beforeEach(() => (logger = loggerMock.create())); + + test('handles Boom errors', () => { + const boomError = Boom.badRequest(); + const payload = boomError.output.payload; + const result = getResponsePayloadBytes(boomError, logger); + expect(result).toBe(JSON.stringify(payload).length); + }); + + describe('handles Buffers', () => { + test('with ascii characters', () => { + const result = getResponsePayloadBytes( + { + variety: 'buffer', + source: Buffer.from('heya'), + } as Response, + logger + ); + expect(result).toBe(4); + }); + + test('with special characters', () => { + const result = getResponsePayloadBytes( + { + variety: 'buffer', + source: Buffer.from('¡hola!'), + } as Response, + logger + ); + expect(result).toBe(7); + }); + }); + + describe('handles fs streams', () => { + afterEach(() => mockFs.restore()); + + test('with ascii characters', async () => { + mockFs({ 'test.txt': 'heya' }); + const source = createReadStream('test.txt'); + + let data = ''; + for await (const chunk of source) { + data += chunk; + } + + const result = getResponsePayloadBytes( + { + variety: 'stream', + source, + } as Response, + logger + ); + + expect(result).toBe(Buffer.byteLength(data)); + }); + + test('with special characters', async () => { + mockFs({ 'test.txt': '¡hola!' }); + const source = createReadStream('test.txt'); + + let data = ''; + for await (const chunk of source) { + data += chunk; + } + + const result = getResponsePayloadBytes( + { + variety: 'stream', + source, + } as Response, + logger + ); + + expect(result).toBe(Buffer.byteLength(data)); + }); + }); + + describe('handles plain responses', () => { + test('when source is text', () => { + const result = getResponsePayloadBytes( + { + variety: 'plain', + source: 'heya', + } as Response, + logger + ); + expect(result).toBe(4); + }); + + test('when source has special characters', () => { + const result = getResponsePayloadBytes( + { + variety: 'plain', + source: '¡hola!', + } as Response, + logger + ); + expect(result).toBe(7); + }); + + test('when source is object', () => { + const payload = { message: 'heya' }; + const result = getResponsePayloadBytes( + { + variety: 'plain', + source: payload, + } as Response, + logger + ); + expect(result).toBe(JSON.stringify(payload).length); + }); + }); + + describe('handles content-length header', () => { + test('always provides content-length header if available', () => { + const headers = { 'content-length': '123' }; + const result = getResponsePayloadBytes( + ({ + headers, + variety: 'plain', + source: 'abc', + } as unknown) as Response, + logger + ); + expect(result).toBe(123); + }); + + test('uses first value when hapi header is an array', () => { + const headers = { 'content-length': ['123', '456'] }; + const result = getResponsePayloadBytes(({ headers } as unknown) as Response, logger); + expect(result).toBe(123); + }); + + test('returns undefined if length is NaN', () => { + const headers = { 'content-length': 'oops' }; + const result = getResponsePayloadBytes(({ headers } as unknown) as Response, logger); + expect(result).toBeUndefined(); + }); + }); + + test('defaults to undefined', () => { + const result = getResponsePayloadBytes(({} as unknown) as Response, logger); + expect(result).toBeUndefined(); + }); + + test('swallows errors to prevent crashing Kibana', () => { + // intentionally create a circular reference so JSON.stringify fails + const payload = { + get circular() { + return this; + }, + }; + const result = getResponsePayloadBytes( + ({ + variety: 'plain', + source: payload.circular, + } as unknown) as Response, + logger + ); + expect(result).toBeUndefined(); + }); + + test('logs any errors that are caught', () => { + // intentionally create a circular reference so JSON.stringify fails + const payload = { + get circular() { + return this; + }, + }; + getResponsePayloadBytes( + ({ + variety: 'plain', + source: payload.circular, + } as unknown) as Response, + logger + ); + expect(logger.warn.mock.calls[0][0]).toMatchInlineSnapshot( + `"Failed to calculate response payload bytes."` + ); + }); +}); diff --git a/src/core/server/http/logging/get_payload_size.ts b/src/core/server/http/logging/get_payload_size.ts new file mode 100644 index 0000000000000..6dcaf3653d842 --- /dev/null +++ b/src/core/server/http/logging/get_payload_size.ts @@ -0,0 +1,73 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0 and the Server Side Public License, v 1; you may not use this file except + * in compliance with, at your election, the Elastic License 2.0 or the Server + * Side Public License, v 1. + */ + +import type { ReadStream } from 'fs'; +import { isBoom } from '@hapi/boom'; +import type { Request } from '@hapi/hapi'; +import { Logger } from '../../logging'; + +type Response = Request['response']; + +const isBuffer = (src: unknown, res: Response): src is Buffer => { + return !isBoom(res) && res.variety === 'buffer' && res.source === src; +}; +const isFsReadStream = (src: unknown, res: Response): src is ReadStream => { + return !isBoom(res) && res.variety === 'stream' && res.source === src; +}; + +/** + * Attempts to determine the size (in bytes) of a Hapi response + * body based on the payload type. Falls back to `undefined` + * if the size cannot be determined from the response object. + * + * @param response Hapi response object or Boom error + * + * @internal + */ +export function getResponsePayloadBytes(response: Response, log: Logger): number | undefined { + try { + const headers = isBoom(response) + ? (response.output.headers as Record) + : response.headers; + + const contentLength = headers && headers['content-length']; + if (contentLength) { + const val = parseInt( + // hapi response headers can be `string | string[]`, so we need to handle both cases + Array.isArray(contentLength) ? String(contentLength) : contentLength, + 10 + ); + return !isNaN(val) ? val : undefined; + } + + if (isBoom(response)) { + return Buffer.byteLength(JSON.stringify(response.output.payload)); + } + + if (isBuffer(response.source, response)) { + return response.source.byteLength; + } + + if (isFsReadStream(response.source, response)) { + return response.source.bytesRead; + } + + if (response.variety === 'plain') { + return typeof response.source === 'string' + ? Buffer.byteLength(response.source) + : Buffer.byteLength(JSON.stringify(response.source)); + } + } catch (e) { + // We intentionally swallow any errors as this information is + // only a nicety for logging purposes, and should not cause the + // server to crash if it cannot be determined. + log.warn('Failed to calculate response payload bytes.', e); + } + + return undefined; +} diff --git a/src/core/server/http/logging/get_response_log.test.ts b/src/core/server/http/logging/get_response_log.test.ts new file mode 100644 index 0000000000000..46c4f1d95e3be --- /dev/null +++ b/src/core/server/http/logging/get_response_log.test.ts @@ -0,0 +1,247 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0 and the Server Side Public License, v 1; you may not use this file except + * in compliance with, at your election, the Elastic License 2.0 or the Server + * Side Public License, v 1. + */ + +import type { Request } from '@hapi/hapi'; +import Boom from '@hapi/boom'; +import { loggerMock, MockedLogger } from '../../logging/logger.mock'; +import { getEcsResponseLog } from './get_response_log'; + +jest.mock('./get_payload_size', () => ({ + getResponsePayloadBytes: jest.fn().mockReturnValue(1234), +})); + +import { getResponsePayloadBytes } from './get_payload_size'; + +interface RequestFixtureOptions { + auth?: Record; + body?: Record; + headers?: Record; + info?: Record; + method?: string; + mime?: string; + path?: string; + query?: Record; + response?: Record | Boom.Boom; +} + +function createMockHapiRequest({ + auth = { isAuthenticated: true }, + body = {}, + headers = { 'user-agent': '' }, + info = { referrer: 'localhost:5601/app/home' }, + method = 'get', + mime = 'application/json', + path = '/path', + query = {}, + response = { headers: {}, statusCode: 200 }, +}: RequestFixtureOptions = {}): Request { + return ({ + auth, + body, + headers, + info, + method, + mime, + path, + query, + response, + } as unknown) as Request; +} + +describe('getEcsResponseLog', () => { + let logger: MockedLogger; + + beforeEach(() => { + logger = loggerMock.create(); + jest.clearAllMocks(); + }); + + test('provides correctly formatted message', () => { + const req = createMockHapiRequest({ + info: { + completed: 1610660232000, + received: 1610660231000, + }, + }); + const result = getEcsResponseLog(req, logger); + expect(result.message).toMatchInlineSnapshot(`"GET /path 200 1000ms - 1.2KB"`); + }); + + describe('calculates responseTime', () => { + test('with response.info.completed', () => { + const req = createMockHapiRequest({ + info: { + completed: 1610660232000, + received: 1610660231000, + }, + }); + const result = getEcsResponseLog(req, logger); + expect(result.http.response.responseTime).toBe(1000); + }); + + test('with response.info.responded', () => { + const req = createMockHapiRequest({ + info: { + responded: 1610660233500, + received: 1610660233000, + }, + }); + const result = getEcsResponseLog(req, logger); + expect(result.http.response.responseTime).toBe(500); + }); + + test('excludes responseTime from message if none is provided', () => { + const req = createMockHapiRequest(); + const result = getEcsResponseLog(req, logger); + expect(result.message).toMatchInlineSnapshot(`"GET /path 200 - 1.2KB"`); + expect(result.http.response.responseTime).toBeUndefined(); + }); + }); + + describe('handles request querystring', () => { + test('correctly formats querystring', () => { + const req = createMockHapiRequest({ + query: { + a: 'hello', + b: 'world', + }, + }); + const result = getEcsResponseLog(req, logger); + expect(result.url.query).toMatchInlineSnapshot(`"a=hello&b=world"`); + expect(result.message).toMatchInlineSnapshot(`"GET /path?a=hello&b=world 200 - 1.2KB"`); + }); + + test('correctly encodes querystring', () => { + const req = createMockHapiRequest({ + query: { a: '¡hola!' }, + }); + const result = getEcsResponseLog(req, logger); + expect(result.url.query).toMatchInlineSnapshot(`"a=%C2%A1hola!"`); + expect(result.message).toMatchInlineSnapshot(`"GET /path?a=%C2%A1hola! 200 - 1.2KB"`); + }); + }); + + test('calls getResponsePayloadBytes to calculate payload bytes', () => { + const response = { headers: {}, source: '...' }; + const req = createMockHapiRequest({ response }); + getEcsResponseLog(req, logger); + expect(getResponsePayloadBytes).toHaveBeenCalledWith(response, logger); + }); + + test('excludes payload bytes from message if unavailable', () => { + (getResponsePayloadBytes as jest.Mock).mockReturnValueOnce(undefined); + const req = createMockHapiRequest(); + const result = getEcsResponseLog(req, logger); + expect(result.message).toMatchInlineSnapshot(`"GET /path 200"`); + }); + + test('handles Boom errors in the response', () => { + const req = createMockHapiRequest({ + response: Boom.badRequest(), + }); + const result = getEcsResponseLog(req, logger); + expect(result.http.response.status_code).toBe(400); + }); + + describe('filters sensitive headers', () => { + test('redacts Authorization and Cookie headers by default', () => { + const req = createMockHapiRequest({ + headers: { authorization: 'a', cookie: 'b', 'user-agent': 'hi' }, + response: { headers: { 'content-length': 123, 'set-cookie': 'c' } }, + }); + const result = getEcsResponseLog(req, logger); + expect(result.http.request.headers).toMatchInlineSnapshot(` + Object { + "authorization": "[REDACTED]", + "cookie": "[REDACTED]", + "user-agent": "hi", + } + `); + expect(result.http.response.headers).toMatchInlineSnapshot(` + Object { + "content-length": 123, + "set-cookie": "[REDACTED]", + } + `); + }); + + test('does not mutate original headers', () => { + const reqHeaders = { authorization: 'a', cookie: 'b', 'user-agent': 'hi' }; + const resHeaders = { headers: { 'content-length': 123, 'set-cookie': 'c' } }; + const req = createMockHapiRequest({ + headers: reqHeaders, + response: { headers: resHeaders }, + }); + getEcsResponseLog(req, logger); + expect(reqHeaders).toMatchInlineSnapshot(` + Object { + "authorization": "a", + "cookie": "b", + "user-agent": "hi", + } + `); + expect(resHeaders).toMatchInlineSnapshot(` + Object { + "headers": Object { + "content-length": 123, + "set-cookie": "c", + }, + } + `); + }); + }); + + describe('ecs', () => { + test('specifies correct ECS version', () => { + const req = createMockHapiRequest(); + const result = getEcsResponseLog(req, logger); + expect(result.ecs.version).toBe('1.7.0'); + }); + + test('provides an ECS-compatible response', () => { + const req = createMockHapiRequest(); + const result = getEcsResponseLog(req, logger); + expect(result).toMatchInlineSnapshot(` + Object { + "client": Object { + "ip": undefined, + }, + "ecs": Object { + "version": "1.7.0", + }, + "http": Object { + "request": Object { + "headers": Object { + "user-agent": "", + }, + "method": "GET", + "mime_type": "application/json", + "referrer": "localhost:5601/app/home", + }, + "response": Object { + "body": Object { + "bytes": 1234, + }, + "headers": Object {}, + "responseTime": undefined, + "status_code": 200, + }, + }, + "message": "GET /path 200 - 1.2KB", + "url": Object { + "path": "/path", + "query": "", + }, + "user_agent": Object { + "original": "", + }, + } + `); + }); + }); +}); diff --git a/src/core/server/http/logging/get_response_log.ts b/src/core/server/http/logging/get_response_log.ts new file mode 100644 index 0000000000000..f75acde93bf40 --- /dev/null +++ b/src/core/server/http/logging/get_response_log.ts @@ -0,0 +1,92 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0 and the Server Side Public License, v 1; you may not use this file except + * in compliance with, at your election, the Elastic License 2.0 or the Server + * Side Public License, v 1. + */ + +import querystring from 'querystring'; +import { isBoom } from '@hapi/boom'; +import type { Request } from '@hapi/hapi'; +import numeral from '@elastic/numeral'; +import { LogMeta } from '@kbn/logging'; +import { EcsEvent, Logger } from '../../logging'; +import { getResponsePayloadBytes } from './get_payload_size'; + +const ECS_VERSION = '1.7.0'; +const FORBIDDEN_HEADERS = ['authorization', 'cookie', 'set-cookie']; +const REDACTED_HEADER_TEXT = '[REDACTED]'; + +// We are excluding sensitive headers by default, until we have a log filtering mechanism. +function redactSensitiveHeaders( + headers?: Record +): Record { + const result = {} as Record; + if (headers) { + for (const key of Object.keys(headers)) { + result[key] = FORBIDDEN_HEADERS.includes(key) ? REDACTED_HEADER_TEXT : headers[key]; + } + } + return result; +} + +/** + * Converts a hapi `Request` into ECS-compliant `LogMeta` for logging. + * + * @internal + */ +export function getEcsResponseLog(request: Request, log: Logger): LogMeta { + const { path, response } = request; + const method = request.method.toUpperCase(); + + const query = querystring.stringify(request.query); + const pathWithQuery = query.length > 0 ? `${path}?${query}` : path; + + // eslint-disable-next-line @typescript-eslint/naming-convention + const status_code = isBoom(response) ? response.output.statusCode : response.statusCode; + const responseHeaders = isBoom(response) ? response.output.headers : response.headers; + + // borrowed from the hapi/good implementation + const responseTime = (request.info.completed || request.info.responded) - request.info.received; + const responseTimeMsg = !isNaN(responseTime) ? ` ${responseTime}ms` : ''; + + const bytes = getResponsePayloadBytes(response, log); + const bytesMsg = bytes ? ` - ${numeral(bytes).format('0.0b')}` : ''; + + const meta: EcsEvent = { + ecs: { version: ECS_VERSION }, + message: `${method} ${pathWithQuery} ${status_code}${responseTimeMsg}${bytesMsg}`, + client: { + ip: request.info.remoteAddress, + }, + http: { + request: { + method, + mime_type: request.mime, + referrer: request.info.referrer, + // @ts-expect-error Headers are not yet part of ECS: https://github.com/elastic/ecs/issues/232. + headers: redactSensitiveHeaders(request.headers), + }, + response: { + body: { + bytes, + }, + status_code, + // @ts-expect-error Headers are not yet part of ECS: https://github.com/elastic/ecs/issues/232. + headers: redactSensitiveHeaders(responseHeaders), + // responseTime is a custom non-ECS field + responseTime: !isNaN(responseTime) ? responseTime : undefined, + }, + }, + url: { + path, + query, + }, + user_agent: { + original: request.headers['user-agent'], + }, + }; + + return meta; +} diff --git a/src/core/server/http/logging/index.ts b/src/core/server/http/logging/index.ts new file mode 100644 index 0000000000000..1ce7c37a64c85 --- /dev/null +++ b/src/core/server/http/logging/index.ts @@ -0,0 +1,9 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0 and the Server Side Public License, v 1; you may not use this file except + * in compliance with, at your election, the Elastic License 2.0 or the Server + * Side Public License, v 1. + */ + +export { getEcsResponseLog } from './get_response_log'; diff --git a/src/core/server/logging/README.md b/src/core/server/logging/README.md index cc2b6230d2d33..b0759defb8803 100644 --- a/src/core/server/logging/README.md +++ b/src/core/server/logging/README.md @@ -347,6 +347,8 @@ logging.root.level: off ``` ### Dedicated loggers +**Metrics Logs** + The `metrics.ops` logger is configured with `debug` level and will automatically output sample system and process information at a regular interval. The metrics that are logged are a subset of the data collected and are formatted in the log message as follows: @@ -364,6 +366,28 @@ ops.interval: 5000 ``` The minimum interval is 100ms and defaults to 5000ms. + +**Request and Response Logs** + +The `http.server.response` logger is configured with `debug` level and will automatically output +data about http requests and responses occurring on the Kibana server. +The message contains some high-level information, and the corresponding log meta contains the following: + +| Meta property | Description | Format +| :------------------------- | :-------------------------- | :-------------------------- | +| client.ip | IP address of the requesting client | ip | +| http.request.method | http verb for the request (uppercase) | string | +| http.request.mime_type | (optional) mime as specified in the headers | string | +| http.request.referrer | (optional) referrer | string | +| http.request.headers | request headers | object | +| http.response.body.bytes | (optional) Calculated response payload size in bytes | number | +| http.response.status_code | status code returned | number | +| http.response.headers | response headers | object | +| http.response.responseTime | (optional) Calculated response time in ms | number | +| url.path | request path | string | +| url.query | (optional) request query string | string | +| user_agent.original | raw user-agent string provided in request headers | string | + ## Usage Usage is very straightforward, one should just get a logger for a specific context and use it to log messages with @@ -479,6 +503,26 @@ logging: #### logging.events Define a custom logger for a specific context. +**`logging.events.ops`** outputs sample system and process information at a regular interval. +With the new logging config, these are provided by a dedicated [context](#logger-hierarchy), +and you can enable them by adjusting the minimum required [logging level](#log-level) to `debug`: +```yaml + loggers: + - context: metrics.ops + appenders: [console] + level: debug +``` + +**`logging.events.request` and `logging.events.response`** provide logs for each request handled +by the http service. With the new logging config, these are provided by a dedicated [context](#logger-hierarchy), +and you can enable them by adjusting the minimum required [logging level](#log-level) to `debug`: +```yaml + loggers: + - context: http.server.response + appenders: [console] + level: debug +``` + #### logging.filter TBD diff --git a/src/core/server/logging/ecs.ts b/src/core/server/logging/ecs.ts index cdb548abedcca..f6db79819d819 100644 --- a/src/core/server/logging/ecs.ts +++ b/src/core/server/logging/ecs.ts @@ -14,8 +14,7 @@ * * @internal */ - -export interface EcsOpsMetricsEvent { +export interface EcsEvent { /** * These typings were written as of ECS 1.7.0. * Don't change this value without checking the rest @@ -30,21 +29,17 @@ export interface EcsOpsMetricsEvent { labels?: Record; message?: string; tags?: string[]; + // other fields - process?: EcsProcessField; + client?: EcsClientField; event?: EcsEventField; + http?: EcsHttpField; + process?: EcsProcessField; + url?: EcsUrlField; + user_agent?: EcsUserAgentField; } -interface EcsProcessField { - uptime?: number; -} - -export interface EcsEventField { - kind?: EcsEventKind; - category?: EcsEventCategory[]; - type?: EcsEventType; -} - +/** @internal */ export enum EcsEventKind { ALERT = 'alert', EVENT = 'event', @@ -54,6 +49,7 @@ export enum EcsEventKind { SIGNAL = 'signal', } +/** @internal */ export enum EcsEventCategory { AUTHENTICATION = 'authentication', CONFIGURATION = 'configuration', @@ -70,6 +66,7 @@ export enum EcsEventCategory { WEB = 'web', } +/** @internal */ export enum EcsEventType { ACCESS = 'access', ADMIN = 'admin', @@ -88,3 +85,45 @@ export enum EcsEventType { START = 'start', USER = 'user', } + +interface EcsEventField { + kind?: EcsEventKind; + category?: EcsEventCategory[]; + type?: EcsEventType; +} + +interface EcsProcessField { + uptime?: number; +} + +interface EcsClientField { + ip?: string; +} + +interface EcsHttpFieldRequest { + body?: { bytes?: number; content?: string }; + method?: string; + mime_type?: string; + referrer?: string; +} + +interface EcsHttpFieldResponse { + body?: { bytes?: number; content?: string }; + bytes?: number; + status_code?: number; +} + +interface EcsHttpField { + version?: string; + request?: EcsHttpFieldRequest; + response?: EcsHttpFieldResponse; +} + +interface EcsUrlField { + path?: string; + query?: string; +} + +interface EcsUserAgentField { + original?: string; +} diff --git a/src/core/server/logging/index.ts b/src/core/server/logging/index.ts index f565d3db1407e..9b3d7747fc560 100644 --- a/src/core/server/logging/index.ts +++ b/src/core/server/logging/index.ts @@ -17,13 +17,7 @@ export { LogLevelId, LogLevel, } from '@kbn/logging'; -export { - EcsOpsMetricsEvent, - EcsEventField, - EcsEventKind, - EcsEventCategory, - EcsEventType, -} from './ecs'; +export { EcsEvent, EcsEventKind, EcsEventCategory, EcsEventType } from './ecs'; export { config, LoggingConfigType, diff --git a/src/core/server/metrics/logging/get_ops_metrics_log.ts b/src/core/server/metrics/logging/get_ops_metrics_log.ts index 723fc50bd8392..02c3ad312c7dd 100644 --- a/src/core/server/metrics/logging/get_ops_metrics_log.ts +++ b/src/core/server/metrics/logging/get_ops_metrics_log.ts @@ -7,7 +7,7 @@ */ import numeral from '@elastic/numeral'; -import { EcsOpsMetricsEvent, EcsEventKind, EcsEventCategory, EcsEventType } from '../../logging'; +import { EcsEvent, EcsEventKind, EcsEventCategory, EcsEventType } from '../../logging'; import { OpsMetrics } from '..'; const ECS_VERSION = '1.7.0'; @@ -16,7 +16,7 @@ const ECS_VERSION = '1.7.0'; * * @internal */ -export function getEcsOpsMetricsLog(metrics: OpsMetrics): EcsOpsMetricsEvent { +export function getEcsOpsMetricsLog(metrics: OpsMetrics): EcsEvent { const { process, os } = metrics; const processMemoryUsedInBytes = process?.memory?.heap?.used_in_bytes; const processMemoryUsedInBytesMsg = processMemoryUsedInBytes From e82bbcff89b51f1af75787658b3ff2de607a2f7c Mon Sep 17 00:00:00 2001 From: Anton Dosov Date: Thu, 4 Feb 2021 14:36:19 +0100 Subject: [PATCH 05/69] [Search Session] Revamp search session indicator UI and tour (#89703) --- .../public/application/dashboard_app.tsx | 1 - .../data/public/search/session/mocks.ts | 4 +- .../public/search/session/session_service.ts | 17 +- .../public/application/angular/discover.js | 7 - test/functional/services/common/browser.ts | 10 + x-pack/plugins/data_enhanced/public/plugin.ts | 3 + ...onnected_search_session_indicator.test.tsx | 131 +++++++++- .../connected_search_session_indicator.tsx | 44 +++- .../search_session_tour.tsx | 93 +++++++ .../search_session_indicator/custom_icons.tsx | 49 ++++ .../ui/search_session_indicator/index.tsx | 16 +- .../search_session_indicator.scss | 20 +- .../search_session_indicator.stories.tsx | 3 + .../search_session_indicator.test.tsx | 41 +-- .../search_session_indicator.tsx | 238 +++++++++++------- .../services/search_sessions.ts | 36 ++- .../apps/dashboard/async_search/index.ts | 10 +- .../async_search/search_sessions_tour.ts | 62 +++++ .../async_search/send_to_background.ts | 4 +- .../tests/apps/discover/index.ts | 9 +- .../search_sessions/sessions_management.ts | 1 + 21 files changed, 616 insertions(+), 183 deletions(-) create mode 100644 x-pack/plugins/data_enhanced/public/search/ui/connected_search_session_indicator/search_session_tour.tsx create mode 100644 x-pack/plugins/data_enhanced/public/search/ui/search_session_indicator/custom_icons.tsx create mode 100644 x-pack/test/send_search_to_background_integration/tests/apps/dashboard/async_search/search_sessions_tour.ts diff --git a/src/plugins/dashboard/public/application/dashboard_app.tsx b/src/plugins/dashboard/public/application/dashboard_app.tsx index e12b083144197..d060327563b25 100644 --- a/src/plugins/dashboard/public/application/dashboard_app.tsx +++ b/src/plugins/dashboard/public/application/dashboard_app.tsx @@ -192,7 +192,6 @@ export function DashboardApp({ subscriptions.add( merge( - data.search.session.onRefresh$, data.query.timefilter.timefilter.getAutoRefreshFetch$(), searchSessionIdQuery$ ).subscribe(() => { diff --git a/src/plugins/data/public/search/session/mocks.ts b/src/plugins/data/public/search/session/mocks.ts index 4028a3b6c32a8..f6a70d157b5a0 100644 --- a/src/plugins/data/public/search/session/mocks.ts +++ b/src/plugins/data/public/search/session/mocks.ts @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -import { BehaviorSubject, Subject } from 'rxjs'; +import { BehaviorSubject } from 'rxjs'; import { ISessionsClient } from './sessions_client'; import { ISessionService } from './session_service'; import { SearchSessionState } from './search_session_state'; @@ -32,8 +32,6 @@ export function getSessionServiceMock(): jest.Mocked { state$: new BehaviorSubject(SearchSessionState.None).asObservable(), trackSearch: jest.fn((searchDescriptor) => () => {}), destroy: jest.fn(), - onRefresh$: new Subject(), - refresh: jest.fn(), cancel: jest.fn(), isStored: jest.fn(), isRestore: jest.fn(), diff --git a/src/plugins/data/public/search/session/session_service.ts b/src/plugins/data/public/search/session/session_service.ts index 475e689da6505..79ae64c5846a5 100644 --- a/src/plugins/data/public/search/session/session_service.ts +++ b/src/plugins/data/public/search/session/session_service.ts @@ -8,7 +8,7 @@ import { PublicContract } from '@kbn/utility-types'; import { distinctUntilChanged, map, startWith } from 'rxjs/operators'; -import { Observable, Subject, Subscription } from 'rxjs'; +import { Observable, Subscription } from 'rxjs'; import { PluginInitializerContext, StartServicesAccessor } from 'kibana/public'; import { UrlGeneratorId, UrlGeneratorStateMapping } from '../../../../share/public/'; import { ConfigSchema } from '../../../config'; @@ -193,21 +193,6 @@ export class SessionService { this.searchSessionIndicatorUiConfig = undefined; } - private refresh$ = new Subject(); - /** - * Observable emits when search result refresh was requested - * For example, the UI could have it's own "refresh" button - * Application would use this observable to handle user interaction on that button - */ - public onRefresh$ = this.refresh$.asObservable(); - - /** - * Request a search results refresh - */ - public refresh() { - this.refresh$.next(); - } - /** * Request a cancellation of on-going search requests within current session */ diff --git a/src/plugins/discover/public/application/angular/discover.js b/src/plugins/discover/public/application/angular/discover.js index fac5bb2d8de4c..13ff8b14d9b43 100644 --- a/src/plugins/discover/public/application/angular/discover.js +++ b/src/plugins/discover/public/application/angular/discover.js @@ -504,13 +504,6 @@ function discoverController($route, $scope, Promise) { ) ); - subscriptions.add( - data.search.session.onRefresh$.subscribe(() => { - searchSessionManager.removeSearchSessionIdFromURL({ replace: false }); - refetch$.next(); - }) - ); - $scope.changeInterval = (interval) => { if (interval) { setAppState({ interval }); diff --git a/test/functional/services/common/browser.ts b/test/functional/services/common/browser.ts index c8cfbf2f2b575..d9212e48f73fc 100644 --- a/test/functional/services/common/browser.ts +++ b/test/functional/services/common/browser.ts @@ -461,6 +461,16 @@ export async function BrowserProvider({ getService }: FtrProviderContext) { ); } + /** + * Removes a value in local storage for the focused window/frame. + * + * @param {string} key + * @return {Promise} + */ + public async removeLocalStorageItem(key: string): Promise { + await driver.executeScript('return window.localStorage.removeItem(arguments[0]);', key); + } + /** * Clears session storage for the focused window/frame. * diff --git a/x-pack/plugins/data_enhanced/public/plugin.ts b/x-pack/plugins/data_enhanced/public/plugin.ts index 7a4d12d0ac63c..b7d7b7c0e20d1 100644 --- a/x-pack/plugins/data_enhanced/public/plugin.ts +++ b/x-pack/plugins/data_enhanced/public/plugin.ts @@ -19,6 +19,7 @@ import { registerSearchSessionsMgmt } from './search/sessions_mgmt'; import { toMountPoint } from '../../../../src/plugins/kibana_react/public'; import { createConnectedSearchSessionIndicator } from './search'; import { ConfigSchema } from '../config'; +import { Storage } from '../../../../src/plugins/kibana_utils/public'; export interface DataEnhancedSetupDependencies { bfetch: BfetchPublicSetup; @@ -37,6 +38,7 @@ export class DataEnhancedPlugin implements Plugin { private enhancedSearchInterceptor!: EnhancedSearchInterceptor; private config!: ConfigSchema; + private readonly storage = new Storage(window.localStorage); constructor(private initializerContext: PluginInitializerContext) {} @@ -83,6 +85,7 @@ export class DataEnhancedPlugin sessionService: plugins.data.search.session, application: core.application, timeFilter: plugins.data.query.timefilter.timefilter, + storage: this.storage, }) ) ), diff --git a/x-pack/plugins/data_enhanced/public/search/ui/connected_search_session_indicator/connected_search_session_indicator.test.tsx b/x-pack/plugins/data_enhanced/public/search/ui/connected_search_session_indicator/connected_search_session_indicator.test.tsx index ba2b0e0f15032..79e49050941be 100644 --- a/x-pack/plugins/data_enhanced/public/search/ui/connected_search_session_indicator/connected_search_session_indicator.test.tsx +++ b/x-pack/plugins/data_enhanced/public/search/ui/connected_search_session_indicator/connected_search_session_indicator.test.tsx @@ -6,7 +6,9 @@ */ import React from 'react'; +import { StubBrowserStorage } from '@kbn/test/jest'; import { render, waitFor, screen, act } from '@testing-library/react'; +import { Storage } from '../../../../../../../src/plugins/kibana_utils/public/'; import { dataPluginMock } from '../../../../../../../src/plugins/data/public/mocks'; import { createConnectedSearchSessionIndicator } from './connected_search_session_indicator'; import { BehaviorSubject } from 'rxjs'; @@ -17,17 +19,19 @@ import { TimefilterContract, } from '../../../../../../../src/plugins/data/public'; import { coreMock } from '../../../../../../../src/core/public/mocks'; +import { TOUR_RESTORE_STEP_KEY, TOUR_TAKING_TOO_LONG_STEP_KEY } from './search_session_tour'; const coreStart = coreMock.createStart(); const dataStart = dataPluginMock.createStartContract(); const sessionService = dataStart.search.session as jest.Mocked; - +let storage: Storage; const refreshInterval$ = new BehaviorSubject({ value: 0, pause: true }); const timeFilter = dataStart.query.timefilter.timefilter as jest.Mocked; timeFilter.getRefreshIntervalUpdate$.mockImplementation(() => refreshInterval$); timeFilter.getRefreshInterval.mockImplementation(() => refreshInterval$.getValue()); beforeEach(() => { + storage = new Storage(new StubBrowserStorage()); refreshInterval$.next({ value: 0, pause: true }); sessionService.isSessionStorageReady.mockImplementation(() => true); sessionService.getSearchSessionIndicatorUiConfig.mockImplementation(() => ({ @@ -42,6 +46,7 @@ test("shouldn't show indicator in case no active search session", async () => { sessionService, application: coreStart.application, timeFilter, + storage, }); const { getByTestId, container } = render(); @@ -49,7 +54,13 @@ test("shouldn't show indicator in case no active search session", async () => { await expect( waitFor(() => getByTestId('searchSessionIndicator'), { timeout: 100 }) ).rejects.toThrow(); - expect(container).toMatchInlineSnapshot(`
`); + expect(container).toMatchInlineSnapshot(` +
+
+
+ `); }); test("shouldn't show indicator in case app hasn't opt-in", async () => { @@ -57,6 +68,7 @@ test("shouldn't show indicator in case app hasn't opt-in", async () => { sessionService, application: coreStart.application, timeFilter, + storage, }); const { getByTestId, container } = render(); sessionService.isSessionStorageReady.mockImplementation(() => false); @@ -65,7 +77,13 @@ test("shouldn't show indicator in case app hasn't opt-in", async () => { await expect( waitFor(() => getByTestId('searchSessionIndicator'), { timeout: 100 }) ).rejects.toThrow(); - expect(container).toMatchInlineSnapshot(`
`); + expect(container).toMatchInlineSnapshot(` +
+
+
+ `); }); test('should show indicator in case there is an active search session', async () => { @@ -74,6 +92,7 @@ test('should show indicator in case there is an active search session', async () sessionService: { ...sessionService, state$ }, application: coreStart.application, timeFilter, + storage, }); const { getByTestId } = render(); @@ -98,6 +117,7 @@ test('should be disabled in case uiConfig says so ', async () => { sessionService: { ...sessionService, state$ }, application: coreStart.application, timeFilter, + storage, }); render(); @@ -114,6 +134,7 @@ test('should be disabled during auto-refresh', async () => { sessionService: { ...sessionService, state$ }, application: coreStart.application, timeFilter, + storage, }); render(); @@ -128,3 +149,107 @@ test('should be disabled during auto-refresh', async () => { expect(screen.getByTestId('searchSessionIndicator').querySelector('button')).toBeDisabled(); }); + +describe('tour steps', () => { + describe('loading state', () => { + beforeAll(() => { + jest.useFakeTimers(); + }); + + afterAll(() => { + jest.useRealTimers(); + }); + + test('shows tour step on slow loading with delay', async () => { + const state$ = new BehaviorSubject(SearchSessionState.Loading); + const SearchSessionIndicator = createConnectedSearchSessionIndicator({ + sessionService: { ...sessionService, state$ }, + application: coreStart.application, + timeFilter, + storage, + }); + const rendered = render(); + + await waitFor(() => rendered.getByTestId('searchSessionIndicator')); + + expect(() => screen.getByTestId('searchSessionIndicatorPopoverContainer')).toThrow(); + + act(() => { + jest.advanceTimersByTime(10001); + }); + + expect(screen.getByTestId('searchSessionIndicatorPopoverContainer')).toBeInTheDocument(); + + act(() => { + jest.advanceTimersByTime(5000); + state$.next(SearchSessionState.Completed); + }); + + // Open tour should stay on screen after state change + expect(screen.getByTestId('searchSessionIndicatorPopoverContainer')).toBeInTheDocument(); + + expect(storage.get(TOUR_RESTORE_STEP_KEY)).toBeFalsy(); + expect(storage.get(TOUR_TAKING_TOO_LONG_STEP_KEY)).toBeTruthy(); + }); + + test("doesn't show tour step if state changed before delay", async () => { + const state$ = new BehaviorSubject(SearchSessionState.Loading); + const SearchSessionIndicator = createConnectedSearchSessionIndicator({ + sessionService: { ...sessionService, state$ }, + application: coreStart.application, + timeFilter, + storage, + }); + const rendered = render(); + + const searchSessionIndicator = await rendered.findByTestId('searchSessionIndicator'); + expect(searchSessionIndicator).toBeTruthy(); + + act(() => { + jest.advanceTimersByTime(3000); + state$.next(SearchSessionState.Completed); + jest.advanceTimersByTime(3000); + }); + + expect(rendered.queryByTestId('searchSessionIndicatorPopoverContainer')).toBeFalsy(); + + expect(storage.get(TOUR_RESTORE_STEP_KEY)).toBeFalsy(); + expect(storage.get(TOUR_TAKING_TOO_LONG_STEP_KEY)).toBeFalsy(); + }); + }); + + test('shows tour step for restored', async () => { + const state$ = new BehaviorSubject(SearchSessionState.Restored); + const SearchSessionIndicator = createConnectedSearchSessionIndicator({ + sessionService: { ...sessionService, state$ }, + application: coreStart.application, + timeFilter, + storage, + }); + const rendered = render(); + + await waitFor(() => rendered.getByTestId('searchSessionIndicator')); + expect(screen.getByTestId('searchSessionIndicatorPopoverContainer')).toBeInTheDocument(); + + expect(storage.get(TOUR_RESTORE_STEP_KEY)).toBeTruthy(); + expect(storage.get(TOUR_TAKING_TOO_LONG_STEP_KEY)).toBeTruthy(); + }); + + test("doesn't show tour for irrelevant state", async () => { + const state$ = new BehaviorSubject(SearchSessionState.Completed); + const SearchSessionIndicator = createConnectedSearchSessionIndicator({ + sessionService: { ...sessionService, state$ }, + application: coreStart.application, + timeFilter, + storage, + }); + const rendered = render(); + + await waitFor(() => rendered.getByTestId('searchSessionIndicator')); + + expect(rendered.queryByTestId('searchSessionIndicatorPopoverContainer')).toBeFalsy(); + + expect(storage.get(TOUR_RESTORE_STEP_KEY)).toBeFalsy(); + expect(storage.get(TOUR_TAKING_TOO_LONG_STEP_KEY)).toBeFalsy(); + }); +}); diff --git a/x-pack/plugins/data_enhanced/public/search/ui/connected_search_session_indicator/connected_search_session_indicator.tsx b/x-pack/plugins/data_enhanced/public/search/ui/connected_search_session_indicator/connected_search_session_indicator.tsx index 985d6ccabeb47..b572db7ebfd4c 100644 --- a/x-pack/plugins/data_enhanced/public/search/ui/connected_search_session_indicator/connected_search_session_indicator.tsx +++ b/x-pack/plugins/data_enhanced/public/search/ui/connected_search_session_indicator/connected_search_session_indicator.tsx @@ -5,33 +5,47 @@ * 2.0. */ -import React from 'react'; -import { debounceTime, distinctUntilChanged, map } from 'rxjs/operators'; +import React, { useRef } from 'react'; +import { debounce, distinctUntilChanged, map } from 'rxjs/operators'; +import { timer } from 'rxjs'; import useObservable from 'react-use/lib/useObservable'; import { i18n } from '@kbn/i18n'; -import { SearchSessionIndicator } from '../search_session_indicator'; -import { ISessionService, TimefilterContract } from '../../../../../../../src/plugins/data/public/'; +import { SearchSessionIndicator, SearchSessionIndicatorRef } from '../search_session_indicator'; +import { + ISessionService, + SearchSessionState, + TimefilterContract, +} from '../../../../../../../src/plugins/data/public/'; import { RedirectAppLinks } from '../../../../../../../src/plugins/kibana_react/public'; import { ApplicationStart } from '../../../../../../../src/core/public'; +import { IStorageWrapper } from '../../../../../../../src/plugins/kibana_utils/public'; +import { useSearchSessionTour } from './search_session_tour'; export interface SearchSessionIndicatorDeps { sessionService: ISessionService; timeFilter: TimefilterContract; application: ApplicationStart; + storage: IStorageWrapper; } export const createConnectedSearchSessionIndicator = ({ sessionService, application, timeFilter, + storage, }: SearchSessionIndicatorDeps): React.FC => { const isAutoRefreshEnabled = () => !timeFilter.getRefreshInterval().pause; const isAutoRefreshEnabled$ = timeFilter .getRefreshIntervalUpdate$() .pipe(map(isAutoRefreshEnabled), distinctUntilChanged()); + const debouncedSessionServiceState$ = sessionService.state$.pipe( + debounce((_state) => timer(_state === SearchSessionState.None ? 50 : 300)) // switch to None faster to quickly remove indicator when navigating away + ); + return () => { - const state = useObservable(sessionService.state$.pipe(debounceTime(500))); + const ref = useRef(null); + const state = useObservable(debouncedSessionServiceState$, SearchSessionState.None); const autoRefreshEnabled = useObservable(isAutoRefreshEnabled$, isAutoRefreshEnabled()); const isDisabledByApp = sessionService.getSearchSessionIndicatorUiConfig().isDisabled(); @@ -43,21 +57,28 @@ export const createConnectedSearchSessionIndicator = ({ disabledReasonText = i18n.translate( 'xpack.data.searchSessionIndicator.disabledDueToAutoRefreshMessage', { - defaultMessage: 'Send to background is not available when auto refresh is enabled.', + defaultMessage: 'Search sessions are not available when auto refresh is enabled.', } ); } + const { markOpenedDone, markRestoredDone } = useSearchSessionTour( + storage, + ref, + state, + disabled + ); + if (isDisabledByApp.disabled) { disabled = true; disabledReasonText = isDisabledByApp.reasonText; } if (!sessionService.isSessionStorageReady()) return null; - if (!state) return null; return ( { sessionService.save(); @@ -65,14 +86,17 @@ export const createConnectedSearchSessionIndicator = ({ onSaveResults={() => { sessionService.save(); }} - onRefresh={() => { - sessionService.refresh(); - }} onCancel={() => { sessionService.cancel(); }} disabled={disabled} disabledReasonText={disabledReasonText} + onOpened={(openedState) => { + markOpenedDone(); + if (openedState === SearchSessionState.Restored) { + markRestoredDone(); + } + }} /> ); diff --git a/x-pack/plugins/data_enhanced/public/search/ui/connected_search_session_indicator/search_session_tour.tsx b/x-pack/plugins/data_enhanced/public/search/ui/connected_search_session_indicator/search_session_tour.tsx new file mode 100644 index 0000000000000..8c04410f9953b --- /dev/null +++ b/x-pack/plugins/data_enhanced/public/search/ui/connected_search_session_indicator/search_session_tour.tsx @@ -0,0 +1,93 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { MutableRefObject, useCallback, useEffect } from 'react'; +import { IStorageWrapper } from '../../../../../../../src/plugins/kibana_utils/public'; +import { SearchSessionIndicatorRef } from '../search_session_indicator'; +import { SearchSessionState } from '../../../../../../../src/plugins/data/public'; + +const TOUR_TAKING_TOO_LONG_TIMEOUT = 10000; +export const TOUR_TAKING_TOO_LONG_STEP_KEY = `data.searchSession.tour.takingTooLong`; +export const TOUR_RESTORE_STEP_KEY = `data.searchSession.tour.restore`; + +export function useSearchSessionTour( + storage: IStorageWrapper, + searchSessionIndicatorRef: MutableRefObject, + state: SearchSessionState, + searchSessionsDisabled: boolean +) { + const markOpenedDone = useCallback(() => { + safeSet(storage, TOUR_TAKING_TOO_LONG_STEP_KEY); + }, [storage]); + + const markRestoredDone = useCallback(() => { + safeSet(storage, TOUR_RESTORE_STEP_KEY); + }, [storage]); + + useEffect(() => { + if (searchSessionsDisabled) return; + let timeoutHandle: number; + + if (state === SearchSessionState.Loading) { + if (!safeHas(storage, TOUR_TAKING_TOO_LONG_STEP_KEY)) { + timeoutHandle = window.setTimeout(() => { + safeOpen(searchSessionIndicatorRef); + }, TOUR_TAKING_TOO_LONG_TIMEOUT); + } + } + + if (state === SearchSessionState.Restored) { + if (!safeHas(storage, TOUR_RESTORE_STEP_KEY)) { + safeOpen(searchSessionIndicatorRef); + } + } + + return () => { + clearTimeout(timeoutHandle); + }; + }, [ + storage, + searchSessionIndicatorRef, + state, + searchSessionsDisabled, + markOpenedDone, + markRestoredDone, + ]); + + return { + markOpenedDone, + markRestoredDone, + }; +} + +function safeHas(storage: IStorageWrapper, key: string): boolean { + try { + return Boolean(storage.get(key)); + } catch (e) { + return true; + } +} + +function safeSet(storage: IStorageWrapper, key: string) { + try { + storage.set(key, true); + } catch (e) { + return true; + } +} + +function safeOpen(searchSessionIndicatorRef: MutableRefObject) { + if (searchSessionIndicatorRef.current) { + searchSessionIndicatorRef.current.openPopover(); + } else { + // TODO: needed for initial open when component is not rendered yet + // fix after: https://github.com/elastic/eui/issues/4460 + setTimeout(() => { + searchSessionIndicatorRef.current?.openPopover(); + }, 50); + } +} diff --git a/x-pack/plugins/data_enhanced/public/search/ui/search_session_indicator/custom_icons.tsx b/x-pack/plugins/data_enhanced/public/search/ui/search_session_indicator/custom_icons.tsx new file mode 100644 index 0000000000000..94aa1d41abd38 --- /dev/null +++ b/x-pack/plugins/data_enhanced/public/search/ui/search_session_indicator/custom_icons.tsx @@ -0,0 +1,49 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import React from 'react'; +import { EuiIconProps } from '@elastic/eui'; + +/** + * These are the new icons we've added for search session indicator, + * likely in future we will remove these when they land into EUI + */ +export const CheckInEmptyCircle = ({ title, titleId, ...props }: Omit) => ( + + {title ? {title} : null} + + +); + +export const PartialClock = ({ title, titleId, ...props }: Omit) => ( + + {title ? {title} : null} + + +); diff --git a/x-pack/plugins/data_enhanced/public/search/ui/search_session_indicator/index.tsx b/x-pack/plugins/data_enhanced/public/search/ui/search_session_indicator/index.tsx index fd18fb7335524..fe86ad2fb5cea 100644 --- a/x-pack/plugins/data_enhanced/public/search/ui/search_session_indicator/index.tsx +++ b/x-pack/plugins/data_enhanced/public/search/ui/search_session_indicator/index.tsx @@ -7,8 +7,11 @@ import { EuiDelayRender, EuiLoadingSpinner } from '@elastic/eui'; import React from 'react'; -import type { SearchSessionIndicatorProps } from './search_session_indicator'; -export type { SearchSessionIndicatorProps }; +import type { + SearchSessionIndicatorProps, + SearchSessionIndicatorRef, +} from './search_session_indicator'; +export type { SearchSessionIndicatorProps, SearchSessionIndicatorRef }; const Fallback = () => ( @@ -17,8 +20,11 @@ const Fallback = () => ( ); const LazySearchSessionIndicator = React.lazy(() => import('./search_session_indicator')); -export const SearchSessionIndicator = (props: SearchSessionIndicatorProps) => ( +export const SearchSessionIndicator = React.forwardRef< + SearchSessionIndicatorRef, + SearchSessionIndicatorProps +>((props: SearchSessionIndicatorProps, ref) => ( }> - + -); +)); diff --git a/x-pack/plugins/data_enhanced/public/search/ui/search_session_indicator/search_session_indicator.scss b/x-pack/plugins/data_enhanced/public/search/ui/search_session_indicator/search_session_indicator.scss index 6f3ae5b5846fd..11c7ba7816c33 100644 --- a/x-pack/plugins/data_enhanced/public/search/ui/search_session_indicator/search_session_indicator.scss +++ b/x-pack/plugins/data_enhanced/public/search/ui/search_session_indicator/search_session_indicator.scss @@ -2,22 +2,6 @@ padding: 0 $euiSizeXS; } -@include euiBreakpoint('xs', 's') { - .searchSessionIndicator__popoverContainer.euiFlexGroup--responsive .euiFlexItem { - margin-bottom: $euiSizeXS !important; - } -} - -.searchSessionIndicator__verticalDivider { - @include euiBreakpoint('xs', 's') { - margin-left: $euiSizeXS; - padding-left: $euiSizeXS; - } - - @include euiBreakpoint('m', 'l', 'xl') { - border-left: $euiBorderThin; - align-self: stretch; - margin-left: $euiSizeS; - padding-left: $euiSizeS; - } +.searchSessionIndicator__panel { + width: $euiSize * 18; } diff --git a/x-pack/plugins/data_enhanced/public/search/ui/search_session_indicator/search_session_indicator.stories.tsx b/x-pack/plugins/data_enhanced/public/search/ui/search_session_indicator/search_session_indicator.stories.tsx index 30dc493f2a315..f2d5a3c52daea 100644 --- a/x-pack/plugins/data_enhanced/public/search/ui/search_session_indicator/search_session_indicator.stories.tsx +++ b/x-pack/plugins/data_enhanced/public/search/ui/search_session_indicator/search_session_indicator.stories.tsx @@ -27,6 +27,9 @@ storiesOf('components/SearchSessionIndicator', module).add('default', () => (
+
+ +
{ ); - await userEvent.click(screen.getByLabelText('Loading')); - await userEvent.click(screen.getByText('Cancel session')); + await userEvent.click(screen.getByLabelText('Search session loading')); + await userEvent.click(screen.getByText('Stop session')); expect(onCancel).toBeCalled(); }); @@ -38,7 +38,7 @@ test('Completed state', async () => { ); - await userEvent.click(screen.getByLabelText('Loaded')); + await userEvent.click(screen.getByLabelText('Search session complete')); await userEvent.click(screen.getByText('Save session')); expect(onSave).toBeCalled(); @@ -52,8 +52,8 @@ test('Loading in the background state', async () => { ); - await userEvent.click(screen.getByLabelText('Loading results in the background')); - await userEvent.click(screen.getByText('Cancel session')); + await userEvent.click(screen.getByLabelText(/Saved session in progress/)); + await userEvent.click(screen.getByText('Stop session')); expect(onCancel).toBeCalled(); }); @@ -68,38 +68,43 @@ test('BackgroundCompleted state', async () => { ); - await userEvent.click(screen.getByLabelText('Results loaded in the background')); - expect(screen.getByRole('link', { name: 'View all sessions' }).getAttribute('href')).toBe( + await userEvent.click(screen.getByLabelText(/Saved session complete/)); + expect(screen.getByRole('link', { name: 'Manage sessions' }).getAttribute('href')).toBe( '__link__' ); }); test('Restored state', async () => { - const onRefresh = jest.fn(); render( - + ); - await userEvent.click(screen.getByLabelText('Results no longer current')); - await userEvent.click(screen.getByText('Refresh')); + await userEvent.click(screen.getByLabelText(/Saved session restored/)); - expect(onRefresh).toBeCalled(); + expect(screen.getByRole('link', { name: 'Manage sessions' }).getAttribute('href')).toBe( + '__link__' + ); }); test('Canceled state', async () => { - const onRefresh = jest.fn(); render( - + ); - await userEvent.click(screen.getByLabelText('Canceled')); - await userEvent.click(screen.getByText('Refresh')); - - expect(onRefresh).toBeCalled(); + await userEvent.click(screen.getByLabelText(/Search session stopped/)); + expect(screen.getByRole('link', { name: 'Manage sessions' }).getAttribute('href')).toBe( + '__link__' + ); }); test('Disabled state', async () => { diff --git a/x-pack/plugins/data_enhanced/public/search/ui/search_session_indicator/search_session_indicator.tsx b/x-pack/plugins/data_enhanced/public/search/ui/search_session_indicator/search_session_indicator.tsx index f6387e832fb75..9ac537829a670 100644 --- a/x-pack/plugins/data_enhanced/public/search/ui/search_session_indicator/search_session_indicator.tsx +++ b/x-pack/plugins/data_enhanced/public/search/ui/search_session_indicator/search_session_indicator.tsx @@ -5,7 +5,7 @@ * 2.0. */ -import React from 'react'; +import React, { useCallback, useImperativeHandle } from 'react'; import { EuiButtonEmpty, EuiButtonEmptyProps, @@ -15,12 +15,13 @@ import { EuiFlexItem, EuiLoadingSpinner, EuiPopover, + EuiSpacer, EuiText, EuiToolTip, } from '@elastic/eui'; import { FormattedMessage } from '@kbn/i18n/react'; import { i18n } from '@kbn/i18n'; - +import { PartialClock, CheckInEmptyCircle } from './custom_icons'; import './search_session_indicator.scss'; import { SearchSessionState } from '../../../../../../../src/plugins/data/public'; @@ -30,9 +31,9 @@ export interface SearchSessionIndicatorProps { onCancel?: () => void; viewSearchSessionsLink?: string; onSaveResults?: () => void; - onRefresh?: () => void; disabled?: boolean; disabledReasonText?: string; + onOpened?: (openedState: SearchSessionState) => void; } type ActionButtonProps = SearchSessionIndicatorProps & { buttonProps: EuiButtonEmptyProps }; @@ -41,11 +42,12 @@ const CancelButton = ({ onCancel = () => {}, buttonProps = {} }: ActionButtonPro ); @@ -61,7 +63,7 @@ const ContinueInBackgroundButton = ({ > ); @@ -72,25 +74,12 @@ const ViewAllSearchSessionsButton = ({ }: ActionButtonProps) => ( - -); - -const RefreshButton = ({ onRefresh = () => {}, buttonProps = {} }: ActionButtonProps) => ( - - ); @@ -114,7 +103,8 @@ const searchSessionIndicatorViewStateToProps: { tooltipText: string; }; popover: { - text: string; + title: string; + description: string; primaryAction?: React.ComponentType; secondaryAction?: React.ComponentType; }; @@ -124,19 +114,22 @@ const searchSessionIndicatorViewStateToProps: { [SearchSessionState.Loading]: { button: { color: 'subdued', - iconType: 'clock', + iconType: PartialClock, 'aria-label': i18n.translate( 'xpack.data.searchSessionIndicator.loadingResultsIconAriaLabel', - { defaultMessage: 'Loading' } + { defaultMessage: 'Search session loading' } ), tooltipText: i18n.translate( 'xpack.data.searchSessionIndicator.loadingResultsIconTooltipText', - { defaultMessage: 'Loading' } + { defaultMessage: 'Search session loading' } ), }, popover: { - text: i18n.translate('xpack.data.searchSessionIndicator.loadingResultsText', { - defaultMessage: 'Loading', + title: i18n.translate('xpack.data.searchSessionIndicator.loadingResultsTitle', { + defaultMessage: 'Your search is taking a while...', + }), + description: i18n.translate('xpack.data.searchSessionIndicator.loadingResultsDescription', { + defaultMessage: 'Save your session, continue your work, and return to completed results.', }), primaryAction: CancelButton, secondaryAction: ContinueInBackgroundButton, @@ -145,21 +138,27 @@ const searchSessionIndicatorViewStateToProps: { [SearchSessionState.Completed]: { button: { color: 'subdued', - iconType: 'checkInCircleFilled', + iconType: 'clock', 'aria-label': i18n.translate('xpack.data.searchSessionIndicator.resultsLoadedIconAriaLabel', { - defaultMessage: 'Loaded', + defaultMessage: 'Search session complete', }), tooltipText: i18n.translate( 'xpack.data.searchSessionIndicator.resultsLoadedIconTooltipText', { - defaultMessage: 'Results loaded', + defaultMessage: 'Search session complete', } ), }, popover: { - text: i18n.translate('xpack.data.searchSessionIndicator.resultsLoadedText', { - defaultMessage: 'Loaded', + title: i18n.translate('xpack.data.searchSessionIndicator.resultsLoadedText', { + defaultMessage: 'Search session complete', }), + description: i18n.translate( + 'xpack.data.searchSessionIndicator.resultsLoadedDescriptionText', + { + defaultMessage: 'Save your session and return to it later.', + } + ), primaryAction: SaveButton, secondaryAction: ViewAllSearchSessionsButton, }, @@ -170,20 +169,26 @@ const searchSessionIndicatorViewStateToProps: { 'aria-label': i18n.translate( 'xpack.data.searchSessionIndicator.loadingInTheBackgroundIconAriaLabel', { - defaultMessage: 'Loading results in the background', + defaultMessage: 'Saved session in progress', } ), tooltipText: i18n.translate( 'xpack.data.searchSessionIndicator.loadingInTheBackgroundIconTooltipText', { - defaultMessage: 'Loading results in the background', + defaultMessage: 'Saved session in progress', } ), }, popover: { - text: i18n.translate('xpack.data.searchSessionIndicator.loadingInTheBackgroundText', { - defaultMessage: 'Loading in the background', + title: i18n.translate('xpack.data.searchSessionIndicator.loadingInTheBackgroundTitleText', { + defaultMessage: 'Saved session in progress', }), + description: i18n.translate( + 'xpack.data.searchSessionIndicator.loadingInTheBackgroundDescriptionText', + { + defaultMessage: 'You can return to completed results from Management.', + } + ), primaryAction: CancelButton, secondaryAction: ViewAllSearchSessionsButton, }, @@ -193,74 +198,118 @@ const searchSessionIndicatorViewStateToProps: { color: 'success', iconType: 'checkInCircleFilled', 'aria-label': i18n.translate( - 'xpack.data.searchSessionIndicator.resultLoadedInTheBackgroundIconAraText', + 'xpack.data.searchSessionIndicator.resultLoadedInTheBackgroundIconAriaLabel', { - defaultMessage: 'Results loaded in the background', + defaultMessage: 'Saved session complete', } ), tooltipText: i18n.translate( 'xpack.data.searchSessionIndicator.resultLoadedInTheBackgroundIconTooltipText', { - defaultMessage: 'Results loaded in the background', + defaultMessage: 'Saved session complete', } ), }, popover: { - text: i18n.translate('xpack.data.searchSessionIndicator.resultLoadedInTheBackgroundText', { - defaultMessage: 'Loaded', - }), - primaryAction: ViewAllSearchSessionsButton, + title: i18n.translate( + 'xpack.data.searchSessionIndicator.resultLoadedInTheBackgroundTitleText', + { + defaultMessage: 'Search session saved', + } + ), + description: i18n.translate( + 'xpack.data.searchSessionIndicator.resultLoadedInTheBackgroundDescriptionText', + { + defaultMessage: 'You can return to these results from Management.', + } + ), + secondaryAction: ViewAllSearchSessionsButton, }, }, [SearchSessionState.Restored]: { button: { - color: 'warning', - iconType: 'refresh', + color: 'success', + iconType: CheckInEmptyCircle, 'aria-label': i18n.translate( 'xpack.data.searchSessionIndicator.restoredResultsIconAriaLabel', { - defaultMessage: 'Results no longer current', + defaultMessage: 'Saved session restored', } ), tooltipText: i18n.translate('xpack.data.searchSessionIndicator.restoredResultsTooltipText', { - defaultMessage: 'Results no longer current', + defaultMessage: 'Search session restored', }), }, popover: { - text: i18n.translate('xpack.data.searchSessionIndicator.restoredText', { - defaultMessage: 'Results no longer current', + title: i18n.translate('xpack.data.searchSessionIndicator.restoredTitleText', { + defaultMessage: 'Search session restored', + }), + description: i18n.translate('xpack.data.searchSessionIndicator.restoredDescriptionText', { + defaultMessage: + 'You are viewing cached data from a specific time range. Changing the time range or filters will re-run the session.', }), - primaryAction: RefreshButton, secondaryAction: ViewAllSearchSessionsButton, }, }, [SearchSessionState.Canceled]: { button: { - color: 'subdued', - iconType: 'refresh', + color: 'danger', + iconType: 'alert', 'aria-label': i18n.translate('xpack.data.searchSessionIndicator.canceledIconAriaLabel', { - defaultMessage: 'Canceled', + defaultMessage: 'Search session stopped', }), tooltipText: i18n.translate('xpack.data.searchSessionIndicator.canceledTooltipText', { - defaultMessage: 'Search was canceled', + defaultMessage: 'Search session stopped', }), }, popover: { - text: i18n.translate('xpack.data.searchSessionIndicator.canceledText', { - defaultMessage: 'Search was canceled', + title: i18n.translate('xpack.data.searchSessionIndicator.canceledTitleText', { + defaultMessage: 'Search session stopped', + }), + description: i18n.translate('xpack.data.searchSessionIndicator.canceledDescriptionText', { + defaultMessage: 'You are viewing incomplete data.', }), - primaryAction: RefreshButton, secondaryAction: ViewAllSearchSessionsButton, }, }, }; -const VerticalDivider: React.FC = () =>
; +export interface SearchSessionIndicatorRef { + openPopover: () => void; + closePopover: () => void; +} -export const SearchSessionIndicator: React.FC = (props) => { +export const SearchSessionIndicator = React.forwardRef< + SearchSessionIndicatorRef, + SearchSessionIndicatorProps +>((props, ref) => { const [isPopoverOpen, setIsPopoverOpen] = React.useState(false); - const onButtonClick = () => setIsPopoverOpen((isOpen) => !isOpen); - const closePopover = () => setIsPopoverOpen(false); + const closePopover = useCallback(() => setIsPopoverOpen(false), []); + const onOpened = props.onOpened; + const openPopover = useCallback(() => { + setIsPopoverOpen(true); + if (onOpened) onOpened(props.state); + }, [onOpened, props.state]); + const onButtonClick = useCallback(() => { + if (isPopoverOpen) { + closePopover(); + } else { + openPopover(); + } + }, [isPopoverOpen, openPopover, closePopover]); + + useImperativeHandle( + ref, + () => ({ + openPopover: () => { + openPopover(); + }, + closePopover: () => { + closePopover(); + }, + }), + [openPopover, closePopover] + ); if (!searchSessionIndicatorViewStateToProps[props.state]) return null; @@ -271,13 +320,18 @@ export const SearchSessionIndicator: React.FC = (pr ownFocus isOpen={isPopoverOpen} closePopover={closePopover} - anchorPosition={'rightCenter'} - panelPaddingSize={'s'} + anchorPosition={'downLeft'} + panelPaddingSize={'m'} className="searchSessionIndicator" data-test-subj={'searchSessionIndicator'} data-state={props.state} + panelClassName={'searchSessionIndicator__panel'} + repositionOnScroll={true} button={ - + = (pr } > - - - -

{popover.text}

- - - - - {popover.primaryAction && ( - - - - )} - {popover.primaryAction && popover.secondaryAction && } - {popover.secondaryAction && ( - - - - )} - - - +
+ +

{popover.title}

+ + + +

{popover.description}

+ + + + {popover.primaryAction && ( + + + + )} + {popover.secondaryAction && ( + + + + )} + +
); -}; +}); // React.lazy() needs default: // eslint-disable-next-line import/no-default-export diff --git a/x-pack/test/send_search_to_background_integration/services/search_sessions.ts b/x-pack/test/send_search_to_background_integration/services/search_sessions.ts index 2756ce2c4f825..69b3e05946345 100644 --- a/x-pack/test/send_search_to_background_integration/services/search_sessions.ts +++ b/x-pack/test/send_search_to_background_integration/services/search_sessions.ts @@ -13,6 +13,9 @@ import { FtrProviderContext } from '../ftr_provider_context'; const SEARCH_SESSION_INDICATOR_TEST_SUBJ = 'searchSessionIndicator'; const SEARCH_SESSIONS_POPOVER_CONTENT_TEST_SUBJ = 'searchSessionIndicatorPopoverContainer'; +export const TOUR_TAKING_TOO_LONG_STEP_KEY = `data.searchSession.tour.takingTooLong`; +export const TOUR_RESTORE_STEP_KEY = `data.searchSession.tour.restore`; + type SessionStateType = | 'none' | 'loading' @@ -61,7 +64,7 @@ export function SearchSessionsProvider({ getService }: FtrProviderContext) { public async viewSearchSessions() { log.debug('viewSearchSessions'); await this.ensurePopoverOpened(); - await testSubjects.click('searchSessionIndicatorviewSearchSessionsLink'); + await testSubjects.click('searchSessionIndicatorViewSearchSessionsLink'); } public async save() { @@ -78,15 +81,20 @@ export function SearchSessionsProvider({ getService }: FtrProviderContext) { await this.ensurePopoverClosed(); } - public async refresh() { - log.debug('refresh the status'); + public async openPopover() { await this.ensurePopoverOpened(); - await testSubjects.click('searchSessionIndicatorRefreshBtn'); - await this.ensurePopoverClosed(); } - public async openPopover() { - await this.ensurePopoverOpened(); + public async openedOrFail() { + return testSubjects.existOrFail(SEARCH_SESSIONS_POPOVER_CONTENT_TEST_SUBJ, { + timeout: 15000, // because popover auto opens after search takes 10s + }); + } + + public async closedOrFail() { + return testSubjects.missingOrFail(SEARCH_SESSIONS_POPOVER_CONTENT_TEST_SUBJ, { + timeout: 15000, // because popover auto opens after search takes 10s + }); } private async ensurePopoverOpened() { @@ -143,5 +151,19 @@ export function SearchSessionsProvider({ getService }: FtrProviderContext) { ); }); } + + public async markTourDone() { + await Promise.all([ + browser.setLocalStorageItem(TOUR_TAKING_TOO_LONG_STEP_KEY, 'true'), + browser.setLocalStorageItem(TOUR_RESTORE_STEP_KEY, 'true'), + ]); + } + + public async markTourUndone() { + await Promise.all([ + browser.removeLocalStorageItem(TOUR_TAKING_TOO_LONG_STEP_KEY), + browser.removeLocalStorageItem(TOUR_RESTORE_STEP_KEY), + ]); + } })(); } diff --git a/x-pack/test/send_search_to_background_integration/tests/apps/dashboard/async_search/index.ts b/x-pack/test/send_search_to_background_integration/tests/apps/dashboard/async_search/index.ts index 101657f796c9b..5a912117fe445 100644 --- a/x-pack/test/send_search_to_background_integration/tests/apps/dashboard/async_search/index.ts +++ b/x-pack/test/send_search_to_background_integration/tests/apps/dashboard/async_search/index.ts @@ -7,9 +7,11 @@ import { FtrProviderContext } from '../../../../ftr_provider_context'; -export default function ({ loadTestFile, getService }: FtrProviderContext) { +export default function ({ loadTestFile, getService, getPageObjects }: FtrProviderContext) { const kibanaServer = getService('kibanaServer'); const esArchiver = getService('esArchiver'); + const PageObjects = getPageObjects(['common']); + const searchSessions = getService('searchSessions'); describe('async search', function () { this.tags('ciGroup3'); @@ -19,6 +21,11 @@ export default function ({ loadTestFile, getService }: FtrProviderContext) { await esArchiver.load('dashboard/async_search'); await kibanaServer.uiSettings.replace({ defaultIndex: 'logstash-*' }); await kibanaServer.uiSettings.replace({ 'search:timeout': 10000 }); + await PageObjects.common.navigateToApp('dashboard'); + }); + + beforeEach(async () => { + await searchSessions.markTourDone(); }); after(async () => { @@ -28,6 +35,7 @@ export default function ({ loadTestFile, getService }: FtrProviderContext) { loadTestFile(require.resolve('./async_search')); loadTestFile(require.resolve('./send_to_background')); loadTestFile(require.resolve('./send_to_background_relative_time')); + loadTestFile(require.resolve('./search_sessions_tour')); loadTestFile(require.resolve('./sessions_in_space')); }); } diff --git a/x-pack/test/send_search_to_background_integration/tests/apps/dashboard/async_search/search_sessions_tour.ts b/x-pack/test/send_search_to_background_integration/tests/apps/dashboard/async_search/search_sessions_tour.ts new file mode 100644 index 0000000000000..e12bd377288ba --- /dev/null +++ b/x-pack/test/send_search_to_background_integration/tests/apps/dashboard/async_search/search_sessions_tour.ts @@ -0,0 +1,62 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { FtrProviderContext } from '../../../../ftr_provider_context'; + +export default function ({ getService, getPageObjects }: FtrProviderContext) { + const es = getService('es'); + const log = getService('log'); + const PageObjects = getPageObjects(['common', 'header', 'dashboard', 'visChart']); + const browser = getService('browser'); + const searchSessions = getService('searchSessions'); + const kibanaServer = getService('kibanaServer'); + + describe('search sessions tour', () => { + before(async function () { + const { body } = await es.info(); + if (!body.version.number.includes('SNAPSHOT')) { + log.debug('Skipping because this build does not have the required shard_delay agg'); + this.skip(); + return; + } + await kibanaServer.uiSettings.replace({ 'search:timeout': 30000 }); + }); + + beforeEach(async () => { + await PageObjects.common.navigateToApp('dashboard'); + await searchSessions.markTourUndone(); + }); + + after(async function () { + await searchSessions.deleteAllSearchSessions(); + await kibanaServer.uiSettings.replace({ 'search:timeout': 10000 }); + await searchSessions.markTourDone(); + }); + + it('search session popover auto opens when search is taking a while', async () => { + await PageObjects.dashboard.loadSavedDashboard('Delayed 15s'); + + await searchSessions.openedOrFail(); // tour auto opens when there is a long running search + + await PageObjects.header.waitUntilLoadingHasFinished(); + await searchSessions.expectState('completed'); + + const url = await browser.getCurrentUrl(); + const fakeSessionId = '__fake__'; + const savedSessionURL = `${url}&searchSessionId=${fakeSessionId}`; + await browser.get(savedSessionURL); + await PageObjects.header.waitUntilLoadingHasFinished(); + await searchSessions.expectState('restored'); + await searchSessions.openedOrFail(); // tour auto opens on first restore + + await browser.get(savedSessionURL); + await PageObjects.header.waitUntilLoadingHasFinished(); + await searchSessions.expectState('restored'); + await searchSessions.closedOrFail(); // do not open on next restore + }); + }); +} diff --git a/x-pack/test/send_search_to_background_integration/tests/apps/dashboard/async_search/send_to_background.ts b/x-pack/test/send_search_to_background_integration/tests/apps/dashboard/async_search/send_to_background.ts index a6169951e21ba..dc7e5b60f5e1c 100644 --- a/x-pack/test/send_search_to_background_integration/tests/apps/dashboard/async_search/send_to_background.ts +++ b/x-pack/test/send_search_to_background_integration/tests/apps/dashboard/async_search/send_to_background.ts @@ -16,6 +16,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { const dashboardPanelActions = getService('dashboardPanelActions'); const browser = getService('browser'); const searchSessions = getService('searchSessions'); + const queryBar = getService('queryBar'); describe('send to background', () => { before(async function () { @@ -46,7 +47,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { ); expect(session1).to.be(fakeSessionId); - await searchSessions.refresh(); + await queryBar.clickQuerySubmitButton(); await PageObjects.header.waitUntilLoadingHasFinished(); await searchSessions.expectState('completed'); await testSubjects.missingOrFail('embeddableErrorLabel'); @@ -65,6 +66,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { expect(url).to.contain('searchSessionId'); await PageObjects.header.waitUntilLoadingHasFinished(); await searchSessions.expectState('restored'); + expect( await dashboardPanelActions.getSearchSessionIdByTitle('Sum of Bytes by Extension') ).to.be(fakeSessionId); diff --git a/x-pack/test/send_search_to_background_integration/tests/apps/discover/index.ts b/x-pack/test/send_search_to_background_integration/tests/apps/discover/index.ts index 69db8b83f45bd..42f7560b82f4f 100644 --- a/x-pack/test/send_search_to_background_integration/tests/apps/discover/index.ts +++ b/x-pack/test/send_search_to_background_integration/tests/apps/discover/index.ts @@ -7,9 +7,11 @@ import { FtrProviderContext } from '../../../ftr_provider_context'; -export default function ({ loadTestFile, getService }: FtrProviderContext) { +export default function ({ loadTestFile, getService, getPageObjects }: FtrProviderContext) { const kibanaServer = getService('kibanaServer'); const esArchiver = getService('esArchiver'); + const PageObjects = getPageObjects(['common']); + const searchSessions = getService('searchSessions'); describe('async search', function () { this.tags('ciGroup3'); @@ -17,6 +19,11 @@ export default function ({ loadTestFile, getService }: FtrProviderContext) { before(async () => { await esArchiver.loadIfNeeded('logstash_functional'); await kibanaServer.uiSettings.replace({ defaultIndex: 'logstash-*' }); + await PageObjects.common.navigateToApp('discover'); + }); + + beforeEach(async () => { + await searchSessions.markTourDone(); }); loadTestFile(require.resolve('./async_search')); diff --git a/x-pack/test/send_search_to_background_integration/tests/apps/management/search_sessions/sessions_management.ts b/x-pack/test/send_search_to_background_integration/tests/apps/management/search_sessions/sessions_management.ts index 94ad6c21419da..7e09c6b0fe05c 100644 --- a/x-pack/test/send_search_to_background_integration/tests/apps/management/search_sessions/sessions_management.ts +++ b/x-pack/test/send_search_to_background_integration/tests/apps/management/search_sessions/sessions_management.ts @@ -31,6 +31,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { retry.tryForTime(10000, async () => { testSubjects.existOrFail('dashboardLandingPage'); }); + await searchSessions.markTourDone(); }); after(async () => { From f3a9c763dfa08972b8106fac248456b4b3f20086 Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Thu, 4 Feb 2021 05:40:18 -0800 Subject: [PATCH 06/69] Updating package registry snapshot distribution version (#89776) --- .../plugins/fleet/server/errors/handlers.ts | 4 +- .../epm/elasticsearch/transform/install.ts | 27 +++-- .../elasticsearch/transform/transform.test.ts | 106 ++++++++++++++++++ .../agent_policy_with_agents_setup.ts | 2 +- x-pack/test/fleet_api_integration/config.ts | 6 +- 5 files changed, 133 insertions(+), 12 deletions(-) diff --git a/x-pack/plugins/fleet/server/errors/handlers.ts b/x-pack/plugins/fleet/server/errors/handlers.ts index 45b79c4a6ebb9..77db050309a60 100644 --- a/x-pack/plugins/fleet/server/errors/handlers.ts +++ b/x-pack/plugins/fleet/server/errors/handlers.ts @@ -44,7 +44,9 @@ interface LegacyESClientError { path?: string; query?: string | undefined; body?: { - error: object; + error: { + type: string; + }; status: number; }; statusCode?: number; diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/transform/install.ts b/x-pack/plugins/fleet/server/services/epm/elasticsearch/transform/install.ts index ea934eb563fab..57e1090f8954b 100644 --- a/x-pack/plugins/fleet/server/services/epm/elasticsearch/transform/install.ts +++ b/x-pack/plugins/fleet/server/services/epm/elasticsearch/transform/install.ts @@ -19,6 +19,7 @@ import { getInstallation } from '../../packages'; import { deleteTransforms, deleteTransformRefs } from './remove'; import { getAsset } from './common'; import { appContextService } from '../../../app_context'; +import { isLegacyESClientError } from '../../../../errors'; interface TransformInstallation { installationName: string; @@ -116,17 +117,27 @@ async function handleTransformInstall({ callCluster: CallESAsCurrentUser; transform: TransformInstallation; }): Promise { - // defer validation on put if the source index is not available - await callCluster('transport.request', { - method: 'PUT', - path: `/_transform/${transform.installationName}`, - query: 'defer_validation=true', - body: transform.content, - }); - + try { + // defer validation on put if the source index is not available + await callCluster('transport.request', { + method: 'PUT', + path: `/_transform/${transform.installationName}`, + query: 'defer_validation=true', + body: transform.content, + }); + } catch (err) { + // swallow the error if the transform already exists. + const isAlreadyExistError = + isLegacyESClientError(err) && err?.body?.error?.type === 'resource_already_exists_exception'; + if (!isAlreadyExistError) { + throw err; + } + } await callCluster('transport.request', { method: 'POST', path: `/_transform/${transform.installationName}/_start`, + // Ignore error if the transform is already started + ignore: [409], }); return { id: transform.installationName, type: ElasticsearchAssetType.transform }; diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/transform/transform.test.ts b/x-pack/plugins/fleet/server/services/epm/elasticsearch/transform/transform.test.ts index 861692d23d9ac..bd944391b5f23 100644 --- a/x-pack/plugins/fleet/server/services/epm/elasticsearch/transform/transform.test.ts +++ b/x-pack/plugins/fleet/server/services/epm/elasticsearch/transform/transform.test.ts @@ -17,6 +17,7 @@ jest.mock('./common', () => { }; }); +import { errors as LegacyESErrors } from 'elasticsearch'; import { installTransform } from './install'; import { ILegacyScopedClusterClient, SavedObject, SavedObjectsClientContract } from 'kibana/server'; import { ElasticsearchAssetType, Installation, RegistryPackage } from '../../../../types'; @@ -217,6 +218,7 @@ describe('test transform install', () => { { method: 'POST', path: '/_transform/endpoint.metadata-default-0.16.0-dev.0/_start', + ignore: [409], }, ], [ @@ -224,6 +226,7 @@ describe('test transform install', () => { { method: 'POST', path: '/_transform/endpoint.metadata_current-default-0.16.0-dev.0/_start', + ignore: [409], }, ], ]); @@ -345,6 +348,7 @@ describe('test transform install', () => { { method: 'POST', path: '/_transform/endpoint.metadata_current-default-0.16.0-dev.0/_start', + ignore: [409], }, ], ]); @@ -492,4 +496,106 @@ describe('test transform install', () => { ], ]); }); + + test('ignore already exists error if saved object and ES transforms are out of sync', async () => { + const previousInstallation: Installation = ({ + installed_es: [], + } as unknown) as Installation; + + const currentInstallation: Installation = ({ + installed_es: [ + { + id: 'metrics-endpoint.metadata-current-default-0.16.0-dev.0', + type: ElasticsearchAssetType.transform, + }, + ], + } as unknown) as Installation; + (getAsset as jest.MockedFunction).mockReturnValueOnce( + Buffer.from('{"content": "data"}', 'utf8') + ); + (getInstallation as jest.MockedFunction) + .mockReturnValueOnce(Promise.resolve(previousInstallation)) + .mockReturnValueOnce(Promise.resolve(currentInstallation)); + + (getInstallationObject as jest.MockedFunction< + typeof getInstallationObject + >).mockReturnValueOnce( + Promise.resolve(({ + attributes: { installed_es: [] }, + } as unknown) as SavedObject) + ); + legacyScopedClusterClient.callAsCurrentUser = jest.fn(); + + legacyScopedClusterClient.callAsCurrentUser.mockImplementation( + async (endpoint, clientParams, options) => { + if ( + endpoint === 'transport.request' && + clientParams?.method === 'PUT' && + clientParams?.path === '/_transform/endpoint.metadata_current-default-0.16.0-dev.0' + ) { + const err: LegacyESErrors._Abstract & { body?: any } = new LegacyESErrors.BadRequest(); + err.body = { + error: { type: 'resource_already_exists_exception' }, + }; + throw err; + } + } + ); + await installTransform( + ({ + name: 'endpoint', + version: '0.16.0-dev.0', + data_streams: [ + { + type: 'metrics', + dataset: 'endpoint.metadata_current', + title: 'Endpoint Metadata', + release: 'experimental', + package: 'endpoint', + ingest_pipeline: 'default', + elasticsearch: { + 'index_template.mappings': { + dynamic: false, + }, + }, + path: 'metadata_current', + }, + ], + } as unknown) as RegistryPackage, + ['endpoint-0.16.0-dev.0/elasticsearch/transform/metadata_current/default.json'], + legacyScopedClusterClient.callAsCurrentUser, + savedObjectsClient + ); + + expect(legacyScopedClusterClient.callAsCurrentUser.mock.calls).toEqual([ + [ + 'transport.request', + { + method: 'PUT', + path: '/_transform/endpoint.metadata_current-default-0.16.0-dev.0', + query: 'defer_validation=true', + body: '{"content": "data"}', + }, + ], + [ + 'transport.request', + { + method: 'POST', + path: '/_transform/endpoint.metadata_current-default-0.16.0-dev.0/_start', + ignore: [409], + }, + ], + ]); + expect(savedObjectsClient.update.mock.calls).toEqual([ + [ + 'epm-packages', + 'endpoint', + { + installed_es: [ + { id: 'endpoint.metadata_current-default-0.16.0-dev.0', type: 'transform' }, + ], + }, + ], + ]); + }); }); diff --git a/x-pack/test/fleet_api_integration/apis/agent_policy/agent_policy_with_agents_setup.ts b/x-pack/test/fleet_api_integration/apis/agent_policy/agent_policy_with_agents_setup.ts index b8bd83739fea4..1cc96b59c460d 100644 --- a/x-pack/test/fleet_api_integration/apis/agent_policy/agent_policy_with_agents_setup.ts +++ b/x-pack/test/fleet_api_integration/apis/agent_policy/agent_policy_with_agents_setup.ts @@ -104,7 +104,7 @@ export default function (providerContext: FtrProviderContext) { const agentPolicy = action.data.policy; expect(agentPolicy.id).to.be(policyId); // should have system inputs - expect(agentPolicy.inputs).length(2); + expect(agentPolicy.inputs).length(3); // should have default output expect(agentPolicy.outputs.default).not.empty(); }); diff --git a/x-pack/test/fleet_api_integration/config.ts b/x-pack/test/fleet_api_integration/config.ts index 596b9319064a5..444b8c3a68776 100644 --- a/x-pack/test/fleet_api_integration/config.ts +++ b/x-pack/test/fleet_api_integration/config.ts @@ -11,9 +11,11 @@ import { FtrConfigProviderContext } from '@kbn/test/types/ftr'; import { defineDockerServersConfig } from '@kbn/test'; // Docker image to use for Fleet API integration tests. -// This hash comes from the commit hash here: https://github.com/elastic/package-storage/commit +// This hash comes from the latest successful build of the Snapshot Distribution of the Package Registry, for +// example: https://beats-ci.elastic.co/blue/organizations/jenkins/Ingest-manager%2Fpackage-storage/detail/snapshot/74/pipeline/257#step-302-log-1. +// It should be updated any time there is a new Docker image published for the Snapshot Distribution of the Package Registry. export const dockerImage = - 'docker.elastic.co/package-registry/distribution:fb58d670bafbac7e9e28baf6d6f99ba65cead548'; + 'docker.elastic.co/package-registry/distribution:5314869e2f6bc01d37b8652f7bda89248950b3a4'; export default async function ({ readConfigFile }: FtrConfigProviderContext) { const xPackAPITestsConfig = await readConfigFile(require.resolve('../api_integration/config.ts')); From b5ce8ba26ff0eb46719da0107579ee73a0b8b461 Mon Sep 17 00:00:00 2001 From: Liza Katz Date: Thu, 4 Feb 2021 16:57:26 +0200 Subject: [PATCH 07/69] [Search Session][Management] Rename "cancel" button and delete "Reload" button (#90015) * Rename management button to "delete" * fix jest * Delete reload action from management * Added both cancel and delete session * Improve texts * fix test * ts * doc * fix jest --- src/plugins/data/server/search/mocks.ts | 1 + .../data/server/search/search_service.ts | 13 +++++-- .../data/server/search/session/mocks.ts | 1 + .../server/search/session/session_service.ts | 3 ++ .../data/server/search/session/types.ts | 1 + src/plugins/data/server/search/types.ts | 1 + src/plugins/data/server/server.api.md | 3 +- .../{cancel_button.tsx => delete_button.tsx} | 32 ++++++++--------- .../components/actions/get_action.tsx | 16 +++------ .../components/actions/popover_actions.tsx | 2 +- .../components/actions/reload_button.tsx | 33 ----------------- .../sessions_mgmt/components/actions/types.ts | 3 +- .../search/sessions_mgmt/lib/api.test.ts | 33 ++--------------- .../public/search/sessions_mgmt/lib/api.ts | 11 +++--- .../server/routes/session.test.ts | 36 +++++++++++++++---- .../data_enhanced/server/routes/session.ts | 23 ++++++++++++ .../server/search/session/session_service.ts | 6 ++++ .../api_integration/apis/search/session.ts | 26 ++++++++++++-- .../search_sessions_management_page.ts | 6 ++-- .../search_sessions/sessions_management.ts | 5 ++- 20 files changed, 137 insertions(+), 118 deletions(-) rename x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/actions/{cancel_button.tsx => delete_button.tsx} (70%) delete mode 100644 x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/actions/reload_button.tsx diff --git a/src/plugins/data/server/search/mocks.ts b/src/plugins/data/server/search/mocks.ts index e32e3326dede0..248487f216a56 100644 --- a/src/plugins/data/server/search/mocks.ts +++ b/src/plugins/data/server/search/mocks.ts @@ -40,5 +40,6 @@ export function createSearchRequestHandlerContext() { updateSession: jest.fn(), extendSession: jest.fn(), cancelSession: jest.fn(), + deleteSession: jest.fn(), }; } diff --git a/src/plugins/data/server/search/search_service.ts b/src/plugins/data/server/search/search_service.ts index 91d9bd6e0d284..ce0771a1e9df8 100644 --- a/src/plugins/data/server/search/search_service.ts +++ b/src/plugins/data/server/search/search_service.ts @@ -307,9 +307,8 @@ export class SearchService implements Plugin { return strategy.extend(id, keepAlive, options, deps); }; - private cancelSession = async (deps: SearchStrategyDependencies, sessionId: string) => { + private cancelSessionSearches = async (deps: SearchStrategyDependencies, sessionId: string) => { const searchIdMapping = await deps.searchSessionsClient.getSearchIdMapping(sessionId); - const response = await deps.searchSessionsClient.cancel(sessionId); for (const [searchId, strategyName] of searchIdMapping.entries()) { const searchOptions = { @@ -319,10 +318,19 @@ export class SearchService implements Plugin { }; this.cancel(deps, searchId, searchOptions); } + }; + private cancelSession = async (deps: SearchStrategyDependencies, sessionId: string) => { + const response = await deps.searchSessionsClient.cancel(sessionId); + this.cancelSessionSearches(deps, sessionId); return response; }; + private deleteSession = async (deps: SearchStrategyDependencies, sessionId: string) => { + this.cancelSessionSearches(deps, sessionId); + return deps.searchSessionsClient.delete(sessionId); + }; + private extendSession = async ( deps: SearchStrategyDependencies, sessionId: string, @@ -372,6 +380,7 @@ export class SearchService implements Plugin { updateSession: searchSessionsClient.update, extendSession: this.extendSession.bind(this, deps), cancelSession: this.cancelSession.bind(this, deps), + deleteSession: this.deleteSession.bind(this, deps), }; }; }; diff --git a/src/plugins/data/server/search/session/mocks.ts b/src/plugins/data/server/search/session/mocks.ts index 5e940412d9abd..c173e1a1290ea 100644 --- a/src/plugins/data/server/search/session/mocks.ts +++ b/src/plugins/data/server/search/session/mocks.ts @@ -21,5 +21,6 @@ export function createSearchSessionsClientMock(): jest.Mocked< update: jest.fn(), cancel: jest.fn(), extend: jest.fn(), + delete: jest.fn(), }; } diff --git a/src/plugins/data/server/search/session/session_service.ts b/src/plugins/data/server/search/session/session_service.ts index 2ca580f50db0a..2ed44b4e57d94 100644 --- a/src/plugins/data/server/search/session/session_service.ts +++ b/src/plugins/data/server/search/session/session_service.ts @@ -41,6 +41,9 @@ export class SearchSessionService implements ISearchSessionService { cancel: async () => { throw new Error('cancel not implemented in OSS search session service'); }, + delete: async () => { + throw new Error('delete not implemented in OSS search session service'); + }, }); } } diff --git a/src/plugins/data/server/search/session/types.ts b/src/plugins/data/server/search/session/types.ts index 16079b51f4bff..816716360415d 100644 --- a/src/plugins/data/server/search/session/types.ts +++ b/src/plugins/data/server/search/session/types.ts @@ -29,6 +29,7 @@ export interface IScopedSearchSessionsClient { find: (options: Omit) => Promise>; update: (sessionId: string, attributes: Partial) => Promise>; cancel: (sessionId: string) => Promise<{}>; + delete: (sessionId: string) => Promise<{}>; extend: (sessionId: string, expires: Date) => Promise>; } diff --git a/src/plugins/data/server/search/types.ts b/src/plugins/data/server/search/types.ts index 854f5ed94eb48..e8548257c0167 100644 --- a/src/plugins/data/server/search/types.ts +++ b/src/plugins/data/server/search/types.ts @@ -92,6 +92,7 @@ export interface IScopedSearchClient extends ISearchClient { findSessions: IScopedSearchSessionsClient['find']; updateSession: IScopedSearchSessionsClient['update']; cancelSession: IScopedSearchSessionsClient['cancel']; + deleteSession: IScopedSearchSessionsClient['delete']; extendSession: IScopedSearchSessionsClient['extend']; } diff --git a/src/plugins/data/server/server.api.md b/src/plugins/data/server/server.api.md index beda5b3cea97e..68582a9d877e9 100644 --- a/src/plugins/data/server/server.api.md +++ b/src/plugins/data/server/server.api.md @@ -1254,6 +1254,7 @@ export class SearchSessionService implements ISearchSessionService { update: () => Promise; extend: () => Promise; cancel: () => Promise; + delete: () => Promise; }; } @@ -1430,7 +1431,7 @@ export function usageProvider(core: CoreSetup_2): SearchUsage; // src/plugins/data/server/index.ts:266:1 - (ae-forgotten-export) The symbol "calcAutoIntervalLessThan" needs to be exported by the entry point index.d.ts // src/plugins/data/server/index_patterns/index_patterns_service.ts:59:14 - (ae-forgotten-export) The symbol "IndexPatternsService" needs to be exported by the entry point index.d.ts // src/plugins/data/server/plugin.ts:79:74 - (ae-forgotten-export) The symbol "DataEnhancements" needs to be exported by the entry point index.d.ts -// src/plugins/data/server/search/types.ts:113:5 - (ae-forgotten-export) The symbol "ISearchStartSearchSource" needs to be exported by the entry point index.d.ts +// src/plugins/data/server/search/types.ts:114:5 - (ae-forgotten-export) The symbol "ISearchStartSearchSource" needs to be exported by the entry point index.d.ts // (No @packageDocumentation comment for this package) diff --git a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/actions/cancel_button.tsx b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/actions/delete_button.tsx similarity index 70% rename from x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/actions/cancel_button.tsx rename to x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/actions/delete_button.tsx index 5edbc7b08985c..d505752ec3fad 100644 --- a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/actions/cancel_button.tsx +++ b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/actions/delete_button.tsx @@ -13,31 +13,31 @@ import { SearchSessionsMgmtAPI } from '../../lib/api'; import { TableText } from '../'; import { OnActionComplete } from './types'; -interface CancelButtonProps { +interface DeleteButtonProps { id: string; name: string; api: SearchSessionsMgmtAPI; onActionComplete: OnActionComplete; } -const CancelConfirm = ({ - onConfirmDismiss, +const DeleteConfirm = ({ + onConfirmCancel, ...props -}: CancelButtonProps & { onConfirmDismiss: () => void }) => { +}: DeleteButtonProps & { onConfirmCancel: () => void }) => { const { id, name, api, onActionComplete } = props; const [isLoading, setIsLoading] = useState(false); const title = i18n.translate('xpack.data.mgmt.searchSessions.cancelModal.title', { - defaultMessage: 'Cancel search session', + defaultMessage: 'Delete search session', }); - const confirm = i18n.translate('xpack.data.mgmt.searchSessions.cancelModal.cancelButton', { - defaultMessage: 'Cancel', + const confirm = i18n.translate('xpack.data.mgmt.searchSessions.cancelModal.deleteButton', { + defaultMessage: 'Delete', }); - const cancel = i18n.translate('xpack.data.mgmt.searchSessions.cancelModal.dontCancelButton', { - defaultMessage: 'Dismiss', + const cancel = i18n.translate('xpack.data.mgmt.searchSessions.cancelModal.cancelButton', { + defaultMessage: 'Cancel', }); const message = i18n.translate('xpack.data.mgmt.searchSessions.cancelModal.message', { - defaultMessage: `Canceling the search session \'{name}\' will expire any cached results, so that quick restore will no longer be available. You will still be able to re-run it, using the reload action.`, + defaultMessage: `Deleting the search session \'{name}\' deletes all cached results.`, values: { name, }, @@ -47,7 +47,7 @@ const CancelConfirm = ({ { setIsLoading(true); await api.sendCancel(id); @@ -65,14 +65,14 @@ const CancelConfirm = ({ ); }; -export const CancelButton = (props: CancelButtonProps) => { +export const DeleteButton = (props: DeleteButtonProps) => { const [showConfirm, setShowConfirm] = useState(false); const onClick = () => { setShowConfirm(true); }; - const onConfirmDismiss = () => { + const onConfirmCancel = () => { setShowConfirm(false); }; @@ -80,11 +80,11 @@ export const CancelButton = (props: CancelButtonProps) => { <> - {showConfirm ? : null} + {showConfirm ? : null} ); }; diff --git a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/actions/get_action.tsx b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/actions/get_action.tsx index bc849abf125c1..edc5037f1dbec 100644 --- a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/actions/get_action.tsx +++ b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/actions/get_action.tsx @@ -10,30 +10,22 @@ import { IClickActionDescriptor } from '../'; import extendSessionIcon from '../../icons/extend_session.svg'; import { SearchSessionsMgmtAPI } from '../../lib/api'; import { UISession } from '../../types'; -import { CancelButton } from './cancel_button'; +import { DeleteButton } from './delete_button'; import { ExtendButton } from './extend_button'; -import { ReloadButton } from './reload_button'; import { ACTION, OnActionComplete } from './types'; export const getAction = ( api: SearchSessionsMgmtAPI, actionType: string, - { id, name, expires, reloadUrl }: UISession, + { id, name, expires }: UISession, onActionComplete: OnActionComplete ): IClickActionDescriptor | null => { switch (actionType) { - case ACTION.CANCEL: + case ACTION.DELETE: return { iconType: 'crossInACircleFilled', textColor: 'default', - label: , - }; - - case ACTION.RELOAD: - return { - iconType: 'refresh', - textColor: 'default', - label: , + label: , }; case ACTION.EXTEND: diff --git a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/actions/popover_actions.tsx b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/actions/popover_actions.tsx index e47a9a5944b24..fe71b5125dfbb 100644 --- a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/actions/popover_actions.tsx +++ b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/actions/popover_actions.tsx @@ -90,7 +90,7 @@ export const PopoverActionsMenu = ({ api, onActionComplete, session }: PopoverAc // add a line above the delete action (when there are multiple) // NOTE: Delete action MUST be the final action[] item - if (actions.length > 1 && actionType === ACTION.CANCEL) { + if (actions.length > 1 && actionType === ACTION.DELETE) { itemSet.push({ isSeparator: true, key: 'separadorable' }); } diff --git a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/actions/reload_button.tsx b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/actions/reload_button.tsx deleted file mode 100644 index 70ca279c2450d..0000000000000 --- a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/actions/reload_button.tsx +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import { FormattedMessage } from '@kbn/i18n/react'; -import React from 'react'; -import { TableText } from '../'; -import { SearchSessionsMgmtAPI } from '../../lib/api'; - -interface ReloadButtonProps { - api: SearchSessionsMgmtAPI; - reloadUrl: string; -} - -export const ReloadButton = (props: ReloadButtonProps) => { - function onClick() { - props.api.reloadSearchSession(props.reloadUrl); - } - - return ( - <> - - - - - ); -}; diff --git a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/actions/types.ts b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/actions/types.ts index 97e67909baea2..5f82f16adcbb6 100644 --- a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/actions/types.ts +++ b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/components/actions/types.ts @@ -9,6 +9,5 @@ export type OnActionComplete = () => void; export enum ACTION { EXTEND = 'extend', - CANCEL = 'cancel', - RELOAD = 'reload', + DELETE = 'delete', } diff --git a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/lib/api.test.ts b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/lib/api.test.ts index 2ec9d588d7fd7..86acbcdb53001 100644 --- a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/lib/api.test.ts +++ b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/lib/api.test.ts @@ -61,9 +61,8 @@ describe('Search Sessions Management API', () => { Array [ Object { "actions": Array [ - "reload", "extend", - "cancel", + "delete", ], "appId": "pizza", "created": undefined, @@ -146,7 +145,7 @@ describe('Search Sessions Management API', () => { await api.sendCancel('abc-123-cool-session-ID'); expect(mockCoreStart.notifications.toasts.addSuccess).toHaveBeenCalledWith({ - title: 'The search session was canceled and expired.', + title: 'The search session was deleted.', }); }); @@ -162,37 +161,11 @@ describe('Search Sessions Management API', () => { expect(mockCoreStart.notifications.toasts.addError).toHaveBeenCalledWith( new Error('implementation is so bad'), - { title: 'Failed to cancel the search session!' } + { title: 'Failed to delete the search session!' } ); }); }); - describe('reload', () => { - beforeEach(() => { - sessionsClient.find = jest.fn().mockImplementation(async () => { - return { - saved_objects: [ - { - id: 'hello-pizza-123', - attributes: { name: 'Veggie', appId: 'pizza', status: SearchSessionStatus.COMPLETE }, - }, - ], - } as SavedObjectsFindResponse; - }); - }); - - test('send cancel calls the cancel endpoint with a session ID', async () => { - const api = new SearchSessionsMgmtAPI(sessionsClient, mockConfig, { - urls: mockUrls, - notifications: mockCoreStart.notifications, - application: mockCoreStart.application, - }); - await api.reloadSearchSession('www.myurl.com'); - - expect(mockCoreStart.application.navigateToUrl).toHaveBeenCalledWith('www.myurl.com'); - }); - }); - describe('extend', () => { beforeEach(() => { sessionsClient.find = jest.fn().mockImplementation(async () => { diff --git a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/lib/api.ts b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/lib/api.ts index 1b024dae1bfca..264556f91cc37 100644 --- a/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/lib/api.ts +++ b/x-pack/plugins/data_enhanced/public/search/sessions_mgmt/lib/api.ts @@ -21,10 +21,9 @@ type UrlGeneratorsStart = SharePluginStart['urlGenerators']; function getActions(status: SearchSessionStatus) { const actions: ACTION[] = []; - actions.push(ACTION.RELOAD); if (status === SearchSessionStatus.IN_PROGRESS || status === SearchSessionStatus.COMPLETE) { actions.push(ACTION.EXTEND); - actions.push(ACTION.CANCEL); + actions.push(ACTION.DELETE); } return actions; } @@ -162,8 +161,8 @@ export class SearchSessionsMgmtAPI { await this.sessionsClient.delete(id); this.deps.notifications.toasts.addSuccess({ - title: i18n.translate('xpack.data.mgmt.searchSessions.api.canceled', { - defaultMessage: 'The search session was canceled and expired.', + title: i18n.translate('xpack.data.mgmt.searchSessions.api.deleted', { + defaultMessage: 'The search session was deleted.', }), }); } catch (err) { @@ -171,8 +170,8 @@ export class SearchSessionsMgmtAPI { console.error(err); this.deps.notifications.toasts.addError(err, { - title: i18n.translate('xpack.data.mgmt.searchSessions.api.cancelError', { - defaultMessage: 'Failed to cancel the search session!', + title: i18n.translate('xpack.data.mgmt.searchSessions.api.deletedError', { + defaultMessage: 'Failed to delete the search session!', }), }); } diff --git a/x-pack/plugins/data_enhanced/server/routes/session.test.ts b/x-pack/plugins/data_enhanced/server/routes/session.test.ts index 830524da0fb97..ebc501346aed2 100644 --- a/x-pack/plugins/data_enhanced/server/routes/session.test.ts +++ b/x-pack/plugins/data_enhanced/server/routes/session.test.ts @@ -16,6 +16,13 @@ import type { import { dataPluginMock } from '../../../../../src/plugins/data/server/mocks'; import { registerSessionRoutes } from './session'; +enum PostHandlerIndex { + SAVE, + FIND, + CANCEL, + EXTEND, +} + describe('registerSessionRoutes', () => { let mockCoreSetup: MockedKeys>; let mockContext: jest.Mocked; @@ -37,7 +44,7 @@ describe('registerSessionRoutes', () => { const mockResponse = httpServerMock.createResponseFactory(); const mockRouter = mockCoreSetup.http.createRouter.mock.results[0].value; - const [[, saveHandler]] = mockRouter.post.mock.calls; + const [, saveHandler] = mockRouter.post.mock.calls[PostHandlerIndex.SAVE]; saveHandler(mockContext, mockRequest, mockResponse); @@ -71,7 +78,7 @@ describe('registerSessionRoutes', () => { const mockResponse = httpServerMock.createResponseFactory(); const mockRouter = mockCoreSetup.http.createRouter.mock.results[0].value; - const [, [, findHandler]] = mockRouter.post.mock.calls; + const [, findHandler] = mockRouter.post.mock.calls[PostHandlerIndex.FIND]; findHandler(mockContext, mockRequest, mockResponse); @@ -89,14 +96,14 @@ describe('registerSessionRoutes', () => { const mockResponse = httpServerMock.createResponseFactory(); const mockRouter = mockCoreSetup.http.createRouter.mock.results[0].value; - const [[, updateHandler]] = mockRouter.put.mock.calls; + const [, updateHandler] = mockRouter.put.mock.calls[0]; updateHandler(mockContext, mockRequest, mockResponse); expect(mockContext.search!.updateSession).toHaveBeenCalledWith(id, body); }); - it('delete calls cancelSession with id', async () => { + it('cancel calls cancelSession with id', async () => { const id = 'd7170a35-7e2c-48d6-8dec-9a056721b489'; const params = { id }; @@ -104,13 +111,28 @@ describe('registerSessionRoutes', () => { const mockResponse = httpServerMock.createResponseFactory(); const mockRouter = mockCoreSetup.http.createRouter.mock.results[0].value; - const [[, deleteHandler]] = mockRouter.delete.mock.calls; + const [, cancelHandler] = mockRouter.post.mock.calls[PostHandlerIndex.CANCEL]; - deleteHandler(mockContext, mockRequest, mockResponse); + cancelHandler(mockContext, mockRequest, mockResponse); expect(mockContext.search!.cancelSession).toHaveBeenCalledWith(id); }); + it('delete calls deleteSession with id', async () => { + const id = 'd7170a35-7e2c-48d6-8dec-9a056721b489'; + const params = { id }; + + const mockRequest = httpServerMock.createKibanaRequest({ params }); + const mockResponse = httpServerMock.createResponseFactory(); + + const mockRouter = mockCoreSetup.http.createRouter.mock.results[0].value; + const [, deleteHandler] = mockRouter.delete.mock.calls[0]; + + await deleteHandler(mockContext, mockRequest, mockResponse); + + expect(mockContext.search!.deleteSession).toHaveBeenCalledWith(id); + }); + it('extend calls extendSession with id', async () => { const id = 'd7170a35-7e2c-48d6-8dec-9a056721b489'; const expires = new Date().toISOString(); @@ -121,7 +143,7 @@ describe('registerSessionRoutes', () => { const mockResponse = httpServerMock.createResponseFactory(); const mockRouter = mockCoreSetup.http.createRouter.mock.results[0].value; - const [, , [, extendHandler]] = mockRouter.post.mock.calls; + const [, extendHandler] = mockRouter.post.mock.calls[PostHandlerIndex.EXTEND]; extendHandler(mockContext, mockRequest, mockResponse); diff --git a/x-pack/plugins/data_enhanced/server/routes/session.ts b/x-pack/plugins/data_enhanced/server/routes/session.ts index 0b953f8201ece..80388a84d98f8 100644 --- a/x-pack/plugins/data_enhanced/server/routes/session.ts +++ b/x-pack/plugins/data_enhanced/server/routes/session.ts @@ -129,6 +129,29 @@ export function registerSessionRoutes(router: DataEnhancedPluginRouter, logger: }), }, }, + async (context, request, res) => { + const { id } = request.params; + try { + await context.search!.deleteSession(id); + + return res.ok(); + } catch (e) { + const err = e.output?.payload || e; + logger.error(err); + return reportServerError(res, err); + } + } + ); + + router.post( + { + path: '/internal/session/{id}/cancel', + validate: { + params: schema.object({ + id: schema.string(), + }), + }, + }, async (context, request, res) => { const { id } = request.params; try { diff --git a/x-pack/plugins/data_enhanced/server/search/session/session_service.ts b/x-pack/plugins/data_enhanced/server/search/session/session_service.ts index 9d8a730004e1b..059edd5edf1de 100644 --- a/x-pack/plugins/data_enhanced/server/search/session/session_service.ts +++ b/x-pack/plugins/data_enhanced/server/search/session/session_service.ts @@ -226,6 +226,11 @@ export class SearchSessionService }); }; + // TODO: Throw an error if this session doesn't belong to this user + public delete = ({ savedObjectsClient }: SearchSessionDependencies, sessionId: string) => { + return savedObjectsClient.delete(SEARCH_SESSION_TYPE, sessionId); + }; + /** * Tracks the given search request/search ID in the saved session. * @internal @@ -308,6 +313,7 @@ export class SearchSessionService update: this.update.bind(this, deps), extend: this.extend.bind(this, deps), cancel: this.cancel.bind(this, deps), + delete: this.delete.bind(this, deps), }; }; }; diff --git a/x-pack/test/api_integration/apis/search/session.ts b/x-pack/test/api_integration/apis/search/session.ts index 28b63788a8cfb..984f3e3f7dd4e 100644 --- a/x-pack/test/api_integration/apis/search/session.ts +++ b/x-pack/test/api_integration/apis/search/session.ts @@ -45,11 +45,11 @@ export default function ({ getService }: FtrProviderContext) { await supertest.get(`/internal/session/${sessionId}`).set('kbn-xsrf', 'foo').expect(200); }); - it('should fail to cancel an unknown session', async () => { + it('should fail to delete an unknown session', async () => { await supertest.delete(`/internal/session/123`).set('kbn-xsrf', 'foo').expect(404); }); - it('should create and cancel a session', async () => { + it('should create and delete a session', async () => { const sessionId = `my-session-${Math.random()}`; await supertest .post(`/internal/session`) @@ -65,6 +65,28 @@ export default function ({ getService }: FtrProviderContext) { await supertest.delete(`/internal/session/${sessionId}`).set('kbn-xsrf', 'foo').expect(200); + await supertest.get(`/internal/session/${sessionId}`).set('kbn-xsrf', 'foo').expect(404); + }); + + it('should create and cancel a session', async () => { + const sessionId = `my-session-${Math.random()}`; + await supertest + .post(`/internal/session`) + .set('kbn-xsrf', 'foo') + .send({ + sessionId, + name: 'My Session', + appId: 'discover', + expires: '123', + urlGeneratorId: 'discover', + }) + .expect(200); + + await supertest + .post(`/internal/session/${sessionId}/cancel`) + .set('kbn-xsrf', 'foo') + .expect(200); + const resp = await supertest .get(`/internal/session/${sessionId}`) .set('kbn-xsrf', 'foo') diff --git a/x-pack/test/functional/page_objects/search_sessions_management_page.ts b/x-pack/test/functional/page_objects/search_sessions_management_page.ts index a5ffa914eac22..df4e99dd595d9 100644 --- a/x-pack/test/functional/page_objects/search_sessions_management_page.ts +++ b/x-pack/test/functional/page_objects/search_sessions_management_page.ts @@ -49,11 +49,11 @@ export function SearchSessionsPageProvider({ getService, getPageObjects }: FtrPr '[data-test-subj="sessionManagementPopoverAction-reload"]' ); }, - cancel: async () => { - log.debug('management ui: cancel the session'); + delete: async () => { + log.debug('management ui: delete the session'); await actionsCell.click(); await find.clickByCssSelector( - '[data-test-subj="sessionManagementPopoverAction-cancel"]' + '[data-test-subj="sessionManagementPopoverAction-delete"]' ); await PageObjects.common.clickConfirmOnModal(); }, diff --git a/x-pack/test/send_search_to_background_integration/tests/apps/management/search_sessions/sessions_management.ts b/x-pack/test/send_search_to_background_integration/tests/apps/management/search_sessions/sessions_management.ts index 7e09c6b0fe05c..f925cfb78a8c6 100644 --- a/x-pack/test/send_search_to_background_integration/tests/apps/management/search_sessions/sessions_management.ts +++ b/x-pack/test/send_search_to_background_integration/tests/apps/management/search_sessions/sessions_management.ts @@ -88,15 +88,14 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { await searchSessions.expectState('completed'); }); - it('Cancels a session from management', async () => { + it('Deletes a session from management', async () => { await PageObjects.searchSessionsManagement.goTo(); const searchSessionList = await PageObjects.searchSessionsManagement.getList(); expect(searchSessionList.length).to.be(1); - await searchSessionList[0].cancel(); + await searchSessionList[0].delete(); - // TODO: update this once canceling doesn't delete the object! await retry.waitFor(`wait for list to be empty`, async function () { const s = await PageObjects.searchSessionsManagement.getList(); From c37b0e1474ba3dd7b8994048122e8dd8349b61e0 Mon Sep 17 00:00:00 2001 From: Maja Grubic Date: Thu, 4 Feb 2021 15:00:22 +0000 Subject: [PATCH 08/69] [Discover] Minor cleanup (#90260) --- .../embeddable/search_embeddable.ts | 4 +- .../_indexpattern_with_unmapped_fields.ts | 4 +- .../fixtures/es_archiver/data/data.json.gz | Bin 224 -> 0 bytes .../fixtures/es_archiver/data/mappings.json | 450 ------------------ 4 files changed, 4 insertions(+), 454 deletions(-) delete mode 100644 test/functional/fixtures/es_archiver/data/data.json.gz delete mode 100644 test/functional/fixtures/es_archiver/data/mappings.json diff --git a/src/plugins/discover/public/application/embeddable/search_embeddable.ts b/src/plugins/discover/public/application/embeddable/search_embeddable.ts index d04d482c7aade..658734aa46cb0 100644 --- a/src/plugins/discover/public/application/embeddable/search_embeddable.ts +++ b/src/plugins/discover/public/application/embeddable/search_embeddable.ts @@ -308,9 +308,9 @@ export class SearchEmbeddable ); if (useNewFieldsApi) { searchSource.removeField('fieldsFromSource'); - const fields: Record = { field: '*' }; + const fields: Record = { field: '*' }; if (pre712) { - fields.include_unmapped = true; + fields.include_unmapped = 'true'; } searchSource.setField('fields', [fields]); } else { diff --git a/test/functional/apps/discover/_indexpattern_with_unmapped_fields.ts b/test/functional/apps/discover/_indexpattern_with_unmapped_fields.ts index bad7afacc1245..0990b3fa29f70 100644 --- a/test/functional/apps/discover/_indexpattern_with_unmapped_fields.ts +++ b/test/functional/apps/discover/_indexpattern_with_unmapped_fields.ts @@ -22,8 +22,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { before(async () => { await esArchiver.loadIfNeeded('unmapped_fields'); - await kibanaServer.uiSettings.replace({ defaultIndex: 'test-index-unmapped-fields' }); - await kibanaServer.uiSettings.update({ + await kibanaServer.uiSettings.replace({ + defaultIndex: 'test-index-unmapped-fields', 'discover:searchFieldsFromSource': false, }); log.debug('discover'); diff --git a/test/functional/fixtures/es_archiver/data/data.json.gz b/test/functional/fixtures/es_archiver/data/data.json.gz deleted file mode 100644 index 629276ccd186e105046047b80791692dfb6588c2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 224 zcmV<603ZJ!iwFP!000026J?N13c@fDh4(#0$-0IlR%?0(U5N`tBsS9$)U>3HDAK!| zX#b##5axSt<_+@+!Vop@3Q!s%S!O8m;3@9blaDK0siar4Qs=5jH<)1Zvw1~JczF@u z)KzG4p}kU<)@0+1uXG?|JpB0)E~=x0RRBJ=x1gC diff --git a/test/functional/fixtures/es_archiver/data/mappings.json b/test/functional/fixtures/es_archiver/data/mappings.json deleted file mode 100644 index 256978162b981..0000000000000 --- a/test/functional/fixtures/es_archiver/data/mappings.json +++ /dev/null @@ -1,450 +0,0 @@ -{ - "type": "index", - "value": { - "aliases": { - ".kibana": { - } - }, - "index": ".kibana_1", - "mappings": { - "_meta": { - "migrationMappingPropertyHashes": { - "application_usage_daily": "43b8830d5d0df85a6823d290885fc9fd", - "application_usage_totals": "3d1b76c39bfb2cc8296b024d73854724", - "application_usage_transactional": "3d1b76c39bfb2cc8296b024d73854724", - "config": "c63748b75f39d0c54de12d12c1ccbc20", - "core-usage-stats": "3d1b76c39bfb2cc8296b024d73854724", - "coreMigrationVersion": "2f4316de49999235636386fe51dc06c1", - "dashboard": "40554caf09725935e2c02e02563a2d07", - "index-pattern": "45915a1ad866812242df474eb0479052", - "kql-telemetry": "d12a98a6f19a2d273696597547e064ee", - "legacy-url-alias": "3d1b76c39bfb2cc8296b024d73854724", - "migrationVersion": "4a1746014a75ade3a714e1db5763276f", - "namespace": "2f4316de49999235636386fe51dc06c1", - "namespaces": "2f4316de49999235636386fe51dc06c1", - "originId": "2f4316de49999235636386fe51dc06c1", - "query": "11aaeb7f5f7fa5bb43f25e18ce26e7d9", - "references": "7997cf5a56cc02bdc9c93361bde732b0", - "sample-data-telemetry": "7d3cfeb915303c9641c59681967ffeb4", - "search": "e5b843b43566421ffa75fb499271dc34", - "search-telemetry": "3d1b76c39bfb2cc8296b024d73854724", - "telemetry": "36a616f7026dfa617d6655df850fe16d", - "timelion-sheet": "9a2a2748877c7a7b582fef201ab1d4cf", - "type": "2f4316de49999235636386fe51dc06c1", - "ui-counter": "0d409297dc5ebe1e3a1da691c6ee32e3", - "ui-metric": "0d409297dc5ebe1e3a1da691c6ee32e3", - "updated_at": "00da57df13e94e9d98437d13ace4bfe0", - "url": "c7f66a0df8b1b52f17c28c4adb111105", - "visualization": "f819cf6636b75c9e76ba733a0c6ef355" - } - }, - "dynamic": "strict", - "properties": { - "application_usage_daily": { - "dynamic": "false", - "properties": { - "timestamp": { - "type": "date" - } - } - }, - "application_usage_totals": { - "dynamic": "false", - "type": "object" - }, - "application_usage_transactional": { - "dynamic": "false", - "type": "object" - }, - "config": { - "dynamic": "false", - "properties": { - "buildNum": { - "type": "keyword" - } - } - }, - "core-usage-stats": { - "dynamic": "false", - "type": "object" - }, - "coreMigrationVersion": { - "type": "keyword" - }, - "dashboard": { - "properties": { - "description": { - "type": "text" - }, - "hits": { - "doc_values": false, - "index": false, - "type": "integer" - }, - "kibanaSavedObjectMeta": { - "properties": { - "searchSourceJSON": { - "index": false, - "type": "text" - } - } - }, - "optionsJSON": { - "index": false, - "type": "text" - }, - "panelsJSON": { - "index": false, - "type": "text" - }, - "refreshInterval": { - "properties": { - "display": { - "doc_values": false, - "index": false, - "type": "keyword" - }, - "pause": { - "doc_values": false, - "index": false, - "type": "boolean" - }, - "section": { - "doc_values": false, - "index": false, - "type": "integer" - }, - "value": { - "doc_values": false, - "index": false, - "type": "integer" - } - } - }, - "timeFrom": { - "doc_values": false, - "index": false, - "type": "keyword" - }, - "timeRestore": { - "doc_values": false, - "index": false, - "type": "boolean" - }, - "timeTo": { - "doc_values": false, - "index": false, - "type": "keyword" - }, - "title": { - "type": "text" - }, - "version": { - "type": "integer" - } - } - }, - "index-pattern": { - "dynamic": "false", - "properties": { - "title": { - "type": "text" - }, - "type": { - "type": "keyword" - } - } - }, - "kql-telemetry": { - "properties": { - "optInCount": { - "type": "long" - }, - "optOutCount": { - "type": "long" - } - } - }, - "legacy-url-alias": { - "dynamic": "false", - "type": "object" - }, - "migrationVersion": { - "dynamic": "true", - "properties": { - "config": { - "fields": { - "keyword": { - "ignore_above": 256, - "type": "keyword" - } - }, - "type": "text" - } - } - }, - "namespace": { - "type": "keyword" - }, - "namespaces": { - "type": "keyword" - }, - "originId": { - "type": "keyword" - }, - "query": { - "properties": { - "description": { - "type": "text" - }, - "filters": { - "enabled": false, - "type": "object" - }, - "query": { - "properties": { - "language": { - "type": "keyword" - }, - "query": { - "index": false, - "type": "keyword" - } - } - }, - "timefilter": { - "enabled": false, - "type": "object" - }, - "title": { - "type": "text" - } - } - }, - "references": { - "properties": { - "id": { - "type": "keyword" - }, - "name": { - "type": "keyword" - }, - "type": { - "type": "keyword" - } - }, - "type": "nested" - }, - "sample-data-telemetry": { - "properties": { - "installCount": { - "type": "long" - }, - "unInstallCount": { - "type": "long" - } - } - }, - "search": { - "properties": { - "columns": { - "doc_values": false, - "index": false, - "type": "keyword" - }, - "description": { - "type": "text" - }, - "grid": { - "enabled": false, - "type": "object" - }, - "hits": { - "doc_values": false, - "index": false, - "type": "integer" - }, - "kibanaSavedObjectMeta": { - "properties": { - "searchSourceJSON": { - "index": false, - "type": "text" - } - } - }, - "pre712": { - "type": "boolean" - }, - "sort": { - "doc_values": false, - "index": false, - "type": "keyword" - }, - "title": { - "type": "text" - }, - "version": { - "type": "integer" - } - } - }, - "search-telemetry": { - "dynamic": "false", - "type": "object" - }, - "telemetry": { - "properties": { - "allowChangingOptInStatus": { - "type": "boolean" - }, - "enabled": { - "type": "boolean" - }, - "lastReported": { - "type": "date" - }, - "lastVersionChecked": { - "type": "keyword" - }, - "reportFailureCount": { - "type": "integer" - }, - "reportFailureVersion": { - "type": "keyword" - }, - "sendUsageFrom": { - "type": "keyword" - }, - "userHasSeenNotice": { - "type": "boolean" - } - } - }, - "timelion-sheet": { - "properties": { - "description": { - "type": "text" - }, - "hits": { - "type": "integer" - }, - "kibanaSavedObjectMeta": { - "properties": { - "searchSourceJSON": { - "type": "text" - } - } - }, - "timelion_chart_height": { - "type": "integer" - }, - "timelion_columns": { - "type": "integer" - }, - "timelion_interval": { - "type": "keyword" - }, - "timelion_other_interval": { - "type": "keyword" - }, - "timelion_rows": { - "type": "integer" - }, - "timelion_sheet": { - "type": "text" - }, - "title": { - "type": "text" - }, - "version": { - "type": "integer" - } - } - }, - "type": { - "type": "keyword" - }, - "ui-counter": { - "properties": { - "count": { - "type": "integer" - } - } - }, - "ui-metric": { - "properties": { - "count": { - "type": "integer" - } - } - }, - "updated_at": { - "type": "date" - }, - "url": { - "properties": { - "accessCount": { - "type": "long" - }, - "accessDate": { - "type": "date" - }, - "createDate": { - "type": "date" - }, - "url": { - "fields": { - "keyword": { - "ignore_above": 2048, - "type": "keyword" - } - }, - "type": "text" - } - } - }, - "visualization": { - "properties": { - "description": { - "type": "text" - }, - "kibanaSavedObjectMeta": { - "properties": { - "searchSourceJSON": { - "index": false, - "type": "text" - } - } - }, - "savedSearchRefName": { - "doc_values": false, - "index": false, - "type": "keyword" - }, - "title": { - "type": "text" - }, - "uiStateJSON": { - "index": false, - "type": "text" - }, - "version": { - "type": "integer" - }, - "visState": { - "index": false, - "type": "text" - } - } - } - } - }, - "settings": { - "index": { - "auto_expand_replicas": "0-1", - "number_of_replicas": "0", - "number_of_shards": "1" - } - } - } -} \ No newline at end of file From e0133892f6443ab7b5faceda9b868d0406ec16da Mon Sep 17 00:00:00 2001 From: Marshall Main <55718608+marshallmain@users.noreply.github.com> Date: Thu, 4 Feb 2021 10:20:16 -0500 Subject: [PATCH 09/69] [Security Solution][Detections] Reduce detection engine reliance on _source (#89371) * First pass at switching rules to depend on fields instead of _source * Fix tests * Change operator: excluded logic so missing fields are allowlisted Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> --- .../signals/__mocks__/es_results.ts | 11 +++++ .../signals/build_events_query.test.ts | 41 ++++++++++++++++--- .../signals/build_events_query.ts | 6 +++ .../bulk_create_threshold_signals.test.ts | 2 +- .../signals/bulk_create_threshold_signals.ts | 6 +-- .../create_field_and_set_tuples.test.ts | 8 ++-- .../create_set_to_filter_against.test.ts | 8 ++-- .../filters/create_set_to_filter_against.ts | 3 +- .../signals/filters/filter_events.test.ts | 10 ++--- .../signals/filters/filter_events.ts | 13 +++--- .../filter_events_against_list.test.ts | 16 ++++---- .../signals/find_threshold_signals.ts | 6 +++ .../signals/search_after_bulk_create.test.ts | 14 +++---- .../signals/single_bulk_create.test.ts | 14 +------ .../build_threat_mapping_filter.mock.ts | 11 +++++ .../build_threat_mapping_filter.test.ts | 18 ++++++-- .../build_threat_mapping_filter.ts | 9 ++-- .../signals/threat_mapping/get_threat_list.ts | 6 +++ .../detection_engine/signals/utils.test.ts | 25 +++++++---- .../server/lib/machine_learning/index.ts | 6 +++ 20 files changed, 162 insertions(+), 71 deletions(-) diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/__mocks__/es_results.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/__mocks__/es_results.ts index eb38c58d82ea1..6011c67376973 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/__mocks__/es_results.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/__mocks__/es_results.ts @@ -166,6 +166,12 @@ export const sampleDocWithSortId = ( ip: destIp ?? '127.0.0.1', }, }, + fields: { + someKey: ['someValue'], + '@timestamp': ['2020-04-20T21:27:45+0000'], + 'source.ip': ip ? (Array.isArray(ip) ? ip : [ip]) : ['127.0.0.1'], + 'destination.ip': destIp ? (Array.isArray(destIp) ? destIp : [destIp]) : ['127.0.0.1'], + }, sort: ['1234567891111'], }); @@ -185,6 +191,11 @@ export const sampleDocNoSortId = ( ip: ip ?? '127.0.0.1', }, }, + fields: { + someKey: ['someValue'], + '@timestamp': ['2020-04-20T21:27:45+0000'], + 'source.ip': [ip ?? '127.0.0.1'], + }, sort: [], }); diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_events_query.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_events_query.test.ts index dc8ed156d8dea..8597667f64657 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_events_query.test.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_events_query.test.ts @@ -56,7 +56,12 @@ describe('create_signals', () => { ], }, }, - + fields: [ + { + field: '*', + include_unmapped: true, + }, + ], sort: [ { '@timestamp': { @@ -115,7 +120,12 @@ describe('create_signals', () => { ], }, }, - + fields: [ + { + field: '*', + include_unmapped: true, + }, + ], sort: [ { '@timestamp': { @@ -175,7 +185,12 @@ describe('create_signals', () => { ], }, }, - + fields: [ + { + field: '*', + include_unmapped: true, + }, + ], sort: [ { '@timestamp': { @@ -236,7 +251,12 @@ describe('create_signals', () => { ], }, }, - + fields: [ + { + field: '*', + include_unmapped: true, + }, + ], sort: [ { '@timestamp': { @@ -296,7 +316,12 @@ describe('create_signals', () => { ], }, }, - + fields: [ + { + field: '*', + include_unmapped: true, + }, + ], sort: [ { '@timestamp': { @@ -358,6 +383,12 @@ describe('create_signals', () => { ], }, }, + fields: [ + { + field: '*', + include_unmapped: true, + }, + ], aggregations: { tags: { terms: { diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_events_query.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_events_query.ts index dde284ed3beab..f8fd4ed30d6ee 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_events_query.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_events_query.ts @@ -89,6 +89,12 @@ export const buildEventsSearchQuery = ({ ], }, }, + fields: [ + { + field: '*', + include_unmapped: true, + }, + ], ...(aggregations ? { aggregations } : {}), sort: [ { diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/bulk_create_threshold_signals.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/bulk_create_threshold_signals.test.ts index f3da37c198ac2..713178345361d 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/bulk_create_threshold_signals.test.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/bulk_create_threshold_signals.test.ts @@ -67,7 +67,7 @@ describe('transformThresholdResultsToEcs', () => { _id, _index: 'test', _source: { - '@timestamp': '2020-04-20T21:27:45+0000', + '@timestamp': ['2020-04-20T21:27:45+0000'], threshold_result: { count: 1, value: '127.0.0.1', diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/bulk_create_threshold_signals.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/bulk_create_threshold_signals.ts index e0494c2e92b1c..dd9e1e97a2b73 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/bulk_create_threshold_signals.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/bulk_create_threshold_signals.ts @@ -75,7 +75,7 @@ const getTransformedHits = ( } const source = { - '@timestamp': get(timestampOverride ?? '@timestamp', hit._source), + '@timestamp': get(timestampOverride ?? '@timestamp', hit.fields), threshold_result: { count: totalResults, value: ruleId, @@ -104,10 +104,10 @@ const getTransformedHits = ( } const source = { - '@timestamp': get(timestampOverride ?? '@timestamp', hit._source), + '@timestamp': get(timestampOverride ?? '@timestamp', hit.fields), threshold_result: { count: docCount, - value: get(threshold.field, hit._source), + value: key, }, }; diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/create_field_and_set_tuples.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/create_field_and_set_tuples.test.ts index 6f744de469d5c..aac0f47c28295 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/create_field_and_set_tuples.test.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/create_field_and_set_tuples.test.ts @@ -120,7 +120,7 @@ describe('filterEventsAgainstList', () => { exceptionItem, buildRuleMessage, }); - expect([...matchedSet]).toEqual([JSON.stringify('1.1.1.1')]); + expect([...matchedSet]).toEqual([JSON.stringify(['1.1.1.1'])]); }); test('it returns two matched sets as a JSON.stringify() set from the "events"', async () => { @@ -133,7 +133,7 @@ describe('filterEventsAgainstList', () => { exceptionItem, buildRuleMessage, }); - expect([...matchedSet]).toEqual([JSON.stringify('1.1.1.1'), JSON.stringify('2.2.2.2')]); + expect([...matchedSet]).toEqual([JSON.stringify(['1.1.1.1']), JSON.stringify(['2.2.2.2'])]); }); test('it returns an array as a set as a JSON.stringify() array from the "events"', async () => { @@ -282,7 +282,7 @@ describe('filterEventsAgainstList', () => { exceptionItem, buildRuleMessage, }); - expect([...matchedSet1]).toEqual([JSON.stringify('1.1.1.1'), JSON.stringify('2.2.2.2')]); - expect([...matchedSet2]).toEqual([JSON.stringify('3.3.3.3'), JSON.stringify('5.5.5.5')]); + expect([...matchedSet1]).toEqual([JSON.stringify(['1.1.1.1']), JSON.stringify(['2.2.2.2'])]); + expect([...matchedSet2]).toEqual([JSON.stringify(['3.3.3.3']), JSON.stringify(['5.5.5.5'])]); }); }); diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/create_set_to_filter_against.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/create_set_to_filter_against.test.ts index aff372dc5bf3b..aae4a7aae2b9e 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/create_set_to_filter_against.test.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/create_set_to_filter_against.test.ts @@ -62,9 +62,9 @@ describe('createSetToFilterAgainst', () => { expect(listClient.searchListItemByValues).toHaveBeenCalledWith({ listId: 'list-123', type: 'ip', - value: ['1.1.1.1'], + value: [['1.1.1.1']], }); - expect([...field]).toEqual([JSON.stringify('1.1.1.1')]); + expect([...field]).toEqual([JSON.stringify(['1.1.1.1'])]); }); test('it returns 2 fields if the list returns 2 items', async () => { @@ -81,9 +81,9 @@ describe('createSetToFilterAgainst', () => { expect(listClient.searchListItemByValues).toHaveBeenCalledWith({ listId: 'list-123', type: 'ip', - value: ['1.1.1.1', '2.2.2.2'], + value: [['1.1.1.1'], ['2.2.2.2']], }); - expect([...field]).toEqual([JSON.stringify('1.1.1.1'), JSON.stringify('2.2.2.2')]); + expect([...field]).toEqual([JSON.stringify(['1.1.1.1']), JSON.stringify(['2.2.2.2'])]); }); test('it returns 0 fields if the field does not match up to a valid field within the event', async () => { diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/create_set_to_filter_against.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/create_set_to_filter_against.ts index c9f98e1b1e4e3..d400cc901a3ed 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/create_set_to_filter_against.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/create_set_to_filter_against.ts @@ -5,7 +5,6 @@ * 2.0. */ -import { get } from 'lodash/fp'; import { CreateSetToFilterAgainstOptions } from './types'; /** @@ -31,7 +30,7 @@ export const createSetToFilterAgainst = async ({ buildRuleMessage, }: CreateSetToFilterAgainstOptions): Promise> => { const valuesFromSearchResultField = events.reduce((acc, searchResultItem) => { - const valueField = get(field, searchResultItem._source); + const valueField = searchResultItem.fields ? searchResultItem.fields[field] : undefined; if (valueField != null) { acc.add(valueField); } diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/filter_events.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/filter_events.test.ts index 092a684756ea3..eb5c69e8abfe8 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/filter_events.test.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/filter_events.test.ts @@ -40,7 +40,7 @@ describe('filterEvents', () => { { field: 'source.ip', operator: 'included', - matchedSet: new Set([JSON.stringify('1.1.1.1')]), + matchedSet: new Set([JSON.stringify(['1.1.1.1'])]), }, ]; const field = filterEvents({ @@ -56,7 +56,7 @@ describe('filterEvents', () => { { field: 'source.ip', operator: 'excluded', - matchedSet: new Set([JSON.stringify('1.1.1.1')]), + matchedSet: new Set([JSON.stringify(['1.1.1.1'])]), }, ]; const field = filterEvents({ @@ -72,7 +72,7 @@ describe('filterEvents', () => { { field: 'madeup.nonexistent', // field does not exist operator: 'included', - matchedSet: new Set([JSON.stringify('1.1.1.1')]), + matchedSet: new Set([JSON.stringify(['1.1.1.1'])]), }, ]; const field = filterEvents({ @@ -88,12 +88,12 @@ describe('filterEvents', () => { { field: 'source.ip', operator: 'included', - matchedSet: new Set([JSON.stringify('1.1.1.1')]), + matchedSet: new Set([JSON.stringify(['1.1.1.1'])]), }, { field: 'source.ip', operator: 'excluded', - matchedSet: new Set([JSON.stringify('1.1.1.1')]), + matchedSet: new Set([JSON.stringify(['1.1.1.1'])]), }, ]; diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/filter_events.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/filter_events.ts index 316ef5eb74f41..421ed91278f4c 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/filter_events.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/filter_events.ts @@ -5,7 +5,6 @@ * 2.0. */ -import { get } from 'lodash/fp'; import { SearchResponse } from '../../../types'; import { FilterEventsOptions } from './types'; @@ -22,13 +21,17 @@ export const filterEvents = ({ return events.filter((item) => { return fieldAndSetTuples .map((tuple) => { - const eventItem = get(tuple.field, item._source); - if (eventItem == null) { - return true; - } else if (tuple.operator === 'included') { + const eventItem = item.fields ? item.fields[tuple.field] : undefined; + if (tuple.operator === 'included') { + if (eventItem == null) { + return true; + } // only create a signal if the event is not in the value list return !tuple.matchedSet.has(JSON.stringify(eventItem)); } else if (tuple.operator === 'excluded') { + if (eventItem == null) { + return false; + } // only create a signal if the event is in the value list return tuple.matchedSet.has(JSON.stringify(eventItem)); } else { diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/filter_events_against_list.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/filter_events_against_list.test.ts index c1ba8eabf7110..5b2f3426cd8aa 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/filter_events_against_list.test.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/filter_events_against_list.test.ts @@ -162,12 +162,12 @@ describe('filterEventsAgainstList', () => { // this call represents an exception list with a value list containing ['2.2.2.2', '4.4.4.4'] (listClient.searchListItemByValues as jest.Mock).mockResolvedValueOnce([ - { ...getSearchListItemResponseMock(), value: '2.2.2.2' }, - { ...getSearchListItemResponseMock(), value: '4.4.4.4' }, + { ...getSearchListItemResponseMock(), value: ['2.2.2.2'] }, + { ...getSearchListItemResponseMock(), value: ['4.4.4.4'] }, ]); // this call represents an exception list with a value list containing ['6.6.6.6'] (listClient.searchListItemByValues as jest.Mock).mockResolvedValueOnce([ - { ...getSearchListItemResponseMock(), value: '6.6.6.6' }, + { ...getSearchListItemResponseMock(), value: ['6.6.6.6'] }, ]); const res = await filterEventsAgainstList({ @@ -224,11 +224,11 @@ describe('filterEventsAgainstList', () => { // this call represents an exception list with a value list containing ['2.2.2.2', '4.4.4.4'] (listClient.searchListItemByValues as jest.Mock).mockResolvedValueOnce([ - { ...getSearchListItemResponseMock(), value: '2.2.2.2' }, + { ...getSearchListItemResponseMock(), value: ['2.2.2.2'] }, ]); // this call represents an exception list with a value list containing ['6.6.6.6'] (listClient.searchListItemByValues as jest.Mock).mockResolvedValueOnce([ - { ...getSearchListItemResponseMock(), value: '6.6.6.6' }, + { ...getSearchListItemResponseMock(), value: ['6.6.6.6'] }, ]); const res = await filterEventsAgainstList({ @@ -283,11 +283,11 @@ describe('filterEventsAgainstList', () => { // this call represents an exception list with a value list containing ['2.2.2.2'] (listClient.searchListItemByValues as jest.Mock).mockResolvedValueOnce([ - { ...getSearchListItemResponseMock(), value: '2.2.2.2' }, + { ...getSearchListItemResponseMock(), value: ['2.2.2.2'] }, ]); // this call represents an exception list with a value list containing ['4.4.4.4'] (listClient.searchListItemByValues as jest.Mock).mockResolvedValueOnce([ - { ...getSearchListItemResponseMock(), value: '4.4.4.4' }, + { ...getSearchListItemResponseMock(), value: ['4.4.4.4'] }, ]); const res = await filterEventsAgainstList({ @@ -365,7 +365,7 @@ describe('filterEventsAgainstList', () => { // this call represents an exception list with a value list containing ['2.2.2.2', '4.4.4.4'] (listClient.searchListItemByValues as jest.Mock).mockResolvedValue([ - { ...getSearchListItemResponseMock(), value: '2.2.2.2' }, + { ...getSearchListItemResponseMock(), value: ['2.2.2.2'] }, ]); const res = await filterEventsAgainstList({ diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/find_threshold_signals.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/find_threshold_signals.ts index 7d32ac6873eb2..6144f1f4b3823 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/find_threshold_signals.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/find_threshold_signals.ts @@ -69,6 +69,12 @@ export const findThresholdSignals = async ({ }, }, ], + fields: [ + { + field: '*', + include_unmapped: true, + }, + ], size: 1, }, }, diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/search_after_bulk_create.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/search_after_bulk_create.test.ts index 418d30711169e..b506a2463a311 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/search_after_bulk_create.test.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/search_after_bulk_create.test.ts @@ -310,9 +310,9 @@ describe('searchAfterAndBulkCreate', () => { test('should return success when all search results are in the allowlist and with sortId present', async () => { const searchListItems: SearchListItemArraySchema = [ - { ...getSearchListItemResponseMock(), value: '1.1.1.1' }, - { ...getSearchListItemResponseMock(), value: '2.2.2.2' }, - { ...getSearchListItemResponseMock(), value: '3.3.3.3' }, + { ...getSearchListItemResponseMock(), value: ['1.1.1.1'] }, + { ...getSearchListItemResponseMock(), value: ['2.2.2.2'] }, + { ...getSearchListItemResponseMock(), value: ['3.3.3.3'] }, ]; listClient.searchListItemByValues = jest.fn().mockResolvedValue(searchListItems); const sampleParams = sampleRuleAlertParams(30); @@ -374,10 +374,10 @@ describe('searchAfterAndBulkCreate', () => { test('should return success when all search results are in the allowlist and no sortId present', async () => { const searchListItems: SearchListItemArraySchema = [ - { ...getSearchListItemResponseMock(), value: '1.1.1.1' }, - { ...getSearchListItemResponseMock(), value: '2.2.2.2' }, - { ...getSearchListItemResponseMock(), value: '2.2.2.2' }, - { ...getSearchListItemResponseMock(), value: '2.2.2.2' }, + { ...getSearchListItemResponseMock(), value: ['1.1.1.1'] }, + { ...getSearchListItemResponseMock(), value: ['2.2.2.2'] }, + { ...getSearchListItemResponseMock(), value: ['2.2.2.2'] }, + { ...getSearchListItemResponseMock(), value: ['2.2.2.2'] }, ]; listClient.searchListItemByValues = jest.fn().mockResolvedValue(searchListItems); diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/single_bulk_create.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/single_bulk_create.test.ts index 942db1e3b1aaa..19aba907f0c84 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/single_bulk_create.test.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/single_bulk_create.test.ts @@ -316,19 +316,9 @@ describe('singleBulkCreate', () => { }); test('filter duplicate rules will return back search responses if they do not have a signal and will NOT filter the source out', () => { - const ancestors = sampleDocWithAncestors(); - ancestors.hits.hits[0]._source = { '@timestamp': '2020-04-20T21:27:45+0000' }; + const ancestors = sampleDocSearchResultsNoSortId(); const filtered = filterDuplicateRules('04128c15-0d1b-4716-a4c5-46997ac7f3bd', ancestors); - expect(filtered).toEqual([ - { - _index: 'myFakeSignalIndex', - _type: 'doc', - _score: 100, - _version: 1, - _id: 'e1e08ddc-5e37-49ff-a258-5393aa44435a', - _source: { '@timestamp': '2020-04-20T21:27:45+0000' }, - }, - ]); + expect(filtered).toEqual(ancestors.hits.hits); }); test('filter duplicate rules does not attempt filters when the signal is not an event type of signal but rather a "clash" from the source index having its own numeric signal type', () => { diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/build_threat_mapping_filter.mock.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/build_threat_mapping_filter.mock.ts index a88d9061f7a1f..12865e4dd47a9 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/build_threat_mapping_filter.mock.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/build_threat_mapping_filter.mock.ts @@ -81,6 +81,7 @@ export const getThreatListSearchResponseMock = (): SearchResponse ({ }, }); +export const getThreatListItemFieldsMock = () => ({ + '@timestamp': ['2020-09-09T21:59:13Z'], + 'host.name': ['host-1'], + 'host.ip': ['192.168.0.0.1'], + 'source.ip': ['127.0.0.1'], + 'source.port': [1], + 'destination.ip': ['127.0.0.1'], + 'destination.port': [1], +}); + export const getFilterThreatMapping = (): ThreatMapping => [ { entries: [ diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/build_threat_mapping_filter.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/build_threat_mapping_filter.test.ts index 792fa889e395d..7a9c4b43b8f7a 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/build_threat_mapping_filter.test.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/build_threat_mapping_filter.test.ts @@ -133,10 +133,16 @@ describe('build_threat_mapping_filter', () => { }, ], threatListItem: { - '@timestamp': '2020-09-09T21:59:13Z', - host: { - name: 'host-1', - // since ip is missing this entire AND clause should be dropped + _source: { + '@timestamp': '2020-09-09T21:59:13Z', + host: { + name: 'host-1', + // since ip is missing this entire AND clause should be dropped + }, + }, + fields: { + '@timestamp': ['2020-09-09T21:59:13Z'], + 'host.name': ['host-1'], }, }, }); @@ -177,6 +183,10 @@ describe('build_threat_mapping_filter', () => { name: 'host-1', }, }, + fields: { + '@timestamp': ['2020-09-09T21:59:13Z'], + 'host.name': ['host-1'], + }, }, }); expect(item).toEqual([ diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/build_threat_mapping_filter.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/build_threat_mapping_filter.ts index 180895877bdd2..cab01a602b8a9 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/build_threat_mapping_filter.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/build_threat_mapping_filter.ts @@ -55,7 +55,8 @@ export const filterThreatMapping = ({ threatMapping .map((threatMap) => { const atLeastOneItemMissingInThreatList = threatMap.entries.some((entry) => { - return get(entry.value, threatListItem._source) == null; + const itemValue = get(entry.value, threatListItem.fields); + return itemValue == null || itemValue.length !== 1; }); if (atLeastOneItemMissingInThreatList) { return { ...threatMap, entries: [] }; @@ -70,15 +71,15 @@ export const createInnerAndClauses = ({ threatListItem, }: CreateInnerAndClausesOptions): BooleanFilter[] => { return threatMappingEntries.reduce((accum, threatMappingEntry) => { - const value = get(threatMappingEntry.value, threatListItem._source); - if (value != null) { + const value = get(threatMappingEntry.value, threatListItem.fields); + if (value != null && value.length === 1) { // These values could be potentially 10k+ large so mutating the array intentionally accum.push({ bool: { should: [ { match: { - [threatMappingEntry.field]: value, + [threatMappingEntry.field]: value[0], }, }, ], diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/get_threat_list.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/get_threat_list.ts index c646fee81f1b1..92d4e5cf8a93b 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/get_threat_list.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/get_threat_list.ts @@ -55,6 +55,12 @@ export const getThreatList = async ({ const response: SearchResponse = await callCluster('search', { body: { query: queryFilter, + fields: [ + { + field: '*', + include_unmapped: true, + }, + ], search_after: searchAfter, sort: getSortWithTieBreaker({ sortField, diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/utils.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/utils.test.ts index 5444f08474053..75bd9f593a6ac 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/utils.test.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/utils.test.ts @@ -1166,6 +1166,9 @@ describe('utils', () => { test('It will not set an invalid date time stamp from a non-existent @timestamp when the index is not 100% ECS compliant', () => { const searchResult = sampleDocSearchResultsNoSortId(); (searchResult.hits.hits[0]._source['@timestamp'] as unknown) = undefined; + if (searchResult.hits.hits[0].fields != null) { + (searchResult.hits.hits[0].fields['@timestamp'] as unknown) = undefined; + } const { lastLookBackDate } = createSearchAfterReturnTypeFromResponse({ searchResult, timestampOverride: undefined, @@ -1176,6 +1179,9 @@ describe('utils', () => { test('It will not set an invalid date time stamp from a null @timestamp when the index is not 100% ECS compliant', () => { const searchResult = sampleDocSearchResultsNoSortId(); (searchResult.hits.hits[0]._source['@timestamp'] as unknown) = null; + if (searchResult.hits.hits[0].fields != null) { + (searchResult.hits.hits[0].fields['@timestamp'] as unknown) = null; + } const { lastLookBackDate } = createSearchAfterReturnTypeFromResponse({ searchResult, timestampOverride: undefined, @@ -1186,6 +1192,9 @@ describe('utils', () => { test('It will not set an invalid date time stamp from an invalid @timestamp string', () => { const searchResult = sampleDocSearchResultsNoSortId(); (searchResult.hits.hits[0]._source['@timestamp'] as unknown) = 'invalid'; + if (searchResult.hits.hits[0].fields != null) { + (searchResult.hits.hits[0].fields['@timestamp'] as unknown) = ['invalid']; + } const { lastLookBackDate } = createSearchAfterReturnTypeFromResponse({ searchResult, timestampOverride: undefined, @@ -1198,6 +1207,9 @@ describe('utils', () => { test('It returns undefined if the search result contains a null timestamp', () => { const searchResult = sampleDocSearchResultsNoSortId(); (searchResult.hits.hits[0]._source['@timestamp'] as unknown) = null; + if (searchResult.hits.hits[0].fields != null) { + (searchResult.hits.hits[0].fields['@timestamp'] as unknown) = null; + } const date = lastValidDate({ searchResult, timestampOverride: undefined }); expect(date).toEqual(undefined); }); @@ -1205,6 +1217,9 @@ describe('utils', () => { test('It returns undefined if the search result contains a undefined timestamp', () => { const searchResult = sampleDocSearchResultsNoSortId(); (searchResult.hits.hits[0]._source['@timestamp'] as unknown) = undefined; + if (searchResult.hits.hits[0].fields != null) { + (searchResult.hits.hits[0].fields['@timestamp'] as unknown) = undefined; + } const date = lastValidDate({ searchResult, timestampOverride: undefined }); expect(date).toEqual(undefined); }); @@ -1212,13 +1227,9 @@ describe('utils', () => { test('It returns undefined if the search result contains an invalid string value', () => { const searchResult = sampleDocSearchResultsNoSortId(); (searchResult.hits.hits[0]._source['@timestamp'] as unknown) = 'invalid value'; - const date = lastValidDate({ searchResult, timestampOverride: undefined }); - expect(date).toEqual(undefined); - }); - - test('It returns correct date time stamp if the search result contains an invalid string value', () => { - const searchResult = sampleDocSearchResultsNoSortId(); - (searchResult.hits.hits[0]._source['@timestamp'] as unknown) = 'invalid value'; + if (searchResult.hits.hits[0].fields != null) { + (searchResult.hits.hits[0].fields['@timestamp'] as unknown) = ['invalid value']; + } const date = lastValidDate({ searchResult, timestampOverride: undefined }); expect(date).toEqual(undefined); }); diff --git a/x-pack/plugins/security_solution/server/lib/machine_learning/index.ts b/x-pack/plugins/security_solution/server/lib/machine_learning/index.ts index a6f4c2086e47b..962c44174d891 100644 --- a/x-pack/plugins/security_solution/server/lib/machine_learning/index.ts +++ b/x-pack/plugins/security_solution/server/lib/machine_learning/index.ts @@ -60,6 +60,12 @@ export const getAnomalies = async ( })?.query, }, }, + fields: [ + { + field: '*', + include_unmapped: true, + }, + ], sort: [{ record_score: { order: 'desc' } }], }, }, From 1741cef4ae79566d61b75ee07f0e5af16818b125 Mon Sep 17 00:00:00 2001 From: Joe Reuter Date: Thu, 4 Feb 2021 16:22:09 +0100 Subject: [PATCH 10/69] [Lens] Hide column in table (#88680) --- .../__snapshots__/table_basic.test.tsx.snap | 54 +++++ .../components/columns.tsx | 23 +- .../components/constants.ts | 1 + .../components/dimension_editor.tsx | 61 ++++++ .../components/table_actions.test.ts | 51 +++-- .../components/table_actions.ts | 56 +++-- .../components/table_basic.test.tsx | 65 ++++-- .../components/table_basic.tsx | 68 ++++-- .../components/types.ts | 21 +- .../expression.test.tsx | 22 +- .../datatable_visualization/expression.tsx | 89 +++----- .../public/datatable_visualization/index.ts | 6 +- .../visualization.test.tsx | 206 +++++++----------- .../datatable_visualization/visualization.tsx | 197 +++++++++-------- .../config_panel/color_indicator.tsx | 10 + x-pack/plugins/lens/public/index.ts | 5 +- .../shared_components/toolbar_popover.tsx | 1 + x-pack/plugins/lens/public/types.ts | 5 +- x-pack/plugins/lens/server/migrations.test.ts | 73 +++++++ x-pack/plugins/lens/server/migrations.ts | 54 +++++ x-pack/test/functional/apps/lens/index.ts | 1 + x-pack/test/functional/apps/lens/table.ts | 69 ++++++ .../test/functional/page_objects/lens_page.ts | 9 + 23 files changed, 762 insertions(+), 385 deletions(-) create mode 100644 x-pack/plugins/lens/public/datatable_visualization/components/dimension_editor.tsx create mode 100644 x-pack/test/functional/apps/lens/table.ts diff --git a/x-pack/plugins/lens/public/datatable_visualization/components/__snapshots__/table_basic.test.tsx.snap b/x-pack/plugins/lens/public/datatable_visualization/components/__snapshots__/table_basic.test.tsx.snap index a4eb99a972b9b..d69af298018e7 100644 --- a/x-pack/plugins/lens/public/datatable_visualization/components/__snapshots__/table_basic.test.tsx.snap +++ b/x-pack/plugins/lens/public/datatable_visualization/components/__snapshots__/table_basic.test.tsx.snap @@ -93,6 +93,15 @@ exports[`DatatableComponent it renders actions column when there are row actions "onClick": [Function], "size": "xs", }, + Object { + "color": "text", + "data-test-subj": "lensDatatableHide", + "iconType": "eyeClosed", + "isDisabled": false, + "label": "Hide", + "onClick": [Function], + "size": "xs", + }, ], "showHide": false, "showMoveLeft": false, @@ -121,6 +130,15 @@ exports[`DatatableComponent it renders actions column when there are row actions "onClick": [Function], "size": "xs", }, + Object { + "color": "text", + "data-test-subj": "lensDatatableHide", + "iconType": "eyeClosed", + "isDisabled": false, + "label": "Hide", + "onClick": [Function], + "size": "xs", + }, ], "showHide": false, "showMoveLeft": false, @@ -149,6 +167,15 @@ exports[`DatatableComponent it renders actions column when there are row actions "onClick": [Function], "size": "xs", }, + Object { + "color": "text", + "data-test-subj": "lensDatatableHide", + "iconType": "eyeClosed", + "isDisabled": false, + "label": "Hide", + "onClick": [Function], + "size": "xs", + }, ], "showHide": false, "showMoveLeft": false, @@ -288,6 +315,15 @@ exports[`DatatableComponent it renders the title and value 1`] = ` "onClick": [Function], "size": "xs", }, + Object { + "color": "text", + "data-test-subj": "lensDatatableHide", + "iconType": "eyeClosed", + "isDisabled": false, + "label": "Hide", + "onClick": [Function], + "size": "xs", + }, ], "showHide": false, "showMoveLeft": false, @@ -316,6 +352,15 @@ exports[`DatatableComponent it renders the title and value 1`] = ` "onClick": [Function], "size": "xs", }, + Object { + "color": "text", + "data-test-subj": "lensDatatableHide", + "iconType": "eyeClosed", + "isDisabled": false, + "label": "Hide", + "onClick": [Function], + "size": "xs", + }, ], "showHide": false, "showMoveLeft": false, @@ -344,6 +389,15 @@ exports[`DatatableComponent it renders the title and value 1`] = ` "onClick": [Function], "size": "xs", }, + Object { + "color": "text", + "data-test-subj": "lensDatatableHide", + "iconType": "eyeClosed", + "isDisabled": false, + "label": "Hide", + "onClick": [Function], + "size": "xs", + }, ], "showHide": false, "showMoveLeft": false, diff --git a/x-pack/plugins/lens/public/datatable_visualization/components/columns.tsx b/x-pack/plugins/lens/public/datatable_visualization/components/columns.tsx index 366e002f50cd8..5ff1e84276ba7 100644 --- a/x-pack/plugins/lens/public/datatable_visualization/components/columns.tsx +++ b/x-pack/plugins/lens/public/datatable_visualization/components/columns.tsx @@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n'; import { EuiDataGridColumn, EuiDataGridColumnCellActionProps } from '@elastic/eui'; import type { Datatable, DatatableColumnMeta } from 'src/plugins/expressions'; import type { FormatFactory } from '../../types'; -import type { DatatableColumns } from './types'; +import { ColumnConfig } from './table_basic'; export const createGridColumns = ( bucketColumns: string[], @@ -23,10 +23,11 @@ export const createGridColumns = ( negate?: boolean ) => void, isReadOnly: boolean, - columnConfig: DatatableColumns & { type: 'lens_datatable_columns' }, + columnConfig: ColumnConfig, visibleColumns: string[], formatFactory: FormatFactory, - onColumnResize: (eventData: { columnId: string; width: number | undefined }) => void + onColumnResize: (eventData: { columnId: string; width: number | undefined }) => void, + onColumnHide: (eventData: { columnId: string }) => void ) => { const columnsReverseLookup = table.columns.reduce< Record @@ -134,8 +135,9 @@ export const createGridColumns = ( ] : undefined; - const initialWidth = columnConfig.columnWidth?.find(({ columnId }) => columnId === field) - ?.width; + const column = columnConfig.columns.find(({ columnId }) => columnId === field); + const initialWidth = column?.width; + const isHidden = column?.hidden; const columnDefinition: EuiDataGridColumn = { id: field, @@ -174,6 +176,17 @@ export const createGridColumns = ( 'data-test-subj': 'lensDatatableResetWidth', isDisabled: initialWidth == null, }, + { + color: 'text', + size: 'xs', + onClick: () => onColumnHide({ columnId: field }), + iconType: 'eyeClosed', + label: i18n.translate('xpack.lens.table.hide.hideLabel', { + defaultMessage: 'Hide', + }), + 'data-test-subj': 'lensDatatableHide', + isDisabled: !isHidden && visibleColumns.length <= 1, + }, ], }, }; diff --git a/x-pack/plugins/lens/public/datatable_visualization/components/constants.ts b/x-pack/plugins/lens/public/datatable_visualization/components/constants.ts index db72f8a4e4a92..84ee4f0e8a18e 100644 --- a/x-pack/plugins/lens/public/datatable_visualization/components/constants.ts +++ b/x-pack/plugins/lens/public/datatable_visualization/components/constants.ts @@ -7,3 +7,4 @@ export const LENS_EDIT_SORT_ACTION = 'sort'; export const LENS_EDIT_RESIZE_ACTION = 'resize'; +export const LENS_TOGGLE_ACTION = 'toggle'; diff --git a/x-pack/plugins/lens/public/datatable_visualization/components/dimension_editor.tsx b/x-pack/plugins/lens/public/datatable_visualization/components/dimension_editor.tsx new file mode 100644 index 0000000000000..008b805bc8fed --- /dev/null +++ b/x-pack/plugins/lens/public/datatable_visualization/components/dimension_editor.tsx @@ -0,0 +1,61 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import React from 'react'; +import { i18n } from '@kbn/i18n'; +import { EuiSwitch, EuiFormRow } from '@elastic/eui'; +import { VisualizationDimensionEditorProps } from '../../types'; +import { DatatableVisualizationState } from '../visualization'; + +export function TableDimensionEditor( + props: VisualizationDimensionEditorProps +) { + const { state, setState, accessor } = props; + const column = state.columns.find((c) => c.columnId === accessor); + + const visibleColumnsCount = state.columns.filter((c) => !c.hidden).length; + + if (!column) { + return null; + } + + return ( + + ); +} diff --git a/x-pack/plugins/lens/public/datatable_visualization/components/table_actions.test.ts b/x-pack/plugins/lens/public/datatable_visualization/components/table_actions.test.ts index b0b7d46e4c3b7..68416ac9a60aa 100644 --- a/x-pack/plugins/lens/public/datatable_visualization/components/table_actions.test.ts +++ b/x-pack/plugins/lens/public/datatable_visualization/components/table_actions.test.ts @@ -14,17 +14,19 @@ import { createGridFilterHandler, createGridResizeHandler, createGridSortingConfig, + createGridHideHandler, } from './table_actions'; -import { DatatableColumns, LensGridDirection } from './types'; +import { LensGridDirection } from './types'; +import { ColumnConfig } from './table_basic'; -function getDefaultConfig(): DatatableColumns & { - type: 'lens_datatable_columns'; -} { +function getDefaultConfig(): ColumnConfig { return { - columnIds: [], - sortBy: '', - sortDirection: 'none', - type: 'lens_datatable_columns', + columns: [ + { columnId: 'a', type: 'lens_datatable_column' }, + { columnId: 'b', type: 'lens_datatable_column' }, + ], + sortingColumnId: '', + sortingDirection: 'none', }; } @@ -207,7 +209,13 @@ describe('Table actions', () => { expect(setColumnConfig).toHaveBeenCalledWith({ ...columnConfig, - columnWidth: [{ columnId: 'a', width: 100, type: 'lens_datatable_column_width' }], + columns: [ + { columnId: 'a', width: 100, type: 'lens_datatable_column' }, + { + columnId: 'b', + type: 'lens_datatable_column', + }, + ], }); expect(onEditAction).toHaveBeenCalledWith({ action: 'resize', columnId: 'a', width: 100 }); @@ -215,16 +223,14 @@ describe('Table actions', () => { it('should pull out the table custom width from the local state when passing undefined', () => { const columnConfig = getDefaultConfig(); - columnConfig.columnWidth = [ - { columnId: 'a', width: 100, type: 'lens_datatable_column_width' }, - ]; + columnConfig.columns = [{ columnId: 'a', width: 100, type: 'lens_datatable_column' }]; const resizer = createGridResizeHandler(columnConfig, setColumnConfig, onEditAction); resizer({ columnId: 'a', width: undefined }); expect(setColumnConfig).toHaveBeenCalledWith({ ...columnConfig, - columnWidth: [], + columns: [{ columnId: 'a', width: undefined, type: 'lens_datatable_column' }], }); expect(onEditAction).toHaveBeenCalledWith({ @@ -234,4 +240,23 @@ describe('Table actions', () => { }); }); }); + describe('Column hiding', () => { + const setColumnConfig = jest.fn(); + + it('should allow to hide column', () => { + const columnConfig = getDefaultConfig(); + const hiding = createGridHideHandler(columnConfig, setColumnConfig, onEditAction); + hiding({ columnId: 'a' }); + + expect(setColumnConfig).toHaveBeenCalledWith({ + ...columnConfig, + columns: [ + { columnId: 'a', hidden: true, type: 'lens_datatable_column' }, + { columnId: 'b', type: 'lens_datatable_column' }, + ], + }); + + expect(onEditAction).toHaveBeenCalledWith({ action: 'toggle', columnId: 'a' }); + }); + }); }); diff --git a/x-pack/plugins/lens/public/datatable_visualization/components/table_actions.ts b/x-pack/plugins/lens/public/datatable_visualization/components/table_actions.ts index ca4ec7f3a8d0c..4f0271b758ffb 100644 --- a/x-pack/plugins/lens/public/datatable_visualization/components/table_actions.ts +++ b/x-pack/plugins/lens/public/datatable_visualization/components/table_actions.ts @@ -9,43 +9,30 @@ import type { EuiDataGridSorting } from '@elastic/eui'; import type { Datatable } from 'src/plugins/expressions'; import type { LensFilterEvent } from '../../types'; import type { - DatatableColumns, LensGridDirection, LensResizeAction, LensSortAction, + LensToggleAction, } from './types'; +import { ColumnConfig } from './table_basic'; import { desanitizeFilterContext } from '../../utils'; export const createGridResizeHandler = ( - columnConfig: DatatableColumns & { - type: 'lens_datatable_columns'; - }, - setColumnConfig: React.Dispatch< - React.SetStateAction< - DatatableColumns & { - type: 'lens_datatable_columns'; - } - > - >, + columnConfig: ColumnConfig, + setColumnConfig: React.Dispatch>, onEditAction: (data: LensResizeAction['data']) => void ) => (eventData: { columnId: string; width: number | undefined }) => { // directly set the local state of the component to make sure the visualization re-renders immediately, // re-layouting and taking up all of the available space. setColumnConfig({ ...columnConfig, - columnWidth: [ - ...(columnConfig.columnWidth || []).filter(({ columnId }) => columnId !== eventData.columnId), - ...(eventData.width !== undefined - ? [ - { - columnId: eventData.columnId, - width: eventData.width, - type: 'lens_datatable_column_width' as const, - }, - ] - : []), - ], + columns: columnConfig.columns.map((column) => { + if (column.columnId === eventData.columnId) { + return { ...column, width: eventData.width }; + } + return column; + }), }); return onEditAction({ action: 'resize', @@ -54,6 +41,27 @@ export const createGridResizeHandler = ( }); }; +export const createGridHideHandler = ( + columnConfig: ColumnConfig, + setColumnConfig: React.Dispatch>, + onEditAction: (data: LensToggleAction['data']) => void +) => (eventData: { columnId: string }) => { + // directly set the local state of the component to make sure the visualization re-renders immediately + setColumnConfig({ + ...columnConfig, + columns: columnConfig.columns.map((column) => { + if (column.columnId === eventData.columnId) { + return { ...column, hidden: true }; + } + return column; + }), + }); + return onEditAction({ + action: 'toggle', + columnId: eventData.columnId, + }); +}; + export const createGridFilterHandler = ( tableRef: React.MutableRefObject, onClickValue: (data: LensFilterEvent['data']) => void @@ -85,7 +93,7 @@ export const createGridFilterHandler = ( }; export const createGridSortingConfig = ( - sortBy: string, + sortBy: string | undefined, sortDirection: LensGridDirection, onEditAction: (data: LensSortAction['data']) => void ): EuiDataGridSorting => ({ diff --git a/x-pack/plugins/lens/public/datatable_visualization/components/table_basic.test.tsx b/x-pack/plugins/lens/public/datatable_visualization/components/table_basic.test.tsx index 6935e8313afb0..50d040bc5c397 100644 --- a/x-pack/plugins/lens/public/datatable_visualization/components/table_basic.test.tsx +++ b/x-pack/plugins/lens/public/datatable_visualization/components/table_basic.test.tsx @@ -65,12 +65,13 @@ function sampleArgs() { const args: DatatableProps['args'] = { title: 'My fanci metric chart', - columns: { - columnIds: ['a', 'b', 'c'], - sortBy: '', - sortDirection: 'none', - type: 'lens_datatable_columns', - }, + columns: [ + { columnId: 'a', type: 'lens_datatable_column' }, + { columnId: 'b', type: 'lens_datatable_column' }, + { columnId: 'c', type: 'lens_datatable_column' }, + ], + sortingColumnId: '', + sortingDirection: 'none', }; return { data, args }; @@ -252,12 +253,12 @@ describe('DatatableComponent', () => { const args: DatatableProps['args'] = { title: '', - columns: { - columnIds: ['a', 'b'], - sortBy: '', - sortDirection: 'none', - type: 'lens_datatable_columns', - }, + columns: [ + { columnId: 'a', type: 'lens_datatable_column' }, + { columnId: 'b', type: 'lens_datatable_column' }, + ], + sortingColumnId: '', + sortingDirection: 'none', }; const wrapper = mountWithIntl( @@ -331,11 +332,8 @@ describe('DatatableComponent', () => { data={data} args={{ ...args, - columns: { - ...args.columns, - sortBy: 'b', - sortDirection: 'desc', - }, + sortingColumnId: 'b', + sortingDirection: 'desc', }} formatFactory={() => ({ convert: (x) => x } as IFieldFormat)} dispatchEvent={onDispatchEvent} @@ -382,11 +380,8 @@ describe('DatatableComponent', () => { data={data} args={{ ...args, - columns: { - ...args.columns, - sortBy: 'b', - sortDirection: 'desc', - }, + sortingColumnId: 'b', + sortingDirection: 'desc', }} formatFactory={() => ({ convert: (x) => x } as IFieldFormat)} dispatchEvent={onDispatchEvent} @@ -400,6 +395,32 @@ describe('DatatableComponent', () => { ]); }); + test('it does not render a hidden column', () => { + const { data, args } = sampleArgs(); + + const wrapper = mountWithIntl( + ({ convert: (x) => x } as IFieldFormat)} + dispatchEvent={onDispatchEvent} + getType={jest.fn()} + renderMode="display" + /> + ); + + expect(wrapper.find(EuiDataGrid).prop('columns')!.length).toEqual(2); + }); + test('it should refresh the table header when the datatable data changes', () => { const { data, args } = sampleArgs(); diff --git a/x-pack/plugins/lens/public/datatable_visualization/components/table_basic.tsx b/x-pack/plugins/lens/public/datatable_visualization/components/table_basic.tsx index b4852895a1e20..f685990f12dd2 100644 --- a/x-pack/plugins/lens/public/datatable_visualization/components/table_basic.tsx +++ b/x-pack/plugins/lens/public/datatable_visualization/components/table_basic.tsx @@ -22,17 +22,20 @@ import { FormatFactory, LensFilterEvent, LensTableRowContextMenuEvent } from '.. import { VisualizationContainer } from '../../visualization_container'; import { EmptyPlaceholder } from '../../shared_components'; import { LensIconChartDatatable } from '../../assets/chart_datatable'; +import { ColumnState } from '../visualization'; import { DataContextType, DatatableRenderProps, LensSortAction, LensResizeAction, LensGridDirection, + LensToggleAction, } from './types'; import { createGridColumns } from './columns'; import { createGridCell } from './cell_value'; import { createGridFilterHandler, + createGridHideHandler, createGridResizeHandler, createGridSortingConfig, } from './table_actions'; @@ -44,15 +47,33 @@ const gridStyle: EuiDataGridStyle = { header: 'underline', }; +export interface ColumnConfig { + columns: Array< + ColumnState & { + type: 'lens_datatable_column'; + } + >; + sortingColumnId: string | undefined; + sortingDirection: LensGridDirection; +} + export const DatatableComponent = (props: DatatableRenderProps) => { const [firstTable] = Object.values(props.data.tables); - const [columnConfig, setColumnConfig] = useState(props.args.columns); + const [columnConfig, setColumnConfig] = useState({ + columns: props.args.columns, + sortingColumnId: props.args.sortingColumnId, + sortingDirection: props.args.sortingDirection, + }); const [firstLocalTable, updateTable] = useState(firstTable); useDeepCompareEffect(() => { - setColumnConfig(props.args.columns); - }, [props.args.columns]); + setColumnConfig({ + columns: props.args.columns, + sortingColumnId: props.args.sortingColumnId, + sortingDirection: props.args.sortingDirection, + }); + }, [props.args.columns, props.args.sortingColumnId, props.args.sortingDirection]); useDeepCompareEffect(() => { updateTable(firstTable); @@ -85,7 +106,7 @@ export const DatatableComponent = (props: DatatableRenderProps) => { ); const onEditAction = useCallback( - (data: LensSortAction['data'] | LensResizeAction['data']) => { + (data: LensSortAction['data'] | LensResizeAction['data'] | LensToggleAction['data']) => { if (renderMode === 'edit') { dispatchEvent({ name: 'edit', data }); } @@ -106,13 +127,15 @@ export const DatatableComponent = (props: DatatableRenderProps) => { const bucketColumns = useMemo( () => - columnConfig.columnIds.filter((_colId, index) => { - const col = firstTableRef.current.columns[index]; - return ( - col?.meta?.sourceParams?.type && - getType(col.meta.sourceParams.type as string)?.type === 'buckets' - ); - }), + columnConfig.columns + .filter((_col, index) => { + const col = firstTableRef.current.columns[index]; + return ( + col?.meta?.sourceParams?.type && + getType(col.meta.sourceParams.type as string)?.type === 'buckets' + ); + }) + .map((col) => col.columnId), [firstTableRef, columnConfig, getType] ); @@ -121,11 +144,15 @@ export const DatatableComponent = (props: DatatableRenderProps) => { (bucketColumns.length && firstTable.rows.every((row) => bucketColumns.every((col) => row[col] == null))); - const visibleColumns = useMemo(() => columnConfig.columnIds.filter((field) => !!field), [ - columnConfig, - ]); + const visibleColumns = useMemo( + () => + columnConfig.columns + .filter((col) => !!col.columnId && !col.hidden) + .map((col) => col.columnId), + [columnConfig] + ); - const { sortBy, sortDirection } = columnConfig; + const { sortingColumnId: sortBy, sortingDirection: sortDirection } = props.args; const isReadOnlySorted = renderMode !== 'edit'; @@ -134,6 +161,11 @@ export const DatatableComponent = (props: DatatableRenderProps) => { [onEditAction, setColumnConfig, columnConfig] ); + const onColumnHide = useMemo( + () => createGridHideHandler(columnConfig, setColumnConfig, onEditAction), + [onEditAction, setColumnConfig, columnConfig] + ); + const columns: EuiDataGridColumn[] = useMemo( () => createGridColumns( @@ -144,7 +176,8 @@ export const DatatableComponent = (props: DatatableRenderProps) => { columnConfig, visibleColumns, formatFactory, - onColumnResize + onColumnResize, + onColumnHide ), [ bucketColumns, @@ -155,6 +188,7 @@ export const DatatableComponent = (props: DatatableRenderProps) => { visibleColumns, formatFactory, onColumnResize, + onColumnHide, ] ); @@ -184,7 +218,7 @@ export const DatatableComponent = (props: DatatableRenderProps) => { onRowContextMenuClick({ rowIndex, table: firstTableRef.current, - columns: columnConfig.columnIds, + columns: columnConfig.columns.map((col) => col.columnId), }); }} /> diff --git a/x-pack/plugins/lens/public/datatable_visualization/components/types.ts b/x-pack/plugins/lens/public/datatable_visualization/components/types.ts index e2cc1daf0f900..8a280b3d15bca 100644 --- a/x-pack/plugins/lens/public/datatable_visualization/components/types.ts +++ b/x-pack/plugins/lens/public/datatable_visualization/components/types.ts @@ -10,7 +10,7 @@ import type { IAggType } from 'src/plugins/data/public'; import type { Datatable, RenderMode } from 'src/plugins/expressions'; import type { FormatFactory, ILensInterpreterRenderHandlers, LensEditEvent } from '../../types'; import type { DatatableProps } from '../expression'; -import { LENS_EDIT_SORT_ACTION, LENS_EDIT_RESIZE_ACTION } from './constants'; +import { LENS_EDIT_SORT_ACTION, LENS_EDIT_RESIZE_ACTION, LENS_TOGGLE_ACTION } from './constants'; export type LensGridDirection = 'none' | Direction; @@ -24,24 +24,13 @@ export interface LensResizeActionData { width: number | undefined; } -export type LensSortAction = LensEditEvent; -export type LensResizeAction = LensEditEvent; - -export interface DatatableColumns { - columnIds: string[]; - sortBy: string; - sortDirection: string; - columnWidth?: DatatableColumnWidthResult[]; -} - -export interface DatatableColumnWidth { +export interface LensToggleActionData { columnId: string; - width: number; } -export type DatatableColumnWidthResult = DatatableColumnWidth & { - type: 'lens_datatable_column_width'; -}; +export type LensSortAction = LensEditEvent; +export type LensResizeAction = LensEditEvent; +export type LensToggleAction = LensEditEvent; export type DatatableRenderProps = DatatableProps & { formatFactory: FormatFactory; diff --git a/x-pack/plugins/lens/public/datatable_visualization/expression.test.tsx b/x-pack/plugins/lens/public/datatable_visualization/expression.test.tsx index 5e51cb2c93c7c..3ee41d4e9aeed 100644 --- a/x-pack/plugins/lens/public/datatable_visualization/expression.test.tsx +++ b/x-pack/plugins/lens/public/datatable_visualization/expression.test.tsx @@ -59,12 +59,22 @@ function sampleArgs() { const args: DatatableProps['args'] = { title: 'My fanci metric chart', - columns: { - columnIds: ['a', 'b', 'c'], - sortBy: '', - sortDirection: 'none', - type: 'lens_datatable_columns', - }, + columns: [ + { + columnId: 'a', + type: 'lens_datatable_column', + }, + { + columnId: 'b', + type: 'lens_datatable_column', + }, + { + columnId: 'c', + type: 'lens_datatable_column', + }, + ], + sortingColumnId: '', + sortingDirection: 'none', }; return { data, args }; diff --git a/x-pack/plugins/lens/public/datatable_visualization/expression.tsx b/x-pack/plugins/lens/public/datatable_visualization/expression.tsx index 82964a03e29e5..7ead7be67947c 100644 --- a/x-pack/plugins/lens/public/datatable_visualization/expression.tsx +++ b/x-pack/plugins/lens/public/datatable_visualization/expression.tsx @@ -19,19 +19,17 @@ import type { import { getSortingCriteria } from './sorting'; import { DatatableComponent } from './components/table_basic'; +import { ColumnState } from './visualization'; import type { FormatFactory, ILensInterpreterRenderHandlers, LensMultiTable } from '../types'; -import type { - DatatableRender, - DatatableColumns, - DatatableColumnWidth, - DatatableColumnWidthResult, -} from './components/types'; +import type { DatatableRender } from './components/types'; interface Args { title: string; description?: string; - columns: DatatableColumns & { type: 'lens_datatable_columns' }; + columns: Array; + sortingColumnId: string | undefined; + sortingDirection: 'asc' | 'desc' | 'none'; } export interface DatatableProps { @@ -66,7 +64,16 @@ export const getDatatable = ({ help: '', }, columns: { - types: ['lens_datatable_columns'], + types: ['lens_datatable_column'], + help: '', + multi: true, + }, + sortingColumnId: { + types: ['string'], + help: '', + }, + sortingDirection: { + types: ['string'], help: '', }, }, @@ -79,7 +86,7 @@ export const getDatatable = ({ firstTable.columns.forEach((column) => { formatters[column.id] = formatFactory(column.meta?.params); }); - const { sortBy, sortDirection } = args.columns; + const { sortingColumnId: sortBy, sortingDirection: sortDirection } = args; const columnsReverseLookup = firstTable.columns.reduce< Record @@ -116,65 +123,27 @@ export const getDatatable = ({ }, }); -type DatatableColumnsResult = DatatableColumns & { type: 'lens_datatable_columns' }; +type DatatableColumnResult = ColumnState & { type: 'lens_datatable_column' }; -export const datatableColumns: ExpressionFunctionDefinition< - 'lens_datatable_columns', +export const datatableColumn: ExpressionFunctionDefinition< + 'lens_datatable_column', null, - DatatableColumns, - DatatableColumnsResult + ColumnState, + DatatableColumnResult > = { - name: 'lens_datatable_columns', + name: 'lens_datatable_column', aliases: [], - type: 'lens_datatable_columns', + type: 'lens_datatable_column', help: '', inputTypes: ['null'], args: { - sortBy: { types: ['string'], help: '' }, - sortDirection: { types: ['string'], help: '' }, - columnIds: { - types: ['string'], - multi: true, - help: '', - }, - columnWidth: { - types: ['lens_datatable_column_width'], - multi: true, - help: '', - }, - }, - fn: function fn(input: unknown, args: DatatableColumns) { - return { - type: 'lens_datatable_columns', - ...args, - }; - }, -}; - -export const datatableColumnWidth: ExpressionFunctionDefinition< - 'lens_datatable_column_width', - null, - DatatableColumnWidth, - DatatableColumnWidthResult -> = { - name: 'lens_datatable_column_width', - aliases: [], - type: 'lens_datatable_column_width', - help: '', - inputTypes: ['null'], - args: { - columnId: { - types: ['string'], - help: '', - }, - width: { - types: ['number'], - help: '', - }, + columnId: { types: ['string'], help: '' }, + hidden: { types: ['boolean'], help: '' }, + width: { types: ['number'], help: '' }, }, - fn: function fn(input: unknown, args: DatatableColumnWidth) { + fn: function fn(input: unknown, args: ColumnState) { return { - type: 'lens_datatable_column_width', + type: 'lens_datatable_column', ...args, }; }, @@ -213,7 +182,7 @@ export const getDatatableRenderer = (dependencies: { data: { rowIndex, table, - columns: config.args.columns.columnIds, + columns: config.args.columns.map((column) => column.columnId), }, }); diff --git a/x-pack/plugins/lens/public/datatable_visualization/index.ts b/x-pack/plugins/lens/public/datatable_visualization/index.ts index 23e0a2b7918a4..f0939f6195229 100644 --- a/x-pack/plugins/lens/public/datatable_visualization/index.ts +++ b/x-pack/plugins/lens/public/datatable_visualization/index.ts @@ -29,15 +29,13 @@ export class DatatableVisualization { editorFrame.registerVisualization(async () => { const { getDatatable, - datatableColumns, - datatableColumnWidth, + datatableColumn, getDatatableRenderer, datatableVisualization, } = await import('../async_services'); const resolvedFormatFactory = await formatFactory; - expressions.registerFunction(() => datatableColumns); - expressions.registerFunction(() => datatableColumnWidth); + expressions.registerFunction(() => datatableColumn); expressions.registerFunction(() => getDatatable({ formatFactory: resolvedFormatFactory })); expressions.registerRenderer(() => getDatatableRenderer({ diff --git a/x-pack/plugins/lens/public/datatable_visualization/visualization.test.tsx b/x-pack/plugins/lens/public/datatable_visualization/visualization.test.tsx index 0627effa30be7..25275ba8e2249 100644 --- a/x-pack/plugins/lens/public/datatable_visualization/visualization.test.tsx +++ b/x-pack/plugins/lens/public/datatable_visualization/visualization.test.tsx @@ -30,23 +30,15 @@ describe('Datatable Visualization', () => { describe('#initialize', () => { it('should initialize from the empty state', () => { expect(datatableVisualization.initialize(mockFrame(), undefined)).toEqual({ - layers: [ - { - layerId: 'aaa', - columns: [], - }, - ], + layerId: 'aaa', + columns: [], }); }); it('should initialize from a persisted state', () => { const expectedState: DatatableVisualizationState = { - layers: [ - { - layerId: 'foo', - columns: ['saved'], - }, - ], + layerId: 'foo', + columns: [{ columnId: 'saved' }], }; expect(datatableVisualization.initialize(mockFrame(), expectedState)).toEqual(expectedState); }); @@ -55,12 +47,8 @@ describe('Datatable Visualization', () => { describe('#getLayerIds', () => { it('return the layer ids', () => { const state: DatatableVisualizationState = { - layers: [ - { - layerId: 'baz', - columns: ['a', 'b', 'c'], - }, - ], + layerId: 'baz', + columns: [{ columnId: 'a' }, { columnId: 'b' }, { columnId: 'c' }], }; expect(datatableVisualization.getLayerIds(state)).toEqual(['baz']); }); @@ -69,20 +57,12 @@ describe('Datatable Visualization', () => { describe('#clearLayer', () => { it('should reset the layer', () => { const state: DatatableVisualizationState = { - layers: [ - { - layerId: 'baz', - columns: ['a', 'b', 'c'], - }, - ], + layerId: 'baz', + columns: [{ columnId: 'a' }, { columnId: 'b' }, { columnId: 'c' }], }; expect(datatableVisualization.clearLayer(state, 'baz')).toMatchObject({ - layers: [ - { - layerId: 'baz', - columns: [], - }, - ], + layerId: 'baz', + columns: [], }); }); }); @@ -113,7 +93,8 @@ describe('Datatable Visualization', () => { it('should accept a single-layer suggestion', () => { const suggestions = datatableVisualization.getSuggestions({ state: { - layers: [{ layerId: 'first', columns: ['col1'] }], + layerId: 'first', + columns: [{ columnId: 'col1' }], }, table: { isMultiRow: true, @@ -130,7 +111,8 @@ describe('Datatable Visualization', () => { it('should not make suggestions when the table is unchanged', () => { const suggestions = datatableVisualization.getSuggestions({ state: { - layers: [{ layerId: 'first', columns: ['col1'] }], + layerId: 'first', + columns: [{ columnId: 'col1' }], }, table: { isMultiRow: true, @@ -147,7 +129,8 @@ describe('Datatable Visualization', () => { it('should not make suggestions when multiple layers are involved', () => { const suggestions = datatableVisualization.getSuggestions({ state: { - layers: [{ layerId: 'first', columns: ['col1'] }], + layerId: 'first', + columns: [{ columnId: 'col1' }], }, table: { isMultiRow: true, @@ -164,7 +147,8 @@ describe('Datatable Visualization', () => { it('should not make suggestions when the suggestion keeps a different layer', () => { const suggestions = datatableVisualization.getSuggestions({ state: { - layers: [{ layerId: 'older', columns: ['col1'] }], + layerId: 'older', + columns: [{ columnId: 'col1' }], }, table: { isMultiRow: true, @@ -203,7 +187,8 @@ describe('Datatable Visualization', () => { datatableVisualization.getConfiguration({ layerId: 'first', state: { - layers: [{ layerId: 'first', columns: [] }], + layerId: 'first', + columns: [], }, frame, }).groups @@ -218,7 +203,8 @@ describe('Datatable Visualization', () => { const filterOperations = datatableVisualization.getConfiguration({ layerId: 'first', state: { - layers: [{ layerId: 'first', columns: [] }], + layerId: 'first', + columns: [], }, frame, }).groups[0].filterOperations; @@ -249,7 +235,8 @@ describe('Datatable Visualization', () => { const filterOperations = datatableVisualization.getConfiguration({ layerId: 'first', state: { - layers: [{ layerId: 'first', columns: [] }], + layerId: 'first', + columns: [], }, frame, }).groups[1].filterOperations; @@ -274,7 +261,6 @@ describe('Datatable Visualization', () => { it('reorders the rendered colums based on the order from the datasource', () => { const datasource = createMockDatasource('test'); - const layer = { layerId: 'a', columns: ['b', 'c'] }; const frame = mockFrame(); frame.datasourceLayers = { a: datasource.publicAPIMock }; datasource.publicAPIMock.getTableSpec.mockReturnValue([{ columnId: 'c' }, { columnId: 'b' }]); @@ -282,7 +268,10 @@ describe('Datatable Visualization', () => { expect( datatableVisualization.getConfiguration({ layerId: 'a', - state: { layers: [layer] }, + state: { + layerId: 'a', + columns: [{ columnId: 'b' }, { columnId: 'c' }], + }, frame, }).groups[1].accessors ).toEqual([{ columnId: 'c' }, { columnId: 'b' }]); @@ -291,95 +280,75 @@ describe('Datatable Visualization', () => { describe('#removeDimension', () => { it('allows columns to be removed', () => { - const layer = { layerId: 'layer1', columns: ['b', 'c'] }; expect( datatableVisualization.removeDimension({ - prevState: { layers: [layer] }, + prevState: { + layerId: 'layer1', + columns: [{ columnId: 'b' }, { columnId: 'c' }], + }, layerId: 'layer1', columnId: 'b', }) ).toEqual({ - layers: [ - { - layerId: 'layer1', - columns: ['c'], - }, - ], + layerId: 'layer1', + columns: [{ columnId: 'c' }], }); }); it('should handle correctly the sorting state on removing dimension', () => { - const layer = { layerId: 'layer1', columns: ['b', 'c'] }; + const state = { layerId: 'layer1', columns: [{ columnId: 'b' }, { columnId: 'c' }] }; expect( datatableVisualization.removeDimension({ - prevState: { layers: [layer], sorting: { columnId: 'b', direction: 'asc' } }, + prevState: { ...state, sorting: { columnId: 'b', direction: 'asc' } }, layerId: 'layer1', columnId: 'b', }) ).toEqual({ sorting: undefined, - layers: [ - { - layerId: 'layer1', - columns: ['c'], - }, - ], + layerId: 'layer1', + columns: [{ columnId: 'c' }], }); expect( datatableVisualization.removeDimension({ - prevState: { layers: [layer], sorting: { columnId: 'c', direction: 'asc' } }, + prevState: { ...state, sorting: { columnId: 'c', direction: 'asc' } }, layerId: 'layer1', columnId: 'b', }) ).toEqual({ sorting: { columnId: 'c', direction: 'asc' }, - layers: [ - { - layerId: 'layer1', - columns: ['c'], - }, - ], + layerId: 'layer1', + columns: [{ columnId: 'c' }], }); }); }); describe('#setDimension', () => { it('allows columns to be added', () => { - const layer = { layerId: 'layer1', columns: ['b', 'c'] }; expect( datatableVisualization.setDimension({ - prevState: { layers: [layer] }, + prevState: { layerId: 'layer1', columns: [{ columnId: 'b' }, { columnId: 'c' }] }, layerId: 'layer1', columnId: 'd', groupId: '', }) ).toEqual({ - layers: [ - { - layerId: 'layer1', - columns: ['b', 'c', 'd'], - }, - ], + layerId: 'layer1', + columns: [{ columnId: 'b' }, { columnId: 'c' }, { columnId: 'd' }], }); }); it('does not set a duplicate dimension', () => { - const layer = { layerId: 'layer1', columns: ['b', 'c'] }; expect( datatableVisualization.setDimension({ - prevState: { layers: [layer] }, + prevState: { layerId: 'layer1', columns: [{ columnId: 'b' }, { columnId: 'c' }] }, layerId: 'layer1', columnId: 'b', groupId: '', }) ).toEqual({ - layers: [ - { - layerId: 'layer1', - columns: ['b', 'c'], - }, - ], + layerId: 'layer1', + columns: [{ columnId: 'b' }, { columnId: 'c' }], }); }); }); @@ -387,7 +356,6 @@ describe('Datatable Visualization', () => { describe('#toExpression', () => { it('reorders the rendered colums based on the order from the datasource', () => { const datasource = createMockDatasource('test'); - const layer = { layerId: 'a', columns: ['b', 'c'] }; const frame = mockFrame(); frame.datasourceLayers = { a: datasource.publicAPIMock }; datasource.publicAPIMock.getTableSpec.mockReturnValue([{ columnId: 'c' }, { columnId: 'b' }]); @@ -398,24 +366,35 @@ describe('Datatable Visualization', () => { }); const expression = datatableVisualization.toExpression( - { layers: [layer] }, + { layerId: 'a', columns: [{ columnId: 'b' }, { columnId: 'c' }] }, frame.datasourceLayers ) as Ast; - const tableArgs = buildExpression(expression).findFunction('lens_datatable_columns'); + const tableArgs = buildExpression(expression).findFunction('lens_datatable'); expect(tableArgs).toHaveLength(1); - expect(tableArgs[0].arguments).toEqual({ - columnIds: ['c', 'b'], - sortBy: [''], - sortDirection: ['none'], - columnWidth: [], + expect(tableArgs[0].arguments).toEqual( + expect.objectContaining({ + sortingColumnId: [''], + sortingDirection: ['none'], + }) + ); + const columnArgs = buildExpression(expression).findFunction('lens_datatable_column'); + expect(columnArgs).toHaveLength(2); + expect(columnArgs[0].arguments).toEqual({ + columnId: ['c'], + hidden: [], + width: [], + }); + expect(columnArgs[1].arguments).toEqual({ + columnId: ['b'], + hidden: [], + width: [], }); }); it('returns no expression if the metric dimension is not defined', () => { const datasource = createMockDatasource('test'); - const layer = { layerId: 'a', columns: ['b', 'c'] }; const frame = mockFrame(); frame.datasourceLayers = { a: datasource.publicAPIMock }; datasource.publicAPIMock.getTableSpec.mockReturnValue([{ columnId: 'c' }, { columnId: 'b' }]); @@ -426,7 +405,7 @@ describe('Datatable Visualization', () => { }); const expression = datatableVisualization.toExpression( - { layers: [layer] }, + { layerId: 'a', columns: [{ columnId: 'b' }, { columnId: 'c' }] }, frame.datasourceLayers ); @@ -437,7 +416,6 @@ describe('Datatable Visualization', () => { describe('#getErrorMessages', () => { it('returns undefined if the datasource is missing a metric dimension', () => { const datasource = createMockDatasource('test'); - const layer = { layerId: 'a', columns: ['b', 'c'] }; const frame = mockFrame(); frame.datasourceLayers = { a: datasource.publicAPIMock }; datasource.publicAPIMock.getTableSpec.mockReturnValue([{ columnId: 'c' }, { columnId: 'b' }]); @@ -447,14 +425,16 @@ describe('Datatable Visualization', () => { label: 'label', }); - const error = datatableVisualization.getErrorMessages({ layers: [layer] }, frame); + const error = datatableVisualization.getErrorMessages( + { layerId: 'a', columns: [{ columnId: 'b' }, { columnId: 'c' }] }, + frame + ); expect(error).toBeUndefined(); }); it('returns undefined if the metric dimension is defined', () => { const datasource = createMockDatasource('test'); - const layer = { layerId: 'a', columns: ['b', 'c'] }; const frame = mockFrame(); frame.datasourceLayers = { a: datasource.publicAPIMock }; datasource.publicAPIMock.getTableSpec.mockReturnValue([{ columnId: 'c' }, { columnId: 'b' }]); @@ -464,7 +444,10 @@ describe('Datatable Visualization', () => { label: 'label', }); - const error = datatableVisualization.getErrorMessages({ layers: [layer] }, frame); + const error = datatableVisualization.getErrorMessages( + { layerId: 'a', columns: [{ columnId: 'b' }, { columnId: 'c' }] }, + frame + ); expect(error).toBeUndefined(); }); @@ -473,12 +456,8 @@ describe('Datatable Visualization', () => { describe('#onEditAction', () => { it('should add a sort column to the state', () => { const currentState: DatatableVisualizationState = { - layers: [ - { - layerId: 'foo', - columns: ['saved'], - }, - ], + layerId: 'foo', + columns: [{ columnId: 'saved' }], }; expect( datatableVisualization.onEditAction!(currentState, { @@ -496,12 +475,8 @@ describe('Datatable Visualization', () => { it('should add a custom width to a column in the state', () => { const currentState: DatatableVisualizationState = { - layers: [ - { - layerId: 'foo', - columns: ['saved'], - }, - ], + layerId: 'foo', + columns: [{ columnId: 'saved' }], }; expect( datatableVisualization.onEditAction!(currentState, { @@ -510,29 +485,14 @@ describe('Datatable Visualization', () => { }) ).toEqual({ ...currentState, - columnWidth: [ - { - columnId: 'saved', - width: 500, - }, - ], + columns: [{ columnId: 'saved', width: 500 }], }); }); it('should clear custom width value for the column from the state', () => { const currentState: DatatableVisualizationState = { - layers: [ - { - layerId: 'foo', - columns: ['saved'], - }, - ], - columnWidth: [ - { - columnId: 'saved', - width: 500, - }, - ], + layerId: 'foo', + columns: [{ columnId: 'saved', width: 5000 }], }; expect( datatableVisualization.onEditAction!(currentState, { @@ -541,7 +501,7 @@ describe('Datatable Visualization', () => { }) ).toEqual({ ...currentState, - columnWidth: [], + columns: [{ columnId: 'saved', width: undefined }], }); }); }); diff --git a/x-pack/plugins/lens/public/datatable_visualization/visualization.tsx b/x-pack/plugins/lens/public/datatable_visualization/visualization.tsx index 6a221396b8a84..77fda43c37fef 100644 --- a/x-pack/plugins/lens/public/datatable_visualization/visualization.tsx +++ b/x-pack/plugins/lens/public/datatable_visualization/visualization.tsx @@ -5,37 +5,35 @@ * 2.0. */ +import React from 'react'; +import { render } from 'react-dom'; import { Ast } from '@kbn/interpreter/common'; +import { I18nProvider } from '@kbn/i18n/react'; import { i18n } from '@kbn/i18n'; import type { SuggestionRequest, Visualization, VisualizationSuggestion, - Operation, DatasourcePublicAPI, } from '../types'; -import type { DatatableColumnWidth } from './components/types'; import { LensIconChartDatatable } from '../assets/chart_datatable'; +import { TableDimensionEditor } from './components/dimension_editor'; -export interface DatatableLayerState { - layerId: string; - columns: string[]; +export interface ColumnState { + columnId: string; + width?: number; + hidden?: boolean; } -export interface DatatableVisualizationState { - layers: DatatableLayerState[]; - sorting?: { - columnId: string | undefined; - direction: 'asc' | 'desc' | 'none'; - }; - columnWidth?: DatatableColumnWidth[]; +export interface SortingState { + columnId: string | undefined; + direction: 'asc' | 'desc' | 'none'; } -function newLayerState(layerId: string): DatatableLayerState { - return { - layerId, - columns: [], - }; +export interface DatatableVisualizationState { + columns: ColumnState[]; + layerId: string; + sorting?: SortingState; } export const datatableVisualization: Visualization = { @@ -56,12 +54,13 @@ export const datatableVisualization: Visualization }, getLayerIds(state) { - return state.layers.map((l) => l.layerId); + return [state.layerId]; }, clearLayer(state) { return { - layers: state.layers.map((l) => newLayerState(l.layerId)), + ...state, + columns: [], }; }, @@ -79,7 +78,8 @@ export const datatableVisualization: Visualization initialize(frame, state) { return ( state || { - layers: [newLayerState(frame.addNewLayer())], + columns: [], + layerId: frame.addNewLayer(), } ); }, @@ -126,12 +126,8 @@ export const datatableVisualization: Visualization // table with >= 10 columns will have a score of 0.4, fewer columns reduce score score: (Math.min(table.columns.length, 10) / 10) * 0.4, state: { - layers: [ - { - layerId: table.layerId, - columns: table.columns.map((col) => col.columnId), - }, - ], + layerId: table.layerId, + columns: table.columns.map((col) => ({ columnId: col.columnId })), }, previewIcon: LensIconChartDatatable, // tables are hidden from suggestion bar, but used for drag & drop and chart switching @@ -144,6 +140,11 @@ export const datatableVisualization: Visualization const { sortedColumns, datasource } = getDataSourceAndSortedColumns(state, frame.datasourceLayers, layerId) || {}; + const columnMap: Record = {}; + state.columns.forEach((column) => { + columnMap[column.columnId] = column; + }); + if (!sortedColumns) { return { groups: [] }; } @@ -155,61 +156,68 @@ export const datatableVisualization: Visualization groupLabel: i18n.translate('xpack.lens.datatable.breakdown', { defaultMessage: 'Break down by', }), - layerId: state.layers[0].layerId, + layerId: state.layerId, accessors: sortedColumns .filter((c) => datasource!.getOperationForColumnId(c)?.isBucketed) - .map((accessor) => ({ columnId: accessor })), + .map((accessor) => ({ + columnId: accessor, + triggerIcon: columnMap[accessor].hidden ? 'invisible' : undefined, + })), supportsMoreColumns: true, filterOperations: (op) => op.isBucketed, dataTestSubj: 'lnsDatatable_column', + enableDimensionEditor: true, }, { groupId: 'metrics', groupLabel: i18n.translate('xpack.lens.datatable.metrics', { defaultMessage: 'Metrics', }), - layerId: state.layers[0].layerId, + layerId: state.layerId, accessors: sortedColumns .filter((c) => !datasource!.getOperationForColumnId(c)?.isBucketed) - .map((accessor) => ({ columnId: accessor })), + .map((accessor) => ({ + columnId: accessor, + triggerIcon: columnMap[accessor].hidden ? 'invisible' : undefined, + })), supportsMoreColumns: true, filterOperations: (op) => !op.isBucketed, required: true, dataTestSubj: 'lnsDatatable_metrics', + enableDimensionEditor: true, }, ], }; }, - setDimension({ prevState, layerId, columnId }) { + setDimension({ prevState, columnId }) { + if (prevState.columns.some((column) => column.columnId === columnId)) { + return prevState; + } return { ...prevState, - layers: prevState.layers.map((l) => { - if (l.layerId !== layerId || l.columns.includes(columnId)) { - return l; - } - return { ...l, columns: [...l.columns, columnId] }; - }), + columns: [...prevState.columns, { columnId }], }; }, - removeDimension({ prevState, layerId, columnId }) { + removeDimension({ prevState, columnId }) { return { ...prevState, - layers: prevState.layers.map((l) => - l.layerId === layerId - ? { - ...l, - columns: l.columns.filter((c) => c !== columnId), - } - : l - ), + columns: prevState.columns.filter((column) => column.columnId !== columnId), sorting: prevState.sorting?.columnId === columnId ? undefined : prevState.sorting, }; }, + renderDimensionEditor(domElement, props) { + render( + + + , + domElement + ); + }, toExpression(state, datasourceLayers, { title, description } = {}): Ast | null { const { sortedColumns, datasource } = - getDataSourceAndSortedColumns(state, datasourceLayers, state.layers[0].layerId) || {}; + getDataSourceAndSortedColumns(state, datasourceLayers, state.layerId) || {}; if ( sortedColumns?.length && @@ -218,9 +226,14 @@ export const datatableVisualization: Visualization return null; } - const operations = sortedColumns! - .map((columnId) => ({ columnId, operation: datasource!.getOperationForColumnId(columnId) })) - .filter((o): o is { columnId: string; operation: Operation } => !!o.operation); + const columnMap: Record = {}; + state.columns.forEach((column) => { + columnMap[column.columnId] = column; + }); + + const columns = sortedColumns! + .filter((columnId) => datasource!.getOperationForColumnId(columnId)) + .map((columnId) => columnMap[columnId]); return { type: 'expression', @@ -231,35 +244,22 @@ export const datatableVisualization: Visualization arguments: { title: [title || ''], description: [description || ''], - columns: [ - { - type: 'expression', - chain: [ - { - type: 'function', - function: 'lens_datatable_columns', - arguments: { - columnIds: operations.map((o) => o.columnId), - sortBy: [state.sorting?.columnId || ''], - sortDirection: [state.sorting?.direction || 'none'], - columnWidth: (state.columnWidth || []).map((columnWidth) => ({ - type: 'expression', - chain: [ - { - type: 'function', - function: 'lens_datatable_column_width', - arguments: { - columnId: [columnWidth.columnId], - width: [columnWidth.width], - }, - }, - ], - })), - }, + columns: columns.map((column) => ({ + type: 'expression', + chain: [ + { + type: 'function', + function: 'lens_datatable_column', + arguments: { + columnId: [column.columnId], + hidden: typeof column.hidden === 'undefined' ? [] : [column.hidden], + width: typeof column.width === 'undefined' ? [] : [column.width], }, - ], - }, - ], + }, + ], + })), + sortingColumnId: [state.sorting?.columnId || ''], + sortingDirection: [state.sorting?.direction || 'none'], }, }, ], @@ -280,15 +280,34 @@ export const datatableVisualization: Visualization direction: event.data.direction, }, }; + case 'toggle': + return { + ...state, + columns: state.columns.map((column) => { + if (column.columnId === event.data.columnId) { + return { + ...column, + hidden: !column.hidden, + }; + } else { + return column; + } + }), + }; case 'resize': + const targetWidth = event.data.width; return { ...state, - columnWidth: [ - ...(state.columnWidth || []).filter(({ columnId }) => columnId !== event.data.columnId), - ...(event.data.width !== undefined - ? [{ columnId: event.data.columnId, width: event.data.width }] - : []), - ], + columns: state.columns.map((column) => { + if (column.columnId === event.data.columnId) { + return { + ...column, + width: targetWidth, + }; + } else { + return column; + } + }), }; default: return state; @@ -301,13 +320,11 @@ function getDataSourceAndSortedColumns( datasourceLayers: Record, layerId: string ) { - const layer = state.layers.find((l: DatatableLayerState) => l.layerId === layerId); - if (!layer) { - return undefined; - } - const datasource = datasourceLayers[layer.layerId]; + const datasource = datasourceLayers[state.layerId]; const originalOrder = datasource.getTableSpec().map(({ columnId }) => columnId); // When we add a column it could be empty, and therefore have no order - const sortedColumns = Array.from(new Set(originalOrder.concat(layer.columns))); + const sortedColumns = Array.from( + new Set(originalOrder.concat(state.columns.map(({ columnId }) => columnId))) + ); return { datasource, sortedColumns }; } diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/color_indicator.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/color_indicator.tsx index e3a30883a2209..a3d5c6fd22fcd 100644 --- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/color_indicator.tsx +++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/color_indicator.tsx @@ -49,6 +49,16 @@ export function ColorIndicator({ })} /> )} + {accessorConfig.triggerIcon === 'invisible' && ( + + )} {accessorConfig.triggerIcon === 'colorBy' && ( void; @@ -368,7 +370,7 @@ export type VisualizationDimensionEditorProps = VisualizationConfig export interface AccessorConfig { columnId: string; - triggerIcon?: 'color' | 'disabled' | 'colorBy' | 'none'; + triggerIcon?: 'color' | 'disabled' | 'colorBy' | 'none' | 'invisible'; color?: string; palette?: string[]; } @@ -649,6 +651,7 @@ export interface LensBrushEvent { interface LensEditContextMapping { [LENS_EDIT_SORT_ACTION]: LensSortActionData; [LENS_EDIT_RESIZE_ACTION]: LensResizeActionData; + [LENS_TOGGLE_ACTION]: LensToggleActionData; } type LensEditSupportedActions = keyof LensEditContextMapping; diff --git a/x-pack/plugins/lens/server/migrations.test.ts b/x-pack/plugins/lens/server/migrations.test.ts index 077204b07ed73..01329d85baf00 100644 --- a/x-pack/plugins/lens/server/migrations.test.ts +++ b/x-pack/plugins/lens/server/migrations.test.ts @@ -597,4 +597,77 @@ describe('Lens migrations', () => { expect(layersWithSuggestedPriority).toEqual(0); }); }); + + describe('7.12.0 restructure datatable state', () => { + const context = ({ log: { warning: () => {} } } as unknown) as SavedObjectMigrationContext; + const example = { + type: 'lens', + id: 'mock-saved-object-id', + attributes: { + state: { + datasourceStates: { + indexpattern: {}, + }, + visualization: { + layers: [ + { + layerId: 'first', + columns: ['a', 'b', 'c'], + }, + ], + sorting: { + columnId: 'a', + direction: 'asc', + }, + }, + query: { query: '', language: 'kuery' }, + filters: [], + }, + title: 'Table', + visualizationType: 'lnsDatatable', + }, + }; + + it('should not touch non datatable visualization', () => { + const xyChart = { + ...example, + attributes: { ...example.attributes, visualizationType: 'xy' }, + }; + const result = migrations['7.12.0'](xyChart, context) as ReturnType< + SavedObjectMigrationFn + >; + expect(result).toBe(xyChart); + }); + + it('should remove layer array and reshape state', () => { + const result = migrations['7.12.0'](example, context) as ReturnType< + SavedObjectMigrationFn + >; + expect(result.attributes.state.visualization).toEqual({ + layerId: 'first', + columns: [ + { + columnId: 'a', + }, + { + columnId: 'b', + }, + { + columnId: 'c', + }, + ], + sorting: { + columnId: 'a', + direction: 'asc', + }, + }); + // should leave other parts alone + expect(result.attributes.state.datasourceStates).toEqual( + example.attributes.state.datasourceStates + ); + expect(result.attributes.state.query).toEqual(example.attributes.state.query); + expect(result.attributes.state.filters).toEqual(example.attributes.state.filters); + expect(result.attributes.title).toEqual(example.attributes.title); + }); + }); }); diff --git a/x-pack/plugins/lens/server/migrations.ts b/x-pack/plugins/lens/server/migrations.ts index bb078ff204f2b..4c6dfcd7949be 100644 --- a/x-pack/plugins/lens/server/migrations.ts +++ b/x-pack/plugins/lens/server/migrations.ts @@ -83,6 +83,29 @@ interface XYStatePost77 { layers: Array>; } +interface DatatableStatePre711 { + layers: Array<{ + layerId: string; + columns: string[]; + }>; + sorting?: { + columnId: string | undefined; + direction: 'asc' | 'desc' | 'none'; + }; +} +interface DatatableStatePost711 { + layerId: string; + columns: Array<{ + columnId: string; + width?: number; + hidden?: boolean; + }>; + sorting?: { + columnId: string | undefined; + direction: 'asc' | 'desc' | 'none'; + }; +} + /** * Removes the `lens_auto_date` subexpression from a stored expression * string. For example: aggConfigs={lens_auto_date aggConfigs="JSON string"} @@ -334,6 +357,36 @@ const removeSuggestedPriority: SavedObjectMigrationFn, + LensDocShape +> = (doc) => { + // nothing to do for non-datatable visualizations + if (doc.attributes.visualizationType !== 'lnsDatatable') + return (doc as unknown) as SavedObjectUnsanitizedDoc>; + const oldState = doc.attributes.state.visualization; + const layer = oldState.layers[0] || { + layerId: '', + columns: [], + }; + // put together new saved object format + const newDoc: SavedObjectUnsanitizedDoc> = { + ...doc, + attributes: { + ...doc.attributes, + state: { + ...doc.attributes.state, + visualization: { + sorting: oldState.sorting, + layerId: layer.layerId, + columns: layer.columns.map((columnId) => ({ columnId })), + }, + }, + }, + }; + return newDoc; +}; + export const migrations: SavedObjectMigrationMap = { '7.7.0': removeInvalidAccessors, // The order of these migrations matter, since the timefield migration relies on the aggConfigs @@ -341,4 +394,5 @@ export const migrations: SavedObjectMigrationMap = { '7.8.0': (doc, context) => addTimeFieldToEsaggs(removeLensAutoDate(doc, context), context), '7.10.0': extractReferences, '7.11.0': removeSuggestedPriority, + '7.12.0': transformTableState, }; diff --git a/x-pack/test/functional/apps/lens/index.ts b/x-pack/test/functional/apps/lens/index.ts index 6cbd18bdeef04..10b1f4d30145f 100644 --- a/x-pack/test/functional/apps/lens/index.ts +++ b/x-pack/test/functional/apps/lens/index.ts @@ -29,6 +29,7 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) { this.tags(['ciGroup4', 'skipFirefox']); loadTestFile(require.resolve('./smokescreen')); + loadTestFile(require.resolve('./table')); loadTestFile(require.resolve('./dashboard')); loadTestFile(require.resolve('./persistent_context')); loadTestFile(require.resolve('./colors')); diff --git a/x-pack/test/functional/apps/lens/table.ts b/x-pack/test/functional/apps/lens/table.ts new file mode 100644 index 0000000000000..f79d1c342b72f --- /dev/null +++ b/x-pack/test/functional/apps/lens/table.ts @@ -0,0 +1,69 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import expect from '@kbn/expect'; +import { FtrProviderContext } from '../../ftr_provider_context'; + +export default function ({ getService, getPageObjects }: FtrProviderContext) { + const PageObjects = getPageObjects(['visualize', 'lens', 'common', 'header']); + const listingTable = getService('listingTable'); + const find = getService('find'); + + describe('lens datatable', () => { + it('should able to sort a table by a column', async () => { + await PageObjects.visualize.gotoVisualizationLandingPage(); + await listingTable.searchForItemWithName('lnsXYvis'); + await PageObjects.lens.clickVisualizeListItemTitle('lnsXYvis'); + await PageObjects.lens.goToTimeRange(); + await PageObjects.lens.switchToVisualization('lnsDatatable'); + // Sort by number + await PageObjects.lens.changeTableSortingBy(2, 'asc'); + await PageObjects.header.waitUntilLoadingHasFinished(); + expect(await PageObjects.lens.getDatatableCellText(0, 2)).to.eql('17,246'); + // Now sort by IP + await PageObjects.lens.changeTableSortingBy(0, 'asc'); + await PageObjects.header.waitUntilLoadingHasFinished(); + expect(await PageObjects.lens.getDatatableCellText(0, 0)).to.eql('78.83.247.30'); + // Change the sorting + await PageObjects.lens.changeTableSortingBy(0, 'desc'); + await PageObjects.header.waitUntilLoadingHasFinished(); + expect(await PageObjects.lens.getDatatableCellText(0, 0)).to.eql('169.228.188.120'); + // Remove the sorting + await PageObjects.lens.changeTableSortingBy(0, 'none'); + await PageObjects.header.waitUntilLoadingHasFinished(); + expect(await PageObjects.lens.isDatatableHeaderSorted(0)).to.eql(false); + }); + + it('should able to use filters cell actions in table', async () => { + const firstCellContent = await PageObjects.lens.getDatatableCellText(0, 0); + await PageObjects.lens.clickTableCellAction(0, 0, 'lensDatatableFilterOut'); + await PageObjects.header.waitUntilLoadingHasFinished(); + expect( + await find.existsByCssSelector( + `[data-test-subj*="filter-value-${firstCellContent}"][data-test-subj*="filter-negated"]` + ) + ).to.eql(true); + }); + + it('should allow to configure column visibility', async () => { + expect(await PageObjects.lens.getDatatableHeaderText(0)).to.equal('Top values of ip'); + expect(await PageObjects.lens.getDatatableHeaderText(1)).to.equal('@timestamp per 3 hours'); + expect(await PageObjects.lens.getDatatableHeaderText(2)).to.equal('Average of bytes'); + + await PageObjects.lens.toggleColumnVisibility('lnsDatatable_column > lns-dimensionTrigger'); + + expect(await PageObjects.lens.getDatatableHeaderText(0)).to.equal('@timestamp per 3 hours'); + expect(await PageObjects.lens.getDatatableHeaderText(1)).to.equal('Average of bytes'); + + await PageObjects.lens.toggleColumnVisibility('lnsDatatable_column > lns-dimensionTrigger'); + + expect(await PageObjects.lens.getDatatableHeaderText(0)).to.equal('Top values of ip'); + expect(await PageObjects.lens.getDatatableHeaderText(1)).to.equal('@timestamp per 3 hours'); + expect(await PageObjects.lens.getDatatableHeaderText(2)).to.equal('Average of bytes'); + }); + }); +} diff --git a/x-pack/test/functional/page_objects/lens_page.ts b/x-pack/test/functional/page_objects/lens_page.ts index 37d97cd014c9f..f6960600a6d7c 100644 --- a/x-pack/test/functional/page_objects/lens_page.ts +++ b/x-pack/test/functional/page_objects/lens_page.ts @@ -562,6 +562,15 @@ export function LensPageProvider({ getService, getPageObjects }: FtrProviderCont return buttonEl.click(); }, + async toggleColumnVisibility(dimension: string) { + await this.openDimensionEditor(dimension); + const id = 'lns-table-column-hidden'; + const isChecked = await testSubjects.isEuiSwitchChecked(id); + await testSubjects.setEuiSwitch(id, isChecked ? 'uncheck' : 'check'); + await this.closeDimensionEditor(); + await PageObjects.header.waitUntilLoadingHasFinished(); + }, + async clickTableCellAction(rowIndex = 0, colIndex = 0, actionTestSub: string) { const el = await this.getDatatableCell(rowIndex, colIndex); await el.focus(); From e676617f69a5959f6a6219e0b067592d2889391a Mon Sep 17 00:00:00 2001 From: Bhavya RM Date: Thu, 4 Feb 2021 11:04:30 -0500 Subject: [PATCH 11/69] Test user for maps tests under import geoJSON tests (#86015) test user assignment for test files under import geoJSON files Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> --- .../import_geojson/add_layer_import_panel.js | 8 ++++++- .../import_geojson/file_indexing_panel.js | 9 ++++++++ x-pack/test/functional/config.js | 22 +++++++++++++++++++ 3 files changed, 38 insertions(+), 1 deletion(-) diff --git a/x-pack/test/functional/apps/maps/import_geojson/add_layer_import_panel.js b/x-pack/test/functional/apps/maps/import_geojson/add_layer_import_panel.js index 390c7af98c653..46b87b1c4195c 100644 --- a/x-pack/test/functional/apps/maps/import_geojson/add_layer_import_panel.js +++ b/x-pack/test/functional/apps/maps/import_geojson/add_layer_import_panel.js @@ -8,18 +8,24 @@ import expect from '@kbn/expect'; import path from 'path'; -export default function ({ getPageObjects }) { +export default function ({ getPageObjects, getService }) { const PageObjects = getPageObjects(['maps', 'common']); const IMPORT_FILE_PREVIEW_NAME = 'Import File'; const FILE_LOAD_DIR = 'test_upload_files'; const DEFAULT_LOAD_FILE_NAME = 'point.json'; + const security = getService('security'); describe('GeoJSON import layer panel', () => { before(async () => { + await security.testUser.setRoles(['global_maps_all', 'geoall_data_writer']); await PageObjects.maps.openNewMap(); }); + after(async () => { + await security.testUser.restoreDefaults(); + }); + beforeEach(async () => { await PageObjects.maps.clickAddLayer(); await PageObjects.maps.selectGeoJsonUploadSource(); diff --git a/x-pack/test/functional/apps/maps/import_geojson/file_indexing_panel.js b/x-pack/test/functional/apps/maps/import_geojson/file_indexing_panel.js index ea8366d809fb7..4496b59393eec 100644 --- a/x-pack/test/functional/apps/maps/import_geojson/file_indexing_panel.js +++ b/x-pack/test/functional/apps/maps/import_geojson/file_indexing_panel.js @@ -13,6 +13,7 @@ export default function ({ getService, getPageObjects }) { const PageObjects = getPageObjects(['maps', 'common']); const testSubjects = getService('testSubjects'); const log = getService('log'); + const security = getService('security'); const IMPORT_FILE_PREVIEW_NAME = 'Import File'; const FILE_LOAD_DIR = 'test_upload_files'; @@ -37,9 +38,17 @@ export default function ({ getService, getPageObjects }) { describe('On GeoJSON index name & pattern operation complete', () => { before(async () => { + await security.testUser.setRoles( + ['global_maps_all', 'geoall_data_writer', 'global_index_pattern_management_all'], + false + ); await PageObjects.maps.openNewMap(); }); + after(async () => { + await security.testUser.restoreDefaults(); + }); + beforeEach(async () => { await PageObjects.maps.clickAddLayer(); await PageObjects.maps.selectGeoJsonUploadSource(); diff --git a/x-pack/test/functional/config.js b/x-pack/test/functional/config.js index f2be2974986fb..4d63f033f8756 100644 --- a/x-pack/test/functional/config.js +++ b/x-pack/test/functional/config.js @@ -377,6 +377,28 @@ export default async function ({ readConfigFile }) { }, }, + geoall_data_writer: { + elasticsearch: { + indices: [ + { + names: ['*'], + privileges: ['create', 'read', 'view_index_metadata', 'monitor', 'create_index'], + }, + ], + }, + }, + + global_index_pattern_management_all: { + kibana: [ + { + feature: { + indexPatterns: ['all'], + }, + spaces: ['*'], + }, + ], + }, + global_devtools_read: { kibana: [ { From 7a42a6f410abc3ef5aab03d72e6d688fe484e780 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cau=C3=AA=20Marcondes?= <55978943+cauemarcondes@users.noreply.github.com> Date: Thu, 4 Feb 2021 17:20:50 +0100 Subject: [PATCH 12/69] [APM] Enabling yesterday option when 24 hours is selected (#90017) * enabling yesterday option when 24 hours is selected * addressing PR comments * addressing PR comments * enabling select box --- .../common/utils/formatters/datetime.test.ts | 29 +++++-- .../apm/common/utils/formatters/datetime.ts | 26 +++--- .../shared/time_comparison/index.test.tsx | 83 ++++++++++++++++++- .../shared/time_comparison/index.tsx | 53 ++++++++---- 4 files changed, 154 insertions(+), 37 deletions(-) diff --git a/x-pack/plugins/apm/common/utils/formatters/datetime.test.ts b/x-pack/plugins/apm/common/utils/formatters/datetime.test.ts index 6aee1e2b9842d..9efb7184f3927 100644 --- a/x-pack/plugins/apm/common/utils/formatters/datetime.test.ts +++ b/x-pack/plugins/apm/common/utils/formatters/datetime.test.ts @@ -170,37 +170,52 @@ describe('date time formatters', () => { it('milliseconds', () => { const start = moment('2019-10-29 08:00:00.001'); const end = moment('2019-10-29 08:00:00.005'); - expect(getDateDifference(start, end, 'milliseconds')).toEqual(4); + expect( + getDateDifference({ start, end, unitOfTime: 'milliseconds' }) + ).toEqual(4); }); it('seconds', () => { const start = moment('2019-10-29 08:00:00'); const end = moment('2019-10-29 08:00:10'); - expect(getDateDifference(start, end, 'seconds')).toEqual(10); + expect(getDateDifference({ start, end, unitOfTime: 'seconds' })).toEqual( + 10 + ); }); it('minutes', () => { const start = moment('2019-10-29 08:00:00'); const end = moment('2019-10-29 08:15:00'); - expect(getDateDifference(start, end, 'minutes')).toEqual(15); + expect(getDateDifference({ start, end, unitOfTime: 'minutes' })).toEqual( + 15 + ); }); it('hours', () => { const start = moment('2019-10-29 08:00:00'); const end = moment('2019-10-29 10:00:00'); - expect(getDateDifference(start, end, 'hours')).toEqual(2); + expect(getDateDifference({ start, end, unitOfTime: 'hours' })).toEqual(2); }); it('days', () => { const start = moment('2019-10-29 08:00:00'); const end = moment('2019-10-30 10:00:00'); - expect(getDateDifference(start, end, 'days')).toEqual(1); + expect(getDateDifference({ start, end, unitOfTime: 'days' })).toEqual(1); }); it('months', () => { const start = moment('2019-10-29 08:00:00'); const end = moment('2019-12-29 08:00:00'); - expect(getDateDifference(start, end, 'months')).toEqual(2); + expect(getDateDifference({ start, end, unitOfTime: 'months' })).toEqual( + 2 + ); }); it('years', () => { const start = moment('2019-10-29 08:00:00'); const end = moment('2020-10-29 08:00:00'); - expect(getDateDifference(start, end, 'years')).toEqual(1); + expect(getDateDifference({ start, end, unitOfTime: 'years' })).toEqual(1); + }); + it('precise days', () => { + const start = moment('2019-10-29 08:00:00'); + const end = moment('2019-10-30 10:00:00'); + expect( + getDateDifference({ start, end, unitOfTime: 'days', precise: true }) + ).toEqual(1.0833333333333333); }); }); }); diff --git a/x-pack/plugins/apm/common/utils/formatters/datetime.ts b/x-pack/plugins/apm/common/utils/formatters/datetime.ts index 624a0b8a664bc..88f70753f47c8 100644 --- a/x-pack/plugins/apm/common/utils/formatters/datetime.ts +++ b/x-pack/plugins/apm/common/utils/formatters/datetime.ts @@ -58,37 +58,43 @@ function getDateFormat(dateUnit: DateUnit) { } } -export const getDateDifference = ( - start: moment.Moment, - end: moment.Moment, - unitOfTime: DateUnit | TimeUnit -) => end.diff(start, unitOfTime); +export const getDateDifference = ({ + start, + end, + unitOfTime, + precise, +}: { + start: moment.Moment; + end: moment.Moment; + unitOfTime: DateUnit | TimeUnit; + precise?: boolean; +}) => end.diff(start, unitOfTime, precise); function getFormatsAccordingToDateDifference( start: moment.Moment, end: moment.Moment ) { - if (getDateDifference(start, end, 'years') >= 5) { + if (getDateDifference({ start, end, unitOfTime: 'years' }) >= 5) { return { dateFormat: getDateFormat('years') }; } - if (getDateDifference(start, end, 'months') >= 5) { + if (getDateDifference({ start, end, unitOfTime: 'months' }) >= 5) { return { dateFormat: getDateFormat('months') }; } const dateFormatWithDays = getDateFormat('days'); - if (getDateDifference(start, end, 'days') > 1) { + if (getDateDifference({ start, end, unitOfTime: 'days' }) > 1) { return { dateFormat: dateFormatWithDays }; } - if (getDateDifference(start, end, 'minutes') >= 1) { + if (getDateDifference({ start, end, unitOfTime: 'minutes' }) >= 1) { return { dateFormat: dateFormatWithDays, timeFormat: getTimeFormat('minutes'), }; } - if (getDateDifference(start, end, 'seconds') >= 10) { + if (getDateDifference({ start, end, unitOfTime: 'seconds' }) >= 10) { return { dateFormat: dateFormatWithDays, timeFormat: getTimeFormat('seconds'), diff --git a/x-pack/plugins/apm/public/components/shared/time_comparison/index.test.tsx b/x-pack/plugins/apm/public/components/shared/time_comparison/index.test.tsx index 52d971a551144..4ace78f74ee79 100644 --- a/x-pack/plugins/apm/public/components/shared/time_comparison/index.test.tsx +++ b/x-pack/plugins/apm/public/components/shared/time_comparison/index.test.tsx @@ -17,6 +17,7 @@ import { } from '../../../utils/testHelpers'; import { TimeComparison } from './'; import * as urlHelpers from '../../shared/Links/url_helpers'; +import moment from 'moment'; function getWrapper(params?: IUrlParams) { return ({ children }: { children?: ReactNode }) => { @@ -31,6 +32,10 @@ function getWrapper(params?: IUrlParams) { } describe('TimeComparison', () => { + beforeAll(() => { + moment.tz.setDefault('Europe/Amsterdam'); + }); + afterAll(() => moment.tz.setDefault('')); const spy = jest.spyOn(urlHelpers, 'replace'); beforeEach(() => { jest.resetAllMocks(); @@ -40,6 +45,7 @@ describe('TimeComparison', () => { const Wrapper = getWrapper({ start: '2021-01-28T14:45:00.000Z', end: '2021-01-28T15:00:00.000Z', + rangeTo: 'now', }); render(, { wrapper: Wrapper, @@ -57,6 +63,7 @@ describe('TimeComparison', () => { end: '2021-01-28T15:00:00.000Z', comparisonEnabled: true, comparisonType: 'yesterday', + rangeTo: 'now', }); const component = render(, { wrapper: Wrapper, @@ -67,13 +74,64 @@ describe('TimeComparison', () => { .selectedIndex ).toEqual(0); }); + + it('enables yesterday option when date difference is equal to 24 hours', () => { + const Wrapper = getWrapper({ + start: '2021-01-28T10:00:00.000Z', + end: '2021-01-29T10:00:00.000Z', + comparisonEnabled: true, + comparisonType: 'yesterday', + rangeTo: 'now', + }); + const component = render(, { + wrapper: Wrapper, + }); + expectTextsInDocument(component, ['Yesterday', 'A week ago']); + expect( + (component.getByTestId('comparisonSelect') as HTMLSelectElement) + .selectedIndex + ).toEqual(0); + }); + + it('selects previous period when rangeTo is different than now', () => { + const Wrapper = getWrapper({ + start: '2021-01-28T10:00:00.000Z', + end: '2021-01-29T10:00:00.000Z', + comparisonEnabled: true, + comparisonType: 'previousPeriod', + rangeTo: 'now-15m', + }); + const component = render(, { + wrapper: Wrapper, + }); + expectTextsInDocument(component, ['28/01 11:00 - 29/01 11:00']); + expect( + (component.getByTestId('comparisonSelect') as HTMLSelectElement) + .selectedIndex + ).toEqual(0); + }); }); describe('Time range is between 24 hours - 1 week', () => { + it("doesn't show yesterday option when date difference is greater than 24 hours", () => { + const Wrapper = getWrapper({ + start: '2021-01-28T10:00:00.000Z', + end: '2021-01-29T11:00:00.000Z', + comparisonEnabled: true, + comparisonType: 'week', + rangeTo: 'now', + }); + const component = render(, { + wrapper: Wrapper, + }); + expectTextsNotInDocument(component, ['Yesterday']); + expectTextsInDocument(component, ['A week ago']); + }); it('sets default values', () => { const Wrapper = getWrapper({ start: '2021-01-26T15:00:00.000Z', end: '2021-01-28T15:00:00.000Z', + rangeTo: 'now', }); render(, { wrapper: Wrapper, @@ -91,6 +149,7 @@ describe('TimeComparison', () => { end: '2021-01-28T15:00:00.000Z', comparisonEnabled: true, comparisonType: 'week', + rangeTo: 'now', }); const component = render(, { wrapper: Wrapper, @@ -102,6 +161,24 @@ describe('TimeComparison', () => { .selectedIndex ).toEqual(0); }); + + it('selects previous period when rangeTo is different than now', () => { + const Wrapper = getWrapper({ + start: '2021-01-26T15:00:00.000Z', + end: '2021-01-28T15:00:00.000Z', + comparisonEnabled: true, + comparisonType: 'previousPeriod', + rangeTo: '2021-01-28T15:00:00.000Z', + }); + const component = render(, { + wrapper: Wrapper, + }); + expectTextsInDocument(component, ['26/01 16:00 - 28/01 16:00']); + expect( + (component.getByTestId('comparisonSelect') as HTMLSelectElement) + .selectedIndex + ).toEqual(0); + }); }); describe('Time range is greater than 7 days', () => { @@ -111,12 +188,13 @@ describe('TimeComparison', () => { end: '2021-01-28T15:00:00.000Z', comparisonEnabled: true, comparisonType: 'previousPeriod', + rangeTo: 'now', }); const component = render(, { wrapper: Wrapper, }); expect(spy).not.toHaveBeenCalled(); - expectTextsInDocument(component, ['20/01 - 28/01']); + expectTextsInDocument(component, ['20/01 16:00 - 28/01 16:00']); expect( (component.getByTestId('comparisonSelect') as HTMLSelectElement) .selectedIndex @@ -129,12 +207,13 @@ describe('TimeComparison', () => { end: '2021-01-28T15:00:00.000Z', comparisonEnabled: true, comparisonType: 'previousPeriod', + rangeTo: 'now', }); const component = render(, { wrapper: Wrapper, }); expect(spy).not.toHaveBeenCalled(); - expectTextsInDocument(component, ['20/12/20 - 28/01/21']); + expectTextsInDocument(component, ['20/12/20 16:00 - 28/01/21 16:00']); expect( (component.getByTestId('comparisonSelect') as HTMLSelectElement) .selectedIndex diff --git a/x-pack/plugins/apm/public/components/shared/time_comparison/index.tsx b/x-pack/plugins/apm/public/components/shared/time_comparison/index.tsx index bb50ca1a45e8c..02064ea786fb0 100644 --- a/x-pack/plugins/apm/public/components/shared/time_comparison/index.tsx +++ b/x-pack/plugins/apm/public/components/shared/time_comparison/index.tsx @@ -33,14 +33,21 @@ function formatPreviousPeriodDates({ momentEnd: moment.Moment; }) { const isDifferentYears = momentStart.get('year') !== momentEnd.get('year'); - const dateFormat = isDifferentYears ? 'DD/MM/YY' : 'DD/MM'; + const dateFormat = isDifferentYears ? 'DD/MM/YY HH:mm' : 'DD/MM HH:mm'; return `${momentStart.format(dateFormat)} - ${momentEnd.format(dateFormat)}`; } -function getSelectOptions({ start, end }: { start?: string; end?: string }) { +function getSelectOptions({ + start, + end, + rangeTo, +}: { + start?: string; + end?: string; + rangeTo?: string; +}) { const momentStart = moment(start); const momentEnd = moment(end); - const dateDiff = getDateDifference(momentStart, momentEnd, 'days'); const yesterdayOption = { value: 'yesterday', @@ -56,22 +63,32 @@ function getSelectOptions({ start, end }: { start?: string; end?: string }) { }), }; + const dateDiff = getDateDifference({ + start: momentStart, + end: momentEnd, + unitOfTime: 'days', + precise: true, + }); + const isRangeToNow = rangeTo === 'now'; + + if (isRangeToNow) { + // Less than or equals to one day + if (dateDiff <= 1) { + return [yesterdayOption, aWeekAgoOption]; + } + + // Less than or equals to one week + if (dateDiff <= 7) { + return [aWeekAgoOption]; + } + } + const prevPeriodOption = { value: 'previousPeriod', text: formatPreviousPeriodDates({ momentStart, momentEnd }), }; - // Less than one day - if (dateDiff < 1) { - return [yesterdayOption, aWeekAgoOption]; - } - - // Less than one week - if (dateDiff <= 7) { - return [aWeekAgoOption]; - } - - // above one week + // above one week or when rangeTo is not "now" return [prevPeriodOption]; } @@ -79,10 +96,10 @@ export function TimeComparison() { const history = useHistory(); const { isMedium, isLarge } = useBreakPoints(); const { - urlParams: { start, end, comparisonEnabled, comparisonType }, + urlParams: { start, end, comparisonEnabled, comparisonType, rangeTo }, } = useUrlParams(); - const selectOptions = getSelectOptions({ start, end }); + const selectOptions = getSelectOptions({ start, end, rangeTo }); // Sets default values if (comparisonEnabled === undefined || comparisonType === undefined) { @@ -113,7 +130,7 @@ export function TimeComparison() { 0} + checked={comparisonEnabled} onChange={() => { urlHelpers.push(history, { query: { From 5052499e2028579f9e4926725f34692c8cf7d366 Mon Sep 17 00:00:00 2001 From: Aaron Caldwell Date: Thu, 4 Feb 2021 09:47:47 -0700 Subject: [PATCH 13/69] Add readme to geo containment alert covering test alert setup (#89625) Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> --- .../alert_types/geo_containment/readme.md | 123 ++++++++++++++++++ 1 file changed, 123 insertions(+) create mode 100644 x-pack/plugins/stack_alerts/public/alert_types/geo_containment/readme.md diff --git a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/readme.md b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/readme.md new file mode 100644 index 0000000000000..798beed8d17bd --- /dev/null +++ b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/readme.md @@ -0,0 +1,123 @@ +## Instructions for loading & observing data + +There are several steps required to set up geo containment alerts for testing in a way +that allows you to view triggered alerts as they happen. These instructions outline +how to load test data, but really these steps can be used to load any data for geo +containment alerts so long as you have the following data: +- An index containing a`geo_point` field and a `date` field. This data is presumed to +be dynamic (updated). +- An index containing `geo_shape` data, such as boundary data, bounding box data, etc. +This data is presumed to be static (not updated). Shape data matching the query is +harvested once when the alert is created and anytime after when alert is re-enabled +after disablement +The ability for containment alerts to monitor data requires there be somewhat "real time" +data streaming in as indicated by the `date` field. + +### 1. Set experimental flag to enable containment alerts +- Your `kibana.yml` config file is located in the `config/` dir in the base of your kibana +project. To edit it, open this file in your editor of choice, add the line described in +the next step to the bottom of the file (or really anywhere) and save. For more details +on different config modifications or on how to make production config modifications, +see [the current docs](https://www.elastic.co/guide/en/kibana/current/settings.html) +- Set the following configuration settings in your `config/kibana.yml`: +`xpack.stack_alerts.enableGeoAlerting: true` + +### 2. Run ES/Kibana dev env with ssl enabled +- In two terminals, run the normal commands to launch both elasticsearch and kibana but +append `--ssl` to the end of each as an arg, i.e.: + - `yarn es snapshot --ssl # Runs Elasticsearch` + - `yarn start --ssl # Runs Kibana` + +### 3. Get an MTA data api key +- You'll need to obtain an NYC MTA api key, you can request this + key [here](https://docs.google.com/forms/d/e/1FAIpQLSfGUZA6h4eHd2-ImaK5Q_I5Gb7C3UEP5vYDALyGd7r3h08YKg/viewform?hl=en&formkey=dG9kcGIxRFpSS0NhQWM4UjA0V0VkNGc6MQ#gid=0) + +### 4. Get trackable point data (MTA bus data) into elasticsearch +- You'll be using the script: `https://github.com/thomasneirynck/mtatracks` to harvest +live bus data to populate the system. Clone the repo and follow the instructions in +the readme to set up. +- Using the MTA key you obtained in the previous step, the final command to run +in a local terminal should look something like the following. This script loads large +quantities of data the frequency listed below (20000ms = 20s) or higher: +`node ./load_tracks.js -a -f 20000` + +### 5. Open required Kibana tabs +There are 3 separate tabs you'll need for a combination of loading and viewing the +data. Since you'll be jumping between them, it might be easiest to just open them +upfront. Each is preceded by `https://localhost:5601//app/`: +- Stack Management > Index Patterns: `management/kibana/indexPatterns` +- Stack Management > Alerts & Actions: `management/insightsAndAlerting/triggersActions/alerts` +- Maps: `maps` + +### 6 Create map to monitor alerts +- Go to the Maps app and create a new map +- Using GeoJSON Upload, upload the GeoJSON file located in the folder of the previously +cloned `mta_tracks` repo: `nyc-neighborhoods.geo.json`. Accept all of the default +settings and add the layer. +- You may want to click your newly added layer and select "Fit to data" so you can see the +boundaries you've added. +_ When finished uploading and adding the layer, save the map using a name of your +choice. +- Keep the Maps tab open, you'll come back to this + +### 7. Create index pattern for generated tracks +- Go to the index pattern tab to create a new index pattern. +- Give it the index name `mtatracks*` +- For `Time field` select `@timestamp` +- Click `Create index pattern` +- Leave this tab open, you'll come back to this + +### 8. Create containment alert +- Go to the Alerts tab and click `Create Alert` > `Tracking containment` +- Fill the side bar form top to bottom. This _should_ flow somewhat logically. In the top +section, set both `Check every` and `Notify every` to `1 minute`. + For `Notify`, leave +on default selected option `Only on status change`, this will notify only on newly +contained entities. + **Please note that `2 seconds` is an unusually quick interval but done here for demo + purposes. With real world data, setting an appropriate interval speed is highly dependent + upon the quantity, update frequency and complexity of data handled.** +- The default settings for `Select Entity` will mostly be correct. Select `mta_tracks*` +as the index you'd like to track. Use the defaults populated under +`Select entity` > `INDEX`, update `Select entity` > `BY` to `vehicle_ref`. +- For `Select boundary` > `INDEX`, select `nyc-neighborhoods` and all populated defaults. +- Under `Actions`, create an `Server log` action, then create a `Connector` which you can simply name +`Log test`. +- For `Run when`, the default `Tracking containment met` will work here. This will track +only points that are newly contained in the boundaries. +- Leave the log level at `Info` +- For the message, use the following sample message or one of your own: +``` +Entity: {{context.entityId}} with document ID: {{context.entityDocumentId}} has been recorded at location: {{context.entityLocation}} in boundary: {{context.containingBoundaryName}}({{context.containingBoundaryId}}) at {{context.entityDateTime}}. This was detected by the alerting framework at: {{context.detectionDateTime}}. +``` +- At the bottom right, click `Save`. Your alert should now be created! +- You should now be able to see alerts generated in your Kibana console log. + +### 9. Visually confirm your alerts with Maps +- Creating layers + - Using the source data below, you can create the following layers: + - Boundary data (`nyc-neighborhoods`) + - Boundary layer + - Original tracks data (`mtatracks*`) + - Last known location + - Geo-line track + - Boundary layer + - This layer should already be added from when you uploaded the GeoJSON + file earlier. If it's not already added, it can be added by selecting `Documents` + > `Index patterns` > `nyc-neighborhoods` then accept the defaults and add the layer. + - Vehicle tracks + - Add `Tracks` > `Index patterns` > `mtatracks*`, accept the defaults selected and set `Entity` > `entity_id`. Add the layer and style appropriately. + - Last known location + - Add `Documents` > `Index patterns` > `mtatracks*` and select `Show top hits per entity` + - For `Entity` select `entity_id` and add the layer. + - The only required setting on the following screen is to set `Sorting` to sort on `@timestamp` +- Update time scope of data + - Changing the refresh rate `Refresh every`: `4 seconds` keeps the layers updated and in particular + shows the latest values obtained in the `Top hits` layer + - The time picker should already be set to the default `15 minutes`, this is a good default but + can be adjusted up or down to see more or less data respectively +- General tips + - Style layers with contrasting colors to clearly see each + - Consider using icons for the `Top hits` vehicle movement layer + - Consider adding tooltips to layers to better understand the data in your layers. + - Save your Map anytime you've made any layer adjustments From 0f45439a5fd882e0503979c84f1a8a333e695a79 Mon Sep 17 00:00:00 2001 From: Tiago Costa Date: Tue, 8 Dec 2020 02:34:49 +0000 Subject: [PATCH 14/69] skip flaky suite (#85086) (cherry picked from commit e564439348bbda561bf740a5a62b5638a60ed864) --- test/api_integration/apis/ui_counters/ui_counters.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/api_integration/apis/ui_counters/ui_counters.ts b/test/api_integration/apis/ui_counters/ui_counters.ts index 881fa33f5fbc0..c2286f8ea3dce 100644 --- a/test/api_integration/apis/ui_counters/ui_counters.ts +++ b/test/api_integration/apis/ui_counters/ui_counters.ts @@ -22,7 +22,8 @@ export default function ({ getService }: FtrProviderContext) { count, }); - describe('UI Counters API', () => { + // FLAKY: https://github.com/elastic/kibana/issues/85086 + describe.skip('UI Counters API', () => { const dayDate = moment().format('DDMMYYYY'); it('stores ui counter events in savedObjects', async () => { From 54b1fb616353a584ea7fe230fa77cbd384b4bfb1 Mon Sep 17 00:00:00 2001 From: Greg Back <1045796+gtback@users.noreply.github.com> Date: Thu, 4 Feb 2021 13:27:52 -0500 Subject: [PATCH 15/69] Use newfeed.service config for all newsfeeds (#90252) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Alejandro Fernández Haro Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> --- src/plugins/newsfeed/public/plugin.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/plugins/newsfeed/public/plugin.tsx b/src/plugins/newsfeed/public/plugin.tsx index 94a113a2786c2..a788b3c4d0b59 100644 --- a/src/plugins/newsfeed/public/plugin.tsx +++ b/src/plugins/newsfeed/public/plugin.tsx @@ -51,7 +51,10 @@ export class NewsfeedPublicPlugin return { createNewsFeed$: (endpoint: NewsfeedApiEndpoint) => { const config = Object.assign({}, this.config, { - service: { pathTemplate: `/${endpoint}/v{VERSION}.json` }, + service: { + ...this.config.service, + pathTemplate: `/${endpoint}/v{VERSION}.json`, + }, }); return this.fetchNewsfeed(core, config); }, From 85e92b5ccd3241cbdac551711ed4030b8b0ea55d Mon Sep 17 00:00:00 2001 From: Nathan L Smith Date: Thu, 4 Feb 2021 13:27:17 -0600 Subject: [PATCH 16/69] Remove UI filters from UI (#89793) * Start moving some stuff * Move some stuff around * more * Transactions label * some snake casing * i18n fix * Remove unused ui filters endpoints * Updates to select * remove projections * Use urlHelpers.push * License change --- x-pack/plugins/apm/common/projections.ts | 17 -- .../apm/public/components/app/Home/index.tsx | 2 +- .../app/Main/route_config/index.tsx | 2 +- .../LocalUIFilters/Filter/FilterBadgeList.tsx | 2 +- .../Filter/FilterTitleButton.tsx | 0 .../LocalUIFilters/Filter/index.tsx | 2 +- .../RumDashboard}/LocalUIFilters/index.tsx | 8 +- .../RumDashboard}/hooks/useLocalUIFilters.ts | 25 ++- .../app/RumDashboard/hooks/use_call_api.ts} | 6 +- .../components/app/RumDashboard/index.tsx | 7 +- .../List/List.test.tsx | 0 .../List/__fixtures__/props.json | 0 .../List/__snapshots__/List.test.tsx.snap | 0 .../List/index.tsx | 0 .../index.tsx | 76 +++----- .../service_details/service_detail_tabs.tsx | 4 +- .../app/service_inventory/index.tsx | 63 ++---- .../service_inventory.test.tsx | 8 - .../components/app/service_metrics/index.tsx | 65 +++---- .../index.tsx | 65 ++----- .../TraceList.tsx | 0 .../index.tsx | 42 ++-- .../Distribution/distribution.test.ts | 0 .../Distribution/index.tsx | 0 .../WaterfallWithSummmary/ErrorCount.test.tsx | 0 .../WaterfallWithSummmary/ErrorCount.tsx | 0 .../MaybeViewTraceLink.tsx | 0 .../WaterfallWithSummmary/PercentOfParent.tsx | 0 .../WaterfallWithSummmary/TransactionTabs.tsx | 0 .../Marks/get_agent_marks.test.ts | 0 .../Marks/get_agent_marks.ts | 0 .../Marks/get_error_marks.test.ts | 0 .../Marks/get_error_marks.ts | 0 .../WaterfallContainer/Marks/index.ts | 0 .../WaterfallContainer/ServiceLegends.tsx | 0 .../Waterfall/FlyoutTopLevelProperties.tsx | 0 .../Waterfall/ResponsiveFlyout.tsx | 0 .../Waterfall/SpanFlyout/DatabaseContext.tsx | 0 .../Waterfall/SpanFlyout/HttpContext.tsx | 0 .../SpanFlyout/StickySpanProperties.tsx | 0 .../SpanFlyout/TruncateHeightSection.tsx | 0 .../Waterfall/SpanFlyout/index.tsx | 0 .../Waterfall/SyncBadge.stories.tsx | 0 .../Waterfall/SyncBadge.tsx | 0 .../TransactionFlyout/DroppedSpansWarning.tsx | 0 .../Waterfall/TransactionFlyout/index.tsx | 0 .../Waterfall/WaterfallFlyout.tsx | 0 .../Waterfall/WaterfallItem.tsx | 0 .../Waterfall/accordion_waterfall.tsx | 0 .../WaterfallContainer/Waterfall/index.tsx | 0 .../waterfall_helpers.test.ts.snap | 0 .../mock_responses/spans.json | 0 .../mock_responses/transaction.json | 0 .../waterfall_helpers.test.ts | 0 .../waterfall_helpers/waterfall_helpers.ts | 0 .../WaterfallContainer.stories.tsx | 0 .../WaterfallContainer/index.tsx | 0 .../waterfallContainer.stories.data.ts | 0 .../WaterfallWithSummmary/index.tsx | 0 .../index.tsx | 121 +++++------- .../use_waterfall_fetcher.ts | 0 .../app/transaction_overview/index.tsx | 182 +++++++++--------- .../transaction_overview.test.tsx | 4 +- .../TransactionTypeFilter/index.tsx | 65 ------- .../shared/Summary/DurationSummaryItem.tsx | 2 +- .../Timeline/Marker/AgentMarker.test.tsx | 2 +- .../charts/Timeline/Marker/AgentMarker.tsx | 2 +- .../Timeline/Marker/ErrorMarker.test.tsx | 2 +- .../charts/Timeline/Marker/ErrorMarker.tsx | 2 +- .../charts/Timeline/Marker/index.test.tsx | 4 +- .../shared/charts/Timeline/Marker/index.tsx | 4 +- .../shared/charts/Timeline/VerticalLines.tsx | 2 +- .../shared/charts/Timeline/index.tsx | 4 +- .../public/components/shared/search_bar.tsx | 2 +- .../shared/transaction_type_select.tsx | 55 ++++++ .../apm/server/routes/create_apm_api.ts | 16 +- .../plugins/apm/server/routes/ui_filters.ts | 154 +-------------- .../translations/translations/ja-JP.json | 1 - .../translations/translations/zh-CN.json | 1 - 79 files changed, 350 insertions(+), 669 deletions(-) delete mode 100644 x-pack/plugins/apm/common/projections.ts rename x-pack/plugins/apm/public/components/{shared => app/RumDashboard}/LocalUIFilters/Filter/FilterBadgeList.tsx (95%) rename x-pack/plugins/apm/public/components/{shared => app/RumDashboard}/LocalUIFilters/Filter/FilterTitleButton.tsx (100%) rename x-pack/plugins/apm/public/components/{shared => app/RumDashboard}/LocalUIFilters/Filter/index.tsx (98%) rename x-pack/plugins/apm/public/components/{shared => app/RumDashboard}/LocalUIFilters/index.tsx (89%) rename x-pack/plugins/apm/public/{ => components/app/RumDashboard}/hooks/useLocalUIFilters.ts (76%) rename x-pack/plugins/apm/public/{hooks/useCallApi.ts => components/app/RumDashboard/hooks/use_call_api.ts} (68%) rename x-pack/plugins/apm/public/components/app/{ErrorGroupOverview => error_group_overview}/List/List.test.tsx (100%) rename x-pack/plugins/apm/public/components/app/{ErrorGroupOverview => error_group_overview}/List/__fixtures__/props.json (100%) rename x-pack/plugins/apm/public/components/app/{ErrorGroupOverview => error_group_overview}/List/__snapshots__/List.test.tsx.snap (100%) rename x-pack/plugins/apm/public/components/app/{ErrorGroupOverview => error_group_overview}/List/index.tsx (100%) rename x-pack/plugins/apm/public/components/app/{ErrorGroupOverview => error_group_overview}/index.tsx (59%) rename x-pack/plugins/apm/public/components/app/{ServiceNodeOverview => service_node_overview}/index.tsx (78%) rename x-pack/plugins/apm/public/components/app/{TraceOverview => trace_overview}/TraceList.tsx (100%) rename x-pack/plugins/apm/public/components/app/{TraceOverview => trace_overview}/index.tsx (66%) rename x-pack/plugins/apm/public/components/app/{TransactionDetails => transaction_details}/Distribution/distribution.test.ts (100%) rename x-pack/plugins/apm/public/components/app/{TransactionDetails => transaction_details}/Distribution/index.tsx (100%) rename x-pack/plugins/apm/public/components/app/{TransactionDetails => transaction_details}/WaterfallWithSummmary/ErrorCount.test.tsx (100%) rename x-pack/plugins/apm/public/components/app/{TransactionDetails => transaction_details}/WaterfallWithSummmary/ErrorCount.tsx (100%) rename x-pack/plugins/apm/public/components/app/{TransactionDetails => transaction_details}/WaterfallWithSummmary/MaybeViewTraceLink.tsx (100%) rename x-pack/plugins/apm/public/components/app/{TransactionDetails => transaction_details}/WaterfallWithSummmary/PercentOfParent.tsx (100%) rename x-pack/plugins/apm/public/components/app/{TransactionDetails => transaction_details}/WaterfallWithSummmary/TransactionTabs.tsx (100%) rename x-pack/plugins/apm/public/components/app/{TransactionDetails => transaction_details}/WaterfallWithSummmary/WaterfallContainer/Marks/get_agent_marks.test.ts (100%) rename x-pack/plugins/apm/public/components/app/{TransactionDetails => transaction_details}/WaterfallWithSummmary/WaterfallContainer/Marks/get_agent_marks.ts (100%) rename x-pack/plugins/apm/public/components/app/{TransactionDetails => transaction_details}/WaterfallWithSummmary/WaterfallContainer/Marks/get_error_marks.test.ts (100%) rename x-pack/plugins/apm/public/components/app/{TransactionDetails => transaction_details}/WaterfallWithSummmary/WaterfallContainer/Marks/get_error_marks.ts (100%) rename x-pack/plugins/apm/public/components/app/{TransactionDetails => transaction_details}/WaterfallWithSummmary/WaterfallContainer/Marks/index.ts (100%) rename x-pack/plugins/apm/public/components/app/{TransactionDetails => transaction_details}/WaterfallWithSummmary/WaterfallContainer/ServiceLegends.tsx (100%) rename x-pack/plugins/apm/public/components/app/{TransactionDetails => transaction_details}/WaterfallWithSummmary/WaterfallContainer/Waterfall/FlyoutTopLevelProperties.tsx (100%) rename x-pack/plugins/apm/public/components/app/{TransactionDetails => transaction_details}/WaterfallWithSummmary/WaterfallContainer/Waterfall/ResponsiveFlyout.tsx (100%) rename x-pack/plugins/apm/public/components/app/{TransactionDetails => transaction_details}/WaterfallWithSummmary/WaterfallContainer/Waterfall/SpanFlyout/DatabaseContext.tsx (100%) rename x-pack/plugins/apm/public/components/app/{TransactionDetails => transaction_details}/WaterfallWithSummmary/WaterfallContainer/Waterfall/SpanFlyout/HttpContext.tsx (100%) rename x-pack/plugins/apm/public/components/app/{TransactionDetails => transaction_details}/WaterfallWithSummmary/WaterfallContainer/Waterfall/SpanFlyout/StickySpanProperties.tsx (100%) rename x-pack/plugins/apm/public/components/app/{TransactionDetails => transaction_details}/WaterfallWithSummmary/WaterfallContainer/Waterfall/SpanFlyout/TruncateHeightSection.tsx (100%) rename x-pack/plugins/apm/public/components/app/{TransactionDetails => transaction_details}/WaterfallWithSummmary/WaterfallContainer/Waterfall/SpanFlyout/index.tsx (100%) rename x-pack/plugins/apm/public/components/app/{TransactionDetails => transaction_details}/WaterfallWithSummmary/WaterfallContainer/Waterfall/SyncBadge.stories.tsx (100%) rename x-pack/plugins/apm/public/components/app/{TransactionDetails => transaction_details}/WaterfallWithSummmary/WaterfallContainer/Waterfall/SyncBadge.tsx (100%) rename x-pack/plugins/apm/public/components/app/{TransactionDetails => transaction_details}/WaterfallWithSummmary/WaterfallContainer/Waterfall/TransactionFlyout/DroppedSpansWarning.tsx (100%) rename x-pack/plugins/apm/public/components/app/{TransactionDetails => transaction_details}/WaterfallWithSummmary/WaterfallContainer/Waterfall/TransactionFlyout/index.tsx (100%) rename x-pack/plugins/apm/public/components/app/{TransactionDetails => transaction_details}/WaterfallWithSummmary/WaterfallContainer/Waterfall/WaterfallFlyout.tsx (100%) rename x-pack/plugins/apm/public/components/app/{TransactionDetails => transaction_details}/WaterfallWithSummmary/WaterfallContainer/Waterfall/WaterfallItem.tsx (100%) rename x-pack/plugins/apm/public/components/app/{TransactionDetails => transaction_details}/WaterfallWithSummmary/WaterfallContainer/Waterfall/accordion_waterfall.tsx (100%) rename x-pack/plugins/apm/public/components/app/{TransactionDetails => transaction_details}/WaterfallWithSummmary/WaterfallContainer/Waterfall/index.tsx (100%) rename x-pack/plugins/apm/public/components/app/{TransactionDetails => transaction_details}/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/__snapshots__/waterfall_helpers.test.ts.snap (100%) rename x-pack/plugins/apm/public/components/app/{TransactionDetails => transaction_details}/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/mock_responses/spans.json (100%) rename x-pack/plugins/apm/public/components/app/{TransactionDetails => transaction_details}/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/mock_responses/transaction.json (100%) rename x-pack/plugins/apm/public/components/app/{TransactionDetails => transaction_details}/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers.test.ts (100%) rename x-pack/plugins/apm/public/components/app/{TransactionDetails => transaction_details}/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers.ts (100%) rename x-pack/plugins/apm/public/components/app/{TransactionDetails => transaction_details}/WaterfallWithSummmary/WaterfallContainer/WaterfallContainer.stories.tsx (100%) rename x-pack/plugins/apm/public/components/app/{TransactionDetails => transaction_details}/WaterfallWithSummmary/WaterfallContainer/index.tsx (100%) rename x-pack/plugins/apm/public/components/app/{TransactionDetails => transaction_details}/WaterfallWithSummmary/WaterfallContainer/waterfallContainer.stories.data.ts (100%) rename x-pack/plugins/apm/public/components/app/{TransactionDetails => transaction_details}/WaterfallWithSummmary/index.tsx (100%) rename x-pack/plugins/apm/public/components/app/{TransactionDetails => transaction_details}/index.tsx (59%) rename x-pack/plugins/apm/public/components/app/{TransactionDetails => transaction_details}/use_waterfall_fetcher.ts (100%) delete mode 100644 x-pack/plugins/apm/public/components/shared/LocalUIFilters/TransactionTypeFilter/index.tsx create mode 100644 x-pack/plugins/apm/public/components/shared/transaction_type_select.tsx diff --git a/x-pack/plugins/apm/common/projections.ts b/x-pack/plugins/apm/common/projections.ts deleted file mode 100644 index dab9dfce5e58a..0000000000000 --- a/x-pack/plugins/apm/common/projections.ts +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -export enum Projection { - services = 'services', - transactionGroups = 'transactionGroups', - traces = 'traces', - transactions = 'transactions', - metrics = 'metrics', - errorGroups = 'errorGroups', - serviceNodes = 'serviceNodes', - rumOverview = 'rumOverview', -} diff --git a/x-pack/plugins/apm/public/components/app/Home/index.tsx b/x-pack/plugins/apm/public/components/app/Home/index.tsx index bb3903727f509..834c2d5c40bce 100644 --- a/x-pack/plugins/apm/public/components/app/Home/index.tsx +++ b/x-pack/plugins/apm/public/components/app/Home/index.tsx @@ -16,7 +16,7 @@ import { useTraceOverviewHref } from '../../shared/Links/apm/TraceOverviewLink'; import { MainTabs } from '../../shared/main_tabs'; import { ServiceMap } from '../ServiceMap'; import { ServiceInventory } from '../service_inventory'; -import { TraceOverview } from '../TraceOverview'; +import { TraceOverview } from '../trace_overview'; interface Tab { key: string; diff --git a/x-pack/plugins/apm/public/components/app/Main/route_config/index.tsx b/x-pack/plugins/apm/public/components/app/Main/route_config/index.tsx index 0fd85df37bb78..08d95aca24714 100644 --- a/x-pack/plugins/apm/public/components/app/Main/route_config/index.tsx +++ b/x-pack/plugins/apm/public/components/app/Main/route_config/index.tsx @@ -23,7 +23,7 @@ import { AnomalyDetection } from '../../Settings/anomaly_detection'; import { ApmIndices } from '../../Settings/ApmIndices'; import { CustomizeUI } from '../../Settings/CustomizeUI'; import { TraceLink } from '../../TraceLink'; -import { TransactionDetails } from '../../TransactionDetails'; +import { TransactionDetails } from '../../transaction_details'; import { CreateAgentConfigurationRouteHandler, EditAgentConfigurationRouteHandler, diff --git a/x-pack/plugins/apm/public/components/shared/LocalUIFilters/Filter/FilterBadgeList.tsx b/x-pack/plugins/apm/public/components/app/RumDashboard/LocalUIFilters/Filter/FilterBadgeList.tsx similarity index 95% rename from x-pack/plugins/apm/public/components/shared/LocalUIFilters/Filter/FilterBadgeList.tsx rename to x-pack/plugins/apm/public/components/app/RumDashboard/LocalUIFilters/Filter/FilterBadgeList.tsx index 6423d295da469..6bc345ea5bd87 100644 --- a/x-pack/plugins/apm/public/components/shared/LocalUIFilters/Filter/FilterBadgeList.tsx +++ b/x-pack/plugins/apm/public/components/app/RumDashboard/LocalUIFilters/Filter/FilterBadgeList.tsx @@ -9,7 +9,7 @@ import React from 'react'; import { EuiFlexGrid, EuiFlexItem, EuiBadge } from '@elastic/eui'; import styled from 'styled-components'; import { i18n } from '@kbn/i18n'; -import { unit, px, truncate } from '../../../../style/variables'; +import { unit, px, truncate } from '../../../../../style/variables'; const BadgeText = styled.div` display: inline-block; diff --git a/x-pack/plugins/apm/public/components/shared/LocalUIFilters/Filter/FilterTitleButton.tsx b/x-pack/plugins/apm/public/components/app/RumDashboard/LocalUIFilters/Filter/FilterTitleButton.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/LocalUIFilters/Filter/FilterTitleButton.tsx rename to x-pack/plugins/apm/public/components/app/RumDashboard/LocalUIFilters/Filter/FilterTitleButton.tsx diff --git a/x-pack/plugins/apm/public/components/shared/LocalUIFilters/Filter/index.tsx b/x-pack/plugins/apm/public/components/app/RumDashboard/LocalUIFilters/Filter/index.tsx similarity index 98% rename from x-pack/plugins/apm/public/components/shared/LocalUIFilters/Filter/index.tsx rename to x-pack/plugins/apm/public/components/app/RumDashboard/LocalUIFilters/Filter/index.tsx index 59ec3b683b4d3..e1debde1117f9 100644 --- a/x-pack/plugins/apm/public/components/shared/LocalUIFilters/Filter/index.tsx +++ b/x-pack/plugins/apm/public/components/app/RumDashboard/LocalUIFilters/Filter/index.tsx @@ -21,7 +21,7 @@ import { import { i18n } from '@kbn/i18n'; import styled from 'styled-components'; import { FilterBadgeList } from './FilterBadgeList'; -import { unit, px } from '../../../../style/variables'; +import { unit, px } from '../../../../../style/variables'; import { FilterTitleButton } from './FilterTitleButton'; const Popover = styled((EuiPopover as unknown) as FunctionComponent).attrs( diff --git a/x-pack/plugins/apm/public/components/shared/LocalUIFilters/index.tsx b/x-pack/plugins/apm/public/components/app/RumDashboard/LocalUIFilters/index.tsx similarity index 89% rename from x-pack/plugins/apm/public/components/shared/LocalUIFilters/index.tsx rename to x-pack/plugins/apm/public/components/app/RumDashboard/LocalUIFilters/index.tsx index 0cab58bc5f448..a07997fb74921 100644 --- a/x-pack/plugins/apm/public/components/shared/LocalUIFilters/index.tsx +++ b/x-pack/plugins/apm/public/components/app/RumDashboard/LocalUIFilters/index.tsx @@ -15,12 +15,10 @@ import { import { i18n } from '@kbn/i18n'; import styled from 'styled-components'; import { Filter } from './Filter'; -import { useLocalUIFilters } from '../../../hooks/useLocalUIFilters'; -import { Projection } from '../../../../common/projections'; -import { LocalUIFilterName } from '../../../../common/ui_filter'; +import { useLocalUIFilters } from '../hooks/useLocalUIFilters'; +import { LocalUIFilterName } from '../../../../../common/ui_filter'; interface Props { - projection: Projection; filterNames: LocalUIFilterName[]; params?: Record; showCount?: boolean; @@ -33,7 +31,6 @@ const ButtonWrapper = styled.div` `; function LocalUIFilters({ - projection, params, filterNames, children, @@ -42,7 +39,6 @@ function LocalUIFilters({ }: Props) { const { filters, setFilterValue, clearValues } = useLocalUIFilters({ filterNames, - projection, params, shouldFetch, }); diff --git a/x-pack/plugins/apm/public/hooks/useLocalUIFilters.ts b/x-pack/plugins/apm/public/components/app/RumDashboard/hooks/useLocalUIFilters.ts similarity index 76% rename from x-pack/plugins/apm/public/hooks/useLocalUIFilters.ts rename to x-pack/plugins/apm/public/components/app/RumDashboard/hooks/useLocalUIFilters.ts index 1e0aa4fd96171..3f366300792ac 100644 --- a/x-pack/plugins/apm/public/hooks/useLocalUIFilters.ts +++ b/x-pack/plugins/apm/public/components/app/RumDashboard/hooks/useLocalUIFilters.ts @@ -7,19 +7,21 @@ import { omit } from 'lodash'; import { useHistory } from 'react-router-dom'; -import { Projection } from '../../common/projections'; -import { pickKeys } from '../../common/utils/pick_keys'; +import { LocalUIFilterName } from '../../../../../common/ui_filter'; +import { pickKeys } from '../../../../../common/utils/pick_keys'; // eslint-disable-next-line @kbn/eslint/no-restricted-paths -import { LocalUIFiltersAPIResponse } from '../../server/lib/ui_filters/local_ui_filters'; +import { LocalUIFiltersAPIResponse } from '../../../../../server/lib/ui_filters/local_ui_filters'; import { localUIFilters, // eslint-disable-next-line @kbn/eslint/no-restricted-paths -} from '../../server/lib/ui_filters/local_ui_filters/config'; -import { fromQuery, toQuery } from '../components/shared/Links/url_helpers'; -import { removeUndefinedProps } from '../context/url_params_context/helpers'; -import { useFetcher } from './use_fetcher'; -import { useUrlParams } from '../context/url_params_context/use_url_params'; -import { LocalUIFilterName } from '../../common/ui_filter'; +} from '../../../../../server/lib/ui_filters/local_ui_filters/config'; +import { + fromQuery, + toQuery, +} from '../../../../components/shared/Links/url_helpers'; +import { removeUndefinedProps } from '../../../../context/url_params_context/helpers'; +import { useUrlParams } from '../../../../context/url_params_context/use_url_params'; +import { useFetcher } from '../../../../hooks/use_fetcher'; const getInitialData = ( filterNames: LocalUIFilterName[] @@ -31,12 +33,10 @@ const getInitialData = ( }; export function useLocalUIFilters({ - projection, filterNames, params, shouldFetch, }: { - projection: Projection; filterNames: LocalUIFilterName[]; params?: Record; shouldFetch: boolean; @@ -72,7 +72,7 @@ export function useLocalUIFilters({ (callApmApi) => { if (shouldFetch && urlParams.start && urlParams.end) { return callApmApi({ - endpoint: `GET /api/apm/ui_filters/local_filters/${projection}` as const, + endpoint: `GET /api/apm/ui_filters/local_filters/rumOverview`, params: { query: { uiFilters: JSON.stringify(uiFilters), @@ -87,7 +87,6 @@ export function useLocalUIFilters({ } }, [ - projection, uiFilters, urlParams.start, urlParams.end, diff --git a/x-pack/plugins/apm/public/hooks/useCallApi.ts b/x-pack/plugins/apm/public/components/app/RumDashboard/hooks/use_call_api.ts similarity index 68% rename from x-pack/plugins/apm/public/hooks/useCallApi.ts rename to x-pack/plugins/apm/public/components/app/RumDashboard/hooks/use_call_api.ts index a2bb77c6ad6fc..5b448871804eb 100644 --- a/x-pack/plugins/apm/public/hooks/useCallApi.ts +++ b/x-pack/plugins/apm/public/components/app/RumDashboard/hooks/use_call_api.ts @@ -6,9 +6,9 @@ */ import { useMemo } from 'react'; -import { callApi } from '../services/rest/callApi'; -import { useApmPluginContext } from '../context/apm_plugin/use_apm_plugin_context'; -import { FetchOptions } from '../../common/fetch_options'; +import { callApi } from '../../../../services/rest/callApi'; +import { useApmPluginContext } from '../../../../context/apm_plugin/use_apm_plugin_context'; +import { FetchOptions } from '../../../../../common/fetch_options'; export function useCallApi() { const { http } = useApmPluginContext().core; diff --git a/x-pack/plugins/apm/public/components/app/RumDashboard/index.tsx b/x-pack/plugins/apm/public/components/app/RumDashboard/index.tsx index 7b0b1d204ac4d..9bdad14eb8a18 100644 --- a/x-pack/plugins/apm/public/components/app/RumDashboard/index.tsx +++ b/x-pack/plugins/apm/public/components/app/RumDashboard/index.tsx @@ -5,13 +5,11 @@ * 2.0. */ -import React, { useMemo } from 'react'; import { EuiFlexGroup, EuiFlexItem, EuiSpacer } from '@elastic/eui'; +import React, { useMemo } from 'react'; import { useTrackPageview } from '../../../../../observability/public'; -import { Projection } from '../../../../common/projections'; +import { LocalUIFilters } from './LocalUIFilters'; import { RumDashboard } from './RumDashboard'; - -import { LocalUIFilters } from '../../shared/LocalUIFilters'; import { URLFilter } from './URLFilter'; export function RumOverview() { @@ -21,7 +19,6 @@ export function RumOverview() { const localUIFiltersConfig = useMemo(() => { const config: React.ComponentProps = { filterNames: ['location', 'device', 'os', 'browser'], - projection: Projection.rumOverview, }; return config; diff --git a/x-pack/plugins/apm/public/components/app/ErrorGroupOverview/List/List.test.tsx b/x-pack/plugins/apm/public/components/app/error_group_overview/List/List.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/ErrorGroupOverview/List/List.test.tsx rename to x-pack/plugins/apm/public/components/app/error_group_overview/List/List.test.tsx diff --git a/x-pack/plugins/apm/public/components/app/ErrorGroupOverview/List/__fixtures__/props.json b/x-pack/plugins/apm/public/components/app/error_group_overview/List/__fixtures__/props.json similarity index 100% rename from x-pack/plugins/apm/public/components/app/ErrorGroupOverview/List/__fixtures__/props.json rename to x-pack/plugins/apm/public/components/app/error_group_overview/List/__fixtures__/props.json diff --git a/x-pack/plugins/apm/public/components/app/ErrorGroupOverview/List/__snapshots__/List.test.tsx.snap b/x-pack/plugins/apm/public/components/app/error_group_overview/List/__snapshots__/List.test.tsx.snap similarity index 100% rename from x-pack/plugins/apm/public/components/app/ErrorGroupOverview/List/__snapshots__/List.test.tsx.snap rename to x-pack/plugins/apm/public/components/app/error_group_overview/List/__snapshots__/List.test.tsx.snap diff --git a/x-pack/plugins/apm/public/components/app/ErrorGroupOverview/List/index.tsx b/x-pack/plugins/apm/public/components/app/error_group_overview/List/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/ErrorGroupOverview/List/index.tsx rename to x-pack/plugins/apm/public/components/app/error_group_overview/List/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/ErrorGroupOverview/index.tsx b/x-pack/plugins/apm/public/components/app/error_group_overview/index.tsx similarity index 59% rename from x-pack/plugins/apm/public/components/app/ErrorGroupOverview/index.tsx rename to x-pack/plugins/apm/public/components/app/error_group_overview/index.tsx index 58fea5e985fae..29bdf6467e544 100644 --- a/x-pack/plugins/apm/public/components/app/ErrorGroupOverview/index.tsx +++ b/x-pack/plugins/apm/public/components/app/error_group_overview/index.tsx @@ -7,29 +7,26 @@ import { EuiFlexGroup, - EuiFlexItem, EuiPage, EuiPanel, EuiSpacer, EuiTitle, } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; -import React, { useMemo } from 'react'; +import React from 'react'; import { useTrackPageview } from '../../../../../observability/public'; -import { Projection } from '../../../../common/projections'; -import { useFetcher } from '../../../hooks/use_fetcher'; import { useUrlParams } from '../../../context/url_params_context/use_url_params'; -import { LocalUIFilters } from '../../shared/LocalUIFilters'; +import { useErrorGroupDistributionFetcher } from '../../../hooks/use_error_group_distribution_fetcher'; +import { useFetcher } from '../../../hooks/use_fetcher'; import { SearchBar } from '../../shared/search_bar'; import { ErrorDistribution } from '../ErrorGroupDetails/Distribution'; import { ErrorGroupList } from './List'; -import { useErrorGroupDistributionFetcher } from '../../../hooks/use_error_group_distribution_fetcher'; interface ErrorGroupOverviewProps { serviceName: string; } -function ErrorGroupOverview({ serviceName }: ErrorGroupOverviewProps) { +export function ErrorGroupOverview({ serviceName }: ErrorGroupOverviewProps) { const { urlParams, uiFilters } = useUrlParams(); const { start, end, sortField, sortDirection } = urlParams; const { errorDistributionData } = useErrorGroupDistributionFetcher({ @@ -68,18 +65,6 @@ function ErrorGroupOverview({ serviceName }: ErrorGroupOverviewProps) { }); useTrackPageview({ app: 'apm', path: 'error_group_overview', delay: 15000 }); - const localUIFiltersConfig = useMemo(() => { - const config: React.ComponentProps = { - filterNames: ['host', 'containerId', 'podName', 'serviceVersion'], - params: { - serviceName, - }, - projection: Projection.errorGroups, - }; - - return config; - }, [serviceName]); - if (!errorDistributionData || !errorGroupListData) { return null; } @@ -88,41 +73,34 @@ function ErrorGroupOverview({ serviceName }: ErrorGroupOverviewProps) { <> - - - - - - - - + + + + - + - - -

Errors

- - + + +

Errors

+ + - - - + + ); } - -export { ErrorGroupOverview }; diff --git a/x-pack/plugins/apm/public/components/app/service_details/service_detail_tabs.tsx b/x-pack/plugins/apm/public/components/app/service_details/service_detail_tabs.tsx index 1c8a33d1968b1..23f699b63d207 100644 --- a/x-pack/plugins/apm/public/components/app/service_details/service_detail_tabs.tsx +++ b/x-pack/plugins/apm/public/components/app/service_details/service_detail_tabs.tsx @@ -20,9 +20,9 @@ import { useServiceNodeOverviewHref } from '../../shared/Links/apm/ServiceNodeOv import { useServiceOverviewHref } from '../../shared/Links/apm/service_overview_link'; import { useTransactionsOverviewHref } from '../../shared/Links/apm/transaction_overview_link'; import { MainTabs } from '../../shared/main_tabs'; -import { ErrorGroupOverview } from '../ErrorGroupOverview'; +import { ErrorGroupOverview } from '../error_group_overview'; import { ServiceMap } from '../ServiceMap'; -import { ServiceNodeOverview } from '../ServiceNodeOverview'; +import { ServiceNodeOverview } from '../service_node_overview'; import { ServiceMetrics } from '../service_metrics'; import { ServiceOverview } from '../service_overview'; import { TransactionOverview } from '../transaction_overview'; diff --git a/x-pack/plugins/apm/public/components/app/service_inventory/index.tsx b/x-pack/plugins/apm/public/components/app/service_inventory/index.tsx index 4ba96b63c91f4..1cb420a8ac194 100644 --- a/x-pack/plugins/apm/public/components/app/service_inventory/index.tsx +++ b/x-pack/plugins/apm/public/components/app/service_inventory/index.tsx @@ -13,21 +13,19 @@ import { EuiPanel, } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; -import React, { useEffect, useMemo } from 'react'; +import React, { useEffect } from 'react'; import { toMountPoint } from '../../../../../../../src/plugins/kibana_react/public'; import { useTrackPageview } from '../../../../../observability/public'; -import { Projection } from '../../../../common/projections'; import { useApmPluginContext } from '../../../context/apm_plugin/use_apm_plugin_context'; -import { FETCH_STATUS, useFetcher } from '../../../hooks/use_fetcher'; -import { useLocalStorage } from '../../../hooks/useLocalStorage'; import { useUrlParams } from '../../../context/url_params_context/use_url_params'; -import { LocalUIFilters } from '../../shared/LocalUIFilters'; +import { useLocalStorage } from '../../../hooks/useLocalStorage'; +import { FETCH_STATUS, useFetcher } from '../../../hooks/use_fetcher'; +import { useUpgradeAssistantHref } from '../../shared/Links/kibana'; import { SearchBar } from '../../shared/search_bar'; import { NoServicesMessage } from './no_services_message'; import { ServiceList } from './ServiceList'; import { MLCallout } from './ServiceList/MLCallout'; import { useAnomalyDetectionJobsFetcher } from './use_anomaly_detection_jobs_fetcher'; -import { useUpgradeAssistantHref } from '../../shared/Links/kibana'; const initialData = { items: [], @@ -100,16 +98,6 @@ export function ServiceInventory() { useTrackPageview({ app: 'apm', path: 'services_overview' }); useTrackPageview({ app: 'apm', path: 'services_overview', delay: 15000 }); - const localFiltersConfig: React.ComponentProps< - typeof LocalUIFilters - > = useMemo( - () => ({ - filterNames: ['host', 'agentName'], - projection: Projection.services, - }), - [] - ); - const { anomalyDetectionJobsData, anomalyDetectionJobsStatus, @@ -132,33 +120,24 @@ export function ServiceInventory() { <> - - - - - - - {displayMlCallout ? ( - - setUserHasDismissedCallout(true)} + + {displayMlCallout ? ( + + setUserHasDismissedCallout(true)} /> + + ) : null} + + + - - ) : null} - - - - } - /> - - - + } + /> + diff --git a/x-pack/plugins/apm/public/components/app/service_inventory/service_inventory.test.tsx b/x-pack/plugins/apm/public/components/app/service_inventory/service_inventory.test.tsx index 647792bb13046..69b4149625824 100644 --- a/x-pack/plugins/apm/public/components/app/service_inventory/service_inventory.test.tsx +++ b/x-pack/plugins/apm/public/components/app/service_inventory/service_inventory.test.tsx @@ -20,7 +20,6 @@ import { MockApmPluginContextWrapper, } from '../../../context/apm_plugin/mock_apm_plugin_context'; import { FETCH_STATUS } from '../../../hooks/use_fetcher'; -import * as useLocalUIFilters from '../../../hooks/useLocalUIFilters'; import * as useDynamicIndexPatternHooks from '../../../hooks/use_dynamic_index_pattern'; import { SessionStorageMock } from '../../../services/__mocks__/SessionStorageMock'; import { MockUrlParamsContextProvider } from '../../../context/url_params_context/mock_url_params_context_provider'; @@ -76,13 +75,6 @@ describe('ServiceInventory', () => { // @ts-expect-error global.sessionStorage = new SessionStorageMock(); - jest.spyOn(useLocalUIFilters, 'useLocalUIFilters').mockReturnValue({ - filters: [], - setFilterValue: () => null, - clearValues: () => null, - status: FETCH_STATUS.SUCCESS, - }); - jest.spyOn(hook, 'useAnomalyDetectionJobsFetcher').mockReturnValue({ anomalyDetectionJobsStatus: FETCH_STATUS.SUCCESS, anomalyDetectionJobsData: { jobs: [], hasLegacyJobs: false }, diff --git a/x-pack/plugins/apm/public/components/app/service_metrics/index.tsx b/x-pack/plugins/apm/public/components/app/service_metrics/index.tsx index d1e6cc0d84ac4..44a5adf31d0b6 100644 --- a/x-pack/plugins/apm/public/components/app/service_metrics/index.tsx +++ b/x-pack/plugins/apm/public/components/app/service_metrics/index.tsx @@ -7,19 +7,17 @@ import { EuiFlexGrid, + EuiFlexGroup, EuiFlexItem, EuiPage, EuiPanel, EuiSpacer, - EuiFlexGroup, } from '@elastic/eui'; -import React, { useMemo } from 'react'; +import React from 'react'; +import { ChartPointerEventContextProvider } from '../../../context/chart_pointer_event/chart_pointer_event_context'; +import { useUrlParams } from '../../../context/url_params_context/use_url_params'; import { useServiceMetricChartsFetcher } from '../../../hooks/use_service_metric_charts_fetcher'; import { MetricsChart } from '../../shared/charts/metrics_chart'; -import { useUrlParams } from '../../../context/url_params_context/use_url_params'; -import { ChartPointerEventContextProvider } from '../../../context/chart_pointer_event/chart_pointer_event_context'; -import { Projection } from '../../../../common/projections'; -import { LocalUIFilters } from '../../shared/LocalUIFilters'; import { SearchBar } from '../../shared/search_bar'; interface ServiceMetricsProps { @@ -37,47 +35,28 @@ export function ServiceMetrics({ }); const { start, end } = urlParams; - const localFiltersConfig: React.ComponentProps< - typeof LocalUIFilters - > = useMemo( - () => ({ - filterNames: ['host', 'containerId', 'podName', 'serviceVersion'], - params: { - serviceName, - }, - projection: Projection.metrics, - showCount: false, - }), - [serviceName] - ); - return ( <> - - - - - - - - {data.charts.map((chart) => ( - - - - - - ))} - - - - + + + + {data.charts.map((chart) => ( + + + + + + ))} + + + diff --git a/x-pack/plugins/apm/public/components/app/ServiceNodeOverview/index.tsx b/x-pack/plugins/apm/public/components/app/service_node_overview/index.tsx similarity index 78% rename from x-pack/plugins/apm/public/components/app/ServiceNodeOverview/index.tsx rename to x-pack/plugins/apm/public/components/app/service_node_overview/index.tsx index 01874c956e8f9..00d184f692e3b 100644 --- a/x-pack/plugins/apm/public/components/app/ServiceNodeOverview/index.tsx +++ b/x-pack/plugins/apm/public/components/app/service_node_overview/index.tsx @@ -4,30 +4,21 @@ * 2.0; you may not use this file except in compliance with the Elastic License * 2.0. */ - -import { - EuiFlexGroup, - EuiFlexItem, - EuiPage, - EuiPanel, - EuiToolTip, -} from '@elastic/eui'; +import { EuiFlexGroup, EuiPage, EuiPanel, EuiToolTip } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; -import React, { useMemo } from 'react'; +import React from 'react'; import styled from 'styled-components'; import { UNIDENTIFIED_SERVICE_NODES_LABEL } from '../../../../common/i18n'; -import { Projection } from '../../../../common/projections'; import { SERVICE_NODE_NAME_MISSING } from '../../../../common/service_nodes'; import { asDynamicBytes, asInteger, asPercent, } from '../../../../common/utils/formatters'; -import { useFetcher } from '../../../hooks/use_fetcher'; import { useUrlParams } from '../../../context/url_params_context/use_url_params'; +import { useFetcher } from '../../../hooks/use_fetcher'; import { px, truncate, unit } from '../../../style/variables'; import { ServiceNodeMetricOverviewLink } from '../../shared/Links/apm/ServiceNodeMetricOverviewLink'; -import { LocalUIFilters } from '../../shared/LocalUIFilters'; import { ITableColumn, ManagedTable } from '../../shared/ManagedTable'; import { SearchBar } from '../../shared/search_bar'; @@ -47,19 +38,6 @@ function ServiceNodeOverview({ serviceName }: ServiceNodeOverviewProps) { const { uiFilters, urlParams } = useUrlParams(); const { start, end } = urlParams; - const localFiltersConfig: React.ComponentProps< - typeof LocalUIFilters - > = useMemo( - () => ({ - filterNames: ['host', 'containerId', 'podName'], - params: { - serviceName, - }, - projection: Projection.serviceNodes, - }), - [serviceName] - ); - const { data: items = [] } = useFetcher( (callApmApi) => { if (!start || !end) { @@ -164,27 +142,22 @@ function ServiceNodeOverview({ serviceName }: ServiceNodeOverviewProps) { <> - - - - - - - - - + + + + diff --git a/x-pack/plugins/apm/public/components/app/TraceOverview/TraceList.tsx b/x-pack/plugins/apm/public/components/app/trace_overview/TraceList.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/TraceOverview/TraceList.tsx rename to x-pack/plugins/apm/public/components/app/trace_overview/TraceList.tsx diff --git a/x-pack/plugins/apm/public/components/app/TraceOverview/index.tsx b/x-pack/plugins/apm/public/components/app/trace_overview/index.tsx similarity index 66% rename from x-pack/plugins/apm/public/components/app/TraceOverview/index.tsx rename to x-pack/plugins/apm/public/components/app/trace_overview/index.tsx index 624aee1e92472..d29dad7a7e3de 100644 --- a/x-pack/plugins/apm/public/components/app/TraceOverview/index.tsx +++ b/x-pack/plugins/apm/public/components/app/trace_overview/index.tsx @@ -6,16 +6,14 @@ */ import { EuiFlexGroup, EuiFlexItem, EuiPage, EuiPanel } from '@elastic/eui'; -import React, { useMemo } from 'react'; +import React from 'react'; import { useTrackPageview } from '../../../../../observability/public'; -import { Projection } from '../../../../common/projections'; -import { FETCH_STATUS, useFetcher } from '../../../hooks/use_fetcher'; import { useUrlParams } from '../../../context/url_params_context/use_url_params'; +import { FETCH_STATUS, useFetcher } from '../../../hooks/use_fetcher'; import { APIReturnType } from '../../../services/rest/createCallApmApi'; -import { LocalUIFilters } from '../../shared/LocalUIFilters'; import { SearchBar } from '../../shared/search_bar'; -import { TraceList } from './TraceList'; import { Correlations } from '../Correlations'; +import { TraceList } from './TraceList'; type TracesAPIResponse = APIReturnType<'GET /api/apm/traces'>; const DEFAULT_RESPONSE: TracesAPIResponse = { @@ -48,32 +46,22 @@ export function TraceOverview() { useTrackPageview({ app: 'apm', path: 'traces_overview' }); useTrackPageview({ app: 'apm', path: 'traces_overview', delay: 15000 }); - const localUIFiltersConfig = useMemo(() => { - const config: React.ComponentProps = { - filterNames: ['transactionResult', 'host', 'containerId', 'podName'], - projection: Projection.traces, - }; - - return config; - }, []); - return ( <> - - - - - - - - - - + + + + + + + + + diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/Distribution/distribution.test.ts b/x-pack/plugins/apm/public/components/app/transaction_details/Distribution/distribution.test.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/TransactionDetails/Distribution/distribution.test.ts rename to x-pack/plugins/apm/public/components/app/transaction_details/Distribution/distribution.test.ts diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/Distribution/index.tsx b/x-pack/plugins/apm/public/components/app/transaction_details/Distribution/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/TransactionDetails/Distribution/index.tsx rename to x-pack/plugins/apm/public/components/app/transaction_details/Distribution/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/ErrorCount.test.tsx b/x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/ErrorCount.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/ErrorCount.test.tsx rename to x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/ErrorCount.test.tsx diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/ErrorCount.tsx b/x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/ErrorCount.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/ErrorCount.tsx rename to x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/ErrorCount.tsx diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/MaybeViewTraceLink.tsx b/x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/MaybeViewTraceLink.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/MaybeViewTraceLink.tsx rename to x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/MaybeViewTraceLink.tsx diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/PercentOfParent.tsx b/x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/PercentOfParent.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/PercentOfParent.tsx rename to x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/PercentOfParent.tsx diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/TransactionTabs.tsx b/x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/TransactionTabs.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/TransactionTabs.tsx rename to x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/TransactionTabs.tsx diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Marks/get_agent_marks.test.ts b/x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Marks/get_agent_marks.test.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Marks/get_agent_marks.test.ts rename to x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Marks/get_agent_marks.test.ts diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Marks/get_agent_marks.ts b/x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Marks/get_agent_marks.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Marks/get_agent_marks.ts rename to x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Marks/get_agent_marks.ts diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Marks/get_error_marks.test.ts b/x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Marks/get_error_marks.test.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Marks/get_error_marks.test.ts rename to x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Marks/get_error_marks.test.ts diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Marks/get_error_marks.ts b/x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Marks/get_error_marks.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Marks/get_error_marks.ts rename to x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Marks/get_error_marks.ts diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Marks/index.ts b/x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Marks/index.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Marks/index.ts rename to x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Marks/index.ts diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/ServiceLegends.tsx b/x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/ServiceLegends.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/ServiceLegends.tsx rename to x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/ServiceLegends.tsx diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/FlyoutTopLevelProperties.tsx b/x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Waterfall/FlyoutTopLevelProperties.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/FlyoutTopLevelProperties.tsx rename to x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Waterfall/FlyoutTopLevelProperties.tsx diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/ResponsiveFlyout.tsx b/x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Waterfall/ResponsiveFlyout.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/ResponsiveFlyout.tsx rename to x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Waterfall/ResponsiveFlyout.tsx diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/SpanFlyout/DatabaseContext.tsx b/x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Waterfall/SpanFlyout/DatabaseContext.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/SpanFlyout/DatabaseContext.tsx rename to x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Waterfall/SpanFlyout/DatabaseContext.tsx diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/SpanFlyout/HttpContext.tsx b/x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Waterfall/SpanFlyout/HttpContext.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/SpanFlyout/HttpContext.tsx rename to x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Waterfall/SpanFlyout/HttpContext.tsx diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/SpanFlyout/StickySpanProperties.tsx b/x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Waterfall/SpanFlyout/StickySpanProperties.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/SpanFlyout/StickySpanProperties.tsx rename to x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Waterfall/SpanFlyout/StickySpanProperties.tsx diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/SpanFlyout/TruncateHeightSection.tsx b/x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Waterfall/SpanFlyout/TruncateHeightSection.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/SpanFlyout/TruncateHeightSection.tsx rename to x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Waterfall/SpanFlyout/TruncateHeightSection.tsx diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/SpanFlyout/index.tsx b/x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Waterfall/SpanFlyout/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/SpanFlyout/index.tsx rename to x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Waterfall/SpanFlyout/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/SyncBadge.stories.tsx b/x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Waterfall/SyncBadge.stories.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/SyncBadge.stories.tsx rename to x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Waterfall/SyncBadge.stories.tsx diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/SyncBadge.tsx b/x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Waterfall/SyncBadge.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/SyncBadge.tsx rename to x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Waterfall/SyncBadge.tsx diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/TransactionFlyout/DroppedSpansWarning.tsx b/x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Waterfall/TransactionFlyout/DroppedSpansWarning.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/TransactionFlyout/DroppedSpansWarning.tsx rename to x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Waterfall/TransactionFlyout/DroppedSpansWarning.tsx diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/TransactionFlyout/index.tsx b/x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Waterfall/TransactionFlyout/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/TransactionFlyout/index.tsx rename to x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Waterfall/TransactionFlyout/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/WaterfallFlyout.tsx b/x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Waterfall/WaterfallFlyout.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/WaterfallFlyout.tsx rename to x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Waterfall/WaterfallFlyout.tsx diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/WaterfallItem.tsx b/x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Waterfall/WaterfallItem.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/WaterfallItem.tsx rename to x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Waterfall/WaterfallItem.tsx diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/accordion_waterfall.tsx b/x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Waterfall/accordion_waterfall.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/accordion_waterfall.tsx rename to x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Waterfall/accordion_waterfall.tsx diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/index.tsx b/x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Waterfall/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/index.tsx rename to x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Waterfall/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/__snapshots__/waterfall_helpers.test.ts.snap b/x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/__snapshots__/waterfall_helpers.test.ts.snap similarity index 100% rename from x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/__snapshots__/waterfall_helpers.test.ts.snap rename to x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/__snapshots__/waterfall_helpers.test.ts.snap diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/mock_responses/spans.json b/x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/mock_responses/spans.json similarity index 100% rename from x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/mock_responses/spans.json rename to x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/mock_responses/spans.json diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/mock_responses/transaction.json b/x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/mock_responses/transaction.json similarity index 100% rename from x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/mock_responses/transaction.json rename to x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/mock_responses/transaction.json diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers.test.ts b/x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers.test.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers.test.ts rename to x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers.test.ts diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers.ts b/x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers.ts rename to x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers.ts diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/WaterfallContainer.stories.tsx b/x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/WaterfallContainer.stories.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/WaterfallContainer.stories.tsx rename to x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/WaterfallContainer.stories.tsx diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/index.tsx b/x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/index.tsx rename to x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/waterfallContainer.stories.data.ts b/x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/waterfallContainer.stories.data.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/waterfallContainer.stories.data.ts rename to x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/waterfallContainer.stories.data.ts diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/index.tsx b/x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/index.tsx rename to x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/index.tsx b/x-pack/plugins/apm/public/components/app/transaction_details/index.tsx similarity index 59% rename from x-pack/plugins/apm/public/components/app/TransactionDetails/index.tsx rename to x-pack/plugins/apm/public/components/app/transaction_details/index.tsx index b155672405b9f..d5f5eed311de8 100644 --- a/x-pack/plugins/apm/public/components/app/TransactionDetails/index.tsx +++ b/x-pack/plugins/apm/public/components/app/transaction_details/index.tsx @@ -14,26 +14,23 @@ import { EuiSpacer, EuiTitle, } from '@elastic/eui'; -import React, { useMemo } from 'react'; -import { isEmpty, flatten } from 'lodash'; -import { useHistory } from 'react-router-dom'; -import { RouteComponentProps } from 'react-router-dom'; +import { flatten, isEmpty } from 'lodash'; +import React from 'react'; +import { RouteComponentProps, useHistory } from 'react-router-dom'; +import { useTrackPageview } from '../../../../../observability/public'; +import { ChartPointerEventContextProvider } from '../../../context/chart_pointer_event/chart_pointer_event_context'; +import { useUrlParams } from '../../../context/url_params_context/use_url_params'; +import { FETCH_STATUS } from '../../../hooks/use_fetcher'; import { useTransactionDistributionFetcher } from '../../../hooks/use_transaction_distribution_fetcher'; -import { useWaterfallFetcher } from './use_waterfall_fetcher'; import { ApmHeader } from '../../shared/ApmHeader'; import { TransactionCharts } from '../../shared/charts/transaction_charts'; -import { TransactionDistribution } from './Distribution'; -import { WaterfallWithSummmary } from './WaterfallWithSummmary'; -import { FETCH_STATUS } from '../../../hooks/use_fetcher'; -import { ChartPointerEventContextProvider } from '../../../context/chart_pointer_event/chart_pointer_event_context'; -import { useTrackPageview } from '../../../../../observability/public'; -import { Projection } from '../../../../common/projections'; -import { fromQuery, toQuery } from '../../shared/Links/url_helpers'; -import { useUrlParams } from '../../../context/url_params_context/use_url_params'; -import { LocalUIFilters } from '../../shared/LocalUIFilters'; import { HeightRetainer } from '../../shared/HeightRetainer'; -import { Correlations } from '../Correlations'; +import { fromQuery, toQuery } from '../../shared/Links/url_helpers'; import { SearchBar } from '../../shared/search_bar'; +import { Correlations } from '../Correlations'; +import { TransactionDistribution } from './Distribution'; +import { useWaterfallFetcher } from './use_waterfall_fetcher'; +import { WaterfallWithSummmary } from './WaterfallWithSummmary'; interface Sample { traceId: string; @@ -46,7 +43,6 @@ export function TransactionDetails({ location, match, }: TransactionDetailsProps) { - const { serviceName } = match.params; const { urlParams } = useUrlParams(); const history = useHistory(); const { @@ -59,24 +55,11 @@ export function TransactionDetails({ exceedsMax, status: waterfallStatus, } = useWaterfallFetcher(); - const { transactionName, transactionType } = urlParams; + const { transactionName } = urlParams; useTrackPageview({ app: 'apm', path: 'transaction_details' }); useTrackPageview({ app: 'apm', path: 'transaction_details', delay: 15000 }); - const localUIFiltersConfig = useMemo(() => { - const config: React.ComponentProps = { - filterNames: ['transactionResult', 'serviceVersion'], - projection: Projection.transactions, - params: { - transactionName, - transactionType, - serviceName, - }, - }; - return config; - }, [transactionName, transactionType, serviceName]); - const selectedSample = flatten( distributionData.buckets.map((bucket) => bucket.samples) ).find( @@ -116,45 +99,45 @@ export function TransactionDetails({ - - - - - - - - - - - - - - { - if (!isEmpty(bucket.samples)) { - selectSampleFromBucketClick(bucket.samples[0]); - } - }} - /> - - - - - - - - + + + + + + + + + + + + + + + { + if (!isEmpty(bucket.samples)) { + selectSampleFromBucketClick(bucket.samples[0]); + } + }} + /> + + + + + + + diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/use_waterfall_fetcher.ts b/x-pack/plugins/apm/public/components/app/transaction_details/use_waterfall_fetcher.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/TransactionDetails/use_waterfall_fetcher.ts rename to x-pack/plugins/apm/public/components/app/transaction_details/use_waterfall_fetcher.ts diff --git a/x-pack/plugins/apm/public/components/app/transaction_overview/index.tsx b/x-pack/plugins/apm/public/components/app/transaction_overview/index.tsx index 08904da396678..1f8b431d072b7 100644 --- a/x-pack/plugins/apm/public/components/app/transaction_overview/index.tsx +++ b/x-pack/plugins/apm/public/components/app/transaction_overview/index.tsx @@ -10,7 +10,6 @@ import { EuiCode, EuiFlexGroup, EuiFlexItem, - EuiHorizontalRule, EuiPage, EuiPanel, EuiSpacer, @@ -19,25 +18,23 @@ import { import { i18n } from '@kbn/i18n'; import { FormattedMessage } from '@kbn/i18n/react'; import { Location } from 'history'; -import React, { useMemo } from 'react'; +import React from 'react'; import { useLocation } from 'react-router-dom'; import { useTrackPageview } from '../../../../../observability/public'; -import { Projection } from '../../../../common/projections'; import { TRANSACTION_PAGE_LOAD } from '../../../../common/transaction_types'; +import { useApmServiceContext } from '../../../context/apm_service/use_apm_service_context'; import { IUrlParams } from '../../../context/url_params_context/types'; -import { useTransactionListFetcher } from './use_transaction_list'; import { useUrlParams } from '../../../context/url_params_context/use_url_params'; import { TransactionCharts } from '../../shared/charts/transaction_charts'; import { ElasticDocsLink } from '../../shared/Links/ElasticDocsLink'; import { fromQuery, toQuery } from '../../shared/Links/url_helpers'; -import { LocalUIFilters } from '../../shared/LocalUIFilters'; -import { TransactionTypeFilter } from '../../shared/LocalUIFilters/TransactionTypeFilter'; import { SearchBar } from '../../shared/search_bar'; +import { TransactionTypeSelect } from '../../shared/transaction_type_select'; import { Correlations } from '../Correlations'; import { TransactionList } from './TransactionList'; import { useRedirect } from './useRedirect'; import { UserExperienceCallout } from './user_experience_callout'; -import { useApmServiceContext } from '../../../context/apm_service/use_apm_service_context'; +import { useTransactionListFetcher } from './use_transaction_list'; function getRedirectLocation({ location, @@ -68,7 +65,7 @@ interface TransactionOverviewProps { export function TransactionOverview({ serviceName }: TransactionOverviewProps) { const location = useLocation(); const { urlParams } = useUrlParams(); - const { transactionType, transactionTypes } = useApmServiceContext(); + const { transactionType } = useApmServiceContext(); // redirect to first transaction type useRedirect(getRedirectLocation({ location, transactionType, urlParams })); @@ -80,27 +77,6 @@ export function TransactionOverview({ serviceName }: TransactionOverviewProps) { transactionListStatus, } = useTransactionListFetcher(); - const localFiltersConfig: React.ComponentProps< - typeof LocalUIFilters - > = useMemo( - () => ({ - shouldFetch: !!transactionType, - filterNames: [ - 'transactionResult', - 'host', - 'containerId', - 'podName', - 'serviceVersion', - ], - params: { - serviceName, - transactionType, - }, - projection: Projection.transactionGroups, - }), - [serviceName, transactionType] - ); - // TODO: improve urlParams typings. // `serviceName` or `transactionType` will never be undefined here, and this check should not be needed if (!serviceName) { @@ -112,74 +88,92 @@ export function TransactionOverview({ serviceName }: TransactionOverviewProps) { - - - - - + + + + + + + +

+ {i18n.translate('xpack.apm.transactionOverviewTitle', { + defaultMessage: 'Transactions', + })} +

+ + + + + + - - - - - {transactionType === TRANSACTION_PAGE_LOAD && ( - <> - - - - )} - - - - -

Transactions

- - - {!transactionListData.isAggregationAccurate && ( - -

- - xpack.apm.ui.transactionGroupBucketSize - - ), - }} - /> + + + + + - - {i18n.translate( - 'xpack.apm.transactionCardinalityWarning.docsLink', - { defaultMessage: 'Learn more in the docs' } - )} - -

- - )} + {transactionType === TRANSACTION_PAGE_LOAD && ( + <> + - - - + + )} + + + + +

Transactions

+ + + {!transactionListData.isAggregationAccurate && ( + +

+ + xpack.apm.ui.transactionGroupBucketSize + + ), + }} + /> + + + {i18n.translate( + 'xpack.apm.transactionCardinalityWarning.docsLink', + { defaultMessage: 'Learn more in the docs' } + )} + +

+ + )} + + + diff --git a/x-pack/plugins/apm/public/components/app/transaction_overview/transaction_overview.test.tsx b/x-pack/plugins/apm/public/components/app/transaction_overview/transaction_overview.test.tsx index e0b1a4cbd05d5..7d0ada3e31bff 100644 --- a/x-pack/plugins/apm/public/components/app/transaction_overview/transaction_overview.test.tsx +++ b/x-pack/plugins/apm/public/components/app/transaction_overview/transaction_overview.test.tsx @@ -136,7 +136,9 @@ describe('TransactionOverview', () => { expect(getByText(container, 'firstType')).toBeInTheDocument(); expect(getByText(container, 'secondType')).toBeInTheDocument(); - fireEvent.click(getByText(container, 'firstType')); + fireEvent.change(getByText(container, 'firstType').parentElement!, { + target: { value: 'firstType' }, + }); expect(history.push).toHaveBeenCalled(); expect(history.location.search).toEqual( diff --git a/x-pack/plugins/apm/public/components/shared/LocalUIFilters/TransactionTypeFilter/index.tsx b/x-pack/plugins/apm/public/components/shared/LocalUIFilters/TransactionTypeFilter/index.tsx deleted file mode 100644 index 19eefca5ee27e..0000000000000 --- a/x-pack/plugins/apm/public/components/shared/LocalUIFilters/TransactionTypeFilter/index.tsx +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import { - EuiHorizontalRule, - EuiRadioGroup, - EuiSpacer, - EuiTitle, -} from '@elastic/eui'; -import { i18n } from '@kbn/i18n'; -import React from 'react'; -import { useHistory } from 'react-router-dom'; -import { useUrlParams } from '../../../../context/url_params_context/use_url_params'; -import { fromQuery, toQuery } from '../../Links/url_helpers'; - -interface Props { - transactionTypes: string[]; -} - -function TransactionTypeFilter({ transactionTypes }: Props) { - const history = useHistory(); - const { - urlParams: { transactionType }, - } = useUrlParams(); - - const options = transactionTypes.map((type) => ({ - id: type, - label: type, - })); - - return ( - <> - -

- {i18n.translate('xpack.apm.localFilters.titles.transactionType', { - defaultMessage: 'Transaction type', - })} -

- - - - - { - const newLocation = { - ...history.location, - search: fromQuery({ - ...toQuery(history.location.search), - transactionType: selectedTransactionType, - }), - }; - history.push(newLocation); - }} - /> - - ); -} - -export { TransactionTypeFilter }; diff --git a/x-pack/plugins/apm/public/components/shared/Summary/DurationSummaryItem.tsx b/x-pack/plugins/apm/public/components/shared/Summary/DurationSummaryItem.tsx index 94fc79dd2164e..1ceccc5203fb2 100644 --- a/x-pack/plugins/apm/public/components/shared/Summary/DurationSummaryItem.tsx +++ b/x-pack/plugins/apm/public/components/shared/Summary/DurationSummaryItem.tsx @@ -9,7 +9,7 @@ import React from 'react'; import { i18n } from '@kbn/i18n'; import { EuiToolTip, EuiText } from '@elastic/eui'; import { asDuration } from '../../../../common/utils/formatters'; -import { PercentOfParent } from '../../app/TransactionDetails/WaterfallWithSummmary/PercentOfParent'; +import { PercentOfParent } from '../../app/transaction_details/WaterfallWithSummmary/PercentOfParent'; interface Props { duration: number; diff --git a/x-pack/plugins/apm/public/components/shared/charts/Timeline/Marker/AgentMarker.test.tsx b/x-pack/plugins/apm/public/components/shared/charts/Timeline/Marker/AgentMarker.test.tsx index 28a581d09908e..1411a264b065e 100644 --- a/x-pack/plugins/apm/public/components/shared/charts/Timeline/Marker/AgentMarker.test.tsx +++ b/x-pack/plugins/apm/public/components/shared/charts/Timeline/Marker/AgentMarker.test.tsx @@ -8,7 +8,7 @@ import { shallow } from 'enzyme'; import React from 'react'; import { AgentMarker } from './AgentMarker'; -import { AgentMark } from '../../../../app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Marks/get_agent_marks'; +import { AgentMark } from '../../../../app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Marks/get_agent_marks'; import { EuiThemeProvider } from '../../../../../../../../../src/plugins/kibana_react/common'; describe('AgentMarker', () => { diff --git a/x-pack/plugins/apm/public/components/shared/charts/Timeline/Marker/AgentMarker.tsx b/x-pack/plugins/apm/public/components/shared/charts/Timeline/Marker/AgentMarker.tsx index f669063f07545..ad8b85ba70c9b 100644 --- a/x-pack/plugins/apm/public/components/shared/charts/Timeline/Marker/AgentMarker.tsx +++ b/x-pack/plugins/apm/public/components/shared/charts/Timeline/Marker/AgentMarker.tsx @@ -12,7 +12,7 @@ import { asDuration } from '../../../../../../common/utils/formatters'; import { useTheme } from '../../../../../hooks/use_theme'; import { px, units } from '../../../../../style/variables'; import { Legend } from '../../Legend'; -import { AgentMark } from '../../../../app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Marks/get_agent_marks'; +import { AgentMark } from '../../../../app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Marks/get_agent_marks'; const NameContainer = styled.div` border-bottom: 1px solid ${({ theme }) => theme.eui.euiColorMediumShade}; diff --git a/x-pack/plugins/apm/public/components/shared/charts/Timeline/Marker/ErrorMarker.test.tsx b/x-pack/plugins/apm/public/components/shared/charts/Timeline/Marker/ErrorMarker.test.tsx index 29e553235e57b..36634f97a3a45 100644 --- a/x-pack/plugins/apm/public/components/shared/charts/Timeline/Marker/ErrorMarker.test.tsx +++ b/x-pack/plugins/apm/public/components/shared/charts/Timeline/Marker/ErrorMarker.test.tsx @@ -14,7 +14,7 @@ import { expectTextsInDocument, renderWithTheme, } from '../../../../../utils/testHelpers'; -import { ErrorMark } from '../../../../app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Marks/get_error_marks'; +import { ErrorMark } from '../../../../app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Marks/get_error_marks'; import { ErrorMarker } from './ErrorMarker'; function Wrapper({ children }: { children?: ReactNode }) { diff --git a/x-pack/plugins/apm/public/components/shared/charts/Timeline/Marker/ErrorMarker.tsx b/x-pack/plugins/apm/public/components/shared/charts/Timeline/Marker/ErrorMarker.tsx index c38cc07955996..393281b2bf848 100644 --- a/x-pack/plugins/apm/public/components/shared/charts/Timeline/Marker/ErrorMarker.tsx +++ b/x-pack/plugins/apm/public/components/shared/charts/Timeline/Marker/ErrorMarker.tsx @@ -16,7 +16,7 @@ import { } from '../../../../../../common/elasticsearch_fieldnames'; import { useUrlParams } from '../../../../../context/url_params_context/use_url_params'; import { px, unit, units } from '../../../../../style/variables'; -import { ErrorMark } from '../../../../app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Marks/get_error_marks'; +import { ErrorMark } from '../../../../app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Marks/get_error_marks'; import { ErrorDetailLink } from '../../../Links/apm/ErrorDetailLink'; import { Legend, Shape } from '../../Legend'; diff --git a/x-pack/plugins/apm/public/components/shared/charts/Timeline/Marker/index.test.tsx b/x-pack/plugins/apm/public/components/shared/charts/Timeline/Marker/index.test.tsx index 16ded0b2402c4..f156d82f05a51 100644 --- a/x-pack/plugins/apm/public/components/shared/charts/Timeline/Marker/index.test.tsx +++ b/x-pack/plugins/apm/public/components/shared/charts/Timeline/Marker/index.test.tsx @@ -8,8 +8,8 @@ import { shallow } from 'enzyme'; import React from 'react'; import { Marker } from './'; -import { AgentMark } from '../../../../app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Marks/get_agent_marks'; -import { ErrorMark } from '../../../../app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Marks/get_error_marks'; +import { AgentMark } from '../../../../app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Marks/get_agent_marks'; +import { ErrorMark } from '../../../../app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Marks/get_error_marks'; describe('Marker', () => { it('renders agent marker', () => { diff --git a/x-pack/plugins/apm/public/components/shared/charts/Timeline/Marker/index.tsx b/x-pack/plugins/apm/public/components/shared/charts/Timeline/Marker/index.tsx index 14688fe7e0c61..b426a10a7562d 100644 --- a/x-pack/plugins/apm/public/components/shared/charts/Timeline/Marker/index.tsx +++ b/x-pack/plugins/apm/public/components/shared/charts/Timeline/Marker/index.tsx @@ -10,8 +10,8 @@ import styled from 'styled-components'; import { px } from '../../../../../style/variables'; import { AgentMarker } from './AgentMarker'; import { ErrorMarker } from './ErrorMarker'; -import { AgentMark } from '../../../../app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Marks/get_agent_marks'; -import { ErrorMark } from '../../../../app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Marks/get_error_marks'; +import { AgentMark } from '../../../../app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Marks/get_agent_marks'; +import { ErrorMark } from '../../../../app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Marks/get_error_marks'; interface Props { mark: ErrorMark | AgentMark; diff --git a/x-pack/plugins/apm/public/components/shared/charts/Timeline/VerticalLines.tsx b/x-pack/plugins/apm/public/components/shared/charts/Timeline/VerticalLines.tsx index 218bdde37abd0..428da80fb808a 100644 --- a/x-pack/plugins/apm/public/components/shared/charts/Timeline/VerticalLines.tsx +++ b/x-pack/plugins/apm/public/components/shared/charts/Timeline/VerticalLines.tsx @@ -8,7 +8,7 @@ import React from 'react'; import { VerticalGridLines, XYPlot } from 'react-vis'; import { useTheme } from '../../../../hooks/use_theme'; -import { Mark } from '../../../app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Marks'; +import { Mark } from '../../../app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Marks'; import { PlotValues } from './plotUtils'; interface VerticalLinesProps { diff --git a/x-pack/plugins/apm/public/components/shared/charts/Timeline/index.tsx b/x-pack/plugins/apm/public/components/shared/charts/Timeline/index.tsx index 84bdd7998cfad..650faa195271c 100644 --- a/x-pack/plugins/apm/public/components/shared/charts/Timeline/index.tsx +++ b/x-pack/plugins/apm/public/components/shared/charts/Timeline/index.tsx @@ -11,8 +11,8 @@ import { makeWidthFlexible } from 'react-vis'; import { getPlotValues } from './plotUtils'; import { TimelineAxis } from './TimelineAxis'; import { VerticalLines } from './VerticalLines'; -import { ErrorMark } from '../../../app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Marks/get_error_marks'; -import { AgentMark } from '../../../app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Marks/get_agent_marks'; +import { ErrorMark } from '../../../app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Marks/get_error_marks'; +import { AgentMark } from '../../../app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Marks/get_agent_marks'; export type Mark = AgentMark | ErrorMark; diff --git a/x-pack/plugins/apm/public/components/shared/search_bar.tsx b/x-pack/plugins/apm/public/components/shared/search_bar.tsx index 296ec3c2d32e9..34ba1d86264c1 100644 --- a/x-pack/plugins/apm/public/components/shared/search_bar.tsx +++ b/x-pack/plugins/apm/public/components/shared/search_bar.tsx @@ -16,7 +16,7 @@ import { useBreakPoints } from '../../hooks/use_break_points'; const SearchBarFlexGroup = styled(EuiFlexGroup)` margin: ${({ theme }) => - `${theme.eui.euiSizeM} ${theme.eui.euiSizeM} -${theme.eui.gutterTypes.gutterMedium} ${theme.eui.euiSizeM}`}; + `${theme.eui.euiSizeS} ${theme.eui.euiSizeS} -${theme.eui.gutterTypes.gutterMedium} ${theme.eui.euiSizeS}`}; `; interface Props { diff --git a/x-pack/plugins/apm/public/components/shared/transaction_type_select.tsx b/x-pack/plugins/apm/public/components/shared/transaction_type_select.tsx new file mode 100644 index 0000000000000..772b42ed13577 --- /dev/null +++ b/x-pack/plugins/apm/public/components/shared/transaction_type_select.tsx @@ -0,0 +1,55 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { EuiSelect } from '@elastic/eui'; +import { i18n } from '@kbn/i18n'; +import React, { FormEvent, useCallback } from 'react'; +import { useHistory } from 'react-router-dom'; +import styled from 'styled-components'; +import { useApmServiceContext } from '../../context/apm_service/use_apm_service_context'; +import { useUrlParams } from '../../context/url_params_context/use_url_params'; +import * as urlHelpers from './Links/url_helpers'; + +// The default transaction type (for non-RUM services) is "request". Set the +// min-width on here to the width when "request" is loaded so it doesn't start +// out collapsed and change its width when the list of transaction types is loaded. +const EuiSelectWithWidth = styled(EuiSelect)` + min-width: 157px; +`; + +export function TransactionTypeSelect() { + const { transactionTypes } = useApmServiceContext(); + const history = useHistory(); + const { + urlParams: { transactionType }, + } = useUrlParams(); + + const handleChange = useCallback( + (event: FormEvent) => { + const selectedTransactionType = event.currentTarget.value; + urlHelpers.push(history, { + query: { transactionType: selectedTransactionType }, + }); + }, + [history] + ); + + const options = transactionTypes.map((t) => ({ text: t, value: t })); + + return ( + <> + + + ); +} diff --git a/x-pack/plugins/apm/server/routes/create_apm_api.ts b/x-pack/plugins/apm/server/routes/create_apm_api.ts index 610442d4ff614..5d580fc0e253a 100644 --- a/x-pack/plugins/apm/server/routes/create_apm_api.ts +++ b/x-pack/plugins/apm/server/routes/create_apm_api.ts @@ -66,15 +66,8 @@ import { transactionThroughputChatsRoute, } from './transactions'; import { - errorGroupsLocalFiltersRoute, - metricsLocalFiltersRoute, - servicesLocalFiltersRoute, - tracesLocalFiltersRoute, - transactionGroupsLocalFiltersRoute, - transactionsLocalFiltersRoute, - serviceNodesLocalFiltersRoute, - uiFiltersEnvironmentsRoute, rumOverviewLocalFiltersRoute, + uiFiltersEnvironmentsRoute, } from './ui_filters'; import { serviceMapRoute, serviceMapServiceNodeRoute } from './service_map'; import { @@ -176,13 +169,6 @@ const createApmApi = () => { .add(transactionThroughputChatsRoute) // UI filters - .add(errorGroupsLocalFiltersRoute) - .add(metricsLocalFiltersRoute) - .add(servicesLocalFiltersRoute) - .add(tracesLocalFiltersRoute) - .add(transactionGroupsLocalFiltersRoute) - .add(transactionsLocalFiltersRoute) - .add(serviceNodesLocalFiltersRoute) .add(uiFiltersEnvironmentsRoute) // Service map diff --git a/x-pack/plugins/apm/server/routes/ui_filters.ts b/x-pack/plugins/apm/server/routes/ui_filters.ts index 9cedbf16e161b..b14a47e302caa 100644 --- a/x-pack/plugins/apm/server/routes/ui_filters.ts +++ b/x-pack/plugins/apm/server/routes/ui_filters.ts @@ -7,29 +7,23 @@ import * as t from 'io-ts'; import { omit } from 'lodash'; +import { jsonRt } from '../../common/runtime_types/json_rt'; +import { LocalUIFilterName } from '../../common/ui_filter'; +import { getSearchAggregatedTransactions } from '../lib/helpers/aggregated_transactions'; +import { getEsFilter } from '../lib/helpers/convert_ui_filters/get_es_filter'; import { - setupRequest, Setup, + setupRequest, SetupTimeRange, } from '../lib/helpers/setup_request'; import { getEnvironments } from '../lib/ui_filters/get_environments'; -import { Projection } from '../projections/typings'; -import { localUIFilterNames } from '../lib/ui_filters/local_ui_filters/config'; -import { getEsFilter } from '../lib/helpers/convert_ui_filters/get_es_filter'; import { getLocalUIFilters } from '../lib/ui_filters/local_ui_filters'; -import { getServicesProjection } from '../projections/services'; -import { getTransactionGroupsProjection } from '../projections/transaction_groups'; -import { getMetricsProjection } from '../projections/metrics'; -import { getErrorGroupsProjection } from '../projections/errors'; -import { getTransactionsProjection } from '../projections/transactions'; -import { createRoute } from './create_route'; -import { uiFiltersRt, rangeRt } from './default_api_types'; -import { jsonRt } from '../../common/runtime_types/json_rt'; -import { getServiceNodesProjection } from '../projections/service_nodes'; +import { localUIFilterNames } from '../lib/ui_filters/local_ui_filters/config'; import { getRumPageLoadTransactionsProjection } from '../projections/rum_page_load_transactions'; -import { getSearchAggregatedTransactions } from '../lib/helpers/aggregated_transactions'; +import { Projection } from '../projections/typings'; +import { createRoute } from './create_route'; +import { rangeRt, uiFiltersRt } from './default_api_types'; import { APMRequestHandlerContext } from './typings'; -import { LocalUIFilterName } from '../../common/ui_filter'; export const uiFiltersEnvironmentsRoute = createRoute({ endpoint: 'GET /api/apm/ui_filters/environments', @@ -122,136 +116,6 @@ function createLocalFiltersRoute< }); } -export const servicesLocalFiltersRoute = createLocalFiltersRoute({ - endpoint: `GET /api/apm/ui_filters/local_filters/services`, - getProjection: async ({ context, setup }) => { - const searchAggregatedTransactions = await getSearchAggregatedTransactions( - setup - ); - - return getServicesProjection({ setup, searchAggregatedTransactions }); - }, - queryRt: t.type({}), -}); - -export const transactionGroupsLocalFiltersRoute = createLocalFiltersRoute({ - endpoint: 'GET /api/apm/ui_filters/local_filters/transactionGroups', - getProjection: async ({ context, setup, query }) => { - const { transactionType, serviceName, transactionName } = query; - - const searchAggregatedTransactions = await getSearchAggregatedTransactions( - setup - ); - - return getTransactionGroupsProjection({ - setup, - options: { - type: 'top_transactions', - transactionType, - serviceName, - transactionName, - searchAggregatedTransactions, - }, - }); - }, - queryRt: t.intersection([ - t.type({ - serviceName: t.string, - transactionType: t.string, - }), - t.partial({ - transactionName: t.string, - }), - ]), -}); - -export const tracesLocalFiltersRoute = createLocalFiltersRoute({ - endpoint: 'GET /api/apm/ui_filters/local_filters/traces', - getProjection: async ({ setup, context }) => { - const searchAggregatedTransactions = await getSearchAggregatedTransactions( - setup - ); - - return getTransactionGroupsProjection({ - setup, - options: { type: 'top_traces', searchAggregatedTransactions }, - }); - }, - queryRt: t.type({}), -}); - -export const transactionsLocalFiltersRoute = createLocalFiltersRoute({ - endpoint: 'GET /api/apm/ui_filters/local_filters/transactions', - getProjection: async ({ context, setup, query }) => { - const { transactionType, serviceName, transactionName } = query; - - const searchAggregatedTransactions = await getSearchAggregatedTransactions( - setup - ); - - return getTransactionsProjection({ - setup, - transactionType, - serviceName, - transactionName, - searchAggregatedTransactions, - }); - }, - queryRt: t.type({ - transactionType: t.string, - transactionName: t.string, - serviceName: t.string, - }), -}); - -export const metricsLocalFiltersRoute = createLocalFiltersRoute({ - endpoint: 'GET /api/apm/ui_filters/local_filters/metrics', - getProjection: ({ setup, query }) => { - const { serviceName, serviceNodeName } = query; - return getMetricsProjection({ - setup, - serviceName, - serviceNodeName, - }); - }, - queryRt: t.intersection([ - t.type({ - serviceName: t.string, - }), - t.partial({ - serviceNodeName: t.string, - }), - ]), -}); - -export const errorGroupsLocalFiltersRoute = createLocalFiltersRoute({ - endpoint: 'GET /api/apm/ui_filters/local_filters/errorGroups', - getProjection: ({ setup, query }) => { - const { serviceName } = query; - return getErrorGroupsProjection({ - setup, - serviceName, - }); - }, - queryRt: t.type({ - serviceName: t.string, - }), -}); - -export const serviceNodesLocalFiltersRoute = createLocalFiltersRoute({ - endpoint: 'GET /api/apm/ui_filters/local_filters/serviceNodes', - getProjection: ({ setup, query }) => { - const { serviceName } = query; - return getServiceNodesProjection({ - setup, - serviceName, - }); - }, - queryRt: t.type({ - serviceName: t.string, - }), -}); - export const rumOverviewLocalFiltersRoute = createLocalFiltersRoute({ endpoint: 'GET /api/apm/ui_filters/local_filters/rumOverview', getProjection: async ({ setup }) => { diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json index cab6973072f24..b472655bf9028 100644 --- a/x-pack/plugins/translations/translations/ja-JP.json +++ b/x-pack/plugins/translations/translations/ja-JP.json @@ -5104,7 +5104,6 @@ "xpack.apm.localFilters.titles.serviceName": "サービス名", "xpack.apm.localFilters.titles.serviceVersion": "サービスバージョン", "xpack.apm.localFilters.titles.transactionResult": "トランザクション結果", - "xpack.apm.localFilters.titles.transactionType": "トランザクションタイプ", "xpack.apm.localFilters.titles.transactionUrl": "Url", "xpack.apm.localFiltersTitle": "フィルター", "xpack.apm.metadataTable.section.agentLabel": "エージェント", diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json index 2bdbfc3d565e5..135aa92fb0b1b 100644 --- a/x-pack/plugins/translations/translations/zh-CN.json +++ b/x-pack/plugins/translations/translations/zh-CN.json @@ -5112,7 +5112,6 @@ "xpack.apm.localFilters.titles.serviceName": "服务名称", "xpack.apm.localFilters.titles.serviceVersion": "服务版本", "xpack.apm.localFilters.titles.transactionResult": "事务结果", - "xpack.apm.localFilters.titles.transactionType": "事务类型", "xpack.apm.localFilters.titles.transactionUrl": "URL", "xpack.apm.localFiltersTitle": "筛选", "xpack.apm.metadataTable.section.agentLabel": "代理", From 82df009fd1db6b9a74f8f7e75018a5b712fa135a Mon Sep 17 00:00:00 2001 From: Jason Stoltzfus Date: Thu, 4 Feb 2021 14:40:19 -0500 Subject: [PATCH 17/69] [App Search] Relevance Tuning logic - actions and selectors only, no listeners (#89313) --- .../components/relevance_tuning/index.ts | 1 + .../relevance_tuning_logic.test.ts | 297 ++++++++++++++++++ .../relevance_tuning_logic.ts | 158 ++++++++++ .../components/relevance_tuning/types.ts | 23 ++ 4 files changed, 479 insertions(+) create mode 100644 x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/relevance_tuning_logic.test.ts create mode 100644 x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/relevance_tuning_logic.ts create mode 100644 x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/types.ts diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/index.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/index.ts index 909d10aae6823..07e53d0d29282 100644 --- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/index.ts +++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/index.ts @@ -7,3 +7,4 @@ export { RELEVANCE_TUNING_TITLE } from './constants'; export { RelevanceTuning } from './relevance_tuning'; +export { RelevanceTuningLogic } from './relevance_tuning_logic'; diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/relevance_tuning_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/relevance_tuning_logic.test.ts new file mode 100644 index 0000000000000..586a845ce382a --- /dev/null +++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/relevance_tuning_logic.test.ts @@ -0,0 +1,297 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { LogicMounter } from '../../../__mocks__'; + +import { BoostType } from './types'; + +import { RelevanceTuningLogic } from './relevance_tuning_logic'; + +describe('RelevanceTuningLogic', () => { + const { mount } = new LogicMounter(RelevanceTuningLogic); + + const searchSettings = { + boosts: { + foo: [ + { + type: 'value' as BoostType, + factor: 5, + }, + ], + }, + search_fields: {}, + }; + const schema = {}; + const schemaConflicts = {}; + const relevanceTuningProps = { + searchSettings, + schema, + schemaConflicts, + }; + const searchResults = [{}, {}]; + + const DEFAULT_VALUES = { + dataLoading: true, + schema: {}, + schemaConflicts: {}, + searchSettings: {}, + unsavedChanges: false, + filterInputValue: '', + query: '', + resultsLoading: false, + searchResults: null, + showSchemaConflictCallout: true, + engineHasSchemaFields: false, + schemaFields: [], + schemaFieldsWithConflicts: [], + filteredSchemaFields: [], + filteredSchemaFieldsWithConflicts: [], + }; + + beforeEach(() => { + jest.clearAllMocks(); + }); + + it('has expected default values', () => { + mount(); + expect(RelevanceTuningLogic.values).toEqual(DEFAULT_VALUES); + }); + + describe('actions', () => { + describe('onInitializeRelevanceTuning', () => { + it('should set searchSettings, schema, & schemaConflicts from the API response, and set dataLoading to false', () => { + mount({ + dataLoading: true, + }); + RelevanceTuningLogic.actions.onInitializeRelevanceTuning(relevanceTuningProps); + + expect(RelevanceTuningLogic.values).toEqual({ + ...DEFAULT_VALUES, + searchSettings, + schema, + dataLoading: false, + schemaConflicts, + }); + }); + }); + + describe('setSearchSettings', () => { + it('should set setSearchSettings and set unsavedChanges to true', () => { + mount({ + unsavedChanges: false, + }); + RelevanceTuningLogic.actions.setSearchSettings(searchSettings); + + expect(RelevanceTuningLogic.values).toEqual({ + ...DEFAULT_VALUES, + searchSettings, + unsavedChanges: true, + }); + }); + }); + + describe('setFilterValue', () => { + it('should set filterInputValue', () => { + mount(); + RelevanceTuningLogic.actions.setFilterValue('foo'); + + expect(RelevanceTuningLogic.values).toEqual({ + ...DEFAULT_VALUES, + filterInputValue: 'foo', + }); + }); + }); + + describe('setSearchQuery', () => { + it('should set query', () => { + mount(); + RelevanceTuningLogic.actions.setSearchQuery('foo'); + + expect(RelevanceTuningLogic.values).toEqual({ + ...DEFAULT_VALUES, + query: 'foo', + }); + }); + }); + + describe('setSearchResults', () => { + it('should set searchResults and set resultLoading to false', () => { + mount({ + resultsLoading: true, + }); + RelevanceTuningLogic.actions.setSearchResults(searchResults); + + expect(RelevanceTuningLogic.values).toEqual({ + ...DEFAULT_VALUES, + searchResults, + resultsLoading: false, + }); + }); + }); + + describe('setResultsLoading', () => { + it('should set resultsLoading', () => { + mount({ + resultsLoading: false, + }); + RelevanceTuningLogic.actions.setResultsLoading(true); + + expect(RelevanceTuningLogic.values).toEqual({ + ...DEFAULT_VALUES, + resultsLoading: true, + }); + }); + }); + + describe('clearSearchResults', () => { + it('should set searchResults', () => { + mount({ + searchResults: [{}], + }); + RelevanceTuningLogic.actions.clearSearchResults(); + + expect(RelevanceTuningLogic.values).toEqual({ + ...DEFAULT_VALUES, + searchResults: null, + }); + }); + }); + + describe('resetSearchSettingsState', () => { + it('should set dataLoading', () => { + mount({ + dataLoading: false, + }); + RelevanceTuningLogic.actions.resetSearchSettingsState(); + + expect(RelevanceTuningLogic.values).toEqual({ + ...DEFAULT_VALUES, + dataLoading: true, + }); + }); + }); + + describe('dismissSchemaConflictCallout', () => { + it('should set showSchemaConflictCallout to false', () => { + mount({ + showSchemaConflictCallout: true, + }); + RelevanceTuningLogic.actions.dismissSchemaConflictCallout(); + + expect(RelevanceTuningLogic.values).toEqual({ + ...DEFAULT_VALUES, + showSchemaConflictCallout: false, + }); + }); + }); + }); + + describe('selectors', () => { + describe('engineHasSchemaFields', () => { + it('should return false if there is only a single field in a schema', () => { + // This is because if a schema only has a single field, it is "id", which we do not + // consider a tunable field. + mount({ + schema: { + id: 'foo', + }, + }); + expect(RelevanceTuningLogic.values.engineHasSchemaFields).toEqual(false); + }); + + it('should return true otherwise', () => { + mount({ + schema: { + id: 'foo', + bar: 'bar', + }, + }); + expect(RelevanceTuningLogic.values.engineHasSchemaFields).toEqual(true); + }); + }); + + describe('schemaFields', () => { + it('should return the list of field names from the schema', () => { + mount({ + schema: { + id: 'foo', + bar: 'bar', + }, + }); + expect(RelevanceTuningLogic.values.schemaFields).toEqual(['id', 'bar']); + }); + }); + + describe('schemaFieldsWithConflicts', () => { + it('should return the list of field names that have schema conflicts', () => { + mount({ + schemaConflicts: { + foo: { + text: ['source_engine_1'], + number: ['source_engine_2'], + }, + }, + }); + expect(RelevanceTuningLogic.values.schemaFieldsWithConflicts).toEqual(['foo']); + }); + }); + + describe('filteredSchemaFields', () => { + it('should return a list of schema field names that contain the text from filterInputValue ', () => { + mount({ + filterInputValue: 'ba', + schema: { + id: 'string', + foo: 'string', + bar: 'string', + baz: 'string', + }, + }); + expect(RelevanceTuningLogic.values.filteredSchemaFields).toEqual(['bar', 'baz']); + }); + + it('should return all schema fields if there is no filter applied', () => { + mount({ + filterTerm: '', + schema: { + id: 'string', + foo: 'string', + bar: 'string', + baz: 'string', + }, + }); + expect(RelevanceTuningLogic.values.filteredSchemaFields).toEqual([ + 'id', + 'foo', + 'bar', + 'baz', + ]); + }); + }); + + describe('filteredSchemaFieldsWithConflicts', () => { + it('should return a list of schema field names that contain the text from filterInputValue, and if that field has a schema conflict', () => { + mount({ + filterInputValue: 'ba', + schema: { + id: 'string', + foo: 'string', + bar: 'string', + baz: 'string', + }, + schemaConflicts: { + bar: { + text: ['source_engine_1'], + number: ['source_engine_2'], + }, + }, + }); + expect(RelevanceTuningLogic.values.filteredSchemaFieldsWithConflicts).toEqual(['bar']); + }); + }); + }); +}); diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/relevance_tuning_logic.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/relevance_tuning_logic.ts new file mode 100644 index 0000000000000..d4ec5e37f6ce5 --- /dev/null +++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/relevance_tuning_logic.ts @@ -0,0 +1,158 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { kea, MakeLogicType } from 'kea'; + +import { Schema, SchemaConflicts } from '../../../shared/types'; + +import { SearchSettings } from './types'; + +interface RelevanceTuningProps { + searchSettings: SearchSettings; + schema: Schema; + schemaConflicts: SchemaConflicts; +} + +interface RelevanceTuningActions { + onInitializeRelevanceTuning(props: RelevanceTuningProps): RelevanceTuningProps; + setSearchSettings(searchSettings: SearchSettings): { searchSettings: SearchSettings }; + setFilterValue(value: string): string; + setSearchQuery(value: string): string; + setSearchResults(searchResults: object[]): object[]; + setResultsLoading(resultsLoading: boolean): boolean; + clearSearchResults(): void; + resetSearchSettingsState(): void; + dismissSchemaConflictCallout(): void; +} + +interface RelevanceTuningValues { + searchSettings: Partial; + schema: Schema; + schemaFields: string[]; + schemaFieldsWithConflicts: string[]; + filteredSchemaFields: string[]; + filteredSchemaFieldsWithConflicts: string[]; + schemaConflicts: SchemaConflicts; + showSchemaConflictCallout: boolean; + engineHasSchemaFields: boolean; + filterInputValue: string; + query: string; + unsavedChanges: boolean; + dataLoading: boolean; + searchResults: object[] | null; + resultsLoading: boolean; +} + +// If the user hasn't entered a filter, then we can skip filtering the array entirely +const filterIfTerm = (array: string[], filterTerm: string): string[] => { + return filterTerm === '' ? array : array.filter((item) => item.includes(filterTerm)); +}; + +export const RelevanceTuningLogic = kea< + MakeLogicType +>({ + path: ['enterprise_search', 'app_search', 'relevance_tuning_logic'], + actions: () => ({ + onInitializeRelevanceTuning: (props) => props, + setSearchSettings: (searchSettings) => ({ searchSettings }), + setFilterValue: (value) => value, + setSearchQuery: (query) => query, + setSearchResults: (searchResults) => searchResults, + setResultsLoading: (resultsLoading) => resultsLoading, + clearSearchResults: true, + resetSearchSettingsState: true, + dismissSchemaConflictCallout: true, + }), + reducers: () => ({ + searchSettings: [ + {}, + { + onInitializeRelevanceTuning: (_, { searchSettings }) => searchSettings, + setSearchSettings: (_, { searchSettings }) => searchSettings, + }, + ], + schema: [ + {}, + { + onInitializeRelevanceTuning: (_, { schema }) => schema, + }, + ], + schemaConflicts: [ + {}, + { + onInitializeRelevanceTuning: (_, { schemaConflicts }) => schemaConflicts, + }, + ], + showSchemaConflictCallout: [ + true, + { + dismissSchemaConflictCallout: () => false, + }, + ], + filterInputValue: [ + '', + { + setFilterValue: (_, filterInputValue) => filterInputValue, + }, + ], + query: [ + '', + { + setSearchQuery: (_, query) => query, + }, + ], + unsavedChanges: [ + false, + { + setSearchSettings: () => true, + }, + ], + + dataLoading: [ + true, + { + onInitializeRelevanceTuning: () => false, + resetSearchSettingsState: () => true, + }, + ], + searchResults: [ + null, + { + clearSearchResults: () => null, + setSearchResults: (_, searchResults) => searchResults, + }, + ], + resultsLoading: [ + false, + { + setResultsLoading: (_, resultsLoading) => resultsLoading, + setSearchResults: () => false, + }, + ], + }), + selectors: ({ selectors }) => ({ + schemaFields: [() => [selectors.schema], (schema: Schema) => Object.keys(schema)], + schemaFieldsWithConflicts: [ + () => [selectors.schemaConflicts], + (schemaConflicts: SchemaConflicts) => Object.keys(schemaConflicts), + ], + filteredSchemaFields: [ + () => [selectors.schemaFields, selectors.filterInputValue], + (schemaFields: string[], filterInputValue: string): string[] => + filterIfTerm(schemaFields, filterInputValue), + ], + filteredSchemaFieldsWithConflicts: [ + () => [selectors.schemaFieldsWithConflicts, selectors.filterInputValue], + (schemaFieldsWithConflicts: string[], filterInputValue: string): string[] => + filterIfTerm(schemaFieldsWithConflicts, filterInputValue), + ], + engineHasSchemaFields: [ + () => [selectors.schema], + (schema: Schema): boolean => Object.keys(schema).length >= 2, + ], + }), +}); diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/types.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/types.ts new file mode 100644 index 0000000000000..25187df89d64c --- /dev/null +++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/types.ts @@ -0,0 +1,23 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +export type BoostType = 'value' | 'functional' | 'proximity'; + +export interface Boost { + type: BoostType; + operation?: string; + function?: string; + newBoost?: boolean; + center?: string | number; + value?: string | number | string[] | number[]; + factor: number; +} + +export interface SearchSettings { + boosts: Record; + search_fields: object; +} From 0ef276dce1dcc33f48450be0acff818d3ae31d42 Mon Sep 17 00:00:00 2001 From: Lisa Cawley Date: Thu, 4 Feb 2021 11:44:57 -0800 Subject: [PATCH 18/69] Use doc link service in more Stack Monitoring pages (#89050) Co-authored-by: igoristic --- ...-plugin-core-public.doclinksstart.links.md | 5 +++ .../public/doc_links/doc_links_service.ts | 13 ++++++ src/core/public/public.api.md | 5 +++ .../public/alerts/lib/alerts_toast.tsx | 16 ++----- .../logs/__snapshots__/reason.test.js.snap | 16 +++---- .../public/components/logs/reason.js | 44 +++++-------------- .../public/components/logs/reason.test.js | 9 ++++ .../flyout/__snapshots__/flyout.test.js.snap | 42 +++++++----------- .../metricbeat_migration/flyout/flyout.js | 5 +-- .../flyout/flyout.test.js | 12 ++++- .../apm/enable_metricbeat_instructions.js | 18 +++----- .../beats/common_beats_instructions.js | 1 - .../beats/enable_metricbeat_instructions.js | 25 ++++------- .../enable_metricbeat_instructions.js | 18 +++----- .../kibana/enable_metricbeat_instructions.js | 18 +++----- .../enable_metricbeat_instructions.js | 18 +++----- .../public/lib/internal_monitoring_toasts.tsx | 16 ++----- 17 files changed, 119 insertions(+), 162 deletions(-) diff --git a/docs/development/core/public/kibana-plugin-core-public.doclinksstart.links.md b/docs/development/core/public/kibana-plugin-core-public.doclinksstart.links.md index 51e8d1a0b6bef..fd46a8a0f82c1 100644 --- a/docs/development/core/public/kibana-plugin-core-public.doclinksstart.links.md +++ b/docs/development/core/public/kibana-plugin-core-public.doclinksstart.links.md @@ -21,6 +21,7 @@ readonly links: { readonly installation: string; readonly configuration: string; readonly elasticsearchOutput: string; + readonly elasticsearchModule: string; readonly startup: string; readonly exportedFields: string; }; @@ -29,6 +30,10 @@ readonly links: { }; readonly metricbeat: { readonly base: string; + readonly configure: string; + readonly httpEndpoint: string; + readonly install: string; + readonly start: string; }; readonly enterpriseSearch: { readonly base: string; diff --git a/src/core/public/doc_links/doc_links_service.ts b/src/core/public/doc_links/doc_links_service.ts index 7fd62d6f02e96..4cb2969a63908 100644 --- a/src/core/public/doc_links/doc_links_service.ts +++ b/src/core/public/doc_links/doc_links_service.ts @@ -39,6 +39,7 @@ export class DocLinksService { base: `${ELASTIC_WEBSITE_URL}guide/en/beats/filebeat/${DOC_LINK_VERSION}`, installation: `${ELASTIC_WEBSITE_URL}guide/en/beats/filebeat/${DOC_LINK_VERSION}/filebeat-installation-configuration.html`, configuration: `${ELASTIC_WEBSITE_URL}guide/en/beats/filebeat/${DOC_LINK_VERSION}/configuring-howto-filebeat.html`, + elasticsearchModule: `${ELASTIC_WEBSITE_URL}guide/en/beats/filebeat/${DOC_LINK_VERSION}/filebeat-module-elasticsearch.html`, elasticsearchOutput: `${ELASTIC_WEBSITE_URL}guide/en/beats/filebeat/${DOC_LINK_VERSION}/elasticsearch-output.html`, startup: `${ELASTIC_WEBSITE_URL}guide/en/beats/filebeat/${DOC_LINK_VERSION}/filebeat-starting.html`, exportedFields: `${ELASTIC_WEBSITE_URL}guide/en/beats/filebeat/${DOC_LINK_VERSION}/exported-fields.html`, @@ -53,6 +54,10 @@ export class DocLinksService { }, metricbeat: { base: `${ELASTIC_WEBSITE_URL}guide/en/beats/metricbeat/${DOC_LINK_VERSION}`, + configure: `${ELASTIC_WEBSITE_URL}guide/en/beats/metricbeat/${DOC_LINK_VERSION}/configuring-howto-metricbeat.html`, + httpEndpoint: `${ELASTIC_WEBSITE_URL}guide/en/beats/metricbeat/${DOC_LINK_VERSION}/http-endpoint.html`, + install: `${ELASTIC_WEBSITE_URL}guide/en/beats/metricbeat/${DOC_LINK_VERSION}/metricbeat-installation-configuration.html`, + start: `${ELASTIC_WEBSITE_URL}guide/en/beats/metricbeat/${DOC_LINK_VERSION}/metricbeat-starting.html`, }, heartbeat: { base: `${ELASTIC_WEBSITE_URL}guide/en/beats/heartbeat/${DOC_LINK_VERSION}`, @@ -193,8 +198,11 @@ export class DocLinksService { alertsKibanaDiskThreshold: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/kibana-alerts.html#kibana-alerts-disk-usage-threshold`, alertsKibanaJvmThreshold: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/kibana-alerts.html#kibana-alerts-jvm-memory-threshold`, alertsKibanaMissingData: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/kibana-alerts.html#kibana-alerts-missing-monitoring-data`, + metricbeatBlog: `${ELASTIC_WEBSITE_URL}blog/external-collection-for-elastic-stack-monitoring-is-now-available-via-metricbeat`, monitorElasticsearch: `${ELASTICSEARCH_DOCS}configuring-metricbeat.html`, monitorKibana: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/monitoring-metricbeat.html`, + monitorLogstash: `${ELASTIC_WEBSITE_URL}guide/en/logstash/${DOC_LINK_VERSION}/monitoring-with-metricbeat.html`, + troubleshootKibana: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/monitor-troubleshooting.html`, }, security: { apiKeyServiceSettings: `${ELASTICSEARCH_DOCS}security-settings.html#api-key-service-settings`, @@ -257,6 +265,7 @@ export interface DocLinksStart { readonly installation: string; readonly configuration: string; readonly elasticsearchOutput: string; + readonly elasticsearchModule: string; readonly startup: string; readonly exportedFields: string; }; @@ -265,6 +274,10 @@ export interface DocLinksStart { }; readonly metricbeat: { readonly base: string; + readonly configure: string; + readonly httpEndpoint: string; + readonly install: string; + readonly start: string; }; readonly enterpriseSearch: { readonly base: string; diff --git a/src/core/public/public.api.md b/src/core/public/public.api.md index 37ebbcaa752af..75ed9aa5f150f 100644 --- a/src/core/public/public.api.md +++ b/src/core/public/public.api.md @@ -474,6 +474,7 @@ export interface DocLinksStart { readonly installation: string; readonly configuration: string; readonly elasticsearchOutput: string; + readonly elasticsearchModule: string; readonly startup: string; readonly exportedFields: string; }; @@ -482,6 +483,10 @@ export interface DocLinksStart { }; readonly metricbeat: { readonly base: string; + readonly configure: string; + readonly httpEndpoint: string; + readonly install: string; + readonly start: string; }; readonly enterpriseSearch: { readonly base: string; diff --git a/x-pack/plugins/monitoring/public/alerts/lib/alerts_toast.tsx b/x-pack/plugins/monitoring/public/alerts/lib/alerts_toast.tsx index 8d889a7a4dc2a..026f172147192 100644 --- a/x-pack/plugins/monitoring/public/alerts/lib/alerts_toast.tsx +++ b/x-pack/plugins/monitoring/public/alerts/lib/alerts_toast.tsx @@ -19,7 +19,7 @@ export interface EnableAlertResponse { } const showTlsAndEncryptionError = () => { - const { ELASTIC_WEBSITE_URL, DOC_LINK_VERSION } = Legacy.shims.docLinks; + const settingsUrl = Legacy.shims.docLinks.links.alerting.generalSettings; Legacy.shims.toastNotifications.addWarning({ title: toMountPoint( @@ -36,11 +36,7 @@ const showTlsAndEncryptionError = () => { })}

- + {i18n.translate('xpack.monitoring.healthCheck.encryptionErrorAction', { defaultMessage: 'Learn how.', })} @@ -51,7 +47,7 @@ const showTlsAndEncryptionError = () => { }; const showUnableToDisableWatcherClusterAlertsError = () => { - const { ELASTIC_WEBSITE_URL, DOC_LINK_VERSION } = Legacy.shims.docLinks; + const settingsUrl = Legacy.shims.docLinks.links.alerting.generalSettings; Legacy.shims.toastNotifications.addWarning({ title: toMountPoint( @@ -68,11 +64,7 @@ const showUnableToDisableWatcherClusterAlertsError = () => { })}

- + {i18n.translate('xpack.monitoring.healthCheck.unableToDisableWatches.action', { defaultMessage: 'Learn more.', })} diff --git a/x-pack/plugins/monitoring/public/components/logs/__snapshots__/reason.test.js.snap b/x-pack/plugins/monitoring/public/components/logs/__snapshots__/reason.test.js.snap index c925ecd1c98ff..40541aeaad4c1 100644 --- a/x-pack/plugins/monitoring/public/components/logs/__snapshots__/reason.test.js.snap +++ b/x-pack/plugins/monitoring/public/components/logs/__snapshots__/reason.test.js.snap @@ -13,7 +13,7 @@ exports[`Logs should render a default message 1`] = ` values={ Object { "link": Click here for more information @@ -67,7 +67,7 @@ exports[`Logs should render with a no cluster found reason 1`] = ` values={ Object { "link": setup @@ -92,7 +92,7 @@ exports[`Logs should render with a no index found reason 1`] = ` values={ Object { "link": setup @@ -117,7 +117,7 @@ exports[`Logs should render with a no index pattern found reason 1`] = ` values={ Object { "link": Filebeat @@ -142,7 +142,7 @@ exports[`Logs should render with a no node found reason 1`] = ` values={ Object { "link": setup @@ -167,7 +167,7 @@ exports[`Logs should render with a no structured logs reason 1`] = ` values={ Object { "link": points to JSON logs @@ -195,7 +195,7 @@ exports[`Logs should render with a no type found reason 1`] = ` values={ Object { "link": these directions diff --git a/x-pack/plugins/monitoring/public/components/logs/reason.js b/x-pack/plugins/monitoring/public/components/logs/reason.js index 538c8934cdaef..512b44c8165b1 100644 --- a/x-pack/plugins/monitoring/public/components/logs/reason.js +++ b/x-pack/plugins/monitoring/public/components/logs/reason.js @@ -13,7 +13,9 @@ import { Legacy } from '../../legacy_shims'; import { Monospace } from '../metricbeat_migration/instruction_steps/components/monospace/monospace'; export const Reason = ({ reason }) => { - const { ELASTIC_WEBSITE_URL, DOC_LINK_VERSION } = Legacy.shims.docLinks; + const filebeatUrl = Legacy.shims.docLinks.links.filebeat.installation; + const elasticsearchUrl = Legacy.shims.docLinks.links.filebeat.elasticsearchModule; + const troubleshootUrl = Legacy.shims.docLinks.links.monitoring.troubleshootKibana; let title = i18n.translate('xpack.monitoring.logs.reason.defaultTitle', { defaultMessage: 'No log data found', }); @@ -23,10 +25,7 @@ export const Reason = ({ reason }) => { defaultMessage="We did not find any log data and we are unable to diagnose why. {link}" values={{ link: ( - + { defaultMessage="Set up {link}, then configure your Elasticsearch output to your monitoring cluster." values={{ link: ( - + {i18n.translate('xpack.monitoring.logs.reason.noIndexPatternLink', { defaultMessage: 'Filebeat', })} @@ -82,10 +78,7 @@ export const Reason = ({ reason }) => { defaultMessage="Follow {link} to set up Elasticsearch." values={{ link: ( - + {i18n.translate('xpack.monitoring.logs.reason.noTypeLink', { defaultMessage: 'these directions', })} @@ -105,10 +98,7 @@ export const Reason = ({ reason }) => { values={{ varPaths: var.paths, link: ( - + {i18n.translate('xpack.monitoring.logs.reason.notUsingStructuredLogsLink', { defaultMessage: 'points to JSON logs', })} @@ -127,10 +117,7 @@ export const Reason = ({ reason }) => { defaultMessage="Check that your {link} is correct." values={{ link: ( - + {i18n.translate('xpack.monitoring.logs.reason.noClusterLink', { defaultMessage: 'setup', })} @@ -149,10 +136,7 @@ export const Reason = ({ reason }) => { defaultMessage="Check that your {link} is correct." values={{ link: ( - + {i18n.translate('xpack.monitoring.logs.reason.noNodeLink', { defaultMessage: 'setup', })} @@ -171,10 +155,7 @@ export const Reason = ({ reason }) => { defaultMessage="We found logs, but none for this index. If this problem continues, check that your {link} is correct." values={{ link: ( - + {i18n.translate('xpack.monitoring.logs.reason.noIndexLink', { defaultMessage: 'setup', })} @@ -193,10 +174,7 @@ export const Reason = ({ reason }) => { defaultMessage="There is an issue reading from your filebeat indices. {link}." values={{ link: ( - + {i18n.translate('xpack.monitoring.logs.reason.correctIndexNameLink', { defaultMessage: 'Click here for more information', })} diff --git a/x-pack/plugins/monitoring/public/components/logs/reason.test.js b/x-pack/plugins/monitoring/public/components/logs/reason.test.js index 53aad5511e0ae..0d75af1d1048f 100644 --- a/x-pack/plugins/monitoring/public/components/logs/reason.test.js +++ b/x-pack/plugins/monitoring/public/components/logs/reason.test.js @@ -15,6 +15,15 @@ jest.mock('../../legacy_shims', () => ({ docLinks: { ELASTIC_WEBSITE_URL: 'https://www.elastic.co/', DOC_LINK_VERSION: 'current', + links: { + filebeat: { + elasticsearchModule: 'jest-metadata-mock-url', + installation: 'jest-metadata-mock-url', + }, + monitoring: { + troubleshootKibana: 'jest-metadata-mock-url', + }, + }, }, }, }, diff --git a/x-pack/plugins/monitoring/public/components/metricbeat_migration/flyout/__snapshots__/flyout.test.js.snap b/x-pack/plugins/monitoring/public/components/metricbeat_migration/flyout/__snapshots__/flyout.test.js.snap index 2f29cd9122a61..1173f36d620d6 100644 --- a/x-pack/plugins/monitoring/public/components/metricbeat_migration/flyout/__snapshots__/flyout.test.js.snap +++ b/x-pack/plugins/monitoring/public/components/metricbeat_migration/flyout/__snapshots__/flyout.test.js.snap @@ -156,7 +156,7 @@ exports[`Flyout apm part two should show instructions to migrate to metricbeat 1 "children":

({ shims: { kfetch: jest.fn(), docLinks: { - ELASTIC_WEBSITE_URL: 'https://www.elastic.co/', - DOC_LINK_VERSION: 'current', + links: { + monitoring: { + monitorKibana: 'jest-metadata-mock-url', + monitorElasticsearch: 'jest-metadata-mock-url', + }, + metricbeat: { + install: 'jest-metadata-mock-url', + configure: 'jest-metadata-mock-url', + }, + }, }, }, }, diff --git a/x-pack/plugins/monitoring/public/components/metricbeat_migration/instruction_steps/apm/enable_metricbeat_instructions.js b/x-pack/plugins/monitoring/public/components/metricbeat_migration/instruction_steps/apm/enable_metricbeat_instructions.js index 1006468d0c736..a0b5468cb9c77 100644 --- a/x-pack/plugins/monitoring/public/components/metricbeat_migration/instruction_steps/apm/enable_metricbeat_instructions.js +++ b/x-pack/plugins/monitoring/public/components/metricbeat_migration/instruction_steps/apm/enable_metricbeat_instructions.js @@ -14,10 +14,10 @@ import { Legacy } from '../../../../legacy_shims'; import { getMigrationStatusStep, getSecurityStep } from '../common_instructions'; export function getApmInstructionsForEnablingMetricbeat(product, _meta, { esMonitoringUrl }) { - const { ELASTIC_WEBSITE_URL, DOC_LINK_VERSION } = Legacy.shims.docLinks; - const securitySetup = getSecurityStep( - `${ELASTIC_WEBSITE_URL}guide/en/beats/metricbeat/${DOC_LINK_VERSION}/configuring-howto-metricbeat.html` - ); + const metricbeatConfigUrl = Legacy.shims.docLinks.links.metricbeat.configure; + const metricbeatInstallUrl = Legacy.shims.docLinks.links.metricbeat.install; + const metricbeatStartUrl = Legacy.shims.docLinks.links.metricbeat.start; + const securitySetup = getSecurityStep(metricbeatConfigUrl); const installMetricbeatStep = { title: i18n.translate( @@ -29,10 +29,7 @@ export function getApmInstructionsForEnablingMetricbeat(product, _meta, { esMoni children: (

- +

- +

- +

- +

- +

- +

- +

- +

- +

- + }); const showIfLegacyOnlyIndices = () => { - const { ELASTIC_WEBSITE_URL } = Legacy.shims.docLinks; + const blogUrl = Legacy.shims.docLinks.links.monitoring.metricbeatBlog; const toast = Legacy.shims.toastNotifications.addWarning({ title: toMountPoint( { - + {learnMoreLabel()}

@@ -69,7 +65,7 @@ const showIfLegacyOnlyIndices = () => { }; const showIfLegacyAndMetricbeatIndices = () => { - const { ELASTIC_WEBSITE_URL } = Legacy.shims.docLinks; + const blogUrl = Legacy.shims.docLinks.links.monitoring.metricbeatBlog; const toast = Legacy.shims.toastNotifications.addWarning({ title: toMountPoint( { - + {learnMoreLabel()}
From 2955d65a18169308259c357078b8b843e8ca87a2 Mon Sep 17 00:00:00 2001 From: Constance Date: Thu, 4 Feb 2021 11:46:47 -0800 Subject: [PATCH 19/69] [Enterprise Search] Refactor MockRouter test helper to not store payload (#90206) * Update MockRouter to not pass/set a this.payload - but instead intelligently validate payloads based on the request keys * Fix relevance tuning API routes to not need a separate mock router for validating query & body * Update all remaining tests to no longer pass a payload param to MockRouter --- .../server/__mocks__/router.mock.ts | 16 +++++++--------- .../server/routes/app_search/analytics.test.ts | 2 -- .../routes/app_search/credentials.test.ts | 4 ---- .../server/routes/app_search/documents.test.ts | 1 - .../server/routes/app_search/engines.test.ts | 1 - .../routes/app_search/search_settings.test.ts | 17 ++--------------- .../server/routes/app_search/settings.test.ts | 1 - .../routes/enterprise_search/telemetry.test.ts | 1 - .../routes/workplace_search/groups.test.ts | 7 ------- .../routes/workplace_search/overview.test.ts | 1 - .../routes/workplace_search/security.test.ts | 2 -- .../routes/workplace_search/settings.test.ts | 2 -- .../routes/workplace_search/sources.test.ts | 17 ----------------- 13 files changed, 9 insertions(+), 63 deletions(-) diff --git a/x-pack/plugins/enterprise_search/server/__mocks__/router.mock.ts b/x-pack/plugins/enterprise_search/server/__mocks__/router.mock.ts index 7fde7934cf7ad..88cf30bb2a549 100644 --- a/x-pack/plugins/enterprise_search/server/__mocks__/router.mock.ts +++ b/x-pack/plugins/enterprise_search/server/__mocks__/router.mock.ts @@ -23,7 +23,6 @@ type PayloadType = 'params' | 'query' | 'body'; interface IMockRouter { method: MethodType; path: string; - payload?: PayloadType; } interface IMockRouterRequest { body?: object; @@ -39,11 +38,10 @@ export class MockRouter { public payload?: PayloadType; public response = httpServerMock.createResponseFactory(); - constructor({ method, path, payload }: IMockRouter) { + constructor({ method, path }: IMockRouter) { this.createRouter(); this.method = method; this.path = path; - this.payload = payload; } public createRouter = () => { @@ -62,16 +60,17 @@ export class MockRouter { */ public validateRoute = (request: MockRouterRequest) => { - if (!this.payload) throw new Error('Cannot validate wihout a payload type specified.'); - const route = this.findRouteRegistration(); const [config] = route; const validate = config.validate as RouteValidatorConfig<{}, {}, {}>; + const payloads = Object.keys(request) as PayloadType[]; - const payloadValidation = validate[this.payload] as { validate(request: KibanaRequest): void }; - const payloadRequest = request[this.payload] as KibanaRequest; + payloads.forEach((payload: PayloadType) => { + const payloadValidation = validate[payload] as { validate(request: KibanaRequest): void }; + const payloadRequest = request[payload] as KibanaRequest; - payloadValidation.validate(payloadRequest); + payloadValidation.validate(payloadRequest); + }); }; public shouldValidate = (request: MockRouterRequest) => { @@ -99,7 +98,6 @@ export class MockRouter { // const mockRouter = new MockRouter({ // method: 'get', // path: '/api/app_search/test', -// payload: 'body' // }); // // beforeEach(() => { diff --git a/x-pack/plugins/enterprise_search/server/routes/app_search/analytics.test.ts b/x-pack/plugins/enterprise_search/server/routes/app_search/analytics.test.ts index 3d63e4044e75b..8e4a7dba165b1 100644 --- a/x-pack/plugins/enterprise_search/server/routes/app_search/analytics.test.ts +++ b/x-pack/plugins/enterprise_search/server/routes/app_search/analytics.test.ts @@ -18,7 +18,6 @@ describe('analytics routes', () => { mockRouter = new MockRouter({ method: 'get', path: '/api/app_search/engines/{engineName}/analytics/queries', - payload: 'query', }); registerAnalyticsRoutes({ @@ -71,7 +70,6 @@ describe('analytics routes', () => { mockRouter = new MockRouter({ method: 'get', path: '/api/app_search/engines/{engineName}/analytics/queries/{query}', - payload: 'query', }); registerAnalyticsRoutes({ diff --git a/x-pack/plugins/enterprise_search/server/routes/app_search/credentials.test.ts b/x-pack/plugins/enterprise_search/server/routes/app_search/credentials.test.ts index 7a513b1c76b4e..d9e84d3e62f28 100644 --- a/x-pack/plugins/enterprise_search/server/routes/app_search/credentials.test.ts +++ b/x-pack/plugins/enterprise_search/server/routes/app_search/credentials.test.ts @@ -18,7 +18,6 @@ describe('credentials routes', () => { mockRouter = new MockRouter({ method: 'get', path: '/api/app_search/credentials', - payload: 'query', }); registerCredentialsRoutes({ @@ -54,7 +53,6 @@ describe('credentials routes', () => { mockRouter = new MockRouter({ method: 'post', path: '/api/app_search/credentials', - payload: 'body', }); registerCredentialsRoutes({ @@ -167,7 +165,6 @@ describe('credentials routes', () => { mockRouter = new MockRouter({ method: 'get', path: '/api/app_search/credentials/details', - payload: 'query', }); registerCredentialsRoutes({ @@ -191,7 +188,6 @@ describe('credentials routes', () => { mockRouter = new MockRouter({ method: 'put', path: '/api/app_search/credentials/{name}', - payload: 'body', }); registerCredentialsRoutes({ diff --git a/x-pack/plugins/enterprise_search/server/routes/app_search/documents.test.ts b/x-pack/plugins/enterprise_search/server/routes/app_search/documents.test.ts index fdae51444bb54..af54d340ad150 100644 --- a/x-pack/plugins/enterprise_search/server/routes/app_search/documents.test.ts +++ b/x-pack/plugins/enterprise_search/server/routes/app_search/documents.test.ts @@ -18,7 +18,6 @@ describe('documents routes', () => { mockRouter = new MockRouter({ method: 'post', path: '/api/app_search/engines/{engineName}/documents', - payload: 'body', }); registerDocumentsRoutes({ diff --git a/x-pack/plugins/enterprise_search/server/routes/app_search/engines.test.ts b/x-pack/plugins/enterprise_search/server/routes/app_search/engines.test.ts index e874a188a10f7..abd26e18c7b9d 100644 --- a/x-pack/plugins/enterprise_search/server/routes/app_search/engines.test.ts +++ b/x-pack/plugins/enterprise_search/server/routes/app_search/engines.test.ts @@ -29,7 +29,6 @@ describe('engine routes', () => { mockRouter = new MockRouter({ method: 'get', path: '/api/app_search/engines', - payload: 'query', }); registerEnginesRoutes({ diff --git a/x-pack/plugins/enterprise_search/server/routes/app_search/search_settings.test.ts b/x-pack/plugins/enterprise_search/server/routes/app_search/search_settings.test.ts index 92a695af12aaa..d8f677e2f0d82 100644 --- a/x-pack/plugins/enterprise_search/server/routes/app_search/search_settings.test.ts +++ b/x-pack/plugins/enterprise_search/server/routes/app_search/search_settings.test.ts @@ -87,7 +87,6 @@ describe('search settings routes', () => { const mockRouter = new MockRouter({ method: 'put', path: '/api/app_search/engines/{engineName}/search_settings', - payload: 'body', }); beforeEach(() => { @@ -149,7 +148,6 @@ describe('search settings routes', () => { const mockRouter = new MockRouter({ method: 'post', path: '/api/app_search/engines/{engineName}/search_settings_search', - payload: 'body', }); beforeEach(() => { @@ -188,29 +186,18 @@ describe('search settings routes', () => { }); describe('validates query', () => { - const queryRouter = new MockRouter({ - method: 'post', - path: '/api/app_search/engines/{engineName}/search_settings_search', - payload: 'query', - }); - it('correctly', () => { - registerSearchSettingsRoutes({ - ...mockDependencies, - router: queryRouter.router, - }); - const request = { query: { query: 'foo', }, }; - queryRouter.shouldValidate(request); + mockRouter.shouldValidate(request); }); it('missing required fields', () => { const request = { query: {} }; - queryRouter.shouldThrow(request); + mockRouter.shouldThrow(request); }); }); }); diff --git a/x-pack/plugins/enterprise_search/server/routes/app_search/settings.test.ts b/x-pack/plugins/enterprise_search/server/routes/app_search/settings.test.ts index 5d56bbf4fcd11..6df9a4f16d710 100644 --- a/x-pack/plugins/enterprise_search/server/routes/app_search/settings.test.ts +++ b/x-pack/plugins/enterprise_search/server/routes/app_search/settings.test.ts @@ -41,7 +41,6 @@ describe('log settings routes', () => { mockRouter = new MockRouter({ method: 'put', path: '/api/app_search/log_settings', - payload: 'body', }); registerSettingsRoutes({ diff --git a/x-pack/plugins/enterprise_search/server/routes/enterprise_search/telemetry.test.ts b/x-pack/plugins/enterprise_search/server/routes/enterprise_search/telemetry.test.ts index f41ad367839c3..08c398ba3eb0d 100644 --- a/x-pack/plugins/enterprise_search/server/routes/enterprise_search/telemetry.test.ts +++ b/x-pack/plugins/enterprise_search/server/routes/enterprise_search/telemetry.test.ts @@ -29,7 +29,6 @@ describe('Enterprise Search Telemetry API', () => { mockRouter = new MockRouter({ method: 'put', path: '/api/enterprise_search/stats', - payload: 'body', }); registerTelemetryRoute({ diff --git a/x-pack/plugins/enterprise_search/server/routes/workplace_search/groups.test.ts b/x-pack/plugins/enterprise_search/server/routes/workplace_search/groups.test.ts index e67ca4c064886..68a9ae725f8a4 100644 --- a/x-pack/plugins/enterprise_search/server/routes/workplace_search/groups.test.ts +++ b/x-pack/plugins/enterprise_search/server/routes/workplace_search/groups.test.ts @@ -26,7 +26,6 @@ describe('groups routes', () => { mockRouter = new MockRouter({ method: 'get', path: '/api/workplace_search/groups', - payload: 'query', }); registerGroupsRoute({ @@ -50,7 +49,6 @@ describe('groups routes', () => { mockRouter = new MockRouter({ method: 'post', path: '/api/workplace_search/groups', - payload: 'body', }); registerGroupsRoute({ @@ -85,7 +83,6 @@ describe('groups routes', () => { mockRouter = new MockRouter({ method: 'post', path: '/api/workplace_search/groups/search', - payload: 'body', }); registerSearchGroupsRoute({ @@ -163,7 +160,6 @@ describe('groups routes', () => { mockRouter = new MockRouter({ method: 'put', path: '/api/workplace_search/groups/{id}', - payload: 'body', }); registerGroupRoute({ @@ -246,7 +242,6 @@ describe('groups routes', () => { mockRouter = new MockRouter({ method: 'post', path: '/api/workplace_search/groups/{id}/share', - payload: 'body', }); registerShareGroupRoute({ @@ -282,7 +277,6 @@ describe('groups routes', () => { mockRouter = new MockRouter({ method: 'post', path: '/api/workplace_search/groups/{id}/assign', - payload: 'body', }); registerAssignGroupRoute({ @@ -318,7 +312,6 @@ describe('groups routes', () => { mockRouter = new MockRouter({ method: 'put', path: '/api/workplace_search/groups/{id}/boosts', - payload: 'body', }); registerBoostsGroupRoute({ diff --git a/x-pack/plugins/enterprise_search/server/routes/workplace_search/overview.test.ts b/x-pack/plugins/enterprise_search/server/routes/workplace_search/overview.test.ts index 1afb85b389b42..bdf885648dff7 100644 --- a/x-pack/plugins/enterprise_search/server/routes/workplace_search/overview.test.ts +++ b/x-pack/plugins/enterprise_search/server/routes/workplace_search/overview.test.ts @@ -18,7 +18,6 @@ describe('Overview route', () => { mockRouter = new MockRouter({ method: 'get', path: '/api/workplace_search/overview', - payload: 'query', }); registerOverviewRoute({ diff --git a/x-pack/plugins/enterprise_search/server/routes/workplace_search/security.test.ts b/x-pack/plugins/enterprise_search/server/routes/workplace_search/security.test.ts index f2117a8bc948a..a1615499c56a2 100644 --- a/x-pack/plugins/enterprise_search/server/routes/workplace_search/security.test.ts +++ b/x-pack/plugins/enterprise_search/server/routes/workplace_search/security.test.ts @@ -45,7 +45,6 @@ describe('security routes', () => { mockRouter = new MockRouter({ method: 'get', path: '/api/workplace_search/org/security/source_restrictions', - payload: 'body', }); registerSecuritySourceRestrictionsRoute({ @@ -72,7 +71,6 @@ describe('security routes', () => { mockRouter = new MockRouter({ method: 'patch', path: '/api/workplace_search/org/security/source_restrictions', - payload: 'body', }); registerSecuritySourceRestrictionsRoute({ diff --git a/x-pack/plugins/enterprise_search/server/routes/workplace_search/settings.test.ts b/x-pack/plugins/enterprise_search/server/routes/workplace_search/settings.test.ts index cf654918beb49..00a5b6c75df0a 100644 --- a/x-pack/plugins/enterprise_search/server/routes/workplace_search/settings.test.ts +++ b/x-pack/plugins/enterprise_search/server/routes/workplace_search/settings.test.ts @@ -45,7 +45,6 @@ describe('settings routes', () => { mockRouter = new MockRouter({ method: 'put', path: '/api/workplace_search/org/settings/customize', - payload: 'body', }); registerOrgSettingsCustomizeRoute({ @@ -76,7 +75,6 @@ describe('settings routes', () => { mockRouter = new MockRouter({ method: 'put', path: '/api/workplace_search/org/settings/oauth_application', - payload: 'body', }); registerOrgSettingsOauthApplicationRoute({ diff --git a/x-pack/plugins/enterprise_search/server/routes/workplace_search/sources.test.ts b/x-pack/plugins/enterprise_search/server/routes/workplace_search/sources.test.ts index 2ae10e85ea9c0..a2fbe759f1a11 100644 --- a/x-pack/plugins/enterprise_search/server/routes/workplace_search/sources.test.ts +++ b/x-pack/plugins/enterprise_search/server/routes/workplace_search/sources.test.ts @@ -154,7 +154,6 @@ describe('sources routes', () => { mockRouter = new MockRouter({ method: 'post', path: '/api/workplace_search/account/create_source', - payload: 'body', }); registerAccountCreateSourceRoute({ @@ -194,7 +193,6 @@ describe('sources routes', () => { mockRouter = new MockRouter({ method: 'post', path: '/api/workplace_search/account/sources/{id}/documents', - payload: 'body', }); registerAccountSourceDocumentsRoute({ @@ -281,7 +279,6 @@ describe('sources routes', () => { mockRouter = new MockRouter({ method: 'patch', path: '/api/workplace_search/account/sources/{id}/settings', - payload: 'body', }); registerAccountSourceSettingsRoute({ @@ -364,7 +361,6 @@ describe('sources routes', () => { mockRouter = new MockRouter({ method: 'put', path: '/api/workplace_search/account/sources/{id}/searchable', - payload: 'body', }); registerAccountSourceSearchableRoute({ @@ -422,7 +418,6 @@ describe('sources routes', () => { mockRouter = new MockRouter({ method: 'post', path: '/api/workplace_search/account/sources/{id}/display_settings/config', - payload: 'body', }); registerAccountSourceDisplaySettingsConfig({ @@ -489,7 +484,6 @@ describe('sources routes', () => { mockRouter = new MockRouter({ method: 'post', path: '/api/workplace_search/account/sources/{id}/schemas', - payload: 'body', }); registerAccountSourceSchemasRoute({ @@ -667,7 +661,6 @@ describe('sources routes', () => { mockRouter = new MockRouter({ method: 'post', path: '/api/workplace_search/org/create_source', - payload: 'body', }); registerOrgCreateSourceRoute({ @@ -707,7 +700,6 @@ describe('sources routes', () => { mockRouter = new MockRouter({ method: 'post', path: '/api/workplace_search/org/sources/{id}/documents', - payload: 'body', }); registerOrgSourceDocumentsRoute({ @@ -794,7 +786,6 @@ describe('sources routes', () => { mockRouter = new MockRouter({ method: 'patch', path: '/api/workplace_search/org/sources/{id}/settings', - payload: 'body', }); registerOrgSourceSettingsRoute({ @@ -877,7 +868,6 @@ describe('sources routes', () => { mockRouter = new MockRouter({ method: 'put', path: '/api/workplace_search/org/sources/{id}/searchable', - payload: 'body', }); registerOrgSourceSearchableRoute({ @@ -935,7 +925,6 @@ describe('sources routes', () => { mockRouter = new MockRouter({ method: 'post', path: '/api/workplace_search/org/sources/{id}/display_settings/config', - payload: 'body', }); registerOrgSourceDisplaySettingsConfig({ @@ -1002,7 +991,6 @@ describe('sources routes', () => { mockRouter = new MockRouter({ method: 'post', path: '/api/workplace_search/org/sources/{id}/schemas', - payload: 'body', }); registerOrgSourceSchemasRoute({ @@ -1102,7 +1090,6 @@ describe('sources routes', () => { mockRouter = new MockRouter({ method: 'post', path: '/api/workplace_search/org/settings/connectors', - payload: 'body', }); registerOrgSourceOauthConfigurationsRoute({ @@ -1133,7 +1120,6 @@ describe('sources routes', () => { mockRouter = new MockRouter({ method: 'put', path: '/api/workplace_search/org/settings/connectors', - payload: 'body', }); registerOrgSourceOauthConfigurationsRoute({ @@ -1187,7 +1173,6 @@ describe('sources routes', () => { mockRouter = new MockRouter({ method: 'post', path: '/api/workplace_search/org/settings/connectors/{serviceType}', - payload: 'body', }); registerOrgSourceOauthConfigurationRoute({ @@ -1218,7 +1203,6 @@ describe('sources routes', () => { mockRouter = new MockRouter({ method: 'put', path: '/api/workplace_search/org/settings/connectors/{serviceType}', - payload: 'body', }); registerOrgSourceOauthConfigurationRoute({ @@ -1272,7 +1256,6 @@ describe('sources routes', () => { mockRouter = new MockRouter({ method: 'get', path: '/api/workplace_search/sources/create', - payload: 'query', }); registerOauthConnectorParamsRoute({ From 284842dc88d0befdbcff59907b57b6c6633b40c0 Mon Sep 17 00:00:00 2001 From: Scotty Bollinger Date: Thu, 4 Feb 2021 13:58:44 -0600 Subject: [PATCH 20/69] [Workplace Search] Fix Source Settings bug (#90242) * Remove comment Verified that this works as expected * Replaces usage from SourceLogic to AddSourceLogic * Remove unused duplicate code Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> --- .../components/source_settings.tsx | 15 +++--- .../content_sources/source_logic.test.ts | 48 +------------------ .../views/content_sources/source_logic.ts | 42 ---------------- .../settings/components/source_config.tsx | 11 ++--- 4 files changed, 14 insertions(+), 102 deletions(-) diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/source_settings.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/source_settings.tsx index dbde764a56861..2fa00c7f029f1 100644 --- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/source_settings.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/source_settings.tsx @@ -48,30 +48,31 @@ import { ViewContentHeader } from '../../../components/shared/view_content_heade import { SourceDataItem } from '../../../types'; import { AppLogic } from '../../../app_logic'; +import { AddSourceLogic } from '../components/add_source/add_source_logic'; import { staticSourceData } from '../source_data'; import { SourceLogic } from '../source_logic'; export const SourceSettings: React.FC = () => { - const { - updateContentSource, - removeContentSource, - resetSourceState, - getSourceConfigData, - } = useActions(SourceLogic); + const { updateContentSource, removeContentSource, resetSourceState } = useActions(SourceLogic); + const { getSourceConfigData } = useActions(AddSourceLogic); const { contentSource: { name, id, serviceType }, buttonLoading, - sourceConfigData: { configuredFields }, } = useValues(SourceLogic); + const { + sourceConfigData: { configuredFields }, + } = useValues(AddSourceLogic); + const { isOrganization } = useValues(AppLogic); useEffect(() => { getSourceConfigData(serviceType); return resetSourceState; }, []); + const { configuration: { isPublicKey }, editPath, diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/source_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/source_logic.test.ts index bf5ec5a949b8d..15df7ddc99395 100644 --- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/source_logic.test.ts +++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/source_logic.test.ts @@ -18,11 +18,7 @@ jest.mock('../../app_logic', () => ({ AppLogic: { values: { isOrganization: true } }, })); -import { - fullContentSources, - sourceConfigData, - contentItems, -} from '../../__mocks__/content_sources.mock'; +import { fullContentSources, contentItems } from '../../__mocks__/content_sources.mock'; import { meta } from '../../__mocks__/meta.mock'; import { DEFAULT_META } from '../../../shared/constants'; @@ -46,7 +42,6 @@ describe('SourceLogic', () => { const defaultValues = { contentSource: {}, contentItems: [], - sourceConfigData: {}, dataLoading: true, sectionLoading: true, buttonLoading: false, @@ -88,13 +83,6 @@ describe('SourceLogic', () => { expect(setSuccessMessage).toHaveBeenCalled(); }); - it('setSourceConfigData', () => { - SourceLogic.actions.setSourceConfigData(sourceConfigData); - - expect(SourceLogic.values.sourceConfigData).toEqual(sourceConfigData); - expect(SourceLogic.values.dataLoading).toEqual(false); - }); - it('setSearchResults', () => { SourceLogic.actions.setSearchResults(searchServerResponse); @@ -402,40 +390,6 @@ describe('SourceLogic', () => { }); }); - describe('getSourceConfigData', () => { - const serviceType = 'github'; - - it('calls API and sets values', async () => { - AppLogic.values.isOrganization = true; - - const setSourceConfigDataSpy = jest.spyOn(SourceLogic.actions, 'setSourceConfigData'); - const promise = Promise.resolve(contentSource); - http.get.mockReturnValue(promise); - SourceLogic.actions.getSourceConfigData(serviceType); - - expect(http.get).toHaveBeenCalledWith( - `/api/workplace_search/org/settings/connectors/${serviceType}` - ); - await promise; - expect(setSourceConfigDataSpy).toHaveBeenCalled(); - }); - - it('handles error', async () => { - const error = { - response: { - error: 'this is an error', - status: 400, - }, - }; - const promise = Promise.reject(error); - http.get.mockReturnValue(promise); - SourceLogic.actions.getSourceConfigData(serviceType); - await expectedAsyncError(promise); - - expect(flashAPIErrors).toHaveBeenCalledWith(error); - }); - }); - it('resetSourceState', () => { SourceLogic.actions.resetSourceState(); diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/source_logic.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/source_logic.ts index 1eef715350848..c1f5d6033543f 100644 --- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/source_logic.ts +++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/source_logic.ts @@ -27,7 +27,6 @@ import { ContentSourceFullData, Meta, DocumentSummaryItem, SourceContentItem } f export interface SourceActions { onInitializeSource(contentSource: ContentSourceFullData): ContentSourceFullData; onUpdateSourceName(name: string): string; - setSourceConfigData(sourceConfigData: SourceConfigData): SourceConfigData; setSearchResults(searchResultsResponse: SearchResultsResponse): SearchResultsResponse; initializeFederatedSummary(sourceId: string): { sourceId: string }; onUpdateSummary(summary: DocumentSummaryItem[]): DocumentSummaryItem[]; @@ -41,28 +40,9 @@ export interface SourceActions { resetSourceState(): void; removeContentSource(sourceId: string): { sourceId: string }; initializeSource(sourceId: string): { sourceId: string }; - getSourceConfigData(serviceType: string): { serviceType: string }; setButtonNotLoading(): void; } -interface SourceConfigData { - serviceType: string; - name: string; - configured: boolean; - categories: string[]; - needsPermissions?: boolean; - privateSourcesEnabled: boolean; - configuredFields: { - publicKey: string; - privateKey: string; - consumerKey: string; - baseUrl?: string; - clientId?: string; - clientSecret?: string; - }; - accountContextOnly?: boolean; -} - interface SourceValues { contentSource: ContentSourceFullData; dataLoading: boolean; @@ -71,7 +51,6 @@ interface SourceValues { contentItems: SourceContentItem[]; contentMeta: Meta; contentFilterValue: string; - sourceConfigData: SourceConfigData; } interface SearchResultsResponse { @@ -84,7 +63,6 @@ export const SourceLogic = kea>({ actions: { onInitializeSource: (contentSource: ContentSourceFullData) => contentSource, onUpdateSourceName: (name: string) => name, - setSourceConfigData: (sourceConfigData: SourceConfigData) => sourceConfigData, onUpdateSummary: (summary: object[]) => summary, setSearchResults: (searchResultsResponse: SearchResultsResponse) => searchResultsResponse, setContentFilterValue: (contentFilterValue: string) => contentFilterValue, @@ -96,7 +74,6 @@ export const SourceLogic = kea>({ removeContentSource: (sourceId: string) => ({ sourceId, }), - getSourceConfigData: (serviceType: string) => ({ serviceType }), resetSourceState: () => true, setButtonNotLoading: () => false, }, @@ -115,17 +92,10 @@ export const SourceLogic = kea>({ }), }, ], - sourceConfigData: [ - {} as SourceConfigData, - { - setSourceConfigData: (_, sourceConfigData) => sourceConfigData, - }, - ], dataLoading: [ true, { onInitializeSource: () => false, - setSourceConfigData: () => false, resetSourceState: () => false, }, ], @@ -133,7 +103,6 @@ export const SourceLogic = kea>({ false, { setButtonNotLoading: () => false, - setSourceConfigData: () => false, resetSourceState: () => false, removeContentSource: () => true, }, @@ -181,7 +150,6 @@ export const SourceLogic = kea>({ actions.initializeFederatedSummary(sourceId); } } catch (e) { - // TODO: Verify this works once components are there. Not sure if the catch gives a status code. if (e.response.status === 404) { KibanaLogic.values.navigateToUrl(NOT_FOUND_PATH); } else { @@ -260,16 +228,6 @@ export const SourceLogic = kea>({ actions.setButtonNotLoading(); } }, - getSourceConfigData: async ({ serviceType }) => { - const route = `/api/workplace_search/org/settings/connectors/${serviceType}`; - - try { - const response = await HttpLogic.values.http.get(route); - actions.setSourceConfigData(response); - } catch (e) { - flashAPIErrors(e); - } - }, onUpdateSourceName: (name: string) => { setSuccessMessage( i18n.translate( diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/settings/components/source_config.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/settings/components/source_config.tsx index 79f418a48dabc..4b59e0f3401c5 100644 --- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/settings/components/source_config.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/settings/components/source_config.tsx @@ -15,7 +15,6 @@ import { EuiConfirmModal, EuiOverlayMask } from '@elastic/eui'; import { Loading } from '../../../../shared/loading'; import { SourceDataItem } from '../../../types'; import { staticSourceData } from '../../content_sources/source_data'; -import { SourceLogic } from '../../content_sources/source_logic'; import { AddSourceLogic } from '../../content_sources/components/add_source/add_source_logic'; import { AddSourceHeader } from '../../content_sources/components/add_source/add_source_header'; @@ -31,18 +30,18 @@ export const SourceConfig: React.FC = ({ sourceIndex }) => { const [confirmModalVisible, setConfirmModalVisibility] = useState(false); const { configuration, serviceType } = staticSourceData[sourceIndex] as SourceDataItem; const { deleteSourceConfig } = useActions(SettingsLogic); - const { getSourceConfigData } = useActions(SourceLogic); - const { saveSourceConfig } = useActions(AddSourceLogic); + const { saveSourceConfig, getSourceConfigData } = useActions(AddSourceLogic); const { sourceConfigData: { name, categories }, - dataLoading: sourceDataLoading, - } = useValues(SourceLogic); + dataLoading, + } = useValues(AddSourceLogic); useEffect(() => { getSourceConfigData(serviceType); }, []); - if (sourceDataLoading) return ; + if (dataLoading) return ; + const hideConfirmModal = () => setConfirmModalVisibility(false); const showConfirmModal = () => setConfirmModalVisibility(true); const saveUpdatedConfig = () => saveSourceConfig(true); From 9e7e1e17088ea33df8b62f2dc6d9f68494b7f270 Mon Sep 17 00:00:00 2001 From: John Schulz Date: Thu, 4 Feb 2021 15:16:45 -0500 Subject: [PATCH 21/69] [Fleet] Managed Agent Policy (#88688) ## Summary Introduces the concept of a managed agent policy. Resolves most of the acceptance criteria from #76843. Remaining to be done in follow up PRs - [x] Define hosted Agent Policy concept in Fleet. - [x] Flag in policy? **_yes, added `is_managed: boolean`_ in agent policy SO** - [x] Should not built only for cloud, an admin should be able to set theses restrictions. - [x] We should have an API to configure it _**Can `POST` and `PUT` to `/api/fleet/agent_policies/{policy_id}`**_ - [x] Integration should be editable, we expect integration author to do the right thing and limit what can be edited. - [x] Research if we can ensure the right behavior of Hosted Agent policy and restrict the super user. - [ ] Capabilities restrictions - [ ] An Agent enrolled in an Hosted Agent policy should not be able to be upgraded. - [x] An Agent enrolled in an Hosted Agent policy should not be able to be unenrolled. - [ ] No Agents cannot be enrolled into this policy by the user. - Hide the enrollment key? - Need to figure out the workflow. - [x] An Agent enrolled in an Hosted Agent policy should not be able to be reassigned to a different configuration. - [x] As a user I should be prevented to do theses action. _**No user-level checks. Only Agent Policy. No UI changes, but API errors are shown for failed actions like reassigning**_ - [x] As an API user I should receive error messages. - [x] If making a single "flag" is easier/faster let's do it. _**Currently single `is_managed` property on agent policy SO.**_ Checks are implemented in service layer (is agent enrolled in a managed policy?) No UI-specific changes added but UI is affected because HTTP requests (like `api/fleet/agents/{agentId}/reassign`) can fail. See screenshots below. Tests at service (`yarn test:jest`) and http (`yarn test ftr`) layers for each of create policy, update policy, unenroll agent, and reassign agent Bulk actions currently filter out restricted items. A follow-up PR will change them to throw an error and cause the request to fail. ## Managed Policy Can create (`POST`) and update (`PUT`) an agent policy with an `is_managed` property. Each new saved object will have an `is_managed` property (default `false`)
HTTP commands #### Create (`is_managed: false` by default) ``` curl --user elastic:changeme -X POST localhost:5601/api/fleet/agent_policies -H 'Content-Type: application/json' -d'{ "name": "User created policy", "namespace": "default"}' -H 'kbn-xsrf: true' {"item":{"id":"edc236a0-5cbb-11eb-ab2c-0134aecb4ce8","name":"User created policy","namespace":"default","is_managed":false,"revision":1,"updated_at":"2021-01-22T14:12:58.250Z","updated_by":"elastic"}} ``` #### Create with `is_managed: true` ``` curl --user elastic:changeme -X POST localhost:5601/api/fleet/agent_policies -H 'Content-Type: application/json' -d'{ "name": "User created policy", "namespace": "default"}' -H 'kbn-xsrf: true' {"item":{"id":"67c785b0-662e-11eb-bf6b-4790dc0178c0","name":"User created policy","namespace":"default","is_managed":false,"revision":1,"updated_at":"2021-02-03T14:45:06.059Z","updated_by":"elastic"}} ``` #### Update with `is_managed: true` ``` curl --user elastic:changeme -X PUT -H 'Content-Type: application/json' -H 'kbn-xsrf: 1234' localhost:5601/api/fleet/agent_policies/67c785b0-662e-11eb-bf6b-4790dc0178c0 -d '{ "name":"User created policy","namespace":"default","is_managed":true }' {"item":{"id":"67c785b0-662e-11eb-bf6b-4790dc0178c0","name":"User created policy","namespace":"default","is_managed":true,"revision":2,"updated_at":"2021-02-03T14:47:28.471Z","updated_by":"elastic","package_policies":[]}} ```
## Enroll behavior is not changed/addressed in this PR. Agents can still be enrolled in managed policies ## Unenroll Agent from managed policy behavior #### Enrolled in managed agent policy, cannot be unenrolled ``` curl --user elastic:changeme -X POST http://localhost:5601/api/fleet/agents/441d4a40-6710-11eb-8f57-db14e8e41cff/unenroll -H 'kbn-xsrf: 1234' | jq { "statusCode": 400, "error": "Bad Request", "message": "Cannot unenroll 441d4a40-6710-11eb-8f57-db14e8e41cff from a managed agent policy af9b4970-6701-11eb-b55a-899b78cb64da" } ```
Screenshots for managed & unmanaged policies #### Enrolled in managed agent policy, cannot be unenrolled Screen Shot 2021-01-19 at 1 22 53 PM Screen Shot 2021-01-19 at 1 30 26 PM Screen Shot 2021-01-19 at 1 30 42 PM #### Enrolled agent policy is not managed, agent can be unenrolledScreen Shot 2021-01-19 at 1 44 12 PM Screen Shot 2021-01-19 at 1 44 19 PM
## Reassign agent #### No agent can be reassigned to a managed policy ``` curl --user elastic:changeme -X 'PUT' 'http://localhost:5601/api/fleet/agents/482760d0-6710-11eb-8f57-db14e8e41cff/reassign' -H 'kbn-xsrf: xxx' -H 'Content-Type: application/json' -d '{"policy_id":"af9b4970-6701-11eb-b55a-899b78cb64da"}' { "statusCode": 400, "error": "Bad Request", "message": "Cannot reassign an agent to managed agent policy 94129590-6707-11eb-b55a-899b78cb64da" } ```
Screenshots Screen Shot 2021-02-04 at 2 14 51 PM
#### Enrolled in managed agent policy, cannot be reassigned ``` curl --user elastic:changeme -X 'PUT' 'http://localhost:5601/api/fleet/agents/482760d0-6710-11eb-8f57-db14e8e41cff/reassign' -H 'kbn-xsrf: xxx' -H 'Content-Type: application/json' -d '{"policy_id":"af9b4970-6701-11eb-b55a-899b78cb64da"}' { "statusCode": 400, "error": "Bad Request", "message": "Cannot reassign an agent from managed agent policy 94129590-6707-11eb-b55a-899b78cb64da" } ```
Screenshots Screen Shot 2021-01-19 at 2 58 38 PM Screen Shot 2021-01-19 at 2 58 44 PM Screen Shot 2021-01-19 at 2 59 27 PM
#### Enrolled agent policy is unmanaged, agent can be reassigned to another unmanaged policy
Screenshots Screen Shot 2021-01-19 at 3 00 01 PM Screen Shot 2021-01-19 at 3 00 08 PM Screen Shot 2021-01-19 at 3 00 46 PM
### Checklist Delete any items that are not applicable to this PR. - [ ] Any text added follows [EUI's writing guidelines](https://elastic.github.io/eui/#/guidelines/writing), uses sentence case text and includes [i18n support](https://github.com/elastic/kibana/blob/master/packages/kbn-i18n/README.md) - [ ] [Documentation](https://www.elastic.co/guide/en/kibana/master/development-documentation.html) was added for features that require explanation or tutorials - [x] [Unit or functional tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html) were updated or added to match the most common scenarios --- .../fleet/common/constants/agent_policy.ts | 1 + .../fleet/common/types/models/agent_policy.ts | 2 + .../epm/screens/detail/index.test.tsx | 2 + x-pack/plugins/fleet/server/errors/index.ts | 2 + .../server/routes/agent/unenroll_handler.ts | 2 +- .../fleet/server/saved_objects/index.ts | 4 +- .../saved_objects/migrations/to_v7_12_0.ts | 15 +- .../server/services/agent_policy.test.ts | 87 +++++++++++- .../fleet/server/services/agent_policy.ts | 1 + .../fleet/server/services/agents/crud.ts | 18 ++- .../server/services/agents/reassign.test.ts | 132 ++++++++++++++++++ .../fleet/server/services/agents/reassign.ts | 46 +++++- .../server/services/agents/unenroll.test.ts | 125 +++++++++++++++++ .../fleet/server/services/agents/unenroll.ts | 45 ++++-- .../fleet/server/services/agents/update.ts | 2 +- .../fleet/server/types/models/agent_policy.ts | 2 + .../common/endpoint/generate_data.ts | 1 + .../apis/agent_policy/agent_policy.ts | 53 ++++++- .../apis/agents/reassign.ts | 35 ++++- .../apis/agents/unenroll.ts | 70 ++++++++-- 20 files changed, 604 insertions(+), 41 deletions(-) create mode 100644 x-pack/plugins/fleet/server/services/agents/reassign.test.ts create mode 100644 x-pack/plugins/fleet/server/services/agents/unenroll.test.ts diff --git a/x-pack/plugins/fleet/common/constants/agent_policy.ts b/x-pack/plugins/fleet/common/constants/agent_policy.ts index 363607aae2b46..96b6249585bfc 100644 --- a/x-pack/plugins/fleet/common/constants/agent_policy.ts +++ b/x-pack/plugins/fleet/common/constants/agent_policy.ts @@ -24,6 +24,7 @@ export const DEFAULT_AGENT_POLICY: Omit< status: agentPolicyStatuses.Active, package_policies: [], is_default: true, + is_managed: false, monitoring_enabled: ['logs', 'metrics'] as Array<'logs' | 'metrics'>, }; diff --git a/x-pack/plugins/fleet/common/types/models/agent_policy.ts b/x-pack/plugins/fleet/common/types/models/agent_policy.ts index 5e86e8e6acb70..5f41b0f70ca74 100644 --- a/x-pack/plugins/fleet/common/types/models/agent_policy.ts +++ b/x-pack/plugins/fleet/common/types/models/agent_policy.ts @@ -17,6 +17,7 @@ export interface NewAgentPolicy { namespace: string; description?: string; is_default?: boolean; + is_managed?: boolean; // Optional when creating a policy monitoring_enabled?: Array>; } @@ -24,6 +25,7 @@ export interface AgentPolicy extends NewAgentPolicy { id: string; status: ValueOf; package_policies: string[] | PackagePolicy[]; + is_managed: boolean; // required for created policy updated_at: string; updated_by: string; revision: number; diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/epm/screens/detail/index.test.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/epm/screens/detail/index.test.tsx index 30588c10178da..b60d3b5eb1f2d 100644 --- a/x-pack/plugins/fleet/public/applications/fleet/sections/epm/screens/detail/index.test.tsx +++ b/x-pack/plugins/fleet/public/applications/fleet/sections/epm/screens/detail/index.test.tsx @@ -687,6 +687,7 @@ On Windows, the module was tested with Nginx installed from the Chocolatey repos 'e8a37031-2907-44f6-89d2-98bd493f60dc', ], is_default: true, + is_managed: false, monitoring_enabled: ['logs', 'metrics'], revision: 6, updated_at: '2020-12-09T13:46:31.840Z', @@ -701,6 +702,7 @@ On Windows, the module was tested with Nginx installed from the Chocolatey repos status: 'active', package_policies: ['e8a37031-2907-44f6-89d2-98bd493f60cd'], is_default: false, + is_managed: false, monitoring_enabled: ['logs', 'metrics'], revision: 2, updated_at: '2020-12-09T13:46:31.840Z', diff --git a/x-pack/plugins/fleet/server/errors/index.ts b/x-pack/plugins/fleet/server/errors/index.ts index ee30c01ac8eec..a903de0138039 100644 --- a/x-pack/plugins/fleet/server/errors/index.ts +++ b/x-pack/plugins/fleet/server/errors/index.ts @@ -32,3 +32,5 @@ export class PackageCacheError extends IngestManagerError {} export class PackageOperationNotSupportedError extends IngestManagerError {} export class FleetAdminUserInvalidError extends IngestManagerError {} export class ConcurrentInstallOperationError extends IngestManagerError {} +export class AgentReassignmentError extends IngestManagerError {} +export class AgentUnenrollmentError extends IngestManagerError {} diff --git a/x-pack/plugins/fleet/server/routes/agent/unenroll_handler.ts b/x-pack/plugins/fleet/server/routes/agent/unenroll_handler.ts index 0365d9f5a29fe..614ccd8a26624 100644 --- a/x-pack/plugins/fleet/server/routes/agent/unenroll_handler.ts +++ b/x-pack/plugins/fleet/server/routes/agent/unenroll_handler.ts @@ -24,7 +24,7 @@ export const postAgentUnenrollHandler: RequestHandler< if (request.body?.force === true) { await AgentService.forceUnenrollAgent(soClient, esClient, request.params.agentId); } else { - await AgentService.unenrollAgent(soClient, request.params.agentId); + await AgentService.unenrollAgent(soClient, esClient, request.params.agentId); } const body: PostAgentUnenrollResponse = {}; diff --git a/x-pack/plugins/fleet/server/saved_objects/index.ts b/x-pack/plugins/fleet/server/saved_objects/index.ts index c61dd1b8e4a19..d50db8d9809f4 100644 --- a/x-pack/plugins/fleet/server/saved_objects/index.ts +++ b/x-pack/plugins/fleet/server/saved_objects/index.ts @@ -32,7 +32,7 @@ import { migrateSettingsToV7100, migrateAgentActionToV7100, } from './migrations/to_v7_10_0'; -import { migrateAgentToV7120 } from './migrations/to_v7_12_0'; +import { migrateAgentToV7120, migrateAgentPolicyToV7120 } from './migrations/to_v7_12_0'; /* * Saved object types and mappings @@ -161,6 +161,7 @@ const getSavedObjectTypes = ( description: { type: 'text' }, namespace: { type: 'keyword' }, is_default: { type: 'boolean' }, + is_managed: { type: 'boolean' }, status: { type: 'keyword' }, package_policies: { type: 'keyword' }, updated_at: { type: 'date' }, @@ -171,6 +172,7 @@ const getSavedObjectTypes = ( }, migrations: { '7.10.0': migrateAgentPolicyToV7100, + '7.12.0': migrateAgentPolicyToV7120, }, }, [ENROLLMENT_API_KEYS_SAVED_OBJECT_TYPE]: { diff --git a/x-pack/plugins/fleet/server/saved_objects/migrations/to_v7_12_0.ts b/x-pack/plugins/fleet/server/saved_objects/migrations/to_v7_12_0.ts index 1635f38cd5522..49a0d6fc7737f 100644 --- a/x-pack/plugins/fleet/server/saved_objects/migrations/to_v7_12_0.ts +++ b/x-pack/plugins/fleet/server/saved_objects/migrations/to_v7_12_0.ts @@ -5,8 +5,8 @@ * 2.0. */ -import { SavedObjectMigrationFn } from 'kibana/server'; -import { Agent } from '../../types'; +import type { SavedObjectMigrationFn } from 'kibana/server'; +import type { Agent, AgentPolicy } from '../../types'; export const migrateAgentToV7120: SavedObjectMigrationFn = ( agentDoc @@ -15,3 +15,14 @@ export const migrateAgentToV7120: SavedObjectMigrationFn, + AgentPolicy +> = (agentPolicyDoc) => { + const isV12 = 'is_managed' in agentPolicyDoc.attributes; + if (!isV12) { + agentPolicyDoc.attributes.is_managed = false; + } + return agentPolicyDoc; +}; diff --git a/x-pack/plugins/fleet/server/services/agent_policy.test.ts b/x-pack/plugins/fleet/server/services/agent_policy.test.ts index b70041e66dcd9..800d4f479bfde 100644 --- a/x-pack/plugins/fleet/server/services/agent_policy.test.ts +++ b/x-pack/plugins/fleet/server/services/agent_policy.test.ts @@ -8,17 +8,16 @@ import { elasticsearchServiceMock, savedObjectsClientMock } from 'src/core/server/mocks'; import { agentPolicyService } from './agent_policy'; import { agentPolicyUpdateEventHandler } from './agent_policy_update'; -import { Output } from '../types'; +import type { AgentPolicy, NewAgentPolicy, Output } from '../types'; function getSavedObjectMock(agentPolicyAttributes: any) { const mock = savedObjectsClientMock.create(); - mock.get.mockImplementation(async (type: string, id: string) => { return { type, id, references: [], - attributes: agentPolicyAttributes, + attributes: agentPolicyAttributes as AgentPolicy, }; }); mock.find.mockImplementation(async (options) => { @@ -69,10 +68,59 @@ function getAgentPolicyUpdateMock() { >; } +function getAgentPolicyCreateMock() { + const soClient = savedObjectsClientMock.create(); + soClient.create.mockImplementation(async (type, attributes) => { + return { + attributes: (attributes as unknown) as NewAgentPolicy, + id: 'mocked', + type: 'mocked', + references: [], + }; + }); + return soClient; +} describe('agent policy', () => { beforeEach(() => { getAgentPolicyUpdateMock().mockClear(); }); + + describe('create', () => { + it('is_managed present and false by default', async () => { + // ignore unrelated unique name constraint + agentPolicyService.requireUniqueName = async () => {}; + const soClient = getAgentPolicyCreateMock(); + const esClient = elasticsearchServiceMock.createClusterClient().asInternalUser; + + await expect( + agentPolicyService.create(soClient, esClient, { + name: 'No is_managed provided', + namespace: 'default', + }) + ).resolves.toHaveProperty('is_managed', false); + + const [, attributes] = soClient.create.mock.calls[0]; + expect(attributes).toHaveProperty('is_managed', false); + }); + + it('should set is_managed property, if given', async () => { + // ignore unrelated unique name constraint + agentPolicyService.requireUniqueName = async () => {}; + const soClient = getAgentPolicyCreateMock(); + const esClient = elasticsearchServiceMock.createClusterClient().asInternalUser; + await expect( + agentPolicyService.create(soClient, esClient, { + name: 'is_managed: true provided', + namespace: 'default', + is_managed: true, + }) + ).resolves.toHaveProperty('is_managed', true); + + const [, attributes] = soClient.create.mock.calls[0]; + expect(attributes).toHaveProperty('is_managed', true); + }); + }); + describe('bumpRevision', () => { it('should call agentPolicyUpdateEventHandler with updated event once', async () => { const soClient = getSavedObjectMock({ @@ -208,4 +256,37 @@ describe('agent policy', () => { }); }); }); + + describe('update', () => { + it('should update is_managed property, if given', async () => { + // ignore unrelated unique name constraint + agentPolicyService.requireUniqueName = async () => {}; + const soClient = savedObjectsClientMock.create(); + const esClient = elasticsearchServiceMock.createClusterClient().asInternalUser; + + soClient.get.mockResolvedValue({ + attributes: {}, + id: 'mocked', + type: 'mocked', + references: [], + }); + await agentPolicyService.update(soClient, esClient, 'mocked', { + name: 'mocked', + namespace: 'default', + is_managed: false, + }); + // soClient.update is called with updated values + let calledWith = soClient.update.mock.calls[0]; + expect(calledWith[2]).toHaveProperty('is_managed', false); + + await agentPolicyService.update(soClient, esClient, 'mocked', { + name: 'is_managed: true provided', + namespace: 'default', + is_managed: true, + }); + // soClient.update is called with updated values + calledWith = soClient.update.mock.calls[1]; + expect(calledWith[2]).toHaveProperty('is_managed', true); + }); + }); }); diff --git a/x-pack/plugins/fleet/server/services/agent_policy.ts b/x-pack/plugins/fleet/server/services/agent_policy.ts index 4a3319941b575..dfe5c19bc417b 100644 --- a/x-pack/plugins/fleet/server/services/agent_policy.ts +++ b/x-pack/plugins/fleet/server/services/agent_policy.ts @@ -140,6 +140,7 @@ class AgentPolicyService { SAVED_OBJECT_TYPE, { ...agentPolicy, + is_managed: agentPolicy.is_managed ?? false, revision: 1, updated_at: new Date().toISOString(), updated_by: options?.user?.username || 'system', diff --git a/x-pack/plugins/fleet/server/services/agents/crud.ts b/x-pack/plugins/fleet/server/services/agents/crud.ts index 9382a8bb61647..36506d0590595 100644 --- a/x-pack/plugins/fleet/server/services/agents/crud.ts +++ b/x-pack/plugins/fleet/server/services/agents/crud.ts @@ -12,7 +12,7 @@ import { AGENT_SAVED_OBJECT_TYPE } from '../../constants'; import { AgentSOAttributes, Agent, ListWithKuery } from '../../types'; import { escapeSearchQueryPhrase } from '../saved_object'; import { savedObjectToAgent } from './saved_objects'; -import { appContextService } from '../../services'; +import { appContextService, agentPolicyService } from '../../services'; import * as crudServiceSO from './crud_so'; import * as crudServiceFleetServer from './crud_fleet_server'; @@ -86,6 +86,22 @@ export async function getAgents(soClient: SavedObjectsClientContract, agentIds: return agents; } +export async function getAgentPolicyForAgent( + soClient: SavedObjectsClientContract, + esClient: ElasticsearchClient, + agentId: string +) { + const agent = await getAgent(soClient, esClient, agentId); + if (!agent.policy_id) { + return; + } + + const agentPolicy = await agentPolicyService.get(soClient, agent.policy_id, false); + if (agentPolicy) { + return agentPolicy; + } +} + export async function getAgentByAccessAPIKeyId( soClient: SavedObjectsClientContract, accessAPIKeyId: string diff --git a/x-pack/plugins/fleet/server/services/agents/reassign.test.ts b/x-pack/plugins/fleet/server/services/agents/reassign.test.ts new file mode 100644 index 0000000000000..7338c440483ea --- /dev/null +++ b/x-pack/plugins/fleet/server/services/agents/reassign.test.ts @@ -0,0 +1,132 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { elasticsearchServiceMock, savedObjectsClientMock } from 'src/core/server/mocks'; +import type { SavedObject } from 'kibana/server'; +import type { Agent, AgentPolicy } from '../../types'; +import { AgentReassignmentError } from '../../errors'; +import { reassignAgent, reassignAgents } from './reassign'; + +const agentInManagedSO = { + id: 'agent-in-managed-policy', + attributes: { policy_id: 'managed-agent-policy' }, +} as SavedObject; +const agentInManagedSO2 = { + id: 'agent-in-managed-policy2', + attributes: { policy_id: 'managed-agent-policy' }, +} as SavedObject; +const agentInUnmanagedSO = { + id: 'agent-in-unmanaged-policy', + attributes: { policy_id: 'unmanaged-agent-policy' }, +} as SavedObject; +const agentInUnmanagedSO2 = { + id: 'agent-in-unmanaged-policy2', + attributes: { policy_id: 'unmanaged-agent-policy' }, +} as SavedObject; +const unmanagedAgentPolicySO = { + id: 'unmanaged-agent-policy', + attributes: { is_managed: false }, +} as SavedObject; +const managedAgentPolicySO = { + id: 'managed-agent-policy', + attributes: { is_managed: true }, +} as SavedObject; + +describe('reassignAgent (singular)', () => { + it('can reassign from unmanaged policy to unmanaged', async () => { + const soClient = createClientMock(); + const esClient = elasticsearchServiceMock.createClusterClient().asInternalUser; + await reassignAgent(soClient, esClient, agentInUnmanagedSO.id, agentInUnmanagedSO2.id); + + // calls ES update with correct values + expect(soClient.update).toBeCalledTimes(1); + const calledWith = soClient.update.mock.calls[0]; + expect(calledWith[1]).toBe(agentInUnmanagedSO.id); + expect(calledWith[2]).toHaveProperty('policy_id', agentInUnmanagedSO2.id); + }); + + it('cannot reassign from unmanaged policy to managed', async () => { + const soClient = createClientMock(); + const esClient = elasticsearchServiceMock.createClusterClient().asInternalUser; + await expect( + reassignAgent( + soClient, + esClient, + agentInUnmanagedSO.id, + agentInManagedSO.attributes.policy_id! + ) + ).rejects.toThrowError(AgentReassignmentError); + + // does not call ES update + expect(soClient.update).toBeCalledTimes(0); + }); + + it('cannot reassign from managed policy', async () => { + const soClient = createClientMock(); + const esClient = elasticsearchServiceMock.createClusterClient().asInternalUser; + await expect( + reassignAgent(soClient, esClient, agentInManagedSO.id, agentInManagedSO2.id) + ).rejects.toThrowError(AgentReassignmentError); + // does not call ES update + expect(soClient.update).toBeCalledTimes(0); + + await expect( + reassignAgent(soClient, esClient, agentInManagedSO.id, agentInUnmanagedSO.id) + ).rejects.toThrowError(AgentReassignmentError); + // does not call ES update + expect(soClient.update).toBeCalledTimes(0); + }); +}); + +describe('reassignAgents (plural)', () => { + it('agents in managed policies are not updated', async () => { + const soClient = createClientMock(); + const esClient = elasticsearchServiceMock.createClusterClient().asInternalUser; + const idsToReassign = [agentInUnmanagedSO.id, agentInManagedSO.id, agentInUnmanagedSO.id]; + await reassignAgents(soClient, esClient, { agentIds: idsToReassign }, agentInUnmanagedSO.id); + + // calls ES update with correct values + const calledWith = soClient.bulkUpdate.mock.calls[0][0]; + const expectedResults = [agentInUnmanagedSO.id, agentInUnmanagedSO.id]; + expect(calledWith.length).toBe(expectedResults.length); // only 2 are unmanaged + expect(calledWith.map(({ id }) => id)).toEqual(expectedResults); + }); +}); + +function createClientMock() { + const soClientMock = savedObjectsClientMock.create(); + + // need to mock .create & bulkCreate due to (bulk)createAgentAction(s) in reassignAgent(s) + soClientMock.create.mockResolvedValue(agentInUnmanagedSO); + soClientMock.bulkCreate.mockImplementation(async ([{ type, attributes }]) => { + return { + saved_objects: [await soClientMock.create(type, attributes)], + }; + }); + + soClientMock.get.mockImplementation(async (_, id) => { + switch (id) { + case unmanagedAgentPolicySO.id: + return unmanagedAgentPolicySO; + case managedAgentPolicySO.id: + return managedAgentPolicySO; + case agentInManagedSO.id: + return agentInManagedSO; + case agentInUnmanagedSO.id: + default: + return agentInUnmanagedSO; + } + }); + + soClientMock.bulkGet.mockImplementation(async (options) => { + return { + saved_objects: await Promise.all(options!.map(({ type, id }) => soClientMock.get(type, id))), + }; + }); + + return soClientMock; +} diff --git a/x-pack/plugins/fleet/server/services/agents/reassign.ts b/x-pack/plugins/fleet/server/services/agents/reassign.ts index fbd91c05dfb4a..9f4373ab553ec 100644 --- a/x-pack/plugins/fleet/server/services/agents/reassign.ts +++ b/x-pack/plugins/fleet/server/services/agents/reassign.ts @@ -5,12 +5,13 @@ * 2.0. */ -import { SavedObjectsClientContract, ElasticsearchClient } from 'kibana/server'; +import type { SavedObjectsClientContract, ElasticsearchClient } from 'kibana/server'; import Boom from '@hapi/boom'; import { AGENT_SAVED_OBJECT_TYPE } from '../../constants'; -import { AgentSOAttributes } from '../../types'; +import type { AgentSOAttributes } from '../../types'; +import { AgentReassignmentError } from '../../errors'; import { agentPolicyService } from '../agent_policy'; -import { getAgents, listAllAgents } from './crud'; +import { getAgentPolicyForAgent, getAgents, listAllAgents } from './crud'; import { createAgentAction, bulkCreateAgentActions } from './actions'; export async function reassignAgent( @@ -19,11 +20,13 @@ export async function reassignAgent( agentId: string, newAgentPolicyId: string ) { - const agentPolicy = await agentPolicyService.get(soClient, newAgentPolicyId); - if (!agentPolicy) { + const newAgentPolicy = await agentPolicyService.get(soClient, newAgentPolicyId); + if (!newAgentPolicy) { throw Boom.notFound(`Agent policy not found: ${newAgentPolicyId}`); } + await reassignAgentIsAllowed(soClient, esClient, agentId, newAgentPolicyId); + await soClient.update(AGENT_SAVED_OBJECT_TYPE, agentId, { policy_id: newAgentPolicyId, policy_revision: null, @@ -36,6 +39,29 @@ export async function reassignAgent( }); } +export async function reassignAgentIsAllowed( + soClient: SavedObjectsClientContract, + esClient: ElasticsearchClient, + agentId: string, + newAgentPolicyId: string +) { + const agentPolicy = await getAgentPolicyForAgent(soClient, esClient, agentId); + if (agentPolicy?.is_managed) { + throw new AgentReassignmentError( + `Cannot reassign an agent from managed agent policy ${agentPolicy.id}` + ); + } + + const newAgentPolicy = await agentPolicyService.get(soClient, newAgentPolicyId); + if (newAgentPolicy?.is_managed) { + throw new AgentReassignmentError( + `Cannot reassign an agent to managed agent policy ${newAgentPolicy.id}` + ); + } + + return true; +} + export async function reassignAgents( soClient: SavedObjectsClientContract, esClient: ElasticsearchClient, @@ -63,7 +89,15 @@ export async function reassignAgents( showInactive: false, }) ).agents; - const agentsToUpdate = agents.filter((agent) => agent.policy_id !== newAgentPolicyId); + // And which are allowed to unenroll + const settled = await Promise.allSettled( + agents.map((agent) => + reassignAgentIsAllowed(soClient, esClient, agent.id, newAgentPolicyId).then((_) => agent) + ) + ); + const agentsToUpdate = agents.filter( + (agent, index) => settled[index].status === 'fulfilled' && agent.policy_id !== newAgentPolicyId + ); // Update the necessary agents const res = await soClient.bulkUpdate( diff --git a/x-pack/plugins/fleet/server/services/agents/unenroll.test.ts b/x-pack/plugins/fleet/server/services/agents/unenroll.test.ts new file mode 100644 index 0000000000000..b8c1b7befb443 --- /dev/null +++ b/x-pack/plugins/fleet/server/services/agents/unenroll.test.ts @@ -0,0 +1,125 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { elasticsearchServiceMock, savedObjectsClientMock } from 'src/core/server/mocks'; +import type { SavedObject } from 'kibana/server'; +import type { Agent, AgentPolicy } from '../../types'; +import { AgentUnenrollmentError } from '../../errors'; +import { unenrollAgent, unenrollAgents } from './unenroll'; + +const agentInManagedSO = { + id: 'agent-in-managed-policy', + attributes: { policy_id: 'managed-agent-policy' }, +} as SavedObject; +const agentInUnmanagedSO = { + id: 'agent-in-unmanaged-policy', + attributes: { policy_id: 'unmanaged-agent-policy' }, +} as SavedObject; +const agentInUnmanagedSO2 = { + id: 'agent-in-unmanaged-policy2', + attributes: { policy_id: 'unmanaged-agent-policy' }, +} as SavedObject; +const unmanagedAgentPolicySO = { + id: 'unmanaged-agent-policy', + attributes: { is_managed: false }, +} as SavedObject; +const managedAgentPolicySO = { + id: 'managed-agent-policy', + attributes: { is_managed: true }, +} as SavedObject; + +describe('unenrollAgent (singular)', () => { + it('can unenroll from unmanaged policy', async () => { + const soClient = createClientMock(); + const esClient = elasticsearchServiceMock.createClusterClient().asInternalUser; + await unenrollAgent(soClient, esClient, agentInUnmanagedSO.id); + + // calls ES update with correct values + expect(soClient.update).toBeCalledTimes(1); + const calledWith = soClient.update.mock.calls[0]; + expect(calledWith[1]).toBe(agentInUnmanagedSO.id); + expect(calledWith[2]).toHaveProperty('unenrollment_started_at'); + }); + + it('cannot unenroll from managed policy', async () => { + const soClient = createClientMock(); + const esClient = elasticsearchServiceMock.createClusterClient().asInternalUser; + await expect(unenrollAgent(soClient, esClient, agentInManagedSO.id)).rejects.toThrowError( + AgentUnenrollmentError + ); + // does not call ES update + expect(soClient.update).toBeCalledTimes(0); + }); +}); + +describe('unenrollAgents (plural)', () => { + it('can unenroll from an unmanaged policy', async () => { + const soClient = createClientMock(); + const esClient = elasticsearchServiceMock.createClusterClient().asInternalUser; + const idsToUnenroll = [agentInUnmanagedSO.id, agentInUnmanagedSO2.id]; + await unenrollAgents(soClient, esClient, { agentIds: idsToUnenroll }); + + // calls ES update with correct values + const calledWith = soClient.bulkUpdate.mock.calls[0][0]; + expect(calledWith.length).toBe(idsToUnenroll.length); + expect(calledWith.map(({ id }) => id)).toEqual(idsToUnenroll); + for (const params of calledWith) { + expect(params.attributes).toHaveProperty('unenrollment_started_at'); + } + }); + it('cannot unenroll from a managed policy', async () => { + const soClient = createClientMock(); + const esClient = elasticsearchServiceMock.createClusterClient().asInternalUser; + const idsToUnenroll = [agentInUnmanagedSO.id, agentInManagedSO.id, agentInUnmanagedSO2.id]; + await unenrollAgents(soClient, esClient, { agentIds: idsToUnenroll }); + + // calls ES update with correct values + const calledWith = soClient.bulkUpdate.mock.calls[0][0]; + const onlyUnmanaged = [agentInUnmanagedSO.id, agentInUnmanagedSO2.id]; + expect(calledWith.length).toBe(onlyUnmanaged.length); + expect(calledWith.map(({ id }) => id)).toEqual(onlyUnmanaged); + for (const params of calledWith) { + expect(params.attributes).toHaveProperty('unenrollment_started_at'); + } + }); +}); + +function createClientMock() { + const soClientMock = savedObjectsClientMock.create(); + + // need to mock .create & bulkCreate due to (bulk)createAgentAction(s) in unenrollAgent(s) + soClientMock.create.mockResolvedValue(agentInUnmanagedSO); + soClientMock.bulkCreate.mockImplementation(async ([{ type, attributes }]) => { + return { + saved_objects: [await soClientMock.create(type, attributes)], + }; + }); + + soClientMock.get.mockImplementation(async (_, id) => { + switch (id) { + case unmanagedAgentPolicySO.id: + return unmanagedAgentPolicySO; + case managedAgentPolicySO.id: + return managedAgentPolicySO; + case agentInManagedSO.id: + return agentInManagedSO; + case agentInUnmanagedSO2.id: + return agentInUnmanagedSO2; + case agentInUnmanagedSO.id: + default: + return agentInUnmanagedSO; + } + }); + + soClientMock.bulkGet.mockImplementation(async (options) => { + return { + saved_objects: await Promise.all(options!.map(({ type, id }) => soClientMock.get(type, id))), + }; + }); + + return soClientMock; +} diff --git a/x-pack/plugins/fleet/server/services/agents/unenroll.ts b/x-pack/plugins/fleet/server/services/agents/unenroll.ts index a20b742d1425e..e2fa83cf32b63 100644 --- a/x-pack/plugins/fleet/server/services/agents/unenroll.ts +++ b/x-pack/plugins/fleet/server/services/agents/unenroll.ts @@ -4,16 +4,36 @@ * 2.0; you may not use this file except in compliance with the Elastic License * 2.0. */ - -import { ElasticsearchClient, SavedObjectsClientContract } from 'src/core/server'; -import { AgentSOAttributes } from '../../types'; +import type { ElasticsearchClient, SavedObjectsClientContract } from 'src/core/server'; +import type { AgentSOAttributes } from '../../types'; +import { AgentUnenrollmentError } from '../../errors'; import { AGENT_SAVED_OBJECT_TYPE } from '../../constants'; -import { getAgent } from './crud'; import * as APIKeyService from '../api_keys'; import { createAgentAction, bulkCreateAgentActions } from './actions'; -import { getAgents, listAllAgents } from './crud'; +import { getAgent, getAgentPolicyForAgent, getAgents, listAllAgents } from './crud'; + +async function unenrollAgentIsAllowed( + soClient: SavedObjectsClientContract, + esClient: ElasticsearchClient, + agentId: string +) { + const agentPolicy = await getAgentPolicyForAgent(soClient, esClient, agentId); + if (agentPolicy?.is_managed) { + throw new AgentUnenrollmentError( + `Cannot unenroll ${agentId} from a managed agent policy ${agentPolicy.id}` + ); + } + + return true; +} + +export async function unenrollAgent( + soClient: SavedObjectsClientContract, + esClient: ElasticsearchClient, + agentId: string +) { + await unenrollAgentIsAllowed(soClient, esClient, agentId); -export async function unenrollAgent(soClient: SavedObjectsClientContract, agentId: string) { const now = new Date().toISOString(); await createAgentAction(soClient, { agent_id: agentId, @@ -36,7 +56,6 @@ export async function unenrollAgents( kuery: string; } ) { - // Filter to agents that do not already unenrolled, or unenrolling const agents = 'agentIds' in options ? await getAgents(soClient, options.agentIds) @@ -46,9 +65,19 @@ export async function unenrollAgents( showInactive: false, }) ).agents; - const agentsToUpdate = agents.filter( + + // Filter to agents that are not already unenrolled, or unenrolling + const agentsEnrolled = agents.filter( (agent) => !agent.unenrollment_started_at && !agent.unenrolled_at ); + // And which are allowed to unenroll + const settled = await Promise.allSettled( + agentsEnrolled.map((agent) => + unenrollAgentIsAllowed(soClient, esClient, agent.id).then((_) => agent) + ) + ); + const agentsToUpdate = agentsEnrolled.filter((_, index) => settled[index].status === 'fulfilled'); + const now = new Date().toISOString(); // Create unenroll action for each agent diff --git a/x-pack/plugins/fleet/server/services/agents/update.ts b/x-pack/plugins/fleet/server/services/agents/update.ts index f6b4b44004761..21087be392bcd 100644 --- a/x-pack/plugins/fleet/server/services/agents/update.ts +++ b/x-pack/plugins/fleet/server/services/agents/update.ts @@ -29,7 +29,7 @@ export async function unenrollForAgentPolicyId( hasMore = false; } for (const agent of agents) { - await unenrollAgent(soClient, agent.id); + await unenrollAgent(soClient, esClient, agent.id); } } } diff --git a/x-pack/plugins/fleet/server/types/models/agent_policy.ts b/x-pack/plugins/fleet/server/types/models/agent_policy.ts index 209bfb4b7398a..5891320c2544b 100644 --- a/x-pack/plugins/fleet/server/types/models/agent_policy.ts +++ b/x-pack/plugins/fleet/server/types/models/agent_policy.ts @@ -13,6 +13,7 @@ const AgentPolicyBaseSchema = { name: schema.string({ minLength: 1 }), namespace: NamespaceSchema, description: schema.maybe(schema.string()), + is_managed: schema.maybe(schema.boolean()), monitoring_enabled: schema.maybe( schema.arrayOf( schema.oneOf([schema.literal(dataTypes.Logs), schema.literal(dataTypes.Metrics)]) @@ -27,6 +28,7 @@ export const NewAgentPolicySchema = schema.object({ export const AgentPolicySchema = schema.object({ ...AgentPolicyBaseSchema, id: schema.string(), + is_managed: schema.boolean(), status: schema.oneOf([ schema.literal(agentPolicyStatuses.Active), schema.literal(agentPolicyStatuses.Inactive), diff --git a/x-pack/plugins/security_solution/common/endpoint/generate_data.ts b/x-pack/plugins/security_solution/common/endpoint/generate_data.ts index d4bae9d88d262..ba64814cd1daf 100644 --- a/x-pack/plugins/security_solution/common/endpoint/generate_data.ts +++ b/x-pack/plugins/security_solution/common/endpoint/generate_data.ts @@ -1277,6 +1277,7 @@ export class EndpointDocGenerator { status: agentPolicyStatuses.Active, description: 'Some description', namespace: 'default', + is_managed: false, monitoring_enabled: ['logs', 'metrics'], revision: 2, updated_at: '2020-07-22T16:36:49.196Z', diff --git a/x-pack/test/fleet_api_integration/apis/agent_policy/agent_policy.ts b/x-pack/test/fleet_api_integration/apis/agent_policy/agent_policy.ts index 0d0749aa8e913..9f016ab044a90 100644 --- a/x-pack/test/fleet_api_integration/apis/agent_policy/agent_policy.ts +++ b/x-pack/test/fleet_api_integration/apis/agent_policy/agent_policy.ts @@ -26,8 +26,10 @@ export default function ({ getService }: FtrProviderContext) { }); describe('POST /api/fleet/agent_policies', () => { - it('should work with valid values', async () => { - await supertest + it('should work with valid minimum required values', async () => { + const { + body: { item: createdPolicy }, + } = await supertest .post(`/api/fleet/agent_policies`) .set('kbn-xsrf', 'xxxx') .send({ @@ -35,6 +37,28 @@ export default function ({ getService }: FtrProviderContext) { namespace: 'default', }) .expect(200); + + const getRes = await supertest.get(`/api/fleet/agent_policies/${createdPolicy.id}`); + const json = getRes.body; + expect(json.item.is_managed).to.equal(false); + }); + + it('sets given is_managed value', async () => { + const { + body: { item: createdPolicy }, + } = await supertest + .post(`/api/fleet/agent_policies`) + .set('kbn-xsrf', 'xxxx') + .send({ + name: 'TEST2', + namespace: 'default', + is_managed: true, + }) + .expect(200); + + const getRes = await supertest.get(`/api/fleet/agent_policies/${createdPolicy.id}`); + const json = getRes.body; + expect(json.item.is_managed).to.equal(true); }); it('should return a 400 with an empty namespace', async () => { @@ -108,6 +132,7 @@ export default function ({ getService }: FtrProviderContext) { expect(newPolicy).to.eql({ name: 'Copied policy', description: 'Test', + is_managed: false, namespace: 'default', monitoring_enabled: ['logs', 'metrics'], revision: 1, @@ -161,6 +186,7 @@ export default function ({ getService }: FtrProviderContext) { }); describe('PUT /api/fleet/agent_policies/{agentPolicyId}', () => { + let agentPolicyId: undefined | string; it('should work with valid values', async () => { const { body: { item: originalPolicy }, @@ -173,11 +199,11 @@ export default function ({ getService }: FtrProviderContext) { namespace: 'default', }) .expect(200); - + agentPolicyId = originalPolicy.id; const { body: { item: updatedPolicy }, } = await supertest - .put(`/api/fleet/agent_policies/${originalPolicy.id}`) + .put(`/api/fleet/agent_policies/${agentPolicyId}`) .set('kbn-xsrf', 'xxxx') .send({ name: 'Updated name', @@ -193,12 +219,31 @@ export default function ({ getService }: FtrProviderContext) { name: 'Updated name', description: 'Updated description', namespace: 'default', + is_managed: false, revision: 2, updated_by: 'elastic', package_policies: [], }); }); + it('sets given is_managed value', async () => { + const { + body: { item: createdPolicy }, + } = await supertest + .put(`/api/fleet/agent_policies/${agentPolicyId}`) + .set('kbn-xsrf', 'xxxx') + .send({ + name: 'TEST2', + namespace: 'default', + is_managed: true, + }) + .expect(200); + + const getRes = await supertest.get(`/api/fleet/agent_policies/${createdPolicy.id}`); + const json = getRes.body; + expect(json.item.is_managed).to.equal(true); + }); + it('should return a 409 if policy already exists with name given', async () => { const sharedBody = { name: 'Initial name', diff --git a/x-pack/test/fleet_api_integration/apis/agents/reassign.ts b/x-pack/test/fleet_api_integration/apis/agents/reassign.ts index e17e779e4217b..a31fa862f7420 100644 --- a/x-pack/test/fleet_api_integration/apis/agents/reassign.ts +++ b/x-pack/test/fleet_api_integration/apis/agents/reassign.ts @@ -16,10 +16,10 @@ export default function (providerContext: FtrProviderContext) { describe('fleet_reassign_agent', () => { setupFleetAndAgents(providerContext); - before(async () => { + beforeEach(async () => { await esArchiver.loadIfNeeded('fleet/agents'); }); - after(async () => { + afterEach(async () => { await esArchiver.unload('fleet/agents'); }); @@ -31,7 +31,7 @@ export default function (providerContext: FtrProviderContext) { policy_id: 'policy2', }) .expect(200); - const { body } = await supertest.get(`/api/fleet/agents/agent1`).set('kbn-xsrf', 'xxx'); + const { body } = await supertest.get(`/api/fleet/agents/agent1`); expect(body.item.policy_id).to.eql('policy2'); }); @@ -88,5 +88,34 @@ export default function (providerContext: FtrProviderContext) { }) .expect(404); }); + + it('can reassign from unmanaged policy to unmanaged', async () => { + // policy2 is not managed + // reassign succeeds + await supertest + .put(`/api/fleet/agents/agent1/reassign`) + .set('kbn-xsrf', 'xxx') + .send({ + policy_id: 'policy2', + }) + .expect(200); + }); + it('cannot reassign from unmanaged policy to managed', async () => { + // agent1 is enrolled in policy1. set policy1 to managed + await supertest + .put(`/api/fleet/agent_policies/policy1`) + .set('kbn-xsrf', 'xxx') + .send({ name: 'Test policy', namespace: 'default', is_managed: true }) + .expect(200); + + // reassign fails + await supertest + .put(`/api/fleet/agents/agent1/reassign`) + .set('kbn-xsrf', 'xxx') + .send({ + policy_id: 'policy2', + }) + .expect(400); + }); }); } diff --git a/x-pack/test/fleet_api_integration/apis/agents/unenroll.ts b/x-pack/test/fleet_api_integration/apis/agents/unenroll.ts index 3cafc86602d3b..85bcce824dd51 100644 --- a/x-pack/test/fleet_api_integration/apis/agents/unenroll.ts +++ b/x-pack/test/fleet_api_integration/apis/agents/unenroll.ts @@ -65,17 +65,28 @@ export default function (providerContext: FtrProviderContext) { await esArchiver.unload('fleet/agents'); }); - it('should allow to unenroll single agent', async () => { + it('/agents/{agent_id}/unenroll should fail for managed policy', async () => { + // set policy to managed await supertest - .post(`/api/fleet/agents/agent1/unenroll`) + .put(`/api/fleet/agent_policies/policy1`) .set('kbn-xsrf', 'xxx') - .send({ - force: true, - }) + .send({ name: 'Test policy', namespace: 'default', is_managed: true }) + .expect(200); + + await supertest.post(`/api/fleet/agents/agent1/unenroll`).set('kbn-xsrf', 'xxx').expect(400); + }); + + it('/agents/{agent_id}/unenroll should allow from unmanaged policy', async () => { + // set policy to unmanaged + await supertest + .put(`/api/fleet/agent_policies/policy1`) + .set('kbn-xsrf', 'xxx') + .send({ name: 'Test policy', namespace: 'default', is_managed: false }) .expect(200); + await supertest.post(`/api/fleet/agents/agent1/unenroll`).set('kbn-xsrf', 'xxx').expect(200); }); - it('should invalidate related API keys', async () => { + it('/agents/{agent_id}/unenroll { force: true } should invalidate related API keys', async () => { await supertest .post(`/api/fleet/agents/agent1/unenroll`) .set('kbn-xsrf', 'xxx') @@ -97,7 +108,44 @@ export default function (providerContext: FtrProviderContext) { expect(outputAPIKeys[0].invalidated).eql(true); }); - it('should allow to unenroll multiple agents by id', async () => { + it('/agents/{agent_id}/bulk_unenroll should not allow unenroll from managed policy', async () => { + // set policy to managed + await supertest + .put(`/api/fleet/agent_policies/policy1`) + .set('kbn-xsrf', 'xxx') + .send({ name: 'Test policy', namespace: 'default', is_managed: true }) + .expect(200); + + // try to unenroll + await supertest + .post(`/api/fleet/agents/bulk_unenroll`) + .set('kbn-xsrf', 'xxx') + .send({ + agents: ['agent2', 'agent3'], + }) + // http request succeeds + .expect(200); + + // but agents are still enrolled + const [agent2data, agent3data] = await Promise.all([ + supertest.get(`/api/fleet/agents/agent2`), + supertest.get(`/api/fleet/agents/agent3`), + ]); + expect(typeof agent2data.body.item.unenrollment_started_at).to.eql('undefined'); + expect(typeof agent2data.body.item.unenrolled_at).to.eql('undefined'); + expect(agent2data.body.item.active).to.eql(true); + expect(typeof agent3data.body.item.unenrollment_started_at).to.be('undefined'); + expect(typeof agent3data.body.item.unenrolled_at).to.be('undefined'); + expect(agent2data.body.item.active).to.eql(true); + }); + + it('/agents/{agent_id}/bulk_unenroll should allow to unenroll multiple agents by id from an unmanaged policy', async () => { + // set policy to unmanaged + await supertest + .put(`/api/fleet/agent_policies/policy1`) + .set('kbn-xsrf', 'xxx') + .send({ name: 'Test policy', namespace: 'default', is_managed: false }) + .expect(200); await supertest .post(`/api/fleet/agents/bulk_unenroll`) .set('kbn-xsrf', 'xxx') @@ -106,8 +154,8 @@ export default function (providerContext: FtrProviderContext) { }) .expect(200); const [agent2data, agent3data] = await Promise.all([ - supertest.get(`/api/fleet/agents/agent2`).set('kbn-xsrf', 'xxx'), - supertest.get(`/api/fleet/agents/agent3`).set('kbn-xsrf', 'xxx'), + supertest.get(`/api/fleet/agents/agent2`), + supertest.get(`/api/fleet/agents/agent3`), ]); expect(typeof agent2data.body.item.unenrollment_started_at).to.eql('string'); expect(agent2data.body.item.active).to.eql(true); @@ -115,7 +163,7 @@ export default function (providerContext: FtrProviderContext) { expect(agent2data.body.item.active).to.eql(true); }); - it('should allow to unenroll multiple agents by kuery', async () => { + it('/agents/{agent_id}/bulk_unenroll should allow to unenroll multiple agents by kuery', async () => { await supertest .post(`/api/fleet/agents/bulk_unenroll`) .set('kbn-xsrf', 'xxx') @@ -125,7 +173,7 @@ export default function (providerContext: FtrProviderContext) { }) .expect(200); - const { body } = await supertest.get(`/api/fleet/agents`).set('kbn-xsrf', 'xxx'); + const { body } = await supertest.get(`/api/fleet/agents`); expect(body.total).to.eql(0); }); }); From 808bd44463c0e7a2a6c1a8ee3c6f32a3477bab8f Mon Sep 17 00:00:00 2001 From: Lisa Cawley Date: Thu, 4 Feb 2021 12:49:46 -0800 Subject: [PATCH 22/69] Use doc link services in index pattern management (#89937) --- src/core/public/doc_links/doc_links_service.ts | 1 + .../components/edit_index_pattern/edit_index_pattern.tsx | 9 +++------ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/core/public/doc_links/doc_links_service.ts b/src/core/public/doc_links/doc_links_service.ts index 4cb2969a63908..da35373f57322 100644 --- a/src/core/public/doc_links/doc_links_service.ts +++ b/src/core/public/doc_links/doc_links_service.ts @@ -121,6 +121,7 @@ export class DocLinksService { addData: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/connect-to-elasticsearch.html`, kibana: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/index.html`, elasticsearch: { + mapping: `${ELASTICSEARCH_DOCS}mapping.html`, remoteClusters: `${ELASTICSEARCH_DOCS}modules-remote-clusters.html`, remoteClustersProxy: `${ELASTICSEARCH_DOCS}modules-remote-clusters.html#proxy-mode`, remoteClusersProxySettings: `${ELASTICSEARCH_DOCS}modules-remote-clusters.html#remote-cluster-proxy-settings`, diff --git a/src/plugins/index_pattern_management/public/components/edit_index_pattern/edit_index_pattern.tsx b/src/plugins/index_pattern_management/public/components/edit_index_pattern/edit_index_pattern.tsx index 4f34bc6aa73b4..4dff5f1e0b598 100644 --- a/src/plugins/index_pattern_management/public/components/edit_index_pattern/edit_index_pattern.tsx +++ b/src/plugins/index_pattern_management/public/components/edit_index_pattern/edit_index_pattern.tsx @@ -149,7 +149,8 @@ export const EditIndexPattern = withRouter( chrome.docTitle.change(indexPattern.title); const showTagsSection = Boolean(indexPattern.timeFieldName || (tags && tags.length > 0)); - + const kibana = useKibana(); + const docsUrl = kibana.services.docLinks!.links.elasticsearch.mapping; return (
@@ -182,11 +183,7 @@ export const EditIndexPattern = withRouter( defaultMessage="This page lists every field in the {indexPatternTitle} index and the field's associated core type as recorded by Elasticsearch. To change a field type, use the Elasticsearch" values={{ indexPatternTitle: {indexPattern.title} }} />{' '} - + {mappingAPILink}

From 35fd85b8fa2350294452489457fed05b526382a4 Mon Sep 17 00:00:00 2001 From: Nick Peihl Date: Thu, 4 Feb 2021 14:16:30 -0800 Subject: [PATCH 23/69] Elastic Maps Server config is `host` not `hostname` (#90234) Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> --- docs/maps/connect-to-ems.asciidoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/maps/connect-to-ems.asciidoc b/docs/maps/connect-to-ems.asciidoc index a5b8010f21f97..8e4695bfc6662 100644 --- a/docs/maps/connect-to-ems.asciidoc +++ b/docs/maps/connect-to-ems.asciidoc @@ -86,7 +86,7 @@ endif::[] [cols="2*<"] |=== -| [[ems-hostname]]`hostname` +| [[ems-host]]`host` | Specifies the host of the backend server. To allow remote users to connect, set the value to the IP address or DNS name of the {hosted-ems} container. *Default: _your-hostname_*. <>. | `port` @@ -199,7 +199,7 @@ TIP: The available basemaps and boundaries can be explored from the `/maps` endp [[elastic-maps-server-kibana]] ==== Kibana configuration -With {hosted-ems} running, add the `map.emsUrl` configuration key in your <> file pointing to the root of the service. This setting will point {kib} to request EMS basemaps and boundaries from {hosted-ems}. Typically this will be the URL to the <> of {hosted-ems}. For example, `map.emsUrl: https://my-ems-server:8080`. +With {hosted-ems} running, add the `map.emsUrl` configuration key in your <> file pointing to the root of the service. This setting will point {kib} to request EMS basemaps and boundaries from {hosted-ems}. Typically this will be the URL to the <> of {hosted-ems}. For example, `map.emsUrl: https://my-ems-server:8080`. [float] From bb3ed33ccc899802f82f0a02eea41b93642fde77 Mon Sep 17 00:00:00 2001 From: Stacey Gammon Date: Thu, 4 Feb 2021 17:22:22 -0500 Subject: [PATCH 24/69] RFC for automatically generated typescript API documentation for every plugins public services, types, and functionality (#86704) * wip RFC for API doc infra * update * update * rfc * rfc * Update RFC * Update RFC post Arch Review * add pr link * Update based on review feedback * Update 0014_api_documentation.md Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> --- rfcs/images/api_doc_pick.png | Bin 0 -> 82547 bytes rfcs/images/api_doc_tech.png | Bin 0 -> 4826 bytes rfcs/images/api_doc_tech_compare.png | Bin 0 -> 21047 bytes rfcs/images/api_docs.png | Bin 0 -> 465680 bytes rfcs/images/api_docs_package_current.png | Bin 0 -> 48116 bytes rfcs/images/api_info.png | Bin 0 -> 117893 bytes rfcs/images/current_api_doc_links.png | Bin 0 -> 41607 bytes rfcs/images/new_api_docs_with_links.png | Bin 0 -> 72543 bytes rfcs/images/repeat_primitive_signature.png | Bin 0 -> 58109 bytes rfcs/images/repeat_type_links.png | Bin 0 -> 51818 bytes rfcs/text/0014_api_documentation.md | 442 +++++++++++++++++++++ 11 files changed, 442 insertions(+) create mode 100644 rfcs/images/api_doc_pick.png create mode 100644 rfcs/images/api_doc_tech.png create mode 100644 rfcs/images/api_doc_tech_compare.png create mode 100644 rfcs/images/api_docs.png create mode 100644 rfcs/images/api_docs_package_current.png create mode 100644 rfcs/images/api_info.png create mode 100644 rfcs/images/current_api_doc_links.png create mode 100644 rfcs/images/new_api_docs_with_links.png create mode 100644 rfcs/images/repeat_primitive_signature.png create mode 100644 rfcs/images/repeat_type_links.png create mode 100644 rfcs/text/0014_api_documentation.md diff --git a/rfcs/images/api_doc_pick.png b/rfcs/images/api_doc_pick.png new file mode 100644 index 0000000000000000000000000000000000000000..825fa47b266cb9ca39eed58d0bcbd939a3fbe981 GIT binary patch literal 82547 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 literal 0 HcmV?d00001 diff --git a/rfcs/images/api_doc_tech.png b/rfcs/images/api_doc_tech.png new file mode 100644 index 0000000000000000000000000000000000000000..8c06d4ef3ebe8f3b5e0ad4bfd07cbf37ec91a037 GIT binary patch literal 4826 zcmeHLX;{+Tw*Ti?nOa$yR?=YFn}p_^sJvQEnNud>OgW`Eq$1dxLS$*Pr73AS9V=7O zNJX4L-mJ_Qrz~+m#58k2z#%b3@Otla&xiBj-mmA}`s_jZ}^`!Z%hCO?LgWva^W^EHURK8Luu`z{6>5**zvpz0Q{i? z0M~B=#P0YLrA^F|NLjRl!Y&JJgQ_4JI6mW^o36-S>00NDHN zKgTAg#MCDnpd#AI#ZGZzlQMAXkYeMxy#TPI)9H-Og`^>VKJ8(N?;iWf{3OLd0xA9m zZd1YN*)HfoTJNX9n~q0a-cP+Ms10#3+*$Ur0HB<4E?AURU=MtRd4&tVpyZ9{PdY_` z`>jX!Hm%nw0`Bj)wk?~0>o2z>fFcDMCE)At$W7NZH-iCpS%N$ed5{eJt}M3)cuio) z04D$RO|4dhrSWn7$H{A(dG6)vmP{GE{#>;s8HdBGF_#O!r4d5(lXB#x1)^$mvNipd zU`CT`ZTmoWFmMj6v}VN%jX+A!5}f)So_Wt(=jy*7U`(F%<>GHWPPrE(#Q5DTJ2A+t z_;WE~G`66r8N7`Is^j)N2>6KEA7bxWPxMZmoMdnh-HOEA$lx^imHtUF%+ zu^jyMvM$FNEcrO5f$yfnWSm1e?xQ~8pkB!i#N&Qt`GQ2zAr6SJ`|7{p|HCzL+Cr)u z@?YV-imYnxodbzsg)7nmo!>bq){lrcPQw?h_7zL$)q+HK_a34)htnnf?;tjg8l+1LiXyPTDGiJ31r9b;{#uXo{9 z>5_yWvM8eVN@Jqkcg382>pZZNDOHB2*{XMB3+acKL#=~MMUxgH8=v}C0Un(;UT6Hc z&kB9%u};~6_G0lPU#vA*C*5&{;H9hzSI4BjqE%n+H%?)C$iq!851LFm%(JM?P{*mf zvXUyEx+?^Q2}e!m#rSi74V=)@cD-lT`Pu7yGht!^BLFO@%je#Af`_zy^1pw9bw0n9 zVgquEFB60m9Z+o)fz$u^Z5*^(Y@&|%I5c;~eZ+KJ4cj?=Pfm{YQLA@2#@(f+)Tng8 ziC(5cq`n&OJyGpec7D+yAkkKq$A(G8yy8ZQw#TH{F9Ux$Gb-HG{=sbvzP_I*#wK&9 z%|72JM*lv07{b2V%0q8wz0u|j!iX_Jk;6=*<$>KDe)?}Q!oSt3vU{ychnU;I<11c? zs?ZA&!QmDaW9cu|ywPPTc`1UT#@V2-f~e}Qc4JK_b+_rYZwUyhq=CxKxG@AV*Fv*9 zRKA>S$qZ?VFPQyOJ)}e2=bPIgLfyAC`&)lHDjdJVI=?k?mf^P0s?_N!Eh4%pktzol zj0j#&Ax!N~9YXfAqh%>|oR@H~=~Z$f1M|u0KmIRMD50WB98OA=j z9?0iUVcIy4^8;m!kLAox+kFW8%z(NYmSIgEiFl&lEdRijn2DDZ*L?8Hv7Fx zhPmx}Ih!3kuoofnr!i*(pEs!sRXnKbdl7B9l-jEPu{>ixeW-uj)98TOy7>^!Aaf5@ z?>k0rA}}Ayi(I>yGG14$0jKzl|52UU0jr>xtP+WWr~SV?A>kte%mXXp+^vqD_V)^` z)PinvIk>ROLQs#nM4dJ!+Y?#H7_+CaM8`B;;({zM4JH=(;X4wVCZ~%~0WmJ%Awr1i z)o9p4xi)9DctZMU@T8^vBkqI)I~UpznE=X4&tKc2U$_e)ib}9jLu9KKg=r!Lh`MUe zK>8aRK5dv`xHc~=#P%)u_DbEYdh6@!P8ahF`&KNgiC-)GDD&O%sl_m7NB($w(t;^R zt|p~<3GYgBqbBn^#gl%Y`QN90GbihahieF-5H}LBhH*TZ&5J-bw5)y^?Q*MM{vwbp zp+n8Cr!gAG-l&pX)(cBhtKx7U6MnrH9u~=aELDc zJ+qXm$)fnN2AeB3E(VSI%i3l20WZ9IcHLV# zFw&OiR*ZXn&ib}S8Vem&A1W~*U0bXQi}*0q+Ftjp*{Fxenvo z%7JFp6L&rP(#^3|gu_V^0^gWC9G))56>ZBB1mDv$GofCM>Xq=BE8~(vtUP>jw%!l< z{8i-b{6LSBkoili6Rk;+I!%AYArIW$R?-=;bf6{bAXaxWtq-&Ah)khP!eG)Rf8@li zmP2ANdG&}5RGHMSz|0!PZ7KSBZKeZWPi&zFj*wumX@R{>1E*W1ahwskwtiq06!5c2 z`1$!)C!|;U+whE609;3vtq_2ylZ0&Lpm%SX7@lP=t``)Gbb;Bxo}q=^HrPc1WgoUS9u$OB zE-7j-BO5L^d_#xi^_{EQ94>>}dregTxgo#Ea{e%cT!+*7knc}zzr|Rn*ls;NQragW z-h2oVy4`3l%4KL~1Oy}dq!DJasQMRipk6HqH4As?=WU2paxZA{=(m@Q#9>rv~;K)J%iC$ z3D5T%VX53{c{*%Lc-~QW;|CRmOibVBz7}1In;CR7KfZ;8$`Ukn{_Me+PE{$wVOhQ^ zW_HF|O`2UYsQ#dr}5A9_OzFv%uJsd|>G{xK;fNEnf2bK(o z{iYD;U_)vii= zk>zX~e8_J%q+{b<3N|y&D{@uB9$_AL(`n1eWkm8j-{-cp$7~}Fk3{jTx6^kZL=WlU zCC{yr;8ZJZ9+)+D%d_Y;SbBIUwNN1^V2WOY z)+2W?`BR9d@%}E{TVx+sH*&p|$-(m8;h>jlh#H8(`M&3OiUT6LOsVwonEcX;Av_Yl z6VWt{icZR{bRViDvz1gyw}LvSXP-2IY{czU!VEsFQfwDX{crAgh8X>?~7g$I0|wB?cum7j`8)49ZzNDksk> z?YEjo>AUY~{;N|4!rdCw)7F}(dKIeikQ0R(oEbYS^gJ0L5&V2PCW9(EG5ldx6sBUg z50OFs>HVkHH|jQ$Ec=~{UQT=DpIQ2#(A4F)SWd{a+mEQAUu+9(a|<(hDYh{-Glb@& zYv%U)hwC6^J{$ zg7{ck30)|3q~8(W$!-^h`ya|<9M7!LrzqH8LGrPknIQ2bsMtJbK7uE$l)nU)mreHZR}>YP$m>=t{DX#=cUPXTZkVCG8lK8V~)*{YE-ACn@OMk4gWu> z39gCpNBF_yElD_)wa%JhXKliggwMA+6EGbZs9aDei(dpUR~wM6M@B|)8_Lu{`0qLyx}lT7*SbU^h;a#i5GR{Ie^&J0s&^8i?<~uk zq?$FcmRsJ>$5218sf8Cqm`gXpeMW^x19KEu($++9cC1a9!uM-`)_~`hNyHBX%KC~G z+MBqdHC2CZ^JP# jaQ*6C@DGIO*pP^@tN$|rc1L)4g8(?$xt^)AMc()iL0N>_ literal 0 HcmV?d00001 diff --git a/rfcs/images/api_doc_tech_compare.png b/rfcs/images/api_doc_tech_compare.png new file mode 100644 index 0000000000000000000000000000000000000000..46388b2a09a5074747092818463aaa877d984750 GIT binary patch literal 21047 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

72Z0!qIyP+UlDLaE|YZq384k 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 KUg@2OPyQFN@d5S# literal 0 HcmV?d00001 diff --git a/rfcs/images/api_docs.png b/rfcs/images/api_docs.png new file mode 100644 index 0000000000000000000000000000000000000000..d7e2e517e646509fe7400f627594d38be6261fc5 GIT binary patch literal 465680 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%0AY=7(wP`>+DRJC|u!d!N-s7H1 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

K1M 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⪼{a1 zOXE%F{?U_CxV*f)U3KvM?P>O|dOaD#T{W+7ONy>pab;%H>YYN6mCF74lvY<+)pgqj*C1GlnN?a-r{u4^AWm-lwDQs`B58sagGi^ z^diK>-$>_zKB?(>`k|npy`!V-=mK;kjvX}7cZB@O?u<)Gzw9YuLUuh|tpy9x29~@^bAS57sqI#^V_~fwSi06g% zh2M=w)}efe1y~aQ-X_~vWdqCOB*l$?h{^yQ7AcY-gYsJZ1b1M`EY9GVOeU&7>m$Jt#uT3_QqH*^qc^nYIw$8HzW^@y*Jh?+9mYS^9L86Qx~w8 zPP*AZW?QFn_wq?8UF*w>4374WyyXmDew~hqGjD#K*f+N@<7e|!q|SmcyT9l3%>;3x z^SS#h5TV1DoQ}LzRq%DV7AA~OJ|CKkoR{n+Xe8%c?8BO(fHqa`Yzl^s`~H;YYQUa* zqrB;S%+Wky_~l2V-n}5iKDRYqUy$K(Jir3|ij*~HV0u)T*!K~BHtW{w&Gts%REHR- z26~>Y0vwcYI)l$>>o#T^rVG1*4A0#m<~802y-hJdovci_YR0v0SQEf&7Z|REkd5M( z!&aMr^(wzTU(sZ|0qFNRF2KArJez`vxfJmuBP0oKuN;Y-K&GCzNOb`3EtSwG^LC=> zG>yM7^puu<2go$`oUFiK6}@(3EnL-k@%$$g(-u|W@MN@dAwT9%+|C|cl6~x)OL~lP zgSLwIK0W~{^R2=Z;&Y_73vhu5XZA1jPBTsn%alMtDk-Q|jZG)b`lH12w7D~eh1omZ z1&E>X3ae*5EuoL7M|nn7!jkQgO+HJOU7sBPxMx3I+nJy7iGQ?wl}`p>?p9D5`@N-u zT+75>7jX!2)1>8tmER;6_#Ds1$)qBD`kAP}#b&xx=5WgrTn5`&kV?G9qJOlYu~~JA^WDfBl4sd^hS?jU`c&O2iS<<=TKIQDY`+pYTm6bV zR0MZ!S@T%>bOAZrL?9O{_=(9C8e|*PjrmC1W51gWd)LCosyu0R<>Gjk=6H18yF4@J zff)ZZZeb+p6X-Yjy00PTlKv($zM_Yp?yMVB=8YXDDj9^c3++}ZLePdi_i89XW6vmO zJVqb~CaqJkivb=@MwBrabb{et`^O(nk0V{R8jckRng>?)H~VDGny7b)`p=qm%FuXf z8Jd6~JnR04k99S%MDj(b_Ga#$Xamox;=Cr>443a%WSuK>V!@Tsh1vi${& z-HXof{Dd!G4if_-8hUm?%iMhobU3DMHBnTm3HvnLxICXqbNuP(qIK?|ZnQ@ji-+&cMt z;ohfBiu%l1ib=%=+!+Vn=NC=gwV@)s{TWAHL$pB^0snMwJ8%PKA64y=iUTt}8H0z) z$@K=!tkLrFD$=l@E%R|u%OrueKp^A6JQeqgdf3|V5Z5J(O=G%HU(lo_YyDAsQCnX{ zb!OhTX8s>|3O3e(6U-60ql4*tfcDApiv!tyj`xL|=8YztRDYW~SKXW9t_jZQ2BC z3tk=>Nl%Kp_4m71k{C`7<&LJUd0sM(cn%h>JIAWhE0Of;WXX&dA+FPpnmn{BTEV@x zflq!1$hBtAp%`0!z5OffsFp58Ozeav9Ev#fUaW{kJR7YjsEVnWhQ`#Q!B2RKTYxU2 z2F8w_@h}yrE~3`l&~2lKXX_@rtpJE5eyOEbPKdQO&6my9C)BLaA(lrsR?e%0?=)m~ zd=?HIOfOIEm^JYW!aPsvcRM2{U^!SVJbGlTlpth+dJja>8v+nCHQ1iNm%tBd>_{Ix47ag09DXh~vrxVVABsTQ^-bEe6Av-}qszasWeQcY;8vtH~37!)(qx;Tj-` zEpWUA1-HjZHHDpj-b;3ATde_#<5G<~FmE8**Qs(u6XVY9#Z$qJa+gJg+{t#`KJ}*t%a?*b&1OKoJ%7&thuEFlT`P!Uy3sc1 zv^cBKzGGi=##eZ3Cv%y1c6V>jWG8hzy|i@5iRF_7LtRkeQbnvcI|u}OWVmm=9fqcU z%v@{s-eBx>Ue~b)7m2X(q%?D%-L6y81gIntKRpsdHUc9;~8 z%W*(LNd((-@Y&7Ym3g*|JFUA-a){n8szp2dqQ=eUb~1jxj7q2e#Ct=vVv<*`dk^xaZS3ZlYt|DH+e40{!-393+cAA3 zPS(pLqY{wpbaJa$BL_8(nGL)~BR}n`Lr`~*osGfIM}k#OL+qmwdf#zX)Z)kIxQ8Y^ z@(IB8;MZqnlSk=5y1VPmVv-(W%gSfWz6V-%FYB-x_n@ZMYyq@`#jZ8^!V}TB)@r43 z2t7M#TFPmsi0KNf?01}{qE|BM76Ff&>^hn%k1vo^??qBxhzfH|x(nzi0&2VCO=psW zvEs*s>->40NtMs~gd8tC17O=Sk*l!&#)~_h{nn>P8JSaO=0o;gtO(e&EtfE>VXcJM zPFb@1SfQ`Lph43`>j_LVoQ8n3alu!J2VgEscoAxaDL^S!Y!n1Zr$)zDtk{wt0?8B_WrC^EjTvl>#zO`PYI2 ztq|-6mT)F~qaH4dNPPw;HqWbTBz&?;8B^3Twf{Y!6IS8ZEUr* zfZhEWk!Ymzw*sn&aZ)JHC;p`&5ys)Jj;P4wS!0;1qWi~G14azXv2%XSmtFRFvGBX_ zi=|oP#CvQ4ou2sj`%T`~o;4ZIjeg%69Z@^xb+Lk8xJ{0NrUY|@*?UMHDg*tY&5~}! zbbJ)Q!A^`aGN%W0u8aZX8FdUZDTJLn;9OnaXWj@Vw^^a?c%#*b*4-930s>vd?=6Fd z19~k{od#Yj1HL$>#6tlpDk>(6D;&#E`TekIN?{sdr%aOm>Eg5J;FahVk7|4o=6Oy8!F>-HH=zbDFoak9?ZlL*a00;s-KN&l~yEEV%Q;tW&N*f7b{$ zlK-$V&Vg;LiMbtMpGt}(GM=OfK>5^N%{ zJWs8*2S*=Pxi3L{61v%A-9isMGwv))N-jGI5rGY|<3RhvqmJ9nNQ3>YT>wNgp`|^9 z%weq&SWk>5i!W56%W_*pw{L&Axl3tSnr#1eCV^}a_tyyHw-j&+9DT(ebdUys+QmN6 ztt&N48tx*#z0I4_^BnW>jfk7v-4#0$t5fg?&mf6WQ&V%geL9awiutx>H)?ETTyUss zSEp|PK0dNF7!Y~6q72i^F*}<9VLkd}5x%UaBTz?YjpzMidDI(6_8mVMb=vt;s^+)# z_P1R@EbI0etcfa5SdUqzv$K!PTKHt(HwNCH0kFU0Tt!ppQJCbBud|Ze=0;q+l~-1V zdEx78sZjwWZH;H)9^k3WK6bsU~+z zE!d#)pM3fn@_20X8>R8i4gS6Spg!sTD4@j$?PP^DglwWp2{17BfD)ij^PtjL^CwRG z3$O+PPy>J0x31e3OioWsTrl}+%)3+rhhoN@6KPae-`IFzv4lQ}u$Lx%(hsOCWbB`T zpqBaP%|4=l?pTZ))JqOf6c+*ul+pEz{$$G+>R$31rgi&Y|FR7O#(&?%H#0M{(JMd? zs!o`l%@7MH1a%6=(v#fW?@mUvs~gDy0wsh}gh{Z{KKha=97{?<0%(`c znt*fj@|J=-x1C-9=%-HpSl{$ zukrb@PH6= z!|im_z1f72=57Z&_WK_e5laog$xTxZGO6Pow<|Oe6Ofo5ovX0kY^o`xwR-#FKd4q$ znmvHKDKzyB?h*5fjdfan1wA|@+1u^wTrX<84=68i+MP*UDl2?xYvrE>kl%|j(_3MK z#_cZFW=X($E~BUz1E}E0D6Z1`_kcF>$;hlUr)``R-Gq#vLS!s|d||a6Dxhm=XD>wb zPZZ%a{36QIAo)W5w#f=lWO_9!=Qb_Rj+rME@M9S?Z~a?OE6yDH8tU z$LI}ijHxQOQEn>>xTu?kw`!_^B%|qI;8OQUdw+i{3Acs(dkAmZ_BQ(H(;cc2pt)JR zz^YrUz}Av_z}lE~iiA|OHu|D^XLp8sUt-JMGP$qH=qRGsP(+)lkDSJ*q>MZEwwDt@;I zS6%Rruka20A&n3fr3T4uA5|t-%#M?;bKPQ4g$cT?n%zT_l@XFYJ=*x#@>X^AOMo*^ z8++2bH*?O`ach!hzg_r6>@{HA@FhT3e^GS@M#2)t#@w6%5r}ERY@iFo^P z2&rF6O3GLKJptK#3L<+6rDWcK2wXBi0*#90k^GGk)StiC7wgG2zZ9%DB-mF!+h!4Q zK%RJ*1^x4b0TFS^0)xOGw<_qiMYcq=7#>xp>C&&hQwOG+Pr?@<#qVfN(7Mqw%xmSef%LTqh&=otK^46~97OLf_&|+d^XH>>k zWR2!s&}hHwwxJ=btv#&(WPegqX@x)tFDJsT&Q9J#W20Qs=T20Dg1V#MVC!;7NWM|# z^h~nS*)rH9+?+%X%zE*{HKW%s{eMg*Jx&xV^jZ@|S{#(C?_Ymwz;iNQu_hQcg65TG5TEBwEZab6O1)-`bpO2m%(j zC-drARuy-bBs-u`=*mjl`}Lpz5YPo9xBiRAo?tnkMqXQjppsQm%8K&8VbLD4nQOD_ zdp=V9)R-w@LDLb-L0vqwPH;oBI}iXO{cHLvg%vvtA}y zqrp)0_lv{jmQDv8nlTWF9H49^`Lr@Au;*BoRM;?CRu^~o=akT!LaArlY-t(1dWKv> z|A6r>4~Jpq@s+o7vO-s`kUuN2d>27^~s69au;eHm)SvKY-3ky#rd#3#x1 zkBW|yX*%PMP)sN1oA2=jgqViY0~UIp+P&=`r>`OvMg48Ep!mw}U{nM_k=O&oTg3jK znKWleQn9m-zhKt`Y+Sfnw!SEI5Wg5Yp0iw#k<_c-6PjzkF%SYkBC&aIEr>jO_Z=&-wp-Az+uH`~*O~Y>9Bc9?N+C zwbdvmJkm{@Yu$avNHIdw*6y0W68Yuq$C z7M5m`7ogBCy}UL7sjA{@{i2pty#1i-At)k*Lg;apQgUVgGSId7pfm0LN6sH^*cVf> zIqUHOVd8JD?-##x#VT|4X9ST~SLvmNx3tX6&^p`W0>(c^MVVYY?EZHA9r(gM*3>6I zzcBD|b6%?R?Q@i?FLU+c@UQQJ%8v?N6X`z~;UCWBFJpeyJ8D$Ocqr;Ak*^E=t~&g0 z&%f#eC}P!Ue{rLK^~wL;p%mm>K2+Jri7d`{u6B?A-Q|AV3KjZio`3FAuAG?v;>|nn zfVKY4ipj^kfAOLJ@{kx_;s2eYAt1MR(@0IocVt0Q%mkAGuqL~IdA8U&J^}ye-zTZ#rqtd(nUz)`~UksIf zfmK$`SCOz5^Phj{zqENgly4;e+8O;9M}09RfH)J=xpYAN4cVY9^a}iwGPEUtuy(wfj=CM{y#nZ5cFp8uzO7JuK!>89^arSz&8@D z28dPtZuS4O6K}qCxuJb3M)rT^D)iDXBXDV@o3$Fbe;+y9^3 z_k|0J=Y@+@@b!y!^e=51S&Ev@8kUX6_-ZCxe&QYD?Qi=M z1*JeWpeQfS_hT0g@i^qNtR*4t2c*h-%LQsl8#6ZX94?Ll$K#)Q%ZT8 zEM3^aVaJ(?IWn`fL#i@_Fwc(C_< zCk;@SF&#GF_R>Y^XHZh=y>vwQs(eSaYmr)B9egneh283Ht9JDubu4k z=X%0aK0uwkTc*%>p|-;Li_G!F+Gvhx9&heePq4gBrSmNrk+so0r4k1RwE%>|UB226 znnbhX+uJX8_YTr}^5q4*&hFYymOrfk&Gp5EiJc^?)#0e;5z2)}Gv_7nPfj{B@I(VL z-wLl^zgCp<0I8?8Da1duu_1dcCBcAG!_Ob(HIGtYSoLOTC}cXS0GdKQTBxeonkXp8 z?J=e%;BlCsK+!NZJL=Rj7*Z* zNlJ`l%cuqdek!Gzs%zQFY5N&x0nADD>(?0oL$3-eoDHreWc{E-gXd_nwTtz2y-~88 zSB;hK4S-zA`RXi8F6bDgqKZ2-C*<*cit#}_&ygI;(|Uf>L{W81Zjj~k?gBiQOz9+mTj%_UNuU*q`fn2tzpu+`_mSu3g!h}pafj(C!CK+9 z?;C-g#slAr>u7^?Nkzs@&se_x!(9IP-zfR!dwx{*_V#NcFW%uBe}G`!#7tdd5w)B> z;k=witoo%L2{x}1W6VEFnV8%j%~gk}s6<${l`}peCeOYVD++idE52MuwnTww8C&-C zl*rLBmY5e)gh%QqwC}aU%3Zq6bS~QQ3CD^*X9kY}IgQ%-Vf7y_Edr3S$h|OQ)fr0A z=3+Q*7KS)ahA-5YI%xu+gfba|PXPYjl=e*K`M0j%RSg_r;l{QdxsUMyGAv}1wyFlM z=^_Q+A6XF6lygGr^wQ^&8cwtKYzz4w@P@T2jB2Nh`W$Y}nktrJ$Q`e-_zlsWPdB;* z&AC+H`8HfX$+ddY$VakDv#-6=u3`)o4%1=|C~RETf$ZHIw{(tXVlkO_;&Kw8rH5BB z5|WYGv`j#uG$|bBjTe}&5(VALR(0`EORAY7P#+!Sv@B^3sU7+_`@I%4a!g#Y zHkABuF}y=_#);*ZtC80R%V7`l@l>b@@bhE6xi)4mx;|c%5$(-ZCDV@c%L3b+p&&|_ z{c@oR&eY!!S3l6!OnPcCbt5?K&jEunio4!)B+*Gw3ef6)D4r)z4E1u&XJSFpM&FMu zY1&D6{UTn_ywV+J@BKh?r|u=l(8}IiF*y_JO=?g19t?O-Ea_)o8jd1+W?#aZ><9L9 z#`rmiim`}HRWUvy-6maBn#}4S$ShYSGNtTItj)Lj(3?P%7?WfuEvUG>qHptSg#Jjn z*;XtJU7>K@NgSA8U`kSM8~LZvX_mWRFnDED8kL|IFjjWtw}rE{!+yt3HeC=miHFAQ zXq;KGl|?jbx8Tf9W=ecSBKFmi-5Ru&>~~)7>>O5C5}gY_&!^r9`_81EJ2X056#XoK zP}84Z4~)(FflqTOa`dTy^M=V;N=&05J_;aYde?}Gv3hior;R{wkpxdHnk$ctTmg{x z=!?+qQ0sn()>#f3M#}>AV!XwrOs%hf6cHe2BvY~W@D57AN{7KslR~+^-in68G)q;w zQu91DCzXKbO51q`4NoqAQyR^D4Ukfg=W${pmshM*a;^40+#tSZP*~D0GdK6=_`UiSdWZd*Lz6-#(8j_=tv!UI;Z;aqg*XN#X8MKy8|Abo z3JeeLe{kJFnXD-@=TA^x*1@_{7nNTNUT78@c_s8(^ErF#4V;av3hyGb{!uRGLtlO5 zhNcpP=-SYMRXit%M#+z5i~J1#;TJ3~^ye}K4BUkn$5L&|c2h`Q0>$BqwDyf(&#Sda zZwA=Qf8>c*ein_w)bU7h@~!JYr#|!QOx)+7if%-p7plZ~`Ulr@MnM-+a$UiNRH5at zS9G^Ypi#)o?W%K~Em2M{iA*~VoDTOT2h9;3T9^fs`D)Sl|+ne>)5MXiX$ZS?j#{B(?%Bje&s? z6%+FW!dnPCGK^%Pr$0(vfi_hT0JYcs4J`JjK+&V&c&dAi9M%;5IxAH7BIG@ZkYa$Z zqthOP(5$P2{Op`+zpxb0Ny~lQ3`;Bw8)rk$2n88jZ(-4JmuXQ_vwh>Cd=|)~WRkLe zd!6Tz`SPl{VM^o~`Gs-Z-s@-Vm5s6H-fzb8p3KgtG30%{d64|H7R0?YnH;ee!_Q~$ zoWJ>?J1JPN*6kbbTg!KUq?{NGk%fhY)tGa5`}u`LYijNiF&Iu|lV8rs3u0tDEWcX) zS^r#(io(=L7bdv?1)Q=JnjBa1-0_s~Z|@~`1FG(pP0Yt{HAJ})g1>9W#g#`lU}R*H zrN?jdW{9;sx&N55WXfeNVx(!U=#D^LOTkM?K#z%tT-fp5+414(W&=vZWVnJ5!(6oZ(JYx$yxIx+mmPb%(Lc zgF)!hCU{!bH;CF3!K1ygs)A|uv@Xo`-z{0A-V zq$D^#tFy$srls*LIkFo`c}@_`h5-CxNM%WwG~kiHl)cx!=^V2TZ8r#X-R3|+Lo0TJ zpmjNgy&QBfyLGG5h?@UmXzG*yjcmn4cP5W(Rj{5{WgikqZ>e&#!$!>FZo@%lcbe`x1nzA0{1hkw?KzOYc8$dP- z-`bN>_zb|WHCPNYBa2z@A!!zBI}wCFx}fCYov5}XK=-MXNkKKh9LK-e4t zN`L<|rtL1vP*AcYAfGFbEAoQ9$yk0+22pFv?3Mhzi_|`%-h&f@{%Xr(`}xW0Dco}L z2>KxskL@}VXnYk8Z-?Xc*WCaA*m|p|HrIAtc$RvhP@q6@iWf_P;_mJmw75edxE3l% zaM$3)-8C)l!5vau0t5{bsSxAwum_F0ZHl8n61bKjS4le)scO`n{yYJ)!r<0FOv zq5vtxfB`}9+^VoMm2OxxY4q%oWF);yU{xjjJ$c-}kT=2c_T`<4 zu#?0&zs=Yg+xnpMc{!oOM7CUmny?Xzkp`$LR_;y-iQSN2Cufj&CcF=BZXGszh#N*lnO>cAB;o?Q;WLl8Ni z>`Qfbi1k5$v>|3g;N{!MJfI-so7KFZugS0X-OB#tc@7h{>uyc|3?{D7r(dfoV{Rn+ z6T4iW%mI`aYI4zHH3{dJZ6^#DS6I3aK-;qTg)H>uWw4=s)?%hEGO;6)c#Cn*EuAcn zW>n?T;gvc%<<9%v$R-IH3L;?9X{gf-L~-qF5U{u1*JhBJ*^lygu1y^5!co-p5l{ zYud)Nt0n#|nO${zmI}i*S!0mfiY?(I1EZ)X9fs?(gtwIk%Q`;Mldsv0TjhPe#?N?c z-6SHkpExh}OvQUw$EUm|C1slFXZvS(GgOx{D1Bwgf!mbC?e3w&-b!Num4S&Zl*{$J=w&N|`l0@~N(&8gvuCc)!Di6}DeWNVnI6LA&@;IP{LF!F2xRuO0iD^R=lRj}Ns+ zBlL^cD6`eo9gSnW=x79U!w}{X_TD;a`zZ)vvBR7xH8T`ck4B#{*4esJv+z~G$pz*e zQcJ%l{L6N^`8(X7H&)4f|#OV@gm<6}X)z|8tYg zVcsq{he8n<1k0qcQ8Ny?`q9} z|3;#QEka{aOjKM zD&#;US~-nBcm7pLk-kxNyvWUTrIU{jT?meo%As)bNUA9Cu6b^+mYt35v+E$mzN?c9 zUF&Ky zwIq`oqZHr6I;M(pvmmw)qmdUyCHK=70J(pa*t)`Oh+TKvxx~x$BIEf_-hnoE@srwv z;3mDsW!}AIlbH3_U4yu3y1J#r#oRTX*Q+IrpH+Cd^_Af(yy}QhGC#xLJIAv^M_j_= z^F`p_G8y?Bb9T{<*H0TC>(++21RG~^H2GebCb~|do)%}ek+K<(37->ZMTrRVXooP; zbt(Kd#vp5*+J%Zb`JQV{7#*60>2vA7jCmgbK+^aMH+QQcfxkEQ{1~iYXd@Bm%|P3Z z?7Wub3upiT-?CqSL%)7yE5(0ndot2K`Ug1?^ayL?&5vHCs`g5hRr%ivJ`?Uf2ip9+ zT?8^PCpA^yzRN;+4%Ip)&&_g0@`Nhj_T@Ji7$zbGCSm^=eFO2M&dG3TGp?w-`y-dF z33F&AvwLC0j}_o+ti*2EwEp9BM2v(w@M@aMvoDH}ORHY7zg$$o$0w(C%R(qszwGGSi#81@b!B5>KmYt5O^;{on04Z< zwIPW+7ZDj-kVD=yr+(A+M~#O5zRdrxT0Z5O-6`XC6J zlgN-C*(c@DP|(*criXs*>>D%N4u{E~DgPd7h-Vu$eYSLb?c^@VSBJw8+aUa+{ThY- z`O#-_`osB{VX_UMj~J@Y5Xmg@6(hY#J4$1s2E=d}O?z~n-WamooahE*UZJ1d9Cvs{ z-Zvt~gI5C{=o;QFQ+lnaU?g>3`x3p(-^DqxYG35@-i@guQ>=vo58mDQT_`rB7O>4e zKf`%+a?HYbM$q|i6i4pxA8BUf}=xw0#MG^F`?mJ*$%)D>L(FJ-2AnpN^kTqWupl6m`H# z=HVnT;o8z-I-%;I>{hcqiCKH$>kx`*rUV`gpzEsrG!4x{DBLqzO-HCEw%D^2{X*w_ zC|z)MLRVVkM>|0p0Ibnt4y*=|V}Hh^P35+46#Ocf5Bo+j^WN0}hwf1JOwnd-ZB1K% zCEb3y+)hhc8nC$8Ec1_cTeOTj!>ZHwq#iJj?YzE?4xh(b$*3_$606>aG~I!09`sxbXgkQ{J?kg=Pi9Eh3=sWpeNB?QOBb)OJ0lVL>qM=vwD06sIE` z3kyp-MKD+NHkXSIh;vy@37ja zUT)98f7C_3KD4gt7FehRu;d|dJR`XvD2qJ+@A?xx47{BA^&Ee%lfG={($LR2kn_^6zK3 z$kWR-9Tdh#yQEr#1=FuDx6~yHKRCQnu$5d>aAHQCzE7;(_1pTvk$F1wE??K);I_5B-&))NJ zQ`xtyfZMXhhA{t0uUj+BCm8|y%}xHfhO0+8d$CT$zCfNv3uS)l93Dxe@U!f-6~Z>K9}5bO;Nfb zbh)oT0Mp9wLJUF4JO$sLTqZ0%leBqF4s8E$u<7MufJ47*DLGuH_7K{qmYMftnNrZC zvi*tAI_bcDyZ3&YHl(6!q0QXwG*GY)2@^Ks0k1L)p>^xt$?xAg^u8iHJ5zI?svv&k z6+=Z*J%&f;0va{}J5(5)oT40pI zT5}q9!>tJ}Fbu%Q!2!F(fG#$S;^iMMoT-Xho;gA40rXB*!Iw!9Lr%vx+f#NO)8kHPWN zr1cFzJ3@#1NWe8@z+T@b0+qaLr`$wKpWJAEjUk~N;>htA1r#>C zXtBNm9cxo13F|C2%G$9q4#W&^)fJbsF*qSU3_~bvqSS*tMz_M^D-wx|Z}!zlpB8-( zsj61)|4<7rmAK#R2R|>^-qau+pNuu*)0lIf8^?fhdvg=e#M-8TXaDCw`D=%@5qOu@ z&pE{ZYim!{$ns*)FHb`(P|ZyE*?TZ^^UdlWtq`00^ZzqX|Bn7@7((+PK1~0zWGXGS zzfvT_7<4@n8L#(pWQ%%Q;tz36bg>R)+H!mSi#}129NPxN@RZ=khffDYv+p{?+;9&7 zD+S?JU=j_I``{uKMuo64be57#T3;`17aHBvBC)AL_Z>LbI!#?D3DrGm_B|#{4r? ztUvE(5fafVCb#@t3aopA!82x0M0?gkp=XatzqRh4 zdX}a_F!?5Uq~4DQv3R2$mt7KO=syqgd5en?oajc8oyh9ifOnK{orL#hTFCjF>|cZ| zZ*A;f(18d1k0+R>+pQePE6Hc8=%`KD3SBoC-4jK=Tq6ClTpb1f?hC}dEW!K`1Pw0m z32T3~O4bv{`>`b#VnW*%-_fBHcB9rV{<&6UZBlsNU1goo)V4SJI0)kV)A#(qDQu12 zxHBVP?r!r-{PD4nT&y=ytV6(YRKVWhrD#3STcI*d#y|6PB@tQD(bCo5iJNA0H39;Z z?qZ6>rY7j*Y=;WMQ42<^F~wdj8oX8$c(U^p^1x4;FGJe(uihBc30NI8-UfshgGhOr z59yLT?)s&GBXw}2$Pf#J))ZQOU!pM1c!-M*W$43A z6iNl1qaQ$Ec7&YJA+&=fUTTXX|A9Q|_nZyS+3rdH@iu6*gMOXh;RPb^^U*0jr^1Rv z6(@RD(Xrs>cV5n8%z$Zs=v?r7R~j{cPE^QtuWLEDaJs7JuVvSKElrxJ#H|kq zY{V^fGV{d12A(b%&5U%Ng|XgX^)ANT?;Bh@*kubL1ZZIe2^|O0iOI2v87*MWnFr@Y zlFOI34T09_Lv3qy86QeDY)S*SDu%cdD`}k0B#A>ix+O8lD}Q_CRv^8PCdpkv-J)Ym zMV2a0D~_J)dmb`k!Y4YXr)vlVRYc2yEaGCc--pGD^)UUoREEN`l=G<6@WcJSp9*L4 z=aoM$nk#=ACmh6ft9r~EYpmd)q?r6rMJm-<`zJkcisBAGGZFjfcZ%uRMfr3&M!% za{x>oq;We=S{0SU3R*)-xOX(ArJrC*#Ntf+uAj#5M$%EzJ5a(45mYSi~v4;8Tc6JNmGh%+C8w&LG1-; z=^5V4$?cYhbktLd`pdt}L?3%Fz=)$E*$h?6x70((juERZfo(8MtWe?L{a{*n6YM#a zuXGj(h{`9>_hF^UZXv#R+cy29UFm37f}rbUeVSl#arg(SLFIERrWl*Mk@!z0GzKPiW?2J$emWv*eT!s4Sm25M4idYW z($Vv1^x+_qnAB1ewihl#_+oxee|Ld1)ZIfs7ueZg6){X3sV0ny6(v2%1*#|j5{L8sPTdE>yizorb!E*E+R$5vEIr+y30?0y8h9;LSZII=g&YMl-% zU?!%sLz`Q?QdthrMov1tw%B7lDx&lA-&0*ow9d*l8=Fc)1XQZz5%8}JIf;yaif-+b zBL!}b%Q}fkLyv?H)Y;yf6Mlem2~P7{o1LvBYwv5Zrmssq-VJ3BwLOpSmd!#v0zQ%L zdoP{2d~&La8hqHjf6a&c*QO9{HwrJ?n~D*m*OP`EQT+ZYsI!NXt>K+pZM6WNPqbPp zj*fZhHvqtfM=rYG1p8$)tE+kwax(j~NCnRSEZ)@vxM5}j;RhMoKc3B1$WE|{PbLrL z<-{3k*|{n%JZW#ey>9fN#o7~NchJ=I&WXFQytlgvxa7Q#7U*=A7M|v=;aZuf7Q}|I z^%rBq7PDo=97Uv=^eHSGUj&(w&DDiRkkx!<^@xZncz;p0SZ$o{8!u|&B_4h>Vs+R( zYFPiNkB|J6|Hq3jhuM6G!=I`D3(|3X3LY7W-?1^>z0VQ(&n*ihz^sD>&yx$4uCJqm zjFP8~GfsWRf-Ds&pZ>Uh+w;)l??1fi1Trj**Ss&%`^m22nI<3K50DV@>P*K1KNA?; z>guK|rc`@o+b8yn>Ey{vjb(d>nP2P;&c^m2P zFMyDna>o|IAr@qcz{V{RnZt_!^hAQ1n4WSy4Pj3`X0GN{+njO| zIoX_=j$tyK&j36?j>gK;`PSgowECPGY+p6V&bGpDt(BM!G(@&OyVZny2*TS1K#4T+ zsH*l-@EXGa46d0%;#cv-GEfFP2D3tWPhQ)N@W0|>x2E%uUmZ%y-z#&Go6M+!u75FS zfi?0qNA$lvxw3@I26lS1TMTW6e_Ds2bs(WsKAF9;YHtzF7(CE^GKxMdl=^Vc?wWdd z`nz%o6qMq8zQSipMEF)EOE`Sf!sY1L_2MSZwf=;#NR!Cqpx<#aD6KeG#ScA;uJyRc z3=?-apMS|q$ZN%>xR|H_HLmLXnSMHS^!UcurcOWhPJsKem!c7B%`gfC*3H9=LUD(^ z*VOX+HL(CJmM)l^{w2mt;^LzGan|SdmM!6{zjxP3>Ioq@z@<>kxYd)+l-Ov&)U@(+ z!U^G|lQ8EKuB2T5>YY24SEHh17g5+HsSTBGEvkYq{YBZ#B1Xl1+Nc^|+7k&*`=BcQ z8l~$skfGh;N`kgMtum5&8HGD?AE}uV#gWW`zuNhTMYP_U+y45vYLn8k?M)p0wv9gH z3v23S$)}`p^N*EyBJ7r8;&<+|rCbC!Q}A>>hJr%%fY2q{_7~wUlDQ2AEG`N~xQ<+> z3gW`Za-XIcmCS?YZaHb5QR>^4c~_t7r?ojduKDZ$YD9pF-0ZG@=qZ2x<%Mp$@Sq$i zIE5muY^OjM$&@HRSe)>bb)8c|bb?Ja!qNL_#T}eRFe_kkfEKH6GL-}%ZSAre*c)TG zLLzfv%&yXu4i zO3OF4^xlQgoPmBV=O2tx*o>8(wVW!K4&M+pq@<=6LkKBW@-Gh-D{8^Tx{S-<)DEBF zWW_gtJa<3xz_}N6`#aP@AG>H7Q+DK9^oBtFAwHm}PcH`=rlMr5P}ZW>+}K$#%$u_A z9SMUvP}@uUEfP)nO`M!H2QQDGH6RXvJN?-~g$0WZ9{3ilFiy8lGCt=K*mxD$iQt#1 zil(WKgF~&1K;47@GbSu5KaJEFwG+Qa4wuz*C|a%i-HqR0p0I3*&UcY1d&!oS0^|iHPM~pV69ymc&GK_MVsZjQtFS z)rr1QMjrI_Y30JbOH@DEhth#0sLzqGSli7VSCAT|vCTF=$V6bI@o=#OdVSNz1joOY zH{EoZI&PCwx7;c=HyJ1>FN53Z1qCT&Sc9!xG^`1cAV{Z8MD_XxD?)4Z<8WP5JyX{! zpHBpMEVR?MTI`9C&wrwPbVK$g2A6xy%}x~82kMWD?Y~lY%$4Bslu&5085&exG(qWa zQpSq`56&QKw@7nZitAqvkI5(EdXySydE@aqE8Vm@beo6Zn4SHDtyzEVE97Fj zbB%y)*$c}HzX6BMPr+SUVBdfKKx}6^tJQ=C4-y8|DWo93-5$pIP5k*bc;0;p7o@7I z`LJ~#{lZxGQ%%QM;ViL^s^$OVMMrz^e5Cr(nX>dH3)B0cs2${a|dxagSPwg zhj81nVc=jmWhM`|rk7O52BrpUs*oAYkC|dZBsdMVw9)0&JkRJSDPs%~F?+p()SDXm zbAJ137?dC|#my$!#=_ARMu4Agb?-5Rt6$ z`#j;f;9<`N9dukbejP%?jsN{$bUL|Cv;{ z&&)bno*6I+fUR*cU5)2zZ_Vi56sz1!mU)>{ePIavRTKGmnETcvfDKy60H0*Q{_w5; zQI8@hb22c$Z4t`X=r=Q19a^+8*2gKSlFmEL3MEIF)3Et@0J@xRZ6=@!;ns0-H=V!%n z^ktL`C!@e80_#=-!oLAsU`R)0(a8oIz-249%LIp>kONcSBaYG8}~_+iyki5WTo>stp3l{-MKr`R_G7mGq8c;aKqRKAvfjVp!Zh)K;V`fvZ)Vy^lZJV;h}%jhwb(=39$ zlFZattfMU=q?MJ9&1{|y>%Z*e1|C58q255i zShpiEg{i6cY+ml7nZNZACFCTWW;Bsop|Q2=3N7*Hs;TvxV~zBddz7Znji+N&w;E4a=fwZ1Iz4GzlP?9QuUap8Nz}y(%F7 ziAXDP=2V}(_oxRQDD7vyoNDIq(zsCV)(&z&`KNlSd5_u#OwG|n zeo;n0`Z;bllOf_bmK8VncK#lLT_D1z;I6#Xsr>_nxMqt*m-dR=%qPHRv$Jy!z8Mbk z(MO2ri2SB1^JRu!`pnO4_T+DF&Fe@39DA9~d)Bxm!X)qD~J45VE%A zt6#H@M;EZ1I^hoghF5l{XBwmwZZG<9MYlLe7&A0%6tGR85fK*FYpKx#5PkUmOD#+B zRP@RUbudw2$6aI`cs0>KbCzWJ28II@zGx<>0jFL^HLYspJw0(d8-|HZU`S)9{T7Fw z4tvv8BIwm^-4J=~i$WLZ8At0~ber~~7EIWMyJqRYLqk|4{E~<>oG)95$nFv@_u!Wu zA0Hp7@6$=f?_FGjWTU}CtQmfNP} zm7khVs|PI)7+1qQtCAwshdR=p?2$3CYi}k ziBS*VLy75CY!V59G?((lLI^I!Y<#P(1Q5e#9i@S!%?bQ>3w>Yx5MuUTYsS& zJ_R16PQGRJpgM7OgmiC|=Xm$?JX9EU*fXf@i{$jB7eq#CbR18XonIxujsqOI9%diJ zP_2f6;NR9nnYnYiN4ZgU3yQzpsIkBId`k#3rLvruabR^q`r(0$aQyNK$f1ZAQC0xm zg&#I0MBp$JXHzAgZl6*e6$8Id36t368*(B*>HJ=C^62cm%eezRs!{?V4$}@72mRMd zi<7bJ(1i?CoU#tI?SY~Cl9~OP;+g}xAqj2kV$FdmDqu3`D?_Rn5~IS7`wy~;J!aIU zaOyLwt}kb))Tt`J4`%tRM5NHQB!^CebCC;LNpyrYGh7_#i(hX&GH1TYoF~eA(1lFP zEncCEFD~l?DC?|8)J?FrM6>+={-c7*A+bO={@39C7l>868>s%}W7gJ*i47xk=c3Et z`WDBL_{q#Vyzx|+hPY2MHSktw_%`yr2Ni13KJY%c75ErSGq56b)<0_v^@33kTi_Q$w z_vfVzX~T%%FIm>BLo7VoGlFVXf)BY?95%QaOM>0sxcn{;IA;21W?ZerA27N|yZyxQ zPp55FcB{)kUKX8}@VyM^^6?0-&*T#-BXrbkxk+Jreb{f=(+Kr^`X$TLdpbf!`)PTa zj@F7q!auPcEyFTT7_G|;cxKxj2%}kiffj_o`h0U;A8AJb{mgZiaZQ%LQ5!CTq#C zjY&_-YD$aIPjy9)O6`>a#Pn!!(+V!ONV3VdEHfRp&-d(2b&=4EXrV~V8mUx(q7*9S zUlRh|XlIqwLffCA*WJ)DQBx}1ZI>oR<;V6m`%MyHiPbPNIk)&s+H6yv<-<& z>X5Z?VZ>~C?)z`f^`u4IO^7i8yUFsFQpHZSfAP{2H$}$MRWA3ObZsV5gQgm9{*O%v zd;Mso_LsXcVel~C=wpkJl7i18S(Ls@8lA5 zQiIgW!mHh!M$)*vIuu**1M>G-}f?8{i*VB z=vCkJ_9Sn;(g*!qbMiv1)E=Wc&&`60x_Czq3bccH13a20q?dJ?$jxjXozT*o0Hdq* zvJ-@owHEt)Fs%IZjD!AJn6^nQJr^n>!)elzsr9-+k&WJr{a0+Y{>>}{8}4*E zomiNG2xnZn$T@azJpyJWRns}u(= zk3lu}Bb+Lnp`f76_M`hlog|ERhnC!(#i^liOwVQ4aQbgD9!217S1Er*5t~1S&c8a( zt=@d4BGmbi5=>}ly@tOf^c=aAu|1kr@tucDVQaMw`4RK1uFp7)>ZXXi3cr$N{2tSM zrYrUCy@{YSe*seAf?U7qkuj#@CIs~>)$kmr7*Pv{aBLz%Dhe*6QC5nJmz&%rFMjs2 z4r6%wD#%Rd&SfZ|?(4iGEm^Y7%NnXV)F-Br>KEXxtmOH3#OPMzXJJtTzWGkN zn$44zJ<7SwCv0s(^J=J}cy#$^&md2kh`ve|7ce}S-UMRNiN0ZFa8C}vcbfN0OZ3)L zCVn&xv#Z6#o~e|S`m7b|Mf!U!`w|YieAp{`;r|ovS?4<97JY$ynJ=#KS*(ej>bo=! zeWTTxweQsVC=VB~ia^_Y5eL+g;$p;hby|rFZblx-_VZ)wOEd z8G3lR^ZOQ3?xAz81padDyBo@CsI^MuEbKDQg|~>AGj`gQttl2_+^OV)9Up-IEGflF z4VG(G$2Xx*yul`xC^3wiRbUF-bj?J6ZY1>iQ6D8Ec~gh5T##YOuDwjjZlcy)kEmlK zSc>(G5QTe>+cLhNzFDT;+mV{1*Y8u{%^vv0r*~L5t#vKjf}*GpN|uRXTQEyxRr%cA z+92Ebgc#_(SUZ0f^8%x#7!*x%nmR{08QRU~+)o#I;l(4}8LMspjIa-nukSyBj%aUo zr(mzwN>$A84utEyg(_@@?Cff zH5suZ#=b1*u>Ip}8Ml==FinULvLi&QUB309jR#$wpJpl2)9sZhO^p*ue>SbDoOAkhi8od3R3QuEzZ}Xf6jI)`U-;+Hhoi&zcb1%Ndpp) zdpqQ~EGJo;4oAQ1l6%1HYNP7rrQK}Pgi51hMJW%9`CX@`cVVCD4wz{+RQS%CV=mz#Zs9(aLgxgDrD;PD0rFKQJO8l^AuO zX51Cte>4_9zh2DcsJQQWq7G_t%ft1zxODRbYatys$FH4oZj8K)P3gcb?KmGBoR(JQ zxt~|=n*-k~_J^aJYtx$%Q`<1-p^MTIK~)!-FB9mS!0F2FE$uShLvucw!6K&GU9Q?B zBE6+*>_3=?+8W8yF{;4AhE?#I@lUk$vrzrOPl_3f(w{-+1Na>dj)a5`q?qFyA2(}6 zo-f{tL6u!FULODJJjVGUeMSFxe9_X1^=uT_-_JzP;`P-RKH+&MxFm6mxDrl%YKgKk zIEyI6SO;b6g~h`{f5ji1s_Kye6i2QX8=%YEMo3IFv|EHgmB0aq7*M1kXLl=cdI=+U z?Vls5qFD<1`)0$>QWungrdtyy{=1OTer3O!N91uho27S4mP1uA;?o0~zHO-+)u8eN zT5Emq{NI+|dsnR24qPVqKhuFaSF>jX2X3kvH*>B4>ff}(Ju{*mc4hVnGByo zYmV6-;28fszFpu)b(l2U&aMfAr-sn4hgvNPsKb|?%uOmaUW2f<(^+$@l2MG-qHJ|n z79mPyzlkowT5DjtOx{4)kasbFOmRmZ7Uy59IGSNNc|t?t3@@E#nzPjR{Mg0jY4bK? z^a)ra#J~qP`}=`i^X%R2l_*Dik44foZIq^!%le^QyLkAISzE{K161I>oJCOu)_xndxg#Su6iOD zt*8r8OJ2LS?K@NJJ|J2Ak%C|P(s3wkt|Ob^$VTV(zn>2UXVKsu=*{}sK2QZR7oA3o zHEzYR*=V3#Zm&x0SAXe7|MKB-p z6gqNfT6`>lGN5II$oVqpHUh^Rjt>O(g#tt_vKk?xE1v_X&fVeCwxIN-);Fl<*wF`0 zhUp&W4itVGm~GjN=y}wtwa`yGA6!e|{NC-(l69&uR>T~WTE+`^nP%@!n8%z!ztc#- z8@0jOaTO$$-js;fifYhZi{wg%Rk=LzqwA9$Q}9an=$7$Iuon$}>3oLw-NbBI2fv+z z*33<$V8jn&RAa_dKH60Rhf#=E{fwoWh+7mmoF;P4u#ppgQTa0-&|GI8t^Uq$&ULQ+ zTA(UWJGRvN6k?&+Y+0#Qc@^FkQ&PPD{+|B2L1q0`%Gya&QsA0uacL|e*+KVaeQTLn7V6!1JHwAJ< z{epQjdcw!$U`?azPZ5FH$E*S93zAP5!x2Ue(V5pB%6{pJzg52@P-%X8Ae!EBI3PC^ zHt3xZO@214Cfly)ews}ZleIh_R6Wr-@|3CthGpTp>nxJsS=UMrUjNQ!2 z#kq&B<)?S~|`FO&AWn@xi>*7Aj` zbd)JR*00NO{x?A}`sEdWG>7p)^r2zW7g@Ehu{zW-HHL!tP+LNLNp~Uy-udBD(=PoY z$Cgk0SCs!$h#qY`xjq-v{Y^rK{^QP<>CY1_3u~sehs7&3G(P-`2U-0g0E+NLQm@6+qe41?JcHqQ+{h@NO& zxuOOuhI4YT4tUSlU+X*ymtE;9ww7eKFnzY);FX#midTlB=L|EA#Mt`Jh6#u9T*Avn z_$2%^5_^PdE81HVAl_!gQ(^mjXzdf7OW{8eO>-FRpyMvADdP-i`>yRx zXDKVj)->>jYw%*G-u9`UvB`}l+1V4QlOZ4ZT=a|PN+gJ`?F}SH*EC))o|KWaD^-Vu?dqiX6vf8wxE{-^9ka-q z=8ZIEL}K!>OE6cW9W??G$Tz}eW1QuRQ_&4e86+rd*lzzD);R05GXqomCZ(%O7^l;QqMWvO=Zdb+lkefQJ$|E;rA%;(V%-S|IkD)E^%peuAzE=CcA5^8 zv7UtG{Qc~E`R!qXTTS#RF6p;%N8tX9OHR$W!PHeIK2Y*^7Kk=MQ^S z(UO?4XLZrS1rWNy1D1FjFj*lBb-SB`>x3a-9`!N&lY^I1 zt8rifzhvW~{@e=Z00dl)Qg2eX-FC1c2g)kwBD0o{W?i!9oQYgX*xL#^GP=vKai5g< zy>M111P44HP5e-b!TsGIzQr7y7aub7&)5DF+R2!uvx(84Wx-9yZZsh$+$hSTKm{G< z`MC@#r#SIT-jYA72DQ7e?zH-NkxB~IQw~j&fLJl~;x`4K2G>sCI%UwC+jjP#vI6DT zsL4Dhhq!*S4&=V>5$Lo792Vi$5P_|!DqMYc88x>%hJVSTHq<)73}FJjcU)3HaNEy_ zBlLk4ABP3-T|`k-1@6$J-5YNU#B z$153T^sC?t1=zp-qLfsH(xU64vgY+!o#FE_UqTJUGn0=UWU@ zxpT)eMce$PlppKo{*F|UBW145~R;v|}gZ0SqaN?2djp}QWHm`|OD<#KC%Uo=r zd%1$vaF=ffeCGmt)8Gue(^m zDOB&limudlnCdGAksuyg&rN2#nIL53tu(a>6Qnn8ryNvKHqr|H`Ca2J*thc6mUH|0aC!Yu|W=Oa4Z=BT-Y3TQ`YBREsG~e!@e~VH?iD(hj`VC!w1F^0)Rj zh9NPvXEib6Sy6so-rlw$@^9!j;hC6t#>sgv#pM`0GGFd%qK+sga#GgbkD)Fi&`UZ*cNl#{y5>w*jER zJuH=3+=P9d+joD9+89=x#hGe&*x2wrxt3CaB)m5J9f*1P#0 zfx_st!zRMydAkiVg5nLHz~aU!p(t*VUKQ*?;3ht4oi+GmsLx&TL+G+|DMSB-$o0*`RMm%515{ ztc@-EL{053^H~h_BndfH6g)f6993$v(gCv}Yik`te z{;$*uYlN;03VH~}Xx!S>tj@Y@ z(iHUBS7pdttZfWUTa?&X(kzD)`dmXbj&^fWH+3r&hGD>gPe2hJ6hDqH%!qb&-KIWAejiFhGcSndm9mF{Vb~aKVvjIt^ z0Oe*Y@KEDVx-3^i(re^RR^k7q6Ii})Tk~4UuN?rDc?Sq*zuei$_EEHI+d>KL9^qe> zfM{1kw#U*`$gfs@32l#YrwB8JFZj6$n+DmZLzL>}Ru zv9$y*uA{5O6eU$GU9G6}zDRqiZo{=aJ zN7fdI!DRa%A%kYRG?Fg6JgVgFtZVJ8cF~yBmS$wHrBl$=gJ)j zkJU+_6PS3k3IFk)w;hNDc0$z$O7A5&Z2z(EU%S$7m+v$80=)53>djk1ImBQqf1J;R z-(dcZ1)|ICcAfpje{4+{Z!V(hH2zFLg(x?eS+vb~rF(!*%>S^XX<$@!y5aiTM^^Oz zW9=<~;_9|;(S+a(`UOKoUMZ%1hC?MxNLDP6$K zUR0Ql#2Qm%zIp!soAkBFpkMu7gj$iqR=djjy*cAmd0~aqpVK2~6zUh7qh-F^5l84g z)6X?K`jUUh{jt7TJTGTQ?2hVX6393}R#K5}tEYGgr+5|Ssb8NiOgA>7O?UZ=!FEjQ z)?j+t$oYAJT*~mCA)!iU5EK@28!!O)a*QZ6DP;p-3;K89GW`EsC z9qjb)c4@C_7Tj#Rx9I_^JLET^l{OQPdV#0N_Ma7$&B-e2aNEG#Ef;d5)<< zTpVKw0JEeOW6Ou#8Dhq!iNHAv|hc7%0BEmCu)s>7AJIsZH1jGL5GSXhK0ot zg6x4%t29*gLgyDokt_b0=_rJn3mc3cPu2?k=@TK|lwgXpeBGbzcdNWz#OP-D-st)J|TmwosZ3A50sP30wRrltyjcyZyF{dfhuP@%z zy*o=PJhwpJ#I4O4=f$f!+TDGI4WD{ho>vN}5Ug;(&4DCdPj%P8QnbCCqnH@`<9dPO ze(eQ)a?4CrUR306JX#OBQWr7XX*I|khOkel{|otYt0(9AV2gVsgatD>!3I%5xGTQp z*m7i8K@z1l?AHaxa*@H>LEa1Bd5z)GiSd0`i-S}XZb(X}o%IPfHTgO`?f&C?8F=3Y zAp8mRbgwj1fN1KIF<2H*gQSNrkUj}4_BtR48?-Pr>Ut#3RTXi0wU)~f*&Ggn9X|Si=-Wy| zea1pVMtIP&=Sfn02>$3(;#<(vnjE=w$f4rdbwgFfPB&dey0mT0Ml2WJipa4@#K z+?7F_w}8w#J%&E}nE|QK3%k*nvD;yGJnGKvwtZ89itl78d>wD6$O}725esB zWz39#ImFEXZn~S}Mai}HOHb@}zmt_lgjtk!7LMO&Q z@h?hv9N3gJdkRu< zi}zi`>aK!pw0plVa_Wb&>2)gAoSaoyFM4iHv7=nl*u|bPl#e$9C`iq!WP+nGKSFOx zZ{kJ3ej0;E=d|7B_KE3>M5^j#f|A|vTo63=OHEDn$$=u()mkAXHLH}FYq`3*U`oS1 z>k7C!RNEtSVL>z0vjhW-pAL?br%j+Fpg$Xa_{Z1cBmG@T7;I^vYHL;IZ;H*UyBa2k zMf3_%O^n+XdbHkx4l@8=?Ty3p4_3?+TXP<`iBgu7=KT~2W)5}FOr|$kqaGT|n68~| zlGfayT2uPbN%z48A&L!5wa-{|XuDw@Ku~z)_ui|p_Kl#slcGNgFYmgBd9YJ$q$?hz z5iiUDaDLNQxTEJS%VV`(R(uJJQ0@$j2@$4B^?C_-go_dht;h39(i@C?1*pBmY;(~p z8Q4k%B$H@0=m4c1S5x9=4uIvwIQ)6sYiH8!uQWPS_n#?YHyPR47i%{A^Lpq|-Ok1M zejY?Q@KlV28eZS6KT${rd(f!2xvCW{NZZxd+l;~=uI%t!d@4@(L_4pw4$67^1UT9- zv@BsCidxpHy%as1xWF&g$;qcWmVfMI%OUT1xS7`l#8LR&%$BH{?OYo7*wEJs6l4;< zNaKtPG;j8w6=^p|ngsB1rG5d_JW6YYaiPHd<;(w9vh5$HXupFF!Z7JFH%LUq<>3+D zZ5kM+H%)T|hj8b*y19j}-@PaMfJw_z=Q5sQ@o5~g`8g=>u#WpZ1F%ty)9n&+)zbxm ziX8GQ7vV2&Q5?-XU=#l(7ysb;({0hwIdzc)^~u2#NSESI+)V~raOkHdspcQq3X7!E$I)hYt2$3MF6vSL7jz@TGH z$i?CQwX2|vcFH+0HNzBAp0WYFE~mYet6WjoJtyFn8DvU~?>daI97`fHbzUGcXv#w( z%Bz@5IFRB{cg_t;a|iRhuz<9KB2A$9%QR|Lu5drmuczscZEuCYsuh#$T=T%&a*Me; z!G&8%50bki8zGrb2uDbM#{Ypn?Ve?K$KdH++JW>hE`a=^Z6=+9exO{AO>V(NEkdN5 zl^k_7afblnT7M?T2}O;Y?#8Gnq5y^fMO{OBzN)NPw~f+?52o>Bd$nlNXQ;fiDc%HRx(c8US#VIo; zur0LuK3{FZv-o}X$=zBmQrO#IG&P%Eb2Q&`F_FC3Hk)E52s}uX`DNSNv`y!)L}_~a znJSG*vq;_u3rEOYL>Q#b_jA1(WE?EM70At+OE}jQ&%F-k9sIt|qoVIl^92Tx8Q}eW z8;p|tXtkJ)nS3GS9tuKP(r~!tE~-7T=kbyqjP1E-z1BA18`(F_P+Z5m@Js`7KkmyN zPFJ*t1JC;`jbzYkY(}Y+QIrZIWw?5vj(4^OxG}>n7Pk~hLEd#=05TTyZGJQ{g#O=f zyjS&{E+hfN$x<3C{LSzsZ_#p^>2u%7 zB{y5f(J|>z+Uja{0Ji6lI8Y~jRP^LGEuxusJ2Xty_VrvcNroF37!rLnyk^-ns4cCW zwV1ZZWImW3pyIL$_7KtQx+>rh70WW=hU`)m*Ofab2{vkYSyUygGo8=jPygV~*j2jme1)18Nic(se?Mi&%3V@l?nmbL~F zRRJ%v9!l%^B{j6VdTz7FqJjoZIhKR3vEN9&UXIr9`g_ zAhdV*hMFt+))`N7NqMbg;O8%`{aqeyei3pu=4m&&2Gngrj{2*{Me zT6?K7=UEN5*K_L@qE|1oYExLOJW2f0e#O{ry1;r^E2$#>43qvBywz?7U@NfULV|H% zXnu>nOA!;9c{8~xi8|wo23v8A$q!=Tzcx6&M`_4`dnSSI0uctE@N7J|Z1^_Htgg4; zo#bKAY7TZ&XE5tmf4~?s;Rd%4&RI1{XT~rq&>Uu_)jHmIZ zt*7M$tM|K35Xe?`wbvs6POny5-0Xi*&R9$y7!HFGk2HbwMSe4`wza=Ua3uV0amKs~8^~-nqu3oswd4Mp zW@~=_TXayA>&a*`nY4N*tyW1?{^IHFK@-@{wS4)TC~7L^3%J>7jVx6d-gvv|r09Z&b(R~-MXIAW#& zk!VwH#D>T2(R2tEFXJ03q+4P|F|&S^4B93YC2X;rW~g0Fe;8ABM^75Ny%aHww^Unp zYuZdn&094LQt{sH7P1vecC}BJrTnk^XBX5Uj&(w0+ifj0gLH^1#Bw1v#z@Lk8ExID z*Tmksj#Sot^DewB?vR-*khW^ck|( zoJ)QV?e4yQ=z|bg?fHC69SGJ&q&S@y%v;b3AcP1lAdg%IS*NlNo>ns5Q$$?ZR;+F6 zM6}|)yd-V_G)SYE<~%BffL05Fq7h=Nwk)PImgOG-yjLT$#?omd^NFn)Zna1IXJJzT zm}-Vc)AQ$TBB?fKEY@dd^w!Hu-@?E!pffQ`l``ggq{2}{+Xdxk4B(=0zu8uRP>TKU zY<}fsI@0M0_YL%oJ>mH0R>Y|q95|>oRbTGa9U%~x-9fsZsp7SvK;R44Xi#ftB4C1VEQ3S8xEm2H?8_ z+qcB68lcn1zJj7f=-H1si=x-SEcd#w-@c5lU;!bfoH3IxT?SE5OI(`k__^slU7A$(|LMbDJv^Dq*DZWFKKCA zy?iU|_`_viqE4I>F1~LNB+{au*)J))Ku6@l5a-$8(`yyja5v(DnZxRAm$Sd>BmINZ zM^A|F*~q>e6od;L4B*aJqlTWk{YgM)=Z1mV+owaNgqTZfDw`xs3IZ`y(R%4=E@YzQ zdA&jy@Q1Q9{E7*hfBqFIj6q|z@j@X1zI6B|gWW*^KCA(_$qHyNdm7lu$)O)`-~&H( z7eqSJAJA*;QR=$!h{u9o)9u7yddroE*JG&VvO_hCm_0RhjVy@x37!>qr~fIHqQ{)( z+ooj}#Z9dp!M)bj6}vd>0?i5Ld@_X&*|}5STDrt07t<+Q-QStVLo@h7lfDZu=z4<{ zfOYE}LmpGB_dc|muSjm?6%gVR-d8J}kNwd4wjpGp*%6n)`AxR>&(8AUsyn8)$_*d)zI%wJ zr&_yO7(Qx7(o2n$TrwI}QvkZlv#1lBhh!17a9>+b8q!LJ~Ode(gKVXFm`ZVTwGMQzL(i>w^Gmwa(TbFy~tJ}7!N~F5ZifP@F~^}DHl&%&RXsm z$+mE-!X|^Gj?He*4NtARVKO&q8f`Et^NWiJK|F`e?s{fe`)EumjfUCxL!8SZ6mgma zeGq@Q>8>OZjHzA}y+$m){=!jcWw1>50C{O3qQfFMNu?NnIzDW@<$YX4YBR5Zb%Li7 ziyfIJ4fOf!XuR4=QR$4+bQD0~ZwgE-oD)3zg6ZPQc`{`uF&}Kx&?UKynNr5Kb?DYa z=8t9dzE(pay`KyX(4$XH;*U+EQT%kT)HwPUBl}Vmc(T*26N`Sv@}5OgE&@iE+@&2w zy&~h>YWj!&hH3IrCT!1h8{ewccYBQZvdQqC#6T1eH^thgesQ9>6n?ZH+eu$DCPDCx=jCm@%M<*gU_4|d^! zt*tG=lKB@YFndkxdc~dNDe)=Xe33QXqYbc5oHGCSr4^08&02OI;+4x4j%}+n_vyTL zBIDG42Ggl{L~)HfSdw?Wms9-Zg#$C~D&mxLsNvJCYfiA@!qwg#Z#nu0bL;`DM1eYji7euZ=zb>HT_k0x7u(CmCF z*S*xSAqX=&n%LJa653D6bGPhr{I%jeiy!PccY=LJ-;oCPq(nqYE#j2x`sY;Uiw{_F z?Ewj8aj~#JAj3}bz1Y(&LaVGqU%6>o#RrjK-q`)3rUHzqRi=kGnU1c^nYJ}T+CLvP z_>L0;VY{$P;kp0TuLsii7ss6ENG@@zoYs4QTGN z9+7G5NCB11o{TqV59U^9`u6ozfwLISao-V{_VHDe5?ibNg3WKMV9>hOozA#ny2TLSSJ1O``4%RNP>JK{}KV(w`QUp2Fy-K|}TT8L`{ zG;1tC*J~FEV%U#3VN~fK+Ml0$zQUw1V@Q9upzL}=M95o6Nw_P(JS!I97r5@}(=p>Y zlhX_=dvS5O!myZIXSI>*CdCWp@Q(CauZxG~T1XA#eiZ|S_{6;c=ZYe?2bVoobTHD6 zAfE=d%O(w~j3X#^h3q+AoOV*A0Aj9X1{=QsK6jHEU18Iz*>t^a+}I_Md0))dCcigo zYrFQkS12QG7>l{^_V+tlG%um=7cB#wziH4GKvE&dr`~+>1!v;eKj4OGuIw`Aht%!&>TR2LB3`VjuODt;Fk#>Pmji zSs5y~=HUm<5ILHYM<>$#IF=~8)#@kY6gE?`GPO1-j$pm`Y;RK@R3jWzHx~deK%vN zPi5D{UD>}(44fBfmt6)iVI>{_OZBW2Po?MZ*EuL(K&Dt28Y7ww3k?z}+((u~``;~5 zyfs{fOe((7K*D{}@m4K=SwL4i*C4 z-@9s5xkgtV)Z7GScxPk!i%Gg=)tXHTggIShR>4)YOQ7*SNPUFgO1^g6z+{A%r5jnM zZ~r!yi7$G;0C+v`sM0ZjwgjrD!^p^FJVfwk&{%)Bm+EV0mVxiMU%1elc|}HwLu;kz zBD9GWR#qfCg6>W|@}u3OL6%En7;e!EiaJnb0*7EcFq~mm+91jdnNLiowK0BbB}zq9 zxknrvpAN%;=R!_K|Aa~-K&9DQbgj0f z+DOFW=|;MPaJE5{B1c2Nh23kFo@2$~gja1%H|r+kVq-$8m3xHwQN8qSJ7&HRgdzgc zqbii)49iZbrsmD1*+3GpyuA!rdq#qqKM^Yz_=4u{LeOY-REutM#x$wfmNnFsib@ds zC@WJRH~V#M&Cvef4hmhN9Szh_;!(Y3zhSs{NZLa!;F`1W;1nC5IjG@+_)+4F+v6jv z_m-;P)y6)XEE?cWzVviU(Fib9=e%lktZ+hx_v}GPxt796mywl3yRMK|PBKVB7=DUf zKaz<@H{jXWV4ly97ipCXdc+ue}8NMdgB1)-2K=-07a;{J;^s$T43iG-&g9 ze_u?T_zNW+rQ8URYx^=>lrgEQJDza&Ub|^kvL%U$jYvd)0|`OlbM+mke)0WB;|*2> z5B1+K2TJKbwTcqwj|c50eIJ%6uuP&{Wh1{(a)(rk@dJ>%*T+|69d^S33Jy0KIQ2%8 z5VJUlOwZQS6&PWWxUZ13nr#|u%b@QDw`ou&S9CfJKO=D`y#s%c0Uj0r}vOh9t7PGH{(1n8T?Ko<*Ms#moD$u3A{LM z^?iP~h9CRIxGm4oI=(d7ysQ0GQ2NI0AtuHAh5n4;0apvOOYT>1B-`XE&V)DVP&Hh z9GIoc`75-nw&Xp$s9th3tu>q0qyM^KFqV%81&=j&y{>@$Kl}6=ufyXsN#G)s796Ct&STD7kF$)Z+=}6Z;6Y$XuK8fUxMC4 zybBoTEGrZ}SWgtFWGYj%hQGBhD8N>V3)_4VO(h3)IK+Rdzt!TZg+tCH+j%LJ4tS@b zo)vw_A~skp4g2dgmS&P)5}-Mu~f3}p)Z z9UEbsLbSgcdmbR;TqKVvgEH8!UW!1%!6EB5@y4dcgQjH9kpb(p7r76;=1aFP!wGpu z^CNEz=?2Nk9Q@@~CnHY2Nh=wN-v0IKw~%i^h0*fW=06HXL9Tn9nGPWJw6BHZ**f|`Ew}9O@kYzpH+#8n)+O^ zPdEbCG11B9a-KFeksQrzy-tq!#;0)=>RoUsDaFZ1T6rA@HxFxxkAu`T|`h555smwz6yvVkTJ*+F+E7hnR z_~}K)J(fZa&2tsrm)avW9O`1R)3Rk5+scGQ@K`8b=Cgq6lIG!xMiKltWLQ;DI6#6Q#XBR>nkv}0$(vl~H= z^49WI-$Y;3{T0T%>T~ECCICgz^2{K+?l2AwN@+IiCiP>lzyP%oaFpMFGRM(J<;^r6cuQSg1Z zF4kSxWWKK3H%(BNTjY3E+;VArHkD197oo;&IO$+{hkN+o{u!iTmAgy3Kz=LWWU}+b z_>#ZN6mVrss+IW?`ve~)Z}86Ry=Gp!R^<4q;Z>iU4!C})Th>m9((C}Iz4qeAqoGe( zuE|E4lYf2-ng{HOB?hgnJ7di<@IX{3ieMVWf7z#1~Pl18O`v$ORqQzonD+KTP= zU20W^2XeQ58-bU{IU!4lJ#W59@K2Jv+y|(==yZbdO&$A;rFdm(__wjGr{JfvqwFmb zNQOS=o5RmwLQOb<-#p#lL;hI~QojcZUI-L9Qn9m#sA=g9GWOJ->s0`2UJIPa?ikb! zzRiNM@%xjVAC!rL>VS4&aRUdFafLHdHRg_3m`Xc!48g0jpf0Q9YT4l{k-?l5!3$e- z7dAotWc%m%mVmN|aqiQ8Fz0pgYrC+J)a*Az6gKurVCGO6AMjTVQV{*r>f zitR!hgXoNQquN6}+dPOvbay|38(eoytO#|u9UN_PP(kf-MMsZp0}30~XJlvONcHL+ zqaMX;7nlRh&fFtUy>uxPV?6!x@f*b6p87!`rj?A2@4qG>8SXMW$5&KNE*6$i0AH7^l#9_IjOaRI9syJHY{mz40 zq-#FJUt)d@p0HoZ4%=Z!sFWF(FAiBOQX*VLwgV94Em&wZYvsH9d_JZ(O`yp}#v#bs z+m78gi#@EG(XDEw)xF%Fa3&8EZ>a_6%#3D}o^a>%3aF4(nyz9PtXpEbzRh9`4-Mt6 zv%Y4FsBaC5jfVe2lIXb~Hm*o3FaMyT^z94eF&%6Y$wdA7J9s1{#n^IKHvc1Ujhv6J z@@W5d2MCZH&IdL`!kDdwM|}d*5oizn<(GWw^}Fvu5_H-fuA1Vrnqts8w>~wvF8PUXXVXt+fKdjbx}`eJO(Q z2$=G79urezNrq56cll-IVwIfWP*lhL2`?i5AsVV?!2_s~fJy1~@ejAxa(@sQY_)P5l8MY) zsWA%0eP#$?-j`}T7`z_Og&A>H4yn0IYH&-8UyHj8Solg!sS?^A$5EzEy~A!>juHg= zeyD;KX6fN?N^)E3NWDCHtIO`KCO6RED-@SAYK6XQc(#ivl&qR#wLA25NGjx6eyX#1 zPaaaY)niK~m<5z~Agy9|T=;?gaLrV85<=j~cf4A`jO{JTX0ehqH8r*U5>=Kl3eG*9 zyEvY3I8hK00Y$=b%iw+P@4f-9^rEQy`tG2ddI)3nHdc+-*IIi7)HFvX0ScN+n=KBQ zG@qW-RN*sEk5(r0U#t4#`dnDzyDrfLzINYL3MZ3z;5P1UI%F1q2a@-Ca=fXiHMnBg z;Syxf;W_CL)7+%@K7!SiGphxzM|Eh+SafxHEmj)fE?jOy(E6>~U<_pAkg!=}Mummb z>6LnntTSkK4Cysp*ldYTo9S1koNG=vhl0Gx&r8RIUrwj$%xzsev(Ji5%ET_P9Mj#` zmV4JMO6m6YO@XsW=8Q`K&qaVVb$gItclW_e2pT$?;W87ZXt_DS+na%ofM5evfs5^4 zbA(I>S7mKEU7(elg6IgE6m}zk-A7RWg@Sx2DCBZcpz#MgcjA{|%&ZJg0yU)y=ib!OlCUMpZtvzQA~{m{X#uQ~LrEVK)AQWs=`Owyesa`VyC9gA@9>A@rnrVK?Ri_uoa18 zgjigBeopUK-zOuUc9!*6!N~o*{cF+Dt@Z(>E`v`f&!Xx)FNxxb8kH0V*-b0G$9gdP zVUz9LspQCVss^jpd|GFB96ff4_Q?y?*!0MY^Qs}`lpFuo_&`}wHSaD3 z4DGWA%!V3cc*lOkV-;|}+7TydOD?+8!^cGz@C)20-+eUPbLO}_BdYcK7>Bmb1jg-0 z+i}75tk{}jhwFNp{np#)WmU?5t8r%0ZZdK|=wK}6J>q7Epbh> zlbFkU-dbNlM)s1zE2*(QvV}g|r0lLNB_?fe!4^sojH9bD=09!{O; zxNkg|hL~zDg9FdxblrE?4Z3XiDW+I-BbM-(zu$-Na*d&y%5P$Vlq!b9y|zV*(PqxJHG0qfFj*D~U!jo5H7XBp(IlTZP9?gGiiIoS|~ zFSgFYO2DtLxjLd)tg13(X0M9?sfFgTh%buoi}DWz{2~+RYwUA`Zkuw9E#o{SSx-2; z;oY-aS*=fS&n)|lr>}bF+-;m*=d72CrLEpPOR(vz-?#NYd8WR+fYTcMPk1lSOga1D zqcu~x(-jYoIVdpv%)+t?Gm6CE~1njs>OMfGUru?xmYL<4OGf$=;2#& z^e`#c3UAWCG4Z7sA5J$Q61Zl{w=;fp^o~P`*q)}`XcPg#SSEncqhzy}+vLwJdFz57 zjC5YZch4A;h~8r~3gNhQGmPlFg|%vFgTmJhIxV{-Cs-KX3)x{KB+$Wb#Ly-HsmV^n zWa{&R6))H3x4deB+TO=X-Tzz}ab6IUm~@4{gtt6Qj!Eag>Bv0JQDVbD1A*jNTX*Eo zX&WkP3iia-Z=MKFO$8;TZJt3g=#*qo?9^+Txxr7F;98hmcVNUUm}8GapAdS}|7vfn z*f;YDaD$3wy$_szrEH6}NxHx9;us^K>Y)r@!|A; z2g&a;;L~ICJ)?uy`;0{ApFP-r^;-P%^#?iHy~j|&OujZJSjMqHeSIuXcdnv-Q8Ap9 z$H&Kq`E{0U+wZyd$UCpm!6fWLD5$ri&)tBv(sW1Ai>}#n@1vx0T#73&-Q#{j^q>`) zCx6N5XsWOvFg~SiaS9b!TVutSc|LaS>k3j7##nuQVr6$|p}j#D)e#-bK;}uIFok>D zEWxU={v!n5tzhrukOM@%&VC};r)?hh+u9v}sQc~=Wxb*gS$?c7tPVG+RNH^$XfWxj z$S`4D*={`40Lw4+%`HGFn?sOn5Wkv_*je=;O&>Itlkv+|h}+_E)4u8ah`Gt@^3aPOcyD4A0Rc&*jeSLwk7T@TuquaQ|f!$z*f_Aa{TbRO3ZwLb? z26kLGG;AC+1b>&Gbhk(oKLHJ-9{;=29}tS<-o&O=cr1_XV7Aa`GK0)6$;3z{U?E+$ zg7HQGs0}^Sq2eBBJY=+L>U6N5*M@n!=HPVZ)}F@v(-PbfibR{ntLo}5k(p4YIbBIE zTId(CJKEct0%R3PfW`f!L-*hiL*C?i`v9sDghdb2JhmyajqF(lc(PCBw;J0?FH4?| zQQhg3U@MUi1Y!6yXM#VS$m(%~M*$k2R%k@JE7Oy^+#1;jUdtGoj~95cYx86nygzNW zZPlm5+2qeuLj7{Nzg5L69uiXHwYsD*%jO9Ek8D%s4+wGb5ODJx!Aw(!B+46Eg?x2_ zMsP3Ra=mRH03MRl!WZoWSF(WIkKl7XKw>Ei4Rg3FL)~!VR!?)yN#CRb-*k&G^+7<; zlWx10U~&*SZnNt~i@4VotW5?KyL2i`Vtemm2_t= zF;KPoT^KtBO-(#l88|CPv@D~NPZLA`Psnjkk3yl?C^4G)7J%2w^A`f*k4`-+%a=Vpa6cc&DFBh7~iUQ*Hk z_q&#P^K@5-E=~deEHu5Ok~rN2n3yFPmqB2h%(SU{nT6V)%EIhAp^zl|tzVptfFR26?-8L`+oT z*kbrg32PQ~cK|sPrm7zgHICb&x#N9FR@YNhRzV3PvG<86nY>)OvxG{l)A5+FqusPr ztgFyZK5;ZX{o?|~w%mzIxs9UAd231=O7p;a!zb&dI?VnT2fuRfm)XRc>!)65yFBCW zH2|HeDw{^lHH>nmjg9v!x{kLFKs}gEpHL6#Jx_s3nYL^v5s?BPyQ`eHgp5R0w$Z_; z!P$-SCxE|Y)7QepHddU#`$^Li;$A(aD^J5S+MIeI3b?(O*W2|i=j|UU@ai*F9eh!M z%NeUKssVpy9BR_}*wajr119!sPmZuVAHA`*s0-h3URgp-*H*GkI}EN<0X$ct#(h?V zKD{3wlcf_?O*(jk;DnTl$&MP((RSpt{ermYS_UBpITC16=*f7SZ5%vDPi^=k{80j0 zAt@7*lf}W*5cxGn^Jd^U(U=)9_Fz2?O^V>uTF)sgG8esEqC%5XqUr=3oJEB4$?6vQ z6%~cNvp!N_YZ7XjW>P8~HaC-Nu1Fa%m9QP0GuQ8`>IAla6dcFg79&zHyf)gWXBObzs$MGd-9|O|d?#fgcyVms4M# zy)UV;cwod*d4)pYS1JHB$*H+QkxFQTWuK-xKX^~SdcP`c{WHG)M*5Eb7bRNHpE>^5 z@lz3&4`mxYybuzSuj7w-Clf=t$RGn>=78+&8W4((jV%#`jOS?4`%Jvywh^7*gn|zu z&&F|cbL3`;_jp z21wkDH9kSh^?nqj%+<%dghi<~+TD{E=@OP;e}L(=N|k+RRL6K4_su-7Lyq;1@7vzo zmLiwiy=b5b8{&o_tlxv~-SND)ab7 zPaB~>dig_hbE!Q;!^Ku(RjZB(G3a-UVChcIjkYgNA#Fpwzr3TDTz_kbQImUE*^ica z)7JbHjMvyEk=@>qFX`)kV8PTe9f4o|StOkpqNpV*=nJz1dU}E|pdxoF8!eHNQ&vc= z5~K^*!@NoVcqX)!4&0yMBx zHijEgdVDDHNQfv=JXZl7`|uY%opULvsW@QyN1%O`0|h&&c)HQd(j`qe0z6{EiNkm9 zlcwhgAo<$C=O8y%R|T1#H}m;OUriYqAHzkV1WV4Rp-8ssC_LR924;7hCvI=N#F)F15Fn;rOH#~;JVVMFngNTCO_+R@n-a*u(`IMH@gtmf-%MKYI;lYxgVX)izhM5nv0$~<^D&HMM;KYyt z9#vEq;khnZ2a_sTYF(G-L*-dLlaG_7%KF%<==$GrUwoN8unlo)!)9OpHB$c`vj6r; zhY9#cE`}pQ{hc%Hzxht)Hh4)Z*&k0b{%eu{d$s>}PZp%!`4Xl^XZ?5Y|9|bxzn&0> z3!Y38k=z>4;Em<~%#jMmhhoIUi2gtHIPiWqhU6W;+#pDF`2S<7{oj40#{~Y_Rw9A_ zfJXlBbN2u4LI1v2&K|scsn~DLu>Qy9q}3lwG&&&n-=5QdyHNtH)i}r!k??<5Qh!~W zd5yB~D2oY?gurwlw-$j@W3glZXX^nrPsxxiz9a+99xT&SO zUv)A#>|*NP+GY))JfFC~LULur#iR)gd#hP6WYoe{v|W(J)8go{0?aWWFFMu}%9a(t zX$}eohG?)k3!bac6vVIy;We3-;D`y3 zde4#)>!Ri~)E+H)U{|oe)YwkRM%$R%e4AmjK0BRC%)!I|;MVA9{v;4IK0XCq9Uevv zHD@l_wh_I(K_GyonnQ6i#Q-j@X;?I2D^-wO*ij6HK9*7zdzg!jkB*YEvAKkXmrAdD zzI}+mXGoI)e%HZn3gr3wa{e#xtU&y68W4qrpZ>$7?D+Mwq=eed-CfS>ReES>h*4_B zYG-e6+E6ekI<+JfrN&4N9TM!eCWb3oM2v^xvcPzr0$AUv>8Zi~dD)YQ5)@Lqm%Lf9 zoQBMq=QRTq6cmnQG?c(N7jHsaDqGa<_|qIA63!f2phJOxEh(8fy$uh2MA*Dd@+U@fcK4DYg#ju2x4d4XRVw z%BXUT;H~FUshn}C*s5cU>_^=<0eNiXEt0Za ztPMg>{(b*(ZT)LC+Tgvvn1lR#8{@xBNqs^G0)0e5gr@U^?Xt6iTxHhJ-iDo6a+v`N z0s?|!nwGVsYWzFi%upw1t928)uu(fd{6op~<$9IGvQ+Qt#>h=7xj%6YqjeJ%^blA? z%{TVz22pSXlybLdWHxzF6iqqZs@=(g{aDKK19jq-5p&o|xlW@M9l~ZP;V)M;ZzSkh z8$;ImlAuHx#IFi@m_+2kItDHtqE9@>#dQ6QSXo5GhbrwU_TW zn(E>H&J$5LOURMGTYUA@SkM>`dz`y_eF7XcE7nd~n@;_M`;ZGCpOLiN{ zF9@I;0~AX?=&t3UN-t!jT=NWBhQZaGy$=>E$dZYL8*dW7Tan4(Cy@c7gc_|DP}1qo zAx%eROEp=tyidMb{y{llbCrwK#W}jupvHpt{s{KZSeIM`FpQ%D>^M9h!xO%%2DLu4JZXYTp6tBKPq-($MvW!x` zFS~0aKBcTVA;n+Ye{M6wp%C8iY<8Lc>4Q9s&thSZ8E+EpK-m>o{_pYqKc941i)Nlr zV%D#oW_JIlfuBS9@!24zIfW%BrIt9PyY35uG&ZZ1(Ig;>)+u?oc_UFbxV5;_X@6o; z3!@lJLl@reOdG#xKpUnFRxd9EW9pUiELbRiF=(n&hHiT?YMN*zDVJ#|laZ5?V+H$s zx3BmD+2VNN!k8{hyV`sgr*Hb|u>A~&gp{{StD&H$mpQ6kl@MjuyL8p@{Y1s)Z2gT* zyWMLvpG+&jg&gBkfPY+d5w7X&`MF$$r6xRQSAqN%+4W9%GV@0IUD)-jv1G<~TQ8f0 zvFQj{7aii8YJ4d0VyUp*II`4k#TxE?il-bA3+MtY^9cAh|wtg|zO+q3)H_?t()q9)Z%H zE>g`=4W7OmM%fDAtB#ciqqKGP<;5<`NNxkd@l5z_`MHm0beq-dOqISXs+waimJg7# z=AtWXb%jXNh&_C`F5q6-I1EpJKlG`}R4vWNe(TG|vHol4Z>sd(e}MWn0>?&S7kBfy zgNg^<88Xp#U+dy($!%jAc;!kpW)CG$EdT#Diawm-Kdo)|Pb<^=PyfTL@Q!#F#*jb$ zoX|zBgyMJP1pH_NTLHxjcGB8stx;g5`W>3fv$mIfxRg*-)a%8)=|Y9PA!y_A3~s?K zp!b~6eWk&uEII~;jly`!4G!WaIKf#c+3#$j1w6O0dwpgvR9xJPTP`$w12Pmn*g{^*3B$}r+{9Z<;<}Nv zSk0$hMR_@0X^Rk7wrzc(yJ=|01a}k0a@5TtucxCWJ4WCzwdz zKiS3&D2)29GPd1)Q(bu2$gs8F`T7BIY1>&Qor|BK++ASd#M-qz1Ey#jycCzvj>&3S&huU$G1AqL%#}x!nUs?ht>!>weks+6fptC2XjKKl$j!p$0f&{4grzJM3lN9A%M*2lr;yT+Au^R$$g{cZet<)%M3X-ZeOC~<9Aota)YT}WOpl1@S_~-`GMBk>E8iUkl0)*%GR^D@>6Q9 zQ~Q}#lil!hUcfjmi`3g%&l{JYJjP4hVGEq1p-C1PQ;J6%K>{bof^_(+&CCKWnS@D z&ok-rby*t&4FXoA;uUJOC|4IdWIOyqANOQ!y5yF!pDRDJCvR!@kyDPfyQ(bCnmQY49VC&)y={?T{%%&~x}2;d z#J!pz>t#+)E=Bp-m23?peG?VGSY)Swd}>RJ?+btI2Q{Q3K2Od>BQlX$aCziw2F-rH z_)Bf*_b67&MQ6X#&o!la+x>HUS!DCZ4oXDnDyU>mxySBab^hZ8P-9FC3`nq=ouid# zHiZo<*Qv9(8;%PKquWtvJv5zwl^X}9I zO+j=jWkndCWzKNf`)iLcVZN^EFjRfB`AcoJm;FlipGt{8g1I%5gkb^Sg`Ak#<>j*U z@PY_z8}@Y8N8(a&y*ux?hDJG(>+YKgI*48>{|B34t;P`i51+oEzXJUd1KnTYj6a?v z$?C><>$b)jpDcDO^bhq$+@MrUbx%nsmv0r+_WBiPd#^~At2f92x}83^1;OD%j*DWC zv4_ON{j^>I%bXm&p8mdhd3pIFi$Z64)2p-KlhU72mou>!JAgOggn`UECXR-#z+d6L zpDlkMVX1V6@YiqU66|?vJ_kiE6)QC0(`r^LYQr;D|H>xWDNAp;yI5KFHe1>}JpeQ@ zsH;z%pWpSI(Rf+_z5tEw-Ygs@Jlu}@Y-~h_s?DBttq4sK`peckbXt4<(U3wR?6RYE z16lqbLBYU0E8Yi;f}l+FFPsGgrj=K(d#)rv{JvPE&s8}TU#A4qZwlOH;C{rN@^Q^lYcPM>U zn4)YQ>2_y8A`jsWsN1K9L9?F{yjdV0LVGmuRolbTaIqg)|3Xs zTSfiB@oGqznjK8Qczxhy$#+WP)-QWH7tC1CEK2)~0zA&*ycnm`)JUb2c7u!fyhaww zwBb6@9O7&j!|)0lh}PeDPMl-HL0A;6GlKHCh3K#B0*~AIf1@EqmtDntkNq@kRRcN^ z0bPqh)xiyULSBRrOR320R2$$CF;;X*$YzR?A;Xu1F_zCy;Ul^U&)8&CxTDci5j<}|btmH!LXw8`1P*wrZD3Kb zH_*I_H1>K*Y@$Kv1+gVu&ZAaG#RO@++lQ-I6I+qyyl(lh{k61^ZD#i&C}K!DD$if% zU9Q*3nxMz(!50&ieZErjYmcFCnqpP~tS5qDbLiLG=QrOU%*K|i_D&;meviF656wFu ziS`l9e?#RAwVlB?C?4I2&zBX)XcUG36>Gd7RYexh18(XS+7WtJwBS^bth*k5a?cL7 zN4wrS(o(OK&d}5HgEslzOED4kTN8SMii%mm<}r`!?Jh5)*uhno#i`V-lj8E350}0l zwqJM%>p!>RqOE43aXocwn777dB|3_UB^@+sN$jmHkW6naFN(e1OJY?GP&66%s5IRD zwBg{qCc3iQMXxicUyRwwcmC!|vKS3KqC?|T zbai$0CZo-01I7ghHPO9(t-4Yo73Y|cIrP70>s;Oeyxwt&U?|?pKa-h5&{QHqvTgTQ zMnM4q&>ybnkvQ!)bp}ya9lX_Bg0%6u`t;WuR^4>msn*}2^0{Xxd36XSNk~cMyR3OD z%yyd{dXWQ)UIb1{?7cll4m#;sg+gnsx^}>|THbh;&-PmNonaQTwAXF z;+%w(6hZ~HvQNiNCLus%I3z0gezf}Fj^weTw*>OS@j5+TN{EdWYii>7-MM4lSyE#h zSy~Fm$H=m-y?%-l2Ha%KS@w@xG{(8t?{<@=Gy=ZvvcSQ@%1&h<+ipH$LrSC*emuF# zWYBv)pPn`1VoHofxQFHD(Wf2dl6Z1DHj9>D;1NxRa{6dnJG9Vuu#51}Q>hdeY&$U9 z-j4I%YlYY+kRHe7eCd>bqN!In{FxIySzoTPdDZKM|J-AMhKWNRe}_fA6CS6dR;gX* z=gN2IxnprZr!zZM-5Z{0Xg=99?h(jzC;6aH<#ar*9Cqyd1X8e?O7#usPB(PIf2p@A zSKq4c^yO9NX9}KUv=tSjx`zf}v0;JW% zLj!wC?fs{)LmBl;2F|ua+UD3S;sz!_j6_l+I`|0^zRN86-hq&dG%9MuM;jdmX2zPF zXSLRKL#1TdirMXTz=utjJ`r>|dK?c;PG$$J{I|&CQbb7u5gngJcen*$&ah!qeXR7_Ir21vo?l0O|j{07olUNDdi4^ z>G;oE10yYE3)fbWn-_FE+bPY4J(=|-VW+IG^82wzhr39Q37AI5M!z+#@QnxR6#jI- zT~;3T+6aq}KKZ5~u||yX0|Zjt1JqvAmhH$vYhKsqa;;aJMuo*r8aPD@GUVf6FRt?= zior&EWsDIi85A!sr6Z3-YZ(oV{Fyty1Lxf4Xc>lxGi zga7bVpT9XGQ7o`!=KH^NfBEMl=)&!rRK8gB(D-Fo-o`TQ26w}C)q1)pG-BH~ABXKx zKW=MDjcKN_VB}c2JL+}4<(-uB`tdP;UzV-c}3>A(soQ&_}`cPp!l3?mI^1!*>RJgaVlzD?B zeR@Mr-S)Bk&W(hJLzA9Z7JdO6I3aREG&FsBpm0zok3%23xHVVT&h*<%QS1uS!*Kd^ z*zd0qcSV7@M~Nr*8|EcvJCUG3m6#C_8=-LHcPq%j9_JV#?p*#*+u}!-R&YPTbQQ|& z#TZ`#q3|rjCB75a*?Q&|&T6HV!grbpOfS3_9X?D1( zrhn|-ONJXoUN7$(>0kTU#!lkdeNd$Bkjr)u@OAN8O*hWoJv!pNbW#>rX@(g+@MP!< z^;Qo7$0ICsmpK6#(-ll?i6Xw{-FQb$!foO9dT(@r`axL?6jrZ|;buq$rnd5feNZtg z>+3mUeR@=m4o#E5v<;9st`n-OKgD>GgqBaPr$@s#Y90)1lS}*#Gh;@czO#|(YM3sj zqRQOsxd3I+z$&&A^4(xb3hYqPtKc1V{4g%zx-*fM=V=Wmy zONaC3!iRe|KfEqI%P0M01`e*K_9Up&Kayd-3g4Sv892~4+oQh!7u)QAp(I^`mpiR6 zwUt&0P=Ai|NEBpHb>=g`=x@`83yY-`A>k)kV``0h8mnc?0?SlJbC%dTi>aXO8L40> zYHwAMXrAYQvW*|lh!Y*bh;lolE1TDmI8C)KH`X;*Esc$`keB{Fj4=X(iRAP$GT_EZ z;DYsO*_K-Ka;yQHz65VkAw|}BaYtK-w|kKdeF-oE&ckwU1~3SC0C^shUP}F*fFsOL z(9djeQ)W1+j&w5iqJODhh1KZ{EUc0CQS{bwr8+eWhfCUBsEC|f<*9a^Ob5Tn(>WS3P45;c>Ll9>q#brQGqYTx~mF#sE9O!UYIHxJS!N~ib z98_l`+@@RF=Wp}ngrx839QIwZoc0g&$oNgxaJA9$)ZcZ!^wtNL!trgdfd+l8R1CYZ zPrnHxa?FEPq}1}x!7pRqU|GoFV=Wmf?VHCyfY)b2a;CMDoapWHa0h>~x6bF`P7POo zeP6}CnTrH>WBUAzW#PG8gwXbsFwyek3{)ofVCCdGt&ZEu1@-*-{e2EMO|P!2wLN1d z9O2c0R=Rea)}Os2Q-rI`{Nw@8xY* z5c<@9u86vf{djvQCw}H^7&j3WQWg+Cc@fu?yA92^eQvg4&*X^j$}WAD_Fam8@00-i z;NRO_*?L{jNN<~mQLZkhEBj5&&PD77{pjzW_rE5Y=S4e5+Vv^^qhbEP_UV73eOoSM zUA+i>^_;ILCT4gPJ)grU0t4ZB+d1um^B;fkkERpxF);YXp`Zp9kp`&OS_)SPY<5Ax z)fF48MM1!?7<+RGVLMu?r{#s3-}KMm zJwCzp$4K0(h~=?24~XB^SgpQy2P2eNEudE2Jg(QPX7nV*WzfvcK05@+WU;SCb8~-P z^}cy!4wRpU$i%KLd(M@b00uKX>w>AZ{h?{m;vjLZR9=Ak!gec}{-9L_n=K(ZnS4wK ze;5w~!#Klo?i$!`Ee>a0@Ur=%-T7685v5!(Y=^}0YBVwN_QL5(?~`q2(*evZxB@^` z@t;E@#40jt@=RaXG&bsl&)N;f%|?QV%f^MUq1Be{w<=le^^j#(M9C%OU_7$lTC65l zJhsgec9i4bdjnUmWxQLeFhhhOsU@|Q&+A74vgq^oMx-JNiTGpi^mP22Bmr!#il$tu z?#rPoXL!Abs$V`<)WtEooK#oeX|59u#2JMSjs*8hCx|NjrR52!%9^O`Sc{?(sJREoII@_yc5?SQ*#Ny$mk)ql3`2|d;PjY-q*v(cJXN<$6z0Qo3 zfP1|UvF|M>g*fenPOS9S!A6tmQ43uNB2-!0W#wdC)bXCJZIoj_S3eaFA!aze0 zJgYv8Y4eId0ciNLuasUQTI|O8gkP&=MfCj#=7d~UK)&h#C zajuxIVLv0Ha~}`ik&0C?fu*O`Q@e}q4mt*ozPaO#!24P5S)^$XZyZ}Kv1G<4eW9T= zl8d4>rYEq%0o0O6^t|h_;72o(r0Y$UrW~}u-=socwz@m~*c&SongEBuWO8E#ECNKI zl^vl`mbN#a;Aa-ltf;dk*Fi&Lg}iqvW`^U^i}@Qp@aZzD@0E}oYdTREBWa$Ryv-f} z4!#`X&018XOTt7nsL2d2`}k?EW^Bua(8LE23)ZT^2K;?F;UA*OKRe3><9E4Jwh`L) zFUp-7Xz6T@^1cSExh(Hzv&?2K)vr9EhKBnA)HJ!O&)t(<)f$Q0+s02M#RN%S^f3II zXEkHdu~&fo+T^!cU?zQ#dwEAM`hD!W#uGh<9C?L)EYR|`{={SvA5+6vlVsZ6o z3u?cb!S(ri^8uUb=a)vWC;>5#bT%*Pn9Ej%%}l|2sWfh-Fw6T(uW>5=7}}jOmWP7P z-zChhg0(oJNM!nQz7S5?iS>lQ3a``t_Yck=e_8TIUG^?kr=DR_h`LIjozjcWJhTdI z=3a333J^J9sFvn`@Uk3bauf`qwXWML*b7WLT%6&V|S8~g_Lea(Y4&pdT0IlcR*J|ZJ$clxGvBLl!w}JEwrReg z)J6O^ed%ALWV%nxfiA3X4)Ojxue3Y?eSLhVu+pI?!$r>7KE@$BsE%$wY=4ocT^p)l!%(iwM03O3?BsZ*r2ivtp=K|khlBA6hebt27Z?Su)dh5uJ3cNOUj{hc zNzVgLcVf*v$fLjVYKIh2_2us>sA4(;&fmL z(p>c|^vqEabY}giI3wB+mI|)yNb4>&;GdXQ=YEnbM$t2EMf&R)Q)s=scc+q!mT4V| z65pSy9#5b``&r!C>1cmXBI{-IMHtU(Guj>Z++{=lV31j_;9_mMfND1sNj;zp9Ozw< zNS8FyT=}Wdt({&3ml*&{S$pTd_!0X$ay%TfE)+OcoK&@VLXp{8Un2WyVxb7F+M4#n z1cX?0BF}5bPcjbNZMd_DMj;4toH6#wH<`bXkwnz_)8p{nRb=)iLK+fV#naj>Jnnh` z0*h5`hzoF=7dAX#|2vk5*T+M+=~pNH^rbbHwE=e-Ixl0=Yg~u|TR> z-?@6dv=}J?YJPcl7`y$1NFE2M>B~Gizx}B7ymFTp61F}r&<1XCE~6BdqOk;%e*B)H z{@c`}jyR6bj=fu!j`T6x zkLH}=DL+c#yj}`TH3->AAszbYKdvtV|1`p-!o+#Aze?R0Cpp%_w>LbD%?V-J!F6GZ z#=qZgc$Q7NsD$4clUGwK9=-@#V*{>m-~`*gl79huceP>(E2C8;o!4@4^!G zGo_Pu)GUo9G+D=4xaO}e{CytCIWRGT+Mci9FcTT%4%d7=^67C%O)x}}G}0N3vlc!7 z?%xsQ7oFC%bYfG;2N^nYH4C+40_>ICJ}{lH8a!stB&8U7R$%)y(4v zXJ=Byy~=YDr?lwy_Qdc;8<{fUIx$-uqx!S$dR_8)#@&D$Io$~|6j{ZcgZ-YiLtYPC42-p>=RCM{ z?UoFW<2m#ZL>7g&f9LLg-I~6CAO)Gl+GiLi_%~7DYo|Z?Cn{FDy=VXI*T(-q9smtR z6ZpD?CoQ!VZHQhk@z}VXueM=;u=_5PbEQOAKjoPh+h4Q}Vn>%C8emWUUXJ4X;I8oO z_0+N5IQ;nGcnFHFRpvM-vShn1=9RA~pe+5qM}L)^gvNW1$pobm^U0mL?Y@O=ptpDC z*pxh)Ag|-@SSMx1?JQg;x6KA(qaA%U;Z^ymR~bn%63ZvGY6H_qmoAO*?F;EoRvM z!bT@nOrbwk0Xw7npV8h$GKlB|$EUZ&Olf9vazs`ut^CnUn{Utfz8XKS5a|=a^(X3h z#eaaSE<@-h#>JSZS`yc>J8JNebZQveH>Xh!&8Sh@IU+swywp+jc5bOa;noXHMe=Lr ztRoEW#UDN9tv;?(=@4{s8QpU}Eb9h;I4M%p>O1E1#G{%=-a8-CA<9EV&X!ocG7p3_OzV6kOaE0VG0`9uCvkwv%KE^)9xyZaiV``w6>-_7;T2+KXlchY2Fr&Y z3F~$u=B-NJxV$xtn?`|Ui=hA<0ZQEeu&N;-a6D}>!^l>%f?m5_cWaB%W2S;e4i^5V~g?IR?WLDwxXQVYHNlK z4}u|+VsMvqbKBFJlbcTH<_P2q5%y3~TXE1RMAxZuzi;OW>|^t7mNQuu1Rzqmc%jDDTU z^Lg6{_2;7bh3_-cz|cs3`Ir?-t{-E~J`FFs{cQ{#Qz)F1GMP7INoDUq=Pnnmu;_y3 zHQ3R}h!k|%lZ6$+bvH`j=|68K5{QBd((Rkc7e&e&E#25Elcaso?9uS0aK>$e;bKzw zJ{WQ_XDmR#J9feCaL;_SHdiC(KAKS&DdiDLJtD1c*xWpvn6h@)Z8Mn@RT)=WU+uZ#K*Pj%k;!eB!OGV%D*3L*$-Jc0Y^GYc)?n$O zM*wr^m&Y(p6fL0SwW)G&GJNtpIe89R^*(sNzkB#8-CRnF#jc}X9|+uwi>4PrCY#O5 znrg6x&)wEaN~9pz5#Wc~VUA&;PEzgYwtqTJds_E_kk{3w1X!EDKdrGl1G}lWn5U*< zg}m8swNaW6>dje7NH8rj=Es6ESbb^Rq3FNMD298&)B_S{_%? zMfr@;HO3RlDr5nl*9w=Go@dH3n96h44t2bxT0T%t{A?S98ob|==n=)nm>ZxUDy@8s z6@$&Mm{N?ty?1IkX58=1o5Ik?uYyJQ#bWFm$jfI;LQ-uB4F79i=WP zQ0sgKv1UenWk-4?#hUNY0WXP{>a9_sLWf5~&_0^M)-KW1@~pvy^RvmhW}RiM3s-^x zDLS>|reA-=J6OFmjNPJHWFjgvMHSldZmUw=%ULQ>s>5ORp6gDtnDMIBmf*0&5M$+F zdSLLdwOsNh{HeW{b8cot`*C}$wqh#t^w3#((^A3z=i9;RQQ7V8E{~p={2(8X_gh%I z|F((q>j&yr!EyhNHz_aw$-A8f;x7>RqxT|vjeI*_k-rH3_Qo6jlW%a?3tYd~K3v>A zebakPCO@T$7Z%jevOlG1yB#?#tez!O&uM4MzAg)F_5)7+-E9G#hvyCH1X8}eGJUnn{)7V6%#`f*1JiEHOC}_R7XJ%*QN3Sei=?|e|7qbi*xVd>uO`A;>R}uQm zXT8Vo$BH`Fb154Pv!}#jzJ93su14_-8HFBNPkLHj>x)+TNH-q~5!@wgL|oKosjY?p zzoB;7ZhHagW9?0BG{N$^{OJjO6j-%cP#UJSp|)qaG@SsqB1OQ5Cy(ex_cyT~vLEXb z*7jU*INBSfE61Vte&zM0KfAoybW$-sPSz(ay+8{b#c$ul#*jIBuOv^1#%e`N%6q|9 zeSZg0l{ku2s!yBLy<=~352-^M^0`q8E2Zh>1}bvioY}aV-NLqF^-&K(sBi7}Y*{;3 z``Af@J+hh8@}xa##$Z%~ksJxGuKpQv*|Iw*2NE04^x&s2an*nO8Mqn1Unk7TgQ&}sVK>Fnde7(vyFls zL(IcZCNiD}1MH^oe`x&PN%RuXA?ZpOJy@C zBt7l9JjaY?@)$VdV9nTx@hN%?x4(SHDP;5e#m#ewxHPt=lTfkGq$8YUCW)q*q|@ch zTfK=MzDGQ_AaXIHpQ$JGn)sDNKW6^3-2J~k%oCq(K%QV=Uc*e( zBf3mz*tAQFBH-nQguuG5U(n0-^@vrgNjb6fe6D}NyS@eB{UMc#Tw#eMad#$@(SkYc zr}s+A%99alHM`+D_a$hr&VH(RUzCz(e4-B56b?@I(a?r&=~mQSv~cDhJY_(H$^e@8;RN*XDsF>2s|IS$|UO;Lz zRKDX;Dzi`3){lY|2SZ&{RuWhQzfADs5L`l$2wMpf(e697;| z@Y_zJ0lk3TUm#*2?D?*Y<_{^4uR%8W%w7f=9Yl>H+}|g6d|`92R?QN?hc>M`=wDa} z^oGoGq2b_|#Dj|!$oE=&o(oyWHlP9BdADHa3|9!5=K;F?1!4_vafNjA*|v_tNTiH= zW^_hPB3R{7uF_s5Y^2nVjaxPL-ZN>H}H_m_1et{*UOY&N-RmXMGkkd?K%xxY{R ztP_bhJv}X?1V&8EM1Sx0UGVhYY~3h*})9@tX5-6!LH{Q?h>)(y0nA zd?Ob*O8m#R?WZni1pIl?WO|bc9j_Z3v)1{Heah#C`=^JSVi1Tw2{Og^*mfID97)1W z{qCj+3G48F9WsC2<$z;$aX~-sppjKrRb^{$Z=ZX8&011YlA8^=B=0KU|CQ(W@&ekI zJnOTE0*lsTwiFugh8kRYb5Ls+O8$Y2h8FhBj*0xbZ?>F;R+Ex6P~{6dvB@Y*Khn$U zp3~T0pXXK7W0)5Y7B%g9!f<3XDbt|`+rfSY&U_%1bAU*}^;U&#}H;rC7SYE*Ca&(Gq2 zE7AX}1*ZWhx+dSgZ=!i!8Re5Yf_oTB%69D-TpS$o0Jt%Adxky9AENa&Yo#i6)#HYC z1>x=Au-{ejEjv#MYJcm$p|byTaOGco$l`|b_I_se>Z9>mS5r$ieWKes4?YM9}LA=BPka}M&YYQ{G{9yLEdvJm>mkGcNfj7+Vf;^I)M z0R6kk-izt^dEL@tIz%{xoXg9%Xjo_;?@v)Lj=vRb8#j|wtS`=3?jIgbJ1G$}QiYMp zq>|NKIbAuP_w=JtKmTAd9###Dh$@f+Lsormr1bLUbJJp?D+#1f;SOS|KAoRle#c-C z0m^zUb{FM2eqeY0i)a7e`SYN#&S5nfv3`Q%O3lMc9;frhm5P&9+V6nD&Uoz}lTlkl zXngTE!ZB-{p?H4ZAIxThif~9C4qmNZMGA+B)~4p)EEZIH@HcQHbbA-3`N<~H%@HFggzN1hIsv4&&@1MZkR7!5>ir9a=accoF3Qp zk+J)%ODL7e>hIUvt}i1)Z*Fb=y<|{)aC9^mpjCK+>HSqZC|N5zdvN~g6{q*$> z%p~2&=T`OBwC;Rj%B#B0g|8boms4$rP?%@qm^n`t7;Ht-i zl(|)#Ng44J4Op$|9-9cto`q{?>qwX=CntfCHIXrpeGf2nFy5hMiti0}U%bTc{gi!k zb(a7AI|D$cG9Jx8SKR8Rqje=&DS6KxHsu}*B_@hKpNfV=vo9eW-~QrB&&7v)eX&?| z#$j*A(19RBKjjo5A(2dQDuGF#a#hJ_Eznu3yRJ`U`k_4RGPaj%eI1$E;Tm`GYMqse zntEo39T^o*bYcQjO+(QrJPgti zmzutTKZl9MU47KDd*=6%1nYhG^*FkDEGY z^=q{`^9aM{K^wS+^7J0sGm9KX@>ba(t~5CexvCdtr*TCyGLr3ale;2RTkW%(G1^`Z z@SEG5(29IG%ouqs_!p+toqu~-#Pym3tyD^-LVZr+-S_5==xqSMs$cZEvV$NCtE{|5Leo!@l`46!4zk2Hb=gVOi`U+uhzwdsyx^kMH50;4f zP*z@^sr`H>vx~|1!0>dA2`LSG;67i~1S(ywi|M(UiKhp$_?H-qmfpvK+FouUPmLN` zkXC?k2;`fYQCgG>xe>0^y0NURAG5m4NX06uE03fKz(LUo4kH~>PPr-{oa#5ZM0s`A zsCCn#h%PQEjuC`p;iyfDn_9E~O7uSxfp09)uNXn3aId5aO)J)^pnLab?+vQN#3We( z0pdtxX$G&iPTTaVLKUw?aqGXe*l#hSqi@28x47!hWxeo;cR=Dgs-kKrs*;T!BA_+U zY_v_X-r9u4Y2^%y3eE5Ba{F?{C&hkgyEZE@qo>iC&gM{5oD&-t7f;;>gwtPqU>ZKuWt;l6&xIMy&38hq(%{s zqJC+mApGCN_y7B^PpVKa`T3j8w6!aw5k-lCx>{JYf4{;UU@JW4?x>Hlwc1pEfapBh{OaRh;a4Q$tDxVv-4rZ+a%^-dDXGh2 zE*sNcb1^#*+FF%>lGm`J)&@u_#NtEXenKyAB0Boz`t{A#o(A}pqPo0*hK{RTvam>R z%3HsLfk5ibovn$x8WYErEB;s^GJ54vbH?zBE3-3Cuj3-7YX0h=Y+szYY7hp19M$e@4k zvKM~mHvj`qlamjuW#7QN!1+!pX(gkEW6;mJ;a~J!S#XX;iMSju=lVa~Oje_p8gh)S zP{0Dg_=@mvbQ*#6G8mfQpuZqh$`O#JsK5IzU4^&0z*J}!WV;PQCy&BQEL6=GckEDM zab7aBu$dFUsK2j4kDZvP#-CI9aqZf1H#4R*yB*7CU&zZbd+-Rbz-b&7Q5Zjj-twcs zM_axXliWyLRx9PoJm1Xo1dZ@FQ2OP^BR0RLDJUqSu>j!O6gQH z8jq)}`aZ>BqxrG_i;!Ugo#6irN#PO!_rk&|R;hK`zCQ6c4#s;1p#z)u9t}9O)C+2y zV-?&~eKILuva>jgtIr1>Y}e4qppz!_=HFy;(nZdvbTVEaFPN!)#0%r*kupYX^;x8N z&8TcFhs1?wr?nbw8S!IuVgAkEv4%vjlZandR<*fw0*SOy{>#_L$=PlyfA!}7L4Fv@&HJXbC>(yyLLOR&DZ}V{(i>(*%#Clg+ z0GBY~{pCm;9^jjBB#5o7AE8ok^dp0@uad1TEDW55kPqZ@SV+jX(-3?WLUMA4sJ?5O zC@RV(3z|tYL>I(NW8rFGWTuKsE+(6N`wf2#Ddy(?d%^Kbj0_1cUia$!1Y=8$mJQ=P z%Lx7W_?U`AUzDES2K0tK0ICOnCuaPUI9BHOerG$oDKlxnRZ|{l$u5S*7svwWRIAz1 z*Ltm4?B=*GWroH0ycd5twPt64c(w9rtI|8Xx`t`*zK*(wm{bE94=+!q4*pGUQITn8 zgJdl{0}8xfh6o3;j)Fr&qj{A>{UL$dUpaK0{8tR&z)FoMmcCR%ZowD;*+7WmVQ0w;>1K zcAolR&7UJ9kpKyjYqv4^b81KvRLZp{>UV+(QGLyYc;!;Dg>IBI68m=>=wA$a{}+_f z@2`CMQ9m66P?>d2lxtV|h}qHpgD|Cmd?=o`Um#Kl4D(Z@B*=w>g+(eXxG}Oan}CPM z#`jT=U)Eb2-!5}MjjD#Ow6ru}YTQVifR8_^rKxE$fpTh7CK%}+Eu3#RJ2O!X2FA_! z$kX%5k(Y`wZMJ-^=;9iM#*zvNOd16o4{ZqhoBznfpSYoMQJ}H;Ov_N}Ft4Hc<>VM@ z%||$yaza7$q>>D9auGXs-Or;Ml~dJ5)LX%`u2EB2_*v&98LYhi2!~4~n*P9~_B*w9 z`gJ5OSW5nw@EWn(O)4SoK2r<~&w9U1p9q>2O^?NDPM0YMjh|VIO%frV3ATf?Sl5GE z@1>>WT+}V}gOf@w%)$Eh_nfU~;X> z3?3vAUH8lD2hHKx_4OXF)pP%?+t^8qO$R@dF|V-M9%>K4^9h60DbhoFe?e3{-(0}O z7$`4zB#7Paks>iEaXbRM=I5L);V3RLuH{ zr<$T)`LvD^9(}O9s8`?x8ZK^b$t5RnLs8n>!nCwB$IQgix!s2!fu50fU5r)V8$(J; zOFj<$R8Yg?)@r~u1+Vfryp)v+AFsfmjDYakU% z84BU8Us_tanA#AiI*~77aHOC8;1kg>2t5bfZR}VE`0Fz@yRK_i?&E7`wGEb`R}Hd0 z*cUvmUo1nqdL_2{lP+imL(xm-0XECtd7!(yTQGtl3~0Ebw{y#W3*>C%4@qIa%`v7YxI~y400`Q)*AJ!)V2bXs24YVt?=-tDSxv5C z|3|L?iwX)44^L59SsWSIWDh1LV{U1@9Cl@6$D-t9KUpUQK~8 zFr1Yr-p@~K=^AQs(vJ?$huCI*RjzyXLi zM(T8eEwl& zrz}dNZF|3`ZdX7k8uo(6TDcv!iwkhUUWbX#N#Y^RhFQ9qjLcN~CSX-ws!wR0l9Hfr z$~PE81_uxSALL@nw4L!*h8}7F03>(qSuilGNMuF&J^~)FlwR7Ts<#g7%WCFkW^%%4 zzX&L%S{pP{xlX+e+1S{CIgTGs(Rj(TrK7q#mJ596e-&5VGQTlTRMj`8K7h9b=OvXL z9b{x?njN>oYy$Vnml-F~(NZ!DiHfExR+Pl>3E{BX$Sr7#+7Jb#67eR8{iFovVM`Aw zm+dQ&iw*z8YHDhTTp*H(MkhGhWH4~*81@b1_Vwj&KFq56P*z+#dp9hB>6nHJG<=Bo zI`Dg|!o#U)HEScd-}@E%J#rUsZ{0^mMoyDL3s9k;peV`{Bm-nqmbNx0-+a%Nh01Um zomTzi;o>d9$I>}&l9@hZ^w@tfH~!x|7;oO9ZSKg+>E#?7t=vl`&|NcVgacS+vHI#_ zGB$Y3#j$p(&O)VJ=}2jIdivwgvZj`khe3X0qpP@-6cffC^GWt<)t*}#rxPcwW@C?~ zPE`rub6OGCRaa!9!!UMJ+;m|&m|&*dE7Ynox3Z#Df7HAtT<1jApLc!jOhwm3J>+(B zw!NcGh>3~G6C_^s5%~QC}c90 zRj@Z@^3xtez-r;1_{?)jU89!|>TyK%oCTM&QRe1{xpw`gfgGA>iS14(LFSj?ezOGB zK=^*5tM$3a*Qt$eOu<0moD--${5z``OBH2vwQ!CIN%-SJjr@10)PK3Alg#(kgUb|r zHpCBY|I~Y{FfjDTu$n_aybS)#%v@}AG8>Q$)1M|hFvct&e(_MkRWE?nh4lD&BLUXX z!?hs{1W?W-7$k14?sA@*e$32Obt-8$_p{+{MLeB2Y&Q8gxnADZbTH7b$9H=S!=j=l z@>UwXr3xMFt!35I%zUo>0>goX5_NtID+mo@;}l~@>4o2TQFqgPd#q*ksT1#TsV%WE zlYokbNSF<|IHT_&JJOUP~k|CCbjIH<^~VVk(dc&!QPru?$L|va|>$ z?<2=TqZ7nDH>sehCIp(yv8@EI+;vZ^hrmQ5n3!wm#08(g9IE!RuZ-Z+`JHb-5fYfA z@s-h)Xct8eo+C+fBQ*71rxnk)CCw(%*||y#B|`#->BFQ8tLcKQrFkId=hne^g=J39#%mPbaE z!W_%4dPhG$+#D5{gDRUk?AE)~#3iMPT+V`@?@WL&dfq>uC51K*>POr5FhV?Bqt^6u zjjoA*?0&|^jt}vn$-A{i)@rg>!vstg;=miIJy|*g3(mtSpdP-YiRER0-5R$b<5P zQ6rgBLDcoAU1m_wYxkS-wV}Hr*8Kqk062Zjd^)V9iW41rFm^`4{%=OiKQF_2@e%{3 z?co~7@%HrPUY|iZCA=Y>Cc9|m(n1UA8rx06`Mmg9Ql| z++9K-xVyW%YeVqh4#5)~f=h6BZQR}6p>e*-$b09`JkQ*@@B8rwKf0*uK3%oXKKrb_ z_Sz0B%&uL|?ornVt)3!UuAs6Ob*js!M%(`8?q-=#sO751!r6mCLnr6tlQ5#gw2}ya z=D&>6ca8iv{kH#s?zqkE@GAx`rj+kXU!@f}Q2;wr5fQo$Iz_+s0ulw|flX@o?rOvF?PMji{~-h>))-VUjK0ewKHZ#+sU%zHYSrg>nh(G+(sG zDz{5ZM<{7)FWH6(sa$^k{5d8ywGp>b13tb8&WquWN4;ePbq#gv=tvSP!5F$>6Vc`@4KS{~r=a}f;H9UKy z{{%z*B>KIkM#QP-p4M$8aM_Inj`9DH8dX)=7yxzi-uHd{$Jkq3i%B)eKz^Nym@%4n zk+19BifvLJG!R5i7a`XT&CMl~l4f;1=?K)TCQ84C9p^aNLqbMIKY}i(uMd$3mAtEA z_}07iIQR19%Sm!6LUi~c{#?Di>o{r5%V6Q zzO-fkz6{Q@EJzdeQm+j8Z{(jZZGGr=cynuvc>hnyhyV8ZU&sI|jY9y@{C_nE_@}}A zZ(p{-1GSiD0ltQue>^AuFZN}2zlGZ)M?Y!)|Mrf!`amU21fw0|U!UXu3#R|~Ya>y= z5ci>Z{2`a?Ke6_IJ%Ha8Qg{jd~Gfv6zl(c;O(D2QZE3ZF8tID z7x~|2ruE?A1A>BL8iRSTu&|Lo+M?vW0Z=-;)D(%Qmmh^8ClkG*D16^S^ppTxDcG-V zK>48H=g+u-0m;3AEm{j(TOX?JK=J=(w|{7rZJlDjr`uVnp3J}A&A%OC42Kz?pp;9w zS(|M>_+(*YgV!@QdSwT&O{}@4)44ynXv;;*-b0S@BK3o6z-JpQX48s}=92~T4r$lO z6=%-{hMy|Gwe|Ljx;UI~_9`i89jXPJJ&K{N)?6O;?DWm`C!fDL-vyG&QIijJlm~lz z)G&@4RHV$ILVln6KW(ZLD{3o?|K?|q?QjDwTZ7#*=YpxC!r{sO41v{nz=_*QkKv35 z`41^Se>b(ieU;HvU|KXMe+OC{{L@qU>q|Xc__~G$1u3bt!}^AX(EWX)GU=htFIKY+ zh+$v9e`yn(Yptz?M8EMfFx=?x?iRV$R8ir!nmK##nie0Q#UQ}V{W6?7pp2PMK8qmQw;~&oJ3uJ=(KDrx1JWpD<&N1AeJ`W8v ziCt_n#HxBc-c5-fhfW0YpxWN-P|>$YHo6|$-QY1($gm%fNxOjr=Oih6c&ca1nTewD`fALM`*5)Q?>00Juq`;j1Sw` z4W||3Gx$Fy=0-{;(SO|9GHw{jPSfixCksXy4~hWy51yhRy2UfVIsVUxw68wdDytP= zw&A~B3V^dlr>E}#;X~Z7QMFN<JU%05S5aT=4ZD&(92aD1aKq>OQ~nhWdc?sR#y}e9r$RWD(t50q3V;UfRo0xvQ!wkJVRY${QN`H|H5?31sMGm8c0!tuJder%3-whL1ml#)@vcfQFlwmV9D{+<6Y>tXeM!2$NjjCYP~Uq^UKqC8DSlr z<;lgx9Iz(EB+Fn2AVqVno{{M8Vy#|nRF6s+fj%NtyEi{YqwuBLU<(huOs>6GcG^&t zv}U`06@z5H;O7wZ;y)&D6X{)V}4xu7e5%77k9K1$z`PinFa( zH{M2#yt+Ecu{6_CQ!<&bN(uYIc}RP>trmbMrs16Uy_S#>N3-M+Z!x5y8QhaOwr(I3 z{*a!Y?%+j4NlhJSu)ZDuKa{k;Z%HkCIyf@2&n93}3;0TasE2j3>ow4lCJrQ9;+ai~ zy`maIT~P(99v(N`erJU{;Q_fWY>?>pfp>dd_d z>2vY_4OINM4ln1of{3{8%R28r@+`iTp>2ox+X{C#i1qE$ZfncS%b27vLW=p|taKj! zU2+$AWP~aFAA^BkdJ~DMk~wT#ZDm{>91{IrVte9p$p5rgPOhz$W%vj*O=7T~uT0R= z)>3wMzeI<6eeAQI(_d{mBkIC2a#0hR$v9Tb*BEPek4QpP=S&kENyulVJh|F;Q)oC5 zveUormz4zt)D|Ys5l|q+4CRO`n$3(HDe0(uPGz@ENG*#ciE+KDEu}R~GHFb8c5br`w5hdO8lo?>Xr`6S3q| zZx2BFaMM&F4WHq+XkUHwe;a&n%ktIXR%hW2wol9B^vQ4$qKP(ai0k_K7EMjLv~%A~ zpVm#wsbh^RSad(0S7W)V&h6r)+2aJoM8*V~1o}TfyYv#i#7!w+{@I?7*9B%aA@~*Z z!_2kvB0!Dd_NH=0r?j^@0yuFTttiUnlF}e;?Xuw`tsVgpkwBAAXWLI#_#BobP_|Sy zsHLb{s@AhRmTJ^#rclt*^q))!zarX-)nY>1zoUa_I8AMCGF3m#4Fg%5PfYxf?$kM) z*GcHe+k-X&7LKe*B^r;2*0a?jp}uuZ6@@WsL*M<%?0xNG^!39^^xDJbb4Eb8Wl;;K z6fVm*{G)0g2+ZTv0vDKFv9k+Sotdrgq*!`}JJ7_J6qTc*iiT3MNA!A_uB{oG0oJ>T z0Wr3j@@vsJc7HOU$M;~LVx6AaXN^0zD$9)v=?+4%5`mE@8L6yX1L)>vH4{|m3d7gn zkM-!HQ2*7^3rJilJeXO{sHUt~0@O!uTfCKK zUJh*GNk09~2d#UKfLdq{@A>Fr~u^@;qaPySW|sjW$6T4de0heeDgQXjO@E^4s> zLW%;6om`zdCKh&|^bDMto^ot2&W6xP6EJ45yK&E5dgMlmm>>hgD$%FJ?{p{R$3v;psE>MEyh{j$Bj89K~T(kpA@|CSeCW~v!z+W2kT@MqG;O<64 z;?kMbirXQHOCQlcQ!40`iU(xjJ5#zvF#A8=yCg?|^KG{mzt>-2qtEESd?nzYX!D8p zbDEotk`cbJaM95GSd8hH-c46u^puM4Ck1v;29)T?I-Rsm3X!~ra#z>*tySzujmAXB zL@r>I%^Z2T1n1jWtAP`CY|B%PRZIOIEUYc)yFIKl!ep43?1@*VialT8*-6^@2@Y~_;DBLiCQ?g-z0&)Z zB@_K5&~?&obN8l!EM~R7TQI1z6T~E#-U96F3 z3&S=hy-|b}+`Qm~jkvhpU4XDx$)Ifi-BICaa;!7dPBFdnKiKbO7(wy*tRIW#eX;!G z{grQTnjk=s)#mk)X4ESToh&LW7S8&F>44Z9U2u8y_bXfoY1->8>`f zQW`%V1IP(spxH-*-e0b{qoUS=rcb}~K=>S`1Kw`XoMG6oc%6JQ1K%nmiq$%}TMi(nvoYcA-H|nNUi9?&o`J-PX_;a^gqb$T-Uj_(6wYB*%4L$(Am&6_E z{QLs!c(tmwz*v;6t1j(RQBm=vbEz&zi6VX9H%|2= zfdZH?aU~<&k>3^1?&{_tUaf`PwEKoJQK7>2wtfvOa1Y*#6_3z#u!xe#S78P~jowe-?v~Zv z&>t<ug}h2caFXBZgi zJpp0x3QMEFyv;Tq79kcHOpWENZ0e~k7JZCvsBB|pLf8SKWcS+A^`cUz7OcwNQLmoua*1J`0^qpXErKW z!sa0OPVKfBg1PM}Ii*>q0t4DJJdp>hK5&Chx0I ziG4$5V{p(d5NaC0VGmN#P>+dtKT)g&&@;Xt7?8*n?3T-k6Gc9m!C#m|2w4K%g;p$$ z;AowUcRMPnYFgIx?Po)eEj1P$wY_slq~Nq5{MDoCr>9I)F6fyA^;zz#1Qk9px$ zX9sMyXINp-9!Hp;npcOut>c69TI`RmS9yustyPsC0p^Ci$y%b}Y~vFwPV9{fx1Vul z#W?Q}!`XQKX>|bD7Tvj8I>jqvLlb%#Bmt<%dVx+`fSu z#7g+M%;JVs`c|0g)imk_~~#utAE!w9Zcyl=y|x-C1tM?iyVlzHDpxqIN` zVn4kXBZbRxx4l$v=(u}#=Rxh@;OH2Kj7RID4@oK5HCxInZW2|>e$$9S`=OHJ+Rn*q zgOm5OvvWd)SpF?R7{>gAMIHk`J2u;&DuPfB&1X-v%l%-zr zOyc^_RemRa&#J_oS{{eiD8%=b(Ser!!#Fa>^mc5fYcK#DZx(+2Dt5$d;`C;N&4y-{ zyni>o>ng~=Yr`$KW4KQPpsnt$=k%2MH;e^M>{jE&yNd~Y$l$a)2QZxl9C@l#jSexLa%7U+zsv`#ekKSTJ21J z_6Giai|r6+?5_&_j7Fm*WY2cL_t-G@H#c{e)bQ&_Gaur=f8MetR3GYC$MTfnOtcR6 zBxpJQsai=*2Wlcn>9&odkc|;&DwPO;o=6x}?+EGEQd--XAhTJIfLKoRTXH%7bjO}% z!@0zUsff-m>+7$V+2}RxvncE!r>a`Geb2-s(zshLnDg`JNlRVa4-eS7GN91>;s+QW zb3_Xo$)%smWm7H_T;J@izS(ggD-wW8kNS)&#KmPl2D3(S`5oqC&pp6a($zD-{EnN6 zwQ(QPEdw3$19ycpW2~k}jeoS7ZYIyf-!Q#~Kfw_(^WyTnQl-0iXg90VFU6O4!G!QC z=53_?&63B?HQjAzXK-NfoBT9HJZm>mTJ2x4{PSnN(!rVhd32fCPG>|C(uAVRK*Jq} ziT(Y<6`rE9dR%bT==u6>)o+Z=km*0F(D`?10bk01HUO)V_qc=ksXEvZ_<5~iW9Nhc zT*cGr5AUM6R=$;Hm^RVu32~YRxKnxBOH!gE)wm-Ep&(%CY>he&eyASn@6g!!{JE5# zuLHr-xqe95D*l}mCl3#b7%D6JhL^)RZbCxRI8bxhuWDtd+HUZ|MR)C;i~L-TW3b&G z6BqN_Zt@~;pU7h(zJpSMs|aU$Q{!uRKLt;ikLDZF1{9^9x8ov)7>#?tqdG)3upgfb zGW;sSb|&>pOqHA-f*DB%)CUOzNvtd=9vhBC5bg!QIf+o$sB;TZUuMQ2A|fH|o}WJo zL!w(i5?MZMVXd7#sw^xN)yfkVToi20L_C&q;bBfA2t7kuLh?NKR?S~xntdr97^b)q z>0)yXYJFDn>B(+fOEsXaO&|)fS7UU^Is9%%!9y->k`pPyK<*1g8Ep_W* z31BaW4MPONz-eiplesYF4z0e*mKQjVEZ&+lFE?ARxDOXIGygku?yrfj({H~qI;Ph4 zI^I9R=w71gL4}C-n;3k*Yv67Gu(Qyxu!4r76b()3^%Mrs)&a8hopMK7yMpNq0(O#{ zo5%HB;8;RV#Si&uTMKqVuFm6+wGK9yb5Rw3zh@*~h?AaPv^JB7o!HlmpqL2yYO!*? zPaz$EBr)mq=L8X?1NDt@rcpG~BKv7lBk`QLs zn3bBq?2%d=*k%S}m-tu{tR3Bbj?f zA|P|X_UeAI;)u_1hJE7b5p%ZbX`ZGsYAid>tiKYAnGdvW)o3|8{ryk^3j@dYpnCY+ z-h6|arRo`qW-2D%bcLR^sI(^gtOe%Gk$SoH7bz>NR3sGeIdZ`;pXigO$wf;unKMbVy&sEuJoq6OTk;Q@JUWy$_)HB`@gI}@-i{n!>|~Z zGd80J#5#(HpOw^<1hHF6pJ-E(w&9;DYt=g>1I^n?EARU757X02o?FAXxjh!~ngaFO zHOfEvmSy(q_s!ov#n&ubk^^-@^>a(TGf`@^`ZP@-ugk*3M3dxF7I>EM)P3h}e)P!5 z6;a41Z|*K)g7WElbjWGF$J&c2RaSOZ)W!n4a!nZ#5qDi_SZD8?9{D&+E35B^hqSky z2WcF&RX`USC8cV+R=Zea(a)dhZAv>`9xZhC-L53qhrKOIhw>sa1*HvI9(e6H7whPw z9v`=MSw<9PTotA6x}}e?41F zL>chukhMc!8g+8Y*dbLPj;IEkmM1JS@)s?h+_IalkkF^2Ur0zNXfS70Ssgdt226U+ z&d)HOi{4Z{su#E+WIXQmuXm_54XVmd?f4?{@`y+Z03&9_<>YSUL|Ldh+T}d#s&bn9 zfJYvA7(bJ=A!}$zR`E4>1?Tt?bzDOaEqrN{BWY0G?s`PCl`{KNLJ>G?01oX~=%J_G z5=7k52gjruj_^ODjVOL!Cj4-&9Gk8id6Vp>}^%W%CK{$mK5Qg-OM zLP8D@TL6&*DOq57mS&e8ZEd29qic-{ZJN-z(`_1;>_N4$fl!Zdy?y4Odv>|Q02OWD z4A7?d7Vff64EJ7-X>3RL0Uh-8MmG=0>Fg>-Mwap5{Sfx*FjK(KqYIY8O&7}`qR1zA zNi#>s@4XLQsP)v61R9cAtC)^;70)?_1Y$S&E~#)fYT$fBy5daSxY)ir!=MQx<(U6dFLweaM! z)U#nn7Jv=}bOiA@=(Y3dFj`t#Sb^*)EAAR0WNOjKL8roNMlI5iM!@?)7_`3`5>+VI z#AEfCcDGrF$zuntD{Y7o0*jX%kWGmIM^6KlXg7`$d?m-ElbnW z)3fS#ykC0Q9wtg+*|--+n0FHSWN@2wnhRR7q{TawgxT0$zJFZZ<Jtiyfj?8K#_3R`OLYDx${jj<^PRk{3B@;`T9+|0`ZmMvW3{kv4 zPKN$tJeA=D)%-lT87BiXgYw7b6-DA3dQOy|G+IssL2xdljaILAD;&7yUdE6iX&OuR z*EUr{)JFvJd=6I{hVo@jj#c6>+9*3ZOTt3wO|{35fHVLVHJ8YavL8nsIE_uzxPLY; zJKG#rGe?q17POmQ!O?)KvW`3oHpkHx1cn62L+}5vpwI5wT63 zMv6_RlQ;OA!ao62C*hf$w15F}Z1reQ$~Wo&V%h%ZH_D1!8N6xNagtA;^q~!ropihslP5Y1iYBJ zxmB(Oe4a=>_9S&{JR&ONyq{t>62J9a0a5JgD(YP2uU|deupmuso;yS%Q{%nTWZm;` z6#&HUC40Lpo5q<8#Q0JyrV!q!A{kv#7qYijr;i&~{p|*Anp}KYZ!JL%=?_g>APc{5 zwM-I{l1?t|S-B>pJl?vrnk}JF575qpmLZ-UOHv}j!toOOWUT_~cJ1w;Qk|;h{RVY_ z@{OHUVOBE4SPM{38w9YS^YUd!-4pcaH^#?vaYv==T3MZV{E@nEEW%^BWze$-u(#EF zXe*XyKSpK?Ky+(bf$a^s`B4Ls25s&e5x<$~SYsOVo}szwD@TSa^ftU!L-}<+Jvsuy zo#_%H{q2c$!favfL_-mg?yt6U2HIY#O|5j>*spZRmX6xkiVB8@7{+AGV*9TdzKIfhv@yw${;R^U0>PbbKrLpyISZ96osV>WhEx zDHeWfBX?t0o|z9GiwglAI{tM+UqIlC9dLS#^HiDE*-7!_B3Pzr;)kdm1|-NWNuDks zGZ%(%kXEZp!X$<3wmh*`qCy}GA~>p7TuOq%)>aq&`7Y;c0oCtPbuKuzADzM1ak-xU zS~NmNJ)oStyg_Fmg8fL|?P^^015b3g{k#vEk)(qpluV|W+~vjkEgbAC1k;$etUG(| zeo^97J){u?&?`+mwdTcYrd}wEFkmH;(&(dZfqH)^fAjN6bD`+#c%t)4RC7$MYpbr> zZWWI57(LghO`{2xqN3CJ(t=&Ii$Vu}SXkJ8&rWmfYAO?K5xtHE zk1nIVufXj5)Q%FzRJEN2=-Q-4o+-({LY|Qh@^lH=XoKM|+!*g_IFC7)IM?ocoDT~Z zkE50t3dye9q~FqNH7RT0otd1ZT6vSU2Jy9*!ZymyjY_(j{;q{JHKJx+knS7rO;@VtQw?XFlgZ07jIKtn7_VbDQb6xuI6y8k z($;pE8k=c-p$*I}s&h>EXrsDw+jpQ9qE%{Sx@WlwdDV&^5ktCcy(VP$fnK7tIe&*P zUQ~G}_C^K^FGIla-SB#<8%WEE_9o_^Ky2A_Tb)cB0ZwGxsl&ssvmYcZeI1RFk*Y0)ke=KI}E7p zMRygarAeK*V|yK~)QXl;ZUo$GBsGo9CWN;VKD0^jwSm@#g;v9aMTc;X39?)hYkvT^ z=$&DC`LJIY5dR70;Q`9%KIkq(V0K$B*bMP+E0rwc%L{?1I~f1A+&_NLwhgK81qEL| z(0m9GBaKh%@)=%7I!HX`Y5MU^1pVP%tJ_7R@u|rMou&Xoz)K)@gI{JWOOxUR<6meC zdoI7XrcrZiKgJ@^it@<{=-UKVc+miSq3`Pq?EJErq+}U`xND~!0*UP-Z$+bsDrvE0 zJ`+|;Tji`&UO5V(8qK@emY}!Ah-3y3E;Hnt}ksJTEjk=|n? z&?O6FQ*#j9cx2K4oAS{d@Xa$TSYGH8;7H8nMx zHO-EW*aMp!x=7qmd!u|6Z;;DfJgUTd`1X)mtrKb?#9m-nq%|15kttX#KT(!_f`2ug zy4SzW)Xq_B`aR^-NwBxeK&6}9EszG->&OjgdO%#>4Ib^D*Nfzb2GC?lv~LYNv@P;b zKp!;TUPDoou&XH(S|T}*__$jis}tD``$CE{^HZz{coniEUte7aDKHkn&h@(MN2po{LaO3U{h`yU zE%KXkyALYxHaES@5&=J_Z>uuZu@{Elp+b#bfo<49Z@QcD__)QN)YuK+s(>7pIyOdF z`%O!^A`x8e&Ti9+2v)C0muF;n=c7;EBS@p!rr8V5{+V`U?VV-2K@LDenDBcKlt~m1 zD(1_G;m|%US7J<0nzMv!_pvrApEcT1WeGScY^d4v$Zv7}S;+m5+_i7;oG&8JVt?*lE^^m!}V?GvsB2g=UYsMZ# zTxeLS5&18b0i*+BLhGfjAs>`$8v^BC;Dcs(vuKJnl&=c+ZH|ua_C#L1gh6$Ccva0k zGEJ8%LbJcyx&2g9TKbvY=dNNAkhTE(ScAPpMH@liwEac!SkHcSbR1L~F3c>8yvzs6 zX)I~(%#@+>yT37p`S2JNF%$53s9pZBdd|CVu^9RE?i3Z|o&&BC%H zs!m8q=o=wi$SGv9yP^YedfjvAhUkC=rD-M)Z>}x(c2AK)b8Z8>gBmgg@28C$R=@)H zVx_t?@NTV^Q}3Hi1@2Bk<`x$FEK-`9KP&E~K1i<;%T4G721T-`f_6PE>*gaYo0Uzg z*Q1Db^cLh+paDUTSTcck`;JKI8)NqeaZ&uyetyf0nN>E#Wf~EZsVai*(ZNrK!#jaN zL)CjbV)AQ9JbckUO}+at80kkqpBHlh$IInw_VgJ>BWGpX+0Mr0WE*pvL|K8S#z!mr z#Jz)?;tYw;Bg~$*$!%G%E>LVBFsOC|f2_^0++}z5B^NL!kfLuPW8fjjJd3Fr&DQcY zvFEGK3ZG}D=8H#Au-iS?MEkKlQqA6Du0Gv!-a;BH*6uG*Gx_TMLTjt5j=*#4)BYQL zp{r-23GW6S|3n|3XNGY*np0iMDM+)5!i9Iz9h`n}!@Cm1>oK^KFz?T>cSMthQ=W_X@4CrQ*H`BFjkJ+?gr)KA+h_;(5DQVD7nfv{* zFBgpWTd3p>heKZ_mG}o{rvX(+1c5zb-_=DpGF@KDkvx@<}47oOHj}cpx4`pNL_obTP#GfH#ad6qP~_d z%%r^Lgyvgbn{9=t1sQq_SAhpN`xTGmG_Zu;5zK5z$x0@5#bcUV+o17@A_X9dP6SuR zDaMkIdu6h+aU@G9Dx(~h&6Lk+HJVg`%GoC$VenOd*1S&%{SXooGQKoLr=cwDQ%htv z@tRzG`)SOAKAkX~-DrAw8N=l5E^buAirg}^$00(G%wx6RHx-+D=bzqfCqMLdo;C-R znJuRY8a-wpJUOR5S9;p-?i@UahxsP-KGg8`HLnu@mDdF&8F}rjHRrIRY5aG1XlUkl zS6=Mqr)8xr)83!m?=Lw@roIA|wMRSI%L`Le9RA*kuz02g_b9B}a*2W8EaZLeE}knt znVmWfCS}ffh0)x3f{P{+Ind^kdzZ6V@VD#w@4twYzBg+>`*hu<1@gPD z@w@2CIQZPCSo&^|A+b$|GDl2y>i)qL|4eIYN zAF^N?8XLFTo|>;InVG+nJY4-<3qYbLk{t6gtU-_f5h_Y>_2hY{Y`ZCl%LX*nm?c=k+EGAtPM@HA4=>dav4)hvrEcAv@Pnb$h37W{h< zr{7+q!h1+D(B=pJeN6x0G*8`L1M+ebiiX*I^<(EV$3$S7es%X(HY+w4Bg}jsUiH*v zS_6W=*$Q9cu-B@-H2$mcqYADjk(S$?DI@~~9lo@(S}zhnUnc5d6p#*o&ri}$6s)qa zeD#P--DIx~9LjBeye1RiNB+wjt**TR#&)xPi1sgY3V1ZWAK#>Ly9-?g2LS`;m4VVg z+m4G8a7&X3as2p4;{c8YDHA&`a=JDZ?SH8EE@>OVfOSy+_S@n=rwjHK@EFSA{?P~h zkH>DX5W?TGO!LjBCSV=2V*G8Ae0lvb8#3>>{U>Jm2Y37bELOZKP?CxCap6PuoPfSxQ=N-H@O*nrd5}oWcTLCEbI+G*7w!VgD5O$0 zBU8EPC8tXugk)|z=%4{pL7onkxd@yQC;BIb|L^XaZ?6n-hf=pX zWc;(Ij_b*CLS7z)xvi}$SP`1pw&f8Y0bvi6*08@VZEj^|cfTtPS+Z%AN?Iu{K2^{E z@%EWfPE#{g7ArL;$H@J0*wyQLgXL?odgBv0huq}UlyRrj@U~lx@=|g2{fy%&J0H;_ zH4U93PJUi)KMR=e1Os;bY=7TE`n0gNawLu>qf(#T^%J-&>_F!l0ea6HA0L0waeQ^6 zXbL<#Ad)eBxGBd=N|wEO5mHHfc!u|jw8+vyfyxtU@4Wq^)F zYFU?(Stz&8bHiHUF9EUkl+8mUPg;)GWrG!D!S8PBREo9efL!<7QE2F!-@YG(w`Zg7 zqncXX<2WIYOEF)w&*7a6>)RvNvec?W?=nhR!X!VMq>~xzwu9`fEaS(ZByuAuFq6%_ zN!TufL3IpT-3lKQv!}7rKZgMS?*0Qtj2i((VkopZl&t7*v-*-liP?Cc)qQ&o$LfXX z&t(AAk^nT6w&u=`X0Dw9zM}{YlKH|f=dgIy%OIOWp$l06mT$Vgqu}UsT)?XYwq`6;g-CaSsrpuVgQ86&A z&`+R_KzM2;?d5+|G+Opf?F+uap{qF9VNf&6Y;@`1{&e+?-7v`W5J&@_FGU_vbWLKc z0`*LB5oOIJd**w;LZgW~LpDT@>`zgEwTLn0l?Pb~S#fk~lBvL#ns`kIhXME#>($Pk zEg8Eg8a_VID!zw@N#vkYZy)Q{t{ERxObi+YN!tFr@Mn>`QMaYb7Ti8r1%pa3?x*yS zhzK@_;R#bD;r%GH!zaE=-K}d#Bc*o&W%oz2|Kn-@VXgb~V{Hryt9La}TyA=q_^{*t zO%_j#kGGDdiyMSV2}d#leF0DUUPwh|jVgA^KnuH#AYUhSZBU8V*_`NcOMdE?m_=YtBYfo2C)Re`k;%8Z z-5@psFmImT46XA6jjl7 zWEnL`B>D4)`6uh{g9J=vz&H;I6#NlZmcE459h_MU659^J47m33G{ zUY;Ick~`1^^O_r8;YO(#<^EFK|jUuGpDIZ$wsS{9>A?psvpyN(yx>9&&L%m z_<3Dd?jiCk7>^kQG(bS{9|l%`Id3)Q4WcXg_h66^S`3>1ym5g0XXp2+DpT%H-OkJ= zL*Mut$99sg-s+WXZxloLCyK%PJj3_Jl;K#Vk#a=Q5`KvWxx%{-Hh2W6d~^LsdwZak20Cr z3C!23f-Wu2Z5zh?ZWV}^v+m7U_C|&?z1|-k)i!G%RtLFFH(!P#yu9+hISAeTW;Vup z6mLGURgFLi6vUN-e=P%3fIhZcGSM9;Sx`DnDuq>fdq|sDv)0R`gY6N{Bau$m{BGpp zEg3t73bQnIGr25nQi-k=GTy$pm{k1CirXL^*)AeF){-L;i^)iAwkUG4-Y9};0{CZ; zdWOzLF#@afsd_03-eg~2Up!@ES+un-h?>Jz;3dxAF0oTn(;u^R+0|2$=gpqZ z&0pbrU87;J$e&A#NjG!&-2Fhff*r=_iLO{W zLjNm^ILg$c%(Eq(dvif?NEvKn%gWf!vVG4T`69+h#cAlDdZj=4M|gmsq+%FPu}ayk z%Yy2$mk$OVUCCn!(Kt8g`YN#IV2KG3q?RV}58FmLz!3-JYp9Dy6{GbwEN%O4?A2`q zOtWfAruZ3(F76hKpFTeM{#rX94V4K-AuJatG~e5H-}UP6@2~3J;Kk=L?4ebp%^JZj z!QDL@Lji2vP3x7%1ff4~XSfqamwM|MlJN~n_PZ7^KP0QfVWV{F%7+8?rgiN} zQ;k-yhfcv|84qM2qAqn)tRA@o)MDMQu3GeoO`9)@NC=TQUs>S2N5BMvgQ*w8L8>}9 zNbg=*dZaz+6Wi({1>FSuHXU3gh3@F?KIV2b+T`S^7Hb{h!=5k1BqF8heSo`~nNB@8 zK!SF^-*0|cpGV4CV|ixRI*u8WKksNrdI)yiskxgzux&cRxUpA>e3!Wd47u1*hm8?( zmse}uHln`WWD!^(_ifPARcY~y#icoW2hU`3cypfKGaM(M4RSy(1 zYseezUnWD4_KUsm-XgI4AkJ4-UW&ii0ZW+M#~AHwCl|dBvkJt}E=zFfF*O!97q{Ja z0y;O0fPf z9O4T3=AY zW>z>}+>3WK9T5Xs6btwE^f4=X$oVtQUuI;on6@0Y%xONFaW17>h$11?Zg$jH{fd=U zaVZ^2ZEZt(X^u+?i1`)`GjPjH6p0TKHq1Uxys-zOOryhImRSwq za~_z)^O>rNA7j7zrz(A_>6iSuxw)#H{{D?#s7R*Y`!R>^4+|%KV7RUIz>Dj-g&!U{ z`Kh6T+sT%oAeE??7h{kF?Tsb#1%&-FITK`S2*N-BX^E~gvDY~Rw-I`D^}u0unFH?=w5wE5On zuET*!Gr-UpS2uzZ-#GGKeC3T{y)C&jA?rmrlEzPc(gg9Wjg2L$g7v?|fwFd#UhPCk z-+id@`&nrUfpD9rBEe}lyvLVz#?CL%c}(-VfwXd0W%+*7yt+cS{qXGMyc7fG@Sz2o zO<%uoD!jLq?6kW z)UAaim)Spi_?Vy4&zL`M2}PB(x>QwawcNXC`eXeQFNdJ@Kyh95Ma8Lqim5_qgSNZeK>F{@i*OL*Mc$!s{u2D-$=;g!YX=p2^R zv3h$Y$`YF;AWU)Tlky!uZWFb5o%uPwR**AF+fTQ0ST!gBm|KTNdXBJq`PAXL6DF}x;qA>g`pG$=@{u4=^PqH zW|-kTu6_17d+%@W^_{i8zvrhiygKjuK6hOAbzS!i3a*-LS>{DKHaa%phEXpd|2dlG zV{;NOv2%_>e_dkhY4jI~`R(*yMaiG5lbFxfrds4?6#7pXm2LfOa9LIB-S-*1-iDcC z!(ObD?Ao-WedgtaQa+B}lB)83mS3XxKAu&bDTWau9hG{12u>&*nOS3%D z0aMtQt6<;2njkUN=SR^#C`{7ww4KR`D!* z9xm@^;>x7{PEB*uZEo(4*>UcJa&C%W(cSbd&1*o!S%3KvI;{)&@}u0+)-nc^Fuj^u zDeO5gnUsQiR+IH}<{NA)WR$P^<O1yiHSGO zc)>{~s#>3dZ)QTS!9X<62)uS4wmMe+3yVgozrc_XpE2vLo9P-Ut zk$-&+pGwk@9uVGu1jEDS5*_tvIoi+Rg3Q9I=Si)T`kk<6ggN8;aV5us0P=)~k&GW= z)^WLZA7?2UCXlOm4$fv~u)=GbS0iPyv)786A5lo-J2EnYs>N&R8Y}>0S$7MdcwbUk zyuaOmW`*VF7b@5|MNkxaHAwkwS!D6W)ZiLxip*O}#+HMB6X?ed?J<=2e4d0<{#m@Z zz2gd4iBWpbp!xf@nym2s`}du@g3SdFLE<$}%98Yw>5T4;Yd$5fe;RmAv(YF<^g|toxgAH8=eU{BLAB|1JDQ5V;QdOIkdg+St zNY1T~tmH#y7+IiT{|ExMokTLP>p;TMQe<`9sBJ%W&MtXc zR8UyhO|yO?GZGVq0Bj@-kxaT9W_g9^wX1$%$$nnJ-f3D$prC1DT%7f5!EQE@1eTPP z6wsg!plGiwY_3)CQDX{>pFCMHT2hmL{HO_GK-|-4zx~;Vn)cf8kDd-|A++D8eWZzz z5%6X;Dq6l7MEsglC09fPVe&b>u+7r)M=63@%w>#X)TpaOFfoR(?v+-RV%cRY#D=6A z0;>?+ZH4i>@LjNZ8P>Xd2&&$rNy&Tno)xNXQWT5g4(s4$4Zdd8la&a+5_GVOZ}aUx zi+h}-DK4v|p(wFjrnRG1Ws)--pS7nZ+rY_Ukf@1QoYT#AXCL5_4Q06WR`(#Evo(Pt z@wVx0Bf%{M=HdYdwI&eG=g%`un__aw!akE7a*lBch4!;({monE za#Pk!voAJpu{MP_!$z-ig1520ek@zo=Ev=)2PDj|kA|03``o+MD$fkP1 z20;}+URYl!wsr%*S-TL?V8ziYx^lrWMDh5soV<^o#89mt-YIf=2-jXC}R z^t4w52dtQ;5MyKH(S$MNZXhJea}5&DfO4@C(|v2x&O_{|1?)!GsF{TJ8g=M=BGmQX zA+oOWvqJTd-eX;F!=0W;w2_faC3)zNv^dAzaZ~q1e--?*<<2f2vE<3mb6!rfB*RLg z12r`_Z>C6wW)A|tedn5TZN?w0yqRU zc-3JBi@I#i$0ZN5ciOPJ*X|kI;=8+ahGwAiD&0hpU1_xo#@XKbnvm>qMUna8xKL~_Ig zLFu{LJJg2!xi?wu*U_21>1Js6seYVku!!-@$k_9FMt-t2JD!`9U+GnvGZc)Z>P$3P zzrMj6h1lW!J~2Bm-F3B9-{t5F_H2gL!TQBF1z>F#J-Itng{~J_jV7x)v~23eI=%NX zfxj!DPT%KYTysq(=k+p#m!w}UuR}6CHD{YO_E#j=ea<=Yvn^qnvZJNV<=yVgxv5H6 z7M6WTBz9gxCzKGj=`cCrgZ`{AON~RNx&6st%;!xkSWaDz%R--tPjGrPk{IG~CT9)e zjFvLktqFV`)UR>%Wa++hS!;#59#q(KP|Ce$P6Ey%%Br)_&*(jFS4SqTrM3Hl818|( zio0pa#l_XQbAR(Gusv#!a#|7L7w8I`p}zxhc(45OrTXwW`c*#^z~hG*>F;oGd<~9x zv|+v3cY^{w{r#HyjmXeT&-C=T3{~1WXC6$a#>Lrk3bHEM*hFY2=p{?*Ab%TyQifdm zg{8ja;meoSu#kt-NrtuQakIoE>8cO&dj_WRn5G2p63TMWUnOr{`{QtRw}RatjL&u-_<1bW5+_E}+;x8Z!5el4C0{d}3_f8f*hA zDD=M0^K8L(zrC`-0ZS4Pr=|5eDt2V>=zP;~rQ_EQ$DQbc?#gPNrp6ti42hw!nUO8T z(P{^2KX3LYE+f&543mqE?6)renvwmP7WRh|^^nw(iIx!*i5Q`Z(QO>gGLf<2Ct$+e zRHEy-A-lK6H(0Evtv!*Ib4zOaSI~`yx5p4Zr~QtlX(8B&C-@F`|z@%wSy(E6WpNGj9q~CD?9%`qj72 z3)&W;Gf8%vRm&uQ*(<_}kyhJbeqK-i6KCPSo0+tKxIn}+EzmxDm1fS-$NDJ4T)o0| zHG`Z&rTl5tR0`@~gYlXebi*@C(%_hTj3|mw2$n41fS36-@mfk87oI%-aL#X(&3w~D zO}*h}cl~~e5J9NPL7$6cZ>0&B<0@BA@9cVHWMAeL=yqHtIR!1Z$zB3nJLm@MS2=e{ z;d=I%<#M1}F#|PL1u!OaYPyK2YuYG;!*m6D2G+$3b(MaZg-q`_Wq2lUf4b-}TbdL# zFvtJ4W_3VlC+M5xECM00^bUfI)id!&;6>1{-|KB1COk<8d&bmhICrE$#C(ag0VD5t zB6S_UZSu-1zcSW;fVKYk2a)B!UK=o7*%xh^WK-aC8Zm>YWG5=*Gk?k<+7vNRU zHghP*U&xg)oR`Cb^$W@k~Y{$zvo`w=${CXxx|w+D<$ zFhEy(HIRzBbg<>ZI~4=0y3-z|?S_E@vC@h-YkS)s@}SxsM`C69k+tbr8DT+6Of-r0 z>pH;U$epJxx*e`Neo`cbivYWm!jp|Qn@L#G$K2tnv~;xTlb3yrYF0$`TL8wivb#7p zD~aXdvfb$ZMGm4!Yud@8}l3YE#_fBJ7&>%Ra%Y1$Ip( z1M!gOxy9<=lBv4C-D1Cd`Lg|4j>@wZZ@Ftc1{)+T-#rk9J4*8Mp{{NoC&BMYniwhG z;ZFSVNHoe1_M>!b5{H9gCCV>RB0v_yoD8YQJ+Ejnwg6qS;(n+UUO$zV&hChjBF_sM z0a0<|lyEPi$5^%H7ZkwJ>h{L1r(o@S()aN(C1sn4{DQ)h;O_0@aG9h%y#H}u7z+za z4txuek2Y0$i3wGD>Dr8nj&T#CPfWVE77>f9;n{4+Z`$UZGg>WSdYd~hJp zW2A4(dgI)&dbyc%h0JUY#CIgr9pGFo1Xp+VNmFzYCI&vq+qevDy+i%fZ!rz(=_ULC zabIvbvoz0U^gpD?w-Q-Pt8A@({=foDMZKb|sG2x4^8myclArE7Q?@URz&${s8(mQzAtajHgDu5>R zpb!qmSG^fyFBg9ifm@+!R)EaXOGGcbajXE!0~Q6%UJ|z-=8UueHWj zlgSaI1syEEAg5-h71!CUC&BJm83g4;P8(O|_#@2C3*$yZ8BcWp0qRtbvR7i*LgU&W zN7+C4sWjv7EMSb}39@Lq{hH;`dls#CEFAY0Y13%)3!B7D6^h%20i&4Z&K)hY$YfNR z?YHbUJbqI~)h#>t3z4CYyzDIq7uTa8s_5J|Z{DOS$xW_kcPfDKzu-)h(2tIxaOpjA z@;J+TvYo*SfUg56F^btk+Sv~~K7Te#FZlr6Q=cCjSr96@QTlQdzN52D$+RdfVWFm` zW*-%TFs?l~2TU4_kNIY?F0_D=!otR??E9>lJjqSLTy8mFhn{}CHOUS8lW2JNiIE*l z5CS=BP|k9jp_aVW2kN@J*Z#(3#{C~IbIFx8ZHg@~p*HhmWQw=JVDMRU%@}qga^9#D zG#{s_L@KC$AA;?Z_VWzX66m{#~b=ai{m+g8&e(bo9i~>yMr;rVB(ItVP5b?mLY=RZ@~ue zJv(U0Xi>@OQh)D-e$X&cEsdH2Ff~LSuu*sQ`9~I+q?y*7K8B~C`}>FfUHaYKB_bn| zc(5t$bDQd_!W;9y9kh#TOlFR0RWyI}oB!@=|NM6k&I8tIv`hx{Pj}q^SSs)-fU5)r zzZCex8~NW=t_*JgRaib}K=Mykx&K@e-^d47dHA{N=Ktu%M9Y9jl&4{l^^afkpKskC zoW{S`P!~19RhZ@{F8+64{f{zKpgc2pOP&I%;$gqiT|go2VDi67X=Yv*?)d?f3mrGLIzm1S2wn(|3`QCA>gRcvfN7h z^HiIExB-AE4vy$~x8uLsYy5uO+L?&Sh$yZ^_5ac9@ZWw}&#Qo7%J4=E`{;jicTHo! zRY=IYUj0v=Gui(SFaQ2L{QvOsFR^rY^V(Z5yaJpjB?YqRv9qR17WwG*HEJ??Xi?wI zKgo0a+hJO~O~t^#2AZ??it$AX+S-x9Z{8^Bjni9MS;bDJ(u#U7efT~;F2PgO>vb_t z+WT=~GrrT%{mZcqYJdC;AN`yT3K(tGOJU~j&9i4ejjc<|7(BNCd9WLJW^B15ee2{5 z3=J7PFA9_0i%A08UAax3>oH)~1Fl}bPO|+?lgRHAI6;1&u7}G0l`t3hgAhgKVwl5#{rUf!aU2rSh3 zlEKYyR-he=OHa7%c2qZz%iQuRijh}QvD-azt$6L>yTsU(^{C5qbh1pA8sUKurMK#i zc8d#(=R7tnth~LOfJj9dJ<9{+40&0ZbLdwm#P2-@t7k7th|dKRW&uM@9~X>YHDe* za&j6>O*<%ez(_=0F!^gDfvF@3x)QiZBe#W#Cne?gl1@*<;-sGEM$%=m0)C06fx+!x z_N3wA;nK1ndq)KL%|Cxpj7t$!15&1fycQ!`TDqn0VR_Jcqm%E5xa0(u$w|@e`}WNeUE3A*R<`yDfb7t_9C3Z-N5bIap!8o5 z+@mu7uTuoNUgooRIJF+2`M2DR{6|3ZN zS?P!HthCV{&$^zqGWJz&FRv1nEK%kC{r!F)$ZT`v_S9g=h1G$cqfO#%e30rI z*7AMHd*SCJW?>O1(PIootmGbVJdkkDpc(vP1`AEQ+V|&w@tsc#Bj5hDKoXObwG(xU z^O&Ap$Fl+U2Xn+V-a3MqJ$-!wxMZVqVqb}}nYTql1O2*nC zm97U&yLq^DC0Px^zD>ue{`RPAEL;w(**varF3Nhgmtgs{dpb8S&u&d#_P6Ui>G4n> z^v5!G)yx+%%1^eN)z+G+sYXI^ErHo#)a<=3ycLOHEF?K?`GMKSxBlMK4+@eeYeAB$ ztB4bVSHNKDSt!^#(!H#F{hWP9V&cmVt)}X_g0B{5T7@c*=Vd}{eV12iV3|cBuCMx2 zxk>$}9L^ceU7EAe)YZI4`|<7Dw~lbj4+?4B&fkIoJ+!t0O-Z!wH*Pm!Da%nGzsl%_ z_|Ox-;_VLvKlQg0E$Rl%9%<({W7DJ*(#g%d(n4AV1+@$`U&v?~s^0C$FJj2Hl3sqN z>Hr@YDD*~}r4Ee)AtOrEN`qU2uEggy7~G7d#3WItIvvBtRR{I^mHXT#@%_3$7j!CcCl_etdM_O7ciQp@F`J&UVHk{P{&Kag{S?UaThN^iN;&#|& zHFc&7ZCN{qQA03&I^eBvd3COp2e6VTEY@zQuKe6iRbo&x-1}~w^1!@QV6(LXFlE(m z6vN?$pmKng!u!%ir?tDg-5N@oyb#*2tsGa~aLP-r-) zoXTSc8W#JFnpxbnW=k2!+-{1oKZTB{Y9)H4pclGrXE6%~h#0)@a-Av=c1T#XAPo#s zGiIm5rPR}~l25@{!mUFZ<2U4^Q`v^7#S97zKG^ANsx+utg?ac*18$}pP!}Wt$x_qw zMc2;^T`lM&54u%}BAU0fY2I`376Zp5XC&TdCQYuN#LLB7CZ5SsphQ)77+3KKbJ{rX z)fQwJ$rr#~$P;cksTjl-*VJg)Be!w35qvrgV{M1k6q6?oQptmCXZMpCMF}{G-lcQj z`3ng!pq=kLh~V%%n$*&p9mD(VDuO!3x{b294;D%4LUgd&Uvq#*WkHs^pdM8384RUt z!nIIO$uriUoz_Ilbr4M5zJ1$#k*l)t(>t$&>lp3rVM(p+H^GO@XY|u;Rio;zjlvSG z*T-AU%IMZNP4JsiDy%8?lY4gRZdakE{+*Hf^*i-2!~EvlJ~f}S6bX+^@iHApwOdlw zT|;jG@U|a9e$n!-wCocwV&Q+D&)INh%3hHiE?uTuS;d@Rdw7vfL4(c#vHRF~j>uzp zQb2s#~BTC%lVPWWs0=c6@+-yKdARY@m3r->EviWQ8z`_Gp^ilz9X>KKQj8eIfh?() zl^%nu!&m825$ISFgy1cYc5P;tR387);2PJA`l(cFE%G&=lCsLW0|P~C7s-I=wnU71-2T`vYm4Bo6r@z1rhy+PL_E^iv`SuzOl=hTlqIB# zy7aJL%wNnkN2XLw3jAM*F(W^PHJdCzOStJvnoTc`D$v$wSMFt z)#h^gOir_G4$dx0+jFt$mW21y9+ip3p-)*eCEuFI2-8TC*Mb^Lf-w8)gK0bA zd)b=?sieAY-IJ0NW!riA#osE%Okb1SKQ%P=Yc(9rp9+rou9POmAm%FVnxdQdzcpW| zJOX<5^!W6+(g;FfSn9!^JY(_)mC1k(X)z5etFULyj>c2sVp~;fE%RII<2GMY??|CZ zI%;!O{p~=>v6M=_EOJawk8)o4avzw8Hp3?u3VLTiiU%smnGeyKNH7q&ZEnuGeKOnV zB7cca%EFdHjvIdcfpaH)iO<4eH?^j=wj~VY`o@+lIDAJ8p16=p2a>Sus?hf<^z@4r z2U$ZOq9JPq?i*{tsKaK#gd%~DR5~-H?V0$izR;|hVD9-Xnx0QgZh7x*Nkm5juCOEG5lbHfGZ2+<-8<(mY?hEL@CZ_~N6{xbs1yUCoq&Dz7dYMz;ju%^?}}XPe7A`( z;_9^()_EsLm4B&YR4q$v{*n;T>v>G2Bun_T3UF9RFjG(v8Sy{7L_r9)1evIi<&J-w zZC9y9Zj0)|6!LVO2a6Z zNS)p48+A;0uMcFoyn-4F4b2n16P#JlcG+8Bf(Srg?chB2f8HP7J69K!i4|oXg$N31 zqJ!s@#q0g;IQ4O9+B&lrU7wE3e5VtmgS4`juOOf71OnpJPu}_i1JpOG#hRK7Ma4F~ zFs18)Dd-#$OF|(xAP=UjwSJnEAv#L;pb3eq46HF#?U3^6Z@E!y^+S>C%n}ixt!AG& z4F;Xg%e6Zy#2oZpZB~x!YgJjZU#-__L-!_^wj#zqkrUy+)6G2nYtNSKkSiuJgV7QC zyJTi9=x zMN8^yu)-^}v<$8gAP^!kDjIbGDrpvh8usGE)c3C{l-12sOzGaiJ-FSVMU5Vv(K}8T zznj>Qwh$D5Or9%! zelsP-emore3~lgoyP19FU5J-VnXuJ_GFSNQ4u1T+^e2NLQKad$Ce;+LEYZXO!6B_@ z+Lob8ii$Or7)u~KB zbX}&Kreh=1?f-HUTUa8vSeu-D!(wC=>BRkxHHkc8j($r8*#Pt5NLda$+Cmr^rR$_+Z#x`#AIPe9-oZD{>e^fQ=9|AT3jO0vjsQE8mOv9vMP zr44!fi-!%;EdTVaHWJpusf&d=dU{9jlnM{Rhxapm_$MA$WnvvBt7$$po!lGOcpp-F zD>}BB{d0dSa6(`gC>-RUZxFdD@G5e!>Y~|-I~J8ayPaAp9B2@^Dv%?l;C9;rp1QGd z8FVkL6{+a4U+9^A(CitjoZPmXQ`8{VK+AA510{fx7@wGU>H&TF)Zv-gVp%1;7n`P_ zq;jk;F_NV!DgJULkeCD=cGwPoe(o>LLE5!z_!0vMaTmW7R#kmMy-x&AQk3quA2c`g z0OkKKUvw05YGiAh?cTk<42GyMP$VrK^fM|anm9f>ch}(lt5L+@H%9zV3vr2LoK;;S z<=k1s44+PvpxKh0f%)%d3UGf+yb4hK!L6Sb4yH@4M+y82m)>LPnK8jUBGCO{_)JQ& zh*LGi{eC{?+;89RT2w(tOBHEb_jT3x)v&G%ODdo~vi07S&_C!qsIQLqzoEdzRp+@) z9@`qoW-)H?wWw{(2|jB?Z_g<=Tlpr%nm5QwjY*{eWI!3&XKmPyEVK2I<@(pZ|KejS zx$;=coE(Wj2tBsGOK_-FY|5wq9E`ETyht5AH%;k$=7UC#jyCKkdbDWSsU&&rP@MUU z!Bs!3YqSm4$Kq|zyWhIUm@MtEWMhh3|4Uhm?7@{lz=owG9FBPyQsTS_^Bh4ESe@w^ zPqP4Ma>Nf?Z#%o+h}x!b&Ck#8)@i)unp|6Z(ZfhtDluS2jZ!3sM!9w7G%PqYRM8m! z2|+k21^0|i1PvK_|~2K9Nm`+<_Rd; zw9^)g%V1tZ^Fhbs=N|#d4+}6%6ubvYf;;qVSL0%1ts1N#pCSPk1FauFFQE37#b|hV zn8U!TxVBco+S=MSSuV-J7xnIP+5Y}vss$?ujUF!z!D^7JMr}NaiOZULdJeMO-fBDe z6|`DXb|qd%?^L`nzpybP6)N+1`$blmF14|ivYiilTUaN*6gozl*67j&dCGqU{iUqZ zoVA3p_gxxitth!*J^z z+~jxU-iHc*FsH>~KV17OQ7z=5bQvK0FQ92*T~V~ zwj}eM|C4qv*#37DWi>^2JqSdo3Gs=owkbLp9Z>J6#a&!l%K3DhfSa+xM<(dm@csM1 zU-a?G+RhGE=gEd>`p1dDMvAo`5*euv+|fel;Fbrnk>8e1E?CU|rk#aF63uRpU!nGv z@%e=D8m#Lkib*eg4qscd6rX$Ry zf+fi%L%-2hvagwyV3r1_(p#(U@_c|Igwk04oN4Dch!r_hcpxB%3AgPc$XP#bl-6M00?C)M-3R%A+%bhlkUd z>(V>MEN+9ay!kP1j~0Q;z!}G-uO?Rw?#=4Ce7R^)+C=D4tOFt6VomjO(K&2>O%1{V z@tJOXxwFpZ7b6hHM>-S)lHG0mRpNGaKf)DV$WZBxUUz>KY9*B;7_b+}TEUbSOtoxK@(Sy$P({ z57T0m$F5IwOs4m!pbArCNs0;U!s5Lv6bGArU>UO#&Clu0g=-IZVs3f+`l{D4N(=@D z`!;-@Cau(AY3g|2wPLp?! zxHy~VFNym-dk<487%e$9v^HomT5a>?JMc!%R%%YZaj{qqW6!KbTOzS%U!WdkISe>o zPKZwFX`1fL$WS(-!sqkruW}GGOr*a1Xk$WZr)VjZf zHobKJR~kY4x$|o#m*{NpL2vL}bTO-LQ+R?eCW?mPGBeU24IBL6 z{j8gVW4n6f3er)@MmYk`!zHeF-r+Fhw(D10>QwI$ZOsv3t9|X0AGot^7eC;0HyYj3 z+iPpG$_OQyDdBgDMEmslTDo~X*z;m;F zc~&+qe8S5xc5-czmX6Mbb2oSrD?d0peWiS^YCw%r9(`mLJvYIeOIU}0lkL0)6EyIG?ySqlyERzI8^ zZXpKdI@_iBU*<~Xw`ByX0IT+j1>xO0!-sR_uoB_H4@Hx^{kt;#hpSL2(_Q7nb%07{asu>^!vWA6kt|>?qJ%^4qHdC%7$RY^dNS< zZ(Ylt$#VYl*ZPlLqrI)qA4Ba;VK>D^IpkJ&pWZD}&xnyFrJUFc!AzQw&Szcz{hhol zae>7D9?@aa8$~u&LsQMEb5<9wao<#cVE%zb@wcuwKwg>)6Gh*9ruu9qlo=4)ii~1 z$~l6`p$jinMlb>S8C~K`Ffh1tn}P5FvD7EL7p1tzI9M!E>0_>swkP`nJ1eq)%D5j)N0tgIx^m=h_|;TSMxe-vOM*OMQ%PSV zu@ofI)Nw;tWQ|uC3;8Gemlzc?r`~X3@DLMQo@qqXPj!90uxi#w9#R~y+v2r}LVlys znpcojT~t|4B|nL`E&g)zFm8PZfE4`=%$JPZzXp>ZZ{g?Q-tCAY^(@yx#N^u6Bw`?c z&?c4~Dyqtr{-yJ4@4HQ6=Q8~Jn|G9JIR_NpD5c}xU%lQ9LPq&Ce8m{3)^aUxaPxB- z>^mRWePt7(w^UY9i9?>vt7|%8ohqugw+jB=P%}3h~TOzb;m=4A>TTbNFi48GY1qAwOF!>yK zDfxDW1*t{8*ZXxmZnWK|v?Hb5+BvwH*E^Vul@f4CS8L*)!0ov2s#yNqY-l@+CqFe3 zkODMq#j+65#PZtBO#h#)5Fw&^e2*rdP=<6C;eS9%H!yUbp)Av{P`wTAvC}gStTx`U-4#rS zO#~+kev1XRZuGibgKN?Li1u$4J03rI-#1|ld{h8t?4CiwQ0tb0*U^F7vEGDb=jU+z zqE*|sck%3=<~@v%E(CTEetLfmPgSVa&WuNyMLNMR_d6OoRyth>vu@_gW%{>Y#p zj1C#F{mP(K*EM}OQOBPU1sN(t?>8WQS?PpZUqOb?^J4N6O;4v!4pvo|3j2)8KV{_1 zP;W~Uu=$C7P_M0y3@H#Ksx#~6zuYE9)oM>ba`W?TsMJ~`%-6b(Uamumc58&uK`UOr z=9SNNplc%uxW?-xQ~Nnemp)ar#^N57*T%80&FZcEImncWp+CCqtRAdzJ{EW=wOFW@ zX77KBy>)UDqphp^lUFzqF`%Sko9<&`c~{B*G>u`9(#QQon~8SABK}M=nb9vW6K?gh z%lr`$32QdT)=z?j0K^Zf-?hg7^pHt-0F8j`9K}pTCfUWJfL8ROgu)*XKLY1zhBSsO zvV8BtRlm~0l&%z8?aqG*d%2%GJU4%WukjfT9oC-KZS7GL{`v_I?79VHk0 zMy2Zu%#45OaOmdt7#}l!A6H_e4d4|16d;WP&XH6U6qY7M=4NJM@oZNeJ4w`1Q&VTm z=g1|_P}B82!*@bkB2ccrFC3V_j_}$+45_|jOLjZTSl57)_LO|=5~CQC)b^~M>{UEe zknFHu&oIBKsmFixLq8ypTXd9#H&s~_I%tC0>eG4aKh%(TuzX7Y3DgQQSN z@mHB=6^ulqTA>5C0bgMO$L+|yh@HsSIwQ>(QRwPp6k{LvOHT)zG<7?9f z`=nuoO;f(Dr>bC7Fk^89jy~q%x7W{UZp6onm!P%$$z*NFOT8{!Q&e-eS5Ija_sIX8 z5Q`Ym#V{Xr0U1Tw%6G^_P7o>KHn;!l_jPG3iecS_+WL{M$!YZ^Rf;^%M7S{XLner` zVoCE2?QXt;+S>eN{OI)9*tHUfNkCU0#oWvia22XD_FuF!WKb>Y?dc<3sIO$5O(6Zg zZ`0V=c;y-cvkrtSKfhR^!ibCP=bQb`G>0^2{SvX@HC}?$)BgL@YQhEMBM5#L7T0pY zG+rWZSdsaDvq`P{oi=~LqayN8zKc{AVE4MoWjiaYDwC&0Y77uYmB6;QEgdXH`KezP zZYlDcH!r+c>~})OUOSM3Ef3UwG0dinc3SM}ef>rvY^XEjaeU;A&A=UG!uPaSy#yO3 z{5UY^@{KDp@N?M9WsOVCwC_R6DW*+^`iW$SxPMPDjpQ?*^V?w<1G^^#>4lv z<{`0ESFTi}&rUMaT%6UM9mo^|Semnry)zHeSIfs6nL@CQCZc9N)06$ESJCU5{&)0` z=dYl_#y_j!G>4XcFR4Zd4}`V9-eGou!5I@98$0HstqikrhWDISwx8y(aobh;Hag`Y zM{L0;JZ}|caV7DbO4z5T)CT8;&wBg%Vqh!22FA{qKK+r#njOe)dY=5U`AeGOl1x_WQ^a%{i9X%rw&u(N0wXx_sl-Rd8ek^NlmKzE@O zf30dojHkyEF<`^MahE;kCO*K>n7+a z=pJ7lraa3EFWgavmByLMh&(Uk?4Lh86blT(RLG*$t%|a2F2&tCxM}Z?W_&4`m2NBf zvRp^Dx_?#gNT571u};$Shgi2N@@Ju?IUVla=aLBYgzh!0qLfcd5=8JpL{j?KjtK*swjeYv|DY3cB5Te9NcBBdZlOse(2~5xly+ z)>;G#X}W}n^HQlbL&(KLoab#-u3*+wq={gjqoDXSX3JYPQ&G#`K`hqB%)WzIhE7sw zx36Nhse7qJfOP`R&TNs3e>FN7toWWs6d!6-$KMwmrd94wE>6mqarb~u^EHP+(du1( z#@Eo3udAxnunCE;8#Zq(HV(N|K7Q7d8OWrfr{+dYH8i}wMW-U7h_E}Vb5UJRi8XlN zH@eW*wuL!d=e5XksZewps6?B1Hch|D;}LcVZHi*LVncYhBtxv%>w09|n+wL5Zfp$u zdzrW$rHegJDz-#IEla9Lvns2Vet4;Av|O<#RC&ou=Rm01vSB;68^s3Yy&+^U$DdOW z8Ru4XXsjQnrY@c9!k0veO+HAh>XFF+n@B;@&=lycm z{>L^$T9!zrkCGAiFF9g}5654ar<^&=ip7>880$Bam@gBFU9QuT(#ujW_F5k#QtnkE z#D5(uY2zRGPmHBnBY-nn7DN;Z?lOLlhbLhA`vnx9VXU{xIXr)DCslxpR zbkaif)btS65*RTf)gU1Q--Y(TLX%J3P1m{epM0#$esbM2cPA_)^N~MzlsZ~8r8!uk z)d#R`n&Q__T{7hTcN8f#jQS))N$Q*2kD$6HWml~(M|IY|Y+Ui{E2~nyV6wLP$ne)o zHhgfu?Kz<;UQnUy65Cq=)P8^kqAi_4DhKb-MG1UMxhk3-f9|VpEqoqXrXrM?lWIVtg`m5|uV3W?CJQ?QSENyz8J=HZ56Qzqi>CvVuoh?*Jdrquu9St8B z`Y5y*URG``6?i4kJEN{cdi$j%YtGbjCiJmmyh5f(canl@H0j1B;{(Bupox}0M@sRY zI}LJ@A=wvPzg5_F)9S4f(jw4cb->7c>*HRau;JqS?qxlU(C~&HP`;L-aiV75L^IL( zZSm_u1AMDP0ftajSrZH$9vd-N;Xph6_xShsg5L5&0QQ0;Z8J6XW$Elm;?&LYTzZlb z-tQc|yaHgehUKx%a)9b}vP+k$S|=2;;F2|QBTXi*qlYz)ME`jZp;i%qb!mdP;y0Eu zBlGSIJtjWfi6~UdTK8SS_41B442v(dPx-P0NGmF~_j%cruUnQ$vwe&tHt8`D^)o49jpB@j^8gRaZ zY}C3=e&IqT^-2}{T7!gj@1QuFVS{~r>F(jys5}PEc$YSAxR9W@w^NlbFxsQs4Hp`s zR?+&ZqHAL)C#V{V)$N89;z%x1!JJ<*`fp9_X_{%K+lRJ7u|A)r<=6ykoff?(8xOdE zpLT8OHMgB%gjf-Y>36&3@Z~Y@Z2yE*O;@s<>8mgLId?WWpcfI)%n`xnHhasNup}~Smnc}3~EQa?HH(}k< zRSGAg?b8)~D`36tjuNaeEMMhoZ7VOgsm)&To(0pF>-ea4wUFp_D=PXO&L6nU zD{NYXVzzp?der8~MgIVUWq+6*aq_|sZim+DYoF`9LO`@}er>f2d%VN@5F>SBxz8D4R}U~Yl_F_vb5*lM?3cRT4(we!#ZvsMJ_hl*f0JY1nyu+NB|Mo)Nvn6r z(ivXe*Vjuc6(e>QftW9_}hU%TfMMoKETF}PKtNY=DFooB{0^gY_a)ZKpLj@ z#3{DK7%A^qjeKmC9=bujGMpVfD~T};b89)qWX{6PzId&s z@kQ-?q&*Mc&5c+JVr|6^YiL!@LATa(19OQFOk#Xr=BXkVO;U$On>X9$z5MDNbb=IV ztch)I3^V3hPw$^F%P|N86yC(re>18#Wj^2&;5t7F^AKzl5e zC7f_pWj@?=Jc(ojN!Nl~u~D1LMa_wNxR(;8UL~XDGySkChV-*}o&i~{nt7&=J1KH* zE$O2!hMo?Gj zhi$8BKR$ZH_RM*ar18h+VKuVC8gdq^>^mAh*mq5rXus(u>ma@Ed@MXXu2sq#jauERSS7oRI$w;0V&yyxa=mA(@n9=QthXj49TjO6W3`7B8qL|Fus%5{ z;>uvssV({P=-(m$?c7vmevb=P%La!GLIZH+TNdMD6{%(aS+CX3{-MX$UDrgAh)TpM z@EjHamYFLmDMi3;bI?J`lj5$Je2QMAhkYzo0KjQoA-zE016o4-ucxY{rsfo-uc>*v zQ527~1PD?&gvyNZ%O#JWuW!+_-sgC7rH?lNRBga`JHy8RLSYLs_D*O)L`t42x@GaY5nCmo$<~7)sxm9w+bK$~;ev|xh3YK-XuPfIxjVL%ewfWC~7u<3>w5&(=oA@6k zQj?94qo(ST=oc;!S-G*m=|y6$@vT)ueN>qgR*ObN%|`j^A@+Nz>gt*!gdd=#QQkJ$7*+DHEsN6^)gS*{=T@oEkzw zXHTEwPE!yVL}G~6hI;BZxYx}d!By_JZWoRg64n_NY7U96UaS$eS!Tm^szH$-&&f48 z6=g}sM%mDCsM>C{;#0-H6b=@coDtv)6~UHcfr`X;Kp?H4C4SrWUrU64qZ;|I9|;^| z{$RG}^R9I$h?Mf%!Jy>m8g6p0?^jH|d%KkF#sY7`3u@~`CW>TBopfn#N#=(G5+3=7 z8wmN&gu$GID7f!rD8I+tyTbJMJ3qY{DB{81tB+P-9H#Z0){=Y~_*TtH-F>XgGd3#7&J!VK6VzO}N~|1_g0l zYaGDK^9vMYXSeI4$HU&Cbxx}q%o!wYJvQ$NQ2JB~4Q!Q-9Se-m3;xu8c1t8SB`e86 z##YfS3U)5`$&-PPbK}WXiy2240Pcd;1dlCu@UQ>NLQCmsYBKvCZer5WEr3=T?Btxj zQQo2#^VsHeSuy6tkzPEcBRPLntqKjyn3Q=R*bv^5-(nurE0Q0`1b-9qv$Q)ng(@0Ole%vln5v6+G7JeF-6|V3tH|((zsTrh+|H*_kQJkz z?Q%j#DKO9KQC4ZDujtglDbN^Q6qpuN(eucH@<<1zXf>|(V$qsV(k5DqULpGCeD$y! z>^GWXD@7rXh+;oB+JI`q#?8sem)qtgUk?t6} zQ@RmQnxVTphLRd;;P-mY-k#s5dw=^}-(SpJGcVV?&$Hh3taYz@-D`*P&v^BJHAeU~ z&$i6_d9S-<h6Cfbs(6$20qolZ82t@C7i<7p#<97WC=UfmTiavV4+As|!VK`s~td17x|s83jn* z8EeA?-(=jObT>#^;;~P0^i5oLWV-I8kh|uBG2Qu2tIFh)J#6Azd|F?zYBpSB4qVkhW*w)Qzo=U0xV`elldI_ZxLd!xuUO zsEVkVn9fqX7|i%h(m61U@>jUlGn%{1Ih zU3T@&Do_pvvNbo0ud)~BZ$4yYns@-~{2@I`_GF+-oSK??v=&nnts*!#7p72C!$0a8 z`cz&vkKg?))qDR~7aO4`rT1>WKXC2Kb&bPQ*W!w2@8d+y-#6BQ)kCrYIrO;_yGq$2x5r^z5xvhguMRPOX{I(P6!U7qZL6h;oh zMlbB(r1YX!6CT{oAo_n6MgZrDMTk%@6b+`O!m!zEtAo=q)n9~AsDh^{a>$7$OD?e? z5oLGqLabZv!(TZ_v8>)9=h18XluWCs=kiINxm7 zRSw&ey|BS`@Cdu%vlMUKtvteMQclNu&c2x%)5A=dxxLlUWl<9M zb*{p^kzBjAN!0=eoDv0~CyWiifn1L^2}(+%=aNW&jb-NVWBZ^(n#}1%=r`_z#1X>! zC0J|@8~t*P(4#(Mt*eiUU7y?#U02bR(|ajLwGeo*;`&3?7a+t|e!Fxq-bLmU2K!g^ zRa&0cZ`|xmqw8J{uG{(S&XXGjKLXpH(Y>&-`EDC_TCNqPD4Xs}BX2&w*8hk92mCG$2H)7^5zbDlmZ z4ykQ0VL?gjgR_`##2^6;F6(tao=)AgxLZAeK>@0+*dAQ70U0quf7#8;yIwM|mWMN|?!YLTHcvcwN4IqNF zB8^$`K(|D!9*&&ZKyM(BCyJiRs0tBrK0hs;Nc}S|s#ne-J+WkpmzSEAT%(g>KM5WHJa$C2GPj$q)t2_>-9Eur} z6=z;CS0>;BBxrDv8h(C_3K|F%5L~_h3B8!6#9W`MYPv(F=W${-HChN;a{&q9}*F{3$Xjz{c~f`(QU2`7Tk}4w~f136&5es+P@Rf>rzLhrO^cNED$*L zx6DPEVk83ss|+VkzM<3D+SxsCH#B^c*?@IwnnJJKEiGz<@to!nlv1|;EeEg1fg^t+ zjO|Te*Lp3c_?Cv69&Nj=-S$XCW&Ktu7BEwS4{LdEpfnR^M=4Yd(kQ-EgA49TnCp2f z+ZERh+)j^-j*PWd_G(wzecic;Of+2gmkB1}#E~?6V48PuxIUsgEY)OFnV!p+5oH#i z4m}#dB^6n8V_45@9P6o3JiLK+)*PK9y?gT}nVn+cRz!5AQmxbO!US|Xegt;3ROnXw z*7xbgtC=SF2(p#evPNP5AUMEfXe3vt0(wp~(P)vsRze9a8AcB<;WIpQAG@af8W@yv z!ZiMH&AG6kKy4O^z#$N+opue@d5Or&U(@O1J=lA#I>D?`E)aS?)=g|K5&?9IE|JG? z|C**I@_4S8&xJ=lAd-=`{ty|-eSs~cIE9g%MS$qDxZFF$ODuDe-(fCeaMyj4<_5wv z^!GAwy}Ad+B}Z3`dhhvc^@>4+am)}E_1-3<*5WjwRx#o0%nyh^Gvh|$*Ud)iDKagF0~54u{d{r2kY z%%*wAGRkSLh;uga#!WnmC)8QEquj%eC4FUPLof1cLmDjE$BI!Bi}FzlyqY-Q|{;--dDI;!LDB_U9J)_ zb4WUZE4;x|=u>Xf>Ixx~`=1`vlZgJw(mqSCM{9c*fVdK(YNYJSBO@J0{dYnDgl5W$ z^hO<@)IhA8vA4andEkExh3zpO!Ntl9Q5^!vz?`u<{?REFF+%y#1gX?S@5 zz?oN2V*R5uLjTHbtc$r;*UPdq7z0@ja9PYVspGD8^9RReFscJzrbjpRnT6}_lpK#8 z6-?jZ5B)5sVWG#Gxk3j+?8FYLw5z zU_M89M0@k->k9@g#J$(tpvg24iQP;jB*|rxi4`6(7K3Uht@|RBJ_{g|2rYzbR&b+6 zpxnpAnn{;~^laLu4z~^2LL$<8k6jCj$RTodU)7knL6PAuhbdd~Q>=)};vDWelM1I8 zaogqzf<(`%Xi*D{UcV#C$Iv>wuw$8|g16kKzBQ$B`$W;p6qWl^QUtRI`x%x+|i0Y-MSs8xXjhwa>eS+G|IW^WNoh zTXx}a+~NZ=th$VZWT%GHHpD2gJpaw&ojatqm3ln0$gLQUa(N)F)Pw|@W}eiH!ONJx zA^NC~%>e|i^cNKS>3jc0aWUvd}c~nl2v$lNF4;J zc>2YMYIVl>qp%vd<~2%(-;q_b&46cCwO5KEI=0Cg^=gBLA5mbJ0SSSPHWCsNjt*Y> zyYH<=o%VIF55%0|pl!IJu-CrrHZkbr(kTyZ0^JW$<_Yd{S#|1aY6AIyWaR$fL0{J$ zf*u+9Jgk&;^oE!|5md%(Q^shM7CR$rsGT3o+!xRRO9+NJU0p&oOuqqzw-3+BO?s*a z(M#T5F6xB5G&|Nmm|#9={)At1IM`j#s!_YsNoI{oZ?q72%+9W~+O!uG^t7))w~C@j z7`k>gJ-s&iSXan1WwNg@&rgB5$KUxaZy|nWl-t%Ge3hMd81|+RF|-F=ZrwFu;XA55 z)fkeK|CR-7IOp?Zf>aueRa)pS19%sJaLE;NMJ7SN*7r&2j<`(|*xCknO|3q=m(Er@ zF1%IM1TDzdMu~7m{B) z2o0^m3_wsF2Iusv715=^2hVSa?+{T&FrsRcw<-3g#`*^mWt`%aKOwPA(;gXS>b8q; zOr!e}v7)lKA&Z^!!%wkyKVh+s;G!S#_BpI(^2(Y@_r`RrbLTf;w!XO2sAj<7 zSyJEf@caq96siL5JLSH`z2KFfBrALT97=!O7yc%lpjQO7rNCjbd}kwUa!%E^rlCer z_*lDb>odlcIUoQ~$(zx4%5k)a*wjLx%u;f#s;D(mHa4m#@(foKs|lUxmEtz_P=O&a zKurdYIn>Eb*u7hgO4wf>>eFr{OC%N8(ra2EM_Ft&`(M68-RXheK|w8#){;B%8X+MN zEw-k8<~SYwRKXUt!6NcowF_AZD~_tE9s2sZ9*xJJbQ_t>o3tJwuMR~H4!UX=${#e@ ze4GZdSK)IrhxEFg)8He{NkOZt=!1hrT}xCnKtORWG9Qi7)J14Z1p{NBJ4(EMsn7oQ z_OWzL%DAbwp6c*knY@!sm1H-B>9V> z^g_Y0VjnP-%FT|V&vYymgX<5DA84d7Qa^3Zdy*j@5_I@XMNjXc^_V7c{e9~MNGo=q z=#s(FA#vkbDOg|AfTuaJq{Ny)dGoC$opfo4Nq~Xjv&l*BeB-3kk6S<=l?+$(8BP%f z#wmShIKXhvYRp=5-kD(Nt!d2wfQ!+a0l+nK!7dwigOyMOQIo$`!uM;vbu|KJJjDOCI6q9_IxBZtNSiFLXKmLN=a2h{P-yV%Qn*#3Jj0xZa)b< zckkP9N-db!4I_>8vkXG45=BXFAs5@3$-3%x z_6hDbJuDw7BOZV+zQhTPswJH=Z_5n;GSg)Yt`Z#IGJW^qfon-M?FiFXZRGI-)}b?8 zZk(v_2SU`CkOYX!=UmhD5x+*osbvZg3uxh<-HLJ5D8wBHJo5x~zQ5kxl;Z@m9DX0$ zlm&`c75re-hnO&XKT}vHA0!ust+0}&#QWH$(!p}9RSUFRaC6f%#T1?)xZ0(ls_`#C(Htg^D|t=o*}cW4o;O$8_&8g!H%HwAYuu$TQsPuWkG zc0CYQc1fQDBC8pSDlHC{w(j<0XJk`df4MFO>V*B}+unX1gnZOEu#l=dN+|DiBQ z!s{8CLyfMZ2esf3kDQx*xE|NLQdK4?JRaLU63wU-sv6UEqdtDF&@x9vdw68OfgcWu zzSTI`FIQs;7bhx`sFMLP$2k(oV(gQ9C-VL-Hjn8_m>F?jgl4qRY9eAjtfAC#s-44a zo^CW24pew?9&4Sk*BG7HgJF(Dtf!jZ`R(Wr%2?W=Lj)(CB97zyFoT#n{6I{1qC&S$ zHzqkB`5M!rY#R6}J?jcCy72jND?R}!m>dxwFy{yhxhycdJP#3A>sQ>qExzk^k(fc7 zp<~wuvW`+GZ=ZeL3C1qCEpuGUW_M7Qq~4GnXJ~0VS`h(+S_Mt=CL01YV*4RSJW`beFGyu@4U*gsWp!=!>(c#+GVW4NZwlrR;Xe?wu^9dCH6YQ#-^aPDfq z1SsZ8tXov!B57Q(}%rtk5Uhm=k zljWM)p!Jg7dTZm#2IU&%!_V3T85!-=;JzzNY^rQBA0 zb*AqPca{O=6dlPnOJRYdG6|C7T0e0L(8&YUfmTgpC-5XuoP`(rrOrFGdeafII;x8pTHg1fn2~R#geS*waIhV(=GLlIn+b2qQtw>Y1>mJAHBW+o)ax%c%cB6A=C)xv45wTZIPr4?vy##Apr6}F0t`5HRB@UT=U|3s!d5WT>tZXZa6CT4t?}gbF z9vBEFhEY4YA&AyyDNd)7ffgKao>){ClW9FeA&;?%2QQ&#vQ>P=C zSDIm|^GG+mQY>k5&7p6q-mYTn$pS$gv~)puAchAA&uowRDUT#q&l`1vrwc$fDQb~Q z|7sXtCk9toIOg;D7mba9+$OMm;ntqI+q+)QV|m*`Q^w7eZy_}=p34H-23*BoIadvA zLMf zv~lw7M?mq(vaq0hcw=mgsiV({r_SRspLdq3fx(WC=kyZZ<<8iCyZ_Z&oFjm~)6i*k zRX`0ET=H;T7tgkG(kQ%mUhe7wD3j6Bp20p_K5!eo3keju=%@Tqu0AQ@ABF5TS`?}@ zPiegVM~%`#1z@wxA#e29f8QWRPXZi_q>a~99(curKAd@Z@*UsMZObt<*(;J0`^AYB zyPu5skWC6y6z94FlS>)bCOe(R>gwRR~~qi4k!?)tJu!J72VMl z0guL6>w#ss+8oOqL{77O;|$IsO|BDg^Nq=&6_tFK;bi2 zBBNcu?Ce0me@s?dm&YoP6aHI-`kUSN#{+_}6N7<6en$ zpCVxtA?)Z(V=>K~*>9M)ui>#!LDri<$c2{p%zJOYSYW36^bp#y=v4Xeq=vEAEh$^h z=iUn1HU3Gm+&ko|sOkHO@=%G_M5g28|e1PLvQM+wXe5I+b6(ONje;k|8gG zS4~_Ug93t(1!Gm=Q4tFhiN;=h5M0ZHpb>-4j!6(idNGZ_sKr-vjC4$v(~f?INs0AB zA<1IrIu7n*-2*>J&g|v#$5m$uQJ}08@hzFnnt9mGYSxO5MksIAkPG>u&Q&#KX_e?< zl-80_Rq+syjHP>Y!={tA3)%u((@oQ?W*}R0F&lVe$?TQoQKGRp3Cu3GYRkwix z39eYW?B!C%rf%*_9JguI_w@8cE&||j(0)TQK!IcnxjLY{zRL)BPyvUc+{v=78=(He zV_ca|nF{}cqe#c?g1ezb>n=cls(qcM9cbzbwMne<(!hgi?>!c04RT2NWqU9%S30c7 zKjSYB++VEF0?@EfPH;_}zVq8-oTzx+BQ@pQ$Jq)tv&H3HV30XAPzYWw7v8RTF-L+THja02a6z7Boj6eY)$f&I;no+v)K%=4!Krgxr#r{nwLLb&PEyYo2?LmmC6+5$ z306^kBKmYd5pW(kO5w3@mR}lTS&)+x>NMxly;~m}s}=C^V@!R$A#8hzLEd&0k7EA{ z(Hr+lz>I$0P?L7>?Q?St4?s=6WOvr8XT00!QjXnum7bQqOW(<(oowneG=bIGxDhPK z^2-+d{#MNV?k!6k;!f`0{K7S~Ldh?<7-oA?H^hd(@KOT{>N^>p_&D(K;`#ZzeTD(K zxTEXG{h?3#fYUi6)58Kyh?`KmHv2g0HA+g?|Kq2?7#G!D9OrfKxVp@O`r!!*01_Ef zIxkvxpFBLfc}T+S1i$p1b~_EpgsLd45J0lA{eqA|=V$^-lL>_@nU74QRrCb=v{W@D zyv!S08G6uRTL?m|a5;F=YA&uCXaxo!u(0k}_s*lDSE`|eCbth0Im#Mde|p-QEoX03 zU{_zg{(Q_K;N9%0Z<&H1_=tjufUUZVWAx}liFA$gxLVE1esV{l<}}zh!v4bkhp*13 z>7So{^c zcw?X}hV$|`!HVyk-+P1{!RO&I%vnI4D7aJGPC5nDEr#%hC#qjJlx{hLQW7~^=G4AuwjC%5pW(5XHg#GFuG=LnlwY2n_M?&Az0aQFu-CS<4fF znzT}h*^70vnl3e$&j}izYalyUvM!R^N&SPLhML&%gwG8jd4&6Y72ikJVNHn9M0swNKW@ z=JVF%X+`;N|I5iLWCP_kqz~Q|e$xYK4jI`67(YFry;^`sm}@V;O-roLrPI>lCN5sc zcG#mj`zoo)dp&W3lZ_aM)+}c&%GatZ961-`VBQp3)EPRGao0XjMFM7|19Hx8PqvKZY zS2s^j(nE}Z8e-{Q1qRHe;Ab5CyF>URmdMtn+GD^}L`K=T|DJWF5Ml%Er6XO0`@<1e z;l#<1$xXy~+@OR+{4T^a+Wj~WOP$bVJ(w7?l))qFIMc1x<}*N{G}m;^Ey#=HjTuuT z83-WTw@H?|!A^!bcnlOjq+i=8T%&%0&)pg)@^W`I-~N`<{>=2+kcCd%8kDn& zu3S@|DzAiZuI4_D*3lN17?;or?u`u}UQt)sL+BvU)W<$imaB{QN3gegWG$p_qoD$? zQ&8taMza-T!`-1tNfs8nKmx1hg!;r`d4bMSZn$fI+d90D^xxzMQI# z`@mC|!zhrft42ISNyQCVFD|ctekpQwUAyLW zSY%YpnQ+6I@YN2;7y)x|ud0d?FKn}Gx2Vz?u`VZ5*>>C-e|m~sx{5@YfaowzxvBFe z5A314u$ld)CbutG%j0%j)dzc&l#xK1qx5VF;8Cy43R=Y+9zJt$8~}mM6;>)pRq16F z;V=7+8?pxbkUI@>xZq)E2r)5Xr^h9#`T_~%CT!kHn$tRozd#jx9P8C#hW*By{%!lj z{Kzfh<=KWGzyXxLn#WX*GeY=8RpO%h)9`MfboxT9dI%q?jW zajbzHynNw=B!QyeHB~@Uhx;#>i{$4U&O-K}p_(`I0czdfwCItN&RpCSR*<@biyOwa z4Uv5*;|b8ktcKN1C6j!{X*)Yal(W4Q({Y{godSb{qHtyOpSN=Omm%e3v~AMiL=;4? z$)#9$&BR`850_9Y^iI)b$*MgMiWT*gbu`F&*o{b>V#V{ztJu9llNn-9mi?>>CUIs-Wj6@i|0 z4WvsMpC4Pa<6N(CMB3lPC8KR{MTX7PId%naPxYP`TWalSUhVSQPE=!!x?_WMsXQ)F zR>JKin&A-<#sDk(heS`2nYnk~osC9d99ztFZ_ET{-R9EckL+N$ol_66t5+7KIhx)<#ER_mJLyk>6Rb0@FqW>|oqZ zf&cncOqckUC4#pD^|x_2fMw`5x+Jh(zN!I6IkV^;FWh{*D^Wx9*LVN(?f}9O1~8K3 zttXzZ+~08sCu_fS9Kd5bav0ZmL=76{fr6X>;=f@nqhb4C&VD8O`=6i~EavVGi;Ri_ z#4h|yN!G)fP%F!cAJYFKTK(lHvrq=S;{&&xY5d>4pKoE1U-TQ=>B**&Ve_B!MIOuw&<^(J~=Pp+5Z%myC;+AZ|E{h*Hu7C?y^ z|1Fw$YU*nh9a*ZJTv+xS52(f@AoKF;9sFT8o|S;)2_@<|0NZJLdDVM7$`qxvh#7>t z3V%-q{~$B%4<%nnb8zBSNn-9`{i_DysmgZOt*fsC>#xQwDHe(msxv7*<^w;YdN0O# zp~G6tSjOCoo}jGk?3|&_#Q0@`M5GrD7&3tj@+t)XZ>z=a*(7`x+XEnp40iy<1?Gu~ z2|%lLxn`yrj1vY1C9)3;yoA|k{BdI`HfZiF=w=eU9T&#N(xIK$aaXzlGpi?OU2Xc0 zAV00)5~C+3P)$8fG$XdJN+T9;R9#);WE9nBa{tfz3ZEecGYbnHtMV#c-R+@+3fN1wHo2Z*DyI1;8 z+S+4KN?LvW3W!$o!xvJje!V85qmTE1HjvEv9?i$=cT&uws&d4spfAn}3fRj`qnw&0 ze_r~_Lvo4XirjcK)&oPl)7!tKsj-Bs!=8j%_H=fJC0`+-wpU6Xix&mu0K1RFtV<0H z68Pi#e!lD363Qi~cP(;GuRUH!ZWAvh{==lp?|1@jfTovvs+J;$I@&-NC|h9uPp_s} zCYG6-rS-sw=w7zed=EiC$otIvGrz8jWZe3%6|0{Q95CJ@m+0gY&tuEY z%t~ic#AW_6c@%<0>0Y8n)OZ%C=W_JUd=}_k3q{UB#&$)#G4Z0U=4?XjcL$y=E-q!} zp7G9o219`?h6``WBg^83&(+l(r{aOdx5INo zi~{-3;)_)wGqalpD&n1m;*_4FjLIu+=HX1Z$}{#oJLl1jR;gpn%mE)h>{}Y)c=FJO zPUa>!@NW1IPWJ03)$3y6eY}fOApzJOi8|L&rCx)j;i?c7_}{rps(H$AkN7uO* ztqs0h8;Lv1zdHXUAAA3VlNaK+8~vat;c--!Y+apM|9U&}R6^#;W#1;wVTC(9Hg+BM z=7_tV3%RLn+nZRk?@c+Q39iF^2=55Z2lqY!Rcjs?e?9vKp)5X|j&CyVHt7^}lxM59 zR!c&4cge2gb%UjCWdnu24|A>_OgJ=^D6LJ~4jq-6ufYY*5n^^ELS_;#BeE3<3fq>8 zQEPJ{x~cRYQzZXt^)eMkYX(|AMQ#nc!bmj#9V%Qy!y)Sb!b$0D@q`%YG5&YS_s-pZ zF)t0KRBFJsfv3RE$5Szh7yNez{$0LPG~yt#6(7&iva$#FF$eRzx&`Ue*-5C0lSHSj zNY;-9clUiffi5jNfJ=U#=)M5&NSP-4DdJHGKjKn=ciR3V0j7W>E0781<+cqK>N>ex zW?}%flvaMA0|3@)zdrub9XKLf0P6A$g$i=PI~gN>hYuZreyO(#3k3y+q;qF270RgO|k&$U{mII|VQ0oW?yyWxwE8adfeH_k3q zS=PwRx;lM!u*%KNh4cLTWGYmps&+8o`MFZJxb&!K`Fxngan|1aUS<5d(D6EkipnJa z6fUL6*5QLG0GzlR5FAkH$j-!}U&)<*uGiC9@> z#s@L*x5cv!N$z$J9`c88VBMHt=;C)B&cz2BT*C zz2q4`{JHzT9PNMgR)GL$8??g(xXSaujn!BWOTvqEtKO9|U+~?i5MYUBw|fC66&T*A z6HMT>vMm-sg@@y3Cx^jy4rh{p@&%Zii|faSQfNLYfw#?%d->zHXTNPw3ThY<nTG9Z*>mGSnJy_&ziO1gXg~%rT4b|IPnQjBMs`6#Ps8N8yRvfV z9JHII3l*Ha{;C9VAm3|YJ*LPf2@|Z(Dln@}7%^43&Y|vGDL> zfL@5DSyOB45~1^!Za~`jF@`UOEo$1l018C>g6Fs-eEl2eh&vBNT1er*2%59P25)h5 z4==qRvuUke(NBslhL+&ke;!S0*lJ0e1hyi7pC$hC%O+uBuV07#5DTb%ii3f=AZ~iw zuV5g8VBVO>kNI)5yfFltdneily$`p?nr01g9%!hBF&iL{{XP zI@m*t9p6=rRxI{|E-!O@e0=z(w&BTF$9MrjLFF3Q*td-V-1j(3qv>nPh^U0+kLZE# zFM%5|;4ew<+cVSd3~{Z|5(D^WVHRMWONY^V=Q~4z1*Z zLDmwY3kwSzZeLwi)sdIw9R2Jb-|c`}4>ai$+1=WWGjrohFJF8jB1>PdM(CQp!>YQv zdM8x$qH*iuEMH(s=lmLGAqvYD1?=mWT;f|IN7>6k|A#%M>Yu~_ntzs=32vVqBwsQD zIjy@D;DFR-U6&lKcfGi|bCp}5Q`540yo3`S z9Zg{s2!_bm1b|V_EZ@F;Yfo65FwoOm)*g$Buuxv}x$`d@D}U>mA_BdsS+OZNzxb!0 z@Wi|w84Vlv$l%>8xt^^rU}^isqW1Oa&5xTi29Wg2yJFoe<_C|xdj?^~A&{|cZseed zA0$Ww059l0nFp+d1~nS`Vfj`Td9d_@ydQ8TZ-?kTQ*X4~q*`sKD0jv}oLTZJpZ`C+ z`fZi^r_t!>$XfdQwAa_z67dYQvcDHz@Wz$F&Rb0Fs~N0 z(?PWx%&Y|u-1uib!&SqLJ0_mdQB#Y{%E}sbXDO6=T*VzZd67Ka)o*e9;d(rkZ~Zs+ z@tf^?X5BVD0caf#3c^7~0QRwOOv!V~S9p4jqx)wQ29U$dwM&0{J{wxFcpJ8}CS~B|b$s=;ULu=yd@=)Ngn5pNH6!h}K#bP5iU|O*yr57;FmnQ!sJo{vB>JI-1YvU+qcP`Cq_;)m5}L zHc1UJ{%Tv7{_~UgTG16{sMghD9VwuN z83xvwYij0{jf%3RcrI;PW~XS>Ds|Rqm51<{sx7(vs+`V#AeDtzJjYf6Hb(L3>Jm{(&5` zRNS@aB4C8>zR|~$U;9e`i*-yfL$jd2JIsZ7Y>9gvXVWL)u2MCdKI(}ksLEfx@B3qD zGbPS7-&h-Sv$Mwe5c8hfXdAVdUh?bN0w?KXh1aPpOgdaQctD~Zq(crCvtN{=Dh$jp zw{4QruTxvp4qIq2=D3-WGk)(Ll=emi7c~R38@_JAiIT z{Q#I!DzGD$v*aYrJbirHoh^NpL;bz~_wn=pF@XR7RXi=IsVGudfBf)&(fu8c?5c9C-B(%A2Vx zv_6l@`Wnj4r)I29z|4s-ZY$_{SAI5HT5Gj>-uBJM%dI&Tzl`;%Q&IO~7Zno^YBBHC zLEa2rG!17_Dh+4Uk07+1(R03oZ-et()1gJ|SQ7tsDV^3ot}N^W(HYm(S+TVYwj9g$a9sv@&_D>Zv^l{V~0gX z9b#6=!xp!0*qV;8gvV57!bL2M#h&rrqc6d?Kofa-R(hrmcP+;{eXgBK$=SzR_$6e5 zX|SF~9*bhGmaUhCZ(QeXNp^*=OZ<|{rtp*}{Zq_OW@I}|ywqv<(74j)bgNL1iu!8| zANvNa8_(c!trBm%#Kl!iTb^OiQ>mFY$j=SSm5#~DgF@tfpa+V+@BKV6r%$8;Hpi=G zhwk0Zi}C;T+dBPo1i~eqqKzirkTv@#H@)b4;uC5%N&K^*NZi(Jnd3?&p{a{PbYDN2 zIhHHk$t0+DQtv&i+%)mj;RCP?{5Y!g$c13%X)~6E%#9bPI5##bbB<>UV~)+M6w}wF z`(&IxpkqLIeB%(K@0A0wZb!ww>W@*HW-)e|fbkc;mNaD2>17y2hc0?E(-sMw5LmPb zlc5cMQ7VtiNKH0V&RVJd1WnY2 z{)FIxo>_~ix{0SNE9XH8pqE z59qL+fDh33fC@>7SEB#Y%K860oWDJa6@RqKrhHgd99&sM1VctsLeG?j7N&FETg8lh z`SJ0In3`8tECFMZvwv&FBtN%;y%~F(3IE|DOl637Dvyg?Wu}E-@*L-edi)n9NtXa0 zNrp+)LSwCWfu`K4C`yqPQqd@uRQjznLU(-md4_>{d@l5iX3B#=?$l%wg4@6%7RY3o z?zP{(BEc)0_Q%t=1iT>v>db|gnO$o7^_>j6sZnX%bgUdJo!V*c9q*LAdv)A{Rrk0@V+H1O2E{uG+r6l2F0T9O>~pvKzcJ#W!Q zWn~5DHQHH?G723J4AWQAtzu;N2iHhmr^&oF5uQG5&5sc%0<@qo{p=x`gcN~KP`3^k zA32!e=0N9II#`d4M|;bVM+w=r5q{zL5)wW6Y*IBYtCFiOl$@TmLI;TNu_MG~cft)< zPqoEUWkJ#%xVJa#04Ao`6j2T75ErGWTPinFe!8KWq5qJC^76Wfl`V?Th|Iq`-G{-#@GlU&O8UmKh?_A4uA@TXa6b7rMdLm-i_gE2Qy%5Pc zhL^Qm#nMAovRd-Uk$LSzm#a9Rh#@YjtlbDh!l*1SWnXqiqd`5g`(4~4KEd&tmASN$ z7A+D|3PO3~YWIO&f3Ye2@ykOzqb~}0GF1UU3soDlEH*8zP@CEbOK1{1s{UpBD~A6X z>iCZvgxh=4V|cZ^!EbPWW2hTwmH=VTF1EhC;ge{Tl$HKIE`n)ph!qdPe$uzIV zlTC5q-ZPe<=oDWW0Rq+Qam-@$Cx#93>okBTl>e4&s`@>f-&@o%D#oizmg$KnCBj&O zS(3h4MT`8HiAy|Kf?(3R>9%}zX1|ZXZTWGj{L@6SqRh|o;0t%cx0W>tPCYhXxNS3| z{NBi$GEVw*zUjdoSQTD{s3UvN<-8>ZObjCVje<7XV^czRGeM<>cSGAU-`^!!bw63Ox5gD4&GJDT(DJ{YKJvF zk8X#l5QyZEyfP?Auok_>5%@tEOF|(H080)K#A2tAW(=3H_yXb(GpMH3uRS4^qYvs-Mp_54B-$pdyGemS`~hhd0k&-WAXIa5#&_lo2{R_4qWIlecbS zDtszD!B){dAt@;-E(zsm;<(eWmJo996*|fF7w`Y+k7rT9`yn4HD~FF`O^c0(pKt=x zM^hRbvyQ&VGP*9?uZylxvw){5CG(y=vOK?5uckOxtH;ER&nAI>Dup*ND}7Cc`rfSo zqI=TU0>$?6EK;T8_a#exS?F(3d9541f2($$+hScoVZH17oN^j{L&|rV^3iwy4$%>5 zqStgpn##MgE|Ll2Et-$;ExXpg^n7rCwp{V5|3;V(`pa9L=FcDAenF%A1m9PpuYcIBJ2~NzWy7D{a zM>5hF>eU-tjo}l$->Dycxn+MFEjZLG(kMkS_aVsVpBCr8Sic`%Szoxt*BkiMG~t>u z>PG(ph-0qbl*zOd8L|zwEf7*ZJ<+ARL0XQZoaA(Eb3a7Fc$J65ex$7HoudCu&_O*N z>8%kt>2Eoe^S9KDckjtc#?MQCG{5WV73q-{fbNrlMRQH^HridP)Ak1~BeOYei#YIo zkD#x~L@jvu9(hN-(q~WcJw9Bh`uZeync!HKYX*Fh7S%YRAaYo{^+GJ*8V^gl%6;c& zsl)F>jb6O)p?r%-9fyB<;EN-DXAnF5?mb{}r?4fdXwUDy?jS}U-}Pn02@8BvKXP}7 z)xVtn2cZXm>f?IHR_k`f??jBr%1_|y#g1dA2 z-RJCE`}_8;y0^~#)m8nc`*~`uvBn%@%(}zZ%e~GC#u0HCY(Z zp8TzLziXv;dam3)h35)0QKqO0{_O~a%qW7o|DYk+h>9X!`ijRe=bwNa$S5fS4&DyI zLCMFI6HRT^1YVTD(J-no6v0Jer?L#>FoGpDupf}-{Ybyv?*PU!2T1@CR2tzYvCVK+ zns9jLlpxf+auppk@rVeCyi#WTF!Mb2W3rEsTNJ!89T^Lt_lQ%wqwgkW&`OC*<02{x$~ zH-d-<%z-VElL#FD*DrXDG*Be6EdSM$uD<=o*Kv>J|19&s>VSX`A-P9*Pt=WPR>@Bz zt+&#@UoZDcDa}(Twj2-J=o3zMM>bahSKmy^i_eWp}3$T&4ip9GUt9x4O*5i(=;uxJC_5TZG{=cJw7Zn^UPLPtluBABg zB}R1cMSOKYdrzif-7PHt(+acjT|Ygu`wKvdr6v zMi&mHW6KC`gG&i7fAv+gU01=e@{2I=;n|ok^*mx<2Av?t@j

0mvKIj3M**62Njq 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%0AVJ#A9Fp3D!w6%vV~ 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 brbp<-JbYu%_X@akoJ2!SSG8Ql=Fxuu3u&du literal 0 HcmV?d00001 diff --git a/rfcs/images/api_info.png b/rfcs/images/api_info.png new file mode 100644 index 0000000000000000000000000000000000000000..dc5ecc845cb722fffa9a2837b726e88c559bd263 GIT binary patch literal 117893 zcmeFZbyOWqvo{I^f+e^nxI4imxVyUscXxN#xVr^+4{pI7g1fsr1phXVz2|<1_q^-= zch|aSui4DdGu=I1T~%FO^{X8$BPIM1<`WDE2*^iK5dk?6koN!(5HNbE_rQ|h9U_z< zARqKh`1xf-`T6l=Y^@AU%nd+5M1td$Aywp+KXWkF{sZc-_Nxo5~$TA2hE8aUzgno1~{WO1n6%Z5S=dZ0z z@AL3A9p&fmckjK3`LjguK|lulS=9>>Q23T$K(r{L20}sb0{PpH!w8aLLh+enx+Ax6Vf6AmCgW##hzEJJ))i4&m#qU0m%MyU`&Oq$$0Hf1} zvZ3$Jfq^Y3Is*fwe{cD)p@~pa!(Eg7!16HPb#wQ)q*FQ|F1ckL%%}7-^V%z6$4g$v z$F@J{9TsC12fJ)McjiO)5D7A`=VCIBD@P+)g%I8sU<~ zpNS<;#aoNP%>OSGN) zVIGm3q!(_R03|@!*tU;dU;@RWZBA2FRwY}hURo*YdwkzOwl5j#>U&)VL7NyQbX;|C zmV#a`97;+tk(usbqwVuPV&jdDP+qDvU+bS>Vyx92j8Tw8*sYSSXNiWyNM}A+TVROR zleU436H}COza_wk*WdvHJanb#`C6zxy8SO-hNn4}c_LhERm!5_ad$d4QZPjAdq>W`aUetnjLEQa z*f5`Pqa2gEbQ1EBu5+zZWQAJW73V5E3sP+e|@m49uW20)LGHYj2!DQXx_&xQT% z6$sC@U4AHK0;AlLLR zePQnH*{J$J1sSV%SqW1LQ_}OP679FNc5hRq))BQ-Hzq5rlb;*wC+QA|-}de}Z78eW zr=6eA9UtjE;ZM7`k@mptd@1q0e-cU%Z6O&V3_>gVWBdF0$DT1dAZsB83y_RQ??FoI zvC~DerZ&Vi1UDqki5(Gf;oZcF5Xr|-k^@krH)2CXwsWs@Idk=L#d9quK3Budha8DU z5E(_~ZOPf9y0F}l-67r4xp-$wR~3NEY>@K}QVrS;I*P$=gXN{t^Dup9m-8zenBq9# zGi9pvagA|Jz2_4a?i1?MHu8-SF!GVA9py@&WWTjvnfPEr!$?CNo1aUabDUc{VL74o zYu_Hym5kF*OF&zwA}90vYF_)e!Cu77_CAcm?%~WH^MTfcN51fQ&Fto$4>ZFr|=J0g?JsNp?eN3PU49=kj{DeJKwP4k>Jww-(q! zz6^TB*()3u9$GT8M5tG(w=TAh506*nhzqlXdouT0O7teh>q&**?VW6Dt+g#bB?M*l zu|~>8qD8iIXmUVgFl8vW>}f@7UACsQX1F!GhPJS{t)A)p4!gZuC>YuGtH`Was_&@p z8ylq^vdUR?s6+hf(;DZokhzAt!@c@a`LYPI>YeTV1nTv^31SEG1kRm)#-`Nx=%xzZ z*WC9vuex88uWE;C$Lf2h0F|IKepCLFpoKsfekXsf9ag&wRyWqM&ZVv`9mp;%yLSzC zjb-a9&I-_MUI#IgMx+i^2-Gh4Sy*ZnG;o6+fj%glgjOFAw-Ip86eXF9@5=j|nli(Zv{?JUw zIK-|*qoN$~-6AO|KfdlO+NxY!Y^jq=kq^ezDYQ-vPc===nyj0YOf->1B(pkgG}_nL zi@MsqCnsdm6Bc^O1&ErFIvCySCm3m^9n<%%~s6rW8-BjvCY_ezg<3hj2Hwc>25_T*Z13U z(XwAjXqmk`zx#R#2|EFEgBAl@0|PJmG4F2T#w20VQ0g$Qad6N;bMjq&MfwV9Wb~;F zUdTYm4gsOF3wMRRoM&E(GM0vh{G*}JLD)NnkA`AK8JXMkW&@>t#L>j7BfUnjhV>&= z88z0Ut&M4o>bv-t)w{JL_37Ho?QXnNzM8N_u$So1atB&X#aG+eKLn`_&Zi*lYqwu0k^zV*`q7Io#3=8*4A3ZWNM~Y#&0pryivDd z5m{GY$$gFe(Axffm<&ha+C2@+1QmQ+=UE=^6Rtt`11FJ;vw z{7mrU4u3Y;)j8~95)O-`;uhmnbF@EG8K`=G(7egBF*#+LH0Kwgd(xps;CW zd{SqeJ4aag0M}Lt;ynfS6Y_3t?Pq>R2YjV)k0sbIcFjq%VgQtzpOs=OO+%yW1=tyc z$^EY}+eh2?#ZWCBiI?pl5OKlpB}p)pfxC_n0~Jw2Nl6e2;58HoIOr!32;dbc@XH1I z`JZbcP%@Brf0ToPfCQO->3s7ZV5q3H%QU_;vmc_V?580pH*K zeGNtrya&Q7&o3$pJj?6Z8W>pG8C%&uL@{gt3!tq5ZprUd_XTbJnO%zn@ zRU{?Y^{gytbo8xs4QQM#tY6y!;c#XLURoH~>)<(Cm|NPhJ985J@dP{Y`n8yr0Pl}S z?9Dg{R3v5a_^oUW@R)$B`WFH&7(6^Y4qJUgb~yo|zp4ZO<0LS)x3^}erFC+0qH$uN zv9dLyrDJ1bqy0ipOHWS?e1h7}#nN8KncC8h@Xtp6Zb!htPS4iF+TO&<67RKL9bGF2 zdrks^*N*=A{P~^+&L;or$XV82|Iy`t zx${>|4%*kD{})pHN#{RGfrRFQ;h_Cz(zsy0O(C-b=Ml?9Kw1HK26EZ!2NV zE=2#6kXr`=Re_N)=VqOj*2>oU`dye&k3CR-n1u6~n|}}#7S5|R&};o46biWr2$(EP zXFW@8eIk6LoAaERFZ*kUzo5E%dgT=Cb8o^v{7I|)%h(iFL z0`LorJAvX@XI1WGrzT-u$ZLf^k@ZnyCKodh(+S9yZxqM>;i(QHscAhJ zO=JA-Z3Rk$=*_c*RJU~qewekT7aGlr$B7_9K}o>E!lJ93h!8l@RV3;jNrh4c+eIp! zLA0XsgG>RB;pw*xVX+KJ0srxMKf90ouJ8VnmD8{5RQNI$9`d(ogMkO63P{V=-T`50 z(2_qYBGT(~4SZ_@z?nr+5)g`wtp81eq{MH-hXDu6#2Ql%&+q79No+c zONAsT#O7FM__F+dLk6kU3N83PLN!((M+f6=egKey_>g4?7Wd!j_X}7S=@P4eLwWP4 z5&gWujz*09K%Krk=;G=kYC|^2%lq?}|6bYwv@>i+lwfw!-k!knNR@gcOOUeowVRkY z?4!qqPD84=IPC{Bi2uGM_%QMTS%$(*7So@{AN-ZjLQn!2D1f+Y83hF*s-UnIz-}R} zI+Baq1FOCukkYwc=amFvuK5^i`9KFI^u zJ`PgwFqp3gZvA_#W6)COo8+LvV?EK=Pd}+Jp%g6GC^3b4qTUpe{bb;Rq;PXH4WU7y zj+OxAtEfOI3{=Od+o*Ay2?TnoY0%dfgc5-JX`clRPJsSB3-&FR@YV!F032<&+{7P% zoy?DgVNN3X3}e>FMU=YyAYO%S6h(}V{9&X&!2+7o8F7z8&n|WE2|KoWg3XDJ0EpRL z=EoDmDaSy4W55#(Kv^m}Ixc~2P^c?4YQtI$Qzi2%&yM@*=E>${?EGaJrbXxA>N zHn$i0v$B=+HAVfeggV1nEOtlFikl+|65*MpxUq^a+bF*B66TB$flK*|yvpQ{=kJUH zMddA)mzRo$LTTl*T8O)~D#q_QVKYi<3>4;MSNVndMCF4BFwqw)ZIFvK8ev9K=)(E< z`D1PJx3Cw+?Ld9VTvpzJXK$^C$iA_l<8dN;^TZ9Vv^9B)8w|M`4hn57G0g&6`4Wft^Fsp!VabSy0q_NQm(@P!DX=RHaX~ zCbJn_&sTPhOTVHJOjk*?<|HZIWDf1GG>Gze7|&|&P_VJZ^FkiRm2rP4h>Ip>A^;|~ z&HD1+8jLD5&>T@}8HF#WSxY-jZgP#IRSI8V3~S$8K4?#aOP|+qidLmJ$U$6wj^yBM zIjY+n>`5gZzbolOwzzF!1~Pp-g+_E!DBY|ep2 zEk#|*z16QHXJgeg&Lo7RSx1RQ{kPCpmrX>U(B6iNDVE!f^*X-Y4`S4?D-8K__lMiVEh zDq8PphJ=S^rF9PWbS?9j=&kEM`qE~IAEH^rI?@Y)6X2ePUAbmj1uvHtq1+Nh`1*@< zZfH23!!0c>DWFzO&$NfOO=M&Sedx1xZ5$Gg>-dT+*e5VvT_(T3aUDC>HM52Dw=!tK z5ceV5IM+)}!{u}pNMES0Q_cKDS#2;TMLBC8B@PP@UobP0nnKNBG@5ob_FFV=ax8LZ zEM4+NGVPmEW&#ctC%TCy-a_32k^?rod|L{dV^rjA7iEsc$BMK?$(~*V>Xn`23 zzkez$i_=?|P`khm;QA0_u#&;W`2A@yj?#^*Y=rp*^~Y_u&@mgQK^T;P`SNtt{J}47ev|J9ShouhS7(#6Al#VdI0?g zsr*nM^UoVEvaDs%upGxq$DWZ>{il1$ReR}zTz_B`O=q^b0}`xK^EvGTZ@=VjKB!^# z^{ZCuwA_@^=fNsxUl5zgaJ6^F4fG}Q`S;sXo>3fgw~4BC6*?wlVucp))-u0pQ(Y$~ z^F|aj&rF(CR&lq8vRQDHAd0&e7a{iu+MEtsiU=)Jw zflx@}hpc$$Kr+=ruy|Un^owl@f}K$sjivyRndXR6Vn;8-CiW=po0bjD zKDnsMwgnG;Y|Tc8nNqis`_@9!b9=HeUSQ$0^4aK6Vnr$+j zfSn?o5w0-}F7s=NR3;?&(Kb?#mnAkBnd^)2!fz+K-R-zk63ftSQhj5mIYTUCd#RsB zKmWC2Iun*d3ADAfF*@&kv2}7PfJGmjOi_gPG74b>A~%VhWiiArIcFP{#2j1Z*W7x!?T1W1vJWbsL9wVQtGT0`I;S1@Eqq8;|9j< zqSL@+zsa!P;kNP`(JbYet1`%4i$N3)!rmQQ%DbokYU5YlAHH)#!MXs1ppJ@e4{haN zu%e>CXR*Yt5$-9Lnvd?{xt()O)38u>Ouy7x@T?*2%k+31*w z!x5J2-dH2!$1YeT(s5*X9J2umCMze?4Ky*|Fmhf0kipdJn;S$WZp{zD0tp+x2Din@ zCOJ(`0?@ z?@Cn1cQA2eK%w-#R4IR~a<6jxryRSrX-S*P4z(ci(EB4_i|2bA6zjt@gLrq(<`?Od zo{zBXq%=nb`AnO%;fkcl|R1Dkj6-0~T3^uEttkVlBZ_XZI-tMt(b;dbxhKSg4;Xb*ZiX zSY*(OqlOt83Ckk&D}x*3F({#aSVix<)#ibloE~G*O2&bbWfl&ydq$gWl9ELxzQDj7 zxI;P0-;1;JF_7II4rX#Py%;=5HQOD-@2`$hK)Pnq-3Ge4_(Ov48@LvoP7`U6aJfAN zHec>iS6o@N6qNilnw)(CKOB(?+9~F9dEGtH7HbxiyD~m#{P>3R^n5s`HXp$W`J=_a z@Nh@+$}7`dB=|T_w@2)1ckaBCf@wupIvf=dkvB)UMPhd>)$5c>r8@0mn<1E>A{BgF0J5H-2;uvG0x7c9?rMD3qVTOfRL4(rfw zMQ9P`)qncPs~cZF=c&bN@#$9)8=Hg+^iKHp$>B}Z*Cxz11N6)?JFr(7%p57d@C;Xp zsHj0C#jCsZla*HYUOg{R1xD98QuRMkgX4Hc-s_Vi>>pmaoV;xQU@<^cR}4S7%Ts#d zfdc65dI1-qe6K~85%BSOv*&Cxrws@SLa^wP)8N_ZY)hwNt#U-8<9uZF+sR_=nxi_K z9}|BYv4@i6J^*SGwuA((jD(C;-j{b*J7zi8f>-m2+OnYuWg~-BxQ?d_ytpk7byP~a zaR#3~wc6~VpRT&<9U-#$0$?Vu<}dwOw+t+xRMAjT1zX+hv)r6EH8~C-2+D77q{wJ& zb|E`EYdsFplmfn_A}SC{3)2qH&?BSFEe?gg{jF<5qN)qKf!+2?2 zpmyW^n%K^V$>2IZP~%i+Q{XJCy2@2k!BWMekZmlb`na5_zQ0?wcr6K7-0LaHNT--= zz-3RZrMm!blA$=S-q>S;B2)_DEkg;kxF`d;fE@1p(<>KfN}4~>HSN9(H?6`oi3yLL zL@RwddOymqQeK#g4w#eMV6wT(?D!g6oKQXrmpLzZ)LEi6ozQ*mt)N!##)ZvRFV1B< zoZ{Oki6*`+u0R^WpF4r6gWqv^DF3aW+5|g$kRraA-{SL)V&np;`l$vYO~a$KWzBv_ zDDB!Effg|u`VBO?V-~!x|6;Y+1XEIRD8N;~YxGV4IbCc2xzW1bsOf5xnQHCKfKz>- z@>hPnxz4RSN4Y^YDMD4{7R^${x#0C6HbY)2+ezkF1=Pobvxs?_;ftMR5DMiMimFA< z_-wuGz1igR>l zE7SV!|XpRe%|x7Wl@_~#;nk{QN>>DjG0jXpl< z#ROU#B@&v6 zsb&7w4Rcqx*2u~FzJUgdu&`w`e9?Se?li?ZwYSJ4=b7FTe%IwOPd(pSDZkT2TyB-Q zqC^;zLG-jvLQw@qfC{E;g)LM{lbtAqBYMPEe}H&%v~Z3iL5VzJ1G$~hQ<>t4ZCB3~ z3zG(y8Y0`GQ*%{I6N`K(Ny;3P(PO*9lx&~9GWMHXv9(~?Fn!m_RYE8Rmn-b|;m(gs zC9Q1}DHmL-g|demzqu=5#50Haa<_8p!Q|3`=5wND8j|JJjtLE{s{hqUQV*43+;;MU zr*VAP$DYk<@opNvE4hJ*vJ494%!KxLH{b+>r$ug;(S{payz8GL%Qh5>WwHaU=~!hr z#cqRAZ~L^J%}}Kb|6z6WR-U*y=J(f!l8H2$67)U*J%sS5uPe3RPL>)?&M&4H=Evx@lDhMVhI7)&Z~K5H^`ZPclTl~n(91-yBFn|9>K6Wz3&y+p z6W_el-nH>fW78>{mN4w@0G|SG7AVq|0hPG}osHQ~;beV*PsE%|s!Nwke&vv$Q#W zZe*iE3lCdO1Jj}7SPpPQY%3z}V?0vMW`FdkwQO&B)$wg|n*lwL8!q-_#r~sy-H*z0 zQ>B{N^wD-1llW} zk&{Y~+0%=ImGKDeMs+kBx#*i#)H2rnAehAZ6 zA|<-fKG5OwJueh}uw{iHm^yS$FrCX_ASNCLotz-_WVyK{{IHnkYV-kDZkJ|x%h^n+ zBG;<@UXD9`*z2K7I%Ru80{=?Fnc`{>B0Ctlcl@d-cI5u~H1)J_K6J!j-skCI@0g`G zX}bA-?N6KW_Y6xBPg^N;f_7a8EeZw-jb;l3)}zb}t%^;WmdhAX9ZlL)WC{~i^7mEJ z)v}!P$(w<0~4a{jyW_Io9(IQ*ABT@ zV9|tezuv!TDPn@{%i-zr+z4dHAq6>W{-qq1HQL9XWt!J^>5ifQ@OU)Zp;((9;1;yz zHJZs|heHXNesDDD+mP6c1-?V#>N{ZcLTkqvx^(Pqm^J z56k*fW{$`-yXQaksj-C;pqD38;Wn%QUp6%P9Us7+NVTc=!D8m2+wxq6RW~bYvh{(* zes&KOqUK2TM)$@t z1LRQbBdL)Db!HFY*6))Io)%?dJrKG+1)_fJYK?=B44wpv<#LK#&vy^Boli>|6tdYw zlBrC}393zY@=xX-O%w={>2#@L2^7>pPv;L-#y#|QS@D$jSD$%u`dVlf(^zfNgg&wa z*SPxZh12Ei{o?hS7kc`2yUA`Di}Jb+)&PrM85C~M#OX3LIoXH> zBue87d^Am6f@h~d!2ar>t^$*uOGs)p9?amBD`LO~^p}ehIKO{u-4l@npD5$$rtOd; zTBx)vb7!Fzc!Z>-#f5=`LrY8s?q?}3l3N)ZK#lY}WeM`7lr$yMGyT1Dbeqo_%&{-U zZpVI*U!e(9z=T2?VCOQ45M2(1IgL@YL~ApXBJzvN_72-fv7i-xCv_c`icrw#QB*d1UkB#op;?(8(A#Zw^(0j@ zqcdwu^@A-%0~NsGZ+zaAlo&uO<>XsFPK6jbK+jY%ooouLY(rtQgcXq~-)>83Vv;vF z-?TS4!f-Htu)EICoQoP$%t(N6j!|*_oI-EVPY~2>b6aiS+?S0;igxXp{4C{rNk-|w zorVZBrVE?`c)EubbpvnY_WZsDl@%R@>-`l#S!eo$3b0&l669=hWLzw7ZvI*Yff$-} zlrdfi5zWOcDP~U(%n&mVwyER4vgZ9FgtgC#l5$aC@BR zwBjzwEE)-hX!ST#CEeXVf8H(~qI`)HyLWb;dU1Z?15aj#hI@ZdKXUcppI&`*Tfr_9 z50meut$;f;Mi5{pb5n|`Z=(w~UMeWOcP+g^y{?6=7I`pBB?b(E$VU6loAmnfUp*_E zZK)sts6;n0-_pr=Oo$@4V2JG>(1J~;N(BuD6Od>4WC`B)60`4lttG3$74c`$7*5wv zW|ke^=2I9Pm}tVME$~ro6n3912+aX_UxPT^Co>A{E(4iLmeS5P$)rZSt_V1MM@_?O z)jtl{2&o(sIBVysX4+oOHyblF^CX@`%kDnO4K8!ko*7w+SKp(2;tLVZ@}9?fxuj~# zSpc1S3kQmg)75}vcezgV{z5veT9tNP3uCEx%VDjz`mXUw({JySWCp`LWjBw!T4^yK zW0@c)@=R^_vkUSeFQSP39Jy=T@Zk-T5sm9+`^?^J;AAY_j~ z%15VAin*)udchaSO{UM(f*=5@R7lhtyqJ(#dR0|aWP-7dkNKwsil0YceMdw2ULKRt z_l_mSr-m$u^K@*z8v{>8qEASMn;!R1uAf+@uY_R`0K>o5-VEd7#RH?b zaf4cbrX;57QY45W`AD=1WBxOUgN>2c+@248*ZcSywfklMS2R0Rn$G8V=GT>~D$|t) z@V6DjRN}vVpR=slm~GBky6K##&gbjMmh=Uo(E9Nuuh{` zu4qj(x`ajqBcVUV28h_J&Dbq!m1)J#@Ky6Xo}nKu5K*bKel&hzMn$mPQ`ndjfMt0W zuLpalFRRtgH&r`7B&QE_FyH_k4C)E!2s3i;{HNo@u-+MVW>@4wgwz+nJ6O?841YRw z{H2&ea-);Ha`J-g;*vs>h#k(WPaanZTR$+=RsiT1jw3X){Is;rd4X0Ar+9C2zj%Rt zR)gqMs9ZAM4HhhBuGw4a+jTNX;J7>6d|hIAp0rc?6k5L0hF7Muf&dn~K3M02p!cEAyKZ6UifyOdX$HeJaGsTm0(i)koe6BM`6MFMYTJhq@Yy^C^)Imo|qj zRPtoI$*E8T+4F$nuzdAH9tG_){v{PwSu%tF#nxcywH}L2`g_ToW}o#=VolHco6VW6 zM8eq8)v8;12OJLmod^3eJ})n`6Whwwy~ZDomu#x-2Io-4r8QD8a4r&(?9$&;>m|Lu zgZPN>N4yD?;h`V`0yE-UQ5@*Z>{ZS2yA$~Cy9vUZE3>O4TzvqCtj`~s0W}gw??)!P zhDwtJ-=V=Hk+8U0{i=Z82}LD9R=+=E=feSqrrYtVrsTd%soB>hwSlN$V`lD^h?23Z z`u!c86fH{V`f=jGoujUrM$Utj_JJ1$U8B$P=hbz~m@wjccjE26?a7cXO!HBV1kfXG zKK>d$Wn{54l`uOUn6MoH@N|a-IXz7cUt^AqoCe0O5P#yXS-b8#ie$7YwqF-}4FqWz zB$TGZquqO^-({$N74PU#^#MTE*a!3*1oxcYeXHEBPFf^MAfdifLZ%IGA+59Abk>MAS&8?TNxV?qS4x?WwJP=<~ zAeHeQbtqxtTu*o)fu}pXU^GdRSUf)A$yuXLgVX+3rs;G!A$0-=hXh}LFmj*C)LB+F z_KQdb7~*NG)(F8=vmNSS+<0n21-BsOO!70p`%neESd)5%B6bs8GTAPwq|m%*>1vRt zqgEFb=A)a0m-Gt%=laxA(a+P=QsM=0QOCdgo__Ty6vL?(q)d=nG3Q{-GmLxVOn0~Y zoG{w#c;25K)>c>Z9_wC>QhqEFpyOtD*$2-Pee+f1UeNZ?Z=)A>L&7^#DBDf7uV+9E2^1{-OwkP zDOqR&1(~+FMK2Ubd|fhpC^K3%(j?7#vp16h6A|DXwgE9HdPs)We?*K%SE>ri^k+Oo zr=kRfXAb7*ae5ONt>VL@kpBVWfOx8w>4>c={x!0696fnE9T5=cUHIPmn$zaxh_CRN z))U<$0ANB}RlB%U`=V0YUo$(VmM*I!>;aF79W)DEn-nT|`R{ofqH9o0TqNppb<+btn9Icu(_x8MgXhzy>%-|~i72s1uyI&}OPIq!j3#Gdkx1d8$cHS3>mvnKw;c%y zbF6S@BRXnzvy*a#RWhJoyDWp#-`U;cfX*DvV#P&PTVOFUJnk5*JV<6!YI9%5IZn0J zwSRk8+=qAl0ud}a+gJJx6aa|N)GPFk!j1Akmzg{vp1LLz1@|gJz`eueZpVZ|w$him zXL@lr0QJ}ELd~ExR@RO~6LG_w;jAra_LwXFgo+()!TqIC8H}VLRcZvZz-O(#>*hq` zn-uQr5y6#k(>N<4%{f)%khvJcu8aWYWkA(o6I^F2W}p3dD2@3t5{7N)4c4N_E||m# z;0n3MxTE~%m4^z}Id^UNAbJH&S+Igzt3xn_Tggjgia4{d=5SG4GQEC&IW1hyV`FHF zDi2+b9{SD1j)ypsb)CIt9bb1aJMo6#{-hfLO)Qc(tI|}a-G&~u%~wb5*<2yWVufNU zFj(r9uYKVQ1iH$qy|!|8Tcff()i*;K(y2j*D*a8wODz^l&HcsB{dDE5Gx1{ODhTIn zF6v)qo0~RO#Evq?l<0v5cT#yv!SC7z=$Yf-O|kvu_ZMFcOMb{F!cCOtkc9gG<|^O) z$7lBr=nU?Z8nfIvX*xQtmTbPcTKH^**c`tJg!M@7j-}^0t-AUplxyfI;>nfomo~a> z(mi8xM^h-%_2i5`GebSVh=ts z1)7Db*ZoRO{?k%(;4~XyK;hMswz|m$)(f~V9ITjj>#DEwhoP(AHjJ&e)21UH*t3xj zRj}7bDx%B=(Z=1)p#v{~0gK{;u^FK|TcfO5E>)V){HJ-pg?g%r;*TCm7HmT@UiNS9 z#z8>Ef$%k|;M}tsAXY2Hz#8j25S^9BD*r{==6rT)+@5rgU6ERTm1-q2PcVFY=}4E- zDdO>h{@HO&aRfEl;OpX;WoJmIG=OS;8$)NkgO9a=l7?qflTr0>Xybh-d>dx9%$c8C z_qk7+DAkwk!Hi7jHW|o=YRXCtT`5O8C(^x?AHFt*QaKj$3;w(C9~!AO&LBQvkFGyc z{is~)LNnrEffXAiLL;m(7{%9kUj9;JZ)+I#V``?~O&5_q^4kc_Q&M6SSd9DOU#m}A z?g9p^z}>}e;)aY|c=8-;PY8O!Mvu6hvvY&>gQK^ut}fCc!QoH>C9NK*Caaegl-dln zMCr$^!$Wa{0FgLx6`|!;yP(kwHvUN5MKq4G@aQFjh>Xx&6hP@QIU|)XjRstH+B}0? zmha;vyI5{g-AXHE@hnjScmFbtXe(Z!Kt>;-Z7e zntJi8;JyX$;RG^)-27LdcULHpsdT7sE0LNjAFL17*6H$#omG#WKQ~-X)g`yrP6EBq zZO}8&Q(OoAcPQMv0)fdS8rTyUnCwN1CX~QH7i!KMSqVI@B!8Go9zfrYy((~d%BvPE znZpj;9G1|!Z=GhPbNrf(1kQt}i2UU*do$NmL?vw!94I;nfHa{)8Au=)Q-_c6EtLyO z3d|X>1)HfcE~Z(F(JdFtJCNBtI2JhaH#h96`eJ`Gh^W@?1S%+yUygxp2;1`x%G+D~ zALJ+vHBP!5H4r%p0faQV1ORcFL6kyo1TTHAB>qtB4?yr1d1Cx{U!twS811`))n>0y zU@%T(aGeef2+gG+{Ps79(mqiKT@dKodD~ z^b~-Q@hhI6e}#x+aa0NlIDrAKN99|5Y3bW5f0FszPsqr^OpBwUH!fd5-5b+0scm+T>4^44#&l4Xktw%0P8}+yloVB1h zTnMN*2*N|z2SWfrD0Gss3KAzRWcPqa<#tp-K_W^JRuzt1S67Hg^p|JoL;TGTbYO4M z(Axnh8l`rkRdTenRu^Yy5>60FV)s3yJk` zopd<2s7nD+uSrHfQNd(8UCE?W5Q!Cao$PRMa1cUbV2nR~4hqPco0}6@9-Lo5Yfd$r z&n1f|kJeNn=wP2gBlU2RkibfBM&UcGhxl2RhV$X#%^;7c6p*cB2${I>N&#UE-B5T@ zIM77#*D|j9L7Z<-H;@N-T!9G!Wbth_j>lUx&!)J4Btv20BaoJI%t2uM0gL~4iAk(L zoH@|HQ&+|38+VqTe63#XGAMhUu7Mxl*QkQ_;~`4fnfof3H#!dsDuztc@8;Q#QPXi^?#UG9$ldV1(6 zGIvmsQX`2X6qcgU%uhqX)e($KSS6Z)djnAW&wKU)^E>EAzlaJKDmLRZHa14T__S8y zh{;uBgp~nIXNtvN=iuGLEeOK_Q`E*#Vbw*zG5r4>Bt) zcUw($7RwT(5x5Sn;SL8(-(!fy20TO2Mp50u?Oi|QV27Yk3mvoDlQ`i!?@zu$it*M$ z+WKXsImAjw)LVVqa z*>rj=H?(`zFOU$!3P-xgH(72modJE%RqPHYLIE)7(Thp+E(Dw~UcV*kftit_gu>zD zHyyDx%{XoO-*iAt0Ee#|rt&{vp0W3e#A?uCzVyjU}2`V}Q# z3XEEBf4(MPH7{-fB0FKDv*m~NP_OP_6I03F zM$e_vtxm<4Jc#TV;sE2x8KMOa*GIrisTzJy`3FpT836(R*1Xi|k60WEPy+Krp;gS? z98dy={S!;?zzH@hsL0zG!YaTB-?p%LE|7pBmKOJPoaJ~}cehymvCKrR~ECLsSfi zwEN?}*WpxpZT7;ZIu>O8y5o zbgH77OK#p$R`cs3_4d=f@t4;vPy#~Q_F}LCBUD!@=JI=g(U3aO!UC!)W#~v*Ln(! z@d;_}f}gF>j5h$Ld;PGzlS|&kO`zGSHW(5*LMjuf+K3}IQ-VQG(48%R|Etl?Xm6eW zp~`J(dAU%xheDxR0dp{oDKw36%k#@Jif=zKg@K%gMk;l7{6j^aZr)(^-Hznvy$-)h zaLw(O_+mL=kWfDihouTGV%c`%w+&2#ZE%bj9tD9eI}jcc5A2k8g=^(Xq}vgu#Vzvj z=~lK7HMGeQn?1S!0Q^BI_((z=`CqMWw(!H(zwlqcAI8yvzk(qD0GGafn&F9c&DD5Z zXOT+2_3SY}GSRc-MS~#$=z;lce(R%phpRdaDHzeK0;5iNQ|j!_h{?* zSWqV`>;JI#mQisn-Ma9GK!OAb8YIEpg1bX-ch|;Ug9m~WTpI7-?$9^{3r+`jNYLQH zy}2vzJ?Gr-o_Fu_{~P0uvHk#q8mp>i&6@L>&wSROW}`FF7RXys-$Lho4-w}sf6aU; zh7oZ0Um#d+4kZ;812c09<{jA=1M}D`oc7%cwFb;>Hr0M0{> z733l@k=KXfqiM|Y*qpL3*lJ&n#DHI$&$$2q{KQFAW)lHDVq9EO4Li2!wEfVy0I>@r~k-0fN@gCK71VKzsSL-a6397n5;oTLPJocz zI2rPO&g*ftI@AM!zw?D(SWsa7{Uue64YW3+HCY~R{zC35P>{6^rhoT?QHhvCAh1<} zdPJjx{_^gW>1;ehGOgj`h0LzVsiWbTIJrD&cEN6iL+ja0hqQgxv-(T0NMNinxqiLN zThF64reN%$PXph+eFvbdN;C>X2yh|oF9*Hz@$ose2*Jb0mphoRO6`>jkrzZxBiu;? zZ}7X{sWsT6xGB^RUk!@;`oyYk%4E_2KUA~QXdo)rRuc!uft2DxZdSD^Re9f?oLU5@VJVf)0 zsrc;7;rYxkZX@XYc>~Ag*IvzQ;{eBFe&y_fXZKeLz&%+WqXEGn=E*CcEnhx#-|u%_ zss|O!`Vx3AH6Ga{vkb22ciLrWA<%+9L^v*cC)8zEVzQ#?wHS0cxQ5tWw)a~5Ji$9> zR1d`=7jtG&IYe;b6{sg?j*zRODAFG6zP>1?)HBO#Ycsj0GS*kO-Kq$$f2N@T;$JM_ zb;uaTZxAq7O<=Jcc|BXIrcrL#lv!2nrj*4~Rq(6SrhzB!cf02SZ7k`dKx<5pGoMl} zmw2T4T-Z=}Y?eAcg|VACf?r=7H%ED3=DTl8?ie%r*nUqaYYlFikBq*i!5-pIB2UWDp3eC{17lyBG8?9#IsF(?nMjERlP zd!u1B@(^{IwP&XKZkt&%VT7xkZj|+&tXOcDEi-m=^FU!%0GbG*;B}tPa1;a?ug9e8pdM%&V2#1|+ZEs3)w>8q$QM7sPbbPK$p#ekEYecr$bTX?Ud`g7Z zhb1q9#jV`;$vEz}3wyN~)$^k9BX5yRy5)Agj%nAt)oEm4Iz19$WsB3@<<ht&{00nDI{q{T^KcaWq^1q~ze}by#I*pWNEB z#i<6$+yY+vj8)Pf{FUR8`i3G=Y+LgQ`=Ji{DkaJ}T--RKe%D0gJC`ZijO7XQ*J8Rq zT?E{BH1iSByW>RyUJPB$t?lBfHTdtDo1K~wYp`MOt9)6>_qOYzhJ)IA#vu*9gNENICxUPXv-GN59}~b4=nC{?PL#Ol+(5rv(br#0 zQp%|}!e{q0bb#>(ER?I$#KmsY!kb;-q(=@0XPY8ey}es+FAo~GYD7=&+({@VNJQ_W zKN#M%>Pbx*B$sh7-fLE)X^~hBtYa;PY9-+4-{vUhJUEA}UjmFJ)lFKq^6E2ALtO$Z zyj_VX0mC8tji$Zif`=vO0liduQvE?7g~VHI^X#UJv)^h<*P{>ooO{M!hB;JV-!sLw z_S=7Q1Li+>^^xQ6Q$v^3KX}+MjfSWU+wV6yYgzz9`7=&IIQO3m}sAeb=Ft^ zR9K4LV7pC4Nl`#oB3S!RCXK{xYT}lM8RyhQ1q6rYsQ6x=FV<6{7((dy#YkO)564OE#5JE79UN@?(-T`WQ1#OWbm)6bn?jUcdkCLd zr5C|1GX^P_CT_?LDZo}XXn2=6XDRG!i---`9w*skDZJ?YE5_PhyXuSmJYxS1a|0^a zq8H!9?qR}107}J_qrX|XGa8??9Y^` zaNEtM8Ktj>)&<%5%|N`JTtunU3C1Bzt0$+NF}gW_@kC3iP%jN5VSPIQWL@UrRkXAL-qJ>bj_uDAF3QdKmF{w*SB5rDfH4+OO4Y= zmE0BJ>7p1w!L{IFVcV3~YQ(uvoA-|JLNb2j2dUfjE1 zt-clxT0%@j`0vQ!zidC48c-LZM6X4-PB?Qqq$qM)w+pweRWmtI#fQw@K{BBiZ6hy6@s@_xZuph-%rj zR<75-zwgx3VoOKeypbeh8c3Q|!ZS=YJET4iFU5(kt;iqxtuALrFOgJn{ zD|A07+i%(d5%+ebSUB2|=&$HRV-NWgqS5djmAN4lC%5`RGe! zX5+C8ZlxG!YIF$v`^oLto(3f?Odz0X-2ZsRr?dnckKd@=2hiNDme)tS#~7y8Ofdn7cg-YdOoE+uCn zJPoNF7@0JP(aXi}{OYQ$8|1i>-~uC(7AnZ=Q$*y3*^Z+{kLs7h zVjoPin=W}MsWRcg7Oe-^QP0A*N$KJq`_e?>Xycw~R%jb7W?Nj5@@Id)i$OMm!Ub6> zOA!%S?Iq7M)U-oLKSd#PjP{=f={MsOWKinCS^0WZVtF0<>BpPaJSgZ5zP+7>bU%A> zH5K@ZSB}PDo#_2~?BsdLT*Tkf5difaG$4dX3Ngot`#FN#)w!1}LB4UC^D2t;RpbQ$ zuRp@0Mg=P#AuiPbm>s>?ws$f%xy1I7Z1dMdm_ka8gYEv^HeCw03Tx~3dHeNbzDoBL z6r%f*vXdsEffGblHxqrobXHr(+oZ`1=}4LL#n0!R5S*3&dR3Eq4qTtr^%=|QnMa_go| zUT^i-tFS$KrB>5Lp)+1xYBiCbfAl4$)=HJ#36N`$zCK=^-M=6Ta43{~aXp>8+I}(1 za}H(oJD9VV<+htkdORGMGE>N>kc_b3G%&ui$JgfI4oj8EX~VD_A3)y?qZyKCs!ET~ z!qZAQ;21?eO2LVg=x@&~^3%B+;B}si{*y(-Tu{FEG~?G)(ZzPH@Av=?QwjQQ91%~- z0$H&8Y~;_MRFBSU^>~MsrnDGhG1Xs(YCgL_ETi|f&V?He5iN{#sB%2uIf`N_<6|*= z7jeAOdMdsvBeDPde}SC+Lae2gdR#oyn}wUR&~=M5i&+V&s2@?;E-T&9jZ zwJ0eliI4yMroegQk5okDLZ;PR7TJ&)-%>clWm8+W#iC*)kWK{TMZ*PkKPVC?v=iQ~s-Zx0CV9_7V$TPev`f zOPr?rA1t>+77t6+?PJ#C$yx7VIh5zjXpal^4Nx-Ht-!_e-2#%533(m&m2a|c+y4Aa z*o*BpfuIZfsqyS01r7q#ly~(Wt`da)b}*t)5VFaNyE)h#5baRY@)C74y4q(Eo~t&N zBV@~M=8tPz*nSRh`+dQd{*y35I5es22vA$ut90osQkO@Sx(em=a@D>ryBVnN1%kv@ zjF}UQ_?DDrD^S7JY@LEPk$3p&eH{~@Ofo#6Hqu2c^4(xu^n$s!(=uMb#hl@xuhaHf z5l;z|NnSp7_sFPkr)OLfCbR#|_81LP!eM{)cywfo0%KYnNRffYrS_fE=l~=a!ooyi zf1nDwJMU6&i9^R`-2y}>dcGZOU#$1LqOPpy9rS?$Tiu2ibjx#%P=GuY+Qsi>6INey%nZNLNCFK4ZML{1ou)8NvcM|}fY|kR+8Mby<78`rMip<#54tvgILY@i>D(2~4hpZ0Q8SpDVVUm^&Q2G)8 zjXFBc0IzZr>v65Dd9h7cYAn@zo@G*sogievd_+li*1y)Zb?$0suYqG{dY0<+)TeQT zdI-Q70j56l)6%-z@V@%GIyo`-j?$6DYJGf_wSlX2WmB`~;&MCeFQ3KnfMTT#`V~Fl z#yO+3%OlaqKdl$%cj)$6Z*sMNt$rK_@(ZhNvnrD+0nak8Bj0+vliVDS?@u4+n2V4o z|CR8@dn&NRvG>=7^X&osBe_i&dC1n+l*Rez36Nx=-HJ^CrwQ~4uDMs>RdeF2y)KtGJp-d9*W5;&C`+*3hE5^4__weWLY6&>(ue5vR!^s|OM7FKE|iL5 zT7TH{{u+bkc-Sm5?#)e92FGAkXV+L$V3+Y{FV1bEP_QbKo~RN6@dc?h?fo>L?%ivF zx#u9WV73qZKyYzM=uWSI62MGi@BWL0nc3)95lygcx3&F!qt?|)X!jd0{6UMYk({h_ zgANcKiJWN-Pods+AeXzI;dvtaaf@R+?ck26TQmd>zla`P$w@Q zvO&G}^}v?Q+e?ve)GhRud#&E3X!Uc}r={Nm1JSFutZZ2-Xx7i^m_S`W)fNj{)EB#J zlLJy(jNEopikRLTH)=~z&j!2;-O8)qzf;)jX+J+sE6Q$tgT5yA;gxfRUl=C5_}d^6 zp#Z4M5YeRfKN_`uRoS2!`ni9#r>qo#mF8pJPjPI@fPIurKxUo)^GlbTBHY#XNj&rE z=k5}x_4{#neEoJq;G+H9@4db>R1KT;4(T(7SrjR2*z}AVt+(49_cBhTZoj>V6_OUN z)Afq5(1np@u8~^R<2GBxoF*zUo%)ZFTlJ0c#~-Gd!uFZ7M5LXKO(5|?L)ht$!-?U< zKlHonlfjsntGk7^!`b!)0Pzv2TV^uY+x}TVFB$%_eu*epR&)@kPyD*7%7PYuu^P|R z2#YRW;9ee(zH)WVt5Vm;iM;T$3Z_=oz2HmYyTXHbTPHVzdGVQyC0e|g-b+X0C)e4} zygr0Gob{vP0VIq+$P^&C1kwUJYN~Xhy4(%-L~#1-UWh)ptYPBKhbmH&U;DF69`{!) zXy_QPB>Hft22I_h$*0a6@TW)DLL76vM@8NvQ*s*D_g>j5A zIoit>`D7_lid1>tQiav7J5Av!yr0I$6Ja+uuUEToKg-WnupH>!pz`@E+S{|ZUvGfM z5r>I_hxCPtD7Bc>)=j#Tr(GV%x--ivu#|H^Cvc=TQ6|iqY6812CGJgCWwR8D+dFswANSi8FNCvJdDW5Nu_6!9j z%8z)GLr_IXva3x9dlPGq-FSej|MVtDz`H;~qGh9B$Zoz$Mp`Z?fXy=X0RdBe!$5pL5+#kVD{tpth2cMad;&-BtZA^zJWFAQ z1JU1qoOUOdw504boZGzRf&UP8|Fys$xOU2hyf5XWL98 zb^OPegX?u^^;YAIo4K{K-&Wh>VnBBaMvq}W!|Fw4o>^CJGdWxkw-LC){oYZQgc5|pnLpT8z>9f)gryH8JE@n%0 z0To)!9=@l}>uW~6`k-!7(AOVeZmG)^5rXz1#t@P`{Q0s>~u zbOG-@)^h}j4g&@$A$!{&Kk`y&6nONuqs0nEIj<%_864ZC;ugt%BLRM1(`CuU3n1u3 z`?kIje&m9AsnoD~3cCeuR(FMDcx<6!e(rR(-ZTRrUt~u|r_D{IP7ycOAY{kDOoLTV=RO@yK8St(@9k z3yJUgJ~v3zIojFO{U|A;UCCbIebtkC&MmJy(SnXn>{Y_OCSQqZ{HXv8g(6Xky1rTm zf+9!3yL77Zgn>}wfI9_VGea*a-TOlvZP7St;NCqxcH(loAjvF39pwMndKtAUad|8# zW^7mC2DH3GMTmLaxavr_l>Nm!fzA@YtxgOAZA~Ih%M?deV<8oLothM%ODdpSD7W)Y z{kVkPk52@KVK!`*@fi&W_RXl?+q?QsLjy7pMPJuo`?gqEEo$ zlHs=1Qz@ya=%iHdGm#vjZWi{uqngc5&&t(CEs=*kfj*iv>u{rmDqSnq_jR)0BvRs4 zp0|ejxLcv=1Qwr280@aPRRLXs``77%%Z;vYa`*#A9Bg(5*HQg370s>vKSL&r{8W2F z!Yuu)`22P}qNAeN4`6eEs#@Q0eRsh+x7D-g7mt}*t94Wnwu5n1`;&*$1d;_O--d2A z&?_}t(X`4nwe(*fuXXm7|EOHr_y-y6{}MxObqj_djy4K{%n@ICzx{m;)2x-?=bz~N zVtUs;DCRhZ5cDX8Y(mclDR?U*tF~4DL~%Br_=y5#Kf1d;pm`M&ZQyT|9Ts@ew6ixJI5l{@BKo5L57wI}4);|?(ZG>^0Zv^CYD{Rc?1D_fK7 z=ev>}1~2{7SWUWQby!V`0kVx|tr$hQc0uvg1WQ;2!m|kVIS1N}8YllKABh>=I{M@%WGg28j8iK_;tk?OiDV7y&3i-}o zQx(i>-fHG+GMJCjr!t3`0!~gd=yLI}C`~i37kytXP#MA@*MP}cfsJ+bCjb?SPdo<$ zEE=FDm;haQvkd)SXCVW~*#5WJN(A6b*?E^Qm)hKdpI)YI&)~(ONCirxPyc4v zY;?VxV<(N--Ifc&HDF(qcNpimUR9C)oL^w21mx@TdgoglOj+j>bo%XgkA7;Kd8cWN zcj0tA4zy5-jf+Yo%G?SV+q&wcofe-x=NrSeB%TNUHLK17d>}#rxDzB$C@rtUozKPb z@Sk9m4*PV$^MJdMnA?7@L@r_1yW90qpJ9W#v{B9Uq#oSf=s2Iq=M-Dj--{YUcxW7* z+yJPGF&GxodmhfDHt^uKFK4nl*5k!7lhCA!^>2)Q6lb$XjLfv&js~42k21^u)@a#0X&{rhc6qS8^EQ&*dV|9EJopccbuc) zojF1@3_aeAsm_3J+jtx(V+_uE%d6R2ZA0zti z*L+Z|_SnYSA<=ZB^{ArxOQV2)ZD+~T>Q-H)p0FGLKX7yZgO!_WMxw*|8}jpvG*g}p zyDn@Zx# zpiany4E6`f+gcoD^JLwKrv58N5_UCEj+c}M?=GE0W2wk*%Tn&G6`M92#GS=416$)oD1#osZE9kBS}S81TX#Q zO2olgwEZbSdes1kp%u;@%eCXItcxXgMk0qW7%=tq`-|D)J#zV{8%}TO$6NL3$orw< zo)dXuvl{vtxx?P_dEGb~G&7!iZ8q^l2CR}&89v^D_opG@SX%l_2IEyPpJ-`loXaC$>Un>WAd7&2fGbIH@$ ze8hHLU+d)Xoq<&oQ~I23rS7m8C^YTc-cK&rl0PhQS6H4EM(vG3dQ8}hSZ35R#6}^a z;~iP3=)p5%>m~N?pWi`V5XOB(`APAm6KdPw(fis)#Bmv_^$pIUuAD7|Q1g~h(Jx|G z6On`lRl3qMYTi;E(Pe z4o$XO=Rd^9kN(ZQaKX`M!sm%=cmD}>U?wF+(cU?uC(1SHFVuv8d!)z^&?56Im3wo( z#@BDW6I6Tu@rY@JF?5mQ-?!wyeiO`0DTbg%5bUjxhI`{=`9T;5X`zc!Jkj;v$NxXS z5xb%T{wZaag6?-grG%TV*Fu+@Zdg4ZwHV?*KG>AN+esjS^?LY%A$pcXY$&w>b#MO9 znEy5%;7=d_LY7jS!{iGl1K}t2)%RVc_A#am{EySY{$pyCEn{eNH)j>pI@N|}gB^=* zJ7XDR^5Lh(p-67K6D+aBCJX>4G8M>xj6#ugE&tAD|7(E|BtIfjN>a)P9?Vp+p`u3B zTV2X8b_bcHY(*~)p(3FXvQo~L&!-f~#1GXMDY!`_>OTJ;#|!?iH`FfIBw_$s5_9`a z>iij+B0116qzTv>BY<}3im-S|YQR45<^{&a@#U1$Zf=l->k=y1~9SuB#~*_ z|Fe7luyn!9iv}?_qQkX|9W3B zZJaM3>6!L89sl7S|38x$LPW&F1|fLR%Kh^J`_K2)llzF6Us(ui{GayufA9bQTiicO z|Nj>Ek6r)&({lTi&Z={-hi>XDEO#f~{Cq#~`_Fk!ph8)B`cB31yB+R!^E;1J?JYsb zKb~EVKmIdAiLduG=wgr1ZMX(ljmtji(4Xj?c2iCn7P?ABNKBZq5mOSXw= z+Ph_3dexum!^xuJaYxIHW$nC{_h**x5&o$8QOU%Eap{z0YuejJi(|J^h_Z?3{=s#L zP5ilgdCFnUYXK(JT|4^xepi)3PcUoHe#-D7{qp&KZ1C0lV}H?`ri4LN>VR(b<)j7Dvh^8cHyBRT?8+4+Ke!X zWHj3n;y{1@$XANKLd&u#x5EYY)<>vvz4uA3%_!|TE@E&N6JhdH)UD-0W=_4}<;Kwq z39&))zjvtE3BW2NypoQHfF3!g1i|l-b28>l0`$Jcy~Te+G-}m~q9b;3X74QDu*34_ z+TN3g&$oG=t#Af`f$+PyeGnav+K*pBujTA#j3Ymv}&Z&1GrliNEsdP&%e zkDcl`r!d0PEko^{>(O$>nng(x=%b_jb`f%H?A4A9Ngx-ECkC2iZ$W)`ms14>;6v@u z(s5^}+4XHTqcy$MJ`L;N*S#%ga<@g!qxu4M3|ZI1BxDby@eZ*y`HrlFA* z@U*E2)QIJUKPSgF_>yjTcVk+$h*(31d7MIJ09J5NN0npNS;qA}`VNE}68SDjQriZi z^!jpSrH&9&Y+n zRTh1)1%l&JqerN~Dbuf39!7EG_&o(KhB&Y}7VET*dbupITP-Am%?-FM^YhqSK7BuWwU8MP|px=)_(OOzBA%h$a1 z{=gMR{`DTRL{jc`Byb0RxIN!;ju%Q1MgWOdS9k|VN6$ExX&Bcu>Um8N9S=+U58J6< z!`W!O*K`v(OF-~t-jU&g7sA(U;h%sk<`#_r{9NU+^3|L5Zlkn7*BTiOdY$7A_1of- zBHcdBJ9ylpB&hG#(+*0uWDqGukvur<(+jMTSVx2HNDh!Eg_F9~+S_UqZR>*RUo>tP zTVb!TDSB=?T50%$Djh`Jm@C-d1^oTwhg|;z0nfDr0?$06bo^EwR%*qMI||&x-Cq8b z9@lT0%@w2rU6!Z1-Ff`R_1k9BOhJ^Bt2eY|$>DdW{pC@IC3}mu4eI1*g#yw!U;6lk zCFnJ3#l#mod@R0xNJ>JJjm_i+&5oo3{))m{GuPb&5fBGQKd2?)b-=ShzIDSAzH3>T zJW>ugm<5|8oLUTi@EJ{}t5HlBQu<2b_odM(uxdWwo|=L}t$enW^~Kf6d~xleA3V-| zccLmx^##_Ol<_Q{+w;t0<68eIWKBY+U*FXP*8F3}vIGsf;Ab%}0le*$zlJ-|DSOU} zzs<4e;kJw;Y{zAQxDm|Q{GecB#JROz@4ZJI5r1A%Cnudss~*S?Rmr&3@bg68PPwhr zrBMW`6Lf=EhY6f?l90%7Ra$R{4xIkOWR0@pBkbFeELBNzsys@X1YYgY zZC|fj@pW1*`uwDnwtVUe&`T4+iPJy?C!OAI{fN@2KhbsZyOUBEOED=j5n|Pjg9uQy ztE<>FcxE6Vy%&qAaQn71L9?tLH@rt~Vn(C6X0B<{PIY;M%v}N|dinYv{5#Sg?@lhE z=ilwL>U*{aHaRftxSlXLJO51I$OT5HJ%?wMIx=~ zzN|K!yKx)NqH}~LHQ40`tao*ut%&AM(H?&`xhKShuytHSbJ;A&k`KK*PRYE<6#>ahnoJ41g;@?Luq8%bf=l_PT%zHOGVT+8OC)rXzLuyxbU8!l^} z?ZQr4y*Bz$iGCZ2-WH#LbM1G&5@0_bO-5`>gW}3{0el{sEf64o7kJw0zupbmCB`&` zqU}`tSfR}^34CO+ohpnbRXaYo-n#bNz_z{De2w12 zACh;4a9-$i71I7rt=;&27gm3G5HT&CL1&U}cy@ywEM{@U+x9PSIxsNl$J zfsM{(Mv9{#a;aIlsUcd#5EYYwmaT%fN%ihIIxF-F1DGlbiJ3~&DqT{r&Vpr~gMhRI z>yid!DZezul#w?OZNw^^x6TahbE8Xnuo8ueF;8!WR_$y1prF7h1>g$aMzz4Kta1+1zjJsvb=j-HuK|E>dXPP**-;vRvuNiP(ZPOo&o}@sv`$Gc`Gz zI|I87S|z&-T2~J;`598!-iJdgDpc+jjVYAm@za*=@pO9g&QJ1*mNAE3#PAH~;qHai zEm-Wq+lq>e!txOj2uK$`uhq(+r!Q$LrqTGt4QX^&OF=%9t%4K}!G zlo)ujE;riIGRVX~A9KBK_Z@kLl?%ZO`#6X~plE8M|BgmJB?bN|+|H3^69$(Ss_8s4 z7dRq9$qRqv8c~pah7kVh9Yq|_{ULu{-Ml#I6F2xIpjF%RkVqBbNxEP^yyw(amm}5! zB1MvT_8bd$Ymv{IpO8(TK3-^HaAmIhy;vx2Nzn4DjK?y;|7QK#^)Avel7+MiAjG0B>u>H z&EB!2(J^6A;5wk1+sh&7>U3ZHiS9m4rHL)-6}I@V?co|QmS_I)AzoVxjK zoBDMZTO;gQh4pax$x|M(_{5h9_hqh}^W1#cx)L;eQIYmcM>%0U1 za=#E&crv6U3%DWE>vG5#RIwrz((lgpC^ekH;o$jk}TYBw7bF;AzuvXTv^*_%7R&L_op;QTCS5$zfPnpli_@$^MOgrD)!c)4UeCr4$n8+6JREIypb{nCpZ;LQy z8m>F18s<9%Fi{BfjlE-a{MRu^8S$C4rsiptU(=m1IwmIDot;1@jJAR!$Yv$bwhA08 z4mui*)}DS)+4|q&3#_!TcMoONbQg!wrB-MrKKcKy!;@2K*{~Y5No4l~}+Yi59?Rh9eb3?h8a`S(C@O`9j&F9RX%8 zA83V(_4a4H>cA$=gR^J?^=!Tt4coz$4Uk(kykK3y-*t8_)f6QCM7RB;%|{?Ew7#jx z3-;vO=(p3cpgD1ejYN!)ILtM+d30w{$kUTXXVM`iXnQadxC4b(1;Av~zo<(FbllFv zEO$E~sYGpk`})s}0;|-J#9>+T-z_pq&QT&YWl;*@cY8|w^*&`=!w`D>Wno(BR8$c@ z6npYUc1&WOOR`7hjcDx|aNN-%H3^+R<-N|+@qA&9h8R+{pcTd}bMgT+LH^D3Saa}d z$NVzmx$AD&T_Su(#}*MO`(NbE{Pt|O+zu{qd$`bJz$armz$_Yq_)RpErFT~(;O(Y9M9gc=@AjZY z{hlyT=Jrg9r2zQRB|I!7qho4~LV*<&w)w$88@FC8pC|Bf}ZY8m5GJz(gtRdzB<| zEm{Z@xm|z3Ve{joySLOG#_K|zgOi0i;heMt$9#v8Ejf99wc% zioJ6ei&BjOZs5(-O~{Yu#3C*^&aJ}@LFxd%Y>Du$c`G%iXahs#0}cALZTk);cs1tR zFJXrcr}E@NG_Y)rpXe;OS@BjMs(5^`P1EY+UN(2h9pE_o)!OnYn&^%XjPso5=00AZ z#CmY7XHRi%@h6aaL2$km&L0EQedqHc*#n+kHQwOp8|0WaafQ{R*?B*G=Ddp^`1vDB zNOjoLUOtlcTo?NYmv&!?j7?Qx!HCc*1ab*2&6Q9tPkG^X7nUs!DT&~cc4Ucl40 zi!YV~xE>Rqrt8q9hlAaEPksG+X(5oo3e!7-7rXZB1tYwoOap8Or6;hUhMXx%fztTC zp9NGd4?Tfq3%oCn^X^YlMZwHoHz<#I#c#VwxTs4}(n>wZf^K>|0xPs?D6UtQWvW}w z%Cq>Z>(-#>@SO~2c3_HTb_ z*xBda{dDO$ldD+gCLvdAipD0rJh@9D>le{T`|YXlbcQn|L7Kh`6gv>W^1dhY4=*`BdwykdL~28vlo~jHvA-y1ZN8O zJnu;FcS(hP``uxriuVC=1Z`sv0pUXDGs!z{U)LGB$EWl;m{N)rAZx* zo+_LEFr!t_c;;+wE#F_=)=wvpsd6PjHeBD97mmR}LYKUYP){ah;R%#T?J7fx>#Md= z_f^uD#5{&4Y)BOIp7Vva=0DelCO47&1kLhqzCo)#d&8XjMu|sXkOkz!9FHnpZaz@L zLO!*a;}>>=rZE0f3&1TRNH%GzwC>GS_3gp#{PYp3W;KY6VY;&9O5l2%z-?!XT`*mw z>mjU6|9k-ag(_#)o$!p1feI{=SUg!;P4qEOR{?(k%F#YgHR6?M%Zb zhr6~A@=9=H-@7BPF$AZPHsO`k&n_TDD*Ys!nq93A2Gg_}Gx1lAjgI>jRGmZD+RJ8U zjXdvKEjpVxuUH_o2Qr;3bn%DRp+KTwAJIt?+F)hnq4(eL=#gN&s|(s!C+9qUg!08^0!INL2@I!)Z=Gku5CiI2oRF>Y90l{4 zCr)c=+pBECxCPrVCUW1PpR`0JQ;)|8{YagQKGV8gERIk|Iu+1(K zcX>7YLp>DQnBg_H7-eeIxrq55mLG!uE5F368s=@Xr5nxh%k z!&?!5SzzB8l4;}SE2it@SNA?AAkME|@%M^|yC^rvwWK8^(0863P>mZv(-4u-=<~Ec zTi4@W|3pNM^m14)<~E!1Z+{B7IHfBbJz8yyIBxb%QyS?vtevpIZbglBI+-(i8+hR? z&?ZCHWkSHB`-9UCCEDp|MbAl_cCU6m%GGpP+V*_mo(35QTihKTcgf|Qz4c92+n}YZ zoqV+1#zW22+o*UI&LA#_U#7ReMNjtpe*Wes^O<`iE~chvn}O#%Gil$Qi_zUt(qybS zVR!XG1x>449@6Wd$rce1@`D^jPk3lq(QK^+QGMeq3vi(d!#ZC=2`2ciZ&0bpLu}jd zAE&sq{EM8cwb~!K<*KI*ZO0D5w_yN z)^4mA3^zMm@ca;2;I-}6-GyR^l+>!bx$#ZpSSy49E`g$NsS-Y=P1Oagg{X&qy3!T_ z1!6fpMmAgSl2Ki_^7(rp#ff5&@FZc0C{MHAZ=9=awFj>A`Af|+aG{cYxOvs8h#C;v zezb!LKzKe%gzmxx-9DP4r-8|KxsRcy`;N2l0uJk4ij0QMFAtvdS{a~=698rveg`Ug zC>n!?ZBWvXhdh796=g+#?p`xyRMTLdweIJ+=9|%V`H+vAtb-Q$5*7ZprLZk2prR%1 zQ>6^y*Fo3kpd^<_JP!I{wzpK31-_*;j7S@4wAI*7C4?U}c~9I7Pt%A@7_|Qd58y9h z;7a!(Iom|3`HgLtt?k$RgOFI&B@qXE(dsOdyOr_Fw?w0GS=7iwzR^@b_pkffqzXCo zKp8=w9O0FsSr0YAim>-O1Mq>JDZiA@#DZ!j=sU2&DBP`q-KVn7@IJcqM%F?y$K$H= z(IrySDWi*?H*OBF_c>wDRp9iuXkau(!3bW~Bv1ehU3XJKJM|8WF)tV=^L2!R$K1jjgh!{uNs(S(s0Z3+a71G;y8PnyOxnb+hdYPs%o&*<5Alf6f0sgOkZnN<}vC zuI}kk6Y8+W{3qFqvj6(UOg+zBIv_3}T;%RYz+#gW7sz&B!Pzhj^60#vLM_6We62H9GE>rC(O#WA2)8glm- zb%V&^ReM&={JKi(YIYq90^L{U-Ln4wC+itU z@%P$SLOh|~ZL;W*hmX=C4=48=4nySDNp7u651szE(e?Pfm3rNN#}SO=93T%n6(36N z7p4YJNsW)p$G`kz92V>K)-kEcIS_eDOowee&B&7CcpK}I&-_R+$+}-z_l_s&c%?=2 z3gubA&(Hk^zzOs^xvyI{25gsL#{-*|t61^{vaKU;p7O?vdVuEprWcco({z`YVnIM| zmZ0!f#h$a`#Uq46ly{a%)(RzZ1lpl8!gEkGopG&C63@>o_!H6Yq-cfRResbaN5&=O zKFh-#nk;++_JGP&dG=(C~$6B zdE^9e*#6S~2H<63eGx2C7YMUn#}K$Vp*odbO}*=;+(gxkkg=y~@=)^QlmAT}mz{sB zj_$=#K=+Lz?Gtgww=X(K2+Du*sFse_?cY(;^-QzN9X6?mu4mOt5PAyQcv8MV`8J?e z$=U(>@fVa`VJjh;Dd7|Lekv1_z4N4<`NY~Mn_rnZQ{IbEkAeK>Y68?9|4AzNzlvW8 zpZ*n>rt-V|ir4>;ceHw*zSQ^PxJk!2$<-oo za`5`%n5y%*Q-utc#VM2fuuOHg0CzWPAW+Y@L?sfq=@5HP%()qqlS$xIjdtDQ&4*&Q zb`N{Hc$CdZXVNT9_)N+vUemSSU>)zV|9xVjcy5QNoE-gQs)W|%Xz2ROW~|69{&paXrazXzJc3c=Rl`-qWAKR{2noyPXq0ptAFsvhT@CdG8>nRI4Ghe2(MI7~yJ4XV zK_%aEPHdc+w0vJ^wn6&>MHc2?u&NVFAu}2?Hu(kRZ>|XKp)U$FK}2|h%#)+#`+`2t zlpKV2Gqw}Pu{TQ)V9$0O1a$6VQ|gz8a?1eF*4`fw`-|;Xv3R5HgG~Jqud`zYfQ>N5 zR&yPZTI-oYt9AQGJUO}+Hr`L(%`-Vx|1b95vMJ8C=@!01AV3ICa19<@f;$9)TW}8+ z+=2xL4-(vMu;4nu-Q5WegS!pxgS=<1=e>9BU3LG2=PN~xok#c4z1Hg08gWftx%7hT zr)N@M$R6Om$=mllR*wOHhN|r?7jm$Ba-&lU@8wY%xT->Q8Hk>1bQFu#7?h0VDxkOd z`@cLId~^Ww!3tRDM`!6&B-bXo{MUmQTAwGADbnk7HA{pe5E_ptDJ6*Rjf`aE`uc|| z)h+X?abn0s%XzE>0AzAEuG8*NR?U{Y))$9@*dyW3v9RuhxumQ^L=ehL*d}@4P zw0^0;W#PQZ1|f~Ss#XSrT!=wg_$;MNzfwO0qS+eU^4uwt`N(<{Hnn6O{Tju9@{ONf zgJWCEDdZXVDNY#nF6c+7vUH?mPIwVo*%zF=zwpuT*?>ikwIDjMVkoRw%Q8$3B*7q;;@z^CJrIq0TE-+-FoQotL1^`_kNBvmod( zU;izxjQrdIHaANd;5M68ScuWlxC0-Yt(HTRE0-cbgKS*^uTv|MXA z@3@}*`hn0H29tP;MHSVbAXZS#X<#mhV(-i-{=0(Fy;htB-(%Pi_a8M z2_RwV;CFuuM`5|Uw5QdUpV4YTl-hmR^Oo2PeBK41F!PFa-hXj49V<5-pN#D#p4N8T zwA)lN1qlGr4igaf1*{kqmRH5)`-^AxF0-b_D^DiqM{PdQ(hhK7?CjtqWFLT+w2XZ2 z>pxU^jAL)oE}y`M@W>G5`Z82bg6CbZg*ZU9%+TF(4ZNRzdsQ2<=Y2C8ia0*LmiB@S zY-5k|a8wzwpcS~V%z`(q!i!k8_bt-@6=GTj^s)))){YN(RyY(CY)YeezB=vAmJW>< z$C>0XyiJ1ASzl6tdHI(EOWkbTp({SmFN<}mlah`1PS+)?JpR19n{yc-uwrqnk_;33 zG+pb3$woC@tWIw}&~cLQIXp{#VLO_pU))t#Zph0Kk-?{fgBx!Kud|!{h^iIf>Y31S zSj)Q_%alOW3@9OlI+Zeos8$(S3LWl!_8ToQ+Me9}#NuD4cSuqX@7v;fw_UUPcVMJR z0hXZWIE!F4b7115q~&=m-LQ+Q$ALT4_{(vbuDMakH!I~TtZU}a#Qe%4PenY6yNxDf zVtRX5^(%?LK8Amv3^KMp0d)8Fmu%;EmbrQX_`t&KzzdJyh%|;If z(scsdHw@Gj7Ud2u-HUSl933u2mV|mWvjd$6mGgN*zt{+)W|Ig123;b~=wL==^ zCmMgEI)I%%A3FR4D>VmNc<(fSE`)bp&$LW(ts%JA&H^s)GuSAYHAu* zKD3FY?jnjB$RYL2@dg*tdAOIUjyb0sCZlZJXgT7@H`DRagJ7NNk@E0sf&lQCM))w< z2YHVmfmeM$TV=Mx&Gn{GJw`wmdJIMpLM}Q;{#gBP?4#Gd)w6?>tt(ym!}54BT8VBr z`dNcaX5Bd#2)cqTAaAQm8c%qdF_IK=f**q-Zqe@{XpEZ`v6RDOr7E4B(;Q`5-IZSp z&q>QG?8y);^n&X}ErtVH?(`<}_Rs1&cSAHgg<<^7zdRKF>mfG%s}V*oIq#GqkGGe* zMaU6L)^nIGm=73rlaTl|4e?fP((|=vgEz5}(+_6D2KMYQNx@N- zXsT2H)9uSJJUeTQoxuQCc8X-cQdoYuRy^GS4G$xr*!!cL{7R67v-b%PzbE%&k8?Jk zL~9mAg)vNZUn0hJ$82rzLS^bKNF5~B7C=i&R~$;Z3K_Cat-QEZMXvMv3j0k^ONpXy zik6&!3wIv~>-Mred5YFZyNe&T>fEUmPS>Dt^YJBkexV^Ev1K|k3|nni7N~Q;Wk?M_ z_EEDnWXv6D$Oj9sK%>c%<1wZj{rzbAwi2tt?rQ3ni|NfyD!I8F{JYFU;1hK3jVRlD zirkttDrGggAX)ZBY^WTbX6HMg^PPvtg&e{W>i^a|{)39B2%rbqs^%FoM=!aK=NNHt zaZ7J}J4M*PErj@~izR@Z$H0aWh~B87RcOd5gAcdW+@qcKhQ1$ti1M!`e^I{>MLaKp z&1BkXtG+5*p&}vERjM0o9#685UAJ+EhlSPucR@KN92)>A)2DUP-C)~B+#z z3f@02jT#LK?4fL)Gnt@BIXc;_Mf2K0{-gS7yCpULylZ>lWB#|Y*8gAV#P)N#L(5|( zcVk`gO6ksiyC^F_8jVRewtG~|z4+6sce7BrwV*17xIS?s=@S!2D=%w(z+wKgI+t|5 zT~u(xGLwz{#ZmdCY&EeO_wj>>n;SkQ-*=~Dfz;N`7*J~e|I@AgpB4^K#R6e6T5=W` zEt&|ZS_eb3d=lJOm7t-*>2KG64IdX(;?i<3s_u-Z(*w2j{6{Sxd_FJiP+5j|$s!!u zmfvB&lg*w>R&(3_0i2v?7bUSUmR+=X7plx%rgu|`BFGUur!ytV-oH((dmESkMGZVl zyqMuE@s~OTB|F3~7xPS_5Z#@C_C`K@7^T*`R^)#|9p|ZFE3W}_aiLYgx>x4Q}BPk@c(|?e}9et{dNCN z&i(IU_}|0uf0Dz04nwueH`K7Ozr$FJIwdt*;gN}wAsB;QNWKG|fyh-Zm4KU(4*k1E z=k2(v?e_z*-63Xx{AZy_B-Il*P+-Yy?aGZfHeZp2Do>X&Mm%{OCtweNW}Nc@nI;Xt zj#4HcV>*vrjJbTWln|Npr~edKF(6b#u8N>6U=4+QWgM-m_|5SOweLteHDIF~Q4)Zx zp7hBg&&j(9IcnLRVcGvXwtEG6xr;e9ZLYNcus|EliWV%1@q)XN8lSIoSFI#I+DJLsYcxz z%g|d~nGhdJU_I2B=(au^T@zpRG`Mh$OG%-zTU^fWGj9YfUwhhJAEj35pk`MERu9+P zF2s@E*+)wWCqPtGD;hSe$!3mp+Km!Sougvk{fYa<7F95sCLgwu|E@!sMW`(vC159Se>5Sx>#=NPW7bJ=!3p*n%gCqNtd3bP=>7*ExS^N{|M<**LXRTh zZWxIlO|{11$0=30*czm6{k{tM@IhgV(01*44kS9&zVlu4@ypxSbhwm+&;}DpP4mrw z{B*Jd8XR_&!XmwfayfSAjh?V?e^#KoRLan$MwgI?hr9l7KELiH*v&^W1d}h@PN)nb zgqz)mmAgYMWMh912|KK`#Kk#(?hr^bP*8|SV9_(QbOOZ7)88U?hKBq-50`4w@!o&d zPCmNapSm|7V(A@G8h5H;ACB+_ilNl$5(9dJ>D#>wQD6I}!!fjc`DE4b0DCvXYcKL* zr<_%(ci*O1SBC)W*S^bQ?4SIWAJywuXq{(f6u;#-Z@f!2UfKS`DLtga!gMGn? zi+%TTyJs-|yd3A#JZp*r8B{cS3KxaDqG!t;>P9w+H1d@M(;{O2am)}W3k$MiFgB!R zO4Dn@{iNUL(Ia%_2X7oai(j_=CGY|MolGy$vdGF7QAdpX_lN5BkOKfsq}`nOdo zV&B$NL%cf~gKV9{Y7*-rfJ6eu5;LyL z%4vLtvk;@?F=cKel!AyqoOe#EkC-+I$k(N9=3j3?@)oo5jpuJ?LMG7#!T{Aw(n7V* z@W>V+FRBN2k!p1kcWcFuwmRE|EY6GieZ!mTa~eV6ew{(a>ZxNlOJ&(lpC$&Gb=d*l zT{nBx)N%}rui*H~x$Yk%G&iLZ*+#MB8=@(5*rJAi%g0_&vo{`Aqn4}^0T$8)YjhGv zoEOWP5(DDVO;J0lxYx!+-o?eKNtM?PtINR^wCtlzv1WNw8;`>=vrdhp{~RbYNV+4- zk0He&V?wRfLt0E~8c%;olOTzIP9~bY zmP-TgC*?StW=nm;I$Ba;l#W@vmPw#N7hAe|CzI0-VDQb+V|6eylrl@27q=u@ zZmo|>j4Hpg$9keg-^2n75rPt^xOmR$2`7Xk0m_QX^l1o3tuGKIA!8RUfWa{88mGc< z?@Ov6@E{Y$C8B)vIcpt(G1T`f10U@n!2%wqet68x5$(__t@oFt<^nj-n> z@jm$TPaZpm7$MJ#Pk?=u(7MT&v9eDKP3GaunoKpe$ki^uUIR5ijT7I4fJBpgpPUx= zYs9Bq15U-FL8mf#LS-7#FXaJSyvqBs{XQ-srD&uKoG9$&HjH7e3m{}O)|hFV1Q&M(AD9A4Cx3@)xxk;ZZ^fiDDMR^yYkpqWDlVU?j@}@ivW42nj$f3JceaWTh z+VVqI=1Lap0iIPhyGr_Qu0+MSMU%57@pbK;m&NM(9|kMz7WLy^(=aL_xAM5UCb{=V z!PIgjXp6Ng;}RGQbd^dlOM%h6f&2DZ)MF&)-&XpChQf?0+1Xo~c2_Ya$uK#jCy49e zBn;EVHNL?5IZDFt%DTQ)gGp{2urSn2dm6q?VeKTK| zu)hAJ(5B5_z)cEBhAJ|5@Afs-x{~ZRnJT7xf5Q51b&r!k)G>o*HdsUrDO zgK=>wF*Nkb8CXY*L2j0delQ9PG{9Q7;65A2+Euq~H)-%B)1cYxcxmCjDI?2V{`oUJ zx%}p~9usgYr+@oiV=~$JVm`&UsvCZYi=`rZNGmt=hg!ybaavY4)TmMJtv@9bW2N80 zuG{{-UMZaa#s|ksOar2-?tl^AG?+UU{T>$w`q{U|aot2n#w2kYrs zCajCnQ8DGB8{~tpgBu^KxI!(LqR{$1css{LuVdzGoN}2TT`Dtsii;Lmu0y&6(LntL ziX`7a8;{%LZ$E=10QDRb$<5#**m~#>Fl|3huG8jS+|k!GwE#N11hh54b{Zu%=dc6F zF!&IX{M0D5?II~4Isp0e%b?Obb<9RUISS1U>R4A^_7yEhq<`mbctCKORWLIg?e5s| zb70B?GSru^8(E-VL_N8LL)qC`H@zo#G-SFNFWjZh4jRYGm&tM2?$~y(uAlXAD8*mU zr|YkuhbZMiKV71s1sJB5C|uFWX6k!x4gBdocx=;1HB6&$TnhHKNRZ5~T5mHD$rb+$ z)V#IWAX-MlmIkoKrRVKN|C8uTFy_cH`w_uo~b}cf~53Fjc5rJUSgcFtk0q z%~rc!xjzT$#kFs@iT3?6gLsuAiF`GWRZy;`uI^2{?~1-oh0>Ms!NE3y+~J|tzWi97 znwIi)J_hw;8T7~4K(kPsDa{rY7aU!|S)*K2QLYGm#pH3ljFZvxlMb*~(Uat4vB!E-6}iT6QcD4C+q77x z61Eqr(rvD!Mf%F!p26Tv4nget$~G6~X8lz3iV_7p%?dTe)^NEZ9(UbW-ZznCiL=&k zZul>Ls$|TA{27t8x$S24yI&E4dJBrE-ehwk;=5O!y?hO+% zTs-Bx0_n*4Isir7d)RVboBUjndwez9)ms?`7Zx|6q4omy9S5C2 zreu`Y{XRv=CGvC$-RmWnk&mM84mrh(2`TlE+60&lKc6Eq&cy&CC!KKmQM|5`6q#dha_lzwU8>!WFQYFa z60ptpK&z4hX+UvbI#^cg+-PmtM#_!iOUk3I=#!!3PD0VASkXLoMI`yp(M;f=;->L9 zv0M2v=>gk3sQrj%`-F(o%7nA_>I!B6$5XIg+ax#V!5C+lbaL6@?*$2p+K&rAEKl$A zJYt7#I<(z)Q3q9aBfpQnOX>PKBikMo?*v z_)*?ac~sw+SUKBq6>A78emb@wzdAO&@k9(8b5D~Uu6TAbl^NVoOdnyHGitWugKBEl z{7}in*rt$6acGd+=P$%PB3Hs<%Vn)sT<5Iys~?o;#u^?YW7l~9rY~^K*JWwvW^Z~bhY7kK z7fUdKDJ^B^m&D2Zp%kcLd&rE`j6eXq{NQy* zAFAE4BOd&*7S(JKnx(&ar7iP^3pZqZG)mquj7{@`u>PBZHFke~DMcTF zn~z-`jW+eY^xf@oFF^3?BH2f(ouoqt>4To*Y>?{{U92&p6ycgbFX=0i+uNSk`d;jO zo|A}K#AGQc927Pv(E>uhjzImr{hp|LzvJ-Jd%H|(ku_uI|CV{8Pbr(SO#hQ*>{}uf zNyM8~F#~76Ob}`Ms?2oJMq8{~y zTfaW$$KymTx(0vm4U+n$3o{SleMH${GH5E(_fm2htH8Vf`}cnOaQmhY3I2wP6@^-G z`5?n6?`4vYn{i_`_u-rcw z4s&RW4a@YDkR8+4{e2K0{Df;vP4~sFoo?$796?fF)%&)`vy6^g4#^>$;#fhJ*yBI< zP3>N!pdOwOF#j=HSkxRKSVU5&q@khl2*_2IS|u#Iu&ys*ri*4E(8TL2ZBT3v;H#9d zE5SME%Xk#wx>31qxb;vLjW`^WbuK%STJF3%Fs%%zJR}po1U-ni{RJq-`7vU44S}Ly zO1u?RejKPwX<3hM2_5=b7xQPA5A5D#aETelCqDY?>9}W9}+K@ zBAh0ULrOm)Ptbj9QsL*@JOlC-roO`Si}neHkfhw@{#=Y#B^pb0F@!$QQq&)u2f`MD zmz4~KkC}eK>)HOR3oA5BK6Cs}FNRI6^+~d@P7M`9k~TVbacn!@G>*caS-*+C zO*k&h9n^trM}~V-*IX8xMykQIyUvasb#63QmM;?W8*e-aX6yg49nyY!Nf5hcTDU2M zQAojQ`s$PihIp1MY@8zaOp{5q>oKAMTnpy+>Z|VH7|JDoaE)^NbUQypKzGoR+q9nX5KoLJ=7!g__vRf=nV8ob zyVXk;2EiRGXC@|zltT`TRRhTx1Ue&4xvo?j@rS)?6S8i%G3R+xGNbL^-HZJM&c`G6 zra5CIcL$R1gz2q!r|y{j4EV0B`pMqEY<}_}1^q3Z+62yqum!No{G#`6VehMg!%d$WwpU|_X#61@jka%5ZCGh5n13N;) z*zxw$v+IUOG|wxMU;waHm1A%<;xme0?VN`Or3p^=uTT7W;ykxhCTRN;n_cXSKx_dh^B=F^oimL=iqwdh4FF0SL(ni=}WQ#tdx;5vQxnq|2JChYE6swNfAHx$r z_ifSfEzh4>*u6uz*&R(UA2r_Ki>ao^J&g_VsJCCv%Tf)h<=+rNTNppQJt@6{?%>gZXqMZjlTyp=b4pS~ zZrk1#W%oi(8cE87$3X+lmQp`BkZ0$sdBMQfHRCs7nAbx?N2H_&jsqPp3`=FGd&TM3 zHlqzhTu9Jl*?pu|L!Mq*IOx?htxyZy%cmM};l`u9^e5#;jqL7$A0!S7pE#m~IjDx` zjBG^bSjUFgCGmlM2;%eEO;AHPx_g{VYjg}QKdwPl6m8Std+=B2x3k?8CP!foL8%<3 zB?oY02_8kt&ytD-^QM|XgGGJ}O9Bx+)luHSA~C@Mn8C649A#TXMC_VqH9V4JT5$2} zlUS~64yTpficHFUF9JDNL1ziH)ys`qZ@*305q(vaDIt}qhUtp7qeKfHjQ zm4~$&$b75!?`7CssOTV1K7mB(e9+fz-9G6eqf>?Aru7+V%^aJQD8;8Nmf-fPAl-2~ z`+6gI`pR9Txi3=$g`jTw1JBu-FzUL<0l~?tL;LzP6<+9|)Qi9xBu$K6cAUQb_3;xp?2Tvg+Rk#xFDcgv!hA9BkKT)PpmHXz z4q3@pYt>}o|LxGO%q8W~`R&lBUTI~a7-~IA_|*hgtx(ae>>Dg+Br4TE*d=#TEb!OE zkUmit$u8bg%Hi+LaACf+->+X$9Q7>(5_ylK4yxMJx^;B^g_2zgWJadRBxg$iV9wt!kIJ=*jVH_?N8#$FUQ`L} zV|Fu`Vkl_m^>__o|~!feP~+1NpyXGw;s(^OiY-Ta#m_;%7!GL8L1 zm_PFp1UHc-o80muu);eWQ5#o32*WO_@?q0neI>AXjBj6BiQaFvebhM2h5KE9Z$6<5$+1cnPi2(LOF~em?tjBxfrPk5Pic1@v=8mhL6rgCoQ7ka4pv=2$6??bO2M zy2sX<4AP=s!4WN%jznhiw6s_%8V=HGdf$$5d@6dZ5XO#dx-;1m zW9y8Ug_64nd|>c;zg~x}&rhJ4dU~BFT)}_g@X+`etQWE_a%g{71wp=Gb#Jp-y0@+e z>aXD=pIrB>5bvl&MV&t@kk197Jhr#;sJ=gnuD#+Hx79L z63%G-$R^g~Um(i|0J5rmE6bVZ*SVViwu}&G#5A`+@pQy2C9Z0Sb^c265bhKAjpE;9M% zUYiQ&g}42kTU0LC#qrjyi|{oD+K=Gk%AZr6aXm0=jB#)J1(+y~3yXG;r2kvcy-fG?%&>QyII3%dnVA z3^%l^Pv>;YehK{;UPL0s`|#BxRhQ8x|N4+;uUGL6g4YrVV)-^p7~AF|h@aorqLy;t zUCG>a+rMPW&`B2UoDN$Shi0^M$<-%=4GeuPN{>+SQtkt+ z#2e&ExD)!4jq;;&G=iJ1wvFR3)7LufpiRBK0H@A6sC2RsV6LrSkXu84{rkQ`e(w0bi4FauAg0AH zT)VzmiK;BrW(tXwN#Ug`do<`0vGo8tY(!pBkO5PU=$I3s(!- zmcBds+`@+fL3Xi|Evbdvm}}YoRy9@2i1nwI=_WybXygCr)9~-1fF3G`Lw1|8()L`H ztkaEozo{$|SqG4fDaP172>8O>dz)NK&Cemb^pz4Y_ez=k1$xKM08dWe6@AO9dr}Za z**_f%i)VG73VKuGUf&)XOLtqzVQUcp&!ze|!lQoO3e_Ic6Qci8>Hn0v;E-+19&dr) zXyQ<1%qvt+l=~?8&jAm=6y$RO?5*QrBNdyf|?SGKRH^iXNeWNje3YNs8|gU>p87aMSPF9pR*AtN$WCqKKW| zhqq|aUjKjCDgt3EoYY&r%l*-IW8lcm>;|cA$fRw30{K-lZ`ok;Bgx2ok3ExpxIN72 zmy0b7!kjZ(ZScydALxFB*}mMc6|Dj^+;;`#`=9i2bGFiBcO1U^T7ArO>$dw=`*B!m9!(d0ky%M!6nODGRCe!CrTUP34b=Ceok6_{I0m zb-ieo{N8u&hG+$t&NkFz4NE&?N2fU>BnF}UstLVgg^$cZdRb$@b-!jdda?J{?B{YO zj9x|styQu-E}&X;DH6Fwh%&E(jg%W!_JB|EEv^KWZ=I1B&=RnlD%Vg(uvtQy+^roK==P*bFncpzXg&#S zViqVZ3HVy-+q3aEw=gBjCJ{{)@C6>Yc*XhLMoS7=4BJK#W&Gwq{h_WT_^5KYWbxJ4 zHvJ*hsD9AOWp&lz-_GPg5x-MkWw&Dan{zsk{lpIX@}zXTineh2$JYc&0oIea@irD+ zSSI&3aJdr)(-6#^+|KJ0p*m;+l*m}Muk9cBeOn(3%KM^ekS)LOEU{*>#cTCZ_^@e&`w?g9A>w^?Ld4IfA<%f# z>+Difh*TdgZ8e!_TL%Z+slW}q9$vt*0Nzs4Sxbl%3-BJ1N8M>cH2 zw;acRN1>VJJ4UlawTy=_#(aWhqVIKBYA#r&Um-{AuOFfEH4BFbWX{C~pY?y87XM_S zu)MfkizKdn`eJIwv2G_|eNErntfJeO!5fP;mzDZ4hKTDn{kHy)AwdNBj(2~JFTv@3 zS7W1bo9j|n+Ts5MFfOmpa^Jn%^Tr9$$p0U`*k4(DSWDYCjr-_2Yu@IWAYzR*Quvyq z)@D8?qTU=ieD_i#y%|AxL7MC9S1`e8{@OeF9>3d#fH66?vZkFI#@`{fN$o{J(`;1V z?({or+3%#yNpaFg=8MzxKjwYpW5@0isW$#@YW0F%2Mv_q0G{Ub>V8u<{-p;&2=f0F z=iYyd^IMgj$RiP&YT&NL`1h{02MPSWYe!T2|NM2s-YX->VDd7KP;xy!s!7aoOM+N^ z&)DterG~4`J0VWxbcu@Wn3NQK+n+SNR)RG+9+A=z!q5uCI4${ncl}>|ye<()33f@7 ztKPH+K;#ba3$Wc#$EtB3hC`Iylxf{incb_7!LA_mOA>{Q2G^&thGj$N&ZPQ}!-x5D zGu8sSdSVIKJ7Yqr7mh=zv6ssSLfXO7!yUz~#zX5TyeXWE6!cF3GTZm7l(YHOuDqDp zhEM2~Jsi)Qq-L+pAZ6z!<= z0$WpOc~%2P^o#C821WqpH17y~sxT7R=OM%NtzZqY&HD=`RO|H@lg=(VuR|Yd^)4y) zWY%n7U~^+tI`ik+lOBaQEUuwi%w_#~Z8zJJ_*sx%zXy^3-lp2W;clQ(vEj=vbX@yR z0be`nQm6zw#WRCt(aASo^ZGmUzGiB*$B+zV_^oq3%x#e0t{zYj;i6 z!WiU}@sb(qA`so7Ja&GVebBNYHdxRp7`=A2wx6PH(y7^k&K%Y%WpO_tQr!(*MIge) z`uJ}o!JHe&fXWur{eQw}XX&t$l?~s!%&=N6iS2R9RCjEto(Q4}KQR#xOz$=fCamvT z@Zw6_U1kA84zIt^Gz%l&2cN&yqN!NG)e?PTm%1(nB?zppC`N~|`=gb+=bC(l$noN4 zVGVpc`J-;xYo$T0FVdO72KHe{;RrO4>D=nSMsMU8#VLFxX)Mh8# zma2961o1oXZJJGI*XOS_-FCIy@s~*b6ek?((jVv^de^(3t=K^^?L1%l?X~B-IF~Sa zTA(el`;we4O4CLn-Q~)@PMevqCBk_h57Lak_}|#~KaEwRa)|MxVoYzAHc$#AYiI5< z&epcSOTidTj&z}=4eN7nq`(6VeXSz%Ey)PqCi|{MFNugD zu!h+yzck$<5cT952p>dvoU_*;lAd8buuqwP$VV-;aIgri5bSoJGwb>LO}FPDl6s%9 zsL}&!DEqD5LQ~}Upl{8%X>oC!5sbt<=;eG6E{Q*MOsLe}?WY|85CvMP*BQ@fk=oCJ z3#bEAKfk6E{WK2C<(NMWrA~=17Nb~cz;v;#wVt~|dBU!Tfde?m$0A-T zyz1UI-Ee}V*HgT<7%`rU)f4eHs6XUN`Gydw4$Akp0Sd&1AGMGW_!|JMPPqlHm(FXp z)a59It9t((2?hR_k7>@g@L9Bia>@)9L@5*kIbmwBD8XJj`6f!rba11C5r#y?pZ15N z%7l&K=!>*RR`(S&Zqc1fhb(CL7lg=Y+l%cwzX2G?q|lUt1ctu_O*yZFXQ=Gxa>j+c zv;H$vzKd_Lu>JdD4`>}l7*t3&&YDLvkVsbSRtAK;uHkceL`M$nkA8Z8gJA0qi@oL3 zG9lmNnb7@T0|b!kFBdb&tAS7W&snV}r}e+IpKL#J7KMHamgfni;rbPaIQULS;RJRJ zeYU)*Z{Ov5r-L^r{*i`3R!q!!jGsF6_Z3V&()C_xe1xBCcct|6+4>kbHEMNVdq$(T zQ1l`Ump8l4eri_0eVg0F694_9Ocd!aTtiC)E{&E?fD2if&l|cAN}TIyY`y5g&bj}r zinGJkatXXHX?#hd7v_Lf*ws-AXVms4_(_>P$06qOgO%&}rR$wt?~5kyk6MHC`^U|i zDoz+N;=lP_D@w~A9-5xZj)1Pi8q3;j(!LKppgr!$awu>O(iWRej)p0V(L9p=W0R7% z)M!eQG0QK8wmh{nnIC?Q`>FQnCk~cuI|?DwFQv#~H<#_9ZE#ycP;o*{q`Z;C`Dc^K zTL#Ox(a$0z4k@R$vIT>3JmC+XrtE)VP$Ypf`Ogq<&cFSNTuX7&W+F;bo6F52J& za|=b4JPIj(4513Vvi$~)PaP?q!Ag|$IqHQC^)goK*9!Ch*~p$(D( z*r6=DEN60|0rgw2CC9_CvsT%ug00-L{ETjsdnFv3fwj~g!UE08otxN)g7iV5$&$oj zJC);;TPnr5`^ioh(u06CBpRqo&Y@?z%1=>eGPFpu6!4EzVmylttu&1Q9igvUAM9qA zg55E_^LqQ~h|lO@d2Ts`yvT?|j@u?g@MtN|%dg_2*m~_{ zoS9KdWk}g*Fw}jr%8U$FHFC>hp&e2Sz zE6j^3)2Ppsl@E+}S6IzWnpmB4HQG0R3i(~A@DyQ`*eLfbuJ-$#VntthrCEEjJu zItt|DSZkXws@5lRoS3V%8>cxMQO=h1zqIHCdnD0nnEUn<9Q+%>?T4E`Y0mu zX36os`J5^n;n&cOqHWmst9{FC?0*otZIr>^}kb{lsMQEDvf9_8B1l0dsbp-)7- z*=>uZ4r|RO!%0SOg5I;5eCf`|WYm9bb-MAH@C zlKt)t(@Xi0s3RcK6KwIPtI@xFrXh@-S=a~vMiEOXxHC+fT|__bp!b+2xu#8oE~|%B zSAf?(r0+447{E|*LM9N8VN%O<|lcrxsUQfQU4vkxQ2 zMeupzP}r^KXF?X)oeJyhD0h{oZwFlrH4)yWy2jOYkdUmBCb%g@mozimaO^~t^dbOmpdR02l-)%@ZhexXpxxD26vuEQy28Z>yQvfKu8 zknDT|5JPN6I_(XO{}lRA_-v`BCzyfHmLdo)c0r0yh8RhMN}0xyxLAV&svyNWSi@C_ zLj1`#7(Hip3DUlyWnK|ioEq)N5bnS*71PlCBf;a7dXIg>?^Wl_Yt-S%irAmR_CYi9 zB7wnr?N2XXD%NGxkn4Q+5`M=KHFX>B)t%VIopXfj^k|S2ezL9GFmWYRn7AYGeF;&$ z(2eYn8nLZ$(cNR7jyGOmOk7?)?$YkXRIFm!huXABzJCx_G2$jSsHa{xC+`z*Vw`!9 z)mp@W%3?T>x0T|e&G4EFV!98;#^a7$`E04?ibQDoV{;yNbMy67`9OD9|iL!ow0Lx`?OG^oL-9OS^>Y&tBY*i*3$ByFa|g zi)zl4;xJzlNuMy$BfO_930g%$O9Y(cjXI@z=>=j#;=&JSM%{DV%7*Ca4ZjH zkxY|il_iU}SMo-9cb8!>MXaCvUZX^tiuF0_T>NuU<4_*x(=`!~RnK;umiOlO9&P_> zkJ*5Y8|RVOy4yS93bkq}Ru6N+;=btJw}9bYm|xPC;A^@+9YW5snH7oGIm?dc^<{d~ zU-Y6N+l-W5eJ|+HDf7DfUbv8@2$~@JiqFZ~d_6f{=3kT~)x5v#*yjafedDFBdR`+- zp9vRy+wVDG^I2~f-LIJ==4^Xs+`KE#4z1ul|a< z{o0idN$E~OBpkY1fss;C>5?3}B%~XqhZ-7b1nKTja>$X6AqSD}hV$|HzUQpxea|}o z!TE^=i#79^d+uG=zV@{j+nd-T4;7QOmh#kF)fL{=f^lCKYNjXFP_9(Yc*Zi^$H;eJ zcHNWQkbqbBUy-7-Htk7N`e*Alnw0bCIX%-{Svw%IJv9HU7?LJL z)3ReRo+DzxzC_CG#!m$d;m|Ugi5T%>MW|2i6vu0^e&?x%?8q} zXRQ6TPFNN(SzmK8tzWm8Hs9ys_i*Vpiz%8OHcQ zSUfQ+3L`KPQTb+A6ys&~<9ER8Rs4wj2M-VPbwxFlHF#zSIxUZe(?u`qXe4&jk4=KH z&&~}bEQpTXp&TG==&NRs_8u4&-Vka>#bVom)6G2NFRx zsD^<(UYPH!bxmfGA!9Fq=k9P|>kXuWOpT-)ll< zvd51_q9hyU!cU4=fyp5Mi?j3>@5e?gdMIee*p}$YK$JP}IDPZXLxbU3OD*WECQ^`9 zP75LyZ~`^oRGD*tv+HURlOCaasu|(|C(zPSt^S%jF zT?w~A{>_7MB=i#F`&dbW%n-y1cHK*2h6UFw^Z{0@CY=3EP7U^oZJ|w4TLx?$B?fFP z_a9>D-i&<_p>G?Fb@Vm`4`tA~M*ei>xy_Uz= zv|`XP%W+gCCkB|qWR9Q4o+4Z*ZM?B*D}~UABcDferp;jU;QGlfc;MH@foc2N#A*-Z zx*XEWlAr1}9On)PrxDk_l;2ySxE?#^95Cu5n*^jz!{g-A>ii}S3ubmzVz7Rall=Tn z8fXQrXLa`Ql5KC!za8mED7QtMvk9?qK*>-d&Y3TQBB zkMOh?J=@KvZd^I>*ie+idY-hOzAmN~t98G&>cQEEV#t1KakL>>+)G&O64c!plVIgU z?SDL_Zo5yz@nC&@o$t}BULteae4JEV)9xP+zXu%W_u?NjjWu`WVBrg%v+dRef5o|f zngh(<%xJAP_I2AovG==hW6(IhQ-Ckqb{OV?@BI)>w&!wUm`dw!T@3hAW!irdOvJEe zIAqF2p@T2|FleaGosl6uHN0APz87Qi-D||%tAU+G4?0|Fxc?~~Sq#OGF#h7j&yOB9&`tX{r0MuH^V_h#ydKV*uv~CDRX-7k+L!rH ze1;QiOXAYm6!&FIddFy}3G?sHe*}H}lY9kRb_v6aU}xJK+~BqxT{1*Ti0>v6_{K1~ ztIrjZXbb3!6QA!RZ9_*7gnu=@);cyXDnjpy9@1HBwYcts1tnaGl@Kyfr~zhP@WPGk z4lJhUpK2SGdeza+;8DqpIxJ$veEuXuY9o}N+>9QUO5O5Or3N>Oj4zM-H~v#9 z7dFJtz~DtmkF>mBvfI;+CJ1|;O8Ju`N)q`9EJV1l?PPU9pBNSsD-O|4fpfu^$)}+l zcnRh+x{xE&=YcmtQ|LgR(T^Af`nYr(my4Byvt~GpCRqt zTj;-jz@k;EVSoHPFBWGP(`z{Owm|&TI<5n6lP$){$FlFS&@)^OiM3@Mrt%fBOZ

    BBrZHOhCcxtVA@HVAfo|d|y5<9W|W}>Ls*yX3^57eNz)V0S3^5{$5YexaX$Kdjn_2b%${@Mj^ucxhX&QAu?(7Xy6 zT%qe^bt2B&y#6g~x-)(nVIKR46PElW%kSB4KJqd@?SLZpNnyYfhvx#Ae0=^yP!*iH#sCxZ}CA%fu_mJoqqjtt? zmxY%#MA=_r#YnJMB`QR_!9FWX>;+?9-?SZGtT8x8nEst%6jVw}$Pw#R0`WhcUy$ z6e2zfX+kjERh799XPK2}1*D=mA6A4s`y=FnIe8e=G~Rt%Fr$H$6SERM(|mIzc#dE5 z@E8Su>Ka6^_j0CRP%wC{362i2&FX2?=2>!gwx)@zj3W^6x$>uMR3Y^@l2`o*TB}ohQ!>r`#Yv9 zICH71g^L*|Z*#N2bNJmG+{_9YLP(lJU-t6{6YSF6J?uPi zAtllat4LF>@ZJ^nM0egycH)rFHjXpX{xzPaCKfDel|h%7Yu}{uNs`ZL1->_QndvPcup+l*I{Y4Z=f-D9lF((C;8Sv{S!NZqn4Z;DOu9S!uHk}%MJ!3 z8R8a{BiU9<)Z%jj7eL)eUhoidC^cK9mGiFqCk7d{`)g-`CFPI(qr`BF1rOw{d|V}B z-6W!WoZ%V^A006~o~I0-*l*{`Gl~Q`KNL)j@kZ85r(*du{i+wk{6w--@Rc1Ig6JE7 zZI-lu?5`K|r^^`W{JfbxT~Sx`E0T*@LA-M2dFmx5Q3~OP*r%Nc-D;C8?Xl0*rySVz z3*@TN@$6);zapi;bH%E2V7~Gguqfwibk;<&qBll4WcmG?k0|42Dn0%zh=Vf8IhYmb zd1#GxC!d9{P@;?#3rEi{&seNw+Ab!zu{rt;dYNI=-e)^PL&<*HN+$5jmANKW(bAIM zk4jS0Ufh^)->VZ*;xRm~Y>$ zsd>hQkH*(bkRqOa0g2X^eyMNYIcIh9=w%35^Rw%Df1Iuf{jG#wyBCU~k#-mSV_c18 zrrIzQ@6S`xrnjU~{To9mX^J?+VK3@Np9TluVg+K02*C>qMYHnm_c`oUPrTrhGA|>8 zpBZv7>oqvk&DPkac=;ZT$>|Iqg8Xk))_xHQWYa2{5D?Kzg;T#I6_>EM$WJKbGpemF%)FxAj0$mGGxnQCZMKA#30kXx0~ZD^KsBB zep@6p+naa@!>~o#o{8=ID5u{#_P`~t`u?TbyCGc2VLW8uT4?PRR5%!3I>yflmT|Tv z(Zo`786HkSkw#!PrTEl=>p!}JCVMi108sCQP?3v*Z;k z$f9>o`;V}$W&t4&6~)tt*`pzjG;W(X@L7Z1+iVjoT4ibL4nq64C<jYub zzR~XT&?7xD-UEz8C*%{-Lrpq8x9VK}L4HrApZY>TC2~J+_vopc|klT3K zr(W&sBUK>;8kj5+kR!vjqz6@nlVZMfaxyL$Tzs#OYe`vd+(AhxbSlU-Ghe+ywQa@q zG1rUZfdL%}+r{7{xBJR+&*M?^WBeE`H=Q4^Uc+YvtrUdAeDIR%zh9kP@l8;Q>yM$T zr8=4_7+;Up6q~)hx*?cn7G&e;8t>~_x zq)syVu%6Djs_+mcl^PpKn*j1#%#~Uuk@~{*bVz&Y+(f8TjlEX|wjk+#LVX%;pbk?Q z3{l5~RiD2twHYDlogsNALeTk3K|i4K(nCP>bMT|`dMlQX_ocnydCJu*XG+&klrx3@ zSW@nv06(p4k&VgzlqDwf?o&Xo2PF_4>HoOfqt`QrAM5;yEYXL~1(i2XpV5P2MIm#) z%F!xgI>nMgIxoU?o14!URXOfQQWH2e*6U(a=BEL%WA*Jd9JS~_!h{+A*%Dr?&wTj9 zyG}OuMa$C#i$-UvWWjC6cv?nCP_{smX~M{cL#vNJmFvQTyk^GBhu_o{Is}U}6Cm>m zLepXU?|jruPu{@-ej4HUp58RMdc7l6=(^sLEt8bHro1ljL0$XwnMZLKJGR?4v_4HT zU9P>j_yTpOKPsR*liG!mB?A(hFQ+NC&Rj1~zE%pPOzU;%>^>>e_~}X6pv0q;B`{oz z)GbU}XS64idg9aYtrjWfbqIG*Ho=WIC#xj#x^F z{!59xpI_;M;m?tW;Ax$V_j*PTiQ1%QmgOZyO^tdM-oAc2-YU3m%qTVf#0TLAV5+B! z#$;#|B)7sH>B-Gdmd-aW5Hq!dTBkS&I(I1Ltv7kk5)V zvV@FBG74v&pnnNq&B6WmkLADrYh-;A`p@4zc+e-b$u3k~2b3FZ@o@ACF|dj7;Jw4y z=O1YV3q5!O^qhf5d4dak1PaV_rDgJ$5Q2gHUKiU}KaY9WlA(?kHQDC7|jsaA@n)lYet5j1-Kv}3yTpH~2r zyh3~ZC{ZYib(wjrR8w}_B%Y}UIr@!47RI~ouLAzRj*L9;34n=_hsLyP{XNX(krz4Y z^X`S4Lv8&Hg5n-AIT$!+>5n5(n;YjKR&n0~;4nNu0KVNEEZhDb5OQl2HU&F z%W!dUOhkj@brSt})>A3@=#u|-aDR`{g8*IZ@!f=K#oQI(BYJmc+IM40THgQt4uJP& zrVae|t~9ME+iOY4cD(ynxnZAPc~{puvi#O^Bum`PeP_nf{ZA_?VQ%|7O!B}VK>q%O z|1IsS|NArjw@X1Dc%=AX?l}p`N(c0xGty-Pj<$?+^5nl?p8xl6#p{1d1*ktWZ`S|# zn*RIU_}6d$|2_WyS^d8+)PMP{|9!7=26bAo2^j?@ZQqK96ET)W{X__G{U6sOhmN_| zyv>Iw^HO!)TE%h&Zx$|<{(4dsDcAOi81~nRd5m`eskdN@yS+#7+l&1)VcWE69HP37 znKr8;-41v4Re?I2$zHeJvs%LY-G<2FEiF#6zBVoN_iVjg%U{{>%lBd!=Hb1B+x9m^ z#IhfXHbodl+`te9dwes&vmuJC>q$w3fBFC1a z-*$cuxA+8yx0^D4D*hVX@Zs`2>4>gG?r(P@aQU91 zhLPVTs_FjjQ~huMo5S$SgW&tY5^QS7%%X22w&mE!Hqu|$pgX)Hhg;JtAB?e8kb*(m2L=dRXu^dDB)-d$36&z0$@ z4oNy#ap_JhhxKO4Ml;0iM*wat=}+9@8X&S*-h`YhARl`*dW-^nnnQHDlMQX}bU>qK z{<^|aLzGi9O9lG8(Ddn}?Uw!aq1N+Q|Jkby39ktsaaX;IzOG+rBl#!#u=81Ftnu`Uu-tB;bszx9Vczf=ufxug!2@wlFZVWH$BM z+6#t>6I}|DcfV3b`Hgh*!B6b7-=V!uW7PLro%;4}e&OP_x#{kDf5WJloj{U;B zputLyOPxm$Gfmjh!Dw5yztCg#hqK`J5Diwrtp^E-^Uts9ALHS73MTJURe;98maVn! zzrArkC6JI=L~b%-o~Vxqt8;>$!h;g-)wP|HlXLlB#6acJaGR%;%R=ZLQs<0mZFxQ$GKGvnT$4 zU;hranY5-zNSBtpPEz~2M+wz_4LId~mM0klj_gcAeK8EtYNek}X$!SB`PLVjs!Fud zZ_pQ8P5BI(t=)GQOx+!jN*#_$y~N&L`)%iGRQ;wx)m#ziv2CHiDE++YFB4YibUzMCjp?=2gJ_GdPZvCC-L~y=!#cDX+R0W$c zHz$zs?W%#nbjO_-r^CP=0yv{UX^qvi21dtA<_q1wm?~r{H}vP;O{l9S)1@OIK&oXv zI5)kJUBzF~a@>{R!vulo|;$!B`kSN4R9eBb8 zvG_J!1`#RKHxqHVnPn#>ne;!9KRyv0#j;3jJnp&P>p;5gO$<-9S$@|;0p^8*muOjT zPYq)iiLT+!F#FwJ5x=>#f!S*N3*z(}kBz?7uuieq2*%yr{LCqt%AuY%TYcxZ)-3LE zMqhVZhw=<^$-R}GY$^p*OyY0DB8amU4ti?R+v`+8*)xUqlGUcjxIc$QO(G6`MH(5P zQpFn?ilgDh)|!jV_rbq!E{}ip>e0<~`p32JP9pvCWPJMTuf^`4M}5SYF!`ov_QUXG zA6NrrUT#AbO_n~qpP$KG@~X^&cF(tcO$p{yu%bw)9{K*e`Z0>PEISUde*K`ma?A)& zXIrsMJ*KqVUn*lb#nSlZm-^(~)KtBLy! z@J-}Khc-kJzGEc{4(bsrF0 z570tpg!=>16HHiKRO%aNG8 z)}0aG)b;0yzb(A`Y0&I5PXEUIzB^T%YD4e8@338%66ojUbttSA zq7AVOUTO=Lt zG*NvTOS`?xxb2%nmSeX^);nGc>l`<2|30<#7a)06XE!@oP7!}lm8U!$h~eGl_tpaS zv-4!jD!XAD_u`dab@4B&d^p)TWG*m0`NqDFF)et0rfSp3Rdjeo=iYv?`6qpTl}t&% z6J$N}P=L3%24`mJqR@p$`!Qi3cYcMdfx+!|d7V4KW*yULg+Tcd_y5Ts16W^?{;gkF zUunWN1xMTE2##U^)d-C){p3X0lJ8ac)l>PP8BewJBk|PFEvxFXJE1L2da4Aj5Lqc6 zqO9Re=^;>p&`Y_H;i=B9p0eBB%GyfPEP*YpN7RNy-V9f2$uyi~Oq^=lP(l5aO1vu@ zlp8m@=f*2jnbm+?Vfl{J7|XcapvRPzXMiO))OpMo~+Huwy))e9>cvp@Ccm# zSscY*xoGf~_K5K@SIZ=q(l{OtelE}oW@Anh-LyTn*>5lWbo%G(W4&t6KnwKnwjUne zJBOTYX2a?N@dD}eNYxdycAfAI?raJHhXAz0CD}WR1o0ONYk(|e>Yk=7cLL$wxJEln z<}nE~&NByOfBklQ&;D9pZ0c-{WwPmDv&DrAs)3GUgU!zTQc@A%v2;hwc&s@f$1TL)c1j#Zi z7ir#8N+qnBy@2ml8$c?#%*z#*oNYzLT-$`zQ$a}v`V-pAvZdJl! znbi(1NfMCEJbnvv&v;^dC{z4q=pzmp)!dj?K-5kVdCp`@r+YLcR5&f~zh885toc2p z&pG}+-(Wv)<9Bf<>3HV+k&j$UeCf9Da3igr!IN9@nbRv%lDaNH9kLtOJN^@~6bbGs zkj$)&T}lz9RMs;eN75Dfy4I;FE^SI8nfd<2?Ki(i0pP0#;_~b(<0bt$Xyc3U;Q?vh zPN~nPrl|Do_kRH!a_|4b5Zvs78hsXjudC=IL&W+3E1igqR&9ev13|oHS80J+Z zh;FJWA)wkRy{jE)3m0L=IomHlRBnqmmb}gjqdA{yk#9OgxA+0}v18ReSP}RWj435r z4ety>$j^;Q#Hl&k8F*sEsQ1^|PP>2R`l+i5C)|eIqp#rbCr} z?mD6oaA;nsVGBa#aV#Y?b^<$hy6;c(-yIAUMt_}gRhXF}^al27H7vGxz#LQ7vs!&l zs``eHpSAvYy+c8rBki2!8G&dsk!w16GphaFGR24JE0xBqvya{HeHIke6Qp|V!rQ@p z%&-|pH|X1X@BCQDQ(^mRgCI-9*oq@IY)yJlH>q7Xg>bYp=XxjM9;H&)mU{Inx?u^>iPM!d| zHKX!r9s@f^TM#SM|OHfBEg3_^Q7`E9b8 zDeB>$;DcheDbg|cy89P?8xFj(ukq_p$Ga9VL@w_$-md?|56#`HFWCjU9xk+|(_gaY zo74a+bpx!l+CGF~Z{_F(Uc`)#VEBvcuDNw1iMKzG$*)lPpP5o1*FY@HDB9QiO+S+` zl{glYWNW_OWy@D~O2r4;9uo0fYCt|{QI0diyXt>jUH?E&RZpQzn6D$0UNz`4favK# zGnR9evTn^M3J2F>80^S1T%r*@S7?{H2z`VYmiE)2*Nni3&3~t3{o?8L7gO|Hg?V%; zPP+`Ec6GSHFr;zXXER;Mm%(dDq}Rgv{N?WsyAoz(+oPfq?f(G3|H1#Nl>n$#mo4q} zr~TG*%^^5;u*u3zQ}XNxxW`9xU#3Er0|V$*`kcsjuJ^Lu55G1e6ny1Qfc=;RA5J822Ka6bY-&zynTy1_ulJjlMt5`g zch30xj*)QRDA40tGZ%vus^Pe?2|LDcm|bT-wzS3^@uy4d5OvD59i&r@Ud&nt^d8vF^DJC9 z*j;pWm|s2}4Fgq_{T`bmt8yH0cQBWnN!jlLbfPz0B)v84I&22y6cP?9D+EQv*rL>n zYGU$N8Ps$#*XunwyetI0t1`aVu1=-C;ruCh@CvjFVxlV!wcwY6q16Ps4A&JR4ipzDqn zCJ)%I8EsQBJ6aQo1X)@dEO}R$ubmxPAaS;7tsls>1Wii=;E@gJOt9egeMZdw zmnw$^{e8@1qPZ!72`Mo}dzz5?bDN5Gl%Ig~&^mquh?1ZvSfuQA;K$Ad@tPpAD=|2F zprft8E#^~-5Ow%Cdc_Nc+xWab?2VZY$86oE54y}S91P$7G19KD)G3#Sznc@b*IV9) zHAxeSKsF_ibHhJ}7Cy0mfAE0O82nuREhlrg2c5W02BAY}k?}~sF4N2J&(4?C=IXNb zmCilp#7VX+s)*zy-gM#-HszU1{Ca%JdqCt}tZO_>aP_oT7_JRk!R}_M(v-dHTsqGF zVD=~7b)pu7uVr5%q>Omki3QgTA*xELQ8tAehggUDB!40cG}`kTtj69G0Fk-vi?T;}M!8&V&&2)UF>_H(DSs)lfxxV-z8o zVvRM%-oypoK335z%T0GLUWmGWUrZ+N8fx>@c0jv#)ZrIB%damR$aFwF0mqa*mp zVtz%8PMTsaP3?VA5R{5;8P%1K1rKauS9j_R$uR%ms#8l>%S58VtC@9y*D+WnN#xH^ z13BJ(-ywYP zZut?WoQY3>ftGi*aTS+}s2|>?U7%bxUbh7$QrQkWYJP6Oa2ns)9*@G0F znPiSjNPgiXJ}f3rDVD9{`T3la*S%D9%Qmz_cK6_+ z2|7N)t<$yXAcf$0Yb09}n)`4E7@L8fP_ds}38?W%WS91JPU}L;H7Y{$_A_lnaE6Mgdv7^T83qSxj#rqoLt zU*o{Eq`X&zh2cF@WSdX~ogwq;FfC7i2;zWYmm zixA2B+!L$LP8RGHd1who-(;$>8r%1&1d*s~Wr0`&bso{O8|etx%Gf%(JX^dv;Q*+y z;(j?8B`=YIR&~!f5oU ILCn;En1YdyFpn`$ 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Ý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 literal 0 HcmV?d00001 diff --git a/rfcs/images/current_api_doc_links.png b/rfcs/images/current_api_doc_links.png new file mode 100644 index 0000000000000000000000000000000000000000..e52a273cf24e380df15c7e51be96e548f9b3cf6a GIT binary patch literal 41607 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 FE<<+*iKeKD(>>$PDvegU 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 OC$4Mgs~29geez$=ncQCh literal 0 HcmV?d00001 diff --git a/rfcs/images/new_api_docs_with_links.png b/rfcs/images/new_api_docs_with_links.png new file mode 100644 index 0000000000000000000000000000000000000000..bfa514b9195338c2afb58ca0da7ebe626fd8789a GIT binary patch literal 72543 zcmeFZbyQSs`#*|^NQfY*ARW?3cSuS}cS$pJ58a5glG4)M%@BfwG)TkHB{g&oaW=m3 z{hrt7ebzeX{CC!G)@)|a-gjNGultJ65UTi23ImN04FLfGL;9__G6KRQC<4NRG8AOs zO4z5)7T}8{NK8yoT1<>g(b3KfWNnIoK>OMF{d;U_M%o{ShVS417-XPBa|A1Y{1~D9 z-nZ}D53;UrU0?gj(!c2HE$awD|){1>*<>4ks|;013JR-$j5XDiHj|e}pa;%T5Re`a zB0K`l9sq~X1EPPQOFp1Qc=-D|A_77P2m$GzZQcQ&_peXDao^`3pATa`AUp=XVFQQT zSHyp{egysc@L%T-%7A+aZ&bvjrGZZsV@Fd{TPF)UXIOka9dH5F{;if10s=nu{qaCr znd$%-e+s0k>8vR)$7gJ3!)$0`XJpFkW@CRp4uXIiA8=}8>TF2nW@ByZ#OEeR@w){d zaDIQ8g@WvN6K5+y3Qc)MGBG9>mTbhbp!p+Otwz{Bnu#r<^B!}EAwlXe~%4x6}Z33rwDR0 zwbm2|*#JBP<`81#eEnMBcZWZ2{m+#D=&I&q>L_Ms1N3wj`X8?Uv-AJH`JWws&#Co4 zb8@i%-=_RucmCN^faRX_|HX=b@cH*ufYCx|0xbU)nh@G!-pk=>b zQ@~$Z;JE(;j{M$iY072<1Q7&j@i(e&4|dZYx#3C?^%y|s_0Vt`B*GyOynI|RS}v|# zrBSevL8TFsK2$Fpf=36leS;`XcDa#e%;lM|E6q%BF?>wL&)?cM1DU(ohwO`^Vf$ls zq@lBVvi)t_9aItf^BB5-B^Wi1zo8!j%71XU{Qlp^1g3ihtQL%&3MqbL59U^?d5lPg z@L%8Q)CleK)y;cn$nEpYgeL!$E`Vf_ATpq>Y#zYlL^-4n5B}?zz;y5KDWl>6YXmOA zY_lvd|4wWIvIqeXbN9JDi~xup$B(}w%^&3r&^A#H2MNrQg!1I!-wm5e1*}%u9##fW zHZML(^512KfZ~>bfCL^ss+%K10z)i5{Vi$F0)VzGNi--heYR)Mk^gR39%*2;u}e@r zfHFvEmf+v00@eZJ0~A>Lx=lSd3e0ts>~BeZZu00U+3MMzg7hQ z=)~Xr*Fk|rDFkKQd7`=9EgXgw05Zd3M#_>16=ltmLQQNPrTc5ixZR6SL6K|ZF%tOU zCufO;t4AaJhVxOtBZ5_lB95mHV>K2J*9`2o_-l*sjSQd$`Ax73D+;U|^?TJk4?`T% z13M}NS+HFyUIgl2spL0ez$ichvxsK>mTaF;z^%{mCihSPo;^zuu{KLrv+#;xln!Sk+&!7t0J7GvtMK58;O;+X#Y^xkv|5I;;a% zL|B!hx&Qp|K5+|yPLM*P2yP{hUBq*xb&8e@=0`7i|KN%r_q}Dos3z+Mo|kFyW_Kb4 z!@=kDaflDfX}%$XO1_lA9W@qFm4fUpevM`+#{H;pKHCljA1^IDMvn3Q=IOz*;Nv*O zyS_o5#ruaQ`YS~ImXeWB#YDd6xQnSdrhu#$!RB0k%`DR>A>M%$cu_z6AQ)i`jE`qvnc`QDE7t(P}I{ zE~~?NrfC?FiSz9ei;waz`lEOPkJ9(_%1jcn2BHpe8AVog!d!r!<|Myj(Z(ww`&wc< zv!Kcsul$bNe=FO6av6pHet@V_F(zQ{53;EA-7?v6+*l2sH>i(VJ?)%mS&by~O+Yxa z1L#bno4r;Zm%Fu$_`EVEGHG-m3$;)CrbxPYeG}*Y#d~fq@SpTZBl3`@B86D~sdcvZ zyG1Ean%$EC2&?P;O0QPw@J@t2+UmLg8hJo1AMa<>6Ar3=T3>H@M$+U6JV&sX97pmoGnlha-n1cj${atPK+- zhkuF$|xs|)al>)Ah-eYz1(8u^QDD)V8{V%?Kgd zwPN6qX{|R{Qh=rbv#eOFF@x7WK0$5{Hez^^G@ZIa6S1yHjO!ZtZy5=N$*0thhQ(W9 z5GyuT#bfWeJG0@OWO>bq^0bM_T?!e zdhrStH1e}rKv?C^1)c4cP@NjD?sqnR6Uq45EV3q}XH1kZd?=<3uhb6y?pRarCr;{G zVojAfu(=5oGyKt3h(#rbC%!H%ciOP2gzy49Nl*`cv{gnXUawMAnUUwL?@cKsWjD1-9qfz)_0;Cijhei>961H%^7bXtKx}m}-d*0>s zD5NW$50%n+H;vn7Ivh{xCG(haQOhO=UEPlKGT9VK#(m8?quf4Q6w}z+r)$TbRwKmA zT$yOC@Z_mOIxiT_nr0e)aXJ^D2@PhSV?4g<(n;pCcyuY?Enm6X`L$b*K{+qA&^o~d zyrQr;G?IK0w?xA0xTZMYbwW55w9FA^_fF|7rWYofz}I5Hbl5@_*V81pfna zgmyu%2Axwv{Q!RSHTDh0td#owCdQ_nuCo)6ipn{2DIF+AT)k&oCIDMi7bIqI-tBw7 zHC={&@~ai|Qovoha;5ugXD_y5_pr*S#=4VY&2y#GuE79%@4Z^3o~SzjuR z6}L~Me^o<4Tm37OFhg5?FA+F*#%CJ=&lBZw_mbK~IY#?r0eK^v49Z}JwJbSaIrYs1 zeAo~QtUnKy1KwXqIn8u+TpPA<8lX3@DZlni93qA=<5PLRWyxsEGbzMTN{;9)P;5+% zdkuQ2#@Jb!9l)=%N{R(73vcu|yLgm~mDBgk{D`iXLe0etV&tH3%Z+4x;>K3Nc8iqZMTKEirc=#O)tj_o_9$@Nj_u3G#`iv3Gtk){@N+CT9j!CLigiA-OQMMb$B#R%0&FL0p z(BdJ%58lt7hn$a0meO#`N_WmlEuR0PPhrr?LZO!X$>m0JF7!X!Gb|$nW zc*AR!jpeXEV-u!V$FZ%NUPVxWAIqH4Di)q^P2I-*fNQ6kY#~QSqFRE7iGaRVODR$F zIA!G|9_uY{gP8pk`h1hENsVGss%o*CL%)fQu*k)kKBp&Unvk=W?3mQFsq9_?HJ$I4 z^_5AA!wrw96W#HzGxlU&Bc@9qtgKTE#|(dee{JPgU^LhpamZxq*FA*F!cd> zwPf7Nt)dU4oh6r6U_Q{9tH9h1#_UcdNN5u(^sjbiRMwdM3(co9cYa^ z_Oa95!3w*L;tXamwAys~CHVmO33+jDd_7@Gi%maiF)I2U$61wWlfLFtX?sjGv@9jP zjTziI8<(Yb?cO~{#x+iZ4m$H+a@TPZ&QAH_SY=mQJ$aZ?#9>4 z-JOLL#ZgE1PBn}kGc>tbWp7S*C%0W`410r|!6>k0>V|xUj0D?-W*gqx+1t3@)k3$* zj#;1g@3Bs|1^w#m7ISlF!sJr;K8NAciEj?wNy#VIRjCC{Yuv0ns-{)Riy%jXy?U3P zmry$3-KxW-S!+p6*R(^5K-Vt#Cg5Uilk~kx$)@XU4M=*?#b#J3G2qJEzUSfdMC5?J zKX>g64uGfnY&XkH4eZF~07t|21SIb{I?6W=Xn;lNoy?x@&3 znWUX7*&d_v{nuEd=>6oVumnW5bDcahAsMnOLAtAE*X1&;G2pVaa%aA^K@K-VxhnH@n(qcM0r8MNn7xx|K}&P^!z@0EqVPS(;nF zsPDB0^R7{WMJ~%g$=YRUDAd3dKjG+c&22F!lZ*tzW&&KrNBhmWtGO&4%Pg)PcyZGi7M?kU6u2t<=dVRzikZGA;e#N ze9IBRta}k%U7%gtr~D&)#sR4sDw5;MQ@{8d6~{EtfbJKxZLo?i8lP0f$U@5@VO!iHr$Dv zjn(PNZcp-R@@ND=2s?i~3zRQ24U$cBSoNLi?(3;Ew)%z1s>Xj-2Y8LUr~b}=_#_Xo zP$ChK&PPz(X%~UajF74npn>6g0z$tv(Ej`i2XOj=)zi9Q$&1Jk6+^@8Xv5;#>k};% zmFKJ+7x~)4$muc-L*NLJgn=h z5Walzeab=$5WcYo<5z-VuiC1;t0|6SgVwY18)vs3EvB~BuT60@PRcfmY*_>ervcTb zjW51WjtutGkVhY%V6wbz@Jiw`i9eveds~bjvs8vxg>!j3B^jsr@#rNNi;(r%>m1E4 zmIBLT3hlv`9fh$C>X4e7e}@`T)7a2sG^>lgNHi@s@vreUOcUu^xn@io1M;N(sny+(2J+y z<3LPJ@{MPNDJSr zRa~Jzq(nw(I*{s_7eInp8!{AHu>PG}OfYfGIetwC>zndu3?haoRj`_0t;#+YmdcNM)( z@SQ+*eA4=LGB5lIOLEcvqPi|i!`UdE9_diR1$MJ1V_`=Rv@ z@_sEKS4Qg4GY_g>Mvy5)8-*Tbze(v-O})&?uH9YvY4p-m-Xt# zldnYVr^a4)oidwh4lwKF<+zZ4#^$yaDALS~7;p*+_Kfet>*^>LE4i{9&xzkq-}sR^ zk1OcGF8H`T?rN63Y!Y*c|GJ_`%^y4?IPgINE{6Nc3Gat^Bt(rY z%*4_}d67E#v?<=fc=Qj~+)hxaZpkdnp-#veuhXQY}WyflioO##D# zx>t@Wb<{VSR!}z#e>o+%xrIAxIg8wp78(XNB~0wX_$eEXJG$JDQ*?1=a0VN{w{0-T z3C-}9nLln%3nlxrhT&!TJK&D+%w8I@ILU&LsJVUIgSPQM0^3GE%1t4Fja}k!2NQjs zJ6SqYdB=tR&s@VN5PG*wCVIZD#bxss8Ws{lWm*+}Qi-smH62NqLIu&qJ zd{Rf`x+mHyu%Y=FT;~{eI~c(u-S{K{kcCBl_M-VBs&$5Rd7<4yJp6r1$dJmfCy=<_ zR7%d;Z5_ShP1wicgde{>_=^T0DF8pc@h9XivitC>S@WW%vO;z9EBJxa){)wkHlui7 z`?GfMb7A-|2u!%oLq3HgN2tZ~N5f}d!1afg>0byp_&)9m!y7At7)VBB=E}-jAq}J+ z^5fB4cr-j}pGU*P{!<-=9{i5BVp`Pf%>@{n%5@>ZXE0&L&ICA~4?jYDN``Rn?O!(-L)JYS5NiL&?}5WL7( zyFLNkvM53doS_1}sH9bgKBw=swgU0mHrf|!8CK!|$qANsd<8BC6lnv+=bd>SH({4L z7}rZHL-A5^T(XY+nL2w!cu-%`3h3^GADG4|AG<^XNo`BMw1&UiZOf@8{h3u5rP)w^ zVa%O24OX(Mm!1lXt5%e>xjS1A;n1rufSEV`RP0~a@Yxe&Y7q85238}D`ncl#hZ=Lst4@;k1`r>1jF&v(E2HS! zVN=(SWGx1!QPnR2YaC4?oQsAhzbMh@w3+kh*sQ3mX76)$&(`+Dj$@lgtxU(Gs4e!@ zk|iOpPEGA9=U{8QtC~Bd&m9{+lb6+tUmawdoJUWz1S;$xXLAVcdMWtge<2+5-@>VC z(Xv0s7I%Cu^WMo+ZZ46SQ%59*$sawTw~P}+XPZBmn#%X2i0PPg!9((ns6mdQ{~5lM zEIPy4kB+c;AV`865pLPb6qM8!c zufjVLv8kh3&Y61FB7*sKc#G}fN0iCjGn^6yX_G zDlu`WzW~pV!{&#~U=Kf7cV`Y;wLtf2b)}oOeH&QpV)kx^D(px^IZswJEo402PW^zQ zyua&vXmw8+$oL89*^~j_t+bCFVolW*@A{*V3<0kroP?Jo3VCa5U!CiQyKG%bU&Dak zl?Q&XKj=7Z?)LuuC%H{l7eY(y?0NEr9j5+4zS_z$Cpk*_UGtq^m4XDbFLxk*BJ7Jx zP}S&Bj9i}5Wa4r9X;J;$nK>UVDs=Dp!jgdvAK$&!Z$;j9Ra0-St=HBdXKSt6nGs=>77pNl|`<~EFR>$KC+Jo+gtu57G6*XA=% z24$F6f;jeL1_5=%9B<|iH*{W;DW1}740g^vYMHvfvt!XyFWS=@Hy9KMbUes^1SMu|J+D(Tb0GB`f*(DM_Ab zzg(F~!}4NxR1Vs@td%$5YbcT-{*fI%K)o+XQO9E3SL0~?2Q@+P+;<-z(P&I-zW-Sz znJm{^aPv(Ym)G(jE58|GJ*IbVknsc4&Y@30r$d2!8)34&jaK&pMPkuQ9rg2+pQ11i zZTo$pst42)TC4_wo{9K!&=S-#%ZLP>{t%qh{f|rOkoRVm<4n_deYcT!$&Kfgy9#al z@7mM!Y6b`!6Z8d+C%}gI=5HV_i^*|(#@N-)3x_pJL*9HHGQPGBdfpW$bLGP-4zlM$ z^z);o|EgG#)UyZhPmSsL9k&WO{~Gy_r;tG%3#D#wGQO(ZhO0Q#iDz(`Qshd<%24;( zq`2yB71;A;V}|1oWv229)iX3W&Ex|Wf@-_D(RqIGsoLPm!^hWeF8kv zJpIoakKeafqQAib97teeoJ=Gx<6JT3t_0Z5#(sYBW~oFD&!Lg>VV`?}#X1z1(*rjJ zqmuLt1O0q-6;5-GQG^AF=}qPrRI^YV$>V>a7FFK^Hpn?eKhr{;vF=KvG(fhz)_bIt zsyA@`(=bYX;zc4Gu#4!R!Jw5H<-(;IzJ5c*ZDwY@!yQgn!^(=R?F_Q%9J9~WI`P`m z=6IZz=u1=T6TJ+otq4`#qwjUBJN|T>7sCNkfKYV!u>m)jG>zA*%i3ppmVb_5tKeOV zvRN5e=!v|oo4&@-LMioxjb8Fm;!xh+T-dKoDW>sa@V;`bgA%%n`uY=D#8$hbK3zsN#qs)>MAwK;VSc>%K78wxzM=o&7@O*&0^nU_J}|nrHnn@P z(CjW77!r{Kl*%l%0)1ezr`wZgO7@!_yAOqxN)qx!ep$W#S7d zO0V5@?{?8#4RiYBO7)KG`A9tf-gKE*l9BM@B0U<{LM2Du#0`lI~_mWs)&=L_-Uaf%_r45hHM(r>W zo%$<$p;H{H$W?20lH&8DLKZ>%k_)eQpJ_gyti$9sch46$x2!xUNnAT431l14!dSd^ z=X?;><>3EH%BH@6l=2OGdzm; zN}~VYYtFbRetz6I|E|#vM!e=)MY0!qZXO)-=k{bMg%IF5UFlL_dS5iBd())}0w4!i z2WCL&{U6Ec=A>ucW~m56k5@|+vHyToknN&~*kkh7J*|BLRPLFn3!XDXDg)Cj$bI{# zB1dtvcT7hBW%u`~crt&c7=nm_{n4;zGBbg^f#`egy@n{EA&GoTLH(C6cW5U0JjDSh zhDTJ3O8=3Z@~@x-3TC_0eB*3@iZ#T2H7end0n*ZL><=`8kEZOd>E6El3RKkDDI*4X z9^86=qzdZ+@D6U&09@pc!5(nq07l>J>k!vtfEwQajYC+sTRBoctW_({|T#-&!K3d3X9etsHY_7{K^GH1XS6f6UIhje~!S!wOYA96Q)ZJbLBm0x?+jh48XWkX}ETR}+$^bu_sy zx&*!s(x2?aLQwz+{~p^~W`_dfdrmI?Ft{JVV3`l$0RT2K!uiOg`%N5QeG7)RtH06W z_PhsCAO{RqI)%Aj>>BzDhPk;t#Vk4O@)?h$zd{}4d}EQ(zW)1FX2zW_jTBm(~y8}||Gw=6l{0NBpZZ?FGnkUwFg-=u-nrXg*@EU}>T^0<3{ zQGWXO7UXAsFK$LVNXr}h`f%hIf6do_Kr*q&0V{SM1NuM6(*J`jMf^X=(tG3b{}NgH z|6jw<8afTxC-Y8v#oZN7Fy$SYMg5m{H6PV_u`*l+mqmuvsMEd)L-pRx@c$_C8+L__ z1U{GRj03TQu1;n+JjSt#lpC`$B_BR~2s%#Kb3PgeHMt*iNdN#`<@|RNmq+WFmTC+{ zmXwTWEk1j)n?nW_GtNylAX?KtT(08?s&pQQu!R<1g%@l&`D?u~goOcYfR!W1YVd|L zmo8R>G8;5XDr5*{cZOmsCom=zN}kfk(a3LOSyG@QH79;6m16nTcVo`=Sd&avCX8Tb ztU+tR6P9o>_$0@=FjjG!>e;d3ExLg)pU-;hVB&A;n1@R2;1XK~gc)z4tf^T5pF{!6lnZhG(zi@?OhYn+R^hhn820~6&uGGSC zIq7p571vhzMP5Ebd47)%Co8C62Jqo79lnElZ&$nT-T~;bytWOwd}}RX^jalSQqt}5 z+E-~e=gn#}x{XdF9q!d7Kh-)8SMz_3e9l&FQg!G{qJ+q}&Yi9Gj-A*PM{&*VjJB}X zTFyYt(m!{y9OK1yU7c)6%M`>;(x?PWl2S@m{MYp3^fy*|GIieYN{7;joFfY_-)p!i{~#M_XWLM8ZTr& zIhk>)4p7Px&m1pQR@OEgc*eewe~2~s#P1>hqRZW9*SqTIz63gHobG7XuNysDC-ZaM z&OXc5VK12o*DZdAQAkCeIgrps_1PdTpa+&`AY3rfscAF&ZVm z>79Gs-Ezhcv3y~AJodi-*%Wf{EE$&nZ;z`N`1Qf8__gQROHQi=buKpFg(p`OU}iCl zrxzgFQk{C~g!S-EWl@3XXOw)EwU#HpM#XSz`xDBUnY7r=hu$(IvT%$8AhaQai|E#! z(VmjN?~gIpeKb*FG9MLEd7jzmwsmZG?;NhaQf)Po=l#Iib}JfBpTJH;>e`VYG6DzV z;yxGu+&Sow^W!X-2pnxR><4qc`{6TV9T~hsr~Y#d2BYYx150SuOu?IyUJ48Eu0A%r zMg~Ia@~z!Qr}0cZhRbfbAVCp=$0S$>@9MDBK2Cn_oD*Ak&b;U;BbaBGdm6%`gTdld zB+gMNMqP9pfBNukaRys*?%?99KX>=?z*p;^RH#o>|loej1?kq34IxZq#+K zgGT=(ac(=2@8*+VcgCGUU!yHfU`?BWOSjL`aCvYO0gnlcngOR5vj?YB3)7YBw9(Bs zILL5CVv1=D=v2fkx7-u!bn0d1G)8q1^Aa^qaystE| zeQFw_k}vnwNTTgXcN5vu<6xH)Z&xTh?m&}Pho1fmC+EEPQH(lib3tvDtvzKq&b+sN zTW%1BoM_K@nOdQ7?e(nNcY4Q-E3v*Y_Yc+!O6@JyiuohLSmkCp zDH;d}?8Jg_CowGFqONw==uinFnax)=KtoR(1Kr>^k zLwuhzXn6$wcRVu;o;yoB5i5UiglyQ~t@eRHc74iHr-nmohDrN%xZ}pa@(7vcuQr#R zr@0ClQ4}GWoH0I%>A29#4_0#18qTX=d?#hIUV#$4fcxTmyz$#?W7f0bQ)dZHXH%He$ zdz``PV$`S}CWXA4_f8ZCdW=rM+e1_9P*{Jkv`W`LPwb@|K=go~p}oZ*+lXUjuF8eGCR}SLWQzU1e2np&M>Ws;RP8}B>y59r5CshoZYykPRyu#R?5JhaQbgHE&Pa)ukL#eDM>w~|;nO)%V@S$kEtP@NVx?$n9 z%xyK@d3sfOE;4g?R%%5DQXbZ&ty1)r()6K`O^!3_a+GU!mbAyjWqu2Tw#bHJ)8sTb zto~S4D>G*FZYXxGC~;$E9^Ion*p#$B~hq}k&^lurX`g<@flwx zevoO#A%M=!?+nFJzP=!5`GrrV-_;7fd(ee1hZAP(LUn*xyTfIjN5JA$pdM)%M5@qZFzV!{ zK|>C6_jTXQYjzL+{0%~&Qlysu*$a{vs)?Riu8GtB`5R)74Y|xK`Iu?yyLcZTpOd9! z%4J0QybFD4qbZkgh71;Sp)sJ!tdMb;=n9(_GuXHh6&km%*GV3pQ^*dl&v?7zQfE~E zgyG!at4AASVlUALuDqg0!qtpfd%{PD)CS~!`3ealKGF9emW7M9Y<>lOMeF6CjA| zZC6^xzK046+Zx}hwwUD@yOMZ(zF$#P-q+|jNbOr46fWL68TRaZ!>}9p#;n!tFu+T{ zIp^YVML7V8+#vD5h2^p7-hR=Nt<^hRmD(LRLGk* z{wLd$7-859b@p~&(?r~@lWT8-41_F zR~qp`86knsqQYsDA5J|z<6Ax*(XQR1s@7oCSyDrP#^2wwQ0c*Ub9w_Yk`FE*aeBCY zcl78o)U&?%jRaO0=D9jn|D94W13(nq&%pch`9%}ky?wqz=`xo`-Y<;AGS>6n@AtWwk|cIka_MEj%-Sm4?wcOBFy6jyGQED?sAwWabZIdV*o z-|NuHqg%YG#XLkS_8QGT-F2Q$59CBTpm4`8I|r%dV6d{w7a8`CYm~7m-W_9qHR>z7 zp_HmxSh$@U-wEe-wWesxSE#9S=ReIUaY?a&&$U@eE3l+aoT*X8xcMEOeh9Rjvh*~8 zvN(H>S<0xCaI9O8evXpA=qgG3C2G$yef%oPPECtSpw02~)2NpsEOz=+RjYZ@uV!{h zp|W}LDLg4LYZs#Z=gvU{va3Y4l$pM5`r`$eTX1QETWI4khtCRb^)RY0!FZucU@K^{ z6Gp`T>Rl?f5Q{uFjpywQ<2GroM0ld?lzP#PHfQl@MP}aPP}qeR?^V*R=avj1YsZ(| zyUD>~I`<$xP_n{2!qv3fHHrOFQ=4IwNy3nf@@1 zQfg0oB;yMH4wGRNn>U&Pb$z=^=$&o#K*^$>4y`G?rXJkY|4x6t)z3ZddFHBJwHYw! zJDYP@@TNEQrsgt(4kz%Am z!Yv7UCHFf66>HNUo^v)jnG(JR*L%J033e~jxPvMRl!Td2)@Emvk4=&MOw^NuB@GZ( zRaWQt3R)_5TxQO$cnZ@S2Xf!pu7B<@sOjO~l zThGoqYLYBs9^hGB45Yo&m}IFJOvGrdWUFbcwF(z#EpS*-K5Z=C>WpJ`c7lK+S%nZ< zZ--_|nAR(>y;JF3mp;hiQ1*J<7G<-ygEnpO#>%NG|}Hr#y+6~S8IRA0AUEDz_aFK4`l z;ID;k^lu({JgK=H>6!5qnqXyP4k`NA{{qN>yb9V;y74yc6YZk4E#h!?A5_+Q5}rq| zJ?#_r+fgY29C%xbNxNzBo5x@DeFYuexFw?TnL0mAPr)aOr^Fbu*%Z=VGhz3_85=ek z6m?CLY$BVH^GWly)-m}#J`bq3%COTnRQq13+wg^Wl$;@fTQ4=M&02QrY*OrU?Fab* zB<~eBas%UHYBOF!z0B@rO*{j>@`l_CUiv@}{x^Feb;Qg_=Y$i*7G2YK2KhsaRz6a- z5tz?fKc`&w>}P7f#(2RMre2~+X_YIVk~~?iXEqbp4=>-J&y(LHO49Q>epGX7MmJSY zy!NPed$;#;tR~x&sFrA@&hKC=UF*WN{>iJnh}{0-+XR9gMpa=Ur=L|QcsC&2TqZ4j z*+pn3YDAg7ST#cHojn1srK$pB>vc! zSTK%0JVg|YT&Hi&;QF-ZZtBC4cfwEm<6(oAc+uTI8x;%n3b_Wy46rJC+Frti(3^uPtpszRIQtqk3 zTmXyPM=N^=mC_VA`VZ8AG;vbgQw#7hYju{yB##{%LHaDmArY_2p!xK|OkDiT-u&)t z)cM4eDJn4+l_$L?7r`v?Fu~}dc@C}WWYcX|C|v`8e@F>y6P=!AC9XFm!l7~gzIF!<&frsWwYFk;u|`=?4EP0%c`n=59$1z3w~T%944S{dXURMB5HQD5 zzF`e$OnvY9^j9%o@99i2t8HjyX+k+g*|pibJ7X^SBtDgP$!EXMDh@o9jQS*u2-p^EhT}&T0 zGk5PVC*jSiuDhh7?(665a)zK>QF_7^F8M*5yCOVlXsJSZu~Ib>x`|ie^=x8jyvenB&_!+G0hGch$nippw^)j{uRNny(Kkf;^0pk& zqO9D4PORgd93q{m(PdUKlh4mPIHUEORZrbg!~_(7Fp)48RJ6Kd9C_0&JjFl9aZ%sR zDPT1&WVG?Tn9A7du8VYRTN!^8cTjE3HWY9~%6=Q?a4W!NH>>!Ze055etdz-(> z+wJ=G9&AoRoq^4sDwo03yT#M>_6Z-ih8N~XMdM{Y!xj<&jp*T*`SUlBqh3xI-+IJQW zpU9TRUz=OsF{@CUsS6XpwPm1J=R$pXC84s|dYauK(cgDF9b<7)kQv9PCIh0bahf8L z|GKuix~lpHHNgFNBa@C|esK}_83zLi38_vY3pTgsE=@M*c=G3!UR#W}$Txn=>4sph zf^RFg1<%9^6f+UCFnqO{Nbn<`^QyZV?`%k(me+aV@H&q3EGusWyETk_?u%#2t%BC6 zmBSqaC9W{JwW`C3UezhiP~xW^`QFN%sTq$Vhs9GR4f>=x&}G{es0NPW&}0oiT6F`l zAH-65xWkc63ls-;gyWPmBJyYjn2wHF2@)v(gAiw<~jG;=ROQQuDXYtqP3#jg5 ztA7+Ky4%ykt}gxct#A|FTO867mqAMlZd&(Qm+XjmOXZqrhpnQDFT#gyODVGl_|U+| zHeqy$Y}X0MEF3SD?=#kF<)9#EY5~5)C1PA)ma{K-Uo2BJ^L7W3-#i?Sts~?-3>wA1Evcl}Sg6l)iul0J>2QS5i!Z)mwnk&G>^l(#T zkDWVx&C`q=W)-gfCT~Jqyvfn^8dsj5;Gw64Ehm0*JKEJ`r$q+hVMh>!#hgi;Nl;cf z1PKiLp(UgN6U=9{q3N$o7)VPub1tWmFn107X+GqdTzeTefIj#Ln}ChJ!7~}NjW?!v zj5Jy8lCW~gI`=v$_w@3o?~qFIVct$2n>*Xckka7#;r89uBXIoCv9^A*dkn4ZlNBe% zFip>p#k!@hNZ{L-BzFc@ePp`5<0MrR9_rM9HWVcS;=d*GNG|Q0+GAjNEdo z7@c=x(G^W?LsPf2$*3w|(ieri8TBZNqAmwJjdA2KH6l@9y2F_}VoJ9M)9ud2{T?%> zO+WEy!No%>rGp$Nzt&i1xofyv;Px%s0J8MfUp)P6o=&GFucOV|gf|f$ayGhf#mMeT zNZqd@LV|NQh7N1asFv{T)6Qp=2*(K_x$}%UyS)x{O?A=O&nxK2eHvnAR9c$dh7o(% zoaTdNSIm{*aJqjpS6@@5{{l1+^SXZ%D57}9OI*`DX`AogY!*7u>6Its{)E^dq}O$+ z|7r1w`gu8h+WuWKDgdWi@8esumAo@sTMp#MXh|x$dSX*-;K^81l~4vsTgTBBCSNbN z)s$Yq?0an8rq%YKHqQa?@->atLV)W3#ol|qHMwp3-%F4tA}Rt>11i!%iu58ND7}Mp z>Am+ZAVm-mX#&!F3(XK96zRQ}Kq#Synn>^PyIp(lbM{(ipXU#Fu5(?y$dwo2p7Wk# z%rWNtj?Y+!FNTxs1XwBNvLK|2+pfY?5zA{#DtSgEC#sBvspzJa{NcBn7920Bf@@Cv zF6rzH;%%zguNBBQ`GeKgITbiD3ps>Q7USjfvp)hP8$2iO&|_hNnEzDSRsrgOG<^4! zpWw$~cegMqPh;+&lcH;GJRP3$wl;O2_^%EUA}`AxBz5h59DYlBx*kUEU=BL;GajyJ z414q$AI)jlocA@KrQd=@gGs(6nhRRc1V9B|T3Pu(UOWS|n8pblw&(PkCd=4Mt~F|j zLe=(7ivhqT*cLw^!UYML(XI7d*UuPNTJhN)>oea+Us#r|b4w8f(+JmQE72f&g!;rS zntUJ~?Vp+p_&TEzF3#-*Ev-70P6Ss%7QqA1A8pI8CmFkEu4FE~_5>&$jE~@?tD#@m z`^lOZVEK^xfS&*n<&*fZtaNs{n1Y6w+dDLjRQOhUdPaY0NoH!5a z50)}@Mfwbz4V_SUYJ}^96PJBkv#QSjaITujM)&YVup?*LvTNvv<6XxBJh_rs7jGW5 z(#SSQ;{8>V?ue4Fklm{Olj23s=i3tmZSD%5OI=bRK7wqedioimMrO^PWZ6tbA7Cog zE14W$ukzcz-g*2$VaA^TmSg;&TCZGE%fb23RP@YO@0{DUvNORv5IF2fa;J*XmykdC zPCVH*Urmd_!@pJg)$2u$KDz9@KFIARn^V~N$asru-b|uDsXxh)?C{2xG5XTCrL4`t zZvv}sxFhY(C#uvkqV41!rT%j`oL}At4gyjYGMjC3{+oIA=x32sQC*PIERS7>=>1|I zw_>L%7gaHhQ%r13f(rCY#Wx$40uF?K zQfiDLLmC0%#Vd#Tqcax`Cree&&98~6#vg_Fnw3hlD{9~6HB=@NigDzE(@HfKFawSv|D_ zd5(g8H`O|=zdPML);#6C$6SO|Y_>pFI@Hfd8P>jYoLJRkp4hHmTEh>LN&c;=< ziW1=?D`rKj12+KKk*W5?_b`l|%(WlE&~s3YNNs?TDlG4j0?#MtW5P%%g*^^XKW14$ zoM|YcJPS*0wgjT47=2K+_!)#q@q|~_1@(Zep#W*n`GMSXZVa3~cZ3UI1ooFwND@vD z^tH5hcE~Kxb_=x8 znbHwU+I>885>hTytA$UX7vW{l2ZT^9Ztk_c0F=BnQAzK3XU`+}x%H+Xsn3&ePf{*>P9 zR*;L$bMItr z)&RRcc^|)oP z+d>I%m6!F%)dlen|8+}VySX3IrKp4DP_1(BC=YIfcXC$NqCUro*6m@jQ)4opDOtxG z{NeKQD*~~Dv^P}zj=g>yPs<+t@L3|AnSw}BRpk1ysk$Uzfn*tXYeYDR;;m~0Y0jtu=40NgQ`M}N6<=VrTlt^}9Vo(%TG=hM_s zT45}No3St!K6Yi)GB&2Ux;GQAd!5VEty!&YXFKJ?TKl|K4+_lGHSkHdyAhTp>afB)A9qU za97uJ~C~I?_ig5U7_)YSY*nu~zM{7DOn;ZmW~EouH`O(oTl18c4c$ ziFZR|a*>P{8%5j?{xQ`hezPz#b~0UmPaV~nHyIA`p|%zcDA&?XteV^Re*f(8(o?n; z$h8c6l_<)!_WM|$)7h8cxC2I!Q(jt#8m&~uP~bH6wcd><0wsUC4P|LRv!OkmBVfPe z^-N|nYJ?l>zPOkqiDE~bb;&;*3SkyQgs z!|QrHM_1+LQRF^bi?PwtM#e;*Y>B>LqWgL2J2+ztJ|MpyKc9u(d>Pzh*KK4ga=ej{ zAS7q!>GwS1R}UoWhgW3dh*@;L?-~%dC)1{GIN7jI0)Qcp$~mB|EiJ(N!uQ$Tw$&P% z8cGo_w1Epq(h=Rc%iBVJ-$8EmXzAjQK)p$GL`IOP8P#^GCRDGByPXCeu6!+A7=6`B zaDaK^A2?(PS`hYmWqY$=Jd5=9^Y0I|y#Ahp8Dm{x-AafvB@L(@?DF*Q*WDEeU8~fg z#o)7=vEOtZ6Iq;DqJ}5-za@*=S!pV-mzNkBmhn^VV{XBPJ+CG28|9V^(`NQl6Yq+w z`@U`-)`WL#xjvivI6~ZQak*1}fUrdE%((LPd&%e2_OtSU(%AW)b zP8q&1S!&igjiP4qGj|cF41^7mZX|9$hLNE``nrvNXOS$L#5q`vyum|k7rjg&Z|%9MZ8XqSrFPm+_YIeSL( zQ+cjHQN1OUaz=cZW&H4F8gmUihWXfrs#KBOTI9K1Y&QlZ{MPr}ef->9J|O`oDk9WQ zPHq3vNcFHTTW=9&vgBZ`2`1`z)lmcqsdlo2zJw&(RoUpU-|3{7L{(%@_bO_!W$Rdo z3VKF*99pr?Mir5vclczQxJsj0-_ zWSim9;U6X4vk@jsV9>#pWyJ<2aOi>FNVR#*or8cf#le1Dn9%!VGMhbBk8NYtowJhy z1q;xwI!ud;H3#a{@*+1^QGCLJbZ6&rm5P?;?|c1F*bu??#?1x-8`N-en3!m^?H)oE zTIXfs^{#Gs+U+YsnY*6EN`)Jb9j&L`fL86!ukAY#)=NV{jPp73a1oxzNo?SgPvwE_ zOKXuJW`}`|5?OmHK(s>vwOktFunVwJlVq)k?TC4x*g!Q_I1>o~AX@w|%;xr{KGEOj zQ-7IcB`pOxnY-;BlcWqJ%_K$nZuL_M2DXJLgJZ_?ZL@|Z3CC7Bo^NYi)d>z=&wD$M zZyA}>i#Z-iI4%tlZtr8k=yCMO&@C0Ba`Ocae6FAxH;lK9fC=zkbm~ey46ghHf!Q)5 zkEjUh`g|Po65K`x=E+B)q5eLAQ? zh921Xx$yo3mrwZ7Cm-@JfNY}D<*MyyLhl=Zfa>dHNH#u+^Y;nl1S{6;ITQsMblcg$ z-?>t>C82vmVR0JLa&oLw)4e+_?s=5NyFzk_T;2M2 zZu2lL2aLGhz{1EBx7!0FBO^quJ>wN`&!KOx&P^JxR`W~_s|D#Kl2s2}{9bdK@ZtA0 zQ@0I(J$OY$7=-CaRlVz z!wYQo{kCMu*UP(2-nmBaDagDO0*c{0n13%~9u4`pV@n>-jV zyh*R2lnc9~$*c@RKjKk+SSphEtLhFq+u(M<-C$vuRWYYujmtN|6;Bq87cHq;HS8B& zmMztN(eYyAwlvQi7YE8kOc;aruMRd6&VU5g{Sbd>a3_ z(Q7Hcr@*EBFVz*wu}0pjxgQ?~+jkBxp4U%14IRpE?)-^=6x`dyOl z<2%X0al1r=Z1XfNDL_)WQ*%Z|Z{hszhZEo0K-|2YLZhj&6M0hOA?!X=EUhSba!J~D zoA5*|ku{lkvYb8&U1*_@qbFP*P5O29GI-y8lRcEX+&QYJo2BmN0;Tbg47zW%`^jVB zSzU|oioBi>UpD*%ZNt++%$4qWQq3t^MkEnQpUwf5(7B1qCk1Wg3bTC3)bhA2 z%?as4+n3Y6Bl)aom4sN^d7trf_H508@66b1{gxL?Wi@`1+v8fz3+@W_1U$^LL!6sa z;DE$tF9*g)C2MW$F#sM2n|rLw_1lHdGj+wVL}rT3tL@1ImJoQRC`O; zm>JiJvie@`nED}28)Iycx7QVot{y#6!`kIff zUwS(uYHl);H+@i2#EJnA+6}_S$uJ#6BE$XcM`XEn6u^T+SK=Z zi2u-j*I0Nz3A0@mb7gveZbqD458vg~e#faqW#LCp<@Ni{QuhS@mR?5FVGOJ; z1Y8e#P>Qilw|NX@9$2?^Fjs%d2ZRu{WvyKxu)ZsxwutsQ;W}FBfz%2I@X!E`GO5lK;p+Glmzw*bUaeLD-9kj8uT^ZF z%v>pZa8Hi)nQWlyld50&<-h&h`Afg8GKBfT`E=TCPX?QP>Z;6Rwq*}0{KVS-AhjAqW^nLhQ;u~zl}vt6tu*MJN+XmH*MD_q=HQ3LJnr5vhuj%Y z{FeMyLXKo+gR%8A9zc1Odql-Q{x!dJV8LP?S`VCJN&+RC_a>hhMy~*+n-f{8g!M41 zRyLR|P0@agoq-N-;)Qck>{HVpnjWU5K8IUF>~coUcSzAZpFNIjIIpq`S@eVD?ov5w zO6$}WvZ}{L9`YLy>X0F>4dm;sD%O_klh*DMpmV-fJE4wnz2KZWlO_RRxJxy(llx|(s=zb^_Wlck4uH`NV2;C#T)=qaNU!> zaN*cE9i6b)!SIU?S#@?|RkRVzL+XNh7tsVS`MeM=oJ_=CG#tTW`%K^>Whzz{(>|Z1 z?BhT4D`I#)K=+{AZ>z-qra9nNYjc+G&~yor>*8E`HOIxzb?zA4CgKx9Xb7Cg=?BeI zvAT*m-vS!cx~XW zPZ5d+ru&rANfK8X0zQNJC&PZHJzV`3YhpJUG=e@N8-0_u7H2jhL)R88AoN^J+#=`H ziVD1L*Qzw*rs+UOj^UsxnT9*EGE&kUE z!b7Z7S_nJ6bZimat5n(ZZF@jb2UkbsBkoahKZ$@F;4@Q;`m~kMRun=k0X1S+>Df6p zJtTMkw5H-5wJqZrM$T!7yXQkFb4|vnV>|_^@f)CYb_s{OEFMH)qP(sr1h0QhsHU-_ zFSFCxOdW~Be|lngLFn*+s~HO_meCE-%>AY2e03hpNjpLifTF5AARx(7KAmpb8Uaf2 z_-Xu%e~OPOrb0dHZZ+XkYeg08XHf!RjqV=uc@v0RsdF=lcrbtqAas|Y1Q&74Nj;p? z8POu=xWfI0RB@&v=fvS0u+nfMuNdo6JeW1^TnLQYx@4{LI3ex*h(@274|aVq(CEi;3r@l~36 z{SmuOugh!;e?T*AC9H3wGr1=CV%Hz`W97zi#;?EqUc-+qM|SZi0Lh9>cYV0398cZG z`Th0xY2C}A_+VHK5NxfUoi~q)9@JKWolXMX75(G96X%JV%1UwjY>;l*7B$4B4 zny_-p6k`#Nv-o!``?Jj0^*^~jj)xD7O~e3ujRt(Zlkn0(g}VP_b0aR^(D_{lrA z!2P!KTMSX7HPG*OO`OGkynpRPOe_`;PbFhpJNxl6`MgtJo2HU1T!i`0)ld6)5?HXF z48t#tlpT;&!bQ^k_x54Q72@n6qOIxuill_o2N>d;JxGoikcM<3m$ncP%Zlss=jNA9 zUZTPpTD#eX&j_Y;Fc5x-s<06LDz}hwQarHJt(BiH1HSN z4(D9qbkLvNZ`X4|g)&bPKwN5d&L=z!rL zX>Qv#l_GW)>P3Jz}4$Zm7x^_!++NW;3k z8pO(USsXeMc1v6XgwPLSf8ERBZsUCBd4y@nZbP0wLtMi-SakL&bQ`>y&x@=T6xa+} zoTYY?Nfgr{Ur{@fg_E-cV!b?;eQ)XMpCjA!jh8!^d417XI>{kMR~7THN8jnOX#`z9 zf5fj4yS8Mt+G3oCy>0QW4!JS>0k#p4-&P9?`R-DwF1FxTL*f72Z@}_ltjaYNr5umt zV4-H|L)!BBN{4((k*UP2m=g@LP$pWh=M9}8-P8y@b`hG@y=QnhRv;_-6pOJdgK>&R zp+9-3@bc`S_e{t4Yz>aw+%_(tQ!|ZW8drTJxJ) z6@TYf{N$eg5e9)Yzv1-biQCsIH+N@Si!Ry!7gv_cH)md&b&aF66oh1C;1C5c^LL`uK2VrA(pE0+K>=N2qR(Mr+mYc@ z2fnrLV3N%Bs?;O5`27r`Z+>-S`pta%eZb$Lv`19zGamXLtwE%C z&|;}j7mFkgxhYV?tKIG^iKQp_44|8#U8PXhlTSx*;8GyP%71=tCf7+ zi4pmnqj@o`3L9lLpQ*ss8%u)>_}>yF52Yq1a!W)eFmfhJxsxqTdvw z7~7w`-JwfH=|kl{eQYW9t}*9zHEIjenQ19?al3GiUe$!@OQfEhZOifDoL{8k98(`1 zIBfA-*04G1K}8fVI#wfP?XzU9=JP9~vYya9FXgbZII@#;oM4l_ZgU@6i@4RTb$fInpQ_XHS{U86um^;EuYNTEN-2Z31kxaN!P-CYS`A(v z+LsvAW?e4)km=A;0k=}-AB=;mb~{@nMEXCr$8(tLpZPHid@DNW5VxLcXy=YHSgkCj z7IRqeRapK+oQ6&?V_@Zc6H8Ml_2h%-h0zpkt$v>qjeXWw7}55p_hs!91zK% zChh>-HKyeEB#>9n_#9_AuA^h(9ZXN5@e5LRDmhIT#A-YbIG@CyUTtpe4MKC*9BWyg z)W#Jy!?sguYWxll%L|8Y?bWx``Go4eEdB|-6jsOIA2WDh>y-d&0FQi zD3Zso0)iyAh;cZ2_Uv$cybpQhET0xV#xt0o%gsgL1r{%_6yIO2PUK*`^c_k>A;>KQ zRLZxW%AJmSp7r?_tKsQi>GpW2RU4U@5k1m(x< zgGu!S9H&P(H;>@1X^afd)bwf z@wHyff?^}-fZd*3_f!lspA$Cry7|pqpaQ3V6;Q|;`Jx{x;+(vQW&@dvA=zeRu~Cki zO8HEKj5`=ZLB3eOSVM1cgo_+lUp!;IJ$}LY$!AJp!xHePP*1Uhm(>RR0kd5;D({r< zphXxh#f|2)1UpE$G_o%g)+PoD25l4akhoB_etp?z0EDUqK}6NUVf1!bL|ubsXa=Ky ziIGJHgsim;%ULGf9J_Ch#fhP9BE9n_mOQnu2Z8!16jj?5uAj6m++jrNsVYLXRa6x( z^)6Xa2Zz?n4B|lO!SFX7qRL*)D{iwqxCMK%WKBVFs+sXs>{NxSzFA&s_tmcxDX|4z zsP;T{wuaOC#nRFy$;Rh8jzem{gT<5rc5_YbW>9q{)X`Ce|5p&yh#&Vr)A&Ls4tD%##B-A zLhq?*kmMm^$A~w-OMV|!o{c|E&A}(9GrMEnNa5=sL)>FmuI% zOYel!g!q(Xdha^EcIapkHlh%YuTEq$oeBqxy^f^3#j{3;fo*oE~tEUag^hUGoPN*mySuO6joPui{!9`I4b` zbc++etZkwCQ-~1{rx!Xg`0pT4ZF*M`ahEdW>>)KM#+1&cm~6o$UoSM|kgxl6l)^os9B$ zunF`c0bNnj*$DG)yg!$iz9J_PA}4L_*6lOlv}huDV=*Z|f{|L#id+Lb_Vd|fOPe^i z@Ndiu#So%9_bu`dY83cqsY&PB$pd8srGf`7+F+xhE&jT!8Dc6OI%Kv~k&s&dwVBua zN(o(_o$&-9MZ;3Dy`N`nTS}zVExM=VH1&^_;>8?Z&!=jsrWV1zp7jR#lRR_?D*Fug3Ig=YFWwh3BqW zdT$_Y7Frzql>NrYBO?de%ti1{Sv##++{GO5d`a!!j>2kgER@o?!UHay!!A$S2Aj2;k>HnrkUf)({W@i9%KuYW zEKQshc*x>cd}O$#LSCgkl}4+=W)wD~*ld+=4n{$)et!s=?GZTtX6Hpywpp*|y|>8s zTg$Ia(t+42cHlBYDJrYM=ib7ep~B8vRQn_*oJ{~jdmMU~y7==T(zd^GHZEp3jisiq z5&o&K1*yr*=Swbj)=6@wfU#{V(xBb@AT{uYw{&NjAPR-oIgX1+1KmoIT2;r()`O2n zU%}S!5ovVEeC1@H6gtIb7IwAT(KG!8Y#Ehoyp3V8b+;FdpB z{=Bcc8&y%{^XMl1!vo6pKTz_5j-YY zGZ+Q31y?ccl#;+b$Rw4=(Dk}{*V^{gNUZ4^+J_;Q|I1p%)g77)Awvt`f}&?plpR26 zJKQe?N@5o7N51RB8ftjS%H;Zd)-y02)alP28mrjgvn!NOj^=h*>)ULOu|MosF?a;F ztu`N&o2i*4ceiuP6;AWymOT-6-rMJz%gV~bF`K8EE$)Fm0~3IqB^UcMIWxCXyOnq# z-$3>jaN2s8R1AwMYaJJT&YjWRZSA+Wd%l`L*2ryrr3l^}NG3EZv_TopEPGz3?2|sr z{P2hGU}J&E`4YCzeGk>k#UA>zo;M}kflpCL1^ly1rYeZkgBEsBC{zoM?|rF5K-Bbl zCX|r6nZjbCohH*dpLmHRS+aw8cy1XtB$kvOL5aPvX;}F_AdUY?8N`_{76+)hav+2= z-O^yvw%Ck$?P#=fPA_?RqtIOT=ofOF(P!4DgqE<0&7}GwQBqJ!1Im*@iHu)~$XByE z72TvQvdXwW35jeH?1%`2DG|U0>m|8W&}9@mn#y}F8ID$`278Y}#n*;2E|Gz1!Nf+; zCj!NF-fK_wZ<&vZ5oIo4LP(stQBjUUdzObur=KnEkp+f#pc3XeD0ZFJgvlN8moT>8 zp?bt`^wqr1kqU;U(`&5Dj^VLR^53-eJwG{SJP$XR?rdLi+7qVtRidv(Rh>=bmRHS) zB6F$WJ^XYke&Kz}w{UL^%xr0<_Ctq#8+@0(&wc+||4L$c9#e`)?Lck$hpT1#M3=wJ zeURHV_LZTfC+!M$jaYo3w?9XVtYhhPU6WNQjdwL&Z^q!NZ*;xv;1FB5bdPdkHEV34 zL9DT$&9)lfMFpIS?G@158{{34c%AcRpu-KHfsAhya5@z45?}5vx9F*QqE+6GTK04g z8{L?xlH67k1Qe{eTrYs)1)^54(t-~x-7Pa`o_W_V)`|d&ZqXWR2@w5GHU+AN#qm z!uQF#O}*;n;Ir|~ddvP<$B&f1d0LC+KnWRD$9sTG&(i@&%|f?>l&a%9qb$^Q9wa=% z0|^<$Rg8VScJI)n35Pz3xqeFibz-GWTq%Vf+oVdqFtc-I zsMW-i_}=|W>BT|g{!QpSK~SgNq?FiiBGKc}Kkz=yi-Ma}3qrgV-trE7$3*(H*vz-}OW`o-zq(;gTxj40oh2I%S<4T5IejGIsjALDJN8V{8*_mbW3K1#{K1IR$~Se5}gZ^H`} zD+jcO1)1#T_iF6KX#2&Bo-16&h22HJF_%kLo29>nH3fh)pfWh#zz{G++Mb*3CtRrJaWh>6s8Y|P>V zQ>?<>kbg(c<>BADm+E7)so&7(pL_RCe-Paazx%=#r%HV-=xrvNnY-!{?cp*4x%sos z*o7?UNwX@%P>M-;GL>1RG%q~%^XD8&$d+7{e_x*SqlXW_x?v~$rW1Z3|3}ISOm!yx zFK0w3Pw?t&m9n2e|WpKf%A6wys;=A zxb^?V=kvn()6{|Pxgn3S#{Va%@ZY}qR}bN|KYIut{!f1BzfHkEdkEXd0MwM{l#l-X z_5A(w2W_C)sKb38iT|5~|C@yWUI{x2*dEo`_?`c~tp9C!{r>Vx7$D%_kJzJMrR=!x zQE*Fm=GI4(|J8)v{t21sIKA&eWP&d|{vmzm4@s{7)iCmm0c-@3i64GFF4xC&>z_&< ze`G)YPh8DEv5;dg{HNPH%yhtq{s@(@k;-lKc;AJE4CAWgoa{Oz>qy28KM-j|wA z!QC;#yC3-<5U~G%S<(^x!=p*{yo{j#zv=$}*>qQ{QiE<1OiWgo#SAZR4w*$Es>CyN zi}$cLUo(mUhgq?)#Ag?05uQV>|4VE0US)vByw5ZB66>SB!8f(WhdZlv1R1ZpRTcEV zuMmx5-JW~>6A4eo!uFe=plSei>3`cQ{_FEB5TVRktc*Uyucz(IB;q&v;}1rE+1C;p zyNB;9<4remGCEYsrsrd@f!**!=JZ;I*ob(3VbI=xT(tiROaINzcsr+Oz(GNI^!V=! zVe|tZWdFXq0EY3ZeGYqTHHhLEZ|Y61Gw}VA~Jx;)+dh=5uh z*kn}n=kPGtmtuO5=x0+S;TteHrx8oR-x_s)2?mx#A)Vju$bA0fAIV> zRfb9YwtMVPWlBfV)p62lm8{A^g^g z$@0d}sc|=U-ry%-WUkc%UM>N3pS}#?k2ZWvZv^+vWn+xpPtJZhJe!a9dS4?p%n2+j z31LUWW_jfth3mcg*aXAUL21gy-+=Y{W`o`C#cz!kK0dqI&mHHmxVA4YgU9i(Kq z%wHbv4=f>I0^kHJ^`*cBD58&iY;R8Ece<1bv_P0=ZDOi71~K9Q|zXYjM5Z6E$W=X7MdS3ifXPuW;R-a_nMMNcGI47 zA-lW7!-h7W$)7&&NQ`=5bFlb1=u^jOM5*WIUOS^rdhqaSj$1REaDG$!zaAfdRXJTu zik#z8zM@e-JUDoa%2@8+utbIE;gqWvR&ieIRc`j-uN}?4BO8W&!g~q~rE-mToA1%p zF|G$w|7{hW{BGJImc(&n_L?4^kCQ*vB?E~cef@igD03(I9gCah8<)t~Sm?|y9(Jl~ zwwiZYQtVFi2U^hxwSJ#iTPgY(o+1=lF7M;wklph`g947$VPrC{l6R(GC(LDl`Wi1Z zqY3<7?M8NYHU5^345b`Esb_^lORw^H_oV_s1@~ygzm5a_9JvR-UrWg;_ZIIRA*38d z3!g8oMWc5_rNVub5=(pDv2kh|O?TgCy_4P)%X+_Z(tdlt{+}a!Hqf&-ag7}gG<$C`Z?{mSRBa88A&e8}G?Hj< zp7~s7I`CU~z_Rtc|IS5|zxqp>zU^^WK(qs6ZUj2A za!rZK7RS}2aLm%rmL80^O>2VM%KhQ7NvqSMzm{`|EC&8X5srOb4Qeax!5zE-#@9o0zsvh2dTkFqv+)d-U(FuEPAf+FknC)W@S&M; z3QopnJJx)d8R`x?gb(c{JNwq-ZNG8tcs979!y0Jo5>!&8eX%OqX@p09(gee> z+bJ4K41G7sEjKy~s(K}yludEFUH-DS(f}VRhtKavF zXMJ!Brw@}Y&`eUW9e8Ywke|sg;>eqDEeq?(qLup+xKn(j*$MM`F@XJ$jAq&=RdQHA z_ZuTuLd#pFlB2Df!-I)It&jp;SLXI@rst2{H{h>1WMdbvpRpu)l#59kqZ~)dsZN+U zI5Mi&2Ncfkpt8u*M3Of?1s`;S$FA8K&29wuKdKbp3EiyF3}+}639TMaqcO^%$!S@^ zTc7>p`Z?OpJB_HcNgjRwQVSLd~zf$!SJ^I0OPq=f!{5kW)J87Esk{9 zKUe%aj^(~YTetHaK_S<3wzG>1^=m)x%}{b1m9EbelO;D{hB>+2N@E+NE1L^V7u+q* zD>53TT0n{0ufi~*t-i)>{x;2I9?epXyq%fqF`(6>HBgNB=;7BCL<=%3~Dsv;TQsNZCHM2YOCQyTYi@ z#k^l-a7)wt{nQZ^UsRPT)0<;EjT#wE!2(v!KR1Gm`i`jKHHi2Li6|*YWF#v83o2^l z$~2kDuU|E?=_Vrb#7-%Ig5Rv&c;%`ts5pYs@i@i8DI~@3~am>#m5PpaeFv#l-&PgtebELZX*x$NFFFo5;sJDLR;aq(se3~zT z;SFvzW8DE!WWG9|YMIxapHriGitHt$Mc;KBjb{Q7&08Svp@XHT#aXrb*FG2I#apcT zg2l9`82xMpafd9%I4+wEKGh;G2b(Kd?6m7Mi2G5V0cl_2_UvRpLcNT%^eFUc*H|A? zn^|W|_(BUaTZjkoI&e?nw_K1+ePLX!>yRRFdBTwbvD$Q@eChICffywA5opmQoy?Kq z@P4g7Gj{5-{`*h{?3E+LhIPB~SXYYjY*+geA_gQL8F1~5vx_iy>3+r$OZ^JGw$ZwkNLQ7u?X7I4@&KM9?3ro^I@VB9qU68kZa$p64l(&g-v#Z?EG#;dq4| zL=pF%H=j{z6)-|UW98U|lLee*j}?Nvt9uT95#5YbWs8rhJ7f3nGmSKokzz(a`-Nb! zM{VrXCAw{*>_6=jLj2;EO;JdB&4W@XyFAx%?S4K6*vrCTdn0aJkoV^ET_4Mj z1BA@l-%18{=*JO9W)-@rEPgk}IhP6VEDz_ye=Rv!NPPcGTnw~u!T$4<@+&_vtWPdZbP?4Co7;vyCx#ztG8Vs!&=9BP<@iY8c24&I;&*^ z8BvE@uSbYaxaxhHGhuW(anwbycrYRV8LqrZaYGS{XJ1_?!eRtDePec(5mBn1m97h` zpsvVy^h@hj<^JD&2EQk6ET(VILcxh=x~=I4iSxhoHzF1di&SoD7D1`MTwHl?`qg6_ zGW(wXqK8}|@!a-IioTj3X9z1hG&s+%BA6ifXtC>nN1*uoUsA}+@X?;c8HFM9_DH&= zh8dQ`tjKur(8RWhQ$ewTK2x8BpWQpAg>`7pq&yvfi~GD$?Zhud6Vsj=k1(eYXo6Bg`*a64neA zP7~0DnsL$yf2ma0p>mp1a|%34r*wPm1f!(PKJIid_W%nkENP?r8vj@dvm80R$34j5 z({*I1aN;1YwoT5Sp3DMgX161iN(&Hu6-)c=wKRC7MBcy$thG!tX=9pB@ULVe15LE# zk-t>x*pqSq-pgDc&U)Ax)q7y1eW@hXLd!g!wERO9ga%%>FcYhOgWshpBa2RsKxgFq z=-B~k64IVN+k7}icqn@U)~HjFKrrf$9iE%eNlT}KE9gTmieZ>~G^z=2q(D(mkU7+U zA>Bx-?yIr3fa^M29)Rra;SQ+MkJnv%FZmDKZS;5}0Jk)*TP<`{sV!kxMZJ`Y(|_c? zc5l~#M~!qPb8|XkA5tWJt;0PskB!=JYMB9u%7ef5cHlR;`a~=}hgT%YR)K{d(^$@^ zvqZq)_Mb%2Rn}?6yY4@IcivjN8rvjZWxcpCMBwv;)bUv9Vu*5#nS2jV6Bw9$; zv$tN2UcIF}>s1B<*ZU{5@UUR+YiN|gsoiz+4R?e0Zbn%yY4fB^>c^+S7hmqx40xm* z)BzEC&jKyslJ}uy)P%ta!kOK(E7_~|43dLxboqgh;GM>r#wxb&}kVj zr^Ug=>p3Wtd~{QCVCQb=caS~&@x&}e%Sn5^#&q(5F4V4q?d0GjpPol}EQvJS>cEiz zDE}I~c$Ea2@y-ayXx1q>3w6x%d(pEh6gmuAh)%H8nwt=yVoSalqXimep&vQG%aN~* z4r!hh!e5;lfez-Kb~UWeI9Ztm1S0wpIAo=x$W;3QU4nP=c{Rg9{*4<1J8on}t-xxu zt=j&>FX9U76-K4(dROwEajo)&yddoJ9^TnvlQr@Ln;%}I)GT@h2|l#!e#ua4c*;b{K8YG&42sB9MblH&wsSAa7IJvyMS~#a+~RZCE|~ggLQ?( z%>xvNT9j5n8rRWQlfp`upY2qPvR1j_8|-FkmIL*uMcM>@;mPx({@1pmbFR43JEF`7 z+hrGFmpph3B{fZ>bde7vv}U9S`qLB|uQ$aK9cVT`Jdya zQt%_NDS(Op5L)uL9A4>ng8PW?gnyrp9)5MZG53vQb-b1xrv@G9|FQQLKvjO*rmpR@Pcd$0JcwSaO?WplLK$RoYz?;yeJlC9Szg6N|c>zB{t>nBR;41}A2 zuF|8E#+^0D&HbhvG@#(w3HI$ltk$NTk0m3VqysARn|tVX202`i8C|5wR-tdIAqDu9 zM&qD{ei5fEnM=4_tJ^;e%^CPkc1!YX+(?$bFXkYr*i)bwyja)Z{MK+<%K%=7`$U0i zu>^y5i+sVO^NaKNXn-%pAQ=O?5lcAQyxEcnT@u*q6BvUPaYny9;AdqGFd56IA6@T@ z&GJDt>^<7`C`^0%*|&#%k?XA1lsayrIg!Wh%Ysu)Q@<3WR|7|Pu0zo*A$sQ21>I)~_(D}nhp?#`!M=N2&{j|I@|%~e++#<~c7t*`HV8m+KeZo^bG55vgiSvF8N zBWLNxtp#C{ulMW8LQDL#zw5QzPZjC%IiT1W=xBMhi`}sQv{LBItj3{KE7pItC8Ny; z+kwYL%Btq&#O%|#jR9Se)lN`^^yX*-b(P!hj!0jf!wyf=Os!8pXxyuzHoQDfwM1ka zM3-?=@|nhMp|CRV$40p(4;EWGV0)`37(s?|fQ}RW+k7J*Ip*iyU$_*4b5v+}fNq}K z2tFo%O50sKJa(Q_jw3)ZZz?!xUTAEUqh+kFPyxCcFE-pDT-RCUI9r$N?ysz)bC#~bf}t^QGY<2~cP&0#>4+#G_{`YWJT zaiNdTsoN#`$Z~s^(NMCR9c;`v%TFqnNmLqtNMR_LrWVK`{#5UJl$W@wrKfg9R>r$< zFa;FNvER0M8l_aV#00dupOy~@c=g>m_v*9N)~fzZlowS(*hf?)9<0-MlSJ(_2c5(k zS1Yg*S~Am>p^oGl@sW&IN_&Pym_^4#x{cD>5+4$u3_LHy{ zp*<*=@3ElQoi)Bw!DXuh28$RH^uL~8d2)3N5X%*6mKmScu{d2VA&UwGr2ljh8mpgp3J9VjR-&DRc%&&hoSI9R z?D%%y!w_uZV@V}Jt5%A$J?+c83-k!+!64c?^9*Dya)YA4+ZzV60IQ{ZDn7+-rxuPg zR}=6qKY_hf+4QwzjE6aHXVJ-RML8ST6dQTam3%>RQGXuiZ|WOdr(PUYn?pm{m5g*_)9d?3>`Xd8Oc77% z`ykM~vOa@mRe3d@Gsq8T9zj#{bQ`U<`XbjXL3fb9y-62@9q7)hpqKlHyL*WSup2_2 zN@rgH?v_a7X`RWU@SP7hWl6y%2(A1-BpJSobmdP@X_p0F&SYu9oJz{fX~>2vSJ_`R zwOA?XNp*E~j?!Q?9_?pPo6L_4;b(L5Or|}F8^uOl#qY4#15Ce6E`^%eNk$s+W(Je_ zsZFkB&iNNQwm+&DZ_~irq512KJS{R=bYHbUmwwB~4flAq$L6D3S1?heTJ!w1Q^}+6 z$nVW7FmoVpz8uiaV7g4GL<_RgY=CTG0K za_3Z$y?c$-K4+KHCy+jh?|2Ij4Xq!bAC=a_=WQr=dWtLUTb-Of9tcqyY$QK|4&$wn zZhp+)Y%2&yIHesmgm$87ZO)yevb$f=`IKu4F*@a? zq#=9p(7>trSv1jt93D8nC2mmeTq&FTD-4zXaingiHxYi^g zxYK2*Vq}hk8P;BoMl_XcWz6(Q=i8;7)IcQ+XSmv*DN>&7?NlJ4fwYG=Ngm%$~(fU)37#~Jd0CPd3;4}t+o?NgR3a+ z$~waL!1eejSMkN@7S5BO`8CPO`^QL7mQzY&P=W%E+jjF$)={=|8jr*Hs64y-&Q>RM zNeT5*X!)9@-%*vzL8uzcJSzf#O`k~@^!US&3}XC5>Njn2oaXaa^E{57W&xV5*T#*t z+-eOq8cx+xRNn7MMX(w`@~$#%vJwzvI9w;k<3t9hY{w{Kn_VmQGc~X-2wz}-Tt4V` zm(Q#6HRE^6D{4Np*sbO#g0ih27OVr8QBzk{TG&s5u@ltJ;w(1tHo(qD7DoWQ zL_?$Hc?kpcBPeh+CXr!fEOwRMwEk&gpb98UsoB9x9`{#evqU?tLV%VkcbzbE6kSqe z%4`n$S~aP27l!fea=PM*;6bio0oo>1ax(-@EP}2=^3{q8C!F?{$j2?mwCAq}5w$IW z%#xKalJz*V%Y%pN4HlHgJDgu5{n630d7S$Z;!_ANX_4Dqhx4`2pOzxl=)dmnsSzh$3%amN?c#*%1hk? z_ToK_*52;dF26S~XdCDIYPN@&Ez#9;3I2kM{qKw*5JVonYb0x-+@l5c6S6ocp5k@k zj86)psje`2hx{qwtc-m9bdE zFyks7DJ?&B%6nTt=Z~<|a>FIF9lNWvJtIxCQl$y1wbp2GWZs!~oimd`r-9)wiC>Bc z0Et1@79Es?v!>xQKI>@SIYMJM*|U5V^XIxi*k$DL<6Ltg5I6_7q6S(-ls#W7)oME) z80q0G$Wyx$6(Kq>GoEd7+!tRLrJz0VbDqp=@TO8}Lgm1rSU}1&7OpT$&$~AMB%I6T zjI~IoGLoV=A#|wtgH#l=$T6ZRq&9My<$pYO$BQkupR#3=L|bl7#3}AKDSqEDUiu^u zCFr4(RewQ(=MdMt$=M-Oc&opzNT-~e+J$f`6-_sis1Z5NP3sTjU(QrO1b5~kpQdVD z@*=)(Rdu4}$$LJ?PdTk5t7QxA9!{_`=@_!R+~YC6yWbkQj_rYtaSL);;?fc`Ys!hiuN0OV@is)_=xSD6Qs0yf6Fsdn^1lSbr? z36IE0?9Ta$vNf!W)!ekJxyW_8dxeU7f}nZp6jND7eql}MoZ zhntN{3|M>p#)zV7DBuaw%8iAX{VOo)r+%L6u^URuHMJK1B8!FI>x0x#d(!G+!?7R9 zoYM<%5rT=g2_)qGw3;^(9wDP^+Xmy;;1T4MAIV%4qypsVioFe)wgI2YJcZ0o*IHYJ zDU0VRPkd4u-l!hzA6j4T0mgIh@s5dL3~Hdif7rTp0d5>T2Q9~YCN!GKJqkHd9P zV7z3p_U&|qK}LTZn?`}&SH7afvy0>Hktt|9I62`i*s*coZDxmg`6_^--9j-DN&dO= ztH+2x`pq)3UuwCMq!-VHr}H*MA@`dH;HMq00!E~ovtKh+hx5J$dUw1+kJJeSQq0Ev zvTySK?dt)|D64iB?#{OUPNbUl;O|6PwDSr!PJN`v)CP4ux;~mQ!06)3CRPbhW zt5QHk;FJF6xLp+mC;djdRogOMAxUAM@4U%8jkn2G)=GYZ$^0OXoheBdp9F$+^_mmT z-bmh98`x39ucZ5TnM$A2i|B1{G70<9`fa`36XR2<)EJWv|Y`)!GJ3||GD`m<<7KEBkhP6PuwX_-- zz)(m3pNF!|CYv_eCy8 zDPu>+$FrCEqhC5?g#{Ep#y;+741V?KZo-4#A@>9Qss94DetrEXF8enK=7wJNKh3yY z95g*cfAeH#_6}q1PHAW`%)ASQ)|u*Tc6~)S17_4hX7-)xZ;}>W*~F zD9pABf;GtiuoT!Mq2BLKm1U;K-T4||W4!S?_i-Jhn?+j*M`(?AtT+CuqD|pAlQ{s2C}NyXS=~u;82?(IO&VgqMVZdKn&MNIkIL-^V$B z5#u_Vm63XMBdO>)AJGx{5{0->Q zgu}%1(*{y)d$fq144-HhO8BI>U!$jFU}LhD#>{it1OM7{tlOvuS64LO1h*1MOSNVi z#VQLN)|{c$!hgU$fR~ya@KR%G_Ne0vS+KU*>ra+O3ViLAQ~XQT#or9c8Sz&r6kFrX zKfH1)8wF#qb51NL^+H*!70nTJ7vLZx$}; zc7EWDmEt5QsC#fKJF_DX)8bb}_#J%=dwK`_AlTFE3w2jL`2I@&RLI zEiR+Z-2D7Jx!BVMen?!;PeV?&gkYKOTX$W^u66=j3mehGMe1{G{x6ImK)HUEBf~?0*v>t`v>8}_%ul~W%`de1_&+0scYiJo zocfZk02KQoWSHfl`^bH7i~lG`TG;~djQb_I!;ZHb!r&F25k+djMFZ6y=` z`{;kroSy%kkl!WizZ3Guw*2pe{9iO7==Gny7DgLBk)fbGy#>0p?-Bn_J1D^9|~H;ky~Te~CAS&x&I`;F%j)2rcg|F7?P z9*|gA;BbZjoSoO(|8Tbgcj7xd!1pD)f{ax6(%L(OU@sD#EWrY3#fU?eKC2)=@&HcJ z%devy8oJ?SMfIPbfEfZD>AsXQYB646+bB)l38;buAA`FcRtwW-B}D4QIYV1@e&4l! zEs)W65EN7g^JP1BJJ8iozGjjXPZRrcze5~$(sFaFoqK0H@jXy4-gWe5Rb!o zHYp|#&TvJV5Fj_10O|G%vQ}jx4#}x>Wuw(Iv_G$V(mUO`r|90l?xmwNBIr&hm*|GV zGVc1|gN78{dx!y+IEUC)*a@4R!P`unqp$ULT$a^zJ(hJdV_3bmGl*7yULQd3e?#>A z+q47A(IN3`+8q8hZK)XZ0?oT*sf5C~=Hg{xKM017wc))@D=%%@yY{UpYo^`@riN6L zW%w_9zJ0rP%OsDoF?hBh-niAK$9qL2`%^bw;VE4Z5~g(=k`7lV$rvOI&+(`ynw|3 zk);KCH9Vb%(<(-hmGe8#F+Z>SNvU{`z~AQd5lV zU@4K&0gDle0&^HdCZ9yd!RBZMbtXP&oqv|IDbTCZ3U&MNjiumWI?xqIb^&oDRpVC{qL0x7NNsz!683Cf7n0`rf$7Bdt+b3-f zveZvoj#-LziPmiUHVtBZb6a}O9Q22_;dk>(A@Tj2LPA=P>-l}kC@7#9K^tJUE<1o% zqi@+XsZnSlAjSuCf3wg>up)i7>aFm{h9JcN!V53=sl2r#xrDl&oJl?&_O%dw$HFmF zr{Jka*-6REJaU}?+U)rpyS958vO*moPCN1yJbs!Q(ynYTU!lTY|!=@R zG;Es|yEe2-L}q4DltI}$$q)zdoi@;j(#iv!aGSwgE@b%U+|&@;Kdeg;DqsQ>Bz0{q zkm?AZy(|VKC@}+xp;L^A=vY~#0z_1s2o$n=F1N{*OJXn>J@Hw9(IDFk@j&6wFqqaQq%b5~v4+HLbH3r;L2sh}BaDlM zWv^1eMO8OQoTbf#rqx`{N2O z-isf*WIi4_#Oaeln~hZqZLe7Q$NcNN$O0X(+08nJD&Myo&N3COX3G*mzqvQ{49pMY zCt;xA(o)Wje3SqYO)_FYcXQuEb^DCw&U(suMSF27-TDMWzKA(qE>m`G?uD-&@Erqn zP-Nm*zw~hjUkq&4TCva(GL>ft38Fm3u&-U))b?$hQ3*aM*z-6DaF`@|xg+tFkvLj= zY|oPqhD*bfe)zlY;91i-{G1wt*r1XZcX6_FzC=4XKFNWC@p5Am zDRm#2%$8I;KTpQ}$G#=rd3}D_l2O8Am&W#S&^W>WyCoASg|EtlS)-h5AelSvEO{iR z6a`+Q)07R>e>q$<3(3{*a!}4v?BM%3JOj%WFg|#qxz|N8%`dI3A2&ipjAoxdpSu_o zVhdX%g)Tkb4jryqjc%CVOG3O0)I*6P;J;*~ba@4k{ZQNZGp7;F}So~sBI zSK)GvP-3dM_p%<*%)9;&mt1Wa4Iw$##+%nLE4k{^a9(CqG<*>%&H2S6AF?HPOfQt6 z6e&dT^RP3t)9zB3c==dT^WwtS8OB1_ilA4&B;W*Nh!?yC;Y#?T@8s&t$49*mq!K?_ zr=K($hj|!5)2U!zEnV!=(08;7y0noCmMp3ya7ck;RPV7!`>3#0=oh)qJ%5})*>|+; z3nqU$;L?jFHShPM6D)hPV6kk#<1{&I00q-mom_;4LX5iYwO6fz;0uP()nVKib^)zkJV6G z_B_A<`Ss%E04j#jZ44WX8&*XtZN1_=-1AUvvp0{|ZsURy3zs-BB3nj8mRBuJqzAEY z5fWKa8ZGTp@3Yl7wRZe7ynuCG_Petvt>{cgrBlya=l!+US%Y5_2`lNvdlacvhtiaj z1)W7*IFi%EAt_L{aJnwa5MC-!^w;u@J_)LVb*fXY30ise54zX09yUBVlXX@r+2uIX z`q8f;&U705B|I++an&eCf1Tqvm!y1-60c2PE28I_&#I0!d{jGD*CJrCVJK3s6EmNw zvZbVwjS%6l#+@S-bP@yNHR*k^CGzPa{(0|OU6m!SK5DtTx*BhvfXlgsFDjKQCCF#V zk8ZAAcwUS&X*b(NC%3r1jbk&+)ULCUhij*8?EP>O41N_`it%iE}s>jYwaX=f@3PU}Pk;1E^hmo3mCfn- zI`_tQl|Ty5^%-x`p~aD5|0ievQ|5?E`A>E?z~Ja5uKgnAZb^FI}35w zdV_Q}v10D%D2Fwptzo(qv}1QMtkNz$W~AxWJ2~!`ubCTlC_OP zIsR&38fZw4@olU0wqmk;w_1*=f1<^jCpI*@-PT8KMUKI~P7XC1Ycos3FsoRiq~L8j zW94eW@?y`nZB%H~;Mi)D3WZ5E@33U!ScOSq=v2H62bPps$ldxLK6v;b5A0if$DDBA zbOGf=_cx9Wk_0QgE>rI}ZC$zxcTaYS?`)u?tj6Z8(uQD`MYmxc$;MYl_*R*Wr>1m0 zQL0}%-QhjWHLXdu+m2a(A5mSQ_x*s~=pCt4!po@|sax~#^la191&0k>Chf3nnTxmx zDrq`jQ*N5WszvJ1-BA)AFei*NV>O7->M9}b=;s=$>{4ei8#>a;b62- zPzCOs@RPIQZ*?ucL)&Dbl|aaUzk0{~a!ir(Fm$(BhW@r@)Iq{;mCJfQ@6`K;;@ZX_ zCv&6mPYCARtow0rkkH4M?O)I{#n6O7yhmMaRChhiN#yPrw5`$3J{}JmuZEeW)VAypa<@dGk^#SmQz#-r8g0wYdaWICxNg*6$7u4HT7iHmHqm zTa=35)J4+Nh89O6;%3LzSvMqvU$>Ml++(ei7>Ib4m-D>+!O@wHhflShRNjaT=S6pTm2ESD*h%lsr*qou4_cd3yJ5T%o=35lyr25@^tE27-PjeJZxS4uEw5!?DeLLhqJev3>>!HNC$j6aXP8Fklw zS656s7{FkUv*?myS=|&oS3Y7{BKSq|SSwMd1!lyKB-uZ%P2d~NN_7?1l#giB=-J(; zujg=~oS$`+*r9K7CHsC+ssS%ToZUM3X)X$E&2F}qN+vZSUWq`c*Ir`af4r+^P>%r2^s+N&SmeMQiZB27HvV2HV@ z1&Xl!(&VFT;s`J7>n9ZWVnwgJ0I$GKMahsg4J@roDKx-If4AR44J8 zO*u0W8uMLRbr>WFijt+0#>=UzU<^M9L4cU^ijRU4SO@9mgKKIqUYlJ}@#8pc)+KUP zt7Q|`+nv+BHaDCej?P$&Wz>0NR-mX}XgQVZ!zYtM&Tp<=qrG*Ji+CDEWuugqmo#Ro zLMP>nUvsvf+dtxoBmQ$bm9eYAuacdb!Pq!p;OAS(fDh60zO!=aYOxH)?&XlPpmJBR zFmLeS6YVz`kVm(&{tT`B+9gU?V%5=G89HiZ8Y>sy+mW&m{P~Vt1WAj;T7>V4l@a|G zqXf*D#5=W+TL+6{h5^{{;3e_$(zvS+B6guDWl3P-aj#1+Yog8G=>`~h(!+#a<;8{= zUaz=ae9lSEU|5uMka0eV?RQnHTM?12nk}t9lc1fq>IkPO_9#lnhIp;uhJ{sL=FK=i zGmrBlwDa?e$d+B+ne!oQdx=4>xLo^`p)vier%C{f(xX%9=!E#0PQ3ulfzJKrMmhZh z)in0dXe2ru)jbdZ+$?8GBSx~MiS&F>q6H!oB1|?+eC*B9PgM$T)84mxM3~B8J1x?y zBDr&=GVm#i)G_N?IOUc*jhe*uxvl3{nXtR12rMcjsOr+()uqEAh4SuKBgO))yYqHP zZM|Jup*u7x(O$4Bo9{r!hndN_HZI|vh$t5c3Dr|o(o}#{>~*TUWKVk{%V6p8Gj|x2 zoxAM1qv8-aCKNAgTQo)AALnLO2Bzf}u$AKHqRA&SStw!rlWxJ5|9dzJ) zUWXsJ*}YF+PeTI&tpsC#xW;vJZEH%W&too1~!u+`@$!=13T=*HgvPN4w>p zDQp(h8tnXd5Kb{AB(T2KecXXjt*uAXu93<1)g9vJeUH`ci2*2y5kXT1AqGw(L#_ukjl(p-GW{HAo#Oe%?ALa*Xfi?!*y29hpOqj6{r zf?`57tR^j3^Y?}WwxqO-7UKw`vJxK>M($p3P?Wo5K946;GNG#)yD)!bfJWt<97-u| zg)y|<*kB_Fe%2zRBbPnYr!?3c93`#PqMKCz)|VF)*@Zc$!jSvFtBnb=-NCi=!3*>W zP*8RHWqt`G&|vR+m!fG8JynQcWpvOIRet0wrg1fV*)tb!&I5Mw*s0|>GPai}2tCde zOQmX3;QaDCtCzMhQC(_=V)UW{d2I@2LUwU!g)yBVCK8HkNp{-%hvc# z!evTKd5#QEYCaDEnu!)Bk(jszP5D)YOogfNS|0bd&;aaR+Tf@|CwuF4@0dNgO_8b7 z)Pzzj^BcrYH&NzL-3&@FV>3vH<}q&E{J29d--3n{;GnFLtrf{yBAM836fmU(U+M=| z3X12`{jYtqTJHW%*6|}!qVi_u3N@fH(Uzofhw%2h~)t>*UTnD(W#Ot#6v2&npK7s4+ zE3#8Ym)aj`{}fuGcP^Sn)$dtHiX*!m$pO>%I&eMzs1#zON!R*K6eD%^9|%V=t{g?5xi zG`?fZR=Zn!0(K9d?vAB$TY>TPQYG?2JT)ty$dTg2ziBeud30fIWF-gp00gr??z7VH z-Lc>d=Em?a<S==0w7HFD7max=h1&SHe!ftw$R;0kGMZF_%{c9}mVk9ucNyE10+DY;Kpv`hLk$onFSs&iduZRP1{FjJzq<3$j7IQt`!DR;P|17**;1fd8l0=%vhf5sZWZTvO<ns!D85!E#?L9G^KE{~2HT&<0Np>fj_EmzFvfAQq zY$;c+3winpZc08VQG-mOpC5Q_Ze^%N(YYyB2?E}TzdY2$Mc3f^V<4j&Jy*8n+VT3%LzOO&hM46C|ID8)OlluWfJWP6iEkCxsOhD4{79{V`L>8L`u$`iPkI>Q==@u1Z0Pfd@2Q)M&wyZLCZwXCQlVQ(_7tHbac^x!PvWhgl4}#6IEb5(| zR!r)vt^|Q21qt4$u3n-v{XAx}8(N3%RE6rE+m$c~jHBwtb+0vvHtpXojl(-%!w`dz z;hXMY%);ennyU{_@+c|^h>8SzHCmI@5_$E|=9@3NP4)qQfT|EXOrn=xhPCz@eI5zj|!UDc9}3eQPb6-TF^(0qP3hUYUNE z;^<~jBD2lJtaimX!o$b^+-aIhr2Nh@$Alczx}>C4afhX`^jh)iW{Xv(oK3Fhz4?~o z2cl6gB=xF->4B`!(8G-(>0{Ug1qcM1DYt*Tv(OZqU;quc0Q651t`D0=nhg$3iR}rM z)ke@D6r65pX5Gg0b5uO&a=W;J?s6NVackpr`5-B!cxcXgA0yV0*~bdQ;H}YgpRJiH zB6jl&vtv!)8?H|Rmdd(GHTJViu*2&&PW?}2s?0@uBB-*Q?M?Fa+y1$>K=YoKiVqmz zL_H@f+&)H*{U514(i<_SH}kI_Z!U*mAK1;QSq#VrP`c}CCzCdcbU8m_110ieXI&O@ zA)a4A=RMHFPv@6#RQPo0YfWu4Y*Sp)&!V!m-JPxBFPoaq!xF}x>ipWz6RLyyDe1}< z&MvE1^I(s#2Tg7&TI96_H1hvOr{n+uBnXOH2ih0Fg=E%lYXF2fWJQhGI5a(!)e#_a z(1Tgf?J%Guv16SKws|>R-an>si@_nUr{rx*LYu1De`2oPDCo_2Lda#}vDD9TQop(N zIhH-^RH@ z$1@-^lu=7zdf|e*fiqKvkzUzW+<0s<8NIrB0@VQx*rN8PqhhFuFfH{K@drH@0(uQWE#Z_*nqHkGuOD^E%2eeyRZL&o7e3-1{b!6zf9MCN<-#yv@oklS z@7r8{xJ|QqL@=UMz}$ifT{;%&aOQIXN+iVPE9MR+aAL?Nu*N)kLMSF4@?5FQCetY= zWG7Fh&(MTOO$d9gZV~7X^b(XLS)f`{@wBb3#QB(RtVP#SDw>s>R1=q!R5zZ_;1Q!n zeOrD~NtRC1&}PCQ@dun5l^m{G;GjRo-m)A_;w^DV;%f#K`DW?eh4%=mmPJCjkB+)U zxwRX5a+}UMH_WrPQERkB%?@kNwv-eX$QfxQmkUp_p#zIG!&T>6G!lN>Qj$y2Ujk&d zWPE2pFK;(u79%;@lDe#Qjw?Rn4+kFBe2|KnB7sNAWM-ddesrrRpKvYRsnss-*lnUw zAnDV&A5z?<(4ZH3!pkt(L-Z|~=%j{lr=&2pUhi%1p|Gv}!|4ugHpP9!rfB#p58qQa zOhe&USby4;6#f9cDDj{OLWor7?A;H=5F|MKOi}ubh?qNLq4_9W&;DS{pH{LLA>39G zf3QvA8bs3k0)*9*{8E@Tu8*Ig&#C1k`W)uAaG}s9l1vfmre}lwz}*q&pF6P0bQy>B zl#~yXz)nx$;%EzKTv{r6a>%1r0**D-U`0urZEvUS$g3i%nJ5NFx)buVcRaJ$+sHk? zJT>5n!=Y7_|MJ9`R+ZuUxgcO}+U+j5l^Jgn9USyZ0E%Q;L$f(0>InvkKqgL4q|!=9 z3_D%5eh>-KaRSs@Y-sz4D_p4i6mEOqauuN$SflaO5F}pqWbQJt;(BL5yra$Tsz0xX zKW#m&A3h^Yi~0!s1 z`W;-7F^K7-{~m3+hgACpz}-;y+HC272z(}iwJ8uKpQ3vZSO$HD3r4=HCw1yyu>IA4 z(M#|qT{1F9I+6!s0s=RvbFjaT3@)DeB~5iEpbrC_6t&_pjL&bpAv1jsh@S`EEnKhyH2Qx6vIJ*95?4~EY@*a-^yi8L%U65rebEY` zf-wPqMZ#+Vl`A1fp!$-`4CfW<@4`X$@>k&062LwG2%NIe)jzfRha;WkVavSBiNYz# zVnMcYp?b*65K?o_ogf~Xc-6b}uXfYxzL(1s-*MUeZL^=`)6-z!( z(|>f8`EXOX=0AK2VlKxh_vah|HX9e-D7Xx7c4k~9Ehsooy43#~q;2y}MM}>`E1R*! z`faBuenrOIVCas3pH1qkKf=M^j(*VsqW{0r0)!dq^Z+b>01zHWI@*l|+ahZ2&~b|! zx2~t1)O$hLFsg4YX)FFLNdO)3>>&a^%I~({9`p{heTx6v%zs(32vV{mUC){c zSZtvls)euN@jBRbVNw3Xc!EMf+H%h(5I2x-)ydm=V4?X2=S6ZZFpl0uE^ktuu7C+< zE!Q7H^i1@Q&YVO0J7A;bZ}yr4_yCmmDX|8fC)aP8{H`8)I}&O6)mRJTTOLmcd8}dX z?PFs|dIykn%_prmdf$X~+=5g0EXl5jxQkiVH4^J|Wt{H6Lit^u?jf`RyTj#Ks%Qre zQXSUY*H@F?DM2hM6tTgMMSXdgm=FFV6G;dnIW z{N)OCmpDWR&iyb^=HQ?Vwzig#ZdccxW$PAKS7j^FKL+{togpzAOanm+3N0kmf$oqJ z;A#Kc>GPK&fC=oVIfTE-H^+Q4fPmf0dtsIt>&^iRD>!Da~8S381Vn}6?&Hz5m}4=ucHKM{y)Cw-7hge-#J(O56Rc!JFs{R zzkzr@4gVW{_CNod^v`F}Sd za#&n;t5p2%*GwJHYo^LJD_m)XDm{YGIFm1ir(G<2+8Oc2yNTRN&SCnb^?OT2VEpKT zWbcU1)6&_T$+H>Gu$zV}ZS;aYNmePGAz4e5i??JmPr2N$ULYboiilM+luDvAsBA)i z_J^+>v*OonaQnC0;JMx7M@>1wA5%tpcuTfU*mQfNU*5+(loDC@`D8S4AcmBr&!Ll3 zOHyY1uBZ@49I0&?j1t22CTF*~y5Z*~_xMgVugR6crFs3qRKmr?UV2c^3OAu){Rz2g z@klP(WG1+Jvhkur-+2{3)s!u8+8))LX;73sWj9tg-CxUMrpjKc1e7NQUvs!TB7~rp zHMMzD+Dt9Df6tRS$%IAitz|F;NPR_abUqFUA>k#^bC2lor`6AX5=Cc#5`as8bsOT% z^`6~=MmaO6vf1Ny;mF|dCGNM5K;;h~I7K305+aG4 z{RDJ~VCw*w!d~PdiMs6pi~YqR&<}ivRL{oqiN8^+np2)cb_e-Idi{G?wbq#JmZ)*( zmBV?i`PR|0h2lV7m(gNXEUdoy#uJB(M9!)VH)Z^-1KkF^CCjz_q$inKIx|C*_+Xa6 zU@&_a0WxGU+XFQ5ncTxc=HKk;kV5YgeUy^I0mjELvdHB?KxkAm52b14Z#>Ht^XR~B z`9$VqZ#}1n3gy*fI{Jz^+X5T@zPzHN6PN2!GpJl-Vi3T%p!XJ8@>`*o%P?C*0I>-)aNlX{OL>Y=E-ogg9X-*u2r(|6#xzc|^yv;(vHTmI81b!FAw zoH%Tyn5bmdk?USc%jus?-Z`k0y^1Hw$-S?XTuTJ6y4< z?{V84;^LCp%Fp0Hy&4K!pL<TievGj>l2riX=7m^*z%A#R{9;sJKM^3FazZSjoh5|QlzmrRA*@ja&&{k5Cgu8* zMPk)%WXo1N)5Pc@ie{muS=j;a*vk0+m=QEU<>h#j4#O0(P!0!Zh`mVLM#Yn9Nzh^= zCEoby39|*2=B@P-NmUX=mFX+5xhs!gW1(%Jc-toLkXsKpGeR<9s%(lV+0a|X>LU@? zZ7vwR_12xOpF6LmlE)@zqg>#&qFZO6D5L2Z@8 zj`bql7Jj;|M>!ltF@QV^les`qLx40aQIzh3mt0o5m-~BGxvRpd#SZ36gi5>+V6 z5l&0fYi~zF7cLM3IA5*suJ-|$Y%|4i4{qyg@%S^GA$|@Y05g%KUCmz_bYalO*^o(j zA@`LNV$dw+q1)KXfWKaZXX#-*uo4_wxpI|FJkhn1ZRJ(oiA$$ z3K2nu3kWo?Z4oednNZG|BSNZo06gjl2v)3JPb3_r&prI!nFiUN$9Gy((oAZHzBZZF zZE|NEJPsJik(Rcw=;WMUcPi0s%0Ai}^>^X_Noz?W=q@DC+#E&WWFr;!ZU5mnvgN*p zQ@BETrX+2eBhjZodM{qK)z|!dA~X2nqF4GW*JtEShx=(FTWo{@&oC@o!O4rW34D<` znOy!)xy#4a9a3^adv3?2rM@y{ye|{zUQE#m^t*BFQIel~@nc?Jv<-U3`d)MY4TZ&? zB^0T#bdROHn6*>ujLY4%>$HV+@MKnNE@7X4;J7oTD46T-Ndv<`?g2POAv5Sx7!mDP zumJMahv&;_M9g_>Am26b6p{GI`wkjtnpZF3&^C_)oeooL=ZztmG~!HqS(YT=|Qka%t5^g&}~wFN_v3=b5|TBpGT(|BEB zV?=e8A52Pj>!!;vhNh!YdSyQZzIZ=?OS@^hQSpo?|1G*ytcal0Lhe%Y;fifOUr%{> z_KCJOsVXxsT2aD4wFb%1w3~0UhU0=oiuvjmskG9~6J+y*t*IilF`YAS&TlFxftgMD z2G!g82K{=iEvMzussg#uf`|sv(Vq-|)>8RSXG4(-QlF~|1QcDp@>II)zt}}@+OIO3 z>9sV*!8i7~F-y_K4T#=9X->kO11-7=m|7_xf*u)Z>RY49Ph1N^NoI&qebfiyG-pgrrP)`3=7?C(d|XKIEbLi}bc z4Elt0tBu5D6WEo%_?(>_A7>D-{TMk(YSAP&#zdgP!H z-KuPS$ER@G2L%qFx;0k?jHuyX%Wq9IaqdjJeB!CJ6yBMs%A{5LI0EOt+=8}?!-iiM z;3>s0w0eB3`|Q)5(kYi+H0#jqi!s-EzH@oHEedWp{vm8*I64Nnu1DglwvBH{J)l5` z`WIStem_=sKD*e#CiCn*o;t|VD_o5k=f3OOrBM>ymd$6r;t!P@N-%ys0e!n8I4SSN zPJVheHByD!RBIDnK4Bq(*bEaArw+}2+=Zc#im4o}s6V(E^}=+oebaogI^!cggQYvI z{uytKM8Wun_WS0MDsFBC^=sFgI!SSjHuXeYWqqJ&*3PvP;dM=uo-d`YjfeV~ zwmM&m+^v8x6R9R$T3{dkNM4Y{>n0lX{c{V|B+|XsNjmtEl!Ql+SB&<0I*jaA;C8>(&$DQ-a<2{@?YRe`n zAB&xf86L|IjnaHZ<&Yts%gbI4$57$q8C$wzW8JlE5*4q}vMUf@Ka7S$M-^qG5CgLg z8jbd)?)nTPE6*x>>C(RA!j#?4+-kwjptxz5KBIR_K;*pwWT!ru-SS3AMc!huxN6kv zGPa0!c$#e^Pw1TWsIL-P^+(}issAH1lK11;{JFX%9Kp}`KUYgmkfL}tT-LZ19(2s2 z$G^5kiKYd&<(~tkZja1|ZU8!(pul0LwK8utPY>~OtJ(3hx_kGxa~P?hy9^-h6LQhV z*Df`hqUX(y`$A?6v(d%i1}we8>Q=uccTnT~(hplw@h$Jdd7?@6_JkjqJGtDVo5PL} z5zi4V=LQ~}xD0&hKc8{PZe;v?2ulH<(I;K%7dsI69?zhvDm=gvwb0_Iwv@4i&!vmR zRfH`DZm`bGImmpDo~4y*6EQjbG03<%Zr>+BVzTNhHR{2*MM-s zMV5g_n;>qOh9Z!i=i?Jv;`nYKbU3v3v`3&vcHHnPkKyBSlWNeiul9So+k5wzt?!!h z5U~#3(1m|ooEJW+SSr4%KJ!$RCQqF#0<(?P2sl!p!fid0m?xKfb&HzK#8Nm--T>82 z!p+bA-uTCl{kD#LA5$UpdM^WU)R%_41 zTWkrRXC*cse&KP$JO@H$RVx-56nR^x98LzBAvHIi>{jErv{#4mjp4MGMueIybhWlK z@wOOVlxa?~>*ij77B4ryFM`y2f-;+*dAi(vh{j*&b9i{VsJQU{a!olzMrWZ86BiR} z4@37HI_Z&^W1mCX*Gxr>Dqo>zJgzi{t<83H2_m6yE{yqq+WYFTsJ6C!3qd@9NT`4y zAzdmdNOz}5i#YVqFf@uF4bsX0(nH74odPma(nAbAgmer841C-3p74C%`TuwQuIuHm zb+H#~KWnqrUiW^U`?(*MI)$4H(!e)Xg_j2D&rmbAEJk%DC6l6?lSF;Ow5iZD26}7K zlWbo`|+nu_1T>7+=q)T6TPG95`A=;pY1x#4ZOoxf7l7vYFBn_ z*_q>7zGt%wB8)k)GR81C`v>8-C($%DE2JbLYIGkDkMKCN!Sq^EalUK;-ccjFYab@w zOkj*}fv79>;7ctx(ZLD1#|z+ulvn23QGO1b0{q6@0)or!%_;|}57|GVUSRd?q7WOr zHR2@Kx39L55JZLIJ068`uz`dyCtCFD@WB!;VHb-#F^kWNWbB#jIIS=~q1jon&H#^n9!_W^yE#y@TDE1Nh9IdADwtah zHqg={#q(L}aiV%^S1HO8O{D6G-dGU)?HmVz!i&x>xDbVYwE0h!mY6CE3KS>!$^l%8kG$p+Q2IN(UfF<@Y2p^j5cgwFh#fp zQ6oR{MJ7iM2sBH{AofxC|Bz?d|2^14_e*}_q-*#Ch>d{Yi&mX_+a*;=V|I(!e6t@p zgeyHdQ5wteLiO@nL!F#~E`)cuqh+@+@d9L_pDk5`U@3}s?7K|JVh&oDhWU3WGz)s?` zDi6<|c=k6evWHA>I#uOr1Ac}OIwq&`@$Dbm%B0f`y8SA{P{V6yx6O%%=Ak_Ker+R_ zxlmaN8@>&uVzJ#2r7-WMH??}Tyxk{HIDL+bSi@Ea+T*?=3qc|^fQ>@w zc8A-bfN-)G`-0VWq>LLN{mWZxwNwS17Et(qE>3?y|V=r)3OG*%!MC*t9jO}ncK6yA!x7FA;We?md>1_b!RvnPm zw5DIAW04l-!zJwJrWY&a=Tdto6;M-qGxYGj*z?`NjS%aHap!CC}H;b3oiXb$MSa z}`4=?WM+4c?%L$T4ByY7b3)eOnF6cwzd^)zQpaAP_=;*5BwDm&UaoKc|eyj54E70_svojnN` zoHRD{ruBBS#KU~k70-&r$-jT06uKA9As`JhjCXe4A_tT=V?^z0yglduw_#|t z??-8-2rqz%{rvr;@Z5+bHBun<*`DfqCH@i3u(>TxI+K^)+r$S4-`MWyqF!PJ5@K3B z-c;r~QFunFP!wwBw~6PYEA-}r<$yyy*I&kleL0ex7HuVtze$DWG0Fx=Wy4{*wxhxB zXEm><68)uc&}`$YZol}h-u3{cKAt&yiilDN8UTM~6kSUWo3rvJ0LL zwLQ$YT6sBSOv*28!*9qwaEoQR2g||0^;?o~@tziJ?_Nt2(8yo+;kGE_Xs=YhG5Bjh~^EK+eCBW}G{TD;#& zqy^qYqmrfs4PWoi8R%Q(0=w~enJ9dgM%STI<)cvKxl!%MW1o!+eR~L!?&d{qD4BnZZ+G+- zQTbZd?RgVeza^i=NVNO-pa6XExZ_s%-9~?uK!a2UV_VaSCDG_KmP~c26`;u5YbmVzX#& zD}+mk`a-BnxDe3&u zRT5A>s!lVqX)ozz_E(}T$fkvDnhpknK?WoO9$x#?BgM|lg|-^RmDcL<)q~9>B9xz z@;c}&t5!(Se$m^cP!sI60+JfwgF+k#Fsa_j9E)M>9&v%Qjven`*Qv13ZO~j2)!?Y* zA#1PKTZwQ!UwFu2^?hj#-oGg|aMV6#t~3%Y^vc=4)YEMcw>gP9DULo{i zIWNY2=y)cI2NCOjUrn?M6xVdtMqWpBb|}Q$beKtU%bwc~xj&#yxE;K+ow!-~YT2eR zW$O$ARHxX?Q%VTy)hKij7Z*n!qD%}bEK+sVAbuX*Ygs~cjnD}`%3qFciB_NAKYdw# z`SeZRDvb7BT{HAoA|FrP3t@fjE!&X4K4}JGExijj_+C!1hhET4XKa3YHRW{5E}$XyG8K*-w)sJvx|Wqn+3x$9T%M@K%GfDdm58~hW2;ELYzjGGLbU6$c-_aO15Rb z@)t3#R}_cE6w?=^b)`=%t3_M)j*fB*_}39Sw^9f}XSJHWT6?G8CS6A0qvP<|1_-1V z%2K1-vMKrY3=2rZ)WSUvKJHe!PO>`-v;(!=^7oL9jgP;k>{g@a%)#|kU@B@*Q3X(l zgR8#{Co*EIF}CO+52#H$t)~J!zu_~yo68+U_KWTL{K!F~yizeAp_oxiU#;eV{M`eF6Kli}#l;riomdF(CxGw_1QloeKkhu{!~ zLE*5ID&y{>34O^ycQHC@3YCP7r9QdR$m%7tu@Xx;V2&xEw$z*G0kqHL4;J~LtdO{a zY3_#mvIQc^g-ed;eVWsZ*CA#Wx2Ie5UDH-V;^n_B^zrCQ*}b7|Kh~g%m=#wdhKQlV z^Ap%4X*R6B>`+cmzJ7>oF$cWtdf5r(Tq)x%b0Ijmr)Kck0qDktt62Yeb3DrB1;ezb z_JTu_(T8f$RGrXRmNGTVr6M3sBA_)eq(Kt5p=y?_J%qaf0?zCVeW&g9Rc`l@M-KtE?5&`+QT38~jy}%) zx#Rer{xQ0=lZ4n#*(#vH{YRY(+Irp;A!A~zY(Si&-tdUC#>wvp2vj1rI!*N1s=aq` z9i&6BbHPaNQUlIY<%9d|0$oKM8%Po$=4rEYw^ygUzIw{c*Zj2W0C4(!s_rUc1I5#9 zm3N-sC(_$`fbke(oBl>Ve|~aAgdEApUou|lc8bq10&yIXvH^J_*m1q^K8SFDm~I;b zIpDMLLbrfBu~=%(NlwPu;s{dw`y!Zh>ENh>zO$EksUb>00k3#e1~Nb2>f$+T9{@A6 zR!sQ>;*m<9-Z}gV%JP1KG8=56W$=f>OkOuUzsFm&o6N~^$t#&Aqf&AOBriNab=f!5 z-_d25#-`%}D)<~w&nEk+UpZ$tfUz5czHF3J;c1ZPwvd5ijQvQ}FG>$nwb~06 za-am=z~c6EH-35w^-)u$wWCvby;E2F_wsq?3CceVFkE!pppXuk=v~S2(dy^eUZ-X% zA=v75_ynHEhwM&sL4)=lC3!8h%|6|I86BQQfEizad^{FGTxC?V?Iek8*Ami7WmNN& z9+j60ME9wB#%bqR;eo(`BAAxj)SQW>8rsCgnpy0TbRt@xm|LL!Sc+6}e@!`ChuN~n zftUKJxt;sb>-+^Tmc`Ht6Fi1)A8dc48I%umMg|Ed$SxPSy&ldEHP5q2P=fod?djSe zzrlrVqqkDmHi*HXhP~anHt7O=1pM+tSn(YG@mlAsNQ(_>D z;ANBZ#kusS4!>PE#hzIY5TjaRj_+;khDCkv-)@NsuGSow?vYyGGst=EzeQ=P`L>j^ zt{&789DRw-!CF?`WB}Mv5 z-IftaV9h4$bzjoZ0bz7q{KeWGrPKT`4sb~yBmIVmDD@gq8Tet%wDf19Z zJ)e1c$A6x?X)R8UE1v#23J6+dYQy?_RD%s`P67(_3ZcH7oN6MjtFd1a#V ze$8s|C?)+PSt$~)$K|n4p@4b~?mVt;K%YEihMlB}J0WeM_Dkl5y6-AFay(SK&Jpz~ z1H`Ilu#u-Go4x3l1<6jX{N`q&l7AN;m8}4D#8=u&cN>6!F zx3d!4RNxiUQ0B6Mg^kF{sGz)7I8G})*Fo=&UtWglvx2%xMEIl~=bhEECx#M@tjRvq z(&(Sb5TDsHfTF9HaAo<{P^~qqR!jZSlBFBdUzlNu2V@Y_V@=|DGSnr6Fa*P;7W9N! ztJ{XdNyg7^r8wSy;8{+xcJxM|!>dIN%2q#Z6bmm1^?Hcx9agf$Knjdu&zX^?9dh7VhzMEvtp(nNC&%R%ZTT z?dSUa_k@v^GG!GXn{&{xPU_OVtC<-WMmdVFT(r2O1nS+6Fw0?c%`Y#W*$ARyTbk_O z>KwEPc(Uqd)^?5$LcYlEig+`Fm!mh#do>fu$4KjyEHk&=dm^7>X+;NH0zD)WCAJ>5 zk|1KcAlm+ny~l&i`e(CMw$Tdy6s)p*AUmr7k!a08zLL@x)gPRf2q@3hfr@M37C1pi z3a!OK54}_#f(zW}w3yrD3oOd1rf4Cg&sUWHiyXM-UhRIpxj!wp%wg|i7`E83MmGLL zf$hZUGnnc0Lq=BUaHHcrpdxn+Gb}0va=7lcK5F@HR!>*yDwz!H}WGFq2RJC1psvFW~Gj`f&Y3M!Spw>y3*k!&_s_C}wqZBK9taj#M zifWRjeZ{EdjYV}Z)SilZDqLP@i_&@_vvN`E!>l!HrQEJ!!ce7UH%V?Gsc+O#pXdhS zb~eddgZ6omg#`=1k62yUlXdl6My;=jZ3>6LN2^777rJ=&HTB3Hltb`&3V~`)f>z5l zSE!1o743HytmW|ZJk3Xb>hWbr;RR3=jZ|+Rt7oed##@^MYScvET5tVwj$M9o`)3+L zsl?w2Ad{|iWY{u9)U!;&#_2u=A$e(zplIQ}Pk6lG`9?GixadB$`Wc;(Eayu3(VntP zLj~Yi!1`eyCf9yp;M;Su0zF5F9;o6W-iO?wZOpmSfiaw1vnl}x+P9J7uO1kO*KSxv zefI*)!M(Hj`LM_1vk;FPTV~500#5xqvEp=EbmUIZP2X++*ZUcEvg5*^*i~UjN?R5e zo)kP<{zxHjU&96Lm;L%iv)yRh(gIjnlN{w7=B61^An2yL34`oULeUv>vHX8^}}QSMI&-t+`d5&m@G0 zcgKOAnPYhzsN*Z+6#lZPa;D+pP4n7bD*Fc)5&3Rs*9I+%z7#2tQj!MoGA65AJ^HxBQIUM4ofjzU=)b#w=R2CgVcg)}0SKR5wZwx=VUgxwa={ves=%UG>_uVH zdRaUkp?1!$3+r>c@HfToK6ysR-n6M{g4$q<@V}eLDQ{{xyQ82 z!j^21O7?+;zqtfO!>{|hTx;69#3bLrlc%7En7WL7l=to*lB+-C9I>aD{$|nls0qqD zlH7i^0qBy{Kj%beG@31H(7St1+Ibalb`1Rhqf>Km3`AiJ>u`ph{DBDeqxXSU8#N1$BQG#=A@1HpE(Xg9XuT7mK7|d`K+niyCF-fkisU4P z@de40r@=SnLEUioS9z>a2|HdSz zk>G8TYhFAJtlbkpu}d9zmeHcSIulh#ue^RVV^fQv*W2@_$Ajx>%axKuH*+%Q4=duP zf`f^AY4o<}Ocswf^+r67*y_)jj{ERttsqe$9;N#TC(mTuRV9u5qBb93obpeCw#!8R z2{pX6slJnHGFt$HCQg*kL5S7mcxnPy8(BTKg zYy=iyQCRm1Yy{h!iQGT+R9iQG_PUqDdn0fxH&W}ua#O1}zFKkmva`nOB2e`S;WNB%h=_cu0N7KuTA11rf&D%=4?jWd{5rv zb70A=-;`(HpTNB8c-{{wiOgJar<}d%zDmkKaT5bRsb_0yc6;|dWQ2u6hLD_b8RgKN zoixsQVX_)oitDCQ`Y^WVkj}vBty?Jj@FbGp(cw;Z%;Q*bwFRb;m!1leXOlVmt}hQR zd3lQ;M>6)Sr{x%c>zOjU>vYo2IC8$}33Vc;2aCNOkQJCqyG`|=VVef?_NA>zRd$2b zuYgbKPV+xRYFfj9gcS}NO~@sB!Sx9d7mMSs_YCN}#VGS%m53hY9w;u7!a(IioYHE? zgYDLW+&9~zWS@X-D1yl{^A>|JBK1r^BDUw5H(i-t$i;Zhdl_7`VqEpJ7Zq*^R(J5x z9;x+My9$9c&VLIn(i)qfwtZiHD)nPIWz+Nf7l<{PZq|4^^@xeb@q1^OqE*68)aqGT z#HqhGgsedJ-uuhPTrr*TQp)Xoj|eL1ti}suDK%xdoF_BWRja^pPy-#rpaFS8;0#wG2^lL5%g+=3WNaJV`A z46!1akKk!e=X9{Y5r0@XQ-QnIzMFg2XfqiE+70lmFgaWjCZ-b>aHIZoWY!Hky%;Rw zalejFBjR2Jlr1zJoJN{Y!j&!Ea&f2rocJWPHng$z3zb{&QF-*cY$Kb~K*m&Q%aR^WC>P>GCv4O3HauUx~nly!qmE*oOMiW-`W zMNGc=9RakEr(u%zeL=R0td{%i!AG0cCQ}c!#Trnag+B1zula}D(?|CD07WK(XSrl$ zW)`Tz$nnJ2*}Us&|4y*~1x|0j`z>?#)fNG76R{1NQ={glm8m{1aManJOI=aj;b3GR zSBMYk1Bo}6E?>DuaBKCpMlIxP#F>liR?pls9u`=dBQfKDE`Go9s(U>x7zJ$i*?Wp45n^h+SYB=%C^w)6N^l+9)F2*T8!`Lh|Bg7gt}8gONsw zCcX=C<}Q^{h}(bOkm-&_Ez1ps7${T7OCn)Bi7vnf;99E;K_y9)@5UB1cT2wIbszt7 z{V6SbcuDEQ=4*!U(GyXubZ&18}?oP>zh*S@BMdQ{P&&k-*@I;uY$iC|DW%RBFR6n(q9w$ z*?5}<;D`i+U%k*F{+jKCco7lhF62Xz~NH^ZFZ$pStqq_R9T~q?!v_Df+ z0VXB+;@$tb$V*FwJE{a15eG5}~w z@s$>UCflk00zSVsR@u@Ww{Hj@m=R(!WK*O6)s{s<*6HrUt;Xc`rns*E`%HfRhKxSl zQT=utFsWN(znJ)UX9@MoLEh@M86?`ZBwXu0znbt@|GRn;^I|0s^eFjOD&HTF?|&Ke zkpLJb_9HN>ErzVloT*vL~M}OV^ z*G8)h0qb;JXErdYK>mOJ^&b`uYD>(|lG(3zkZ(zcKc)LuTe>JTYNI!1Jo$sXSt2k0 oYZqpzpD>XbnAC&+=UeC)pDPlDe7%WVyafCx%BsnfNWBdBA4X5iX#fBK literal 0 HcmV?d00001 diff --git a/rfcs/images/repeat_primitive_signature.png b/rfcs/images/repeat_primitive_signature.png new file mode 100644 index 0000000000000000000000000000000000000000..7c98eefbcf50df3b29e119078ff962e7836efe36 GIT binary patch literal 58109 zcmeEuXEa=E8>kWzgcLz^DN6LH(TNtlhA?XMU_=|eB@xj@FHxdKw5WqoA_=1RHW;GU znJ^fP;cn+U=X~YlocsH(b!V-yUwgmpDeu$wgllUmlatbs;^E)>RAhsW{O%EIEh3OC1hOG^uj?|oeNNZq`2 z-@J*^wFv6|{QdLS&uyQ(EaFm4Oy+N1ohQ`)f|sY$26dDjlYMSPV{M@R!&YxdKx{uQ z*5xb3)N@7H$N99B(xN;IYYXe|pYcfD-)szsezxr5=m@#Wb=At^ zlLxQ|v#6_T@lP!#DLh*5vOiR}5hElFxcSPl)HbZ<-`0xPt%?8)5TA#a2TDj}vHL z!n=S^hergo@PV&1KK-9g2r>;2FdeBM(%ic)U4-U zd==fhKY{rt9Q2=fJkd}Ww{mgjwX}A5YQyX8eBK)mPtsc)Xgb??Sh9FKJAvKBy`^sd z)Njld`a|NV-|uit8#U{XQJ{PwKY4 zhsSeqK0YrmFJ3P}UKckzzWZWgVto7pd;$VIKo1^wAFzj|HxJnT&c7!4V;%(?cPlrC z=N=9&V3zZFEuXr0dPv>AeZJ72pMUMs#@pfFD}mjA2MYj@@B9hheO`XPKj#L9N}k^p z*LLu>aeAWQ;0)jlSVQ{0h!DTzZv+1F=-*5JYv^Nl8#j3uXJDj<^uMwG`{4h4_`d^x zThr*@YYGbp{O6MY@#OcBl6>c&{|74mh3DVy0*IC-mE`-AXwsxBViLCjIx;vYXz2r2 zfXmK5_~*RH@vrN7J96s1MGZF|o-Ce#|zFuQE< zYkK^DoahrCe){E??hpQ9G1*`|a?IZ@a{eIB5+B$N@#^!x*~q^J)F@jx9Y4ZfeBPY+-!POLw9W=t1dCn|IJP>u>z2gjBE&R+B7=| z%Rj^miN6)+Y&@c08fPj%s&?<%FY%BwN(vBTb$G;$jhVsVmUa}8y^3BGABE!I5Jw9D z^aZ_K=R2cXThkY{+)8*M3%uIJ55+q2?;&ZzcYnzl+7STX+^s*X$x^}l`t*Y88@w`m z)$gIXslQ~lL|p&}B)lixW1DyF7CSCD8b#p|w41V&sM8jkRGPpe8o)SWqt;u>Zt9!j zS(hEGc;3<`-7o0x=DagyQ=M-DnY!*naf9v`Xv$gpZ6Cy324w};MMB6UuW^tN7>An` z=pKDn9FyHnuiaFHN!`75^#+F{fiP9KT_o`Zm0#{L|2BZ^ka0K4oLjeoWxJ>+Imz+q z7$a3*3L0OlC}XV|yFh~PtWi+*ajW^g71P^a9*0MY04@o509Y-aM9Gp|e?yluM0zN^ zDdOEm%Q>$$7&>5~no_P(ZZ$k@_xTT!QJN_eOaA=iP}RpD&)cU+wu;`qpf-0Icue`OF^ zm2=rNzcED$y-URT>p&L!ohjkA8^tK5pww~nj%K
    mS^SJ3hUbcN@}57bL=~|YV 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 MlGQKO7w-J}Ka6R+p#T5? literal 0 HcmV?d00001 diff --git a/rfcs/images/repeat_type_links.png b/rfcs/images/repeat_type_links.png new file mode 100644 index 0000000000000000000000000000000000000000..bff54d90e9cae009b68822e74988787eec75e356 GIT binary patch literal 51818 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 Xt-BvREC*=a|E8;Ha2u`u@cDlMIqIU3 literal 0 HcmV?d00001 diff --git a/rfcs/text/0014_api_documentation.md b/rfcs/text/0014_api_documentation.md new file mode 100644 index 0000000000000..b70636c63aad3 --- /dev/null +++ b/rfcs/text/0014_api_documentation.md @@ -0,0 +1,442 @@ +- Start Date: 2020-12-21 +- RFC PR: (leave this empty) +- Kibana Issue: (leave this empty) +- [POC PR](https://github.com/elastic/kibana/pull/86232) + +# Goal + +Automatically generate API documentation for every plugin that exposes a public API within Kibana in order to help Kibana plugin developers +find and understand the services available to them. Automatic generation ensures the APIs are _always_ up to date. The system will make it easy to find +APIs that are lacking documentation. + +Note this does not cover REST API docs, but is targetted towards our javascript +plugin APIs. + +# Technology: ts-morph vs api-extractor + +[Api-extractor](https://api-extractor.com/) is a utility built from microsoft that parses typescript code into json files that can then be used in a custom [api-documenter](https://api-extractor.com/pages/setup/generating_docs/) in order to build documentation. This is what we [have now](https://github.com/elastic/kibana/tree/master/docs/development), except we use the default api-documenter. + +## Limitations with the current implementation using api-extractor & api-documenter + +The current implementation relies on the default api-documenter. It has the following limitations: + +- One page per API item +- Files are .md not .mdx +- There is no entry page per plugin (just an index.md per plugin/public and plugin/server) +- Incorrectly marks these entries as packages. + +![image](../images/api_docs_package_current.png) + +- Does not generate links to APIs exposed from other plugins, nor inside the same plugin. + +![image](../images/current_api_doc_links.png) + +## Options to improve + +We have two options to improve on the current implementation. We can use a custom api-documenter, or use ts-morph. + +### Custom Api-Documenter + +- According to the current maintainer of the sample api-documenter, it's a surprising amount of work to maintain. +- If we wish to re-use code from the sample api-documenter, we'll have to fork the rush-stack repo, or copy their code into our system. +- No verified ability to support cross plugin links. We do have some ideas (can explore creating a package.json for every page, and/or adding source file information to every node). +- More limited feature set, we wouldn't get thinks like references and source file paths. +- There are very few examples of other companies using custom api-documenters to drive their documentation systems (I could not find any on github). + +### Custom implementation using ts-morph + +[ts-morph](https://github.com/dsherret/ts-morph) is a utility built and maintained by a single person, which sits a layer above the raw typescript compiler. + +- Requires manually converting the types to how we want them to be displayed in the UI. Certain types have to be handled specially to show up +in the right way (for example, for arrow functions to be categorized as functions). This special handling is the bulk of the logic in the PR, and +may be a maintenance burden. +- Relies on a package maintained by a single person, albiet they have been very responsive and have a history of keeping the library up to date with +typescript upgrades. +- Affords us flexibility to do things like extract the setup and start types, grab source file paths to create links to github, and get +reference counts (reference counts not implemented in MVP). +- There are some issues with type links and signatures not working correctly (see https://github.com/dsherret/ts-morph/issues/923). + +![image](../images/new_api_docs_with_links.png) + +## Recommendation: ts-morph for the short term, switch to api-extractor when limitations can be worked around + +Both approaches will have a decent amount of code to maintain, but the api-extractor approach appears to be a more stable long term solution, since it's built and maintained by Microsoft and +is likely going to grow in popularity as more TypeScript API doc systems exist. +If we had a working example that supported cross plugin links, I would suggest continuing down that road. However, we don't, while we _do_ have a working ts-morph implementation. + +I recommend that we move ahead with ts-morph in the short term, because we have an implementation that offers a much improved experience over the current system, but that we continually +re-evaluate as time goes on and we learn more about the maintenance burden of the current approach, and see what happens with our priorities and the api-extractor library. + +Progress over perfection. + +![image](../images/api_doc_tech_compare.png) + +If we do switch, we can re-use all of the tests that take example TypeScript files and verify the resulting ApiDeclaration shapes. + +# Terminology + +**API** - A plugin's public API consists of every function, class, interface, type, variable, etc, that is exported from it's index.ts file, or returned from it's start or setup +contract. + +**API Declaration** - Each function, class, interface, type, variable, etc, that is part of a plugins public API is a "declaration". This +terminology is motivated by [these docs](https://www.typescriptlang.org/docs/handbook/modules.html#exporting-a-declaration). + +# MVP + +Every plugin will have one or more API reference pages. Every exported declaration will be listed in the page. It is first split by "scope" - client, server and common. Underneath +that, setup and start contracts are at the top, the remaining declarations are grouped by type (classes, functions, interfaces, etc). +Plugins may opt to have their API split into "service" sections (see [proposed manifest file changes](#manifest-file-changes)). If a plugin uses service folders, the API doc system will automatically group declarations that are defined inside the service folder name. This is a simple way to break down very large plugins. The start and setup contract will +always remain with the main plugin name. + +![image](../images/api_docs.png) + +- Cross plugin API links work inside `signature`. +- Github links with source file and line number +- using `serviceFolders` to split large plugins + +## Post MVP + +- Plugin `{@link AnApi}` links work. Will need to decide if we only support per plugin links, or if we should support a way to do this across plugins. +- Ingesting stats like number of public APIs, and number of those missing comments +- Include and expose API references +- Use namespaces to split large plugins + +# Information available for each API declaration + +We have the following pieces of information available from each declaration: + +- Label. The name of the function, class, interface, etc. + +- Description. Any comment that was able to be extracted. Currently it's not possible for this data to be formatted, for example if it has a code example with back tics. This +is dependent on the elastic-docs team moving the infrastructure to NextJS instead of Gatsby, but it will eventually be supported. + +- Tags. Any `@blahblah` tags that were extracted from comments. Known tags, like `beta`, will be show help text in a tooltip when hovered over. + +- Type. This can be thought of as the _kind_ of type (see [TypeKind](#typekind)). It allows us to group each type into a category. It can be a primitive, or a +more complex grouping. Possibilities are: array, string, number, boolean, object, class, interface, function, compound (unions or intersections) + +- Required or optional. (whether or not the type was written with `| undefined` or `?`). This terminology makes the most sense for function +parameters, not as much when thinking about an exported variable that might be undefined. + +- Signature. This is only relevant for some types: functions, objects, type, arrays and compound. Classes and interfaces would be too large. +For primitives, this is equivalent to "type". + +- Children. Only relevant for some types, this would include parameters for functions, class members and functions for classes, properties for +interfaces and objects. This makes the structure recursive. Each child is a nested API component. + +- Return comment. Only relevant for function types. + +![image](../images/api_info.png) + + +### ApiDeclaration type + +```ts +interface ApiDeclaration { + label: string; + type: TypeKind; // string, number, boolean, class, interface, function, type, etc. + description: TextWithLinks; + signature: TextWithLinks; + tags: string[]; // Declarations may be tagged as beta, or deprecated. + children: ApiDeclaration[]; // Recursive - this could be function parameters, class members, or interface/object properties. + returnComment?: TextWithLinks; + lifecycle?: Lifecycle.START | Lifecycle.SETUP; +} + +``` + +# Architecture design + +## Location + +The generated docs will reside inside the kibana repo, inside a top level `api_docs` folder. In the long term, we could investigate having the docs system run a script to generated the mdx files, so we don’t need to store them inside the repo. Every ci run should destroy and re-create this folder so removed plugins don't have lingering documentation files. + +They will be hosted online wherever the new docs system ends up. This can temporarily be accessed at https://elasticdocstest.netlify.app/docs/. + +## Algorithm overview + +The first stage is to collect the list of plugins using the existing `findPlugins` logic. + +For every plugin, the initial list of ts-morph api node declarations are collected from three "scope" files: + - plugin/public/index.ts + - plugin/server/index.ts + - plugin/common/index.ts + +Each ts-morph declaration is then transformed into an [ApiDeclaration](#ApiDeclaration-type) type, which is recursive due to the `children` property. Each +type of declaration is handled slightly differently, mainly in regard to whether or not a signature or return type is added, and how children are added. + +For example: + +```ts +if (node.isClassDeclaration()) { + // No signature or return. + return { + label, + description, + type: TypeKind.ClassKind, + // The class members are captured in the children array. + children: getApiDeclaration(node.getMembers()), + } +} else if (node.isFunctionDeclaration()) { + return { + label, + description, + signature: getSignature(node), + returnComment: getReturnComment(node), + type: TypeKind.FunctionKind, + // The function parameters are captured in the children array. This logic is more specific because + // the comments for a function parameter are captured in the function comment, with "@param" tags. + children: getParameterList(node.getParameters(), getParamTagComments(node)), + } +} if (...) +.... +``` + +The handling of each specific type is what encompasses the vast majority of the logic in the PR. + +The public and server scope have 0-2 special interfaces indicated by "lifecycle". This is determined by using ts-morph to extract the first two generic types +passed to `... extends Plugin` in the class defined inside the plugin's `plugin.ts` file. + +A [PluginApi](#pluginapi) is generated for each plugin, which is used to generate the json and mdx files. One or more json/mdx file pair + per plugin may be created, depending on the value of `serviceFolders` inside the plugin's manifest files. This is because some plugins have such huge APIs that + it is too large to render in a single page. + +![image](../images/api_doc_tech.png) + +## Types + +### TypeKind + +TypeKind is an enum that will identify what "category" or "group" name we can call this particular export. Is it a function, an interface, a class a variable, etc. +This list is likely incomplete, and we'll expand as needed. + +```ts +export enum TypeKind { + ClassKind = 'Class', + FunctionKind = 'Function', + ObjectKind = 'Object', + InterfaceKind = 'Interface', + TypeKind = 'Type', // For things like `export type Foo = ...` + UnknownKind = 'Unknown', // For the special "unknown" typescript type. + AnyKind = 'Any', // For the "any" kind, which should almost never be used in our public API. + UnCategorized = 'UnCategorized', // There are a lot of ts-morph types, if I encounter something not handled, I dump it in here. + StringKind = 'string', + NumberKind = 'number', + BooleanKind = 'boolean', + ArrayKind = 'Array', + CompoundTypeKind = 'CompoundType', // Unions & intersections, to handle things like `string | number`. +} +``` + + +### Text with reference links + +Signatures, descriptions and return comments may all contain links to other API declarations. This information needs to be serializable into json. This serializable type encompasses the information needed to build the DocLink components within these fields. The logic of building +the DocLink components currently resides inside the elastic-docs system. It's unclear if this will change. + +```ts +/** + * This is used for displaying code or comments that may contain reference links. For example, a function + * signature that is `(a: import("src/plugin_b").Bar) => void` will be parsed into the following Array: + * + * ```ts + * [ + * '(a: ', + * { docId: 'pluginB', section: 'Bar', text: 'Bar' }, + * ') => void' + * ] + * ``` + * + * This is then used to render text with nested DocLinks so it looks like this: + * + * `(a: => ) => void` + */ +export type TextWithLinks = Array; + +/** + * The information neccessary to build a DocLink. + */ +export interface Reference { + docId: string; + section: string; + text: string; +} +``` + +### ScopeApi + +Scope API is essentially just grouping an array of ApiDeclarations into different categories that makes building the mdx files from a +single json file easier. + +```ts +export interface ScopeApi { + setup?: ApiDeclaration; + start?: ApiDeclaration; + classes: ApiDeclaration[]; + functions: ApiDeclaration[]; + interfaces: ApiDeclaration[]; + objects: ApiDeclaration[]; + enums: ApiDeclaration[]; + misc: ApiDeclaration[]; + // We may add more here as we sit fit to pull out of `misc`. +} +``` + +With this structure, the mdx files end up looking like: + +``` +### Start + +### Functions + +### Interfaces + +``` + +### PluginApi + +A plugin API is the component that is serialized into the json file. It is broken into public, server and common components. `serviceFolders` is a way for the system to +write separate mdx files depending on where each declaration is defined. This is because certain plugins (and core) +are huge, and can't be rendered in a single page. + + +```ts +export interface PluginApi { + id: string; + serviceFolders?: readonly string[]; + client: ScopeApi; + server: ScopeApi; + common: ScopeApi; +} +``` + +## kibana.json Manifest file changes + +### Using a kibana.json file for core + +For the purpose of API infrastructure, core is treated like any other plugin. This means it has to specify serviceFolders section inside a manifest file to be split into sub folders. There are other ways to tackle this - like a hard coded array just for the core folder, but I kept the logic as similar to the other plugins as possible. + +### New parameters + +**serviceFolders?: string[]** + +Used by the system to group services into sub-pages. Some plugins, like data and core, have such huge APIs they are very slow to contain in a single page, and they are less consummable by solution developers. The addition of an optional list of services folders will cause the system to automatically create a separate page with every API that is defined within that folder. The caveat is that core will need to define a manifest file in order to define its service folders... + +**teamOwner: string** + +Team owner can be determined via github CODEOWNERS file, but we want to encourage single team ownership per plugin. Requiring a team owner string in the manifest file will help with this and will allow the API doc system to manually add a section to every page that has a link to the team owner. Additional ideas are teamSlackChannel or teamEmail for further contact. + +**summary: string** + + +A brief description of the plugin can then be displayed in the automatically generated API documentation. + +# Future features + +## Indexing stats + +Can we index statistics about our API as part of this system? For example, I'm dumping information about which api declarations are missing comments in the console. + +## Longer term approach to "plugin service folders" + +Using sub folders is a short term plan. A long term plan hasn't been established yet, but it should fit in with our folder structure hierarchy goals, along with +any support we have for sharing services among a related set of plugins, that are not exposed as part of the public API. +# Recommendations for writing comments + +## @link comments for the referenced type + +Core has a pattern of writing comments like this: + +```ts + /** {@link IUiSettingsClient} */ + uiSettings: IUiSettingsClient; +``` + +I don't see the value in this. In the IDE, I can click on the IUiSettingsClient type and get directed there, and in the API doc system, the +type will already be clickable. This ends up with a weird looking API: + +![image](../images/repeat_type_links.png) + +The plan is to make @link comments work like links, which means this is unneccessary information. + +I propose we avoid this kind of pattern. + +## Export every referenced type + +The docs system handles broken link warnings but to avoid breaking the ci, I suggest we turn this off initially. However, this will mean +we may miss situations where we are referencing a type that is not actually exported. This will cause a broken link in the docs +system + +For example if your index.ts file has: +```ts +export type foo: string | AnInterface; +``` + +and does not also export `AnInterface`, this will be a broken link in the docs system. + +Until we have better CI tools to catch these mistakes, developers will need to export every referenced type. + +## Avoid `Pick` pattern + +Connected to the above, if you use `Pick`, there are two problems. One is that it's difficult for a developer to see the functionality +available to them at a glance, since they would have to keep flipping from the interface definition to the properties that have been picked. + +The second potential problem is that you will have to export the referenced type, and in some situations, it's an internal type that isn't exported. + +![image](../images/api_doc_pick.png) + +# Open questions + +## Required attribute + +`isRequired` is an optional parameter that can be used to display a badge next to the API. +We can mark function parameters that do not use `?` or `| undefined` as required. Open questions: + +1. Are we okay with a badge showing for `required` rather than `optional` when marking a parameter as optional is extra work for a developer, and `required` is the default? + +2. Should we only mark function parameters as `required` or interface/class parameters? Essentially, should any declaration that is not nullable +have the `required` tag? + +## Signatures on primitive types + +1. Should we _always_ include a signature for variables and parameters, even if they are a repeat of the TypeKind? For example: + +![image](../images/repeat_primitive_signature.png) + +2. If no, should we include signatures when the only difference is `| undefined`? For function parameters this information is captured by +the absence of the `required` badge. Is this obvious? What about class members/interface props? + +## Out of scope + +### REST API + +This RFC does not cover REST API documentation, though it worth considering where +REST APIs registered by plugins should go in the docs. The docs team has a proposal for this but it is not inside the `Kibana Developer Docs` mission. + +### Package APIs + +Package APIs are not covered in this RFC. + +# Adoption strategy + +In order to generate useful API documentation, we need to approach this by two sides. + +1. Establish a habit of writing documentation. +2. Establish a habit of reading documentation. + +Currently what often happens is a developer asks another developer a question directly, and it is answered. Every time this happens, ask yourself if +there is a link you can share instead of a direct answer. If there isn't, file an issue for that documentation to be created. When we start responding +to questions with links, solution developers will naturally start to look in the documentation _first_, saving everyone time! + +The APIs WILL need to be well commented or they won't be useful. We can measure the amount of missing comments and set a goal of reducing this number. + +# External documentation system examples + +- [Microsoft .NET](https://docs.microsoft.com/en-us/dotnet/api/microsoft.visualbasic?view=netcore-3.1) +- [Android](https://developer.android.com/reference/androidx/packages) + +# Architecure review + +The primary concern coming out of the architecture review was over the technology choice of ts-morph vs api-extractor, and the potential maintenance +burdern of using ts-morph. For the short term, we've decide tech leads will own this section of code, we'll consider it experimental and + focus on deriving value out of it. Once we are confident of the value, we can focus on stabilizing the implementation details. \ No newline at end of file From 9a3977d66ec76d9670880332314bd74b4fa86452 Mon Sep 17 00:00:00 2001 From: Lisa Cawley Date: Thu, 4 Feb 2021 15:38:44 -0800 Subject: [PATCH 25/69] [DOCS] Update installation details (#90354) --- docs/setup/install/deb.asciidoc | 8 ++------ docs/setup/install/rpm.asciidoc | 8 ++------ docs/setup/install/targz.asciidoc | 8 ++------ docs/setup/install/windows.asciidoc | 8 ++------ 4 files changed, 8 insertions(+), 24 deletions(-) diff --git a/docs/setup/install/deb.asciidoc b/docs/setup/install/deb.asciidoc index 8edd2f9312168..6012ae394c832 100644 --- a/docs/setup/install/deb.asciidoc +++ b/docs/setup/install/deb.asciidoc @@ -8,12 +8,8 @@ The Debian package for Kibana can be <> or from our <>. It can be used to install Kibana on any Debian-based system such as Debian and Ubuntu. -This package is free to use under the Elastic license. It contains open source -and free commercial features and access to paid commercial features. -<> to try out all of the -paid commercial features. See the -https://www.elastic.co/subscriptions[Subscriptions] page for information about -Elastic license levels. +This package contains both free and subscription features. +<> to try out all of the features. The latest stable version of Kibana can be found on the link:/downloads/kibana[Download Kibana] page. Other versions can diff --git a/docs/setup/install/rpm.asciidoc b/docs/setup/install/rpm.asciidoc index 01a9c5718f14b..216ec849147b4 100644 --- a/docs/setup/install/rpm.asciidoc +++ b/docs/setup/install/rpm.asciidoc @@ -13,12 +13,8 @@ and Oracle Enterprise. NOTE: RPM install is not supported on distributions with old versions of RPM, such as SLES 11 and CentOS 5. Please see <> instead. -This package is free to use under the Elastic license. It contains open source -and free commercial features and access to paid commercial features. -<> to try out all of the -paid commercial features. See the -https://www.elastic.co/subscriptions[Subscriptions] page for information about -Elastic license levels. +This package contains both free and subscription features. +<> to try out all of the features. The latest stable version of Kibana can be found on the link:/downloads/kibana[Download Kibana] page. Other versions can diff --git a/docs/setup/install/targz.asciidoc b/docs/setup/install/targz.asciidoc index 8eef43f796167..bb51d98a4f922 100644 --- a/docs/setup/install/targz.asciidoc +++ b/docs/setup/install/targz.asciidoc @@ -7,12 +7,8 @@ Kibana is provided for Linux and Darwin as a `.tar.gz` package. These packages are the easiest formats to use when trying out Kibana. -These packages are free to use under the Elastic license. They contain open -source and free commercial features and access to paid commercial features. -<> to try out all of the -paid commercial features. See the -https://www.elastic.co/subscriptions[Subscriptions] page for information about -Elastic license levels. +This package contains both free and subscription features. +<> to try out all of the features. The latest stable version of Kibana can be found on the link:/downloads/kibana[Download Kibana] page. diff --git a/docs/setup/install/windows.asciidoc b/docs/setup/install/windows.asciidoc index 4a5a855e0bbcf..b4204cc623f0f 100644 --- a/docs/setup/install/windows.asciidoc +++ b/docs/setup/install/windows.asciidoc @@ -6,12 +6,8 @@ Kibana can be installed on Windows using the `.zip` package. -This package is free to use under the Elastic license. It contains open source -and free commercial features and access to paid commercial features. -<> to try out all of the -paid commercial features. See the -https://www.elastic.co/subscriptions[Subscriptions] page for information about -Elastic license levels. +This package contains both free and subscription features. +<> to try out all of the features. The latest stable version of Kibana can be found on the link:/downloads/kibana[Download Kibana] page. From da9c4a89e7659d80ac22e1bc29274fd8fc79e74d Mon Sep 17 00:00:00 2001 From: Kent Marten <65553677+kmartastic@users.noreply.github.com> Date: Thu, 4 Feb 2021 15:43:03 -0800 Subject: [PATCH 26/69] [maps] Top hits per entity--change to title to use recent, minor edits (#89254) * [maps] Top hits per entity--change to title to use recent, minor edits * Updated TopHitsPerEntity title and description to use the term relevant * updating top hits per entity topic to new title Co-authored-by: Kent Marten Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> --- docs/maps/maps-aggregations.asciidoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/maps/maps-aggregations.asciidoc b/docs/maps/maps-aggregations.asciidoc index 3c66e187bf59c..265bf6bfaea30 100644 --- a/docs/maps/maps-aggregations.asciidoc +++ b/docs/maps/maps-aggregations.asciidoc @@ -68,9 +68,9 @@ To enable a blended layer that dynamically shows clusters or documents: [role="xpack"] [[maps-top-hits-aggregation]] -=== Top hits per entity +=== Display the most relevant documents per entity -You can display the most relevant documents per entity, for example, the most recent GPS tracks per flight. +Use *Top hits per entity* to display the most relevant documents per entity, for example, the most recent GPS tracks per flight route. To get this data, {es} first groups your data using a {ref}/search-aggregations-bucket-terms-aggregation.html[terms aggregation], then accumulates the most relevant documents based on sort order for each entry using a {ref}/search-aggregations-metrics-top-hits-aggregation.html[top hits metric aggregation]. From 219a86dbe51183ee30c2cd696bbf048e06a2e671 Mon Sep 17 00:00:00 2001 From: Frank Hassanabad Date: Thu, 4 Feb 2021 17:06:10 -0700 Subject: [PATCH 27/69] Fixes regression where tags are turning immutable to mutable within rules (#90326) ## Summary Fixes regression: https://github.com/elastic/kibana/issues/90319 that has not been released where in some cases such as adding actions to a rule through an update we can and will update an immutable rule and do not expect the immutable to turn into a mutable through the tags. Simple one-liner fix, I will update in a follow on PR with a regression test for this particular use case of actions but not with this one since we optimizing for speed of pull request to back-port. Criticality is high and impact is high as this is data bug which can cause a lot of headaches and migrations if this goes out. ### Checklist No unit test for this one, but a functional test will be added in a follow up - [ ] [Unit or functional tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html) were updated or added to match the most common scenarios --- .../server/lib/detection_engine/rules/update_rules.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/update_rules.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/update_rules.ts index 5a99728f83b57..40900fdccdb28 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/update_rules.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/update_rules.ts @@ -38,7 +38,7 @@ export const updateRules = async ({ const enabled = ruleUpdate.enabled ?? true; const newInternalRule: InternalRuleUpdate = { name: ruleUpdate.name, - tags: addTags(ruleUpdate.tags ?? [], existingRule.params.ruleId, false), + tags: addTags(ruleUpdate.tags ?? [], existingRule.params.ruleId, existingRule.params.immutable), params: { author: ruleUpdate.author ?? [], buildingBlockType: ruleUpdate.building_block_type, From 00a20268b1f3c95ebcc2044f7023e0181498a543 Mon Sep 17 00:00:00 2001 From: Larry Gregory Date: Thu, 4 Feb 2021 19:18:10 -0500 Subject: [PATCH 28/69] Optimize performance of ES privilege response validation (#90074) Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> --- .../validate_es_response.test.ts.snap | 20 +++--- .../authorization/check_privileges.test.ts | 20 +++--- .../authorization/validate_es_response.ts | 65 +++++++++++-------- 3 files changed, 57 insertions(+), 48 deletions(-) diff --git a/x-pack/plugins/security/server/authorization/__snapshots__/validate_es_response.test.ts.snap b/x-pack/plugins/security/server/authorization/__snapshots__/validate_es_response.test.ts.snap index 226002545a378..76d284a21984e 100644 --- a/x-pack/plugins/security/server/authorization/__snapshots__/validate_es_response.test.ts.snap +++ b/x-pack/plugins/security/server/authorization/__snapshots__/validate_es_response.test.ts.snap @@ -1,21 +1,21 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`validateEsPrivilegeResponse fails validation when an action is malformed in the response 1`] = `"Invalid response received from Elasticsearch has_privilege endpoint. ValidationError: child \\"application\\" fails because [child \\"foo-application\\" fails because [child \\"foo-resource\\" fails because [child \\"action3\\" fails because [\\"action3\\" must be a boolean]]]]"`; +exports[`validateEsPrivilegeResponse fails validation when an action is malformed in the response 1`] = `"Invalid response received from Elasticsearch has_privilege endpoint. Error: [application.foo-application]: [action3]: expected value of type [boolean] but got [string]"`; -exports[`validateEsPrivilegeResponse fails validation when an action is missing in the response 1`] = `"Invalid response received from Elasticsearch has_privilege endpoint. ValidationError: child \\"application\\" fails because [child \\"foo-application\\" fails because [child \\"foo-resource\\" fails because [child \\"action2\\" fails because [\\"action2\\" is required]]]]"`; +exports[`validateEsPrivilegeResponse fails validation when an action is missing in the response 1`] = `"Invalid response received from Elasticsearch has_privilege endpoint. Error: [application.foo-application]: [action2]: expected value of type [boolean] but got [undefined]"`; -exports[`validateEsPrivilegeResponse fails validation when an expected resource property is missing from the response 1`] = `"Invalid response received from Elasticsearch has_privilege endpoint. ValidationError: child \\"application\\" fails because [child \\"foo-application\\" fails because [child \\"bar-resource\\" fails because [\\"bar-resource\\" is required]]]"`; +exports[`validateEsPrivilegeResponse fails validation when an expected resource property is missing from the response 1`] = `"Invalid response received from Elasticsearch has_privilege endpoint. Error: [application.foo-application]: Payload did not match expected resources"`; -exports[`validateEsPrivilegeResponse fails validation when an extra action is present in the response 1`] = `"Invalid response received from Elasticsearch has_privilege endpoint. ValidationError: child \\"application\\" fails because [child \\"foo-application\\" fails because [child \\"foo-resource\\" fails because [\\"action4\\" is not allowed]]]"`; +exports[`validateEsPrivilegeResponse fails validation when an extra action is present in the response 1`] = `"Invalid response received from Elasticsearch has_privilege endpoint. Error: [application.foo-application]: [action4]: definition for this key is missing"`; -exports[`validateEsPrivilegeResponse fails validation when an extra application is present in the response 1`] = `"Invalid response received from Elasticsearch has_privilege endpoint. ValidationError: child \\"application\\" fails because [\\"otherApplication\\" is not allowed]"`; +exports[`validateEsPrivilegeResponse fails validation when an extra application is present in the response 1`] = `"Invalid response received from Elasticsearch has_privilege endpoint. Error: [application.otherApplication]: definition for this key is missing"`; -exports[`validateEsPrivilegeResponse fails validation when an unexpected resource property is present in the response 1`] = `"Invalid response received from Elasticsearch has_privilege endpoint. ValidationError: child \\"application\\" fails because [child \\"foo-application\\" fails because [child \\"bar-resource\\" fails because [\\"bar-resource\\" is required]]]"`; +exports[`validateEsPrivilegeResponse fails validation when an unexpected resource property is present in the response 1`] = `"Invalid response received from Elasticsearch has_privilege endpoint. Error: [application.foo-application]: Payload did not match expected resources"`; -exports[`validateEsPrivilegeResponse fails validation when the "application" property is missing from the response 1`] = `"Invalid response received from Elasticsearch has_privilege endpoint. ValidationError: child \\"application\\" fails because [\\"application\\" is required]"`; +exports[`validateEsPrivilegeResponse fails validation when the "application" property is missing from the response 1`] = `"Invalid response received from Elasticsearch has_privilege endpoint. Error: [application.foo-application]: Payload did not match expected resources"`; -exports[`validateEsPrivilegeResponse fails validation when the requested application is missing from the response 1`] = `"Invalid response received from Elasticsearch has_privilege endpoint. ValidationError: child \\"application\\" fails because [child \\"foo-application\\" fails because [\\"foo-application\\" is required]]"`; +exports[`validateEsPrivilegeResponse fails validation when the requested application is missing from the response 1`] = `"Invalid response received from Elasticsearch has_privilege endpoint. Error: [application.foo-application]: Payload did not match expected resources"`; -exports[`validateEsPrivilegeResponse fails validation when the resource propertry is malformed in the response 1`] = `"Invalid response received from Elasticsearch has_privilege endpoint. ValidationError: child \\"application\\" fails because [child \\"foo-application\\" fails because [child \\"foo-resource\\" fails because [\\"foo-resource\\" must be an object]]]"`; +exports[`validateEsPrivilegeResponse fails validation when the resource propertry is malformed in the response 1`] = `"Invalid response received from Elasticsearch has_privilege endpoint. Error: [application.foo-application]: could not parse object value from json input"`; -exports[`validateEsPrivilegeResponse fails validation when there are no resource properties in the response 1`] = `"Invalid response received from Elasticsearch has_privilege endpoint. ValidationError: child \\"application\\" fails because [child \\"foo-application\\" fails because [child \\"foo-resource\\" fails because [\\"foo-resource\\" is required]]]"`; +exports[`validateEsPrivilegeResponse fails validation when there are no resource properties in the response 1`] = `"Invalid response received from Elasticsearch has_privilege endpoint. Error: [application.foo-application]: Payload did not match expected resources"`; diff --git a/x-pack/plugins/security/server/authorization/check_privileges.test.ts b/x-pack/plugins/security/server/authorization/check_privileges.test.ts index cfa6153c1b164..93f5efed58fb8 100644 --- a/x-pack/plugins/security/server/authorization/check_privileges.test.ts +++ b/x-pack/plugins/security/server/authorization/check_privileges.test.ts @@ -316,7 +316,7 @@ describe('#atSpace', () => { }, }); expect(result).toMatchInlineSnapshot( - `[Error: Invalid response received from Elasticsearch has_privilege endpoint. ValidationError: child "application" fails because [child "kibana-our_application" fails because [child "space:space_1" fails because ["saved_object:bar-type/get" is not allowed]]]]` + `[Error: Invalid response received from Elasticsearch has_privilege endpoint. Error: [application.kibana-our_application]: [saved_object:bar-type/get]: definition for this key is missing]` ); }); @@ -338,7 +338,7 @@ describe('#atSpace', () => { }, }); expect(result).toMatchInlineSnapshot( - `[Error: Invalid response received from Elasticsearch has_privilege endpoint. ValidationError: child "application" fails because [child "kibana-our_application" fails because [child "space:space_1" fails because [child "saved_object:foo-type/get" fails because ["saved_object:foo-type/get" is required]]]]]` + `[Error: Invalid response received from Elasticsearch has_privilege endpoint. Error: [application.kibana-our_application]: [saved_object:foo-type/get]: expected value of type [boolean] but got [undefined]]` ); }); }); @@ -1092,7 +1092,7 @@ describe('#atSpaces', () => { }, }); expect(result).toMatchInlineSnapshot( - `[Error: Invalid response received from Elasticsearch has_privilege endpoint. ValidationError: child "application" fails because [child "kibana-our_application" fails because [child "space:space_1" fails because [child "mock-action:version" fails because ["mock-action:version" is required]]]]]` + `[Error: Invalid response received from Elasticsearch has_privilege endpoint. Error: [application.kibana-our_application]: [mock-action:version]: expected value of type [boolean] but got [undefined]]` ); }); @@ -1379,7 +1379,7 @@ describe('#atSpaces', () => { }, }); expect(result).toMatchInlineSnapshot( - `[Error: Invalid response received from Elasticsearch has_privilege endpoint. ValidationError: child "application" fails because [child "kibana-our_application" fails because [child "space:space_2" fails because ["space:space_2" is required]]]]` + `[Error: Invalid response received from Elasticsearch has_privilege endpoint. Error: [application.kibana-our_application]: Payload did not match expected resources]` ); }); @@ -1407,7 +1407,7 @@ describe('#atSpaces', () => { }, }); expect(result).toMatchInlineSnapshot( - `[Error: Invalid response received from Elasticsearch has_privilege endpoint. ValidationError: child "application" fails because [child "kibana-our_application" fails because [child "space:space_2" fails because ["space:space_2" is required]]]]` + `[Error: Invalid response received from Elasticsearch has_privilege endpoint. Error: [application.kibana-our_application]: Payload did not match expected resources]` ); }); @@ -1440,7 +1440,7 @@ describe('#atSpaces', () => { }, }); expect(result).toMatchInlineSnapshot( - `[Error: Invalid response received from Elasticsearch has_privilege endpoint. ValidationError: child "application" fails because [child "kibana-our_application" fails because ["space:space_3" is not allowed]]]` + `[Error: Invalid response received from Elasticsearch has_privilege endpoint. Error: [application.kibana-our_application]: Payload did not match expected resources]` ); }); @@ -1463,7 +1463,7 @@ describe('#atSpaces', () => { }, }); expect(result).toMatchInlineSnapshot( - `[Error: Invalid response received from Elasticsearch has_privilege endpoint. ValidationError: child "application" fails because [child "kibana-our_application" fails because [child "space:space_2" fails because ["space:space_2" is required]]]]` + `[Error: Invalid response received from Elasticsearch has_privilege endpoint. Error: [application.kibana-our_application]: Payload did not match expected resources]` ); }); }); @@ -2266,7 +2266,7 @@ describe('#globally', () => { }, }); expect(result).toMatchInlineSnapshot( - `[Error: Invalid response received from Elasticsearch has_privilege endpoint. ValidationError: child "application" fails because [child "kibana-our_application" fails because [child "*" fails because [child "mock-action:version" fails because ["mock-action:version" is required]]]]]` + `[Error: Invalid response received from Elasticsearch has_privilege endpoint. Error: [application.kibana-our_application]: [mock-action:version]: expected value of type [boolean] but got [undefined]]` ); }); @@ -2384,7 +2384,7 @@ describe('#globally', () => { }, }); expect(result).toMatchInlineSnapshot( - `[Error: Invalid response received from Elasticsearch has_privilege endpoint. ValidationError: child "application" fails because [child "kibana-our_application" fails because [child "*" fails because ["saved_object:bar-type/get" is not allowed]]]]` + `[Error: Invalid response received from Elasticsearch has_privilege endpoint. Error: [application.kibana-our_application]: [saved_object:bar-type/get]: definition for this key is missing]` ); }); @@ -2405,7 +2405,7 @@ describe('#globally', () => { }, }); expect(result).toMatchInlineSnapshot( - `[Error: Invalid response received from Elasticsearch has_privilege endpoint. ValidationError: child "application" fails because [child "kibana-our_application" fails because [child "*" fails because [child "saved_object:foo-type/get" fails because ["saved_object:foo-type/get" is required]]]]]` + `[Error: Invalid response received from Elasticsearch has_privilege endpoint. Error: [application.kibana-our_application]: [saved_object:foo-type/get]: expected value of type [boolean] but got [undefined]]` ); }); }); diff --git a/x-pack/plugins/security/server/authorization/validate_es_response.ts b/x-pack/plugins/security/server/authorization/validate_es_response.ts index dbc5bdee8f250..19afaaf035c15 100644 --- a/x-pack/plugins/security/server/authorization/validate_es_response.ts +++ b/x-pack/plugins/security/server/authorization/validate_es_response.ts @@ -5,7 +5,7 @@ * 2.0. */ -import Joi from 'joi'; +import { schema } from '@kbn/config-schema'; import { HasPrivilegesResponse } from './types'; export function validateEsPrivilegeResponse( @@ -14,48 +14,57 @@ export function validateEsPrivilegeResponse( actions: string[], resources: string[] ) { - const schema = buildValidationSchema(application, actions, resources); - const { error, value } = schema.validate(response); - - if (error) { - throw new Error( - `Invalid response received from Elasticsearch has_privilege endpoint. ${error}` - ); + const validationSchema = buildValidationSchema(application, actions, resources); + try { + validationSchema.validate(response); + } catch (e) { + throw new Error(`Invalid response received from Elasticsearch has_privilege endpoint. ${e}`); } - return value; + return response; } function buildActionsValidationSchema(actions: string[]) { - return Joi.object({ + return schema.object({ ...actions.reduce>((acc, action) => { return { ...acc, - [action]: Joi.bool().required(), + [action]: schema.boolean(), }; }, {}), - }).required(); + }); } function buildValidationSchema(application: string, actions: string[], resources: string[]) { const actionValidationSchema = buildActionsValidationSchema(actions); - const resourceValidationSchema = Joi.object({ - ...resources.reduce((acc, resource) => { - return { - ...acc, - [resource]: actionValidationSchema, - }; - }, {}), - }).required(); + const resourceValidationSchema = schema.object( + {}, + { + unknowns: 'allow', + validate: (value) => { + const actualResources = Object.keys(value).sort(); + if ( + resources.length !== actualResources.length || + !resources.sort().every((x, i) => x === actualResources[i]) + ) { + throw new Error('Payload did not match expected resources'); + } + + Object.values(value).forEach((actionResult) => { + actionValidationSchema.validate(actionResult); + }); + }, + } + ); - return Joi.object({ - username: Joi.string().required(), - has_all_requested: Joi.bool(), - cluster: Joi.object(), - application: Joi.object({ + return schema.object({ + username: schema.string(), + has_all_requested: schema.boolean(), + cluster: schema.object({}, { unknowns: 'allow' }), + application: schema.object({ [application]: resourceValidationSchema, - }).required(), - index: Joi.object(), - }).required(); + }), + index: schema.object({}, { unknowns: 'allow' }), + }); } From a971c251e9c26af9b5713f023c87eff966c5e712 Mon Sep 17 00:00:00 2001 From: Luke Elmers Date: Thu, 4 Feb 2021 17:43:03 -0700 Subject: [PATCH 29/69] Fix issue where logs fail to calculate size of gunzip streams. (#90353) --- .../src/utils/get_payload_size.test.ts | 11 +++++++++ .../src/utils/get_payload_size.ts | 9 ++++--- .../http/logging/get_payload_size.test.ts | 24 +++++++++++++++++++ .../server/http/logging/get_payload_size.ts | 22 ++++++++++++----- 4 files changed, 55 insertions(+), 11 deletions(-) diff --git a/packages/kbn-legacy-logging/src/utils/get_payload_size.test.ts b/packages/kbn-legacy-logging/src/utils/get_payload_size.test.ts index c70f95b9ddc11..3bb97e57ca0a3 100644 --- a/packages/kbn-legacy-logging/src/utils/get_payload_size.test.ts +++ b/packages/kbn-legacy-logging/src/utils/get_payload_size.test.ts @@ -6,6 +6,7 @@ * Side Public License, v 1. */ +import { createGunzip } from 'zlib'; import mockFs from 'mock-fs'; import { createReadStream } from 'fs'; @@ -54,6 +55,11 @@ describe('getPayloadSize', () => { const result = getResponsePayloadBytes(readStream); expect(result).toBe(Buffer.byteLength(data)); }); + + test('ignores streams that are not instances of ReadStream', async () => { + const result = getResponsePayloadBytes(createGunzip()); + expect(result).toBe(undefined); + }); }); describe('handles plain responses', () => { @@ -72,6 +78,11 @@ describe('getPayloadSize', () => { const result = getResponsePayloadBytes(payload); expect(result).toBe(JSON.stringify(payload).length); }); + + test('returns undefined when source is not plain object', () => { + const result = getResponsePayloadBytes([1, 2, 3]); + expect(result).toBe(undefined); + }); }); describe('handles content-length header', () => { diff --git a/packages/kbn-legacy-logging/src/utils/get_payload_size.ts b/packages/kbn-legacy-logging/src/utils/get_payload_size.ts index de96ad7002731..c7aeb0e8cac2b 100644 --- a/packages/kbn-legacy-logging/src/utils/get_payload_size.ts +++ b/packages/kbn-legacy-logging/src/utils/get_payload_size.ts @@ -6,14 +6,13 @@ * Side Public License, v 1. */ -import type { ReadStream } from 'fs'; +import { isPlainObject } from 'lodash'; +import { ReadStream } from 'fs'; import type { ResponseObject } from '@hapi/hapi'; const isBuffer = (obj: unknown): obj is Buffer => Buffer.isBuffer(obj); -const isObject = (obj: unknown): obj is Record => - typeof obj === 'object' && obj !== null; const isFsReadStream = (obj: unknown): obj is ReadStream => - typeof obj === 'object' && obj !== null && 'bytesRead' in obj; + typeof obj === 'object' && obj !== null && 'bytesRead' in obj && obj instanceof ReadStream; const isString = (obj: unknown): obj is string => typeof obj === 'string'; /** @@ -56,7 +55,7 @@ export function getResponsePayloadBytes( return Buffer.byteLength(payload); } - if (isObject(payload)) { + if (isPlainObject(payload)) { return Buffer.byteLength(JSON.stringify(payload)); } diff --git a/src/core/server/http/logging/get_payload_size.test.ts b/src/core/server/http/logging/get_payload_size.test.ts index a4ab8919e8b6d..dba5c7be30f3b 100644 --- a/src/core/server/http/logging/get_payload_size.test.ts +++ b/src/core/server/http/logging/get_payload_size.test.ts @@ -6,6 +6,7 @@ * Side Public License, v 1. */ +import { createGunzip } from 'zlib'; import type { Request } from '@hapi/hapi'; import Boom from '@hapi/boom'; @@ -96,6 +97,18 @@ describe('getPayloadSize', () => { expect(result).toBe(Buffer.byteLength(data)); }); + + test('ignores streams that are not instances of ReadStream', async () => { + const result = getResponsePayloadBytes( + { + variety: 'stream', + source: createGunzip(), + } as Response, + logger + ); + + expect(result).toBe(undefined); + }); }); describe('handles plain responses', () => { @@ -132,6 +145,17 @@ describe('getPayloadSize', () => { ); expect(result).toBe(JSON.stringify(payload).length); }); + + test('returns undefined when source is not a plain object', () => { + const result = getResponsePayloadBytes( + { + variety: 'plain', + source: [1, 2, 3], + } as Response, + logger + ); + expect(result).toBe(undefined); + }); }); describe('handles content-length header', () => { diff --git a/src/core/server/http/logging/get_payload_size.ts b/src/core/server/http/logging/get_payload_size.ts index 6dcaf3653d842..8e6dea13e1fa1 100644 --- a/src/core/server/http/logging/get_payload_size.ts +++ b/src/core/server/http/logging/get_payload_size.ts @@ -6,7 +6,8 @@ * Side Public License, v 1. */ -import type { ReadStream } from 'fs'; +import { isPlainObject } from 'lodash'; +import { ReadStream } from 'fs'; import { isBoom } from '@hapi/boom'; import type { Request } from '@hapi/hapi'; import { Logger } from '../../logging'; @@ -17,8 +18,15 @@ const isBuffer = (src: unknown, res: Response): src is Buffer => { return !isBoom(res) && res.variety === 'buffer' && res.source === src; }; const isFsReadStream = (src: unknown, res: Response): src is ReadStream => { - return !isBoom(res) && res.variety === 'stream' && res.source === src; + return ( + !isBoom(res) && + res.variety === 'stream' && + res.source === src && + res.source instanceof ReadStream + ); }; +const isString = (src: unknown, res: Response): src is string => + !isBoom(res) && res.variety === 'plain' && typeof src === 'string'; /** * Attempts to determine the size (in bytes) of a Hapi response @@ -57,10 +65,12 @@ export function getResponsePayloadBytes(response: Response, log: Logger): number return response.source.bytesRead; } - if (response.variety === 'plain') { - return typeof response.source === 'string' - ? Buffer.byteLength(response.source) - : Buffer.byteLength(JSON.stringify(response.source)); + if (isString(response.source, response)) { + return Buffer.byteLength(response.source); + } + + if (response.variety === 'plain' && isPlainObject(response.source)) { + return Buffer.byteLength(JSON.stringify(response.source)); } } catch (e) { // We intentionally swallow any errors as this information is From 0c5fb85bfd23b636e8fcb069e0d1abf84582ca9e Mon Sep 17 00:00:00 2001 From: Frank Hassanabad Date: Thu, 4 Feb 2021 19:07:14 -0700 Subject: [PATCH 30/69] Adds tests for issue with immutable (#90372) ## Summary Adds e2e tests for https://github.com/elastic/kibana/pull/90326 * Adds e2 tests and backfills for updating actions and expected behaviors * Adds two tests that would fail without the fix and if a regression happens this will trigger on the regression * Adds two tests to the PATCH for exception lists even though there is no regression there. Reason is to prevent an accidental issue there. * Adds tests to ensure the version number does not accidentally get bumped if PATCH or UPDATE is called on actions or exceptions for immutable rules. * Adds utilities for cutting down noise. ### Checklist - [x] [Unit or functional tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html) were updated or added to match the most common scenarios --- .../tests/create_exceptions.ts | 79 +++++++++ .../security_and_spaces/tests/index.ts | 1 + .../tests/update_actions.ts | 158 ++++++++++++++++++ .../detection_engine_api_integration/utils.ts | 107 ++++++++++-- 4 files changed, 332 insertions(+), 13 deletions(-) create mode 100644 x-pack/test/detection_engine_api_integration/security_and_spaces/tests/update_actions.ts diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_exceptions.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_exceptions.ts index b1d6a13b77300..1ae6aa80b219f 100644 --- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_exceptions.ts +++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/create_exceptions.ts @@ -34,6 +34,8 @@ import { createExceptionListItem, waitForSignalsToBePresent, getSignalsByIds, + findImmutableRuleById, + getPrePackagedRulesStatus, } from '../../utils'; // eslint-disable-next-line import/no-default-export @@ -394,6 +396,83 @@ export default ({ getService }: FtrProviderContext) => { ]); }); + it('should not change the immutable tags when adding a second exception list to an immutable rule through patch', async () => { + await installPrePackagedRules(supertest); + + const { id, list_id, namespace_type, type } = await createExceptionList( + supertest, + getCreateExceptionListMinimalSchemaMock() + ); + + // Rule id of "9a1a2dae-0b5f-4c3d-8305-a268d404c306" is from the file: + // x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/elastic_endpoint.json + // This rule has an existing exceptions_list that we are going to use + const immutableRule = await getRule(supertest, '9a1a2dae-0b5f-4c3d-8305-a268d404c306'); + expect(immutableRule.exceptions_list.length).greaterThan(0); // make sure we have at least one + + // add a second exceptions list as a user is allowed to add a second list to an immutable rule + await supertest + .patch(DETECTION_ENGINE_RULES_URL) + .set('kbn-xsrf', 'true') + .send({ + rule_id: '9a1a2dae-0b5f-4c3d-8305-a268d404c306', + exceptions_list: [ + ...immutableRule.exceptions_list, + { + id, + list_id, + namespace_type, + type, + }, + ], + }) + .expect(200); + + const body = await findImmutableRuleById(supertest, '9a1a2dae-0b5f-4c3d-8305-a268d404c306'); + expect(body.data.length).to.eql(1); // should have only one length to the data set, otherwise we have duplicates or the tags were removed and that is incredibly bad. + + const bodyToCompare = removeServerGeneratedProperties(body.data[0]); + expect(bodyToCompare.rule_id).to.eql(immutableRule.rule_id); // Rule id should not change with a a patch + expect(bodyToCompare.immutable).to.eql(immutableRule.immutable); // Immutable should always stay the same which is true and never flip to false. + expect(bodyToCompare.version).to.eql(immutableRule.version); // The version should never update on a patch + }); + + it('should not change count of prepacked rules when adding a second exception list to an immutable rule through patch. If this fails, suspect the immutable tags are not staying on the rule correctly.', async () => { + await installPrePackagedRules(supertest); + + const { id, list_id, namespace_type, type } = await createExceptionList( + supertest, + getCreateExceptionListMinimalSchemaMock() + ); + + // Rule id of "9a1a2dae-0b5f-4c3d-8305-a268d404c306" is from the file: + // x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/elastic_endpoint.json + // This rule has an existing exceptions_list that we are going to use + const immutableRule = await getRule(supertest, '9a1a2dae-0b5f-4c3d-8305-a268d404c306'); + expect(immutableRule.exceptions_list.length).greaterThan(0); // make sure we have at least one + + // add a second exceptions list as a user is allowed to add a second list to an immutable rule + await supertest + .patch(DETECTION_ENGINE_RULES_URL) + .set('kbn-xsrf', 'true') + .send({ + rule_id: '9a1a2dae-0b5f-4c3d-8305-a268d404c306', + exceptions_list: [ + ...immutableRule.exceptions_list, + { + id, + list_id, + namespace_type, + type, + }, + ], + }) + .expect(200); + + const status = await getPrePackagedRulesStatus(supertest); + expect(status.rules_not_installed).to.eql(0); + }); + describe('tests with auditbeat data', () => { beforeEach(async () => { await createSignalsIndex(supertest); diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/index.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/index.ts index 7f299fc580138..b6d88b657f25c 100644 --- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/index.ts +++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/index.ts @@ -14,6 +14,7 @@ export default ({ loadTestFile }: FtrProviderContext): void => { this.tags('ciGroup11'); loadTestFile(require.resolve('./add_actions')); + loadTestFile(require.resolve('./update_actions')); loadTestFile(require.resolve('./add_prepackaged_rules')); loadTestFile(require.resolve('./create_rules')); loadTestFile(require.resolve('./create_rules_bulk')); diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/update_actions.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/update_actions.ts new file mode 100644 index 0000000000000..257c6a4286982 --- /dev/null +++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/update_actions.ts @@ -0,0 +1,158 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import expect from '@kbn/expect'; + +import { CreateRulesSchema } from '../../../../plugins/security_solution/common/detection_engine/schemas/request'; +import { DETECTION_ENGINE_RULES_URL } from '../../../../plugins/security_solution/common/constants'; +import { FtrProviderContext } from '../../common/ftr_provider_context'; +import { + createSignalsIndex, + deleteAllAlerts, + deleteSignalsIndex, + removeServerGeneratedProperties, + getRuleWithWebHookAction, + getSimpleRuleOutputWithWebHookAction, + waitForRuleSuccessOrStatus, + createRule, + getSimpleRule, + updateRule, + installPrePackagedRules, + getRule, + createNewAction, + findImmutableRuleById, + getPrePackagedRulesStatus, +} from '../../utils'; + +// eslint-disable-next-line import/no-default-export +export default ({ getService }: FtrProviderContext) => { + const supertest = getService('supertest'); + const esArchiver = getService('esArchiver'); + + describe('update_actions', () => { + describe('updating actions', () => { + beforeEach(async () => { + await esArchiver.load('auditbeat/hosts'); + await createSignalsIndex(supertest); + }); + + afterEach(async () => { + await deleteSignalsIndex(supertest); + await deleteAllAlerts(supertest); + await esArchiver.unload('auditbeat/hosts'); + }); + + it('should be able to create a new webhook action and update a rule with the webhook action', async () => { + const hookAction = await createNewAction(supertest); + const rule = getSimpleRule(); + await createRule(supertest, rule); + const ruleToUpdate = getRuleWithWebHookAction(hookAction.id, false, rule); + const updatedRule = await updateRule(supertest, ruleToUpdate); + const bodyToCompare = removeServerGeneratedProperties(updatedRule); + + const expected = { + ...getSimpleRuleOutputWithWebHookAction(`${bodyToCompare.actions?.[0].id}`), + version: 2, // version bump is required since this is an updated rule and this is part of the testing that we do bump the version number on update + }; + expect(bodyToCompare).to.eql(expected); + }); + + it('should be able to create a new webhook action and attach it to a rule without a meta field and run it correctly', async () => { + const hookAction = await createNewAction(supertest); + const rule = getSimpleRule(); + await createRule(supertest, rule); + const ruleToUpdate = getRuleWithWebHookAction(hookAction.id, true, rule); + const updatedRule = await updateRule(supertest, ruleToUpdate); + await waitForRuleSuccessOrStatus(supertest, updatedRule.id); + + // expected result for status should be 'succeeded' + const { body } = await supertest + .post(`${DETECTION_ENGINE_RULES_URL}/_find_statuses`) + .set('kbn-xsrf', 'true') + .send({ ids: [updatedRule.id] }) + .expect(200); + expect(body[updatedRule.id].current_status.status).to.eql('succeeded'); + }); + + it('should be able to create a new webhook action and attach it to a rule with a meta field and run it correctly', async () => { + const hookAction = await createNewAction(supertest); + const rule = getSimpleRule(); + await createRule(supertest, rule); + const ruleToUpdate: CreateRulesSchema = { + ...getRuleWithWebHookAction(hookAction.id, true, rule), + meta: {}, // create a rule with the action attached and a meta field + }; + const updatedRule = await updateRule(supertest, ruleToUpdate); + await waitForRuleSuccessOrStatus(supertest, updatedRule.id); + + // expected result for status should be 'succeeded' + const { body } = await supertest + .post(`${DETECTION_ENGINE_RULES_URL}/_find_statuses`) + .set('kbn-xsrf', 'true') + .send({ ids: [updatedRule.id] }) + .expect(200); + expect(body[updatedRule.id].current_status.status).to.eql('succeeded'); + }); + + it('should be able to create a new webhook action and attach it to an immutable rule', async () => { + await installPrePackagedRules(supertest); + // Rule id of "9a1a2dae-0b5f-4c3d-8305-a268d404c306" is from the file: + // x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/elastic_endpoint.json + const immutableRule = await getRule(supertest, '9a1a2dae-0b5f-4c3d-8305-a268d404c306'); + const hookAction = await createNewAction(supertest); + const newRuleToUpdate = getSimpleRule(immutableRule.rule_id); + const ruleToUpdate = getRuleWithWebHookAction(hookAction.id, false, newRuleToUpdate); + const updatedRule = await updateRule(supertest, ruleToUpdate); + const bodyToCompare = removeServerGeneratedProperties(updatedRule); + + const expected = { + ...getSimpleRuleOutputWithWebHookAction(`${bodyToCompare.actions?.[0].id}`), + rule_id: immutableRule.rule_id, // Rule id should match the same as the immutable rule + version: immutableRule.version, // This version number should not change when an immutable rule is updated + immutable: true, // It should stay immutable true when returning + }; + expect(bodyToCompare).to.eql(expected); + }); + + it('should be able to create a new webhook action, attach it to an immutable rule and the count of prepackaged rules should not increase. If this fails, suspect the immutable tags are not staying on the rule correctly.', async () => { + await installPrePackagedRules(supertest); + // Rule id of "9a1a2dae-0b5f-4c3d-8305-a268d404c306" is from the file: + // x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/elastic_endpoint.json + const immutableRule = await getRule(supertest, '9a1a2dae-0b5f-4c3d-8305-a268d404c306'); + const hookAction = await createNewAction(supertest); + const newRuleToUpdate = getSimpleRule(immutableRule.rule_id); + const ruleToUpdate = getRuleWithWebHookAction(hookAction.id, false, newRuleToUpdate); + await updateRule(supertest, ruleToUpdate); + + const status = await getPrePackagedRulesStatus(supertest); + expect(status.rules_not_installed).to.eql(0); + }); + + it('should be able to create a new webhook action, attach it to an immutable rule and the rule should stay immutable when searching against immutable tags', async () => { + await installPrePackagedRules(supertest); + // Rule id of "9a1a2dae-0b5f-4c3d-8305-a268d404c306" is from the file: + // x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/elastic_endpoint.json + const immutableRule = await getRule(supertest, '9a1a2dae-0b5f-4c3d-8305-a268d404c306'); + const hookAction = await createNewAction(supertest); + const newRuleToUpdate = getSimpleRule(immutableRule.rule_id); + const ruleToUpdate = getRuleWithWebHookAction(hookAction.id, false, newRuleToUpdate); + await updateRule(supertest, ruleToUpdate); + const body = await findImmutableRuleById(supertest, '9a1a2dae-0b5f-4c3d-8305-a268d404c306'); + + expect(body.data.length).to.eql(1); // should have only one length to the data set, otherwise we have duplicates or the tags were removed and that is incredibly bad. + const bodyToCompare = removeServerGeneratedProperties(body.data[0]); + const expected = { + ...getSimpleRuleOutputWithWebHookAction(`${bodyToCompare.actions?.[0].id}`), + rule_id: immutableRule.rule_id, // Rule id should match the same as the immutable rule + version: immutableRule.version, // This version number should not change when an immutable rule is updated + immutable: true, // It should stay immutable true when returning + }; + expect(bodyToCompare).to.eql(expected); + }); + }); + }); +}; diff --git a/x-pack/test/detection_engine_api_integration/utils.ts b/x-pack/test/detection_engine_api_integration/utils.ts index 71390400c359b..158247ee244dd 100644 --- a/x-pack/test/detection_engine_api_integration/utils.ts +++ b/x-pack/test/detection_engine_api_integration/utils.ts @@ -11,6 +11,7 @@ import { SuperTest } from 'supertest'; import supertestAsPromised from 'supertest-as-promised'; import { Context } from '@elastic/elasticsearch/lib/Transport'; import { SearchResponse } from 'elasticsearch'; +import { PrePackagedRulesAndTimelinesStatusSchema } from '../../plugins/security_solution/common/detection_engine/schemas/response'; import { NonEmptyEntriesArray } from '../../plugins/lists/common/schemas'; import { getCreateExceptionListDetectionSchemaMock } from '../../plugins/lists/common/schemas/request/create_exception_list_schema.mock'; import { @@ -38,6 +39,7 @@ import { DETECTION_ENGINE_PREPACKAGED_URL, DETECTION_ENGINE_QUERY_SIGNALS_URL, DETECTION_ENGINE_RULES_URL, + INTERNAL_IMMUTABLE_KEY, INTERNAL_RULE_ID_KEY, } from '../../plugins/security_solution/common/constants'; import { getCreateExceptionListItemMinimalSchemaMockWithoutId } from '../../plugins/lists/common/schemas/request/create_exception_list_item_schema.mock'; @@ -674,20 +676,27 @@ export const getWebHookAction = () => ({ name: 'Some connector', }); -export const getRuleWithWebHookAction = (id: string, enabled = false): CreateRulesSchema => ({ - ...getSimpleRule('rule-1', enabled), - throttle: 'rule', - actions: [ - { - group: 'default', - id, - params: { - body: '{}', +export const getRuleWithWebHookAction = ( + id: string, + enabled = false, + rule?: QueryCreateSchema +): CreateRulesSchema | UpdateRulesSchema => { + const finalRule = rule != null ? { ...rule, enabled } : getSimpleRule('rule-1', enabled); + return { + ...finalRule, + throttle: 'rule', + actions: [ + { + group: 'default', + id, + params: { + body: '{}', + }, + action_type_id: '.webhook', }, - action_type_id: '.webhook', - }, - ], -}); + ], + }; +}; export const getSimpleRuleOutputWithWebHookAction = (actionId: string): Partial => ({ ...getSimpleRuleOutput(), @@ -830,6 +839,78 @@ export const createRule = async ( return body; }; +/** + * Helper to cut down on the noise in some of the tests. This checks for + * an expected 200 still and does not do any retries. + * @param supertest The supertest deps + * @param rule The rule to create + */ +export const updateRule = async ( + supertest: SuperTest, + updatedRule: UpdateRulesSchema +): Promise => { + const { body } = await supertest + .put(DETECTION_ENGINE_RULES_URL) + .set('kbn-xsrf', 'true') + .send(updatedRule) + .expect(200); + return body; +}; + +/** + * Helper to cut down on the noise in some of the tests. This + * creates a new action and expects a 200 and does not do any retries. + * @param supertest The supertest deps + */ +export const createNewAction = async (supertest: SuperTest) => { + const { body } = await supertest + .post('/api/actions/action') + .set('kbn-xsrf', 'true') + .send(getWebHookAction()) + .expect(200); + return body; +}; + +/** + * Helper to cut down on the noise in some of the tests. This + * creates a new action and expects a 200 and does not do any retries. + * @param supertest The supertest deps + */ +export const findImmutableRuleById = async ( + supertest: SuperTest, + ruleId: string +): Promise<{ + page: number; + perPage: number; + total: number; + data: FullResponseSchema[]; +}> => { + const { body } = await supertest + .get( + `${DETECTION_ENGINE_RULES_URL}/_find?filter=alert.attributes.tags: "${INTERNAL_IMMUTABLE_KEY}:true" AND alert.attributes.tags: "${INTERNAL_RULE_ID_KEY}:${ruleId}"` + ) + .set('kbn-xsrf', 'true') + .send() + .expect(200); + return body; +}; + +/** + * Helper to cut down on the noise in some of the tests. This + * creates a new action and expects a 200 and does not do any retries. + * @param supertest The supertest deps + */ +export const getPrePackagedRulesStatus = async ( + supertest: SuperTest +): Promise => { + const { body } = await supertest + .get(`${DETECTION_ENGINE_PREPACKAGED_URL}/_status`) + .set('kbn-xsrf', 'true') + .send() + .expect(200); + return body; +}; + /** * Helper to cut down on the noise in some of the tests. This checks for * an expected 200 still and does not try to any retries. Creates exception lists From d8ea8af22f40f0934f537f3cb141910f3bdddd65 Mon Sep 17 00:00:00 2001 From: CJ Cenizal Date: Thu, 4 Feb 2021 19:22:46 -0800 Subject: [PATCH 31/69] Change Remote Clusters Cloud message to clarify that it's Elastic Cloud. (#90314) --- .../components/remote_cluster_form/remote_cluster_form.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/remote_cluster_form.js b/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/remote_cluster_form.js index 7c01eea57e723..325215d08af5f 100644 --- a/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/remote_cluster_form.js +++ b/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/remote_cluster_form.js @@ -528,7 +528,7 @@ export class RemoteClusterForm extends Component { title={ } > From 860152810b5b1cb3815f345ad33f7d7fb2213362 Mon Sep 17 00:00:00 2001 From: Xavier Mouligneau <189600+XavierM@users.noreply.github.com> Date: Thu, 4 Feb 2021 22:38:38 -0500 Subject: [PATCH 32/69] [SECURITY SOLUTIONS] add property include_unmapped (#90341) * simpler fix * remove fields capabilities to get unmapper fields * fix test * bring back test --- .../timeline/factory/events/details/index.ts | 12 +- .../details/query.events_details.dsl.test.ts | 55 ++ .../details/query.events_details.dsl.ts | 2 - .../security_solution/timeline_details.ts | 617 +++++++----------- 4 files changed, 298 insertions(+), 388 deletions(-) create mode 100644 x-pack/plugins/security_solution/server/search_strategy/timeline/factory/events/details/query.events_details.dsl.test.ts diff --git a/x-pack/plugins/security_solution/server/search_strategy/timeline/factory/events/details/index.ts b/x-pack/plugins/security_solution/server/search_strategy/timeline/factory/events/details/index.ts index 40867e566a730..f5deb258fc1f4 100644 --- a/x-pack/plugins/security_solution/server/search_strategy/timeline/factory/events/details/index.ts +++ b/x-pack/plugins/security_solution/server/search_strategy/timeline/factory/events/details/index.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { cloneDeep, merge, unionBy } from 'lodash/fp'; +import { cloneDeep, merge } from 'lodash/fp'; import { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common'; import { @@ -17,7 +17,7 @@ import { import { inspectStringifyObject } from '../../../../../utils/build_query'; import { SecuritySolutionTimelineFactory } from '../../types'; import { buildTimelineDetailsQuery } from './query.events_details.dsl'; -import { getDataFromFieldsHits, getDataFromSourceHits } from './helpers'; +import { getDataFromSourceHits } from './helpers'; export const timelineEventsDetails: SecuritySolutionTimelineFactory = { buildDsl: (options: TimelineEventsDetailsRequestOptions) => { @@ -29,7 +29,7 @@ export const timelineEventsDetails: SecuritySolutionTimelineFactory ): Promise => { const { indexName, eventId, docValueFields = [] } = options; - const { _source, fields, ...hitsData } = cloneDeep(response.rawResponse.hits.hits[0] ?? {}); + const { _source, ...hitsData } = cloneDeep(response.rawResponse.hits.hits[0] ?? {}); const inspect = { dsl: [inspectStringifyObject(buildTimelineDetailsQuery(indexName, eventId, docValueFields))], }; @@ -42,13 +42,11 @@ export const timelineEventsDetails: SecuritySolutionTimelineFactory { + it('returns the expected query', () => { + const indexName = '.siem-signals-default'; + const eventId = 'f0a936d50b5b3a5a193d415459c14587fe633f7e519df7b5dc151d56142680e3'; + const docValueFields = [ + { field: '@timestamp' }, + { field: 'agent.ephemeral_id' }, + { field: 'agent.id' }, + { field: 'agent.name' }, + ]; + + const query = buildTimelineDetailsQuery(indexName, eventId, docValueFields); + + expect(query).toMatchInlineSnapshot(` + Object { + "allowNoIndices": true, + "body": Object { + "docvalue_fields": Array [ + Object { + "field": "@timestamp", + }, + Object { + "field": "agent.ephemeral_id", + }, + Object { + "field": "agent.id", + }, + Object { + "field": "agent.name", + }, + ], + "query": Object { + "terms": Object { + "_id": Array [ + "f0a936d50b5b3a5a193d415459c14587fe633f7e519df7b5dc151d56142680e3", + ], + }, + }, + }, + "ignoreUnavailable": true, + "index": ".siem-signals-default", + "size": 1, + } + `); + }); +}); diff --git a/x-pack/plugins/security_solution/server/search_strategy/timeline/factory/events/details/query.events_details.dsl.ts b/x-pack/plugins/security_solution/server/search_strategy/timeline/factory/events/details/query.events_details.dsl.ts index a1265750271fa..e8890072c1aff 100644 --- a/x-pack/plugins/security_solution/server/search_strategy/timeline/factory/events/details/query.events_details.dsl.ts +++ b/x-pack/plugins/security_solution/server/search_strategy/timeline/factory/events/details/query.events_details.dsl.ts @@ -22,8 +22,6 @@ export const buildTimelineDetailsQuery = ( _id: [id], }, }, - fields: ['*'], - _source: ['signal.*'], }, size: 1, }); diff --git a/x-pack/test/api_integration/apis/security_solution/timeline_details.ts b/x-pack/test/api_integration/apis/security_solution/timeline_details.ts index c204ec3b28cf0..2705406009062 100644 --- a/x-pack/test/api_integration/apis/security_solution/timeline_details.ts +++ b/x-pack/test/api_integration/apis/security_solution/timeline_details.ts @@ -16,464 +16,373 @@ const INDEX_NAME = 'filebeat-7.0.0-iot-2019.06'; const ID = 'QRhG1WgBqd-n62SwZYDT'; const EXPECTED_DATA = [ { - category: 'file', - field: 'file.path', - values: [ - '/dm/2$XTMWANo0Q2RZKlH-95UoAahZrOg~/0a9a/bf72/e1da/4c20-919e-0cbabcf7bfe8/75f50c57-d25f-4e97-9e37-01b9f5caa293_audio_13.mp4', - ], - originalValue: [ - '/dm/2$XTMWANo0Q2RZKlH-95UoAahZrOg~/0a9a/bf72/e1da/4c20-919e-0cbabcf7bfe8/75f50c57-d25f-4e97-9e37-01b9f5caa293_audio_13.mp4', - ], - }, - { - category: 'traefik', - field: 'traefik.access.geoip.region_iso_code', - values: ['US-WA'], - originalValue: ['US-WA'], - }, - { - category: 'host', - field: 'host.hostname', - values: ['raspberrypi'], - originalValue: ['raspberrypi'], - }, - { - category: 'traefik', - field: 'traefik.access.geoip.location', - values: ['{"long":-122.3341,"lat":47.6103}'], - originalValue: ['{"coordinates":[-122.3341,47.6103],"type":"Point"}'], + category: 'base', + field: '@timestamp', + values: ['2019-02-10T02:39:44.107Z'], + originalValue: '2019-02-10T02:39:44.107Z', }, { - category: 'suricata', - field: 'suricata.eve.src_port', - values: ['80'], - originalValue: ['80'], + category: '@version', + field: '@version', + values: ['1'], + originalValue: '1', }, { - category: 'traefik', - field: 'traefik.access.geoip.city_name', - values: ['Seattle'], - originalValue: ['Seattle'], + category: 'agent', + field: 'agent.ephemeral_id', + values: ['909cd6a1-527d-41a5-9585-a7fb5386f851'], + originalValue: '909cd6a1-527d-41a5-9585-a7fb5386f851', }, { - category: 'service', - field: 'service.type', - values: ['suricata'], - originalValue: ['suricata'], + category: 'agent', + field: 'agent.hostname', + values: ['raspberrypi'], + originalValue: 'raspberrypi', }, { - category: 'http', - field: 'http.request.method', - values: ['get'], - originalValue: ['get'], + category: 'agent', + field: 'agent.id', + values: ['4d3ea604-27e5-4ec7-ab64-44f82285d776'], + originalValue: '4d3ea604-27e5-4ec7-ab64-44f82285d776', }, { - category: 'host', - field: 'host.os.version', - values: ['9 (stretch)'], - originalValue: ['9 (stretch)'], + category: 'agent', + field: 'agent.type', + values: ['filebeat'], + originalValue: 'filebeat', }, { - category: 'source', - field: 'source.geo.region_name', - values: ['Washington'], - originalValue: ['Washington'], + category: 'agent', + field: 'agent.version', + values: ['7.0.0'], + originalValue: '7.0.0', }, { - category: 'suricata', - field: 'suricata.eve.http.protocol', - values: ['HTTP/1.1'], - originalValue: ['HTTP/1.1'], + category: 'destination', + field: 'destination.domain', + values: ['s3-iad-2.cf.dash.row.aiv-cdn.net'], + originalValue: 's3-iad-2.cf.dash.row.aiv-cdn.net', }, { - category: 'host', - field: 'host.os.name', - values: ['Raspbian GNU/Linux'], - originalValue: ['Raspbian GNU/Linux'], + category: 'destination', + field: 'destination.ip', + values: ['10.100.7.196'], + originalValue: '10.100.7.196', }, { - category: 'source', - field: 'source.ip', - values: ['54.239.219.210'], - originalValue: ['54.239.219.210'], + category: 'destination', + field: 'destination.port', + values: [40684], + originalValue: 40684, }, { - category: 'host', - field: 'host.name', - values: ['raspberrypi'], - originalValue: ['raspberrypi'], + category: 'ecs', + field: 'ecs.version', + values: ['1.0.0-beta2'], + originalValue: '1.0.0-beta2', }, { - category: 'source', - field: 'source.geo.region_iso_code', - values: ['US-WA'], - originalValue: ['US-WA'], + category: 'event', + field: 'event.dataset', + values: ['suricata.eve'], + originalValue: 'suricata.eve', }, { - category: 'http', - field: 'http.response.status_code', - values: ['206'], - originalValue: ['206'], + category: 'event', + field: 'event.end', + values: ['2019-02-10T02:39:44.107Z'], + originalValue: '2019-02-10T02:39:44.107Z', }, { category: 'event', field: 'event.kind', values: ['event'], - originalValue: ['event'], + originalValue: 'event', }, { - category: 'suricata', - field: 'suricata.eve.flow_id', - values: ['196625917175466'], - originalValue: ['196625917175466'], - }, - { - category: 'source', - field: 'source.geo.city_name', - values: ['Seattle'], - originalValue: ['Seattle'], + category: 'event', + field: 'event.module', + values: ['suricata'], + originalValue: 'suricata', }, { - category: 'suricata', - field: 'suricata.eve.proto', - values: ['tcp'], - originalValue: ['tcp'], + category: 'event', + field: 'event.type', + values: ['fileinfo'], + originalValue: 'fileinfo', }, { - category: 'flow', - field: 'flow.locality', - values: ['public'], - originalValue: ['public'], + category: 'file', + field: 'file.path', + values: [ + '/dm/2$XTMWANo0Q2RZKlH-95UoAahZrOg~/0a9a/bf72/e1da/4c20-919e-0cbabcf7bfe8/75f50c57-d25f-4e97-9e37-01b9f5caa293_audio_13.mp4', + ], + originalValue: + '/dm/2$XTMWANo0Q2RZKlH-95UoAahZrOg~/0a9a/bf72/e1da/4c20-919e-0cbabcf7bfe8/75f50c57-d25f-4e97-9e37-01b9f5caa293_audio_13.mp4', }, { - category: 'traefik', - field: 'traefik.access.geoip.country_iso_code', - values: ['US'], - originalValue: ['US'], + category: 'file', + field: 'file.size', + values: [48277], + originalValue: 48277, }, { category: 'fileset', field: 'fileset.name', values: ['eve'], - originalValue: ['eve'], + originalValue: 'eve', }, { - category: 'input', - field: 'input.type', - values: ['log'], - originalValue: ['log'], - }, - { - category: 'log', - field: 'log.offset', - values: ['1856288115'], - originalValue: ['1856288115'], + category: 'flow', + field: 'flow.locality', + values: ['public'], + originalValue: 'public', }, { - category: 'destination', - field: 'destination.domain', - values: ['s3-iad-2.cf.dash.row.aiv-cdn.net'], - originalValue: ['s3-iad-2.cf.dash.row.aiv-cdn.net'], + category: 'host', + field: 'host.architecture', + values: ['armv7l'], + originalValue: 'armv7l', }, { - category: 'agent', - field: 'agent.hostname', + category: 'host', + field: 'host.hostname', values: ['raspberrypi'], - originalValue: ['raspberrypi'], - }, - { - category: 'suricata', - field: 'suricata.eve.http.hostname', - values: ['s3-iad-2.cf.dash.row.aiv-cdn.net'], - originalValue: ['s3-iad-2.cf.dash.row.aiv-cdn.net'], + originalValue: 'raspberrypi', }, { - category: 'suricata', - field: 'suricata.eve.in_iface', - values: ['eth0'], - originalValue: ['eth0'], - }, - { - category: 'base', - field: 'tags', - values: ['suricata'], - originalValue: ['suricata'], + category: 'host', + field: 'host.id', + values: ['b19a781f683541a7a25ee345133aa399'], + originalValue: 'b19a781f683541a7a25ee345133aa399', }, { category: 'host', - field: 'host.architecture', - values: ['armv7l'], - originalValue: ['armv7l'], + field: 'host.name', + values: ['raspberrypi'], + originalValue: 'raspberrypi', }, { - category: 'suricata', - field: 'suricata.eve.http.status', - values: ['206'], - originalValue: ['206'], + category: 'host', + field: 'host.os.codename', + values: ['stretch'], + originalValue: 'stretch', }, { - category: 'suricata', - field: 'suricata.eve.http.url', - values: [ - '/dm/2$XTMWANo0Q2RZKlH-95UoAahZrOg~/0a9a/bf72/e1da/4c20-919e-0cbabcf7bfe8/75f50c57-d25f-4e97-9e37-01b9f5caa293_audio_13.mp4', - ], - originalValue: [ - '/dm/2$XTMWANo0Q2RZKlH-95UoAahZrOg~/0a9a/bf72/e1da/4c20-919e-0cbabcf7bfe8/75f50c57-d25f-4e97-9e37-01b9f5caa293_audio_13.mp4', - ], + category: 'host', + field: 'host.os.family', + values: [''], + originalValue: '', }, { - category: 'url', - field: 'url.path', - values: [ - '/dm/2$XTMWANo0Q2RZKlH-95UoAahZrOg~/0a9a/bf72/e1da/4c20-919e-0cbabcf7bfe8/75f50c57-d25f-4e97-9e37-01b9f5caa293_audio_13.mp4', - ], - originalValue: [ - '/dm/2$XTMWANo0Q2RZKlH-95UoAahZrOg~/0a9a/bf72/e1da/4c20-919e-0cbabcf7bfe8/75f50c57-d25f-4e97-9e37-01b9f5caa293_audio_13.mp4', - ], + category: 'host', + field: 'host.os.kernel', + values: ['4.14.50-v7+'], + originalValue: '4.14.50-v7+', }, { - category: 'source', - field: 'source.port', - values: ['80'], - originalValue: ['80'], + category: 'host', + field: 'host.os.name', + values: ['Raspbian GNU/Linux'], + originalValue: 'Raspbian GNU/Linux', }, { - category: 'agent', - field: 'agent.id', - values: ['4d3ea604-27e5-4ec7-ab64-44f82285d776'], - originalValue: ['4d3ea604-27e5-4ec7-ab64-44f82285d776'], + category: 'host', + field: 'host.os.platform', + values: ['raspbian'], + originalValue: 'raspbian', }, { category: 'host', - field: 'host.containerized', - values: ['false'], - originalValue: ['false'], + field: 'host.os.version', + values: ['9 (stretch)'], + originalValue: '9 (stretch)', }, { - category: 'ecs', - field: 'ecs.version', - values: ['1.0.0-beta2'], - originalValue: ['1.0.0-beta2'], + category: 'http', + field: 'http.request.method', + values: ['get'], + originalValue: 'get', }, { - category: 'agent', - field: 'agent.version', - values: ['7.0.0'], - originalValue: ['7.0.0'], + category: 'http', + field: 'http.response.body.bytes', + values: [48277], + originalValue: 48277, }, { - category: 'suricata', - field: 'suricata.eve.fileinfo.stored', - values: ['false'], - originalValue: ['false'], + category: 'http', + field: 'http.response.status_code', + values: [206], + originalValue: 206, }, { - category: 'host', - field: 'host.os.family', - values: [''], - originalValue: [''], + category: 'input', + field: 'input.type', + values: ['log'], + originalValue: 'log', }, { category: 'base', field: 'labels.pipeline', values: ['filebeat-7.0.0-suricata-eve-pipeline'], - originalValue: ['filebeat-7.0.0-suricata-eve-pipeline'], + originalValue: 'filebeat-7.0.0-suricata-eve-pipeline', }, { - category: 'suricata', - field: 'suricata.eve.src_ip', - values: ['54.239.219.210'], - originalValue: ['54.239.219.210'], + category: 'log', + field: 'log.file.path', + values: ['/var/log/suricata/eve.json'], + originalValue: '/var/log/suricata/eve.json', }, { - category: 'suricata', - field: 'suricata.eve.fileinfo.state', - values: ['CLOSED'], - originalValue: ['CLOSED'], + category: 'log', + field: 'log.offset', + values: [1856288115], + originalValue: 1856288115, }, { - category: 'destination', - field: 'destination.port', - values: ['40684'], - originalValue: ['40684'], + category: 'network', + field: 'network.name', + values: ['iot'], + originalValue: 'iot', }, { - category: 'traefik', - field: 'traefik.access.geoip.region_name', - values: ['Washington'], - originalValue: ['Washington'], + category: 'network', + field: 'network.protocol', + values: ['http'], + originalValue: 'http', }, { - category: 'source', - field: 'source.as.num', - values: ['16509'], - originalValue: ['16509'], + category: 'network', + field: 'network.transport', + values: ['tcp'], + originalValue: 'tcp', }, { - category: 'event', - field: 'event.end', - values: ['2019-02-10T02:39:44.107Z'], - originalValue: ['2019-02-10T02:39:44.107Z'], + category: 'service', + field: 'service.type', + values: ['suricata'], + originalValue: 'suricata', }, { category: 'source', - field: 'source.geo.location', - values: ['{"long":-122.3341,"lat":47.6103}'], - originalValue: ['{"coordinates":[-122.3341,47.6103],"type":"Point"}'], + field: 'source.as.num', + values: [16509], + originalValue: 16509, }, { category: 'source', - field: 'source.domain', - values: ['server-54-239-219-210.jfk51.r.cloudfront.net'], - originalValue: ['server-54-239-219-210.jfk51.r.cloudfront.net'], - }, - { - category: 'suricata', - field: 'suricata.eve.fileinfo.size', - values: ['48277'], - originalValue: ['48277'], - }, - { - category: 'suricata', - field: 'suricata.eve.app_proto', - values: ['http'], - originalValue: ['http'], - }, - { - category: 'agent', - field: 'agent.type', - values: ['filebeat'], - originalValue: ['filebeat'], - }, - { - category: 'suricata', - field: 'suricata.eve.fileinfo.tx_id', - values: ['301'], - originalValue: ['301'], + field: 'source.as.org', + values: ['Amazon.com, Inc.'], + originalValue: 'Amazon.com, Inc.', }, { - category: 'event', - field: 'event.module', - values: ['suricata'], - originalValue: ['suricata'], + category: 'source', + field: 'source.domain', + values: ['server-54-239-219-210.jfk51.r.cloudfront.net'], + originalValue: 'server-54-239-219-210.jfk51.r.cloudfront.net', }, { - category: 'network', - field: 'network.protocol', - values: ['http'], - originalValue: ['http'], + category: 'source', + field: 'source.geo.city_name', + values: ['Seattle'], + originalValue: 'Seattle', }, { - category: 'host', - field: 'host.os.kernel', - values: ['4.14.50-v7+'], - originalValue: ['4.14.50-v7+'], + category: 'source', + field: 'source.geo.continent_name', + values: ['North America'], + originalValue: 'North America', }, { category: 'source', field: 'source.geo.country_iso_code', values: ['US'], - originalValue: ['US'], + originalValue: 'US', }, { - category: '@version', - field: '@version', - values: ['1'], - originalValue: ['1'], - }, - { - category: 'host', - field: 'host.id', - values: ['b19a781f683541a7a25ee345133aa399'], - originalValue: ['b19a781f683541a7a25ee345133aa399'], + category: 'source', + field: 'source.geo.location.lat', + values: [47.6103], + originalValue: 47.6103, }, { category: 'source', - field: 'source.as.org', - values: ['Amazon.com, Inc.'], - originalValue: ['Amazon.com, Inc.'], + field: 'source.geo.location.lon', + values: [-122.3341], + originalValue: -122.3341, }, { - category: 'suricata', - field: 'suricata.eve.timestamp', - values: ['2019-02-10T02:39:44.107Z'], - originalValue: ['2019-02-10T02:39:44.107Z'], + category: 'source', + field: 'source.geo.region_iso_code', + values: ['US-WA'], + originalValue: 'US-WA', }, { - category: 'host', - field: 'host.os.codename', - values: ['stretch'], - originalValue: ['stretch'], + category: 'source', + field: 'source.geo.region_name', + values: ['Washington'], + originalValue: 'Washington', }, { category: 'source', - field: 'source.geo.continent_name', - values: ['North America'], - originalValue: ['North America'], + field: 'source.ip', + values: ['54.239.219.210'], + originalValue: '54.239.219.210', }, { - category: 'network', - field: 'network.name', - values: ['iot'], - originalValue: ['iot'], + category: 'source', + field: 'source.port', + values: [80], + originalValue: 80, }, { category: 'suricata', - field: 'suricata.eve.http.http_method', - values: ['get'], - originalValue: ['get'], - }, - { - category: 'traefik', - field: 'traefik.access.geoip.continent_name', - values: ['North America'], - originalValue: ['North America'], + field: 'suricata.eve.fileinfo.state', + values: ['CLOSED'], + originalValue: 'CLOSED', }, { - category: 'file', - field: 'file.size', - values: ['48277'], - originalValue: ['48277'], + category: 'suricata', + field: 'suricata.eve.fileinfo.tx_id', + values: [301], + originalValue: 301, }, { - category: 'destination', - field: 'destination.ip', - values: ['10.100.7.196'], - originalValue: ['10.100.7.196'], + category: 'suricata', + field: 'suricata.eve.flow_id', + values: [196625917175466], + originalValue: 196625917175466, }, { category: 'suricata', - field: 'suricata.eve.http.length', - values: ['48277'], - originalValue: ['48277'], + field: 'suricata.eve.http.http_content_type', + values: ['video/mp4'], + originalValue: 'video/mp4', }, { - category: 'http', - field: 'http.response.body.bytes', - values: ['48277'], - originalValue: ['48277'], + category: 'suricata', + field: 'suricata.eve.http.protocol', + values: ['HTTP/1.1'], + originalValue: 'HTTP/1.1', }, { category: 'suricata', - field: 'suricata.eve.fileinfo.filename', - values: [ - '/dm/2$XTMWANo0Q2RZKlH-95UoAahZrOg~/0a9a/bf72/e1da/4c20-919e-0cbabcf7bfe8/75f50c57-d25f-4e97-9e37-01b9f5caa293_audio_13.mp4', - ], - originalValue: [ - '/dm/2$XTMWANo0Q2RZKlH-95UoAahZrOg~/0a9a/bf72/e1da/4c20-919e-0cbabcf7bfe8/75f50c57-d25f-4e97-9e37-01b9f5caa293_audio_13.mp4', - ], + field: 'suricata.eve.in_iface', + values: ['eth0'], + originalValue: 'eth0', }, { - category: 'suricata', - field: 'suricata.eve.dest_ip', - values: ['10.100.7.196'], - originalValue: ['10.100.7.196'], + category: 'base', + field: 'tags', + values: ['suricata'], + originalValue: ['suricata'], }, { - category: 'network', - field: 'network.transport', - values: ['tcp'], - originalValue: ['tcp'], + category: 'url', + field: 'url.domain', + values: ['s3-iad-2.cf.dash.row.aiv-cdn.net'], + originalValue: 's3-iad-2.cf.dash.row.aiv-cdn.net', }, { category: 'url', @@ -481,81 +390,35 @@ const EXPECTED_DATA = [ values: [ '/dm/2$XTMWANo0Q2RZKlH-95UoAahZrOg~/0a9a/bf72/e1da/4c20-919e-0cbabcf7bfe8/75f50c57-d25f-4e97-9e37-01b9f5caa293_audio_13.mp4', ], - originalValue: [ + originalValue: '/dm/2$XTMWANo0Q2RZKlH-95UoAahZrOg~/0a9a/bf72/e1da/4c20-919e-0cbabcf7bfe8/75f50c57-d25f-4e97-9e37-01b9f5caa293_audio_13.mp4', - ], - }, - { - category: 'base', - field: '@timestamp', - values: ['2019-02-10T02:39:44.107Z'], - originalValue: ['2019-02-10T02:39:44.107Z'], - }, - { - category: 'host', - field: 'host.os.platform', - values: ['raspbian'], - originalValue: ['raspbian'], - }, - { - category: 'suricata', - field: 'suricata.eve.dest_port', - values: ['40684'], - originalValue: ['40684'], - }, - { - category: 'event', - field: 'event.type', - values: ['fileinfo'], - originalValue: ['fileinfo'], - }, - { - category: 'log', - field: 'log.file.path', - values: ['/var/log/suricata/eve.json'], - originalValue: ['/var/log/suricata/eve.json'], }, { category: 'url', - field: 'url.domain', - values: ['s3-iad-2.cf.dash.row.aiv-cdn.net'], - originalValue: ['s3-iad-2.cf.dash.row.aiv-cdn.net'], - }, - { - category: 'agent', - field: 'agent.ephemeral_id', - values: ['909cd6a1-527d-41a5-9585-a7fb5386f851'], - originalValue: ['909cd6a1-527d-41a5-9585-a7fb5386f851'], - }, - { - category: 'suricata', - field: 'suricata.eve.http.http_content_type', - values: ['video/mp4'], - originalValue: ['video/mp4'], - }, - { - category: 'event', - field: 'event.dataset', - values: ['suricata.eve'], - originalValue: ['suricata.eve'], + field: 'url.path', + values: [ + '/dm/2$XTMWANo0Q2RZKlH-95UoAahZrOg~/0a9a/bf72/e1da/4c20-919e-0cbabcf7bfe8/75f50c57-d25f-4e97-9e37-01b9f5caa293_audio_13.mp4', + ], + originalValue: + '/dm/2$XTMWANo0Q2RZKlH-95UoAahZrOg~/0a9a/bf72/e1da/4c20-919e-0cbabcf7bfe8/75f50c57-d25f-4e97-9e37-01b9f5caa293_audio_13.mp4', }, { category: '_index', field: '_index', values: ['filebeat-7.0.0-iot-2019.06'], - originalValue: ['filebeat-7.0.0-iot-2019.06'], + originalValue: 'filebeat-7.0.0-iot-2019.06', }, { category: '_id', field: '_id', values: ['QRhG1WgBqd-n62SwZYDT'], - originalValue: ['QRhG1WgBqd-n62SwZYDT'], + originalValue: 'QRhG1WgBqd-n62SwZYDT', }, { category: '_score', field: '_score', - values: ['1'], - originalValue: ['1'], + values: [1], + originalValue: 1, }, ]; @@ -589,12 +452,8 @@ export default function ({ getService }: FtrProviderContext) { eventId: ID, }) .expect(200); - expect( - sortBy(detailsData, 'name').map((item) => { - const { __typename, ...rest } = item; - return rest; - }) - ).to.eql(sortBy(EXPECTED_DATA, 'name')); + + expect(sortBy(detailsData, 'name')).to.eql(sortBy(EXPECTED_DATA, 'name')); }); it('Make sure that we get kpi data', async () => { From 98c2de3db9c4adbffb379ac5495629706c1528f4 Mon Sep 17 00:00:00 2001 From: Mikhail Shustov Date: Fri, 5 Feb 2021 07:15:49 +0100 Subject: [PATCH 33/69] remove unused angular import from security solution (#90263) Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> --- x-pack/plugins/security_solution/public/common/lib/lib.ts | 8 -------- 1 file changed, 8 deletions(-) diff --git a/x-pack/plugins/security_solution/public/common/lib/lib.ts b/x-pack/plugins/security_solution/public/common/lib/lib.ts index e953fb1a341a3..7919ef78fff0b 100644 --- a/x-pack/plugins/security_solution/public/common/lib/lib.ts +++ b/x-pack/plugins/security_solution/public/common/lib/lib.ts @@ -5,7 +5,6 @@ * 2.0. */ -import { IScope } from 'angular'; import { NormalizedCacheObject } from 'apollo-cache-inmemory'; import ApolloClient from 'apollo-client'; @@ -38,10 +37,3 @@ export interface AppKibanaUIConfig { // eslint-disable-next-line @typescript-eslint/no-explicit-any set(key: string, value: any): Promise; } - -export interface AppKibanaAdapterServiceRefs { - config: AppKibanaUIConfig; - rootScope: IScope; -} - -export type AppBufferedKibanaServiceCall = (serviceRefs: ServiceRefs) => void; From 81e4595eafe3434cb07b8c22b5671415db15c972 Mon Sep 17 00:00:00 2001 From: Mikhail Shustov Date: Fri, 5 Feb 2021 07:16:17 +0100 Subject: [PATCH 34/69] prevent jest leaking into the prod build (#90318) --- .../public/indexpattern_datasource/indexpattern.test.ts | 7 ++----- .../public/indexpattern_datasource/operations/index.ts | 2 -- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern.test.ts b/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern.test.ts index 3f842792c20cf..4e7e07b99904f 100644 --- a/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern.test.ts +++ b/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern.test.ts @@ -14,11 +14,8 @@ import { dataPluginMock } from '../../../../../src/plugins/data/public/mocks'; import { Ast } from '@kbn/interpreter/common'; import { chartPluginMock } from '../../../../../src/plugins/charts/public/mocks'; import { getFieldByNameFactory } from './pure_helpers'; -import { - operationDefinitionMap, - getErrorMessages, - createMockedReferenceOperation, -} from './operations'; +import { operationDefinitionMap, getErrorMessages } from './operations'; +import { createMockedReferenceOperation } from './operations/mocks'; jest.mock('./loader'); jest.mock('../id_generator'); diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/index.ts b/x-pack/plugins/lens/public/indexpattern_datasource/operations/index.ts index 2677c16c566f5..aa46dd765bd8b 100644 --- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/index.ts +++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/index.ts @@ -32,5 +32,3 @@ export { DerivativeIndexPatternColumn, MovingAverageIndexPatternColumn, } from './definitions'; - -export { createMockedReferenceOperation } from './mocks'; From 1f0da4f8894924dfd9b6032e6af9c02d464aff18 Mon Sep 17 00:00:00 2001 From: Uladzislau Lasitsa Date: Fri, 5 Feb 2021 10:58:30 +0300 Subject: [PATCH 35/69] Removes editorConfig.collections (#89854) * Removed editorConfig.collections * Fix CI * Update snapshots * Fix comments * Fix eslint Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> --- .../public/components/wms_options.tsx | 6 +- .../public/components/region_map_options.tsx | 16 +- .../region_map/public/kibana_services.ts | 5 + .../region_map/public/region_map_type.ts | 16 +- .../tile_map/public/components/collections.ts | 65 ++++++++ .../public/components/tile_map_options.tsx | 17 +- src/plugins/tile_map/public/services.ts | 3 + src/plugins/tile_map/public/tile_map_type.ts | 61 +------- .../components/options/basic_options.tsx | 11 +- .../public/components/metric_vis_options.tsx | 28 +++- .../vis_type_metric/public/metric_vis_type.ts | 25 +-- .../public/components/collections.ts | 68 ++++++++ .../public/components/tag_cloud_options.tsx | 7 +- .../public/tag_cloud_type.ts | 42 ----- .../editor/components/gauge/ranges_panel.tsx | 5 +- .../editor/components/gauge/style_panel.tsx | 9 +- .../editor/components/heatmap/index.tsx | 11 +- .../public/editor/components/pie.tsx | 6 +- src/plugins/vis_type_vislib/public/gauge.ts | 2 - src/plugins/vis_type_vislib/public/goal.ts | 3 +- src/plugins/vis_type_vislib/public/heatmap.ts | 3 +- src/plugins/vis_type_vislib/public/pie.ts | 4 - .../__snapshots__/chart_options.test.tsx.snap | 28 ++++ .../__snapshots__/index.test.tsx.snap | 32 ---- .../value_axes_panel.test.tsx.snap | 148 ------------------ .../metrics_axes/category_axis_panel.test.tsx | 3 +- .../metrics_axes/category_axis_panel.tsx | 14 +- .../metrics_axes/chart_options.test.tsx | 3 +- .../options/metrics_axes/chart_options.tsx | 14 +- .../components/options/metrics_axes/index.tsx | 2 - .../metrics_axes/line_options.test.tsx | 3 +- .../options/metrics_axes/line_options.tsx | 9 +- .../components/options/metrics_axes/mocks.ts | 15 +- .../metrics_axes/value_axes_panel.test.tsx | 3 +- .../options/metrics_axes/value_axes_panel.tsx | 4 - .../metrics_axes/value_axis_options.test.tsx | 3 +- .../metrics_axes/value_axis_options.tsx | 12 +- .../point_series/elastic_charts_options.tsx | 7 +- .../options/point_series/point_series.tsx | 5 +- .../options/point_series/threshold_panel.tsx | 6 +- .../public/sample_vis.test.mocks.ts | 122 --------------- .../vis_type_xy/public/vis_types/area.ts | 2 - .../vis_type_xy/public/vis_types/histogram.ts | 2 - .../public/vis_types/horizontal_bar.ts | 2 - .../vis_type_xy/public/vis_types/line.ts | 2 - src/plugins/visualizations/public/types.ts | 1 - .../translations/translations/ja-JP.json | 28 ++-- .../translations/translations/zh-CN.json | 28 ++-- 48 files changed, 329 insertions(+), 582 deletions(-) create mode 100644 src/plugins/tile_map/public/components/collections.ts create mode 100644 src/plugins/vis_type_tagcloud/public/components/collections.ts diff --git a/src/plugins/maps_legacy/public/components/wms_options.tsx b/src/plugins/maps_legacy/public/components/wms_options.tsx index b30f20d355262..d4ed5abd896e4 100644 --- a/src/plugins/maps_legacy/public/components/wms_options.tsx +++ b/src/plugins/maps_legacy/public/components/wms_options.tsx @@ -11,7 +11,6 @@ import { EuiPanel, EuiSpacer, EuiTitle } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; import { FormattedMessage } from '@kbn/i18n/react'; import { TmsLayer } from '../index'; -import { Vis } from '../../../visualizations/public'; import { SelectOption, SwitchOption } from '../../../vis_default_editor/public'; import { WmsInternalOptions } from './wms_internal_options'; import { WMSOptions } from '../common/types'; @@ -19,14 +18,13 @@ import { WMSOptions } from '../common/types'; interface Props { stateParams: K; setValue: (title: 'wms', options: WMSOptions) => void; - vis: Vis; + tmsLayers: TmsLayer[]; } const mapLayerForOption = ({ id }: TmsLayer) => ({ text: id, value: id }); -function WmsOptions({ stateParams, setValue, vis }: Props) { +function WmsOptions({ stateParams, setValue, tmsLayers }: Props) { const { wms } = stateParams; - const { tmsLayers } = vis.type.editorConfig.collections; const tmsLayerOptions = useMemo(() => tmsLayers.map(mapLayerForOption), [tmsLayers]); const setWmsOption = (paramName: T, value: WMSOptions[T]) => diff --git a/src/plugins/region_map/public/components/region_map_options.tsx b/src/plugins/region_map/public/components/region_map_options.tsx index 5b5b71c9e9f4e..2bf13e46f70de 100644 --- a/src/plugins/region_map/public/components/region_map_options.tsx +++ b/src/plugins/region_map/public/components/region_map_options.tsx @@ -11,10 +11,12 @@ import { EuiIcon, EuiLink, EuiPanel, EuiSpacer, EuiText, EuiTitle } from '@elast import { i18n } from '@kbn/i18n'; import { FormattedMessage } from '@kbn/i18n/react'; import { VisEditorOptionsProps } from 'src/plugins/visualizations/public'; +import { truncatedColorSchemas } from '../../../charts/public'; import { FileLayerField, VectorLayer, IServiceSettings } from '../../../maps_legacy/public'; import { SelectOption, SwitchOption, NumberInputOption } from '../../../vis_default_editor/public'; import { WmsOptions } from '../../../maps_legacy/public'; import { RegionMapVisParams } from '../region_map_types'; +import { getTmsLayers, getVectorLayers } from '../kibana_services'; const mapLayerForOption = ({ layerId, name }: VectorLayer) => ({ text: name, @@ -26,14 +28,16 @@ const mapFieldForOption = ({ description, name }: FileLayerField) => ({ value: name, }); +const tmsLayers = getTmsLayers(); +const vectorLayers = getVectorLayers(); +const vectorLayerOptions = vectorLayers.map(mapLayerForOption); + export type RegionMapOptionsProps = { getServiceSettings: () => Promise; } & VisEditorOptionsProps; function RegionMapOptions(props: RegionMapOptionsProps) { - const { getServiceSettings, stateParams, vis, setValue } = props; - const { vectorLayers } = vis.type.editorConfig.collections; - const vectorLayerOptions = useMemo(() => vectorLayers.map(mapLayerForOption), [vectorLayers]); + const { getServiceSettings, stateParams, setValue } = props; const fieldOptions = useMemo( () => ((stateParams.selectedLayer && stateParams.selectedLayer.fields) || []).map( @@ -61,7 +65,7 @@ function RegionMapOptions(props: RegionMapOptionsProps) { setEmsHotLink(newLayer); } }, - [vectorLayers, setEmsHotLink, setValue] + [setEmsHotLink, setValue] ); const setField = useCallback( @@ -178,7 +182,7 @@ function RegionMapOptions(props: RegionMapOptionsProps) { label={i18n.translate('regionMap.visParams.colorSchemaLabel', { defaultMessage: 'Color schema', })} - options={vis.type.editorConfig.collections.colorSchemas} + options={truncatedColorSchemas} paramName="colorSchema" value={stateParams.colorSchema} setValue={setValue} @@ -197,7 +201,7 @@ function RegionMapOptions(props: RegionMapOptionsProps) { - + ); } diff --git a/src/plugins/region_map/public/kibana_services.ts b/src/plugins/region_map/public/kibana_services.ts index 60465e2e0c251..77bc472e3b140 100644 --- a/src/plugins/region_map/public/kibana_services.ts +++ b/src/plugins/region_map/public/kibana_services.ts @@ -12,6 +12,7 @@ import { createGetterSetter } from '../../kibana_utils/public'; import { DataPublicPluginStart } from '../../data/public'; import { KibanaLegacyStart } from '../../kibana_legacy/public'; import { SharePluginStart } from '../../share/public'; +import { VectorLayer, TmsLayer } from '../../maps_legacy/public'; export const [getCoreService, setCoreService] = createGetterSetter('Core'); @@ -32,3 +33,7 @@ export const [getShareService, setShareService] = createGetterSetter( 'KibanaLegacy' ); + +export const [getTmsLayers, setTmsLayers] = createGetterSetter('TmsLayers'); + +export const [getVectorLayers, setVectorLayers] = createGetterSetter('VectorLayers'); diff --git a/src/plugins/region_map/public/region_map_type.ts b/src/plugins/region_map/public/region_map_type.ts index 0e8df51b17c79..35f4cffca18d4 100644 --- a/src/plugins/region_map/public/region_map_type.ts +++ b/src/plugins/region_map/public/region_map_type.ts @@ -9,7 +9,6 @@ import { i18n } from '@kbn/i18n'; import { VisTypeDefinition } from '../../visualizations/public'; -import { truncatedColorSchemas } from '../../charts/public'; import { ORIGIN } from '../../maps_legacy/public'; import { getDeprecationMessage } from './get_deprecation_message'; @@ -18,6 +17,7 @@ import { createRegionMapOptions } from './components'; import { toExpressionAst } from './to_ast'; import { RegionMapVisParams } from './region_map_types'; import { mapToLayerWithId } from './util'; +import { setTmsLayers, setVectorLayers } from './kibana_services'; export function createRegionMapTypeDefinition({ uiSettings, @@ -50,11 +50,6 @@ provided base maps, or add your own. Darker colors represent higher values.', }, editorConfig: { optionsTemplate: createRegionMapOptions(getServiceSettings), - collections: { - colorSchemas: truncatedColorSchemas, - vectorLayers: [], - tmsLayers: [], - }, schemas: [ { group: 'metrics', @@ -95,7 +90,9 @@ provided base maps, or add your own. Darker colors represent higher values.', setup: async (vis) => { const serviceSettings = await getServiceSettings(); const tmsLayers = await serviceSettings.getTMSServices(); - vis.type.editorConfig.collections.tmsLayers = tmsLayers; + setTmsLayers(tmsLayers); + setVectorLayers([]); + if (!vis.params.wms.selectedTmsLayer && tmsLayers.length) { vis.params.wms.selectedTmsLayer = tmsLayers[0]; } @@ -122,9 +119,10 @@ provided base maps, or add your own. Darker colors represent higher values.', } }); - vis.type.editorConfig.collections.vectorLayers = [...vectorLayers, ...newLayers]; + const allVectorLayers = [...vectorLayers, ...newLayers]; + setVectorLayers(allVectorLayers); - [selectedLayer] = vis.type.editorConfig.collections.vectorLayers; + [selectedLayer] = allVectorLayers; selectedJoinField = selectedLayer ? selectedLayer.fields[0] : undefined; if (selectedLayer && !vis.params.selectedLayer && selectedLayer.isEMS) { diff --git a/src/plugins/tile_map/public/components/collections.ts b/src/plugins/tile_map/public/components/collections.ts new file mode 100644 index 0000000000000..f75d83c4a055f --- /dev/null +++ b/src/plugins/tile_map/public/components/collections.ts @@ -0,0 +1,65 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0 and the Server Side Public License, v 1; you may not use this file except + * in compliance with, at your election, the Elastic License 2.0 or the Server + * Side Public License, v 1. + */ + +import { i18n } from '@kbn/i18n'; +import { MapTypes } from '../utils/map_types'; + +export const collections = { + mapTypes: [ + { + value: MapTypes.ScaledCircleMarkers, + text: i18n.translate('tileMap.mapTypes.scaledCircleMarkersText', { + defaultMessage: 'Scaled circle markers', + }), + }, + { + value: MapTypes.ShadedCircleMarkers, + text: i18n.translate('tileMap.mapTypes.shadedCircleMarkersText', { + defaultMessage: 'Shaded circle markers', + }), + }, + { + value: MapTypes.ShadedGeohashGrid, + text: i18n.translate('tileMap.mapTypes.shadedGeohashGridText', { + defaultMessage: 'Shaded geohash grid', + }), + }, + { + value: MapTypes.Heatmap, + text: i18n.translate('tileMap.mapTypes.heatmapText', { + defaultMessage: 'Heatmap', + }), + }, + ], + legendPositions: [ + { + value: 'bottomleft', + text: i18n.translate('tileMap.legendPositions.bottomLeftText', { + defaultMessage: 'Bottom left', + }), + }, + { + value: 'bottomright', + text: i18n.translate('tileMap.legendPositions.bottomRightText', { + defaultMessage: 'Bottom right', + }), + }, + { + value: 'topleft', + text: i18n.translate('tileMap.legendPositions.topLeftText', { + defaultMessage: 'Top left', + }), + }, + { + value: 'topright', + text: i18n.translate('tileMap.legendPositions.topRightText', { + defaultMessage: 'Top right', + }), + }, + ], +}; diff --git a/src/plugins/tile_map/public/components/tile_map_options.tsx b/src/plugins/tile_map/public/components/tile_map_options.tsx index 9164a4b0d6300..dbe28f0e2c2dd 100644 --- a/src/plugins/tile_map/public/components/tile_map_options.tsx +++ b/src/plugins/tile_map/public/components/tile_map_options.tsx @@ -17,20 +17,25 @@ import { SwitchOption, RangeOption, } from '../../../vis_default_editor/public'; +import { truncatedColorSchemas } from '../../../charts/public'; import { WmsOptions } from '../../../maps_legacy/public'; import { TileMapVisParams } from '../types'; import { MapTypes } from '../utils/map_types'; +import { getTmsLayers } from '../services'; +import { collections } from './collections'; export type TileMapOptionsProps = VisEditorOptionsProps; +const tmsLayers = getTmsLayers(); + function TileMapOptions(props: TileMapOptionsProps) { const { stateParams, setValue, vis } = props; useEffect(() => { if (!stateParams.mapType) { - setValue('mapType', vis.type.editorConfig.collections.mapTypes[0]); + setValue('mapType', collections.mapTypes[0].value); } - }, [setValue, stateParams.mapType, vis.type.editorConfig.collections.mapTypes]); + }, [setValue, stateParams.mapType]); return ( <> @@ -39,7 +44,7 @@ function TileMapOptions(props: TileMapOptionsProps) { label={i18n.translate('tileMap.visParams.mapTypeLabel', { defaultMessage: 'Map type', })} - options={vis.type.editorConfig.collections.mapTypes} + options={collections.mapTypes} paramName="mapType" value={stateParams.mapType} setValue={setValue} @@ -62,14 +67,14 @@ function TileMapOptions(props: TileMapOptionsProps) { label={i18n.translate('tileMap.visParams.colorSchemaLabel', { defaultMessage: 'Color schema', })} - options={vis.type.editorConfig.collections.colorSchemas} + options={truncatedColorSchemas} paramName="colorSchema" value={stateParams.colorSchema} setValue={setValue} /> )} - + - + ); } diff --git a/src/plugins/tile_map/public/services.ts b/src/plugins/tile_map/public/services.ts index 3e6dbb69c9403..af23daf24f7f5 100644 --- a/src/plugins/tile_map/public/services.ts +++ b/src/plugins/tile_map/public/services.ts @@ -11,6 +11,7 @@ import { createGetterSetter } from '../../kibana_utils/public'; import { DataPublicPluginStart } from '../../data/public'; import { KibanaLegacyStart } from '../../kibana_legacy/public'; import { SharePluginStart } from '../../share/public'; +import { TmsLayer } from '../../maps_legacy/public'; export const [getCoreService, setCoreService] = createGetterSetter('Core'); @@ -27,3 +28,5 @@ export const [getShareService, setShareService] = createGetterSetter( 'KibanaLegacy' ); + +export const [getTmsLayers, setTmsLayers] = createGetterSetter('TmsLayers'); diff --git a/src/plugins/tile_map/public/tile_map_type.ts b/src/plugins/tile_map/public/tile_map_type.ts index dc2cd418c28e2..5e71351f1bd56 100644 --- a/src/plugins/tile_map/public/tile_map_type.ts +++ b/src/plugins/tile_map/public/tile_map_type.ts @@ -8,7 +8,6 @@ import { i18n } from '@kbn/i18n'; import { VisTypeDefinition } from 'src/plugins/visualizations/public'; -import { truncatedColorSchemas } from '../../charts/public'; // @ts-expect-error import { supportsCssFilters } from './css_filters'; @@ -17,7 +16,7 @@ import { getDeprecationMessage } from './get_deprecation_message'; import { TileMapVisualizationDependencies } from './plugin'; import { toExpressionAst } from './to_ast'; import { TileMapVisParams } from './types'; -import { MapTypes } from './utils/map_types'; +import { setTmsLayers } from './services'; export function createTileMapTypeDefinition( dependencies: TileMapVisualizationDependencies @@ -50,62 +49,6 @@ export function createTileMapTypeDefinition( }, toExpressionAst, editorConfig: { - collections: { - colorSchemas: truncatedColorSchemas, - legendPositions: [ - { - value: 'bottomleft', - text: i18n.translate('tileMap.vis.editorConfig.legendPositions.bottomLeftText', { - defaultMessage: 'Bottom left', - }), - }, - { - value: 'bottomright', - text: i18n.translate('tileMap.vis.editorConfig.legendPositions.bottomRightText', { - defaultMessage: 'Bottom right', - }), - }, - { - value: 'topleft', - text: i18n.translate('tileMap.vis.editorConfig.legendPositions.topLeftText', { - defaultMessage: 'Top left', - }), - }, - { - value: 'topright', - text: i18n.translate('tileMap.vis.editorConfig.legendPositions.topRightText', { - defaultMessage: 'Top right', - }), - }, - ], - mapTypes: [ - { - value: MapTypes.ScaledCircleMarkers, - text: i18n.translate('tileMap.vis.editorConfig.mapTypes.scaledCircleMarkersText', { - defaultMessage: 'Scaled circle markers', - }), - }, - { - value: MapTypes.ShadedCircleMarkers, - text: i18n.translate('tileMap.vis.editorConfig.mapTypes.shadedCircleMarkersText', { - defaultMessage: 'Shaded circle markers', - }), - }, - { - value: MapTypes.ShadedGeohashGrid, - text: i18n.translate('tileMap.vis.editorConfig.mapTypes.shadedGeohashGridText', { - defaultMessage: 'Shaded geohash grid', - }), - }, - { - value: MapTypes.Heatmap, - text: i18n.translate('tileMap.vis.editorConfig.mapTypes.heatmapText', { - defaultMessage: 'Heatmap', - }), - }, - ], - tmsLayers: [], - }, optionsTemplate: TileMapOptionsLazy, schemas: [ { @@ -141,7 +84,7 @@ export function createTileMapTypeDefinition( return vis; } - vis.type.editorConfig.collections.tmsLayers = tmsLayers; + setTmsLayers(tmsLayers); if (!vis.params.wms.selectedTmsLayer && tmsLayers.length) { vis.params.wms.selectedTmsLayer = tmsLayers[0]; } diff --git a/src/plugins/vis_default_editor/public/components/options/basic_options.tsx b/src/plugins/vis_default_editor/public/components/options/basic_options.tsx index 5d19b6dab4b82..5cec0743b94fd 100644 --- a/src/plugins/vis_default_editor/public/components/options/basic_options.tsx +++ b/src/plugins/vis_default_editor/public/components/options/basic_options.tsx @@ -19,18 +19,23 @@ interface BasicOptionsParams { legendPosition: string; } +type LegendPositions = Array<{ + value: string; + text: string; +}>; + function BasicOptions({ stateParams, setValue, - vis, -}: VisEditorOptionsProps) { + legendPositions, +}: VisEditorOptionsProps & { legendPositions: LegendPositions }) { return ( <> ) { const setMetricValue: ( @@ -137,14 +157,14 @@ function MetricVisOptions({ isDisabled={stateParams.metric.colorsRange.length === 1} isFullWidth={true} legend={metricColorModeLabel} - options={vis.type.editorConfig.collections.metricColorMode} + options={metricColorMode} onChange={setColorMode} /> => }, }, editorConfig: { - collections: { - metricColorMode: [ - { - id: ColorMode.None, - label: i18n.translate('visTypeMetric.colorModes.noneOptionLabel', { - defaultMessage: 'None', - }), - }, - { - id: ColorMode.Labels, - label: i18n.translate('visTypeMetric.colorModes.labelsOptionLabel', { - defaultMessage: 'Labels', - }), - }, - { - id: ColorMode.Background, - label: i18n.translate('visTypeMetric.colorModes.backgroundOptionLabel', { - defaultMessage: 'Background', - }), - }, - ], - colorSchemas, - }, optionsTemplate: MetricVisOptions, schemas: [ { diff --git a/src/plugins/vis_type_tagcloud/public/components/collections.ts b/src/plugins/vis_type_tagcloud/public/components/collections.ts new file mode 100644 index 0000000000000..d5dd3c7f2d252 --- /dev/null +++ b/src/plugins/vis_type_tagcloud/public/components/collections.ts @@ -0,0 +1,68 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0 and the Server Side Public License, v 1; you may not use this file except + * in compliance with, at your election, the Elastic License 2.0 or the Server + * Side Public License, v 1. + */ + +import { i18n } from '@kbn/i18n'; +import { TagCloudVisParams } from '../types'; + +interface Scales { + text: string; + value: TagCloudVisParams['scale']; +} + +interface Orientation { + text: string; + value: TagCloudVisParams['orientation']; +} + +interface Collections { + scales: Scales[]; + orientations: Orientation[]; +} + +export const collections: Collections = { + scales: [ + { + text: i18n.translate('visTypeTagCloud.scales.linearText', { + defaultMessage: 'Linear', + }), + value: 'linear', + }, + { + text: i18n.translate('visTypeTagCloud.scales.logText', { + defaultMessage: 'Log', + }), + value: 'log', + }, + { + text: i18n.translate('visTypeTagCloud.scales.squareRootText', { + defaultMessage: 'Square root', + }), + value: 'square root', + }, + ], + orientations: [ + { + text: i18n.translate('visTypeTagCloud.orientations.singleText', { + defaultMessage: 'Single', + }), + value: 'single', + }, + { + text: i18n.translate('visTypeTagCloud.orientations.rightAngledText', { + defaultMessage: 'Right angled', + }), + value: 'right angled', + }, + { + text: i18n.translate('visTypeTagCloud.orientations.multipleText', { + defaultMessage: 'Multiple', + }), + value: 'multiple', + }, + ], +}; diff --git a/src/plugins/vis_type_tagcloud/public/components/tag_cloud_options.tsx b/src/plugins/vis_type_tagcloud/public/components/tag_cloud_options.tsx index 549cbc8bfec84..d5e005a638680 100644 --- a/src/plugins/vis_type_tagcloud/public/components/tag_cloud_options.tsx +++ b/src/plugins/vis_type_tagcloud/public/components/tag_cloud_options.tsx @@ -13,8 +13,9 @@ import { VisEditorOptionsProps } from 'src/plugins/visualizations/public'; import { SelectOption, SwitchOption } from '../../../vis_default_editor/public'; import { ValidatedDualRange } from '../../../kibana_react/public'; import { TagCloudVisParams } from '../types'; +import { collections } from './collections'; -function TagCloudOptions({ stateParams, setValue, vis }: VisEditorOptionsProps) { +function TagCloudOptions({ stateParams, setValue }: VisEditorOptionsProps) { const handleFontSizeChange = ([minFontSize, maxFontSize]: [string | number, string | number]) => { setValue('minFontSize', Number(minFontSize)); setValue('maxFontSize', Number(maxFontSize)); @@ -29,7 +30,7 @@ function TagCloudOptions({ stateParams, setValue, vis }: VisEditorOptionsProps(paramName: T, value: ColorSchemaParams[T]) => { @@ -91,7 +90,7 @@ function RangesPanel({ ) { - const { stateParams, vis, uiState, setValue, setValidity, setTouched } = props; + const { stateParams, uiState, setValue, setValidity, setTouched } = props; const [valueAxis] = stateParams.valueAxes; const isColorsNumberInvalid = stateParams.colorsNumber < 2 || stateParams.colorsNumber > 10; const [isColorRangesValid, setIsColorRangesValid] = useState(false); @@ -65,7 +68,7 @@ function HeatmapOptions(props: VisEditorOptionsProps) { - + ) { ) { label={i18n.translate('visTypeVislib.controls.heatmapOptions.colorScaleLabel', { defaultMessage: 'Color scale', })} - options={vis.type.editorConfig.collections.scales} + options={heatmapCollections.scales} paramName="type" value={valueAxis.scale.type} setValue={setValueAxisScale} diff --git a/src/plugins/vis_type_vislib/public/editor/components/pie.tsx b/src/plugins/vis_type_vislib/public/editor/components/pie.tsx index 9acadd4252a95..6c84bc744676a 100644 --- a/src/plugins/vis_type_vislib/public/editor/components/pie.tsx +++ b/src/plugins/vis_type_vislib/public/editor/components/pie.tsx @@ -14,10 +14,12 @@ import { FormattedMessage } from '@kbn/i18n/react'; import { VisEditorOptionsProps } from 'src/plugins/visualizations/public'; import { BasicOptions, SwitchOption } from '../../../../vis_default_editor/public'; -import { TruncateLabelsOption } from '../../../../vis_type_xy/public'; +import { TruncateLabelsOption, getPositions } from '../../../../vis_type_xy/public'; import { PieVisParams } from '../../pie'; +const legendPositions = getPositions(); + function PieOptions(props: VisEditorOptionsProps) { const { stateParams, setValue } = props; const setLabels = ( @@ -45,7 +47,7 @@ function PieOptions(props: VisEditorOptionsProps) { value={stateParams.isDonut} setValue={setValue} /> - + diff --git a/src/plugins/vis_type_vislib/public/gauge.ts b/src/plugins/vis_type_vislib/public/gauge.ts index cd4c03e5a84d1..315c4388a5cd3 100644 --- a/src/plugins/vis_type_vislib/public/gauge.ts +++ b/src/plugins/vis_type_vislib/public/gauge.ts @@ -14,7 +14,6 @@ import { AggGroupNames } from '../../data/public'; import { VisTypeDefinition, VIS_EVENT_TO_TRIGGER } from '../../visualizations/public'; import { Alignment, GaugeType, VislibChartType } from './types'; -import { getGaugeCollections } from './editor'; import { toExpressionAst } from './to_ast'; import { GaugeOptions } from './editor/components'; @@ -102,7 +101,6 @@ export const gaugeVisTypeDefinition: VisTypeDefinition = { }, }, editorConfig: { - collections: getGaugeCollections(), optionsTemplate: GaugeOptions, schemas: [ { diff --git a/src/plugins/vis_type_vislib/public/goal.ts b/src/plugins/vis_type_vislib/public/goal.ts index a31ba48704d50..aaeae4f675f3f 100644 --- a/src/plugins/vis_type_vislib/public/goal.ts +++ b/src/plugins/vis_type_vislib/public/goal.ts @@ -12,7 +12,7 @@ import { AggGroupNames } from '../../data/public'; import { ColorMode, ColorSchemas } from '../../charts/public'; import { VisTypeDefinition } from '../../visualizations/public'; -import { getGaugeCollections, GaugeOptions } from './editor'; +import { GaugeOptions } from './editor'; import { toExpressionAst } from './to_ast'; import { GaugeType } from './types'; import { GaugeVisParams } from './gauge'; @@ -66,7 +66,6 @@ export const goalVisTypeDefinition: VisTypeDefinition = { }, }, editorConfig: { - collections: getGaugeCollections(), optionsTemplate: GaugeOptions, schemas: [ { diff --git a/src/plugins/vis_type_vislib/public/heatmap.ts b/src/plugins/vis_type_vislib/public/heatmap.ts index ca6dda547571c..f804a78cbe453 100644 --- a/src/plugins/vis_type_vislib/public/heatmap.ts +++ b/src/plugins/vis_type_vislib/public/heatmap.ts @@ -15,7 +15,7 @@ import { ColorSchemas, ColorSchemaParams } from '../../charts/public'; import { VIS_EVENT_TO_TRIGGER, VisTypeDefinition } from '../../visualizations/public'; import { ValueAxis, ScaleType, AxisType } from '../../vis_type_xy/public'; -import { HeatmapOptions, getHeatmapCollections } from './editor'; +import { HeatmapOptions } from './editor'; import { TimeMarker } from './vislib/visualizations/time_marker'; import { CommonVislibParams, VislibChartType } from './types'; import { toExpressionAst } from './to_ast'; @@ -75,7 +75,6 @@ export const heatmapVisTypeDefinition: VisTypeDefinition = { }, }, editorConfig: { - collections: getHeatmapCollections(), optionsTemplate: HeatmapOptions, schemas: [ { diff --git a/src/plugins/vis_type_vislib/public/pie.ts b/src/plugins/vis_type_vislib/public/pie.ts index e00fae7c32f06..d1d8d2a5279fe 100644 --- a/src/plugins/vis_type_vislib/public/pie.ts +++ b/src/plugins/vis_type_vislib/public/pie.ts @@ -11,7 +11,6 @@ import { Position } from '@elastic/charts'; import { AggGroupNames } from '../../data/public'; import { VisTypeDefinition, VIS_EVENT_TO_TRIGGER } from '../../visualizations/public'; -import { getPositions } from '../../vis_type_xy/public'; import { CommonVislibParams } from './types'; import { PieOptions } from './editor'; @@ -53,9 +52,6 @@ export const pieVisTypeDefinition: VisTypeDefinition = { }, }, editorConfig: { - collections: { - legendPositions: getPositions(), - }, optionsTemplate: PieOptions, schemas: [ { diff --git a/src/plugins/vis_type_xy/public/editor/components/options/metrics_axes/__snapshots__/chart_options.test.tsx.snap b/src/plugins/vis_type_xy/public/editor/components/options/metrics_axes/__snapshots__/chart_options.test.tsx.snap index e9cd2b737b879..56f35ae021173 100644 --- a/src/plugins/vis_type_xy/public/editor/components/options/metrics_axes/__snapshots__/chart_options.test.tsx.snap +++ b/src/plugins/vis_type_xy/public/editor/components/options/metrics_axes/__snapshots__/chart_options.test.tsx.snap @@ -31,6 +31,22 @@ exports[`ChartOptions component should init with the default set of props 1`] = `; diff --git a/src/plugins/vis_type_xy/public/editor/components/options/metrics_axes/__snapshots__/value_axes_panel.test.tsx.snap b/src/plugins/vis_type_xy/public/editor/components/options/metrics_axes/__snapshots__/value_axes_panel.test.tsx.snap index 594511010b745..abcbf1a4fd7d9 100644 --- a/src/plugins/vis_type_xy/public/editor/components/options/metrics_axes/__snapshots__/value_axes_panel.test.tsx.snap +++ b/src/plugins/vis_type_xy/public/editor/components/options/metrics_axes/__snapshots__/value_axes_panel.test.tsx.snap @@ -150,80 +150,6 @@ exports[`ValueAxesPanel component should init with the default set of props 1`] "type": "value", } } - vis={ - Object { - "type": Object { - "editorConfig": Object { - "collections": Object { - "axisModes": Array [ - Object { - "text": "Normal", - "value": "normal", - }, - Object { - "text": "Percentage", - "value": "percentage", - }, - Object { - "text": "Wiggle", - "value": "wiggle", - }, - Object { - "text": "Silhouette", - "value": "silhouette", - }, - ], - "interpolationModes": Array [ - Object { - "text": "Straight", - "value": "linear", - }, - Object { - "text": "Smoothed", - "value": "cardinal", - }, - Object { - "text": "Stepped", - "value": "step-after", - }, - ], - "positions": Array [ - Object { - "text": "Top", - "value": "top", - }, - Object { - "text": "Left", - "value": "left", - }, - Object { - "text": "Right", - "value": "right", - }, - Object { - "text": "Bottom", - "value": "bottom", - }, - ], - "scaleTypes": Array [ - Object { - "text": "Linear", - "value": "linear", - }, - Object { - "text": "Log", - "value": "log", - }, - Object { - "text": "Square root", - "value": "square root", - }, - ], - }, - }, - }, - } - } /> diff --git a/src/plugins/vis_type_xy/public/editor/components/options/metrics_axes/category_axis_panel.test.tsx b/src/plugins/vis_type_xy/public/editor/components/options/metrics_axes/category_axis_panel.test.tsx index 17a504a25b05f..066f053d4e186 100644 --- a/src/plugins/vis_type_xy/public/editor/components/options/metrics_axes/category_axis_panel.test.tsx +++ b/src/plugins/vis_type_xy/public/editor/components/options/metrics_axes/category_axis_panel.test.tsx @@ -11,7 +11,7 @@ import { shallow } from 'enzyme'; import { CategoryAxisPanel, CategoryAxisPanelProps } from './category_axis_panel'; import { CategoryAxis } from '../../../../types'; import { LabelOptions } from './label_options'; -import { categoryAxis, vis } from './mocks'; +import { categoryAxis } from './mocks'; import { Position } from '@elastic/charts'; describe('CategoryAxisPanel component', () => { @@ -27,7 +27,6 @@ describe('CategoryAxisPanel component', () => { defaultProps = { axis, - vis, onPositionChanged, setCategoryAxis, }; diff --git a/src/plugins/vis_type_xy/public/editor/components/options/metrics_axes/category_axis_panel.tsx b/src/plugins/vis_type_xy/public/editor/components/options/metrics_axes/category_axis_panel.tsx index 6c261137d9eb6..5ba35717e46f3 100644 --- a/src/plugins/vis_type_xy/public/editor/components/options/metrics_axes/category_axis_panel.tsx +++ b/src/plugins/vis_type_xy/public/editor/components/options/metrics_axes/category_axis_panel.tsx @@ -13,25 +13,21 @@ import { FormattedMessage } from '@kbn/i18n/react'; import { EuiPanel, EuiTitle, EuiSpacer } from '@elastic/eui'; import { Position } from '@elastic/charts'; -import { VisEditorOptionsProps } from 'src/plugins/visualizations/public'; import { SelectOption, SwitchOption } from '../../../../../../vis_default_editor/public'; import { LabelOptions, SetAxisLabel } from './label_options'; import { CategoryAxis } from '../../../../types'; +import { getPositions } from '../../../collections'; + +const positions = getPositions(); export interface CategoryAxisPanelProps { axis: CategoryAxis; onPositionChanged: (position: Position) => void; setCategoryAxis: (value: CategoryAxis) => void; - vis: VisEditorOptionsProps['vis']; } -function CategoryAxisPanel({ - axis, - onPositionChanged, - vis, - setCategoryAxis, -}: CategoryAxisPanelProps) { +function CategoryAxisPanel({ axis, onPositionChanged, setCategoryAxis }: CategoryAxisPanelProps) { const setAxis = useCallback( (paramName: T, value: CategoryAxis[T]) => { const updatedAxis = { @@ -78,7 +74,7 @@ function CategoryAxisPanel({ label={i18n.translate('visTypeXy.controls.pointSeries.categoryAxis.positionLabel', { defaultMessage: 'Position', })} - options={vis.type.editorConfig.collections.positions} + options={positions} paramName="position" value={axis.position} setValue={setPosition} diff --git a/src/plugins/vis_type_xy/public/editor/components/options/metrics_axes/chart_options.test.tsx b/src/plugins/vis_type_xy/public/editor/components/options/metrics_axes/chart_options.test.tsx index 1e274dce7c2a8..caf14e57fef7e 100644 --- a/src/plugins/vis_type_xy/public/editor/components/options/metrics_axes/chart_options.test.tsx +++ b/src/plugins/vis_type_xy/public/editor/components/options/metrics_axes/chart_options.test.tsx @@ -12,7 +12,7 @@ import { shallow } from 'enzyme'; import { ChartOptions, ChartOptionsParams } from './chart_options'; import { SeriesParam, ChartMode } from '../../../../types'; import { LineOptions } from './line_options'; -import { valueAxis, seriesParam, vis } from './mocks'; +import { valueAxis, seriesParam } from './mocks'; import { ChartType } from '../../../../../common'; describe('ChartOptions component', () => { @@ -29,7 +29,6 @@ describe('ChartOptions component', () => { defaultProps = { index: 0, chart, - vis, valueAxes: [valueAxis], setParamByIndex, changeValueAxis, diff --git a/src/plugins/vis_type_xy/public/editor/components/options/metrics_axes/chart_options.tsx b/src/plugins/vis_type_xy/public/editor/components/options/metrics_axes/chart_options.tsx index 76604383db8c5..6f0b4fc5c9d22 100644 --- a/src/plugins/vis_type_xy/public/editor/components/options/metrics_axes/chart_options.tsx +++ b/src/plugins/vis_type_xy/public/editor/components/options/metrics_axes/chart_options.tsx @@ -11,13 +11,15 @@ import React, { useMemo, useCallback } from 'react'; import { i18n } from '@kbn/i18n'; import { EuiFlexGroup, EuiFlexItem, EuiSpacer } from '@elastic/eui'; -import { Vis } from '../../../../../../visualizations/public'; import { SelectOption } from '../../../../../../vis_default_editor/public'; import { SeriesParam, ValueAxis } from '../../../../types'; import { LineOptions } from './line_options'; import { SetParamByIndex, ChangeValueAxis } from '.'; import { ChartType } from '../../../../../common'; +import { getConfigCollections } from '../../../collections'; + +const collections = getConfigCollections(); export type SetChart = (paramName: T, value: SeriesParam[T]) => void; @@ -27,14 +29,12 @@ export interface ChartOptionsParams { changeValueAxis: ChangeValueAxis; setParamByIndex: SetParamByIndex; valueAxes: ValueAxis[]; - vis: Vis; } function ChartOptions({ chart, index, valueAxes, - vis, changeValueAxis, setParamByIndex, }: ChartOptionsParams) { @@ -90,7 +90,7 @@ function ChartOptions({ label={i18n.translate('visTypeXy.controls.pointSeries.series.chartTypeLabel', { defaultMessage: 'Chart type', })} - options={vis.type.editorConfig.collections.chartTypes} + options={collections.chartTypes} paramName="type" value={chart.type} setValue={setChart} @@ -102,7 +102,7 @@ function ChartOptions({ label={i18n.translate('visTypeXy.controls.pointSeries.series.modeLabel', { defaultMessage: 'Mode', })} - options={vis.type.editorConfig.collections.chartModes} + options={collections.chartModes} paramName="mode" value={chart.mode} setValue={setChart} @@ -118,7 +118,7 @@ function ChartOptions({ label={i18n.translate('visTypeXy.controls.pointSeries.series.lineModeLabel', { defaultMessage: 'Line mode', })} - options={vis.type.editorConfig.collections.interpolationModes} + options={collections.interpolationModes} paramName="interpolate" value={chart.interpolate} setValue={setChart} @@ -126,7 +126,7 @@ function ChartOptions({ )} - {chart.type === ChartType.Line && } + {chart.type === ChartType.Line && } ); } diff --git a/src/plugins/vis_type_xy/public/editor/components/options/metrics_axes/index.tsx b/src/plugins/vis_type_xy/public/editor/components/options/metrics_axes/index.tsx index c295d909863dc..d25845f02e7a7 100644 --- a/src/plugins/vis_type_xy/public/editor/components/options/metrics_axes/index.tsx +++ b/src/plugins/vis_type_xy/public/editor/components/options/metrics_axes/index.tsx @@ -326,14 +326,12 @@ function MetricsAxisOptions(props: ValidationVisOptionsProps) { setMultipleValidity={props.setMultipleValidity} seriesParams={stateParams.seriesParams} valueAxes={stateParams.valueAxes} - vis={vis} /> ) : null; diff --git a/src/plugins/vis_type_xy/public/editor/components/options/metrics_axes/line_options.test.tsx b/src/plugins/vis_type_xy/public/editor/components/options/metrics_axes/line_options.test.tsx index c8a5e6f17b1ed..5497c46c1dd34 100644 --- a/src/plugins/vis_type_xy/public/editor/components/options/metrics_axes/line_options.test.tsx +++ b/src/plugins/vis_type_xy/public/editor/components/options/metrics_axes/line_options.test.tsx @@ -12,7 +12,7 @@ import { shallow } from 'enzyme'; import { NumberInputOption } from '../../../../../../vis_default_editor/public'; import { LineOptions, LineOptionsParams } from './line_options'; -import { seriesParam, vis } from './mocks'; +import { seriesParam } from './mocks'; const LINE_WIDTH = 'lineWidth'; const DRAW_LINES = 'drawLinesBetweenPoints'; @@ -26,7 +26,6 @@ describe('LineOptions component', () => { defaultProps = { chart: { ...seriesParam }, - vis, setChart, }; }); diff --git a/src/plugins/vis_type_xy/public/editor/components/options/metrics_axes/line_options.tsx b/src/plugins/vis_type_xy/public/editor/components/options/metrics_axes/line_options.tsx index b101ed1553a24..140f190c77181 100644 --- a/src/plugins/vis_type_xy/public/editor/components/options/metrics_axes/line_options.tsx +++ b/src/plugins/vis_type_xy/public/editor/components/options/metrics_axes/line_options.tsx @@ -11,7 +11,6 @@ import React, { useCallback } from 'react'; import { i18n } from '@kbn/i18n'; import { EuiFlexGroup, EuiFlexItem, EuiSpacer } from '@elastic/eui'; -import { Vis } from '../../../../../../visualizations/public'; import { NumberInputOption, SelectOption, @@ -20,14 +19,16 @@ import { import { SeriesParam } from '../../../../types'; import { SetChart } from './chart_options'; +import { getInterpolationModes } from '../../../collections'; + +const interpolationModes = getInterpolationModes(); export interface LineOptionsParams { chart: SeriesParam; - vis: Vis; setChart: SetChart; } -function LineOptions({ chart, vis, setChart }: LineOptionsParams) { +function LineOptions({ chart, setChart }: LineOptionsParams) { const setLineWidth = useCallback( (paramName: 'lineWidth', value: number | '') => { setChart(paramName, value === '' ? undefined : value); @@ -57,7 +58,7 @@ function LineOptions({ chart, vis, setChart }: LineOptionsParams) { label={i18n.translate('visTypeXy.controls.pointSeries.series.lineModeLabel', { defaultMessage: 'Line mode', })} - options={vis.type.editorConfig.collections.interpolationModes} + options={interpolationModes} paramName="interpolate" value={chart.interpolate} setValue={setChart} diff --git a/src/plugins/vis_type_xy/public/editor/components/options/metrics_axes/mocks.ts b/src/plugins/vis_type_xy/public/editor/components/options/metrics_axes/mocks.ts index 33e2af174753e..7451f6dea9039 100644 --- a/src/plugins/vis_type_xy/public/editor/components/options/metrics_axes/mocks.ts +++ b/src/plugins/vis_type_xy/public/editor/components/options/metrics_axes/mocks.ts @@ -20,12 +20,6 @@ import { AxisType, CategoryAxis, } from '../../../../types'; -import { - getScaleTypes, - getAxisModes, - getPositions, - getInterpolationModes, -} from '../../../collections'; import { ChartType } from '../../../../../common'; const defaultValueAxisId = 'ValueAxis-1'; @@ -85,16 +79,9 @@ const seriesParam: SeriesParam = { valueAxis: defaultValueAxisId, }; -const positions = getPositions(); -const axisModes = getAxisModes(); -const scaleTypes = getScaleTypes(); -const interpolationModes = getInterpolationModes(); - const vis = ({ type: { - editorConfig: { - collections: { scaleTypes, axisModes, positions, interpolationModes }, - }, + editorConfig: {}, }, } as any) as Vis; diff --git a/src/plugins/vis_type_xy/public/editor/components/options/metrics_axes/value_axes_panel.test.tsx b/src/plugins/vis_type_xy/public/editor/components/options/metrics_axes/value_axes_panel.test.tsx index 13dab168e586c..3e1a44993235b 100644 --- a/src/plugins/vis_type_xy/public/editor/components/options/metrics_axes/value_axes_panel.test.tsx +++ b/src/plugins/vis_type_xy/public/editor/components/options/metrics_axes/value_axes_panel.test.tsx @@ -14,7 +14,7 @@ import { Position } from '@elastic/charts'; import { ValueAxis, SeriesParam } from '../../../../types'; import { ValueAxesPanel, ValueAxesPanelProps } from './value_axes_panel'; -import { valueAxis, seriesParam, vis } from './mocks'; +import { valueAxis, seriesParam } from './mocks'; describe('ValueAxesPanel component', () => { let setParamByIndex: jest.Mock; @@ -53,7 +53,6 @@ describe('ValueAxesPanel component', () => { defaultProps = { seriesParams: [seriesParamCount, seriesParamAverage], valueAxes: [axisLeft, axisRight], - vis, setParamByIndex, onValueAxisPositionChanged, addValueAxis, diff --git a/src/plugins/vis_type_xy/public/editor/components/options/metrics_axes/value_axes_panel.tsx b/src/plugins/vis_type_xy/public/editor/components/options/metrics_axes/value_axes_panel.tsx index 5f874e0489370..02bdb7b185288 100644 --- a/src/plugins/vis_type_xy/public/editor/components/options/metrics_axes/value_axes_panel.tsx +++ b/src/plugins/vis_type_xy/public/editor/components/options/metrics_axes/value_axes_panel.tsx @@ -20,8 +20,6 @@ import { import { i18n } from '@kbn/i18n'; import { FormattedMessage } from '@kbn/i18n/react'; -import { Vis } from '../../../../../../visualizations/public'; - import { SeriesParam, ValueAxis } from '../../../../types'; import { ValueAxisOptions } from './value_axis_options'; import { SetParamByIndex } from '.'; @@ -33,7 +31,6 @@ export interface ValueAxesPanelProps { setParamByIndex: SetParamByIndex; seriesParams: SeriesParam[]; valueAxes: ValueAxis[]; - vis: Vis; setMultipleValidity: (paramName: string, isValid: boolean) => void; } @@ -152,7 +149,6 @@ function ValueAxesPanel(props: ValueAxesPanelProps) { onValueAxisPositionChanged={props.onValueAxisPositionChanged} setParamByIndex={props.setParamByIndex} setMultipleValidity={props.setMultipleValidity} - vis={props.vis} /> diff --git a/src/plugins/vis_type_xy/public/editor/components/options/metrics_axes/value_axis_options.test.tsx b/src/plugins/vis_type_xy/public/editor/components/options/metrics_axes/value_axis_options.test.tsx index b843e7b5ab064..f2d689126166f 100644 --- a/src/plugins/vis_type_xy/public/editor/components/options/metrics_axes/value_axis_options.test.tsx +++ b/src/plugins/vis_type_xy/public/editor/components/options/metrics_axes/value_axis_options.test.tsx @@ -16,7 +16,7 @@ import { TextInputOption } from '../../../../../../vis_default_editor/public'; import { ValueAxis, ScaleType } from '../../../../types'; import { LabelOptions } from './label_options'; import { ValueAxisOptions, ValueAxisOptionsParams } from './value_axis_options'; -import { valueAxis, vis } from './mocks'; +import { valueAxis } from './mocks'; const POSITION = 'position'; @@ -37,7 +37,6 @@ describe('ValueAxisOptions component', () => { axis, index: 0, valueAxis, - vis, setParamByIndex, onValueAxisPositionChanged, setMultipleValidity, diff --git a/src/plugins/vis_type_xy/public/editor/components/options/metrics_axes/value_axis_options.tsx b/src/plugins/vis_type_xy/public/editor/components/options/metrics_axes/value_axis_options.tsx index d9e0302cbe516..1a38be83b9fc5 100644 --- a/src/plugins/vis_type_xy/public/editor/components/options/metrics_axes/value_axis_options.tsx +++ b/src/plugins/vis_type_xy/public/editor/components/options/metrics_axes/value_axis_options.tsx @@ -10,7 +10,6 @@ import React, { useCallback } from 'react'; import { i18n } from '@kbn/i18n'; import { EuiSpacer, EuiAccordion, EuiHorizontalRule } from '@elastic/eui'; -import { Vis } from '../../../../../../visualizations/public'; import { SelectOption, SwitchOption, @@ -21,6 +20,9 @@ import { ValueAxis } from '../../../../types'; import { LabelOptions, SetAxisLabel } from './label_options'; import { CustomExtentsOptions } from './custom_extents_options'; import { SetParamByIndex } from '.'; +import { getConfigCollections } from '../../../collections'; + +const collections = getConfigCollections(); export type SetScale = ( paramName: T, @@ -33,7 +35,6 @@ export interface ValueAxisOptionsParams { onValueAxisPositionChanged: (index: number, value: ValueAxis['position']) => void; setParamByIndex: SetParamByIndex; valueAxis: ValueAxis; - vis: Vis; setMultipleValidity: (paramName: string, isValid: boolean) => void; } @@ -41,7 +42,6 @@ export function ValueAxisOptions({ axis, index, valueAxis, - vis, onValueAxisPositionChanged, setParamByIndex, setMultipleValidity, @@ -101,7 +101,7 @@ export function ValueAxisOptions({ label={i18n.translate('visTypeXy.controls.pointSeries.valueAxes.positionLabel', { defaultMessage: 'Position', })} - options={vis.type.editorConfig.collections.positions} + options={collections.positions} paramName="position" value={axis.position} setValue={onPositionChanged} @@ -112,7 +112,7 @@ export function ValueAxisOptions({ label={i18n.translate('visTypeXy.controls.pointSeries.valueAxes.modeLabel', { defaultMessage: 'Mode', })} - options={vis.type.editorConfig.collections.axisModes} + options={collections.axisModes} paramName="mode" value={axis.scale.mode} setValue={setValueAxisScale} @@ -123,7 +123,7 @@ export function ValueAxisOptions({ label={i18n.translate('visTypeXy.controls.pointSeries.valueAxes.scaleTypeLabel', { defaultMessage: 'Scale type', })} - options={vis.type.editorConfig.collections.scaleTypes} + options={collections.scaleTypes} paramName="type" value={axis.scale.type} setValue={setValueAxisScale} diff --git a/src/plugins/vis_type_xy/public/editor/components/options/point_series/elastic_charts_options.tsx b/src/plugins/vis_type_xy/public/editor/components/options/point_series/elastic_charts_options.tsx index ecfbdf5b60528..5398980e268d4 100644 --- a/src/plugins/vis_type_xy/public/editor/components/options/point_series/elastic_charts_options.tsx +++ b/src/plugins/vis_type_xy/public/editor/components/options/point_series/elastic_charts_options.tsx @@ -22,11 +22,14 @@ import { ChartType } from '../../../../../common'; import { VisParams } from '../../../../types'; import { ValidationVisOptionsProps } from '../../common'; import { getPalettesService, getTrackUiMetric } from '../../../../services'; +import { getFittingFunctions } from '../../../collections'; + +const fittingFunctions = getFittingFunctions(); export function ElasticChartsOptions(props: ValidationVisOptionsProps) { const trackUiMetric = getTrackUiMetric(); const [palettesRegistry, setPalettesRegistry] = useState(null); - const { stateParams, setValue, vis, aggs } = props; + const { stateParams, setValue, aggs } = props; const hasLineChart = stateParams.seriesParams.some( ({ type, data: { id: paramId } }) => @@ -69,7 +72,7 @@ export function ElasticChartsOptions(props: ValidationVisOptionsProps label={i18n.translate('visTypeXy.editors.elasticChartsOptions.missingValuesLabel', { defaultMessage: 'Fill missing values', })} - options={vis.type.editorConfig.collections.fittingFunctions} + options={fittingFunctions} paramName="fittingFunction" value={stateParams.fittingFunction} setValue={(paramName, value) => { diff --git a/src/plugins/vis_type_xy/public/editor/components/options/point_series/point_series.tsx b/src/plugins/vis_type_xy/public/editor/components/options/point_series/point_series.tsx index 27e940e62489a..343976651d21e 100644 --- a/src/plugins/vis_type_xy/public/editor/components/options/point_series/point_series.tsx +++ b/src/plugins/vis_type_xy/public/editor/components/options/point_series/point_series.tsx @@ -20,6 +20,9 @@ import { ThresholdPanel } from './threshold_panel'; import { ChartType } from '../../../../../common'; import { ValidationVisOptionsProps } from '../../common'; import { ElasticChartsOptions } from './elastic_charts_options'; +import { getPositions } from '../../../collections'; + +const legendPositions = getPositions(); export function PointSeriesOptions( props: ValidationVisOptionsProps< @@ -54,7 +57,7 @@ export function PointSeriesOptions( - + {vis.data.aggs!.aggs.some( (agg) => agg.schema === 'segment' && agg.type.name === BUCKET_TYPES.DATE_HISTOGRAM diff --git a/src/plugins/vis_type_xy/public/editor/components/options/point_series/threshold_panel.tsx b/src/plugins/vis_type_xy/public/editor/components/options/point_series/threshold_panel.tsx index 943280b1373fb..dadbe4dd1fc76 100644 --- a/src/plugins/vis_type_xy/public/editor/components/options/point_series/threshold_panel.tsx +++ b/src/plugins/vis_type_xy/public/editor/components/options/point_series/threshold_panel.tsx @@ -19,12 +19,14 @@ import { } from '../../../../../../vis_default_editor/public'; import { ValidationVisOptionsProps } from '../../common'; import { VisParams } from '../../../../types'; +import { getThresholdLineStyles } from '../../../collections'; + +const thresholdLineStyles = getThresholdLineStyles(); function ThresholdPanel({ stateParams, setValue, setMultipleValidity, - vis, }: ValidationVisOptionsProps) { const setThresholdLine = useCallback( ( @@ -94,7 +96,7 @@ function ThresholdPanel({ label={i18n.translate('visTypeXy.editors.pointSeries.thresholdLine.styleLabel', { defaultMessage: 'Line style', })} - options={vis.type.editorConfig.collections.thresholdLineStyles} + options={thresholdLineStyles} paramName="style" value={stateParams.thresholdLine.style} setValue={setThresholdLine} diff --git a/src/plugins/vis_type_xy/public/sample_vis.test.mocks.ts b/src/plugins/vis_type_xy/public/sample_vis.test.mocks.ts index b45c30b46c79e..c425eb71117e8 100644 --- a/src/plugins/vis_type_xy/public/sample_vis.test.mocks.ts +++ b/src/plugins/vis_type_xy/public/sample_vis.test.mocks.ts @@ -1417,128 +1417,6 @@ export const sampleAreaVis = { }, }, editorConfig: { - collections: { - legendPositions: [ - { - text: 'Top', - value: 'top', - }, - { - text: 'Left', - value: 'left', - }, - { - text: 'Right', - value: 'right', - }, - { - text: 'Bottom', - value: 'bottom', - }, - ], - positions: [ - { - text: 'Top', - value: 'top', - }, - { - text: 'Left', - value: 'left', - }, - { - text: 'Right', - value: 'right', - }, - { - text: 'Bottom', - value: 'bottom', - }, - ], - chartTypes: [ - { - text: 'Line', - value: 'line', - }, - { - text: 'Area', - value: 'area', - }, - { - text: 'Bar', - value: 'histogram', - }, - ], - axisModes: [ - { - text: 'Normal', - value: 'normal', - }, - { - text: 'Percentage', - value: 'percentage', - }, - { - text: 'Wiggle', - value: 'wiggle', - }, - { - text: 'Silhouette', - value: 'silhouette', - }, - ], - scaleTypes: [ - { - text: 'Linear', - value: 'linear', - }, - { - text: 'Log', - value: 'log', - }, - { - text: 'Square root', - value: 'square root', - }, - ], - chartModes: [ - { - text: 'Normal', - value: 'normal', - }, - { - text: 'Stacked', - value: 'stacked', - }, - ], - interpolationModes: [ - { - text: 'Straight', - value: 'linear', - }, - { - text: 'Smoothed', - value: 'cardinal', - }, - { - text: 'Stepped', - value: 'step-after', - }, - ], - thresholdLineStyles: [ - { - value: 'full', - text: 'Full', - }, - { - value: 'dashed', - text: 'Dashed', - }, - { - value: 'dot-dashed', - text: 'Dot-dashed', - }, - ], - }, optionTabs: [ { name: 'advanced', diff --git a/src/plugins/vis_type_xy/public/vis_types/area.ts b/src/plugins/vis_type_xy/public/vis_types/area.ts index a118afb12d249..a61c25bbc075a 100644 --- a/src/plugins/vis_type_xy/public/vis_types/area.ts +++ b/src/plugins/vis_type_xy/public/vis_types/area.ts @@ -26,7 +26,6 @@ import { } from '../types'; import { toExpressionAst } from '../to_ast'; import { ChartType } from '../../common'; -import { getConfigCollections } from '../editor/collections'; import { getOptionTabs } from '../editor/common_config'; export const getAreaVisTypeDefinition = ( @@ -126,7 +125,6 @@ export const getAreaVisTypeDefinition = ( }, }, editorConfig: { - collections: getConfigCollections(), optionTabs: getOptionTabs(showElasticChartsOptions), schemas: [ { diff --git a/src/plugins/vis_type_xy/public/vis_types/histogram.ts b/src/plugins/vis_type_xy/public/vis_types/histogram.ts index 72d34f70b1a13..2c2a83b48802d 100644 --- a/src/plugins/vis_type_xy/public/vis_types/histogram.ts +++ b/src/plugins/vis_type_xy/public/vis_types/histogram.ts @@ -25,7 +25,6 @@ import { } from '../types'; import { toExpressionAst } from '../to_ast'; import { ChartType } from '../../common'; -import { getConfigCollections } from '../editor/collections'; import { getOptionTabs } from '../editor/common_config'; import { defaultCountLabel, LabelRotation } from '../../../charts/public'; @@ -129,7 +128,6 @@ export const getHistogramVisTypeDefinition = ( }, }, editorConfig: { - collections: getConfigCollections(), optionTabs: getOptionTabs(showElasticChartsOptions), schemas: [ { diff --git a/src/plugins/vis_type_xy/public/vis_types/horizontal_bar.ts b/src/plugins/vis_type_xy/public/vis_types/horizontal_bar.ts index 751803c07aa8d..75c4ddd75d0b3 100644 --- a/src/plugins/vis_type_xy/public/vis_types/horizontal_bar.ts +++ b/src/plugins/vis_type_xy/public/vis_types/horizontal_bar.ts @@ -25,7 +25,6 @@ import { } from '../types'; import { toExpressionAst } from '../to_ast'; import { ChartType } from '../../common'; -import { getConfigCollections } from '../editor/collections'; import { getOptionTabs } from '../editor/common_config'; import { defaultCountLabel, LabelRotation } from '../../../charts/public'; @@ -128,7 +127,6 @@ export const getHorizontalBarVisTypeDefinition = ( }, }, editorConfig: { - collections: getConfigCollections(), optionTabs: getOptionTabs(showElasticChartsOptions), schemas: [ { diff --git a/src/plugins/vis_type_xy/public/vis_types/line.ts b/src/plugins/vis_type_xy/public/vis_types/line.ts index 75e4ebe09e3f7..87165a20592e5 100644 --- a/src/plugins/vis_type_xy/public/vis_types/line.ts +++ b/src/plugins/vis_type_xy/public/vis_types/line.ts @@ -26,7 +26,6 @@ import { } from '../types'; import { toExpressionAst } from '../to_ast'; import { ChartType } from '../../common'; -import { getConfigCollections } from '../editor/collections'; import { getOptionTabs } from '../editor/common_config'; export const getLineVisTypeDefinition = ( @@ -126,7 +125,6 @@ export const getLineVisTypeDefinition = ( }, }, editorConfig: { - collections: getConfigCollections(), optionTabs: getOptionTabs(showElasticChartsOptions), schemas: [ { diff --git a/src/plugins/visualizations/public/types.ts b/src/plugins/visualizations/public/types.ts index 8dceee8e0010a..6241f9ee4ae12 100644 --- a/src/plugins/visualizations/public/types.ts +++ b/src/plugins/visualizations/public/types.ts @@ -20,7 +20,6 @@ import { PersistedState } from './persisted_state'; import { VisParams } from '../common'; export { Vis, SerializedVis, VisParams }; - export interface SavedVisState { title: string; type: string; diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json index b472655bf9028..3cfaaba5f8538 100644 --- a/x-pack/plugins/translations/translations/ja-JP.json +++ b/x-pack/plugins/translations/translations/ja-JP.json @@ -3367,14 +3367,14 @@ "tileMap.geohashLayer.mapTitle": "{mapType} マップタイプが認識されません", "tileMap.tooltipFormatter.latitudeLabel": "緯度", "tileMap.tooltipFormatter.longitudeLabel": "経度", - "tileMap.vis.editorConfig.legendPositions.bottomLeftText": "左下", - "tileMap.vis.editorConfig.legendPositions.bottomRightText": "右下", - "tileMap.vis.editorConfig.legendPositions.topLeftText": "左上", - "tileMap.vis.editorConfig.legendPositions.topRightText": "右上", - "tileMap.vis.editorConfig.mapTypes.heatmapText": "ヒートマップ", - "tileMap.vis.editorConfig.mapTypes.scaledCircleMarkersText": "スケーリングされた円マーカー", - "tileMap.vis.editorConfig.mapTypes.shadedCircleMarkersText": "影付き円マーカー", - "tileMap.vis.editorConfig.mapTypes.shadedGeohashGridText": "影付きジオハッシュグリッド", + "tileMap.legendPositions.bottomLeftText": "左下", + "tileMap.legendPositions.bottomRightText": "右下", + "tileMap.legendPositions.topLeftText": "左上", + "tileMap.legendPositions.topRightText": "右上", + "tileMap.mapTypes.heatmapText": "ヒートマップ", + "tileMap.mapTypes.scaledCircleMarkersText": "スケーリングされた円マーカー", + "tileMap.mapTypes.shadedCircleMarkersText": "影付き円マーカー", + "tileMap.mapTypes.shadedGeohashGridText": "影付きジオハッシュグリッド", "tileMap.vis.map.editorConfig.schemas.geoCoordinatesTitle": "座標", "tileMap.vis.map.editorConfig.schemas.metricTitle": "値", "tileMap.vis.mapDescription": "マップ上に緯度と経度の座標を表示します。", @@ -3967,12 +3967,12 @@ "visTypeTagCloud.function.metric.help": "メトリックディメンションの構成です。", "visTypeTagCloud.function.orientation.help": "タグクラウド内の単語の方向です。", "visTypeTagCloud.function.scale.help": "単語のフォントサイズを決定するスケールです", - "visTypeTagCloud.vis.editorConfig.orientations.multipleText": "複数", - "visTypeTagCloud.vis.editorConfig.orientations.rightAngledText": "直角", - "visTypeTagCloud.vis.editorConfig.orientations.singleText": "単一", - "visTypeTagCloud.vis.editorConfig.scales.linearText": "線形", - "visTypeTagCloud.vis.editorConfig.scales.logText": "ログ", - "visTypeTagCloud.vis.editorConfig.scales.squareRootText": "平方根", + "visTypeTagCloud.orientations.multipleText": "複数", + "visTypeTagCloud.orientations.rightAngledText": "直角", + "visTypeTagCloud.orientations.singleText": "単一", + "visTypeTagCloud.scales.linearText": "線形", + "visTypeTagCloud.scales.logText": "ログ", + "visTypeTagCloud.scales.squareRootText": "平方根", "visTypeTagCloud.vis.schemas.metricTitle": "タグサイズ", "visTypeTagCloud.vis.schemas.segmentTitle": "タグ", "visTypeTagCloud.vis.tagCloudDescription": "単語の頻度とフォントサイズを表示します。", diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json index 135aa92fb0b1b..ebc0c6f88ecfa 100644 --- a/x-pack/plugins/translations/translations/zh-CN.json +++ b/x-pack/plugins/translations/translations/zh-CN.json @@ -3371,14 +3371,14 @@ "tileMap.geohashLayer.mapTitle": "{mapType} 地图类型无法识别", "tileMap.tooltipFormatter.latitudeLabel": "纬度", "tileMap.tooltipFormatter.longitudeLabel": "经度", - "tileMap.vis.editorConfig.legendPositions.bottomLeftText": "左下方", - "tileMap.vis.editorConfig.legendPositions.bottomRightText": "右下方", - "tileMap.vis.editorConfig.legendPositions.topLeftText": "左上方", - "tileMap.vis.editorConfig.legendPositions.topRightText": "右上方", - "tileMap.vis.editorConfig.mapTypes.heatmapText": "热图", - "tileMap.vis.editorConfig.mapTypes.scaledCircleMarkersText": "缩放式圆形标记", - "tileMap.vis.editorConfig.mapTypes.shadedCircleMarkersText": "带阴影圆形标记", - "tileMap.vis.editorConfig.mapTypes.shadedGeohashGridText": "带阴影 geohash 网格", + "tileMap.legendPositions.bottomLeftText": "左下方", + "tileMap.legendPositions.bottomRightText": "右下方", + "tileMap.legendPositions.topLeftText": "左上方", + "tileMap.legendPositions.topRightText": "右上方", + "tileMap.mapTypes.heatmapText": "热图", + "tileMap.mapTypes.scaledCircleMarkersText": "缩放式圆形标记", + "tileMap.mapTypes.shadedCircleMarkersText": "带阴影圆形标记", + "tileMap.mapTypes.shadedGeohashGridText": "带阴影 geohash 网格", "tileMap.vis.map.editorConfig.schemas.geoCoordinatesTitle": "地理坐标", "tileMap.vis.map.editorConfig.schemas.metricTitle": "值", "tileMap.vis.mapDescription": "在地图上绘制纬度和经度坐标", @@ -3971,12 +3971,12 @@ "visTypeTagCloud.function.metric.help": "指标维度配置", "visTypeTagCloud.function.orientation.help": "标签云图内的字方向", "visTypeTagCloud.function.scale.help": "缩放以确定字体大小", - "visTypeTagCloud.vis.editorConfig.orientations.multipleText": "多个", - "visTypeTagCloud.vis.editorConfig.orientations.rightAngledText": "直角", - "visTypeTagCloud.vis.editorConfig.orientations.singleText": "单个", - "visTypeTagCloud.vis.editorConfig.scales.linearText": "线性", - "visTypeTagCloud.vis.editorConfig.scales.logText": "对数", - "visTypeTagCloud.vis.editorConfig.scales.squareRootText": "平方根", + "visTypeTagCloud.orientations.multipleText": "多个", + "visTypeTagCloud.orientations.rightAngledText": "直角", + "visTypeTagCloud.orientations.singleText": "单个", + "visTypeTagCloud.scales.linearText": "线性", + "visTypeTagCloud.scales.logText": "对数", + "visTypeTagCloud.scales.squareRootText": "平方根", "visTypeTagCloud.vis.schemas.metricTitle": "标签大小", "visTypeTagCloud.vis.schemas.segmentTitle": "标签", "visTypeTagCloud.vis.tagCloudDescription": "使用字体大小显示词频。", From a63dd15eac5f0daa8841b3b10a3849adfa39dffe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Istv=C3=A1n=20Zolt=C3=A1n=20Szab=C3=B3?= Date: Fri, 5 Feb 2021 09:37:22 +0100 Subject: [PATCH 36/69] Adjusts button labels to match titles in Data Visualizer. (#90289) Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> --- .../application/datavisualizer/datavisualizer_selector.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x-pack/plugins/ml/public/application/datavisualizer/datavisualizer_selector.tsx b/x-pack/plugins/ml/public/application/datavisualizer/datavisualizer_selector.tsx index 5f451339746bb..79d17a7846b8c 100644 --- a/x-pack/plugins/ml/public/application/datavisualizer/datavisualizer_selector.tsx +++ b/x-pack/plugins/ml/public/application/datavisualizer/datavisualizer_selector.tsx @@ -137,7 +137,7 @@ export const DatavisualizerSelector: FC = () => { > } @@ -167,7 +167,7 @@ export const DatavisualizerSelector: FC = () => { > } From f329ff84b883983c81e0117b3e18e95ef4f43d4e Mon Sep 17 00:00:00 2001 From: Pete Hampton Date: Fri, 5 Feb 2021 08:44:35 +0000 Subject: [PATCH 37/69] [7.12][Security] - Collect Security ML job / datafeed statistics (#89705) * inital setup and experiments. * Cast into ML job metric. * Update mappings file. * small refactor. add basic test to build on. * mock out anomoly detector for testing from the usage collector. * [PH JD] collect first set of ml job stats. * Update telemetry schema. * Include create and finished time. * Cache datafeed calls and find / filter by naming convention. * Fix jest test temp. * [PH JD] Add datafeed to the usage collector payload. * Get e2e test working. * Update time complexity detail / df stats lookup. O(n) -> O(1) * Update var names. Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> --- .../server/lib/machine_learning/mocks.ts | 1 + .../server/usage/collector.ts | 71 ++++++++-- .../usage/detections/detections.mocks.ts | 127 ++++++++++++++++++ .../usage/detections/detections.test.ts | 100 +++++++++++++- .../usage/detections/detections_helpers.ts | 92 ++++++++++++- .../server/usage/detections/index.ts | 53 ++++++++ .../schema/xpack_plugins.json | 121 +++++++++++++++++ 7 files changed, 548 insertions(+), 17 deletions(-) diff --git a/x-pack/plugins/security_solution/server/lib/machine_learning/mocks.ts b/x-pack/plugins/security_solution/server/lib/machine_learning/mocks.ts index 630e9c9c88489..5d1b090e98a79 100644 --- a/x-pack/plugins/security_solution/server/lib/machine_learning/mocks.ts +++ b/x-pack/plugins/security_solution/server/lib/machine_learning/mocks.ts @@ -19,6 +19,7 @@ export const mlServicesMock = { (({ modulesProvider: jest.fn(), jobServiceProvider: jest.fn(), + anomalyDetectorsProvider: jest.fn(), mlSystemProvider: createMockMlSystemProvider(), mlClient: createMockClient(), } as unknown) as jest.Mocked), diff --git a/x-pack/plugins/security_solution/server/usage/collector.ts b/x-pack/plugins/security_solution/server/usage/collector.ts index 9126029139ef4..981101bf733c7 100644 --- a/x-pack/plugins/security_solution/server/usage/collector.ts +++ b/x-pack/plugins/security_solution/server/usage/collector.ts @@ -8,13 +8,19 @@ import { CoreSetup, SavedObjectsClientContract } from '../../../../../src/core/server'; import { CollectorFetchContext } from '../../../../../src/plugins/usage_collection/server'; import { CollectorDependencies } from './types'; -import { DetectionsUsage, fetchDetectionsUsage, defaultDetectionsUsage } from './detections'; +import { + DetectionsUsage, + fetchDetectionsUsage, + defaultDetectionsUsage, + fetchDetectionsMetrics, +} from './detections'; import { EndpointUsage, getEndpointTelemetryFromFleet } from './endpoints'; export type RegisterCollector = (deps: CollectorDependencies) => void; export interface UsageData { detections: DetectionsUsage; endpoints: EndpointUsage | {}; + detectionMetrics: {}; } export async function getInternalSavedObjectsClient(core: CoreSetup) { @@ -57,6 +63,53 @@ export const registerCollector: RegisterCollector = ({ }, }, }, + detectionMetrics: { + ml_jobs: { + type: 'array', + items: { + job_id: { type: 'keyword' }, + open_time: { type: 'keyword' }, + create_time: { type: 'keyword' }, + finished_time: { type: 'keyword' }, + state: { type: 'keyword' }, + data_counts: { + bucket_count: { type: 'long' }, + empty_bucket_count: { type: 'long' }, + input_bytes: { type: 'long' }, + input_record_count: { type: 'long' }, + last_data_time: { type: 'long' }, + processed_record_count: { type: 'long' }, + }, + model_size_stats: { + bucket_allocation_failures_count: { type: 'long' }, + model_bytes: { type: 'long' }, + model_bytes_exceeded: { type: 'long' }, + model_bytes_memory_limit: { type: 'long' }, + peak_model_bytes: { type: 'long' }, + }, + timing_stats: { + average_bucket_processing_time_ms: { type: 'long' }, + bucket_count: { type: 'long' }, + exponential_average_bucket_processing_time_ms: { type: 'long' }, + exponential_average_bucket_processing_time_per_hour_ms: { type: 'long' }, + maximum_bucket_processing_time_ms: { type: 'long' }, + minimum_bucket_processing_time_ms: { type: 'long' }, + total_bucket_processing_time_ms: { type: 'long' }, + }, + datafeed: { + datafeed_id: { type: 'keyword' }, + state: { type: 'keyword' }, + timing_stats: { + average_search_time_per_bucket_ms: { type: 'long' }, + bucket_count: { type: 'long' }, + exponential_average_search_time_per_hour_ms: { type: 'long' }, + search_count: { type: 'long' }, + total_search_time_ms: { type: 'long' }, + }, + }, + }, + }, + }, endpoints: { total_installed: { type: 'long' }, active_within_last_24_hours: { type: 'long' }, @@ -80,19 +133,17 @@ export const registerCollector: RegisterCollector = ({ }, isReady: () => kibanaIndex.length > 0, fetch: async ({ esClient }: CollectorFetchContext): Promise => { - const savedObjectsClient = await getInternalSavedObjectsClient(core); - const [detections, endpoints] = await Promise.allSettled([ - fetchDetectionsUsage( - kibanaIndex, - esClient, - ml, - (savedObjectsClient as unknown) as SavedObjectsClientContract - ), - getEndpointTelemetryFromFleet(savedObjectsClient), + const internalSavedObjectsClient = await getInternalSavedObjectsClient(core); + const savedObjectsClient = (internalSavedObjectsClient as unknown) as SavedObjectsClientContract; + const [detections, detectionMetrics, endpoints] = await Promise.allSettled([ + fetchDetectionsUsage(kibanaIndex, esClient, ml, savedObjectsClient), + fetchDetectionsMetrics(ml, savedObjectsClient), + getEndpointTelemetryFromFleet(internalSavedObjectsClient), ]); return { detections: detections.status === 'fulfilled' ? detections.value : defaultDetectionsUsage, + detectionMetrics: detectionMetrics.status === 'fulfilled' ? detectionMetrics.value : {}, endpoints: endpoints.status === 'fulfilled' ? endpoints.value : {}, }; }, diff --git a/x-pack/plugins/security_solution/server/usage/detections/detections.mocks.ts b/x-pack/plugins/security_solution/server/usage/detections/detections.mocks.ts index 5601250ac1ecd..f7fa59958abae 100644 --- a/x-pack/plugins/security_solution/server/usage/detections/detections.mocks.ts +++ b/x-pack/plugins/security_solution/server/usage/detections/detections.mocks.ts @@ -175,3 +175,130 @@ export const getMockRulesResponse = () => ({ ], }, }); + +export const getMockMlJobDetailsResponse = () => ({ + count: 20, + jobs: [ + { + job_id: 'high_distinct_count_error_message', + job_type: 'anomaly_detector', + job_version: '8.0.0', + create_time: 1603838214983, + finished_time: 1611739871669, + model_snapshot_id: '1611740107', + custom_settings: { + created_by: undefined, + }, + groups: ['cloudtrail', 'security'], + description: + 'Security: Cloudtrail - Looks for a spike in the rate of an error message which may simply indicate an impending service failure but these can also be byproducts of attempted or successful persistence, privilege escalation, defense evasion, discovery, lateral movement, or collection activity by a threat actor.', + analysis_config: { + bucket_span: '15m', + detectors: [ + { + detector_description: 'high_distinct_count("aws.cloudtrail.error_message")', + function: 'high_distinct_count', + field_name: 'aws.cloudtrail.error_message', + detector_index: 0, + }, + ], + influencers: ['aws.cloudtrail.user_identity.arn', 'source.ip', 'source.geo.city_name'], + }, + analysis_limits: { + model_memory_limit: '16mb', + categorization_examples_limit: 4, + }, + data_description: { + time_field: '@timestamp', + time_format: 'epoch_ms', + }, + model_snapshot_retention_days: 10, + daily_model_snapshot_retention_after_days: 1, + results_index_name: 'custom-high_distinct_count_error_message', + }, + ], +}); + +export const getMockMlJobStatsResponse = () => ({ + count: 1, + jobs: [ + { + job_id: 'high_distinct_count_error_message', + data_counts: { + job_id: 'high_distinct_count_error_message', + processed_record_count: 162, + processed_field_count: 476, + input_bytes: 45957, + input_field_count: 476, + invalid_date_count: 0, + missing_field_count: 172, + out_of_order_timestamp_count: 0, + empty_bucket_count: 8590, + sparse_bucket_count: 0, + bucket_count: 8612, + earliest_record_timestamp: 1602648289000, + latest_record_timestamp: 1610399348000, + last_data_time: 1610470367123, + latest_empty_bucket_timestamp: 1610397900000, + input_record_count: 162, + log_time: 1610470367123, + }, + model_size_stats: { + job_id: 'high_distinct_count_error_message', + result_type: 'model_size_stats', + model_bytes: 72574, + peak_model_bytes: 78682, + model_bytes_exceeded: 0, + model_bytes_memory_limit: 16777216, + total_by_field_count: 4, + total_over_field_count: 0, + total_partition_field_count: 3, + bucket_allocation_failures_count: 0, + memory_status: 'ok', + assignment_memory_basis: 'current_model_bytes', + categorized_doc_count: 0, + total_category_count: 0, + frequent_category_count: 0, + rare_category_count: 0, + dead_category_count: 0, + failed_category_count: 0, + categorization_status: 'ok', + log_time: 1611740107843, + timestamp: 1611738900000, + }, + forecasts_stats: { + total: 0, + forecasted_jobs: 0, + }, + state: 'closed', + timing_stats: { + job_id: 'high_distinct_count_error_message', + bucket_count: 16236, + total_bucket_processing_time_ms: 7957.00000000008, + minimum_bucket_processing_time_ms: 0, + maximum_bucket_processing_time_ms: 392, + average_bucket_processing_time_ms: 0.4900837644740133, + exponential_average_bucket_processing_time_ms: 0.23614068552903306, + exponential_average_bucket_processing_time_per_hour_ms: 1.5551298175461634, + }, + }, + ], +}); + +export const getMockMlDatafeedStatsResponse = () => ({ + count: 1, + datafeeds: [ + { + datafeed_id: 'datafeed-high_distinct_count_error_message', + state: 'stopped', + timing_stats: { + job_id: 'high_distinct_count_error_message', + search_count: 7202, + bucket_count: 8612, + total_search_time_ms: 3107147, + average_search_time_per_bucket_ms: 360.7927310729215, + exponential_average_search_time_per_hour_ms: 86145.39799630083, + }, + }, + ], +}); diff --git a/x-pack/plugins/security_solution/server/usage/detections/detections.test.ts b/x-pack/plugins/security_solution/server/usage/detections/detections.test.ts index 1804d7c756e53..b53f90f40f621 100644 --- a/x-pack/plugins/security_solution/server/usage/detections/detections.test.ts +++ b/x-pack/plugins/security_solution/server/usage/detections/detections.test.ts @@ -12,15 +12,18 @@ import { getMockJobSummaryResponse, getMockListModulesResponse, getMockRulesResponse, + getMockMlJobDetailsResponse, + getMockMlJobStatsResponse, + getMockMlDatafeedStatsResponse, } from './detections.mocks'; -import { fetchDetectionsUsage } from './index'; +import { fetchDetectionsUsage, fetchDetectionsMetrics } from './index'; -describe('Detections Usage', () => { - describe('fetchDetectionsUsage()', () => { - let esClientMock: jest.Mocked; - let savedObjectsClientMock: jest.Mocked; - let mlMock: ReturnType; +describe('Detections Usage and Metrics', () => { + let esClientMock: jest.Mocked; + let savedObjectsClientMock: jest.Mocked; + let mlMock: ReturnType; + describe('fetchDetectionsUsage()', () => { beforeEach(() => { esClientMock = elasticsearchServiceMock.createClusterClient().asInternalUser; mlMock = mlServicesMock.create(); @@ -102,4 +105,89 @@ describe('Detections Usage', () => { ); }); }); + + describe('fetchDetectionsMetrics()', () => { + beforeEach(() => { + mlMock = mlServicesMock.create(); + }); + + it('returns an empty array if there is no data', async () => { + mlMock.anomalyDetectorsProvider.mockReturnValue(({ + jobs: null, + jobStats: null, + } as unknown) as ReturnType); + const result = await fetchDetectionsMetrics(mlMock, savedObjectsClientMock); + + expect(result).toEqual( + expect.objectContaining({ + ml_jobs: [], + }) + ); + }); + + it('returns an ml job telemetry object from anomaly detectors provider', async () => { + const mockJobsResponse = jest.fn().mockResolvedValue(getMockMlJobDetailsResponse()); + const mockJobStatsResponse = jest.fn().mockResolvedValue(getMockMlJobStatsResponse()); + const mockDatafeedStatsResponse = jest + .fn() + .mockResolvedValue(getMockMlDatafeedStatsResponse()); + + mlMock.anomalyDetectorsProvider.mockReturnValue(({ + jobs: mockJobsResponse, + jobStats: mockJobStatsResponse, + datafeedStats: mockDatafeedStatsResponse, + } as unknown) as ReturnType); + + const result = await fetchDetectionsMetrics(mlMock, savedObjectsClientMock); + + expect(result).toEqual( + expect.objectContaining({ + ml_jobs: [ + { + job_id: 'high_distinct_count_error_message', + create_time: 1603838214983, + finished_time: 1611739871669, + state: 'closed', + data_counts: { + bucket_count: 8612, + empty_bucket_count: 8590, + input_bytes: 45957, + input_record_count: 162, + last_data_time: 1610470367123, + processed_record_count: 162, + }, + model_size_stats: { + bucket_allocation_failures_count: 0, + memory_status: 'ok', + model_bytes: 72574, + model_bytes_exceeded: 0, + model_bytes_memory_limit: 16777216, + peak_model_bytes: 78682, + }, + timing_stats: { + average_bucket_processing_time_ms: 0.4900837644740133, + bucket_count: 16236, + exponential_average_bucket_processing_time_ms: 0.23614068552903306, + exponential_average_bucket_processing_time_per_hour_ms: 1.5551298175461634, + maximum_bucket_processing_time_ms: 392, + minimum_bucket_processing_time_ms: 0, + total_bucket_processing_time_ms: 7957.00000000008, + }, + datafeed: { + datafeed_id: 'datafeed-high_distinct_count_error_message', + state: 'stopped', + timing_stats: { + average_search_time_per_bucket_ms: 360.7927310729215, + bucket_count: 8612, + exponential_average_search_time_per_hour_ms: 86145.39799630083, + search_count: 7202, + total_search_time_ms: 3107147, + }, + }, + }, + ], + }) + ); + }); + }); }); diff --git a/x-pack/plugins/security_solution/server/usage/detections/detections_helpers.ts b/x-pack/plugins/security_solution/server/usage/detections/detections_helpers.ts index 9ffd3e0911779..4236c782d6c68 100644 --- a/x-pack/plugins/security_solution/server/usage/detections/detections_helpers.ts +++ b/x-pack/plugins/security_solution/server/usage/detections/detections_helpers.ts @@ -13,7 +13,7 @@ import { } from '../../../../../../src/core/server'; import { MlPluginSetup } from '../../../../ml/server'; import { SIGNALS_ID, INTERNAL_IMMUTABLE_KEY } from '../../../common/constants'; -import { DetectionRulesUsage, MlJobsUsage } from './index'; +import { DetectionRulesUsage, MlJobsUsage, MlJobMetric } from './index'; import { isJobStarted } from '../../../common/machine_learning/helpers'; import { isSecurityJob } from '../../../common/machine_learning/is_security_job'; @@ -213,3 +213,93 @@ export const getMlJobsUsage = async ( return jobsUsage; }; + +export const getMlJobMetrics = async ( + ml: MlPluginSetup | undefined, + savedObjectClient: SavedObjectsClientContract +): Promise => { + if (ml) { + try { + const fakeRequest = { headers: {} } as KibanaRequest; + const jobsType = 'security'; + const securityJobStats = await ml + .anomalyDetectorsProvider(fakeRequest, savedObjectClient) + .jobStats(jobsType); + + const jobDetails = await ml + .anomalyDetectorsProvider(fakeRequest, savedObjectClient) + .jobs(jobsType); + + const jobDetailsCache = new Map(); + jobDetails.jobs.forEach((detail) => jobDetailsCache.set(detail.job_id, detail)); + + const datafeedStats = await ml + .anomalyDetectorsProvider(fakeRequest, savedObjectClient) + .datafeedStats(); + + const datafeedStatsCache = new Map(); + datafeedStats.datafeeds.forEach((datafeedStat) => + datafeedStatsCache.set(`${datafeedStat.datafeed_id}`, datafeedStat) + ); + + return securityJobStats.jobs.map((stat) => { + const jobId = stat.job_id; + const jobDetail = jobDetailsCache.get(stat.job_id); + const datafeed = datafeedStatsCache.get(`datafeed-${jobId}`); + + return { + job_id: jobId, + open_time: stat.open_time, + create_time: jobDetail?.create_time, + finished_time: jobDetail?.finished_time, + state: stat.state, + data_counts: { + bucket_count: stat.data_counts.bucket_count, + empty_bucket_count: stat.data_counts.empty_bucket_count, + input_bytes: stat.data_counts.input_bytes, + input_record_count: stat.data_counts.input_record_count, + last_data_time: stat.data_counts.last_data_time, + processed_record_count: stat.data_counts.processed_record_count, + }, + model_size_stats: { + bucket_allocation_failures_count: + stat.model_size_stats.bucket_allocation_failures_count, + memory_status: stat.model_size_stats.memory_status, + model_bytes: stat.model_size_stats.model_bytes, + model_bytes_exceeded: stat.model_size_stats.model_bytes_exceeded, + model_bytes_memory_limit: stat.model_size_stats.model_bytes_memory_limit, + peak_model_bytes: stat.model_size_stats.peak_model_bytes, + }, + timing_stats: { + average_bucket_processing_time_ms: stat.timing_stats.average_bucket_processing_time_ms, + bucket_count: stat.timing_stats.bucket_count, + exponential_average_bucket_processing_time_ms: + stat.timing_stats.exponential_average_bucket_processing_time_ms, + exponential_average_bucket_processing_time_per_hour_ms: + stat.timing_stats.exponential_average_bucket_processing_time_per_hour_ms, + maximum_bucket_processing_time_ms: stat.timing_stats.maximum_bucket_processing_time_ms, + minimum_bucket_processing_time_ms: stat.timing_stats.minimum_bucket_processing_time_ms, + total_bucket_processing_time_ms: stat.timing_stats.total_bucket_processing_time_ms, + }, + datafeed: { + datafeed_id: datafeed?.datafeed_id, + state: datafeed?.state, + timing_stats: { + average_search_time_per_bucket_ms: + datafeed?.timing_stats.average_search_time_per_bucket_ms, + bucket_count: datafeed?.timing_stats.bucket_count, + exponential_average_search_time_per_hour_ms: + datafeed?.timing_stats.exponential_average_search_time_per_hour_ms, + search_count: datafeed?.timing_stats.search_count, + total_search_time_ms: datafeed?.timing_stats.total_search_time_ms, + }, + }, + } as MlJobMetric; + }); + } catch (e) { + // ignore failure, usage will be zeroed + } + } + + return []; +}; diff --git a/x-pack/plugins/security_solution/server/usage/detections/index.ts b/x-pack/plugins/security_solution/server/usage/detections/index.ts index 27f0b1acb2ee9..39c8f3159fe03 100644 --- a/x-pack/plugins/security_solution/server/usage/detections/index.ts +++ b/x-pack/plugins/security_solution/server/usage/detections/index.ts @@ -8,6 +8,7 @@ import { ElasticsearchClient, SavedObjectsClientContract } from '../../../../../../src/core/server'; import { getMlJobsUsage, + getMlJobMetrics, getRulesUsage, initialRulesUsage, initialMlJobsUsage, @@ -34,6 +35,47 @@ export interface DetectionsUsage { ml_jobs: MlJobsUsage; } +export interface DetectionMetrics { + ml_jobs: MlJobMetric[]; +} + +export interface MlJobDataCount { + bucket_count: number; + empty_bucket_count: number; + input_bytes: number; + input_record_count: number; + last_data_time: number; + processed_record_count: number; +} + +export interface MlJobModelSize { + bucket_allocation_failures_count: number; + memory_status: string; + model_bytes: number; + model_bytes_exceeded: number; + model_bytes_memory_limit: number; + peak_model_bytes: number; +} + +export interface MlTimingStats { + average_bucket_processing_time_ms: number; + bucket_count: number; + exponential_average_bucket_processing_time_ms: number; + exponential_average_bucket_processing_time_per_hour_ms: number; + maximum_bucket_processing_time_ms: number; + minimum_bucket_processing_time_ms: number; + total_bucket_processing_time_ms: number; +} + +export interface MlJobMetric { + job_id: string; + open_time: string; + state: string; + data_counts: MlJobDataCount; + model_size_stats: MlJobModelSize; + timing_stats: MlTimingStats; +} + export const defaultDetectionsUsage = { detection_rules: initialRulesUsage, ml_jobs: initialMlJobsUsage, @@ -55,3 +97,14 @@ export const fetchDetectionsUsage = async ( ml_jobs: mlJobsUsage.status === 'fulfilled' ? mlJobsUsage.value : initialMlJobsUsage, }; }; + +export const fetchDetectionsMetrics = async ( + ml: MlPluginSetup | undefined, + savedObjectClient: SavedObjectsClientContract +): Promise => { + const [mlJobMetrics] = await Promise.allSettled([getMlJobMetrics(ml, savedObjectClient)]); + + return { + ml_jobs: mlJobMetrics.status === 'fulfilled' ? mlJobMetrics.value : [], + }; +}; diff --git a/x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json b/x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json index c1674f8a92669..9e6a0c06808bc 100644 --- a/x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json +++ b/x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @@ -3244,6 +3244,127 @@ } } }, + "detectionMetrics": { + "properties": { + "ml_jobs": { + "type": "array", + "items": { + "properties": { + "job_id": { + "type": "keyword" + }, + "open_time": { + "type": "keyword" + }, + "create_time": { + "type": "keyword" + }, + "finished_time": { + "type": "keyword" + }, + "state": { + "type": "keyword" + }, + "data_counts": { + "properties": { + "bucket_count": { + "type": "long" + }, + "empty_bucket_count": { + "type": "long" + }, + "input_bytes": { + "type": "long" + }, + "input_record_count": { + "type": "long" + }, + "last_data_time": { + "type": "long" + }, + "processed_record_count": { + "type": "long" + } + } + }, + "model_size_stats": { + "properties": { + "bucket_allocation_failures_count": { + "type": "long" + }, + "model_bytes": { + "type": "long" + }, + "model_bytes_exceeded": { + "type": "long" + }, + "model_bytes_memory_limit": { + "type": "long" + }, + "peak_model_bytes": { + "type": "long" + } + } + }, + "timing_stats": { + "properties": { + "average_bucket_processing_time_ms": { + "type": "long" + }, + "bucket_count": { + "type": "long" + }, + "exponential_average_bucket_processing_time_ms": { + "type": "long" + }, + "exponential_average_bucket_processing_time_per_hour_ms": { + "type": "long" + }, + "maximum_bucket_processing_time_ms": { + "type": "long" + }, + "minimum_bucket_processing_time_ms": { + "type": "long" + }, + "total_bucket_processing_time_ms": { + "type": "long" + } + } + }, + "datafeed": { + "properties": { + "datafeed_id": { + "type": "keyword" + }, + "state": { + "type": "keyword" + }, + "timing_stats": { + "properties": { + "average_search_time_per_bucket_ms": { + "type": "long" + }, + "bucket_count": { + "type": "long" + }, + "exponential_average_search_time_per_hour_ms": { + "type": "long" + }, + "search_count": { + "type": "long" + }, + "total_search_time_ms": { + "type": "long" + } + } + } + } + } + } + } + } + } + }, "endpoints": { "properties": { "total_installed": { From 3a388c6bf0a9ae115fa1b1be78cd5ab36c669cd4 Mon Sep 17 00:00:00 2001 From: Stratoula Kalafateli Date: Fri, 5 Feb 2021 12:01:46 +0200 Subject: [PATCH 38/69] [Visualize] Removes the dashboard callout for users without permission (#89979) * [Visualize] Removes the dashboard callout for users without permission * Check if the user has the createNew permission Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> --- .../application/components/visualize_listing.tsx | 12 +++++++----- .../application/components/visualize_top_nav.tsx | 2 +- src/plugins/visualize/public/application/types.ts | 3 ++- .../public/application/utils/get_top_nav_config.tsx | 2 +- src/plugins/visualize/public/plugin.ts | 1 + 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/plugins/visualize/public/application/components/visualize_listing.tsx b/src/plugins/visualize/public/application/components/visualize_listing.tsx index c13c5d9accef3..c772554344cb2 100644 --- a/src/plugins/visualize/public/application/components/visualize_listing.tsx +++ b/src/plugins/visualize/public/application/components/visualize_listing.tsx @@ -40,6 +40,7 @@ export const VisualizeListing = () => { savedObjectsTagging, uiSettings, visualizeCapabilities, + dashboardCapabilities, kbnUrlStateStorage, }, } = useKibana(); @@ -172,11 +173,12 @@ export const VisualizeListing = () => { return ( <> - {dashboard.dashboardFeatureFlagConfig.allowByValueEmbeddables && ( -
    - -
    - )} + {dashboard.dashboardFeatureFlagConfig.allowByValueEmbeddables && + dashboardCapabilities.createNew && ( +
    + +
    + )} diff --git a/src/plugins/visualize/public/application/types.ts b/src/plugins/visualize/public/application/types.ts index d20553ee73e9c..67c3d22d95426 100644 --- a/src/plugins/visualize/public/application/types.ts +++ b/src/plugins/visualize/public/application/types.ts @@ -83,7 +83,8 @@ export interface VisualizeServices extends CoreStart { navigation: NavigationStart; toastNotifications: ToastsStart; share?: SharePluginStart; - visualizeCapabilities: any; + visualizeCapabilities: Record>; + dashboardCapabilities: Record>; visualizations: VisualizationsStart; savedObjectsPublic: SavedObjectsStart; savedVisualizations: VisualizationsStart['savedVisualizationsLoader']; diff --git a/src/plugins/visualize/public/application/utils/get_top_nav_config.tsx b/src/plugins/visualize/public/application/utils/get_top_nav_config.tsx index 3fd6fd15e3667..9ea42e8b56559 100644 --- a/src/plugins/visualize/public/application/utils/get_top_nav_config.tsx +++ b/src/plugins/visualize/public/application/utils/get_top_nav_config.tsx @@ -250,7 +250,7 @@ export const getTopNavConfig = ( share.toggleShareContextMenu({ anchorElement, allowEmbed: true, - allowShortUrl: visualizeCapabilities.createShortUrl, + allowShortUrl: Boolean(visualizeCapabilities.createShortUrl), shareableUrl: unhashUrl(window.location.href), objectId: savedVis?.id, objectType: 'visualization', diff --git a/src/plugins/visualize/public/plugin.ts b/src/plugins/visualize/public/plugin.ts index d93601ccd673e..39074735e2aeb 100644 --- a/src/plugins/visualize/public/plugin.ts +++ b/src/plugins/visualize/public/plugin.ts @@ -172,6 +172,7 @@ export class VisualizePlugin share: pluginsStart.share, toastNotifications: coreStart.notifications.toasts, visualizeCapabilities: coreStart.application.capabilities.visualize, + dashboardCapabilities: coreStart.application.capabilities.dashboard, visualizations: pluginsStart.visualizations, embeddable: pluginsStart.embeddable, stateTransferService: pluginsStart.embeddable.getStateTransfer(), From b058f7852b74fd22f396c367dc47cf4a526b4daa Mon Sep 17 00:00:00 2001 From: Matthias Wilhelm Date: Fri, 5 Feb 2021 11:42:59 +0100 Subject: [PATCH 39/69] [Discover] Close document flyout when inspect flyout is displayed (#89679) --- .../public/application/angular/discover.js | 57 ++++++++----------- .../application/components/discover.test.tsx | 32 +++-------- .../application/components/discover.tsx | 25 +++++++- .../discover_grid/discover_grid.tsx | 21 +++++-- .../top_nav/get_top_nav_links.test.ts | 1 + .../components/top_nav/get_top_nav_links.ts | 3 + .../public/application/components/types.ts | 24 ++++++-- 7 files changed, 92 insertions(+), 71 deletions(-) diff --git a/src/plugins/discover/public/application/angular/discover.js b/src/plugins/discover/public/application/angular/discover.js index 13ff8b14d9b43..b22bb6dc71342 100644 --- a/src/plugins/discover/public/application/angular/discover.js +++ b/src/plugins/discover/public/application/angular/discover.js @@ -56,7 +56,6 @@ import { SORT_DEFAULT_ORDER_SETTING, } from '../../../common'; import { loadIndexPattern, resolveIndexPattern } from '../helpers/resolve_index_pattern'; -import { getTopNavLinks } from '../components/top_nav/get_top_nav_links'; import { updateSearchSource } from '../helpers/update_search_source'; import { calcFieldCounts } from '../helpers/calc_field_counts'; import { getDefaultSort } from './doc_table/lib/get_default_sort'; @@ -198,7 +197,7 @@ function discoverController($route, $scope, Promise) { session: data.search.session, }); - const state = getState({ + const stateContainer = getState({ getStateDefaults, storeInSessionStorage: config.get('state:storeInSessionStorage'), history, @@ -213,7 +212,7 @@ function discoverController($route, $scope, Promise) { replaceUrlAppState, kbnUrlStateStorage, getPreviousAppState, - } = state; + } = stateContainer; if (appStateContainer.getState().index !== $scope.indexPattern.id) { //used index pattern is different than the given by url/state which is invalid @@ -323,10 +322,24 @@ function discoverController($route, $scope, Promise) { ) ); - const inspectorAdapters = { - requests: new RequestAdapter(), + $scope.opts = { + // number of records to fetch, then paginate through + sampleSize: config.get(SAMPLE_SIZE_SETTING), + timefield: getTimeField(), + savedSearch: savedSearch, + indexPatternList: $route.current.locals.savedObjects.ip.list, + config: config, + setHeaderActionMenu: getHeaderActionMenuMounter(), + filterManager, + setAppState, + data, + stateContainer, }; + const inspectorAdapters = ($scope.opts.inspectorAdapters = { + requests: new RequestAdapter(), + }); + $scope.timefilterUpdateHandler = (ranges) => { timefilter.setTime({ from: moment(ranges.from).toISOString(), @@ -358,7 +371,7 @@ function discoverController($route, $scope, Promise) { unlistenHistoryBasePath(); }); - const getFieldCounts = async () => { + $scope.opts.getFieldCounts = async () => { // the field counts aren't set until we have the data back, // so we wait for the fetch to be done before proceeding if ($scope.fetchStatus === fetchStatuses.COMPLETE) { @@ -374,20 +387,11 @@ function discoverController($route, $scope, Promise) { }); }); }; - - $scope.topNavMenu = getTopNavLinks({ - getFieldCounts, - indexPattern: $scope.indexPattern, - inspectorAdapters, - navigateTo: (path) => { - $scope.$evalAsync(() => { - history.push(path); - }); - }, - savedSearch, - services, - state, - }); + $scope.opts.navigateTo = (path) => { + $scope.$evalAsync(() => { + history.push(path); + }); + }; $scope.searchSource .setField('index', $scope.indexPattern) @@ -446,19 +450,6 @@ function discoverController($route, $scope, Promise) { $scope.state.index = $scope.indexPattern.id; $scope.state.sort = getSortArray($scope.state.sort, $scope.indexPattern); - $scope.opts = { - // number of records to fetch, then paginate through - sampleSize: config.get(SAMPLE_SIZE_SETTING), - timefield: getTimeField(), - savedSearch: savedSearch, - indexPatternList: $route.current.locals.savedObjects.ip.list, - config: config, - setHeaderActionMenu: getHeaderActionMenuMounter(), - filterManager, - setAppState, - data, - }; - const shouldSearchOnPageLoad = () => { // A saved search is created on every page load, so we check the ID to see if we're loading a // previously saved search or if it is just transient diff --git a/src/plugins/discover/public/application/components/discover.test.tsx b/src/plugins/discover/public/application/components/discover.test.tsx index 720b79f53a551..bb0014f4278a1 100644 --- a/src/plugins/discover/public/application/components/discover.test.tsx +++ b/src/plugins/discover/public/application/components/discover.test.tsx @@ -9,11 +9,8 @@ import React from 'react'; import { shallowWithIntl } from '@kbn/test/jest'; import { Discover } from './discover'; -import { inspectorPluginMock } from '../../../../inspector/public/mocks'; import { esHits } from '../../__mocks__/es_hits'; import { indexPatternMock } from '../../__mocks__/index_pattern'; -import { getTopNavLinks } from './top_nav/get_top_nav_links'; -import { DiscoverServices } from '../../build_services'; import { GetStateReturn } from '../angular/discover_state'; import { savedSearchMock } from '../../__mocks__/saved_search'; import { createSearchSourceMock } from '../../../../data/common/search/search_source/mocks'; @@ -25,6 +22,8 @@ import { SavedObject } from '../../../../../core/types'; import { navigationPluginMock } from '../../../../navigation/public/mocks'; import { indexPatternWithTimefieldMock } from '../../__mocks__/index_pattern_with_timefield'; import { calcFieldCounts } from '../helpers/calc_field_counts'; +import { DiscoverProps } from './types'; +import { RequestAdapter } from '../../../../inspector/common'; const mockNavigation = navigationPluginMock.createStartContract(); @@ -45,17 +44,9 @@ jest.mock('../../kibana_services', () => { }; }); -function getProps(indexPattern: IndexPattern) { +function getProps(indexPattern: IndexPattern): DiscoverProps { const searchSourceMock = createSearchSourceMock({}); const state = ({} as unknown) as GetStateReturn; - const services = ({ - capabilities: { - discover: { - save: true, - }, - }, - uiSettings: mockUiSettings, - } as unknown) as DiscoverServices; return { fetch: jest.fn(), @@ -76,32 +67,25 @@ function getProps(indexPattern: IndexPattern) { opts: { config: mockUiSettings, data: dataPluginMock.createStartContract(), - fixedScroll: jest.fn(), filterManager: createFilterManagerMock(), + getFieldCounts: jest.fn(), indexPatternList: (indexPattern as unknown) as Array>, + inspectorAdapters: { requests: {} as RequestAdapter }, + navigateTo: jest.fn(), sampleSize: 10, savedSearch: savedSearchMock, + setAppState: jest.fn(), setHeaderActionMenu: jest.fn(), + stateContainer: state, timefield: indexPattern.timeFieldName || '', - setAppState: jest.fn(), }, resetQuery: jest.fn(), resultState: 'ready', rows: esHits, searchSource: searchSourceMock, setIndexPattern: jest.fn(), - showSaveQuery: true, state: { columns: [] }, timefilterUpdateHandler: jest.fn(), - topNavMenu: getTopNavLinks({ - getFieldCounts: jest.fn(), - indexPattern, - inspectorAdapters: inspectorPluginMock, - navigateTo: jest.fn(), - savedSearch: savedSearchMock, - services, - state, - }), updateQuery: jest.fn(), updateSavedQueryId: jest.fn(), }; diff --git a/src/plugins/discover/public/application/components/discover.tsx b/src/plugins/discover/public/application/components/discover.tsx index e6c4524f81f56..baee0623f0b5a 100644 --- a/src/plugins/discover/public/application/components/discover.tsx +++ b/src/plugins/discover/public/application/components/discover.tsx @@ -41,6 +41,8 @@ import { getDisplayedColumns } from '../helpers/columns'; import { SortPairArr } from '../angular/doc_table/lib/get_sort'; import { DiscoverGrid, DiscoverGridProps } from './discover_grid/discover_grid'; import { SEARCH_FIELDS_FROM_SOURCE } from '../../../common'; +import { ElasticSearchHit } from '../doc_views/doc_views_types'; +import { getTopNavLinks } from './top_nav/get_top_nav_links'; const DocTableLegacyMemoized = React.memo((props: DocTableLegacyProps) => ( @@ -77,11 +79,11 @@ export function Discover({ state, timefilterUpdateHandler, timeRange, - topNavMenu, updateQuery, updateSavedQueryId, unmappedFieldsConfig, }: DiscoverProps) { + const [expandedDoc, setExpandedDoc] = useState(undefined); const scrollableDesktop = useRef(null); const collapseIcon = useRef(null); const isMobile = () => { @@ -91,7 +93,24 @@ export function Discover({ const [toggleOn, toggleChart] = useState(true); const [isSidebarClosed, setIsSidebarClosed] = useState(false); - const services = getServices(); + const services = useMemo(() => getServices(), []); + const topNavMenu = useMemo( + () => + getTopNavLinks({ + getFieldCounts: opts.getFieldCounts, + indexPattern, + inspectorAdapters: opts.inspectorAdapters, + navigateTo: opts.navigateTo, + savedSearch: opts.savedSearch, + services, + state: opts.stateContainer, + onOpenInspector: () => { + // prevent overlapping + setExpandedDoc(undefined); + }, + }), + [indexPattern, opts, services] + ); const { TopNavMenu } = services.navigation.ui; const { trackUiMetric } = services; const { savedSearch, indexPatternList, config } = opts; @@ -318,12 +337,14 @@ export function Discover({ void; /** * Grid display settings persisted in Elasticsearch (e.g. column width) */ @@ -121,6 +129,7 @@ export const DiscoverGrid = ({ ariaLabelledBy, columns, indexPattern, + expandedDoc, onAddColumn, onFilter, onRemoveColumn, @@ -132,11 +141,11 @@ export const DiscoverGrid = ({ searchDescription, searchTitle, services, + setExpandedDoc, settings, showTimeCol, sort, }: DiscoverGridProps) => { - const [expanded, setExpanded] = useState(undefined); const defaultColumns = columns.includes('_source'); /** @@ -233,8 +242,8 @@ export const DiscoverGrid = ({ return ( )} - {expanded && ( + {expandedDoc && ( setExpanded(undefined)} + onClose={() => setExpandedDoc(undefined)} services={services} /> )} diff --git a/src/plugins/discover/public/application/components/top_nav/get_top_nav_links.test.ts b/src/plugins/discover/public/application/components/top_nav/get_top_nav_links.test.ts index 7629495c85bb5..89cb60700074d 100644 --- a/src/plugins/discover/public/application/components/top_nav/get_top_nav_links.test.ts +++ b/src/plugins/discover/public/application/components/top_nav/get_top_nav_links.test.ts @@ -29,6 +29,7 @@ test('getTopNavLinks result', () => { indexPattern: indexPatternMock, inspectorAdapters: inspectorPluginMock, navigateTo: jest.fn(), + onOpenInspector: jest.fn(), savedSearch: savedSearchMock, services, state, diff --git a/src/plugins/discover/public/application/components/top_nav/get_top_nav_links.ts b/src/plugins/discover/public/application/components/top_nav/get_top_nav_links.ts index 0b23c31ac03c4..513508c478aa9 100644 --- a/src/plugins/discover/public/application/components/top_nav/get_top_nav_links.ts +++ b/src/plugins/discover/public/application/components/top_nav/get_top_nav_links.ts @@ -28,6 +28,7 @@ export const getTopNavLinks = ({ savedSearch, services, state, + onOpenInspector, }: { getFieldCounts: () => Promise>; indexPattern: IndexPattern; @@ -36,6 +37,7 @@ export const getTopNavLinks = ({ savedSearch: SavedSearch; services: DiscoverServices; state: GetStateReturn; + onOpenInspector: () => void; }) => { const newSearch = { id: 'new', @@ -123,6 +125,7 @@ export const getTopNavLinks = ({ }), testId: 'openInspectorButton', run: () => { + onOpenInspector(); services.inspector.open(inspectorAdapters, { title: savedSearch.title, }); diff --git a/src/plugins/discover/public/application/components/types.ts b/src/plugins/discover/public/application/components/types.ts index abc8086e72712..b73f7391bf22a 100644 --- a/src/plugins/discover/public/application/components/types.ts +++ b/src/plugins/discover/public/application/components/types.ts @@ -21,8 +21,8 @@ import { TimeRange, } from '../../../../data/public'; import { SavedSearch } from '../../saved_searches'; -import { AppState } from '../angular/discover_state'; -import { TopNavMenuData } from '../../../../navigation/public'; +import { AppState, GetStateReturn } from '../angular/discover_state'; +import { RequestAdapter } from '../../../../inspector/common'; export interface DiscoverProps { /** @@ -100,6 +100,22 @@ export interface DiscoverProps { * Client of uiSettings */ config: IUiSettingsClient; + /** + * returns field statistics based on the loaded data sample + */ + getFieldCounts: () => Promise>; + /** + * Use angular router for navigation + */ + navigateTo: () => void; + /** + * Functions to get/mutate state + */ + stateContainer: GetStateReturn; + /** + * Inspect, for analyzing requests and responses + */ + inspectorAdapters: { requests: RequestAdapter }; /** * Data plugin */ @@ -165,10 +181,6 @@ export interface DiscoverProps { * Currently selected time range */ timeRange?: { from: string; to: string }; - /** - * Menu data of top navigation (New, save ...) - */ - topNavMenu: TopNavMenuData[]; /** * Function to update the actual query */ From ae609c4aea78a2c39bb7bd4bd46c31478fcd74dd Mon Sep 17 00:00:00 2001 From: Matthias Wilhelm Date: Fri, 5 Feb 2021 17:28:17 +0100 Subject: [PATCH 40/69] [Discover] Add missing key to DocViewer table (#90396) --- .../discover/public/application/components/table/table.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/plugins/discover/public/application/components/table/table.tsx b/src/plugins/discover/public/application/components/table/table.tsx index 6ead2aff67452..684a7d4fd467c 100644 --- a/src/plugins/discover/public/application/components/table/table.tsx +++ b/src/plugins/discover/public/application/components/table/table.tsx @@ -101,9 +101,8 @@ export function DocViewTable({ ? 'nested' : indexPattern.fields.getByName(field)?.type; return ( - + Date: Fri, 5 Feb 2021 16:32:49 +0000 Subject: [PATCH 41/69] [ML] Allow filtering by mlcategory in Anomaly Explorer Influencers list (#90282) * [ML] Allow filtering by mlcategory in Anomaly Explorer Influencers list * [ML] Use getFormattedSeverityScore for formatting anomaly scores --- .../anomalies_table_columns.js | 2 - .../severity_cell/severity_cell.tsx | 7 +- ...tity_cell.test.js => entity_cell.test.tsx} | 0 .../{entity_cell.js => entity_cell.tsx} | 111 ++++++++++-------- .../entity_cell/{index.js => index.ts} | 2 +- .../influencers_list/{index.js => index.ts} | 0 ...fluencers_list.js => influencers_list.tsx} | 81 +++++++------ .../explorer_chart_distribution.js | 8 +- .../explorer_chart_single_metric.js | 4 +- .../anomaly_detection_panel/table.tsx | 7 +- .../timeseries_chart/timeseries_chart.js | 4 +- 11 files changed, 125 insertions(+), 101 deletions(-) rename x-pack/plugins/ml/public/application/components/entity_cell/{entity_cell.test.js => entity_cell.test.tsx} (100%) rename x-pack/plugins/ml/public/application/components/entity_cell/{entity_cell.js => entity_cell.tsx} (59%) rename x-pack/plugins/ml/public/application/components/entity_cell/{index.js => index.ts} (80%) rename x-pack/plugins/ml/public/application/components/influencers_list/{index.js => index.ts} (100%) rename x-pack/plugins/ml/public/application/components/influencers_list/{influencers_list.js => influencers_list.tsx} (71%) diff --git a/x-pack/plugins/ml/public/application/components/anomalies_table/anomalies_table_columns.js b/x-pack/plugins/ml/public/application/components/anomalies_table/anomalies_table_columns.js index 6b869d042ed7f..f1093fd0b16a1 100644 --- a/x-pack/plugins/ml/public/application/components/anomalies_table/anomalies_table_columns.js +++ b/x-pack/plugins/ml/public/application/components/anomalies_table/anomalies_table_columns.js @@ -249,7 +249,6 @@ export function getColumns( name: i18n.translate('xpack.ml.anomaliesTable.categoryExamplesColumnName', { defaultMessage: 'category examples', }), - sortable: false, truncateText: true, render: (item) => { const examples = get(examplesByJobId, [item.jobId, item.entityValue], []); @@ -268,7 +267,6 @@ export function getColumns( ); }, - textOnly: true, width: '13%', }); } diff --git a/x-pack/plugins/ml/public/application/components/anomalies_table/severity_cell/severity_cell.tsx b/x-pack/plugins/ml/public/application/components/anomalies_table/severity_cell/severity_cell.tsx index 7b7912f2a9fa5..b761599a447b7 100644 --- a/x-pack/plugins/ml/public/application/components/anomalies_table/severity_cell/severity_cell.tsx +++ b/x-pack/plugins/ml/public/application/components/anomalies_table/severity_cell/severity_cell.tsx @@ -8,7 +8,10 @@ import React, { FC, memo } from 'react'; import { EuiHealth, EuiFlexGroup, EuiFlexItem } from '@elastic/eui'; import { MULTI_BUCKET_IMPACT } from '../../../../../common/constants/multi_bucket_impact'; -import { getSeverityColor } from '../../../../../common/util/anomaly_utils'; +import { + getSeverityColor, + getFormattedSeverityScore, +} from '../../../../../common/util/anomaly_utils'; interface SeverityCellProps { /** @@ -27,7 +30,7 @@ interface SeverityCellProps { * Renders anomaly severity score with single or multi-bucket impact marker. */ export const SeverityCell: FC = memo(({ score, multiBucketImpact }) => { - const severity = score >= 1 ? Math.floor(score) : '< 1'; + const severity = getFormattedSeverityScore(score); const color = getSeverityColor(score); const isMultiBucket = multiBucketImpact >= MULTI_BUCKET_IMPACT.MEDIUM; return isMultiBucket ? ( diff --git a/x-pack/plugins/ml/public/application/components/entity_cell/entity_cell.test.js b/x-pack/plugins/ml/public/application/components/entity_cell/entity_cell.test.tsx similarity index 100% rename from x-pack/plugins/ml/public/application/components/entity_cell/entity_cell.test.js rename to x-pack/plugins/ml/public/application/components/entity_cell/entity_cell.test.tsx diff --git a/x-pack/plugins/ml/public/application/components/entity_cell/entity_cell.js b/x-pack/plugins/ml/public/application/components/entity_cell/entity_cell.tsx similarity index 59% rename from x-pack/plugins/ml/public/application/components/entity_cell/entity_cell.js rename to x-pack/plugins/ml/public/application/components/entity_cell/entity_cell.tsx index f6cfe486d65f8..650a9d3deb539 100644 --- a/x-pack/plugins/ml/public/application/components/entity_cell/entity_cell.js +++ b/x-pack/plugins/ml/public/application/components/entity_cell/entity_cell.tsx @@ -5,8 +5,7 @@ * 2.0. */ -import PropTypes from 'prop-types'; -import React from 'react'; +import React, { FC } from 'react'; import { EuiButtonIcon, EuiFlexGroup, EuiFlexItem, EuiText, EuiToolTip } from '@elastic/eui'; import { FormattedMessage } from '@kbn/i18n/react'; @@ -14,50 +13,67 @@ import { i18n } from '@kbn/i18n'; import { EMPTY_FIELD_VALUE_LABEL } from '../../timeseriesexplorer/components/entity_control/entity_control'; import { MLCATEGORY } from '../../../../common/constants/field_types'; -function getAddFilter({ entityName, entityValue, filter }) { - return ( - void; + +interface EntityCellProps { + entityName: string; + entityValue: string; + filter?: EntityCellFilter; + wrapText?: boolean; +} + +function getAddFilter({ entityName, entityValue, filter }: EntityCellProps) { + if (filter !== undefined) { + return ( + + } + > + filter(entityName, entityValue, '+')} + iconType="plusInCircle" + aria-label={i18n.translate('xpack.ml.anomaliesTable.entityCell.addFilterAriaLabel', { + defaultMessage: 'Add filter', + })} /> - } - > - filter(entityName, entityValue, '+')} - iconType="plusInCircle" - aria-label={i18n.translate('xpack.ml.anomaliesTable.entityCell.addFilterAriaLabel', { - defaultMessage: 'Add filter', - })} - /> - - ); + + ); + } } -function getRemoveFilter({ entityName, entityValue, filter }) { - return ( - + } + > + filter(entityName, entityValue, '-')} + iconType="minusInCircle" + aria-label={i18n.translate('xpack.ml.anomaliesTable.entityCell.removeFilterAriaLabel', { + defaultMessage: 'Remove filter', + })} /> - } - > - filter(entityName, entityValue, '-')} - iconType="minusInCircle" - aria-label={i18n.translate('xpack.ml.anomaliesTable.entityCell.removeFilterAriaLabel', { - defaultMessage: 'Remove filter', - })} - /> - - ); + + ); + } } /* @@ -65,12 +81,12 @@ function getRemoveFilter({ entityName, entityValue, filter }) { * of the entity, such as a partitioning or influencer field value, and optionally links for * adding or removing a filter on this entity. */ -export const EntityCell = function EntityCell({ +export const EntityCell: FC = ({ entityName, entityValue, filter, wrapText = false, -}) { +}) => { let valueText = entityValue === '' ? {EMPTY_FIELD_VALUE_LABEL} : entityValue; if (entityName === MLCATEGORY) { valueText = `${MLCATEGORY} ${valueText}`; @@ -117,10 +133,3 @@ export const EntityCell = function EntityCell({ ); } }; - -EntityCell.propTypes = { - entityName: PropTypes.string, - entityValue: PropTypes.any, - filter: PropTypes.func, - wrapText: PropTypes.bool, -}; diff --git a/x-pack/plugins/ml/public/application/components/entity_cell/index.js b/x-pack/plugins/ml/public/application/components/entity_cell/index.ts similarity index 80% rename from x-pack/plugins/ml/public/application/components/entity_cell/index.js rename to x-pack/plugins/ml/public/application/components/entity_cell/index.ts index f1fbb8ede4ee2..d29e2adf66bfe 100644 --- a/x-pack/plugins/ml/public/application/components/entity_cell/index.js +++ b/x-pack/plugins/ml/public/application/components/entity_cell/index.ts @@ -5,4 +5,4 @@ * 2.0. */ -export { EntityCell } from './entity_cell'; +export { EntityCell, EntityCellFilter } from './entity_cell'; diff --git a/x-pack/plugins/ml/public/application/components/influencers_list/index.js b/x-pack/plugins/ml/public/application/components/influencers_list/index.ts similarity index 100% rename from x-pack/plugins/ml/public/application/components/influencers_list/index.js rename to x-pack/plugins/ml/public/application/components/influencers_list/index.ts diff --git a/x-pack/plugins/ml/public/application/components/influencers_list/influencers_list.js b/x-pack/plugins/ml/public/application/components/influencers_list/influencers_list.tsx similarity index 71% rename from x-pack/plugins/ml/public/application/components/influencers_list/influencers_list.js rename to x-pack/plugins/ml/public/application/components/influencers_list/influencers_list.tsx index ee562428114ce..a4c0aab282d15 100644 --- a/x-pack/plugins/ml/public/application/components/influencers_list/influencers_list.js +++ b/x-pack/plugins/ml/public/application/components/influencers_list/influencers_list.tsx @@ -9,17 +9,39 @@ * React component for rendering a list of Machine Learning influencers. */ -import PropTypes from 'prop-types'; -import React from 'react'; +import React, { FC } from 'react'; import { EuiFlexGroup, EuiFlexItem, EuiSpacer, EuiTitle, EuiToolTip } from '@elastic/eui'; import { FormattedMessage } from '@kbn/i18n/react'; import { abbreviateWholeNumber } from '../../formatters/abbreviate_whole_number'; -import { getSeverity } from '../../../../common/util/anomaly_utils'; -import { EntityCell } from '../entity_cell'; +import { getSeverity, getFormattedSeverityScore } from '../../../../common/util/anomaly_utils'; +import { EntityCell, EntityCellFilter } from '../entity_cell'; -function getTooltipContent(maxScoreLabel, totalScoreLabel) { +interface InfluencerValueData { + influencerFieldValue: string; + maxAnomalyScore: number; + sumAnomalyScore: number; +} + +interface InfluencerProps { + influencerFieldName: string; + influencerFilter: EntityCellFilter; + valueData: InfluencerValueData; +} + +interface InfluencersByNameProps { + influencerFieldName: string; + influencerFilter: EntityCellFilter; + fieldValues: InfluencerValueData[]; +} + +interface InfluencersListProps { + influencers: { [id: string]: InfluencerValueData[] }; + influencerFilter: EntityCellFilter; +} + +function getTooltipContent(maxScoreLabel: string, totalScoreLabel: string) { return (

    @@ -40,13 +62,12 @@ function getTooltipContent(maxScoreLabel, totalScoreLabel) { ); } -function Influencer({ influencerFieldName, influencerFilter, valueData }) { - const maxScorePrecise = valueData.maxAnomalyScore; - const maxScore = parseInt(maxScorePrecise); - const maxScoreLabel = maxScore !== 0 ? maxScore : '< 1'; +const Influencer: FC = ({ influencerFieldName, influencerFilter, valueData }) => { + const maxScore = Math.floor(valueData.maxAnomalyScore); + const maxScoreLabel = getFormattedSeverityScore(valueData.maxAnomalyScore); const severity = getSeverity(maxScore); - const totalScore = parseInt(valueData.sumAnomalyScore); - const totalScoreLabel = totalScore !== 0 ? totalScore : '< 1'; + const totalScore = Math.floor(valueData.sumAnomalyScore); + const totalScoreLabel = getFormattedSeverityScore(valueData.sumAnomalyScore); // Ensure the bar has some width for 0 scores. const barScore = maxScore !== 0 ? maxScore : 1; @@ -59,17 +80,13 @@ function Influencer({ influencerFieldName, influencerFilter, valueData }) { return (

    - {influencerFieldName !== 'mlcategory' ? ( - - ) : ( -
    mlcategory {valueData.influencerFieldValue}
    - )} +
    -
    +
    @@ -96,14 +113,13 @@ function Influencer({ influencerFieldName, influencerFilter, valueData }) {
    ); -} -Influencer.propTypes = { - influencerFieldName: PropTypes.string.isRequired, - influencerFilter: PropTypes.func, - valueData: PropTypes.object.isRequired, }; -function InfluencersByName({ influencerFieldName, influencerFilter, fieldValues }) { +const InfluencersByName: FC = ({ + influencerFieldName, + influencerFilter, + fieldValues, +}) => { const influencerValues = fieldValues.map((valueData) => ( ); -} -InfluencersByName.propTypes = { - influencerFieldName: PropTypes.string.isRequired, - influencerFilter: PropTypes.func, - fieldValues: PropTypes.array.isRequired, }; -export function InfluencersList({ influencers, influencerFilter }) { +export const InfluencersList: FC = ({ influencers, influencerFilter }) => { if (influencers === undefined || Object.keys(influencers).length === 0) { return ( @@ -158,8 +169,4 @@ export function InfluencersList({ influencers, influencerFilter }) { )); return
    {influencersByName}
    ; -} -InfluencersList.propTypes = { - influencers: PropTypes.object, - influencerFilter: PropTypes.func, }; diff --git a/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_chart_distribution.js b/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_chart_distribution.js index d0cfe55e8d01e..4607ac65c87a6 100644 --- a/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_chart_distribution.js +++ b/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_chart_distribution.js @@ -20,7 +20,11 @@ import moment from 'moment'; import { formatHumanReadableDateTime } from '../../../../common/util/date_utils'; import { formatValue } from '../../formatters/format_value'; -import { getSeverityColor, getSeverityWithLow } from '../../../../common/util/anomaly_utils'; +import { + getFormattedSeverityScore, + getSeverityColor, + getSeverityWithLow, +} from '../../../../common/util/anomaly_utils'; import { getChartType, getTickValues, @@ -458,7 +462,7 @@ export class ExplorerChartDistribution extends React.Component { if (marker.anomalyScore !== undefined) { const score = parseInt(marker.anomalyScore); - const displayScore = score > 0 ? score : '< 1'; + const displayScore = getFormattedSeverityScore(score); tooltipData.push({ label: i18n.translate('xpack.ml.explorer.distributionChart.anomalyScoreLabel', { defaultMessage: 'anomaly score', diff --git a/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_chart_single_metric.js b/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_chart_single_metric.js index 109592c207940..d2d81e0349c68 100644 --- a/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_chart_single_metric.js +++ b/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_chart_single_metric.js @@ -21,6 +21,7 @@ import { i18n } from '@kbn/i18n'; import { formatHumanReadableDateTime } from '../../../../common/util/date_utils'; import { formatValue } from '../../formatters/format_value'; import { + getFormattedSeverityScore, getSeverityColor, getSeverityWithLow, getMultiBucketImpactLabel, @@ -380,12 +381,11 @@ export class ExplorerChartSingleMetric extends React.Component { if (marker.anomalyScore !== undefined) { const score = parseInt(marker.anomalyScore); - const displayScore = score > 0 ? score : '< 1'; tooltipData.push({ label: i18n.translate('xpack.ml.explorer.singleMetricChart.anomalyScoreLabel', { defaultMessage: 'anomaly score', }), - value: displayScore, + value: getFormattedSeverityScore(score), color: getSeverityColor(score), seriesIdentifier: { key: seriesKey, diff --git a/x-pack/plugins/ml/public/application/overview/components/anomaly_detection_panel/table.tsx b/x-pack/plugins/ml/public/application/overview/components/anomaly_detection_panel/table.tsx index b62df648d1931..7c6b109f059f2 100644 --- a/x-pack/plugins/ml/public/application/overview/components/anomaly_detection_panel/table.tsx +++ b/x-pack/plugins/ml/public/application/overview/components/anomaly_detection_panel/table.tsx @@ -30,7 +30,10 @@ import { StatsBar, JobStatsBarStats } from '../../../components/stats_bar'; // @ts-ignore import { JobSelectorBadge } from '../../../components/job_selector/job_selector_badge/index'; import { toLocaleString } from '../../../util/string_utils'; -import { getSeverityColor } from '../../../../../common/util/anomaly_utils'; +import { + getFormattedSeverityScore, + getSeverityColor, +} from '../../../../../common/util/anomaly_utils'; // Used to pass on attribute names to table columns export enum AnomalyDetectionListColumns { @@ -125,7 +128,7 @@ export const AnomalyDetectionTable: FC = ({ items, jobsList, statsBarData return ( // @ts-ignore - {score >= 1 ? Math.floor(score) : '< 1'} + {getFormattedSeverityScore(score)} ); } diff --git a/x-pack/plugins/ml/public/application/timeseriesexplorer/components/timeseries_chart/timeseries_chart.js b/x-pack/plugins/ml/public/application/timeseriesexplorer/components/timeseries_chart/timeseries_chart.js index 74c9a6117e566..fa172fa0c2190 100644 --- a/x-pack/plugins/ml/public/application/timeseriesexplorer/components/timeseries_chart/timeseries_chart.js +++ b/x-pack/plugins/ml/public/application/timeseriesexplorer/components/timeseries_chart/timeseries_chart.js @@ -19,6 +19,7 @@ import moment from 'moment'; import { i18n } from '@kbn/i18n'; import { + getFormattedSeverityScore, getSeverityWithLow, getMultiBucketImpactLabel, } from '../../../../../common/util/anomaly_utils'; @@ -1442,12 +1443,11 @@ class TimeseriesChartIntl extends Component { if (marker.anomalyScore !== undefined) { const score = parseInt(marker.anomalyScore); - const displayScore = score > 0 ? score : '< 1'; tooltipData.push({ label: i18n.translate('xpack.ml.timeSeriesExplorer.timeSeriesChart.anomalyScoreLabel', { defaultMessage: 'anomaly score', }), - value: displayScore, + value: getFormattedSeverityScore(score), color: anomalyColorScale(score), seriesIdentifier: { key: seriesKey, From 6ccb716c9c1550e328f4adbd3ef20d72b7e4b36c Mon Sep 17 00:00:00 2001 From: Yuliia Naumenko Date: Fri, 5 Feb 2021 08:59:41 -0800 Subject: [PATCH 42/69] [Alerting UI] Added EuiThemeProvider as an application wrapper for triggers_actions_ui (#90312) --- .../public/application/app.tsx | 34 ++++++++++++------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/x-pack/plugins/triggers_actions_ui/public/application/app.tsx b/x-pack/plugins/triggers_actions_ui/public/application/app.tsx index 85f3818484a13..0a59cff98ce26 100644 --- a/x-pack/plugins/triggers_actions_ui/public/application/app.tsx +++ b/x-pack/plugins/triggers_actions_ui/public/application/app.tsx @@ -10,6 +10,7 @@ import { Switch, Route, Redirect, Router } from 'react-router-dom'; import { ChromeBreadcrumb, CoreStart, ScopedHistory } from 'kibana/public'; import { render, unmountComponentAtNode } from 'react-dom'; import { I18nProvider } from '@kbn/i18n/react'; +import useObservable from 'react-use/lib/useObservable'; import { KibanaFeature } from '../../../features/common'; import { Section, routeToAlertDetails } from './constants'; import { ActionTypeRegistryContract, AlertTypeRegistryContract } from '../types'; @@ -18,6 +19,7 @@ import { DataPublicPluginStart } from '../../../../../src/plugins/data/public'; import { PluginStartContract as AlertingStart } from '../../../alerts/public'; import { suspendedComponentWithProps } from './lib/suspended_component_with_props'; import { Storage } from '../../../../../src/plugins/kibana_utils/public'; +import { EuiThemeProvider } from '../../../../../src/plugins/kibana_react/common'; import { setSavedObjectsClient } from '../common/lib/data_apis'; import { KibanaContextProvider } from '../common/lib/kibana'; @@ -41,25 +43,31 @@ export interface TriggersAndActionsUiServices extends CoreStart { } export const renderApp = (deps: TriggersAndActionsUiServices) => { - const { element, savedObjects } = deps; + const { element } = deps; + render(, element); + return () => { + unmountComponentAtNode(element); + }; +}; + +export const App = ({ deps }: { deps: TriggersAndActionsUiServices }) => { + const { savedObjects, uiSettings } = deps; const sections: Section[] = ['alerts', 'connectors']; + const isDarkMode = useObservable(uiSettings.get$('theme:darkMode')); const sectionsRegex = sections.join('|'); setSavedObjectsClient(savedObjects.client); - - render( + return ( - - - - - - , - element + + + + + + + + ); - return () => { - unmountComponentAtNode(element); - }; }; export const AppWithoutRouter = ({ sectionsRegex }: { sectionsRegex: string }) => { From 3166ff3761ba306fa254f2d8bf6049d46267433a Mon Sep 17 00:00:00 2001 From: Constance Date: Fri, 5 Feb 2021 09:01:01 -0800 Subject: [PATCH 43/69] [Enterprise Search] eslint rule update: react/jsx-boolean-value (#90345) * [Setup] Split rule that explicitly allows `any` in test/mock files into its own section - so that the rules we're about to add apply correctly to all files * Add react/jsx-boolean-value rule * Run --fix Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> --- .eslintrc.js | 10 +++++++++- .../components/credentials/credentials.tsx | 2 +- .../credentials/credentials_flyout/footer.tsx | 2 +- .../credentials/credentials_flyout/header.tsx | 2 +- .../credentials/credentials_flyout/index.tsx | 4 ++-- .../credentials_list/credentials_list.test.tsx | 2 +- .../documents/document_creation_button.tsx | 2 +- .../search_experience/customization_modal.tsx | 8 ++++---- .../search_experience/search_experience.tsx | 2 +- .../views/multi_checkbox_facets_view.tsx | 2 +- .../search_experience/views/result_view.test.tsx | 2 +- .../search_experience/views/result_view.tsx | 2 +- .../app_search/components/engine/engine_nav.tsx | 4 ++-- .../app_search/components/library/library.tsx | 2 +- .../app_search/components/result/result.test.tsx | 6 +++--- .../components/result/result_header.test.tsx | 8 ++++---- .../public/applications/app_search/index.test.tsx | 2 +- .../components/product_card/product_card.tsx | 2 +- .../applications/shared/hidden_text/hidden_text.tsx | 2 +- .../shared/indexing_status/indexing_status.tsx | 2 +- .../applications/shared/layout/layout.test.tsx | 2 +- .../react_router_helpers/eui_components.test.tsx | 2 +- .../shared/schema/schema_add_field_modal.tsx | 10 +++++----- .../shared/credential_item/credential_item.tsx | 12 +++--------- .../applications/workplace_search/index.test.tsx | 2 +- .../components/add_source/add_source_header.tsx | 2 +- .../components/add_source/add_source_list.tsx | 2 +- .../components/display_settings/display_settings.tsx | 2 +- .../display_settings/field_editor_modal.tsx | 8 ++++---- .../components/display_settings/result_detail.tsx | 4 ++-- .../components/display_settings/search_results.tsx | 12 ++++++------ .../content_sources/components/schema/schema.tsx | 4 ++-- .../components/schema/schema_fields_table.tsx | 2 +- .../views/content_sources/private_sources.tsx | 2 +- .../views/groups/components/add_group_modal.tsx | 2 +- .../groups/components/filterable_users_popover.tsx | 4 ++-- .../components/group_source_prioritization.tsx | 2 +- .../views/groups/components/groups_table.tsx | 2 +- .../components/table_filter_users_dropdown.tsx | 2 +- .../views/groups/components/table_filters.tsx | 2 +- .../workplace_search/views/groups/groups.tsx | 2 +- 41 files changed, 76 insertions(+), 74 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index dadebc922df9e..e85792c4f4ba6 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1114,10 +1114,18 @@ module.exports = { * Enterprise Search overrides */ { + // All files files: ['x-pack/plugins/enterprise_search/**/*.{ts,tsx}'], - excludedFiles: ['x-pack/plugins/enterprise_search/**/*.{test,mock}.{ts,tsx}'], rules: { 'react-hooks/exhaustive-deps': 'off', + 'react/jsx-boolean-value': ['error', 'never'], + }, + }, + { + // Source files only - allow `any` in test/mock files + files: ['x-pack/plugins/enterprise_search/**/*.{ts,tsx}'], + excludedFiles: ['x-pack/plugins/enterprise_search/**/*.{test,mock}.{ts,tsx}'], + rules: { '@typescript-eslint/no-explicit-any': 'error', }, }, diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials.tsx index e21a01d2b97ec..0266b64f97104 100644 --- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials.tsx @@ -106,7 +106,7 @@ export const Credentials: React.FC = () => { showCredentialsForm()} > {i18n.translate('xpack.enterpriseSearch.appSearch.credentials.createKey', { diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_flyout/footer.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_flyout/footer.tsx index 68fae9d942e9d..dc2d52a073b36 100644 --- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_flyout/footer.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_flyout/footer.tsx @@ -35,7 +35,7 @@ export const CredentialsFlyoutFooter: React.FC = () => { { const { activeApiToken } = useValues(CredentialsLogic); return ( - +

    {activeApiToken.id diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_flyout/index.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_flyout/index.tsx index 1e0c2d3eb822c..1335a3cdeea18 100644 --- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_flyout/index.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_flyout/index.tsx @@ -22,8 +22,8 @@ export const CredentialsFlyout: React.FC = () => { diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_list/credentials_list.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_list/credentials_list.test.tsx index 3c3f02106fe12..dd3d8ef8069ba 100644 --- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_list/credentials_list.test.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_list/credentials_list.test.tsx @@ -207,7 +207,7 @@ describe('Credentials', () => { isHidden: expect.any(Boolean), text: ( - ••••••• + ••••••• ), }); diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/document_creation_button.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/document_creation_button.tsx index b26a244397cba..a05005fefa082 100644 --- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/document_creation_button.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/document_creation_button.tsx @@ -19,7 +19,7 @@ export const DocumentCreationButton: React.FC = () => { return ( <> = ({ defaultMessage: 'Filter fields', } )} - fullWidth={true} + fullWidth helpText={i18n.translate( 'xpack.enterpriseSearch.appSearch.documents.search.customizationModal.filterFields', { @@ -93,7 +93,7 @@ export const CustomizationModal: React.FC = ({ > = ({ defaultMessage: 'Sort fields', } )} - fullWidth={true} + fullWidth helpText={i18n.translate( 'xpack.enterpriseSearch.appSearch.documents.search.customizationModal.sortFields', { @@ -117,7 +117,7 @@ export const CustomizationModal: React.FC = ({ > {
    = ({ options={checkboxGroupOptions} idToSelectedMap={idToSelectedMap} onChange={onChange} - compressed={true} + compressed /> {showMore && ( <> diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/search_experience/views/result_view.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/search_experience/views/result_view.test.tsx index 0eb0861ee3b02..e06603894c288 100644 --- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/search_experience/views/result_view.test.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/search_experience/views/result_view.test.tsx @@ -34,7 +34,7 @@ describe('ResultView', () => { it('renders', () => { const wrapper = shallow( - + ); expect(wrapper.find(Result).props()).toEqual({ result, diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/search_experience/views/result_view.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/search_experience/views/result_view.tsx index 441216f75a40c..9dd3fcea5f754 100644 --- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/search_experience/views/result_view.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/search_experience/views/result_view.tsx @@ -22,7 +22,7 @@ export const ResultView: React.FC = ({ result, schemaForTypeHighlights, i
  1. diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_nav.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_nav.tsx index a828747788f77..b1b31c245eb99 100644 --- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_nav.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_nav.tsx @@ -105,7 +105,7 @@ export const EngineNav: React.FC = () => { {canViewEngineAnalytics && ( {ANALYTICS_TITLE} @@ -114,7 +114,7 @@ export const EngineNav: React.FC = () => { {canViewEngineDocuments && ( {DOCUMENTS_TITLE} diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/library/library.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/library/library.tsx index 9d7b05e68baf4..2d39b5a9aa05c 100644 --- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/library/library.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/library/library.tsx @@ -198,7 +198,7 @@ export const Library: React.FC = () => {

    With a link

    - + diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/result/result.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/result/result.test.tsx index cbec65ec9f884..0c3749d1ccb3d 100644 --- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/result/result.test.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/result/result.test.tsx @@ -62,7 +62,7 @@ describe('Result', () => { }); it('passes showScore, resultMeta, and isMetaEngine to ResultHeader', () => { - const wrapper = shallow(); + const wrapper = shallow(); expect(wrapper.find(ResultHeader).props()).toEqual({ isMetaEngine: true, showScore: true, @@ -76,7 +76,7 @@ describe('Result', () => { describe('document detail link', () => { it('will render a link if shouldLinkToDetailPage is true', () => { - const wrapper = shallow(); + const wrapper = shallow(); wrapper.find(ReactRouterHelper).forEach((link) => { expect(link.prop('to')).toEqual('/engines/my-engine/documents/1'); }); @@ -96,7 +96,7 @@ describe('Result', () => { it('will render field details with type highlights if schemaForTypeHighlights has been provided', () => { const wrapper = shallow( - + ); expect(wrapper.find(ResultField).map((rf) => rf.prop('type'))).toEqual([ 'text', diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/result/result_header.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/result/result_header.test.tsx index 1e7be7027f7b3..9d90b3ae35a8f 100644 --- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/result/result_header.test.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/result/result_header.test.tsx @@ -34,7 +34,7 @@ describe('ResultHeader', () => { describe('score', () => { it('renders score if showScore is true ', () => { const wrapper = shallow( - + ); expect(wrapper.find('[data-test-subj="ResultScore"]').prop('value')).toEqual(100); }); @@ -51,12 +51,12 @@ describe('ResultHeader', () => { it('renders engine name if this is a meta engine', () => { const wrapper = shallow( ); expect(wrapper.find('[data-test-subj="ResultEngine"]').prop('value')).toBe('my-engine'); @@ -65,7 +65,7 @@ describe('ResultHeader', () => { it('does not render an engine if this is not a meta engine', () => { const wrapper = shallow( { const initializeAppData = jest.fn(); setMockActions({ initializeAppData }); - shallow(); + shallow(); expect(initializeAppData).toHaveBeenCalledWith({ ilmEnabled: true }); }); diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/product_card/product_card.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/product_card/product_card.tsx index d4e879ebc11ce..162ea7f427306 100644 --- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/product_card/product_card.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/product_card/product_card.tsx @@ -67,7 +67,7 @@ export const ProductCard: React.FC = ({ product, image }) => { sendEnterpriseSearchTelemetry({ action: 'clicked', diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/hidden_text/hidden_text.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/hidden_text/hidden_text.tsx index 1886afb468404..5503baf0bdae4 100644 --- a/x-pack/plugins/enterprise_search/public/applications/shared/hidden_text/hidden_text.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/shared/hidden_text/hidden_text.tsx @@ -27,7 +27,7 @@ export const HiddenText: React.FC = ({ text, children }) => { }); const hiddenText = isHidden ? ( - {text.replace(/./g, '•')} + {text.replace(/./g, '•')} ) : ( text diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/indexing_status/indexing_status.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/indexing_status/indexing_status.tsx index 6bcdc9623cb91..3898eda126415 100644 --- a/x-pack/plugins/enterprise_search/public/applications/shared/indexing_status/indexing_status.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/shared/indexing_status/indexing_status.tsx @@ -41,7 +41,7 @@ export const IndexingStatus: React.FC = ({ return ( <> {percentageComplete < 100 && ( - + )} diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/layout/layout.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/layout/layout.test.tsx index 3f6d4e781cda1..c67518e977de2 100644 --- a/x-pack/plugins/enterprise_search/public/applications/shared/layout/layout.test.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/shared/layout/layout.test.tsx @@ -57,7 +57,7 @@ describe('Layout', () => { }); it('renders a read-only mode callout', () => { - const wrapper = shallow(); + const wrapper = shallow(); expect(wrapper.find(EuiCallOut)).toHaveLength(1); }); diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/eui_components.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/eui_components.test.tsx index f9269e425f84a..4de43ce997b48 100644 --- a/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/eui_components.test.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/shared/react_router_helpers/eui_components.test.tsx @@ -53,7 +53,7 @@ describe('EUI & React Router Component Helpers', () => { }); it('passes down all ...rest props', () => { - const wrapper = shallow(); + const wrapper = shallow(); const link = wrapper.find(EuiLink); expect(link.prop('external')).toEqual(true); diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/schema/schema_add_field_modal.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/schema/schema_add_field_modal.tsx index 1ef665a52c782..bbde6c5d3b55d 100644 --- a/x-pack/plugins/enterprise_search/public/applications/shared/schema/schema_add_field_modal.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/shared/schema/schema_add_field_modal.tsx @@ -94,7 +94,7 @@ export const SchemaAddFieldModal: React.FC = ({ = ({ placeholder="name" type="text" onChange={handleChange} - required={true} + required value={rawFieldName} - fullWidth={true} - autoFocus={true} + fullWidth + autoFocus isLoading={loading} data-test-subj="SchemaAddFieldNameField" /> @@ -132,7 +132,7 @@ export const SchemaAddFieldModal: React.FC = ({ {FIELD_NAME_MODAL_CANCEL} = ({ {!isVisible ? ( - + ) : ( )} diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.test.tsx index 2b09babbb03fc..73ee7662888bb 100644 --- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.test.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.test.tsx @@ -63,7 +63,7 @@ describe('WorkplaceSearchConfigured', () => { }); it('initializes app data with passed props', () => { - shallow(); + shallow(); expect(initializeAppData).toHaveBeenCalledWith({ isFederatedAuth: true }); }); diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/add_source_header.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/add_source_header.tsx index 39c432eb27491..f12c24feb8e1a 100644 --- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/add_source_header.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/add_source_header.tsx @@ -36,7 +36,7 @@ export const AddSourceHeader: React.FC = ({ diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/add_source_list.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/add_source_list.tsx index 0dd3850b86de8..3a0db0f44047d 100644 --- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/add_source_list.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/add_source_list.tsx @@ -109,7 +109,7 @@ export const AddSourceList: React.FC = () => { data-test-subj="FilterSourcesInput" value={filterValue} onChange={handleFilterChange} - fullWidth={true} + fullWidth placeholder={ADD_SOURCE_PLACEHOLDER} /> diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/display_settings.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/display_settings.tsx index bc697a39984c0..62beb4e40793b 100644 --- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/display_settings.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/display_settings.tsx @@ -118,7 +118,7 @@ export const DisplaySettings: React.FC = ({ tabId }) => { description={DISPLAY_SETTINGS_DESCRIPTION} action={ hasDocuments ? ( - + {SAVE_BUTTON} ) : null diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/field_editor_modal.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/field_editor_modal.tsx index 6171bddbd1527..9a6af035c1c8d 100644 --- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/field_editor_modal.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/field_editor_modal.tsx @@ -73,9 +73,9 @@ export const FieldEditorModal: React.FC = () => { { setLabel(e.target.value)} @@ -95,7 +95,7 @@ export const FieldEditorModal: React.FC = () => { {CANCEL_BUTTON} - + {ACTION_LABEL} {FIELD_LABEL} diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/result_detail.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/result_detail.tsx index 3930768628aba..8382ddc9e82b3 100644 --- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/result_detail.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/result_detail.tsx @@ -79,7 +79,7 @@ export const ResultDetail: React.FC = () => { <> {detailFields.map(({ fieldName, label }, index) => ( @@ -87,7 +87,7 @@ export const ResultDetail: React.FC = () => { key={`${fieldName}-${index}`} index={index} draggableId={`${fieldName}-${index}`} - customDragHandle={true} + customDragHandle spacing="m" > {(provided) => ( diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/search_results.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/search_results.tsx index f7491ae8778c3..b2ba2b13e5ec3 100644 --- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/search_results.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/search_results.tsx @@ -76,10 +76,10 @@ export const SearchResults: React.FC = () => { > setTitleField(e.target.value)} @@ -88,9 +88,9 @@ export const SearchResults: React.FC = () => { setUrlField(e.target.value)} @@ -110,7 +110,7 @@ export const SearchResults: React.FC = () => { @@ -129,7 +129,7 @@ export const SearchResults: React.FC = () => { diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/schema/schema.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/schema/schema.tsx index 936dceba89e56..fe48e1c14ff41 100644 --- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/schema/schema.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/schema/schema.tsx @@ -122,7 +122,7 @@ export const Schema: React.FC = () => { {addFieldButton} {percentageComplete < 100 ? ( - + {SCHEMA_UPDATING} ) : ( @@ -130,7 +130,7 @@ export const Schema: React.FC = () => { disabled={formUnchanged} data-test-subj="UpdateTypesButton" onClick={updateFields} - fill={true} + fill > {SCHEMA_SAVE_BUTTON} diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/schema/schema_fields_table.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/schema/schema_fields_table.tsx index d93bafe6b972e..a683d9384f636 100644 --- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/schema/schema_fields_table.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/schema/schema_fields_table.tsx @@ -57,7 +57,7 @@ export const SchemaFieldsTable: React.FC = () => { disabled={fieldName === 'id'} key={fieldName} fieldName={fieldName} - hideName={true} + hideName fieldType={filteredSchemaFields[fieldName]} updateExistingFieldType={updateExistingFieldType} /> diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/private_sources.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/private_sources.tsx index 6dcc4379515a3..d68b451ffa6f5 100644 --- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/private_sources.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/private_sources.tsx @@ -109,7 +109,7 @@ export const PrivateSources: React.FC = () => { const privateSourcesTable = ( diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/add_group_modal.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/add_group_modal.tsx index b19003e431ee5..f49c978d06e90 100644 --- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/add_group_modal.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/add_group_modal.tsx @@ -73,7 +73,7 @@ export const AddGroupModal: React.FC<{}> = () => { {ADD_GROUP_SUBMIT} diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/filterable_users_popover.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/filterable_users_popover.tsx index 6cba9fcb509ea..b47232197c47f 100644 --- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/filterable_users_popover.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/filterable_users_popover.tsx @@ -41,7 +41,7 @@ export const FilterableUsersPopover: React.FC = ({ return ( = ({ addFilteredUser={addFilteredUser} allGroupUsersLoading={allGroupUsersLoading} removeFilteredUser={removeFilteredUser} - isPopover={true} + isPopover /> diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_source_prioritization.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_source_prioritization.tsx index 4fb9350d0b362..6907618e40b46 100644 --- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_source_prioritization.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_source_prioritization.tsx @@ -96,7 +96,7 @@ export const GroupSourcePrioritization: React.FC = () => { {HEADER_ACTION_TEXT} diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/groups_table.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/groups_table.tsx index ff596e41f5538..31f549c3e2065 100644 --- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/groups_table.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/groups_table.tsx @@ -91,7 +91,7 @@ export const GroupsTable: React.FC<{}> = () => { - {showPagination && } + {showPagination && } ); }; diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/table_filter_users_dropdown.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/table_filter_users_dropdown.tsx index 49dc3bfa671d9..9ddb955767c14 100644 --- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/table_filter_users_dropdown.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/table_filter_users_dropdown.tsx @@ -44,7 +44,7 @@ export const TableFilterUsersDropdown: React.FC<{}> = () => { { diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/groups.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/groups.tsx index 144aaabba407d..7a8b9343691f9 100644 --- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/groups.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/groups.tsx @@ -86,7 +86,7 @@ export const Groups: React.FC = () => { const headerAction = ( - + {i18n.translate('xpack.enterpriseSearch.workplaceSearch.groups.addGroupForm.action', { defaultMessage: 'Create a group', })} From db899a92740b7f4de7488eb1f5cef9f89442a28a Mon Sep 17 00:00:00 2001 From: Chandler Prall Date: Fri, 5 Feb 2021 10:14:58 -0700 Subject: [PATCH 44/69] Upgrade EUI to v31.4.0 (#89648) * Bump EUI to v31.4.0 * fix datagrid functional tests * fix Lens unit tests * fix table cell filter test * Fix discover grid doc view test * stabilize data table tests * fix dashboard embeddable datagrid test * Fix x-pack functional tests * fix ml accessibility tests * Fix discover grid context test * Adapt expected nr of documents being displayed * stabilize Lens a11y tests and skip data table * Fix 2 ml functional tests * enable lens datatable test; disable axe rule for datatable * fix ml test * fix Lens table test Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> Co-authored-by: Joe Reuter Co-authored-by: Matthias Wilhelm Co-authored-by: Michail Yasonik --- package.json | 2 +- .../services/a11y/analyze_with_axe.js | 4 + .../apps/dashboard/embeddable_data_grid.ts | 7 +- .../apps/discover/_data_grid_context.ts | 1 + .../apps/discover/_data_grid_doc_table.ts | 6 +- .../apps/discover/_data_grid_field_data.ts | 7 +- test/functional/apps/visualize/_data_table.ts | 18 +-- .../_data_table_notimeindex_filters.ts | 15 ++- .../apps/visualize/_embedding_chart.ts | 35 +++--- .../page_objects/visualize_chart_page.ts | 2 +- test/functional/services/data_grid.ts | 108 +++++++++--------- .../components/table_basic.test.tsx | 10 +- x-pack/test/accessibility/apps/lens.ts | 4 +- x-pack/test/accessibility/apps/ml.ts | 12 +- .../test/functional/apps/lens/smokescreen.ts | 17 +-- x-pack/test/functional/apps/lens/table.ts | 17 +-- .../apps/transform/creation_index_pattern.ts | 10 +- .../apps/transform/creation_saved_search.ts | 10 +- .../test/functional/page_objects/lens_page.ts | 10 +- .../ml/data_frame_analytics_results.ts | 11 +- .../functional/services/transform/wizard.ts | 43 ++++--- yarn.lock | 8 +- 22 files changed, 207 insertions(+), 150 deletions(-) diff --git a/package.json b/package.json index 27cbbf3fb1299..fc5cd02a03253 100644 --- a/package.json +++ b/package.json @@ -98,7 +98,7 @@ "@elastic/datemath": "link:packages/elastic-datemath", "@elastic/elasticsearch": "npm:@elastic/elasticsearch-canary@^8.0.0-canary", "@elastic/ems-client": "7.11.0", - "@elastic/eui": "31.3.0", + "@elastic/eui": "31.4.0", "@elastic/filesaver": "1.1.2", "@elastic/good": "^9.0.1-kibana3", "@elastic/node-crypto": "1.2.1", diff --git a/test/accessibility/services/a11y/analyze_with_axe.js b/test/accessibility/services/a11y/analyze_with_axe.js index 301d03ec17fb1..3d1e257235f55 100644 --- a/test/accessibility/services/a11y/analyze_with_axe.js +++ b/test/accessibility/services/a11y/analyze_with_axe.js @@ -30,6 +30,10 @@ export function analyzeWithAxe(context, options, callback) { id: 'aria-roles', selector: '[data-test-subj="comboBoxSearchInput"] *', }, + { + id: 'aria-required-parent', + selector: '[class=*"euiDataGridRowCell"][role="gridcell"] ', + }, ], }); return window.axe.run(context, options); diff --git a/test/functional/apps/dashboard/embeddable_data_grid.ts b/test/functional/apps/dashboard/embeddable_data_grid.ts index a81f855198843..54fa9f08c5763 100644 --- a/test/functional/apps/dashboard/embeddable_data_grid.ts +++ b/test/functional/apps/dashboard/embeddable_data_grid.ts @@ -36,10 +36,13 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('saved search filters', function () { it('are added when a cell filter is clicked', async function () { await dashboardAddPanel.addSavedSearch('Rendering-Test:-saved-search'); - await find.clickByCssSelector(`[role="gridcell"]:nth-child(2)`); + await find.clickByCssSelector(`[role="gridcell"]:nth-child(3)`); + // needs a short delay between becoming visible & being clickable + await PageObjects.common.sleep(250); await find.clickByCssSelector(`[data-test-subj="filterOutButton"]`); await PageObjects.header.waitUntilLoadingHasFinished(); - await find.clickByCssSelector(`[role="gridcell"]:nth-child(2)`); + await find.clickByCssSelector(`[role="gridcell"]:nth-child(3)`); + await PageObjects.common.sleep(250); await find.clickByCssSelector(`[data-test-subj="filterForButton"]`); const filterCount = await filterBar.getFilterCount(); expect(filterCount).to.equal(2); diff --git a/test/functional/apps/discover/_data_grid_context.ts b/test/functional/apps/discover/_data_grid_context.ts index 898efff558702..8f817dbea35c3 100644 --- a/test/functional/apps/discover/_data_grid_context.ts +++ b/test/functional/apps/discover/_data_grid_context.ts @@ -27,6 +27,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('discover data grid context tests', () => { before(async () => { + await esArchiver.load('discover'); await esArchiver.loadIfNeeded('logstash_functional'); await PageObjects.timePicker.setDefaultAbsoluteRangeViaUiSettings(); await kibanaServer.uiSettings.update(defaultSettings); diff --git a/test/functional/apps/discover/_data_grid_doc_table.ts b/test/functional/apps/discover/_data_grid_doc_table.ts index 1775b096fecd8..5eeafc4d78f67 100644 --- a/test/functional/apps/discover/_data_grid_doc_table.ts +++ b/test/functional/apps/discover/_data_grid_doc_table.ts @@ -22,8 +22,6 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { }; describe('discover data grid doc table', function describeIndexTests() { - const defaultRowsLimit = 25; - before(async function () { log.debug('load kibana index with default index pattern'); await esArchiver.load('discover'); @@ -38,10 +36,10 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { await kibanaServer.uiSettings.replace({}); }); - it('should show the first 50 rows by default', async function () { + it('should show the first 12 rows by default', async function () { // with the default range the number of hits is ~14000 const rows = await dataGrid.getDocTableRows(); - expect(rows.length).to.be(defaultRowsLimit); + expect(rows.length).to.be(12); }); it('should refresh the table content when changing time window', async function () { diff --git a/test/functional/apps/discover/_data_grid_field_data.ts b/test/functional/apps/discover/_data_grid_field_data.ts index 068ed82a7c603..e8fcb06d06193 100644 --- a/test/functional/apps/discover/_data_grid_field_data.ts +++ b/test/functional/apps/discover/_data_grid_field_data.ts @@ -67,9 +67,10 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { await dataGrid.clickDocSortAsc(); await PageObjects.discover.waitUntilSearchingHasFinished(); - await retry.try(async function tryingForTime() { - const rowData = await dataGrid.getFields(); - expect(rowData[0][0].startsWith(expectedTimeStamp)).to.be.ok(); + await retry.waitFor('first cell contains expected timestamp', async () => { + const cell = await dataGrid.getCellElement(1, 2); + const text = await cell.getVisibleText(); + return text === expectedTimeStamp; }); }); diff --git a/test/functional/apps/visualize/_data_table.ts b/test/functional/apps/visualize/_data_table.ts index c98126dd01843..0b9cedd0ca94c 100644 --- a/test/functional/apps/visualize/_data_table.ts +++ b/test/functional/apps/visualize/_data_table.ts @@ -267,14 +267,16 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { }); it('should apply correct filter', async () => { - await PageObjects.visChart.filterOnTableCell(1, 3); - await PageObjects.visChart.waitForVisualizationRenderingStabilized(); - const data = await PageObjects.visChart.getTableVisContent(); - expect(data).to.be.eql([ - ['png', '1,373'], - ['gif', '918'], - ['Other', '445'], - ]); + await retry.try(async () => { + await PageObjects.visChart.filterOnTableCell(1, 3); + await PageObjects.visChart.waitForVisualizationRenderingStabilized(); + const data = await PageObjects.visChart.getTableVisContent(); + expect(data).to.be.eql([ + ['png', '1,373'], + ['gif', '918'], + ['Other', '445'], + ]); + }); }); }); diff --git a/test/functional/apps/visualize/_data_table_notimeindex_filters.ts b/test/functional/apps/visualize/_data_table_notimeindex_filters.ts index df3af20fca613..df219edc1d2d5 100644 --- a/test/functional/apps/visualize/_data_table_notimeindex_filters.ts +++ b/test/functional/apps/visualize/_data_table_notimeindex_filters.ts @@ -14,6 +14,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { const log = getService('log'); const filterBar = getService('filterBar'); const renderable = getService('renderable'); + const retry = getService('retry'); const dashboardAddPanel = getService('dashboardAddPanel'); const PageObjects = getPageObjects([ 'common', @@ -66,13 +67,15 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { await PageObjects.dashboard.clickNewDashboard(); await dashboardAddPanel.addVisualization(vizName1); - // hover and click on cell to filter - await PageObjects.visChart.filterOnTableCell(1, 2); + await retry.try(async () => { + // hover and click on cell to filter + await PageObjects.visChart.filterOnTableCell(1, 2); - await PageObjects.header.waitUntilLoadingHasFinished(); - await renderable.waitForRender(); - const filterCount = await filterBar.getFilterCount(); - expect(filterCount).to.be(1); + await PageObjects.header.waitUntilLoadingHasFinished(); + await renderable.waitForRender(); + const filterCount = await filterBar.getFilterCount(); + expect(filterCount).to.be(1); + }); await filterBar.removeAllFilters(); }); diff --git a/test/functional/apps/visualize/_embedding_chart.ts b/test/functional/apps/visualize/_embedding_chart.ts index 6bf42d5948d4e..a6f0b21f96b35 100644 --- a/test/functional/apps/visualize/_embedding_chart.ts +++ b/test/functional/apps/visualize/_embedding_chart.ts @@ -14,6 +14,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { const filterBar = getService('filterBar'); const renderable = getService('renderable'); const embedding = getService('embedding'); + const retry = getService('retry'); const PageObjects = getPageObjects([ 'visualize', 'visEditor', @@ -80,23 +81,25 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { }); it('should allow to change timerange from the visualization in embedded mode', async () => { - await PageObjects.visChart.filterOnTableCell(1, 7); - await PageObjects.header.waitUntilLoadingHasFinished(); - await renderable.waitForRender(); + await retry.try(async () => { + await PageObjects.visChart.filterOnTableCell(1, 7); + await PageObjects.header.waitUntilLoadingHasFinished(); + await renderable.waitForRender(); - const data = await PageObjects.visChart.getTableVisContent(); - expect(data).to.be.eql([ - ['03:00', '0B', '1'], - ['03:00', '1.953KB', '1'], - ['03:00', '3.906KB', '1'], - ['03:00', '5.859KB', '2'], - ['03:10', '0B', '1'], - ['03:10', '5.859KB', '1'], - ['03:10', '7.813KB', '1'], - ['03:15', '0B', '1'], - ['03:15', '1.953KB', '1'], - ['03:20', '1.953KB', '1'], - ]); + const data = await PageObjects.visChart.getTableVisContent(); + expect(data).to.be.eql([ + ['03:00', '0B', '1'], + ['03:00', '1.953KB', '1'], + ['03:00', '3.906KB', '1'], + ['03:00', '5.859KB', '2'], + ['03:10', '0B', '1'], + ['03:10', '5.859KB', '1'], + ['03:10', '7.813KB', '1'], + ['03:15', '0B', '1'], + ['03:15', '1.953KB', '1'], + ['03:20', '1.953KB', '1'], + ]); + }); }); }); }); diff --git a/test/functional/page_objects/visualize_chart_page.ts b/test/functional/page_objects/visualize_chart_page.ts index 87ec9ac27902f..abd5975b95d0a 100644 --- a/test/functional/page_objects/visualize_chart_page.ts +++ b/test/functional/page_objects/visualize_chart_page.ts @@ -418,7 +418,7 @@ export function VisualizeChartPageProvider({ getService, getPageObjects }: FtrPr public async filterOnTableCell(columnIndex: number, rowIndex: number) { await retry.try(async () => { const cell = await dataGrid.getCellElement(rowIndex, columnIndex); - await cell.moveMouseTo(); + await cell.focus(); const filterBtn = await testSubjects.findDescendant( 'tbvChartCell__filterForCellValue', cell diff --git a/test/functional/services/data_grid.ts b/test/functional/services/data_grid.ts index 60f75b692ff0e..c0a7e0f82e692 100644 --- a/test/functional/services/data_grid.ts +++ b/test/functional/services/data_grid.ts @@ -6,6 +6,7 @@ * Side Public License, v 1. */ +import { chunk } from 'lodash'; import { FtrProviderContext } from '../ftr_provider_context'; import { WebElementWrapper } from './lib/web_element_wrapper'; @@ -31,14 +32,11 @@ export function DataGridProvider({ getService, getPageObjects }: FtrProviderCont const columns = $('.euiDataGridHeaderCell__content') .toArray() .map((cell) => $(cell).text()); - const rows = $.findTestSubjects('dataGridRow') + const cells = $.findTestSubjects('dataGridRowCell') .toArray() - .map((row) => - $(row) - .find('.euiDataGridRowCell__truncate') - .toArray() - .map((cell) => $(cell).text()) - ); + .map((cell) => $(cell).text()); + + const rows = chunk(cells, columns.length); return { columns, @@ -56,20 +54,18 @@ export function DataGridProvider({ getService, getPageObjects }: FtrProviderCont cellDataTestSubj: string ): Promise { const $ = await element.parseDomContent(); - return $('[data-test-subj="dataGridRow"]') + const columnNumber = $('.euiDataGridHeaderCell__content').length; + const cells = $.findTestSubjects('dataGridRowCell') .toArray() - .map((row) => - $(row) - .findTestSubjects('dataGridRowCell') - .toArray() - .map((cell) => - $(cell) - .findTestSubject(cellDataTestSubj) - .text() - .replace(/ /g, '') - .trim() - ) + .map((cell) => + $(cell) + .findTestSubject(cellDataTestSubj) + .text() + .replace(/ /g, '') + .trim() ); + + return chunk(cells, columnNumber); } /** @@ -90,62 +86,72 @@ export function DataGridProvider({ getService, getPageObjects }: FtrProviderCont * @param columnIndex column index starting from 1 (1 means 1st column) */ public async getCellElement(rowIndex: number, columnIndex: number) { + const table = await find.byCssSelector('.euiDataGrid'); + const $ = await table.parseDomContent(); + const columnNumber = $('.euiDataGridHeaderCell__content').length; return await find.byCssSelector( - `[data-test-subj="dataGridWrapper"] [data-test-subj="dataGridRow"]:nth-of-type(${ - rowIndex + 1 - }) - [data-test-subj="dataGridRowCell"]:nth-of-type(${columnIndex})` + `[data-test-subj="dataGridWrapper"] [data-test-subj="dataGridRowCell"]:nth-of-type(${ + columnNumber * (rowIndex - 1) + columnIndex + 1 + })` ); } public async getFields() { - const rows = await find.allByCssSelector('.euiDataGridRow'); - - const result = []; - for (const row of rows) { - const cells = await row.findAllByClassName('euiDataGridRowCell__truncate'); - const cellsText = []; - let cellIdx = 0; - for (const cell of cells) { - if (cellIdx > 0) { - cellsText.push(await cell.getVisibleText()); - } - cellIdx++; + const cells = await find.allByCssSelector('.euiDataGridRowCell'); + + const rows: string[][] = []; + let rowIdx = -1; + for (const cell of cells) { + if (await cell.elementHasClass('euiDataGridRowCell--firstColumn')) { + // first column contains expand icon + rowIdx++; + rows[rowIdx] = []; + } + if (!(await cell.elementHasClass('euiDataGridRowCell--controlColumn'))) { + rows[rowIdx].push(await cell.getVisibleText()); } - result.push(cellsText); } - return result; + return rows; } public async getTable(selector: string = 'docTable') { return await testSubjects.find(selector); } - public async getBodyRows(): Promise { - const table = await this.getTable(); - return await table.findAllByTestSubject('dataGridRow'); + public async getBodyRows(): Promise { + return this.getDocTableRows(); } + /** + * Returns an array of rows (which are array of cells) + */ public async getDocTableRows() { const table = await this.getTable(); - return await table.findAllByTestSubject('dataGridRow'); - } - - public async getAnchorRow(): Promise { - const table = await this.getTable(); - return await table.findByTestSubject('~docTableAnchorRow'); + const cells = await table.findAllByCssSelector('.euiDataGridRowCell'); + + const rows: WebElementWrapper[][] = []; + let rowIdx = -1; + for (const cell of cells) { + if (await cell.elementHasClass('euiDataGridRowCell--firstColumn')) { + rowIdx++; + rows[rowIdx] = []; + } + rows[rowIdx].push(cell); + } + return rows; } - public async getRow(options: SelectOptions): Promise { - return options.isAnchorRow - ? await this.getAnchorRow() - : (await this.getBodyRows())[options.rowIndex]; + /** + * Returns an array of cells for that row + */ + public async getRow(options: SelectOptions): Promise { + return (await this.getBodyRows())[options.rowIndex]; } public async clickRowToggle( options: SelectOptions = { isAnchorRow: false, rowIndex: 0 } ): Promise { const row = await this.getRow(options); - const toggle = await row.findByTestSubject('~docTableExpandToggleColumn'); + const toggle = await row[0]; await toggle.click(); } diff --git a/x-pack/plugins/lens/public/datatable_visualization/components/table_basic.test.tsx b/x-pack/plugins/lens/public/datatable_visualization/components/table_basic.test.tsx index 50d040bc5c397..588340fbe97fa 100644 --- a/x-pack/plugins/lens/public/datatable_visualization/components/table_basic.test.tsx +++ b/x-pack/plugins/lens/public/datatable_visualization/components/table_basic.test.tsx @@ -161,6 +161,8 @@ describe('DatatableComponent', () => { /> ); + wrapper.find('[data-test-subj="dataGridRowCell"]').first().simulate('focus'); + wrapper.find('[data-test-subj="lensDatatableFilterOut"]').first().simulate('click'); expect(onDispatchEvent).toHaveBeenCalledWith({ @@ -200,7 +202,9 @@ describe('DatatableComponent', () => { /> ); - wrapper.find('[data-test-subj="lensDatatableFilterFor"]').at(3).simulate('click'); + wrapper.find('[data-test-subj="dataGridRowCell"]').at(1).simulate('focus'); + + wrapper.find('[data-test-subj="lensDatatableFilterFor"]').first().simulate('click'); expect(onDispatchEvent).toHaveBeenCalledWith({ name: 'filter', @@ -278,7 +282,9 @@ describe('DatatableComponent', () => { /> ); - wrapper.find('[data-test-subj="lensDatatableFilterFor"]').at(1).simulate('click'); + wrapper.find('[data-test-subj="dataGridRowCell"]').at(0).simulate('focus'); + + wrapper.find('[data-test-subj="lensDatatableFilterFor"]').first().simulate('click'); expect(onDispatchEvent).toHaveBeenCalledWith({ name: 'filter', diff --git a/x-pack/test/accessibility/apps/lens.ts b/x-pack/test/accessibility/apps/lens.ts index 229bc76a229ee..2f5ebe3c1a2dc 100644 --- a/x-pack/test/accessibility/apps/lens.ts +++ b/x-pack/test/accessibility/apps/lens.ts @@ -44,8 +44,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { await PageObjects.lens.configureDimension({ dimension: 'lnsXY_xDimensionPanel > lns-empty-dimension', - operation: 'date_histogram', - field: 'timestamp', + operation: 'terms', + field: 'DestCityName', }); await PageObjects.lens.configureDimension({ diff --git a/x-pack/test/accessibility/apps/ml.ts b/x-pack/test/accessibility/apps/ml.ts index baa5e9df61768..0dbc7cbb041d7 100644 --- a/x-pack/test/accessibility/apps/ml.ts +++ b/x-pack/test/accessibility/apps/ml.ts @@ -235,7 +235,9 @@ export default function ({ getService }: FtrProviderContext) { await ml.dataFrameAnalyticsResults.assertOutlierTablePanelExists(); await ml.dataFrameAnalyticsResults.assertResultsTableExists(); await ml.dataFrameAnalyticsResults.assertResultsTableNotEmpty(); - await a11y.testAppSnapshot(); + // EuiDataGrid does not have row roles + // https://github.com/elastic/eui/issues/4471 + // await a11y.testAppSnapshot(); }); it('data frame analytics create job select index pattern modal', async () => { @@ -251,7 +253,9 @@ export default function ({ getService }: FtrProviderContext) { ); await ml.jobSourceSelection.selectSourceForAnalyticsJob(ihpIndexPattern); await ml.dataFrameAnalyticsCreation.assertConfigurationStepActive(); - await a11y.testAppSnapshot(); + // EuiDataGrid does not have row roles + // https://github.com/elastic/eui/issues/4471 + // await a11y.testAppSnapshot(); }); it('data frame analytics create job configuration step for outlier job', async () => { @@ -264,7 +268,9 @@ export default function ({ getService }: FtrProviderContext) { await ml.dataFrameAnalyticsCreation.enableSourceDataPreviewHistogramCharts(); await ml.testExecution.logTestStep('displays the include fields selection'); await ml.dataFrameAnalyticsCreation.assertIncludeFieldsSelectionExists(); - await a11y.testAppSnapshot(); + // EuiDataGrid does not have row roles + // https://github.com/elastic/eui/issues/4471 + // await a11y.testAppSnapshot(); }); it('data frame analytics create job additional options step for outlier job', async () => { diff --git a/x-pack/test/functional/apps/lens/smokescreen.ts b/x-pack/test/functional/apps/lens/smokescreen.ts index 73c5838259f6e..a86a67d7c8d0d 100644 --- a/x-pack/test/functional/apps/lens/smokescreen.ts +++ b/x-pack/test/functional/apps/lens/smokescreen.ts @@ -11,6 +11,7 @@ import { FtrProviderContext } from '../../ftr_provider_context'; export default function ({ getService, getPageObjects }: FtrProviderContext) { const PageObjects = getPageObjects(['visualize', 'lens', 'common', 'header']); const find = getService('find'); + const retry = getService('retry'); const listingTable = getService('listingTable'); const testSubjects = getService('testSubjects'); const elasticChart = getService('elasticChart'); @@ -589,13 +590,15 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { it('should able to use filters cell actions in table', async () => { const firstCellContent = await PageObjects.lens.getDatatableCellText(0, 0); - await PageObjects.lens.clickTableCellAction(0, 0, 'lensDatatableFilterOut'); - await PageObjects.header.waitUntilLoadingHasFinished(); - expect( - await find.existsByCssSelector( - `[data-test-subj*="filter-value-${firstCellContent}"][data-test-subj*="filter-negated"]` - ) - ).to.eql(true); + await retry.try(async () => { + await PageObjects.lens.clickTableCellAction(0, 0, 'lensDatatableFilterOut'); + await PageObjects.header.waitUntilLoadingHasFinished(); + expect( + await find.existsByCssSelector( + `[data-test-subj*="filter-value-${firstCellContent}"][data-test-subj*="filter-negated"]` + ) + ).to.eql(true); + }); }); }); } diff --git a/x-pack/test/functional/apps/lens/table.ts b/x-pack/test/functional/apps/lens/table.ts index f79d1c342b72f..3f9cdf06da8ab 100644 --- a/x-pack/test/functional/apps/lens/table.ts +++ b/x-pack/test/functional/apps/lens/table.ts @@ -12,6 +12,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { const PageObjects = getPageObjects(['visualize', 'lens', 'common', 'header']); const listingTable = getService('listingTable'); const find = getService('find'); + const retry = getService('retry'); describe('lens datatable', () => { it('should able to sort a table by a column', async () => { @@ -40,13 +41,15 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { it('should able to use filters cell actions in table', async () => { const firstCellContent = await PageObjects.lens.getDatatableCellText(0, 0); - await PageObjects.lens.clickTableCellAction(0, 0, 'lensDatatableFilterOut'); - await PageObjects.header.waitUntilLoadingHasFinished(); - expect( - await find.existsByCssSelector( - `[data-test-subj*="filter-value-${firstCellContent}"][data-test-subj*="filter-negated"]` - ) - ).to.eql(true); + await retry.try(async () => { + await PageObjects.lens.clickTableCellAction(0, 0, 'lensDatatableFilterOut'); + await PageObjects.header.waitUntilLoadingHasFinished(); + expect( + await find.existsByCssSelector( + `[data-test-subj*="filter-value-${firstCellContent}"][data-test-subj*="filter-negated"]` + ) + ).to.eql(true); + }); }); it('should allow to configure column visibility', async () => { diff --git a/x-pack/test/functional/apps/transform/creation_index_pattern.ts b/x-pack/test/functional/apps/transform/creation_index_pattern.ts index 9c8b22803ccbe..c28b3cfec85ac 100644 --- a/x-pack/test/functional/apps/transform/creation_index_pattern.ts +++ b/x-pack/test/functional/apps/transform/creation_index_pattern.ts @@ -453,10 +453,12 @@ export default function ({ getService }: FtrProviderContext) { await transform.testExecution.logTestStep('shows the transform preview'); await transform.wizard.assertPivotPreviewChartHistogramButtonMissing(); - await transform.wizard.assertPivotPreviewColumnValues( - testData.expected.transformPreview.column, - testData.expected.transformPreview.values - ); + // cell virtualization means the last column is cutoff in the functional tests + // https://github.com/elastic/eui/issues/4470 + // await transform.wizard.assertPivotPreviewColumnValues( + // testData.expected.transformPreview.column, + // testData.expected.transformPreview.values + // ); await transform.testExecution.logTestStep('loads the details step'); await transform.wizard.advanceToDetailsStep(); diff --git a/x-pack/test/functional/apps/transform/creation_saved_search.ts b/x-pack/test/functional/apps/transform/creation_saved_search.ts index 620dd6e0823ac..673f5b3217fb5 100644 --- a/x-pack/test/functional/apps/transform/creation_saved_search.ts +++ b/x-pack/test/functional/apps/transform/creation_saved_search.ts @@ -292,10 +292,12 @@ export default function ({ getService }: FtrProviderContext) { await transform.testExecution.logTestStep( 'displays the transform preview in the expanded row' ); - await transform.table.assertTransformsExpandedRowPreviewColumnValues( - testData.expected.transformPreview.column, - testData.expected.transformPreview.values - ); + // cell virtualization means the last column is cutoff in the functional tests + // https://github.com/elastic/eui/issues/4470 + // await transform.table.assertTransformsExpandedRowPreviewColumnValues( + // testData.expected.transformPreview.column, + // testData.expected.transformPreview.values + // ); }); }); } diff --git a/x-pack/test/functional/page_objects/lens_page.ts b/x-pack/test/functional/page_objects/lens_page.ts index f6960600a6d7c..fc6842aae0345 100644 --- a/x-pack/test/functional/page_objects/lens_page.ts +++ b/x-pack/test/functional/page_objects/lens_page.ts @@ -350,6 +350,7 @@ export function LensPageProvider({ getService, getPageObjects }: FtrProviderCont async switchToVisualization(subVisualizationId: string) { await this.openChartSwitchPopover(); await testSubjects.click(`lnsChartSwitchPopover_${subVisualizationId}`); + await PageObjects.header.waitUntilLoadingHasFinished(); }, async openChartSwitchPopover() { @@ -531,10 +532,13 @@ export function LensPageProvider({ getService, getPageObjects }: FtrProviderCont }, async getDatatableCell(rowIndex = 0, colIndex = 0) { + const table = await find.byCssSelector('.euiDataGrid'); + const $ = await table.parseDomContent(); + const columnNumber = $('.euiDataGridHeaderCell__content').length; return await find.byCssSelector( - `[data-test-subj="lnsDataTable"] [data-test-subj="dataGridRow"]:nth-child(${ - rowIndex + 2 // this is a bit specific for EuiDataGrid: the first row is the Header - }) [data-test-subj="dataGridRowCell"]:nth-child(${colIndex + 1})` + `[data-test-subj="lnsDataTable"] [data-test-subj="dataGridRowCell"]:nth-child(${ + rowIndex * columnNumber + colIndex + 2 + })` ); }, diff --git a/x-pack/test/functional/services/ml/data_frame_analytics_results.ts b/x-pack/test/functional/services/ml/data_frame_analytics_results.ts index f1d9b08cc2438..b6aba13054f75 100644 --- a/x-pack/test/functional/services/ml/data_frame_analytics_results.ts +++ b/x-pack/test/functional/services/ml/data_frame_analytics_results.ts @@ -53,7 +53,9 @@ export function MachineLearningDataFrameAnalyticsResultsProvider({ }, async getResultTableRows() { - return await testSubjects.findAll('mlExplorationDataGrid loaded > dataGridRow'); + return (await testSubjects.find('mlExplorationDataGrid loaded')).findAllByTestSubject( + 'dataGridRowCell' + ); }, async assertResultsTableNotEmpty() { @@ -88,6 +90,7 @@ export function MachineLearningDataFrameAnalyticsResultsProvider({ this.assertResultsTableNotEmpty(); const featureImportanceCell = await this.getFirstFeatureImportanceCell(); + await featureImportanceCell.focus(); const interactionButton = await featureImportanceCell.findByTagName('button'); // simulate hover and wait for button to appear @@ -101,11 +104,9 @@ export function MachineLearningDataFrameAnalyticsResultsProvider({ async getFirstFeatureImportanceCell(): Promise { // get first row of the data grid - const firstDataGridRow = await testSubjects.find( - 'mlExplorationDataGrid loaded > dataGridRow' - ); + const dataGrid = await testSubjects.find('mlExplorationDataGrid loaded'); // find the feature importance cell in that row - const featureImportanceCell = await firstDataGridRow.findByCssSelector( + const featureImportanceCell = await dataGrid.findByCssSelector( '[data-test-subj="dataGridRowCell"][class*="featureImportance"]' ); return featureImportanceCell; diff --git a/x-pack/test/functional/services/transform/wizard.ts b/x-pack/test/functional/services/transform/wizard.ts index 7223d210cfb15..518accdeaf47e 100644 --- a/x-pack/test/functional/services/transform/wizard.ts +++ b/x-pack/test/functional/services/transform/wizard.ts @@ -5,6 +5,7 @@ * 2.0. */ +import { chunk } from 'lodash'; import expect from '@kbn/expect'; import { FtrProviderContext } from '../../ftr_provider_context'; @@ -88,18 +89,24 @@ export function TransformWizardProvider({ getService }: FtrProviderContext) { async parseEuiDataGrid(tableSubj: string) { const table = await testSubjects.find(`~${tableSubj}`); const $ = await table.parseDomContent(); - const rows = []; - - // For each row, get the content of each cell and - // add its values as an array to each row. - for (const tr of $.findTestSubjects(`~dataGridRow`).toArray()) { - rows.push( - $(tr) - .find('.euiDataGridRowCell__truncate') - .toArray() - .map((cell) => $(cell).text().trim()) + + // find columns to help determine number of rows + const columns = $('.euiDataGridHeaderCell__content') + .toArray() + .map((cell) => $(cell).text()); + + // Get the content of each cell and divide them up into rows + const cells = $.findTestSubjects('dataGridRowCell') + .find('.euiDataGridRowCell__truncate') + .toArray() + .map((cell) => + $(cell) + .text() + .trim() + .replace(/Row: \d+, Column: \d+:$/g, '') ); - } + + const rows = chunk(cells, columns.length); return rows; }, @@ -139,12 +146,14 @@ export function TransformWizardProvider({ getService }: FtrProviderContext) { `EuiDataGrid rows should be '${expectedNumberOfRows}' (got '${rowsData.length}')` ); - rowsData.map((r, i) => - expect(r).to.length( - columns, - `EuiDataGrid row #${i + 1} column count should be '${columns}' (got '${r.length}')` - ) - ); + // cell virtualization means the last column is cutoff in the functional tests + // https://github.com/elastic/eui/issues/4470 + // rowsData.map((r, i) => + // expect(r).to.length( + // columns, + // `EuiDataGrid row #${i + 1} column count should be '${columns}' (got '${r.length}')` + // ) + // ); }); }, diff --git a/yarn.lock b/yarn.lock index 9be907922c2a6..24fe6463fa41c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2204,10 +2204,10 @@ resolved "https://registry.yarnpkg.com/@elastic/eslint-plugin-eui/-/eslint-plugin-eui-0.0.2.tgz#56b9ef03984a05cc213772ae3713ea8ef47b0314" integrity sha512-IoxURM5zraoQ7C8f+mJb9HYSENiZGgRVcG4tLQxE61yHNNRDXtGDWTZh8N1KIHcsqN1CEPETjuzBXkJYF/fDiQ== -"@elastic/eui@31.3.0": - version "31.3.0" - resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-31.3.0.tgz#f39eecc09d588e4b22150faceb67e5e169afbbd8" - integrity sha512-1Sjhf5HVakx7VGWQkKP8wzGUf7HzyoNnAxjg5P3NH8k+ctJFagS1Wlz9zogwClEuj3FMTMC4tzbJyo06OgHECw== +"@elastic/eui@31.4.0": + version "31.4.0" + resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-31.4.0.tgz#d2c8cc91fc538f7b1c5e5229663e186fa0c9207c" + integrity sha512-ADdUeNxj2uiN13U7AkF0ishLAN0xcqFWHC+xjEmx8Wedyaj5DFrmmJEuH9aXv+XSQG5l8ppMgZQb3pMDjR2mKw== dependencies: "@types/chroma-js" "^2.0.0" "@types/lodash" "^4.14.160" From 5d9b84ff7539b188e17b534d0c363b91f753cf16 Mon Sep 17 00:00:00 2001 From: Lisa Cawley Date: Fri, 5 Feb 2021 09:16:28 -0800 Subject: [PATCH 45/69] [DOCS] Clean up text (#90359) --- docs/developer/architecture/index.asciidoc | 4 ++-- .../running-kibana-advanced.asciidoc | 18 ------------------ 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/docs/developer/architecture/index.asciidoc b/docs/developer/architecture/index.asciidoc index 7fa7d80ef9729..4bdd693979b49 100644 --- a/docs/developer/architecture/index.asciidoc +++ b/docs/developer/architecture/index.asciidoc @@ -13,8 +13,8 @@ To begin plugin development, we recommend reading our overview of how plugins wo * <> Our developer services are changing all the time. One of the best ways to discover and learn about them is to read the available -READMEs from all the plugins inside our {kib-repo}tree/{branch}/src/plugins[open source plugins folder] and our -{kib-repo}/tree/{branch}/x-pack/plugins[commercial plugins folder]. +READMEs inside our plugins folders: {kib-repo}tree/{branch}/src/plugins[src/plugins] and +{kib-repo}/tree/{branch}/x-pack/plugins[x-pack/plugins]. A few services also automatically generate api documentation which can be browsed inside the {kib-repo}tree/{branch}/docs/development[docs/development section of our repo] diff --git a/docs/developer/getting-started/running-kibana-advanced.asciidoc b/docs/developer/getting-started/running-kibana-advanced.asciidoc index 277e52a3dc8e9..68a4951ea1c21 100644 --- a/docs/developer/getting-started/running-kibana-advanced.asciidoc +++ b/docs/developer/getting-started/running-kibana-advanced.asciidoc @@ -23,24 +23,6 @@ By default, you can log in with username `elastic` and password `changeme`. See the `--help` options on `yarn es ` if you’d like to configure a different password. -[discrete] -=== Running {kib} in Open-Source mode - -If you’re looking to only work with the open-source software, supply the -license type to `yarn es`: - -[source,bash] ----- -yarn es snapshot --license oss ----- - -And start {kib} with only open-source code: - -[source,bash] ----- -yarn start --oss ----- - [discrete] === Unsupported URL Type From 43e8ff8f8f17770174f2e505f513a8e2b67d963d Mon Sep 17 00:00:00 2001 From: Marta Bondyra Date: Fri, 5 Feb 2021 18:17:03 +0100 Subject: [PATCH 46/69] [Lens] Add new drag and drop capabilities (#89745) --- .../__snapshots__/drag_drop.test.tsx.snap | 10 +- .../lens/public/drag_drop/announcements.tsx | 180 +++ .../lens/public/drag_drop/drag_drop.scss | 12 + .../lens/public/drag_drop/drag_drop.test.tsx | 505 +++++--- .../lens/public/drag_drop/drag_drop.tsx | 311 ++--- .../lens/public/drag_drop/providers.tsx | 155 ++- .../plugins/lens/public/drag_drop/readme.md | 7 +- .../draggable_dimension_button.tsx | 103 +- .../config_panel/empty_dimension_button.tsx | 79 +- .../config_panel/layer_panel.test.tsx | 78 +- .../editor_frame/config_panel/layer_panel.tsx | 26 +- .../editor_frame/editor_frame.test.tsx | 12 +- .../editor_frame/suggestion_helpers.test.ts | 5 +- .../workspace_panel/workspace_panel.test.tsx | 9 +- .../workspace_panel/workspace_panel.tsx | 17 +- .../public/editor_frame_service/mocks.tsx | 2 +- .../datapanel.test.tsx | 6 +- .../dimension_panel/dimension_panel.test.tsx | 3 - .../dimension_panel/droppable.test.ts | 1040 ++++++++++------- .../dimension_panel/droppable.ts | 275 +++-- .../indexpattern_datasource/field_item.scss | 18 + .../indexpattern_datasource/field_item.tsx | 30 +- .../indexpattern_datasource/indexpattern.tsx | 13 +- .../public/indexpattern_datasource/mocks.ts | 1 + .../public/indexpattern_datasource/types.ts | 5 + .../public/indexpattern_datasource/utils.ts | 3 +- x-pack/plugins/lens/public/types.ts | 18 +- .../translations/translations/ja-JP.json | 2 - .../translations/translations/zh-CN.json | 2 - .../functional/apps/lens/drag_and_drop.ts | 125 +- .../test/functional/page_objects/lens_page.ts | 79 +- 31 files changed, 2039 insertions(+), 1092 deletions(-) create mode 100644 x-pack/plugins/lens/public/drag_drop/announcements.tsx diff --git a/x-pack/plugins/lens/public/drag_drop/__snapshots__/drag_drop.test.tsx.snap b/x-pack/plugins/lens/public/drag_drop/__snapshots__/drag_drop.test.tsx.snap index 6423a9f6190a7..b3b695b22ad71 100644 --- a/x-pack/plugins/lens/public/drag_drop/__snapshots__/drag_drop.test.tsx.snap +++ b/x-pack/plugins/lens/public/drag_drop/__snapshots__/drag_drop.test.tsx.snap @@ -1,6 +1,6 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`DragDrop droppable is reflected in the className 1`] = ` +exports[`DragDrop defined dropType is reflected in the className 1`] = ` ); @@ -46,10 +48,10 @@ describe('DragDrop', () => { expect(component).toMatchSnapshot(); }); - test('dragover calls preventDefault if droppable is true', () => { + test('dragover calls preventDefault if dropType is defined', () => { const preventDefault = jest.fn(); const component = mount( - + ); @@ -59,10 +61,10 @@ describe('DragDrop', () => { expect(preventDefault).toBeCalled(); }); - test('dragover does not call preventDefault if droppable is false', () => { + test('dragover does not call preventDefault if dropType is undefined', () => { const preventDefault = jest.fn(); const component = mount( - + ); @@ -75,9 +77,15 @@ describe('DragDrop', () => { test('dragstart sets dragging in the context', async () => { const setDragging = jest.fn(); + const setA11yMessage = jest.fn(); const component = mount( - - + + @@ -87,8 +95,9 @@ describe('DragDrop', () => { jest.runAllTimers(); - expect(dataTransfer.setData).toBeCalledWith('text', 'drag label'); + expect(dataTransfer.setData).toBeCalledWith('text', 'hello'); expect(setDragging).toBeCalledWith(value); + expect(setA11yMessage).toBeCalledWith('Lifted hello'); }); test('drop resets all the things', async () => { @@ -100,10 +109,10 @@ describe('DragDrop', () => { const component = mount( - + @@ -116,18 +125,22 @@ describe('DragDrop', () => { expect(preventDefault).toBeCalled(); expect(stopPropagation).toBeCalled(); expect(setDragging).toBeCalledWith(undefined); - expect(onDrop).toBeCalledWith({ id: '2', label: 'hi' }, { id: '1', label: 'hello' }); + expect(onDrop).toBeCalledWith({ id: '2', humanData: { label: 'label1' } }, 'field_add'); }); - test('drop function is not called on droppable=false', async () => { + test('drop function is not called on dropType undefined', async () => { const preventDefault = jest.fn(); const stopPropagation = jest.fn(); const setDragging = jest.fn(); const onDrop = jest.fn(); const component = mount( - - + + @@ -143,14 +156,15 @@ describe('DragDrop', () => { expect(onDrop).not.toHaveBeenCalled(); }); - test('droppable is reflected in the className', () => { + test('defined dropType is reflected in the className', () => { const component = render( { throw x; }} - droppable + dropType="field_add" value={value} + order={[2, 0, 1, 0]} > @@ -159,13 +173,18 @@ describe('DragDrop', () => { expect(component).toMatchSnapshot(); }); - test('items that have droppable=false get special styling when another item is dragged', () => { + test('items that has dropType=undefined get special styling when another item is dragged', () => { const component = mount( - + - {}} droppable={false} value={{ id: '2' }}> + {}} + dropType={undefined} + value={{ id: '2', humanData: { label: 'label2' } }} + > @@ -175,30 +194,39 @@ describe('DragDrop', () => { }); test('additional styles are reflected in the className until drop', () => { - let dragging: { id: '1' } | undefined; - const getAdditionalClasses = jest.fn().mockReturnValue('additional'); + let dragging: { id: '1'; humanData: { label: 'label1' } } | undefined; + const getAdditionalClassesOnEnter = jest.fn().mockReturnValue('additional'); + const getAdditionalClassesOnDroppable = jest.fn().mockReturnValue('droppable'); + const setA11yMessage = jest.fn(); let activeDropTarget; const component = mount( { - dragging = { id: '1' }; + dragging = { id: '1', humanData: { label: 'label1' } }; }} setActiveDropTarget={(val) => { activeDropTarget = { activeDropTarget: val }; }} activeDropTarget={activeDropTarget} > - + {}} - droppable - getAdditionalClassesOnEnter={getAdditionalClasses} + dropType="field_add" + getAdditionalClassesOnEnter={getAdditionalClassesOnEnter} + getAdditionalClassesOnDroppable={getAdditionalClassesOnDroppable} > @@ -210,6 +238,7 @@ describe('DragDrop', () => { .first() .simulate('dragstart', { dataTransfer }); jest.runAllTimers(); + expect(setA11yMessage).toBeCalledWith('Lifted ignored'); component.find('[data-test-subj="lnsDragDrop"]').at(1).simulate('dragover'); component.find('[data-test-subj="lnsDragDrop"]').at(1).simulate('drop'); @@ -217,8 +246,9 @@ describe('DragDrop', () => { }); test('additional enter styles are reflected in the className until dragleave', () => { - let dragging: { id: '1' } | undefined; + let dragging: { id: '1'; humanData: { label: 'label1' } } | undefined; const getAdditionalClasses = jest.fn().mockReturnValue('additional'); + const getAdditionalClassesOnDroppable = jest.fn().mockReturnValue('droppable'); const setActiveDropTarget = jest.fn(); const component = mount( @@ -226,7 +256,7 @@ describe('DragDrop', () => { setA11yMessage={jest.fn()} dragging={dragging} setDragging={() => { - dragging = { id: '1' }; + dragging = { id: '1', humanData: { label: 'label1' } }; }} setActiveDropTarget={setActiveDropTarget} activeDropTarget={ @@ -234,15 +264,22 @@ describe('DragDrop', () => { } keyboardMode={false} setKeyboardMode={(keyboardMode) => true} + registerDropTarget={jest.fn()} > - + {}} - droppable + dropType="field_add" getAdditionalClassesOnEnter={getAdditionalClasses} + getAdditionalClassesOnDroppable={getAdditionalClassesOnDroppable} > @@ -257,19 +294,137 @@ describe('DragDrop', () => { component.find('[data-test-subj="lnsDragDrop"]').at(1).simulate('dragover'); expect(component.find('.additional')).toHaveLength(1); - component.find('[data-test-subj="lnsDragDrop"]').at(1).simulate('dragleave'); expect(setActiveDropTarget).toBeCalledWith(undefined); }); + test('Keyboard navigation: User receives proper drop Targets highlighted when pressing arrow keys', () => { + const onDrop = jest.fn(); + const setActiveDropTarget = jest.fn(); + const setA11yMessage = jest.fn(); + const items = [ + { + draggable: true, + value: { + id: '1', + humanData: { label: 'label1', position: 1 }, + }, + children: '1', + order: [2, 0, 0, 0], + }, + { + draggable: true, + dragType: 'move' as 'copy' | 'move', + + value: { + id: '2', + + humanData: { label: 'label2', position: 1 }, + }, + onDrop, + dropType: 'move_compatible' as DropType, + order: [2, 0, 1, 0], + }, + { + draggable: true, + dragType: 'move' as 'copy' | 'move', + value: { + id: '3', + humanData: { label: 'label3', position: 1 }, + }, + onDrop, + dropType: 'replace_compatible' as DropType, + order: [2, 0, 2, 0], + }, + { + draggable: true, + dragType: 'move' as 'copy' | 'move', + value: { + id: '4', + humanData: { label: 'label4', position: 2 }, + }, + order: [2, 0, 2, 1], + }, + ]; + const component = mount( + + {items.map((props) => ( + +
    + + ))} + + ); + const keyboardHandler = component + .find('[data-test-subj="lnsDragDrop-keyboardHandler"]') + .first() + .simulate('focus'); + act(() => { + keyboardHandler.simulate('keydown', { key: 'ArrowRight' }); + expect(setActiveDropTarget).toBeCalledWith({ + ...items[2].value, + onDrop, + dropType: items[2].dropType, + }); + keyboardHandler.simulate('keydown', { key: 'Enter' }); + expect(setA11yMessage).toBeCalledWith( + 'Selected label3 in group at position 1. Press space or enter to replace label3 with label1.' + ); + expect(setActiveDropTarget).toBeCalledWith(undefined); + expect(onDrop).toBeCalledWith( + { humanData: { label: 'label1', position: 1 }, id: '1' }, + 'move_compatible' + ); + }); + }); + describe('reordering', () => { + const onDrop = jest.fn(); + const items = [ + { + id: '1', + humanData: { label: 'label1', position: 1 }, + onDrop, + dropType: 'reorder' as DropType, + }, + { + id: '2', + humanData: { label: 'label2', position: 2 }, + onDrop, + dropType: 'reorder' as DropType, + }, + { + id: '3', + humanData: { label: 'label3', position: 3 }, + onDrop, + dropType: 'reorder' as DropType, + }, + ]; const mountComponent = ( dragContext: Partial | undefined, - onDrop: DropHandler = jest.fn() + onDropHandler?: () => void ) => { let dragging = dragContext?.dragging; let keyboardMode = !!dragContext?.keyboardMode; let activeDropTarget = dragContext?.activeDropTarget; + + const setA11yMessage = jest.fn(); + const registerDropTarget = jest.fn(); const baseContext = { dragging, setDragging: (val?: DragDropIdentifier) => { @@ -280,70 +435,51 @@ describe('DragDrop', () => { keyboardMode = mode; }), setActiveDropTarget: (target?: DragDropIdentifier) => { - activeDropTarget = { activeDropTarget: target } as ActiveDropTarget; + activeDropTarget = { activeDropTarget: target } as DropTargets; }, activeDropTarget, - setA11yMessage: jest.fn(), + setA11yMessage, + registerDropTarget, + }; + + const dragDropSharedProps = { + draggable: true, + dragType: 'move' as 'copy' | 'move', + dropType: 'reorder' as DropType, + reorderableGroup: items.map(({ id }) => ({ id })), + onDrop: onDropHandler || onDrop, }; + return mount( 1 - + 2 - + 3 ); }; - test(`Inactive reorderable group renders properly`, () => { - const component = mountComponent(undefined, jest.fn()); - expect(component.find('.lnsDragDrop-reorderable')).toHaveLength(3); + test(`Inactive group renders properly`, () => { + const component = mountComponent(undefined); + expect(component.find('[data-test-subj="lnsDragDrop"]')).toHaveLength(3); }); test(`Reorderable group with lifted element renders properly`, () => { - const setDragging = jest.fn(); const setA11yMessage = jest.fn(); - const component = mountComponent( - { dragging: { id: '1' }, setA11yMessage, setDragging }, - jest.fn() - ); + const setDragging = jest.fn(); + const component = mountComponent({ dragging: items[0], setDragging, setA11yMessage }); act(() => { component .find('[data-test-subj="lnsDragDrop"]') @@ -352,8 +488,8 @@ describe('DragDrop', () => { jest.runAllTimers(); }); - expect(setDragging).toBeCalledWith({ id: '1' }); - expect(setA11yMessage).toBeCalledWith('You have lifted an item 1 in position 1'); + expect(setDragging).toBeCalledWith(items[0]); + expect(setA11yMessage).toBeCalledWith('Lifted label1'); expect( component .find('[data-test-subj="lnsDragDrop-reorderableGroup"]') @@ -362,7 +498,7 @@ describe('DragDrop', () => { }); test(`Reordered elements get extra styles to show the reorder effect when dragging`, () => { - const component = mountComponent({ dragging: { id: '1' } }, jest.fn()); + const component = mountComponent({ dragging: items[0] }); act(() => { component @@ -403,16 +539,13 @@ describe('DragDrop', () => { }); test(`Dropping an item runs onDrop function`, () => { - const setDragging = jest.fn(); - const setA11yMessage = jest.fn(); const preventDefault = jest.fn(); const stopPropagation = jest.fn(); - const onDrop = jest.fn(); - const component = mountComponent( - { dragging: { id: '1' }, setA11yMessage, setDragging }, - onDrop - ); + const setA11yMessage = jest.fn(); + const setDragging = jest.fn(); + + const component = mountComponent({ dragging: items[0], setDragging, setA11yMessage }); component .find('[data-test-subj="lnsDragDrop-reorderableDropLayer"]') @@ -421,23 +554,58 @@ describe('DragDrop', () => { jest.runAllTimers(); expect(setA11yMessage).toBeCalledWith( - 'You have dropped the item. You have moved the item from position 1 to positon 3' + 'You have dropped the item label1. You have moved the item from position 1 to positon 3' ); expect(preventDefault).toBeCalled(); expect(stopPropagation).toBeCalled(); - expect(onDrop).toBeCalledWith({ id: '1' }, { id: '3' }); + expect(onDrop).toBeCalledWith(items[0], 'reorder'); }); - test(`Keyboard navigation: user can drop element to an activeDropTarget`, () => { - const onDrop = jest.fn(); - const component = mountComponent( - { - dragging: { id: '1' }, - activeDropTarget: { activeDropTarget: { id: '3' } } as ActiveDropTarget, - keyboardMode: true, + test(`Keyboard Navigation: User cannot move an element outside of the group`, () => { + const setA11yMessage = jest.fn(); + const setActiveDropTarget = jest.fn(); + const component = mountComponent({ + dragging: items[0], + keyboardMode: true, + activeDropTarget: { + activeDropTarget: undefined, + dropTargetsByOrder: { + '2,0,0': undefined, + '2,0,1': { ...items[1], onDrop, dropType: 'reorder' }, + '2,0,2': { ...items[2], onDrop, dropType: 'reorder' }, + }, }, - onDrop + setActiveDropTarget, + setA11yMessage, + }); + const keyboardHandler = component.find('[data-test-subj="lnsDragDrop-keyboardHandler"]'); + + keyboardHandler.simulate('keydown', { key: 'Space' }); + keyboardHandler.simulate('keydown', { key: 'ArrowUp' }); + expect(setActiveDropTarget).not.toHaveBeenCalled(); + + keyboardHandler.simulate('keydown', { key: 'Space' }); + keyboardHandler.simulate('keydown', { key: 'ArrowDown' }); + + expect(setActiveDropTarget).toBeCalledWith(items[1]); + expect(setA11yMessage).toBeCalledWith( + 'You have moved the item label1 from position 1 to position 2' ); + }); + test(`Keyboard navigation: user can drop element to an activeDropTarget`, () => { + const component = mountComponent({ + dragging: items[0], + activeDropTarget: { + activeDropTarget: { ...items[2], dropType: 'reorder', onDrop }, + dropTargetsByOrder: { + '2,0,0': { ...items[0], onDrop, dropType: 'reorder' }, + '2,0,1': { ...items[1], onDrop, dropType: 'reorder' }, + '2,0,2': { ...items[2], onDrop, dropType: 'reorder' }, + }, + }, + + keyboardMode: true, + }); const keyboardHandler = component .find('[data-test-subj="lnsDragDrop-keyboardHandler"]') .simulate('focus'); @@ -447,15 +615,43 @@ describe('DragDrop', () => { keyboardHandler.simulate('keydown', { key: 'ArrowDown' }); keyboardHandler.simulate('keydown', { key: 'Enter' }); }); - expect(onDrop).toBeCalledWith({ id: '1' }, { id: '3' }); + expect(onDrop).toBeCalledWith(items[0], 'reorder'); + }); + + test(`Keyboard Navigation: Doesn't call onDrop when movement is cancelled`, () => { + const setA11yMessage = jest.fn(); + const onDropHandler = jest.fn(); + const component = mountComponent({ dragging: items[0], setA11yMessage }, onDropHandler); + const keyboardHandler = component.find('[data-test-subj="lnsDragDrop-keyboardHandler"]'); + keyboardHandler.simulate('keydown', { key: 'Space' }); + keyboardHandler.simulate('keydown', { key: 'Escape' }); + jest.runAllTimers(); + + expect(onDropHandler).not.toHaveBeenCalled(); + expect(setA11yMessage).toBeCalledWith('Movement cancelled'); + keyboardHandler.simulate('keydown', { key: 'Space' }); + keyboardHandler.simulate('keydown', { key: 'ArrowDown' }); + keyboardHandler.simulate('blur'); + + expect(onDropHandler).not.toHaveBeenCalled(); + expect(setA11yMessage).toBeCalledWith('Movement cancelled'); }); test(`Keyboard Navigation: Reordered elements get extra styles to show the reorder effect`, () => { const setA11yMessage = jest.fn(); - const component = mountComponent( - { dragging: { id: '1' }, keyboardMode: true, setA11yMessage }, - jest.fn() - ); + const component = mountComponent({ + dragging: items[0], + keyboardMode: true, + activeDropTarget: { + activeDropTarget: undefined, + dropTargetsByOrder: { + '2,0,0': undefined, + '2,0,1': { ...items[1], onDrop, dropType: 'reorder' }, + '2,0,2': { ...items[2], onDrop, dropType: 'reorder' }, + }, + }, + setA11yMessage, + }); const keyboardHandler = component.find('[data-test-subj="lnsDragDrop-keyboardHandler"]'); keyboardHandler.simulate('keydown', { key: 'Space' }); @@ -475,7 +671,7 @@ describe('DragDrop', () => { component.find('[data-test-subj="lnsDragDrop-translatableDrop"]').at(1).prop('style') ).toEqual(undefined); expect(setA11yMessage).toBeCalledWith( - 'You have moved the item 1 from position 1 to position 2' + 'You have moved the item label1 from position 1 to position 2' ); component @@ -490,63 +686,45 @@ describe('DragDrop', () => { ).toEqual(undefined); }); - test(`Keyboard Navigation: User cannot move an element outside of the group`, () => { - const onDrop = jest.fn(); - const setActiveDropTarget = jest.fn(); - const setA11yMessage = jest.fn(); - const component = mountComponent( - { dragging: { id: '1' }, keyboardMode: true, setActiveDropTarget, setA11yMessage }, - onDrop - ); - const keyboardHandler = component.find('[data-test-subj="lnsDragDrop-keyboardHandler"]'); - - keyboardHandler.simulate('keydown', { key: 'Space' }); - keyboardHandler.simulate('keydown', { key: 'ArrowUp' }); - expect(setActiveDropTarget).not.toHaveBeenCalled(); - - keyboardHandler.simulate('keydown', { key: 'Space' }); - keyboardHandler.simulate('keydown', { key: 'ArrowDown' }); - - expect(setActiveDropTarget).toBeCalledWith({ id: '2' }); - expect(setA11yMessage).toBeCalledWith( - 'You have moved the item 1 from position 1 to position 2' - ); - }); - test(`Keyboard Navigation: User cannot drop element to itself`, () => { - const setActiveDropTarget = jest.fn(); const setA11yMessage = jest.fn(); + const setActiveDropTarget = jest.fn(); const component = mount( 1 2 @@ -557,33 +735,8 @@ describe('DragDrop', () => { keyboardHandler.simulate('keydown', { key: 'Space' }); keyboardHandler.simulate('keydown', { key: 'ArrowUp' }); - expect(setActiveDropTarget).toBeCalledWith({ id: '1' }); - expect(setA11yMessage).toBeCalledWith('You have moved back the item 1 to position 1'); - }); - - test(`Keyboard Navigation: Doesn't call onDrop when movement is cancelled`, () => { - const setA11yMessage = jest.fn(); - const onDrop = jest.fn(); - - const component = mountComponent({ dragging: { id: '1' }, setA11yMessage }, onDrop); - const keyboardHandler = component.find('[data-test-subj="lnsDragDrop-keyboardHandler"]'); - keyboardHandler.simulate('keydown', { key: 'Space' }); - keyboardHandler.simulate('keydown', { key: 'Escape' }); - - jest.runAllTimers(); - - expect(onDrop).not.toHaveBeenCalled(); - expect(setA11yMessage).toBeCalledWith( - 'Movement cancelled. The item has returned to its starting position 1' - ); - keyboardHandler.simulate('keydown', { key: 'Space' }); - keyboardHandler.simulate('keydown', { key: 'ArrowDown' }); - keyboardHandler.simulate('blur'); - - expect(onDrop).not.toHaveBeenCalled(); - expect(setA11yMessage).toBeCalledWith( - 'Movement cancelled. The item has returned to its starting position 1' - ); + expect(setActiveDropTarget).toBeCalledWith(undefined); + expect(setA11yMessage).toBeCalledWith('You have moved the item label1 back to position 1'); }); }); }); diff --git a/x-pack/plugins/lens/public/drag_drop/drag_drop.tsx b/x-pack/plugins/lens/public/drag_drop/drag_drop.tsx index e006e4f5af49e..898071e85ea79 100644 --- a/x-pack/plugins/lens/public/drag_drop/drag_drop.tsx +++ b/x-pack/plugins/lens/public/drag_drop/drag_drop.tsx @@ -9,23 +9,23 @@ import './drag_drop.scss'; import React, { useContext, useEffect, memo } from 'react'; import classNames from 'classnames'; import { keys, EuiScreenReaderOnly } from '@elastic/eui'; +import useShallowCompareEffect from 'react-use/lib/useShallowCompareEffect'; import { DragDropIdentifier, + DropIdentifier, DragContext, DragContextState, + nextValidDropTarget, ReorderContext, ReorderState, - reorderAnnouncements, + DropHandler, } from './providers'; +import { announce } from './announcements'; import { trackUiEvent } from '../lens_ui_telemetry'; +import { DropType } from '../types'; export type DroppableEvent = React.DragEvent; -/** - * A function that handles a drop event. - */ -export type DropHandler = (dropped: DragDropIdentifier, dropTarget: DragDropIdentifier) => void; - /** * The base props to the DragDrop component. */ @@ -34,10 +34,6 @@ interface BaseProps { * The CSS class(es) for the root element. */ className?: string; - /** - * The label for accessibility - */ - label?: string; /** * The event handler that fires when an item @@ -62,16 +58,15 @@ interface BaseProps { * Indicates whether or not this component is draggable. */ draggable?: boolean; - /** - * Indicates whether or not the currently dragged item - * can be dropped onto this component. - */ - droppable?: boolean; /** * Additional class names to apply when another element is over the drop target */ - getAdditionalClassesOnEnter?: () => string; + getAdditionalClassesOnEnter?: (dropType?: DropType) => string | undefined; + /** + * Additional class names to apply when another element is droppable for a currently dragged item + */ + getAdditionalClassesOnDroppable?: (dropType?: DropType) => string | undefined; /** * The optional test subject associated with this DOM element. @@ -81,35 +76,29 @@ interface BaseProps { /** * items belonging to the same group that can be reordered */ - reorderableGroup?: DragDropIdentifier[]; + reorderableGroup?: Array<{ id: string }>; /** * Indicates to the user whether the currently dragged item * will be moved or copied */ - dragType?: 'copy' | 'move' | 'reorder'; + dragType?: 'copy' | 'move'; /** - * Indicates to the user whether the drop action will - * replace something that is existing or add a new one + * Indicates the type of a drop - when undefined, the currently dragged item + * cannot be dropped onto this component. */ - dropType?: 'add' | 'replace' | 'reorder'; - + dropType?: DropType; /** - * temporary flag to exclude the draggable elements that don't have keyboard nav yet. To be removed along with the feature development + * Order for keyboard dragging. This takes an array of numbers which will be used to order hierarchically */ - noKeyboardSupportYet?: boolean; + order: number[]; } /** * The props for a draggable instance of that component. */ interface DragInnerProps extends BaseProps { - /** - * The label, which should be attached to the drag event, and which will e.g. - * be used if the element will be dropped into a text field. - */ - label?: string; isDragging: boolean; keyboardMode: boolean; setKeyboardMode: DragContextState['setKeyboardMode']; @@ -124,6 +113,7 @@ interface DragInnerProps extends BaseProps { ) => void; onDragEnd?: () => void; extraKeyboardHandler?: (e: React.KeyboardEvent) => void; + ariaDescribedBy?: string; } /** @@ -131,23 +121,16 @@ interface DragInnerProps extends BaseProps { */ interface DropInnerProps extends BaseProps, DragContextState { isDragging: boolean; - isNotDroppable: boolean; } -/** - * A draggable / droppable item. Items can be both draggable and droppable at - * the same time. - * - * @param props - */ - const lnsLayerPanelDimensionMargin = 8; export const DragDrop = (props: BaseProps) => { const { dragging, setDragging, + registerDropTarget, keyboardMode, setKeyboardMode, activeDropTarget, @@ -155,8 +138,7 @@ export const DragDrop = (props: BaseProps) => { setA11yMessage, } = useContext(DragContext); - const { value, draggable, droppable, reorderableGroup } = props; - + const { value, draggable, dropType, reorderableGroup } = props; const isDragging = !!(draggable && value.id === dragging?.id); const dragProps = { @@ -178,16 +160,17 @@ export const DragDrop = (props: BaseProps) => { setDragging, activeDropTarget, setActiveDropTarget, + registerDropTarget, isDragging, setA11yMessage, isNotDroppable: // If the configuration has provided a droppable flag, but this particular item is not // droppable, then it should be less prominent. Ignores items that are both // draggable and drop targets - !!(droppable === false && dragging && value.id !== dragging.id), + !!(!dropType && dragging && value.id !== dragging.id), }; - if (draggable && !droppable) { + if (draggable && !dropType) { if (reorderableGroup && reorderableGroup.length > 1) { return ( { if ( reorderableGroup && reorderableGroup.length > 1 && - reorderableGroup?.some((i) => i.id === value.id) + reorderableGroup?.some((i) => i.id === dragging?.id) ) { - return ; + return ; } return ; }; -const DragInner = memo(function DragDropInner({ +const DragInner = memo(function DragInner({ dataTestSubj, className, value, @@ -219,16 +202,16 @@ const DragInner = memo(function DragDropInner({ setDragging, setKeyboardMode, setActiveDropTarget, - label = '', + order, keyboardMode, isDragging, activeDropTarget, - onDrop, dragType, onDragStart, onDragEnd, extraKeyboardHandler, - noKeyboardSupportYet, + ariaDescribedBy, + setA11yMessage, }: DragInnerProps) { const dragStart = (e?: DroppableEvent | React.KeyboardEvent) => { // Setting stopPropgagation causes Chrome failures, so @@ -241,7 +224,7 @@ const DragInner = memo(function DragDropInner({ // We only can reach the dragStart method if the element is draggable, // so we know we have DraggableProps if we reach this code. if (e && 'dataTransfer' in e) { - e.dataTransfer.setData('text', label); + e.dataTransfer.setData('text', value.humanData.label); } // Chrome causes issues if you try to render from within a @@ -250,6 +233,7 @@ const DragInner = memo(function DragDropInner({ const currentTarget = e?.currentTarget; setTimeout(() => { setDragging(value); + setA11yMessage(announce.lifted(value.humanData)); if (onDragStart) { onDragStart(currentTarget); } @@ -261,53 +245,78 @@ const DragInner = memo(function DragDropInner({ setDragging(undefined); setActiveDropTarget(undefined); setKeyboardMode(false); + setA11yMessage(announce.cancelled()); if (onDragEnd) { onDragEnd(); } }; - const dropToActiveDropTarget = () => { if (isDragging && activeDropTarget?.activeDropTarget) { trackUiEvent('drop_total'); - if (onDrop) { - onDrop(value, activeDropTarget.activeDropTarget); - } + const { dropType, humanData, onDrop: onTargetDrop } = activeDropTarget.activeDropTarget; + setTimeout(() => setA11yMessage(announce.dropped(value.humanData, humanData, dropType))); + onTargetDrop(value, dropType); } }; + const setNextTarget = (reversed = false) => { + if (!order) { + return; + } + + const nextTarget = nextValidDropTarget( + activeDropTarget, + [order.join(',')], + (el) => el?.dropType !== 'reorder', + reversed + ); + + setActiveDropTarget(nextTarget); + setA11yMessage( + nextTarget + ? announce.selectedTarget(value.humanData, nextTarget?.humanData, nextTarget?.dropType) + : announce.noTarget() + ); + }; return ( -
    - {!noKeyboardSupportYet && ( - -
    ); }); const ReorderableDrop = memo(function ReorderableDrop( - props: DropInnerProps & { reorderableGroup: DragDropIdentifier[] } + props: DropInnerProps & { reorderableGroup: Array<{ id: string }> } ) { const { onDrop, value, - droppable, dragging, setDragging, setKeyboardMode, @@ -595,6 +606,7 @@ const ReorderableDrop = memo(function ReorderableDrop( setActiveDropTarget, reorderableGroup, setA11yMessage, + dropType, } = props; const currentIndex = reorderableGroup.findIndex((i) => i.id === value.id); @@ -628,15 +640,14 @@ const ReorderableDrop = memo(function ReorderableDrop( }, [isReordered, setReorderState, value.id]); const onReorderableDragOver = (e: DroppableEvent) => { - if (!droppable) { + if (!dropType) { return; } e.preventDefault(); // An optimization to prevent a bunch of React churn. - // todo: replace with custom function ? - if (!activeDropTargetMatches) { - setActiveDropTarget(value); + if (!activeDropTargetMatches && dropType && onDrop) { + setActiveDropTarget({ ...value, dropType, onDrop }); } const draggingIndex = reorderableGroup.findIndex((i) => i.id === dragging?.id); @@ -675,14 +686,12 @@ const ReorderableDrop = memo(function ReorderableDrop( setDragging(undefined); setKeyboardMode(false); - if (onDrop && droppable && dragging) { + if (onDrop && dropType && dragging) { trackUiEvent('drop_total'); - - onDrop(dragging, value); - const draggingIndex = reorderableGroup.findIndex((i) => i.id === dragging.id); + onDrop(dragging, 'reorder'); // setTimeout ensures it will run after dragEnd messaging setTimeout(() => - setA11yMessage(reorderAnnouncements.dropped(currentIndex + 1, draggingIndex + 1)) + setA11yMessage(announce.dropped(dragging.humanData, value.humanData, 'reorder')) ); } }; @@ -707,7 +716,7 @@ const ReorderableDrop = memo(function ReorderableDrop(
    void; export type DragDropIdentifier = Record & { id: string; + /** + * The data for accessibility, consists of required label and not required groupLabel and position in group + */ + humanData: HumanData; }; -export interface ActiveDropTarget { - activeDropTarget?: DragDropIdentifier; +export type DropIdentifier = DragDropIdentifier & { + dropType: DropType; + onDrop: DropHandler; +}; + +export interface DropTargets { + activeDropTarget?: DropIdentifier; + dropTargetsByOrder: Record; } /** * The shape of the drag / drop context. @@ -39,11 +56,12 @@ export interface DragContextState { */ setDragging: (dragging?: DragDropIdentifier) => void; - activeDropTarget?: ActiveDropTarget; + activeDropTarget?: DropTargets; - setActiveDropTarget: (newTarget?: DragDropIdentifier) => void; + setActiveDropTarget: (newTarget?: DropIdentifier) => void; setA11yMessage: (message: string) => void; + registerDropTarget: (order: number[], dropTarget?: DropIdentifier) => void; } /** @@ -59,6 +77,7 @@ export const DragContext = React.createContext({ activeDropTarget: undefined, setActiveDropTarget: () => {}, setA11yMessage: () => {}, + registerDropTarget: () => {}, }); /** @@ -89,10 +108,13 @@ export interface ProviderProps { setDragging: (dragging?: DragDropIdentifier) => void; activeDropTarget?: { - activeDropTarget?: DragDropIdentifier; + activeDropTarget?: DropIdentifier; + dropTargetsByOrder: Record; }; - setActiveDropTarget: (newTarget?: DragDropIdentifier) => void; + setActiveDropTarget: (newTarget?: DropIdentifier) => void; + + registerDropTarget: (order: number[], dropTarget?: DropIdentifier) => void; /** * The React children. @@ -116,9 +138,11 @@ export function RootDragDropProvider({ children }: { children: React.ReactNode } const [keyboardModeState, setKeyboardModeState] = useState(false); const [a11yMessageState, setA11yMessageState] = useState(''); const [activeDropTargetState, setActiveDropTargetState] = useState<{ - activeDropTarget?: DragDropIdentifier; + activeDropTarget?: DropIdentifier; + dropTargetsByOrder: Record; }>({ activeDropTarget: undefined, + dropTargetsByOrder: {}, }); const setDragging = useMemo( @@ -131,11 +155,26 @@ export function RootDragDropProvider({ children }: { children: React.ReactNode } ]); const setActiveDropTarget = useMemo( - () => (activeDropTarget?: DragDropIdentifier) => + () => (activeDropTarget?: DropIdentifier) => setActiveDropTargetState((s) => ({ ...s, activeDropTarget })), [setActiveDropTargetState] ); + const registerDropTarget = useMemo( + () => (order: number[], dropTarget?: DropIdentifier) => { + return setActiveDropTargetState((s) => { + return { + ...s, + dropTargetsByOrder: { + ...s.dropTargetsByOrder, + [order.join(',')]: dropTarget, + }, + }; + }); + }, + [setActiveDropTargetState] + ); + return (
    {children} @@ -155,9 +195,14 @@ export function RootDragDropProvider({ children }: { children: React.ReactNode }

    {a11yMessageState}

    +

    + {i18n.translate('xpack.lens.dragDrop.keyboardInstructionsReorder', { + defaultMessage: `Press enter or space to dragging. When dragging, use the up/down arrow keys to reorder items in the group and left/right arrow keys to choose drop targets outside of the group. Press enter or space again to finish.`, + })} +

    {i18n.translate('xpack.lens.dragDrop.keyboardInstructions', { - defaultMessage: `Press enter or space to start reordering the dimension group. When dragging, use arrow keys to reorder. Press enter or space again to finish.`, + defaultMessage: `Press enter or space to start dragging. When dragging, use the left/right arrow keys to move between drop targets. Press enter or space again to finish.`, })}

    @@ -167,6 +212,45 @@ export function RootDragDropProvider({ children }: { children: React.ReactNode } ); } +export function nextValidDropTarget( + activeDropTarget: DropTargets | undefined, + draggingOrder: [string], + filterElements: (el: DragDropIdentifier) => boolean = () => true, + reverse = false +) { + if (!activeDropTarget) { + return; + } + + const filteredTargets = [...Object.entries(activeDropTarget.dropTargetsByOrder)].filter( + ([, dropTarget]) => dropTarget && filterElements(dropTarget) + ); + + const nextDropTargets = [...filteredTargets, draggingOrder].sort(([orderA], [orderB]) => { + const parsedOrderA = orderA.split(',').map((v) => Number(v)); + const parsedOrderB = orderB.split(',').map((v) => Number(v)); + + const relevantLevel = parsedOrderA.findIndex((v, i) => parsedOrderA[i] !== parsedOrderB[i]); + return parsedOrderA[relevantLevel] - parsedOrderB[relevantLevel]; + }); + + let currentActiveDropIndex = nextDropTargets.findIndex( + ([_, dropTarget]) => dropTarget?.id === activeDropTarget?.activeDropTarget?.id + ); + + if (currentActiveDropIndex === -1) { + currentActiveDropIndex = nextDropTargets.findIndex( + ([targetOrder]) => targetOrder === draggingOrder[0] + ); + } + + const previousElement = + (nextDropTargets.length + currentActiveDropIndex - 1) % nextDropTargets.length; + const nextElement = (currentActiveDropIndex + 1) % nextDropTargets.length; + + return nextDropTargets[reverse ? previousElement : nextElement][1]; +} + /** * A React drag / drop provider that derives its state from a RootDragDropProvider. If * part of a React application is rendered separately from the root, this provider can @@ -182,6 +266,7 @@ export function ChildDragDropProvider({ activeDropTarget, setActiveDropTarget, setA11yMessage, + registerDropTarget, children, }: ProviderProps) { const value = useMemo( @@ -193,6 +278,7 @@ export function ChildDragDropProvider({ activeDropTarget, setActiveDropTarget, setA11yMessage, + registerDropTarget, }), [ setDragging, @@ -202,6 +288,7 @@ export function ChildDragDropProvider({ setKeyboardMode, keyboardMode, setA11yMessage, + registerDropTarget, ] ); return {children}; @@ -211,7 +298,7 @@ export interface ReorderState { /** * Ids of the elements that are translated up or down */ - reorderedItems: DragDropIdentifier[]; + reorderedItems: Array<{ id: string; height?: number }>; /** * Direction of the move of dragged element in the reordered list @@ -282,51 +369,3 @@ export function ReorderProvider({
    ); } - -export const reorderAnnouncements = { - moved: (itemLabel: string, position: number, prevPosition: number) => { - return prevPosition === position - ? i18n.translate('xpack.lens.dragDrop.elementMovedBack', { - defaultMessage: `You have moved back the item {itemLabel} to position {prevPosition}`, - values: { - itemLabel, - prevPosition, - }, - }) - : i18n.translate('xpack.lens.dragDrop.elementMoved', { - defaultMessage: `You have moved the item {itemLabel} from position {prevPosition} to position {position}`, - values: { - itemLabel, - position, - prevPosition, - }, - }); - }, - - lifted: (itemLabel: string, position: number) => - i18n.translate('xpack.lens.dragDrop.elementLifted', { - defaultMessage: `You have lifted an item {itemLabel} in position {position}`, - values: { - itemLabel, - position, - }, - }), - - cancelled: (position: number) => - i18n.translate('xpack.lens.dragDrop.abortMessageReorder', { - defaultMessage: - 'Movement cancelled. The item has returned to its starting position {position}', - values: { - position, - }, - }), - dropped: (position: number, prevPosition: number) => - i18n.translate('xpack.lens.dragDrop.dropMessageReorder', { - defaultMessage: - 'You have dropped the item. You have moved the item from position {prevPosition} to positon {position}', - values: { - position, - prevPosition, - }, - }), -}; diff --git a/x-pack/plugins/lens/public/drag_drop/readme.md b/x-pack/plugins/lens/public/drag_drop/readme.md index e48564a074986..55a9e3157c247 100644 --- a/x-pack/plugins/lens/public/drag_drop/readme.md +++ b/x-pack/plugins/lens/public/drag_drop/readme.md @@ -56,7 +56,7 @@ const { dragging } = useContext(DragContext); return ( onChange([...items, item])} > {items.map((x) => ( @@ -86,11 +86,14 @@ The children `DragDrop` components must have props defined as in the example: key={f.id} draggable droppable - dragType="reorder" + dragType="move" dropType="reorder" reorderableGroup={fields} // consists all reorderable elements in the group, eg. [{id:'3'}, {id:'5'}, {id:'1'}] value={{ id: f.id, + humanData: { + label: 'Label' + } }} onDrop={/*handler*/} > diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/draggable_dimension_button.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/draggable_dimension_button.tsx index f6f4bed44b84d..e3e4f11e8450d 100644 --- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/draggable_dimension_button.tsx +++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/draggable_dimension_button.tsx @@ -7,14 +7,29 @@ import React, { useMemo } from 'react'; import { DragDrop, DragDropIdentifier, DragContextState } from '../../../drag_drop'; -import { Datasource, VisualizationDimensionGroupConfig, isDraggedOperation } from '../../../types'; +import { + Datasource, + VisualizationDimensionGroupConfig, + isDraggedOperation, + DropType, +} from '../../../types'; import { LayerDatasourceDropProps } from './types'; -const isFromTheSameGroup = (el1: DragDropIdentifier, el2?: DragDropIdentifier) => - el2 && isDraggedOperation(el2) && el1.groupId === el2.groupId && el1.columnId !== el2.columnId; +const getAdditionalClassesOnEnter = (dropType?: string) => { + if ( + dropType === 'field_replace' || + dropType === 'replace_compatible' || + dropType === 'replace_incompatible' + ) { + return 'lnsDragDrop-isReplacing'; + } +}; -const isSelf = (el1: DragDropIdentifier, el2?: DragDropIdentifier) => - isDraggedOperation(el2) && el1.columnId === el2.columnId; +const getAdditionalClassesOnDroppable = (dropType?: string) => { + if (dropType === 'move_incompatible' || dropType === 'replace_incompatible') { + return 'lnsDragDrop-notCompatible'; + } +}; export function DraggableDimensionButton({ layerId, @@ -34,7 +49,11 @@ export function DraggableDimensionButton({ layerId: string; groupIndex: number; layerIndex: number; - onDrop: (droppedItem: DragDropIdentifier, dropTarget: DragDropIdentifier) => void; + onDrop: ( + droppedItem: DragDropIdentifier, + dropTarget: DragDropIdentifier, + dropType?: DropType + ) => void; group: VisualizationDimensionGroupConfig; label: string; children: React.ReactElement; @@ -43,66 +62,52 @@ export function DraggableDimensionButton({ accessorIndex: number; columnId: string; }) { - const value = useMemo(() => { - return { + const dropType = layerDatasource.getDropTypes({ + ...layerDatasourceDropProps, + columnId, + filterOperations: group.filterOperations, + groupId: group.groupId, + }); + + const value = useMemo( + () => ({ columnId, groupId: group.groupId, layerId, id: columnId, - }; - }, [columnId, group.groupId, layerId]); - - const { dragging } = dragDropContext; - - const isCurrentGroup = group.groupId === dragging?.groupId; - const isOperationDragged = isDraggedOperation(dragging); - const canHandleDrop = - Boolean(dragDropContext.dragging) && - layerDatasource.canHandleDrop({ - ...layerDatasourceDropProps, - columnId, - filterOperations: group.filterOperations, - }); - - const dragType = isSelf(value, dragging) - ? 'move' - : isOperationDragged && isCurrentGroup - ? 'reorder' - : 'copy'; - - const dropType = isOperationDragged ? (!isCurrentGroup ? 'replace' : 'reorder') : 'add'; - - const isCompatibleFromOtherGroup = !isCurrentGroup && canHandleDrop; - - const isDroppable = isOperationDragged - ? dragType === 'reorder' - ? isFromTheSameGroup(value, dragging) - : isCompatibleFromOtherGroup - : canHandleDrop; + dropType, + humanData: { + label, + groupLabel: group.groupLabel, + position: accessorIndex + 1, + }, + }), + [columnId, group.groupId, accessorIndex, layerId, dropType, label, group.groupLabel] + ); + // todo: simplify by id and use drop targets? const reorderableGroup = useMemo( () => - group.accessors.map((a) => ({ - columnId: a.columnId, - id: a.columnId, - groupId: group.groupId, - layerId, + group.accessors.map((g) => ({ + id: g.columnId, })), - [group, layerId] + [group.accessors] ); return (
    1 ? reorderableGroup : undefined} value={value} - label={label} - droppable={dragging && isDroppable} - onDrop={onDrop} + onDrop={(drag: DragDropIdentifier, selectedDropType?: DropType) => + onDrop(drag, value, selectedDropType) + } > {children} diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/empty_dimension_button.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/empty_dimension_button.tsx index 1116cef1aa3ef..a83d4bde0383c 100644 --- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/empty_dimension_button.tsx +++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/empty_dimension_button.tsx @@ -5,17 +5,26 @@ * 2.0. */ -import React, { useMemo } from 'react'; +import React, { useMemo, useState, useEffect } from 'react'; import { EuiButtonEmpty } from '@elastic/eui'; import { FormattedMessage } from '@kbn/i18n/react'; import { i18n } from '@kbn/i18n'; import { generateId } from '../../../id_generator'; -import { DragDrop, DragDropIdentifier, DragContextState } from '../../../drag_drop'; -import { Datasource, VisualizationDimensionGroupConfig, isDraggedOperation } from '../../../types'; +import { DragDrop, DragDropIdentifier } from '../../../drag_drop'; +import { Datasource, VisualizationDimensionGroupConfig, DropType } from '../../../types'; import { LayerDatasourceDropProps } from './types'; +const label = i18n.translate('xpack.lens.indexPattern.emptyDimensionButton', { + defaultMessage: 'Empty dimension', +}); + +const getAdditionalClassesOnDroppable = (dropType?: string) => { + if (dropType === 'move_incompatible' || dropType === 'replace_incompatible') { + return 'lnsDragDrop-notCompatible'; + } +}; + export function EmptyDimensionButton({ - dragDropContext, group, layerDatasource, layerDatasourceDropProps, @@ -25,48 +34,58 @@ export function EmptyDimensionButton({ onClick, onDrop, }: { - dragDropContext: DragContextState; layerId: string; groupIndex: number; layerIndex: number; onClick: (id: string) => void; - onDrop: (droppedItem: DragDropIdentifier, dropTarget: DragDropIdentifier) => void; + onDrop: ( + droppedItem: DragDropIdentifier, + dropTarget: DragDropIdentifier, + dropType?: DropType + ) => void; group: VisualizationDimensionGroupConfig; - layerDatasource: Datasource; layerDatasourceDropProps: LayerDatasourceDropProps; }) { - const handleDrop = (droppedItem: DragDropIdentifier) => onDrop(droppedItem, value); + const itemIndex = group.accessors.length; - const value = useMemo(() => { - const newId = generateId(); - return { - columnId: newId, + const [newColumnId, setNewColumnId] = useState(generateId()); + useEffect(() => { + setNewColumnId(generateId()); + }, [itemIndex]); + + const dropType = layerDatasource.getDropTypes({ + ...layerDatasourceDropProps, + columnId: newColumnId, + filterOperations: group.filterOperations, + groupId: group.groupId, + }); + + const value = useMemo( + () => ({ + columnId: newColumnId, groupId: group.groupId, layerId, - isNew: true, - id: newId, - }; - // eslint-disable-next-line react-hooks/exhaustive-deps - }, [group.accessors.length, group.groupId, layerId]); + id: newColumnId, + dropType, + humanData: { + label, + groupLabel: group.groupLabel, + position: itemIndex + 1, + }, + }), + [dropType, newColumnId, group.groupId, layerId, group.groupLabel, itemIndex] + ); return (
    onDrop(droppedItem, value, selectedDropType)} + dropType={dropType} >
    {}, setA11yMessage: jest.fn(), + registerDropTarget: jest.fn(), }; describe('LayerPanel', () => { @@ -224,7 +225,7 @@ describe('LayerPanel', () => { }); it('should not update the visualization if the datasource is incomplete', () => { - (generateId as jest.Mock).mockReturnValueOnce(`newid`); + (generateId as jest.Mock).mockReturnValue(`newid`); const updateAll = jest.fn(); const updateDatasource = jest.fn(); @@ -439,9 +440,14 @@ describe('LayerPanel', () => { ], }); - mockDatasource.canHandleDrop.mockReturnValue(true); + mockDatasource.getDropTypes.mockReturnValue('field_add'); - const draggingField = { field: { name: 'dragged' }, indexPatternId: 'a', id: '1' }; + const draggingField = { + field: { name: 'dragged' }, + indexPatternId: 'a', + id: '1', + humanData: { label: 'Label' }, + }; const component = mountWithIntl( @@ -449,7 +455,7 @@ describe('LayerPanel', () => { ); - expect(mockDatasource.canHandleDrop).toHaveBeenCalledWith( + expect(mockDatasource.getDropTypes).toHaveBeenCalledWith( expect.objectContaining({ dragDropContext: expect.objectContaining({ dragging: draggingField, @@ -482,9 +488,16 @@ describe('LayerPanel', () => { ], }); - mockDatasource.canHandleDrop.mockImplementation(({ columnId }) => columnId !== 'a'); + mockDatasource.getDropTypes.mockImplementation(({ columnId }) => + columnId !== 'a' ? 'field_replace' : undefined + ); - const draggingField = { field: { name: 'dragged' }, indexPatternId: 'a', id: '1' }; + const draggingField = { + field: { name: 'dragged' }, + indexPatternId: 'a', + id: '1', + humanData: { label: 'Label' }, + }; const component = mountWithIntl( @@ -492,13 +505,13 @@ describe('LayerPanel', () => { ); - expect(mockDatasource.canHandleDrop).toHaveBeenCalledWith( + expect(mockDatasource.getDropTypes).toHaveBeenCalledWith( expect.objectContaining({ columnId: 'a' }) ); expect( - component.find('[data-test-subj="lnsGroup"] DragDrop').first().prop('droppable') - ).toEqual(false); + component.find('[data-test-subj="lnsGroup"] DragDrop').first().prop('dropType') + ).toEqual(undefined); component .find('[data-test-subj="lnsGroup"] DragDrop') @@ -533,9 +546,15 @@ describe('LayerPanel', () => { ], }); - mockDatasource.canHandleDrop.mockReturnValue(true); + mockDatasource.getDropTypes.mockReturnValue('replace_compatible'); - const draggingOperation = { layerId: 'first', columnId: 'a', groupId: 'a', id: 'a' }; + const draggingOperation = { + layerId: 'first', + columnId: 'a', + groupId: 'a', + id: 'a', + humanData: { label: 'Label' }, + }; const component = mountWithIntl( @@ -543,7 +562,7 @@ describe('LayerPanel', () => { ); - expect(mockDatasource.canHandleDrop).toHaveBeenCalledWith( + expect(mockDatasource.getDropTypes).toHaveBeenCalledWith( expect.objectContaining({ dragDropContext: expect.objectContaining({ dragging: draggingOperation, @@ -588,7 +607,13 @@ describe('LayerPanel', () => { ], }); - const draggingOperation = { layerId: 'first', columnId: 'a', groupId: 'a', id: 'a' }; + const draggingOperation = { + layerId: 'first', + columnId: 'a', + groupId: 'a', + id: 'a', + humanData: { label: 'Label' }, + }; const component = mountWithIntl( @@ -596,15 +621,10 @@ describe('LayerPanel', () => { ); - component.find(DragDrop).at(1).prop('onDrop')!(draggingOperation, { - layerId: 'first', - columnId: 'b', - groupId: 'a', - id: 'b', - }); + component.find(DragDrop).at(1).prop('onDrop')!(draggingOperation, 'reorder'); expect(mockDatasource.onDrop).toHaveBeenCalledWith( expect.objectContaining({ - groupId: 'a', + dropType: 'reorder', droppedItem: draggingOperation, }) ); @@ -624,22 +644,24 @@ describe('LayerPanel', () => { ], }); - const draggingOperation = { layerId: 'first', columnId: 'a', groupId: 'a', id: 'a' }; + const draggingOperation = { + layerId: 'first', + columnId: 'a', + groupId: 'a', + id: 'a', + humanData: { label: 'Label' }, + }; const component = mountWithIntl( ); - - component.find('[data-test-subj="lnsGroup"] DragDrop').at(2).prop('onDrop')!( - (draggingOperation as unknown) as DroppableEvent - ); + component.find(DragDrop).at(2).prop('onDrop')!(draggingOperation, 'duplicate_in_group'); expect(mockDatasource.onDrop).toHaveBeenCalledWith( expect.objectContaining({ - groupId: 'a', + dropType: 'duplicate_in_group', droppedItem: draggingOperation, - isNew: true, }) ); }); diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.tsx index bfdd3ec3bb59a..80e9ed05b982d 100644 --- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.tsx +++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.tsx @@ -11,7 +11,7 @@ import React, { useContext, useState, useEffect, useMemo, useCallback } from 're import { EuiPanel, EuiSpacer, EuiFlexGroup, EuiFlexItem, EuiFormRow } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; import { NativeRenderer } from '../../../native_renderer'; -import { StateSetter, Visualization } from '../../../types'; +import { StateSetter, Visualization, DraggedOperation, DropType } from '../../../types'; import { DragContext, DragDropIdentifier, @@ -115,13 +115,19 @@ export function LayerPanel( const layerDatasourceOnDrop = layerDatasource.onDrop; const onDrop = useMemo(() => { - return (droppedItem: DragDropIdentifier, targetItem: DragDropIdentifier) => { - const { columnId, groupId, layerId: targetLayerId, isNew } = (targetItem as unknown) as { - groupId: string; - columnId: string; - layerId: string; - isNew?: boolean; - }; + return ( + droppedItem: DragDropIdentifier, + targetItem: DragDropIdentifier, + dropType?: DropType + ) => { + if (!dropType) { + return; + } + const { + columnId, + groupId, + layerId: targetLayerId, + } = (targetItem as unknown) as DraggedOperation; // TODO: correct misleading name const filterOperations = groups.find(({ groupId: gId }) => gId === targetItem.groupId)?.filterOperations || @@ -131,10 +137,9 @@ export function LayerPanel( ...layerDatasourceDropProps, droppedItem, columnId, - groupId, layerId: targetLayerId, - isNew, filterOperations, + dropType, }); if (dropResult) { updateVisualization( @@ -317,7 +322,6 @@ export function LayerPanel( {group.supportsMoreColumns ? ( { getDatasourceSuggestionsForVisualizeField: () => [generateSuggestion()], renderDataPanel: (_element, { dragDropContext: { setDragging, dragging } }) => { if (!dragging || dragging.id !== 'draggedField') { - setDragging({ id: 'draggedField' }); + setDragging({ id: 'draggedField', humanData: { label: 'draggedField' } }); } }, }, @@ -1344,8 +1344,9 @@ describe('editor_frame', () => { indexPatternId: '1', field: {}, id: '1', + humanData: { label: 'draggedField' }, }, - { id: 'lnsWorkspace' } + 'field_replace' ); }); @@ -1424,7 +1425,7 @@ describe('editor_frame', () => { getDatasourceSuggestionsForVisualizeField: () => [generateSuggestion()], renderDataPanel: (_element, { dragDropContext: { setDragging, dragging } }) => { if (!dragging || dragging.id !== 'draggedField') { - setDragging({ id: 'draggedField' }); + setDragging({ id: 'draggedField', humanData: { label: '1' } }); } }, }, @@ -1445,8 +1446,11 @@ describe('editor_frame', () => { indexPatternId: '1', field: {}, id: '1', + humanData: { + label: 'label', + }, }, - { id: 'lnsWorkspace' } + 'field_replace' ); }); diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/suggestion_helpers.test.ts b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/suggestion_helpers.test.ts index bc2abb694eefe..0e8c9b962b995 100644 --- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/suggestion_helpers.test.ts +++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/suggestion_helpers.test.ts @@ -532,7 +532,7 @@ describe('suggestion helpers', () => { { mockindexpattern: { state: mockDatasourceState, isLoading: false }, }, - { id: 'myfield' }, + { id: 'myfield', humanData: { label: 'myfieldLabel' } }, ]; }); @@ -543,6 +543,9 @@ describe('suggestion helpers', () => { mockDatasourceState, { id: 'myfield', + humanData: { + label: 'myfieldLabel', + }, } ); }); diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/workspace_panel.test.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/workspace_panel.test.tsx index e3385f504763c..48aa56efdb3cc 100644 --- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/workspace_panel.test.tsx +++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/workspace_panel.test.tsx @@ -775,7 +775,7 @@ describe('workspace_panel', () => { let mockGetSuggestionForField: jest.Mock; let frame: jest.Mocked; - const draggedField = { id: 'field' }; + const draggedField = { id: 'field', humanData: { label: 'Label' } }; beforeEach(() => { frame = createMockFramePublicAPI(); @@ -793,6 +793,7 @@ describe('workspace_panel', () => { keyboardMode={false} setKeyboardMode={() => {}} setA11yMessage={() => {}} + registerDropTarget={jest.fn()} > { }); initComponent(); - instance.find(DragDrop).prop('onDrop')!(draggedField, { id: 'lnsWorkspace' }); + instance.find(DragDrop).prop('onDrop')!(draggedField, 'field_replace'); expect(mockDispatch).toHaveBeenCalledWith({ type: 'SWITCH_VISUALIZATION', @@ -850,12 +851,12 @@ describe('workspace_panel', () => { visualizationState: {}, }); initComponent(); - expect(instance.find(DragDrop).prop('droppable')).toBeTruthy(); + expect(instance.find(DragDrop).prop('dropType')).toBeTruthy(); }); it('should refuse to drop if there are no suggestions', () => { initComponent(); - expect(instance.find(DragDrop).prop('droppable')).toBeFalsy(); + expect(instance.find(DragDrop).prop('dropType')).toBeFalsy(); }); }); }); diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/workspace_panel.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/workspace_panel.tsx index 208dc823c314c..2c4cecd356ced 100644 --- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/workspace_panel.tsx +++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/workspace_panel.tsx @@ -84,7 +84,17 @@ interface WorkspaceState { expandError: boolean; } -const workspaceDropValue = { id: 'lnsWorkspace' }; +const dropProps = { + value: { + id: 'lnsWorkspace', + humanData: { + label: i18n.translate('xpack.lens.editorFrame.workspaceLabel', { + defaultMessage: 'Workspace', + }), + }, + }, + order: [1, 0, 0, 0], +}; // Exported for testing purposes only. export const WorkspacePanel = React.memo(function WorkspacePanel({ @@ -302,9 +312,10 @@ export const WorkspacePanel = React.memo(function WorkspacePanel({ className="lnsWorkspacePanel__dragDrop" dataTestSubj="lnsWorkspace" draggable={false} - droppable={Boolean(suggestionForDraggedField)} + dropType={suggestionForDraggedField ? 'field_add' : undefined} onDrop={onDrop} - value={workspaceDropValue} + value={dropProps.value} + order={dropProps.order} >
    {renderVisualization()} diff --git a/x-pack/plugins/lens/public/editor_frame_service/mocks.tsx b/x-pack/plugins/lens/public/editor_frame_service/mocks.tsx index 9bc4e5401f070..61404dd1b71be 100644 --- a/x-pack/plugins/lens/public/editor_frame_service/mocks.tsx +++ b/x-pack/plugins/lens/public/editor_frame_service/mocks.tsx @@ -88,7 +88,7 @@ export function createMockDatasource(id: string): DatasourceMock { uniqueLabels: jest.fn((_state) => ({})), renderDimensionTrigger: jest.fn(), renderDimensionEditor: jest.fn(), - canHandleDrop: jest.fn(), + getDropTypes: jest.fn(), onDrop: jest.fn(), // this is an additional property which doesn't exist on real datasources diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/datapanel.test.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/datapanel.test.tsx index e062c152f8ec4..03f281e90f6b5 100644 --- a/x-pack/plugins/lens/public/indexpattern_datasource/datapanel.test.tsx +++ b/x-pack/plugins/lens/public/indexpattern_datasource/datapanel.test.tsx @@ -281,7 +281,7 @@ describe('IndexPattern Data Panel', () => { setState={setStateSpy} dragDropContext={{ ...createMockedDragDropContext(), - dragging: { id: '1' }, + dragging: { id: '1', humanData: { label: 'Label' } }, }} /> ); @@ -303,7 +303,7 @@ describe('IndexPattern Data Panel', () => { setState={jest.fn()} dragDropContext={{ ...createMockedDragDropContext(), - dragging: { id: '1' }, + dragging: { id: '1', humanData: { label: 'Label' } }, }} changeIndexPattern={jest.fn()} /> @@ -338,7 +338,7 @@ describe('IndexPattern Data Panel', () => { setState, dragDropContext: { ...createMockedDragDropContext(), - dragging: { id: '1' }, + dragging: { id: '1', humanData: { label: 'Label' } }, }, dateRange: { fromDate: '2019-01-01', toDate: '2020-01-01' }, state: { diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_panel.test.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_panel.test.tsx index 3273cdbfe1742..c26d35c4d9a5d 100644 --- a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_panel.test.tsx +++ b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_panel.test.tsx @@ -106,9 +106,6 @@ const bytesColumn: IndexPatternColumn = { * * - Dimension trigger: Not tested here * - Dimension editor component: First half of the tests - * - * - canHandleDrop: Tests for dropping of fields or other dimensions - * - onDrop: Correct application of drop logic */ describe('IndexPatternDimensionEditorPanel', () => { let state: IndexPatternPrivateState; diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/droppable.test.ts b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/droppable.test.ts index 8c411aa3a5a6c..b374be98748f0 100644 --- a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/droppable.test.ts +++ b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/droppable.test.ts @@ -7,14 +7,14 @@ import { DataPublicPluginStart } from '../../../../../../src/plugins/data/public'; import { IndexPatternDimensionEditorProps } from './dimension_panel'; -import { onDrop, canHandleDrop } from './droppable'; +import { onDrop, getDropTypes } from './droppable'; import { DragContextState } from '../../drag_drop'; import { createMockedDragDropContext } from '../mocks'; import { IUiSettingsClient, SavedObjectsClientContract, HttpSetup, CoreSetup } from 'kibana/public'; import { IStorageWrapper } from 'src/plugins/kibana_utils/public'; import { IndexPatternPrivateState } from '../types'; import { documentField } from '../document_field'; -import { OperationMetadata } from '../../types'; +import { OperationMetadata, DropType } from '../../types'; import { IndexPatternColumn } from '../operations'; import { getFieldByNameFactory } from '../pure_helpers'; @@ -66,6 +66,23 @@ const expectedIndexPatterns = { }, }; +const defaultDragging = { + columnId: 'col2', + groupId: 'a', + layerId: 'first', + id: 'col2', + humanData: { + label: 'Column 2', + }, +}; + +const draggingField = { + field: { type: 'number', name: 'bytes', aggregatable: true }, + indexPatternId: 'foo', + id: 'bar', + humanData: { label: 'Label' }, +}; + /** * The datasource exposes four main pieces of code which are tested at * an integration test level. The main reason for this fairly high level @@ -75,7 +92,7 @@ const expectedIndexPatterns = { * - Dimension trigger: Not tested here * - Dimension editor component: First half of the tests * - * - canHandleDrop: Tests for dropping of fields or other dimensions + * - getDropTypes: Returns drop types that are possible for the current dragging field or other dimension * - onDrop: Correct application of drop logic */ describe('IndexPatternDimensionEditorPanel', () => { @@ -157,522 +174,671 @@ describe('IndexPatternDimensionEditorPanel', () => { jest.clearAllMocks(); }); - it('is not droppable if no drag is happening', () => { - expect(canHandleDrop({ ...defaultProps, dragDropContext })).toBe(false); - }); + const groupId = 'a'; + describe('getDropTypes', () => { + it('returns undefined if no drag is happening', () => { + expect(getDropTypes({ ...defaultProps, groupId, dragDropContext })).toBe(undefined); + }); - it('is not droppable if the dragged item has no field', () => { - expect( - canHandleDrop({ - ...defaultProps, - dragDropContext: { - ...dragDropContext, - dragging: { name: 'bar', id: 'bar' }, - }, - }) - ).toBe(false); - }); + it('returns undefined if the dragged item has no field', () => { + expect( + getDropTypes({ + ...defaultProps, + groupId, + dragDropContext: { + ...dragDropContext, + dragging: { name: 'bar', id: 'bar', humanData: { label: 'Label' } }, + }, + }) + ).toBe(undefined); + }); - it('is not droppable if field is not supported by filterOperations', () => { - expect( - canHandleDrop({ - ...defaultProps, - dragDropContext: { - ...dragDropContext, - dragging: { - indexPatternId: 'foo', - field: { type: 'string', name: 'mystring', aggregatable: true }, - id: 'mystring', + it('returns undefined if field is not supported by filterOperations', () => { + expect( + getDropTypes({ + ...defaultProps, + groupId, + dragDropContext: { + ...dragDropContext, + dragging: { + indexPatternId: 'foo', + field: { type: 'string', name: 'mystring', aggregatable: true }, + id: 'mystring', + humanData: { label: 'Label' }, + }, + }, + filterOperations: () => false, + }) + ).toBe(undefined); + }); + + it('returns remove_add if the field is supported by filterOperations and the dropTarget is an existing column', () => { + expect( + getDropTypes({ + ...defaultProps, + groupId, + dragDropContext: { + ...dragDropContext, + dragging: draggingField, + }, + filterOperations: (op: OperationMetadata) => op.dataType === 'number', + }) + ).toBe('field_replace'); + }); + + it('returns undefined if the field belongs to another index pattern', () => { + expect( + getDropTypes({ + ...defaultProps, + groupId, + dragDropContext: { + ...dragDropContext, + dragging: { + field: { type: 'number', name: 'bar', aggregatable: true }, + indexPatternId: 'foo2', + id: 'bar', + humanData: { label: 'Label' }, + }, + }, + filterOperations: (op: OperationMetadata) => op.dataType === 'number', + }) + ).toBe(undefined); + }); + + it('returns undefined if the dragged field is already in use by this operation', () => { + expect( + getDropTypes({ + ...defaultProps, + groupId, + dragDropContext: { + ...dragDropContext, + dragging: { + field: { + name: 'timestamp', + displayName: 'timestampLabel', + type: 'date', + aggregatable: true, + searchable: true, + exists: true, + }, + indexPatternId: 'foo', + id: 'bar', + humanData: { label: 'Label' }, + }, + }, + }) + ).toBe(undefined); + }); + + it('returns move if the dragged column is compatible', () => { + expect( + getDropTypes({ + ...defaultProps, + groupId, + dragDropContext: { + ...dragDropContext, + dragging: { + columnId: 'col1', + groupId: 'b', + layerId: 'first', + id: 'col1', + humanData: { label: 'Label' }, + }, + }, + columnId: 'col2', + }) + ).toBe('move_compatible'); + }); + + it('returns undefined if the dragged column from different group uses the same field as the dropTarget', () => { + const testState = { ...state }; + testState.layers.first = { + indexPatternId: 'foo', + columnOrder: ['col1', 'col2', 'col3'], + columns: { + col1: testState.layers.first.columns.col1, + + col2: { + label: 'Date histogram of timestamp (1)', + customLabel: true, + dataType: 'date', + isBucketed: true, + + // Private + operationType: 'date_histogram', + params: { + interval: '1d', + }, + sourceField: 'timestamp', }, }, - filterOperations: () => false, - }) - ).toBe(false); - }); + }; - it('is droppable if the field is supported by filterOperations', () => { - expect( - canHandleDrop({ - ...defaultProps, - dragDropContext: { - ...dragDropContext, - dragging: { - field: { type: 'number', name: 'bytes', aggregatable: true }, - indexPatternId: 'foo', - id: 'bar', + expect( + getDropTypes({ + ...defaultProps, + groupId, + dragDropContext: { + ...dragDropContext, + dragging: { + columnId: 'col1', + groupId: 'b', + layerId: 'first', + id: 'col1', + humanData: { label: 'Label' }, + }, + }, + columnId: 'col2', + }) + ).toEqual(undefined); + }); + + it('returns replace_incompatible if dropping column to existing incompatible column', () => { + const testState = { ...state }; + testState.layers.first = { + indexPatternId: 'foo', + columnOrder: ['col1', 'col2', 'col3'], + columns: { + col1: testState.layers.first.columns.col1, + + col2: { + label: 'Sum of bytes', + dataType: 'number', + isBucketed: false, + + // Private + operationType: 'sum', + sourceField: 'bytes', }, }, - filterOperations: (op: OperationMetadata) => op.dataType === 'number', - }) - ).toBe(true); - }); + }; - it('is not droppable if the field belongs to another index pattern', () => { - expect( - canHandleDrop({ + expect( + getDropTypes({ + ...defaultProps, + groupId, + dragDropContext: { + ...dragDropContext, + dragging: { + columnId: 'col1', + groupId: 'b', + layerId: 'first', + id: 'col1', + humanData: { label: 'Label' }, + }, + }, + columnId: 'col2', + filterOperations: (op: OperationMetadata) => op.isBucketed === false, + }) + ).toEqual('replace_incompatible'); + }); + }); + describe('onDrop', () => { + it('appends the dropped column when a field is dropped', () => { + onDrop({ ...defaultProps, dragDropContext: { ...dragDropContext, - dragging: { - field: { type: 'number', name: 'bar', aggregatable: true }, - indexPatternId: 'foo2', - id: 'bar', - }, + dragging: draggingField, }, + droppedItem: draggingField, + dropType: 'field_replace', + columnId: 'col2', filterOperations: (op: OperationMetadata) => op.dataType === 'number', - }) - ).toBe(false); - }); + }); - it('is not droppable if the dragged field is already in use by this operation', () => { - expect( - canHandleDrop({ - ...defaultProps, - dragDropContext: { - ...dragDropContext, - dragging: { - field: { - name: 'timestamp', - displayName: 'timestampLabel', - type: 'date', - aggregatable: true, - searchable: true, - exists: true, + expect(setState).toBeCalledTimes(1); + expect(setState).toHaveBeenCalledWith({ + ...state, + layers: { + first: { + ...state.layers.first, + columnOrder: ['col1', 'col2'], + columns: { + ...state.layers.first.columns, + col2: expect.objectContaining({ + dataType: 'number', + sourceField: 'bytes', + }), }, - indexPatternId: 'foo', - id: 'bar', }, }, - }) - ).toBe(false); - }); + }); + }); - it('is droppable if the dragged column is compatible', () => { - expect( - canHandleDrop({ + it('selects the specific operation that was valid on drop', () => { + onDrop({ ...defaultProps, dragDropContext: { ...dragDropContext, - dragging: { - columnId: 'col1', - groupId: 'a', - layerId: 'first', - id: 'col1', - }, + dragging: draggingField, }, + droppedItem: draggingField, columnId: 'col2', - }) - ).toBe(true); - }); + filterOperations: (op: OperationMetadata) => op.isBucketed, + dropType: 'field_replace', + }); - it('is not droppable if the dragged column is the same as the current column', () => { - expect( - canHandleDrop({ - ...defaultProps, - dragDropContext: { - ...dragDropContext, - dragging: { - columnId: 'col1', - groupId: 'a', - layerId: 'first', - id: 'bar', + expect(setState).toBeCalledTimes(1); + expect(setState).toHaveBeenCalledWith({ + ...state, + layers: { + first: { + ...state.layers.first, + columnOrder: ['col1', 'col2'], + columns: { + ...state.layers.first.columns, + col2: expect.objectContaining({ + dataType: 'number', + sourceField: 'bytes', + }), + }, }, }, - }) - ).toBe(false); - }); + }); + }); - it('is not droppable if the dragged column is incompatible', () => { - expect( - canHandleDrop({ + it('updates a column when a field is dropped', () => { + onDrop({ ...defaultProps, dragDropContext: { ...dragDropContext, - dragging: { - columnId: 'col1', - groupId: 'a', - layerId: 'first', - id: 'bar', - }, + dragging: draggingField, }, - columnId: 'col2', + droppedItem: draggingField, filterOperations: (op: OperationMetadata) => op.dataType === 'number', - }) - ).toBe(false); - }); - - it('appends the dropped column when a field is dropped', () => { - const dragging = { - field: { type: 'number', name: 'bytes', aggregatable: true }, - indexPatternId: 'foo', - id: 'bar', - }; - - onDrop({ - ...defaultProps, - dragDropContext: { - ...dragDropContext, - dragging, - }, - droppedItem: dragging, - columnId: 'col2', - filterOperations: (op: OperationMetadata) => op.dataType === 'number', - groupId: '1', - }); + dropType: 'field_replace', + }); - expect(setState).toBeCalledTimes(1); - expect(setState).toHaveBeenCalledWith({ - ...state, - layers: { - first: { - ...state.layers.first, - columnOrder: ['col1', 'col2'], - columns: { - ...state.layers.first.columns, - col2: expect.objectContaining({ - dataType: 'number', - sourceField: 'bytes', + expect(setState).toBeCalledTimes(1); + expect(setState).toHaveBeenCalledWith({ + ...state, + layers: { + first: expect.objectContaining({ + columns: expect.objectContaining({ + col1: expect.objectContaining({ + dataType: 'number', + sourceField: 'bytes', + }), }), - }, + }), }, - }, + }); }); - }); - it('selects the specific operation that was valid on drop', () => { - const dragging = { - field: { type: 'string', name: 'source', aggregatable: true }, - indexPatternId: 'foo', - id: 'bar', - }; - onDrop({ - ...defaultProps, - dragDropContext: { - ...dragDropContext, - dragging, - }, - droppedItem: dragging, - columnId: 'col2', - filterOperations: (op: OperationMetadata) => op.isBucketed, - groupId: '1', - }); - - expect(setState).toBeCalledTimes(1); - expect(setState).toHaveBeenCalledWith({ - ...state, - layers: { - first: { - ...state.layers.first, - columnOrder: ['col2', 'col1'], - columns: { - ...state.layers.first.columns, - col2: expect.objectContaining({ - dataType: 'string', - sourceField: 'source', - }), + it('keeps the operation when dropping a different compatible field', () => { + const dragging = { + field: { name: 'memory', type: 'number', aggregatable: true }, + indexPatternId: 'foo', + id: '1', + humanData: { label: 'Label' }, + }; + onDrop({ + ...defaultProps, + dragDropContext: { + ...dragDropContext, + dragging, + }, + droppedItem: { + field: { name: 'memory', type: 'number', aggregatable: true }, + indexPatternId: 'foo', + id: '1', + }, + state: { + ...state, + layers: { + first: { + indexPatternId: 'foo', + columnOrder: ['col1'], + columns: { + col1: { + label: 'Sum of bytes', + dataType: 'number', + isBucketed: false, + + // Private + operationType: 'sum', + sourceField: 'bytes', + }, + }, + }, }, }, - }, - }); - }); + dropType: 'field_replace', + }); - it('updates a column when a field is dropped', () => { - const dragging = { - field: { type: 'number', name: 'bytes', aggregatable: true }, - indexPatternId: 'foo', - id: 'bar', - }; - onDrop({ - ...defaultProps, - dragDropContext: { - ...dragDropContext, - dragging, - }, - droppedItem: dragging, - filterOperations: (op: OperationMetadata) => op.dataType === 'number', - groupId: '1', - }); - - expect(setState).toBeCalledTimes(1); - expect(setState).toHaveBeenCalledWith({ - ...state, - layers: { - first: expect.objectContaining({ - columns: expect.objectContaining({ - col1: expect.objectContaining({ - dataType: 'number', - sourceField: 'bytes', + expect(setState).toBeCalledTimes(1); + expect(setState).toHaveBeenCalledWith({ + ...state, + layers: { + first: expect.objectContaining({ + columns: expect.objectContaining({ + col1: expect.objectContaining({ + operationType: 'sum', + dataType: 'number', + sourceField: 'memory', + }), }), }), - }), - }, + }, + }); }); - }); - it('keeps the operation when dropping a different compatible field', () => { - const dragging = { - field: { name: 'memory', type: 'number', aggregatable: true }, - indexPatternId: 'foo', - id: '1', - }; - onDrop({ - ...defaultProps, - dragDropContext: { - ...dragDropContext, - dragging, - }, - droppedItem: dragging, - state: { + it('updates the column id when moving an operation to an empty dimension', () => { + const dragging = { + columnId: 'col1', + groupId: 'a', + layerId: 'first', + id: 'bar', + humanData: { label: 'Label' }, + }; + + onDrop({ + ...defaultProps, + dragDropContext: { + ...dragDropContext, + dragging, + }, + droppedItem: dragging, + columnId: 'col2', + dropType: 'move_compatible', + }); + + expect(setState).toBeCalledTimes(1); + expect(setState).toHaveBeenCalledWith({ ...state, layers: { first: { - indexPatternId: 'foo', - columnOrder: ['col1'], + ...state.layers.first, + columnOrder: ['col2'], columns: { - col1: { - label: 'Sum of bytes', - dataType: 'number', - isBucketed: false, - - // Private - operationType: 'sum', - sourceField: 'bytes', - }, + col2: state.layers.first.columns.col1, }, }, }, - }, - groupId: '1', + }); }); - expect(setState).toBeCalledTimes(1); - expect(setState).toHaveBeenCalledWith({ - ...state, - layers: { - first: expect.objectContaining({ - columns: expect.objectContaining({ - col1: expect.objectContaining({ - operationType: 'sum', - dataType: 'number', - sourceField: 'memory', - }), - }), - }), - }, - }); - }); - - it('updates the column id when moving an operation to an empty dimension', () => { - const dragging = { - columnId: 'col1', - groupId: 'a', - layerId: 'first', - id: 'bar', - }; - - onDrop({ - ...defaultProps, - dragDropContext: { - ...dragDropContext, - dragging, - }, - droppedItem: dragging, - columnId: 'col2', - groupId: '1', - }); - - expect(setState).toBeCalledTimes(1); - expect(setState).toHaveBeenCalledWith({ - ...state, - layers: { - first: { - ...state.layers.first, - columnOrder: ['col2'], - columns: { - col2: state.layers.first.columns.col1, + it('replaces an operation when moving to a populated dimension', () => { + const testState = { ...state }; + testState.layers.first = { + indexPatternId: 'foo', + columnOrder: ['col1', 'col2', 'col3'], + columns: { + col1: testState.layers.first.columns.col1, + + col2: { + label: 'Top values of src', + dataType: 'string', + isBucketed: true, + + // Private + operationType: 'terms', + params: { + orderBy: { type: 'column', columnId: 'col3' }, + orderDirection: 'desc', + size: 10, + }, + sourceField: 'src', }, - }, - }, - }); - }); - - it('replaces an operation when moving to a populated dimension', () => { - const dragging = { - columnId: 'col2', - groupId: 'a', - layerId: 'first', - id: 'col2', - }; - const testState = { ...state }; - testState.layers.first = { - indexPatternId: 'foo', - columnOrder: ['col1', 'col2', 'col3'], - columns: { - col1: testState.layers.first.columns.col1, - - col2: { - label: 'Top values of src', - dataType: 'string', - isBucketed: true, - - // Private - operationType: 'terms', - params: { - orderBy: { type: 'column', columnId: 'col3' }, - orderDirection: 'desc', - size: 10, + col3: { + label: 'Count', + dataType: 'number', + isBucketed: false, + + // Private + operationType: 'count', + sourceField: 'Records', }, - sourceField: 'src', }, - col3: { - label: 'Count', - dataType: 'number', - isBucketed: false, - - // Private - operationType: 'count', - sourceField: 'Records', - }, - }, - }; + }; - onDrop({ - ...defaultProps, - dragDropContext: { - ...dragDropContext, - dragging, - }, - droppedItem: dragging, - state: testState, - groupId: '1', - }); + onDrop({ + ...defaultProps, + dragDropContext: { + ...dragDropContext, + dragging: defaultDragging, + }, + droppedItem: defaultDragging, + state: testState, + dropType: 'replace_compatible', + }); - expect(setState).toBeCalledTimes(1); - expect(setState).toHaveBeenCalledWith({ - ...testState, - layers: { - first: { - ...testState.layers.first, - columnOrder: ['col1', 'col3'], - columns: { - col1: testState.layers.first.columns.col2, - col3: testState.layers.first.columns.col3, + expect(setState).toBeCalledTimes(1); + expect(setState).toHaveBeenCalledWith({ + ...testState, + layers: { + first: { + ...testState.layers.first, + columnOrder: ['col1', 'col3'], + columns: { + col1: testState.layers.first.columns.col2, + col3: testState.layers.first.columns.col3, + }, }, }, - }, + }); }); - }); - it('if dnd is reorder, it correctly reorders columns', () => { - const dragging = { - columnId: 'col1', - groupId: 'a', - layerId: 'first', - id: 'col1', - }; - const testState = { - ...state, - layers: { - first: { - indexPatternId: 'foo', - columnOrder: ['col1', 'col2', 'col3'], - columns: { - col1: { - label: 'Date histogram of timestamp', - dataType: 'date', - isBucketed: true, - } as IndexPatternColumn, - col2: { - label: 'Top values of bar', - dataType: 'number', - isBucketed: true, - } as IndexPatternColumn, - col3: { - label: 'Top values of memory', - dataType: 'number', - isBucketed: true, - } as IndexPatternColumn, + it('copies a dimension if dropType is duplicate_in_group, respecting bucket metric order', () => { + const testState = { ...state }; + testState.layers.first = { + indexPatternId: 'foo', + columnOrder: ['col1', 'col2', 'col3'], + columns: { + col1: testState.layers.first.columns.col1, + + col2: { + label: 'Top values of src', + dataType: 'string', + isBucketed: true, + + // Private + operationType: 'terms', + params: { + orderBy: { type: 'column', columnId: 'col3' }, + orderDirection: 'desc', + size: 10, + }, + sourceField: 'src', + }, + col3: { + label: 'Count', + dataType: 'number', + isBucketed: false, + + // Private + operationType: 'count', + sourceField: 'Records', }, }, - }, - }; + }; - const defaultReorderDropParams = { - ...defaultProps, - isReorder: true, - dragDropContext: { - ...dragDropContext, - dragging, - }, - droppedItem: dragging, - state: testState, - filterOperations: (op: OperationMetadata) => op.dataType === 'number', - groupId: 'a', - }; + const metricDragging = { + columnId: 'col3', + groupId: 'a', + layerId: 'first', + id: 'col3', + humanData: { label: 'Label' }, + }; - const stateWithColumnOrder = (columnOrder: string[]) => { - return { + onDrop({ + ...defaultProps, + dragDropContext: { + ...dragDropContext, + dragging: metricDragging, + }, + droppedItem: metricDragging, + state: testState, + dropType: 'duplicate_in_group', + columnId: 'newCol', + }); + // metric is appended + expect(setState).toHaveBeenCalledWith({ ...testState, layers: { first: { ...testState.layers.first, - columnOrder, + columnOrder: ['col1', 'col2', 'col3', 'newCol'], columns: { - ...testState.layers.first.columns, + col1: testState.layers.first.columns.col1, + col2: testState.layers.first.columns.col2, + col3: testState.layers.first.columns.col3, + newCol: testState.layers.first.columns.col3, }, }, }, - }; - }; - - // first element to last - onDrop({ - ...defaultReorderDropParams, - columnId: 'col3', - }); - expect(setState).toBeCalledTimes(1); - expect(setState).toHaveBeenCalledWith(stateWithColumnOrder(['col2', 'col3', 'col1'])); + }); - // last element to first - onDrop({ - ...defaultReorderDropParams, - columnId: 'col1', - droppedItem: { - columnId: 'col3', - groupId: 'a', - layerId: 'first', - id: 'col3', - }, - }); - expect(setState).toBeCalledTimes(2); - expect(setState).toHaveBeenCalledWith(stateWithColumnOrder(['col3', 'col1', 'col2'])); - - // middle column to first - onDrop({ - ...defaultReorderDropParams, - columnId: 'col1', - droppedItem: { + const bucketDragging = { columnId: 'col2', groupId: 'a', layerId: 'first', id: 'col2', - }, + humanData: { label: 'Label' }, + }; + + onDrop({ + ...defaultProps, + dragDropContext: { + ...dragDropContext, + dragging: bucketDragging, + }, + droppedItem: bucketDragging, + state: testState, + dropType: 'duplicate_in_group', + columnId: 'newCol', + }); + + // bucket is placed after the last existing bucket + expect(setState).toHaveBeenCalledWith({ + ...testState, + layers: { + first: { + ...testState.layers.first, + columnOrder: ['col1', 'col2', 'newCol', 'col3'], + columns: { + col1: testState.layers.first.columns.col1, + col2: testState.layers.first.columns.col2, + newCol: testState.layers.first.columns.col2, + col3: testState.layers.first.columns.col3, + }, + }, + }, + }); }); - expect(setState).toBeCalledTimes(3); - expect(setState).toHaveBeenCalledWith(stateWithColumnOrder(['col2', 'col1', 'col3'])); - - // middle column to last - onDrop({ - ...defaultReorderDropParams, - columnId: 'col3', - droppedItem: { - columnId: 'col2', + + it('if dropType is reorder, it correctly reorders columns', () => { + const dragging = { + columnId: 'col1', groupId: 'a', layerId: 'first', - id: 'col2', - }, + id: 'col1', + humanData: { label: 'Label' }, + }; + const testState = { + ...state, + layers: { + first: { + indexPatternId: 'foo', + columnOrder: ['col1', 'col2', 'col3'], + columns: { + col1: { + label: 'Date histogram of timestamp', + dataType: 'date', + isBucketed: true, + } as IndexPatternColumn, + col2: { + label: 'Top values of bar', + dataType: 'number', + isBucketed: true, + } as IndexPatternColumn, + col3: { + label: 'Top values of memory', + dataType: 'number', + isBucketed: true, + } as IndexPatternColumn, + }, + }, + }, + }; + + const defaultReorderDropParams = { + ...defaultProps, + dragDropContext: { + ...dragDropContext, + dragging, + }, + droppedItem: dragging, + state: testState, + filterOperations: (op: OperationMetadata) => op.dataType === 'number', + dropType: 'reorder' as DropType, + }; + + const stateWithColumnOrder = (columnOrder: string[]) => { + return { + ...testState, + layers: { + first: { + ...testState.layers.first, + columnOrder, + columns: { + ...testState.layers.first.columns, + }, + }, + }, + }; + }; + + // first element to last + onDrop({ + ...defaultReorderDropParams, + columnId: 'col3', + }); + expect(setState).toBeCalledTimes(1); + expect(setState).toHaveBeenCalledWith(stateWithColumnOrder(['col2', 'col3', 'col1'])); + + // last element to first + onDrop({ + ...defaultReorderDropParams, + columnId: 'col1', + droppedItem: { + columnId: 'col3', + groupId: 'a', + layerId: 'first', + id: 'col3', + }, + }); + expect(setState).toBeCalledTimes(2); + expect(setState).toHaveBeenCalledWith(stateWithColumnOrder(['col3', 'col1', 'col2'])); + + // middle column to first + onDrop({ + ...defaultReorderDropParams, + columnId: 'col1', + droppedItem: { + columnId: 'col2', + groupId: 'a', + layerId: 'first', + id: 'col2', + }, + }); + expect(setState).toBeCalledTimes(3); + expect(setState).toHaveBeenCalledWith(stateWithColumnOrder(['col2', 'col1', 'col3'])); + + // middle column to last + onDrop({ + ...defaultReorderDropParams, + columnId: 'col3', + droppedItem: { + columnId: 'col2', + groupId: 'a', + layerId: 'first', + id: 'col2', + }, + }); + expect(setState).toBeCalledTimes(4); + expect(setState).toHaveBeenCalledWith(stateWithColumnOrder(['col1', 'col3', 'col2'])); }); - expect(setState).toBeCalledTimes(4); - expect(setState).toHaveBeenCalledWith(stateWithColumnOrder(['col1', 'col3', 'col2'])); }); }); diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/droppable.ts b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/droppable.ts index 3fa40911062cf..cbd599743f813 100644 --- a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/droppable.ts +++ b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/droppable.ts @@ -12,39 +12,46 @@ import { DraggedOperation, } from '../../types'; import { IndexPatternColumn } from '../indexpattern'; -import { insertOrReplaceColumn } from '../operations'; +import { insertOrReplaceColumn, deleteColumn } from '../operations'; import { mergeLayer } from '../state_helpers'; import { hasField, isDraggedField } from '../utils'; -import { IndexPatternPrivateState, IndexPatternField } from '../types'; +import { IndexPatternPrivateState, IndexPatternField, DraggedField } from '../types'; import { trackUiEvent } from '../../lens_ui_telemetry'; -import { getOperationSupportMatrix, OperationSupportMatrix } from './operation_support'; +import { getOperationSupportMatrix } from './operation_support'; -type DropHandlerProps = Pick< - DatasourceDimensionDropHandlerProps, - 'columnId' | 'setState' | 'state' | 'layerId' | 'droppedItem' -> & { +type DropHandlerProps = DatasourceDimensionDropHandlerProps & { droppedItem: T; - operationSupportMatrix: OperationSupportMatrix; }; -export function canHandleDrop(props: DatasourceDimensionDropProps) { - const operationSupportMatrix = getOperationSupportMatrix(props); - +export function getDropTypes( + props: DatasourceDimensionDropProps & { groupId: string } +) { const { dragging } = props.dragDropContext; + if (!dragging) { + return; + } + const layerIndexPatternId = props.state.layers[props.layerId].indexPatternId; function hasOperationForField(field: IndexPatternField) { - return Boolean(operationSupportMatrix.operationByField[field.name]); + return !!getOperationSupportMatrix(props).operationByField[field.name]; } + const currentColumn = props.state.layers[props.layerId].columns[props.columnId]; if (isDraggedField(dragging)) { - const currentColumn = props.state.layers[props.layerId].columns[props.columnId]; - return Boolean( - layerIndexPatternId === dragging.indexPatternId && - Boolean(hasOperationForField(dragging.field)) && - (!currentColumn || - (hasField(currentColumn) && currentColumn.sourceField !== dragging.field.name)) - ); + if ( + !!(layerIndexPatternId === dragging.indexPatternId && hasOperationForField(dragging.field)) + ) { + if (!currentColumn) { + return 'field_add'; + } else if ( + (hasField(currentColumn) && currentColumn.sourceField !== dragging.field.name) || + !hasField(currentColumn) + ) { + return 'field_replace'; + } + } + return; } if ( @@ -52,12 +59,72 @@ export function canHandleDrop(props: DatasourceDimensionDropProps) { + const { droppedItem, dropType } = props; + + if (dropType === 'field_add' || dropType === 'field_replace') { + return operationOnDropMap[dropType]({ + ...props, + droppedItem: droppedItem as DraggedField, + }); + } + return operationOnDropMap[dropType]({ + ...props, + droppedItem: droppedItem as DraggedOperation, + }); +} + +const operationOnDropMap = { + field_add: onFieldDrop, + field_replace: onFieldDrop, + reorder: onReorderDrop, + duplicate_in_group: onSameGroupDuplicateDrop, + move_compatible: onMoveDropToCompatibleGroup, + replace_compatible: onMoveDropToCompatibleGroup, + move_incompatible: onMoveDropToNonCompatibleGroup, + replace_incompatible: onMoveDropToNonCompatibleGroup, +}; + function reorderElements(items: string[], dest: string, src: string) { const result = items.filter((c) => c !== src); const destIndex = items.findIndex((c) => c === src); @@ -69,7 +136,13 @@ function reorderElements(items: string[], dest: string, src: string) { return result; } -const onReorderDrop = ({ columnId, setState, state, layerId, droppedItem }: DropHandlerProps) => { +function onReorderDrop({ + columnId, + setState, + state, + layerId, + droppedItem, +}: DropHandlerProps) { setState( mergeLayer({ state, @@ -85,15 +158,98 @@ const onReorderDrop = ({ columnId, setState, state, layerId, droppedItem }: Drop ); return true; -}; +} + +function onMoveDropToNonCompatibleGroup(props: DropHandlerProps) { + const { columnId, setState, state, layerId, droppedItem } = props; + + const layer = state.layers[layerId]; + const op = { ...layer.columns[droppedItem.columnId] }; + const field = + hasField(op) && state.indexPatterns[layer.indexPatternId].getFieldByName(op.sourceField); + if (!field) { + return false; + } + + const operationSupportMatrix = getOperationSupportMatrix(props); + const operationsForNewField = operationSupportMatrix.operationByField[field.name]; + + if (!operationsForNewField || operationsForNewField.size === 0) { + return false; + } + + const currentIndexPattern = state.indexPatterns[layer.indexPatternId]; + + const newLayer = insertOrReplaceColumn({ + layer: deleteColumn({ + layer, + columnId: droppedItem.columnId, + indexPattern: currentIndexPattern, + }), + columnId, + indexPattern: currentIndexPattern, + op: operationsForNewField.values().next().value, + field, + }); + + trackUiEvent('drop_onto_dimension'); + setState( + mergeLayer({ + state, + layerId, + newLayer: { + ...newLayer, + }, + }) + ); + + return { deleted: droppedItem.columnId }; +} -const onMoveDropToCompatibleGroup = ({ +function onSameGroupDuplicateDrop({ columnId, setState, state, layerId, droppedItem, -}: DropHandlerProps) => { +}: DropHandlerProps) { + const layer = state.layers[layerId]; + + const op = { ...layer.columns[droppedItem.columnId] }; + const newColumns = { + ...layer.columns, + [columnId]: op, + }; + + const newColumnOrder = [...layer.columnOrder]; + // put a new bucketed dimension just in front of the metric dimensions, a metric dimension in the back of the array + // TODO this logic does not take into account groups - we probably need to pass the current + // group config to this position to place the column right + const insertionIndex = op.isBucketed + ? newColumnOrder.findIndex((id) => !newColumns[id].isBucketed) + : newColumnOrder.length; + newColumnOrder.splice(insertionIndex, 0, columnId); + // Time to replace + setState( + mergeLayer({ + state, + layerId, + newLayer: { + columnOrder: newColumnOrder, + columns: newColumns, + }, + }) + ); + return true; +} + +function onMoveDropToCompatibleGroup({ + columnId, + setState, + state, + layerId, + droppedItem, +}: DropHandlerProps) { const layer = state.layers[layerId]; const op = { ...layer.columns[droppedItem.columnId] }; const newColumns = { ...layer.columns }; @@ -122,18 +278,14 @@ const onMoveDropToCompatibleGroup = ({ }) ); return { deleted: droppedItem.columnId }; -}; +} + +function onFieldDrop(props: DropHandlerProps) { + const { columnId, setState, state, layerId, droppedItem } = props; + const operationSupportMatrix = getOperationSupportMatrix(props); -const onFieldDrop = ({ - columnId, - setState, - state, - layerId, - droppedItem, - operationSupportMatrix, -}: DropHandlerProps) => { function hasOperationForField(field: IndexPatternField) { - return Boolean(operationSupportMatrix.operationByField[field.name]); + return !!operationSupportMatrix.operationByField[field.name]; } if (!isDraggedField(droppedItem) || !hasOperationForField(droppedItem.field)) { @@ -176,55 +328,4 @@ const onFieldDrop = ({ trackUiEvent(hasData ? 'drop_non_empty' : 'drop_empty'); setState(mergeLayer({ state, layerId, newLayer })); return true; -}; - -export function onDrop(props: DatasourceDimensionDropHandlerProps) { - const operationSupportMatrix = getOperationSupportMatrix(props); - const { setState, state, droppedItem, columnId, layerId, groupId, isNew } = props; - - if (!isDraggedOperation(droppedItem)) { - return onFieldDrop({ - columnId, - setState, - state, - layerId, - droppedItem, - operationSupportMatrix, - }); - } - const isExistingFromSameGroup = - droppedItem.groupId === groupId && droppedItem.columnId !== columnId && !isNew; - - // reorder in the same group - if (isExistingFromSameGroup) { - return onReorderDrop({ - columnId, - setState, - state, - layerId, - droppedItem, - operationSupportMatrix, - }); - } - - // replace or move to compatible group - const isFromOtherGroup = droppedItem.groupId !== groupId && droppedItem.layerId === layerId; - - if (isFromOtherGroup) { - const layer = state.layers[layerId]; - const op = { ...layer.columns[droppedItem.columnId] }; - - if (props.filterOperations(op)) { - return onMoveDropToCompatibleGroup({ - columnId, - setState, - state, - layerId, - droppedItem, - operationSupportMatrix, - }); - } - } - - return false; } diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/field_item.scss b/x-pack/plugins/lens/public/indexpattern_datasource/field_item.scss index 8c10ca9d30b73..8a6e10c8be6e4 100644 --- a/x-pack/plugins/lens/public/indexpattern_datasource/field_item.scss +++ b/x-pack/plugins/lens/public/indexpattern_datasource/field_item.scss @@ -1,4 +1,5 @@ .lnsFieldItem { + width: 100%; .lnsFieldItem__infoIcon { visibility: hidden; opacity: 0; @@ -13,6 +14,23 @@ transition: opacity $euiAnimSpeedFast ease-in-out 1s; } } + + &:focus, + &:focus-within, + &.kbnFieldButton-isActive { + animation: none !important; // sass-lint:disable-line no-important + } + + &:focus .kbnFieldButton__name span, + &:focus-within .kbnFieldButton__name span, + &.kbnFieldButton-isActive .kbnFieldButton__name span { + background-color: transparentize($euiColorVis1, .9) !important; + text-decoration: underline !important; + } +} + +.kbnFieldButton__name { + transition: background-color $euiAnimSpeedFast ease-in-out; } .lnsFieldItem--missing { diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/field_item.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/field_item.tsx index e598e85f2ff17..e0198d6d7903e 100644 --- a/x-pack/plugins/lens/public/indexpattern_datasource/field_item.tsx +++ b/x-pack/plugins/lens/public/indexpattern_datasource/field_item.tsx @@ -48,11 +48,10 @@ import { } from '../../../../../src/plugins/data/public'; import { FieldButton } from '../../../../../src/plugins/kibana_react/public'; import { ChartsPluginSetup } from '../../../../../src/plugins/charts/public'; -import { DraggedField } from './indexpattern'; import { DragDrop, DragDropIdentifier } from '../drag_drop'; import { DatasourceDataPanelProps, DataType } from '../types'; import { BucketedAggregation, FieldStatsResponse } from '../../common'; -import { IndexPattern, IndexPatternField } from './types'; +import { IndexPattern, IndexPatternField, DraggedField } from './types'; import { LensFieldIcon } from './lens_field_icon'; import { trackUiEvent } from '../lens_ui_telemetry'; @@ -103,6 +102,8 @@ export const InnerFieldItem = function InnerFieldItem(props: FieldItemProps) { dateRange, filters, hideDetails, + itemIndex, + groupIndex, dropOntoWorkspace, } = props; @@ -167,9 +168,18 @@ export const InnerFieldItem = function InnerFieldItem(props: FieldItemProps) { } const value = useMemo( - () => ({ field, indexPatternId: indexPattern.id, id: field.name } as DraggedField), - [field, indexPattern.id] + () => ({ + field, + indexPatternId: indexPattern.id, + id: field.name, + humanData: { + label: field.displayName, + position: itemIndex + 1, + }, + }), + [field, indexPattern.id, itemIndex] ); + const order = useMemo(() => [0, groupIndex, itemIndex], [groupIndex, itemIndex]); const lensFieldIcon = ; const lensInfoIcon = ( @@ -204,9 +214,8 @@ export const InnerFieldItem = function InnerFieldItem(props: FieldItemProps) { container={document.querySelector('.application') || undefined} button={ @@ -271,6 +280,9 @@ function FieldPanelHeader({ indexPatternId, id: field.name, field, + humanData: { + label: field.displayName, + }, }; return ( @@ -641,11 +653,7 @@ const DragToWorkspaceButton = ({ dropOntoWorkspace, isEnabled, }: { - field: { - indexPatternId: string; - id: string; - field: IndexPatternField; - }; + field: DraggedField; dropOntoWorkspace: DatasourceDataPanelProps['dropOntoWorkspace']; isEnabled: boolean; }) => { diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern.tsx index 5571700b15b61..6cc89d3dab119 100644 --- a/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern.tsx +++ b/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern.tsx @@ -31,7 +31,7 @@ import { toExpression } from './to_expression'; import { IndexPatternDimensionTrigger, IndexPatternDimensionEditor, - canHandleDrop, + getDropTypes, onDrop, } from './dimension_panel'; import { IndexPatternDataPanel } from './datapanel'; @@ -44,7 +44,7 @@ import { import { isDraggedField, normalizeOperationDataType } from './utils'; import { LayerPanel } from './layerpanel'; import { IndexPatternColumn, getErrorMessages, IncompleteColumn } from './operations'; -import { IndexPatternField, IndexPatternPrivateState, IndexPatternPersistedState } from './types'; +import { IndexPatternPrivateState, IndexPatternPersistedState } from './types'; import { KibanaContextProvider } from '../../../../../src/plugins/kibana_react/public'; import { DataPublicPluginStart } from '../../../../../src/plugins/data/public'; import { VisualizeFieldContext } from '../../../../../src/plugins/ui_actions/public'; @@ -52,15 +52,9 @@ import { mergeLayer } from './state_helpers'; import { Datasource, StateSetter } from '../types'; import { ChartsPluginSetup } from '../../../../../src/plugins/charts/public'; import { deleteColumn, isReferenced } from './operations'; -import { DragDropIdentifier } from '../drag_drop/providers'; export { OperationType, IndexPatternColumn, deleteColumn } from './operations'; -export type DraggedField = DragDropIdentifier & { - field: IndexPatternField; - indexPatternId: string; -}; - export function columnToOperation(column: IndexPatternColumn, uniqueLabel?: string): Operation { const { dataType, label, isBucketed, scale } = column; return { @@ -314,8 +308,7 @@ export function getIndexPatternDatasource({ domElement ); }, - - canHandleDrop, + getDropTypes, onDrop, // Reset the temporary invalid state when closing the editor, but don't diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/mocks.ts b/x-pack/plugins/lens/public/indexpattern_datasource/mocks.ts index 306c87fa765e5..06560bb0fa244 100644 --- a/x-pack/plugins/lens/public/indexpattern_datasource/mocks.ts +++ b/x-pack/plugins/lens/public/indexpattern_datasource/mocks.ts @@ -253,5 +253,6 @@ export function createMockedDragDropContext(): jest.Mocked { keyboardMode: false, setKeyboardMode: jest.fn(), setA11yMessage: jest.fn(), + registerDropTarget: jest.fn(), }; } diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/types.ts b/x-pack/plugins/lens/public/indexpattern_datasource/types.ts index 10b1f7f1799da..f45f963ee174f 100644 --- a/x-pack/plugins/lens/public/indexpattern_datasource/types.ts +++ b/x-pack/plugins/lens/public/indexpattern_datasource/types.ts @@ -8,6 +8,7 @@ import { IFieldType } from 'src/plugins/data/common'; import { IndexPatternColumn, IncompleteColumn } from './operations'; import { IndexPatternAggRestrictions } from '../../../../../src/plugins/data/public'; +import { DragDropIdentifier } from '../drag_drop/providers'; export { IndexPatternColumn, @@ -32,6 +33,10 @@ export { MovingAverageIndexPatternColumn, } from './operations'; +export type DraggedField = DragDropIdentifier & { + field: IndexPatternField; + indexPatternId: string; +}; export interface IndexPattern { id: string; fields: IndexPatternField[]; diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/utils.ts b/x-pack/plugins/lens/public/indexpattern_datasource/utils.ts index 515d205637505..d4c9da188be61 100644 --- a/x-pack/plugins/lens/public/indexpattern_datasource/utils.ts +++ b/x-pack/plugins/lens/public/indexpattern_datasource/utils.ts @@ -6,8 +6,7 @@ */ import { DataType } from '../types'; -import { IndexPattern, IndexPatternLayer } from './types'; -import { DraggedField } from './indexpattern'; +import { IndexPattern, IndexPatternLayer, DraggedField } from './types'; import type { BaseIndexPatternColumn, FieldBasedIndexPatternColumn, diff --git a/x-pack/plugins/lens/public/types.ts b/x-pack/plugins/lens/public/types.ts index 4b1c0f755b3ae..cccc35acb3fca 100644 --- a/x-pack/plugins/lens/public/types.ts +++ b/x-pack/plugins/lens/public/types.ts @@ -138,6 +138,16 @@ export type TableChangeType = | 'reorder' | 'layers'; +export type DropType = + | 'field_add' + | 'field_replace' + | 'reorder' + | 'duplicate_in_group' + | 'move_compatible' + | 'replace_compatible' + | 'move_incompatible' + | 'replace_incompatible'; + export interface DatasourceSuggestion { state: T; table: TableSuggestion; @@ -179,7 +189,9 @@ export interface Datasource { renderDimensionTrigger: (domElement: Element, props: DatasourceDimensionTriggerProps) => void; renderDimensionEditor: (domElement: Element, props: DatasourceDimensionEditorProps) => void; renderLayerPanel: (domElement: Element, props: DatasourceLayerPanelProps) => void; - canHandleDrop: (props: DatasourceDimensionDropProps) => boolean; + getDropTypes: ( + props: DatasourceDimensionDropProps & { groupId: string } + ) => DropType | undefined; onDrop: (props: DatasourceDimensionDropHandlerProps) => false | true | { deleted: string }; updateStateOnCloseDimension?: (props: { layerId: string; @@ -299,13 +311,11 @@ export type DatasourceDimensionDropProps = SharedDimensionProps & { state: T; setState: StateSetter; dragDropContext: DragContextState; - isReorder?: boolean; }; export type DatasourceDimensionDropHandlerProps = DatasourceDimensionDropProps & { droppedItem: unknown; - groupId: string; - isNew?: boolean; + dropType: DropType; }; export type DataType = 'document' | 'string' | 'number' | 'date' | 'boolean' | 'ip'; diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json index 3cfaaba5f8538..6658671b84682 100644 --- a/x-pack/plugins/translations/translations/ja-JP.json +++ b/x-pack/plugins/translations/translations/ja-JP.json @@ -11183,8 +11183,6 @@ "xpack.lens.dimensionContainer.close": "閉じる", "xpack.lens.dimensionContainer.closeConfiguration": "構成を閉じる", "xpack.lens.discover.visualizeFieldLegend": "Visualize フィールド", - "xpack.lens.dragDrop.elementLifted": "位置 {position} のアイテム {itemLabel} を持ち上げました。", - "xpack.lens.dragDrop.elementMoved": "位置 {prevPosition} から位置 {position} までアイテム {itemLabel} を移動しました", "xpack.lens.editLayerSettings": "レイヤー設定を編集", "xpack.lens.editLayerSettingsChartType": "レイヤー設定を編集、{chartType}", "xpack.lens.editorFrame.buildExpressionError": "グラフの準備中に予期しないエラーが発生しました", diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json index ebc0c6f88ecfa..9602583e8d215 100644 --- a/x-pack/plugins/translations/translations/zh-CN.json +++ b/x-pack/plugins/translations/translations/zh-CN.json @@ -11212,8 +11212,6 @@ "xpack.lens.dimensionContainer.close": "关闭", "xpack.lens.dimensionContainer.closeConfiguration": "关闭配置", "xpack.lens.discover.visualizeFieldLegend": "可视化字段", - "xpack.lens.dragDrop.elementLifted": "您已将项目 {itemLabel} 提升到位置 {position}", - "xpack.lens.dragDrop.elementMoved": "您已将项目 {itemLabel} 从位置 {prevPosition} 移到位置 {position}", "xpack.lens.editLayerSettings": "编辑图层设置", "xpack.lens.editLayerSettingsChartType": "编辑图层设置 {chartType}", "xpack.lens.editorFrame.buildExpressionError": "准备图表时发生意外错误", diff --git a/x-pack/test/functional/apps/lens/drag_and_drop.ts b/x-pack/test/functional/apps/lens/drag_and_drop.ts index 7f8d60f9ffccf..5b3a984f00519 100644 --- a/x-pack/test/functional/apps/lens/drag_and_drop.ts +++ b/x-pack/test/functional/apps/lens/drag_and_drop.ts @@ -53,7 +53,7 @@ export default function ({ getPageObjects }: FtrProviderContext) { }); it('should reorder the elements for the table', async () => { - await PageObjects.lens.reorderDimensions('lnsDatatable_column', 2, 0); + await PageObjects.lens.reorderDimensions('lnsDatatable_column', 3, 1); await PageObjects.header.waitUntilLoadingHasFinished(); expect(await PageObjects.lens.getDimensionTriggersTexts('lnsDatatable_column')).to.eql([ 'Top values of @message.raw', @@ -83,6 +83,129 @@ export default function ({ getPageObjects }: FtrProviderContext) { await PageObjects.lens.getDimensionTriggersTexts('lnsXY_splitDimensionPanel') ).to.eql(['Top values of @message.raw']); }); + + it('should move the column to non-compatible dimension group', async () => { + expect( + await PageObjects.lens.getDimensionTriggersTexts('lnsXY_splitDimensionPanel') + ).to.eql(['Top values of @message.raw']); + + await PageObjects.lens.dragDimensionToDimension( + 'lnsXY_splitDimensionPanel > lns-dimensionTrigger', + 'lnsXY_yDimensionPanel > lns-dimensionTrigger' + ); + + expect( + await PageObjects.lens.getDimensionTriggersTexts('lnsXY_splitDimensionPanel') + ).to.eql([]); + expect( + await PageObjects.lens.getDimensionTriggersTexts('lnsXY_splitDimensionPanel') + ).to.eql([]); + expect(await PageObjects.lens.getDimensionTriggersTexts('lnsXY_yDimensionPanel')).to.eql([ + 'Unique count of @message.raw', + ]); + }); + it('should duplicate the column when dragging to empty dimension in the same group', async () => { + await PageObjects.lens.dragDimensionToDimension( + 'lnsXY_yDimensionPanel > lns-dimensionTrigger', + 'lnsXY_yDimensionPanel > lns-empty-dimension' + ); + await PageObjects.lens.dragDimensionToDimension( + 'lnsXY_yDimensionPanel > lns-dimensionTrigger', + 'lnsXY_yDimensionPanel > lns-empty-dimension' + ); + expect(await PageObjects.lens.getDimensionTriggersTexts('lnsXY_yDimensionPanel')).to.eql([ + 'Unique count of @message.raw', + 'Unique count of @message.raw [1]', + 'Unique count of @message.raw [2]', + ]); + }); + it('should duplicate the column when dragging to empty dimension in the same group', async () => { + await PageObjects.lens.dragDimensionToDimension( + 'lnsXY_yDimensionPanel > lns-dimensionTrigger', + 'lnsXY_xDimensionPanel > lns-empty-dimension' + ); + expect(await PageObjects.lens.getDimensionTriggersTexts('lnsXY_yDimensionPanel')).to.eql([ + 'Unique count of @message.raw', + 'Unique count of @message.raw [1]', + ]); + expect(await PageObjects.lens.getDimensionTriggersTexts('lnsXY_xDimensionPanel')).to.eql([ + 'Top values of @message.raw', + ]); + }); + }); + describe('keyboard drag and drop', () => { + it('should drop a field to workspace', async () => { + await PageObjects.visualize.navigateToNewVisualization(); + await PageObjects.visualize.clickVisType('lens'); + await PageObjects.lens.goToTimeRange(); + await PageObjects.header.waitUntilLoadingHasFinished(); + await PageObjects.lens.dragFieldWithKeyboard('@timestamp'); + expect(await PageObjects.lens.getDimensionTriggerText('lnsXY_xDimensionPanel')).to.eql( + '@timestamp' + ); + }); + it('should drop a field to empty dimension', async () => { + await PageObjects.lens.dragFieldWithKeyboard('bytes', 4); + expect(await PageObjects.lens.getDimensionTriggersTexts('lnsXY_yDimensionPanel')).to.eql([ + 'Count of records', + 'Average of bytes', + ]); + await PageObjects.lens.dragFieldWithKeyboard('@message.raw', 1, true); + expect( + await PageObjects.lens.getDimensionTriggersTexts('lnsXY_splitDimensionPanel') + ).to.eql(['Top values of @message.raw']); + }); + it('should drop a field to an existing dimension replacing the old one', async () => { + await PageObjects.lens.dragFieldWithKeyboard('clientip', 1, true); + expect( + await PageObjects.lens.getDimensionTriggersTexts('lnsXY_splitDimensionPanel') + ).to.eql(['Top values of clientip']); + }); + it('should duplicate an element in a group', async () => { + await PageObjects.lens.dimensionKeyboardDragDrop('lnsXY_yDimensionPanel', 0, 1); + expect(await PageObjects.lens.getDimensionTriggersTexts('lnsXY_yDimensionPanel')).to.eql([ + 'Count of records', + 'Average of bytes', + 'Count of records [1]', + ]); + }); + + it('should move dimension to compatible dimension', async () => { + await PageObjects.lens.dimensionKeyboardDragDrop('lnsXY_xDimensionPanel', 0, 5); + expect(await PageObjects.lens.getDimensionTriggersTexts('lnsXY_xDimensionPanel')).to.eql( + [] + ); + expect( + await PageObjects.lens.getDimensionTriggersTexts('lnsXY_splitDimensionPanel') + ).to.eql(['@timestamp']); + + await PageObjects.lens.dimensionKeyboardDragDrop('lnsXY_splitDimensionPanel', 0, 5, true); + expect(await PageObjects.lens.getDimensionTriggersTexts('lnsXY_xDimensionPanel')).to.eql([ + '@timestamp', + ]); + expect( + await PageObjects.lens.getDimensionTriggersTexts('lnsXY_splitDimensionPanel') + ).to.eql([]); + }); + it('should move dimension to incompatible dimension', async () => { + await PageObjects.lens.dimensionKeyboardDragDrop('lnsXY_yDimensionPanel', 1, 2); + expect( + await PageObjects.lens.getDimensionTriggersTexts('lnsXY_splitDimensionPanel') + ).to.eql(['bytes']); + + await PageObjects.lens.dimensionKeyboardDragDrop('lnsXY_xDimensionPanel', 0, 2); + expect(await PageObjects.lens.getDimensionTriggersTexts('lnsXY_yDimensionPanel')).to.eql([ + 'Count of records', + 'Unique count of @timestamp', + ]); + }); + it('should reorder elements with keyboard', async () => { + await PageObjects.lens.dimensionKeyboardReorder('lnsXY_yDimensionPanel', 0, 1); + expect(await PageObjects.lens.getDimensionTriggersTexts('lnsXY_yDimensionPanel')).to.eql([ + 'Unique count of @timestamp', + 'Count of records', + ]); + }); }); describe('workspace drop', () => { diff --git a/x-pack/test/functional/page_objects/lens_page.ts b/x-pack/test/functional/page_objects/lens_page.ts index fc6842aae0345..aae161ef9fcf1 100644 --- a/x-pack/test/functional/page_objects/lens_page.ts +++ b/x-pack/test/functional/page_objects/lens_page.ts @@ -163,6 +163,73 @@ export function LensPageProvider({ getService, getPageObjects }: FtrProviderCont await PageObjects.header.waitUntilLoadingHasFinished(); }, + /** + * Copies field to chosen destination that is defined by distance of `steps` + * (right arrow presses) from it + * + * @param fieldName - the desired field for the dimension + * @param steps - number of steps user has to press right + * @param reverse - defines the direction of going through drops + * */ + async dragFieldWithKeyboard(fieldName: string, steps = 1, reverse = false) { + const field = await find.byCssSelector( + `[data-test-subj="lnsDragDrop_draggable-${fieldName}"] [data-test-subj="lnsDragDrop-keyboardHandler"]` + ); + await field.focus(); + await browser.pressKeys(browser.keys.ENTER); + for (let i = 0; i < steps; i++) { + await browser.pressKeys(reverse ? browser.keys.LEFT : browser.keys.RIGHT); + } + await browser.pressKeys(browser.keys.ENTER); + + await PageObjects.header.waitUntilLoadingHasFinished(); + }, + + /** + * Selects draggable element and moves it by number of `steps` + * + * @param group - the group of the element + * @param index - the index of the element in the group + * @param steps - number of steps of presses right or left + * @param reverse - defines the direction of going through drops + * */ + async dimensionKeyboardDragDrop(group: string, index = 0, steps = 1, reverse = false) { + const elements = await find.allByCssSelector( + `[data-test-subj="${group}"] [data-test-subj="lnsDragDrop-keyboardHandler"]` + ); + const el = elements[index]; + await el.focus(); + await browser.pressKeys(browser.keys.ENTER); + for (let i = 0; i < steps; i++) { + await browser.pressKeys(reverse ? browser.keys.LEFT : browser.keys.RIGHT); + } + await browser.pressKeys(browser.keys.ENTER); + + await PageObjects.header.waitUntilLoadingHasFinished(); + }, + /** + * Selects draggable element and reorders it by number of `steps` + * + * @param group - the group of the element + * @param index - the index of the element in the group + * @param steps - number of steps of presses right or left + * @param reverse - defines the direction of going through drops + * */ + async dimensionKeyboardReorder(group: string, index = 0, steps = 1, reverse = false) { + const elements = await find.allByCssSelector( + `[data-test-subj="${group}"] [data-test-subj="lnsDragDrop-keyboardHandler"]` + ); + const el = elements[index]; + await el.focus(); + await browser.pressKeys(browser.keys.ENTER); + for (let i = 0; i < steps; i++) { + await browser.pressKeys(reverse ? browser.keys.ARROW_UP : browser.keys.ARROW_DOWN); + } + await browser.pressKeys(browser.keys.ENTER); + + await PageObjects.header.waitUntilLoadingHasFinished(); + }, + /** * Drags field to dimension trigger * @@ -194,16 +261,12 @@ export function LensPageProvider({ getService, getPageObjects }: FtrProviderCont /** * Reorder elements within the group * - * @param startIndex - the index of dragging element - * @param endIndex - the index of drop + * @param startIndex - the index of dragging element starting from 1 + * @param endIndex - the index of drop starting from 1 * */ async reorderDimensions(dimension: string, startIndex: number, endIndex: number) { - const dragging = `[data-test-subj='${dimension}']:nth-of-type(${ - startIndex + 1 - }) .lnsDragDrop`; - const dropping = `[data-test-subj='${dimension}']:nth-of-type(${ - endIndex + 1 - }) [data-test-subj='lnsDragDrop-reorderableDropLayer'`; + const dragging = `[data-test-subj='${dimension}']:nth-of-type(${startIndex}) .lnsDragDrop`; + const dropping = `[data-test-subj='${dimension}']:nth-of-type(${endIndex}) [data-test-subj='lnsDragDrop-reorderableDropLayer'`; await browser.html5DragAndDrop(dragging, dropping); await PageObjects.header.waitUntilLoadingHasFinished(); }, From 455538f99c3b0c7a33e7900fc42f862accfb22a5 Mon Sep 17 00:00:00 2001 From: Anton Dosov Date: Fri, 5 Feb 2021 18:18:49 +0100 Subject: [PATCH 47/69] [Dashboard] fix destroy on embeddable container is never called (#90306) Co-authored-by: Devon Thomson --- .../hooks/use_dashboard_container.test.tsx | 173 ++++++++++++++++++ .../hooks/use_dashboard_container.ts | 44 ++++- 2 files changed, 209 insertions(+), 8 deletions(-) create mode 100644 src/plugins/dashboard/public/application/hooks/use_dashboard_container.test.tsx diff --git a/src/plugins/dashboard/public/application/hooks/use_dashboard_container.test.tsx b/src/plugins/dashboard/public/application/hooks/use_dashboard_container.test.tsx new file mode 100644 index 0000000000000..d14b4056a64c6 --- /dev/null +++ b/src/plugins/dashboard/public/application/hooks/use_dashboard_container.test.tsx @@ -0,0 +1,173 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0 and the Server Side Public License, v 1; you may not use this file except + * in compliance with, at your election, the Elastic License 2.0 or the Server + * Side Public License, v 1. + */ + +import { useDashboardContainer } from './use_dashboard_container'; +import { renderHook, act } from '@testing-library/react-hooks'; +import { KibanaContextProvider } from '../../../../kibana_react/public'; +import React from 'react'; +import { DashboardStateManager } from '../dashboard_state_manager'; +import { getSavedDashboardMock } from '../test_helpers'; +import { createKbnUrlStateStorage, defer } from '../../../../kibana_utils/public'; +import { createBrowserHistory } from 'history'; +import { dataPluginMock } from '../../../../data/public/mocks'; +import { embeddablePluginMock } from '../../../../embeddable/public/mocks'; +import { DashboardCapabilities } from '../types'; +import { EmbeddableFactory } from '../../../../embeddable/public'; +import { HelloWorldEmbeddable } from '../../../../embeddable/public/tests/fixtures'; +import { DashboardContainer } from '../embeddable'; + +const savedDashboard = getSavedDashboardMock(); + +// TS is *very* picky with type guards / predicates. can't just use jest.fn() +function mockHasTaggingCapabilities(obj: any): obj is any { + return false; +} + +const history = createBrowserHistory(); +const createDashboardState = () => + new DashboardStateManager({ + savedDashboard, + hideWriteControls: false, + allowByValueEmbeddables: false, + kibanaVersion: '7.0.0', + kbnUrlStateStorage: createKbnUrlStateStorage(), + history: createBrowserHistory(), + hasTaggingCapabilities: mockHasTaggingCapabilities, + }); + +const defaultCapabilities: DashboardCapabilities = { + show: false, + createNew: false, + saveQuery: false, + createShortUrl: false, + hideWriteControls: true, + mapsCapabilities: { save: false }, + visualizeCapabilities: { save: false }, + storeSearchSession: true, +}; + +const services = { + dashboardCapabilities: defaultCapabilities, + data: dataPluginMock.createStartContract(), + embeddable: embeddablePluginMock.createStartContract(), + scopedHistory: history, +}; + +const setupEmbeddableFactory = () => { + const embeddable = new HelloWorldEmbeddable({ id: 'id' }); + const deferEmbeddableCreate = defer(); + services.embeddable.getEmbeddableFactory.mockImplementation( + () => + (({ + create: () => deferEmbeddableCreate.promise, + } as unknown) as EmbeddableFactory) + ); + const destroySpy = jest.spyOn(embeddable, 'destroy'); + + return { + destroySpy, + embeddable, + createEmbeddable: () => { + act(() => { + deferEmbeddableCreate.resolve(embeddable); + }); + }, + }; +}; + +test('container is destroyed on unmount', async () => { + const { createEmbeddable, destroySpy, embeddable } = setupEmbeddableFactory(); + + const state = createDashboardState(); + const { result, unmount, waitForNextUpdate } = renderHook( + () => useDashboardContainer(state, history, false), + { + wrapper: ({ children }) => ( + {children} + ), + } + ); + + expect(result.current).toBeNull(); // null on initial render + + createEmbeddable(); + + await waitForNextUpdate(); + + expect(embeddable).toBe(result.current); + expect(destroySpy).not.toBeCalled(); + + unmount(); + + expect(destroySpy).toBeCalled(); +}); + +test('old container is destroyed on new dashboardStateManager', async () => { + const embeddableFactoryOld = setupEmbeddableFactory(); + + const { result, waitForNextUpdate, rerender } = renderHook< + DashboardStateManager, + DashboardContainer | null + >((dashboardState) => useDashboardContainer(dashboardState, history, false), { + wrapper: ({ children }) => ( + {children} + ), + initialProps: createDashboardState(), + }); + + expect(result.current).toBeNull(); // null on initial render + + embeddableFactoryOld.createEmbeddable(); + + await waitForNextUpdate(); + + expect(embeddableFactoryOld.embeddable).toBe(result.current); + expect(embeddableFactoryOld.destroySpy).not.toBeCalled(); + + const embeddableFactoryNew = setupEmbeddableFactory(); + rerender(createDashboardState()); + + embeddableFactoryNew.createEmbeddable(); + + await waitForNextUpdate(); + + expect(embeddableFactoryNew.embeddable).toBe(result.current); + + expect(embeddableFactoryNew.destroySpy).not.toBeCalled(); + expect(embeddableFactoryOld.destroySpy).toBeCalled(); +}); + +test('destroyed if rerendered before resolved', async () => { + const embeddableFactoryOld = setupEmbeddableFactory(); + + const { result, waitForNextUpdate, rerender } = renderHook< + DashboardStateManager, + DashboardContainer | null + >((dashboardState) => useDashboardContainer(dashboardState, history, false), { + wrapper: ({ children }) => ( + {children} + ), + initialProps: createDashboardState(), + }); + + expect(result.current).toBeNull(); // null on initial render + + const embeddableFactoryNew = setupEmbeddableFactory(); + rerender(createDashboardState()); + embeddableFactoryNew.createEmbeddable(); + await waitForNextUpdate(); + expect(embeddableFactoryNew.embeddable).toBe(result.current); + expect(embeddableFactoryNew.destroySpy).not.toBeCalled(); + + embeddableFactoryOld.createEmbeddable(); + + await act(() => Promise.resolve()); // Can't use waitFor from hooks, because there is no hook update + expect(embeddableFactoryNew.embeddable).toBe(result.current); + expect(embeddableFactoryNew.destroySpy).not.toBeCalled(); + expect(embeddableFactoryOld.destroySpy).toBeCalled(); +}); diff --git a/src/plugins/dashboard/public/application/hooks/use_dashboard_container.ts b/src/plugins/dashboard/public/application/hooks/use_dashboard_container.ts index a3a31ee52836f..b27322b6bec53 100644 --- a/src/plugins/dashboard/public/application/hooks/use_dashboard_container.ts +++ b/src/plugins/dashboard/public/application/hooks/use_dashboard_container.ts @@ -7,7 +7,6 @@ */ import { useEffect, useState } from 'react'; -import _ from 'lodash'; import { History } from 'history'; import { useKibana } from '../../services/kibana_react'; @@ -15,6 +14,7 @@ import { ContainerOutput, EmbeddableFactoryNotFoundError, EmbeddableInput, + ErrorEmbeddable, isErrorEmbeddable, ViewMode, } from '../../services/embeddable'; @@ -70,8 +70,10 @@ export const useDashboardContainer = ( const incomingEmbeddable = embeddable.getStateTransfer().getIncomingEmbeddablePackage(true); + let canceled = false; + let pendingContainer: DashboardContainer | ErrorEmbeddable | null | undefined; (async function createContainer() { - const newContainer = await dashboardFactory.create( + pendingContainer = await dashboardFactory.create( getDashboardContainerInput({ dashboardCapabilities, dashboardStateManager, @@ -82,12 +84,27 @@ export const useDashboardContainer = ( }) ); - if (!newContainer || isErrorEmbeddable(newContainer)) { + // already new container is being created + // no longer interested in the pending one + if (canceled) { + try { + pendingContainer?.destroy(); + pendingContainer = null; + } catch (e) { + // destroy could throw if something has already destroyed the container + // eslint-disable-next-line no-console + console.warn(e); + } + + return; + } + + if (!pendingContainer || isErrorEmbeddable(pendingContainer)) { return; } // inject switch view mode callback for the empty screen to use - newContainer.switchViewMode = (newViewMode: ViewMode) => + pendingContainer.switchViewMode = (newViewMode: ViewMode) => dashboardStateManager.switchViewMode(newViewMode); // If the incoming embeddable is newly created, or doesn't exist in the current panels list, @@ -96,17 +113,28 @@ export const useDashboardContainer = ( incomingEmbeddable && (!incomingEmbeddable?.embeddableId || (incomingEmbeddable.embeddableId && - !newContainer.getInput().panels[incomingEmbeddable.embeddableId])) + !pendingContainer.getInput().panels[incomingEmbeddable.embeddableId])) ) { dashboardStateManager.switchViewMode(ViewMode.EDIT); - newContainer.addNewEmbeddable( + pendingContainer.addNewEmbeddable( incomingEmbeddable.type, incomingEmbeddable.input ); } - setDashboardContainer(newContainer); + setDashboardContainer(pendingContainer); })(); - return () => setDashboardContainer(null); + return () => { + canceled = true; + try { + pendingContainer?.destroy(); + } catch (e) { + // destroy could throw if something has already destroyed the container + // eslint-disable-next-line no-console + console.warn(e); + } + + setDashboardContainer(null); + }; }, [ dashboardCapabilities, dashboardStateManager, From 5dee629a6da0930b9854d8f20fa12cb362c19b7b Mon Sep 17 00:00:00 2001 From: Aaron Caldwell Date: Fri, 5 Feb 2021 10:22:23 -0700 Subject: [PATCH 48/69] GA Geo containment alerts. Remove Geo containment alert experimental config settings and refs (#90301) --- docs/user/alerting/geo-alert-types.asciidoc | 9 ++------- x-pack/plugins/stack_alerts/common/config.ts | 1 - .../public/alert_types/geo_containment/readme.md | 2 -- .../plugins/stack_alerts/public/alert_types/index.ts | 4 +--- x-pack/plugins/stack_alerts/server/index.ts | 10 +--------- 5 files changed, 4 insertions(+), 22 deletions(-) diff --git a/docs/user/alerting/geo-alert-types.asciidoc b/docs/user/alerting/geo-alert-types.asciidoc index c04cf4bca4320..f79885e3bc716 100644 --- a/docs/user/alerting/geo-alert-types.asciidoc +++ b/docs/user/alerting/geo-alert-types.asciidoc @@ -2,13 +2,8 @@ [[geo-alert-types]] == Geo alert types -experimental[] Two additional stack alerts are available: -<> and <>. To enable, -add the following configuration to your `kibana.yml`: - -```yml -xpack.stack_alerts.enableGeoAlerting: true -``` +Two additional stack alerts are available: +<> and <>. As with other stack alerts, you need `all` access to the *Stack Alerts* feature to be able to create and edit either of the geo alerts. diff --git a/x-pack/plugins/stack_alerts/common/config.ts b/x-pack/plugins/stack_alerts/common/config.ts index 1bd7b2728a95c..ebc12ee563350 100644 --- a/x-pack/plugins/stack_alerts/common/config.ts +++ b/x-pack/plugins/stack_alerts/common/config.ts @@ -9,7 +9,6 @@ import { schema, TypeOf } from '@kbn/config-schema'; export const configSchema = schema.object({ enabled: schema.boolean({ defaultValue: true }), - enableGeoAlerting: schema.boolean({ defaultValue: false }), }); export type Config = TypeOf; diff --git a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/readme.md b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/readme.md index 798beed8d17bd..b48a28fbdf99b 100644 --- a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/readme.md +++ b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/readme.md @@ -19,8 +19,6 @@ project. To edit it, open this file in your editor of choice, add the line descr the next step to the bottom of the file (or really anywhere) and save. For more details on different config modifications or on how to make production config modifications, see [the current docs](https://www.elastic.co/guide/en/kibana/current/settings.html) -- Set the following configuration settings in your `config/kibana.yml`: -`xpack.stack_alerts.enableGeoAlerting: true` ### 2. Run ES/Kibana dev env with ssl enabled - In two terminals, run the normal commands to launch both elasticsearch and kibana but diff --git a/x-pack/plugins/stack_alerts/public/alert_types/index.ts b/x-pack/plugins/stack_alerts/public/alert_types/index.ts index 55819785d628b..d6f9f97939b79 100644 --- a/x-pack/plugins/stack_alerts/public/alert_types/index.ts +++ b/x-pack/plugins/stack_alerts/public/alert_types/index.ts @@ -18,9 +18,7 @@ export function registerAlertTypes({ alertTypeRegistry: TriggersAndActionsUIPublicPluginSetup['alertTypeRegistry']; config: Config; }) { - if (config.enableGeoAlerting) { - alertTypeRegistry.register(getGeoContainmentAlertType()); - } + alertTypeRegistry.register(getGeoContainmentAlertType()); alertTypeRegistry.register(getThresholdAlertType()); alertTypeRegistry.register(getEsQueryAlertType()); } diff --git a/x-pack/plugins/stack_alerts/server/index.ts b/x-pack/plugins/stack_alerts/server/index.ts index 4834749ab5917..bd10a486fa531 100644 --- a/x-pack/plugins/stack_alerts/server/index.ts +++ b/x-pack/plugins/stack_alerts/server/index.ts @@ -11,16 +11,8 @@ import { configSchema, Config } from '../common/config'; export { ID as INDEX_THRESHOLD_ID } from './alert_types/index_threshold/alert_type'; export const config: PluginConfigDescriptor = { - exposeToBrowser: { - enableGeoAlerting: true, - }, + exposeToBrowser: {}, schema: configSchema, - deprecations: ({ renameFromRoot }) => [ - renameFromRoot( - 'xpack.triggers_actions_ui.enableGeoTrackingThresholdAlert', - 'xpack.stack_alerts.enableGeoAlerting' - ), - ], }; export const plugin = (ctx: PluginInitializerContext) => new AlertingBuiltinsPlugin(ctx); From 4190ea4237d24314a3b88b6fd16d70a3acd56fed Mon Sep 17 00:00:00 2001 From: Spencer Date: Fri, 5 Feb 2021 10:52:39 -0700 Subject: [PATCH 49/69] [eslint] stop ignoring .storybook files (#90447) Co-authored-by: spalger --- .eslintignore | 1 + src/plugins/dashboard/.storybook/main.js | 5 +++-- src/plugins/dashboard/.storybook/storyshots.test.tsx | 5 +++-- src/plugins/embeddable/.storybook/main.js | 5 +++-- .../kibana_react/public/code_editor/.storybook/main.js | 6 ++++-- 5 files changed, 14 insertions(+), 8 deletions(-) diff --git a/.eslintignore b/.eslintignore index 2d169c45214fe..5513ad1320232 100644 --- a/.eslintignore +++ b/.eslintignore @@ -16,6 +16,7 @@ target snapshots.js !/.eslintrc.js +!.storybook # plugin overrides /src/core/lib/kbn_internal_native_observable diff --git a/src/plugins/dashboard/.storybook/main.js b/src/plugins/dashboard/.storybook/main.js index 86b48c32f103e..8dc3c5d1518f4 100644 --- a/src/plugins/dashboard/.storybook/main.js +++ b/src/plugins/dashboard/.storybook/main.js @@ -1,8 +1,9 @@ /* * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. + * 2.0 and the Server Side Public License, v 1; you may not use this file except + * in compliance with, at your election, the Elastic License 2.0 or the Server + * Side Public License, v 1. */ module.exports = require('@kbn/storybook').defaultConfig; diff --git a/src/plugins/dashboard/.storybook/storyshots.test.tsx b/src/plugins/dashboard/.storybook/storyshots.test.tsx index a75a9d178f0dd..80e8aa795ed40 100644 --- a/src/plugins/dashboard/.storybook/storyshots.test.tsx +++ b/src/plugins/dashboard/.storybook/storyshots.test.tsx @@ -1,8 +1,9 @@ /* * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. + * 2.0 and the Server Side Public License, v 1; you may not use this file except + * in compliance with, at your election, the Elastic License 2.0 or the Server + * Side Public License, v 1. */ import fs from 'fs'; diff --git a/src/plugins/embeddable/.storybook/main.js b/src/plugins/embeddable/.storybook/main.js index 86b48c32f103e..8dc3c5d1518f4 100644 --- a/src/plugins/embeddable/.storybook/main.js +++ b/src/plugins/embeddable/.storybook/main.js @@ -1,8 +1,9 @@ /* * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. + * 2.0 and the Server Side Public License, v 1; you may not use this file except + * in compliance with, at your election, the Elastic License 2.0 or the Server + * Side Public License, v 1. */ module.exports = require('@kbn/storybook').defaultConfig; diff --git a/src/plugins/kibana_react/public/code_editor/.storybook/main.js b/src/plugins/kibana_react/public/code_editor/.storybook/main.js index 86b48c32f103e..742239e638b8a 100644 --- a/src/plugins/kibana_react/public/code_editor/.storybook/main.js +++ b/src/plugins/kibana_react/public/code_editor/.storybook/main.js @@ -1,8 +1,10 @@ /* * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. + * 2.0 and the Server Side Public License, v 1; you may not use this file except + * in compliance with, at your election, the Elastic License 2.0 or the Server + * Side Public License, v 1. */ +// eslint-disable-next-line import/no-commonjs module.exports = require('@kbn/storybook').defaultConfig; From be53a06925393e5e1591a9eb720474ae693dd77f Mon Sep 17 00:00:00 2001 From: Jen Huang Date: Fri, 5 Feb 2021 09:56:32 -0800 Subject: [PATCH 50/69] Fix state sharing between home integration components, prevent full page reload when clicking Fleet link (#90334) Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> --- .../tutorial_directory_header_link.tsx | 25 +++++++++--------- .../tutorial_directory_notice.tsx | 26 +++++++++++++------ 2 files changed, 30 insertions(+), 21 deletions(-) diff --git a/x-pack/plugins/fleet/public/applications/fleet/components/home_integration/tutorial_directory_header_link.tsx b/x-pack/plugins/fleet/public/applications/fleet/components/home_integration/tutorial_directory_header_link.tsx index 12d3647aeb524..cd378ec842679 100644 --- a/x-pack/plugins/fleet/public/applications/fleet/components/home_integration/tutorial_directory_header_link.tsx +++ b/x-pack/plugins/fleet/public/applications/fleet/components/home_integration/tutorial_directory_header_link.tsx @@ -6,19 +6,16 @@ */ import React, { memo, useState, useEffect } from 'react'; -import { BehaviorSubject } from 'rxjs'; import { FormattedMessage } from '@kbn/i18n/react'; import { EuiButtonEmpty } from '@elastic/eui'; import type { TutorialDirectoryHeaderLinkComponent } from 'src/plugins/home/public'; -import { useLink, useCapabilities } from '../../hooks'; - -const tutorialDirectoryNoticeState$ = new BehaviorSubject({ - settingsDataLoaded: false, - hasSeenNotice: false, -}); +import { RedirectAppLinks } from '../../../../../../../../src/plugins/kibana_react/public'; +import { useLink, useCapabilities, useStartServices } from '../../hooks'; +import { tutorialDirectoryNoticeState$ } from './tutorial_directory_notice'; const TutorialDirectoryHeaderLink: TutorialDirectoryHeaderLinkComponent = memo(() => { const { getHref } = useLink(); + const { application } = useStartServices(); const { show: hasIngestManager } = useCapabilities(); const [noticeState, setNoticeState] = useState({ settingsDataLoaded: false, @@ -33,12 +30,14 @@ const TutorialDirectoryHeaderLink: TutorialDirectoryHeaderLinkComponent = memo(( }, []); return hasIngestManager && noticeState.settingsDataLoaded && noticeState.hasSeenNotice ? ( - - - + + + + + ) : null; }); diff --git a/x-pack/plugins/fleet/public/applications/fleet/components/home_integration/tutorial_directory_notice.tsx b/x-pack/plugins/fleet/public/applications/fleet/components/home_integration/tutorial_directory_notice.tsx index 57a2803038301..8ea0c8730fdb5 100644 --- a/x-pack/plugins/fleet/public/applications/fleet/components/home_integration/tutorial_directory_notice.tsx +++ b/x-pack/plugins/fleet/public/applications/fleet/components/home_integration/tutorial_directory_notice.tsx @@ -19,7 +19,14 @@ import { EuiSpacer, } from '@elastic/eui'; import type { TutorialDirectoryNoticeComponent } from 'src/plugins/home/public'; -import { sendPutSettings, useGetSettings, useLink, useCapabilities } from '../../hooks'; +import { RedirectAppLinks } from '../../../../../../../../src/plugins/kibana_react/public'; +import { + sendPutSettings, + useGetSettings, + useLink, + useCapabilities, + useStartServices, +} from '../../hooks'; const FlexItemButtonWrapper = styled(EuiFlexItem)` &&& { @@ -27,13 +34,14 @@ const FlexItemButtonWrapper = styled(EuiFlexItem)` } `; -const tutorialDirectoryNoticeState$ = new BehaviorSubject({ +export const tutorialDirectoryNoticeState$ = new BehaviorSubject({ settingsDataLoaded: false, hasSeenNotice: false, }); const TutorialDirectoryNotice: TutorialDirectoryNoticeComponent = memo(() => { const { getHref } = useLink(); + const { application } = useStartServices(); const { show: hasIngestManager } = useCapabilities(); const { data: settingsData, isLoading } = useGetSettings(); const [dismissedNotice, setDismissedNotice] = useState(false); @@ -98,12 +106,14 @@ const TutorialDirectoryNotice: TutorialDirectoryNoticeComponent = memo(() => {
    - - - + + + + +
    From 70d61436bc53ba80e46652026aa9554fb13c9eae Mon Sep 17 00:00:00 2001 From: Quynh Nguyen <43350163+qn895@users.noreply.github.com> Date: Fri, 5 Feb 2021 11:58:57 -0600 Subject: [PATCH 51/69] [ML] Add Lens and Discover integration to index based Data Visualizer (#89471) --- x-pack/plugins/ml/kibana.json | 3 +- x-pack/plugins/ml/public/application/app.tsx | 1 + .../data_recognizer/data_recognizer.d.ts | 4 +- .../contexts/kibana/kibana_context.ts | 4 +- .../index_based/common/combined_query.ts | 11 + .../index_based/common/index.ts | 1 + .../actions_panel/actions_panel.tsx | 219 +++++++++---- .../components/expanded_row/expanded_row.tsx | 7 +- .../expanded_row/geo_point_content.tsx | 11 +- .../field_data_row/action_menu/actions.ts | 49 +++ .../field_data_row/action_menu/index.ts | 8 + .../field_data_row/action_menu/lens_utils.ts | 288 ++++++++++++++++++ .../datavisualizer/index_based/page.tsx | 53 ++-- .../data_visualizer_stats_table.tsx | 12 +- x-pack/plugins/ml/public/plugin.ts | 3 + x-pack/plugins/ml/tsconfig.json | 1 + .../data_visualizer/file_data_visualizer.ts | 4 +- .../data_visualizer/index_data_visualizer.ts | 30 +- .../index_data_visualizer_actions_panel.ts | 36 ++- .../apps/ml/permissions/full_ml_access.ts | 7 +- .../apps/ml/permissions/read_ml_access.ts | 12 +- .../ml/data_visualizer_index_based.ts | 40 +++ .../services/ml/data_visualizer_table.ts | 29 +- .../apps/ml/data_visualizer/index.ts | 3 +- .../index_data_visualizer_actions_panel.ts | 57 ++++ .../apps/ml/permissions/full_ml_access.ts | 7 +- .../apps/ml/permissions/read_ml_access.ts | 7 +- 27 files changed, 805 insertions(+), 102 deletions(-) create mode 100644 x-pack/plugins/ml/public/application/datavisualizer/index_based/common/combined_query.ts create mode 100644 x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/action_menu/actions.ts create mode 100644 x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/action_menu/index.ts create mode 100644 x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/action_menu/lens_utils.ts create mode 100644 x-pack/test/functional_basic/apps/ml/data_visualizer/index_data_visualizer_actions_panel.ts diff --git a/x-pack/plugins/ml/kibana.json b/x-pack/plugins/ml/kibana.json index ede6b8abbd09c..a73a68445a391 100644 --- a/x-pack/plugins/ml/kibana.json +++ b/x-pack/plugins/ml/kibana.json @@ -25,7 +25,8 @@ "spaces", "management", "licenseManagement", - "maps" + "maps", + "lens" ], "server": true, "ui": true, diff --git a/x-pack/plugins/ml/public/application/app.tsx b/x-pack/plugins/ml/public/application/app.tsx index 44558fb9dcfeb..0199e13e93d8c 100644 --- a/x-pack/plugins/ml/public/application/app.tsx +++ b/x-pack/plugins/ml/public/application/app.tsx @@ -77,6 +77,7 @@ const App: FC = ({ coreStart, deps, appMountParams }) => { data: deps.data, security: deps.security, licenseManagement: deps.licenseManagement, + lens: deps.lens, storage: localStorage, embeddable: deps.embeddable, maps: deps.maps, diff --git a/x-pack/plugins/ml/public/application/components/data_recognizer/data_recognizer.d.ts b/x-pack/plugins/ml/public/application/components/data_recognizer/data_recognizer.d.ts index c47e21222097d..ff6363ea2cc6e 100644 --- a/x-pack/plugins/ml/public/application/components/data_recognizer/data_recognizer.d.ts +++ b/x-pack/plugins/ml/public/application/components/data_recognizer/data_recognizer.d.ts @@ -7,10 +7,10 @@ import { FC } from 'react'; import { SavedSearchSavedObject } from '../../../../common/types/kibana'; -import { IndexPattern } from '../../../../../../../src/plugins/data/public'; +import type { IIndexPattern } from '../../../../../../../src/plugins/data/public'; declare const DataRecognizer: FC<{ - indexPattern: IndexPattern; + indexPattern: IIndexPattern; savedSearch: SavedSearchSavedObject | null; results: { count: number; diff --git a/x-pack/plugins/ml/public/application/contexts/kibana/kibana_context.ts b/x-pack/plugins/ml/public/application/contexts/kibana/kibana_context.ts index a8df8f8174bd3..1dd30d5d99335 100644 --- a/x-pack/plugins/ml/public/application/contexts/kibana/kibana_context.ts +++ b/x-pack/plugins/ml/public/application/contexts/kibana/kibana_context.ts @@ -17,7 +17,8 @@ import { SharePluginStart } from '../../../../../../../src/plugins/share/public' import { MlServicesContext } from '../../app'; import { IStorageWrapper } from '../../../../../../../src/plugins/kibana_utils/public'; import type { EmbeddableStart } from '../../../../../../../src/plugins/embeddable/public'; -import { MapsStartApi } from '../../../../../maps/public'; +import type { MapsStartApi } from '../../../../../maps/public'; +import type { LensPublicStart } from '../../../../../lens/public'; interface StartPlugins { data: DataPublicPluginStart; @@ -26,6 +27,7 @@ interface StartPlugins { share: SharePluginStart; embeddable: EmbeddableStart; maps?: MapsStartApi; + lens?: LensPublicStart; } export type StartServices = CoreStart & StartPlugins & { diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/common/combined_query.ts b/x-pack/plugins/ml/public/application/datavisualizer/index_based/common/combined_query.ts new file mode 100644 index 0000000000000..7723277959b1f --- /dev/null +++ b/x-pack/plugins/ml/public/application/datavisualizer/index_based/common/combined_query.ts @@ -0,0 +1,11 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +export interface CombinedQuery { + searchString: string | { [key: string]: any }; + searchQueryLanguage: string; +} diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/common/index.ts b/x-pack/plugins/ml/public/application/datavisualizer/index_based/common/index.ts index 50a67b946e525..fe99a63432793 100644 --- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/common/index.ts +++ b/x-pack/plugins/ml/public/application/datavisualizer/index_based/common/index.ts @@ -6,3 +6,4 @@ */ export { FieldHistogramRequestConfig, FieldRequestConfig } from './request'; +export type { CombinedQuery } from './combined_query'; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/actions_panel/actions_panel.tsx b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/actions_panel/actions_panel.tsx index 9dd455427b747..255dfcc21ccab 100644 --- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/actions_panel/actions_panel.tsx +++ b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/actions_panel/actions_panel.tsx @@ -5,23 +5,51 @@ * 2.0. */ -import React, { FC, useState } from 'react'; +import React, { FC, useState, useEffect } from 'react'; import { FormattedMessage } from '@kbn/i18n/react'; import { i18n } from '@kbn/i18n'; -import { EuiSpacer, EuiText, EuiTitle, EuiFlexGroup } from '@elastic/eui'; +import { + EuiSpacer, + EuiText, + EuiTitle, + EuiFlexGroup, + EuiFlexItem, + EuiCard, + EuiIcon, +} from '@elastic/eui'; import { Link } from 'react-router-dom'; -import { IndexPattern } from '../../../../../../../../../src/plugins/data/public'; import { CreateJobLinkCard } from '../../../../components/create_job_link_card'; import { DataRecognizer } from '../../../../components/data_recognizer'; import { ML_PAGES } from '../../../../../../common/constants/ml_url_generator'; +import { + DISCOVER_APP_URL_GENERATOR, + DiscoverUrlGeneratorState, +} from '../../../../../../../../../src/plugins/discover/public'; +import { useMlKibana } from '../../../../contexts/kibana'; +import { isFullLicense } from '../../../../license'; +import { checkPermission } from '../../../../capabilities/check_capabilities'; +import { mlNodesAvailable } from '../../../../ml_nodes_check'; +import { useUrlState } from '../../../../util/url_state'; +import type { IIndexPattern } from '../../../../../../../../../src/plugins/data/common'; interface Props { - indexPattern: IndexPattern; + indexPattern: IIndexPattern; + searchString?: string | { [key: string]: any }; + searchQueryLanguage?: string; } -export const ActionsPanel: FC = ({ indexPattern }) => { +export const ActionsPanel: FC = ({ indexPattern, searchString, searchQueryLanguage }) => { const [recognizerResultsCount, setRecognizerResultsCount] = useState(0); + const [discoverLink, setDiscoverLink] = useState(''); + const { + services: { + share: { + urlGenerators: { getUrlGenerator }, + }, + }, + } = useMlKibana(); + const [globalState] = useUrlState('_g'); const recognizerResults = { count: 0, @@ -29,63 +57,146 @@ export const ActionsPanel: FC = ({ indexPattern }) => { setRecognizerResultsCount(recognizerResults.count); }, }; + const showCreateJob = + isFullLicense() && + checkPermission('canCreateJob') && + mlNodesAvailable() && + indexPattern.timeFieldName !== undefined; const createJobLink = `/${ML_PAGES.ANOMALY_DETECTION_CREATE_JOB}/advanced?index=${indexPattern.id}`; + useEffect(() => { + let unmounted = false; + + const indexPatternId = indexPattern.id; + const getDiscoverUrl = async (): Promise => { + const state: DiscoverUrlGeneratorState = { + indexPatternId, + }; + if (searchString && searchQueryLanguage !== undefined) { + state.query = { query: searchString, language: searchQueryLanguage }; + } + if (globalState?.time) { + state.timeRange = globalState.time; + } + if (globalState?.refreshInterval) { + state.refreshInterval = globalState.refreshInterval; + } + + let discoverUrlGenerator; + try { + discoverUrlGenerator = getUrlGenerator(DISCOVER_APP_URL_GENERATOR); + } catch (error) { + // ignore error thrown when url generator is not available + return; + } + + const discoverUrl = await discoverUrlGenerator.createUrl(state); + if (!unmounted) { + setDiscoverLink(discoverUrl); + } + }; + getDiscoverUrl(); + return () => { + unmounted = true; + }; + }, [indexPattern, searchString, searchQueryLanguage, globalState]); + // Note we use display:none for the DataRecognizer section as it needs to be // passed the recognizerResults object, and then run the recognizer check which // controls whether the recognizer section is ultimately displayed. return (
    - -

    - -

    -     - -
    - -

    - + +

    + +

    + + + + +

    + +

    +     + + + + + + + )} + + {discoverLink && ( + <> + +

    + +

    +     + + + } + description={i18n.translate( + 'xpack.ml.datavisualizer.actionsPanel.viewIndexInDiscoverDescription', + { + defaultMessage: 'Explore index in Discover', + } + )} + title={ + + } + href={discoverLink} /> -

    -     - - - - - -
    - -

    - -

    -     - - - - + + + )}
    ); }; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/expanded_row/expanded_row.tsx b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/expanded_row/expanded_row.tsx index 96531de23fa4d..8a0656abe95cc 100644 --- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/expanded_row/expanded_row.tsx +++ b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/expanded_row/expanded_row.tsx @@ -10,7 +10,6 @@ import React from 'react'; import { ML_JOB_FIELD_TYPES } from '../../../../../../common/constants/field_types'; import { LoadingIndicator } from '../field_data_row/loading_indicator'; import { NotInDocsContent } from '../field_data_row/content_types'; -import { FieldVisConfig } from '../../../stats_table/types'; import { BooleanContent, DateContent, @@ -20,8 +19,10 @@ import { OtherContent, TextContent, } from '../../../stats_table/components/field_data_expanded_row'; -import { CombinedQuery, GeoPointContent } from './geo_point_content'; -import { IndexPattern } from '../../../../../../../../../src/plugins/data/common/index_patterns/index_patterns'; +import { GeoPointContent } from './geo_point_content'; +import type { CombinedQuery } from '../../common'; +import type { IndexPattern } from '../../../../../../../../../src/plugins/data/common/index_patterns/index_patterns'; +import type { FieldVisConfig } from '../../../stats_table/types'; export const IndexBasedDataVisualizerExpandedRow = ({ item, diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/expanded_row/geo_point_content.tsx b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/expanded_row/geo_point_content.tsx index cea65edbfb55a..33b347b4da805 100644 --- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/expanded_row/geo_point_content.tsx +++ b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/expanded_row/geo_point_content.tsx @@ -9,20 +9,17 @@ import React, { FC, useEffect, useState } from 'react'; import { EuiFlexItem } from '@elastic/eui'; import { ExamplesList } from '../../../index_based/components/field_data_row/examples_list'; -import { FieldVisConfig } from '../../../stats_table/types'; -import { IndexPattern } from '../../../../../../../../../src/plugins/data/common/index_patterns/index_patterns'; import { MlEmbeddedMapComponent } from '../../../../components/ml_embedded_map'; import { ML_JOB_FIELD_TYPES } from '../../../../../../common/constants/field_types'; import { ES_GEO_FIELD_TYPE } from '../../../../../../../maps/common/constants'; -import { LayerDescriptor } from '../../../../../../../maps/common/descriptor_types'; import { useMlKibana } from '../../../../contexts/kibana'; import { DocumentStatsTable } from '../../../stats_table/components/field_data_expanded_row/document_stats'; import { ExpandedRowContent } from '../../../stats_table/components/field_data_expanded_row/expanded_row_content'; +import type { CombinedQuery } from '../../common'; +import type { IndexPattern } from '../../../../../../../../../src/plugins/data/common/index_patterns/index_patterns'; +import type { LayerDescriptor } from '../../../../../../../maps/common/descriptor_types'; +import type { FieldVisConfig } from '../../../stats_table/types'; -export interface CombinedQuery { - searchString: string | { [key: string]: any }; - searchQueryLanguage: string; -} export const GeoPointContent: FC<{ config: FieldVisConfig; indexPattern: IndexPattern | undefined; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/action_menu/actions.ts b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/action_menu/actions.ts new file mode 100644 index 0000000000000..57675927ce816 --- /dev/null +++ b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/action_menu/actions.ts @@ -0,0 +1,49 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { i18n } from '@kbn/i18n'; +import { Action } from '@elastic/eui/src/components/basic_table/action_types'; +import { getCompatibleLensDataType, getLensAttributes } from './lens_utils'; +import type { CombinedQuery } from '../../../common'; +import type { IIndexPattern } from '../../../../../../../../../../src/plugins/data/common/index_patterns'; +import type { LensPublicStart } from '../../../../../../../../lens/public'; +import type { FieldVisConfig } from '../../../../stats_table/types'; + +export function getActions( + indexPattern: IIndexPattern, + lensPlugin: LensPublicStart, + combinedQuery: CombinedQuery +): Array> { + const canUseLensEditor = lensPlugin.canUseEditor(); + return [ + { + name: i18n.translate('xpack.ml.dataVisualizer.indexBasedDataGrid.exploreInLensTitle', { + defaultMessage: 'Explore in Lens', + }), + description: i18n.translate( + 'xpack.ml.dataVisualizer.indexBasedDataGrid.exploreInLensDescription', + { + defaultMessage: 'Explore in Lens', + } + ), + type: 'icon', + icon: 'lensApp', + available: (item: FieldVisConfig) => + getCompatibleLensDataType(item.type) !== undefined && canUseLensEditor, + onClick: (item: FieldVisConfig) => { + const lensAttributes = getLensAttributes(indexPattern, combinedQuery, item); + if (lensAttributes) { + lensPlugin.navigateToPrefilledEditor({ + id: `ml-dataVisualizer-${item.fieldName}`, + attributes: lensAttributes, + }); + } + }, + 'data-test-subj': 'mlActionButtonViewInLens', + }, + ]; +} diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/action_menu/index.ts b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/action_menu/index.ts new file mode 100644 index 0000000000000..df36cc89ce911 --- /dev/null +++ b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/action_menu/index.ts @@ -0,0 +1,8 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +export { getActions } from './actions'; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/action_menu/lens_utils.ts b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/action_menu/lens_utils.ts new file mode 100644 index 0000000000000..8d078b59ad778 --- /dev/null +++ b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/action_menu/lens_utils.ts @@ -0,0 +1,288 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { i18n } from '@kbn/i18n'; +import { ML_JOB_FIELD_TYPES } from '../../../../../../../common/constants/field_types'; +import type { TypedLensByValueInput } from '../../../../../../../../lens/public'; +import type { FieldVisConfig } from '../../../../stats_table/types'; +import type { IndexPatternColumn, XYLayerConfig } from '../../../../../../../../lens/public'; +import type { CombinedQuery } from '../../../common'; +import type { IIndexPattern } from '../../../../../../../../../../src/plugins/data/common/index_patterns'; +interface ColumnsAndLayer { + columns: Record; + layer: XYLayerConfig; +} + +const TOP_VALUES_LABEL = i18n.translate('xpack.ml.dataVisualizer.lensChart.topValuesLabel', { + defaultMessage: 'Top values', +}); +const COUNT = i18n.translate('xpack.ml.dataVisualizer.lensChart.countLabel', { + defaultMessage: 'Count', +}); + +export function getNumberSettings(item: FieldVisConfig, defaultIndexPattern: IIndexPattern) { + // if index has no timestamp field + if (defaultIndexPattern.timeFieldName === undefined) { + const columns: Record = { + col1: { + label: item.fieldName!, + dataType: 'number', + isBucketed: true, + operationType: 'range', + params: { + type: 'histogram', + maxBars: 'auto', + ranges: [], + }, + sourceField: item.fieldName!, + }, + col2: { + label: COUNT, + dataType: 'number', + isBucketed: false, + sourceField: 'Records', + operationType: 'count', + }, + }; + + const layer: XYLayerConfig = { + accessors: ['col2'], + layerId: 'layer1', + seriesType: 'bar', + xAccessor: 'col1', + }; + return { columns, layer }; + } + + const columns: Record = { + col2: { + dataType: 'number', + isBucketed: false, + label: i18n.translate('xpack.ml.dataVisualizer.lensChart.averageOfLabel', { + defaultMessage: 'Average of {fieldName}', + values: { fieldName: item.fieldName }, + }), + operationType: 'avg', + sourceField: item.fieldName!, + }, + col1: { + dataType: 'date', + isBucketed: true, + label: defaultIndexPattern.timeFieldName!, + operationType: 'date_histogram', + params: { interval: 'auto' }, + scale: 'interval', + sourceField: defaultIndexPattern.timeFieldName!, + }, + }; + + const layer: XYLayerConfig = { + accessors: ['col2'], + layerId: 'layer1', + seriesType: 'line', + xAccessor: 'col1', + }; + + return { columns, layer }; +} +export function getDateSettings(item: FieldVisConfig) { + const columns: Record = { + col2: { + dataType: 'number', + isBucketed: false, + label: COUNT, + operationType: 'count', + scale: 'ratio', + sourceField: 'Records', + }, + col1: { + dataType: 'date', + isBucketed: true, + label: item.fieldName!, + operationType: 'date_histogram', + params: { interval: 'auto' }, + scale: 'interval', + sourceField: item.fieldName!, + }, + }; + const layer: XYLayerConfig = { + accessors: ['col2'], + layerId: 'layer1', + seriesType: 'line', + xAccessor: 'col1', + }; + + return { columns, layer }; +} + +export function getKeywordSettings(item: FieldVisConfig) { + const columns: Record = { + col1: { + label: TOP_VALUES_LABEL, + dataType: 'string', + isBucketed: true, + operationType: 'terms', + params: { + orderBy: { type: 'column', columnId: 'col2' }, + size: 10, + orderDirection: 'desc', + }, + sourceField: item.fieldName!, + }, + col2: { + label: COUNT, + dataType: 'number', + isBucketed: false, + sourceField: 'Records', + operationType: 'count', + }, + }; + const layer: XYLayerConfig = { + accessors: ['col2'], + layerId: 'layer1', + seriesType: 'bar', + xAccessor: 'col1', + }; + + return { columns, layer }; +} + +export function getBooleanSettings(item: FieldVisConfig) { + const columns: Record = { + col1: { + label: TOP_VALUES_LABEL, + dataType: 'string', + isBucketed: true, + operationType: 'terms', + params: { + orderBy: { type: 'alphabetical' }, + size: 2, + orderDirection: 'desc', + }, + sourceField: item.fieldName!, + }, + col2: { + label: COUNT, + dataType: 'number', + isBucketed: false, + sourceField: 'Records', + operationType: 'count', + }, + }; + const layer: XYLayerConfig = { + accessors: ['col2'], + layerId: 'layer1', + seriesType: 'bar', + xAccessor: 'col1', + }; + + return { columns, layer }; +} + +export function getCompatibleLensDataType(type: FieldVisConfig['type']): string | undefined { + let lensType: string | undefined; + switch (type) { + case ML_JOB_FIELD_TYPES.KEYWORD: + lensType = 'string'; + break; + case ML_JOB_FIELD_TYPES.DATE: + lensType = 'date'; + break; + case ML_JOB_FIELD_TYPES.NUMBER: + lensType = 'number'; + break; + case ML_JOB_FIELD_TYPES.IP: + lensType = 'ip'; + break; + case ML_JOB_FIELD_TYPES.BOOLEAN: + lensType = 'string'; + break; + default: + lensType = undefined; + } + return lensType; +} + +function getColumnsAndLayer( + fieldType: FieldVisConfig['type'], + item: FieldVisConfig, + defaultIndexPattern: IIndexPattern +): ColumnsAndLayer | undefined { + if (item.fieldName === undefined) return; + + if (fieldType === ML_JOB_FIELD_TYPES.DATE) { + return getDateSettings(item); + } + if (fieldType === ML_JOB_FIELD_TYPES.NUMBER) { + return getNumberSettings(item, defaultIndexPattern); + } + if (fieldType === ML_JOB_FIELD_TYPES.IP || fieldType === ML_JOB_FIELD_TYPES.KEYWORD) { + return getKeywordSettings(item); + } + if (fieldType === ML_JOB_FIELD_TYPES.BOOLEAN) { + return getBooleanSettings(item); + } +} +// Get formatted Lens visualization format depending on field type +// currently only supports the following types: +// 'document' | 'string' | 'number' | 'date' | 'boolean' | 'ip' +export function getLensAttributes( + defaultIndexPattern: IIndexPattern | undefined, + combinedQuery: CombinedQuery, + item: FieldVisConfig +): TypedLensByValueInput['attributes'] | undefined { + if (defaultIndexPattern === undefined || item.type === undefined || item.fieldName === undefined) + return; + + const presets = getColumnsAndLayer(item.type, item, defaultIndexPattern); + + if (!presets) return; + + return { + visualizationType: 'lnsXY', + title: i18n.translate('xpack.ml.dataVisualizer.lensChart.chartTitle', { + defaultMessage: 'Lens for {fieldName}', + values: { fieldName: item.fieldName }, + }), + references: [ + { + id: defaultIndexPattern.id!, + name: 'indexpattern-datasource-current-indexpattern', + type: 'index-pattern', + }, + { + id: defaultIndexPattern.id!, + name: 'indexpattern-datasource-layer-layer1', + type: 'index-pattern', + }, + ], + state: { + datasourceStates: { + indexpattern: { + layers: { + layer1: { + columnOrder: ['col1', 'col2'], + columns: presets.columns, + }, + }, + }, + }, + filters: [], + query: { language: combinedQuery.searchQueryLanguage, query: combinedQuery.searchString }, + visualization: { + axisTitlesVisibilitySettings: { x: true, yLeft: true, yRight: true }, + fittingFunction: 'None', + gridlinesVisibilitySettings: { x: true, yLeft: true, yRight: true }, + layers: [presets.layer], + legend: { isVisible: true, position: 'right' }, + preferredSeriesType: 'line', + tickLabelsVisibilitySettings: { x: true, yLeft: true, yRight: true }, + valueLabels: 'hide', + }, + }, + }; +} diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/page.tsx b/x-pack/plugins/ml/public/application/datavisualizer/index_based/page.tsx index 6ea85c354d88b..6bc1970bc615b 100644 --- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/page.tsx +++ b/x-pack/plugins/ml/public/application/datavisualizer/index_based/page.tsx @@ -19,6 +19,8 @@ import { EuiSpacer, EuiTitle, } from '@elastic/eui'; +import { EuiTableActionsColumnType } from '@elastic/eui/src/components/basic_table/table_types'; +import { FormattedMessage } from '@kbn/i18n/react'; import { IFieldType, KBN_FIELD_TYPES, @@ -32,9 +34,6 @@ import { NavigationMenu } from '../../components/navigation_menu'; import { DatePickerWrapper } from '../../components/navigation_menu/date_picker_wrapper'; import { ML_JOB_FIELD_TYPES } from '../../../../common/constants/field_types'; import { SEARCH_QUERY_LANGUAGE, SearchQueryLanguage } from '../../../../common/constants/search'; -import { isFullLicense } from '../../license'; -import { checkPermission } from '../../capabilities/check_capabilities'; -import { mlNodesAvailable } from '../../ml_nodes_check/check_ml_nodes'; import { FullTimeRangeSelector } from '../../components/full_time_range_selector'; import { mlTimefilterRefresh$ } from '../../services/timefilter_refresh_service'; import { useMlContext } from '../../contexts/ml'; @@ -63,6 +62,7 @@ import type { MetricFieldsStats, TotalFieldsStats, } from '../stats_table/components/field_count_stats'; +import { getActions } from './components/field_data_row/action_menu/actions'; interface DataVisualizerPageState { overallStats: OverallStats; @@ -116,6 +116,10 @@ export const getDefaultDataVisualizerListState = (): Required { const mlContext = useMlContext(); const restorableDefaults = getDefaultDataVisualizerListState(); + const { + services: { lens: lensPlugin, docLinks }, + } = useMlKibana(); + const [dataVisualizerListState, setDataVisualizerListState] = usePageUrlState( ML_PAGES.DATA_VISUALIZER_INDEX_VIEWER, restorableDefaults @@ -167,12 +171,6 @@ export const Page: FC = () => { const defaults = getDefaultPageState(); - const showActionsPanel = - isFullLicense() && - checkPermission('canCreateJob') && - mlNodesAvailable() && - currentIndexPattern.timeFieldName !== undefined; - const { searchQueryLanguage, searchString, searchQuery } = useMemo(() => { const searchData = extractSearchData(currentSavedSearch); if (searchData === undefined || dataVisualizerListState.searchString !== '') { @@ -686,9 +684,27 @@ export const Page: FC = () => { [currentIndexPattern, searchQuery] ); - const { - services: { docLinks }, - } = useMlKibana(); + // Inject custom action column for the index based visualizer + const extendedColumns = useMemo(() => { + if (lensPlugin === undefined) { + // eslint-disable-next-line no-console + console.error('Lens plugin not available'); + return; + } + const actionColumn: EuiTableActionsColumnType = { + name: ( + + ), + actions: getActions(currentIndexPattern, lensPlugin, { searchQueryLanguage, searchString }), + width: '100px', + }; + + return [actionColumn]; + }, [currentIndexPattern, lensPlugin, searchQueryLanguage, searchString]); + const helpLink = docLinks.links.ml.guide; return ( @@ -766,14 +782,17 @@ export const Page: FC = () => { pageState={dataVisualizerListState} updatePageState={setDataVisualizerListState} getItemIdToExpandedRowMap={getItemIdToExpandedRowMap} + extendedColumns={extendedColumns} /> - {showActionsPanel === true && ( - - - - )} + + +     diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/data_visualizer_stats_table.tsx b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/data_visualizer_stats_table.tsx index 82e807fa61e67..2a6a681c63210 100644 --- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/data_visualizer_stats_table.tsx +++ b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/data_visualizer_stats_table.tsx @@ -9,6 +9,7 @@ import React, { useMemo, useState } from 'react'; import { CENTER_ALIGNMENT, + EuiBasicTableColumn, EuiButtonIcon, EuiFlexItem, EuiIcon, @@ -52,6 +53,7 @@ interface DataVisualizerTableProps { update: Partial ) => void; getItemIdToExpandedRowMap: (itemIds: string[], items: T[]) => ItemIdToExpandedRowMap; + extendedColumns?: Array>; } export const DataVisualizerTable = ({ @@ -59,11 +61,12 @@ export const DataVisualizerTable = ({ pageState, updatePageState, getItemIdToExpandedRowMap, + extendedColumns, }: DataVisualizerTableProps) => { const [expandedRowItemIds, setExpandedRowItemIds] = useState([]); const [expandAll, toggleExpandAll] = useState(false); - const { onTableChange, pagination, sorting } = useTableSettings( + const { onTableChange, pagination, sorting } = useTableSettings( items, pageState, updatePageState @@ -136,7 +139,7 @@ export const DataVisualizerTable = ({ 'data-test-subj': 'mlDataVisualizerTableColumnDetailsToggle', }; - return [ + const baseColumns = [ expanderColumn, { field: 'type', @@ -236,7 +239,8 @@ export const DataVisualizerTable = ({ 'data-test-subj': 'mlDataVisualizerTableColumnDistribution', }, ]; - }, [expandAll, showDistributions, updatePageState]); + return extendedColumns ? [...baseColumns, ...extendedColumns] : baseColumns; + }, [expandAll, showDistributions, updatePageState, extendedColumns]); const itemIdToExpandedRowMap = useMemo(() => { let itemIds = expandedRowItemIds; @@ -248,7 +252,7 @@ export const DataVisualizerTable = ({ return ( - + className={'mlDataVisualizer'} items={items} itemId={FIELD_NAME} diff --git a/x-pack/plugins/ml/public/plugin.ts b/x-pack/plugins/ml/public/plugin.ts index bfbc04943273e..9fd245a7e16ba 100644 --- a/x-pack/plugins/ml/public/plugin.ts +++ b/x-pack/plugins/ml/public/plugin.ts @@ -46,6 +46,7 @@ import { registerFeature } from './register_feature'; // Not importing from `ml_url_generator/index` here to avoid importing unnecessary code import { registerUrlGenerator } from './ml_url_generator/ml_url_generator'; import type { MapsStartApi } from '../../maps/public'; +import { LensPublicStart } from '../../lens/public'; export interface MlStartDependencies { data: DataPublicPluginStart; @@ -55,6 +56,7 @@ export interface MlStartDependencies { spaces?: SpacesPluginStart; embeddable: EmbeddableStart; maps?: MapsStartApi; + lens?: LensPublicStart; } export interface MlSetupDependencies { security?: SecurityPluginSetup; @@ -106,6 +108,7 @@ export class MlPlugin implements Plugin { embeddable: { ...pluginsSetup.embeddable, ...pluginsStart.embeddable }, maps: pluginsStart.maps, uiActions: pluginsStart.uiActions, + lens: pluginsStart.lens, kibanaVersion, }, params diff --git a/x-pack/plugins/ml/tsconfig.json b/x-pack/plugins/ml/tsconfig.json index 113bcbe71047f..2caf88de1b76a 100644 --- a/x-pack/plugins/ml/tsconfig.json +++ b/x-pack/plugins/ml/tsconfig.json @@ -28,6 +28,7 @@ { "path": "../license_management/tsconfig.json" }, { "path": "../licensing/tsconfig.json" }, { "path": "../maps/tsconfig.json" }, + { "path": "../lens/tsconfig.json" }, { "path": "../security/tsconfig.json" }, { "path": "../spaces/tsconfig.json" }, ] diff --git a/x-pack/test/functional/apps/ml/data_visualizer/file_data_visualizer.ts b/x-pack/test/functional/apps/ml/data_visualizer/file_data_visualizer.ts index c09bb0c555322..65bc68db25aa1 100644 --- a/x-pack/test/functional/apps/ml/data_visualizer/file_data_visualizer.ts +++ b/x-pack/test/functional/apps/ml/data_visualizer/file_data_visualizer.ts @@ -222,6 +222,7 @@ export default function ({ getService }: FtrProviderContext) { fieldRow.fieldName, fieldRow.docCountFormatted, fieldRow.topValuesCount, + false, false ); } @@ -230,7 +231,8 @@ export default function ({ getService }: FtrProviderContext) { fieldRow.type, fieldRow.fieldName!, fieldRow.docCountFormatted, - fieldRow.exampleCount + fieldRow.exampleCount, + false ); } diff --git a/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer.ts b/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer.ts index ffd22dd176ed5..609cf05dad541 100644 --- a/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer.ts +++ b/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer.ts @@ -13,11 +13,13 @@ interface MetricFieldVisConfig extends FieldVisConfig { statsMaxDecimalPlaces: number; docCountFormatted: string; topValuesCount: number; + viewableInLens: boolean; } interface NonMetricFieldVisConfig extends FieldVisConfig { docCountFormatted: string; exampleCount: number; + viewableInLens: boolean; } interface TestData { @@ -69,6 +71,7 @@ export default function ({ getService }: FtrProviderContext) { docCountFormatted: '5000 (100%)', statsMaxDecimalPlaces: 3, topValuesCount: 10, + viewableInLens: true, }, ], nonMetricFields: [ @@ -80,6 +83,7 @@ export default function ({ getService }: FtrProviderContext) { loading: false, docCountFormatted: '5000 (100%)', exampleCount: 2, + viewableInLens: true, }, { fieldName: '@version', @@ -89,6 +93,7 @@ export default function ({ getService }: FtrProviderContext) { loading: false, exampleCount: 1, docCountFormatted: '', + viewableInLens: false, }, { fieldName: '@version.keyword', @@ -98,6 +103,7 @@ export default function ({ getService }: FtrProviderContext) { loading: false, exampleCount: 1, docCountFormatted: '5000 (100%)', + viewableInLens: true, }, { fieldName: 'airline', @@ -107,6 +113,7 @@ export default function ({ getService }: FtrProviderContext) { loading: false, exampleCount: 10, docCountFormatted: '5000 (100%)', + viewableInLens: true, }, { fieldName: 'type', @@ -116,6 +123,7 @@ export default function ({ getService }: FtrProviderContext) { loading: false, exampleCount: 1, docCountFormatted: '', + viewableInLens: false, }, { fieldName: 'type.keyword', @@ -125,6 +133,7 @@ export default function ({ getService }: FtrProviderContext) { loading: false, exampleCount: 1, docCountFormatted: '5000 (100%)', + viewableInLens: true, }, ], emptyFields: ['sourcetype'], @@ -158,6 +167,7 @@ export default function ({ getService }: FtrProviderContext) { docCountFormatted: '5000 (100%)', statsMaxDecimalPlaces: 3, topValuesCount: 10, + viewableInLens: true, }, ], nonMetricFields: [ @@ -169,6 +179,7 @@ export default function ({ getService }: FtrProviderContext) { loading: false, docCountFormatted: '5000 (100%)', exampleCount: 2, + viewableInLens: true, }, { fieldName: '@version', @@ -178,6 +189,7 @@ export default function ({ getService }: FtrProviderContext) { loading: false, exampleCount: 1, docCountFormatted: '', + viewableInLens: false, }, { fieldName: '@version.keyword', @@ -187,6 +199,7 @@ export default function ({ getService }: FtrProviderContext) { loading: false, exampleCount: 1, docCountFormatted: '5000 (100%)', + viewableInLens: true, }, { fieldName: 'airline', @@ -196,6 +209,7 @@ export default function ({ getService }: FtrProviderContext) { loading: false, exampleCount: 5, docCountFormatted: '5000 (100%)', + viewableInLens: true, }, { fieldName: 'type', @@ -205,6 +219,7 @@ export default function ({ getService }: FtrProviderContext) { loading: false, exampleCount: 1, docCountFormatted: '', + viewableInLens: false, }, { fieldName: 'type.keyword', @@ -214,6 +229,7 @@ export default function ({ getService }: FtrProviderContext) { loading: false, exampleCount: 1, docCountFormatted: '5000 (100%)', + viewableInLens: true, }, ], emptyFields: ['sourcetype'], @@ -247,6 +263,7 @@ export default function ({ getService }: FtrProviderContext) { docCountFormatted: '5000 (100%)', statsMaxDecimalPlaces: 3, topValuesCount: 10, + viewableInLens: true, }, ], nonMetricFields: [ @@ -258,6 +275,7 @@ export default function ({ getService }: FtrProviderContext) { loading: false, docCountFormatted: '5000 (100%)', exampleCount: 2, + viewableInLens: true, }, { fieldName: '@version', @@ -267,6 +285,7 @@ export default function ({ getService }: FtrProviderContext) { loading: false, exampleCount: 1, docCountFormatted: '', + viewableInLens: false, }, { fieldName: '@version.keyword', @@ -276,6 +295,7 @@ export default function ({ getService }: FtrProviderContext) { loading: false, exampleCount: 1, docCountFormatted: '5000 (100%)', + viewableInLens: true, }, { fieldName: 'airline', @@ -285,6 +305,7 @@ export default function ({ getService }: FtrProviderContext) { loading: false, exampleCount: 5, docCountFormatted: '5000 (100%)', + viewableInLens: true, }, { fieldName: 'type', @@ -294,6 +315,7 @@ export default function ({ getService }: FtrProviderContext) { loading: false, exampleCount: 1, docCountFormatted: '', + viewableInLens: false, }, { fieldName: 'type.keyword', @@ -303,6 +325,7 @@ export default function ({ getService }: FtrProviderContext) { loading: false, exampleCount: 1, docCountFormatted: '5000 (100%)', + viewableInLens: true, }, ], emptyFields: ['sourcetype'], @@ -334,6 +357,7 @@ export default function ({ getService }: FtrProviderContext) { loading: false, docCountFormatted: '408 (100%)', exampleCount: 10, + viewableInLens: false, }, ], emptyFields: [], @@ -417,7 +441,8 @@ export default function ({ getService }: FtrProviderContext) { await ml.dataVisualizerTable.assertNumberFieldContents( fieldRow.fieldName, fieldRow.docCountFormatted, - fieldRow.topValuesCount + fieldRow.topValuesCount, + fieldRow.viewableInLens ); } @@ -426,7 +451,8 @@ export default function ({ getService }: FtrProviderContext) { fieldRow.type, fieldRow.fieldName!, fieldRow.docCountFormatted, - fieldRow.exampleCount + fieldRow.exampleCount, + fieldRow.viewableInLens ); } diff --git a/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer_actions_panel.ts b/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer_actions_panel.ts index 6e2e9cfb858c3..ce00ee79e9075 100644 --- a/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer_actions_panel.ts +++ b/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer_actions_panel.ts @@ -11,7 +11,7 @@ export default function ({ getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const ml = getService('ml'); - describe('index based actions panel', function () { + describe('index based actions panel on trial license', function () { this.tags(['mlqa']); const indexPatternName = 'ft_farequote'; @@ -28,6 +28,7 @@ export default function ({ getService }: FtrProviderContext) { before(async () => { await esArchiver.loadIfNeeded('ml/farequote'); await ml.testResources.createIndexPatternIfNeeded(indexPatternName, '@timestamp'); + await ml.testResources.createSavedSearchFarequoteKueryIfNeeded(); await ml.testResources.setKibanaTimeZoneToUTC(); await ml.securityUI.loginAsMlPowerUser(); @@ -59,5 +60,38 @@ export default function ({ getService }: FtrProviderContext) { await ml.jobWizardAdvanced.assertDatafeedQueryEditorValue(advancedJobWizardDatafeedQuery); }); }); + + describe('view in discover page action', function () { + const savedSearch = 'ft_farequote_kuery'; + const expectedQuery = 'airline: A* and responsetime > 5'; + const docCountFormatted = '34,415'; + + it('loads the source data in the data visualizer', async () => { + await ml.testExecution.logTestStep('loads the data visualizer selector page'); + await ml.navigation.navigateToMl(); + await ml.navigation.navigateToDataVisualizer(); + + await ml.testExecution.logTestStep('loads the saved search selection page'); + await ml.dataVisualizer.navigateToIndexPatternSelection(); + + await ml.testExecution.logTestStep('loads the index data visualizer page'); + await ml.jobSourceSelection.selectSourceForIndexBasedDataVisualizer(savedSearch); + + await ml.testExecution.logTestStep(`loads data for full time range`); + await ml.dataVisualizerIndexBased.assertTimeRangeSelectorSectionExists(); + await ml.dataVisualizerIndexBased.clickUseFullDataButton(docCountFormatted); + }); + + it('navigates to Discover page', async () => { + await ml.testExecution.logTestStep('displays the actions panel with view in Discover card'); + await ml.dataVisualizerIndexBased.assertActionsPanelExists(); + await ml.dataVisualizerIndexBased.assertViewInDiscoverCardExists(); + + await ml.testExecution.logTestStep('retains the query in Discover page'); + await ml.dataVisualizerIndexBased.clickViewInDiscoverButton(); + await ml.dataVisualizerIndexBased.assertDiscoverPageQuery(expectedQuery); + await ml.dataVisualizerIndexBased.assertDiscoverHitCount(docCountFormatted); + }); + }); }); } diff --git a/x-pack/test/functional/apps/ml/permissions/full_ml_access.ts b/x-pack/test/functional/apps/ml/permissions/full_ml_access.ts index 261e0547210f1..7b4c646f379de 100644 --- a/x-pack/test/functional/apps/ml/permissions/full_ml_access.ts +++ b/x-pack/test/functional/apps/ml/permissions/full_ml_access.ts @@ -357,8 +357,13 @@ export default function ({ getService }: FtrProviderContext) { await ml.testExecution.logTestStep('should display the data visualizer table'); await ml.dataVisualizerIndexBased.assertDataVisualizerTableExist(); - await ml.testExecution.logTestStep('should display the actions panel with cards'); + await ml.testExecution.logTestStep( + 'should display the actions panel with Discover card' + ); await ml.dataVisualizerIndexBased.assertActionsPanelExists(); + await ml.dataVisualizerIndexBased.assertViewInDiscoverCardExists(); + + await ml.testExecution.logTestStep('should display job cards'); await ml.dataVisualizerIndexBased.assertCreateAdvancedJobCardExists(); await ml.dataVisualizerIndexBased.assertRecognizerCardExists(ecExpectedModuleId); }); diff --git a/x-pack/test/functional/apps/ml/permissions/read_ml_access.ts b/x-pack/test/functional/apps/ml/permissions/read_ml_access.ts index 98b743192c160..69ae3961dfd4d 100644 --- a/x-pack/test/functional/apps/ml/permissions/read_ml_access.ts +++ b/x-pack/test/functional/apps/ml/permissions/read_ml_access.ts @@ -99,6 +99,7 @@ export default function ({ getService }: FtrProviderContext) { const ecIndexPattern = 'ft_module_sample_ecommerce'; const ecExpectedTotalCount = '287'; + const ecExpectedModuleId = 'sample_data_ecommerce'; const uploadFilePath = path.join( __dirname, @@ -349,8 +350,15 @@ export default function ({ getService }: FtrProviderContext) { await ml.testExecution.logTestStep('should display the data visualizer table'); await ml.dataVisualizerIndexBased.assertDataVisualizerTableExist(); - await ml.testExecution.logTestStep('should not display the actions panel'); - await ml.dataVisualizerIndexBased.assertActionsPanelNotExists(); + await ml.testExecution.logTestStep( + 'should display the actions panel with Discover card' + ); + await ml.dataVisualizerIndexBased.assertActionsPanelExists(); + await ml.dataVisualizerIndexBased.assertViewInDiscoverCardExists(); + + await ml.testExecution.logTestStep('should not display job cards'); + await ml.dataVisualizerIndexBased.assertCreateAdvancedJobCardNotExists(); + await ml.dataVisualizerIndexBased.assertRecognizerCardNotExists(ecExpectedModuleId); }); it('should display elements on File Data Visualizer page correctly', async () => { diff --git a/x-pack/test/functional/services/ml/data_visualizer_index_based.ts b/x-pack/test/functional/services/ml/data_visualizer_index_based.ts index 373b1aa20a4bb..d8ec8ed49f011 100644 --- a/x-pack/test/functional/services/ml/data_visualizer_index_based.ts +++ b/x-pack/test/functional/services/ml/data_visualizer_index_based.ts @@ -10,9 +10,12 @@ import { FtrProviderContext } from '../../ftr_provider_context'; export function MachineLearningDataVisualizerIndexBasedProvider({ getService, + getPageObjects, }: FtrProviderContext) { const testSubjects = getService('testSubjects'); const retry = getService('retry'); + const PageObjects = getPageObjects(['discover']); + const queryBar = getService('queryBar'); return { async assertTimeRangeSelectorSectionExists() { @@ -149,5 +152,42 @@ export function MachineLearningDataVisualizerIndexBasedProvider({ async clickCreateAdvancedJobButton() { await testSubjects.clickWhenNotDisabled('mlDataVisualizerCreateAdvancedJobCard'); }, + + async assertViewInDiscoverCardExists() { + await testSubjects.existOrFail('mlDataVisualizerViewInDiscoverCard'); + }, + + async assertViewInDiscoverCardNotExists() { + await testSubjects.missingOrFail('mlDataVisualizerViewInDiscoverCard'); + }, + + async clickViewInDiscoverButton() { + await retry.tryForTime(5000, async () => { + await testSubjects.clickWhenNotDisabled('mlDataVisualizerViewInDiscoverCard'); + await PageObjects.discover.waitForDiscoverAppOnScreen(); + }); + }, + + async assertDiscoverPageQuery(expectedQueryString: string) { + await PageObjects.discover.waitForDiscoverAppOnScreen(); + await retry.tryForTime(5000, async () => { + const queryString = await queryBar.getQueryString(); + expect(queryString).to.eql( + expectedQueryString, + `Expected Discover global query bar to have query '${expectedQueryString}', got '${queryString}'` + ); + }); + }, + + async assertDiscoverHitCount(expectedHitCountFormatted: string) { + await PageObjects.discover.waitForDiscoverAppOnScreen(); + await retry.tryForTime(5000, async () => { + const hitCount = await PageObjects.discover.getHitCount(); + expect(hitCount).to.eql( + expectedHitCountFormatted, + `Expected Discover hit count to be '${expectedHitCountFormatted}' (got '${hitCount}')` + ); + }); + }, }; } diff --git a/x-pack/test/functional/services/ml/data_visualizer_table.ts b/x-pack/test/functional/services/ml/data_visualizer_table.ts index 36f5b94dc52dd..3bd3b7e2e783a 100644 --- a/x-pack/test/functional/services/ml/data_visualizer_table.ts +++ b/x-pack/test/functional/services/ml/data_visualizer_table.ts @@ -133,6 +133,17 @@ export function MachineLearningDataVisualizerTableProvider( ); } + public async assertViewInLensActionEnabled(fieldName: string) { + const actionButton = this.rowSelector(fieldName, 'mlActionButtonViewInLens'); + await testSubjects.existOrFail(actionButton); + await testSubjects.isEnabled(actionButton); + } + + public async assertViewInLensActionNotExists(fieldName: string) { + const actionButton = this.rowSelector(fieldName, 'mlActionButtonViewInLens'); + await testSubjects.missingOrFail(actionButton); + } + public async assertFieldDistinctValuesExist(fieldName: string) { const selector = this.rowSelector(fieldName, 'mlDataVisualizerTableColumnDistinctValues'); await testSubjects.existOrFail(selector); @@ -249,6 +260,7 @@ export function MachineLearningDataVisualizerTableProvider( fieldName: string, docCountFormatted: string, topValuesCount: number, + viewableInLens: boolean, checkDistributionPreviewExist = true ) { await this.assertRowExists(fieldName); @@ -263,6 +275,11 @@ export function MachineLearningDataVisualizerTableProvider( if (checkDistributionPreviewExist) { await this.assertDistributionPreviewExist(fieldName); } + if (viewableInLens) { + await this.assertViewInLensActionEnabled(fieldName); + } else { + await this.assertViewInLensActionNotExists(fieldName); + } await this.ensureDetailsClosed(fieldName); } @@ -307,6 +324,7 @@ export function MachineLearningDataVisualizerTableProvider( ) { await this.assertRowExists(fieldName); await this.assertFieldDocCount(fieldName, docCountFormatted); + await this.ensureDetailsOpen(fieldName); await this.assertExamplesList(fieldName, expectedExamplesCount); @@ -320,6 +338,7 @@ export function MachineLearningDataVisualizerTableProvider( ) { await this.assertRowExists(fieldName); await this.assertFieldDocCount(fieldName, docCountFormatted); + await this.ensureDetailsOpen(fieldName); await this.assertExamplesList(fieldName, expectedExamplesCount); @@ -332,6 +351,7 @@ export function MachineLearningDataVisualizerTableProvider( public async assertUnknownFieldContents(fieldName: string, docCountFormatted: string) { await this.assertRowExists(fieldName); await this.assertFieldDocCount(fieldName, docCountFormatted); + await this.ensureDetailsOpen(fieldName); await testSubjects.existOrFail(this.detailsSelector(fieldName, 'mlDVDocumentStatsContent')); @@ -343,7 +363,8 @@ export function MachineLearningDataVisualizerTableProvider( fieldType: string, fieldName: string, docCountFormatted: string, - exampleCount: number + exampleCount: number, + viewableInLens: boolean ) { // Currently the data used in the data visualizer tests only contains these field types. if (fieldType === ML_JOB_FIELD_TYPES.DATE) { @@ -357,6 +378,12 @@ export function MachineLearningDataVisualizerTableProvider( } else if (fieldType === ML_JOB_FIELD_TYPES.UNKNOWN) { await this.assertUnknownFieldContents(fieldName, docCountFormatted); } + + if (viewableInLens) { + await this.assertViewInLensActionEnabled(fieldName); + } else { + await this.assertViewInLensActionNotExists(fieldName); + } } public async ensureNumRowsPerPage(n: 10 | 25 | 50) { diff --git a/x-pack/test/functional_basic/apps/ml/data_visualizer/index.ts b/x-pack/test/functional_basic/apps/ml/data_visualizer/index.ts index 007b8be272f5d..57a44a0b7952d 100644 --- a/x-pack/test/functional_basic/apps/ml/data_visualizer/index.ts +++ b/x-pack/test/functional_basic/apps/ml/data_visualizer/index.ts @@ -15,9 +15,10 @@ export default function ({ loadTestFile }: FtrProviderContext) { ); // The data visualizer should work the same as with a trial license, except the missing create actions - // That's why 'index_data_visualizer_actions_panel' is not loaded here + // That's why the 'basic' version of 'index_data_visualizer_actions_panel' is loaded here loadTestFile( require.resolve('../../../../functional/apps/ml/data_visualizer/index_data_visualizer') ); + loadTestFile(require.resolve('./index_data_visualizer_actions_panel')); }); } diff --git a/x-pack/test/functional_basic/apps/ml/data_visualizer/index_data_visualizer_actions_panel.ts b/x-pack/test/functional_basic/apps/ml/data_visualizer/index_data_visualizer_actions_panel.ts new file mode 100644 index 0000000000000..8a59d6ed3ce2a --- /dev/null +++ b/x-pack/test/functional_basic/apps/ml/data_visualizer/index_data_visualizer_actions_panel.ts @@ -0,0 +1,57 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { FtrProviderContext } from '../../../ftr_provider_context'; + +export default function ({ getService }: FtrProviderContext) { + const esArchiver = getService('esArchiver'); + const ml = getService('ml'); + + describe('index based actions panel on basic license', function () { + this.tags(['mlqa']); + + const indexPatternName = 'ft_farequote'; + const savedSearch = 'ft_farequote_kuery'; + const expectedQuery = 'airline: A* and responsetime > 5'; + + before(async () => { + await esArchiver.loadIfNeeded('ml/farequote'); + await ml.testResources.createIndexPatternIfNeeded(indexPatternName, '@timestamp'); + await ml.testResources.createSavedSearchFarequoteKueryIfNeeded(); + await ml.testResources.setKibanaTimeZoneToUTC(); + + await ml.securityUI.loginAsMlPowerUser(); + }); + + describe('view in discover page action', function () { + it('loads the source data in the data visualizer', async () => { + await ml.testExecution.logTestStep('loads the data visualizer selector page'); + await ml.navigation.navigateToMl(); + await ml.navigation.navigateToDataVisualizer(); + + await ml.testExecution.logTestStep('loads the saved search selection page'); + await ml.dataVisualizer.navigateToIndexPatternSelection(); + + await ml.testExecution.logTestStep('loads the index data visualizer page'); + await ml.jobSourceSelection.selectSourceForIndexBasedDataVisualizer(savedSearch); + }); + + it('navigates to Discover page', async () => { + await ml.testExecution.logTestStep('should not display create job card'); + await ml.dataVisualizerIndexBased.assertCreateAdvancedJobCardNotExists(); + + await ml.testExecution.logTestStep('displays the actions panel with view in Discover card'); + await ml.dataVisualizerIndexBased.assertActionsPanelExists(); + await ml.dataVisualizerIndexBased.assertViewInDiscoverCardExists(); + + await ml.testExecution.logTestStep('retains the query in Discover page'); + await ml.dataVisualizerIndexBased.clickViewInDiscoverButton(); + await ml.dataVisualizerIndexBased.assertDiscoverPageQuery(expectedQuery); + }); + }); + }); +} diff --git a/x-pack/test/functional_basic/apps/ml/permissions/full_ml_access.ts b/x-pack/test/functional_basic/apps/ml/permissions/full_ml_access.ts index 36cc1b1771e8b..b09270b1d0f78 100644 --- a/x-pack/test/functional_basic/apps/ml/permissions/full_ml_access.ts +++ b/x-pack/test/functional_basic/apps/ml/permissions/full_ml_access.ts @@ -127,8 +127,11 @@ export default function ({ getService }: FtrProviderContext) { await ml.testExecution.logTestStep('should display the data visualizer table'); await ml.dataVisualizerIndexBased.assertDataVisualizerTableExist(); - await ml.testExecution.logTestStep('should not display the actions panel with cards'); - await ml.dataVisualizerIndexBased.assertActionsPanelNotExists(); + await ml.testExecution.logTestStep('should display the actions panel with Discover card'); + await ml.dataVisualizerIndexBased.assertActionsPanelExists(); + await ml.dataVisualizerIndexBased.assertViewInDiscoverCardExists(); + + await ml.testExecution.logTestStep('should not display job cards'); await ml.dataVisualizerIndexBased.assertCreateAdvancedJobCardNotExists(); await ml.dataVisualizerIndexBased.assertRecognizerCardNotExists(ecExpectedModuleId); }); diff --git a/x-pack/test/functional_basic/apps/ml/permissions/read_ml_access.ts b/x-pack/test/functional_basic/apps/ml/permissions/read_ml_access.ts index f302be40a0e98..14cc4e93b37ab 100644 --- a/x-pack/test/functional_basic/apps/ml/permissions/read_ml_access.ts +++ b/x-pack/test/functional_basic/apps/ml/permissions/read_ml_access.ts @@ -127,8 +127,11 @@ export default function ({ getService }: FtrProviderContext) { await ml.testExecution.logTestStep('should display the data visualizer table'); await ml.dataVisualizerIndexBased.assertDataVisualizerTableExist(); - await ml.testExecution.logTestStep('should not display the actions panel with cards'); - await ml.dataVisualizerIndexBased.assertActionsPanelNotExists(); + await ml.testExecution.logTestStep('should display the actions panel with Discover card'); + await ml.dataVisualizerIndexBased.assertActionsPanelExists(); + await ml.dataVisualizerIndexBased.assertViewInDiscoverCardExists(); + + await ml.testExecution.logTestStep('should not display job cards'); await ml.dataVisualizerIndexBased.assertCreateAdvancedJobCardNotExists(); await ml.dataVisualizerIndexBased.assertRecognizerCardNotExists(ecExpectedModuleId); }); From 0c0a74b364b89a59eecd5f5c8119f06dfe03ad5b Mon Sep 17 00:00:00 2001 From: Constance Date: Fri, 5 Feb 2021 10:38:37 -0800 Subject: [PATCH 52/69] [Enterprise Search] eslint rule override: catch unnecessary backticks (#90347) * Add eslint rule for linting unnecessary backticks This needs to be below the Prettier overrides at the bottom of the file to override Prettier * Run --fix Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> --- .eslintrc.js | 12 ++++++++++++ .../documents/document_detail_logic.test.ts | 4 ++-- .../components/product_card/product_card.tsx | 2 +- .../server/routes/app_search/documents.ts | 6 +++--- .../server/routes/app_search/engines.ts | 4 ++-- .../server/routes/app_search/search_settings.ts | 8 ++++---- 6 files changed, 24 insertions(+), 12 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index e85792c4f4ba6..9430b9bf24466 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1112,6 +1112,8 @@ module.exports = { /** * Enterprise Search overrides + * NOTE: We also have a single rule at the bottom of the file that + * overrides Prettier's default of not linting unnecessary backticks */ { // All files @@ -1268,6 +1270,16 @@ module.exports = { ...require('eslint-config-prettier/@typescript-eslint').rules, }, }, + /** + * Enterprise Search Prettier override + * Lints unnecessary backticks - @see https://github.com/prettier/eslint-config-prettier/blob/main/README.md#forbid-unnecessary-backticks + */ + { + files: ['x-pack/plugins/enterprise_search/**/*.{ts,tsx}'], + rules: { + quotes: ['error', 'single', { avoidEscape: true, allowTemplateLiterals: false }], + }, + }, { files: [ diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/document_detail_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/document_detail_logic.test.ts index 21f6855d1abcf..ef5ebad3aea13 100644 --- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/document_detail_logic.test.ts +++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/document_detail_logic.test.ts @@ -62,7 +62,7 @@ describe('DocumentDetailLogic', () => { DocumentDetailLogic.actions.getDocumentDetails('1'); - expect(http.get).toHaveBeenCalledWith(`/api/app_search/engines/engine1/documents/1`); + expect(http.get).toHaveBeenCalledWith('/api/app_search/engines/engine1/documents/1'); await nextTick(); expect(DocumentDetailLogic.actions.setFields).toHaveBeenCalledWith(fields); }); @@ -96,7 +96,7 @@ describe('DocumentDetailLogic', () => { mount(); DocumentDetailLogic.actions.deleteDocument('1'); - expect(http.delete).toHaveBeenCalledWith(`/api/app_search/engines/engine1/documents/1`); + expect(http.delete).toHaveBeenCalledWith('/api/app_search/engines/engine1/documents/1'); await nextTick(); expect(setQueuedSuccessMessage).toHaveBeenCalledWith( 'Successfully marked document for deletion. It will be deleted momentarily.' diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/product_card/product_card.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/product_card/product_card.tsx index 162ea7f427306..d31daeef54de9 100644 --- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/product_card/product_card.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/product_card/product_card.tsx @@ -53,7 +53,7 @@ export const ProductCard: React.FC = ({ product, image }) => { className="productCard" titleElement="h2" title={i18n.translate('xpack.enterpriseSearch.overview.productCard.heading', { - defaultMessage: `Elastic {productName}`, + defaultMessage: 'Elastic {productName}', values: { productName: product.NAME }, })} image={ diff --git a/x-pack/plugins/enterprise_search/server/routes/app_search/documents.ts b/x-pack/plugins/enterprise_search/server/routes/app_search/documents.ts index 3a408b62bd540..78463fc8724ac 100644 --- a/x-pack/plugins/enterprise_search/server/routes/app_search/documents.ts +++ b/x-pack/plugins/enterprise_search/server/routes/app_search/documents.ts @@ -26,7 +26,7 @@ export function registerDocumentsRoutes({ }, }, enterpriseSearchRequestHandler.createRequest({ - path: `/as/engines/:engineName/documents/new`, + path: '/as/engines/:engineName/documents/new', }) ); } @@ -46,7 +46,7 @@ export function registerDocumentRoutes({ }, }, enterpriseSearchRequestHandler.createRequest({ - path: `/as/engines/:engineName/documents/:documentId`, + path: '/as/engines/:engineName/documents/:documentId', }) ); router.delete( @@ -60,7 +60,7 @@ export function registerDocumentRoutes({ }, }, enterpriseSearchRequestHandler.createRequest({ - path: `/as/engines/:engineName/documents/:documentId`, + path: '/as/engines/:engineName/documents/:documentId', }) ); } diff --git a/x-pack/plugins/enterprise_search/server/routes/app_search/engines.ts b/x-pack/plugins/enterprise_search/server/routes/app_search/engines.ts index edf5d1f3855e3..49ff0353bef03 100644 --- a/x-pack/plugins/enterprise_search/server/routes/app_search/engines.ts +++ b/x-pack/plugins/enterprise_search/server/routes/app_search/engines.ts @@ -56,7 +56,7 @@ export function registerEnginesRoutes({ }, }, enterpriseSearchRequestHandler.createRequest({ - path: `/as/engines/:name/details`, + path: '/as/engines/:name/details', }) ); router.get( @@ -69,7 +69,7 @@ export function registerEnginesRoutes({ }, }, enterpriseSearchRequestHandler.createRequest({ - path: `/as/engines/:name/overview_metrics`, + path: '/as/engines/:name/overview_metrics', }) ); } diff --git a/x-pack/plugins/enterprise_search/server/routes/app_search/search_settings.ts b/x-pack/plugins/enterprise_search/server/routes/app_search/search_settings.ts index c68c8e61d539b..82b0497cd0946 100644 --- a/x-pack/plugins/enterprise_search/server/routes/app_search/search_settings.ts +++ b/x-pack/plugins/enterprise_search/server/routes/app_search/search_settings.ts @@ -38,7 +38,7 @@ export function registerSearchSettingsRoutes({ }, }, enterpriseSearchRequestHandler.createRequest({ - path: `/as/engines/:engineName/search_settings/details`, + path: '/as/engines/:engineName/search_settings/details', }) ); @@ -52,7 +52,7 @@ export function registerSearchSettingsRoutes({ }, }, enterpriseSearchRequestHandler.createRequest({ - path: `/as/engines/:engineName/search_settings/reset`, + path: '/as/engines/:engineName/search_settings/reset', }) ); @@ -67,7 +67,7 @@ export function registerSearchSettingsRoutes({ }, }, enterpriseSearchRequestHandler.createRequest({ - path: `/as/engines/:engineName/search_settings`, + path: '/as/engines/:engineName/search_settings', }) ); @@ -88,7 +88,7 @@ export function registerSearchSettingsRoutes({ }, }, enterpriseSearchRequestHandler.createRequest({ - path: `/as/engines/:engineName/search_settings_search`, + path: '/as/engines/:engineName/search_settings_search', }) ); } From 3ba3131912d7032799f7bb9972e9c1078b7bda33 Mon Sep 17 00:00:00 2001 From: Rashmi Kulkarni Date: Fri, 5 Feb 2021 10:43:03 -0800 Subject: [PATCH 53/69] Accessibility test- unskipping a functional test (kibana_overview.ts) (#90395) * fixes https://github.com/elastic/kibana/issues/74449 * unskipping accessibility test --- x-pack/test/accessibility/apps/kibana_overview.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/x-pack/test/accessibility/apps/kibana_overview.ts b/x-pack/test/accessibility/apps/kibana_overview.ts index 395da78f6049c..068b600d2adf2 100644 --- a/x-pack/test/accessibility/apps/kibana_overview.ts +++ b/x-pack/test/accessibility/apps/kibana_overview.ts @@ -11,8 +11,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { const PageObjects = getPageObjects(['common', 'home']); const a11y = getService('a11y'); - // FLAKY: https://github.com/elastic/kibana/issues/82226 - describe.skip('Kibana overview', () => { + describe('Kibana overview', () => { const esArchiver = getService('esArchiver'); before(async () => { From 6c7c936e0086908299e710c01d276488f1dfebf1 Mon Sep 17 00:00:00 2001 From: Lisa Cawley Date: Fri, 5 Feb 2021 10:44:16 -0800 Subject: [PATCH 54/69] [DOCS] Update more installation details (#90469) --- docs/setup/docker.asciidoc | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/docs/setup/docker.asciidoc b/docs/setup/docker.asciidoc index 2e70df09b5c37..75a9799d70fbd 100644 --- a/docs/setup/docker.asciidoc +++ b/docs/setup/docker.asciidoc @@ -11,12 +11,8 @@ A list of all published Docker images and tags is available at https://www.docker.elastic.co[www.docker.elastic.co]. The source code is in https://github.com/elastic/dockerfiles/tree/{branch}/kibana[GitHub]. -These images are free to use under the Elastic license. They contain open source -and free commercial features and access to paid commercial features. -<> to try out all of the -paid commercial features. See the -https://www.elastic.co/subscriptions[Subscriptions] page for information about -Elastic license levels. +These images contain both free and subscription features. +<> to try out all of the features. [float] [[pull-image]] From 095233d7278b15b9d501b2009bc6d46f33022ccf Mon Sep 17 00:00:00 2001 From: Devon Thomson Date: Fri, 5 Feb 2021 13:48:25 -0500 Subject: [PATCH 55/69] Fix Visualize Link Redirecting to Dashboard Linked Visualization (#90243) --- .../public/application/visualize_constants.ts | 1 + src/plugins/visualize/public/plugin.ts | 19 +++++++++++- .../apps/dashboard/edit_visualizations.js | 30 ++++++++++++++++--- 3 files changed, 45 insertions(+), 5 deletions(-) diff --git a/src/plugins/visualize/public/application/visualize_constants.ts b/src/plugins/visualize/public/application/visualize_constants.ts index c74cabdb9fe82..7dbf5be77b74d 100644 --- a/src/plugins/visualize/public/application/visualize_constants.ts +++ b/src/plugins/visualize/public/application/visualize_constants.ts @@ -9,6 +9,7 @@ export const APP_NAME = 'visualize'; export const VisualizeConstants = { + VISUALIZE_BASE_PATH: '/app/visualize', LANDING_PAGE_PATH: '/', WIZARD_STEP_1_PAGE_PATH: '/new', WIZARD_STEP_2_PAGE_PATH: '/new/configure', diff --git a/src/plugins/visualize/public/plugin.ts b/src/plugins/visualize/public/plugin.ts index 39074735e2aeb..1cad0ca7ca396 100644 --- a/src/plugins/visualize/public/plugin.ts +++ b/src/plugins/visualize/public/plugin.ts @@ -78,6 +78,7 @@ export class VisualizePlugin private appStateUpdater = new BehaviorSubject(() => ({})); private stopUrlTracking: (() => void) | undefined = undefined; private currentHistory: ScopedHistory | undefined = undefined; + private isLinkedToOriginatingApp: (() => boolean) | undefined = undefined; private readonly visEditorsRegistry = createVisEditorsRegistry(); @@ -94,7 +95,7 @@ export class VisualizePlugin setActiveUrl, restorePreviousUrl, } = createKbnUrlTracker({ - baseUrl: core.http.basePath.prepend('/app/visualize'), + baseUrl: core.http.basePath.prepend(VisualizeConstants.VISUALIZE_BASE_PATH), defaultSubUrl: '#/', storageKey: `lastUrl:${core.http.basePath.get()}:visualize`, navLinkUpdater$: this.appStateUpdater, @@ -114,6 +115,15 @@ export class VisualizePlugin }, ], getHistory: () => this.currentHistory!, + onBeforeNavLinkSaved: (urlToSave: string) => { + if ( + !urlToSave.includes(`${VisualizeConstants.EDIT_PATH}/`) && + this.isLinkedToOriginatingApp?.() + ) { + return core.http.basePath.prepend(VisualizeConstants.VISUALIZE_BASE_PATH); + } + return urlToSave; + }, }); this.stopUrlTracking = () => { stopUrlTracker(); @@ -134,6 +144,13 @@ export class VisualizePlugin const [coreStart, pluginsStart] = await core.getStartServices(); this.currentHistory = params.history; + // allows the urlTracker to only save URLs that are not linked to an originatingApp + this.isLinkedToOriginatingApp = () => { + return Boolean( + pluginsStart.embeddable.getStateTransfer().getIncomingEditorState()?.originatingApp + ); + }; + // make sure the index pattern list is up to date pluginsStart.data.indexPatterns.clearCache(); // make sure a default index pattern exists diff --git a/test/functional/apps/dashboard/edit_visualizations.js b/test/functional/apps/dashboard/edit_visualizations.js index ab8de37122bb7..0996fbe7cf0d7 100644 --- a/test/functional/apps/dashboard/edit_visualizations.js +++ b/test/functional/apps/dashboard/edit_visualizations.js @@ -12,6 +12,7 @@ export default function ({ getService, getPageObjects }) { const PageObjects = getPageObjects(['dashboard', 'header', 'visualize', 'common', 'visEditor']); const esArchiver = getService('esArchiver'); const testSubjects = getService('testSubjects'); + const appsMenu = getService('appsMenu'); const kibanaServer = getService('kibanaServer'); const dashboardPanelActions = getService('dashboardPanelActions'); const dashboardVisualizations = getService('dashboardVisualizations'); @@ -25,10 +26,14 @@ export default function ({ getService, getPageObjects }) { await PageObjects.visualize.clickMarkdownWidget(); await PageObjects.visEditor.setMarkdownTxt(originalMarkdownText); await PageObjects.visEditor.clickGo(); - await PageObjects.visualize.saveVisualizationExpectSuccess(title, { - saveAsNew: true, - redirectToOrigin: true, - }); + if (title) { + await PageObjects.visualize.saveVisualizationExpectSuccess(title, { + saveAsNew: true, + redirectToOrigin: true, + }); + } else { + await PageObjects.visualize.saveVisualizationAndReturn(); + } }; const editMarkdownVis = async () => { @@ -86,5 +91,22 @@ export default function ({ getService, getPageObjects }) { const markdownText = await testSubjects.find('markdownBody'); expect(await markdownText.getVisibleText()).to.eql(originalMarkdownText); }); + + it('visualize app menu navigates to the visualize listing page if the last opened visualization was by value', async () => { + await PageObjects.dashboard.gotoDashboardLandingPage(); + await PageObjects.dashboard.clickNewDashboard(); + + // Create markdown by value. + await createMarkdownVis(); + + // Edit then save and return + await editMarkdownVis(); + await PageObjects.visualize.saveVisualizationAndReturn(); + + await PageObjects.header.waitUntilLoadingHasFinished(); + await appsMenu.clickLink('Visualize'); + await PageObjects.common.clickConfirmOnModal(); + expect(await testSubjects.exists('visualizationLandingPage')).to.be(true); + }); }); } From b4248465cd6ec63932ba774928c00dd2616aed83 Mon Sep 17 00:00:00 2001 From: Candace Park <56409205+parkiino@users.noreply.github.com> Date: Fri, 5 Feb 2021 13:57:42 -0500 Subject: [PATCH 56/69] [Security Solution][Endpoint][Admin] Locked ransomware card (#90210) * [Security Solution][Endpoint][Admin] Locked card for ransomware policy --- .../pages/policy/view/policy_details.test.tsx | 5 ++ .../pages/policy/view/policy_details_form.tsx | 3 +- .../policy/view/policy_forms/locked_card.tsx | 82 +++++++++++++++++++ 3 files changed, 89 insertions(+), 1 deletion(-) create mode 100644 x-pack/plugins/security_solution/public/management/pages/policy/view/policy_forms/locked_card.tsx diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_details.test.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_details.test.tsx index 154e26dd0f380..1ae4144a26835 100644 --- a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_details.test.tsx +++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_details.test.tsx @@ -336,6 +336,11 @@ describe('Policy Details', () => { const ransomware = policyView.find('EuiPanel[data-test-subj="ransomwareProtectionsForm"]'); expect(ransomware).toHaveLength(0); }); + + it('shows the locked card in place of 1 paid feature', () => { + const lockedCard = policyView.find('EuiCard[data-test-subj="lockedPolicyCard"]'); + expect(lockedCard).toHaveLength(1); + }); }); }); }); diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_details_form.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_details_form.tsx index aa1d62c2e1430..528f3afc1e64a 100644 --- a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_details_form.tsx +++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_details_form.tsx @@ -13,6 +13,7 @@ import { LinuxEvents, MacEvents, WindowsEvents } from './policy_forms/events'; import { AdvancedPolicyForms } from './policy_advanced'; import { AntivirusRegistrationForm } from './components/antivirus_registration_form'; import { Ransomware } from './policy_forms/protections/ransomware'; +import { LockedPolicyCard } from './policy_forms/locked_card'; import { useLicense } from '../../../../common/hooks/use_license'; export const PolicyDetailsForm = memo(() => { @@ -36,7 +37,7 @@ export const PolicyDetailsForm = memo(() => { - {isPlatinumPlus && } + {isPlatinumPlus ? : } diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_forms/locked_card.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_forms/locked_card.tsx new file mode 100644 index 0000000000000..5c19a10307608 --- /dev/null +++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_forms/locked_card.tsx @@ -0,0 +1,82 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import React, { memo } from 'react'; +import { EuiCard, EuiIcon, EuiTextColor, EuiLink, EuiFlexGroup, EuiFlexItem } from '@elastic/eui'; +import { FormattedMessage } from '@kbn/i18n/react'; +import styled from 'styled-components'; +import { i18n } from '@kbn/i18n'; + +const LockedPolicyDiv = styled.div` + .euiCard__betaBadgeWrapper { + .euiCard__betaBadge { + width: auto; + } + } + .lockedCardDescription { + padding: 0 ${(props) => props.theme.eui.fractions.thirds.percentage}; + } +`; + +export const LockedPolicyCard = memo(() => { + return ( + + } + title={ +

    + + + +

    + } + description={ + + +

    + + + +

    +     + +

    + + + + ), + }} + /> +

    +     +     + } + /> +     + ); +}); +LockedPolicyCard.displayName = 'LockedPolicyCard'; From e202ceab299c7fcf3fa13ea7f74124d658e18df8 Mon Sep 17 00:00:00 2001 From: Andrew Goldstein Date: Fri, 5 Feb 2021 12:15:44 -0700 Subject: [PATCH 57/69] [Security Solution] [Timeline] Endpoint row renderers (1st batch) (#89810) ## [Security Solution] [Timeline] Endpoint row renderers (1st batch) This PR implements the 1st batch of Endpoint (`event.module: "endpoint"`) row renderers by updating and enhancing some of the existing "Endgame" (`event.module: "endgame"`) row renderers to use the latest [ECS fields](https://www.elastic.co/guide/en/ecs/current/ecs-field-reference.html). The following Endpoint events will be rendered via row renderers in Timeline: | event.dataset | event.action | |--------------------------|---------------------| | endpoint.events.file | creation | | endpoint.events.file | deletion | | endpoint.events.process | start | | endpoint.events.process | end | | endpoint.events.network | lookup_requested | | endpoint.events.network | lookup_result | | endpoint.events.network | connection_accepted | | endpoint.events.network | disconnect_received | | endpoint.events.security | log_on | | endpoint.events.security | log_off | ## File (FIM) Creation events Endpoint File (FIM) Creation events with the following `event.dataset` and `event.action` will be rendered in Timeline via row renderers: ``` event.dataset: endpoint.events.file and event.action: creation ``` ### Sample rendered File (FIM) Creation event ![endpoint_file_creation](https://user-images.githubusercontent.com/4459398/106036793-ff522f80-6092-11eb-9e3b-c24538129bea.png) Each field with `this formatting` is draggable (to pivot a search) in the row-rendered event: `SYSTEM` \ `NT AUTHORITY` @ `win2019-endpoint` created a file `WimProvider.dll` in `C:\Windows\TEMP\F590BACBAE94\WimProvider.dll` via `MsMpEng.exe` `(2424)` ### Fields in a File (FIM) Creation event `user.name` \ `user.domain` @ `host.name` created a file `file.name` in `file.path` via `process.name` `(process.pid)` ## File (FIM) Deletion events Endpoint File (FIM) Deletion events with the following `event.dataset` and `event.action` will be rendered in Timeline via row renderers: ``` event.dataset: endpoint.events.file and event.action: deletion ``` ### Sample rendered File (FIM) Deletion event ![endpoint_file_deletion](https://user-images.githubusercontent.com/4459398/106037520-088fcc00-6094-11eb-985d-ba8cead9fec9.png) `SYSTEM` \ `NT AUTHORITY` @ `windows-endpoint-1` deleted a file `AM_Delta_Patch_1.329.2793.0.exe` in `C:\Windows\SoftwareDistribution\Download\Install\AM_Delta_Patch_1.329.2793.0.exe` via `svchost.exe` `(1728)` ### Fields in a File (FIM) Deletion event `user.name` \ `user.domain` @ `host.name` deleted a file `file.name` in `file.path` via `process.name` `(process.pid)` ## Process Start events Endpoint Process Start events with the following `event.dataset` and `event.action` will be rendered in Timeline via row renderers: ``` event.dataset: endpoint.events.process and event.action: start ``` ### Sample rendered Process Start event ![creation-event](https://user-images.githubusercontent.com/4459398/106061579-c7f37b00-60b2-11eb-9bc4-224e671baa4a.png) `SYSTEM` \ `NT AUTHORITY` @ `win2019-endpoint` started process `conhost.exe` (`376`) `C:\Windows\system32\conhost.exe` `0xffffffff` `-ForceV1` via parent process `sshd.exe` (`6460`) `sha256 697334c236cce7d4c9e223146ee683a1219adced9729d4ae771fd6a1502a6b63` `sha1 e19da2c35ba1c38adf12d1a472c1fcf1f1a811a7` `md5 1b0e9b5fcb62de0787235ecca560b610` ### Fields in a Process Start event The following fields will be used to render a Process Start event: `user.name` \ `user.domain` @ `host.name` started process `process.name` (`process.pid`) `process.args` via parent process `process.parent.name` (`process.parent.pid`) `process.hash.sha256` `process.hash.sha1` `process.hash.md5` ## Process End events Endpoint Process End events with the following `event.dataset` and `event.action` will be rendered in Timeline via row renderers: ``` event.dataset: endpoint.events.process and event.action: end ``` ### Sample rendered Process End event ![endpoint_process_end](https://user-images.githubusercontent.com/4459398/106076527-f1b99b80-60cc-11eb-8ff8-2da78a1fcb8f.png) `SYSTEM` \ `NT AUTHORITY` @ `win2019-endpoint` terminated process `svchost.exe` (`10392`) `C:\Windows\System32\svchost.exe` `-k` `netsvcs` `-p` `-s` `NetSetupSvc` with exit code `0` via parent process `services.exe` `(568)` `7fd065bac18c5278777ae44908101cdfed72d26fa741367f0ad4d02020787ab6` `a1385ce20ad79f55df235effd9780c31442aa234` `8a0a29438052faed8a2532da50455756` ### Fields in a Process End event The following fields will be used to render a Process End event: `user.name` \ `user.domain` @ `host.name` terminated process `process.name` (`process.pid`) with exit code `process.exit_code` via parent process `process.parent.name` (`process.parent.pid`) `process.hash.sha256` `process.hash.sha1` `process.hash.md5` ## Network (DNS) Lookup Requested events Endpoint Network (DNS) Lookup Requested events with the following `event.dataset` and `event.action` will be rendered in Timeline via row renderers: ``` event.dataset: endpoint.events.network and event.action: lookup_requested ``` ### Runtime matching criteria All Network Lookup Requested events, including Endpoint and non-Endpoint DNS events matching the following criteria will be rendered: ``` dns.question.type: * and dns.question.name: * ``` ### Sample rendered Network Lookup Requested event ![network_lookup_requested](https://user-images.githubusercontent.com/4459398/106191208-cdf76380-6167-11eb-9be7-aaf78e4cfdd3.png) `SYSTEM` \ `NT AUTHORITY` @ `windows-endpoint-1` asked for `logging.googleapis.com` with question type `A` via `google_osconfig_agent.exe` `(4064)` `dns` ### Fields in a Network Lookup Requested event The following fields will be used to render a Network Lookup Request event: `user.name` \ `user.domain` @ `host.name` asked for `dns.question.name` with question type `dns.question.type` via `process.name` `(process.pid)` `network.protocol` ## Network Lookup Result events Endpoint Network (DNS) Lookup Result events with the following `event.dataset` and `event.action` will be rendered in Timeline via row renderers: ``` event.dataset: endpoint.events.network and event.action: lookup_result ``` ### Runtime matching criteria All Network Lookup Result events, including Endpoint and non-Endpoint DNS events matching the following criteria will be rendered: ``` dns.question.type: * and dns.question.name: * ``` ### Sample rendered Network Lookup Result event ![network_lookup_result](https://user-images.githubusercontent.com/4459398/106192595-a43f3c00-6169-11eb-95bc-4ebe331f1231.png) `SYSTEM` \ `NT AUTHORITY` @ `windows-endpoint-1` asked for `logging.googleapis.com` with question type `AAAA` via `GCEWindowsAgent.exe` `(684)` `dns` ### Fields in a Network Lookup Result event The following fields will be used to render a Network Lookup Result event: `user.name` \ `user.domain` @ `host.name` asked for `dns.question.name` with question type `dns.question.type` via `process.name` `(process.pid)` `network.protocol` ## Network Connection Accepted events Endpoint Network Connection Accepted events with the following `event.dataset` and `event.action` will be rendered in Timeline via row renderers: ``` event.dataset: endpoint.events.network and event.action: connection_accepted ```` ### Sample rendered Network Connection Accepted event ![network_connection_accepted](https://user-images.githubusercontent.com/4459398/106200497-4f54f300-6174-11eb-8879-06b7bfc88edf.png) Network Connection Accepted events, like the one in the screenshot above, are also rendered by the _Netflow_ row renderer, which displays information that includes the directionality of the connection, protocol, and source / destination details. `NETWORK SERVICE` \ `NT AUTHORITY` @ `windows-endpoint-1` accepted a connection via `svchost.exe` `(328)` with result `success` ### Fields in a Network Connection Accepted event `user.name` \ `user.domain` @ `host.name` accepted a connection via `process.name` `(process.pid)` with result `event.outcome` ## Network Disconnect Received events Endpoint Network Disconnect Received events with the following `event.dataset` and `event.action` will be rendered in Timeline via row renderers: ``` event.dataset: endpoint.events.network and event.action: disconnect_received ```` ### Sample rendered Network Disconnect Received event ![network_disconnect_received](https://user-images.githubusercontent.com/4459398/106205196-56cbca80-617b-11eb-83d3-26aa9670f114.png) Network Disconnect Received events, like the one in the screenshot above, are also rendered by the _Netflow_ row renderer, which displays information that includes the directionality of the connection, protocol, and source / destination details. `NETWORK SERVICE` \ `NT AUTHORITY` @ `windows-endpoint-1` disconnected via `svchost.exe` `(328)` ### Fields in a Network Disconnect Received event `user.name` \ `user.domain` @ `host.name` disconnected via `process.name` `(process.pid)` ## Security Log On events Endpoint Security Log On events with the following `event.dataset` and `event.action` will be rendered in Timeline via row renderers: ``` event.dataset: endpoint.events.security and event.action: log_on ``` ### `event.outcome: "success"` vs `event.outcome: "failure"` The row renderer for Security Log On events uses the `event.outcome` field to display different results for events matching: ``` event.dataset: endpoint.events.security and event.action: log_on and event.outcome: success ``` vs events matching: ``` event.dataset: endpoint.events.security and event.action: log_on and event.outcome: failure ``` ### Sample rendered Security Log On / `event.outcome: "success"` event ![security_log_on_success](https://user-images.githubusercontent.com/4459398/106210917-fcd00280-6184-11eb-9c1c-564cfb375539.png) `SYSTEM` \ `NT AUTHORITY` @ `win2019-endpoint` successfully logged in via `C:\Program Files\OpenSSH-Win64\sshd.exe` ### Fields in an Security Log On / `event.outcome: "success"` event `user.name` \ `user.domain` @ `host.name` successfully logged in via `process.name` (`process.pid`) ### Sample rendered Security Log On / `event.outcome: "failure"` event ![security_log_on_failure](https://user-images.githubusercontent.com/4459398/106211893-b2e81c00-6186-11eb-9c34-43227c15a1f0.png) `SYSTEM` \ `NT AUTHORITY` @ `win2019-endpoint` failed to log in via `C:\Program Files\OpenSSH-Win64\sshd.exe` ### Fields in an Security Log On / `event.outcome: "failure"` event `user.name` \ `user.domain` @ `host.name` failed to log in via `process.name` (`process.pid`) ## Security Log Off events Endpoint Security Log Off events with the following `event.dataset` and `event.action` will be rendered in Timeline via row renderers: ``` event.dataset: endpoint.events.security and event.action: log_off ``` ### Sample rendered Security Log Off event ![security_log_off](https://user-images.githubusercontent.com/4459398/106212499-0018bd80-6188-11eb-9e91-971f360ee87a.png) `SYSTEM` \ `NT AUTHORITY` @ `win2019-endpoint` logged off via `C:\Program Files\OpenSSH-Win64\sshd.exe` ### Fields in a Security Log Off event `user.name` \ `user.domain` @ `host.name` logged off via `process.name` (`process.pid`) --- .../common/ecs/process/index.ts | 6 + .../common/mock/mock_endgame_ecs_data.ts | 594 ++++++++++++++++++ .../process_draggable.test.tsx.snap | 43 +- .../endgame_security_event_details.tsx | 2 + ...dgame_security_event_details_line.test.tsx | 19 + .../endgame_security_event_details_line.tsx | 4 +- .../body/renderers/endgame/helpers.test.tsx | 112 +++- .../body/renderers/endgame/helpers.ts | 15 +- .../body/renderers/endgame/translations.ts | 14 + .../renderers/exit_code_draggable.test.tsx | 101 ++- .../body/renderers/exit_code_draggable.tsx | 34 +- .../timeline/body/renderers/helpers.tsx | 7 +- .../parent_process_draggable.test.tsx | 48 +- .../renderers/parent_process_draggable.tsx | 40 +- .../body/renderers/process_draggable.tsx | 85 +-- .../system/generic_file_details.test.tsx | 285 +++++++-- .../renderers/system/generic_file_details.tsx | 15 + .../system/generic_row_renderer.test.tsx | 264 ++++++++ .../renderers/system/generic_row_renderer.tsx | 65 +- .../timeline/factory/events/all/constants.ts | 3 + 20 files changed, 1590 insertions(+), 166 deletions(-) diff --git a/x-pack/plugins/security_solution/common/ecs/process/index.ts b/x-pack/plugins/security_solution/common/ecs/process/index.ts index cc4a961a5b528..3a8ccc309aecb 100644 --- a/x-pack/plugins/security_solution/common/ecs/process/index.ts +++ b/x-pack/plugins/security_solution/common/ecs/process/index.ts @@ -7,7 +7,9 @@ export interface ProcessEcs { entity_id?: string[]; + exit_code?: number[]; hash?: ProcessHashData; + parent?: ProcessParentData; pid?: number[]; name?: string[]; ppid?: number[]; @@ -24,6 +26,10 @@ export interface ProcessHashData { sha256?: string[]; } +export interface ProcessParentData { + name?: string[]; +} + export interface Thread { id?: number[]; start?: string[]; diff --git a/x-pack/plugins/security_solution/public/common/mock/mock_endgame_ecs_data.ts b/x-pack/plugins/security_solution/public/common/mock/mock_endgame_ecs_data.ts index 98bedbb08028b..1082b5f9474e5 100644 --- a/x-pack/plugins/security_solution/public/common/mock/mock_endgame_ecs_data.ts +++ b/x-pack/plugins/security_solution/public/common/mock/mock_endgame_ecs_data.ts @@ -58,6 +58,121 @@ export const mockEndgameDnsRequest: Ecs = { }, }; +export const mockEndpointNetworkLookupRequestedEvent: Ecs = { + host: { + os: { + full: ['Windows Server 2019 Datacenter 1809 (10.0.17763.1697)'], + name: ['Windows'], + version: ['1809 (10.0.17763.1697)'], + family: ['windows'], + kernel: ['1809 (10.0.17763.1697)'], + platform: ['windows'], + }, + mac: ['aa:bb:cc:dd:ee:ff'], + name: ['win2019-endpoint'], + architecture: ['x86_64'], + ip: ['10.1.2.3'], + id: ['d8ad572e-d224-4044-a57d-f5a84c0dfe5d'], + }, + event: { + category: ['network'], + kind: ['event'], + created: ['2021-01-25T16:44:40.788Z'], + module: ['endpoint'], + action: ['lookup_requested'], + type: ['protocol,info'], + id: ['LzzWB9jjGmCwGMvk++++6FZj'], + dataset: ['endpoint.events.network'], + }, + process: { + name: ['google_osconfig_agent.exe'], + pid: [3272], + entity_id: [ + 'MWQxNWNmOWUtM2RjNy01Yjk3LWY1ODYtNzQzZjdjMjUxOGIyLTMyNzItMTMyNTUwNzg4NjguNjUzODkxNTAw', + ], + executable: ['C:\\Program Files\\Google\\OSConfig\\google_osconfig_agent.exe'], + }, + dns: { + question: { + name: ['logging.googleapis.com'], + type: ['A'], + }, + }, + agent: { + type: ['endpoint'], + }, + user: { + name: ['SYSTEM'], + domain: ['NT AUTHORITY'], + }, + network: { + protocol: ['dns'], + }, + message: [ + 'DNS query is completed for the name logging.googleapis.com, type 1, query options 1073766400 with status 87 Results', + ], + timestamp: '2021-01-25T16:44:40.788Z', + _id: 'sUNzOncBPmkOXwyN9VbT', +}; + +export const mockEndpointNetworkLookupResultEvent: Ecs = { + host: { + os: { + full: ['Windows Server 2019 Datacenter 1809 (10.0.17763.1697)'], + name: ['Windows'], + version: ['1809 (10.0.17763.1697)'], + family: ['windows'], + kernel: ['1809 (10.0.17763.1697)'], + platform: ['windows'], + }, + mac: ['aa:bb:cc:dd:ee:ff'], + name: ['win2019-endpoint'], + architecture: ['x86_64'], + ip: ['10.1.2.3'], + id: ['d8ad572e-d224-4044-a57d-f5a84c0dfe5d'], + }, + event: { + category: ['network'], + kind: ['event'], + outcome: ['success'], + created: ['2021-01-25T16:44:40.789Z'], + module: ['endpoint'], + action: ['lookup_result'], + type: ['protocol,info'], + id: ['LzzWB9jjGmCwGMvk++++6FZq'], + dataset: ['endpoint.events.network'], + }, + process: { + name: ['google_osconfig_agent.exe'], + pid: [3272], + entity_id: [ + 'MWQxNWNmOWUtM2RjNy01Yjk3LWY1ODYtNzQzZjdjMjUxOGIyLTMyNzItMTMyNTUwNzg4NjguNjUzODkxNTAw', + ], + executable: ['C:\\Program Files\\Google\\OSConfig\\google_osconfig_agent.exe'], + }, + agent: { + type: ['endpoint'], + }, + dns: { + question: { + name: ['logging.googleapis.com'], + type: ['AAAA'], + }, + }, + user: { + name: ['SYSTEM'], + domain: ['NT AUTHORITY'], + }, + network: { + protocol: ['dns'], + }, + message: [ + 'DNS query is completed for the name logging.googleapis.com, type 28, query options 2251800887582720 with status 0 Results', + ], + timestamp: '2021-01-25T16:44:40.789Z', + _id: 'skNzOncBPmkOXwyN9VbT', +}; + export const mockEndgameFileCreateEvent: Ecs = { _id: '98jPcG0BOpWiDweSouzg', user: { @@ -91,6 +206,59 @@ export const mockEndgameFileCreateEvent: Ecs = { }, }; +export const mockEndpointFileCreationEvent: Ecs = { + file: { + path: ['C:\\Windows\\TEMP\\E38FD162-B6E6-4799-B52D-F590BACBAE94\\WimProvider.dll'], + extension: ['dll'], + name: ['WimProvider.dll'], + }, + host: { + os: { + full: ['Windows Server 2019 Datacenter 1809 (10.0.17763.1697)'], + name: ['Windows'], + version: ['1809 (10.0.17763.1697)'], + family: ['windows'], + kernel: ['1809 (10.0.17763.1697)'], + platform: ['windows'], + }, + mac: ['aa:bb:cc:dd:ee:ff'], + name: ['win2019-endpoint'], + architecture: ['x86_64'], + ip: ['10.9.8.7'], + id: ['d8ad572e-d224-4044-a57d-f5a84c0dfe5d'], + }, + event: { + category: ['file'], + kind: ['event'], + created: ['2021-01-25T16:21:56.832Z'], + module: ['endpoint'], + action: ['creation'], + type: ['creation'], + id: ['LzzWB9jjGmCwGMvk++++6FEM'], + dataset: ['endpoint.events.file'], + }, + process: { + name: ['MsMpEng.exe'], + pid: [2424], + entity_id: [ + 'MWQxNWNmOWUtM2RjNy01Yjk3LWY1ODYtNzQzZjdjMjUxOGIyLTI0MjQtMTMyNTUwNzg2OTAuNDQ1MzY0NzAw', + ], + executable: [ + 'C:\\ProgramData\\Microsoft\\Windows Defender\\Platform\\4.18.2011.6-0\\MsMpEng.exe', + ], + }, + agent: { + type: ['endpoint'], + }, + user: { + name: ['SYSTEM'], + domain: ['NT AUTHORITY'], + }, + message: ['Endpoint file event'], + timestamp: '2021-01-25T16:21:56.832Z', + _id: 'eSdbOncBLJMagDUQ3YFs', +}; + export const mockEndgameFileDeleteEvent: Ecs = { _id: 'OMjPcG0BOpWiDweSeuW9', user: { @@ -123,6 +291,58 @@ export const mockEndgameFileDeleteEvent: Ecs = { }, }; +export const mockEndpointFileDeletionEvent: Ecs = { + file: { + path: ['C:\\Windows\\SoftwareDistribution\\Download\\Install\\AM_Delta_Patch_1.329.2793.0.exe'], + extension: ['exe'], + name: ['AM_Delta_Patch_1.329.2793.0.exe'], + }, + host: { + os: { + full: ['Windows Server 2019 Datacenter 1809 (10.0.17763.1697)'], + name: ['Windows'], + version: ['1809 (10.0.17763.1697)'], + family: ['windows'], + kernel: ['1809 (10.0.17763.1697)'], + platform: ['windows'], + }, + mac: ['11:22:33:44:55:66'], + name: ['windows-endpoint-1'], + architecture: ['x86_64'], + ip: ['10.1.2.3'], + id: ['ce6fa3c3-fda1-4984-9bce-f6d602a5bd1a'], + }, + event: { + category: ['file'], + kind: ['event'], + created: ['2021-01-25T22:50:36.783Z'], + module: ['endpoint'], + action: ['deletion'], + type: ['deletion'], + id: ['Lzty2lsJxA05IUWg++++CBsc'], + dataset: ['endpoint.events.file'], + }, + process: { + name: ['svchost.exe'], + pid: [1728], + entity_id: [ + 'YjUwNDNiMTMtYTdjNi0xZGFlLTEyZWQtODQ1ZDlhNTRhZmQyLTE3MjgtMTMyNTQ5ODc2MjYuNjg3OTg0MDAw', + ], + executable: ['C:\\Windows\\System32\\svchost.exe'], + }, + user: { + id: ['S-1-5-18'], + name: ['SYSTEM'], + domain: ['NT AUTHORITY'], + }, + agent: { + type: ['endpoint'], + }, + message: ['Endpoint file event'], + timestamp: '2021-01-25T22:50:36.783Z', + _id: 'mnXHO3cBPmkOXwyNlyv_', +}; + export const mockEndgameIpv4ConnectionAcceptEvent: Ecs = { _id: 'LsjPcG0BOpWiDweSCNfu', user: { @@ -213,6 +433,74 @@ export const mockEndgameIpv6ConnectionAcceptEvent: Ecs = { }, }; +export const mockEndpointNetworkConnectionAcceptedEvent: Ecs = { + host: { + os: { + full: ['Windows Server 2019 Datacenter 1809 (10.0.17763.1697)'], + name: ['Windows'], + version: ['1809 (10.0.17763.1697)'], + family: ['windows'], + kernel: ['1809 (10.0.17763.1697)'], + platform: ['windows'], + }, + mac: ['aa:bb:cc:dd:ee:ff'], + name: ['windows-endpoint-1'], + architecture: ['x86_64'], + ip: ['10.1.2.3'], + id: ['ce6fa3c3-fda1-4984-9bce-f6d602a5bd1a'], + }, + event: { + category: ['network'], + kind: ['event'], + outcome: ['success'], + created: ['2021-01-25T16:44:45.048Z'], + module: ['endpoint'], + action: ['connection_accepted'], + type: ['start'], + id: ['Lzty2lsJxA05IUWg++++C1CY'], + dataset: ['endpoint.events.network'], + }, + process: { + name: ['svchost.exe'], + pid: [328], + entity_id: [ + 'YjUwNDNiMTMtYTdjNi0xZGFlLTEyZWQtODQ1ZDlhNTRhZmQyLTMyOC0xMzI1NDk4NzUwNS45OTYxMjUzMDA=', + ], + executable: ['C:\\Windows\\System32\\svchost.exe'], + }, + source: { + geo: { + region_name: ['North Carolina'], + region_iso_code: ['US-NC'], + city_name: ['Concord'], + country_iso_code: ['US'], + continent_name: ['North America'], + country_name: ['United States'], + }, + ip: ['10.1.2.3'], + port: [64557], + }, + destination: { + port: [3389], + ip: ['10.50.60.70'], + }, + user: { + id: ['S-1-5-20'], + name: ['NETWORK SERVICE'], + domain: ['NT AUTHORITY'], + }, + agent: { + type: ['endpoint'], + }, + network: { + direction: ['incoming'], + transport: ['tcp'], + }, + message: ['Endpoint network event'], + timestamp: '2021-01-25T16:44:45.048Z', + _id: 'tUN0OncBPmkOXwyNOGPV', +}; + export const mockEndgameIpv4DisconnectReceivedEvent: Ecs = { _id: 'hMjPcG0BOpWiDweSoOin', user: { @@ -309,6 +597,75 @@ export const mockEndgameIpv6DisconnectReceivedEvent: Ecs = { }, }; +export const mockEndpointDisconnectReceivedEvent: Ecs = { + host: { + os: { + full: ['Windows Server 2019 Datacenter 1809 (10.0.17763.1697)'], + name: ['Windows'], + version: ['1809 (10.0.17763.1697)'], + family: ['windows'], + kernel: ['1809 (10.0.17763.1697)'], + platform: ['windows'], + }, + mac: ['aa:bb:cc:dd:ee:ff'], + name: ['windows-endpoint-1'], + architecture: ['x86_64'], + ip: ['10.1.2.3'], + id: ['ce6fa3c3-fda1-4984-9bce-f6d602a5bd1a'], + }, + event: { + category: ['network'], + kind: ['event'], + created: ['2021-01-25T16:44:47.004Z'], + module: ['endpoint'], + action: ['disconnect_received'], + type: ['end'], + id: ['Lzty2lsJxA05IUWg++++C1Ch'], + dataset: ['endpoint.events.network'], + }, + process: { + name: ['svchost.exe'], + pid: [328], + entity_id: [ + 'YjUwNDNiMTMtYTdjNi0xZGFlLTEyZWQtODQ1ZDlhNTRhZmQyLTMyOC0xMzI1NDk4NzUwNS45OTYxMjUzMDA=', + ], + executable: ['C:\\Windows\\System32\\svchost.exe'], + }, + source: { + geo: { + region_name: ['North Carolina'], + region_iso_code: ['US-NC'], + city_name: ['Concord'], + country_iso_code: ['US'], + continent_name: ['North America'], + country_name: ['United States'], + }, + ip: ['10.20.30.40'], + port: [64557], + bytes: [1192], + }, + destination: { + bytes: [1615], + port: [3389], + ip: ['10.11.12.13'], + }, + user: { + id: ['S-1-5-20'], + name: ['NETWORK SERVICE'], + domain: ['NT AUTHORITY'], + }, + agent: { + type: ['endpoint'], + }, + network: { + direction: ['incoming'], + transport: ['tcp'], + }, + message: ['Endpoint network event'], + timestamp: '2021-01-25T16:44:47.004Z', + _id: 'uUN0OncBPmkOXwyNOGPV', +}; + export const mockEndgameUserLogon: Ecs = { _id: 'QsjPcG0BOpWiDweSeuRE', user: { @@ -357,6 +714,92 @@ export const mockEndgameUserLogon: Ecs = { }, }; +export const mockEndpointSecurityLogOnSuccessEvent: Ecs = { + host: { + os: { + full: ['Windows Server 2019 Datacenter 1809 (10.0.17763.1697)'], + name: ['Windows'], + version: ['1809 (10.0.17763.1697)'], + family: ['windows'], + kernel: ['1809 (10.0.17763.1697)'], + platform: ['windows'], + }, + mac: ['aa:bb:cc:dd:ee:ff'], + name: ['win2019-endpoint'], + architecture: ['x86_64'], + ip: ['10.1.2.3'], + id: ['d8ad572e-d224-4044-a57d-f5a84c0dfe5d'], + }, + event: { + category: ['authentication', 'session'], + kind: ['event'], + outcome: ['success'], + created: ['2021-01-25T16:24:51.761Z'], + module: ['endpoint'], + action: ['log_on'], + type: ['start'], + id: ['LzzWB9jjGmCwGMvk++++6FKC'], + dataset: ['endpoint.events.security'], + }, + process: { + name: ['C:\\Program Files\\OpenSSH-Win64\\sshd.exe'], + entity_id: [ + 'MWQxNWNmOWUtM2RjNy01Yjk3LWY1ODYtNzQzZjdjMjUxOGIyLTQzNDQtMTMyNTYwNjU0ODYuMzIwNDI3MDAw', + ], + executable: ['C:\\Program Files\\OpenSSH-Win64\\sshd.exe'], + pid: [90210], + }, + agent: { + type: ['endpoint'], + }, + user: { + name: ['SYSTEM'], + domain: ['NT AUTHORITY'], + }, + message: ['Endpoint security event'], + timestamp: '2021-01-25T16:24:51.761Z', + _id: 'eSlgOncBLJMagDUQ-yBL', +}; + +export const mockEndpointSecurityLogOnFailureEvent: Ecs = { + host: { + os: { + full: ['Windows Server 2019 Datacenter 1809 (10.0.17763.1637)'], + name: ['Windows'], + version: ['1809 (10.0.17763.1637)'], + kernel: ['1809 (10.0.17763.1637)'], + platform: ['windows'], + family: ['windows'], + }, + mac: ['aa:bb:cc:dd:ee:ff'], + ip: ['10.1.2.3'], + name: ['win2019-endpoint'], + id: ['d8ad572e-d224-4044-a57d-f5a84c0dfe5d'], + architecture: ['x86_64'], + }, + event: { + category: ['authentication', 'session'], + module: ['endpoint'], + kind: ['event'], + outcome: ['failure'], + action: ['log_on'], + created: ['2020-12-28T04:05:01.409Z'], + type: ['start'], + id: ['Ly1AjdVRChqy2iq3++++3jlX'], + dataset: ['endpoint.events.security'], + }, + process: { + name: ['C:\\Program Files\\OpenSSH-Win64\\sshd.exe'], + pid: [90210], + }, + agent: { + type: ['endpoint'], + }, + message: ['Endpoint security event'], + timestamp: '2020-12-28T04:05:01.409Z', + _id: 's8GIp3YBN9Y7_e914Upz', +}; + export const mockEndgameAdminLogon: Ecs = { _id: 'psjPcG0BOpWiDweSoelR', user: { @@ -488,6 +931,49 @@ export const mockEndgameUserLogoff: Ecs = { }, }; +export const mockEndpointSecurityLogOffEvent: Ecs = { + host: { + os: { + full: ['Windows Server 2019 Datacenter 1809 (10.0.17763.1697)'], + name: ['Windows'], + version: ['1809 (10.0.17763.1697)'], + family: ['windows'], + kernel: ['1809 (10.0.17763.1697)'], + platform: ['windows'], + }, + mac: ['aa:bb:cc:dd:ee:ff'], + name: ['win2019-endpoint'], + architecture: ['x86_64'], + ip: ['10.1.2.3'], + id: ['d8ad572e-d224-4044-a57d-f5a84c0dfe5d'], + }, + event: { + category: ['authentication,session'], + kind: ['event'], + outcome: ['success'], + created: ['2021-01-26T23:27:27.610Z'], + module: ['endpoint'], + action: ['log_off'], + type: ['end'], + id: ['LzzWB9jjGmCwGMvk++++6l0y'], + dataset: ['endpoint.events.security'], + }, + process: { + entity_id: [ + 'MWQxNWNmOWUtM2RjNy01Yjk3LWY1ODYtNzQzZjdjMjUxOGIyLTU4MC0xMzI1NTA3ODY2Ny45MTg5Njc1MDA=', + ], + executable: ['C:\\Windows\\System32\\lsass.exe'], + pid: [90210], + }, + user: { + name: ['SYSTEM'], + domain: ['NT AUTHORITY'], + }, + message: ['Endpoint security event'], + timestamp: '2021-01-26T23:27:27.610Z', + _id: 'ZesLQXcBPmkOXwyNdT1a', +}; + export const mockEndgameCreationEvent: Ecs = { _id: 'BcjPcG0BOpWiDweSou3g', user: { @@ -537,6 +1023,58 @@ export const mockEndgameCreationEvent: Ecs = { }, }; +export const mockEndpointProcessStartEvent: Ecs = { + process: { + hash: { + md5: ['1b0e9b5fcb62de0787235ecca560b610'], + sha256: ['697334c236cce7d4c9e223146ee683a1219adced9729d4ae771fd6a1502a6b63'], + sha1: ['e19da2c35ba1c38adf12d1a472c1fcf1f1a811a7'], + }, + name: ['conhost.exe'], + pid: [3636], + entity_id: [ + 'MWQxNWNmOWUtM2RjNy01Yjk3LWY1ODYtNzQzZjdjMjUxOGIyLTM2MzYtMTMyNTYwODU1OTguMTA3NTA3MDAw', + ], + executable: ['C:\\Windows\\System32\\conhost.exe'], + args: ['C:\\Windows\\system32\\conhost.exe,0xffffffff,-ForceV1'], + }, + host: { + os: { + full: ['Windows Server 2019 Datacenter 1809 (10.0.17763.1697)'], + name: ['Windows'], + version: ['1809 (10.0.17763.1697)'], + family: ['windows'], + kernel: ['1809 (10.0.17763.1697)'], + platform: ['windows'], + }, + mac: ['aa:bb:cc:dd:ee:ff'], + name: ['win2019-endpoint-1'], + architecture: ['x86_64'], + ip: ['10.1.2.3'], + id: ['d8ad572e-d224-4044-a57d-f5a84c0dfe5d'], + }, + event: { + category: ['process'], + kind: ['event'], + created: ['2021-01-25T21:59:58.107Z'], + module: ['endpoint'], + action: ['start'], + type: ['start'], + id: ['LzzWB9jjGmCwGMvk++++6Kw+'], + dataset: ['endpoint.events.process'], + }, + agent: { + type: ['endpoint'], + }, + user: { + name: ['SYSTEM'], + domain: ['NT AUTHORITY'], + }, + message: ['Endpoint process event'], + timestamp: '2021-01-25T21:59:58.107Z', + _id: 't5KSO3cB8l64wN2iQ8V9', +}; + export const mockEndgameTerminationEvent: Ecs = { _id: '2MjPcG0BOpWiDweSoutC', user: { @@ -578,3 +1116,59 @@ export const mockEndgameTerminationEvent: Ecs = { exit_code: [0], }, }; + +export const mockEndpointProcessEndEvent: Ecs = { + process: { + hash: { + md5: ['8a0a29438052faed8a2532da50455756'], + sha256: ['7fd065bac18c5278777ae44908101cdfed72d26fa741367f0ad4d02020787ab6'], + sha1: ['a1385ce20ad79f55df235effd9780c31442aa234'], + }, + name: ['svchost.exe'], + parent: { + name: ['services.exe'], + }, + pid: [10392], + entity_id: [ + 'MWQxNWNmOWUtM2RjNy01Yjk3LWY1ODYtNzQzZjdjMjUxOGIyLTEwMzkyLTEzMjU2MjY2OTkwLjcwMzgzMDgwMA==', + ], + executable: ['C:\\Windows\\System32\\svchost.exe'], + exit_code: [-1], + args: ['C:\\Windows\\System32\\svchost.exe,-k,netsvcs,-p,-s,NetSetupSvc'], + }, + host: { + os: { + full: ['Windows Server 2019 Datacenter 1809 (10.0.17763.1697)'], + name: ['Windows'], + version: ['1809 (10.0.17763.1697)'], + family: ['windows'], + kernel: ['1809 (10.0.17763.1697)'], + platform: ['windows'], + }, + mac: ['aa:bb:cc:dd:ee:ff'], + name: ['win2019-endpoint'], + architecture: ['x86_64'], + ip: ['10.1.2.3'], + id: ['d8ad572e-d224-4044-a57d-f5a84c0dfe5d'], + }, + event: { + category: ['process'], + kind: ['event'], + created: ['2021-01-28T00:24:05.929Z'], + module: ['endpoint'], + action: ['end'], + type: ['end'], + id: ['LzzWB9jjGmCwGMvk++++77mE'], + dataset: ['endpoint.events.process'], + }, + agent: { + type: ['endpoint'], + }, + user: { + name: ['SYSTEM'], + domain: ['NT AUTHORITY'], + }, + message: ['Endpoint process event'], + timestamp: '2021-01-28T00:24:05.929Z', + _id: 'quloRncBX5UUcOOYo2ZS', +}; diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/__snapshots__/process_draggable.test.tsx.snap b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/__snapshots__/process_draggable.test.tsx.snap index 494a2b2b7732b..84aea591337ee 100644 --- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/__snapshots__/process_draggable.test.tsx.snap +++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/__snapshots__/process_draggable.test.tsx.snap @@ -1,20 +1,31 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`ProcessDraggable rendering it renders against shallow snapshot 1`] = ` -
    - - -
    + + + + + + + + `; diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/endgame/endgame_security_event_details.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/endgame/endgame_security_event_details.tsx index 819c77343fc14..515db45e9fcd4 100644 --- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/endgame/endgame_security_event_details.tsx +++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/endgame/endgame_security_event_details.tsx @@ -42,6 +42,7 @@ export const EndgameSecurityEventDetails = React.memo(({ data, contextId, const endgameTargetUserName: string | null | undefined = get('endgame.target_user_name[0]', data); const eventAction: string | null | undefined = get('event.action[0]', data); const eventCode: string | null | undefined = get('event.code[0]', data); + const eventOutcome: string | null | undefined = get('event.outcome[0]', data); const hostName: string | null | undefined = get('host.name[0]', data); const id = data._id; const processExecutable: string | null | undefined = get('process.executable[0]', data); @@ -64,6 +65,7 @@ export const EndgameSecurityEventDetails = React.memo(({ data, contextId, endgameTargetUserName={endgameTargetUserName} eventAction={eventAction} eventCode={eventCode} + eventOutcome={eventOutcome} hostName={hostName} id={id} processExecutable={processExecutable} diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/endgame/endgame_security_event_details_line.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/endgame/endgame_security_event_details_line.test.tsx index a502180edfcf1..5d08898789821 100644 --- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/endgame/endgame_security_event_details_line.test.tsx +++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/endgame/endgame_security_event_details_line.test.tsx @@ -39,6 +39,7 @@ describe('EndgameSecurityEventDetailsLine', () => { endgameTargetUserName="[endgameTargetUserName]" eventAction="admin_logon" eventCode="[eventCode]" + eventOutcome={undefined} hostName="[hostName]" id="1" processExecutable="[processExecutable]" @@ -69,6 +70,7 @@ describe('EndgameSecurityEventDetailsLine', () => { endgameTargetUserName="[endgameTargetUserName]" eventAction="explicit_user_logon" eventCode="[eventCode]" + eventOutcome={undefined} hostName="[hostName]" id="1" processExecutable="[processExecutable]" @@ -99,6 +101,7 @@ describe('EndgameSecurityEventDetailsLine', () => { endgameTargetUserName="[endgameTargetUserName]" eventAction="explicit_user_logon" eventCode="[eventCode]" + eventOutcome={undefined} hostName="[hostName]" id="1" processExecutable="[processExecutable]" @@ -129,6 +132,7 @@ describe('EndgameSecurityEventDetailsLine', () => { endgameTargetUserName="[endgameTargetUserName]" eventAction="explicit_user_logon" eventCode="[eventCode]" + eventOutcome={undefined} hostName="[hostName]" id="1" processExecutable="[processExecutable]" @@ -159,6 +163,7 @@ describe('EndgameSecurityEventDetailsLine', () => { endgameTargetUserName="[endgameTargetUserName]" eventAction="explicit_user_logon" eventCode="[eventCode]" + eventOutcome={undefined} hostName="[hostName]" id="1" processExecutable="[processExecutable]" @@ -189,6 +194,7 @@ describe('EndgameSecurityEventDetailsLine', () => { endgameTargetUserName="[endgameTargetUserName]" eventAction="explicit_user_logon" eventCode="[eventCode]" + eventOutcome={undefined} hostName="[hostName]" id="1" processExecutable="[processExecutable]" @@ -219,6 +225,7 @@ describe('EndgameSecurityEventDetailsLine', () => { endgameTargetUserName="[endgameTargetUserName]" eventAction="explicit_user_logon" eventCode="[eventCode]" + eventOutcome={undefined} hostName="[hostName]" id="1" processExecutable="[processExecutable]" @@ -249,6 +256,7 @@ describe('EndgameSecurityEventDetailsLine', () => { endgameTargetUserName="[endgameTargetUserName]" eventAction="explicit_user_logon" eventCode="[eventCode]" + eventOutcome={undefined} hostName="[hostName]" id="1" processExecutable="[processExecutable]" @@ -279,6 +287,7 @@ describe('EndgameSecurityEventDetailsLine', () => { endgameTargetUserName={undefined} eventAction="explicit_user_logon" eventCode="[eventCode]" + eventOutcome={undefined} hostName="[hostName]" id="1" processExecutable="[processExecutable]" @@ -309,6 +318,7 @@ describe('EndgameSecurityEventDetailsLine', () => { endgameTargetUserName="[endgameTargetUserName]" eventAction={undefined} eventCode="[eventCode]" + eventOutcome={undefined} hostName="[hostName]" id="1" processExecutable="[processExecutable]" @@ -339,6 +349,7 @@ describe('EndgameSecurityEventDetailsLine', () => { endgameTargetUserName="[endgameTargetUserName]" eventAction="explicit_user_logon" eventCode={undefined} + eventOutcome={undefined} hostName="[hostName]" id="1" processExecutable="[processExecutable]" @@ -369,6 +380,7 @@ describe('EndgameSecurityEventDetailsLine', () => { endgameTargetUserName="[endgameTargetUserName]" eventAction="explicit_user_logon" eventCode="[eventCode]" + eventOutcome={undefined} hostName={undefined} id="1" processExecutable="[processExecutable]" @@ -399,6 +411,7 @@ describe('EndgameSecurityEventDetailsLine', () => { endgameTargetUserName="[endgameTargetUserName]" eventAction="explicit_user_logon" eventCode="[eventCode]" + eventOutcome={undefined} hostName="[hostName]" id="1" processExecutable={undefined} @@ -429,6 +442,7 @@ describe('EndgameSecurityEventDetailsLine', () => { endgameTargetUserName="[endgameTargetUserName]" eventAction="explicit_user_logon" eventCode="[eventCode]" + eventOutcome={undefined} hostName="[hostName]" id="1" processExecutable="[processExecutable]" @@ -459,6 +473,7 @@ describe('EndgameSecurityEventDetailsLine', () => { endgameTargetUserName="[endgameTargetUserName]" eventAction="explicit_user_logon" eventCode="[eventCode]" + eventOutcome={undefined} hostName="[hostName]" id="1" processExecutable="[processExecutable]" @@ -489,6 +504,7 @@ describe('EndgameSecurityEventDetailsLine', () => { endgameTargetUserName="[endgameTargetUserName]" eventAction="admin_logon" eventCode="[eventCode]" + eventOutcome={undefined} hostName="[hostName]" id="1" processExecutable="[processExecutable]" @@ -519,6 +535,7 @@ describe('EndgameSecurityEventDetailsLine', () => { endgameTargetUserName="[endgameTargetUserName]" eventAction="admin_logon" eventCode="[eventCode]" + eventOutcome={undefined} hostName="[hostName]" id="1" processExecutable="[processExecutable]" @@ -549,6 +566,7 @@ describe('EndgameSecurityEventDetailsLine', () => { endgameTargetUserName="[endgameTargetUserName]" eventAction="admin_logon" eventCode="[eventCode]" + eventOutcome={undefined} hostName="[hostName]" id="1" processExecutable="[processExecutable]" @@ -579,6 +597,7 @@ describe('EndgameSecurityEventDetailsLine', () => { endgameTargetUserName="[endgameTargetUserName]" eventAction="admin_logon" eventCode={undefined} + eventOutcome={undefined} hostName="[hostName]" id="1" processExecutable="[processExecutable]" diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/endgame/endgame_security_event_details_line.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/endgame/endgame_security_event_details_line.tsx index 9d3e74435852a..aba6f7346271d 100644 --- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/endgame/endgame_security_event_details_line.tsx +++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/endgame/endgame_security_event_details_line.tsx @@ -35,6 +35,7 @@ interface Props { endgameTargetUserName: string | null | undefined; eventAction: string | null | undefined; eventCode: string | null | undefined; + eventOutcome: string | null | undefined; hostName: string | null | undefined; id: string; processExecutable: string | null | undefined; @@ -57,6 +58,7 @@ export const EndgameSecurityEventDetailsLine = React.memo( endgameTargetUserName, eventAction, eventCode, + eventOutcome, hostName, id, processExecutable, @@ -67,7 +69,7 @@ export const EndgameSecurityEventDetailsLine = React.memo( winlogEventId, }) => { const domain = getTargetUserAndTargetDomain(eventAction) ? endgameTargetDomainName : userDomain; - const eventDetails = getEventDetails(eventAction); + const eventDetails = getEventDetails({ eventAction, eventOutcome }); const hostNameSeparator = getHostNameSeparator(eventAction); const user = getTargetUserAndTargetDomain(eventAction) ? endgameTargetUserName : userName; const userDomainField = getUserDomainField(eventAction); diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/endgame/helpers.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/endgame/helpers.test.tsx index a8955ccf22fec..5efc1e0b15673 100644 --- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/endgame/helpers.test.tsx +++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/endgame/helpers.test.tsx @@ -182,28 +182,116 @@ describe('helpers', () => { }); describe('#getEventDetails', () => { - test('it returns successfully logged in when eventAction is undefined', () => { - expect(getEventDetails(undefined)).toEqual('successfully logged in'); + test('it returns an empty string when eventAction is "explicit_user_logon"', () => { + expect( + getEventDetails({ eventAction: 'explicit_user_logon', eventOutcome: undefined }) + ).toEqual(''); }); - test('it returns successfully logged in when eventAction is null', () => { - expect(getEventDetails(null)).toEqual('successfully logged in'); + test('it returns logged off when eventAction is "log_off" and eventOutcome is null', () => { + expect(getEventDetails({ eventAction: 'log_off', eventOutcome: null })).toEqual('logged off'); }); - test('it returns successfully logged in when eventAction is an empty string', () => { - expect(getEventDetails('')).toEqual('successfully logged in'); + test('it returns logged off when eventAction is "log_off" and eventOutcome is undefined', () => { + expect(getEventDetails({ eventAction: 'log_off', eventOutcome: undefined })).toEqual( + 'logged off' + ); }); - test('it returns successfully logged in when eventAction is a random value', () => { - expect(getEventDetails('a random value')).toEqual('successfully logged in'); + test('it returns failed to log off when eventAction is "log_off" and eventOutcome is failure', () => { + expect(getEventDetails({ eventAction: 'log_off', eventOutcome: 'failure' })).toEqual( + 'failed to log off' + ); }); - test('it returns an empty string when eventAction is "explicit_user_logon"', () => { - expect(getEventDetails('explicit_user_logon')).toEqual(''); + test('it returns failed to log off when eventAction is "log_off" and eventOutcome is fAiLuRe', () => { + expect(getEventDetails({ eventAction: 'log_off', eventOutcome: 'fAiLuRe' })).toEqual( + 'failed to log off' + ); + }); + + test('it returns logged off when eventAction is "log_off" and eventOutcome is anything_else', () => { + expect(getEventDetails({ eventAction: 'log_off', eventOutcome: 'anything_else' })).toEqual( + 'logged off' + ); + }); + + test('it returns logged off when eventAction is "user_logoff" and eventOutcome is null', () => { + expect(getEventDetails({ eventAction: 'user_logoff', eventOutcome: null })).toEqual( + 'logged off' + ); + }); + + test('it returns logged off when eventAction is "user_logoff" and eventOutcome is undefined', () => { + expect(getEventDetails({ eventAction: 'user_logoff', eventOutcome: undefined })).toEqual( + 'logged off' + ); + }); + + test('it returns failed to log off when eventAction is "user_logoff" and eventOutcome is failure', () => { + expect(getEventDetails({ eventAction: 'user_logoff', eventOutcome: 'failure' })).toEqual( + 'failed to log off' + ); + }); + + test('it returns failed to log off when eventAction is "user_logoff" and eventOutcome is fAiLuRe', () => { + expect(getEventDetails({ eventAction: 'user_logoff', eventOutcome: 'fAiLuRe' })).toEqual( + 'failed to log off' + ); + }); + + test('it returns logged off when eventAction is "user_logoff" and eventOutcome is anything_else', () => { + expect( + getEventDetails({ eventAction: 'user_logoff', eventOutcome: 'anything_else' }) + ).toEqual('logged off'); + }); + + test('it returns successfully logged in when eventAction is null and eventOutcome is undefined', () => { + expect(getEventDetails({ eventAction: null, eventOutcome: undefined })).toEqual( + 'successfully logged in' + ); + }); + + test('it returns successfully logged in when eventAction is null and eventOutcome is null', () => { + expect(getEventDetails({ eventAction: null, eventOutcome: null })).toEqual( + 'successfully logged in' + ); + }); + + test('it returns successfully logged in when eventAction is undefined and eventOutcome is null', () => { + expect(getEventDetails({ eventAction: undefined, eventOutcome: null })).toEqual( + 'successfully logged in' + ); + }); + + test('it returns successfully logged in when eventAction is undefined and eventOutcome is undefined', () => { + expect(getEventDetails({ eventAction: undefined, eventOutcome: undefined })).toEqual( + 'successfully logged in' + ); + }); + + test('it returns successfully logged in when eventAction is anything_else and eventOutcome is undefined', () => { + expect(getEventDetails({ eventAction: 'anything_else', eventOutcome: undefined })).toEqual( + 'successfully logged in' + ); + }); + + test('it returns successfully logged in when eventAction is anything_else and eventOutcome is null', () => { + expect(getEventDetails({ eventAction: 'anything_else', eventOutcome: null })).toEqual( + 'successfully logged in' + ); + }); + + test('it returns failed to log in when eventAction is anything_else and eventOutcome is failure', () => { + expect(getEventDetails({ eventAction: 'anything_else', eventOutcome: 'failure' })).toEqual( + 'failed to log in' + ); }); - test('it returns logged off when eventAction is "user_logoff"', () => { - expect(getEventDetails('user_logoff')).toEqual('logged off'); + test('it returns failed to log in when eventAction is anything_else and eventOutcome is fAiLuRe', () => { + expect(getEventDetails({ eventAction: 'anything_else', eventOutcome: 'fAiLuRe' })).toEqual( + 'failed to log in' + ); }); }); }); diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/endgame/helpers.ts b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/endgame/helpers.ts index 86785c3986270..87c0ed2782f9d 100644 --- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/endgame/helpers.ts +++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/endgame/helpers.ts @@ -50,13 +50,22 @@ export const getUserDomainField = (eventAction: string | null | undefined): stri export const getUserNameField = (eventAction: string | null | undefined): string => getTargetUserAndTargetDomain(eventAction) ? 'endgame.target_user_name' : 'user.name'; -export const getEventDetails = (eventAction: string | null | undefined): string => { +export const getEventDetails = ({ + eventAction, + eventOutcome, +}: { + eventAction: string | null | undefined; + eventOutcome: string | null | undefined; +}): string => { switch (eventAction) { case 'explicit_user_logon': return ''; // no details + case 'log_off': // fall through case 'user_logoff': - return i18n.LOGGED_OFF; + return eventOutcome?.toLowerCase() === 'failure' ? i18n.FAILED_TO_LOG_OFF : i18n.LOGGED_OFF; default: - return i18n.SUCCESSFULLY_LOGGED_IN; + return eventOutcome?.toLowerCase() === 'failure' + ? i18n.FAILED_TO_LOG_IN + : i18n.SUCCESSFULLY_LOGGED_IN; } }; diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/endgame/translations.ts b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/endgame/translations.ts index e7dfefb2b570c..859fc8ead332a 100644 --- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/endgame/translations.ts +++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/endgame/translations.ts @@ -21,6 +21,20 @@ export const AS_REQUESTED_BY_SUBJECT = i18n.translate( } ); +export const FAILED_TO_LOG_IN = i18n.translate( + 'xpack.securitySolution.timeline.body.renderers.endpoint.failedToLogInDescription', + { + defaultMessage: 'failed to log in', + } +); + +export const FAILED_TO_LOG_OFF = i18n.translate( + 'xpack.securitySolution.timeline.body.renderers.endpoint.failedToLogOffDescription', + { + defaultMessage: 'failed to log off', + } +); + export const LOGGED_OFF = i18n.translate( 'xpack.securitySolution.timeline.body.renderers.endgame.loggedOffDescription', { diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/exit_code_draggable.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/exit_code_draggable.test.tsx index 2d502f1195995..a6f15a9f79f4e 100644 --- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/exit_code_draggable.test.tsx +++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/exit_code_draggable.test.tsx @@ -25,22 +25,29 @@ jest.mock('@elastic/eui', () => { describe('ExitCodeDraggable', () => { const mount = useMountAppended(); - test('it renders the expected text and exit code, when both text and an endgameExitCode are provided', () => { + test('it renders the expected text and exit codes, when text, processExitCode, and an endgameExitCode are provided', () => { const wrapper = mount( - + ); - expect(wrapper.text()).toEqual('with exit code0'); + expect(wrapper.text()).toEqual('with exit code-10'); }); - test('it returns an empty string when text is provided, but endgameExitCode is undefined', () => { + test('it returns an empty string when text is provided, but processExitCode and endgameExitCode are undefined', () => { const wrapper = mount( @@ -48,13 +55,14 @@ describe('ExitCodeDraggable', () => { expect(wrapper.text()).toEqual(''); }); - test('it returns an empty string when text is provided, but endgameExitCode is null', () => { + test('it returns an empty string when text is provided, but processExitCode and endgameExitCode are null', () => { const wrapper = mount( @@ -65,36 +73,105 @@ describe('ExitCodeDraggable', () => { test('it returns an empty string when text is provided, but endgameExitCode is an empty string', () => { const wrapper = mount( - + ); expect(wrapper.text()).toEqual(''); }); - test('it renders just the exit code when text is undefined', () => { + test('it renders just the endgameExitCode code when text is undefined', () => { const wrapper = mount( - + ); expect(wrapper.text()).toEqual('1'); }); - test('it renders just the exit code when text is null', () => { + test('it renders just the processExitCode code when text is undefined', () => { const wrapper = mount( - + + + ); + expect(wrapper.text()).toEqual('-1'); + }); + + test('it renders just the endgameExitCode code when text is null', () => { + const wrapper = mount( + + ); expect(wrapper.text()).toEqual('1'); }); - test('it renders just the exit code when text is an empty string', () => { + test('it renders just the processExitCode code when text is null', () => { const wrapper = mount( - + + + ); + expect(wrapper.text()).toEqual('-1'); + }); + + test('it renders just the endgameExitCode code when text is an empty string', () => { + const wrapper = mount( + + ); expect(wrapper.text()).toEqual('1'); }); + + test('it renders just the processExitCode code when text is an empty string', () => { + const wrapper = mount( + + + + ); + expect(wrapper.text()).toEqual('-1'); + }); }); diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/exit_code_draggable.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/exit_code_draggable.tsx index 7d680aeb2ea76..7ac9fe290893f 100644 --- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/exit_code_draggable.tsx +++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/exit_code_draggable.tsx @@ -15,12 +15,13 @@ interface Props { contextId: string; endgameExitCode: string | null | undefined; eventId: string; + processExitCode: number | null | undefined; text: string | null | undefined; } export const ExitCodeDraggable = React.memo( - ({ contextId, endgameExitCode, eventId, text }) => { - if (isNillEmptyOrNotFinite(endgameExitCode)) { + ({ contextId, endgameExitCode, eventId, processExitCode, text }) => { + if (isNillEmptyOrNotFinite(processExitCode) && isNillEmptyOrNotFinite(endgameExitCode)) { return null; } @@ -32,14 +33,27 @@ export const ExitCodeDraggable = React.memo( )} - - - + {!isNillEmptyOrNotFinite(processExitCode) && ( + + + + )} + + {!isNillEmptyOrNotFinite(endgameExitCode) && ( + + + + )} ); } diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/helpers.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/helpers.tsx index 1dfff526dcce6..ea84dc19908f0 100644 --- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/helpers.tsx +++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/helpers.tsx @@ -51,14 +51,15 @@ export const isFileEvent = ({ eventCategory: string | null | undefined; eventDataset: string | null | undefined; }) => - (eventCategory != null && eventCategory.toLowerCase() === 'file') || - (eventDataset != null && eventDataset.toLowerCase() === 'file'); + eventCategory?.toLowerCase() === 'file' || + eventDataset?.toLowerCase() === 'file' || + eventDataset?.toLowerCase() === 'endpoint.events.file'; export const isProcessStoppedOrTerminationEvent = ( eventAction: string | null | undefined ): boolean => ['process_stopped', 'termination_event'].includes(`${eventAction}`.toLowerCase()); export const showVia = (eventAction: string | null | undefined): boolean => - ['file_create_event', 'created', 'file_delete_event', 'deleted'].includes( + ['file_create_event', 'created', 'creation', 'file_delete_event', 'deleted', 'deletion'].includes( `${eventAction}`.toLowerCase() ); diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/parent_process_draggable.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/parent_process_draggable.test.tsx index 19fd5eee0e230..2402be88dea18 100644 --- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/parent_process_draggable.test.tsx +++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/parent_process_draggable.test.tsx @@ -25,28 +25,34 @@ jest.mock('@elastic/eui', () => { describe('ParentProcessDraggable', () => { const mount = useMountAppended(); - test('displays the text, endgameParentProcessName, and processPpid when they are all provided', () => { + test('displays the text, endgameParentProcessName, processParentName, processParentPid, and processPpid when they are all provided', () => { const wrapper = mount( ); - expect(wrapper.text()).toEqual('via parent process[endgameParentProcessName](456)'); + expect(wrapper.text()).toEqual( + 'via parent process[processParentName][endgameParentProcessName](789)(456)' + ); }); - test('displays nothing when the text is provided, but endgameParentProcessName and processPpid are both undefined', () => { + test('displays nothing when the text is provided, but endgameParentProcessName and processParentName are both undefined', () => { const wrapper = mount( @@ -55,63 +61,71 @@ describe('ParentProcessDraggable', () => { expect(wrapper.text()).toEqual(''); }); - test('displays the text and processPpid when endgameParentProcessName is undefined', () => { + test('displays the text and endgameParentProcessName when processPpid is undefined', () => { const wrapper = mount( ); - expect(wrapper.text()).toEqual('via parent process(456)'); + expect(wrapper.text()).toEqual('via parent process[endgameParentProcessName]'); }); - test('displays the processPpid when both endgameParentProcessName and text are undefined', () => { + test('displays the text and processParentName when processParentPid is undefined', () => { const wrapper = mount( ); - expect(wrapper.text()).toEqual('(456)'); + expect(wrapper.text()).toEqual('via parent process[processParentName]'); }); - test('displays the text and endgameParentProcessName when processPpid is undefined', () => { + test('displays the endgameParentProcessName when both processPpid and text are undefined', () => { const wrapper = mount( ); - expect(wrapper.text()).toEqual('via parent process[endgameParentProcessName]'); + expect(wrapper.text()).toEqual('[endgameParentProcessName]'); }); - test('displays the endgameParentProcessName when both processPpid and text are undefined', () => { + test('displays the processParentName when both processParentPid and text are undefined', () => { const wrapper = mount( ); - expect(wrapper.text()).toEqual('[endgameParentProcessName]'); + expect(wrapper.text()).toEqual('[processParentName]'); }); }); diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/parent_process_draggable.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/parent_process_draggable.tsx index 816b2c8ddae78..f0a63404feeb7 100644 --- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/parent_process_draggable.tsx +++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/parent_process_draggable.tsx @@ -15,13 +15,26 @@ interface Props { contextId: string; endgameParentProcessName: string | null | undefined; eventId: string; + processParentPid: number | null | undefined; + processParentName: string | null | undefined; processPpid: number | undefined | null; text: string | null | undefined; } export const ParentProcessDraggable = React.memo( - ({ contextId, endgameParentProcessName, eventId, processPpid, text }) => { - if (isNillEmptyOrNotFinite(endgameParentProcessName) && isNillEmptyOrNotFinite(processPpid)) { + ({ + contextId, + endgameParentProcessName, + eventId, + processParentName, + processParentPid, + processPpid, + text, + }) => { + if ( + isNillEmptyOrNotFinite(processParentName) && + isNillEmptyOrNotFinite(endgameParentProcessName) + ) { return null; } @@ -37,6 +50,17 @@ export const ParentProcessDraggable = React.memo( )} + {!isNillEmptyOrNotFinite(processParentName) && ( + + + + )} + {!isNillEmptyOrNotFinite(endgameParentProcessName) && ( ( )} + {!isNillEmptyOrNotFinite(processParentPid) && ( + + + + )} + {!isNillEmptyOrNotFinite(processPpid) && ( ( } return ( -
    + {!isNillEmptyOrNotFinite(processName) ? ( - + + + ) : !isNillEmptyOrNotFinite(processExecutable) ? ( - + + + ) : !isNillEmptyOrNotFinite(endgameProcessName) ? ( - + + + ) : null} {!isNillEmptyOrNotFinite(processPid) ? ( - + + + ) : !isNillEmptyOrNotFinite(endgamePid) ? ( - + + + ) : null} -
    + ); } ); diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/system/generic_file_details.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/system/generic_file_details.test.tsx index 536de70a712a8..a3932fde44c1d 100644 --- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/system/generic_file_details.test.tsx +++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/system/generic_file_details.test.tsx @@ -116,10 +116,13 @@ describe('SystemGenericFileDetails', () => { packageName="[packageName-123]" packageSummary="[packageSummary-123]" packageVersion="[packageVersion-123]" - processExecutable="[packageExecutable=123]" + processExecutable="[processExecutable=123]" + processExitCode={-1} processHashMd5="[processHashMd5-123]" processHashSha1="[processHashSha1-123]" processHashSha256="[processHashSha256-123]" + processParentName="[processParentName-123]" + processParentPid={789} processPid={123} processPpid={456} processName="[processName-123]" @@ -135,7 +138,7 @@ describe('SystemGenericFileDetails', () => {     ); expect(wrapper.text()).toEqual( - '[username-123]\\[userDomain-123]@[hostname-123]in[working-directory-123][generic-text-123][fileName-123]in[filePath-123][processName-123](123)[arg-1][arg-2][arg-3][some-title-123]with exit code[endgameExitCode-123]via parent process[endgameParentProcessName-123](456)with result[outcome-123][sshSignature-123][sshMethod-123][packageName-123][packageVersion-123][packageSummary-123][processHashSha256-123][processHashSha1-123][processHashMd5-123][message-123]' + '[username-123]\\[userDomain-123]@[hostname-123]in[working-directory-123][generic-text-123][fileName-123]in[filePath-123][processName-123](123)[arg-1][arg-2][arg-3][some-title-123]with exit code-1[endgameExitCode-123]via parent process[processParentName-123][endgameParentProcessName-123](789)(456)with result[outcome-123][sshSignature-123][sshMethod-123][packageName-123][packageVersion-123][packageSummary-123][processHashSha256-123][processHashSha1-123][processHashMd5-123][message-123]' ); }); @@ -162,9 +165,12 @@ describe('SystemGenericFileDetails', () => { packageSummary={null} packageVersion={null} processExecutable={null} + processExitCode={null} processHashMd5={null} processHashSha1={null} processHashSha256={null} + processParentName={null} + processParentPid={null} processPid={null} processPpid={null} processName={null} @@ -207,9 +213,12 @@ describe('SystemGenericFileDetails', () => { packageSummary={null} packageVersion={null} processExecutable={null} + processExitCode={null} processHashMd5={null} processHashSha1={null} processHashSha256={null} + processParentName={null} + processParentPid={null} processPid={null} processPpid={null} processName={null} @@ -252,9 +261,12 @@ describe('SystemGenericFileDetails', () => { packageSummary={null} packageVersion={null} processExecutable={null} + processExitCode={null} processHashMd5={null} processHashSha1={null} processHashSha256={null} + processParentName={null} + processParentPid={null} processPid={null} processPpid={null} processName={null} @@ -297,9 +309,12 @@ describe('SystemGenericFileDetails', () => { packageSummary={null} packageVersion={null} processExecutable={null} + processExitCode={null} processHashMd5={null} processHashSha1={null} processHashSha256={null} + processParentName={null} + processParentPid={null} processPid={null} processPpid={null} processName={null} @@ -344,9 +359,12 @@ describe('SystemGenericFileDetails', () => { packageSummary={null} packageVersion={null} processExecutable={null} + processExitCode={null} processHashMd5={null} processHashSha1={null} processHashSha256={null} + processParentName={null} + processParentPid={null} processPid={null} processPpid={null} processName={null} @@ -391,9 +409,12 @@ describe('SystemGenericFileDetails', () => { packageSummary="[packageSummary-123]" packageVersion={null} processExecutable={null} + processExitCode={null} processHashMd5={null} processHashSha1={null} processHashSha256={null} + processParentName={null} + processParentPid={null} processPid={null} processPpid={null} processName={null} @@ -438,9 +459,12 @@ describe('SystemGenericFileDetails', () => { packageSummary="[packageSummary-123]" packageVersion="[packageVersion-123]" processExecutable={null} + processExitCode={null} processHashMd5={null} processHashSha1={null} processHashSha256={null} + processParentName={null} + processParentPid={null} processPid={null} processPpid={null} processName={null} @@ -462,7 +486,7 @@ describe('SystemGenericFileDetails', () => { ); }); - test('it can return the host, message, outcome, packageName, pacakgeSummary, packageVersion, packageExecutable', () => { + test('it can return the host, message, outcome, packageName, pacakgeSummary, packageVersion, packageExecutable, processExitCode', () => { const wrapper = mount(
    @@ -484,10 +508,13 @@ describe('SystemGenericFileDetails', () => { packageName="[packageName-123]" packageSummary="[packageSummary-123]" packageVersion="[packageVersion-123]" - processExecutable="[packageVersion-123]" + processExecutable="[processExecutable-123]" + processExitCode={-1} processHashMd5={null} processHashSha1={null} processHashSha256={null} + processParentName={null} + processParentPid={null} processPid={null} processPpid={null} processName={null} @@ -505,11 +532,11 @@ describe('SystemGenericFileDetails', () => { ); expect(wrapper.text()).toEqual( - '[hostname-123][packageVersion-123]with result[outcome-123][packageName-123][packageVersion-123][packageSummary-123][message-123]' + '[hostname-123][processExecutable-123]with exit code-1with result[outcome-123][packageName-123][packageVersion-123][packageSummary-123][message-123]' ); }); - test('it can return the host, message, outcome, packageName, pacakgeSummary, packageVersion, packageExecutable, processHashMd5', () => { + test('it can return the host, message, outcome, packageName, pacakgeSummary, packageVersion, processExecutable, processExitCode, processHashMd5', () => { const wrapper = mount(
    @@ -531,10 +558,13 @@ describe('SystemGenericFileDetails', () => { packageName="[packageName-123]" packageSummary="[packageSummary-123]" packageVersion="[packageVersion-123]" - processExecutable="[packageVersion-123]" + processExecutable="[processExecutable-123]" + processExitCode={-1} processHashMd5="[processHashMd5-123]" processHashSha1={null} processHashSha256={null} + processParentName={null} + processParentPid={null} processPid={null} processPpid={null} processName={null} @@ -552,11 +582,11 @@ describe('SystemGenericFileDetails', () => { ); expect(wrapper.text()).toEqual( - '[hostname-123][packageVersion-123]with result[outcome-123][packageName-123][packageVersion-123][packageSummary-123][processHashMd5-123][message-123]' + '[hostname-123][processExecutable-123]with exit code-1with result[outcome-123][packageName-123][packageVersion-123][packageSummary-123][processHashMd5-123][message-123]' ); }); - test('it can return the host, message, outcome, packageName, pacakgeSummary, packageVersion, packageExecutable, processHashMd5, processHashSha1', () => { + test('it can return the host, message, outcome, packageName, pacakgeSummary, packageVersion, processExecutable, processExitCode, processHashMd5, processHashSha1', () => { const wrapper = mount(
    @@ -578,10 +608,63 @@ describe('SystemGenericFileDetails', () => { packageName="[packageName-123]" packageSummary="[packageSummary-123]" packageVersion="[packageVersion-123]" - processExecutable="[packageVersion-123]" + processExecutable="[processExecutable-123]" + processExitCode={-1} processHashMd5="[processHashMd5-123]" processHashSha1="[processHashSha1-123]" processHashSha256={null} + processParentName={null} + processParentPid={null} + processPid={null} + processPpid={null} + processName={null} + showMessage={true} + sshMethod={null} + sshSignature={null} + text={null} + userDomain={null} + userName={null} + workingDirectory={null} + processTitle={null} + args={null} + /> +
    +     + ); + expect(wrapper.text()).toEqual( + '[hostname-123][processExecutable-123]with exit code-1with result[outcome-123][packageName-123][packageVersion-123][packageSummary-123][processHashSha1-123][processHashMd5-123][message-123]' + ); + }); + + test('it can return the host, message, outcome, packageName, pacakgeSummary, packageVersion, processExecutable, processExitCode, processHashMd5, processHashSha1, processHashSha256', () => { + const wrapper = mount( + +
    + { ); expect(wrapper.text()).toEqual( - '[hostname-123][packageVersion-123]with result[outcome-123][packageName-123][packageVersion-123][packageSummary-123][processHashSha1-123][processHashMd5-123][message-123]' + '[hostname-123][processExecutable-123]with exit code-1with result[outcome-123][packageName-123][packageVersion-123][packageSummary-123][processHashSha256-123][processHashSha1-123][processHashMd5-123][message-123]' ); }); - test('it can return the host, message, outcome, packageName, pacakgeSummary, packageVersion, packageExecutable, processHashMd5, processHashSha1, processHashSha256', () => { + test('it can return the host, message, outcome, packageName, pacakgeSummary, packageVersion, processExecutable, processExitCode, processHashMd5, processHashSha1, processHashSha256, processParentName', () => { const wrapper = mount(
    @@ -625,10 +708,13 @@ describe('SystemGenericFileDetails', () => { packageName="[packageName-123]" packageSummary="[packageSummary-123]" packageVersion="[packageVersion-123]" - processExecutable="[packageVersion-123]" + processExecutable="[processExecutable-123]" + processExitCode={-1} processHashMd5="[processHashMd5-123]" processHashSha1="[processHashSha1-123]" processHashSha256="[processHashSha256-123]" + processParentName="[processParentName-123]" + processParentPid={null} processPid={null} processPpid={null} processName={null} @@ -646,11 +732,11 @@ describe('SystemGenericFileDetails', () => { ); expect(wrapper.text()).toEqual( - '[hostname-123][packageVersion-123]with result[outcome-123][packageName-123][packageVersion-123][packageSummary-123][processHashSha256-123][processHashSha1-123][processHashMd5-123][message-123]' + '[hostname-123][processExecutable-123]with exit code-1via parent process[processParentName-123]with result[outcome-123][packageName-123][packageVersion-123][packageSummary-123][processHashSha256-123][processHashSha1-123][processHashMd5-123][message-123]' ); }); - test('it can return the host, message, outcome, packageName, pacakgeSummary, packageVersion, packageExecutable, processHashMd5, processHashSha1, processHashSha256, processPid', () => { + test('it can return the host, message, outcome, packageName, pacakgeSummary, packageVersion, processExecutable, processExitCode, processHashMd5, processHashSha1, processHashSha256, processParentName, processParentPid', () => { const wrapper = mount(
    @@ -673,9 +759,62 @@ describe('SystemGenericFileDetails', () => { packageSummary="[packageSummary-123]" packageVersion="[packageVersion-123]" processExecutable="[processExecutable-123]" + processExitCode={-1} processHashMd5="[processHashMd5-123]" processHashSha1="[processHashSha1-123]" processHashSha256="[processHashSha256-123]" + processParentName="[processParentName-123]" + processParentPid={789} + processPid={null} + processPpid={null} + processName={null} + showMessage={true} + sshMethod={null} + sshSignature={null} + text={null} + userDomain={null} + userName={null} + workingDirectory={null} + processTitle={null} + args={null} + /> +
    +     + ); + expect(wrapper.text()).toEqual( + '[hostname-123][processExecutable-123]with exit code-1via parent process[processParentName-123](789)with result[outcome-123][packageName-123][packageVersion-123][packageSummary-123][processHashSha256-123][processHashSha1-123][processHashMd5-123][message-123]' + ); + }); + + test('it can return the host, message, outcome, packageName, pacakgeSummary, packageVersion, processExecutable, processExitCode, processHashMd5, processHashSha1, processHashSha256, processParentName, processParentPid, processPid', () => { + const wrapper = mount( + +
    + { ); expect(wrapper.text()).toEqual( - '[hostname-123][processExecutable-123](123)with result[outcome-123][packageName-123][packageVersion-123][packageSummary-123][processHashSha256-123][processHashSha1-123][processHashMd5-123][message-123]' + '[hostname-123][processExecutable-123](123)with exit code-1via parent process[processParentName-123](789)with result[outcome-123][packageName-123][packageVersion-123][packageSummary-123][processHashSha256-123][processHashSha1-123][processHashMd5-123][message-123]' ); }); - test('it can return the host, message, outcome, packageName, pacakgeSummary, packageVersion, packageExecutable, processHashMd5, processHashSha1, processHashSha256, processPid, processPpid, processName', () => { + test('it can return the host, message, outcome, packageName, pacakgeSummary, packageVersion, processExecutable, processExitCode, processHashMd5, processHashSha1, processHashSha256, processParentName, processParentPid, processPid, processPpid, processName', () => { const wrapper = mount(
    @@ -719,10 +858,13 @@ describe('SystemGenericFileDetails', () => { packageName="[packageName-123]" packageSummary="[packageSummary-123]" packageVersion="[packageVersion-123]" - processExecutable="[packageVersion-123]" + processExecutable="[processExecutable-123]" + processExitCode={-1} processHashMd5="[processHashMd5-123]" processHashSha1="[processHashSha1-123]" processHashSha256="[processHashSha256-123]" + processParentName="[processParentName-123]" + processParentPid={789} processPid={123} processPpid={456} processName="[processName-123]" @@ -740,11 +882,11 @@ describe('SystemGenericFileDetails', () => { ); expect(wrapper.text()).toEqual( - '[hostname-123][processName-123](123)via parent process(456)with result[outcome-123][packageName-123][packageVersion-123][packageSummary-123][processHashSha256-123][processHashSha1-123][processHashMd5-123][message-123]' + '[hostname-123][processName-123](123)with exit code-1via parent process[processParentName-123](789)(456)with result[outcome-123][packageName-123][packageVersion-123][packageSummary-123][processHashSha256-123][processHashSha1-123][processHashMd5-123][message-123]' ); }); - test('it can return the endgameExitCode, endgameParentProcessName, eventAction, host, message, outcome, packageName, pacakgeSummary, packageVersion, packageExecutable, processHashMd5, processHashSha1, processHashSha256, processPid, processPpid, processName, sshMethod', () => { + test('it can return the endgameExitCode, endgameParentProcessName, eventAction, host, message, outcome, packageName, pacakgeSummary, packageVersion, processExecutable, processExitCode, processHashMd5, processHashSha1, processHashSha256, processParentName, processParentPid, processPid, processPpid, processName, sshMethod', () => { const wrapper = mount(
    @@ -766,10 +908,13 @@ describe('SystemGenericFileDetails', () => { packageName="[packageName-123]" packageSummary="[packageSummary-123]" packageVersion="[packageVersion-123]" - processExecutable="[packageVersion-123]" + processExecutable="[processExecutable-123]" + processExitCode={-1} processHashMd5="[processHashMd5-123]" processHashSha1="[processHashSha1-123]" processHashSha256="[processHashSha256-123]" + processParentName="[processParentName-123]" + processParentPid={789} processPid={123} processPpid={456} processName="[processName-123]" @@ -787,11 +932,11 @@ describe('SystemGenericFileDetails', () => { ); expect(wrapper.text()).toEqual( - '[hostname-123][processName-123](123)with exit code[endgameExitCode-123]via parent process[endgameParentProcessName-123](456)with result[outcome-123][sshMethod-123][packageName-123][packageVersion-123][packageSummary-123][processHashSha256-123][processHashSha1-123][processHashMd5-123][message-123]' + '[hostname-123][processName-123](123)with exit code-1[endgameExitCode-123]via parent process[processParentName-123][endgameParentProcessName-123](789)(456)with result[outcome-123][sshMethod-123][packageName-123][packageVersion-123][packageSummary-123][processHashSha256-123][processHashSha1-123][processHashMd5-123][message-123]' ); }); - test('it can return the endgameExitCode, endgameParentProcessName, eventAction, host, message, outcome, packageName, pacakgeSummary, packageVersion, packageExecutable, processHashMd5, processHashSha1, processHashSha256, processPid, processPpid, processName, sshMethod, sshSignature', () => { + test('it can return the endgameExitCode, endgameParentProcessName, eventAction, host, message, outcome, packageName, pacakgeSummary, packageVersion, processExecutable, processExitCode, processHashMd5, processHashSha1, processHashSha256, processParentName, processParentPid, processPid, processPpid, processName, sshMethod, sshSignature', () => { const wrapper = mount(
    @@ -813,10 +958,13 @@ describe('SystemGenericFileDetails', () => { packageName="[packageName-123]" packageSummary="[packageSummary-123]" packageVersion="[packageVersion-123]" - processExecutable="[packageVersion-123]" + processExecutable="[processExecutable-123]" + processExitCode={-1} processHashMd5="[processHashMd5-123]" processHashSha1="[processHashSha1-123]" processHashSha256="[processHashSha256-123]" + processParentName="[processParentName-123]" + processParentPid={789} processPid={123} processPpid={456} processName="[processName-123]" @@ -834,11 +982,11 @@ describe('SystemGenericFileDetails', () => { ); expect(wrapper.text()).toEqual( - '[hostname-123][processName-123](123)with exit code[endgameExitCode-123]via parent process[endgameParentProcessName-123](456)with result[outcome-123][sshSignature-123][sshMethod-123][packageName-123][packageVersion-123][packageSummary-123][processHashSha256-123][processHashSha1-123][processHashMd5-123][message-123]' + '[hostname-123][processName-123](123)with exit code-1[endgameExitCode-123]via parent process[processParentName-123][endgameParentProcessName-123](789)(456)with result[outcome-123][sshSignature-123][sshMethod-123][packageName-123][packageVersion-123][packageSummary-123][processHashSha256-123][processHashSha1-123][processHashMd5-123][message-123]' ); }); - test('it can return the endgameExitCode, endgameParentProcessName, eventAction, host, message, outcome, packageName, pacakgeSummary, packageVersion, packageExecutable, processHashMd5, processHashSha1, processHashSha256, processPid, processPpid, processName, sshMethod, sshSignature, text', () => { + test('it can return the endgameExitCode, endgameParentProcessName, eventAction, host, message, outcome, packageName, pacakgeSummary, packageVersion, processExecutable, processExitCode, processHashMd5, processHashSha1, processHashSha256, processParentName, processParentPid, processPid, processPpid, processName, sshMethod, sshSignature, text', () => { const wrapper = mount(
    @@ -860,10 +1008,13 @@ describe('SystemGenericFileDetails', () => { packageName="[packageName-123]" packageSummary="[packageSummary-123]" packageVersion="[packageVersion-123]" - processExecutable="[packageVersion-123]" + processExecutable="[processExecutable-123]" + processExitCode={-1} processHashMd5="[processHashMd5-123]" processHashSha1="[processHashSha1-123]" processHashSha256="[processHashSha256-123]" + processParentName="[processParentName-123]" + processParentPid={789} processPid={123} processPpid={456} processName="[processName-123]" @@ -881,11 +1032,11 @@ describe('SystemGenericFileDetails', () => { ); expect(wrapper.text()).toEqual( - '[hostname-123][text-123][processName-123](123)with exit code[endgameExitCode-123]via parent process[endgameParentProcessName-123](456)with result[outcome-123][sshSignature-123][sshMethod-123][packageName-123][packageVersion-123][packageSummary-123][processHashSha256-123][processHashSha1-123][processHashMd5-123][message-123]' + '[hostname-123][text-123][processName-123](123)with exit code-1[endgameExitCode-123]via parent process[processParentName-123][endgameParentProcessName-123](789)(456)with result[outcome-123][sshSignature-123][sshMethod-123][packageName-123][packageVersion-123][packageSummary-123][processHashSha256-123][processHashSha1-123][processHashMd5-123][message-123]' ); }); - test('it can return the endgameExitCode, endgameParentProcessName, eventAction, host, message, outcome, packageName, pacakgeSummary, packageVersion, packageExecutable, processHashMd5, processHashSha1, processHashSha256, processPid, processPpid, processName, sshMethod, sshSignature, text, userDomain', () => { + test('it can return the endgameExitCode, endgameParentProcessName, eventAction, host, message, outcome, packageName, pacakgeSummary, packageVersion, processExecutable, processExitCode, processHashMd5, processHashSha1, processHashSha256, processParentName, processParentPid, processPid, processPpid, processName, sshMethod, sshSignature, text, userDomain', () => { const wrapper = mount(
    @@ -907,10 +1058,13 @@ describe('SystemGenericFileDetails', () => { packageName="[packageName-123]" packageSummary="[packageSummary-123]" packageVersion="[packageVersion-123]" - processExecutable="[packageVersion-123]" + processExecutable="[processExecutable-123]" + processExitCode={-1} processHashMd5="[processHashMd5-123]" processHashSha1="[processHashSha1-123]" processHashSha256="[processHashSha256-123]" + processParentName="[processParentName-123]" + processParentPid={789} processPid={123} processPpid={456} processName="[processName-123]" @@ -928,11 +1082,11 @@ describe('SystemGenericFileDetails', () => { ); expect(wrapper.text()).toEqual( - '\\[userDomain-123][hostname-123][text-123][processName-123](123)with exit code[endgameExitCode-123]via parent process[endgameParentProcessName-123](456)with result[outcome-123][sshSignature-123][sshMethod-123][packageName-123][packageVersion-123][packageSummary-123][processHashSha256-123][processHashSha1-123][processHashMd5-123][message-123]' + '\\[userDomain-123][hostname-123][text-123][processName-123](123)with exit code-1[endgameExitCode-123]via parent process[processParentName-123][endgameParentProcessName-123](789)(456)with result[outcome-123][sshSignature-123][sshMethod-123][packageName-123][packageVersion-123][packageSummary-123][processHashSha256-123][processHashSha1-123][processHashMd5-123][message-123]' ); }); - test('it can return the endgameExitCode, endgameParentProcessName, eventAction, host, message, outcome, packageName, pacakgeSummary, packageVersion, packageExecutable, processHashMd5, processHashSha1, processHashSha256, processPid, processPpid, processName, sshMethod, sshSignature, text, userDomain, username', () => { + test('it can return the endgameExitCode, endgameParentProcessName, eventAction, host, message, outcome, packageName, pacakgeSummary, packageVersion, processExecutable, processExitCode, processHashMd5, processHashSha1, processHashSha256, processParentName, processParentPid, processPid, processPpid, processName, sshMethod, sshSignature, text, userDomain, username', () => { const wrapper = mount(
    @@ -954,10 +1108,13 @@ describe('SystemGenericFileDetails', () => { packageName="[packageName-123]" packageSummary="[packageSummary-123]" packageVersion="[packageVersion-123]" - processExecutable="[packageVersion-123]" + processExecutable="[processExecutable-123]" + processExitCode={-1} processHashMd5="[processHashMd5-123]" processHashSha1="[processHashSha1-123]" processHashSha256="[processHashSha256-123]" + processParentName="[processParentName-123]" + processParentPid={789} processPid={123} processPpid={456} processName="[processName-123]" @@ -975,11 +1132,11 @@ describe('SystemGenericFileDetails', () => { ); expect(wrapper.text()).toEqual( - '[username-123]\\[userDomain-123]@[hostname-123][text-123][processName-123](123)with exit code[endgameExitCode-123]via parent process[endgameParentProcessName-123](456)with result[outcome-123][sshSignature-123][sshMethod-123][packageName-123][packageVersion-123][packageSummary-123][processHashSha256-123][processHashSha1-123][processHashMd5-123][message-123]' + '[username-123]\\[userDomain-123]@[hostname-123][text-123][processName-123](123)with exit code-1[endgameExitCode-123]via parent process[processParentName-123][endgameParentProcessName-123](789)(456)with result[outcome-123][sshSignature-123][sshMethod-123][packageName-123][packageVersion-123][packageSummary-123][processHashSha256-123][processHashSha1-123][processHashMd5-123][message-123]' ); }); - test('it can return the endgameExitCode, endgameParentProcessName, eventAction, host, message, outcome, packageName, pacakgeSummary, packageVersion, packageExecutable, processHashMd5, processHashSha1, processHashSha256, processPid, processPpid, processName, sshMethod, sshSignature, text, userDomain, username, working-directory', () => { + test('it can return the endgameExitCode, endgameParentProcessName, eventAction, host, message, outcome, packageName, pacakgeSummary, packageVersion, processExecutable, processExitCode, processHashMd5, processHashSha1, processHashSha256, processParentName, processParentPid, processPid, processPpid, processName, sshMethod, sshSignature, text, userDomain, username, working-directory', () => { const wrapper = mount(
    @@ -1001,10 +1158,13 @@ describe('SystemGenericFileDetails', () => { packageName="[packageName-123]" packageSummary="[packageSummary-123]" packageVersion="[packageVersion-123]" - processExecutable="[packageVersion-123]" + processExecutable="[processExecutable-123]" + processExitCode={-1} processHashMd5="[processHashMd5-123]" processHashSha1="[processHashSha1-123]" processHashSha256="[processHashSha256-123]" + processParentName="[processParentName-123]" + processParentPid={789} processPid={123} processPpid={456} processName="[processName-123]" @@ -1022,11 +1182,11 @@ describe('SystemGenericFileDetails', () => { ); expect(wrapper.text()).toEqual( - '[username-123]\\[userDomain-123]@[hostname-123]in[working-directory-123][text-123][processName-123](123)with exit code[endgameExitCode-123]via parent process[endgameParentProcessName-123](456)with result[outcome-123][sshSignature-123][sshMethod-123][packageName-123][packageVersion-123][packageSummary-123][processHashSha256-123][processHashSha1-123][processHashMd5-123][message-123]' + '[username-123]\\[userDomain-123]@[hostname-123]in[working-directory-123][text-123][processName-123](123)with exit code-1[endgameExitCode-123]via parent process[processParentName-123][endgameParentProcessName-123](789)(456)with result[outcome-123][sshSignature-123][sshMethod-123][packageName-123][packageVersion-123][packageSummary-123][processHashSha256-123][processHashSha1-123][processHashMd5-123][message-123]' ); }); - test('it can return the endgameExitCode, endgameParentProcessName, eventAction, host, message, outcome, packageName, pacakgeSummary, packageVersion, packageExecutable, processHashMd5, processHashSha1, processHashSha256, processPid, processPpid, processName, sshMethod, sshSignature, text, userDomain, username, working-directory, process-title', () => { + test('it can return the endgameExitCode, endgameParentProcessName, eventAction, host, message, outcome, packageName, pacakgeSummary, packageVersion, processExecutable, processExitCode, processHashMd5, processHashSha1, processHashSha256, processParentName, processParentPid, processPid, processPpid, processName, sshMethod, sshSignature, text, userDomain, username, working-directory, process-title', () => { const wrapper = mount(
    @@ -1048,10 +1208,13 @@ describe('SystemGenericFileDetails', () => { packageName="[packageName-123]" packageSummary="[packageSummary-123]" packageVersion="[packageVersion-123]" - processExecutable="[packageVersion-123]" + processExecutable="[processExecutable-123]" + processExitCode={-1} processHashMd5="[processHashMd5-123]" processHashSha1="[processHashSha1-123]" processHashSha256="[processHashSha256-123]" + processParentName="[processParentName-123]" + processParentPid={789} processPid={123} processPpid={456} processName="[processName-123]" @@ -1069,11 +1232,11 @@ describe('SystemGenericFileDetails', () => { ); expect(wrapper.text()).toEqual( - '[username-123]\\[userDomain-123]@[hostname-123]in[working-directory-123][text-123][processName-123](123)[process-title-123]with exit code[endgameExitCode-123]via parent process[endgameParentProcessName-123](456)with result[outcome-123][sshSignature-123][sshMethod-123][packageName-123][packageVersion-123][packageSummary-123][processHashSha256-123][processHashSha1-123][processHashMd5-123][message-123]' + '[username-123]\\[userDomain-123]@[hostname-123]in[working-directory-123][text-123][processName-123](123)[process-title-123]with exit code-1[endgameExitCode-123]via parent process[processParentName-123][endgameParentProcessName-123](789)(456)with result[outcome-123][sshSignature-123][sshMethod-123][packageName-123][packageVersion-123][packageSummary-123][processHashSha256-123][processHashSha1-123][processHashMd5-123][message-123]' ); }); - test('it can return the endgameExitCode, endgameParentProcessName, eventAction, host, message, outcome, packageName, pacakgeSummary, packageVersion, packageExecutable, processHashMd5, processHashSha1, processHashSha256, processPid, processPpid, processName, sshMethod, sshSignature, text, userDomain, username, working-directory, process-title, args', () => { + test('it can return the endgameExitCode, endgameParentProcessName, eventAction, host, message, outcome, packageName, pacakgeSummary, packageVersion, processExecutable, processExitCode, processHashMd5, processHashSha1, processHashSha256, processParentName, processParentPid, processPid, processPpid, processName, sshMethod, sshSignature, text, userDomain, username, working-directory, process-title, args', () => { const wrapper = mount(
    @@ -1095,10 +1258,13 @@ describe('SystemGenericFileDetails', () => { packageName="[packageName-123]" packageSummary="[packageSummary-123]" packageVersion="[packageVersion-123]" - processExecutable="[packageVersion-123]" + processExecutable="[processExecutable-123]" + processExitCode={-1} processHashMd5="[processHashMd5-123]" processHashSha1="[processHashSha1-123]" processHashSha256="[processHashSha256-123]" + processParentName="[processParentName-123]" + processParentPid={789} processPid={123} processPpid={456} processName="[processName-123]" @@ -1116,7 +1282,7 @@ describe('SystemGenericFileDetails', () => { ); expect(wrapper.text()).toEqual( - '[username-123]\\[userDomain-123]@[hostname-123]in[working-directory-123][text-123][processName-123](123)[arg-1][arg-2][arg-3][process-title-123]with exit code[endgameExitCode-123]via parent process[endgameParentProcessName-123](456)with result[outcome-123][sshSignature-123][sshMethod-123][packageName-123][packageVersion-123][packageSummary-123][processHashSha256-123][processHashSha1-123][processHashMd5-123][message-123]' + '[username-123]\\[userDomain-123]@[hostname-123]in[working-directory-123][text-123][processName-123](123)[arg-1][arg-2][arg-3][process-title-123]with exit code-1[endgameExitCode-123]via parent process[processParentName-123][endgameParentProcessName-123](789)(456)with result[outcome-123][sshSignature-123][sshMethod-123][packageName-123][packageVersion-123][packageSummary-123][processHashSha256-123][processHashSha1-123][processHashMd5-123][message-123]' ); }); @@ -1143,9 +1309,12 @@ describe('SystemGenericFileDetails', () => { packageSummary={undefined} packageVersion={undefined} processExecutable={undefined} + processExitCode={undefined} processHashMd5={undefined} processHashSha1={undefined} processHashSha256={undefined} + processParentName={undefined} + processParentPid={undefined} processPid={undefined} processPpid={undefined} processName={undefined} @@ -1188,9 +1357,12 @@ describe('SystemGenericFileDetails', () => { packageSummary={undefined} packageVersion={undefined} processExecutable={undefined} + processExitCode={undefined} processHashMd5={undefined} processHashSha1={undefined} processHashSha256={undefined} + processParentName={undefined} + processParentPid={undefined} processPid={undefined} processPpid={undefined} processName={undefined} @@ -1235,9 +1407,12 @@ describe('SystemGenericFileDetails', () => { packageSummary={undefined} packageVersion={undefined} processExecutable={undefined} + processExitCode={undefined} processHashMd5={undefined} processHashSha1={undefined} processHashSha256={undefined} + processParentName={undefined} + processParentPid={undefined} processPid={undefined} processPpid={undefined} processName={undefined} @@ -1284,9 +1459,12 @@ describe('SystemGenericFileDetails', () => { packageSummary={undefined} packageVersion={undefined} processExecutable={undefined} + processExitCode={undefined} processHashMd5={undefined} processHashSha1={undefined} processHashSha256={undefined} + processParentName={undefined} + processParentPid={undefined} processPid={undefined} processPpid={undefined} processName={undefined} @@ -1332,9 +1510,12 @@ describe('SystemGenericFileDetails', () => { packageSummary={undefined} packageVersion={undefined} processExecutable={undefined} + processExitCode={undefined} processHashMd5={undefined} processHashSha1={undefined} processHashSha256={undefined} + processParentName={undefined} + processParentPid={undefined} processPid={undefined} processPpid={456} processName={undefined} @@ -1382,9 +1563,12 @@ describe('SystemGenericFileDetails', () => { packageSummary={undefined} packageVersion={undefined} processExecutable={undefined} + processExitCode={undefined} processHashMd5={undefined} processHashSha1={undefined} processHashSha256={undefined} + processParentName={undefined} + processParentPid={undefined} processPid={undefined} processPpid={456} processName={undefined} @@ -1430,9 +1614,12 @@ describe('SystemGenericFileDetails', () => { packageSummary={undefined} packageVersion={undefined} processExecutable={undefined} + processExitCode={undefined} processHashMd5={undefined} processHashSha1={undefined} processHashSha256={undefined} + processParentName={undefined} + processParentPid={undefined} processPid={undefined} processPpid={456} processName={undefined} @@ -1476,9 +1663,12 @@ describe('SystemGenericFileDetails', () => { packageSummary={undefined} packageVersion={undefined} processExecutable={undefined} + processExitCode={undefined} processHashMd5={undefined} processHashSha1={undefined} processHashSha256={undefined} + processParentName={undefined} + processParentPid={undefined} processPid={undefined} processPpid={undefined} processName={undefined} @@ -1522,9 +1712,12 @@ describe('SystemGenericFileDetails', () => { packageSummary={undefined} packageVersion={undefined} processExecutable={undefined} + processExitCode={undefined} processHashMd5={undefined} processHashSha1={undefined} processHashSha256={undefined} + processParentName={undefined} + processParentPid={undefined} processPid={undefined} processPpid={undefined} processName={undefined} @@ -1568,9 +1761,12 @@ describe('SystemGenericFileDetails', () => { packageSummary={undefined} packageVersion={undefined} processExecutable={undefined} + processExitCode={undefined} processHashMd5={undefined} processHashSha1={undefined} processHashSha256={undefined} + processParentName={undefined} + processParentPid={undefined} processPid={undefined} processPpid={undefined} processName={undefined} @@ -1614,9 +1810,12 @@ describe('SystemGenericFileDetails', () => { packageSummary={undefined} packageVersion={undefined} processExecutable={undefined} + processExitCode={undefined} processHashMd5={undefined} processHashSha1={undefined} processHashSha256={undefined} + processParentName={undefined} + processParentPid={undefined} processPid={123} processPpid={undefined} processName="[processName]" diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/system/generic_file_details.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/system/generic_file_details.tsx index e0e0743fb3043..4026613ff7d0a 100644 --- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/system/generic_file_details.tsx +++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/system/generic_file_details.tsx @@ -48,6 +48,9 @@ interface Props { packageSummary: string | null | undefined; packageVersion: string | null | undefined; processName: string | null | undefined; + processParentName: string | null | undefined; + processParentPid: number | null | undefined; + processExitCode: number | null | undefined; processPid: number | null | undefined; processPpid: number | null | undefined; processExecutable: string | null | undefined; @@ -82,6 +85,9 @@ export const SystemGenericFileLine = React.memo( message, outcome, packageName, + processParentName, + processParentPid, + processExitCode, packageSummary, packageVersion, processExecutable, @@ -142,6 +148,7 @@ export const SystemGenericFileLine = React.memo( contextId={contextId} endgameExitCode={endgameExitCode} eventId={id} + processExitCode={processExitCode} text={i18n.WITH_EXIT_CODE} /> {!isProcessStoppedOrTerminationEvent(eventAction) && ( @@ -149,6 +156,8 @@ export const SystemGenericFileLine = React.memo( contextId={contextId} endgameParentProcessName={endgameParentProcessName} eventId={id} + processParentName={processParentName} + processParentPid={processParentPid} processPpid={processPpid} text={i18n.VIA_PARENT_PROCESS} /> @@ -239,6 +248,9 @@ export const SystemGenericFileDetails = React.memo( const packageName: string | null | undefined = get('system.audit.package.name[0]', data); const packageSummary: string | null | undefined = get('system.audit.package.summary[0]', data); const packageVersion: string | null | undefined = get('system.audit.package.version[0]', data); + const processExitCode: number | null | undefined = get('process.exit_code[0]', data); + const processParentName: string | null | undefined = get('process.parent.name[0]', data); + const processParentPid: number | null | undefined = get('process.parent.pid[0]', data); const processHashMd5: string | null | undefined = get('process.hash.md5[0]', data); const processHashSha1: string | null | undefined = get('process.hash.sha1[0]', data); const processHashSha256: string | null | undefined = get('process.hash.sha256[0]', data); @@ -271,6 +283,9 @@ export const SystemGenericFileDetails = React.memo( userDomain={userDomain} userName={userName} message={message} + processExitCode={processExitCode} + processParentName={processParentName} + processParentPid={processParentPid} processTitle={processTitle} workingDirectory={workingDirectory} args={args} diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/system/generic_row_renderer.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/system/generic_row_renderer.test.tsx index 23c7770d1f25b..4de9bcbdd9c18 100644 --- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/system/generic_row_renderer.test.tsx +++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/system/generic_row_renderer.test.tsx @@ -36,6 +36,17 @@ import { mockEndgameTerminationEvent, mockEndgameUserLogoff, mockEndgameUserLogon, + mockEndpointDisconnectReceivedEvent, + mockEndpointFileCreationEvent, + mockEndpointFileDeletionEvent, + mockEndpointNetworkConnectionAcceptedEvent, + mockEndpointNetworkLookupRequestedEvent, + mockEndpointNetworkLookupResultEvent, + mockEndpointProcessStartEvent, + mockEndpointProcessEndEvent, + mockEndpointSecurityLogOnSuccessEvent, + mockEndpointSecurityLogOnFailureEvent, + mockEndpointSecurityLogOffEvent, } from '../../../../../../common/mock/mock_endgame_ecs_data'; import { useMountAppended } from '../../../../../../common/utils/use_mount_appended'; import { RowRenderer } from '../row_renderer'; @@ -187,6 +198,31 @@ describe('GenericRowRenderer', () => { }); describe('#createEndgameProcessRowRenderer', () => { + test('it renders an endpoint process start event', () => { + const actionName = 'start'; + const text = i18n.PROCESS_STARTED; + + const endpointProcessStartRowRenderer = createEndgameProcessRowRenderer({ + actionName, + text, + }); + + const wrapper = mount( + + {endpointProcessStartRowRenderer.isInstance(mockEndpointProcessStartEvent) && + endpointProcessStartRowRenderer.renderRow({ + browserFields: mockBrowserFields, + data: mockEndpointProcessStartEvent, + timelineId: 'test', + })} + + ); + + expect(wrapper.text()).toEqual( + 'SYSTEM\\NT AUTHORITY@win2019-endpoint-1started processconhost.exe(3636)C:\\Windows\\system32\\conhost.exe,0xffffffff,-ForceV1697334c236cce7d4c9e223146ee683a1219adced9729d4ae771fd6a1502a6b63e19da2c35ba1c38adf12d1a472c1fcf1f1a811a71b0e9b5fcb62de0787235ecca560b610' + ); + }); + test('it renders an endgame process creation_event', () => { const actionName = 'creation_event'; const text = i18n.PROCESS_STARTED; @@ -215,6 +251,31 @@ describe('GenericRowRenderer', () => { ); }); + test('it renders an endpoint process end event', () => { + const actionName = 'end'; + const text = i18n.TERMINATED_PROCESS; + + const endpointProcessEndRowRenderer = createEndgameProcessRowRenderer({ + actionName, + text, + }); + + const wrapper = mount( + + {endpointProcessEndRowRenderer.isInstance(mockEndpointProcessEndEvent) && + endpointProcessEndRowRenderer.renderRow({ + browserFields: mockBrowserFields, + data: mockEndpointProcessEndEvent, + timelineId: 'test', + })} + + ); + + expect(wrapper.text()).toEqual( + 'SYSTEM\\NT AUTHORITY@win2019-endpointterminated processsvchost.exe(10392)C:\\Windows\\System32\\svchost.exe,-k,netsvcs,-p,-s,NetSetupSvcwith exit code-1via parent processservices.exe7fd065bac18c5278777ae44908101cdfed72d26fa741367f0ad4d02020787ab6a1385ce20ad79f55df235effd9780c31442aa2348a0a29438052faed8a2532da50455756' + ); + }); + test('it renders an endgame process termination_event', () => { const actionName = 'termination_event'; const text = i18n.TERMINATED_PROCESS; @@ -331,6 +392,31 @@ describe('GenericRowRenderer', () => { }); describe('#createFimRowRenderer', () => { + test('it renders an endpoint file creation event', () => { + const actionName = 'creation'; + const text = i18n.CREATED_FILE; + + const endpointFileCreationRowRenderer = createFimRowRenderer({ + actionName, + text, + }); + + const wrapper = mount( + + {endpointFileCreationRowRenderer.isInstance(mockEndpointFileCreationEvent) && + endpointFileCreationRowRenderer.renderRow({ + browserFields: mockBrowserFields, + data: mockEndpointFileCreationEvent, + timelineId: 'test', + })} + + ); + + expect(wrapper.text()).toEqual( + 'SYSTEM\\NT AUTHORITY@win2019-endpointcreated a fileWimProvider.dllinC:\\Windows\\TEMP\\E38FD162-B6E6-4799-B52D-F590BACBAE94\\WimProvider.dllviaMsMpEng.exe(2424)' + ); + }); + test('it renders an endgame file_create_event', () => { const actionName = 'file_create_event'; const text = i18n.CREATED_FILE; @@ -359,6 +445,31 @@ describe('GenericRowRenderer', () => { ); }); + test('it renders an endpoint file deletion event', () => { + const actionName = 'deletion'; + const text = i18n.DELETED_FILE; + + const endpointFileDeletionRowRenderer = createFimRowRenderer({ + actionName, + text, + }); + + const wrapper = mount( + + {endpointFileDeletionRowRenderer.isInstance(mockEndpointFileDeletionEvent) && + endpointFileDeletionRowRenderer.renderRow({ + browserFields: mockBrowserFields, + data: mockEndpointFileDeletionEvent, + timelineId: 'test', + })} + + ); + + expect(wrapper.text()).toEqual( + 'SYSTEM\\NT AUTHORITY@windows-endpoint-1deleted a fileAM_Delta_Patch_1.329.2793.0.exeinC:\\Windows\\SoftwareDistribution\\Download\\Install\\AM_Delta_Patch_1.329.2793.0.exeviasvchost.exe(1728)' + ); + }); + test('it renders an endgame file_delete_event', () => { const actionName = 'file_delete_event'; const text = i18n.DELETED_FILE; @@ -529,6 +640,33 @@ describe('GenericRowRenderer', () => { }); describe('#createSocketRowRenderer', () => { + test('it renders an Endpoint network connection_accepted event', () => { + const actionName = 'connection_accepted'; + const text = i18n.ACCEPTED_A_CONNECTION_VIA; + + const endpointConnectionAcceptedRowRenderer = createSocketRowRenderer({ + actionName, + text, + }); + + const wrapper = mount( + + {endpointConnectionAcceptedRowRenderer.isInstance( + mockEndpointNetworkConnectionAcceptedEvent + ) && + endpointConnectionAcceptedRowRenderer.renderRow({ + browserFields: mockBrowserFields, + data: mockEndpointNetworkConnectionAcceptedEvent, + timelineId: 'test', + })} + + ); + + expect(removeExternalLinkText(wrapper.text())).toEqual( + 'NETWORK SERVICE\\NT AUTHORITY@windows-endpoint-1accepted a connection viasvchost.exe(328)with resultsuccessEndpoint network eventincomingtcpSource10.1.2.3:64557North AmericaUnited States🇺🇸USNorth CarolinaConcordDestination10.50.60.70:3389' + ); + }); + test('it renders an Endgame ipv4_connection_accept_event', () => { const actionName = 'ipv4_connection_accept_event'; const text = i18n.ACCEPTED_A_CONNECTION_VIA; @@ -585,6 +723,31 @@ describe('GenericRowRenderer', () => { ); }); + test('it renders an endpoint network disconnect_received event', () => { + const actionName = 'disconnect_received'; + const text = i18n.DISCONNECTED_VIA; + + const endpointDisconnectReceivedRowRenderer = createSocketRowRenderer({ + actionName, + text, + }); + + const wrapper = mount( + + {endpointDisconnectReceivedRowRenderer.isInstance(mockEndpointDisconnectReceivedEvent) && + endpointDisconnectReceivedRowRenderer.renderRow({ + browserFields: mockBrowserFields, + data: mockEndpointDisconnectReceivedEvent, + timelineId: 'test', + })} + + ); + + expect(removeExternalLinkText(wrapper.text())).toEqual( + 'NETWORK SERVICE\\NT AUTHORITY@windows-endpoint-1disconnected viasvchost.exe(328)Endpoint network eventincomingtcpSource10.20.30.40:64557North AmericaUnited States🇺🇸USNorth CarolinaConcord(42.47%)1.2KB(57.53%)1.6KBDestination10.11.12.13:3389' + ); + }); + test('it renders an Endgame ipv4_disconnect_received_event', () => { const actionName = 'ipv4_disconnect_received_event'; const text = i18n.DISCONNECTED_VIA; @@ -725,6 +888,48 @@ describe('GenericRowRenderer', () => { }); describe('#createSecurityEventRowRenderer', () => { + test('it renders an endpoint security log_on event with event.outcome: success', () => { + const actionName = 'log_on'; + + const securityLogOnRowRenderer = createSecurityEventRowRenderer({ actionName }); + + const wrapper = mount( + + {securityLogOnRowRenderer.isInstance(mockEndpointSecurityLogOnSuccessEvent) && + securityLogOnRowRenderer.renderRow({ + browserFields: mockBrowserFields, + data: mockEndpointSecurityLogOnSuccessEvent, + timelineId: 'test', + })} + + ); + + expect(wrapper.text()).toEqual( + 'SYSTEM\\NT AUTHORITY@win2019-endpointsuccessfully logged inviaC:\\Program Files\\OpenSSH-Win64\\sshd.exe(90210)' + ); + }); + + test('it renders an endpoint security log_on event with event.outcome: failure', () => { + const actionName = 'log_on'; + + const securityLogOnRowRenderer = createSecurityEventRowRenderer({ actionName }); + + const wrapper = mount( + + {securityLogOnRowRenderer.isInstance(mockEndpointSecurityLogOnFailureEvent) && + securityLogOnRowRenderer.renderRow({ + browserFields: mockBrowserFields, + data: mockEndpointSecurityLogOnFailureEvent, + timelineId: 'test', + })} + + ); + + expect(wrapper.text()).toEqual( + 'win2019-endpointfailed to log inviaC:\\Program Files\\OpenSSH-Win64\\sshd.exe(90210)' + ); + }); + test('it renders an Endgame user_logon event', () => { const actionName = 'user_logon'; const userLogonEvent = { @@ -797,6 +1002,27 @@ describe('GenericRowRenderer', () => { ); }); + test('it renders an endpoint security log_off event', () => { + const actionName = 'log_off'; + + const securityLogOffRowRenderer = createSecurityEventRowRenderer({ actionName }); + + const wrapper = mount( + + {securityLogOffRowRenderer.isInstance(mockEndpointSecurityLogOffEvent) && + securityLogOffRowRenderer.renderRow({ + browserFields: mockBrowserFields, + data: mockEndpointSecurityLogOffEvent, + timelineId: 'test', + })} + + ); + + expect(wrapper.text()).toEqual( + 'SYSTEM\\NT AUTHORITY@win2019-endpointlogged offviaC:\\Windows\\System32\\lsass.exe(90210)' + ); + }); + test('it renders an Endgame user_logoff event', () => { const actionName = 'user_logoff'; const userLogoffEvent = { @@ -845,6 +1071,44 @@ describe('GenericRowRenderer', () => { }); describe('#createDnsRowRenderer', () => { + test('it renders an endpoint network lookup_requested event', () => { + const dnsRowRenderer = createDnsRowRenderer(); + + const wrapper = mount( + + {dnsRowRenderer.isInstance(mockEndpointNetworkLookupRequestedEvent) && + dnsRowRenderer.renderRow({ + browserFields: mockBrowserFields, + data: mockEndpointNetworkLookupRequestedEvent, + timelineId: 'test', + })} + + ); + + expect(wrapper.text()).toEqual( + 'SYSTEM\\NT AUTHORITY@win2019-endpointasked forlogging.googleapis.comwith question typeAviagoogle_osconfig_agent.exe(3272)dns' + ); + }); + + test('it renders an endpoint network lookup_result event', () => { + const dnsRowRenderer = createDnsRowRenderer(); + + const wrapper = mount( + + {dnsRowRenderer.isInstance(mockEndpointNetworkLookupResultEvent) && + dnsRowRenderer.renderRow({ + browserFields: mockBrowserFields, + data: mockEndpointNetworkLookupResultEvent, + timelineId: 'test', + })} + + ); + + expect(wrapper.text()).toEqual( + 'SYSTEM\\NT AUTHORITY@win2019-endpointasked forlogging.googleapis.comwith question typeAAAAviagoogle_osconfig_agent.exe(3272)dns' + ); + }); + test('it renders an Endgame DNS request_event', () => { const requestEvent = { ...mockEndgameDnsRequest, diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/system/generic_row_renderer.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/system/generic_row_renderer.tsx index 431fc2592c8d1..69a6317ebcd11 100644 --- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/system/generic_row_renderer.tsx +++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/system/generic_row_renderer.tsx @@ -63,11 +63,11 @@ export const createEndgameProcessRowRenderer = ({ isInstance: (ecs) => { const action: string | null | undefined = get('event.action[0]', ecs); const category: string | null | undefined = get('event.category[0]', ecs); + const dataset: string | null | undefined = get('event.dataset[0]', ecs); return ( - category != null && - category.toLowerCase() === 'process' && - action != null && - action.toLowerCase() === actionName + (category?.toLowerCase() === 'process' || + dataset?.toLowerCase() === 'endpoint.events.process') && + action?.toLowerCase() === actionName ); }, renderRow: ({ browserFields, data, timelineId }) => ( @@ -98,8 +98,7 @@ export const createFimRowRenderer = ({ const dataset: string | null | undefined = get('event.dataset[0]', ecs); return ( isFileEvent({ eventCategory: category, eventDataset: dataset }) && - action != null && - action.toLowerCase() === actionName + action?.toLowerCase() === actionName ); }, renderRow: ({ browserFields, data, timelineId }) => ( @@ -181,11 +180,11 @@ export const createSecurityEventRowRenderer = ({ isInstance: (ecs) => { const category: string | null | undefined = get('event.category[0]', ecs); const action: string | null | undefined = get('event.action[0]', ecs); + const dataset: string | null | undefined = get('event.dataset[0]', ecs); return ( - category != null && - category.toLowerCase() === 'authentication' && - action != null && - action.toLowerCase() === actionName + (category?.toLowerCase() === 'authentication' || + dataset?.toLowerCase() === 'endpoint.events.security') && + action?.toLowerCase() === actionName ); }, renderRow: ({ browserFields, data, timelineId }) => ( @@ -234,6 +233,11 @@ const endgameProcessStartedRowRenderer = createEndgameProcessRowRenderer({ text: i18n.PROCESS_STARTED, }); +const endpointProcessStartRowRenderer = createEndgameProcessRowRenderer({ + actionName: 'start', + text: i18n.PROCESS_STARTED, +}); + const systemProcessStoppedRowRenderer = createGenericFileRowRenderer({ actionName: 'process_stopped', text: i18n.PROCESS_STOPPED, @@ -244,11 +248,21 @@ const endgameProcessTerminationRowRenderer = createEndgameProcessRowRenderer({ text: i18n.TERMINATED_PROCESS, }); +const endpointProcessEndRowRenderer = createEndgameProcessRowRenderer({ + actionName: 'end', + text: i18n.TERMINATED_PROCESS, +}); + const endgameFileCreateEventRowRenderer = createFimRowRenderer({ actionName: 'file_create_event', text: i18n.CREATED_FILE, }); +const endpointFileCreationEventRowRenderer = createFimRowRenderer({ + actionName: 'creation', + text: i18n.CREATED_FILE, +}); + const fimFileCreateEventRowRenderer = createFimRowRenderer({ actionName: 'created', text: i18n.CREATED_FILE, @@ -259,6 +273,11 @@ const endgameFileDeleteEventRowRenderer = createFimRowRenderer({ text: i18n.DELETED_FILE, }); +const endpointFileDeletionEventRowRenderer = createFimRowRenderer({ + actionName: 'deletion', + text: i18n.DELETED_FILE, +}); + const fimFileDeletedEventRowRenderer = createFimRowRenderer({ actionName: 'deleted', text: i18n.DELETED_FILE, @@ -284,6 +303,11 @@ const endgameIpv4ConnectionAcceptEventRowRenderer = createSocketRowRenderer({ text: i18n.ACCEPTED_A_CONNECTION_VIA, }); +const endpointConnectionAcceptedEventRowRenderer = createSocketRowRenderer({ + actionName: 'connection_accepted', + text: i18n.ACCEPTED_A_CONNECTION_VIA, +}); + const endgameIpv6ConnectionAcceptEventRowRenderer = createSocketRowRenderer({ actionName: 'ipv6_connection_accept_event', text: i18n.ACCEPTED_A_CONNECTION_VIA, @@ -294,6 +318,11 @@ const endgameIpv4DisconnectReceivedEventRowRenderer = createSocketRowRenderer({ text: i18n.DISCONNECTED_VIA, }); +const endpointDisconnectReceivedEventRowRenderer = createSocketRowRenderer({ + actionName: 'disconnect_received', + text: i18n.DISCONNECTED_VIA, +}); + const endgameIpv6DisconnectReceivedEventRowRenderer = createSocketRowRenderer({ actionName: 'ipv6_disconnect_received_event', text: i18n.DISCONNECTED_VIA, @@ -315,6 +344,10 @@ const endgameUserLogonRowRenderer = createSecurityEventRowRenderer({ actionName: 'user_logon', }); +const endpointUserLogOnRowRenderer = createSecurityEventRowRenderer({ + actionName: 'log_on', +}); + const dnsRowRenderer = createDnsRowRenderer(); const systemExistingUserRowRenderer = createGenericSystemRowRenderer({ @@ -357,6 +390,10 @@ const systemLogoutRowRenderer = createGenericSystemRowRenderer({ text: i18n.LOGGED_OUT, }); +const endpointUserLogOffRowRenderer = createSecurityEventRowRenderer({ + actionName: 'log_off', +}); + const systemProcessErrorRowRenderer = createGenericFileRowRenderer({ actionName: 'process_error', text: i18n.PROCESS_ERROR, @@ -408,15 +445,22 @@ export const systemRowRenderers: RowRenderer[] = [ endgameAdminLogonRowRenderer, endgameExplicitUserLogonRowRenderer, endgameFileCreateEventRowRenderer, + endpointFileCreationEventRowRenderer, endgameFileDeleteEventRowRenderer, + endpointFileDeletionEventRowRenderer, endgameIpv4ConnectionAcceptEventRowRenderer, + endpointConnectionAcceptedEventRowRenderer, endgameIpv6ConnectionAcceptEventRowRenderer, endgameIpv4DisconnectReceivedEventRowRenderer, + endpointDisconnectReceivedEventRowRenderer, endgameIpv6DisconnectReceivedEventRowRenderer, endgameProcessStartedRowRenderer, + endpointProcessStartRowRenderer, endgameProcessTerminationRowRenderer, + endpointProcessEndRowRenderer, endgameUserLogoffRowRenderer, endgameUserLogonRowRenderer, + endpointUserLogOnRowRenderer, fimFileCreateEventRowRenderer, fimFileDeletedEventRowRenderer, systemAcceptedRowRenderer, @@ -431,6 +475,7 @@ export const systemRowRenderers: RowRenderer[] = [ systemInvalidRowRenderer, systemLoginRowRenderer, systemLogoutRowRenderer, + endpointUserLogOffRowRenderer, systemPackageInstalledRowRenderer, systemPackageUpdatedRowRenderer, systemPackageRemovedRowRenderer, diff --git a/x-pack/plugins/security_solution/server/search_strategy/timeline/factory/events/all/constants.ts b/x-pack/plugins/security_solution/server/search_strategy/timeline/factory/events/all/constants.ts index 649a36d01d47d..5e9391df5b8a4 100644 --- a/x-pack/plugins/security_solution/server/search_strategy/timeline/factory/events/all/constants.ts +++ b/x-pack/plugins/security_solution/server/search_strategy/timeline/factory/events/all/constants.ts @@ -162,9 +162,12 @@ export const TIMELINE_EVENTS_FIELDS = [ 'tls.server_certificate.fingerprint.sha1', 'user.domain', 'winlog.event_id', + 'process.exit_code', 'process.hash.md5', 'process.hash.sha1', 'process.hash.sha256', + 'process.parent.name', + 'process.parent.pid', 'process.pid', 'process.name', 'process.ppid', From 83e866d62d68101487dd4aec97f871ed138dea9b Mon Sep 17 00:00:00 2001 From: Brian Seeders Date: Fri, 5 Feb 2021 14:17:22 -0500 Subject: [PATCH 58/69] skip flaky suite (#90135) --- x-pack/test/api_integration/apis/security_solution/users.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/x-pack/test/api_integration/apis/security_solution/users.ts b/x-pack/test/api_integration/apis/security_solution/users.ts index 178bb3810b087..45e06ab72adbb 100644 --- a/x-pack/test/api_integration/apis/security_solution/users.ts +++ b/x-pack/test/api_integration/apis/security_solution/users.ts @@ -22,7 +22,8 @@ const IP = '0.0.0.0'; export default function ({ getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const supertest = getService('supertest'); - describe('Users', () => { + // Failing: See https://github.com/elastic/kibana/issues/90135 + describe.skip('Users', () => { describe('With auditbeat', () => { before(() => esArchiver.load('auditbeat/default')); after(() => esArchiver.unload('auditbeat/default')); From eff9d4381f320d5f472476a5afbce8cf78531d59 Mon Sep 17 00:00:00 2001 From: Quynh Nguyen <43350163+qn895@users.noreply.github.com> Date: Fri, 5 Feb 2021 13:48:14 -0600 Subject: [PATCH 59/69] [ML] Fix incorrect behaviors for Anomaly Detection jobs when resetting or converting to advanced job (#90078) --- .../jobs/jobs_list/components/utils.js | 9 ++++++--- .../common/job_creator/util/general.ts | 19 ++++++++----------- .../jobs/new_job/pages/new_job/page.tsx | 7 ++++++- .../application/services/job_service.d.ts | 8 ++++---- 4 files changed, 24 insertions(+), 19 deletions(-) diff --git a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/utils.js b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/utils.js index 2b88a9cbcaaf5..98d8b5eaf912a 100644 --- a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/utils.js +++ b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/utils.js @@ -373,11 +373,14 @@ export function filterJobs(jobs, clauses) { // start datafeed modal. export function checkForAutoStartDatafeed() { const job = mlJobService.tempJobCloningObjects.job; + const datafeed = mlJobService.tempJobCloningObjects.datafeed; if (job !== undefined) { mlJobService.tempJobCloningObjects.job = undefined; - const hasDatafeed = - typeof job.datafeed_config === 'object' && Object.keys(job.datafeed_config).length > 0; - const datafeedId = hasDatafeed ? job.datafeed_config.datafeed_id : ''; + mlJobService.tempJobCloningObjects.datafeed = undefined; + mlJobService.tempJobCloningObjects.createdBy = undefined; + + const hasDatafeed = typeof datafeed === 'object' && Object.keys(datafeed).length > 0; + const datafeedId = hasDatafeed ? datafeed.datafeed_id : ''; return { id: job.job_id, hasDatafeed, diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/util/general.ts b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/util/general.ts index d24b1cbf22de3..9ae8585933ca8 100644 --- a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/util/general.ts +++ b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/util/general.ts @@ -229,17 +229,14 @@ export function isSparseDataJob(job: Job, datafeed: Datafeed): boolean { return false; } -function stashCombinedJob( +function stashJobForCloning( jobCreator: JobCreatorType, skipTimeRangeStep: boolean = false, includeTimeRange: boolean = false ) { - const combinedJob = { - ...jobCreator.jobConfig, - datafeed_config: jobCreator.datafeedConfig, - }; - - mlJobService.tempJobCloningObjects.job = combinedJob; + mlJobService.tempJobCloningObjects.job = jobCreator.jobConfig; + mlJobService.tempJobCloningObjects.datafeed = jobCreator.datafeedConfig; + mlJobService.tempJobCloningObjects.createdBy = jobCreator.createdBy ?? undefined; // skip over the time picker step of the wizard mlJobService.tempJobCloningObjects.skipTimeRangeStep = skipTimeRangeStep; @@ -259,21 +256,21 @@ export function convertToMultiMetricJob( ) { jobCreator.createdBy = CREATED_BY_LABEL.MULTI_METRIC; jobCreator.modelPlot = false; - stashCombinedJob(jobCreator, true, true); + stashJobForCloning(jobCreator, true, true); navigateToPath(`jobs/new_job/${JOB_TYPE.MULTI_METRIC}`, true); } export function convertToAdvancedJob(jobCreator: JobCreatorType, navigateToPath: NavigateToPath) { jobCreator.createdBy = null; - stashCombinedJob(jobCreator, true, true); + stashJobForCloning(jobCreator, true, true); navigateToPath(`jobs/new_job/${JOB_TYPE.ADVANCED}`, true); } export function resetJob(jobCreator: JobCreatorType, navigateToPath: NavigateToPath) { jobCreator.jobId = ''; - stashCombinedJob(jobCreator, true, true); + stashJobForCloning(jobCreator, true, true); navigateToPath('/jobs/new_job'); } @@ -282,7 +279,7 @@ export function advancedStartDatafeed( navigateToPath: NavigateToPath ) { if (jobCreator !== null) { - stashCombinedJob(jobCreator, false, false); + stashJobForCloning(jobCreator, false, false); } navigateToPath('/jobs'); } diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/pages/new_job/page.tsx b/x-pack/plugins/ml/public/application/jobs/new_job/pages/new_job/page.tsx index 7b9d79a2cfb2f..c8dbb90804444 100644 --- a/x-pack/plugins/ml/public/application/jobs/new_job/pages/new_job/page.tsx +++ b/x-pack/plugins/ml/public/application/jobs/new_job/pages/new_job/page.tsx @@ -72,7 +72,10 @@ export const Page: FC = ({ existingJobsAndGroups, jobType }) => { let autoSetTimeRange = false; - if (mlJobService.tempJobCloningObjects.job !== undefined) { + if ( + mlJobService.tempJobCloningObjects.job !== undefined && + mlJobService.tempJobCloningObjects.datafeed !== undefined + ) { // cloning a job const clonedJob = mlJobService.tempJobCloningObjects.job; const clonedDatafeed = mlJobService.cloneDatafeed(mlJobService.tempJobCloningObjects.datafeed); @@ -89,6 +92,8 @@ export const Page: FC = ({ existingJobsAndGroups, jobType }) => { mlJobService.tempJobCloningObjects.skipTimeRangeStep = false; mlJobService.tempJobCloningObjects.job = undefined; + mlJobService.tempJobCloningObjects.datafeed = undefined; + mlJobService.tempJobCloningObjects.createdBy = undefined; if ( mlJobService.tempJobCloningObjects.start !== undefined && diff --git a/x-pack/plugins/ml/public/application/services/job_service.d.ts b/x-pack/plugins/ml/public/application/services/job_service.d.ts index b954f1d344b45..544d346341591 100644 --- a/x-pack/plugins/ml/public/application/services/job_service.d.ts +++ b/x-pack/plugins/ml/public/application/services/job_service.d.ts @@ -7,7 +7,7 @@ import { SearchResponse } from 'elasticsearch'; import { TimeRange } from 'src/plugins/data/common/query/timefilter/types'; -import { CombinedJob, Datafeed } from '../../../common/types/anomaly_detection_jobs'; +import { CombinedJob, Datafeed, Job } from '../../../common/types/anomaly_detection_jobs'; import { Calendar } from '../../../common/types/calendars'; export interface ExistingJobsAndGroups { @@ -21,15 +21,15 @@ declare interface JobService { tempJobCloningObjects: { createdBy?: string; datafeed?: Datafeed; - job: any; + job?: Job; skipTimeRangeStep: boolean; start?: number; end?: number; calendars: Calendar[] | undefined; }; skipTimeRangeStep: boolean; - saveNewJob(job: any): Promise; - cloneDatafeed(datafeed: any): Datafeed; + saveNewJob(job: Job): Promise; + cloneDatafeed(Datafeed: Datafeed): Datafeed; openJob(jobId: string): Promise; saveNewDatafeed(datafeedConfig: any, jobId: string): Promise; startDatafeed( From a7b46a975d2a9bac7fe2ed40f9af18972e6e2784 Mon Sep 17 00:00:00 2001 From: Constance Date: Fri, 5 Feb 2021 12:26:19 -0800 Subject: [PATCH 60/69] Update eslint-plugin-import to latest (#90483) -to grab fixes, case-sensitivity, etc. --- package.json | 2 +- yarn.lock | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 52 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index fc5cd02a03253..4afe7a579ad45 100644 --- a/package.json +++ b/package.json @@ -636,7 +636,7 @@ "eslint-plugin-ban": "^1.4.0", "eslint-plugin-cypress": "^2.11.2", "eslint-plugin-eslint-comments": "^3.2.0", - "eslint-plugin-import": "^2.19.1", + "eslint-plugin-import": "^2.22.1", "eslint-plugin-jest": "^24.0.2", "eslint-plugin-jsx-a11y": "^6.2.3", "eslint-plugin-mocha": "^6.2.2", diff --git a/yarn.lock b/yarn.lock index 24fe6463fa41c..e4f5fc2e1a8e1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5968,6 +5968,11 @@ resolved "https://registry.yarnpkg.com/@types/json-stable-stringify/-/json-stable-stringify-1.0.32.tgz#121f6917c4389db3923640b2e68de5fa64dda88e" integrity sha512-q9Q6+eUEGwQkv4Sbst3J4PNgDOvpuVuKj79Hl/qnmBMEIPzB5QoFRUtjcgcg2xNUZyYUGXBk5wYIBKHt0A+Mxw== +"@types/json5@^0.0.29": + version "0.0.29" + resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee" + integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4= + "@types/json5@^0.0.30": version "0.0.30" resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.30.tgz#44cb52f32a809734ca562e685c6473b5754a7818" @@ -13614,6 +13619,14 @@ eslint-import-resolver-node@0.3.2, eslint-import-resolver-node@^0.3.2: debug "^2.6.9" resolve "^1.5.0" +eslint-import-resolver-node@^0.3.4: + version "0.3.4" + resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz#85ffa81942c25012d8231096ddf679c03042c717" + integrity sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA== + dependencies: + debug "^2.6.9" + resolve "^1.13.1" + eslint-import-resolver-webpack@0.11.1: version "0.11.1" resolved "https://registry.yarnpkg.com/eslint-import-resolver-webpack/-/eslint-import-resolver-webpack-0.11.1.tgz#fcf1fd57a775f51e18f442915f85dd6ba45d2f26" @@ -13638,6 +13651,14 @@ eslint-module-utils@2.5.0, eslint-module-utils@^2.4.1: debug "^2.6.9" pkg-dir "^2.0.0" +eslint-module-utils@^2.6.0: + version "2.6.0" + resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz#579ebd094f56af7797d19c9866c9c9486629bfa6" + integrity sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA== + dependencies: + debug "^2.6.9" + pkg-dir "^2.0.0" + eslint-plugin-babel@^5.3.1: version "5.3.1" resolved "https://registry.yarnpkg.com/eslint-plugin-babel/-/eslint-plugin-babel-5.3.1.tgz#75a2413ffbf17e7be57458301c60291f2cfbf560" @@ -13693,6 +13714,25 @@ eslint-plugin-import@^2.19.1: read-pkg-up "^2.0.0" resolve "^1.12.0" +eslint-plugin-import@^2.22.1: + version "2.22.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz#0896c7e6a0cf44109a2d97b95903c2bb689d7702" + integrity sha512-8K7JjINHOpH64ozkAhpT3sd+FswIZTfMZTjdx052pnWrgRCVfp8op9tbjpAk3DdUeI/Ba4C8OjdC0r90erHEOw== + dependencies: + array-includes "^3.1.1" + array.prototype.flat "^1.2.3" + contains-path "^0.1.0" + debug "^2.6.9" + doctrine "1.5.0" + eslint-import-resolver-node "^0.3.4" + eslint-module-utils "^2.6.0" + has "^1.0.3" + minimatch "^3.0.4" + object.values "^1.1.1" + read-pkg-up "^2.0.0" + resolve "^1.17.0" + tsconfig-paths "^3.9.0" + eslint-plugin-jest@^24.0.2: version "24.0.2" resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-24.0.2.tgz#4bf0fcdc86289d702a7dacb430b4363482af773b" @@ -25534,7 +25574,7 @@ resolve@1.8.1: dependencies: path-parse "^1.0.5" -resolve@^1.1.10, resolve@^1.1.4, resolve@^1.1.5, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.12.0, resolve@^1.17.0, resolve@^1.18.1, resolve@^1.3.2, resolve@^1.3.3, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.7.1, resolve@^1.8.1: +resolve@^1.1.10, resolve@^1.1.4, resolve@^1.1.5, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.17.0, resolve@^1.18.1, resolve@^1.3.2, resolve@^1.3.3, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.7.1, resolve@^1.8.1: version "1.19.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz#1af5bf630409734a067cae29318aac7fa29a267c" integrity sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg== @@ -28427,6 +28467,16 @@ ts-pnp@^1.1.6: resolved "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.2.0.tgz#a500ad084b0798f1c3071af391e65912c86bca92" integrity sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw== +tsconfig-paths@^3.9.0: + version "3.9.0" + resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz#098547a6c4448807e8fcb8eae081064ee9a3c90b" + integrity sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw== + dependencies: + "@types/json5" "^0.0.29" + json5 "^1.0.1" + minimist "^1.2.0" + strip-bom "^3.0.0" + tsd@^0.13.1: version "0.13.1" resolved "https://registry.yarnpkg.com/tsd/-/tsd-0.13.1.tgz#d2a8baa80b8319dafea37fbeb29fef3cec86e92b" From fc516bacbd367baea0b06447c3710f693ebab06d Mon Sep 17 00:00:00 2001 From: Steph Milovic Date: Fri, 5 Feb 2021 14:13:51 -0700 Subject: [PATCH 61/69] [index patterns] Add pattern validation method to index patterns fetcher (#90170) --- ...lugins-data-server.indexpatternsfetcher.md | 1 + ...tternsfetcher.validatepatternlistactive.md | 24 ++++ .../fetcher/index_patterns_fetcher.test.ts | 72 ++++++++++++ .../fetcher/index_patterns_fetcher.ts | 40 ++++++- src/plugins/data/server/server.api.md | 1 + .../fields_for_wildcard_route/response.js | 110 ++++++++++-------- 6 files changed, 197 insertions(+), 51 deletions(-) create mode 100644 docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpatternsfetcher.validatepatternlistactive.md create mode 100644 src/plugins/data/server/index_patterns/fetcher/index_patterns_fetcher.test.ts diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpatternsfetcher.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpatternsfetcher.md index 3ba3c862bf16a..608d738676bcf 100644 --- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpatternsfetcher.md +++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpatternsfetcher.md @@ -22,4 +22,5 @@ export declare class IndexPatternsFetcher | --- | --- | --- | | [getFieldsForTimePattern(options)](./kibana-plugin-plugins-data-server.indexpatternsfetcher.getfieldsfortimepattern.md) | | Get a list of field objects for a time pattern | | [getFieldsForWildcard(options)](./kibana-plugin-plugins-data-server.indexpatternsfetcher.getfieldsforwildcard.md) | | Get a list of field objects for an index pattern that may contain wildcards | +| [validatePatternListActive(patternList)](./kibana-plugin-plugins-data-server.indexpatternsfetcher.validatepatternlistactive.md) | | Returns an index pattern list of only those index pattern strings in the given list that return indices | diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpatternsfetcher.validatepatternlistactive.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpatternsfetcher.validatepatternlistactive.md new file mode 100644 index 0000000000000..8944c41204323 --- /dev/null +++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpatternsfetcher.validatepatternlistactive.md @@ -0,0 +1,24 @@ + + +[Home](./index.md) > [kibana-plugin-plugins-data-server](./kibana-plugin-plugins-data-server.md) > [IndexPatternsFetcher](./kibana-plugin-plugins-data-server.indexpatternsfetcher.md) > [validatePatternListActive](./kibana-plugin-plugins-data-server.indexpatternsfetcher.validatepatternlistactive.md) + +## IndexPatternsFetcher.validatePatternListActive() method + +Returns an index pattern list of only those index pattern strings in the given list that return indices + +Signature: + +```typescript +validatePatternListActive(patternList: string[]): Promise; +``` + +## Parameters + +| Parameter | Type | Description | +| --- | --- | --- | +| patternList | string[] | | + +Returns: + +`Promise` + diff --git a/src/plugins/data/server/index_patterns/fetcher/index_patterns_fetcher.test.ts b/src/plugins/data/server/index_patterns/fetcher/index_patterns_fetcher.test.ts new file mode 100644 index 0000000000000..ffdd47e5cdf49 --- /dev/null +++ b/src/plugins/data/server/index_patterns/fetcher/index_patterns_fetcher.test.ts @@ -0,0 +1,72 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0 and the Server Side Public License, v 1; you may not use this file except + * in compliance with, at your election, the Elastic License 2.0 or the Server + * Side Public License, v 1. + */ + +import { IndexPatternsFetcher } from '.'; +import { ElasticsearchClient } from 'kibana/server'; +import * as indexNotFoundException from '../../../common/search/test_data/index_not_found_exception.json'; + +describe('Index Pattern Fetcher - server', () => { + let indexPatterns: IndexPatternsFetcher; + let esClient: ElasticsearchClient; + const emptyResponse = { + body: { + count: 0, + }, + }; + const response = { + body: { + count: 1115, + }, + }; + const patternList = ['a', 'b', 'c']; + beforeEach(() => { + esClient = ({ + count: jest.fn().mockResolvedValueOnce(emptyResponse).mockResolvedValue(response), + } as unknown) as ElasticsearchClient; + indexPatterns = new IndexPatternsFetcher(esClient); + }); + + it('Removes pattern without matching indices', async () => { + const result = await indexPatterns.validatePatternListActive(patternList); + expect(result).toEqual(['b', 'c']); + }); + + it('Returns all patterns when all match indices', async () => { + esClient = ({ + count: jest.fn().mockResolvedValue(response), + } as unknown) as ElasticsearchClient; + indexPatterns = new IndexPatternsFetcher(esClient); + const result = await indexPatterns.validatePatternListActive(patternList); + expect(result).toEqual(patternList); + }); + it('Removes pattern when "index_not_found_exception" error is thrown', async () => { + class ServerError extends Error { + public body?: Record; + constructor( + message: string, + public readonly statusCode: number, + errBody?: Record + ) { + super(message); + this.body = errBody; + } + } + + esClient = ({ + count: jest + .fn() + .mockResolvedValueOnce(response) + .mockRejectedValue( + new ServerError('index_not_found_exception', 404, indexNotFoundException) + ), + } as unknown) as ElasticsearchClient; + indexPatterns = new IndexPatternsFetcher(esClient); + const result = await indexPatterns.validatePatternListActive(patternList); + expect(result).toEqual([patternList[0]]); + }); +}); diff --git a/src/plugins/data/server/index_patterns/fetcher/index_patterns_fetcher.ts b/src/plugins/data/server/index_patterns/fetcher/index_patterns_fetcher.ts index cc8bfe28bbc9a..3acdde33f599e 100644 --- a/src/plugins/data/server/index_patterns/fetcher/index_patterns_fetcher.ts +++ b/src/plugins/data/server/index_patterns/fetcher/index_patterns_fetcher.ts @@ -58,9 +58,16 @@ export class IndexPatternsFetcher { rollupIndex?: string; }): Promise { const { pattern, metaFields, fieldCapsOptions, type, rollupIndex } = options; + const patternList = Array.isArray(pattern) ? pattern : pattern.split(','); + let patternListActive: string[] = patternList; + // if only one pattern, don't bother with validation. We let getFieldCapabilities fail if the single pattern is bad regardless + if (patternList.length > 1) { + patternListActive = await this.validatePatternListActive(patternList); + } const fieldCapsResponse = await getFieldCapabilities( this.elasticsearchClient, - pattern, + // if none of the patterns are active, pass the original list to get an error + patternListActive.length > 0 ? patternListActive : patternList, metaFields, { allow_no_indices: fieldCapsOptions @@ -68,6 +75,7 @@ export class IndexPatternsFetcher { : this.allowNoIndices, } ); + if (type === 'rollup' && rollupIndex) { const rollupFields: FieldDescriptor[] = []; const rollupIndexCapabilities = getCapabilitiesForRollupIndices( @@ -118,4 +126,34 @@ export class IndexPatternsFetcher { } return await getFieldCapabilities(this.elasticsearchClient, indices, metaFields); } + + /** + * Returns an index pattern list of only those index pattern strings in the given list that return indices + * + * @param patternList string[] + * @return {Promise} + */ + async validatePatternListActive(patternList: string[]) { + const result = await Promise.all( + patternList + .map((pattern) => + this.elasticsearchClient.count({ + index: pattern, + }) + ) + .map((p) => + p.catch((e) => { + if (e.body.error.type === 'index_not_found_exception') { + return { body: { count: 0 } }; + } + throw e; + }) + ) + ); + return result.reduce( + (acc: string[], { body: { count } }, patternListIndex) => + count > 0 ? [...acc, patternList[patternListIndex]] : acc, + [] + ); + } } diff --git a/src/plugins/data/server/server.api.md b/src/plugins/data/server/server.api.md index 68582a9d877e9..3b1440f211bfe 100644 --- a/src/plugins/data/server/server.api.md +++ b/src/plugins/data/server/server.api.md @@ -885,6 +885,7 @@ export class IndexPatternsFetcher { type?: string; rollupIndex?: string; }): Promise; + validatePatternListActive(patternList: string[]): Promise; } // Warning: (ae-forgotten-export) The symbol "IndexPatternsServiceStart" needs to be exported by the entry point index.d.ts diff --git a/test/api_integration/apis/index_patterns/fields_for_wildcard_route/response.js b/test/api_integration/apis/index_patterns/fields_for_wildcard_route/response.js index e84052e58dac4..87c5aa535ccd9 100644 --- a/test/api_integration/apis/index_patterns/fields_for_wildcard_route/response.js +++ b/test/api_integration/apis/index_patterns/fields_for_wildcard_route/response.js @@ -17,6 +17,55 @@ export default function ({ getService }) { expect(resp.body.fields).to.eql(sortBy(resp.body.fields, 'name')); }; + const testFields = [ + { + type: 'boolean', + esTypes: ['boolean'], + searchable: true, + aggregatable: true, + name: 'bar', + readFromDocValues: true, + }, + { + type: 'string', + esTypes: ['text'], + searchable: true, + aggregatable: false, + name: 'baz', + readFromDocValues: false, + }, + { + type: 'string', + esTypes: ['keyword'], + searchable: true, + aggregatable: true, + name: 'baz.keyword', + readFromDocValues: true, + subType: { multi: { parent: 'baz' } }, + }, + { + type: 'number', + esTypes: ['long'], + searchable: true, + aggregatable: true, + name: 'foo', + readFromDocValues: true, + }, + { + aggregatable: true, + esTypes: ['keyword'], + name: 'nestedField.child', + readFromDocValues: true, + searchable: true, + subType: { + nested: { + path: 'nestedField', + }, + }, + type: 'string', + }, + ]; + describe('fields_for_wildcard_route response', () => { before(() => esArchiver.load('index_patterns/basic_index')); after(() => esArchiver.unload('index_patterns/basic_index')); @@ -26,54 +75,7 @@ export default function ({ getService }) { .get('/api/index_patterns/_fields_for_wildcard') .query({ pattern: 'basic_index' }) .expect(200, { - fields: [ - { - type: 'boolean', - esTypes: ['boolean'], - searchable: true, - aggregatable: true, - name: 'bar', - readFromDocValues: true, - }, - { - type: 'string', - esTypes: ['text'], - searchable: true, - aggregatable: false, - name: 'baz', - readFromDocValues: false, - }, - { - type: 'string', - esTypes: ['keyword'], - searchable: true, - aggregatable: true, - name: 'baz.keyword', - readFromDocValues: true, - subType: { multi: { parent: 'baz' } }, - }, - { - type: 'number', - esTypes: ['long'], - searchable: true, - aggregatable: true, - name: 'foo', - readFromDocValues: true, - }, - { - aggregatable: true, - esTypes: ['keyword'], - name: 'nestedField.child', - readFromDocValues: true, - searchable: true, - subType: { - nested: { - path: 'nestedField', - }, - }, - type: 'string', - }, - ], + fields: testFields, }) .then(ensureFieldsAreSorted); }); @@ -162,11 +164,19 @@ export default function ({ getService }) { .then(ensureFieldsAreSorted); }); - it('returns 404 when the pattern does not exist', async () => { + it('returns fields when one pattern exists and the other does not', async () => { + await supertest + .get('/api/index_patterns/_fields_for_wildcard') + .query({ pattern: 'bad_index,basic_index' }) + .expect(200, { + fields: testFields, + }); + }); + it('returns 404 when no patterns exist', async () => { await supertest .get('/api/index_patterns/_fields_for_wildcard') .query({ - pattern: '[non-existing-pattern]its-invalid-*', + pattern: 'bad_index', }) .expect(404); }); From feda8a07854ca18ce5d932c4ab990adfa3a752fd Mon Sep 17 00:00:00 2001 From: Tiago Costa Date: Fri, 5 Feb 2021 21:55:09 +0000 Subject: [PATCH 62/69] chore(NA): build bazel projects all at once in the distributable build process (#90328) * chore(NA): build bazel projects all at once in the distributable build process * chore(NA): make sure bazelisk is installed * chore(NA): install bazelisk using npm * chore(NA): remove extra spac * chore(NA): test yarn path exports * chore(NA): add direct global dir * chore(NA): some more debug steps * chore(NA): remove one statement * chore(NA): comment one more line out for testing purposes * chore(NA): export the correct yarn bin location into the PATH * chore(NA): cleaning implementation * chore(NA): move installation process of bazelisk into npm * chore(NA): add missing type --- packages/kbn-pm/dist/index.js | 60 ++++++++++++------- .../build_bazel_production_projects.ts | 7 ++- .../kbn-pm/src/utils/bazel/install_tools.ts | 32 +++++++--- src/dev/ci_setup/setup.sh | 5 -- src/dev/ci_setup/setup_env.sh | 11 ++++ 5 files changed, 76 insertions(+), 39 deletions(-) diff --git a/packages/kbn-pm/dist/index.js b/packages/kbn-pm/dist/index.js index 4d065411f91b6..abb941d211713 100644 --- a/packages/kbn-pm/dist/index.js +++ b/packages/kbn-pm/dist/index.js @@ -48106,23 +48106,34 @@ async function isBazelBinAvailable() { } } +async function isBazeliskInstalled(bazeliskVersion) { + try { + const { + stdout: bazeliskPkgInstallStdout + } = await Object(_child_process__WEBPACK_IMPORTED_MODULE_2__["spawn"])('npm', ['ls', '--global', '--parseable', '--long', `@bazel/bazelisk@${bazeliskVersion}`], { + stdio: 'pipe' + }); + return bazeliskPkgInstallStdout.includes(`@bazel/bazelisk@${bazeliskVersion}`); + } catch { + return false; + } +} + async function installBazelTools(repoRootPath) { _log__WEBPACK_IMPORTED_MODULE_4__["log"].debug(`[bazel_tools] reading bazel tools versions from version files`); const bazeliskVersion = await readBazelToolsVersionFile(repoRootPath, '.bazeliskversion'); const bazelVersion = await readBazelToolsVersionFile(repoRootPath, '.bazelversion'); // Check what globals are installed - _log__WEBPACK_IMPORTED_MODULE_4__["log"].debug(`[bazel_tools] verify if bazelisk is installed`); - const { - stdout: bazeliskPkgInstallStdout - } = await Object(_child_process__WEBPACK_IMPORTED_MODULE_2__["spawn"])('yarn', ['global', 'list'], { - stdio: 'pipe' - }); + _log__WEBPACK_IMPORTED_MODULE_4__["log"].debug(`[bazel_tools] verify if bazelisk is installed`); // Test if bazelisk is already installed in the correct version + + const isBazeliskPkgInstalled = await isBazeliskInstalled(bazeliskVersion); // Test if bazel bin is available + const isBazelBinAlreadyAvailable = await isBazelBinAvailable(); // Install bazelisk if not installed - if (!bazeliskPkgInstallStdout.includes(`@bazel/bazelisk@${bazeliskVersion}`) || !isBazelBinAlreadyAvailable) { + if (!isBazeliskPkgInstalled || !isBazelBinAlreadyAvailable) { _log__WEBPACK_IMPORTED_MODULE_4__["log"].info(`[bazel_tools] installing Bazel tools`); _log__WEBPACK_IMPORTED_MODULE_4__["log"].debug(`[bazel_tools] bazelisk is not installed. Installing @bazel/bazelisk@${bazeliskVersion} and bazel@${bazelVersion}`); - await Object(_child_process__WEBPACK_IMPORTED_MODULE_2__["spawn"])('yarn', ['global', 'add', `@bazel/bazelisk@${bazeliskVersion}`], { + await Object(_child_process__WEBPACK_IMPORTED_MODULE_2__["spawn"])('npm', ['install', '--global', `@bazel/bazelisk@${bazeliskVersion}`], { env: { USE_BAZEL_VERSION: bazelVersion }, @@ -48132,7 +48143,7 @@ async function installBazelTools(repoRootPath) { if (!isBazelBinAvailableAfterInstall) { throw new Error(dedent__WEBPACK_IMPORTED_MODULE_0___default.a` - [bazel_tools] an error occurred when installing the Bazel tools. Please make sure 'yarn global bin' is on your $PATH, otherwise just add it there + [bazel_tools] an error occurred when installing the Bazel tools. Please make sure you have access to npm globally installed modules on your $PATH `); } } @@ -59771,10 +59782,11 @@ __webpack_require__.r(__webpack_exports__); /* harmony import */ var path__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(4); /* harmony import */ var path__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_2__); /* harmony import */ var _build_non_bazel_production_projects__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(745); -/* harmony import */ var _utils_fs__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(131); -/* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(246); -/* harmony import */ var _utils_package_json__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(251); -/* harmony import */ var _utils_projects__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(248); +/* harmony import */ var _utils_bazel_run__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(374); +/* harmony import */ var _utils_fs__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(131); +/* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(246); +/* harmony import */ var _utils_package_json__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(251); +/* harmony import */ var _utils_projects__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(248); /* * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one * or more contributor license agreements. Licensed under the Elastic License @@ -59790,17 +59802,19 @@ __webpack_require__.r(__webpack_exports__); + async function buildBazelProductionProjects({ kibanaRoot, buildRoot, onlyOSS }) { - const projects = await Object(_utils_projects__WEBPACK_IMPORTED_MODULE_7__["getBazelProjectsOnly"])(await Object(_build_non_bazel_production_projects__WEBPACK_IMPORTED_MODULE_3__["getProductionProjects"])(kibanaRoot, onlyOSS)); + const projects = await Object(_utils_projects__WEBPACK_IMPORTED_MODULE_8__["getBazelProjectsOnly"])(await Object(_build_non_bazel_production_projects__WEBPACK_IMPORTED_MODULE_3__["getProductionProjects"])(kibanaRoot, onlyOSS)); const projectNames = [...projects.values()].map(project => project.name); - _utils_log__WEBPACK_IMPORTED_MODULE_5__["log"].info(`Preparing Bazel projects production build for [${projectNames.join(', ')}]`); + _utils_log__WEBPACK_IMPORTED_MODULE_6__["log"].info(`Preparing Bazel projects production build for [${projectNames.join(', ')}]`); + await Object(_utils_bazel_run__WEBPACK_IMPORTED_MODULE_4__["runBazel"])(['build', '//packages:build']); + _utils_log__WEBPACK_IMPORTED_MODULE_6__["log"].info(`All Bazel projects production builds for [${projectNames.join(', ')}] are complete}]`); for (const project of projects.values()) { - await Object(_build_non_bazel_production_projects__WEBPACK_IMPORTED_MODULE_3__["buildProject"])(project); await copyToBuild(project, kibanaRoot, buildRoot); await applyCorrectPermissions(project, kibanaRoot, buildRoot); } @@ -59835,9 +59849,9 @@ async function copyToBuild(project, kibanaRoot, buildRoot) { // the intermediate build, we fall back to using the project's already defined // `package.json`. - const packageJson = (await Object(_utils_fs__WEBPACK_IMPORTED_MODULE_4__["isFile"])(Object(path__WEBPACK_IMPORTED_MODULE_2__["join"])(buildProjectPath, 'package.json'))) ? await Object(_utils_package_json__WEBPACK_IMPORTED_MODULE_6__["readPackageJson"])(buildProjectPath) : project.json; - const preparedPackageJson = Object(_utils_package_json__WEBPACK_IMPORTED_MODULE_6__["createProductionPackageJson"])(packageJson); - await Object(_utils_package_json__WEBPACK_IMPORTED_MODULE_6__["writePackageJson"])(buildProjectPath, preparedPackageJson); + const packageJson = (await Object(_utils_fs__WEBPACK_IMPORTED_MODULE_5__["isFile"])(Object(path__WEBPACK_IMPORTED_MODULE_2__["join"])(buildProjectPath, 'package.json'))) ? await Object(_utils_package_json__WEBPACK_IMPORTED_MODULE_7__["readPackageJson"])(buildProjectPath) : project.json; + const preparedPackageJson = Object(_utils_package_json__WEBPACK_IMPORTED_MODULE_7__["createProductionPackageJson"])(packageJson); + await Object(_utils_package_json__WEBPACK_IMPORTED_MODULE_7__["writePackageJson"])(buildProjectPath, preparedPackageJson); } async function applyCorrectPermissions(project, kibanaRoot, buildRoot) { @@ -59852,12 +59866,12 @@ async function applyCorrectPermissions(project, kibanaRoot, buildRoot) { for (const pluginPath of allPluginPaths) { const resolvedPluginPath = Object(path__WEBPACK_IMPORTED_MODULE_2__["resolve"])(buildRoot, pluginPath); - if (await Object(_utils_fs__WEBPACK_IMPORTED_MODULE_4__["isFile"])(resolvedPluginPath)) { - await Object(_utils_fs__WEBPACK_IMPORTED_MODULE_4__["chmod"])(resolvedPluginPath, 0o644); + if (await Object(_utils_fs__WEBPACK_IMPORTED_MODULE_5__["isFile"])(resolvedPluginPath)) { + await Object(_utils_fs__WEBPACK_IMPORTED_MODULE_5__["chmod"])(resolvedPluginPath, 0o644); } - if (await Object(_utils_fs__WEBPACK_IMPORTED_MODULE_4__["isDirectory"])(resolvedPluginPath)) { - await Object(_utils_fs__WEBPACK_IMPORTED_MODULE_4__["chmod"])(resolvedPluginPath, 0o755); + if (await Object(_utils_fs__WEBPACK_IMPORTED_MODULE_5__["isDirectory"])(resolvedPluginPath)) { + await Object(_utils_fs__WEBPACK_IMPORTED_MODULE_5__["chmod"])(resolvedPluginPath, 0o755); } } } diff --git a/packages/kbn-pm/src/production/build_bazel_production_projects.ts b/packages/kbn-pm/src/production/build_bazel_production_projects.ts index cd40653a6b54c..a54d6c753d8d7 100644 --- a/packages/kbn-pm/src/production/build_bazel_production_projects.ts +++ b/packages/kbn-pm/src/production/build_bazel_production_projects.ts @@ -10,7 +10,8 @@ import copy from 'cpy'; import globby from 'globby'; import { basename, join, relative, resolve } from 'path'; -import { buildProject, getProductionProjects } from './build_non_bazel_production_projects'; +import { getProductionProjects } from './build_non_bazel_production_projects'; +import { runBazel } from '../utils/bazel/run'; import { chmod, isFile, isDirectory } from '../utils/fs'; import { log } from '../utils/log'; import { @@ -35,8 +36,10 @@ export async function buildBazelProductionProjects({ const projectNames = [...projects.values()].map((project) => project.name); log.info(`Preparing Bazel projects production build for [${projectNames.join(', ')}]`); + await runBazel(['build', '//packages:build']); + log.info(`All Bazel projects production builds for [${projectNames.join(', ')}] are complete}]`); + for (const project of projects.values()) { - await buildProject(project); await copyToBuild(project, kibanaRoot, buildRoot); await applyCorrectPermissions(project, kibanaRoot, buildRoot); } diff --git a/packages/kbn-pm/src/utils/bazel/install_tools.ts b/packages/kbn-pm/src/utils/bazel/install_tools.ts index dfd20f5974d67..cee6eff317afa 100644 --- a/packages/kbn-pm/src/utils/bazel/install_tools.ts +++ b/packages/kbn-pm/src/utils/bazel/install_tools.ts @@ -36,6 +36,22 @@ async function isBazelBinAvailable() { } } +async function isBazeliskInstalled(bazeliskVersion: string) { + try { + const { stdout: bazeliskPkgInstallStdout } = await spawn( + 'npm', + ['ls', '--global', '--parseable', '--long', `@bazel/bazelisk@${bazeliskVersion}`], + { + stdio: 'pipe', + } + ); + + return bazeliskPkgInstallStdout.includes(`@bazel/bazelisk@${bazeliskVersion}`); + } catch { + return false; + } +} + export async function installBazelTools(repoRootPath: string) { log.debug(`[bazel_tools] reading bazel tools versions from version files`); const bazeliskVersion = await readBazelToolsVersionFile(repoRootPath, '.bazeliskversion'); @@ -43,23 +59,21 @@ export async function installBazelTools(repoRootPath: string) { // Check what globals are installed log.debug(`[bazel_tools] verify if bazelisk is installed`); - const { stdout: bazeliskPkgInstallStdout } = await spawn('yarn', ['global', 'list'], { - stdio: 'pipe', - }); + // Test if bazelisk is already installed in the correct version + const isBazeliskPkgInstalled = await isBazeliskInstalled(bazeliskVersion); + + // Test if bazel bin is available const isBazelBinAlreadyAvailable = await isBazelBinAvailable(); // Install bazelisk if not installed - if ( - !bazeliskPkgInstallStdout.includes(`@bazel/bazelisk@${bazeliskVersion}`) || - !isBazelBinAlreadyAvailable - ) { + if (!isBazeliskPkgInstalled || !isBazelBinAlreadyAvailable) { log.info(`[bazel_tools] installing Bazel tools`); log.debug( `[bazel_tools] bazelisk is not installed. Installing @bazel/bazelisk@${bazeliskVersion} and bazel@${bazelVersion}` ); - await spawn('yarn', ['global', 'add', `@bazel/bazelisk@${bazeliskVersion}`], { + await spawn('npm', ['install', '--global', `@bazel/bazelisk@${bazeliskVersion}`], { env: { USE_BAZEL_VERSION: bazelVersion, }, @@ -69,7 +83,7 @@ export async function installBazelTools(repoRootPath: string) { const isBazelBinAvailableAfterInstall = await isBazelBinAvailable(); if (!isBazelBinAvailableAfterInstall) { throw new Error(dedent` - [bazel_tools] an error occurred when installing the Bazel tools. Please make sure 'yarn global bin' is on your $PATH, otherwise just add it there + [bazel_tools] an error occurred when installing the Bazel tools. Please make sure you have access to npm globally installed modules on your $PATH `); } } diff --git a/src/dev/ci_setup/setup.sh b/src/dev/ci_setup/setup.sh index e5e21e312b0dd..61f578ba33971 100755 --- a/src/dev/ci_setup/setup.sh +++ b/src/dev/ci_setup/setup.sh @@ -65,8 +65,3 @@ if [ "$GIT_CHANGES" ]; then echo -e "$GIT_CHANGES\n" exit 1 fi - -### -### copy .bazelrc-ci into $HOME/.bazelrc -### -cp "src/dev/ci_setup/.bazelrc-ci" "$HOME/.bazelrc"; diff --git a/src/dev/ci_setup/setup_env.sh b/src/dev/ci_setup/setup_env.sh index 5dac270239c4a..0b835d4b9fa94 100644 --- a/src/dev/ci_setup/setup_env.sh +++ b/src/dev/ci_setup/setup_env.sh @@ -175,4 +175,15 @@ if [[ -d "$ES_DIR" && -f "$ES_JAVA_PROP_PATH" ]]; then export JAVA_HOME=$HOME/.java/$ES_BUILD_JAVA fi +### +### copy .bazelrc-ci into $HOME/.bazelrc +### +cp -f "$KIBANA_DIR/src/dev/ci_setup/.bazelrc-ci" "$HOME/.bazelrc"; + +### +### append auth token to buildbuddy into "$HOME/.bazelrc"; +### +echo "# Appended by $KIBANA_DIR/src/dev/ci_setup/setup.sh" >> "$HOME/.bazelrc" +echo "build --remote_header=x-buildbuddy-api-key=$KIBANA_BUILDBUDDY_CI_API_KEY" >> "$HOME/.bazelrc" + export CI_ENV_SETUP=true From befe41067e2cd4d5cc3e11fe2d910b42344bc4eb Mon Sep 17 00:00:00 2001 From: liza-mae Date: Fri, 5 Feb 2021 15:06:15 -0700 Subject: [PATCH 63/69] [Docs] Update reporting troubleshooting for arm rhel/centos (#90385) * Update reporting document * Move to own section * Remove extra line --- docs/user/reporting/reporting-troubleshooting.asciidoc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docs/user/reporting/reporting-troubleshooting.asciidoc b/docs/user/reporting/reporting-troubleshooting.asciidoc index 1f07b0b57d8c7..ebe095e0881b3 100644 --- a/docs/user/reporting/reporting-troubleshooting.asciidoc +++ b/docs/user/reporting/reporting-troubleshooting.asciidoc @@ -15,6 +15,7 @@ Having trouble? Here are solutions to common problems you might encounter while * <> * <> * <> +* <> [float] [[reporting-diagnostics]] @@ -156,3 +157,9 @@ requests to render. If the {kib} instance doesn't have enough memory to run the report, the report fails with an error such as `Error: Page crashed!` In this case, try increasing the memory for the {kib} instance to 2GB. + +[float] +[[reporting-troubleshooting-arm-systems]] +=== ARM systems + +Chromium is not compatible with ARM RHEL/CentOS. From f4dc6d0235f3abeaa5196587eaac199b829aad4c Mon Sep 17 00:00:00 2001 From: Jen Huang Date: Fri, 5 Feb 2021 14:14:31 -0800 Subject: [PATCH 64/69] [Fleet] Fix incorrect conversion of string to numeric values in agent YAML (#90371) * Convert user values back to string after yaml template compilation if they were strings originally * Add better test cases and adjust patch * Fix when field is undefined * Handle array of strings too --- .../server/services/epm/agent/agent.test.ts | 16 ++++++++++++++++ .../fleet/server/services/epm/agent/agent.ts | 12 ++++++++++++ 2 files changed, 28 insertions(+) diff --git a/x-pack/plugins/fleet/server/services/epm/agent/agent.test.ts b/x-pack/plugins/fleet/server/services/epm/agent/agent.test.ts index 3e1d3d57bbf71..7ab904b2f15e1 100644 --- a/x-pack/plugins/fleet/server/services/epm/agent/agent.test.ts +++ b/x-pack/plugins/fleet/server/services/epm/agent/agent.test.ts @@ -22,10 +22,23 @@ password: {{password}} {{#if password}} hidden_password: {{password}} {{/if}} +{{#if optional_field}} +optional_field: {{optional_field}} +{{/if}} +foo: {{bar}} +some_text_field: {{should_be_text}} +multi_text_field: +{{#each multi_text}} + - {{this}} +{{/each}} `; const vars = { paths: { value: ['/usr/local/var/log/nginx/access.log'] }, password: { type: 'password', value: '' }, + optional_field: { type: 'text', value: undefined }, + bar: { type: 'text', value: 'bar' }, + should_be_text: { type: 'text', value: '1234' }, + multi_text: { type: 'text', value: ['1234', 'foo', 'bar'] }, }; const output = compileTemplate(vars, streamTemplate); @@ -35,6 +48,9 @@ hidden_password: {{password}} exclude_files: ['.gz$'], processors: [{ add_locale: null }], password: '', + foo: 'bar', + some_text_field: '1234', + multi_text_field: ['1234', 'foo', 'bar'], }); }); diff --git a/x-pack/plugins/fleet/server/services/epm/agent/agent.ts b/x-pack/plugins/fleet/server/services/epm/agent/agent.ts index 6b1d84ea28b0a..4f39da5b0b70d 100644 --- a/x-pack/plugins/fleet/server/services/epm/agent/agent.ts +++ b/x-pack/plugins/fleet/server/services/epm/agent/agent.ts @@ -58,6 +58,10 @@ function replaceVariablesInYaml(yamlVariables: { [k: string]: any }, yaml: any) return yaml; } +const maybeEscapeNumericString = (value: string) => { + return value.length && !isNaN(+value) ? `"${value}"` : value; +}; + function buildTemplateVariables(variables: PackagePolicyConfigRecord, templateStr: string) { const yamlValues: { [k: string]: any } = {}; const vars = Object.entries(variables).reduce((acc, [key, recordEntry]) => { @@ -84,6 +88,14 @@ function buildTemplateVariables(variables: PackagePolicyConfigRecord, templateSt const yamlKeyPlaceholder = `##${key}##`; varPart[lastKeyPart] = `"${yamlKeyPlaceholder}"`; yamlValues[yamlKeyPlaceholder] = recordEntry.value ? safeLoad(recordEntry.value) : null; + } else if (recordEntry.type && recordEntry.type === 'text' && recordEntry.value?.length) { + if (Array.isArray(recordEntry.value)) { + varPart[lastKeyPart] = recordEntry.value.map((value: string) => + maybeEscapeNumericString(value) + ); + } else { + varPart[lastKeyPart] = maybeEscapeNumericString(recordEntry.value); + } } else { varPart[lastKeyPart] = recordEntry.value; } From efcd2c38ef0181756af49e7228f1c9e37f372034 Mon Sep 17 00:00:00 2001 From: Brian Seeders Date: Fri, 5 Feb 2021 17:23:26 -0500 Subject: [PATCH 65/69] Skip failing suite (#90526) --- .../apps/ml/data_frame_analytics/feature_importance.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/x-pack/test/functional/apps/ml/data_frame_analytics/feature_importance.ts b/x-pack/test/functional/apps/ml/data_frame_analytics/feature_importance.ts index 49728603c246c..b8bdc7de16e1e 100644 --- a/x-pack/test/functional/apps/ml/data_frame_analytics/feature_importance.ts +++ b/x-pack/test/functional/apps/ml/data_frame_analytics/feature_importance.ts @@ -14,7 +14,8 @@ export default function ({ getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const ml = getService('ml'); - describe('total feature importance panel and decision path popover', function () { + // Failing: See https://github.com/elastic/kibana/issues/90526 + describe.skip('total feature importance panel and decision path popover', function () { const testDataList: Array<{ suiteTitle: string; archive: string; From a9fce985a5e22e64c07b5d082848d272997373ad Mon Sep 17 00:00:00 2001 From: Tiago Costa Date: Fri, 5 Feb 2021 23:45:30 +0000 Subject: [PATCH 66/69] chore(NA): integrate build buddy with our bazel setup and remote cache for ci (#90116) * chore(NA): simple changes on bazelrc * chore(NA): integrate bazel tools with BuildBuddy and remote cache service * chore(NA) fix bazelrc line config * chore(NA): move non auth settings out of bazelrc.auth * chore(NA): output home dir * chore(NA): load .bazelrc-ci.auth from /Users/tiagocosta dir * chore(NA): remove bazelrc auth file and append directly into home bazelrc * chore(NA): comment announce option * chore(NA): integrate build buddy metadata * chore(NA): update src/dev/ci_setup/.bazelrc-ci Co-authored-by: Tyler Smalley * chore(NA): move build metadata integation to common confdig * chore(NA): fix problem on bazel file location * chore(NA): correct sh file permissions * chore(NA): only get host on CI * chore(NA): add cores into host info on CI * chore(NA): sync with last settings to setup bazelisk tools on ci * chore(NA): sync last changes on ci setup env * chore(NA): sync settings on ci setup with the other PR * chore(NA): remove yarn export Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> Co-authored-by: Tyler Smalley --- .bazelrc | 9 +++++ src/dev/bazel_workspace_status.sh | 57 +++++++++++++++++++++++++++++ src/dev/ci_setup/.bazelrc-ci | 12 ++++-- src/dev/ci_setup/.bazelrc-ci.common | 3 -- src/dev/ci_setup/load_env_keys.sh | 3 ++ src/dev/ci_setup/setup.sh | 11 ++++++ 6 files changed, 89 insertions(+), 6 deletions(-) create mode 100755 src/dev/bazel_workspace_status.sh diff --git a/.bazelrc b/.bazelrc index 741067e4ff18e..158338ec5f093 100644 --- a/.bazelrc +++ b/.bazelrc @@ -2,8 +2,17 @@ # Import shared settings first so we can override below import %workspace%/.bazelrc.common +## Disabled for now # Remote cache settings for local env # build --remote_cache=https://storage.googleapis.com/kibana-bazel-cache # build --incompatible_remote_results_ignore_disk=true # build --remote_accept_cached=true # build --remote_upload_local_results=false + +# BuildBuddy +## Metadata settings +build --workspace_status_command=$(pwd)/src/dev/bazel_workspace_status.sh +# Enable this in case you want to share your build info +# build --build_metadata=VISIBILITY=PUBLIC +build --build_metadata=TEST_GROUPS=//packages + diff --git a/src/dev/bazel_workspace_status.sh b/src/dev/bazel_workspace_status.sh new file mode 100755 index 0000000000000..efaca4bb98849 --- /dev/null +++ b/src/dev/bazel_workspace_status.sh @@ -0,0 +1,57 @@ +#!/bin/bash + +# Inspired on https://github.com/buildbuddy-io/buildbuddy/blob/master/workspace_status.sh +# This script will be run bazel when building process starts to +# generate key-value information that represents the status of the +# workspace. The output should be like +# +# KEY1 VALUE1 +# KEY2 VALUE2 +# +# If the script exits with non-zero code, it's considered as a failure +# and the output will be discarded. + +# Git repo +repo_url=$(git config --get remote.origin.url) +if [[ $? != 0 ]]; +then + exit 1 +fi +echo "REPO_URL ${repo_url}" + +# Commit SHA +commit_sha=$(git rev-parse HEAD) +if [[ $? != 0 ]]; +then + exit 1 +fi +echo "COMMIT_SHA ${commit_sha}" + +# Git branch +repo_url=$(git rev-parse --abbrev-ref HEAD) +if [[ $? != 0 ]]; +then + exit 1 +fi +echo "GIT_BRANCH ${repo_url}" + +# Tree status +git diff-index --quiet HEAD -- +if [[ $? == 0 ]]; +then + tree_status="Clean" +else + tree_status="Modified" +fi +echo "GIT_TREE_STATUS ${tree_status}" + +# Host +if [ "$CI" = "true" ]; then + host=$(hostname | sed 's|\(.*\)-.*|\1|') + cores=$(grep ^cpu\\scores /proc/cpuinfo | uniq | awk '{print $4}' ) + if [[ $? != 0 ]]; + then + exit 1 + fi + echo "HOST ${host}-${cores}" +fi diff --git a/src/dev/ci_setup/.bazelrc-ci b/src/dev/ci_setup/.bazelrc-ci index 5b345d3c9e207..ef6fab3a30590 100644 --- a/src/dev/ci_setup/.bazelrc-ci +++ b/src/dev/ci_setup/.bazelrc-ci @@ -5,6 +5,12 @@ # Import and load bazelrc common settings for ci env try-import %workspace%/src/dev/ci_setup/.bazelrc-ci.common -# Remote cache settings for ci env -# build --google_default_credentials -# build --remote_upload_local_results=true +# BuildBuddy settings +## Remote settings including cache +build --bes_results_url=https://app.buildbuddy.io/invocation/ +build --bes_backend=grpcs://cloud.buildbuddy.io +build --remote_cache=grpcs://cloud.buildbuddy.io +build --remote_timeout=3600 + +## Metadata settings +build --build_metadata=ROLE=CI diff --git a/src/dev/ci_setup/.bazelrc-ci.common b/src/dev/ci_setup/.bazelrc-ci.common index 3f58e4e03a178..9d00ee5639741 100644 --- a/src/dev/ci_setup/.bazelrc-ci.common +++ b/src/dev/ci_setup/.bazelrc-ci.common @@ -4,8 +4,5 @@ # Don't be spammy in the logs build --noshow_progress -# Print all the options that apply to the build. -build --announce_rc - # More details on failures build --verbose_failures=true diff --git a/src/dev/ci_setup/load_env_keys.sh b/src/dev/ci_setup/load_env_keys.sh index 62d29db232eae..5f7a6c26bab21 100644 --- a/src/dev/ci_setup/load_env_keys.sh +++ b/src/dev/ci_setup/load_env_keys.sh @@ -34,6 +34,9 @@ else PERCY_TOKEN=$(retry 5 vault read -field=value secret/kibana-issues/dev/percy) export PERCY_TOKEN + KIBANA_BUILDBUDDY_CI_API_KEY=$(retry 5 vault read -field=value secret/kibana-issues/dev/kibana-buildbuddy-ci-api-key) + export KIBANA_BUILDBUDDY_CI_API_KEY + # remove vault related secrets unset VAULT_ROLE_ID VAULT_SECRET_ID VAULT_TOKEN VAULT_ADDR fi diff --git a/src/dev/ci_setup/setup.sh b/src/dev/ci_setup/setup.sh index 61f578ba33971..0b24f0b22b81a 100755 --- a/src/dev/ci_setup/setup.sh +++ b/src/dev/ci_setup/setup.sh @@ -10,6 +10,17 @@ echo " -- PARENT_DIR='$PARENT_DIR'" echo " -- KIBANA_PKG_BRANCH='$KIBANA_PKG_BRANCH'" echo " -- TEST_ES_SNAPSHOT_VERSION='$TEST_ES_SNAPSHOT_VERSION'" +### +### copy .bazelrc-ci into $HOME/.bazelrc +### +cp "src/dev/ci_setup/.bazelrc-ci" "$HOME/.bazelrc"; + +### +### append auth token to buildbuddy into "$HOME/.bazelrc"; +### +echo "# Appended by src/dev/ci_setup/setup.sh" >> "$HOME/.bazelrc" +echo "build --remote_header=x-buildbuddy-api-key=$KIBANA_BUILDBUDDY_CI_API_KEY" >> "$HOME/.bazelrc" + ### ### install dependencies ### From be725cabc2f74d2c0a812b44717c1f3add4b130a Mon Sep 17 00:00:00 2001 From: Tyler Smalley Date: Fri, 5 Feb 2021 17:10:49 -0800 Subject: [PATCH 67/69] [test] Await retry.waitFor (#90456) Signed-off-by: Tyler Smalley --- test/functional/apps/console/_console.ts | 4 +++- x-pack/test/functional/page_objects/upgrade_assistant_page.ts | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/test/functional/apps/console/_console.ts b/test/functional/apps/console/_console.ts index 6aeb1e2a624ad..05933ebf1ea2a 100644 --- a/test/functional/apps/console/_console.ts +++ b/test/functional/apps/console/_console.ts @@ -85,7 +85,9 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { await PageObjects.console.dismissTutorial(); expect(await PageObjects.console.hasAutocompleter()).to.be(false); await PageObjects.console.promptAutocomplete(); - retry.waitFor('autocomplete to be visible', () => PageObjects.console.hasAutocompleter()); + await retry.waitFor('autocomplete to be visible', () => + PageObjects.console.hasAutocompleter() + ); }); }); } diff --git a/x-pack/test/functional/page_objects/upgrade_assistant_page.ts b/x-pack/test/functional/page_objects/upgrade_assistant_page.ts index da1518ed72b48..1c4a85450a8da 100644 --- a/x-pack/test/functional/page_objects/upgrade_assistant_page.ts +++ b/x-pack/test/functional/page_objects/upgrade_assistant_page.ts @@ -24,7 +24,7 @@ export function UpgradeAssistantPageProvider({ getPageObjects, getService }: Ftr return await retry.try(async () => { await common.navigateToApp('settings'); await testSubjects.click('upgrade_assistant'); - retry.waitFor('url to contain /upgrade_assistant', async () => { + await retry.waitFor('url to contain /upgrade_assistant', async () => { const url = await browser.getCurrentUrl(); return url.includes('/upgrade_assistant'); }); @@ -61,7 +61,7 @@ export function UpgradeAssistantPageProvider({ getPageObjects, getService }: Ftr async waitForTelemetryHidden() { const self = this; - retry.waitFor('Telemetry to disappear.', async () => { + await retry.waitFor('Telemetry to disappear.', async () => { return (await self.isTelemetryExists()) === false; }); } From 6408a668e454f8c696d59d59ca1b9ffbe938326d Mon Sep 17 00:00:00 2001 From: Tiago Costa Date: Sat, 6 Feb 2021 03:27:21 +0000 Subject: [PATCH 68/69] chore(NA): add safe guard to remove bazelisk from yarn global at bootstrap (#90538) --- packages/kbn-pm/dist/index.js | 27 ++++++++++++++++++- .../kbn-pm/src/utils/bazel/install_tools.ts | 26 ++++++++++++++++++ 2 files changed, 52 insertions(+), 1 deletion(-) diff --git a/packages/kbn-pm/dist/index.js b/packages/kbn-pm/dist/index.js index abb941d211713..d939e7b3000fa 100644 --- a/packages/kbn-pm/dist/index.js +++ b/packages/kbn-pm/dist/index.js @@ -48119,6 +48119,29 @@ async function isBazeliskInstalled(bazeliskVersion) { } } +async function tryRemoveBazeliskFromYarnGlobal() { + try { + // Check if Bazelisk is installed on the yarn global scope + const { + stdout: bazeliskPkgInstallStdout + } = await Object(_child_process__WEBPACK_IMPORTED_MODULE_2__["spawn"])('yarn', ['global', 'list'], { + stdio: 'pipe' + }); // Bazelisk was found on yarn global scope so lets remove it + + if (bazeliskPkgInstallStdout.includes(`@bazel/bazelisk@`)) { + await Object(_child_process__WEBPACK_IMPORTED_MODULE_2__["spawn"])('yarn', ['global', 'remove', `@bazel/bazelisk`], { + stdio: 'pipe' + }); + _log__WEBPACK_IMPORTED_MODULE_4__["log"].info(`[bazel_tools] bazelisk was installed on Yarn global packages and is now removed`); + return true; + } + + return false; + } catch { + return false; + } +} + async function installBazelTools(repoRootPath) { _log__WEBPACK_IMPORTED_MODULE_4__["log"].debug(`[bazel_tools] reading bazel tools versions from version files`); const bazeliskVersion = await readBazelToolsVersionFile(repoRootPath, '.bazeliskversion'); @@ -48128,7 +48151,9 @@ async function installBazelTools(repoRootPath) { const isBazeliskPkgInstalled = await isBazeliskInstalled(bazeliskVersion); // Test if bazel bin is available - const isBazelBinAlreadyAvailable = await isBazelBinAvailable(); // Install bazelisk if not installed + const isBazelBinAlreadyAvailable = await isBazelBinAvailable(); // Check if we need to remove bazelisk from yarn + + await tryRemoveBazeliskFromYarnGlobal(); // Install bazelisk if not installed if (!isBazeliskPkgInstalled || !isBazelBinAlreadyAvailable) { _log__WEBPACK_IMPORTED_MODULE_4__["log"].info(`[bazel_tools] installing Bazel tools`); diff --git a/packages/kbn-pm/src/utils/bazel/install_tools.ts b/packages/kbn-pm/src/utils/bazel/install_tools.ts index cee6eff317afa..b547c2bc141bd 100644 --- a/packages/kbn-pm/src/utils/bazel/install_tools.ts +++ b/packages/kbn-pm/src/utils/bazel/install_tools.ts @@ -52,6 +52,29 @@ async function isBazeliskInstalled(bazeliskVersion: string) { } } +async function tryRemoveBazeliskFromYarnGlobal() { + try { + // Check if Bazelisk is installed on the yarn global scope + const { stdout: bazeliskPkgInstallStdout } = await spawn('yarn', ['global', 'list'], { + stdio: 'pipe', + }); + + // Bazelisk was found on yarn global scope so lets remove it + if (bazeliskPkgInstallStdout.includes(`@bazel/bazelisk@`)) { + await spawn('yarn', ['global', 'remove', `@bazel/bazelisk`], { + stdio: 'pipe', + }); + + log.info(`[bazel_tools] bazelisk was installed on Yarn global packages and is now removed`); + return true; + } + + return false; + } catch { + return false; + } +} + export async function installBazelTools(repoRootPath: string) { log.debug(`[bazel_tools] reading bazel tools versions from version files`); const bazeliskVersion = await readBazelToolsVersionFile(repoRootPath, '.bazeliskversion'); @@ -66,6 +89,9 @@ export async function installBazelTools(repoRootPath: string) { // Test if bazel bin is available const isBazelBinAlreadyAvailable = await isBazelBinAvailable(); + // Check if we need to remove bazelisk from yarn + await tryRemoveBazeliskFromYarnGlobal(); + // Install bazelisk if not installed if (!isBazeliskPkgInstalled || !isBazelBinAlreadyAvailable) { log.info(`[bazel_tools] installing Bazel tools`); From 826a1ecbdbc7de14aebce15330db6a8316ada404 Mon Sep 17 00:00:00 2001 From: Liza Katz Date: Sat, 6 Feb 2021 11:52:04 +0200 Subject: [PATCH 69/69] [Search Sessions] Use sync config (#90138) * Search Sessions: Unskip Flaky Functional Test * Save all search sessions and then manage them based on their persisted state * Get default search session expiration from config * randomize sleep time * fix test * fix test * Make sure we poll, and dont persist, searches not in the context of a session * Added keepalive unit tests * fix ts * code review @lukasolson * ts * More tests, rename onScreenTimeout to completedTimeout * lint * lint * Delete async seaches * Support saved object pagination Fix get search status tests * better PersistedSearchSessionSavedObjectAttributes ts * test titles * Remove runAt from monitoring task Increase testing trackingInterval (caused bug) * support workload histograms that take into account overdue tasks * Update touched when changing session status to complete \ error * removed test * Updated management test data * Rename configs * delete tap first add comments * Use sync config in data-enhanced plugin * fix merge * fix merge * ts * code review Co-authored-by: Timothy Sullivan Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> Co-authored-by: Anton Dosov Co-authored-by: Gidi Meir Morris --- x-pack/plugins/data_enhanced/server/plugin.ts | 12 +++----- .../server/search/es_search_strategy.test.ts | 30 +++++++++---------- .../server/search/es_search_strategy.ts | 3 +- .../server/search/session/monitoring_task.ts | 7 ++--- .../search/session/session_service.test.ts | 7 ++--- .../server/search/session/session_service.ts | 29 +++++++++--------- 6 files changed, 39 insertions(+), 49 deletions(-) diff --git a/x-pack/plugins/data_enhanced/server/plugin.ts b/x-pack/plugins/data_enhanced/server/plugin.ts index 76235c917b139..3aaf50fbeb3e6 100644 --- a/x-pack/plugins/data_enhanced/server/plugin.ts +++ b/x-pack/plugins/data_enhanced/server/plugin.ts @@ -6,7 +6,6 @@ */ import { CoreSetup, CoreStart, Logger, Plugin, PluginInitializerContext } from 'kibana/server'; -import { Observable } from 'rxjs'; import { TaskManagerSetupContract, TaskManagerStartContract } from '../../task_manager/server'; import { PluginSetup as DataPluginSetup, @@ -40,11 +39,11 @@ export class EnhancedDataServerPlugin implements Plugin { private readonly logger: Logger; private sessionService!: SearchSessionService; - private config$: Observable; + private config: ConfigSchema; constructor(private initializerContext: PluginInitializerContext) { this.logger = initializerContext.logger.get('data_enhanced'); - this.config$ = this.initializerContext.config.create(); + this.config = this.initializerContext.config.get(); } public setup(core: CoreSetup, deps: SetupDependencies) { @@ -56,7 +55,7 @@ export class EnhancedDataServerPlugin deps.data.search.registerSearchStrategy( ENHANCED_ES_SEARCH_STRATEGY, enhancedEsSearchStrategyProvider( - this.config$, + this.config, this.initializerContext.config.legacy.globalConfig$, this.logger, usage @@ -68,10 +67,7 @@ export class EnhancedDataServerPlugin eqlSearchStrategyProvider(this.logger) ); - this.sessionService = new SearchSessionService( - this.logger, - this.initializerContext.config.create() - ); + this.sessionService = new SearchSessionService(this.logger, this.config); deps.data.__enhance({ search: { diff --git a/x-pack/plugins/data_enhanced/server/search/es_search_strategy.test.ts b/x-pack/plugins/data_enhanced/server/search/es_search_strategy.test.ts index 019b94f638ca4..d529e981aaea1 100644 --- a/x-pack/plugins/data_enhanced/server/search/es_search_strategy.test.ts +++ b/x-pack/plugins/data_enhanced/server/search/es_search_strategy.test.ts @@ -72,13 +72,13 @@ describe('ES search strategy', () => { }, }); - const mockConfig$ = new BehaviorSubject({ + const mockConfig: any = { search: { sessions: { defaultExpiration: moment.duration('1', 'm'), }, }, - }); + }; beforeEach(() => { mockApiCaller.mockClear(); @@ -89,7 +89,7 @@ describe('ES search strategy', () => { it('returns a strategy with `search and `cancel`', async () => { const esSearch = await enhancedEsSearchStrategyProvider( - mockConfig$, + mockConfig, mockLegacyConfig$, mockLogger ); @@ -104,7 +104,7 @@ describe('ES search strategy', () => { const params = { index: 'logstash-*', body: { query: {} } }; const esSearch = await enhancedEsSearchStrategyProvider( - mockConfig$, + mockConfig, mockLegacyConfig$, mockLogger ); @@ -123,7 +123,7 @@ describe('ES search strategy', () => { const params = { index: 'logstash-*', body: { query: {} } }; const esSearch = await enhancedEsSearchStrategyProvider( - mockConfig$, + mockConfig, mockLegacyConfig$, mockLogger ); @@ -142,7 +142,7 @@ describe('ES search strategy', () => { const params = { index: 'foo-*', body: {} }; const esSearch = await enhancedEsSearchStrategyProvider( - mockConfig$, + mockConfig, mockLegacyConfig$, mockLogger ); @@ -160,7 +160,7 @@ describe('ES search strategy', () => { const params = { index: 'foo-程', body: {} }; const esSearch = await enhancedEsSearchStrategyProvider( - mockConfig$, + mockConfig, mockLegacyConfig$, mockLogger ); @@ -189,7 +189,7 @@ describe('ES search strategy', () => { const params = { index: 'logstash-*', body: { query: {} } }; const esSearch = await enhancedEsSearchStrategyProvider( - mockConfig$, + mockConfig, mockLegacyConfig$, mockLogger ); @@ -209,7 +209,7 @@ describe('ES search strategy', () => { const params = { index: 'logstash-*', body: { query: {} } }; const esSearch = await enhancedEsSearchStrategyProvider( - mockConfig$, + mockConfig, mockLegacyConfig$, mockLogger ); @@ -237,7 +237,7 @@ describe('ES search strategy', () => { const params = { index: 'logstash-*', body: { query: {} } }; const esSearch = await enhancedEsSearchStrategyProvider( - mockConfig$, + mockConfig, mockLegacyConfig$, mockLogger ); @@ -262,7 +262,7 @@ describe('ES search strategy', () => { const params = { index: 'logstash-*', body: { query: {} } }; const esSearch = await enhancedEsSearchStrategyProvider( - mockConfig$, + mockConfig, mockLegacyConfig$, mockLogger ); @@ -287,7 +287,7 @@ describe('ES search strategy', () => { const id = 'some_id'; const esSearch = await enhancedEsSearchStrategyProvider( - mockConfig$, + mockConfig, mockLegacyConfig$, mockLogger ); @@ -311,7 +311,7 @@ describe('ES search strategy', () => { const id = 'some_id'; const esSearch = await enhancedEsSearchStrategyProvider( - mockConfig$, + mockConfig, mockLegacyConfig$, mockLogger ); @@ -338,7 +338,7 @@ describe('ES search strategy', () => { const id = 'some_other_id'; const keepAlive = '1d'; const esSearch = await enhancedEsSearchStrategyProvider( - mockConfig$, + mockConfig, mockLegacyConfig$, mockLogger ); @@ -357,7 +357,7 @@ describe('ES search strategy', () => { const id = 'some_other_id'; const keepAlive = '1d'; const esSearch = await enhancedEsSearchStrategyProvider( - mockConfig$, + mockConfig, mockLegacyConfig$, mockLogger ); diff --git a/x-pack/plugins/data_enhanced/server/search/es_search_strategy.ts b/x-pack/plugins/data_enhanced/server/search/es_search_strategy.ts index 402058a776605..fc1cc63146358 100644 --- a/x-pack/plugins/data_enhanced/server/search/es_search_strategy.ts +++ b/x-pack/plugins/data_enhanced/server/search/es_search_strategy.ts @@ -39,7 +39,7 @@ import { ConfigSchema } from '../../config'; import { getKbnServerError, KbnServerError } from '../../../../../src/plugins/kibana_utils/server'; export const enhancedEsSearchStrategyProvider = ( - config$: Observable, + config: ConfigSchema, legacyConfig$: Observable, logger: Logger, usage?: SearchUsage @@ -60,7 +60,6 @@ export const enhancedEsSearchStrategyProvider = ( const client = esClient.asCurrentUser.asyncSearch; const search = async () => { - const config = await config$.pipe(first()).toPromise(); const params = id ? getDefaultAsyncGetParams(options) : { diff --git a/x-pack/plugins/data_enhanced/server/search/session/monitoring_task.ts b/x-pack/plugins/data_enhanced/server/search/session/monitoring_task.ts index 75b6089cddf9b..8aa35def387b7 100644 --- a/x-pack/plugins/data_enhanced/server/search/session/monitoring_task.ts +++ b/x-pack/plugins/data_enhanced/server/search/session/monitoring_task.ts @@ -5,8 +5,6 @@ * 2.0. */ -import { Observable } from 'rxjs'; -import { first } from 'rxjs/operators'; import { Duration } from 'moment'; import { TaskManagerSetupContract, @@ -24,14 +22,13 @@ export const SEARCH_SESSIONS_TASK_ID = `data_enhanced_${SEARCH_SESSIONS_TASK_TYP interface SearchSessionTaskDeps { taskManager: TaskManagerSetupContract; logger: Logger; - config$: Observable; + config: ConfigSchema; } -function searchSessionRunner(core: CoreSetup, { logger, config$ }: SearchSessionTaskDeps) { +function searchSessionRunner(core: CoreSetup, { logger, config }: SearchSessionTaskDeps) { return ({ taskInstance }: RunContext) => { return { async run() { - const config = await config$.pipe(first()).toPromise(); const sessionConfig = config.search.sessions; const [coreStart] = await core.getStartServices(); const internalRepo = coreStart.savedObjects.createInternalRepository([SEARCH_SESSION_TYPE]); diff --git a/x-pack/plugins/data_enhanced/server/search/session/session_service.test.ts b/x-pack/plugins/data_enhanced/server/search/session/session_service.test.ts index 19679f02df0ad..24d13cf24ccfb 100644 --- a/x-pack/plugins/data_enhanced/server/search/session/session_service.test.ts +++ b/x-pack/plugins/data_enhanced/server/search/session/session_service.test.ts @@ -5,7 +5,6 @@ * 2.0. */ -import { BehaviorSubject } from 'rxjs'; import { SavedObject, SavedObjectsClientContract, @@ -46,7 +45,7 @@ describe('SearchSessionService', () => { beforeEach(async () => { savedObjectsClient = savedObjectsClientMock.create(); - const config$ = new BehaviorSubject({ + const config: ConfigSchema = { search: { sessions: { enabled: true, @@ -59,13 +58,13 @@ describe('SearchSessionService', () => { management: {} as any, }, }, - }); + }; const mockLogger: any = { debug: jest.fn(), warn: jest.fn(), error: jest.fn(), }; - service = new SearchSessionService(mockLogger, config$); + service = new SearchSessionService(mockLogger, config); const coreStart = coreMock.createStart(); const mockTaskManager = taskManagerMock.createStart(); await flushPromises(); diff --git a/x-pack/plugins/data_enhanced/server/search/session/session_service.ts b/x-pack/plugins/data_enhanced/server/search/session/session_service.ts index 059edd5edf1de..2d0e7e519e3bd 100644 --- a/x-pack/plugins/data_enhanced/server/search/session/session_service.ts +++ b/x-pack/plugins/data_enhanced/server/search/session/session_service.ts @@ -5,8 +5,6 @@ * 2.0. */ -import { Observable } from 'rxjs'; -import { first } from 'rxjs/operators'; import { CoreSetup, CoreStart, @@ -50,32 +48,33 @@ function sleep(ms: number) { } export class SearchSessionService implements ISearchSessionService { - private config!: SearchSessionsConfig; + private sessionConfig: SearchSessionsConfig; - constructor( - private readonly logger: Logger, - private readonly config$: Observable - ) {} + constructor(private readonly logger: Logger, private readonly config: ConfigSchema) { + this.sessionConfig = this.config.search.sessions; + } public setup(core: CoreSetup, deps: SetupDependencies) { registerSearchSessionsTask(core, { - config$: this.config$, + config: this.config, taskManager: deps.taskManager, logger: this.logger, }); } public async start(core: CoreStart, deps: StartDependencies) { - const configPromise = await this.config$.pipe(first()).toPromise(); - this.config = (await configPromise).search.sessions; return this.setupMonitoring(core, deps); } public stop() {} private setupMonitoring = async (core: CoreStart, deps: StartDependencies) => { - if (this.config.enabled) { - scheduleSearchSessionsTasks(deps.taskManager, this.logger, this.config.trackingInterval); + if (this.sessionConfig.enabled) { + scheduleSearchSessionsTasks( + deps.taskManager, + this.logger, + this.sessionConfig.trackingInterval + ); } }; @@ -107,7 +106,7 @@ export class SearchSessionService } catch (createError) { if ( SavedObjectsErrorHelpers.isConflictError(createError) && - retry < this.config.maxUpdateRetries + retry < this.sessionConfig.maxUpdateRetries ) { return await retryOnConflict(createError); } else { @@ -116,7 +115,7 @@ export class SearchSessionService } } else if ( SavedObjectsErrorHelpers.isConflictError(e) && - retry < this.config.maxUpdateRetries + retry < this.sessionConfig.maxUpdateRetries ) { return await retryOnConflict(e); } else { @@ -164,7 +163,7 @@ export class SearchSessionService sessionId, status: SearchSessionStatus.IN_PROGRESS, expires: new Date( - Date.now() + this.config.defaultExpiration.asMilliseconds() + Date.now() + this.sessionConfig.defaultExpiration.asMilliseconds() ).toISOString(), created: new Date().toISOString(), touched: new Date().toISOString(),