From 6486ef4b7d346a6ee9d99f7c13e62bb1310694a5 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Tue, 8 Jun 2021 15:02:19 -0500 Subject: [PATCH 001/130] wip --- src/plugins/index_pattern_editor/README.md | 93 +++ .../index_pattern_editor/jest.config.js | 13 + src/plugins/index_pattern_editor/kibana.json | 8 + .../public/components/_templates.scss | 11 + .../public/components/_variables.scss | 1 + .../empty_index_pattern_prompt.test.tsx.snap | 99 ++++ .../assets/index_pattern_illustration.scss | 9 + .../assets/index_pattern_illustration.tsx | 540 ++++++++++++++++++ .../empty_index_pattern_prompt.scss | 31 + .../empty_index_pattern_prompt.test.tsx | 26 + .../empty_index_pattern_prompt.tsx | 93 +++ .../empty_index_pattern_prompt/index.tsx | 9 + .../__snapshots__/empty_state.test.tsx.snap | 216 +++++++ .../components/empty_state/empty_state.scss | 23 + .../empty_state/empty_state.test.tsx | 62 ++ .../components/empty_state/empty_state.tsx | 229 ++++++++ .../public/components/empty_state/index.ts | 9 + .../advanced_parameters_section.tsx | 44 ++ .../components/field_editor/constants.ts | 37 ++ .../field_editor/field_editor.test.tsx | 275 +++++++++ .../field_editor/field_editor.tsx.old | 319 +++++++++++ .../components/field_editor/form_row.tsx | 86 +++ .../components/field_editor/form_schema.ts | 119 ++++ .../public/components/field_editor/index.ts | 9 + .../public/components/field_editor/lib.ts | 60 ++ .../field_editor/shadowing_field_warning.tsx | 32 ++ .../field_editor_flyout_content.test.ts | 191 +++++++ .../public/components/form_fields/index.ts | 9 + .../form_fields/timestamp_field.tsx | 73 +++ .../public/components/form_schema.ts | 153 +++++ .../public/components/index.ts | 17 + .../index_pattern_editor_flyout_content.tsx | 443 ++++++++++++++ ...index_pattern_flyout_content_container.tsx | 103 ++++ .../public/components/utils.test.ts | 37 ++ .../public/components/utils.ts | 51 ++ .../index_pattern_editor/public/constants.ts | 9 + .../index_pattern_editor/public/index.ts | 30 + .../__snapshots__/get_indices.test.ts.snap | 69 +++ .../public/lib/can_append_wildcard.test.ts | 31 + .../public/lib/can_append_wildcard.ts | 15 + .../public/lib/contains_illegal_characters.ts | 11 + .../lib/contains_invalid_characters.test.ts | 21 + .../public/lib/ensure_minimum_time.test.ts | 36 ++ .../public/lib/ensure_minimum_time.ts | 50 ++ .../public/lib/extract_time_fields.test.ts | 32 ++ .../public/lib/extract_time_fields.ts | 54 ++ .../public/lib/get_indices.test.ts | 96 ++++ .../public/lib/get_indices.ts | 109 ++++ .../public/lib/get_matched_indices.test.ts | 113 ++++ .../public/lib/get_matched_indices.ts | 95 +++ .../index_pattern_editor/public/lib/index.ts | 19 + .../index_pattern_editor/public/mocks.ts | 33 ++ .../public/open_editor.tsx | 81 +++ .../public/plugin.test.tsx | 180 ++++++ .../index_pattern_editor/public/plugin.ts | 42 ++ .../public/shared_imports.ts | 40 ++ .../public/test_utils/helpers.ts | 41 ++ .../public/test_utils/index.ts | 13 + .../public/test_utils/mocks.ts | 24 + .../public/test_utils/setup_environment.tsx | 80 +++ .../public/test_utils/test_utils.ts | 11 + .../index_pattern_editor/public/types.ts | 91 +++ .../index_pattern_editor/tsconfig.json | 21 + .../index_pattern_management/kibana.json | 2 +- .../empty_state/_templates.scss | 11 + .../empty_state/_variables.scss | 1 + .../empty_state/empty_state.scss | 4 +- .../empty_state/empty_state.tsx | 26 +- .../index_pattern_table.tsx | 58 +- .../mount_management_section.tsx | 3 +- .../index_pattern_management/public/plugin.ts | 2 + .../index_pattern_management/public/types.ts | 2 + .../index_pattern_management/tsconfig.json | 1 + 73 files changed, 5041 insertions(+), 46 deletions(-) create mode 100644 src/plugins/index_pattern_editor/README.md create mode 100644 src/plugins/index_pattern_editor/jest.config.js create mode 100644 src/plugins/index_pattern_editor/kibana.json create mode 100644 src/plugins/index_pattern_editor/public/components/_templates.scss create mode 100644 src/plugins/index_pattern_editor/public/components/_variables.scss create mode 100644 src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/__snapshots__/empty_index_pattern_prompt.test.tsx.snap create mode 100644 src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/assets/index_pattern_illustration.scss create mode 100644 src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/assets/index_pattern_illustration.tsx create mode 100644 src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/empty_index_pattern_prompt.scss create mode 100644 src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/empty_index_pattern_prompt.test.tsx create mode 100644 src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/empty_index_pattern_prompt.tsx create mode 100644 src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/index.tsx create mode 100644 src/plugins/index_pattern_editor/public/components/empty_state/__snapshots__/empty_state.test.tsx.snap create mode 100644 src/plugins/index_pattern_editor/public/components/empty_state/empty_state.scss create mode 100644 src/plugins/index_pattern_editor/public/components/empty_state/empty_state.test.tsx create mode 100644 src/plugins/index_pattern_editor/public/components/empty_state/empty_state.tsx create mode 100644 src/plugins/index_pattern_editor/public/components/empty_state/index.ts create mode 100644 src/plugins/index_pattern_editor/public/components/field_editor/advanced_parameters_section.tsx create mode 100644 src/plugins/index_pattern_editor/public/components/field_editor/constants.ts create mode 100644 src/plugins/index_pattern_editor/public/components/field_editor/field_editor.test.tsx create mode 100644 src/plugins/index_pattern_editor/public/components/field_editor/field_editor.tsx.old create mode 100644 src/plugins/index_pattern_editor/public/components/field_editor/form_row.tsx create mode 100644 src/plugins/index_pattern_editor/public/components/field_editor/form_schema.ts create mode 100644 src/plugins/index_pattern_editor/public/components/field_editor/index.ts create mode 100644 src/plugins/index_pattern_editor/public/components/field_editor/lib.ts create mode 100644 src/plugins/index_pattern_editor/public/components/field_editor/shadowing_field_warning.tsx create mode 100644 src/plugins/index_pattern_editor/public/components/field_editor_flyout_content.test.ts create mode 100644 src/plugins/index_pattern_editor/public/components/form_fields/index.ts create mode 100644 src/plugins/index_pattern_editor/public/components/form_fields/timestamp_field.tsx create mode 100644 src/plugins/index_pattern_editor/public/components/form_schema.ts create mode 100644 src/plugins/index_pattern_editor/public/components/index.ts create mode 100644 src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx create mode 100644 src/plugins/index_pattern_editor/public/components/index_pattern_flyout_content_container.tsx create mode 100644 src/plugins/index_pattern_editor/public/components/utils.test.ts create mode 100644 src/plugins/index_pattern_editor/public/components/utils.ts create mode 100644 src/plugins/index_pattern_editor/public/constants.ts create mode 100644 src/plugins/index_pattern_editor/public/index.ts create mode 100644 src/plugins/index_pattern_editor/public/lib/__snapshots__/get_indices.test.ts.snap create mode 100644 src/plugins/index_pattern_editor/public/lib/can_append_wildcard.test.ts create mode 100644 src/plugins/index_pattern_editor/public/lib/can_append_wildcard.ts create mode 100644 src/plugins/index_pattern_editor/public/lib/contains_illegal_characters.ts create mode 100644 src/plugins/index_pattern_editor/public/lib/contains_invalid_characters.test.ts create mode 100644 src/plugins/index_pattern_editor/public/lib/ensure_minimum_time.test.ts create mode 100644 src/plugins/index_pattern_editor/public/lib/ensure_minimum_time.ts create mode 100644 src/plugins/index_pattern_editor/public/lib/extract_time_fields.test.ts create mode 100644 src/plugins/index_pattern_editor/public/lib/extract_time_fields.ts create mode 100644 src/plugins/index_pattern_editor/public/lib/get_indices.test.ts create mode 100644 src/plugins/index_pattern_editor/public/lib/get_indices.ts create mode 100644 src/plugins/index_pattern_editor/public/lib/get_matched_indices.test.ts create mode 100644 src/plugins/index_pattern_editor/public/lib/get_matched_indices.ts create mode 100644 src/plugins/index_pattern_editor/public/lib/index.ts create mode 100644 src/plugins/index_pattern_editor/public/mocks.ts create mode 100644 src/plugins/index_pattern_editor/public/open_editor.tsx create mode 100644 src/plugins/index_pattern_editor/public/plugin.test.tsx create mode 100644 src/plugins/index_pattern_editor/public/plugin.ts create mode 100644 src/plugins/index_pattern_editor/public/shared_imports.ts create mode 100644 src/plugins/index_pattern_editor/public/test_utils/helpers.ts create mode 100644 src/plugins/index_pattern_editor/public/test_utils/index.ts create mode 100644 src/plugins/index_pattern_editor/public/test_utils/mocks.ts create mode 100644 src/plugins/index_pattern_editor/public/test_utils/setup_environment.tsx create mode 100644 src/plugins/index_pattern_editor/public/test_utils/test_utils.ts create mode 100644 src/plugins/index_pattern_editor/public/types.ts create mode 100644 src/plugins/index_pattern_editor/tsconfig.json create mode 100644 src/plugins/index_pattern_management/public/components/index_pattern_table/empty_state/_templates.scss create mode 100644 src/plugins/index_pattern_management/public/components/index_pattern_table/empty_state/_variables.scss diff --git a/src/plugins/index_pattern_editor/README.md b/src/plugins/index_pattern_editor/README.md new file mode 100644 index 0000000000000..cfd70d58d9798 --- /dev/null +++ b/src/plugins/index_pattern_editor/README.md @@ -0,0 +1,93 @@ +# Index pattern editor + + +// TODO + + +The reusable field editor across Kibana! + +This editor can be used to + +* create or edit a runtime field inside an index pattern. +* edit concrete (mapped) fields. In this case certain functionalities will be disabled like the possibility to change the field _type_ or to set the field _value_. + +## How to use + +You first need to add in your kibana.json the "`indexPatternFieldEditor`" plugin as a required dependency of your plugin. + +You will then receive in the start contract of the indexPatternFieldEditor plugin the following API: + +### `userPermissions.editIndexPattern(): boolean` + +Convenience method that uses the `core.application.capabilities` api to determine whether the user can edit the index pattern. + +### `openEditor(options: OpenFieldEditorOptions): CloseEditor` + +Use this method to open the index pattern field editor to either create (runtime) or edit (concrete | runtime) a field. + +#### `options` + +`ctx: FieldEditorContext` (**required**) + +This is the only required option. You need to provide the context in which the editor is being consumed. This object has the following properties: + +- `indexPattern: IndexPattern`: the index pattern you want to create/edit the field into. + +`onSave(field: IndexPatternField): void` (optional) + +You can provide an optional `onSave` handler to be notified when the field has being created/updated. This handler is called after the field has been persisted to the saved object. + +`fieldName: string` (optional) + +You can optionally pass the name of a field to edit. Leave empty to create a new runtime field based field. + +### `openDeleteModal(options: OpenFieldDeleteModalOptions): CloseEditor` + +Use this method to open a confirmation modal to delete runtime fields from an index pattern. + +#### `options` + +`ctx: FieldEditorContext` (**required**) + +You need to provide the context in which the deletion modal is being consumed. This object has the following properties: + +- `indexPattern: IndexPattern`: the index pattern you want to delete fields from. + +`onDelete(fieldNames: string[]): void` (optional) + +You can provide an optional `onDelete` handler to be notified when the fields have been deleted. This handler is called after the deletion has been persisted to the saved object. + +`fieldName: string | string[]` (**required**) + +You have to pass the field or fields to delete. + +### `` + +This children func React component provides a handler to delete one or multiple runtime fields. It can be used as an alternative to `openDeleteModal` in a react context. + +#### Props + +* `indexPattern: IndexPattern`: the current index pattern. (**required**) + +```js + +const { DeleteRuntimeFieldProvider } = indexPatternFieldEditor; + +// Single field + + {(deleteField) => ( + deleteField('myField')}> + Delete + + )} + + +// Multiple fields + + {(deleteFields) => ( + deleteFields(['field1', 'field2', 'field3'])}> + Delete + + )} + +``` diff --git a/src/plugins/index_pattern_editor/jest.config.js b/src/plugins/index_pattern_editor/jest.config.js new file mode 100644 index 0000000000000..0a018a42d06e6 --- /dev/null +++ b/src/plugins/index_pattern_editor/jest.config.js @@ -0,0 +1,13 @@ +/* + * 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. + */ + +module.exports = { + preset: '@kbn/test', + rootDir: '../../..', + roots: ['/src/plugins/index_pattern_editor'], +}; diff --git a/src/plugins/index_pattern_editor/kibana.json b/src/plugins/index_pattern_editor/kibana.json new file mode 100644 index 0000000000000..d1c925fffbde6 --- /dev/null +++ b/src/plugins/index_pattern_editor/kibana.json @@ -0,0 +1,8 @@ +{ + "id": "indexPatternEditor", + "version": "kibana", + "server": false, + "ui": true, + "requiredPlugins": ["data"], + "requiredBundles": ["kibanaReact", "esUiShared"] +} diff --git a/src/plugins/index_pattern_editor/public/components/_templates.scss b/src/plugins/index_pattern_editor/public/components/_templates.scss new file mode 100644 index 0000000000000..5303537bddabc --- /dev/null +++ b/src/plugins/index_pattern_editor/public/components/_templates.scss @@ -0,0 +1,11 @@ +%inp-empty-state-footer { + background: $euiColorLightestShade; + margin: 0 (-$euiSizeL) (-$euiSizeL); + padding: $euiSizeL; + border-radius: 0 0 $euiBorderRadius $euiBorderRadius; + + // sass-lint:disable-block mixins-before-declarations + @include euiBreakpoint('xs', 's') { + text-align: center; + } +} diff --git a/src/plugins/index_pattern_editor/public/components/_variables.scss b/src/plugins/index_pattern_editor/public/components/_variables.scss new file mode 100644 index 0000000000000..5da25a91bd77c --- /dev/null +++ b/src/plugins/index_pattern_editor/public/components/_variables.scss @@ -0,0 +1 @@ +$inpEmptyStateMaxWidth: $euiSizeXXL * 19; diff --git a/src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/__snapshots__/empty_index_pattern_prompt.test.tsx.snap b/src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/__snapshots__/empty_index_pattern_prompt.test.tsx.snap new file mode 100644 index 0000000000000..c5e6d1220d8bf --- /dev/null +++ b/src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/__snapshots__/empty_index_pattern_prompt.test.tsx.snap @@ -0,0 +1,99 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`EmptyIndexPatternPrompt should render normally 1`] = ` + + + + + + + +

+ +
+ +

+

+ +

+ + + + + + + + + + + + + + + + + + +`; diff --git a/src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/assets/index_pattern_illustration.scss b/src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/assets/index_pattern_illustration.scss new file mode 100644 index 0000000000000..cd0477aba7adf --- /dev/null +++ b/src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/assets/index_pattern_illustration.scss @@ -0,0 +1,9 @@ +.indexPatternIllustration { + &__verticalStripes { + fill: $euiColorFullShade; + } + + &__dots { + fill: $euiColorLightShade; + } +} diff --git a/src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/assets/index_pattern_illustration.tsx b/src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/assets/index_pattern_illustration.tsx new file mode 100644 index 0000000000000..3666c1be7b5d2 --- /dev/null +++ b/src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/assets/index_pattern_illustration.tsx @@ -0,0 +1,540 @@ +/* + * 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 './index_pattern_illustration.scss'; +import React from 'react'; + +const IndexPatternIllustration = () => ( + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +); + +export const Illustration = IndexPatternIllustration; diff --git a/src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/empty_index_pattern_prompt.scss b/src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/empty_index_pattern_prompt.scss new file mode 100644 index 0000000000000..ad2eb5edf7fcb --- /dev/null +++ b/src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/empty_index_pattern_prompt.scss @@ -0,0 +1,31 @@ +@import '../variables'; +@import '../templates'; + +.inpEmptyIndexPatternPrompt { + // override EUI specificity + max-width: $inpEmptyStateMaxWidth !important; // sass-lint:disable-line no-important +} + +.inpEmptyIndexPatternPrompt__footer { + @extend %inp-empty-state-footer; + // override EUI specificity + align-items: baseline !important; // sass-lint:disable-line no-important +} + +.inpEmptyIndexPatternPrompt__title { + // override EUI specificity + width: auto !important; // sass-lint:disable-line no-important +} + +@include euiBreakpoint('xs', 's') { + .inpEmptyIndexPatternPrompt__illustration > svg { + width: $euiSize * 12; + height: auto; + margin: 0 auto; + } + + .inpEmptyIndexPatternPrompt__text { + text-align: center; + align-items: center; + } +} diff --git a/src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/empty_index_pattern_prompt.test.tsx b/src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/empty_index_pattern_prompt.test.tsx new file mode 100644 index 0000000000000..1cd0574a35d15 --- /dev/null +++ b/src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/empty_index_pattern_prompt.test.tsx @@ -0,0 +1,26 @@ +/* + * 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 React from 'react'; +import { EmptyIndexPatternPrompt } from '../empty_index_pattern_prompt'; +import { shallowWithI18nProvider } from '@kbn/test/jest'; + +describe('EmptyIndexPatternPrompt', () => { + it('should render normally', () => { + const component = shallowWithI18nProvider( + {} }]} + docLinksIndexPatternIntro={'testUrl'} + setBreadcrumbs={() => {}} + /> + ); + + expect(component).toMatchSnapshot(); + }); +}); diff --git a/src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/empty_index_pattern_prompt.tsx b/src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/empty_index_pattern_prompt.tsx new file mode 100644 index 0000000000000..836171835b4b1 --- /dev/null +++ b/src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/empty_index_pattern_prompt.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 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 './empty_index_pattern_prompt.scss'; + +import React from 'react'; +import { FormattedMessage } from '@kbn/i18n/react'; + +import { EuiPageContent, EuiSpacer, EuiText, EuiFlexItem, EuiFlexGroup } from '@elastic/eui'; +import { EuiDescriptionListTitle } from '@elastic/eui'; +import { EuiDescriptionListDescription, EuiDescriptionList } from '@elastic/eui'; +import { EuiLink, EuiButton } from '@elastic/eui'; +import { Illustration } from './assets/index_pattern_illustration'; + +interface Props { + canSave: boolean; + docLinksIndexPatternIntro: string; + goToCreate: () => void; +} + +export const EmptyIndexPatternPrompt = ({ + canSave, + docLinksIndexPatternIntro, + goToCreate, +}: Props) => { + return ( + + + + + + + +

+ +
+ +

+

+ +

+ {canSave && ( + + + + )} + + + + + + + + + + + + + + + + ); +}; diff --git a/src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/index.tsx b/src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/index.tsx new file mode 100644 index 0000000000000..0a58c6f86a8d3 --- /dev/null +++ b/src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/index.tsx @@ -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 { EmptyIndexPatternPrompt } from './empty_index_pattern_prompt'; diff --git a/src/plugins/index_pattern_editor/public/components/empty_state/__snapshots__/empty_state.test.tsx.snap b/src/plugins/index_pattern_editor/public/components/empty_state/__snapshots__/empty_state.test.tsx.snap new file mode 100644 index 0000000000000..645694371f905 --- /dev/null +++ b/src/plugins/index_pattern_editor/public/components/empty_state/__snapshots__/empty_state.test.tsx.snap @@ -0,0 +1,216 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`EmptyState should render normally 1`] = ` + + + + + +

+ +

+ + + + + + + + + } + icon={ + + } + onClick={[Function]} + title={ + + } + /> + + + + } + icon={ + + } + isDisabled={false} + onClick={[Function]} + title={ + + } + /> + + + + } + icon={ + + } + onClick={[Function]} + title={ + + } + /> + + + +
+ + + + + , + "title": , + }, + ] + } + /> + + + + + + + , + "title": , + }, + ] + } + /> + + +
+ + + + + + + , + } + } + /> + + +`; diff --git a/src/plugins/index_pattern_editor/public/components/empty_state/empty_state.scss b/src/plugins/index_pattern_editor/public/components/empty_state/empty_state.scss new file mode 100644 index 0000000000000..9354a56c769a5 --- /dev/null +++ b/src/plugins/index_pattern_editor/public/components/empty_state/empty_state.scss @@ -0,0 +1,23 @@ +@import '../variables'; +@import '../templates'; + +.inpEmptyState { + // override EUI specificity + max-width: $inpEmptyStateMaxWidth !important; // sass-lint:disable-line no-important +} + +.inpEmptyState__cardGrid { + justify-content: center; +} + +.inpEmptyState__card { + min-width: $euiSizeXL * 6; +} + +.inpEmptyState__footer { + @extend %inp-empty-state-footer; +} + +.inpEmptyState__footerFlexItem { + min-width: $euiSizeXL * 7; +} diff --git a/src/plugins/index_pattern_editor/public/components/empty_state/empty_state.test.tsx b/src/plugins/index_pattern_editor/public/components/empty_state/empty_state.test.tsx new file mode 100644 index 0000000000000..fa300667ff919 --- /dev/null +++ b/src/plugins/index_pattern_editor/public/components/empty_state/empty_state.test.tsx @@ -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 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 React from 'react'; +import { EmptyState } from '../empty_state'; +import { shallow } from 'enzyme'; +import sinon from 'sinon'; +import { findTestSubject } from '@elastic/eui/lib/test'; +import { mountWithIntl } from '@kbn/test/jest'; +import { docLinksServiceMock } from '../../../../../../core/public/mocks'; +import { MlCardState } from '../../../types'; + +const docLinks = docLinksServiceMock.createStartContract(); + +jest.mock('react-router-dom', () => ({ + useHistory: () => ({ + createHref: jest.fn(), + }), +})); + +describe('EmptyState', () => { + it('should render normally', () => { + const component = shallow( + {}} + navigateToApp={async () => {}} + getMlCardState={() => MlCardState.ENABLED} + canSave={true} + /> + ); + + expect(component).toMatchSnapshot(); + }); + + describe('props', () => { + describe('onRefresh', () => { + it('is called when refresh button is clicked', () => { + const onRefreshHandler = sinon.stub(); + + const component = mountWithIntl( + {}} + getMlCardState={() => MlCardState.ENABLED} + canSave={true} + /> + ); + + findTestSubject(component, 'refreshIndicesButton').simulate('click'); + + sinon.assert.calledOnce(onRefreshHandler); + }); + }); + }); +}); diff --git a/src/plugins/index_pattern_editor/public/components/empty_state/empty_state.tsx b/src/plugins/index_pattern_editor/public/components/empty_state/empty_state.tsx new file mode 100644 index 0000000000000..3d302a305b0bc --- /dev/null +++ b/src/plugins/index_pattern_editor/public/components/empty_state/empty_state.tsx @@ -0,0 +1,229 @@ +/* + * 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 './empty_state.scss'; +import React from 'react'; +import { i18n } from '@kbn/i18n'; +import { FormattedMessage } from '@kbn/i18n/react'; +import { DocLinksStart, ApplicationStart } from 'kibana/public'; +import { + EuiPageContentHeader, + EuiPageContentHeaderSection, + EuiTitle, + EuiPageContentBody, + EuiPageContent, + EuiIcon, + EuiSpacer, + EuiFlexItem, + EuiDescriptionList, + EuiFlexGrid, + EuiCard, + EuiLink, + EuiText, +} from '@elastic/eui'; + +export const EmptyState = ({ + onRefresh, + navigateToApp, + docLinks, + canSave, + closeFlyout, + createAnyway, +}: { + onRefresh: () => void; + navigateToApp: ApplicationStart['navigateToApp']; + closeFlyout: () => void; + docLinks: DocLinksStart; + canSave: boolean; + createAnyway: () => void; +}) => { + const mlCard = ( + + { + navigateToApp('ml', { path: '#/filedatavisualizer' }); + closeFlyout(); + }} + className="inpEmptyState__card" + betaBadgeLabel={ + // getMlCardState() === MlCardState.ENABLED + // ? undefined + i18n.translate('indexPatternManagement.createIndexPattern.emptyState.basicLicenseLabel', { + defaultMessage: 'Basic', + }) + } + betaBadgeTooltipContent={i18n.translate( + 'indexPatternManagement.createIndexPattern.emptyState.basicLicenseDescription', + { + defaultMessage: 'This feature requires a Basic license.', + } + )} + // isDisabled={getMlCardState() === MlCardState.DISABLED} + icon={} + title={ + + } + description={ + + } + /> + + ); + + const createAnywayLink = ( + + createAnyway()} data-test-subj="createAnyway"> + + + ), + }} + /> + + ); + + return ( + <> + + + + +

+ +

+ + + + + + + + { + navigateToApp('home', { path: '#/tutorial_directory' }); + closeFlyout(); + }} + icon={} + title={ + + } + description={ + + } + /> + + {/* getMlCardState() !== MlCardState.HIDDEN ? mlCard : <> */} + {mlCard} + + { + navigateToApp('home', { path: '#/tutorial_directory/sampleData' }); + closeFlyout(); + }} + icon={} + title={ + + } + description={ + + } + /> + + + +
+ + + + ), + description: ( + + + + ), + }, + ]} + /> + + + + ), + description: ( + + {' '} + + + ), + }, + ]} + /> + + +
+ + + + {canSave && createAnywayLink} + + ); +}; diff --git a/src/plugins/index_pattern_editor/public/components/empty_state/index.ts b/src/plugins/index_pattern_editor/public/components/empty_state/index.ts new file mode 100644 index 0000000000000..4e19a60d5a769 --- /dev/null +++ b/src/plugins/index_pattern_editor/public/components/empty_state/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 { EmptyState } from './empty_state'; diff --git a/src/plugins/index_pattern_editor/public/components/field_editor/advanced_parameters_section.tsx b/src/plugins/index_pattern_editor/public/components/field_editor/advanced_parameters_section.tsx new file mode 100644 index 0000000000000..26504eee28ddb --- /dev/null +++ b/src/plugins/index_pattern_editor/public/components/field_editor/advanced_parameters_section.tsx @@ -0,0 +1,44 @@ +/* + * 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 React, { useState } from 'react'; +import { i18n } from '@kbn/i18n'; + +import { EuiButtonEmpty, EuiSpacer } from '@elastic/eui'; + +interface Props { + children: React.ReactNode; +} + +export const AdvancedParametersSection = ({ children }: Props) => { + const [isVisible, setIsVisible] = useState(false); + + const toggleIsVisible = () => { + setIsVisible(!isVisible); + }; + + return ( + <> + + {isVisible + ? i18n.translate('indexPatternFieldEditor.editor.form.advancedSettings.hideButtonLabel', { + defaultMessage: 'Hide advanced settings', + }) + : i18n.translate('indexPatternFieldEditor.editor.form.advancedSettings.showButtonLabel', { + defaultMessage: 'Show advanced settings', + })} + + +
+ + {/* We ned to wrap the children inside a "div" to have our css :first-child rule */} +
{children}
+
+ + ); +}; diff --git a/src/plugins/index_pattern_editor/public/components/field_editor/constants.ts b/src/plugins/index_pattern_editor/public/components/field_editor/constants.ts new file mode 100644 index 0000000000000..82711f707fa19 --- /dev/null +++ b/src/plugins/index_pattern_editor/public/components/field_editor/constants.ts @@ -0,0 +1,37 @@ +/* + * 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 { EuiComboBoxOptionOption } from '@elastic/eui'; +import { RuntimeType } from '../../shared_imports'; + +export const RUNTIME_FIELD_OPTIONS: Array> = [ + { + label: 'Keyword', + value: 'keyword', + }, + { + label: 'Long', + value: 'long', + }, + { + label: 'Double', + value: 'double', + }, + { + label: 'Date', + value: 'date', + }, + { + label: 'IP', + value: 'ip', + }, + { + label: 'Boolean', + value: 'boolean', + }, +]; diff --git a/src/plugins/index_pattern_editor/public/components/field_editor/field_editor.test.tsx b/src/plugins/index_pattern_editor/public/components/field_editor/field_editor.test.tsx new file mode 100644 index 0000000000000..b3fada3dbd00f --- /dev/null +++ b/src/plugins/index_pattern_editor/public/components/field_editor/field_editor.test.tsx @@ -0,0 +1,275 @@ +/* + * 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 React, { useState, useMemo } from 'react'; +import { act } from 'react-dom/test-utils'; + +import '../../test_utils/setup_environment'; +import { registerTestBed, TestBed, getCommonActions } from '../../test_utils'; +import { RuntimeFieldPainlessError } from '../../lib'; +import { Field } from '../../types'; +import { FieldEditor, Props, FieldEditorFormState } from './field_editor'; + +const defaultProps: Props = { + onChange: jest.fn(), + links: { + runtimePainless: 'https://elastic.co', + }, + ctx: { + existingConcreteFields: [], + namesNotAllowed: [], + fieldTypeToProcess: 'runtime', + }, + indexPattern: { fields: [] } as any, + fieldFormatEditors: { + getAll: () => [], + getById: () => undefined, + }, + fieldFormats: {} as any, + uiSettings: {} as any, + syntaxError: { + error: null, + clear: () => {}, + }, +}; + +const setup = (props?: Partial) => { + const testBed = registerTestBed(FieldEditor, { + memoryRouter: { + wrapComponent: false, + }, + })({ ...defaultProps, ...props }) as TestBed; + + const actions = { + ...getCommonActions(testBed), + }; + + return { + ...testBed, + actions, + }; +}; + +describe('', () => { + beforeAll(() => { + jest.useFakeTimers(); + }); + + afterAll(() => { + jest.useRealTimers(); + }); + + let testBed: TestBed & { actions: ReturnType }; + let onChange: jest.Mock = jest.fn(); + + const lastOnChangeCall = (): FieldEditorFormState[] => + onChange.mock.calls[onChange.mock.calls.length - 1]; + + const getLastStateUpdate = () => lastOnChangeCall()[0]; + + const submitFormAndGetData = async (state: FieldEditorFormState) => { + let formState: + | { + data: Field; + isValid: boolean; + } + | undefined; + + let promise: ReturnType; + + await act(async () => { + // We can't await for the promise here as the validation for the + // "script" field has a setTimeout which is mocked by jest. If we await + // we don't have the chance to call jest.advanceTimersByTime and thus the + // test times out. + promise = state.submit(); + }); + + await act(async () => { + // The painless syntax validation has a timeout set to 600ms + // we give it a bit more time just to be on the safe side + jest.advanceTimersByTime(1000); + }); + + await act(async () => { + promise.then((response) => { + formState = response; + }); + }); + + return formState!; + }; + + beforeEach(() => { + onChange = jest.fn(); + }); + + test('initial state should have "set custom label", "set value" and "set format" turned off', () => { + testBed = setup(); + + ['customLabel', 'value', 'format'].forEach((row) => { + const testSubj = `${row}Row.toggle`; + const toggle = testBed.find(testSubj); + const isOn = toggle.props()['aria-checked']; + + try { + expect(isOn).toBe(false); + } catch (e) { + e.message = `"${row}" row toggle expected to be 'off' but was 'on'. \n${e.message}`; + throw e; + } + }); + }); + + test('should accept a defaultValue and onChange prop to forward the form state', async () => { + const field = { + name: 'foo', + type: 'date', + script: { source: 'emit("hello")' }, + }; + + testBed = setup({ onChange, field }); + + expect(onChange).toHaveBeenCalled(); + + let lastState = getLastStateUpdate(); + expect(lastState.isValid).toBe(undefined); + expect(lastState.isSubmitted).toBe(false); + expect(lastState.submit).toBeDefined(); + + const { data: formData } = await submitFormAndGetData(lastState); + expect(formData).toEqual(field); + + // Make sure that both isValid and isSubmitted state are now "true" + lastState = getLastStateUpdate(); + expect(lastState.isValid).toBe(true); + expect(lastState.isSubmitted).toBe(true); + }); + + describe('validation', () => { + test('should accept an optional list of existing fields and prevent creating duplicates', async () => { + const existingFields = ['myRuntimeField']; + testBed = setup({ + onChange, + ctx: { + namesNotAllowed: existingFields, + existingConcreteFields: [], + fieldTypeToProcess: 'runtime', + }, + }); + + const { form, component, actions } = testBed; + + await act(async () => { + actions.toggleFormRow('value'); + }); + + await act(async () => { + form.setInputValue('nameField.input', existingFields[0]); + form.setInputValue('scriptField', 'echo("hello")'); + }); + + await act(async () => { + jest.advanceTimersByTime(1000); // Make sure our debounced error message is in the DOM + }); + + const lastState = getLastStateUpdate(); + await submitFormAndGetData(lastState); + component.update(); + expect(getLastStateUpdate().isValid).toBe(false); + expect(form.getErrorsMessages()).toEqual(['A field with this name already exists.']); + }); + + test('should not count the default value as a duplicate', async () => { + const existingRuntimeFieldNames = ['myRuntimeField']; + const field: Field = { + name: 'myRuntimeField', + type: 'boolean', + script: { source: 'emit("hello"' }, + }; + + testBed = setup({ + field, + onChange, + ctx: { + namesNotAllowed: existingRuntimeFieldNames, + existingConcreteFields: [], + fieldTypeToProcess: 'runtime', + }, + }); + + const { form, component } = testBed; + const lastState = getLastStateUpdate(); + await submitFormAndGetData(lastState); + component.update(); + expect(getLastStateUpdate().isValid).toBe(true); + expect(form.getErrorsMessages()).toEqual([]); + }); + + test('should clear the painless syntax error whenever the field type changes', async () => { + const field: Field = { + name: 'myRuntimeField', + type: 'keyword', + script: { source: 'emit(6)' }, + }; + + const TestComponent = () => { + const dummyError = { + reason: 'Awwww! Painless syntax error', + message: '', + position: { offset: 0, start: 0, end: 0 }, + scriptStack: [''], + }; + const [error, setError] = useState(null); + const clearError = useMemo(() => () => setError(null), []); + const syntaxError = useMemo(() => ({ error, clear: clearError }), [error, clearError]); + + return ( + <> + + + {/* Button to forward dummy syntax error */} + + + ); + }; + + const customTestbed = registerTestBed(TestComponent, { + memoryRouter: { + wrapComponent: false, + }, + })() as TestBed; + + testBed = { + ...customTestbed, + actions: getCommonActions(customTestbed), + }; + + const { + form, + component, + find, + actions: { changeFieldType }, + } = testBed; + + // We set some dummy painless error + act(() => { + find('setPainlessErrorButton').simulate('click'); + }); + component.update(); + + expect(form.getErrorsMessages()).toEqual(['Awwww! Painless syntax error']); + + // We change the type and expect the form error to not be there anymore + await changeFieldType('keyword'); + expect(form.getErrorsMessages()).toEqual([]); + }); + }); +}); diff --git a/src/plugins/index_pattern_editor/public/components/field_editor/field_editor.tsx.old b/src/plugins/index_pattern_editor/public/components/field_editor/field_editor.tsx.old new file mode 100644 index 0000000000000..fc25879b128ec --- /dev/null +++ b/src/plugins/index_pattern_editor/public/components/field_editor/field_editor.tsx.old @@ -0,0 +1,319 @@ +/* + * 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 React, { useEffect } from 'react'; +import { i18n } from '@kbn/i18n'; +import { FormattedMessage } from '@kbn/i18n/react'; +import { + EuiFlexGroup, + EuiFlexItem, + EuiSpacer, + EuiComboBoxOptionOption, + EuiCode, + EuiCallOut, +} from '@elastic/eui'; +import type { CoreStart } from 'src/core/public'; + +import { + Form, + useForm, + useFormData, + FormHook, + UseField, + TextField, + RuntimeType, + IndexPattern, + DataPublicPluginStart, +} from '../../shared_imports'; +import { Field, InternalFieldType, PluginStart } from '../../types'; + +import { RUNTIME_FIELD_OPTIONS } from './constants'; +import { schema } from './form_schema'; +import { getNameFieldConfig } from './lib'; +import { + TypeField, + CustomLabelField, + ScriptField, + FormatField, + PopularityField, + ScriptSyntaxError, +} from './form_fields'; +import { FormRow } from './form_row'; +import { AdvancedParametersSection } from './advanced_parameters_section'; + +export interface FieldEditorFormState { + isValid: boolean | undefined; + isSubmitted: boolean; + submit: FormHook['submit']; +} + +export interface FieldFormInternal extends Omit { + type: Array>; + __meta__: { + isCustomLabelVisible: boolean; + isValueVisible: boolean; + isFormatVisible: boolean; + isPopularityVisible: boolean; + }; +} + +export interface Props { + /** Link URLs to our doc site */ + links: { + runtimePainless: string; + }; + /** Optional field to edit */ + field?: Field; + /** Handler to receive state changes updates */ + onChange?: (state: FieldEditorFormState) => void; + indexPattern: IndexPattern; + fieldFormatEditors: PluginStart['fieldFormatEditors']; + fieldFormats: DataPublicPluginStart['fieldFormats']; + uiSettings: CoreStart['uiSettings']; + /** Context object */ + ctx: { + /** The internal field type we are dealing with (concrete|runtime)*/ + fieldTypeToProcess: InternalFieldType; + /** + * An array of field names not allowed. + * e.g we probably don't want a user to give a name of an existing + * runtime field (for that the user should edit the existing runtime field). + */ + namesNotAllowed: string[]; + /** + * An array of existing concrete fields. If the user gives a name to the runtime + * field that matches one of the concrete fields, a callout will be displayed + * to indicate that this runtime field will shadow the concrete field. + * It is also used to provide the list of field autocomplete suggestions to the code editor. + */ + existingConcreteFields: Array<{ name: string; type: string }>; + }; + syntaxError: ScriptSyntaxError; +} + +const geti18nTexts = (): { + [key: string]: { title: string; description: JSX.Element | string }; +} => ({ + customLabel: { + title: i18n.translate('indexPatternFieldEditor.editor.form.customLabelTitle', { + defaultMessage: 'Set custom label', + }), + description: i18n.translate('indexPatternFieldEditor.editor.form.customLabelDescription', { + defaultMessage: `Create a label to display in place of the field name in Discover, Maps, and Visualize. Useful for shortening a long field name. Queries and filters use the original field name.`, + }), + }, + value: { + title: i18n.translate('indexPatternFieldEditor.editor.form.valueTitle', { + defaultMessage: 'Set value', + }), + description: ( + {'_source'}, + }} + /> + ), + }, + format: { + title: i18n.translate('indexPatternFieldEditor.editor.form.formatTitle', { + defaultMessage: 'Set format', + }), + description: i18n.translate('indexPatternFieldEditor.editor.form.formatDescription', { + defaultMessage: `Set your preferred format for displaying the value. Changing the format can affect the value and prevent highlighting in Discover.`, + }), + }, + popularity: { + title: i18n.translate('indexPatternFieldEditor.editor.form.popularityTitle', { + defaultMessage: 'Set popularity', + }), + description: i18n.translate('indexPatternFieldEditor.editor.form.popularityDescription', { + defaultMessage: `Adjust the popularity to make the field appear higher or lower in the fields list. By default, Discover orders fields from most selected to least selected.`, + }), + }, +}); + +const changeWarning = i18n.translate('indexPatternFieldEditor.editor.form.changeWarning', { + defaultMessage: + 'Changing name or type can break searches and visualizations that rely on this field.', +}); + +const formDeserializer = (field: Field): FieldFormInternal => { + let fieldType: Array>; + if (!field.type) { + fieldType = [RUNTIME_FIELD_OPTIONS[0]]; + } else { + const label = RUNTIME_FIELD_OPTIONS.find(({ value }) => value === field.type)?.label; + fieldType = [{ label: label ?? field.type, value: field.type as RuntimeType }]; + } + + return { + ...field, + type: fieldType, + __meta__: { + isCustomLabelVisible: field.customLabel !== undefined, + isValueVisible: field.script !== undefined, + isFormatVisible: field.format !== undefined, + isPopularityVisible: field.popularity !== undefined, + }, + }; +}; + +const formSerializer = (field: FieldFormInternal): Field => { + const { __meta__, type, ...rest } = field; + return { + type: type[0].value!, + ...rest, + }; +}; + +const FieldEditorComponent = ({ + field, + onChange, + links, + indexPattern, + fieldFormatEditors, + fieldFormats, + uiSettings, + syntaxError, + ctx: { fieldTypeToProcess, namesNotAllowed, existingConcreteFields }, +}: Props) => { + const { form } = useForm({ + defaultValue: field, + schema, + deserializer: formDeserializer, + serializer: formSerializer, + }); + const { submit, isValid: isFormValid, isSubmitted } = form; + const { clear: clearSyntaxError } = syntaxError; + + const [{ type }] = useFormData({ form }); + + const nameFieldConfig = getNameFieldConfig(namesNotAllowed, field); + const i18nTexts = geti18nTexts(); + + useEffect(() => { + if (onChange) { + onChange({ isValid: isFormValid, isSubmitted, submit }); + } + }, [onChange, isFormValid, isSubmitted, submit]); + + useEffect(() => { + // Whenever the field "type" changes we clear any possible painless syntax + // error as it is possibly stale. + clearSyntaxError(); + }, [type, clearSyntaxError]); + + const [{ name: updatedName, type: updatedType }] = useFormData({ form }); + const nameHasChanged = Boolean(field?.name) && field?.name !== updatedName; + const typeHasChanged = + Boolean(field?.type) && field?.type !== (updatedType && updatedType[0].value); + + return ( +
+ + {/* Name */} + + + path="name" + config={nameFieldConfig} + component={TextField} + data-test-subj="nameField" + componentProps={{ + euiFieldProps: { + disabled: fieldTypeToProcess === 'concrete', + 'aria-label': i18n.translate('indexPatternFieldEditor.editor.form.nameAriaLabel', { + defaultMessage: 'Name field', + }), + }, + }} + /> + + + {/* Type */} + + + + + + {(nameHasChanged || typeHasChanged) && ( + <> + + + + )} + + + {/* Set custom label */} + + + + + {/* Set value */} + {fieldTypeToProcess === 'runtime' && ( + + + + )} + + {/* Set custom format */} + + + + + {/* Advanced settings */} + + + + + + + ); +}; + +export const FieldEditor = React.memo(FieldEditorComponent); diff --git a/src/plugins/index_pattern_editor/public/components/field_editor/form_row.tsx b/src/plugins/index_pattern_editor/public/components/field_editor/form_row.tsx new file mode 100644 index 0000000000000..66f5af09c8b2f --- /dev/null +++ b/src/plugins/index_pattern_editor/public/components/field_editor/form_row.tsx @@ -0,0 +1,86 @@ +/* + * 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 React from 'react'; +import { get } from 'lodash'; +import { + EuiFlexGroup, + EuiFlexItem, + EuiTitle, + EuiText, + EuiHorizontalRule, + EuiSpacer, +} from '@elastic/eui'; + +import { UseField, ToggleField, useFormData } from '../../shared_imports'; + +interface Props { + title: string; + formFieldPath: string; + children: React.ReactNode; + description?: string | JSX.Element; + withDividerRule?: boolean; + 'data-test-subj'?: string; +} + +export const FormRow = ({ + title, + description, + children, + formFieldPath, + withDividerRule = false, + 'data-test-subj': dataTestSubj, +}: Props) => { + const [formData] = useFormData({ watch: formFieldPath }); + const isContentVisible = Boolean(get(formData, formFieldPath)); + + return ( + <> + + + + + + +
+ {/* Title */} + +

{title}

+ + + + {/* Description */} + + {description} + + + {/* Content */} + {isContentVisible && ( + <> + + {children} + + )} +
+ + + + {withDividerRule && } + + ); +}; diff --git a/src/plugins/index_pattern_editor/public/components/field_editor/form_schema.ts b/src/plugins/index_pattern_editor/public/components/field_editor/form_schema.ts new file mode 100644 index 0000000000000..a722f277b8e23 --- /dev/null +++ b/src/plugins/index_pattern_editor/public/components/field_editor/form_schema.ts @@ -0,0 +1,119 @@ +/* + * 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 { fieldValidators } from '../../shared_imports'; + +import { RUNTIME_FIELD_OPTIONS } from './constants'; + +const { emptyField, numberGreaterThanField } = fieldValidators; + +export const schema = { + name: { + label: i18n.translate('indexPatternFieldEditor.editor.form.nameLabel', { + defaultMessage: 'Name', + }), + validations: [ + { + validator: emptyField( + i18n.translate( + 'indexPatternFieldEditor.editor.form.validations.nameIsRequiredErrorMessage', + { + defaultMessage: 'A name is required.', + } + ) + ), + }, + ], + }, + type: { + label: i18n.translate('indexPatternFieldEditor.editor.form.runtimeTypeLabel', { + defaultMessage: 'Type', + }), + defaultValue: [RUNTIME_FIELD_OPTIONS[0]], + }, + script: { + source: { + label: i18n.translate('indexPatternFieldEditor.editor.form.defineFieldLabel', { + defaultMessage: 'Define script', + }), + validations: [ + { + validator: emptyField( + i18n.translate( + 'indexPatternFieldEditor.editor.form.validations.scriptIsRequiredErrorMessage', + { + defaultMessage: 'A script is required to set the field value.', + } + ) + ), + }, + ], + }, + }, + customLabel: { + label: i18n.translate('indexPatternFieldEditor.editor.form.customLabelLabel', { + defaultMessage: 'Custom label', + }), + validations: [ + { + validator: emptyField( + i18n.translate( + 'indexPatternFieldEditor.editor.form.validations.customLabelIsRequiredErrorMessage', + { + defaultMessage: 'Give a label to the field.', + } + ) + ), + }, + ], + }, + popularity: { + label: i18n.translate('indexPatternFieldEditor.editor.form.popularityLabel', { + defaultMessage: 'Popularity', + }), + validations: [ + { + validator: emptyField( + i18n.translate( + 'indexPatternFieldEditor.editor.form.validations.popularityIsRequiredErrorMessage', + { + defaultMessage: 'Give a popularity to the field.', + } + ) + ), + }, + { + validator: numberGreaterThanField({ + than: 0, + allowEquality: true, + message: i18n.translate( + 'indexPatternFieldEditor.editor.form.validations.popularityGreaterThan0ErrorMessage', + { + defaultMessage: 'The popularity must be zero or greater.', + } + ), + }), + }, + ], + }, + __meta__: { + isCustomLabelVisible: { + defaultValue: false, + }, + isValueVisible: { + defaultValue: false, + }, + isFormatVisible: { + defaultValue: false, + }, + isPopularityVisible: { + defaultValue: false, + }, + }, +}; diff --git a/src/plugins/index_pattern_editor/public/components/field_editor/index.ts b/src/plugins/index_pattern_editor/public/components/field_editor/index.ts new file mode 100644 index 0000000000000..db7c05fa7ff7a --- /dev/null +++ b/src/plugins/index_pattern_editor/public/components/field_editor/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 { FieldEditor } from './field_editor'; diff --git a/src/plugins/index_pattern_editor/public/components/field_editor/lib.ts b/src/plugins/index_pattern_editor/public/components/field_editor/lib.ts new file mode 100644 index 0000000000000..2d324804c9e43 --- /dev/null +++ b/src/plugins/index_pattern_editor/public/components/field_editor/lib.ts @@ -0,0 +1,60 @@ +/* + * 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 { ValidationFunc, FieldConfig } from '../../shared_imports'; +import { Field } from '../../types'; +import { schema } from './form_schema'; +import { Props } from './field_editor'; + +const createNameNotAllowedValidator = ( + namesNotAllowed: string[] +): ValidationFunc<{}, string, string> => ({ value }) => { + if (namesNotAllowed.includes(value)) { + return { + message: i18n.translate( + 'indexPatternFieldEditor.editor.runtimeFieldsEditor.existRuntimeFieldNamesValidationErrorMessage', + { + defaultMessage: 'A field with this name already exists.', + } + ), + }; + } +}; + +/** + * Dynamically retrieve the config for the "name" field, adding + * a validator to avoid duplicated runtime fields to be created. + * + * @param namesNotAllowed Array of names not allowed for the field "name" + * @param field Initial value of the form + */ +export const getNameFieldConfig = ( + namesNotAllowed?: string[], + field?: Props['field'] +): FieldConfig => { + const nameFieldConfig = schema.name as FieldConfig; + + if (!namesNotAllowed) { + return nameFieldConfig; + } + + // Add validation to not allow duplicates + return { + ...nameFieldConfig!, + validations: [ + ...(nameFieldConfig.validations ?? []), + { + validator: createNameNotAllowedValidator( + namesNotAllowed.filter((name) => name !== field?.name) + ), + }, + ], + }; +}; diff --git a/src/plugins/index_pattern_editor/public/components/field_editor/shadowing_field_warning.tsx b/src/plugins/index_pattern_editor/public/components/field_editor/shadowing_field_warning.tsx new file mode 100644 index 0000000000000..4343b13db9a5a --- /dev/null +++ b/src/plugins/index_pattern_editor/public/components/field_editor/shadowing_field_warning.tsx @@ -0,0 +1,32 @@ +/* + * 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 React from 'react'; +import { i18n } from '@kbn/i18n'; +import { EuiCallOut } from '@elastic/eui'; + +export const ShadowingFieldWarning = () => { + return ( + +
+ {i18n.translate('indexPatternFieldEditor.editor.form.fieldShadowingCalloutDescription', { + defaultMessage: + 'This field shares the name of a mapped field. Values for this field will be returned in search results.', + })} +
+ + ); +}; diff --git a/src/plugins/index_pattern_editor/public/components/field_editor_flyout_content.test.ts b/src/plugins/index_pattern_editor/public/components/field_editor_flyout_content.test.ts new file mode 100644 index 0000000000000..286931ad0e854 --- /dev/null +++ b/src/plugins/index_pattern_editor/public/components/field_editor_flyout_content.test.ts @@ -0,0 +1,191 @@ +/* + * 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 { act } from 'react-dom/test-utils'; + +import '../test_utils/setup_environment'; +import { registerTestBed, TestBed, noop, docLinks, getCommonActions } from '../test_utils'; + +import { FieldEditor } from './field_editor'; +import { FieldEditorFlyoutContent, Props } from './field_editor_flyout_content'; + +const defaultProps: Props = { + onSave: noop, + onCancel: noop, + docLinks, + FieldEditor, + indexPattern: { fields: [] } as any, + uiSettings: {} as any, + fieldFormats: {} as any, + fieldFormatEditors: {} as any, + fieldTypeToProcess: 'runtime', + runtimeFieldValidator: () => Promise.resolve(null), + isSavingField: false, +}; + +const setup = (props: Props = defaultProps) => { + const testBed = registerTestBed(FieldEditorFlyoutContent, { + memoryRouter: { wrapComponent: false }, + })(props) as TestBed; + + const actions = { + ...getCommonActions(testBed), + }; + + return { + ...testBed, + actions, + }; +}; + +describe('', () => { + beforeAll(() => { + jest.useFakeTimers(); + }); + + afterAll(() => { + jest.useRealTimers(); + }); + + test('should have the correct title', () => { + const { exists, find } = setup(); + expect(exists('flyoutTitle')).toBe(true); + expect(find('flyoutTitle').text()).toBe('Create field'); + }); + + test('should allow a field to be provided', () => { + const field = { + name: 'foo', + type: 'ip', + script: { + source: 'emit("hello world")', + }, + }; + + const { find } = setup({ ...defaultProps, field }); + + expect(find('flyoutTitle').text()).toBe(`Edit field 'foo'`); + expect(find('nameField.input').props().value).toBe(field.name); + expect(find('typeField').props().value).toBe(field.type); + expect(find('scriptField').props().value).toBe(field.script.source); + }); + + test('should accept an "onSave" prop', async () => { + const field = { + name: 'foo', + type: 'date', + script: { source: 'test=123' }, + }; + const onSave: jest.Mock = jest.fn(); + + const { find } = setup({ ...defaultProps, onSave, field }); + + await act(async () => { + find('fieldSaveButton').simulate('click'); + }); + + await act(async () => { + // The painless syntax validation has a timeout set to 600ms + // we give it a bit more time just to be on the safe side + jest.advanceTimersByTime(1000); + }); + + expect(onSave).toHaveBeenCalled(); + const fieldReturned = onSave.mock.calls[onSave.mock.calls.length - 1][0]; + expect(fieldReturned).toEqual(field); + }); + + test('should accept an onCancel prop', () => { + const onCancel = jest.fn(); + const { find } = setup({ ...defaultProps, onCancel }); + + find('closeFlyoutButton').simulate('click'); + + expect(onCancel).toHaveBeenCalled(); + }); + + describe('validation', () => { + test('should validate the fields and prevent saving invalid form', async () => { + const onSave: jest.Mock = jest.fn(); + + const { find, exists, form, component } = setup({ ...defaultProps, onSave }); + + expect(find('fieldSaveButton').props().disabled).toBe(false); + + await act(async () => { + find('fieldSaveButton').simulate('click'); + }); + + await act(async () => { + jest.advanceTimersByTime(1000); + }); + + component.update(); + + expect(onSave).toHaveBeenCalledTimes(0); + expect(find('fieldSaveButton').props().disabled).toBe(true); + expect(form.getErrorsMessages()).toEqual(['A name is required.']); + expect(exists('formError')).toBe(true); + expect(find('formError').text()).toBe('Fix errors in form before continuing.'); + }); + + test('should forward values from the form', async () => { + const onSave: jest.Mock = jest.fn(); + + const { + find, + component, + form, + actions: { toggleFormRow, changeFieldType }, + } = setup({ ...defaultProps, onSave }); + + act(() => { + form.setInputValue('nameField.input', 'someName'); + toggleFormRow('value'); + }); + component.update(); + + await act(async () => { + form.setInputValue('scriptField', 'echo("hello")'); + }); + + await act(async () => { + // Let's make sure that validation has finished running + jest.advanceTimersByTime(1000); + }); + + await act(async () => { + find('fieldSaveButton').simulate('click'); + }); + + expect(onSave).toHaveBeenCalled(); + + let fieldReturned = onSave.mock.calls[onSave.mock.calls.length - 1][0]; + + expect(fieldReturned).toEqual({ + name: 'someName', + type: 'keyword', // default to keyword + script: { source: 'echo("hello")' }, + }); + + // Change the type and make sure it is forwarded + await changeFieldType('other_type', 'Other type'); + + await act(async () => { + find('fieldSaveButton').simulate('click'); + }); + + fieldReturned = onSave.mock.calls[onSave.mock.calls.length - 1][0]; + + expect(fieldReturned).toEqual({ + name: 'someName', + type: 'other_type', + script: { source: 'echo("hello")' }, + }); + }); + }); +}); diff --git a/src/plugins/index_pattern_editor/public/components/form_fields/index.ts b/src/plugins/index_pattern_editor/public/components/form_fields/index.ts new file mode 100644 index 0000000000000..2c74ffba7263d --- /dev/null +++ b/src/plugins/index_pattern_editor/public/components/form_fields/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 { TimestampField } from './timestamp_field'; diff --git a/src/plugins/index_pattern_editor/public/components/form_fields/timestamp_field.tsx b/src/plugins/index_pattern_editor/public/components/form_fields/timestamp_field.tsx new file mode 100644 index 0000000000000..7ef04bb0ea8d9 --- /dev/null +++ b/src/plugins/index_pattern_editor/public/components/form_fields/timestamp_field.tsx @@ -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 React from 'react'; +import { i18n } from '@kbn/i18n'; + +import { EuiFormRow, EuiComboBox } from '@elastic/eui'; + +import { UseField } from '../../shared_imports'; + +import { TimestampOption } from '../index_pattern_editor_flyout_content'; + +interface Props { + isDisabled?: boolean; + options: TimestampOption[]; +} + +export const TimestampField = ({ isDisabled = false, options = [] }: Props) => { + const optionsAsComboBoxOptions = options.map(({ display, fieldName }) => ({ + label: display, + value: fieldName, + })); + + return ( + path="timestampField"> + {({ label, value, setValue }) => { + if (value === undefined) { + return null; + } + return ( + <> + + + placeholder={i18n.translate( + 'indexPatternFieldEditor.editor.form.runtimeType.placeholderLabel', + { + defaultMessage: 'Select a timestamp field', + } + )} + singleSelection={{ asPlainText: true }} + options={optionsAsComboBoxOptions} + selectedOptions={[{ label: value }]} + onChange={(newValue) => { + if (newValue.length === 0) { + // Don't allow clearing the type. One must always be selected + return; + } + // + setValue(newValue[0].label); + }} + isClearable={false} + isDisabled={isDisabled} + data-test-subj="timestampField" + aria-label={i18n.translate( + 'indexPatternFieldEditor.editor.form.typeSelectAriaLabel', + { + defaultMessage: 'Timestamp field', + } + )} + fullWidth + /> + + + ); + }} + + ); +}; diff --git a/src/plugins/index_pattern_editor/public/components/form_schema.ts b/src/plugins/index_pattern_editor/public/components/form_schema.ts new file mode 100644 index 0000000000000..e4ebcc9bf4cea --- /dev/null +++ b/src/plugins/index_pattern_editor/public/components/form_schema.ts @@ -0,0 +1,153 @@ +/* + * 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 { fieldValidators } from '../shared_imports'; + +// import { RUNTIME_FIELD_OPTIONS } from './constants'; + +// const { emptyField, numberGreaterThanField } = fieldValidators; + +export const schema = { + title: { + label: i18n.translate('indexPatternEditor.editor.form.titleLabel', { + defaultMessage: 'Name', + }), + defaultValue: '', + helpText: + 'Use an asterisk (*) to match multiple indices. Spaces and the characters , /, ?, ", <, >, | are not allowed.', + validations: [ + { + validator: fieldValidators.emptyField( + i18n.translate('indexPatternEditor.editor.form.validations.titleIsRequiredErrorMessage', { + defaultMessage: 'A name is required.', + }) + ), + }, + ], + }, + timestampField: { + label: i18n.translate('indexPatternEditor.editor.form.timeFieldLabel', { + defaultMessage: 'Timestamp field', + }), + // defaultValue: '', + helpText: 'Select a primary time field for use with the global time filter.', + validations: [ + { + validator: fieldValidators.emptyField( + i18n.translate( + 'indexPatternEditor.editor.form.validations.timeFieldSelectionIsRequiredErrorMessage', + { + defaultMessage: 'A time field selection is required.', + } + ) + ), + }, + ], + }, + allowHidden: { + label: i18n.translate('indexPatternEditor.editor.form.allowHiddenLabel', { + defaultMessage: 'Allow hidden and system indices', + }), + defaultValue: false, + }, + id: { + label: i18n.translate('indexPatternEditor.editor.form.customIdLabel', { + defaultMessage: 'Custom index pattern ID', + }), + helpText: + 'Kibana will provide a unique identifier for each index pattern. If you do not want to use this unique ID, enter a custom one.', + }, + /* + type: { + label: i18n.translate('indexPatternFieldEditor.editor.form.runtimeTypeLabel', { + defaultMessage: 'Type', + }), + defaultValue: [RUNTIME_FIELD_OPTIONS[0]], + }, + script: { + source: { + label: i18n.translate('indexPatternFieldEditor.editor.form.defineFieldLabel', { + defaultMessage: 'Define script', + }), + validations: [ + { + validator: emptyField( + i18n.translate( + 'indexPatternFieldEditor.editor.form.validations.scriptIsRequiredErrorMessage', + { + defaultMessage: 'A script is required to set the field value.', + } + ) + ), + }, + ], + }, + }, + customLabel: { + label: i18n.translate('indexPatternFieldEditor.editor.form.customLabelLabel', { + defaultMessage: 'Custom label', + }), + validations: [ + { + validator: emptyField( + i18n.translate( + 'indexPatternFieldEditor.editor.form.validations.customLabelIsRequiredErrorMessage', + { + defaultMessage: 'Give a label to the field.', + } + ) + ), + }, + ], + }, + popularity: { + label: i18n.translate('indexPatternFieldEditor.editor.form.popularityLabel', { + defaultMessage: 'Popularity', + }), + validations: [ + { + validator: emptyField( + i18n.translate( + 'indexPatternFieldEditor.editor.form.validations.popularityIsRequiredErrorMessage', + { + defaultMessage: 'Give a popularity to the field.', + } + ) + ), + }, + { + validator: numberGreaterThanField({ + than: 0, + allowEquality: true, + message: i18n.translate( + 'indexPatternFieldEditor.editor.form.validations.popularityGreaterThan0ErrorMessage', + { + defaultMessage: 'The popularity must be zero or greater.', + } + ), + }), + }, + ], + }, + __meta__: { + isCustomLabelVisible: { + defaultValue: false, + }, + isValueVisible: { + defaultValue: false, + }, + isFormatVisible: { + defaultValue: false, + }, + isPopularityVisible: { + defaultValue: false, + }, + }, + */ +}; diff --git a/src/plugins/index_pattern_editor/public/components/index.ts b/src/plugins/index_pattern_editor/public/components/index.ts new file mode 100644 index 0000000000000..30e6e80268032 --- /dev/null +++ b/src/plugins/index_pattern_editor/public/components/index.ts @@ -0,0 +1,17 @@ +/* + * 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 { + IndexPatternEditorFlyoutContent, + Props as IndexPatternEditorFlyoutContentProps, +} from './index_pattern_editor_flyout_content'; + +export { + IndexPatternFlyoutContentContainer, + Props as IndexPatternEditorFlyoutContentContainerProps, +} from './index_pattern_flyout_content_container'; diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx new file mode 100644 index 0000000000000..3d0ec37c88068 --- /dev/null +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx @@ -0,0 +1,443 @@ +/* + * 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 React, { useState, useEffect } from 'react'; +import { i18n } from '@kbn/i18n'; +import { + EuiFlyoutHeader, + EuiFlyoutBody, + EuiFlyoutFooter, + EuiTitle, + EuiFlexGroup, + EuiFlexItem, + EuiButtonEmpty, + EuiButton, +} from '@elastic/eui'; + +import { DocLinksStart, CoreStart } from 'src/core/public'; +import { getIndexPatterns } from './utils'; + +import { ensureMinimumTime, getIndices, extractTimeFields, getMatchedIndices } from '../lib'; +import { AdvancedParametersSection } from './field_editor/advanced_parameters_section'; + +import { + IndexPatternSpec, + DataPublicPluginStart, + Form, + UseField, + useForm, + TextField, + useFormData, + HttpStart, + ToggleField, +} from '../shared_imports'; + +import { MatchedItem, ResolveIndexResponseItemAlias, IndexPatternTableItem } from '../types'; + +import { schema } from './form_schema'; +import { TimestampField } from './form_fields'; +import { EmptyState } from './empty_state'; +import { EmptyIndexPatternPrompt } from './empty_index_pattern_prompt'; + +export interface Props { + /** + * Handler for the "save" footer button + */ + onSave: (indexPatternSpec: IndexPatternSpec) => void; + /** + * Handler for the "cancel" footer button + */ + onCancel: () => void; + /** + * The docLinks start service from core + */ + docLinks: DocLinksStart; + + // uiSettings: CoreStart['uiSettings']; + isSaving: boolean; + existingIndexPatterns: string[]; + http: HttpStart; + indexPatternService: DataPublicPluginStart['indexPatterns']; + navigateToApp: CoreStart['application']['navigateToApp']; + canCreateIndexPattern: boolean; +} + +export interface IndexPatternConfig { + title: string; + timestampField?: string; // TimestampOption; + allowHidden: boolean; + id?: string; +} +export interface TimestampOption { + display: string; + fieldName?: string; + isDisabled?: boolean; +} + +export interface FormInternal extends Omit { + timestampField?: TimestampOption; +} + +const count = 0; + +const geti18nTexts = () => { + return { + closeButtonLabel: i18n.translate('indexPatternFieldEditor.editor.flyoutCloseButtonLabel', { + defaultMessage: 'Close', + }), + saveButtonLabel: i18n.translate('indexPatternFieldEditor.editor.flyoutSaveButtonLabel', { + defaultMessage: 'Save', + }), + }; +}; + +const IndexPatternEditorFlyoutContentComponent = ({ + onSave, + onCancel, + docLinks, + isSaving, + // existingIndexPatterns, + http, + indexPatternService, + navigateToApp, + canCreateIndexPattern, +}: Props) => { + const i18nTexts = geti18nTexts(); + + // return type, interal type + const { form } = useForm({ + defaultValue: { title: '' }, + schema, + }); + + const [{ title, allowHidden }] = useFormData({ form }); + const [isLoadingSources, setIsLoadingSources] = useState(true); + + const [formState, setFormState] = useState<{ isSubmitted: boolean; isValid: boolean }>({ + isSubmitted: false, + isValid: false, + /* isValid: field ? true : undefined, + submit: field + ? async () => ({ isValid: true, data: field }) + : async () => ({ isValid: false, data: {} as Field }), + */ + }); + const [lastTitle, setLastTitle] = useState(''); + const [exactMatchedIndices, setExactMatchedIndices] = useState([]); + const [partialMatchedIndices, setPartialMatchedIndices] = useState([]); + const [timestampFields, setTimestampFields] = useState([]); + const [sources, setSources] = useState([]); + const [remoteClustersExist, setRemoteClustersExist] = useState(false); + const [isLoadingIndexPatterns, setIsLoadingIndexPatterns] = useState(true); + const [goToForm, setGoToForm] = useState(false); + // const [indexPatterns, setIndexPatterns] = useState([]); + + const [existingIndexPatterns, setExistingIndexPatterns] = useState([]); + + const removeAliases = (item: MatchedItem) => + !((item as unknown) as ResolveIndexResponseItemAlias).indices; + + const loadSources = () => { + getIndices(http, () => [], '*', false).then((dataSources) => + setSources(dataSources.filter(removeAliases)) + ); + getIndices(http, () => [], '*:*', false).then((dataSources) => + setRemoteClustersExist(!!dataSources.filter(removeAliases).length) + ); + }; + + useEffect(() => { + getIndices(http, () => [], '*', false).then(async (dataSources) => { + setSources(dataSources.filter(removeAliases)); + setIsLoadingSources(false); + }); + getIndices(http, () => [], '*:*', false).then((dataSources) => + setRemoteClustersExist(!!dataSources.filter(removeAliases).length) + ); + }, [http]); + + useEffect(() => { + const getTitles = async () => { + const indexPatternTitles = await indexPatternService.getTitles(); + setExistingIndexPatterns(indexPatternTitles); + }; + getTitles(); + setIsLoadingIndexPatterns(false); + }, [indexPatternService]); + + useEffect(() => { + const fetchIndices = async (query: string = '') => { + if (!query) { + setExactMatchedIndices([]); + setPartialMatchedIndices([]); + setTimestampFields([]); + return; + } + // const { indexPatternCreationType } = this.props; + + // this.setState({ isLoadingIndices: true, indexPatternExists: false }); + const indexRequests = []; + + if (query?.endsWith('*')) { + const exactMatchedQuery = getIndices( + http, + (indexName: string) => [], // indexPatternCreationType.getIndexTags(indexName), + query, + allowHidden + ); + indexRequests.push(exactMatchedQuery); + indexRequests.push(Promise.resolve([])); + } else { + const exactMatchQuery = getIndices( + http, + (indexName: string) => [], // (indexName: string) => indexPatternCreationType.getIndexTags(indexName), + query, + allowHidden + ); + const partialMatchQuery = getIndices( + http, + (indexName: string) => [], // (indexName: string) => indexPatternCreationType.getIndexTags(indexName), + `${query}*`, + allowHidden + ); + indexRequests.push(exactMatchQuery); + indexRequests.push(partialMatchQuery); + } + + const [exactMatched, partialMatched] = (await ensureMinimumTime( + indexRequests + )) as MatchedItem[][]; + + // If the search changed, discard this state + + // if (query !== this.lastQuery) { + // return; + // } + + // this.setState({ + // partialMatchedIndices, + // exactMatchedIndices, + // isLoadingIndices: false, + // }); + const isValidResult = + !!title?.length && !existingIndexPatterns.includes(title) && exactMatched.length > 0; + + setFormState({ + isSubmitted: false, + isValid: isValidResult, // todo show error when index pattern already exists + }); + setExactMatchedIndices(exactMatched); + setPartialMatchedIndices(partialMatched); + + if (isValidResult) { + const fields = await ensureMinimumTime( + indexPatternService.getFieldsForWildcard({ + pattern: query, + // ...getFetchForWildcardOptions(), + }) + ); + const timeFields = extractTimeFields(fields); + setTimestampFields(timeFields); + } else { + setTimestampFields([]); + } + }; + + // Whenever the field "type" changes we clear any possible painless syntax + // error as it is possibly stale. + setLastTitle(title); + + fetchIndices(title); + }, [title, existingIndexPatterns, http, indexPatternService, allowHidden]); + + const { isValid } = formState; + const onClickSave = async () => { + const formData = form.getFormData(); + await onSave({ + title: formData.title, + timeFieldName: formData.timestampField, + id: formData.id, + }); + }; + + // todo + const matchedIndices = getMatchedIndices( + [], // allIndices, + partialMatchedIndices, + exactMatchedIndices, + allowHidden + ); + + if (isLoadingSources || isLoadingIndexPatterns) { + return <>loading; + } + + const hasDataIndices = sources.some(({ name }: MatchedItem) => !name.startsWith('.')); + + if (!existingIndexPatterns.length && !goToForm) { + if (!hasDataIndices && !remoteClustersExist) { + // load data + return ( + setGoToForm(true)} + /> + ); + } else { + // first time + return ( + setGoToForm(true)} + /> + ); + } + } + + return ( + <> + + +

Create index pattern

+ + + + + {/* + possibly break out into own component + */} +
+ + {/* Name */} + + + path="title" + // config={nameFieldConfig} + component={TextField} + data-test-subj="titleField" + componentProps={{ + euiFieldProps: { + 'aria-label': i18n.translate('indexPatternEditor.form.titleAriaLabel', { + defaultMessage: 'Title field', + }), + }, + }} + /> + + + + + {/* disable when no time fields */} + + path="timestampField" + // config={{ options: timestampFields }} + options={timestampFields} + component={TimestampField} + data-test-subj="timestampField" + componentProps={{ + euiFieldProps: { + 'aria-label': i18n.translate('indexPatternEditor.form.timestampAriaLabel', { + defaultMessage: 'Timestamp field', + }), + }, + }} + /> + + + +
{exactMatchedIndices.map((item) => item.name).join(', ')}
+ + {/* + + hi + {/* } + */} + + + + path={'allowHidden'} + component={ToggleField} + data-test-subj="allowHiddenField" + componentProps={{ + euiFieldProps: { + 'aria-label': i18n.translate('indexPatternEditor.form.timestampAriaLabel', { + defaultMessage: 'Allow hidden and system indices', + }), + }, + }} + /> + + + + + + path={'id'} + component={TextField} + data-test-subj="savedObjectIdField" + componentProps={{ + euiFieldProps: { + 'aria-label': i18n.translate( + 'indexPatternEditor.form.customIndexPatternIdLabel', + { + defaultMessage: 'Custom index pattern ID', + } + ), + }, + }} + /> + + + +
+ + + + + + + {i18nTexts.closeButtonLabel} + + + + + + {i18nTexts.saveButtonLabel} + + + + + {/* modal */} + + ); +}; + +export const IndexPatternEditorFlyoutContent = React.memo(IndexPatternEditorFlyoutContentComponent); diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_flyout_content_container.tsx b/src/plugins/index_pattern_editor/public/components/index_pattern_flyout_content_container.tsx new file mode 100644 index 0000000000000..d7629a2943f8f --- /dev/null +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_flyout_content_container.tsx @@ -0,0 +1,103 @@ +/* + * 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 React, { useEffect, useState } from 'react'; +import { DocLinksStart, NotificationsStart, CoreStart } from 'src/core/public'; +import { i18n } from '@kbn/i18n'; + +import { IndexPattern, DataPublicPluginStart, IndexPatternSpec } from '../shared_imports'; +// import { PluginStart, InternalFieldType } from '../types'; +// import { deserializeField, getRuntimeFieldValidator } from '../lib'; +// import { Props as FieldEditorProps } from './field_editor/field_editor'; +import { IndexPatternEditorFlyoutContent } from './index_pattern_editor_flyout_content'; + +export interface Props { + /** + * Handler for the "save" footer button + */ + onSave: (indexPattern: IndexPattern) => void; + /** + * Handler for the "cancel" footer button + */ + onCancel: () => void; + /** + * The docLinks start service from core + */ + docLinks: DocLinksStart; + /** + * The context object specific to where the editor is currently being consumed + */ + // ctx: FieldEditorContext; + /** + * Optional field to edit + */ + // field?: IndexPatternField; + /** + * Services + */ + indexPatternService: DataPublicPluginStart['indexPatterns']; + notifications: NotificationsStart; + // fieldFormatEditors: PluginStart['fieldFormatEditors']; + // fieldFormats: DataPublicPluginStart['fieldFormats']; + // uiSettings: CoreStart['uiSettings']; + http: CoreStart['http']; + navigateToApp: CoreStart['application']['navigateToApp']; + canCreateIndexPattern: boolean; +} + +/** + * The container component will be in charge of the communication with the index pattern service + * to retrieve/save the field in the saved object. + * The component is the presentational component that won't know + * anything about where a field comes from and where it should be persisted. + */ + +export const IndexPatternFlyoutContentContainer = ({ + onSave, + onCancel, + docLinks, + indexPatternService, + notifications, + http, + navigateToApp, + canCreateIndexPattern, +}: Props) => { + const onSaveClick = async (indexPatternSpec: IndexPatternSpec) => { + const indexPattern = await indexPatternService.createAndSave(indexPatternSpec); + const message = i18n.translate('indexPatternEditor.saved', { + defaultMessage: "Saved '{indexPatternTitle}'", + values: { indexPatternTitle: indexPattern.title }, + }); + notifications.toasts.addSuccess(message); + await onSave(indexPattern); + }; + + const [existingIndexPatterns, setExistingIndexPatterns] = useState([]); + + useEffect(() => { + const getTitles = async () => { + const indexPatternTitles = await indexPatternService.getTitles(); + setExistingIndexPatterns(indexPatternTitles); + }; + getTitles(); + }, [indexPatternService]); + + return ( + + ); +}; diff --git a/src/plugins/index_pattern_editor/public/components/utils.test.ts b/src/plugins/index_pattern_editor/public/components/utils.test.ts new file mode 100644 index 0000000000000..15e0a65390f4d --- /dev/null +++ b/src/plugins/index_pattern_editor/public/components/utils.test.ts @@ -0,0 +1,37 @@ +/* + * 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 { IndexPatternsContract } from 'src/plugins/data/public'; +import { getIndexPatterns } from './utils'; +import { mockManagementPlugin } from '../mocks'; + +const indexPatternContractMock = ({ + getIdsWithTitle: jest.fn().mockReturnValue( + Promise.resolve([ + { + id: 'test', + title: 'test name', + }, + { + id: 'test1', + title: 'test name 1', + }, + ]) + ), + get: jest.fn().mockReturnValue(Promise.resolve({})), +} as unknown) as jest.Mocked; + +const mockManagementPluginStart = mockManagementPlugin.createStartContract(); + +test('getting index patterns', async () => { + const indexPatterns = await getIndexPatterns( + 'test', + mockManagementPluginStart, + indexPatternContractMock + ); + expect(indexPatterns).toMatchSnapshot(); +}); diff --git a/src/plugins/index_pattern_editor/public/components/utils.ts b/src/plugins/index_pattern_editor/public/components/utils.ts new file mode 100644 index 0000000000000..68e78199798b4 --- /dev/null +++ b/src/plugins/index_pattern_editor/public/components/utils.ts @@ -0,0 +1,51 @@ +/* + * 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 { IndexPatternsContract } from 'src/plugins/data/public'; +import { IndexPatternManagementStart } from '../plugin'; + +export async function getIndexPatterns( + defaultIndex: string, + indexPatternManagementStart: IndexPatternManagementStart, + indexPatternsService: IndexPatternsContract +) { + const existingIndexPatterns = await indexPatternsService.getIdsWithTitle(true); + const indexPatternsListItems = await Promise.all( + existingIndexPatterns.map(async ({ id, title }) => { + const isDefault = defaultIndex === id; + const pattern = await indexPatternsService.get(id); + const tags = (indexPatternManagementStart as IndexPatternManagementStart).list.getIndexPatternTags( + pattern, + isDefault + ); + + return { + id, + title, + default: isDefault, + tags, + // the prepending of 0 at the default pattern takes care of prioritization + // so the sorting will but the default index on top + // or on bottom of a the table + sort: `${isDefault ? '0' : '1'}${title}`, + }; + }) + ); + + return ( + indexPatternsListItems.sort((a, b) => { + if (a.sort < b.sort) { + return -1; + } else if (a.sort > b.sort) { + return 1; + } else { + return 0; + } + }) || [] + ); +} diff --git a/src/plugins/index_pattern_editor/public/constants.ts b/src/plugins/index_pattern_editor/public/constants.ts new file mode 100644 index 0000000000000..b74ba8b900aab --- /dev/null +++ b/src/plugins/index_pattern_editor/public/constants.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 const pluginName = 'index_pattern_editor'; diff --git a/src/plugins/index_pattern_editor/public/index.ts b/src/plugins/index_pattern_editor/public/index.ts new file mode 100644 index 0000000000000..93001d1ea349f --- /dev/null +++ b/src/plugins/index_pattern_editor/public/index.ts @@ -0,0 +1,30 @@ +/* + * 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. + */ + +/** + * Management Plugin - public + * + * This is the entry point for the entire client-side public contract of the plugin. + * If something is not explicitly exported here, you can safely assume it is private + * to the plugin and not considered stable. + * + * All stateful contracts will be injected by the platform at runtime, and are defined + * in the setup/start interfaces in `plugin.ts`. The remaining items exported here are + * either types, or static code. + */ + +import { IndexPatternEditorPlugin } from './plugin'; + +export { PluginStart as IndexPatternEditorStart } from './types'; + +export function plugin() { + return new IndexPatternEditorPlugin(); +} + +// Expose types +export type { OpenEditorOptions } from './open_editor'; diff --git a/src/plugins/index_pattern_editor/public/lib/__snapshots__/get_indices.test.ts.snap b/src/plugins/index_pattern_editor/public/lib/__snapshots__/get_indices.test.ts.snap new file mode 100644 index 0000000000000..99876383b4343 --- /dev/null +++ b/src/plugins/index_pattern_editor/public/lib/__snapshots__/get_indices.test.ts.snap @@ -0,0 +1,69 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`getIndices response object to item array 1`] = ` +Array [ + Object { + "item": Object { + "attributes": Array [ + "frozen", + ], + "name": "frozen_index", + }, + "name": "frozen_index", + "tags": Array [ + Object { + "color": "default", + "key": "index", + "name": "Index", + }, + Object { + "color": "danger", + "key": "frozen", + "name": "Frozen", + }, + ], + }, + Object { + "item": Object { + "indices": Array [], + "name": "test_alias", + }, + "name": "test_alias", + "tags": Array [ + Object { + "color": "default", + "key": "alias", + "name": "Alias", + }, + ], + }, + Object { + "item": Object { + "backing_indices": Array [], + "name": "test_data_stream", + "timestamp_field": "test_timestamp_field", + }, + "name": "test_data_stream", + "tags": Array [ + Object { + "color": "primary", + "key": "data_stream", + "name": "Data stream", + }, + ], + }, + Object { + "item": Object { + "name": "test_index", + }, + "name": "test_index", + "tags": Array [ + Object { + "color": "default", + "key": "index", + "name": "Index", + }, + ], + }, +] +`; diff --git a/src/plugins/index_pattern_editor/public/lib/can_append_wildcard.test.ts b/src/plugins/index_pattern_editor/public/lib/can_append_wildcard.test.ts new file mode 100644 index 0000000000000..ff2482d1db9af --- /dev/null +++ b/src/plugins/index_pattern_editor/public/lib/can_append_wildcard.test.ts @@ -0,0 +1,31 @@ +/* + * 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 { canAppendWildcard } from './can_append_wildcard'; + +describe('canAppendWildcard', () => { + test('ignores symbols', () => { + expect(canAppendWildcard('%')).toBeFalsy(); + }); + + test('accepts numbers', () => { + expect(canAppendWildcard('1')).toBeTruthy(); + }); + + test('accepts letters', () => { + expect(canAppendWildcard('b')).toBeTruthy(); + }); + + test('accepts uppercase letters', () => { + expect(canAppendWildcard('B')).toBeTruthy(); + }); + + test('ignores if more than one key pressed', () => { + expect(canAppendWildcard('ab')).toBeFalsy(); + }); +}); diff --git a/src/plugins/index_pattern_editor/public/lib/can_append_wildcard.ts b/src/plugins/index_pattern_editor/public/lib/can_append_wildcard.ts new file mode 100644 index 0000000000000..3e192a7e6acf7 --- /dev/null +++ b/src/plugins/index_pattern_editor/public/lib/can_append_wildcard.ts @@ -0,0 +1,15 @@ +/* + * 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 const canAppendWildcard = (keyPressed: string) => { + // If it's not a letter, number or is something longer, reject it + if (!keyPressed || !/[a-z0-9]/i.test(keyPressed) || keyPressed.length !== 1) { + return false; + } + return true; +}; diff --git a/src/plugins/index_pattern_editor/public/lib/contains_illegal_characters.ts b/src/plugins/index_pattern_editor/public/lib/contains_illegal_characters.ts new file mode 100644 index 0000000000000..362817d8338df --- /dev/null +++ b/src/plugins/index_pattern_editor/public/lib/contains_illegal_characters.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 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 function containsIllegalCharacters(pattern: string, illegalCharacters: string[]) { + return illegalCharacters.some((char) => pattern.includes(char)); +} diff --git a/src/plugins/index_pattern_editor/public/lib/contains_invalid_characters.test.ts b/src/plugins/index_pattern_editor/public/lib/contains_invalid_characters.test.ts new file mode 100644 index 0000000000000..eea2a791c322b --- /dev/null +++ b/src/plugins/index_pattern_editor/public/lib/contains_invalid_characters.test.ts @@ -0,0 +1,21 @@ +/* + * 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 { containsIllegalCharacters } from './contains_illegal_characters'; + +describe('containsIllegalCharacters', () => { + it('returns true with illegal characters', () => { + const isInvalid = containsIllegalCharacters('abc', ['a']); + expect(isInvalid).toBe(true); + }); + + it('returns false with no illegal characters', () => { + const isInvalid = containsIllegalCharacters('abc', ['%']); + expect(isInvalid).toBe(false); + }); +}); diff --git a/src/plugins/index_pattern_editor/public/lib/ensure_minimum_time.test.ts b/src/plugins/index_pattern_editor/public/lib/ensure_minimum_time.test.ts new file mode 100644 index 0000000000000..1bda1b9b5394c --- /dev/null +++ b/src/plugins/index_pattern_editor/public/lib/ensure_minimum_time.test.ts @@ -0,0 +1,36 @@ +/* + * 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 { ensureMinimumTime } from './ensure_minimum_time'; + +describe('ensureMinimumTime', () => { + it('resolves single promise', async (done) => { + const promiseA = new Promise((resolve) => resolve('a')); + const a = await ensureMinimumTime(promiseA, 0); + expect(a).toBe('a'); + done(); + }); + + it('resolves multiple promises', async (done) => { + const promiseA = new Promise((resolve) => resolve('a')); + const promiseB = new Promise((resolve) => resolve('b')); + const [a, b] = await ensureMinimumTime([promiseA, promiseB], 0); + expect(a).toBe('a'); + expect(b).toBe('b'); + done(); + }); + + it('resolves in the amount of time provided, at minimum', async (done) => { + const startTime = new Date().getTime(); + const promise = new Promise((resolve) => resolve()); + await ensureMinimumTime(promise, 100); + const endTime = new Date().getTime(); + expect(endTime - startTime).toBeGreaterThanOrEqual(100); + done(); + }); +}); diff --git a/src/plugins/index_pattern_editor/public/lib/ensure_minimum_time.ts b/src/plugins/index_pattern_editor/public/lib/ensure_minimum_time.ts new file mode 100644 index 0000000000000..5c52446efbe34 --- /dev/null +++ b/src/plugins/index_pattern_editor/public/lib/ensure_minimum_time.ts @@ -0,0 +1,50 @@ +/* + * 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. + */ + +/** + * When you make an async request, typically you want to show the user a spinner while they wait. + * However, if the request takes less than 300 ms, the spinner will flicker in the UI and the user + * won't have time to register it as a spinner. This function ensures the spinner (or whatever + * you're showing the user) displays for at least 300 ms, even if the request completes before then. + */ + +export const DEFAULT_MINIMUM_TIME_MS = 300; + +export async function ensureMinimumTime( + promiseOrPromises: Promise | Array>, + minimumTimeMs = DEFAULT_MINIMUM_TIME_MS +) { + let returnValue; + + // https://kibana-ci.elastic.co/job/elastic+kibana+6.x+multijob-intake/128/console + // We're having periodic failures around the timing here. I'm not exactly sure + // why it's not consistent but I'm going to add some buffer space here to + // prevent these random failures + const bufferedMinimumTimeMs = minimumTimeMs + 5; + + // Block on the async action and start the clock. + const asyncActionStartTime = new Date().getTime(); + if (Array.isArray(promiseOrPromises)) { + returnValue = await Promise.all(promiseOrPromises); + } else { + returnValue = await promiseOrPromises; + } + + // Measure how long the async action took to complete. + const asyncActionCompletionTime = new Date().getTime(); + const asyncActionDuration = asyncActionCompletionTime - asyncActionStartTime; + + // Wait longer if the async action completed too quickly. + if (asyncActionDuration < bufferedMinimumTimeMs) { + const additionalWaitingTime = + bufferedMinimumTimeMs - (asyncActionCompletionTime - asyncActionStartTime); + await new Promise((resolve) => setTimeout(resolve, additionalWaitingTime)); + } + + return returnValue; +} diff --git a/src/plugins/index_pattern_editor/public/lib/extract_time_fields.test.ts b/src/plugins/index_pattern_editor/public/lib/extract_time_fields.test.ts new file mode 100644 index 0000000000000..90070c37995af --- /dev/null +++ b/src/plugins/index_pattern_editor/public/lib/extract_time_fields.test.ts @@ -0,0 +1,32 @@ +/* + * 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 { extractTimeFields } from './extract_time_fields'; + +describe('extractTimeFields', () => { + it('should handle no date fields', () => { + const fields = [ + { type: 'text', name: 'name' }, + { type: 'text', name: 'name' }, + ]; + + expect(extractTimeFields(fields)).toEqual([ + { display: `The indices which match this index pattern don't contain any time fields.` }, + ]); + }); + + it('should add extra options', () => { + const fields = [{ type: 'date', name: '@timestamp' }]; + + expect(extractTimeFields(fields)).toEqual([ + { display: '@timestamp', fieldName: '@timestamp' }, + { isDisabled: true, display: '───', fieldName: '' }, + { display: `I don't want to use the time filter`, fieldName: undefined }, + ]); + }); +}); diff --git a/src/plugins/index_pattern_editor/public/lib/extract_time_fields.ts b/src/plugins/index_pattern_editor/public/lib/extract_time_fields.ts new file mode 100644 index 0000000000000..c7cd044ff5e2a --- /dev/null +++ b/src/plugins/index_pattern_editor/public/lib/extract_time_fields.ts @@ -0,0 +1,54 @@ +/* + * 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 { IFieldType } from '../../../../plugins/data/public'; +import { TimestampOption } from '../components/index_pattern_editor_flyout_content'; + +export function extractTimeFields(fields: IFieldType[]): TimestampOption[] { + const dateFields = fields.filter((field) => field.type === 'date'); + const label = i18n.translate( + 'indexPatternManagement.createIndexPattern.stepTime.noTimeFieldsLabel', + { + defaultMessage: "The indices which match this index pattern don't contain any time fields.", + } + ); + + if (dateFields.length === 0) { + return [ + { + display: label, + }, + ]; + } + + const disabledDividerOption = { + isDisabled: true, + display: '───', + fieldName: '', + }; + const noTimeFieldLabel = i18n.translate( + 'indexPatternManagement.createIndexPattern.stepTime.noTimeFieldOptionLabel', + { + defaultMessage: "I don't want to use the time filter", + } + ); + const noTimeFieldOption = { + display: noTimeFieldLabel, + fieldName: undefined, + }; + + return [ + ...dateFields.map((field) => ({ + display: field.name, + fieldName: field.name, + })), + disabledDividerOption, + noTimeFieldOption, + ]; +} diff --git a/src/plugins/index_pattern_editor/public/lib/get_indices.test.ts b/src/plugins/index_pattern_editor/public/lib/get_indices.test.ts new file mode 100644 index 0000000000000..29330cefc4806 --- /dev/null +++ b/src/plugins/index_pattern_editor/public/lib/get_indices.test.ts @@ -0,0 +1,96 @@ +/* + * 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 { getIndices, responseToItemArray } from './get_indices'; +import { httpServiceMock } from '../../../../../../core/public/mocks'; +import { ResolveIndexResponseItemIndexAttrs } from '../types'; + +export const successfulResponse = { + indices: [ + { + name: 'remoteCluster1:bar-01', + attributes: ['open'], + }, + ], + aliases: [ + { + name: 'f-alias', + indices: ['freeze-index', 'my-index'], + }, + ], + data_streams: [ + { + name: 'foo', + backing_indices: ['foo-000001'], + timestamp_field: '@timestamp', + }, + ], +}; + +const mockGetTags = () => []; + +const http = httpServiceMock.createStartContract(); +http.get.mockResolvedValue(successfulResponse); + +describe('getIndices', () => { + it('should work in a basic case', async () => { + const result = await getIndices(http, mockGetTags, 'kibana', false); + expect(result.length).toBe(3); + expect(result[0].name).toBe('f-alias'); + expect(result[1].name).toBe('foo'); + }); + + it('should ignore ccs query-all', async () => { + expect((await getIndices(http, mockGetTags, '*:', false)).length).toBe(0); + }); + + it('should ignore a single comma', async () => { + expect((await getIndices(http, mockGetTags, ',', false)).length).toBe(0); + expect((await getIndices(http, mockGetTags, ',*', false)).length).toBe(0); + expect((await getIndices(http, mockGetTags, ',foobar', false)).length).toBe(0); + }); + + it('response object to item array', () => { + const result = { + indices: [ + { + name: 'test_index', + }, + { + name: 'frozen_index', + attributes: ['frozen' as ResolveIndexResponseItemIndexAttrs], + }, + ], + aliases: [ + { + name: 'test_alias', + indices: [], + }, + ], + data_streams: [ + { + name: 'test_data_stream', + backing_indices: [], + timestamp_field: 'test_timestamp_field', + }, + ], + }; + expect(responseToItemArray(result, mockGetTags)).toMatchSnapshot(); + expect(responseToItemArray({}, mockGetTags)).toEqual([]); + }); + + describe('errors', () => { + it('should handle errors gracefully', async () => { + http.get.mockImplementationOnce(() => { + throw new Error('Test error'); + }); + const result = await getIndices(http, mockGetTags, 'kibana', false); + expect(result.length).toBe(0); + }); + }); +}); diff --git a/src/plugins/index_pattern_editor/public/lib/get_indices.ts b/src/plugins/index_pattern_editor/public/lib/get_indices.ts new file mode 100644 index 0000000000000..cd100cc5d6c17 --- /dev/null +++ b/src/plugins/index_pattern_editor/public/lib/get_indices.ts @@ -0,0 +1,109 @@ +/* + * 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 { sortBy } from 'lodash'; +import { HttpStart } from 'kibana/public'; +import { i18n } from '@kbn/i18n'; +// todo move into this plugin, consider removing all ipm references +import { IndexPatternCreationConfig } from '../../../index_pattern_management/public'; +import { MatchedItem, ResolveIndexResponse, ResolveIndexResponseItemIndexAttrs } from '../types'; + +const aliasLabel = i18n.translate('indexPatternManagement.aliasLabel', { defaultMessage: 'Alias' }); +const dataStreamLabel = i18n.translate('indexPatternManagement.dataStreamLabel', { + defaultMessage: 'Data stream', +}); + +const indexLabel = i18n.translate('indexPatternManagement.indexLabel', { + defaultMessage: 'Index', +}); + +const frozenLabel = i18n.translate('indexPatternManagement.frozenLabel', { + defaultMessage: 'Frozen', +}); + +export async function getIndices( + http: HttpStart, + getIndexTags: IndexPatternCreationConfig['getIndexTags'], + rawPattern: string, + showAllIndices: boolean +): Promise { + const pattern = rawPattern.trim(); + + // Searching for `*:` fails for CCS environments. The search request + // is worthless anyways as the we should only send a request + // for a specific query (where we do not append *) if there is at + // least a single character being searched for. + if (pattern === '*:') { + return []; + } + + // This should never match anything so do not bother + if (pattern === '') { + return []; + } + + // ES does not like just a `,*` and will throw a `[string_index_out_of_bounds_exception] String index out of range: 0` + if (pattern.startsWith(',')) { + return []; + } + + const query = showAllIndices ? { expand_wildcards: 'all' } : undefined; + + try { + const response = await http.get( + `/internal/index-pattern-management/resolve_index/${pattern}`, + { query } + ); + if (!response) { + return []; + } + + return responseToItemArray(response, getIndexTags); + } catch { + return []; + } +} + +export const responseToItemArray = ( + response: ResolveIndexResponse, + getIndexTags: IndexPatternCreationConfig['getIndexTags'] +): MatchedItem[] => { + const source: MatchedItem[] = []; + + (response.indices || []).forEach((index) => { + const tags: MatchedItem['tags'] = [{ key: 'index', name: indexLabel, color: 'default' }]; + const isFrozen = (index.attributes || []).includes(ResolveIndexResponseItemIndexAttrs.FROZEN); + + tags.push(...getIndexTags(index.name)); + if (isFrozen) { + tags.push({ name: frozenLabel, key: 'frozen', color: 'danger' }); + } + + source.push({ + name: index.name, + tags, + item: index, + }); + }); + (response.aliases || []).forEach((alias) => { + source.push({ + name: alias.name, + tags: [{ key: 'alias', name: aliasLabel, color: 'default' }], + item: alias, + }); + }); + (response.data_streams || []).forEach((dataStream) => { + source.push({ + name: dataStream.name, + tags: [{ key: 'data_stream', name: dataStreamLabel, color: 'primary' }], + item: dataStream, + }); + }); + + return sortBy(source, 'name'); +}; diff --git a/src/plugins/index_pattern_editor/public/lib/get_matched_indices.test.ts b/src/plugins/index_pattern_editor/public/lib/get_matched_indices.test.ts new file mode 100644 index 0000000000000..bb762e78cc893 --- /dev/null +++ b/src/plugins/index_pattern_editor/public/lib/get_matched_indices.test.ts @@ -0,0 +1,113 @@ +/* + * 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 { getMatchedIndices } from './get_matched_indices'; +import { Tag, MatchedItem } from '../types'; + +jest.mock('./../constants', () => ({ + MAX_NUMBER_OF_MATCHING_INDICES: 6, +})); + +const tags: Tag[] = []; +const indices = [ + { name: 'kibana', tags }, + { name: 'es', tags }, + { name: 'logstash', tags }, + { name: 'packetbeat', tags }, + { name: 'metricbeat', tags }, + { name: '.kibana', tags }, +] as MatchedItem[]; + +const partialIndices = [ + { name: 'kibana', tags }, + { name: 'es', tags }, + { name: '.kibana', tags }, +] as MatchedItem[]; + +const exactIndices = [ + { name: 'kibana', tags }, + { name: '.kibana', tags }, +] as MatchedItem[]; + +describe('getMatchedIndices', () => { + it('should return all indices', () => { + const { + allIndices, + exactMatchedIndices, + partialMatchedIndices, + visibleIndices, + } = getMatchedIndices(indices, partialIndices, exactIndices, true); + + expect(allIndices).toEqual([ + { name: 'kibana', tags }, + { name: 'es', tags }, + { name: 'logstash', tags }, + { name: 'packetbeat', tags }, + { name: 'metricbeat', tags }, + { name: '.kibana', tags }, + ]); + + expect(exactMatchedIndices).toEqual([ + { name: 'kibana', tags }, + { name: '.kibana', tags }, + ]); + + expect(partialMatchedIndices).toEqual([ + { name: 'kibana', tags }, + { name: 'es', tags }, + { name: '.kibana', tags }, + ]); + + expect(visibleIndices).toEqual([ + { name: 'kibana', tags }, + { name: '.kibana', tags }, + ]); + }); + + it('should return all indices except for system indices', () => { + const { + allIndices, + exactMatchedIndices, + partialMatchedIndices, + visibleIndices, + } = getMatchedIndices(indices, partialIndices, exactIndices, false); + + expect(allIndices).toEqual([ + { name: 'kibana', tags }, + { name: 'es', tags }, + { name: 'logstash', tags }, + { name: 'packetbeat', tags }, + { name: 'metricbeat', tags }, + ]); + + expect(exactMatchedIndices).toEqual([{ name: 'kibana', tags }]); + + expect(partialMatchedIndices).toEqual([ + { name: 'kibana', tags }, + { name: 'es', tags }, + ]); + + expect(visibleIndices).toEqual([{ name: 'kibana', tags }]); + }); + + it('should return partial matches as visible if there are no exact', () => { + const { visibleIndices } = getMatchedIndices(indices, partialIndices, [], true); + + expect(visibleIndices).toEqual([ + { name: 'kibana', tags }, + { name: 'es', tags }, + { name: '.kibana', tags }, + ]); + }); + + it('should return all indices as visible if there are no exact or partial', () => { + const { visibleIndices } = getMatchedIndices(indices, [], [], true); + + expect(visibleIndices).toEqual(indices); + }); +}); diff --git a/src/plugins/index_pattern_editor/public/lib/get_matched_indices.ts b/src/plugins/index_pattern_editor/public/lib/get_matched_indices.ts new file mode 100644 index 0000000000000..e9b365474425b --- /dev/null +++ b/src/plugins/index_pattern_editor/public/lib/get_matched_indices.ts @@ -0,0 +1,95 @@ +/* + * 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 { MAX_NUMBER_OF_MATCHING_INDICES } from '../constants'; + +function isSystemIndex(index: string): boolean { + if (index.startsWith('.')) { + return true; + } + + if (index.includes(':')) { + return index + .split(':') + .reduce((isSystem: boolean, idx) => isSystem || isSystemIndex(idx), false); + } + + return false; +} + +function filterSystemIndices(indices: MatchedItem[], isIncludingSystemIndices: boolean) { + if (!indices) { + return indices; + } + + const acceptableIndices = isIncludingSystemIndices + ? indices + : // All system indices begin with a period. + indices.filter((index) => !isSystemIndex(index.name)); + + return acceptableIndices.slice(0, MAX_NUMBER_OF_MATCHING_INDICES); +} + +/** + This utility is designed to do a couple of things: + + 1) Take in list of indices and filter out system indices if necessary + 2) Return a `visible` list based on a priority order. + + We are passing in three separate lists because they each represent + something slightly different. + + - `unfilteredAllIndices` + This is the result of the initial `*` query and represents all known indices + - `unfilteredPartialMatchedIndices` + This is the result of searching against the query with an added `*`. This is only + used when the query does not end in an `*` and represents potential matches in the UI + - `unfilteredExactMatchedIndices + This is the result of searching against a query that already ends in `*`. + We call this `exact` matches because ES is telling us exactly what it matches + */ + +import { MatchedItem } from '../types'; + +export function getMatchedIndices( + unfilteredAllIndices: MatchedItem[], + unfilteredPartialMatchedIndices: MatchedItem[], + unfilteredExactMatchedIndices: MatchedItem[], + isIncludingSystemIndices: boolean = false +) { + const allIndices = filterSystemIndices(unfilteredAllIndices, isIncludingSystemIndices); + const partialMatchedIndices = filterSystemIndices( + unfilteredPartialMatchedIndices, + isIncludingSystemIndices + ); + const exactMatchedIndices = filterSystemIndices( + unfilteredExactMatchedIndices, + isIncludingSystemIndices + ); + + // We need to pick one to show in the UI and there is a priority here + // 1) If there are exact matches, show those as the query is good to go + // 2) If there are no exact matches, but there are partial matches, + // show the partial matches + // 3) If there are no exact or partial matches, just show all indices + let visibleIndices; + if (exactMatchedIndices.length) { + visibleIndices = exactMatchedIndices; + } else if (partialMatchedIndices.length) { + visibleIndices = partialMatchedIndices; + } else { + visibleIndices = allIndices; + } + + return { + allIndices, + exactMatchedIndices, + partialMatchedIndices, + visibleIndices, + }; +} diff --git a/src/plugins/index_pattern_editor/public/lib/index.ts b/src/plugins/index_pattern_editor/public/lib/index.ts new file mode 100644 index 0000000000000..371712b70a0d2 --- /dev/null +++ b/src/plugins/index_pattern_editor/public/lib/index.ts @@ -0,0 +1,19 @@ +/* + * 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 { canAppendWildcard } from './can_append_wildcard'; + +export { ensureMinimumTime } from './ensure_minimum_time'; + +export { getIndices } from './get_indices'; + +export { getMatchedIndices } from './get_matched_indices'; + +export { containsIllegalCharacters } from './contains_illegal_characters'; + +export { extractTimeFields } from './extract_time_fields'; diff --git a/src/plugins/index_pattern_editor/public/mocks.ts b/src/plugins/index_pattern_editor/public/mocks.ts new file mode 100644 index 0000000000000..c172a85e5ccee --- /dev/null +++ b/src/plugins/index_pattern_editor/public/mocks.ts @@ -0,0 +1,33 @@ +/* + * 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 { IndexPatternEditorPlugin } from './plugin'; + +export type Start = jest.Mocked< + Omit, 'DeleteRuntimeFieldProvider'> +>; + +export type Setup = jest.Mocked>; + +const createSetupContract = (): Setup => { + return {}; +}; + +const createStartContract = (): Start => { + return { + openEditor: jest.fn(), + userPermissions: { + editIndexPattern: jest.fn(), + }, + }; +}; + +export const indexPatternFieldEditorPluginMock = { + createSetupContract, + createStartContract, +}; diff --git a/src/plugins/index_pattern_editor/public/open_editor.tsx b/src/plugins/index_pattern_editor/public/open_editor.tsx new file mode 100644 index 0000000000000..7278c56969d65 --- /dev/null +++ b/src/plugins/index_pattern_editor/public/open_editor.tsx @@ -0,0 +1,81 @@ +/* + * 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 React from 'react'; +import { CoreStart, OverlayRef } from 'src/core/public'; + +import { + createKibanaReactContext, + toMountPoint, + IndexPattern, + DataPublicPluginStart, +} from './shared_imports'; + +import { CloseEditor } from './types'; +import { IndexPatternFlyoutContentContainer } from './components/index_pattern_flyout_content_container'; + +export interface OpenEditorOptions { + onSave: (indexPattern: IndexPattern) => void; +} + +interface Dependencies { + core: CoreStart; + indexPatternService: DataPublicPluginStart['indexPatterns']; +} + +export const getEditorOpener = ({ core, indexPatternService }: Dependencies) => ( + options: OpenEditorOptions +): CloseEditor => { + const { uiSettings, overlays, docLinks, notifications, http, application } = core; + const { Provider: KibanaReactContextProvider } = createKibanaReactContext({ + uiSettings, + docLinks, + http: core.http, + }); + + let overlayRef: OverlayRef | null = null; + // capabilities.management.kibana.indexPatterns + + const openEditor = ({ onSave }: OpenEditorOptions): CloseEditor => { + const closeEditor = () => { + if (overlayRef) { + overlayRef.close(); + overlayRef = null; + } + }; + + const onSaveField = (indexPattern: IndexPattern) => { + closeEditor(); + + if (onSave) { + onSave(indexPattern); + } + }; + + overlayRef = overlays.openFlyout( + toMountPoint( + + + + ) + ); + + return closeEditor; + }; + + return openEditor(options); +}; diff --git a/src/plugins/index_pattern_editor/public/plugin.test.tsx b/src/plugins/index_pattern_editor/public/plugin.test.tsx new file mode 100644 index 0000000000000..2212264427d1a --- /dev/null +++ b/src/plugins/index_pattern_editor/public/plugin.test.tsx @@ -0,0 +1,180 @@ +/* + * 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 React from 'react'; + +jest.mock('../../kibana_react/public', () => { + const original = jest.requireActual('../../kibana_react/public'); + + return { + ...original, + toMountPoint: (node: React.ReactNode) => node, + }; +}); + +import { CoreStart } from 'src/core/public'; +import { coreMock } from 'src/core/public/mocks'; +import { dataPluginMock } from '../../data/public/mocks'; +import { usageCollectionPluginMock } from '../../usage_collection/public/mocks'; + +import { registerTestBed } from './test_utils'; + +import { FieldEditorFlyoutContentContainer } from './components/field_editor_flyout_content_container'; +import { IndexPatternFieldEditorPlugin } from './plugin'; +import { DeleteFieldModal } from './components/delete_field_modal'; +import { IndexPattern } from './shared_imports'; + +const noop = () => {}; + +describe('IndexPatternFieldEditorPlugin', () => { + const coreStart: CoreStart = coreMock.createStart(); + const pluginStart = { + data: dataPluginMock.createStartContract(), + usageCollection: usageCollectionPluginMock.createSetupContract(), + }; + + let plugin: IndexPatternFieldEditorPlugin; + + beforeEach(() => { + plugin = new IndexPatternFieldEditorPlugin(); + }); + + test('should expose a handler to open the indexpattern field editor', async () => { + const startApi = await plugin.start(coreStart, pluginStart); + expect(startApi.openEditor).toBeDefined(); + }); + + test('should call core.overlays.openFlyout when opening the editor', async () => { + const openFlyout = jest.fn(); + const onSaveSpy = jest.fn(); + + const coreStartMocked = { + ...coreStart, + overlays: { + ...coreStart.overlays, + openFlyout, + }, + }; + const { openEditor } = await plugin.start(coreStartMocked, pluginStart); + + openEditor({ onSave: onSaveSpy, ctx: { indexPattern: {} as any } }); + + expect(openFlyout).toHaveBeenCalled(); + + const [[arg]] = openFlyout.mock.calls; + expect(arg.props.children.type).toBe(FieldEditorFlyoutContentContainer); + + // We force call the "onSave" prop from the component + // and make sure that the the spy is being called. + // Note: we are testing implementation details, if we change or rename the "onSave" prop on + // the component, we will need to update this test accordingly. + expect(arg.props.children.props.onSave).toBeDefined(); + arg.props.children.props.onSave(); + expect(onSaveSpy).toHaveBeenCalled(); + }); + + test('should return a handler to close the flyout', async () => { + const { openEditor } = await plugin.start(coreStart, pluginStart); + + const closeEditorHandler = openEditor({ onSave: noop, ctx: { indexPattern: {} as any } }); + expect(typeof closeEditorHandler).toBe('function'); + }); + + test('should expose a handler to open field deletion modal', async () => { + const startApi = await plugin.start(coreStart, pluginStart); + expect(startApi.openDeleteModal).toBeDefined(); + }); + + test('should call correct services when opening the deletion modal', async () => { + const openModal = jest.fn(); + const onDeleteSpy = jest.fn(); + const removeFieldSpy = jest.fn(); + + const coreStartMocked = { + ...coreStart, + overlays: { + ...coreStart.overlays, + openModal, + }, + }; + const pluginStartMocked = { + ...pluginStart, + data: { + ...pluginStart.data, + indexPatterns: { + ...pluginStart.data.indexPatterns, + updateSavedObject: jest.fn(), + }, + }, + }; + const { openDeleteModal } = await plugin.start(coreStartMocked, pluginStartMocked); + + const indexPatternMock = ({ removeRuntimeField: removeFieldSpy } as unknown) as IndexPattern; + + openDeleteModal({ + onDelete: onDeleteSpy, + ctx: { indexPattern: indexPatternMock }, + fieldName: ['a', 'b', 'c'], + }); + + expect(openModal).toHaveBeenCalled(); + + const [[arg]] = openModal.mock.calls; + expect(arg.type).toBe(DeleteFieldModal); + + // simulate user confirming deletion + await arg.props.confirmDelete(); + + // consumer should be notified + expect(onDeleteSpy).toHaveBeenCalled(); + + // fields should be removed on index pattern and changes persisted + expect(removeFieldSpy).toHaveBeenCalledWith('a'); + expect(removeFieldSpy).toHaveBeenCalledWith('b'); + expect(removeFieldSpy).toHaveBeenCalledWith('c'); + expect(pluginStartMocked.data.indexPatterns.updateSavedObject).toHaveBeenLastCalledWith( + indexPatternMock + ); + }); + + test('should return a handler to close the modal', async () => { + const { openDeleteModal } = await plugin.start(coreStart, pluginStart); + + const closeModal = openDeleteModal({ fieldName: ['a'], ctx: { indexPattern: {} as any } }); + expect(typeof closeModal).toBe('function'); + }); + + test('should expose a render props component to delete runtime fields', async () => { + const { DeleteRuntimeFieldProvider } = await plugin.start(coreStart, pluginStart); + + const TestComponent = ({ callback }: { callback: (...args: any[]) => void }) => { + return ( + + {(...args) => { + // Forward arguments passed down to children to our spy callback + callback(args); + return null; + }} + + ); + }; + + const setup = registerTestBed(TestComponent, { + memoryRouter: { wrapComponent: false }, + }); + + const spy = jest.fn(); + // Mount our dummy component and pass it the spy + setup({ callback: spy }); + + expect(spy).toHaveBeenCalled(); + const argumentsFromRenderProps = spy.mock.calls[0][0]; + + expect(argumentsFromRenderProps.length).toBe(1); + expect(typeof argumentsFromRenderProps[0]).toBe('function'); + }); +}); diff --git a/src/plugins/index_pattern_editor/public/plugin.ts b/src/plugins/index_pattern_editor/public/plugin.ts new file mode 100644 index 0000000000000..4e7d28632f472 --- /dev/null +++ b/src/plugins/index_pattern_editor/public/plugin.ts @@ -0,0 +1,42 @@ +/* + * 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 { Plugin, CoreSetup, CoreStart } from 'src/core/public'; + +import { PluginSetup, PluginStart, SetupPlugins, StartPlugins } from './types'; +import { getEditorOpener } from './open_editor'; + +export class IndexPatternEditorPlugin + implements Plugin { + public setup(core: CoreSetup, plugins: SetupPlugins): PluginSetup { + return {}; + } + + public start(core: CoreStart, plugins: StartPlugins) { + const { + application: { capabilities }, + } = core; + const { data } = plugins; + + return { + openEditor: getEditorOpener({ + core, + indexPatternService: data.indexPatterns, + }), + userPermissions: { + editIndexPattern: () => { + return capabilities.management.kibana.indexPatterns; + }, + }, + }; + } + + public stop() { + return {}; + } +} diff --git a/src/plugins/index_pattern_editor/public/shared_imports.ts b/src/plugins/index_pattern_editor/public/shared_imports.ts new file mode 100644 index 0000000000000..6976b02ff319c --- /dev/null +++ b/src/plugins/index_pattern_editor/public/shared_imports.ts @@ -0,0 +1,40 @@ +/* + * 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 { + IndexPattern, + IndexPatternField, + DataPublicPluginStart, + IndexPatternSpec, +} from '../../data/public'; + +export { createKibanaReactContext, toMountPoint, CodeEditor } from '../../kibana_react/public'; + +export { + useForm, + useFormData, + useFormContext, + Form, + FormSchema, + UseField, + FormHook, + ValidationFunc, + FieldConfig, +} from '../../es_ui_shared/static/forms/hook_form_lib'; + +export { fieldValidators } from '../../es_ui_shared/static/forms/helpers'; + +export { + TextField, + ToggleField, + NumericField, + SelectField, + FormRow, +} from '../../es_ui_shared/static/forms/components'; + +export { HttpStart } from '../../../core/public'; diff --git a/src/plugins/index_pattern_editor/public/test_utils/helpers.ts b/src/plugins/index_pattern_editor/public/test_utils/helpers.ts new file mode 100644 index 0000000000000..b55a59df34545 --- /dev/null +++ b/src/plugins/index_pattern_editor/public/test_utils/helpers.ts @@ -0,0 +1,41 @@ +/* + * 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 { act } from 'react-dom/test-utils'; +import { TestBed } from './test_utils'; + +export const getCommonActions = (testBed: TestBed) => { + const toggleFormRow = (row: 'customLabel' | 'value' | 'format', value: 'on' | 'off' = 'on') => { + const testSubj = `${row}Row.toggle`; + const toggle = testBed.find(testSubj); + const isOn = toggle.props()['aria-checked']; + + if ((value === 'on' && isOn) || (value === 'off' && isOn === false)) { + return; + } + + testBed.form.toggleEuiSwitch(testSubj); + }; + + const changeFieldType = async (value: string, label?: string) => { + await act(async () => { + testBed.find('typeField').simulate('change', [ + { + value, + label: label ?? value, + }, + ]); + }); + testBed.component.update(); + }; + + return { + toggleFormRow, + changeFieldType, + }; +}; diff --git a/src/plugins/index_pattern_editor/public/test_utils/index.ts b/src/plugins/index_pattern_editor/public/test_utils/index.ts new file mode 100644 index 0000000000000..b5d943281cd79 --- /dev/null +++ b/src/plugins/index_pattern_editor/public/test_utils/index.ts @@ -0,0 +1,13 @@ +/* + * 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 * from './test_utils'; + +export * from './mocks'; + +export * from './helpers'; diff --git a/src/plugins/index_pattern_editor/public/test_utils/mocks.ts b/src/plugins/index_pattern_editor/public/test_utils/mocks.ts new file mode 100644 index 0000000000000..c6bc24f176858 --- /dev/null +++ b/src/plugins/index_pattern_editor/public/test_utils/mocks.ts @@ -0,0 +1,24 @@ +/* + * 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 { DocLinksStart } from 'src/core/public'; + +export const noop = () => {}; + +export const docLinks: DocLinksStart = { + ELASTIC_WEBSITE_URL: 'htts://jestTest.elastic.co', + DOC_LINK_VERSION: 'jest', + links: {} as any, +}; + +// TODO check how we can better stub an index pattern format +export const fieldFormats = { + getDefaultInstance: () => ({ + convert: (val: any) => val, + }), +} as any; diff --git a/src/plugins/index_pattern_editor/public/test_utils/setup_environment.tsx b/src/plugins/index_pattern_editor/public/test_utils/setup_environment.tsx new file mode 100644 index 0000000000000..885bcc87f89df --- /dev/null +++ b/src/plugins/index_pattern_editor/public/test_utils/setup_environment.tsx @@ -0,0 +1,80 @@ +/* + * 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 React from 'react'; + +const EDITOR_ID = 'testEditor'; + +jest.mock('../../../kibana_react/public', () => { + const original = jest.requireActual('../../../kibana_react/public'); + + /** + * We mock the CodeEditor because it requires the + * with the uiSettings passed down. Let's use a simple in our tests. + */ + const CodeEditorMock = (props: any) => { + // Forward our deterministic ID to the consumer + // We need below for the PainlessLang.getSyntaxErrors mock + props.editorDidMount({ + getModel() { + return { + id: EDITOR_ID, + }; + }, + }); + + return ( + ) => { + props.onChange(e.target.value); + }} + /> + ); + }; + + return { + ...original, + CodeEditor: CodeEditorMock, + }; +}); + +jest.mock('@elastic/eui', () => { + const original = jest.requireActual('@elastic/eui'); + + return { + ...original, + EuiComboBox: (props: any) => ( + { + props.onChange([syntheticEvent['0']]); + }} + /> + ), + }; +}); + +jest.mock('@kbn/monaco', () => { + const original = jest.requireActual('@kbn/monaco'); + + return { + ...original, + PainlessLang: { + ID: 'painless', + getSuggestionProvider: () => undefined, + getSyntaxErrors: () => ({ + [EDITOR_ID]: [], + }), + }, + }; +}); diff --git a/src/plugins/index_pattern_editor/public/test_utils/test_utils.ts b/src/plugins/index_pattern_editor/public/test_utils/test_utils.ts new file mode 100644 index 0000000000000..c8e4aedc26471 --- /dev/null +++ b/src/plugins/index_pattern_editor/public/test_utils/test_utils.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 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 { getRandomString } from '@kbn/test/jest'; + +export { registerTestBed, TestBed } from '@kbn/test/jest'; diff --git a/src/plugins/index_pattern_editor/public/types.ts b/src/plugins/index_pattern_editor/public/types.ts new file mode 100644 index 0000000000000..99e9c6a398447 --- /dev/null +++ b/src/plugins/index_pattern_editor/public/types.ts @@ -0,0 +1,91 @@ +/* + * 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 { DataPublicPluginStart } from './shared_imports'; +import { OpenEditorOptions } from './open_editor'; + +// eslint-disable-next-line @typescript-eslint/no-empty-interface +export interface PluginSetup {} + +export interface PluginStart { + openEditor(options: OpenEditorOptions): () => void; + userPermissions: { + editIndexPattern: () => boolean; + }; +} + +// eslint-disable-next-line @typescript-eslint/no-empty-interface +export interface SetupPlugins {} + +export interface StartPlugins { + data: DataPublicPluginStart; +} + +export type CloseEditor = () => void; + +export interface MatchedItem { + name: string; + tags: Tag[]; + item: { + name: string; + backing_indices?: string[]; + timestamp_field?: string; + indices?: string[]; + aliases?: string[]; + attributes?: ResolveIndexResponseItemIndexAttrs[]; + data_stream?: string; + }; +} + +// for showing index matches +export interface ResolveIndexResponse { + indices?: ResolveIndexResponseItemIndex[]; + aliases?: ResolveIndexResponseItemAlias[]; + data_streams?: ResolveIndexResponseItemDataStream[]; +} + +export interface ResolveIndexResponseItem { + name: string; +} + +export interface ResolveIndexResponseItemDataStream extends ResolveIndexResponseItem { + backing_indices: string[]; + timestamp_field: string; +} + +export interface ResolveIndexResponseItemAlias extends ResolveIndexResponseItem { + indices: string[]; +} + +export interface ResolveIndexResponseItemIndex extends ResolveIndexResponseItem { + aliases?: string[]; + attributes?: ResolveIndexResponseItemIndexAttrs[]; + data_stream?: string; +} + +export enum ResolveIndexResponseItemIndexAttrs { + OPEN = 'open', + CLOSED = 'closed', + HIDDEN = 'hidden', + FROZEN = 'frozen', +} + +export interface Tag { + name: string; + key: string; + color: string; +} +// end for index matches + +export interface IndexPatternTableItem { + id: string; + title: string; + default: boolean; + tag?: string[]; + sort: string; +} diff --git a/src/plugins/index_pattern_editor/tsconfig.json b/src/plugins/index_pattern_editor/tsconfig.json new file mode 100644 index 0000000000000..b0a862dc50854 --- /dev/null +++ b/src/plugins/index_pattern_editor/tsconfig.json @@ -0,0 +1,21 @@ +{ + "extends": "../../../tsconfig.base.json", + "compilerOptions": { + "composite": true, + "outDir": "./target/types", + "emitDeclarationOnly": true, + "declaration": true, + "declarationMap": true + }, + "include": [ + "public/**/*", + ], + "references": [ + { "path": "../../core/tsconfig.json" }, + { "path": "../data/tsconfig.json" }, + { "path": "../kibana_react/tsconfig.json" }, + { "path": "../kibana_utils/tsconfig.json" }, + { "path": "../es_ui_shared/tsconfig.json" }, + { "path": "../index_pattern_management/tsconfig.json" }, + ] +} diff --git a/src/plugins/index_pattern_management/kibana.json b/src/plugins/index_pattern_management/kibana.json index 60e382fb395f7..22edd23b3d368 100644 --- a/src/plugins/index_pattern_management/kibana.json +++ b/src/plugins/index_pattern_management/kibana.json @@ -3,6 +3,6 @@ "version": "kibana", "server": true, "ui": true, - "requiredPlugins": ["management", "data", "urlForwarding", "indexPatternFieldEditor"], + "requiredPlugins": ["management", "data", "urlForwarding", "indexPatternFieldEditor", "indexPatternEditor"], "requiredBundles": ["kibanaReact", "kibanaUtils"] } diff --git a/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_state/_templates.scss b/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_state/_templates.scss new file mode 100644 index 0000000000000..5303537bddabc --- /dev/null +++ b/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_state/_templates.scss @@ -0,0 +1,11 @@ +%inp-empty-state-footer { + background: $euiColorLightestShade; + margin: 0 (-$euiSizeL) (-$euiSizeL); + padding: $euiSizeL; + border-radius: 0 0 $euiBorderRadius $euiBorderRadius; + + // sass-lint:disable-block mixins-before-declarations + @include euiBreakpoint('xs', 's') { + text-align: center; + } +} diff --git a/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_state/_variables.scss b/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_state/_variables.scss new file mode 100644 index 0000000000000..5da25a91bd77c --- /dev/null +++ b/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_state/_variables.scss @@ -0,0 +1 @@ +$inpEmptyStateMaxWidth: $euiSizeXXL * 19; diff --git a/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_state/empty_state.scss b/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_state/empty_state.scss index 37889b9d7c483..5c7c827700017 100644 --- a/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_state/empty_state.scss +++ b/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_state/empty_state.scss @@ -1,5 +1,5 @@ -@import '../../../variables'; -@import '../../../templates'; +@import './variables'; +@import './templates'; .inpEmptyState { // override EUI specificity diff --git a/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_state/empty_state.tsx b/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_state/empty_state.tsx index 438eb8a031993..d5f7e48975c42 100644 --- a/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_state/empty_state.tsx +++ b/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_state/empty_state.tsx @@ -27,20 +27,20 @@ import { EuiText, } from '@elastic/eui'; import { useHistory } from 'react-router-dom'; -import { reactRouterNavigate } from '../../../../../../plugins/kibana_react/public'; -import { MlCardState } from '../../../types'; +import { reactRouterNavigate } from '../../../../../kibana_react/public'; +// import { MlCardState } from '../../../types'; export const EmptyState = ({ onRefresh, navigateToApp, docLinks, - getMlCardState, + // getMlCardState, canSave, }: { onRefresh: () => void; navigateToApp: ApplicationStart['navigateToApp']; docLinks: DocLinksStart; - getMlCardState: () => MlCardState; + // getMlCardState: () => MlCardState; canSave: boolean; }) => { const mlCard = ( @@ -49,14 +49,11 @@ export const EmptyState = ({ onClick={() => navigateToApp('ml', { path: '#/filedatavisualizer' })} className="inpEmptyState__card" betaBadgeLabel={ - getMlCardState() === MlCardState.ENABLED - ? undefined - : i18n.translate( - 'indexPatternManagement.createIndexPattern.emptyState.basicLicenseLabel', - { - defaultMessage: 'Basic', - } - ) + // getMlCardState() === MlCardState.ENABLED + // ? undefined + i18n.translate('indexPatternManagement.createIndexPattern.emptyState.basicLicenseLabel', { + defaultMessage: 'Basic', + }) } betaBadgeTooltipContent={i18n.translate( 'indexPatternManagement.createIndexPattern.emptyState.basicLicenseDescription', @@ -64,7 +61,7 @@ export const EmptyState = ({ defaultMessage: 'This feature requires a Basic license.', } )} - isDisabled={getMlCardState() === MlCardState.DISABLED} + // isDisabled={getMlCardState() === MlCardState.DISABLED} icon={} title={ - {getMlCardState() !== MlCardState.HIDDEN ? mlCard : <>} + {/* getMlCardState() !== MlCardState.HIDDEN ? mlCard : <> */} + {mlCard} { http, data, getMlCardState, + indexPatternEditor, } = useKibana().services; const [indexPatterns, setIndexPatterns] = useState([]); const [creationOptions, setCreationOptions] = useState([]); @@ -158,6 +157,7 @@ export const IndexPatternTable = ({ canSave, history }: Props) => { }, ]; + /* const createButton = canSave ? ( { ) : ( <> ); + */ + + const createButton = ( + + indexPatternEditor.openEditor({ + onSave: async () => { + // todo dedup from useEffect code + const gettedIndexPatterns: IndexPatternTableItem[] = await getIndexPatterns( + uiSettings.get('defaultIndex'), + indexPatternManagementStart, + data.indexPatterns + ); + setIsLoadingIndexPatterns(false); + setIndexPatterns(gettedIndexPatterns); + }, + }) + } + > + + + ); if (isLoadingSources || isLoadingIndexPatterns) { return <>; } - const hasDataIndices = sources.some(({ name }: MatchedItem) => !name.startsWith('.')); - - if (!indexPatterns.length) { - if (!hasDataIndices && !remoteClustersExist) { - return ( - - ); - } else { - return ( - - ); - } - } - return ( diff --git a/src/plugins/index_pattern_management/public/management_app/mount_management_section.tsx b/src/plugins/index_pattern_management/public/management_app/mount_management_section.tsx index 355f529fe0f75..8b197c3a17786 100644 --- a/src/plugins/index_pattern_management/public/management_app/mount_management_section.tsx +++ b/src/plugins/index_pattern_management/public/management_app/mount_management_section.tsx @@ -42,7 +42,7 @@ export async function mountManagementSection( ) { const [ { chrome, application, uiSettings, notifications, overlays, http, docLinks }, - { data, indexPatternFieldEditor }, + { data, indexPatternFieldEditor, indexPatternEditor }, indexPatternManagementStart, ] = await getStartServices(); const canSave = Boolean(application.capabilities.indexPatterns.save); @@ -65,6 +65,7 @@ export async function mountManagementSection( setBreadcrumbs: params.setBreadcrumbs, getMlCardState, fieldFormatEditors: indexPatternFieldEditor.fieldFormatEditors, + indexPatternEditor, }; ReactDOM.render( diff --git a/src/plugins/index_pattern_management/public/plugin.ts b/src/plugins/index_pattern_management/public/plugin.ts index ed92172c8b91c..aa7b6448b558b 100644 --- a/src/plugins/index_pattern_management/public/plugin.ts +++ b/src/plugins/index_pattern_management/public/plugin.ts @@ -18,6 +18,7 @@ import { import { ManagementSetup } from '../../management/public'; import { IndexPatternFieldEditorStart } from '../../index_pattern_field_editor/public'; +import { IndexPatternEditorStart } from '../../index_pattern_editor/public'; export interface IndexPatternManagementSetupDependencies { management: ManagementSetup; @@ -27,6 +28,7 @@ export interface IndexPatternManagementSetupDependencies { export interface IndexPatternManagementStartDependencies { data: DataPublicPluginStart; indexPatternFieldEditor: IndexPatternFieldEditorStart; + indexPatternEditor: IndexPatternEditorStart; } export type IndexPatternManagementSetup = IndexPatternManagementServiceSetup; diff --git a/src/plugins/index_pattern_management/public/types.ts b/src/plugins/index_pattern_management/public/types.ts index 58a138df633fd..5a303733883f0 100644 --- a/src/plugins/index_pattern_management/public/types.ts +++ b/src/plugins/index_pattern_management/public/types.ts @@ -20,6 +20,7 @@ import { ManagementAppMountParams } from '../../management/public'; import { IndexPatternManagementStart } from './index'; import { KibanaReactContextValue } from '../../kibana_react/public'; import { IndexPatternFieldEditorStart } from '../../index_pattern_field_editor/public'; +import { IndexPatternEditorStart } from '../../index_pattern_editor/public'; export interface IndexPatternManagmentContext { chrome: ChromeStart; @@ -35,6 +36,7 @@ export interface IndexPatternManagmentContext { setBreadcrumbs: ManagementAppMountParams['setBreadcrumbs']; getMlCardState: () => MlCardState; fieldFormatEditors: IndexPatternFieldEditorStart['fieldFormatEditors']; + indexPatternEditor: IndexPatternEditorStart; } export type IndexPatternManagmentContextValue = KibanaReactContextValue; diff --git a/src/plugins/index_pattern_management/tsconfig.json b/src/plugins/index_pattern_management/tsconfig.json index 37bd3e4aa5bbb..16afcb3599fec 100644 --- a/src/plugins/index_pattern_management/tsconfig.json +++ b/src/plugins/index_pattern_management/tsconfig.json @@ -20,5 +20,6 @@ { "path": "../kibana_utils/tsconfig.json" }, { "path": "../es_ui_shared/tsconfig.json" }, { "path": "../index_pattern_field_editor/tsconfig.json" }, + { "path": "../index_pattern_editor/tsconfig.json" }, ] } From ca9361049ef74df6d045a7f00240abbecd987e36 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Tue, 8 Jun 2021 17:39:01 -0500 Subject: [PATCH 002/130] fix circular dependencies --- .../empty_state/empty_state.test.tsx | 9 +- .../components/field_editor/constants.ts | 37 -- .../field_editor/field_editor.test.tsx | 275 --------- .../field_editor/field_editor.tsx.old | 319 ----------- .../components/field_editor/form_schema.ts | 119 ---- .../public/components/field_editor/index.ts | 3 +- .../public/components/field_editor/lib.ts | 60 -- .../field_editor/shadowing_field_warning.tsx | 32 -- .../index_pattern_editor_flyout_content.tsx | 3 - .../public/components/utils.test.ts | 37 -- .../public/components/utils.ts | 51 -- .../index_pattern_editor/public/constants.ts | 1 + .../public/lib/get_indices.test.ts | 2 +- .../public/lib/get_indices.ts | 8 +- .../public/plugin.test.tsx | 9 +- .../index_pattern_editor/tsconfig.json | 1 - .../empty_index_pattern_prompt.test.tsx.snap | 99 ---- .../assets/index_pattern_illustration.scss | 9 - .../assets/index_pattern_illustration.tsx | 540 ------------------ .../empty_index_pattern_prompt.scss | 31 - .../empty_index_pattern_prompt.test.tsx | 26 - .../empty_index_pattern_prompt.tsx | 101 ---- .../empty_index_pattern_prompt/index.tsx | 9 - .../__snapshots__/empty_state.test.tsx.snap | 216 ------- .../empty_state/_templates.scss | 11 - .../empty_state/_variables.scss | 1 - .../empty_state/empty_state.scss | 23 - .../empty_state/empty_state.test.tsx | 62 -- .../empty_state/empty_state.tsx | 221 ------- .../index_pattern_table/empty_state/index.ts | 9 - .../index_pattern_table.tsx | 42 +- tsconfig.json | 1 + 32 files changed, 22 insertions(+), 2345 deletions(-) delete mode 100644 src/plugins/index_pattern_editor/public/components/field_editor/constants.ts delete mode 100644 src/plugins/index_pattern_editor/public/components/field_editor/field_editor.test.tsx delete mode 100644 src/plugins/index_pattern_editor/public/components/field_editor/field_editor.tsx.old delete mode 100644 src/plugins/index_pattern_editor/public/components/field_editor/form_schema.ts delete mode 100644 src/plugins/index_pattern_editor/public/components/field_editor/lib.ts delete mode 100644 src/plugins/index_pattern_editor/public/components/field_editor/shadowing_field_warning.tsx delete mode 100644 src/plugins/index_pattern_editor/public/components/utils.test.ts delete mode 100644 src/plugins/index_pattern_editor/public/components/utils.ts delete mode 100644 src/plugins/index_pattern_management/public/components/index_pattern_table/empty_index_pattern_prompt/__snapshots__/empty_index_pattern_prompt.test.tsx.snap delete mode 100644 src/plugins/index_pattern_management/public/components/index_pattern_table/empty_index_pattern_prompt/assets/index_pattern_illustration.scss delete mode 100644 src/plugins/index_pattern_management/public/components/index_pattern_table/empty_index_pattern_prompt/assets/index_pattern_illustration.tsx delete mode 100644 src/plugins/index_pattern_management/public/components/index_pattern_table/empty_index_pattern_prompt/empty_index_pattern_prompt.scss delete mode 100644 src/plugins/index_pattern_management/public/components/index_pattern_table/empty_index_pattern_prompt/empty_index_pattern_prompt.test.tsx delete mode 100644 src/plugins/index_pattern_management/public/components/index_pattern_table/empty_index_pattern_prompt/empty_index_pattern_prompt.tsx delete mode 100644 src/plugins/index_pattern_management/public/components/index_pattern_table/empty_index_pattern_prompt/index.tsx delete mode 100644 src/plugins/index_pattern_management/public/components/index_pattern_table/empty_state/__snapshots__/empty_state.test.tsx.snap delete mode 100644 src/plugins/index_pattern_management/public/components/index_pattern_table/empty_state/_templates.scss delete mode 100644 src/plugins/index_pattern_management/public/components/index_pattern_table/empty_state/_variables.scss delete mode 100644 src/plugins/index_pattern_management/public/components/index_pattern_table/empty_state/empty_state.scss delete mode 100644 src/plugins/index_pattern_management/public/components/index_pattern_table/empty_state/empty_state.test.tsx delete mode 100644 src/plugins/index_pattern_management/public/components/index_pattern_table/empty_state/empty_state.tsx delete mode 100644 src/plugins/index_pattern_management/public/components/index_pattern_table/empty_state/index.ts diff --git a/src/plugins/index_pattern_editor/public/components/empty_state/empty_state.test.tsx b/src/plugins/index_pattern_editor/public/components/empty_state/empty_state.test.tsx index fa300667ff919..1b6690c5795df 100644 --- a/src/plugins/index_pattern_editor/public/components/empty_state/empty_state.test.tsx +++ b/src/plugins/index_pattern_editor/public/components/empty_state/empty_state.test.tsx @@ -12,8 +12,7 @@ import { shallow } from 'enzyme'; import sinon from 'sinon'; import { findTestSubject } from '@elastic/eui/lib/test'; import { mountWithIntl } from '@kbn/test/jest'; -import { docLinksServiceMock } from '../../../../../../core/public/mocks'; -import { MlCardState } from '../../../types'; +import { docLinksServiceMock } from '../../../../../core/public/mocks'; const docLinks = docLinksServiceMock.createStartContract(); @@ -30,8 +29,9 @@ describe('EmptyState', () => { docLinks={docLinks} onRefresh={() => {}} navigateToApp={async () => {}} - getMlCardState={() => MlCardState.ENABLED} canSave={true} + createAnyway={() => {}} + closeFlyout={() => {}} /> ); @@ -48,8 +48,9 @@ describe('EmptyState', () => { docLinks={docLinks} onRefresh={onRefreshHandler} navigateToApp={async () => {}} - getMlCardState={() => MlCardState.ENABLED} canSave={true} + createAnyway={() => {}} + closeFlyout={() => {}} /> ); diff --git a/src/plugins/index_pattern_editor/public/components/field_editor/constants.ts b/src/plugins/index_pattern_editor/public/components/field_editor/constants.ts deleted file mode 100644 index 82711f707fa19..0000000000000 --- a/src/plugins/index_pattern_editor/public/components/field_editor/constants.ts +++ /dev/null @@ -1,37 +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 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 { EuiComboBoxOptionOption } from '@elastic/eui'; -import { RuntimeType } from '../../shared_imports'; - -export const RUNTIME_FIELD_OPTIONS: Array> = [ - { - label: 'Keyword', - value: 'keyword', - }, - { - label: 'Long', - value: 'long', - }, - { - label: 'Double', - value: 'double', - }, - { - label: 'Date', - value: 'date', - }, - { - label: 'IP', - value: 'ip', - }, - { - label: 'Boolean', - value: 'boolean', - }, -]; diff --git a/src/plugins/index_pattern_editor/public/components/field_editor/field_editor.test.tsx b/src/plugins/index_pattern_editor/public/components/field_editor/field_editor.test.tsx deleted file mode 100644 index b3fada3dbd00f..0000000000000 --- a/src/plugins/index_pattern_editor/public/components/field_editor/field_editor.test.tsx +++ /dev/null @@ -1,275 +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 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 React, { useState, useMemo } from 'react'; -import { act } from 'react-dom/test-utils'; - -import '../../test_utils/setup_environment'; -import { registerTestBed, TestBed, getCommonActions } from '../../test_utils'; -import { RuntimeFieldPainlessError } from '../../lib'; -import { Field } from '../../types'; -import { FieldEditor, Props, FieldEditorFormState } from './field_editor'; - -const defaultProps: Props = { - onChange: jest.fn(), - links: { - runtimePainless: 'https://elastic.co', - }, - ctx: { - existingConcreteFields: [], - namesNotAllowed: [], - fieldTypeToProcess: 'runtime', - }, - indexPattern: { fields: [] } as any, - fieldFormatEditors: { - getAll: () => [], - getById: () => undefined, - }, - fieldFormats: {} as any, - uiSettings: {} as any, - syntaxError: { - error: null, - clear: () => {}, - }, -}; - -const setup = (props?: Partial) => { - const testBed = registerTestBed(FieldEditor, { - memoryRouter: { - wrapComponent: false, - }, - })({ ...defaultProps, ...props }) as TestBed; - - const actions = { - ...getCommonActions(testBed), - }; - - return { - ...testBed, - actions, - }; -}; - -describe('', () => { - beforeAll(() => { - jest.useFakeTimers(); - }); - - afterAll(() => { - jest.useRealTimers(); - }); - - let testBed: TestBed & { actions: ReturnType }; - let onChange: jest.Mock = jest.fn(); - - const lastOnChangeCall = (): FieldEditorFormState[] => - onChange.mock.calls[onChange.mock.calls.length - 1]; - - const getLastStateUpdate = () => lastOnChangeCall()[0]; - - const submitFormAndGetData = async (state: FieldEditorFormState) => { - let formState: - | { - data: Field; - isValid: boolean; - } - | undefined; - - let promise: ReturnType; - - await act(async () => { - // We can't await for the promise here as the validation for the - // "script" field has a setTimeout which is mocked by jest. If we await - // we don't have the chance to call jest.advanceTimersByTime and thus the - // test times out. - promise = state.submit(); - }); - - await act(async () => { - // The painless syntax validation has a timeout set to 600ms - // we give it a bit more time just to be on the safe side - jest.advanceTimersByTime(1000); - }); - - await act(async () => { - promise.then((response) => { - formState = response; - }); - }); - - return formState!; - }; - - beforeEach(() => { - onChange = jest.fn(); - }); - - test('initial state should have "set custom label", "set value" and "set format" turned off', () => { - testBed = setup(); - - ['customLabel', 'value', 'format'].forEach((row) => { - const testSubj = `${row}Row.toggle`; - const toggle = testBed.find(testSubj); - const isOn = toggle.props()['aria-checked']; - - try { - expect(isOn).toBe(false); - } catch (e) { - e.message = `"${row}" row toggle expected to be 'off' but was 'on'. \n${e.message}`; - throw e; - } - }); - }); - - test('should accept a defaultValue and onChange prop to forward the form state', async () => { - const field = { - name: 'foo', - type: 'date', - script: { source: 'emit("hello")' }, - }; - - testBed = setup({ onChange, field }); - - expect(onChange).toHaveBeenCalled(); - - let lastState = getLastStateUpdate(); - expect(lastState.isValid).toBe(undefined); - expect(lastState.isSubmitted).toBe(false); - expect(lastState.submit).toBeDefined(); - - const { data: formData } = await submitFormAndGetData(lastState); - expect(formData).toEqual(field); - - // Make sure that both isValid and isSubmitted state are now "true" - lastState = getLastStateUpdate(); - expect(lastState.isValid).toBe(true); - expect(lastState.isSubmitted).toBe(true); - }); - - describe('validation', () => { - test('should accept an optional list of existing fields and prevent creating duplicates', async () => { - const existingFields = ['myRuntimeField']; - testBed = setup({ - onChange, - ctx: { - namesNotAllowed: existingFields, - existingConcreteFields: [], - fieldTypeToProcess: 'runtime', - }, - }); - - const { form, component, actions } = testBed; - - await act(async () => { - actions.toggleFormRow('value'); - }); - - await act(async () => { - form.setInputValue('nameField.input', existingFields[0]); - form.setInputValue('scriptField', 'echo("hello")'); - }); - - await act(async () => { - jest.advanceTimersByTime(1000); // Make sure our debounced error message is in the DOM - }); - - const lastState = getLastStateUpdate(); - await submitFormAndGetData(lastState); - component.update(); - expect(getLastStateUpdate().isValid).toBe(false); - expect(form.getErrorsMessages()).toEqual(['A field with this name already exists.']); - }); - - test('should not count the default value as a duplicate', async () => { - const existingRuntimeFieldNames = ['myRuntimeField']; - const field: Field = { - name: 'myRuntimeField', - type: 'boolean', - script: { source: 'emit("hello"' }, - }; - - testBed = setup({ - field, - onChange, - ctx: { - namesNotAllowed: existingRuntimeFieldNames, - existingConcreteFields: [], - fieldTypeToProcess: 'runtime', - }, - }); - - const { form, component } = testBed; - const lastState = getLastStateUpdate(); - await submitFormAndGetData(lastState); - component.update(); - expect(getLastStateUpdate().isValid).toBe(true); - expect(form.getErrorsMessages()).toEqual([]); - }); - - test('should clear the painless syntax error whenever the field type changes', async () => { - const field: Field = { - name: 'myRuntimeField', - type: 'keyword', - script: { source: 'emit(6)' }, - }; - - const TestComponent = () => { - const dummyError = { - reason: 'Awwww! Painless syntax error', - message: '', - position: { offset: 0, start: 0, end: 0 }, - scriptStack: [''], - }; - const [error, setError] = useState(null); - const clearError = useMemo(() => () => setError(null), []); - const syntaxError = useMemo(() => ({ error, clear: clearError }), [error, clearError]); - - return ( - <> - - - {/* Button to forward dummy syntax error */} - - - ); - }; - - const customTestbed = registerTestBed(TestComponent, { - memoryRouter: { - wrapComponent: false, - }, - })() as TestBed; - - testBed = { - ...customTestbed, - actions: getCommonActions(customTestbed), - }; - - const { - form, - component, - find, - actions: { changeFieldType }, - } = testBed; - - // We set some dummy painless error - act(() => { - find('setPainlessErrorButton').simulate('click'); - }); - component.update(); - - expect(form.getErrorsMessages()).toEqual(['Awwww! Painless syntax error']); - - // We change the type and expect the form error to not be there anymore - await changeFieldType('keyword'); - expect(form.getErrorsMessages()).toEqual([]); - }); - }); -}); diff --git a/src/plugins/index_pattern_editor/public/components/field_editor/field_editor.tsx.old b/src/plugins/index_pattern_editor/public/components/field_editor/field_editor.tsx.old deleted file mode 100644 index fc25879b128ec..0000000000000 --- a/src/plugins/index_pattern_editor/public/components/field_editor/field_editor.tsx.old +++ /dev/null @@ -1,319 +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 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 React, { useEffect } from 'react'; -import { i18n } from '@kbn/i18n'; -import { FormattedMessage } from '@kbn/i18n/react'; -import { - EuiFlexGroup, - EuiFlexItem, - EuiSpacer, - EuiComboBoxOptionOption, - EuiCode, - EuiCallOut, -} from '@elastic/eui'; -import type { CoreStart } from 'src/core/public'; - -import { - Form, - useForm, - useFormData, - FormHook, - UseField, - TextField, - RuntimeType, - IndexPattern, - DataPublicPluginStart, -} from '../../shared_imports'; -import { Field, InternalFieldType, PluginStart } from '../../types'; - -import { RUNTIME_FIELD_OPTIONS } from './constants'; -import { schema } from './form_schema'; -import { getNameFieldConfig } from './lib'; -import { - TypeField, - CustomLabelField, - ScriptField, - FormatField, - PopularityField, - ScriptSyntaxError, -} from './form_fields'; -import { FormRow } from './form_row'; -import { AdvancedParametersSection } from './advanced_parameters_section'; - -export interface FieldEditorFormState { - isValid: boolean | undefined; - isSubmitted: boolean; - submit: FormHook['submit']; -} - -export interface FieldFormInternal extends Omit { - type: Array>; - __meta__: { - isCustomLabelVisible: boolean; - isValueVisible: boolean; - isFormatVisible: boolean; - isPopularityVisible: boolean; - }; -} - -export interface Props { - /** Link URLs to our doc site */ - links: { - runtimePainless: string; - }; - /** Optional field to edit */ - field?: Field; - /** Handler to receive state changes updates */ - onChange?: (state: FieldEditorFormState) => void; - indexPattern: IndexPattern; - fieldFormatEditors: PluginStart['fieldFormatEditors']; - fieldFormats: DataPublicPluginStart['fieldFormats']; - uiSettings: CoreStart['uiSettings']; - /** Context object */ - ctx: { - /** The internal field type we are dealing with (concrete|runtime)*/ - fieldTypeToProcess: InternalFieldType; - /** - * An array of field names not allowed. - * e.g we probably don't want a user to give a name of an existing - * runtime field (for that the user should edit the existing runtime field). - */ - namesNotAllowed: string[]; - /** - * An array of existing concrete fields. If the user gives a name to the runtime - * field that matches one of the concrete fields, a callout will be displayed - * to indicate that this runtime field will shadow the concrete field. - * It is also used to provide the list of field autocomplete suggestions to the code editor. - */ - existingConcreteFields: Array<{ name: string; type: string }>; - }; - syntaxError: ScriptSyntaxError; -} - -const geti18nTexts = (): { - [key: string]: { title: string; description: JSX.Element | string }; -} => ({ - customLabel: { - title: i18n.translate('indexPatternFieldEditor.editor.form.customLabelTitle', { - defaultMessage: 'Set custom label', - }), - description: i18n.translate('indexPatternFieldEditor.editor.form.customLabelDescription', { - defaultMessage: `Create a label to display in place of the field name in Discover, Maps, and Visualize. Useful for shortening a long field name. Queries and filters use the original field name.`, - }), - }, - value: { - title: i18n.translate('indexPatternFieldEditor.editor.form.valueTitle', { - defaultMessage: 'Set value', - }), - description: ( - {'_source'}, - }} - /> - ), - }, - format: { - title: i18n.translate('indexPatternFieldEditor.editor.form.formatTitle', { - defaultMessage: 'Set format', - }), - description: i18n.translate('indexPatternFieldEditor.editor.form.formatDescription', { - defaultMessage: `Set your preferred format for displaying the value. Changing the format can affect the value and prevent highlighting in Discover.`, - }), - }, - popularity: { - title: i18n.translate('indexPatternFieldEditor.editor.form.popularityTitle', { - defaultMessage: 'Set popularity', - }), - description: i18n.translate('indexPatternFieldEditor.editor.form.popularityDescription', { - defaultMessage: `Adjust the popularity to make the field appear higher or lower in the fields list. By default, Discover orders fields from most selected to least selected.`, - }), - }, -}); - -const changeWarning = i18n.translate('indexPatternFieldEditor.editor.form.changeWarning', { - defaultMessage: - 'Changing name or type can break searches and visualizations that rely on this field.', -}); - -const formDeserializer = (field: Field): FieldFormInternal => { - let fieldType: Array>; - if (!field.type) { - fieldType = [RUNTIME_FIELD_OPTIONS[0]]; - } else { - const label = RUNTIME_FIELD_OPTIONS.find(({ value }) => value === field.type)?.label; - fieldType = [{ label: label ?? field.type, value: field.type as RuntimeType }]; - } - - return { - ...field, - type: fieldType, - __meta__: { - isCustomLabelVisible: field.customLabel !== undefined, - isValueVisible: field.script !== undefined, - isFormatVisible: field.format !== undefined, - isPopularityVisible: field.popularity !== undefined, - }, - }; -}; - -const formSerializer = (field: FieldFormInternal): Field => { - const { __meta__, type, ...rest } = field; - return { - type: type[0].value!, - ...rest, - }; -}; - -const FieldEditorComponent = ({ - field, - onChange, - links, - indexPattern, - fieldFormatEditors, - fieldFormats, - uiSettings, - syntaxError, - ctx: { fieldTypeToProcess, namesNotAllowed, existingConcreteFields }, -}: Props) => { - const { form } = useForm({ - defaultValue: field, - schema, - deserializer: formDeserializer, - serializer: formSerializer, - }); - const { submit, isValid: isFormValid, isSubmitted } = form; - const { clear: clearSyntaxError } = syntaxError; - - const [{ type }] = useFormData({ form }); - - const nameFieldConfig = getNameFieldConfig(namesNotAllowed, field); - const i18nTexts = geti18nTexts(); - - useEffect(() => { - if (onChange) { - onChange({ isValid: isFormValid, isSubmitted, submit }); - } - }, [onChange, isFormValid, isSubmitted, submit]); - - useEffect(() => { - // Whenever the field "type" changes we clear any possible painless syntax - // error as it is possibly stale. - clearSyntaxError(); - }, [type, clearSyntaxError]); - - const [{ name: updatedName, type: updatedType }] = useFormData({ form }); - const nameHasChanged = Boolean(field?.name) && field?.name !== updatedName; - const typeHasChanged = - Boolean(field?.type) && field?.type !== (updatedType && updatedType[0].value); - - return ( -
- - {/* Name */} - - - path="name" - config={nameFieldConfig} - component={TextField} - data-test-subj="nameField" - componentProps={{ - euiFieldProps: { - disabled: fieldTypeToProcess === 'concrete', - 'aria-label': i18n.translate('indexPatternFieldEditor.editor.form.nameAriaLabel', { - defaultMessage: 'Name field', - }), - }, - }} - /> - - - {/* Type */} - - - - - - {(nameHasChanged || typeHasChanged) && ( - <> - - - - )} - - - {/* Set custom label */} - - - - - {/* Set value */} - {fieldTypeToProcess === 'runtime' && ( - - - - )} - - {/* Set custom format */} - - - - - {/* Advanced settings */} - - - - - - - ); -}; - -export const FieldEditor = React.memo(FieldEditorComponent); diff --git a/src/plugins/index_pattern_editor/public/components/field_editor/form_schema.ts b/src/plugins/index_pattern_editor/public/components/field_editor/form_schema.ts deleted file mode 100644 index a722f277b8e23..0000000000000 --- a/src/plugins/index_pattern_editor/public/components/field_editor/form_schema.ts +++ /dev/null @@ -1,119 +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 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 { fieldValidators } from '../../shared_imports'; - -import { RUNTIME_FIELD_OPTIONS } from './constants'; - -const { emptyField, numberGreaterThanField } = fieldValidators; - -export const schema = { - name: { - label: i18n.translate('indexPatternFieldEditor.editor.form.nameLabel', { - defaultMessage: 'Name', - }), - validations: [ - { - validator: emptyField( - i18n.translate( - 'indexPatternFieldEditor.editor.form.validations.nameIsRequiredErrorMessage', - { - defaultMessage: 'A name is required.', - } - ) - ), - }, - ], - }, - type: { - label: i18n.translate('indexPatternFieldEditor.editor.form.runtimeTypeLabel', { - defaultMessage: 'Type', - }), - defaultValue: [RUNTIME_FIELD_OPTIONS[0]], - }, - script: { - source: { - label: i18n.translate('indexPatternFieldEditor.editor.form.defineFieldLabel', { - defaultMessage: 'Define script', - }), - validations: [ - { - validator: emptyField( - i18n.translate( - 'indexPatternFieldEditor.editor.form.validations.scriptIsRequiredErrorMessage', - { - defaultMessage: 'A script is required to set the field value.', - } - ) - ), - }, - ], - }, - }, - customLabel: { - label: i18n.translate('indexPatternFieldEditor.editor.form.customLabelLabel', { - defaultMessage: 'Custom label', - }), - validations: [ - { - validator: emptyField( - i18n.translate( - 'indexPatternFieldEditor.editor.form.validations.customLabelIsRequiredErrorMessage', - { - defaultMessage: 'Give a label to the field.', - } - ) - ), - }, - ], - }, - popularity: { - label: i18n.translate('indexPatternFieldEditor.editor.form.popularityLabel', { - defaultMessage: 'Popularity', - }), - validations: [ - { - validator: emptyField( - i18n.translate( - 'indexPatternFieldEditor.editor.form.validations.popularityIsRequiredErrorMessage', - { - defaultMessage: 'Give a popularity to the field.', - } - ) - ), - }, - { - validator: numberGreaterThanField({ - than: 0, - allowEquality: true, - message: i18n.translate( - 'indexPatternFieldEditor.editor.form.validations.popularityGreaterThan0ErrorMessage', - { - defaultMessage: 'The popularity must be zero or greater.', - } - ), - }), - }, - ], - }, - __meta__: { - isCustomLabelVisible: { - defaultValue: false, - }, - isValueVisible: { - defaultValue: false, - }, - isFormatVisible: { - defaultValue: false, - }, - isPopularityVisible: { - defaultValue: false, - }, - }, -}; diff --git a/src/plugins/index_pattern_editor/public/components/field_editor/index.ts b/src/plugins/index_pattern_editor/public/components/field_editor/index.ts index db7c05fa7ff7a..ac1fc933441d8 100644 --- a/src/plugins/index_pattern_editor/public/components/field_editor/index.ts +++ b/src/plugins/index_pattern_editor/public/components/field_editor/index.ts @@ -6,4 +6,5 @@ * Side Public License, v 1. */ -export { FieldEditor } from './field_editor'; +export { AdvancedParametersSection } from './advanced_parameters_section'; +export { FormRow } from './form_row'; diff --git a/src/plugins/index_pattern_editor/public/components/field_editor/lib.ts b/src/plugins/index_pattern_editor/public/components/field_editor/lib.ts deleted file mode 100644 index 2d324804c9e43..0000000000000 --- a/src/plugins/index_pattern_editor/public/components/field_editor/lib.ts +++ /dev/null @@ -1,60 +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 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 { ValidationFunc, FieldConfig } from '../../shared_imports'; -import { Field } from '../../types'; -import { schema } from './form_schema'; -import { Props } from './field_editor'; - -const createNameNotAllowedValidator = ( - namesNotAllowed: string[] -): ValidationFunc<{}, string, string> => ({ value }) => { - if (namesNotAllowed.includes(value)) { - return { - message: i18n.translate( - 'indexPatternFieldEditor.editor.runtimeFieldsEditor.existRuntimeFieldNamesValidationErrorMessage', - { - defaultMessage: 'A field with this name already exists.', - } - ), - }; - } -}; - -/** - * Dynamically retrieve the config for the "name" field, adding - * a validator to avoid duplicated runtime fields to be created. - * - * @param namesNotAllowed Array of names not allowed for the field "name" - * @param field Initial value of the form - */ -export const getNameFieldConfig = ( - namesNotAllowed?: string[], - field?: Props['field'] -): FieldConfig => { - const nameFieldConfig = schema.name as FieldConfig; - - if (!namesNotAllowed) { - return nameFieldConfig; - } - - // Add validation to not allow duplicates - return { - ...nameFieldConfig!, - validations: [ - ...(nameFieldConfig.validations ?? []), - { - validator: createNameNotAllowedValidator( - namesNotAllowed.filter((name) => name !== field?.name) - ), - }, - ], - }; -}; diff --git a/src/plugins/index_pattern_editor/public/components/field_editor/shadowing_field_warning.tsx b/src/plugins/index_pattern_editor/public/components/field_editor/shadowing_field_warning.tsx deleted file mode 100644 index 4343b13db9a5a..0000000000000 --- a/src/plugins/index_pattern_editor/public/components/field_editor/shadowing_field_warning.tsx +++ /dev/null @@ -1,32 +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 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 React from 'react'; -import { i18n } from '@kbn/i18n'; -import { EuiCallOut } from '@elastic/eui'; - -export const ShadowingFieldWarning = () => { - return ( - -
- {i18n.translate('indexPatternFieldEditor.editor.form.fieldShadowingCalloutDescription', { - defaultMessage: - 'This field shares the name of a mapped field. Values for this field will be returned in search results.', - })} -
- - ); -}; diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx index 3d0ec37c88068..62c02400ee78d 100644 --- a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx @@ -20,7 +20,6 @@ import { } from '@elastic/eui'; import { DocLinksStart, CoreStart } from 'src/core/public'; -import { getIndexPatterns } from './utils'; import { ensureMinimumTime, getIndices, extractTimeFields, getMatchedIndices } from '../lib'; import { AdvancedParametersSection } from './field_editor/advanced_parameters_section'; @@ -83,8 +82,6 @@ export interface FormInternal extends Omit timestampField?: TimestampOption; } -const count = 0; - const geti18nTexts = () => { return { closeButtonLabel: i18n.translate('indexPatternFieldEditor.editor.flyoutCloseButtonLabel', { diff --git a/src/plugins/index_pattern_editor/public/components/utils.test.ts b/src/plugins/index_pattern_editor/public/components/utils.test.ts deleted file mode 100644 index 15e0a65390f4d..0000000000000 --- a/src/plugins/index_pattern_editor/public/components/utils.test.ts +++ /dev/null @@ -1,37 +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 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 { IndexPatternsContract } from 'src/plugins/data/public'; -import { getIndexPatterns } from './utils'; -import { mockManagementPlugin } from '../mocks'; - -const indexPatternContractMock = ({ - getIdsWithTitle: jest.fn().mockReturnValue( - Promise.resolve([ - { - id: 'test', - title: 'test name', - }, - { - id: 'test1', - title: 'test name 1', - }, - ]) - ), - get: jest.fn().mockReturnValue(Promise.resolve({})), -} as unknown) as jest.Mocked; - -const mockManagementPluginStart = mockManagementPlugin.createStartContract(); - -test('getting index patterns', async () => { - const indexPatterns = await getIndexPatterns( - 'test', - mockManagementPluginStart, - indexPatternContractMock - ); - expect(indexPatterns).toMatchSnapshot(); -}); diff --git a/src/plugins/index_pattern_editor/public/components/utils.ts b/src/plugins/index_pattern_editor/public/components/utils.ts deleted file mode 100644 index 68e78199798b4..0000000000000 --- a/src/plugins/index_pattern_editor/public/components/utils.ts +++ /dev/null @@ -1,51 +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 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 { IndexPatternsContract } from 'src/plugins/data/public'; -import { IndexPatternManagementStart } from '../plugin'; - -export async function getIndexPatterns( - defaultIndex: string, - indexPatternManagementStart: IndexPatternManagementStart, - indexPatternsService: IndexPatternsContract -) { - const existingIndexPatterns = await indexPatternsService.getIdsWithTitle(true); - const indexPatternsListItems = await Promise.all( - existingIndexPatterns.map(async ({ id, title }) => { - const isDefault = defaultIndex === id; - const pattern = await indexPatternsService.get(id); - const tags = (indexPatternManagementStart as IndexPatternManagementStart).list.getIndexPatternTags( - pattern, - isDefault - ); - - return { - id, - title, - default: isDefault, - tags, - // the prepending of 0 at the default pattern takes care of prioritization - // so the sorting will but the default index on top - // or on bottom of a the table - sort: `${isDefault ? '0' : '1'}${title}`, - }; - }) - ); - - return ( - indexPatternsListItems.sort((a, b) => { - if (a.sort < b.sort) { - return -1; - } else if (a.sort > b.sort) { - return 1; - } else { - return 0; - } - }) || [] - ); -} diff --git a/src/plugins/index_pattern_editor/public/constants.ts b/src/plugins/index_pattern_editor/public/constants.ts index b74ba8b900aab..1b2d5dc59b17e 100644 --- a/src/plugins/index_pattern_editor/public/constants.ts +++ b/src/plugins/index_pattern_editor/public/constants.ts @@ -7,3 +7,4 @@ */ export const pluginName = 'index_pattern_editor'; +export const MAX_NUMBER_OF_MATCHING_INDICES = 6; diff --git a/src/plugins/index_pattern_editor/public/lib/get_indices.test.ts b/src/plugins/index_pattern_editor/public/lib/get_indices.test.ts index 29330cefc4806..f96043bce0739 100644 --- a/src/plugins/index_pattern_editor/public/lib/get_indices.test.ts +++ b/src/plugins/index_pattern_editor/public/lib/get_indices.test.ts @@ -7,7 +7,7 @@ */ import { getIndices, responseToItemArray } from './get_indices'; -import { httpServiceMock } from '../../../../../../core/public/mocks'; +import { httpServiceMock } from '../../../../core/public/mocks'; import { ResolveIndexResponseItemIndexAttrs } from '../types'; export const successfulResponse = { diff --git a/src/plugins/index_pattern_editor/public/lib/get_indices.ts b/src/plugins/index_pattern_editor/public/lib/get_indices.ts index cd100cc5d6c17..d318d5a9b7249 100644 --- a/src/plugins/index_pattern_editor/public/lib/get_indices.ts +++ b/src/plugins/index_pattern_editor/public/lib/get_indices.ts @@ -10,7 +10,7 @@ import { sortBy } from 'lodash'; import { HttpStart } from 'kibana/public'; import { i18n } from '@kbn/i18n'; // todo move into this plugin, consider removing all ipm references -import { IndexPatternCreationConfig } from '../../../index_pattern_management/public'; +// import { IndexPatternCreationConfig } from '../../../index_pattern_management/public'; import { MatchedItem, ResolveIndexResponse, ResolveIndexResponseItemIndexAttrs } from '../types'; const aliasLabel = i18n.translate('indexPatternManagement.aliasLabel', { defaultMessage: 'Alias' }); @@ -28,7 +28,8 @@ const frozenLabel = i18n.translate('indexPatternManagement.frozenLabel', { export async function getIndices( http: HttpStart, - getIndexTags: IndexPatternCreationConfig['getIndexTags'], + // todo + getIndexTags: () => [], // IndexPatternCreationConfig['getIndexTags'], rawPattern: string, showAllIndices: boolean ): Promise { @@ -71,7 +72,8 @@ export async function getIndices( export const responseToItemArray = ( response: ResolveIndexResponse, - getIndexTags: IndexPatternCreationConfig['getIndexTags'] + // todo + getIndexTags: (a: string) => [] // IndexPatternCreationConfig['getIndexTags'] ): MatchedItem[] => { const source: MatchedItem[] = []; diff --git a/src/plugins/index_pattern_editor/public/plugin.test.tsx b/src/plugins/index_pattern_editor/public/plugin.test.tsx index 2212264427d1a..b21e5c17f2085 100644 --- a/src/plugins/index_pattern_editor/public/plugin.test.tsx +++ b/src/plugins/index_pattern_editor/public/plugin.test.tsx @@ -23,9 +23,8 @@ import { usageCollectionPluginMock } from '../../usage_collection/public/mocks'; import { registerTestBed } from './test_utils'; -import { FieldEditorFlyoutContentContainer } from './components/field_editor_flyout_content_container'; -import { IndexPatternFieldEditorPlugin } from './plugin'; -import { DeleteFieldModal } from './components/delete_field_modal'; +import { IndexPatternFlyoutContentContainer } from './components/index_pattern_flyout_content_container'; +import { IndexPatternEditorPlugin } from './plugin'; import { IndexPattern } from './shared_imports'; const noop = () => {}; @@ -37,10 +36,10 @@ describe('IndexPatternFieldEditorPlugin', () => { usageCollection: usageCollectionPluginMock.createSetupContract(), }; - let plugin: IndexPatternFieldEditorPlugin; + let plugin: IndexPatternEditorPlugin; beforeEach(() => { - plugin = new IndexPatternFieldEditorPlugin(); + plugin = new IndexPatternEditorPlugin(); }); test('should expose a handler to open the indexpattern field editor', async () => { diff --git a/src/plugins/index_pattern_editor/tsconfig.json b/src/plugins/index_pattern_editor/tsconfig.json index b0a862dc50854..559b1aaf0fc26 100644 --- a/src/plugins/index_pattern_editor/tsconfig.json +++ b/src/plugins/index_pattern_editor/tsconfig.json @@ -16,6 +16,5 @@ { "path": "../kibana_react/tsconfig.json" }, { "path": "../kibana_utils/tsconfig.json" }, { "path": "../es_ui_shared/tsconfig.json" }, - { "path": "../index_pattern_management/tsconfig.json" }, ] } diff --git a/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_index_pattern_prompt/__snapshots__/empty_index_pattern_prompt.test.tsx.snap b/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_index_pattern_prompt/__snapshots__/empty_index_pattern_prompt.test.tsx.snap deleted file mode 100644 index c5e6d1220d8bf..0000000000000 --- a/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_index_pattern_prompt/__snapshots__/empty_index_pattern_prompt.test.tsx.snap +++ /dev/null @@ -1,99 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`EmptyIndexPatternPrompt should render normally 1`] = ` - - - - - - - -

- -
- -

-

- -

- - - - - - - - - - - - - - - - - - -`; diff --git a/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_index_pattern_prompt/assets/index_pattern_illustration.scss b/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_index_pattern_prompt/assets/index_pattern_illustration.scss deleted file mode 100644 index cd0477aba7adf..0000000000000 --- a/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_index_pattern_prompt/assets/index_pattern_illustration.scss +++ /dev/null @@ -1,9 +0,0 @@ -.indexPatternIllustration { - &__verticalStripes { - fill: $euiColorFullShade; - } - - &__dots { - fill: $euiColorLightShade; - } -} diff --git a/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_index_pattern_prompt/assets/index_pattern_illustration.tsx b/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_index_pattern_prompt/assets/index_pattern_illustration.tsx deleted file mode 100644 index 3666c1be7b5d2..0000000000000 --- a/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_index_pattern_prompt/assets/index_pattern_illustration.tsx +++ /dev/null @@ -1,540 +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 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 './index_pattern_illustration.scss'; -import React from 'react'; - -const IndexPatternIllustration = () => ( - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -); - -export const Illustration = IndexPatternIllustration; diff --git a/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_index_pattern_prompt/empty_index_pattern_prompt.scss b/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_index_pattern_prompt/empty_index_pattern_prompt.scss deleted file mode 100644 index 11ac55b098a57..0000000000000 --- a/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_index_pattern_prompt/empty_index_pattern_prompt.scss +++ /dev/null @@ -1,31 +0,0 @@ -@import '../../../variables'; -@import '../../../templates'; - -.inpEmptyIndexPatternPrompt { - // override EUI specificity - max-width: $inpEmptyStateMaxWidth !important; // sass-lint:disable-line no-important -} - -.inpEmptyIndexPatternPrompt__footer { - @extend %inp-empty-state-footer; - // override EUI specificity - align-items: baseline !important; // sass-lint:disable-line no-important -} - -.inpEmptyIndexPatternPrompt__title { - // override EUI specificity - width: auto !important; // sass-lint:disable-line no-important -} - -@include euiBreakpoint('xs', 's') { - .inpEmptyIndexPatternPrompt__illustration > svg { - width: $euiSize * 12; - height: auto; - margin: 0 auto; - } - - .inpEmptyIndexPatternPrompt__text { - text-align: center; - align-items: center; - } -} diff --git a/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_index_pattern_prompt/empty_index_pattern_prompt.test.tsx b/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_index_pattern_prompt/empty_index_pattern_prompt.test.tsx deleted file mode 100644 index 1cd0574a35d15..0000000000000 --- a/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_index_pattern_prompt/empty_index_pattern_prompt.test.tsx +++ /dev/null @@ -1,26 +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 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 React from 'react'; -import { EmptyIndexPatternPrompt } from '../empty_index_pattern_prompt'; -import { shallowWithI18nProvider } from '@kbn/test/jest'; - -describe('EmptyIndexPatternPrompt', () => { - it('should render normally', () => { - const component = shallowWithI18nProvider( - {} }]} - docLinksIndexPatternIntro={'testUrl'} - setBreadcrumbs={() => {}} - /> - ); - - expect(component).toMatchSnapshot(); - }); -}); diff --git a/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_index_pattern_prompt/empty_index_pattern_prompt.tsx b/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_index_pattern_prompt/empty_index_pattern_prompt.tsx deleted file mode 100644 index f1bf912f332d8..0000000000000 --- a/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_index_pattern_prompt/empty_index_pattern_prompt.tsx +++ /dev/null @@ -1,101 +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 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 './empty_index_pattern_prompt.scss'; - -import React from 'react'; -import { FormattedMessage } from '@kbn/i18n/react'; - -import { EuiPageContent, EuiSpacer, EuiText, EuiFlexItem, EuiFlexGroup } from '@elastic/eui'; -import { EuiDescriptionListTitle } from '@elastic/eui'; -import { EuiDescriptionListDescription, EuiDescriptionList } from '@elastic/eui'; -import { EuiLink } from '@elastic/eui'; -import { getListBreadcrumbs } from '../../breadcrumbs'; -import { IndexPatternCreationOption } from '../../types'; -import { CreateButton } from '../../create_button'; -import { Illustration } from './assets/index_pattern_illustration'; -import { ManagementAppMountParams } from '../../../../../management/public'; - -interface Props { - canSave: boolean; - creationOptions: IndexPatternCreationOption[]; - docLinksIndexPatternIntro: string; - setBreadcrumbs: ManagementAppMountParams['setBreadcrumbs']; -} - -export const EmptyIndexPatternPrompt = ({ - canSave, - creationOptions, - docLinksIndexPatternIntro, - setBreadcrumbs, -}: Props) => { - setBreadcrumbs(getListBreadcrumbs()); - - return ( - - - - - - - -

- -
- -

-

- -

- {canSave && ( - - - - )} - - - - - - - - - - - - - - - - ); -}; diff --git a/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_index_pattern_prompt/index.tsx b/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_index_pattern_prompt/index.tsx deleted file mode 100644 index 0a58c6f86a8d3..0000000000000 --- a/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_index_pattern_prompt/index.tsx +++ /dev/null @@ -1,9 +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 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 { EmptyIndexPatternPrompt } from './empty_index_pattern_prompt'; diff --git a/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_state/__snapshots__/empty_state.test.tsx.snap b/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_state/__snapshots__/empty_state.test.tsx.snap deleted file mode 100644 index 645694371f905..0000000000000 --- a/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_state/__snapshots__/empty_state.test.tsx.snap +++ /dev/null @@ -1,216 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`EmptyState should render normally 1`] = ` - - - - - -

- -

- - - - - - - - - } - icon={ - - } - onClick={[Function]} - title={ - - } - /> - - - - } - icon={ - - } - isDisabled={false} - onClick={[Function]} - title={ - - } - /> - - - - } - icon={ - - } - onClick={[Function]} - title={ - - } - /> - - - -
- - - - - , - "title": , - }, - ] - } - /> - - - - - - - , - "title": , - }, - ] - } - /> - - -
- - - - - - - , - } - } - /> - - -`; diff --git a/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_state/_templates.scss b/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_state/_templates.scss deleted file mode 100644 index 5303537bddabc..0000000000000 --- a/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_state/_templates.scss +++ /dev/null @@ -1,11 +0,0 @@ -%inp-empty-state-footer { - background: $euiColorLightestShade; - margin: 0 (-$euiSizeL) (-$euiSizeL); - padding: $euiSizeL; - border-radius: 0 0 $euiBorderRadius $euiBorderRadius; - - // sass-lint:disable-block mixins-before-declarations - @include euiBreakpoint('xs', 's') { - text-align: center; - } -} diff --git a/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_state/_variables.scss b/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_state/_variables.scss deleted file mode 100644 index 5da25a91bd77c..0000000000000 --- a/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_state/_variables.scss +++ /dev/null @@ -1 +0,0 @@ -$inpEmptyStateMaxWidth: $euiSizeXXL * 19; diff --git a/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_state/empty_state.scss b/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_state/empty_state.scss deleted file mode 100644 index 5c7c827700017..0000000000000 --- a/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_state/empty_state.scss +++ /dev/null @@ -1,23 +0,0 @@ -@import './variables'; -@import './templates'; - -.inpEmptyState { - // override EUI specificity - max-width: $inpEmptyStateMaxWidth !important; // sass-lint:disable-line no-important -} - -.inpEmptyState__cardGrid { - justify-content: center; -} - -.inpEmptyState__card { - min-width: $euiSizeXL * 6; -} - -.inpEmptyState__footer { - @extend %inp-empty-state-footer; -} - -.inpEmptyState__footerFlexItem { - min-width: $euiSizeXL * 7; -} diff --git a/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_state/empty_state.test.tsx b/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_state/empty_state.test.tsx deleted file mode 100644 index fa300667ff919..0000000000000 --- a/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_state/empty_state.test.tsx +++ /dev/null @@ -1,62 +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 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 React from 'react'; -import { EmptyState } from '../empty_state'; -import { shallow } from 'enzyme'; -import sinon from 'sinon'; -import { findTestSubject } from '@elastic/eui/lib/test'; -import { mountWithIntl } from '@kbn/test/jest'; -import { docLinksServiceMock } from '../../../../../../core/public/mocks'; -import { MlCardState } from '../../../types'; - -const docLinks = docLinksServiceMock.createStartContract(); - -jest.mock('react-router-dom', () => ({ - useHistory: () => ({ - createHref: jest.fn(), - }), -})); - -describe('EmptyState', () => { - it('should render normally', () => { - const component = shallow( - {}} - navigateToApp={async () => {}} - getMlCardState={() => MlCardState.ENABLED} - canSave={true} - /> - ); - - expect(component).toMatchSnapshot(); - }); - - describe('props', () => { - describe('onRefresh', () => { - it('is called when refresh button is clicked', () => { - const onRefreshHandler = sinon.stub(); - - const component = mountWithIntl( - {}} - getMlCardState={() => MlCardState.ENABLED} - canSave={true} - /> - ); - - findTestSubject(component, 'refreshIndicesButton').simulate('click'); - - sinon.assert.calledOnce(onRefreshHandler); - }); - }); - }); -}); diff --git a/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_state/empty_state.tsx b/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_state/empty_state.tsx deleted file mode 100644 index d5f7e48975c42..0000000000000 --- a/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_state/empty_state.tsx +++ /dev/null @@ -1,221 +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 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 './empty_state.scss'; -import React from 'react'; -import { i18n } from '@kbn/i18n'; -import { FormattedMessage } from '@kbn/i18n/react'; -import { DocLinksStart, ApplicationStart } from 'kibana/public'; -import { - EuiPageContentHeader, - EuiPageContentHeaderSection, - EuiTitle, - EuiPageContentBody, - EuiPageContent, - EuiIcon, - EuiSpacer, - EuiFlexItem, - EuiDescriptionList, - EuiFlexGrid, - EuiCard, - EuiLink, - EuiText, -} from '@elastic/eui'; -import { useHistory } from 'react-router-dom'; -import { reactRouterNavigate } from '../../../../../kibana_react/public'; -// import { MlCardState } from '../../../types'; - -export const EmptyState = ({ - onRefresh, - navigateToApp, - docLinks, - // getMlCardState, - canSave, -}: { - onRefresh: () => void; - navigateToApp: ApplicationStart['navigateToApp']; - docLinks: DocLinksStart; - // getMlCardState: () => MlCardState; - canSave: boolean; -}) => { - const mlCard = ( - - navigateToApp('ml', { path: '#/filedatavisualizer' })} - className="inpEmptyState__card" - betaBadgeLabel={ - // getMlCardState() === MlCardState.ENABLED - // ? undefined - i18n.translate('indexPatternManagement.createIndexPattern.emptyState.basicLicenseLabel', { - defaultMessage: 'Basic', - }) - } - betaBadgeTooltipContent={i18n.translate( - 'indexPatternManagement.createIndexPattern.emptyState.basicLicenseDescription', - { - defaultMessage: 'This feature requires a Basic license.', - } - )} - // isDisabled={getMlCardState() === MlCardState.DISABLED} - icon={} - title={ - - } - description={ - - } - /> - - ); - - const createAnyway = ( - - - - - ), - }} - /> - - ); - - return ( - <> - - - - -

- -

- - - - - - - - navigateToApp('home', { path: '#/tutorial_directory' })} - icon={} - title={ - - } - description={ - - } - /> - - {/* getMlCardState() !== MlCardState.HIDDEN ? mlCard : <> */} - {mlCard} - - navigateToApp('home', { path: '#/tutorial_directory/sampleData' })} - icon={} - title={ - - } - description={ - - } - /> - - - -
- - - - ), - description: ( - - - - ), - }, - ]} - /> - - - - ), - description: ( - - {' '} - - - ), - }, - ]} - /> - - -
- - - - {canSave && createAnyway} - - ); -}; diff --git a/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_state/index.ts b/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_state/index.ts deleted file mode 100644 index 4e19a60d5a769..0000000000000 --- a/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_state/index.ts +++ /dev/null @@ -1,9 +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 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 { EmptyState } from './empty_state'; diff --git a/src/plugins/index_pattern_management/public/components/index_pattern_table/index_pattern_table.tsx b/src/plugins/index_pattern_management/public/components/index_pattern_table/index_pattern_table.tsx index ea4af778d219b..5c3abd3608afd 100644 --- a/src/plugins/index_pattern_management/public/components/index_pattern_table/index_pattern_table.tsx +++ b/src/plugins/index_pattern_management/public/components/index_pattern_table/index_pattern_table.tsx @@ -25,11 +25,9 @@ import React, { useState, useEffect } from 'react'; import { i18n } from '@kbn/i18n'; import { reactRouterNavigate, useKibana } from '../../../../../plugins/kibana_react/public'; import { IndexPatternManagmentContext } from '../../types'; -import { IndexPatternTableItem, IndexPatternCreationOption } from '../types'; +import { IndexPatternTableItem } from '../types'; import { getIndexPatterns } from '../utils'; import { getListBreadcrumbs } from '../breadcrumbs'; -import { MatchedItem, ResolveIndexResponseItemAlias } from '../create_index_pattern_wizard/types'; -import { getIndices } from '../create_index_pattern_wizard/lib'; const pagination = { initialPageSize: 10, @@ -64,65 +62,31 @@ interface Props extends RouteComponentProps { canSave: boolean; } -export const IndexPatternTable = ({ canSave, history }: Props) => { +export const IndexPatternTable = ({ history }: Props) => { const { setBreadcrumbs, uiSettings, indexPatternManagementStart, chrome, - docLinks, - application, - http, data, - getMlCardState, indexPatternEditor, } = useKibana().services; const [indexPatterns, setIndexPatterns] = useState([]); - const [creationOptions, setCreationOptions] = useState([]); - const [sources, setSources] = useState([]); - const [remoteClustersExist, setRemoteClustersExist] = useState(false); - const [isLoadingSources, setIsLoadingSources] = useState(true); const [isLoadingIndexPatterns, setIsLoadingIndexPatterns] = useState(true); setBreadcrumbs(getListBreadcrumbs()); useEffect(() => { (async function () { - const options = await indexPatternManagementStart.creation.getIndexPatternCreationOptions( - history.push - ); const gettedIndexPatterns: IndexPatternTableItem[] = await getIndexPatterns( uiSettings.get('defaultIndex'), indexPatternManagementStart, data.indexPatterns ); setIsLoadingIndexPatterns(false); - setCreationOptions(options); setIndexPatterns(gettedIndexPatterns); })(); }, [history.push, indexPatterns.length, indexPatternManagementStart, uiSettings, data]); - const removeAliases = (item: MatchedItem) => - !((item as unknown) as ResolveIndexResponseItemAlias).indices; - - const loadSources = () => { - getIndices(http, () => [], '*', false).then((dataSources) => - setSources(dataSources.filter(removeAliases)) - ); - getIndices(http, () => [], '*:*', false).then((dataSources) => - setRemoteClustersExist(!!dataSources.filter(removeAliases).length) - ); - }; - - useEffect(() => { - getIndices(http, () => [], '*', false).then((dataSources) => { - setSources(dataSources.filter(removeAliases)); - setIsLoadingSources(false); - }); - getIndices(http, () => [], '*:*', false).then((dataSources) => - setRemoteClustersExist(!!dataSources.filter(removeAliases).length) - ); - }, [http, creationOptions]); - chrome.docTitle.change(title); const columns = [ @@ -196,7 +160,7 @@ export const IndexPatternTable = ({ canSave, history }: Props) => { ); - if (isLoadingSources || isLoadingIndexPatterns) { + if (isLoadingIndexPatterns) { return <>; } diff --git a/tsconfig.json b/tsconfig.json index c91f7b768a5c4..33a630a9404f4 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -70,6 +70,7 @@ { "path": "./src/plugins/visualize/tsconfig.json" }, { "path": "./src/plugins/index_pattern_management/tsconfig.json" }, { "path": "./src/plugins/index_pattern_field_editor/tsconfig.json" }, + { "path": "./src/plugins/index_pattern_editor/tsconfig.json" }, { "path": "./x-pack/plugins/actions/tsconfig.json" }, { "path": "./x-pack/plugins/alerting/tsconfig.json" }, From 0b6f4a1af94d7d8d1cd05f6a52f7562dcbaa9de9 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Wed, 9 Jun 2021 14:26:56 -0500 Subject: [PATCH 003/130] pass dependencies through context --- .../empty_index_pattern_prompt.tsx | 17 ++++--- .../components/empty_state/empty_state.tsx | 19 ++++---- .../index_pattern_editor_flyout_content.tsx | 45 +++++++------------ ...index_pattern_flyout_content_container.tsx | 40 ++++------------- .../public/open_editor.tsx | 25 +++++------ .../public/shared_imports.ts | 7 ++- .../index_pattern_editor/public/types.ts | 17 +++++++ 7 files changed, 79 insertions(+), 91 deletions(-) diff --git a/src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/empty_index_pattern_prompt.tsx b/src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/empty_index_pattern_prompt.tsx index 836171835b4b1..e426a69abbe26 100644 --- a/src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/empty_index_pattern_prompt.tsx +++ b/src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/empty_index_pattern_prompt.tsx @@ -16,18 +16,17 @@ import { EuiDescriptionListTitle } from '@elastic/eui'; import { EuiDescriptionListDescription, EuiDescriptionList } from '@elastic/eui'; import { EuiLink, EuiButton } from '@elastic/eui'; import { Illustration } from './assets/index_pattern_illustration'; +import { useKibana } from '../../shared_imports'; +import { IndexPatternEditorContext } from '../../types'; interface Props { - canSave: boolean; - docLinksIndexPatternIntro: string; goToCreate: () => void; } -export const EmptyIndexPatternPrompt = ({ - canSave, - docLinksIndexPatternIntro, - goToCreate, -}: Props) => { +export const EmptyIndexPatternPrompt = ({ goToCreate }: Props) => { + const { + services: { docLinks, application }, + } = useKibana(); return (

- {canSave && ( + {application.capabilities.management.kibana.indexPatterns && ( - + void; - navigateToApp: ApplicationStart['navigateToApp']; closeFlyout: () => void; - docLinks: DocLinksStart; - canSave: boolean; createAnyway: () => void; }) => { + const { + services: { + docLinks, + application: { navigateToApp, capabilities }, + }, + } = useKibana(); const mlCard = ( - {canSave && createAnywayLink} + {capabilities.management.kibana.indexPatterns && createAnywayLink} ); }; diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx index 62c02400ee78d..734c71c1f80bf 100644 --- a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx @@ -19,24 +19,26 @@ import { EuiButton, } from '@elastic/eui'; -import { DocLinksStart, CoreStart } from 'src/core/public'; - import { ensureMinimumTime, getIndices, extractTimeFields, getMatchedIndices } from '../lib'; import { AdvancedParametersSection } from './field_editor/advanced_parameters_section'; import { IndexPatternSpec, - DataPublicPluginStart, Form, UseField, useForm, TextField, useFormData, - HttpStart, ToggleField, + useKibana, } from '../shared_imports'; -import { MatchedItem, ResolveIndexResponseItemAlias, IndexPatternTableItem } from '../types'; +import { + MatchedItem, + ResolveIndexResponseItemAlias, + // IndexPatternTableItem, + IndexPatternEditorContext, +} from '../types'; import { schema } from './form_schema'; import { TimestampField } from './form_fields'; @@ -52,18 +54,10 @@ export interface Props { * Handler for the "cancel" footer button */ onCancel: () => void; - /** - * The docLinks start service from core - */ - docLinks: DocLinksStart; // uiSettings: CoreStart['uiSettings']; isSaving: boolean; existingIndexPatterns: string[]; - http: HttpStart; - indexPatternService: DataPublicPluginStart['indexPatterns']; - navigateToApp: CoreStart['application']['navigateToApp']; - canCreateIndexPattern: boolean; } export interface IndexPatternConfig { @@ -93,17 +87,10 @@ const geti18nTexts = () => { }; }; -const IndexPatternEditorFlyoutContentComponent = ({ - onSave, - onCancel, - docLinks, - isSaving, - // existingIndexPatterns, - http, - indexPatternService, - navigateToApp, - canCreateIndexPattern, -}: Props) => { +const IndexPatternEditorFlyoutContentComponent = ({ onSave, onCancel, isSaving }: Props) => { + const { + services: { http, indexPatternService }, + } = useKibana(); const i18nTexts = geti18nTexts(); // return type, interal type @@ -282,9 +269,9 @@ const IndexPatternEditorFlyoutContentComponent = ({ return ( setGoToForm(true)} /> @@ -293,8 +280,8 @@ const IndexPatternEditorFlyoutContentComponent = ({ // first time return ( setGoToForm(true)} /> ); diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_flyout_content_container.tsx b/src/plugins/index_pattern_editor/public/components/index_pattern_flyout_content_container.tsx index d7629a2943f8f..95c30999d7db3 100644 --- a/src/plugins/index_pattern_editor/public/components/index_pattern_flyout_content_container.tsx +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_flyout_content_container.tsx @@ -7,14 +7,14 @@ */ import React, { useEffect, useState } from 'react'; -import { DocLinksStart, NotificationsStart, CoreStart } from 'src/core/public'; import { i18n } from '@kbn/i18n'; -import { IndexPattern, DataPublicPluginStart, IndexPatternSpec } from '../shared_imports'; +import { IndexPattern, IndexPatternSpec, useKibana } from '../shared_imports'; // import { PluginStart, InternalFieldType } from '../types'; // import { deserializeField, getRuntimeFieldValidator } from '../lib'; // import { Props as FieldEditorProps } from './field_editor/field_editor'; import { IndexPatternEditorFlyoutContent } from './index_pattern_editor_flyout_content'; +import { IndexPatternEditorContext } from '../types'; export interface Props { /** @@ -25,29 +25,6 @@ export interface Props { * Handler for the "cancel" footer button */ onCancel: () => void; - /** - * The docLinks start service from core - */ - docLinks: DocLinksStart; - /** - * The context object specific to where the editor is currently being consumed - */ - // ctx: FieldEditorContext; - /** - * Optional field to edit - */ - // field?: IndexPatternField; - /** - * Services - */ - indexPatternService: DataPublicPluginStart['indexPatterns']; - notifications: NotificationsStart; - // fieldFormatEditors: PluginStart['fieldFormatEditors']; - // fieldFormats: DataPublicPluginStart['fieldFormats']; - // uiSettings: CoreStart['uiSettings']; - http: CoreStart['http']; - navigateToApp: CoreStart['application']['navigateToApp']; - canCreateIndexPattern: boolean; } /** @@ -60,13 +37,19 @@ export interface Props { export const IndexPatternFlyoutContentContainer = ({ onSave, onCancel, +}: /* docLinks, indexPatternService, notifications, http, navigateToApp, canCreateIndexPattern, -}: Props) => { + */ +Props) => { + const { + services: { indexPatternService, notifications }, + } = useKibana(); + const onSaveClick = async (indexPatternSpec: IndexPatternSpec) => { const indexPattern = await indexPatternService.createAndSave(indexPatternSpec); const message = i18n.translate('indexPatternEditor.saved', { @@ -91,13 +74,8 @@ export const IndexPatternFlyoutContentContainer = ({ ); }; diff --git a/src/plugins/index_pattern_editor/public/open_editor.tsx b/src/plugins/index_pattern_editor/public/open_editor.tsx index 7278c56969d65..ac96364fc15a7 100644 --- a/src/plugins/index_pattern_editor/public/open_editor.tsx +++ b/src/plugins/index_pattern_editor/public/open_editor.tsx @@ -8,6 +8,7 @@ import React from 'react'; import { CoreStart, OverlayRef } from 'src/core/public'; +import { I18nProvider } from '@kbn/i18n/react'; import { createKibanaReactContext, @@ -16,7 +17,7 @@ import { DataPublicPluginStart, } from './shared_imports'; -import { CloseEditor } from './types'; +import { CloseEditor, IndexPatternEditorContext } from './types'; import { IndexPatternFlyoutContentContainer } from './components/index_pattern_flyout_content_container'; export interface OpenEditorOptions { @@ -32,10 +33,15 @@ export const getEditorOpener = ({ core, indexPatternService }: Dependencies) => options: OpenEditorOptions ): CloseEditor => { const { uiSettings, overlays, docLinks, notifications, http, application } = core; - const { Provider: KibanaReactContextProvider } = createKibanaReactContext({ + const { + Provider: KibanaReactContextProvider, + } = createKibanaReactContext({ uiSettings, docLinks, - http: core.http, + http, + notifications, + application, + indexPatternService, }); let overlayRef: OverlayRef | null = null; @@ -60,16 +66,9 @@ export const getEditorOpener = ({ core, indexPatternService }: Dependencies) => overlayRef = overlays.openFlyout( toMountPoint( - + + + ) ); diff --git a/src/plugins/index_pattern_editor/public/shared_imports.ts b/src/plugins/index_pattern_editor/public/shared_imports.ts index 6976b02ff319c..dc6e72d4c01c6 100644 --- a/src/plugins/index_pattern_editor/public/shared_imports.ts +++ b/src/plugins/index_pattern_editor/public/shared_imports.ts @@ -13,7 +13,12 @@ export { IndexPatternSpec, } from '../../data/public'; -export { createKibanaReactContext, toMountPoint, CodeEditor } from '../../kibana_react/public'; +export { + createKibanaReactContext, + toMountPoint, + CodeEditor, + useKibana, +} from '../../kibana_react/public'; export { useForm, diff --git a/src/plugins/index_pattern_editor/public/types.ts b/src/plugins/index_pattern_editor/public/types.ts index 99e9c6a398447..74fbbb35410b7 100644 --- a/src/plugins/index_pattern_editor/public/types.ts +++ b/src/plugins/index_pattern_editor/public/types.ts @@ -6,9 +6,26 @@ * Side Public License, v 1. */ +import { + ApplicationStart, + IUiSettingsClient, + NotificationsStart, + DocLinksStart, + HttpSetup, +} from 'src/core/public'; + import { DataPublicPluginStart } from './shared_imports'; import { OpenEditorOptions } from './open_editor'; +export interface IndexPatternEditorContext { + uiSettings: IUiSettingsClient; + docLinks: DocLinksStart; + http: HttpSetup; + notifications: NotificationsStart; + application: ApplicationStart; + indexPatternService: DataPublicPluginStart['indexPatterns']; +} + // eslint-disable-next-line @typescript-eslint/no-empty-interface export interface PluginSetup {} From 96b5c53d2857299fb8ca8bc5ad6a08befc10326a Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Wed, 9 Jun 2021 22:30:11 -0500 Subject: [PATCH 004/130] add create url functionality --- .../public/components/index.ts | 2 + .../components/index_pattern_editor.tsx | 33 +++++++++++++ .../index_pattern_editor_flyout_content.tsx | 46 +++++++++++------- ...index_pattern_flyout_content_container.tsx | 21 ++++----- .../index_pattern_editor/public/index.ts | 2 + .../index_pattern_table.tsx | 47 +++++++++++++++++-- .../mount_management_section.tsx | 6 +-- .../index_pattern_management/public/types.ts | 2 - 8 files changed, 118 insertions(+), 41 deletions(-) create mode 100644 src/plugins/index_pattern_editor/public/components/index_pattern_editor.tsx diff --git a/src/plugins/index_pattern_editor/public/components/index.ts b/src/plugins/index_pattern_editor/public/components/index.ts index 30e6e80268032..b7e2e031c352e 100644 --- a/src/plugins/index_pattern_editor/public/components/index.ts +++ b/src/plugins/index_pattern_editor/public/components/index.ts @@ -15,3 +15,5 @@ export { IndexPatternFlyoutContentContainer, Props as IndexPatternEditorFlyoutContentContainerProps, } from './index_pattern_flyout_content_container'; + +export { IndexPatternEditor } from './index_pattern_editor'; diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_editor.tsx b/src/plugins/index_pattern_editor/public/components/index_pattern_editor.tsx new file mode 100644 index 0000000000000..9737cf1d73bae --- /dev/null +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_editor.tsx @@ -0,0 +1,33 @@ +/* + * 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 React from 'react'; +import { EuiFlyout } from '@elastic/eui'; +import { IndexPatternFlyoutContentContainer } from './index_pattern_flyout_content_container'; +import { IndexPatternEditorContext } from '../types'; +import { createKibanaReactContext } from '../shared_imports'; + +export interface IndexPatternEditorProps { + onSave: () => void; + closeEditor: () => void; + services: IndexPatternEditorContext; +} + +export const IndexPatternEditor = ({ onSave, closeEditor, services }: IndexPatternEditorProps) => { + const { + Provider: KibanaReactContextProvider, + } = createKibanaReactContext(services); + + return ( + + + + + + ); +}; diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx index 734c71c1f80bf..a17b9db2b3d8c 100644 --- a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx @@ -136,23 +136,42 @@ const IndexPatternEditorFlyoutContentComponent = ({ onSave, onCancel, isSaving } }; useEffect(() => { + let isMounted = true; getIndices(http, () => [], '*', false).then(async (dataSources) => { - setSources(dataSources.filter(removeAliases)); - setIsLoadingSources(false); + if (isMounted) { + setSources(dataSources.filter(removeAliases)); + setIsLoadingSources(false); + } }); - getIndices(http, () => [], '*:*', false).then((dataSources) => - setRemoteClustersExist(!!dataSources.filter(removeAliases).length) - ); - }, [http]); + getIndices(http, () => [], '*:*', false).then((dataSources) => { + if (isMounted) { + setRemoteClustersExist(!!dataSources.filter(removeAliases).length); + } + }); + + const getTitles = async () => { + const indexPatternTitles = await indexPatternService.getTitles(); + if (isMounted) { + setExistingIndexPatterns(indexPatternTitles); + setIsLoadingIndexPatterns(false); + } + }; + getTitles(); + return () => { + isMounted = false; + }; + }, [http, indexPatternService]); + /* useEffect(() => { const getTitles = async () => { const indexPatternTitles = await indexPatternService.getTitles(); setExistingIndexPatterns(indexPatternTitles); + setIsLoadingIndexPatterns(false); }; getTitles(); - setIsLoadingIndexPatterns(false); }, [indexPatternService]); + */ useEffect(() => { const fetchIndices = async (query: string = '') => { @@ -269,22 +288,13 @@ const IndexPatternEditorFlyoutContentComponent = ({ onSave, onCancel, isSaving } return ( setGoToForm(true)} /> ); } else { // first time - return ( - setGoToForm(true)} - /> - ); + return setGoToForm(true)} />; } } @@ -308,7 +318,7 @@ const IndexPatternEditorFlyoutContentComponent = ({ onSave, onCancel, isSaving } path="title" // config={nameFieldConfig} component={TextField} - data-test-subj="titleField" + data-test-subj="createIndexPatternNameInput" componentProps={{ euiFieldProps: { 'aria-label': i18n.translate('indexPatternEditor.form.titleAriaLabel', { diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_flyout_content_container.tsx b/src/plugins/index_pattern_editor/public/components/index_pattern_flyout_content_container.tsx index 95c30999d7db3..5816fd2353809 100644 --- a/src/plugins/index_pattern_editor/public/components/index_pattern_flyout_content_container.tsx +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_flyout_content_container.tsx @@ -34,18 +34,7 @@ export interface Props { * anything about where a field comes from and where it should be persisted. */ -export const IndexPatternFlyoutContentContainer = ({ - onSave, - onCancel, -}: /* - docLinks, - indexPatternService, - notifications, - http, - navigateToApp, - canCreateIndexPattern, - */ -Props) => { +export const IndexPatternFlyoutContentContainer = ({ onSave, onCancel }: Props) => { const { services: { indexPatternService, notifications }, } = useKibana(); @@ -63,11 +52,17 @@ Props) => { const [existingIndexPatterns, setExistingIndexPatterns] = useState([]); useEffect(() => { + let isMounted = true; const getTitles = async () => { const indexPatternTitles = await indexPatternService.getTitles(); - setExistingIndexPatterns(indexPatternTitles); + if (isMounted) { + setExistingIndexPatterns(indexPatternTitles); + } }; getTitles(); + return () => { + isMounted = false; + }; }, [indexPatternService]); return ( diff --git a/src/plugins/index_pattern_editor/public/index.ts b/src/plugins/index_pattern_editor/public/index.ts index 93001d1ea349f..5cdbafd63126c 100644 --- a/src/plugins/index_pattern_editor/public/index.ts +++ b/src/plugins/index_pattern_editor/public/index.ts @@ -22,6 +22,8 @@ import { IndexPatternEditorPlugin } from './plugin'; export { PluginStart as IndexPatternEditorStart } from './types'; +export { IndexPatternEditor } from './components'; + export function plugin() { return new IndexPatternEditorPlugin(); } diff --git a/src/plugins/index_pattern_management/public/components/index_pattern_table/index_pattern_table.tsx b/src/plugins/index_pattern_management/public/components/index_pattern_table/index_pattern_table.tsx index 5c3abd3608afd..8b8a1e12659ef 100644 --- a/src/plugins/index_pattern_management/public/components/index_pattern_table/index_pattern_table.tsx +++ b/src/plugins/index_pattern_management/public/components/index_pattern_table/index_pattern_table.tsx @@ -28,6 +28,7 @@ import { IndexPatternManagmentContext } from '../../types'; import { IndexPatternTableItem } from '../types'; import { getIndexPatterns } from '../utils'; import { getListBreadcrumbs } from '../breadcrumbs'; +import { IndexPatternEditor } from '../../../../index_pattern_editor/public'; const pagination = { initialPageSize: 10, @@ -60,19 +61,27 @@ const title = i18n.translate('indexPatternManagement.indexPatternTable.title', { interface Props extends RouteComponentProps { canSave: boolean; + showCreateDialog?: boolean; } -export const IndexPatternTable = ({ history }: Props) => { +export const IndexPatternTable = ({ + history, + showCreateDialog: showCreateDialogProp = false, +}: Props) => { const { setBreadcrumbs, uiSettings, indexPatternManagementStart, chrome, data, - indexPatternEditor, + docLinks, + http, + notifications, + application, } = useKibana().services; const [indexPatterns, setIndexPatterns] = useState([]); const [isLoadingIndexPatterns, setIsLoadingIndexPatterns] = useState(true); + const [showCreateDialog, setShowCreateDialog] = useState(showCreateDialogProp); setBreadcrumbs(getListBreadcrumbs()); useEffect(() => { @@ -82,10 +91,10 @@ export const IndexPatternTable = ({ history }: Props) => { indexPatternManagementStart, data.indexPatterns ); - setIsLoadingIndexPatterns(false); setIndexPatterns(gettedIndexPatterns); + setIsLoadingIndexPatterns(false); })(); - }, [history.push, indexPatterns.length, indexPatternManagementStart, uiSettings, data]); + }, [indexPatternManagementStart, uiSettings, data]); chrome.docTitle.change(title); @@ -135,6 +144,7 @@ export const IndexPatternTable = ({ history }: Props) => { */ const createButton = ( + /* { }) } > + */ + setShowCreateDialog(true)}> { return <>; } + const displayIndexPatternEditor = showCreateDialog ? ( + { + // todo dedup from useEffect code + const gettedIndexPatterns: IndexPatternTableItem[] = await getIndexPatterns( + uiSettings.get('defaultIndex'), + indexPatternManagementStart, + data.indexPatterns + ); + setIndexPatterns(gettedIndexPatterns); + setShowCreateDialog(false); + }} + closeEditor={() => setShowCreateDialog(false)} + services={{ + uiSettings, + docLinks, + http, + notifications, + application, + indexPatternService: data.indexPatterns, + }} + /> + ) : ( + <> + ); + return ( @@ -194,6 +232,7 @@ export const IndexPatternTable = ({ history }: Props) => { sorting={sorting} search={search} /> + {displayIndexPatternEditor} ); }; diff --git a/src/plugins/index_pattern_management/public/management_app/mount_management_section.tsx b/src/plugins/index_pattern_management/public/management_app/mount_management_section.tsx index 95992eae4da50..d9b809646e538 100644 --- a/src/plugins/index_pattern_management/public/management_app/mount_management_section.tsx +++ b/src/plugins/index_pattern_management/public/management_app/mount_management_section.tsx @@ -20,7 +20,6 @@ import { IndexPatternTableWithRouter, EditIndexPatternContainer, CreateEditFieldContainer, - CreateIndexPatternWizardWithRouter, } from '../components'; import { IndexPatternManagementStartDependencies, IndexPatternManagementStart } from '../plugin'; import { IndexPatternManagmentContext } from '../types'; @@ -41,7 +40,7 @@ export async function mountManagementSection( ) { const [ { chrome, application, uiSettings, notifications, overlays, http, docLinks }, - { data, indexPatternFieldEditor, indexPatternEditor }, + { data, indexPatternFieldEditor }, indexPatternManagementStart, ] = await getStartServices(); const canSave = Boolean(application.capabilities.indexPatterns.save); @@ -63,7 +62,6 @@ export async function mountManagementSection( indexPatternManagementStart: indexPatternManagementStart as IndexPatternManagementStart, setBreadcrumbs: params.setBreadcrumbs, fieldFormatEditors: indexPatternFieldEditor.fieldFormatEditors, - indexPatternEditor, }; ReactDOM.render( @@ -72,7 +70,7 @@ export async function mountManagementSection( - + diff --git a/src/plugins/index_pattern_management/public/types.ts b/src/plugins/index_pattern_management/public/types.ts index 21eb1f7cda4c3..a61eeb99b25a5 100644 --- a/src/plugins/index_pattern_management/public/types.ts +++ b/src/plugins/index_pattern_management/public/types.ts @@ -20,7 +20,6 @@ import { ManagementAppMountParams } from '../../management/public'; import { IndexPatternManagementStart } from './index'; import { KibanaReactContextValue } from '../../kibana_react/public'; import { IndexPatternFieldEditorStart } from '../../index_pattern_field_editor/public'; -import { IndexPatternEditorStart } from '../../index_pattern_editor/public'; export interface IndexPatternManagmentContext { chrome: ChromeStart; @@ -35,7 +34,6 @@ export interface IndexPatternManagmentContext { indexPatternManagementStart: IndexPatternManagementStart; setBreadcrumbs: ManagementAppMountParams['setBreadcrumbs']; fieldFormatEditors: IndexPatternFieldEditorStart['fieldFormatEditors']; - indexPatternEditor: IndexPatternEditorStart; } export type IndexPatternManagmentContextValue = KibanaReactContextValue; From 3ff6821cadf3b08e783645a51367863286d94366 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Wed, 9 Jun 2021 22:49:01 -0500 Subject: [PATCH 005/130] update plugin list and limits file --- docs/developer/plugin-list.asciidoc | 4 ++++ packages/kbn-optimizer/limits.yml | 1 + 2 files changed, 5 insertions(+) diff --git a/docs/developer/plugin-list.asciidoc b/docs/developer/plugin-list.asciidoc index 6675a8dd283c9..8de4442b1cfff 100644 --- a/docs/developer/plugin-list.asciidoc +++ b/docs/developer/plugin-list.asciidoc @@ -95,6 +95,10 @@ for use in their own application. |Moves the legacy ui/registry/feature_catalogue module for registering "features" that should be shown in the home page's feature catalogue to a service within a "home" plugin. The feature catalogue refered to here should not be confused with the "feature" plugin for registering features used to derive UI capabilities for feature controls. +|{kib-repo}blob/{branch}/src/plugins/index_pattern_editor/README.md[indexPatternEditor] +|// TODO + + |{kib-repo}blob/{branch}/src/plugins/index_pattern_field_editor/README.md[indexPatternFieldEditor] |The reusable field editor across Kibana! diff --git a/packages/kbn-optimizer/limits.yml b/packages/kbn-optimizer/limits.yml index 9b4199c812864..ff6718b95a363 100644 --- a/packages/kbn-optimizer/limits.yml +++ b/packages/kbn-optimizer/limits.yml @@ -33,6 +33,7 @@ pageLoadAssetSize: indexLifecycleManagement: 107090 indexManagement: 140608 indexPatternManagement: 28222 + indexPatternEditor: 50000 infra: 184320 fleet: 450005 ingestPipelines: 58003 From b3e7f894b6dbb109f09cb288220fdd2b263ca2f9 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Wed, 9 Jun 2021 23:22:45 -0500 Subject: [PATCH 006/130] fix create button disabled state --- .../index_pattern_editor_flyout_content.tsx | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx index a17b9db2b3d8c..666aa30a9eb4c 100644 --- a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx @@ -234,8 +234,14 @@ const IndexPatternEditorFlyoutContentComponent = ({ onSave, onCancel, isSaving } isSubmitted: false, isValid: isValidResult, // todo show error when index pattern already exists }); - setExactMatchedIndices(exactMatched); - setPartialMatchedIndices(partialMatched); + const matchedIndices = getMatchedIndices( + [], // allIndices, + partialMatched, + exactMatched, + allowHidden + ); + setExactMatchedIndices(matchedIndices.exactMatchedIndices); + setPartialMatchedIndices(matchedIndices.partialMatchedIndices); if (isValidResult) { const fields = await ensureMinimumTime( @@ -269,12 +275,6 @@ const IndexPatternEditorFlyoutContentComponent = ({ onSave, onCancel, isSaving } }; // todo - const matchedIndices = getMatchedIndices( - [], // allIndices, - partialMatchedIndices, - exactMatchedIndices, - allowHidden - ); if (isLoadingSources || isLoadingIndexPatterns) { return <>loading; @@ -421,7 +421,7 @@ const IndexPatternEditorFlyoutContentComponent = ({ onSave, onCancel, isSaving } onClick={onClickSave} data-test-subj="fieldSaveButton" fill - disabled={!isValid} + disabled={!isValid || !exactMatchedIndices.length} // isLoading={isSavingField || isValidating} > {i18nTexts.saveButtonLabel} From 4de600563c80052eaf606529987d17c278d45f62 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Thu, 10 Jun 2021 22:46:50 -0500 Subject: [PATCH 007/130] functional test fixes --- .../assets/index_pattern_illustration.tsx | 3 +- .../empty_index_pattern_prompt.tsx | 17 ++++++-- .../components/index_pattern_editor.tsx | 4 +- .../index_pattern_editor_flyout_content.tsx | 2 +- .../index_pattern_table.tsx | 21 +++++----- .../_create_index_pattern_wizard.js | 4 +- test/functional/page_objects/settings_page.ts | 40 ++++++------------- 7 files changed, 45 insertions(+), 46 deletions(-) diff --git a/src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/assets/index_pattern_illustration.tsx b/src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/assets/index_pattern_illustration.tsx index 3666c1be7b5d2..09b18e25e9d00 100644 --- a/src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/assets/index_pattern_illustration.tsx +++ b/src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/assets/index_pattern_illustration.tsx @@ -537,4 +537,5 @@ const IndexPatternIllustration = () => ( ); -export const Illustration = IndexPatternIllustration; +/* eslint-disable import/no-default-export */ +export default IndexPatternIllustration; diff --git a/src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/empty_index_pattern_prompt.tsx b/src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/empty_index_pattern_prompt.tsx index e426a69abbe26..dd7ae60a297d2 100644 --- a/src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/empty_index_pattern_prompt.tsx +++ b/src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/empty_index_pattern_prompt.tsx @@ -8,14 +8,13 @@ import './empty_index_pattern_prompt.scss'; -import React from 'react'; +import React, { lazy, Suspense } from 'react'; import { FormattedMessage } from '@kbn/i18n/react'; import { EuiPageContent, EuiSpacer, EuiText, EuiFlexItem, EuiFlexGroup } from '@elastic/eui'; import { EuiDescriptionListTitle } from '@elastic/eui'; import { EuiDescriptionListDescription, EuiDescriptionList } from '@elastic/eui'; import { EuiLink, EuiButton } from '@elastic/eui'; -import { Illustration } from './assets/index_pattern_illustration'; import { useKibana } from '../../shared_imports'; import { IndexPatternEditorContext } from '../../types'; @@ -27,6 +26,9 @@ export const EmptyIndexPatternPrompt = ({ goToCreate }: Props) => { const { services: { docLinks, application }, } = useKibana(); + + const Illustration = lazy(() => import('./assets/index_pattern_illustration')); + return ( { > - + ...loading...}> + + @@ -60,7 +64,12 @@ export const EmptyIndexPatternPrompt = ({ goToCreate }: Props) => { />

{application.capabilities.management.kibana.indexPatterns && ( - + void; + onSave: (indexPattern: IndexPattern) => void; closeEditor: () => void; services: IndexPatternEditorContext; } diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx index 666aa30a9eb4c..d34297b6dbb87 100644 --- a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx @@ -419,7 +419,7 @@ const IndexPatternEditorFlyoutContentComponent = ({ onSave, onCancel, isSaving } */ - setShowCreateDialog(true)}> + setShowCreateDialog(true)} + data-test-subj="createIndexPatternButton" + > { - // todo dedup from useEffect code - const gettedIndexPatterns: IndexPatternTableItem[] = await getIndexPatterns( - uiSettings.get('defaultIndex'), - indexPatternManagementStart, - data.indexPatterns - ); - setIndexPatterns(gettedIndexPatterns); - setShowCreateDialog(false); + onSave={(indexPattern) => { + history.push(`patterns/${indexPattern.id}`); }} closeEditor={() => setShowCreateDialog(false)} services={{ diff --git a/test/functional/apps/management/_create_index_pattern_wizard.js b/test/functional/apps/management/_create_index_pattern_wizard.js index d4b49d74d1b90..eb0491ec00519 100644 --- a/test/functional/apps/management/_create_index_pattern_wizard.js +++ b/test/functional/apps/management/_create_index_pattern_wizard.js @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -import expect from '@kbn/expect'; +// import expect from '@kbn/expect'; export default function ({ getService, getPageObjects }) { const kibanaServer = getService('kibanaServer'); @@ -23,6 +23,7 @@ export default function ({ getService, getPageObjects }) { await PageObjects.settings.clickKibanaIndexPatterns(); }); + /* describe('step 1 next button', function () { it('is disabled by default', async function () { await (await testSubjects.find('createIndexPatternButton')).click(); @@ -39,6 +40,7 @@ export default function ({ getService, getPageObjects }) { expect(isEnabled).to.be.ok(); }); }); + */ describe('index alias', () => { before(async function () { diff --git a/test/functional/page_objects/settings_page.ts b/test/functional/page_objects/settings_page.ts index 7d7da79b4a397..d74bf73eab8c4 100644 --- a/test/functional/page_objects/settings_page.ts +++ b/test/functional/page_objects/settings_page.ts @@ -122,38 +122,29 @@ export class SettingsPageObject extends FtrService { } async getIndexPatternField() { - return await this.testSubjects.find('createIndexPatternNameInput'); - } - - async clickTimeFieldNameField() { - return await this.testSubjects.click('createIndexPatternTimeFieldSelect'); + const wrapperElement = await this.testSubjects.find('createIndexPatternNameInput'); + return wrapperElement.findByTestSubject('input'); } async getTimeFieldNameField() { - return await this.testSubjects.find('createIndexPatternTimeFieldSelect'); + const wrapperElement = await this.testSubjects.find('timestampField'); + return wrapperElement.findByTestSubject('comboBoxSearchInput'); } async selectTimeFieldOption(selection: string) { // open dropdown - await this.clickTimeFieldNameField(); - // close dropdown, keep focus - await this.clickTimeFieldNameField(); - await this.header.waitUntilLoadingHasFinished(); - return await this.retry.try(async () => { - this.log.debug(`selectTimeFieldOption(${selection})`); - const timeFieldOption = await this.getTimeFieldOption(selection); - await timeFieldOption.click(); - const selected = await timeFieldOption.isSelected(); - if (!selected) throw new Error('option not selected: ' + selected); - }); + const timefield = await this.getTimeFieldNameField(); + await timefield.click(); + await this.browser.pressKeys(selection); + await this.browser.pressKeys(this.browser.keys.TAB); } async getTimeFieldOption(selection: string) { return await this.find.displayedByCssSelector('option[value="' + selection + '"]'); } - async getCreateIndexPatternButton() { - return await this.testSubjects.find('createIndexPatternButton'); + async getSaveIndexPatternButton() { + return await this.testSubjects.find('saveIndexPatternButton'); } async getCreateButton() { @@ -358,17 +349,11 @@ export class SettingsPageObject extends FtrService { await this.setIndexPatternField(indexPatternName); }); - const btn = await this.getCreateIndexPatternGoToStep2Button(); - await this.retry.waitFor(`index pattern Go To Step 2 button to be enabled`, async () => { - return await btn.isEnabled(); - }); - await btn.click(); - await this.common.sleep(2000); if (timefield) { await this.selectTimeFieldOption(timefield); } - await (await this.getCreateIndexPatternButton()).click(); + await (await this.getSaveIndexPatternButton()).click(); }); await this.header.waitUntilLoadingHasFinished(); await this.retry.try(async () => { @@ -386,7 +371,8 @@ export class SettingsPageObject extends FtrService { async clickAddNewIndexPatternButton() { await this.common.scrollKibanaBodyTop(); - await this.testSubjects.click('createIndexPatternButton'); + const createButtons = await this.testSubjects.findAll('createIndexPatternButton'); + await createButtons[createButtons.length - 1].click(); } async clickCreateNewRollupButton() { From 9c479d76a7938bb840aba31a48d89723215ecee0 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Thu, 10 Jun 2021 23:37:11 -0500 Subject: [PATCH 008/130] fix size limit, localization content --- .i18nrc.json | 1 + packages/kbn-optimizer/limits.yml | 2 +- .../public/overlays/flyout/flyout_service.tsx | 1 + .../empty_index_pattern_prompt.tsx | 12 ++++----- .../components/empty_state/empty_state.tsx | 26 +++++++++---------- .../advanced_parameters_section.tsx | 4 +-- .../form_fields/timestamp_field.tsx | 11 +++----- .../components/index_pattern_editor.tsx | 2 +- .../index_pattern_editor_flyout_content.tsx | 6 ++--- .../public/lib/extract_time_fields.ts | 11 +++----- .../public/lib/get_indices.ts | 8 +++--- .../public/open_editor.tsx | 6 +++-- .../translations/translations/ja-JP.json | 18 ------------- .../translations/translations/zh-CN.json | 18 ------------- 14 files changed, 44 insertions(+), 82 deletions(-) diff --git a/.i18nrc.json b/.i18nrc.json index ad91042a2172d..6826061c3cfcf 100644 --- a/.i18nrc.json +++ b/.i18nrc.json @@ -27,6 +27,7 @@ "maps_legacy": "src/plugins/maps_legacy", "monaco": "packages/kbn-monaco/src", "presentationUtil": "src/plugins/presentation_util", + "indexPatternEditor": "src/plugins/index_pattern_editor", "indexPatternFieldEditor": "src/plugins/index_pattern_field_editor", "indexPatternManagement": "src/plugins/index_pattern_management", "advancedSettings": "src/plugins/advanced_settings", diff --git a/packages/kbn-optimizer/limits.yml b/packages/kbn-optimizer/limits.yml index ff6718b95a363..226d908e3a10d 100644 --- a/packages/kbn-optimizer/limits.yml +++ b/packages/kbn-optimizer/limits.yml @@ -33,7 +33,7 @@ pageLoadAssetSize: indexLifecycleManagement: 107090 indexManagement: 140608 indexPatternManagement: 28222 - indexPatternEditor: 50000 + indexPatternEditor: 70000 infra: 184320 fleet: 450005 ingestPipelines: 58003 diff --git a/src/core/public/overlays/flyout/flyout_service.tsx b/src/core/public/overlays/flyout/flyout_service.tsx index 603736f08268f..b41b85e5f429f 100644 --- a/src/core/public/overlays/flyout/flyout_service.tsx +++ b/src/core/public/overlays/flyout/flyout_service.tsx @@ -84,6 +84,7 @@ export interface OverlayFlyoutOpenOptions { 'data-test-subj'?: string; size?: EuiFlyoutSize; maxWidth?: boolean | number | string; + hideCloseButton?: boolean; } interface StartDeps { diff --git a/src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/empty_index_pattern_prompt.tsx b/src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/empty_index_pattern_prompt.tsx index dd7ae60a297d2..1cb776819c464 100644 --- a/src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/empty_index_pattern_prompt.tsx +++ b/src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/empty_index_pattern_prompt.tsx @@ -46,18 +46,18 @@ export const EmptyIndexPatternPrompt = ({ goToCreate }: Props) => {


{ data-test-subj="createIndexPatternButton" > @@ -83,14 +83,14 @@ export const EmptyIndexPatternPrompt = ({ goToCreate }: Props) => { diff --git a/src/plugins/index_pattern_editor/public/components/empty_state/empty_state.tsx b/src/plugins/index_pattern_editor/public/components/empty_state/empty_state.tsx index abc53e091b498..1f314143d4ea2 100644 --- a/src/plugins/index_pattern_editor/public/components/empty_state/empty_state.tsx +++ b/src/plugins/index_pattern_editor/public/components/empty_state/empty_state.tsx @@ -48,13 +48,13 @@ export const EmptyState = ({ const createAnywayLink = ( createAnyway()} data-test-subj="createAnyway"> @@ -77,7 +77,7 @@ export const EmptyState = ({

@@ -97,13 +97,13 @@ export const EmptyState = ({ icon={} title={ } description={ } @@ -116,13 +116,13 @@ export const EmptyState = ({ icon={} title={ } description={ } @@ -138,13 +138,13 @@ export const EmptyState = ({ icon={} title={ } description={ } @@ -160,14 +160,14 @@ export const EmptyState = ({ { title: ( ), description: ( @@ -182,14 +182,14 @@ export const EmptyState = ({ { title: ( ), description: ( {' '} diff --git a/src/plugins/index_pattern_editor/public/components/field_editor/advanced_parameters_section.tsx b/src/plugins/index_pattern_editor/public/components/field_editor/advanced_parameters_section.tsx index 26504eee28ddb..c74ff81fe36e9 100644 --- a/src/plugins/index_pattern_editor/public/components/field_editor/advanced_parameters_section.tsx +++ b/src/plugins/index_pattern_editor/public/components/field_editor/advanced_parameters_section.tsx @@ -26,10 +26,10 @@ export const AdvancedParametersSection = ({ children }: Props) => { <> {isVisible - ? i18n.translate('indexPatternFieldEditor.editor.form.advancedSettings.hideButtonLabel', { + ? i18n.translate('indexPatternEditor.editor.form.advancedSettings.hideButtonLabel', { defaultMessage: 'Hide advanced settings', }) - : i18n.translate('indexPatternFieldEditor.editor.form.advancedSettings.showButtonLabel', { + : i18n.translate('indexPatternEditor.editor.form.advancedSettings.showButtonLabel', { defaultMessage: 'Show advanced settings', })} diff --git a/src/plugins/index_pattern_editor/public/components/form_fields/timestamp_field.tsx b/src/plugins/index_pattern_editor/public/components/form_fields/timestamp_field.tsx index 7ef04bb0ea8d9..573505a82e23d 100644 --- a/src/plugins/index_pattern_editor/public/components/form_fields/timestamp_field.tsx +++ b/src/plugins/index_pattern_editor/public/components/form_fields/timestamp_field.tsx @@ -37,7 +37,7 @@ export const TimestampField = ({ isDisabled = false, options = [] }: Props) => { placeholder={i18n.translate( - 'indexPatternFieldEditor.editor.form.runtimeType.placeholderLabel', + 'indexPatternEditor.editor.form.runtimeType.placeholderLabel', { defaultMessage: 'Select a timestamp field', } @@ -56,12 +56,9 @@ export const TimestampField = ({ isDisabled = false, options = [] }: Props) => { isClearable={false} isDisabled={isDisabled} data-test-subj="timestampField" - aria-label={i18n.translate( - 'indexPatternFieldEditor.editor.form.typeSelectAriaLabel', - { - defaultMessage: 'Timestamp field', - } - )} + aria-label={i18n.translate('indexPatternEditor.editor.form.typeSelectAriaLabel', { + defaultMessage: 'Timestamp field', + })} fullWidth /> diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_editor.tsx b/src/plugins/index_pattern_editor/public/components/index_pattern_editor.tsx index 82280429aeef8..11c72fc8a95d2 100644 --- a/src/plugins/index_pattern_editor/public/components/index_pattern_editor.tsx +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_editor.tsx @@ -25,7 +25,7 @@ export const IndexPatternEditor = ({ onSave, closeEditor, services }: IndexPatte return ( - + diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx index d34297b6dbb87..4abf303637b5c 100644 --- a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx @@ -78,10 +78,10 @@ export interface FormInternal extends Omit const geti18nTexts = () => { return { - closeButtonLabel: i18n.translate('indexPatternFieldEditor.editor.flyoutCloseButtonLabel', { + closeButtonLabel: i18n.translate('indexPatternEditor.editor.flyoutCloseButtonLabel', { defaultMessage: 'Close', }), - saveButtonLabel: i18n.translate('indexPatternFieldEditor.editor.flyoutSaveButtonLabel', { + saveButtonLabel: i18n.translate('indexPatternEditor.editor.flyoutSaveButtonLabel', { defaultMessage: 'Save', }), }; @@ -371,7 +371,7 @@ const IndexPatternEditorFlyoutContentComponent = ({ onSave, onCancel, isSaving } data-test-subj="allowHiddenField" componentProps={{ euiFieldProps: { - 'aria-label': i18n.translate('indexPatternEditor.form.timestampAriaLabel', { + 'aria-label': i18n.translate('indexPatternEditor.form.allowHiddenAriaLabel', { defaultMessage: 'Allow hidden and system indices', }), }, diff --git a/src/plugins/index_pattern_editor/public/lib/extract_time_fields.ts b/src/plugins/index_pattern_editor/public/lib/extract_time_fields.ts index c7cd044ff5e2a..cb861ae48a151 100644 --- a/src/plugins/index_pattern_editor/public/lib/extract_time_fields.ts +++ b/src/plugins/index_pattern_editor/public/lib/extract_time_fields.ts @@ -12,12 +12,9 @@ import { TimestampOption } from '../components/index_pattern_editor_flyout_conte export function extractTimeFields(fields: IFieldType[]): TimestampOption[] { const dateFields = fields.filter((field) => field.type === 'date'); - const label = i18n.translate( - 'indexPatternManagement.createIndexPattern.stepTime.noTimeFieldsLabel', - { - defaultMessage: "The indices which match this index pattern don't contain any time fields.", - } - ); + const label = i18n.translate('indexPatternEditor.createIndexPattern.stepTime.noTimeFieldsLabel', { + defaultMessage: "The indices which match this index pattern don't contain any time fields.", + }); if (dateFields.length === 0) { return [ @@ -33,7 +30,7 @@ export function extractTimeFields(fields: IFieldType[]): TimestampOption[] { fieldName: '', }; const noTimeFieldLabel = i18n.translate( - 'indexPatternManagement.createIndexPattern.stepTime.noTimeFieldOptionLabel', + 'indexPatternEditor.createIndexPattern.stepTime.noTimeFieldOptionLabel', { defaultMessage: "I don't want to use the time filter", } diff --git a/src/plugins/index_pattern_editor/public/lib/get_indices.ts b/src/plugins/index_pattern_editor/public/lib/get_indices.ts index d318d5a9b7249..52fbb25c6cc9e 100644 --- a/src/plugins/index_pattern_editor/public/lib/get_indices.ts +++ b/src/plugins/index_pattern_editor/public/lib/get_indices.ts @@ -13,16 +13,16 @@ import { i18n } from '@kbn/i18n'; // import { IndexPatternCreationConfig } from '../../../index_pattern_management/public'; import { MatchedItem, ResolveIndexResponse, ResolveIndexResponseItemIndexAttrs } from '../types'; -const aliasLabel = i18n.translate('indexPatternManagement.aliasLabel', { defaultMessage: 'Alias' }); -const dataStreamLabel = i18n.translate('indexPatternManagement.dataStreamLabel', { +const aliasLabel = i18n.translate('indexPatternEditor.aliasLabel', { defaultMessage: 'Alias' }); +const dataStreamLabel = i18n.translate('indexPatternEditor.dataStreamLabel', { defaultMessage: 'Data stream', }); -const indexLabel = i18n.translate('indexPatternManagement.indexLabel', { +const indexLabel = i18n.translate('indexPatternEditor.indexLabel', { defaultMessage: 'Index', }); -const frozenLabel = i18n.translate('indexPatternManagement.frozenLabel', { +const frozenLabel = i18n.translate('indexPatternEditor.frozenLabel', { defaultMessage: 'Frozen', }); diff --git a/src/plugins/index_pattern_editor/public/open_editor.tsx b/src/plugins/index_pattern_editor/public/open_editor.tsx index ac96364fc15a7..bca9c3b0a3e07 100644 --- a/src/plugins/index_pattern_editor/public/open_editor.tsx +++ b/src/plugins/index_pattern_editor/public/open_editor.tsx @@ -45,7 +45,6 @@ export const getEditorOpener = ({ core, indexPatternService }: Dependencies) => }); let overlayRef: OverlayRef | null = null; - // capabilities.management.kibana.indexPatterns const openEditor = ({ onSave }: OpenEditorOptions): CloseEditor => { const closeEditor = () => { @@ -70,7 +69,10 @@ export const getEditorOpener = ({ core, indexPatternService }: Dependencies) =>
- ) + ), + { + // hideCloseButton: true, + } ); return closeEditor; diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json index 8066ca178d34f..94f6c65b9c68d 100644 --- a/x-pack/plugins/translations/translations/ja-JP.json +++ b/x-pack/plugins/translations/translations/ja-JP.json @@ -2879,19 +2879,6 @@ "indexPatternManagement.createIndexPattern.betaLabel": "ベータ", "indexPatternManagement.createIndexPattern.description": "インデックスパターンは、{single}または{multiple}データソース、{star}と一致します。", "indexPatternManagement.createIndexPattern.documentation": "ドキュメンテーションを表示", - "indexPatternManagement.createIndexPattern.emptyState.checkDataButton": "新規データを確認", - "indexPatternManagement.createIndexPattern.emptyState.createAnyway": "一部のインデックスは表示されない場合があります。{link}してください。", - "indexPatternManagement.createIndexPattern.emptyState.createAnywayLink": "インデックスパターンを作成します", - "indexPatternManagement.createIndexPattern.emptyState.haveData": "すでにデータがある場合", - "indexPatternManagement.createIndexPattern.emptyState.integrationCardDescription": "さまざまなソースからデータを追加します。", - "indexPatternManagement.createIndexPattern.emptyState.integrationCardTitle": "統合の追加", - "indexPatternManagement.createIndexPattern.emptyState.learnMore": "詳細について", - "indexPatternManagement.createIndexPattern.emptyState.noDataTitle": "Kibanaを試しますか？まずデータが必要です。", - "indexPatternManagement.createIndexPattern.emptyState.readDocs": "ドキュメンテーションを表示", - "indexPatternManagement.createIndexPattern.emptyState.sampleDataCardDescription": "データセットとKibanaダッシュボードを読み込みます。", - "indexPatternManagement.createIndexPattern.emptyState.sampleDataCardTitle": "サンプルデータの追加", - "indexPatternManagement.createIndexPattern.emptyState.uploadCardDescription": "CSV、NDJSON、またはログファイルをインポートします。", - "indexPatternManagement.createIndexPattern.emptyState.uploadCardTitle": "ファイルをアップロード", "indexPatternManagement.createIndexPattern.includeSystemIndicesToggleSwitchLabel": "システムと非表示のインデックスを含める", "indexPatternManagement.createIndexPattern.loadClustersFailMsg": "リモートクラスターの読み込みに失敗", "indexPatternManagement.createIndexPattern.loadIndicesFailMsg": "インデックスの読み込みに失敗", @@ -3029,11 +3016,6 @@ "indexPatternManagement.editIndexPattern.timeFilterLabel.mappingAPILink": "フィールドマッピング", "indexPatternManagement.editIndexPattern.timeFilterLabel.timeFilterDetail": "{indexPatternTitle}でフィールドを表示して編集します。型や検索可否などのフィールド属性はElasticsearchで{mappingAPILink}に基づきます。", "indexPatternManagement.editIndexPatternLiveRegionAriaLabel": "インデックスパターン", - "indexPatternManagement.emptyIndexPatternPrompt.documentation": "ドキュメンテーションを表示", - "indexPatternManagement.emptyIndexPatternPrompt.indexPatternExplanation": "Kibanaでは、検索するインデックスを特定するためにインデックスパターンが必要です。インデックスパターンは、昨日のログデータなど特定のインデックス、またはログデータを含むすべてのインデックスを参照できます。", - "indexPatternManagement.emptyIndexPatternPrompt.learnMore": "詳細について", - "indexPatternManagement.emptyIndexPatternPrompt.nowCreate": "インデックスパターンを作成します。", - "indexPatternManagement.emptyIndexPatternPrompt.youHaveData": "Elasticsearchにデータがあります。", "indexPatternManagement.fieldTypeConflict": "フィールドタイプの矛盾", "indexPatternManagement.formatHeader": "フォーマット", "indexPatternManagement.formatLabel": "フォーマットは、特定の値の表示形式を管理できます。また、値を完全に変更したり、Discover でのハイライト機能を無効にしたりすることも可能です。", diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json index 33f5d4aceb51c..d72a79f3bbbbb 100644 --- a/x-pack/plugins/translations/translations/zh-CN.json +++ b/x-pack/plugins/translations/translations/zh-CN.json @@ -2893,19 +2893,6 @@ "indexPatternManagement.createIndexPattern.betaLabel": "公测版", "indexPatternManagement.createIndexPattern.description": "索引模式可以匹配单个源，例如 {single} 或 {multiple} 个数据源、{star}。", "indexPatternManagement.createIndexPattern.documentation": "阅读文档", - "indexPatternManagement.createIndexPattern.emptyState.checkDataButton": "检查新数据", - "indexPatternManagement.createIndexPattern.emptyState.createAnyway": "部分索引可能已隐藏。仍然尝试{link}。", - "indexPatternManagement.createIndexPattern.emptyState.createAnywayLink": "创建索引模式", - "indexPatternManagement.createIndexPattern.emptyState.haveData": "假设您已有数据？", - "indexPatternManagement.createIndexPattern.emptyState.integrationCardDescription": "从各种源添加数据。", - "indexPatternManagement.createIndexPattern.emptyState.integrationCardTitle": "添加集成", - "indexPatternManagement.createIndexPattern.emptyState.learnMore": "希望了解详情？", - "indexPatternManagement.createIndexPattern.emptyState.noDataTitle": "准备试用 Kibana？首先，您需要数据。", - "indexPatternManagement.createIndexPattern.emptyState.readDocs": "阅读文档", - "indexPatternManagement.createIndexPattern.emptyState.sampleDataCardDescription": "加载数据集和 Kibana 仪表板。", - "indexPatternManagement.createIndexPattern.emptyState.sampleDataCardTitle": "添加样例数据", - "indexPatternManagement.createIndexPattern.emptyState.uploadCardDescription": "导入 CSV、NDJSON 或日志文件。", - "indexPatternManagement.createIndexPattern.emptyState.uploadCardTitle": "上传文件", "indexPatternManagement.createIndexPattern.includeSystemIndicesToggleSwitchLabel": "包括系统和隐藏索引", "indexPatternManagement.createIndexPattern.loadClustersFailMsg": "无法加载远程集群", "indexPatternManagement.createIndexPattern.loadIndicesFailMsg": "无法加载索引", @@ -3050,11 +3037,6 @@ "indexPatternManagement.editIndexPattern.timeFilterLabel.mappingAPILink": "字段映射", "indexPatternManagement.editIndexPattern.timeFilterLabel.timeFilterDetail": "查看和编辑 {indexPatternTitle} 中的字段。字段属性，如类型和可搜索性，基于 Elasticsearch 中的 {mappingAPILink}。", "indexPatternManagement.editIndexPatternLiveRegionAriaLabel": "索引模式", - "indexPatternManagement.emptyIndexPatternPrompt.documentation": "阅读文档", - "indexPatternManagement.emptyIndexPatternPrompt.indexPatternExplanation": "Kibana 需要索引模式，以识别您要浏览的索引。索引模式可以指向特定索引 (例如昨天的日志数据) ，或包含日志数据的所有索引。", - "indexPatternManagement.emptyIndexPatternPrompt.learnMore": "希望了解详情？", - "indexPatternManagement.emptyIndexPatternPrompt.nowCreate": "现在，创建索引模式。", - "indexPatternManagement.emptyIndexPatternPrompt.youHaveData": "您在 Elasticsearch 中有数据。", "indexPatternManagement.fieldTypeConflict": "字段类型冲突", "indexPatternManagement.formatHeader": "格式", "indexPatternManagement.formatLabel": "设置格式允许您控制特定值的显示方式。其还会导致值完全更改，并阻止 Discover 中的突出显示起作用。", From 95b88765a8aa718c75c8458717b175e2a9287a37 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Fri, 11 Jun 2021 21:40:30 -0500 Subject: [PATCH 009/130] update docs and append * to index pattern titles --- ...in-core-public.overlayflyoutopenoptions.md | 1 + src/core/public/public.api.md | 2 + .../index_pattern_editor_flyout_content.tsx | 39 +++++++++++++++++-- 3 files changed, 39 insertions(+), 3 deletions(-) diff --git a/docs/development/core/public/kibana-plugin-core-public.overlayflyoutopenoptions.md b/docs/development/core/public/kibana-plugin-core-public.overlayflyoutopenoptions.md index 6665ebde295bc..fc4959b87a987 100644 --- a/docs/development/core/public/kibana-plugin-core-public.overlayflyoutopenoptions.md +++ b/docs/development/core/public/kibana-plugin-core-public.overlayflyoutopenoptions.md @@ -18,6 +18,7 @@ export interface OverlayFlyoutOpenOptions | ["data-test-subj"](./kibana-plugin-core-public.overlayflyoutopenoptions._data-test-subj_.md) | string | | | [className](./kibana-plugin-core-public.overlayflyoutopenoptions.classname.md) | string | | | [closeButtonAriaLabel](./kibana-plugin-core-public.overlayflyoutopenoptions.closebuttonarialabel.md) | string | | +| [hideCloseButton](./kibana-plugin-core-public.overlayflyoutopenoptions.hideclosebutton.md) | boolean | | | [maxWidth](./kibana-plugin-core-public.overlayflyoutopenoptions.maxwidth.md) | boolean | number | string | | | [ownFocus](./kibana-plugin-core-public.overlayflyoutopenoptions.ownfocus.md) | boolean | | | [size](./kibana-plugin-core-public.overlayflyoutopenoptions.size.md) | EuiFlyoutSize | | diff --git a/src/core/public/public.api.md b/src/core/public/public.api.md index 235110aeb4633..c7aad90306f35 100644 --- a/src/core/public/public.api.md +++ b/src/core/public/public.api.md @@ -969,6 +969,8 @@ export interface OverlayFlyoutOpenOptions { // (undocumented) closeButtonAriaLabel?: string; // (undocumented) + hideCloseButton?: boolean; + // (undocumented) maxWidth?: boolean | number | string; // (undocumented) ownFocus?: boolean; diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx index 4abf303637b5c..c27d1942aed23 100644 --- a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -import React, { useState, useEffect } from 'react'; +import React, { useState, useEffect, ChangeEvent } from 'react'; import { i18n } from '@kbn/i18n'; import { EuiFlyoutHeader, @@ -19,7 +19,13 @@ import { EuiButton, } from '@elastic/eui'; -import { ensureMinimumTime, getIndices, extractTimeFields, getMatchedIndices } from '../lib'; +import { + ensureMinimumTime, + getIndices, + extractTimeFields, + getMatchedIndices, + canAppendWildcard, +} from '../lib'; import { AdvancedParametersSection } from './field_editor/advanced_parameters_section'; import { @@ -119,6 +125,7 @@ const IndexPatternEditorFlyoutContentComponent = ({ onSave, onCancel, isSaving } const [remoteClustersExist, setRemoteClustersExist] = useState(false); const [isLoadingIndexPatterns, setIsLoadingIndexPatterns] = useState(true); const [goToForm, setGoToForm] = useState(false); + const [appendedWildcard, setAppendedWildcard] = useState(false); // const [indexPatterns, setIndexPatterns] = useState([]); const [existingIndexPatterns, setExistingIndexPatterns] = useState([]); @@ -208,10 +215,14 @@ const IndexPatternEditorFlyoutContentComponent = ({ onSave, onCancel, isSaving } `${query}*`, allowHidden ); + indexRequests.push(exactMatchQuery); indexRequests.push(partialMatchQuery); } + if (query !== lastTitle) { + return; + } const [exactMatched, partialMatched] = (await ensureMinimumTime( indexRequests )) as MatchedItem[][]; @@ -262,7 +273,7 @@ const IndexPatternEditorFlyoutContentComponent = ({ onSave, onCancel, isSaving } setLastTitle(title); fetchIndices(title); - }, [title, existingIndexPatterns, http, indexPatternService, allowHidden]); + }, [title, existingIndexPatterns, http, indexPatternService, allowHidden, lastTitle]); const { isValid } = formState; const onClickSave = async () => { @@ -320,6 +331,28 @@ const IndexPatternEditorFlyoutContentComponent = ({ onSave, onCancel, isSaving } component={TextField} data-test-subj="createIndexPatternNameInput" componentProps={{ + onChange: (e: ChangeEvent) => { + e.persist(); + let query = e.target.value; + if (query.length === 1 && !appendedWildcard && canAppendWildcard(query)) { + query += '*'; + setAppendedWildcard(true); + form.setFieldValue('title', query); + setTimeout(() => e.target.setSelectionRange(1, 1)); + } else { + if (['', '*'].includes(query) && appendedWildcard) { + query = ''; + // this.setState({ appendedWildcard: false }); + setAppendedWildcard(false); + form.setFieldValue('title', query); + } + } + setLastTitle(query); + /* + console.log('changed', e.target.value); + form.setFieldValue('title', e.target.value + '*'); + */ + }, euiFieldProps: { 'aria-label': i18n.translate('indexPatternEditor.form.titleAriaLabel', { defaultMessage: 'Title field', From 26c9d80e18bea10af0ffadaa25f5909e119779eb Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Fri, 11 Jun 2021 21:40:59 -0500 Subject: [PATCH 010/130] update docs and append * to index pattern titles --- ...public.overlayflyoutopenoptions.hideclosebutton.md | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 docs/development/core/public/kibana-plugin-core-public.overlayflyoutopenoptions.hideclosebutton.md diff --git a/docs/development/core/public/kibana-plugin-core-public.overlayflyoutopenoptions.hideclosebutton.md b/docs/development/core/public/kibana-plugin-core-public.overlayflyoutopenoptions.hideclosebutton.md new file mode 100644 index 0000000000000..149a53f35d34d --- /dev/null +++ b/docs/development/core/public/kibana-plugin-core-public.overlayflyoutopenoptions.hideclosebutton.md @@ -0,0 +1,11 @@ + + +[Home](./index.md) > [kibana-plugin-core-public](./kibana-plugin-core-public.md) > [OverlayFlyoutOpenOptions](./kibana-plugin-core-public.overlayflyoutopenoptions.md) > [hideCloseButton](./kibana-plugin-core-public.overlayflyoutopenoptions.hideclosebutton.md) + +## OverlayFlyoutOpenOptions.hideCloseButton property + +Signature: + +```typescript +hideCloseButton?: boolean; +``` From 74df12361d8b42e2d8210484924c6da60a919763 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Fri, 11 Jun 2021 23:01:41 -0500 Subject: [PATCH 011/130] disambiguate tests --- src/plugins/index_pattern_editor/kibana.json | 7 ++++++- .../empty_index_pattern_prompt.tsx | 2 +- .../components/index_pattern_table/index_pattern_table.tsx | 5 ++++- test/functional/page_objects/settings_page.ts | 5 +++-- .../feature_controls/index_patterns_security.ts | 2 +- 5 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/plugins/index_pattern_editor/kibana.json b/src/plugins/index_pattern_editor/kibana.json index d1c925fffbde6..72f296d2435c2 100644 --- a/src/plugins/index_pattern_editor/kibana.json +++ b/src/plugins/index_pattern_editor/kibana.json @@ -4,5 +4,10 @@ "server": false, "ui": true, "requiredPlugins": ["data"], - "requiredBundles": ["kibanaReact", "esUiShared"] + "requiredBundles": ["kibanaReact", "esUiShared"], + "owner": { + "name": "App Services", + "githubTeam": "kibana-app-services" + }, + "description": "This plugin provides the ability to create index patterns via a EuiFlyout from any app" } diff --git a/src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/empty_index_pattern_prompt.tsx b/src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/empty_index_pattern_prompt.tsx index 1cb776819c464..8fd598fdb06db 100644 --- a/src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/empty_index_pattern_prompt.tsx +++ b/src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/empty_index_pattern_prompt.tsx @@ -68,7 +68,7 @@ export const EmptyIndexPatternPrompt = ({ goToCreate }: Props) => { onClick={goToCreate} iconType="plusInCircle" fill={true} - data-test-subj="createIndexPatternButton" + data-test-subj="createIndexPatternButtonFlyout" > { const { @@ -146,7 +147,7 @@ export const IndexPatternTable = ({ ); */ - const createButton = ( + const createButton = canSave ? ( /* + ) : ( + <> ); if (isLoadingIndexPatterns) { diff --git a/test/functional/page_objects/settings_page.ts b/test/functional/page_objects/settings_page.ts index d74bf73eab8c4..e909aad3ec1d5 100644 --- a/test/functional/page_objects/settings_page.ts +++ b/test/functional/page_objects/settings_page.ts @@ -371,8 +371,9 @@ export class SettingsPageObject extends FtrService { async clickAddNewIndexPatternButton() { await this.common.scrollKibanaBodyTop(); - const createButtons = await this.testSubjects.findAll('createIndexPatternButton'); - await createButtons[createButtons.length - 1].click(); + const createButtonTable = await this.testSubjects.find('createIndexPatternButton'); + const createButtonFlyout = await this.testSubjects.find('createIndexPatternButtonFlyout'); + await (createButtonFlyout || createButtonTable).click(); } async clickCreateNewRollupButton() { diff --git a/x-pack/test/functional/apps/index_patterns/feature_controls/index_patterns_security.ts b/x-pack/test/functional/apps/index_patterns/feature_controls/index_patterns_security.ts index 04f251d247d1b..c3e1080997cda 100644 --- a/x-pack/test/functional/apps/index_patterns/feature_controls/index_patterns_security.ts +++ b/x-pack/test/functional/apps/index_patterns/feature_controls/index_patterns_security.ts @@ -132,7 +132,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { it(`index pattern listing doesn't show create button`, async () => { await PageObjects.settings.clickKibanaIndexPatterns(); await testSubjects.existOrFail('emptyIndexPatternPrompt'); - await testSubjects.missingOrFail('createIndexPatternButton'); + await testSubjects.missingOrFail('createIndexPatternButtonFlyout'); }); it(`shows read-only badge`, async () => { From 8b62d6bffb081af024bb8d3100d67170067e2935 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Sat, 12 Jun 2021 09:31:14 -0500 Subject: [PATCH 012/130] functional test - conditionally press add index pattern button as appropriate --- test/functional/page_objects/settings_page.ts | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/test/functional/page_objects/settings_page.ts b/test/functional/page_objects/settings_page.ts index e909aad3ec1d5..2ad06db47a611 100644 --- a/test/functional/page_objects/settings_page.ts +++ b/test/functional/page_objects/settings_page.ts @@ -371,9 +371,14 @@ export class SettingsPageObject extends FtrService { async clickAddNewIndexPatternButton() { await this.common.scrollKibanaBodyTop(); - const createButtonTable = await this.testSubjects.find('createIndexPatternButton'); - const createButtonFlyout = await this.testSubjects.find('createIndexPatternButtonFlyout'); - await (createButtonFlyout || createButtonTable).click(); + const tableView = await this.testSubjects.exists('createIndexPatternButton'); + if (tableView) { + await this.testSubjects.click('createIndexPatternButton'); + } + const flyoutView = await this.testSubjects.exists('createIndexPatternButtonFlyout'); + if (flyoutView) { + await this.testSubjects.click('createIndexPatternButtonFlyout'); + } } async clickCreateNewRollupButton() { From 2be1255d1ae8b2edb84ae7d6ff8cd9a78b678d4c Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Sat, 12 Jun 2021 12:27:30 -0500 Subject: [PATCH 013/130] fix index pattern creation --- test/functional/page_objects/settings_page.ts | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/test/functional/page_objects/settings_page.ts b/test/functional/page_objects/settings_page.ts index 2ad06db47a611..c6431ab38559a 100644 --- a/test/functional/page_objects/settings_page.ts +++ b/test/functional/page_objects/settings_page.ts @@ -371,12 +371,20 @@ export class SettingsPageObject extends FtrService { async clickAddNewIndexPatternButton() { await this.common.scrollKibanaBodyTop(); + + // if flyout is open + const flyoutView = await this.testSubjects.exists('createIndexPatternButtonFlyout'); + if (flyoutView) { + await this.testSubjects.click('createIndexPatternButtonFlyout'); + return; + } + const tableView = await this.testSubjects.exists('createIndexPatternButton'); if (tableView) { await this.testSubjects.click('createIndexPatternButton'); } - const flyoutView = await this.testSubjects.exists('createIndexPatternButtonFlyout'); - if (flyoutView) { + const flyoutView2 = await this.testSubjects.exists('createIndexPatternButtonFlyout'); + if (flyoutView2) { await this.testSubjects.click('createIndexPatternButtonFlyout'); } } From 8566d6b7b2d91716488796187aaaa6e398aa2cd8 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Sat, 12 Jun 2021 17:00:09 -0500 Subject: [PATCH 014/130] skip a few tests and troubleshoot indexPatterns privs --- .../public/components/empty_state/empty_state.tsx | 2 ++ test/functional/apps/management/_index_pattern_create_delete.js | 2 +- x-pack/test/functional/apps/rollup_job/hybrid_index_pattern.js | 2 +- x-pack/test/functional/apps/visualize/hybrid_visualization.ts | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/plugins/index_pattern_editor/public/components/empty_state/empty_state.tsx b/src/plugins/index_pattern_editor/public/components/empty_state/empty_state.tsx index 1f314143d4ea2..5795eda167236 100644 --- a/src/plugins/index_pattern_editor/public/components/empty_state/empty_state.tsx +++ b/src/plugins/index_pattern_editor/public/components/empty_state/empty_state.tsx @@ -64,6 +64,8 @@ export const EmptyState = ({ ); + console.log('HI', capabilities, capabilities.management.kibana.indexPatterns); + return ( <> { + describe.skip('special character handling', () => { it('should handle special charaters in template input', async () => { await PageObjects.settings.clickAddNewIndexPatternButton(); await PageObjects.header.waitUntilLoadingHasFinished(); diff --git a/x-pack/test/functional/apps/rollup_job/hybrid_index_pattern.js b/x-pack/test/functional/apps/rollup_job/hybrid_index_pattern.js index 1986efe202224..6d684f5b2a6da 100644 --- a/x-pack/test/functional/apps/rollup_job/hybrid_index_pattern.js +++ b/x-pack/test/functional/apps/rollup_job/hybrid_index_pattern.js @@ -17,7 +17,7 @@ export default function ({ getService, getPageObjects }) { const PageObjects = getPageObjects(['common', 'settings']); const esDeleteAllIndices = getService('esDeleteAllIndices'); - describe('hybrid index pattern', function () { + describe.skip('hybrid index pattern', function () { //Since rollups can only be created once with the same name (even if you delete it), //we add the Date.now() to avoid name collision if you run the tests locally back to back. const rollupJobName = `hybrid-index-pattern-test-rollup-job-${Date.now()}`; diff --git a/x-pack/test/functional/apps/visualize/hybrid_visualization.ts b/x-pack/test/functional/apps/visualize/hybrid_visualization.ts index 41c393398b256..118822f2ddc51 100644 --- a/x-pack/test/functional/apps/visualize/hybrid_visualization.ts +++ b/x-pack/test/functional/apps/visualize/hybrid_visualization.ts @@ -12,7 +12,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { const PageObjects = getPageObjects(['common', 'visualize', 'timePicker', 'visChart']); const inspector = getService('inspector'); - describe('hybrid index pattern', () => { + describe.skip('hybrid index pattern', () => { before(async () => { await esArchiver.load('x-pack/test/functional/es_archives/hybrid/kibana'); await esArchiver.load('x-pack/test/functional/es_archives/hybrid/logstash'); From beae4fe3f9139e184dd5b552ed9df9e43ca45941 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Sat, 12 Jun 2021 21:04:26 -0500 Subject: [PATCH 015/130] fix display of create buttons in flyout --- .../empty_index_pattern_prompt/empty_index_pattern_prompt.tsx | 2 +- .../public/components/empty_state/empty_state.tsx | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/empty_index_pattern_prompt.tsx b/src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/empty_index_pattern_prompt.tsx index 8fd598fdb06db..e59c2b1cc548b 100644 --- a/src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/empty_index_pattern_prompt.tsx +++ b/src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/empty_index_pattern_prompt.tsx @@ -63,7 +63,7 @@ export const EmptyIndexPatternPrompt = ({ goToCreate }: Props) => { yesterday, or all indices that contain your log data." />

- {application.capabilities.management.kibana.indexPatterns && ( + {application.capabilities.indexPatterns.save && ( ); - console.log('HI', capabilities, capabilities.management.kibana.indexPatterns); - return ( <> - {capabilities.management.kibana.indexPatterns && createAnywayLink} + {capabilities.indexPatterns.save && createAnywayLink} ); }; From c134740b2d64671949a37deb4e8cdc35e15302cb Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Mon, 14 Jun 2021 17:43:12 -0500 Subject: [PATCH 016/130] move rollup config to index pattern management --- .../index_pattern_management/public/mocks.ts | 9 +------ .../index_pattern_management/public/plugin.ts | 5 +++- .../components/rollup_prompt/index.ts | 5 ++-- .../rollup_prompt/rollup_prompt.tsx | 5 ++-- .../public/service/creation/index.ts | 2 ++ .../creation/rollup_creation_config.js | 7 +++--- .../index_pattern_management_service.ts | 24 +++++++++++++++---- .../public/service/list/index.ts | 2 ++ .../public/service/list/rollup_list_config.js | 7 +++--- x-pack/plugins/rollup/kibana.json | 1 - x-pack/plugins/rollup/public/plugin.ts | 14 ++++------- x-pack/plugins/rollup/tsconfig.json | 1 - 12 files changed, 47 insertions(+), 35 deletions(-) rename x-pack/plugins/rollup/public/index_pattern_creation/components/rollup_prompt/index.js => src/plugins/index_pattern_management/public/service/creation/components/rollup_prompt/index.ts (53%) rename x-pack/plugins/rollup/public/index_pattern_creation/components/rollup_prompt/rollup_prompt.js => src/plugins/index_pattern_management/public/service/creation/components/rollup_prompt/rollup_prompt.tsx (88%) rename x-pack/plugins/rollup/public/index_pattern_creation/rollup_index_pattern_creation_config.js => src/plugins/index_pattern_management/public/service/creation/rollup_creation_config.js (95%) rename x-pack/plugins/rollup/public/index_pattern_list/rollup_index_pattern_list_config.js => src/plugins/index_pattern_management/public/service/list/rollup_list_config.js (86%) diff --git a/src/plugins/index_pattern_management/public/mocks.ts b/src/plugins/index_pattern_management/public/mocks.ts index 6c709fb14f08d..7671a532d1cb8 100644 --- a/src/plugins/index_pattern_management/public/mocks.ts +++ b/src/plugins/index_pattern_management/public/mocks.ts @@ -19,14 +19,7 @@ import { } from './plugin'; import { IndexPatternManagmentContext } from './types'; -const createSetupContract = (): IndexPatternManagementSetup => ({ - creation: { - addCreationConfig: jest.fn(), - } as any, - list: { - addListConfig: jest.fn(), - } as any, -}); +const createSetupContract = (): IndexPatternManagementSetup => {}; const createStartContract = (): IndexPatternManagementStart => ({ creation: { diff --git a/src/plugins/index_pattern_management/public/plugin.ts b/src/plugins/index_pattern_management/public/plugin.ts index e3c156927bfac..610b3541620b0 100644 --- a/src/plugins/index_pattern_management/public/plugin.ts +++ b/src/plugins/index_pattern_management/public/plugin.ts @@ -81,7 +81,10 @@ export class IndexPatternManagementPlugin }, }); - return this.indexPatternManagementService.setup({ httpClient: core.http }); + return this.indexPatternManagementService.setup({ + httpClient: core.http, + uiSettings: core.uiSettings, + }); } public start(core: CoreStart, plugins: IndexPatternManagementStartDependencies) { diff --git a/x-pack/plugins/rollup/public/index_pattern_creation/components/rollup_prompt/index.js b/src/plugins/index_pattern_management/public/service/creation/components/rollup_prompt/index.ts similarity index 53% rename from x-pack/plugins/rollup/public/index_pattern_creation/components/rollup_prompt/index.js rename to src/plugins/index_pattern_management/public/service/creation/components/rollup_prompt/index.ts index 1d9eff8227c0a..d1fc2fa242eb1 100644 --- a/x-pack/plugins/rollup/public/index_pattern_creation/components/rollup_prompt/index.js +++ b/src/plugins/index_pattern_management/public/service/creation/components/rollup_prompt/index.ts @@ -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. */ export { RollupPrompt } from './rollup_prompt'; diff --git a/x-pack/plugins/rollup/public/index_pattern_creation/components/rollup_prompt/rollup_prompt.js b/src/plugins/index_pattern_management/public/service/creation/components/rollup_prompt/rollup_prompt.tsx similarity index 88% rename from x-pack/plugins/rollup/public/index_pattern_creation/components/rollup_prompt/rollup_prompt.js rename to src/plugins/index_pattern_management/public/service/creation/components/rollup_prompt/rollup_prompt.tsx index 9306ab082dff4..750fa2a3844d2 100644 --- a/x-pack/plugins/rollup/public/index_pattern_creation/components/rollup_prompt/rollup_prompt.js +++ b/src/plugins/index_pattern_management/public/service/creation/components/rollup_prompt/rollup_prompt.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 React from 'react'; diff --git a/src/plugins/index_pattern_management/public/service/creation/index.ts b/src/plugins/index_pattern_management/public/service/creation/index.ts index 51610bc83e371..e1f464b01e550 100644 --- a/src/plugins/index_pattern_management/public/service/creation/index.ts +++ b/src/plugins/index_pattern_management/public/service/creation/index.ts @@ -8,3 +8,5 @@ export { IndexPatternCreationConfig, IndexPatternCreationOption } from './config'; export { IndexPatternCreationManager } from './manager'; +// @ts-ignore +export { RollupIndexPatternCreationConfig } from './rollup_creation_config'; diff --git a/x-pack/plugins/rollup/public/index_pattern_creation/rollup_index_pattern_creation_config.js b/src/plugins/index_pattern_management/public/service/creation/rollup_creation_config.js similarity index 95% rename from x-pack/plugins/rollup/public/index_pattern_creation/rollup_index_pattern_creation_config.js rename to src/plugins/index_pattern_management/public/service/creation/rollup_creation_config.js index 8e5203fca9034..b516467bf73cc 100644 --- a/x-pack/plugins/rollup/public/index_pattern_creation/rollup_index_pattern_creation_config.js +++ b/src/plugins/index_pattern_management/public/service/creation/rollup_creation_config.js @@ -1,15 +1,16 @@ /* * 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 React from 'react'; import { i18n } from '@kbn/i18n'; import { RollupPrompt } from './components/rollup_prompt'; -import { IndexPatternCreationConfig } from '../../../../../src/plugins/index_pattern_management/public'; +import { IndexPatternCreationConfig } from '../../types'; const rollupIndexPatternTypeName = i18n.translate( 'xpack.rollupJobs.editRollupIndexPattern.createIndex.defaultTypeName', diff --git a/src/plugins/index_pattern_management/public/service/index_pattern_management_service.ts b/src/plugins/index_pattern_management/public/service/index_pattern_management_service.ts index f30ccfcb9f3ed..0edc99561b42b 100644 --- a/src/plugins/index_pattern_management/public/service/index_pattern_management_service.ts +++ b/src/plugins/index_pattern_management/public/service/index_pattern_management_service.ts @@ -6,11 +6,20 @@ * Side Public License, v 1. */ -import { HttpSetup } from '../../../../core/public'; -import { IndexPatternCreationManager, IndexPatternCreationConfig } from './creation'; -import { IndexPatternListManager, IndexPatternListConfig } from './list'; +import { HttpSetup, CoreSetup } from '../../../../core/public'; +import { + IndexPatternCreationManager, + IndexPatternCreationConfig, + RollupIndexPatternCreationConfig, +} from './creation'; +import { + IndexPatternListManager, + IndexPatternListConfig, + RollupIndexPatternListConfig, +} from './list'; interface SetupDependencies { httpClient: HttpSetup; + uiSettings: CoreSetup['uiSettings']; } /** @@ -27,17 +36,24 @@ export class IndexPatternManagementService { this.indexPatternListConfig = new IndexPatternListManager(); } - public setup({ httpClient }: SetupDependencies) { + public setup({ httpClient, uiSettings }: SetupDependencies) { const creationManagerSetup = this.indexPatternCreationManager.setup(httpClient); creationManagerSetup.addCreationConfig(IndexPatternCreationConfig); const indexPatternListConfigSetup = this.indexPatternListConfig.setup(); indexPatternListConfigSetup.addListConfig(IndexPatternListConfig); + // todo move to shared plugin + if (uiSettings.get('rollups:enableIndexPatterns')) { + creationManagerSetup.addCreationConfig(RollupIndexPatternCreationConfig); + indexPatternListConfigSetup.addListConfig(RollupIndexPatternListConfig); + } + /* return { creation: creationManagerSetup, list: indexPatternListConfigSetup, }; + */ } public start() { diff --git a/src/plugins/index_pattern_management/public/service/list/index.ts b/src/plugins/index_pattern_management/public/service/list/index.ts index 620d4c7600733..738b807ac7624 100644 --- a/src/plugins/index_pattern_management/public/service/list/index.ts +++ b/src/plugins/index_pattern_management/public/service/list/index.ts @@ -8,3 +8,5 @@ export { IndexPatternListConfig } from './config'; export { IndexPatternListManager } from './manager'; +// @ts-ignore +export { RollupIndexPatternListConfig } from './rollup_list_config'; diff --git a/x-pack/plugins/rollup/public/index_pattern_list/rollup_index_pattern_list_config.js b/src/plugins/index_pattern_management/public/service/list/rollup_list_config.js similarity index 86% rename from x-pack/plugins/rollup/public/index_pattern_list/rollup_index_pattern_list_config.js rename to src/plugins/index_pattern_management/public/service/list/rollup_list_config.js index 43eee6ca27f9a..c4422bc4cbef5 100644 --- a/x-pack/plugins/rollup/public/index_pattern_list/rollup_index_pattern_list_config.js +++ b/src/plugins/index_pattern_management/public/service/list/rollup_list_config.js @@ -1,11 +1,12 @@ /* * 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 { IndexPatternListConfig } from '../../../../../src/plugins/index_pattern_management/public'; +import { IndexPatternListConfig } from '../../types'; function isRollup(indexPattern) { return ( diff --git a/x-pack/plugins/rollup/kibana.json b/x-pack/plugins/rollup/kibana.json index 725b563c3674f..10541d9a4ebdd 100644 --- a/x-pack/plugins/rollup/kibana.json +++ b/x-pack/plugins/rollup/kibana.json @@ -5,7 +5,6 @@ "server": true, "ui": true, "requiredPlugins": [ - "indexPatternManagement", "management", "licensing", "features" diff --git a/x-pack/plugins/rollup/public/plugin.ts b/x-pack/plugins/rollup/public/plugin.ts index 17e352e1a4472..830fb63b6288e 100644 --- a/x-pack/plugins/rollup/public/plugin.ts +++ b/x-pack/plugins/rollup/public/plugin.ts @@ -12,14 +12,13 @@ import { rollupBadgeExtension, rollupToggleExtension } from './extend_index_mana import { RollupIndexPatternCreationConfig } from './index_pattern_creation/rollup_index_pattern_creation_config'; // @ts-ignore import { RollupIndexPatternListConfig } from './index_pattern_list/rollup_index_pattern_list_config'; -import { CONFIG_ROLLUPS, UIM_APP_NAME } from '../common'; +import { UIM_APP_NAME } from '../common'; import { FeatureCatalogueCategory, HomePublicPluginSetup, } from '../../../../src/plugins/home/public'; import { ManagementSetup } from '../../../../src/plugins/management/public'; import { IndexManagementPluginSetup } from '../../index_management/public'; -import { IndexPatternManagementSetup } from '../../../../src/plugins/index_pattern_management/public'; // @ts-ignore import { setHttp, init as initDocumentation } from './crud_app/services/index'; import { setNotifications, setFatalErrors, setUiStatsReporter } from './kibana_services'; @@ -29,20 +28,13 @@ export interface RollupPluginSetupDependencies { home?: HomePublicPluginSetup; management: ManagementSetup; indexManagement?: IndexManagementPluginSetup; - indexPatternManagement: IndexPatternManagementSetup; usageCollection?: UsageCollectionSetup; } export class RollupPlugin implements Plugin { setup( core: CoreSetup, - { - home, - management, - indexManagement, - indexPatternManagement, - usageCollection, - }: RollupPluginSetupDependencies + { home, management, indexManagement, usageCollection }: RollupPluginSetupDependencies ) { setFatalErrors(core.fatalErrors); if (usageCollection) { @@ -54,12 +46,14 @@ export class RollupPlugin implements Plugin { indexManagement.extensionsService.addToggle(rollupToggleExtension); } + /* const isRollupIndexPatternsEnabled = core.uiSettings.get(CONFIG_ROLLUPS); if (isRollupIndexPatternsEnabled) { indexPatternManagement.creation.addCreationConfig(RollupIndexPatternCreationConfig); indexPatternManagement.list.addListConfig(RollupIndexPatternListConfig); } + */ if (home) { home.featureCatalogue.register({ diff --git a/x-pack/plugins/rollup/tsconfig.json b/x-pack/plugins/rollup/tsconfig.json index 9b994d1710ffc..6885081ce4bdd 100644 --- a/x-pack/plugins/rollup/tsconfig.json +++ b/x-pack/plugins/rollup/tsconfig.json @@ -16,7 +16,6 @@ "references": [ { "path": "../../../src/core/tsconfig.json" }, // required plugins - { "path": "../../../src/plugins/index_pattern_management/tsconfig.json" }, { "path": "../../../src/plugins/management/tsconfig.json" }, { "path": "../licensing/tsconfig.json" }, { "path": "../features/tsconfig.json" }, From 5cc9214f3a265296a9b9e12ff2a0e5a16ca13456 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Mon, 14 Jun 2021 20:04:53 -0500 Subject: [PATCH 017/130] fix imports --- .../public/service/creation/rollup_creation_config.js | 2 +- .../public/service/list/rollup_list_config.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/index_pattern_management/public/service/creation/rollup_creation_config.js b/src/plugins/index_pattern_management/public/service/creation/rollup_creation_config.js index b516467bf73cc..93af6c27a3957 100644 --- a/src/plugins/index_pattern_management/public/service/creation/rollup_creation_config.js +++ b/src/plugins/index_pattern_management/public/service/creation/rollup_creation_config.js @@ -10,7 +10,7 @@ import React from 'react'; import { i18n } from '@kbn/i18n'; import { RollupPrompt } from './components/rollup_prompt'; -import { IndexPatternCreationConfig } from '../../types'; +import { IndexPatternCreationConfig } from '.'; const rollupIndexPatternTypeName = i18n.translate( 'xpack.rollupJobs.editRollupIndexPattern.createIndex.defaultTypeName', diff --git a/src/plugins/index_pattern_management/public/service/list/rollup_list_config.js b/src/plugins/index_pattern_management/public/service/list/rollup_list_config.js index c4422bc4cbef5..9a80d5fd0d622 100644 --- a/src/plugins/index_pattern_management/public/service/list/rollup_list_config.js +++ b/src/plugins/index_pattern_management/public/service/list/rollup_list_config.js @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -import { IndexPatternListConfig } from '../../types'; +import { IndexPatternListConfig } from '.'; function isRollup(indexPattern) { return ( From af507883522ad9c1d81a8bbba554a3b1f8ee3c9c Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Mon, 14 Jun 2021 21:40:32 -0500 Subject: [PATCH 018/130] fix localization, remove comments, cleanup --- .../public/constants.ts | 9 +++++++++ .../components/rollup_prompt/rollup_prompt.tsx | 4 ++-- .../service/creation/rollup_creation_config.js | 14 +++++++------- .../index_pattern_management_service.ts | 11 +++-------- x-pack/plugins/rollup/public/plugin.ts | 9 --------- .../translations/translations/ja-JP.json | 18 +++++++++--------- .../translations/translations/zh-CN.json | 18 +++++++++--------- 7 files changed, 39 insertions(+), 44 deletions(-) create mode 100644 src/plugins/index_pattern_management/public/constants.ts diff --git a/src/plugins/index_pattern_management/public/constants.ts b/src/plugins/index_pattern_management/public/constants.ts new file mode 100644 index 0000000000000..e5010d133f0f3 --- /dev/null +++ b/src/plugins/index_pattern_management/public/constants.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 const CONFIG_ROLLUPS = 'rollups:enableIndexPatterns'; diff --git a/src/plugins/index_pattern_management/public/service/creation/components/rollup_prompt/rollup_prompt.tsx b/src/plugins/index_pattern_management/public/service/creation/components/rollup_prompt/rollup_prompt.tsx index 750fa2a3844d2..81fcdaedb90c9 100644 --- a/src/plugins/index_pattern_management/public/service/creation/components/rollup_prompt/rollup_prompt.tsx +++ b/src/plugins/index_pattern_management/public/service/creation/components/rollup_prompt/rollup_prompt.tsx @@ -15,7 +15,7 @@ export const RollupPrompt = () => (

{i18n.translate( - 'xpack.rollupJobs.editRollupIndexPattern.rollupPrompt.betaCalloutParagraph1Text', + 'indexPatternManagement.editRollupIndexPattern.rollupPrompt.betaCalloutParagraph1Text', { defaultMessage: "Kibana's support for rollup index patterns is in beta. You might encounter issues using " + @@ -26,7 +26,7 @@ export const RollupPrompt = () => (

{i18n.translate( - 'xpack.rollupJobs.editRollupIndexPattern.rollupPrompt.betaCalloutParagraph2Text', + 'indexPatternManagement.editRollupIndexPattern.rollupPrompt.betaCalloutParagraph2Text', { defaultMessage: 'You can match a rollup index pattern against one rollup index and zero or more regular ' + diff --git a/src/plugins/index_pattern_management/public/service/creation/rollup_creation_config.js b/src/plugins/index_pattern_management/public/service/creation/rollup_creation_config.js index 93af6c27a3957..2a85dfa01143c 100644 --- a/src/plugins/index_pattern_management/public/service/creation/rollup_creation_config.js +++ b/src/plugins/index_pattern_management/public/service/creation/rollup_creation_config.js @@ -13,32 +13,32 @@ import { RollupPrompt } from './components/rollup_prompt'; import { IndexPatternCreationConfig } from '.'; const rollupIndexPatternTypeName = i18n.translate( - 'xpack.rollupJobs.editRollupIndexPattern.createIndex.defaultTypeName', + 'indexPatternManagement.editRollupIndexPattern.createIndex.defaultTypeName', { defaultMessage: 'rollup index pattern' } ); const rollupIndexPatternButtonText = i18n.translate( - 'xpack.rollupJobs.editRollupIndexPattern.createIndex.defaultButtonText', + 'indexPatternManagement.editRollupIndexPattern.createIndex.defaultButtonText', { defaultMessage: 'Rollup index pattern' } ); const rollupIndexPatternButtonDescription = i18n.translate( - 'xpack.rollupJobs.editRollupIndexPattern.createIndex.defaultButtonDescription', + 'indexPatternManagement.editRollupIndexPattern.createIndex.defaultButtonDescription', { defaultMessage: 'Perform limited aggregations against summarized data' } ); const rollupIndexPatternNoMatchError = i18n.translate( - 'xpack.rollupJobs.editRollupIndexPattern.createIndex.noMatchError', + 'indexPatternManagement.editRollupIndexPattern.createIndex.noMatchError', { defaultMessage: 'Rollup index pattern error: must match one rollup index' } ); const rollupIndexPatternTooManyMatchesError = i18n.translate( - 'xpack.rollupJobs.editRollupIndexPattern.createIndex.tooManyMatchesError', + 'indexPatternManagement.editRollupIndexPattern.createIndex.tooManyMatchesError', { defaultMessage: 'Rollup index pattern error: can only match one rollup index' } ); const rollupIndexPatternIndexLabel = i18n.translate( - 'xpack.rollupJobs.editRollupIndexPattern.createIndex.indexLabel', + 'indexPatternManagement.editRollupIndexPattern.createIndex.indexLabel', { defaultMessage: 'Rollup' } ); @@ -128,7 +128,7 @@ export class RollupIndexPatternCreationConfig extends IndexPatternCreationConfig if (error) { const errorMessage = i18n.translate( - 'xpack.rollupJobs.editRollupIndexPattern.createIndex.uncaughtError', + 'indexPatternManagement.editRollupIndexPattern.createIndex.uncaughtError', { defaultMessage: 'Rollup index pattern error: {error}', values: { diff --git a/src/plugins/index_pattern_management/public/service/index_pattern_management_service.ts b/src/plugins/index_pattern_management/public/service/index_pattern_management_service.ts index 0edc99561b42b..19346dbf31d18 100644 --- a/src/plugins/index_pattern_management/public/service/index_pattern_management_service.ts +++ b/src/plugins/index_pattern_management/public/service/index_pattern_management_service.ts @@ -17,6 +17,8 @@ import { IndexPatternListConfig, RollupIndexPatternListConfig, } from './list'; + +import { CONFIG_ROLLUPS } from '../constants'; interface SetupDependencies { httpClient: HttpSetup; uiSettings: CoreSetup['uiSettings']; @@ -43,17 +45,10 @@ export class IndexPatternManagementService { const indexPatternListConfigSetup = this.indexPatternListConfig.setup(); indexPatternListConfigSetup.addListConfig(IndexPatternListConfig); - // todo move to shared plugin - if (uiSettings.get('rollups:enableIndexPatterns')) { + if (uiSettings.get(CONFIG_ROLLUPS)) { creationManagerSetup.addCreationConfig(RollupIndexPatternCreationConfig); indexPatternListConfigSetup.addListConfig(RollupIndexPatternListConfig); } - /* - return { - creation: creationManagerSetup, - list: indexPatternListConfigSetup, - }; - */ } public start() { diff --git a/x-pack/plugins/rollup/public/plugin.ts b/x-pack/plugins/rollup/public/plugin.ts index 830fb63b6288e..0d345e326193c 100644 --- a/x-pack/plugins/rollup/public/plugin.ts +++ b/x-pack/plugins/rollup/public/plugin.ts @@ -46,15 +46,6 @@ export class RollupPlugin implements Plugin { indexManagement.extensionsService.addToggle(rollupToggleExtension); } - /* - const isRollupIndexPatternsEnabled = core.uiSettings.get(CONFIG_ROLLUPS); - - if (isRollupIndexPatternsEnabled) { - indexPatternManagement.creation.addCreationConfig(RollupIndexPatternCreationConfig); - indexPatternManagement.list.addListConfig(RollupIndexPatternListConfig); - } - */ - if (home) { home.featureCatalogue.register({ id: 'rollup_jobs', diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json index 9be5957cd4718..510df729fd277 100644 --- a/x-pack/plugins/translations/translations/ja-JP.json +++ b/x-pack/plugins/translations/translations/ja-JP.json @@ -18035,15 +18035,15 @@ "xpack.rollupJobs.detailPanel.jobActionMenu.buttonLabel": "管理", "xpack.rollupJobs.detailPanel.loadingLabel": "ロールアップジョブを読み込み中...", "xpack.rollupJobs.detailPanel.notFoundLabel": "ロールアップジョブが見つかりません", - "xpack.rollupJobs.editRollupIndexPattern.createIndex.defaultButtonDescription": "要約データに制限された集約を実行します。", - "xpack.rollupJobs.editRollupIndexPattern.createIndex.defaultButtonText": "ロールアップインデックスパターン", - "xpack.rollupJobs.editRollupIndexPattern.createIndex.defaultTypeName": "ロールアップインデックスパターン", - "xpack.rollupJobs.editRollupIndexPattern.createIndex.indexLabel": "ロールアップ", - "xpack.rollupJobs.editRollupIndexPattern.createIndex.noMatchError": "ロールアップインデックスパターンエラー：ロールアップインデックスの 1 つと一致している必要があります", - "xpack.rollupJobs.editRollupIndexPattern.createIndex.tooManyMatchesError": "ロールアップインデックスパターンエラー：一致できるロールアップインデックスは 1 つだけです", - "xpack.rollupJobs.editRollupIndexPattern.createIndex.uncaughtError": "ロールアップインデックスパターンエラー：{error}", - "xpack.rollupJobs.editRollupIndexPattern.rollupPrompt.betaCalloutParagraph1Text": "ロールアップインデックスパターンのKibanaのサポートはベータ版です。保存された検索、可視化、ダッシュボードでこれらのパターンを使用すると問題が発生する場合があります。Timelionや機械学習などの一部の高度な機能ではサポートされていません。", - "xpack.rollupJobs.editRollupIndexPattern.rollupPrompt.betaCalloutParagraph2Text": "ロールアップインデックスパターンは、1つのロールアップインデックスとゼロ以上の標準インデックスと一致させることができます。ロールアップインデックスパターンでは、メトリック、フィールド、間隔、アグリゲーションが制限されています。ロールアップインデックスは、1つのジョブ構成があるインデックス、または複数のジョブと互換する構成があるインデックスに制限されています。", + "indexPatternManagement.editRollupIndexPattern.createIndex.defaultButtonDescription": "要約データに制限された集約を実行します。", + "indexPatternManagement.editRollupIndexPattern.createIndex.defaultButtonText": "ロールアップインデックスパターン", + "indexPatternManagement.editRollupIndexPattern.createIndex.defaultTypeName": "ロールアップインデックスパターン", + "indexPatternManagement.editRollupIndexPattern.createIndex.indexLabel": "ロールアップ", + "indexPatternManagement.editRollupIndexPattern.createIndex.noMatchError": "ロールアップインデックスパターンエラー：ロールアップインデックスの 1 つと一致している必要があります", + "indexPatternManagement.editRollupIndexPattern.createIndex.tooManyMatchesError": "ロールアップインデックスパターンエラー：一致できるロールアップインデックスは 1 つだけです", + "indexPatternManagement.editRollupIndexPattern.createIndex.uncaughtError": "ロールアップインデックスパターンエラー：{error}", + "indexPatternManagement.editRollupIndexPattern.rollupPrompt.betaCalloutParagraph1Text": "ロールアップインデックスパターンのKibanaのサポートはベータ版です。保存された検索、可視化、ダッシュボードでこれらのパターンを使用すると問題が発生する場合があります。Timelionや機械学習などの一部の高度な機能ではサポートされていません。", + "indexPatternManagement.editRollupIndexPattern.rollupPrompt.betaCalloutParagraph2Text": "ロールアップインデックスパターンは、1つのロールアップインデックスとゼロ以上の標準インデックスと一致させることができます。ロールアップインデックスパターンでは、メトリック、フィールド、間隔、アグリゲーションが制限されています。ロールアップインデックスは、1つのジョブ構成があるインデックス、または複数のジョブと互換する構成があるインデックスに制限されています。", "xpack.rollupJobs.featureCatalogueDescription": "今後の分析用に履歴データを小さなインデックスに要約して格納します。", "xpack.rollupJobs.indexMgmtBadge.rollupLabel": "ロールアップ", "xpack.rollupJobs.indexMgmtToggle.toggleLabel": "ロールアップインデックスを含める", diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json index d6ebf8a32bcc4..ff9bdb9c593bb 100644 --- a/x-pack/plugins/translations/translations/zh-CN.json +++ b/x-pack/plugins/translations/translations/zh-CN.json @@ -18276,15 +18276,15 @@ "xpack.rollupJobs.detailPanel.jobActionMenu.buttonLabel": "管理", "xpack.rollupJobs.detailPanel.loadingLabel": "正在加载汇总/打包作业……", "xpack.rollupJobs.detailPanel.notFoundLabel": "未找到汇总/打包作业", - "xpack.rollupJobs.editRollupIndexPattern.createIndex.defaultButtonDescription": "针对汇总数据执行有限聚合", - "xpack.rollupJobs.editRollupIndexPattern.createIndex.defaultButtonText": "汇总/打包索引模式", - "xpack.rollupJobs.editRollupIndexPattern.createIndex.defaultTypeName": "汇总/打包索引模式", - "xpack.rollupJobs.editRollupIndexPattern.createIndex.indexLabel": "汇总/打包", - "xpack.rollupJobs.editRollupIndexPattern.createIndex.noMatchError": "汇总/打包索引模式错误：必须匹配一个汇总/打包索引", - "xpack.rollupJobs.editRollupIndexPattern.createIndex.tooManyMatchesError": "汇总/打包索引模式错误：只能匹配一个汇总/打包索引", - "xpack.rollupJobs.editRollupIndexPattern.createIndex.uncaughtError": "汇总索引模式错误：{error}", - "xpack.rollupJobs.editRollupIndexPattern.rollupPrompt.betaCalloutParagraph1Text": "Kibana 对汇总/打包索引模式的支持处于公测版状态。将这些模式用于已保存搜索、可视化以及仪表板可能会遇到问题。某些高级功能，如 Timelion 和 Machine Learning，不支持这些模式。", - "xpack.rollupJobs.editRollupIndexPattern.rollupPrompt.betaCalloutParagraph2Text": "可以根据一个汇总/打包索引和零个或更多常规索引匹配汇总/打包索引模式。汇总/打包索引模式的指标、字段、时间间隔和聚合有限。汇总/打包索引仅限于具有一个作业配置或多个作业配置兼容的索引。", + "indexPatternManagement.editRollupIndexPattern.createIndex.defaultButtonDescription": "针对汇总数据执行有限聚合", + "indexPatternManagement.editRollupIndexPattern.createIndex.defaultButtonText": "汇总/打包索引模式", + "indexPatternManagement.editRollupIndexPattern.createIndex.defaultTypeName": "汇总/打包索引模式", + "indexPatternManagement.editRollupIndexPattern.createIndex.indexLabel": "汇总/打包", + "indexPatternManagement.editRollupIndexPattern.createIndex.noMatchError": "汇总/打包索引模式错误：必须匹配一个汇总/打包索引", + "indexPatternManagement.editRollupIndexPattern.createIndex.tooManyMatchesError": "汇总/打包索引模式错误：只能匹配一个汇总/打包索引", + "indexPatternManagement.editRollupIndexPattern.createIndex.uncaughtError": "汇总索引模式错误：{error}", + "indexPatternManagement.editRollupIndexPattern.rollupPrompt.betaCalloutParagraph1Text": "Kibana 对汇总/打包索引模式的支持处于公测版状态。将这些模式用于已保存搜索、可视化以及仪表板可能会遇到问题。某些高级功能，如 Timelion 和 Machine Learning，不支持这些模式。", + "indexPatternManagement.editRollupIndexPattern.rollupPrompt.betaCalloutParagraph2Text": "可以根据一个汇总/打包索引和零个或更多常规索引匹配汇总/打包索引模式。汇总/打包索引模式的指标、字段、时间间隔和聚合有限。汇总/打包索引仅限于具有一个作业配置或多个作业配置兼容的索引。", "xpack.rollupJobs.featureCatalogueDescription": "汇总历史数据并将其存储在较小的索引中以供将来分析。", "xpack.rollupJobs.indexMgmtBadge.rollupLabel": "汇总/打包", "xpack.rollupJobs.indexMgmtToggle.toggleLabel": "包括汇总索引", From 452baf667a5a8102a4175e23579a312d35e3977b Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Tue, 15 Jun 2021 20:34:41 -0500 Subject: [PATCH 019/130] provide default for uiSettings lookup --- .../public/service/index_pattern_management_service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/index_pattern_management/public/service/index_pattern_management_service.ts b/src/plugins/index_pattern_management/public/service/index_pattern_management_service.ts index 19346dbf31d18..f1fa2b76b2888 100644 --- a/src/plugins/index_pattern_management/public/service/index_pattern_management_service.ts +++ b/src/plugins/index_pattern_management/public/service/index_pattern_management_service.ts @@ -45,7 +45,7 @@ export class IndexPatternManagementService { const indexPatternListConfigSetup = this.indexPatternListConfig.setup(); indexPatternListConfigSetup.addListConfig(IndexPatternListConfig); - if (uiSettings.get(CONFIG_ROLLUPS)) { + if (uiSettings.get(CONFIG_ROLLUPS, false)) { creationManagerSetup.addCreationConfig(RollupIndexPatternCreationConfig); indexPatternListConfigSetup.addListConfig(RollupIndexPatternListConfig); } From d74614ad68f07d9dad0b74d24356501950f73f1f Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Tue, 15 Jun 2021 22:55:36 -0500 Subject: [PATCH 020/130] refactor to only reference uiSettings after lifecycle functions have run --- .../index_pattern_management/public/plugin.ts | 8 ++-- .../public/service/creation/manager.ts | 41 +++++++++++-------- .../index_pattern_management_service.ts | 40 +++++------------- .../public/service/list/manager.ts | 38 +++++++++-------- 4 files changed, 57 insertions(+), 70 deletions(-) diff --git a/src/plugins/index_pattern_management/public/plugin.ts b/src/plugins/index_pattern_management/public/plugin.ts index 610b3541620b0..d254691a0270d 100644 --- a/src/plugins/index_pattern_management/public/plugin.ts +++ b/src/plugins/index_pattern_management/public/plugin.ts @@ -80,17 +80,15 @@ export class IndexPatternManagementPlugin return mountManagementSection(core.getStartServices, params); }, }); + } - return this.indexPatternManagementService.setup({ + public start(core: CoreStart, plugins: IndexPatternManagementStartDependencies) { + return this.indexPatternManagementService.start({ httpClient: core.http, uiSettings: core.uiSettings, }); } - public start(core: CoreStart, plugins: IndexPatternManagementStartDependencies) { - return this.indexPatternManagementService.start(); - } - public stop() { this.indexPatternManagementService.stop(); } diff --git a/src/plugins/index_pattern_management/public/service/creation/manager.ts b/src/plugins/index_pattern_management/public/service/creation/manager.ts index c139b10ebb1fe..f1fdb68418a65 100644 --- a/src/plugins/index_pattern_management/public/service/creation/manager.ts +++ b/src/plugins/index_pattern_management/public/service/creation/manager.ts @@ -6,31 +6,36 @@ * Side Public License, v 1. */ -import { HttpSetup } from '../../../../../core/public'; +import { memoize } from 'lodash'; +import { HttpStart, CoreStart } from '../../../../../core/public'; import { IndexPatternCreationConfig, UrlHandler, IndexPatternCreationOption } from './config'; +import { CONFIG_ROLLUPS } from '../../constants'; +// @ts-ignore +import { RollupIndexPatternCreationConfig } from './rollup_creation_config'; -export class IndexPatternCreationManager { - private configs: IndexPatternCreationConfig[] = []; +interface IndexPatternCreationManagerStart { + httpClient: HttpStart; + uiSettings: CoreStart['uiSettings']; +} - setup(httpClient: HttpSetup) { - return { - addCreationConfig: (Config: typeof IndexPatternCreationConfig) => { - const config = new Config({ httpClient }); +export class IndexPatternCreationManager { + start({ httpClient, uiSettings }: IndexPatternCreationManagerStart) { + const getConfigs = memoize(() => { + const configs: IndexPatternCreationConfig[] = []; + configs.push(new IndexPatternCreationConfig({ httpClient })); - if (this.configs.findIndex((c) => c.key === config.key) !== -1) { - throw new Error(`${config.key} exists in IndexPatternCreationManager.`); - } + if (uiSettings.get(CONFIG_ROLLUPS, false)) { + configs.push(new RollupIndexPatternCreationConfig({ httpClient })); + } - this.configs.push(config); - }, - }; - } + return configs; + }); - start() { const getType = (key: string | undefined): IndexPatternCreationConfig => { + const configs = getConfigs(); if (key) { - const index = this.configs.findIndex((config) => config.key === key); - const config = this.configs[index]; + const index = configs.findIndex((config) => config.key === key); + const config = configs[index]; if (config) { return config; @@ -48,7 +53,7 @@ export class IndexPatternCreationManager { const options: IndexPatternCreationOption[] = []; await Promise.all( - this.configs.map(async (config) => { + getConfigs().map(async (config) => { const option = config.getIndexPatternCreationOption ? await config.getIndexPatternCreationOption(urlHandler) : null; diff --git a/src/plugins/index_pattern_management/public/service/index_pattern_management_service.ts b/src/plugins/index_pattern_management/public/service/index_pattern_management_service.ts index f1fa2b76b2888..25a36faa1c3e3 100644 --- a/src/plugins/index_pattern_management/public/service/index_pattern_management_service.ts +++ b/src/plugins/index_pattern_management/public/service/index_pattern_management_service.ts @@ -6,22 +6,13 @@ * Side Public License, v 1. */ -import { HttpSetup, CoreSetup } from '../../../../core/public'; -import { - IndexPatternCreationManager, - IndexPatternCreationConfig, - RollupIndexPatternCreationConfig, -} from './creation'; -import { - IndexPatternListManager, - IndexPatternListConfig, - RollupIndexPatternListConfig, -} from './list'; +import { HttpStart, CoreStart } from '../../../../core/public'; +import { IndexPatternCreationManager } from './creation'; +import { IndexPatternListManager } from './list'; -import { CONFIG_ROLLUPS } from '../constants'; -interface SetupDependencies { - httpClient: HttpSetup; - uiSettings: CoreSetup['uiSettings']; +interface StartDependencies { + httpClient: HttpStart; + uiSettings: CoreStart['uiSettings']; } /** @@ -38,23 +29,12 @@ export class IndexPatternManagementService { this.indexPatternListConfig = new IndexPatternListManager(); } - public setup({ httpClient, uiSettings }: SetupDependencies) { - const creationManagerSetup = this.indexPatternCreationManager.setup(httpClient); - creationManagerSetup.addCreationConfig(IndexPatternCreationConfig); + public setup() {} - const indexPatternListConfigSetup = this.indexPatternListConfig.setup(); - indexPatternListConfigSetup.addListConfig(IndexPatternListConfig); - - if (uiSettings.get(CONFIG_ROLLUPS, false)) { - creationManagerSetup.addCreationConfig(RollupIndexPatternCreationConfig); - indexPatternListConfigSetup.addListConfig(RollupIndexPatternListConfig); - } - } - - public start() { + public start({ httpClient, uiSettings }: StartDependencies) { return { - creation: this.indexPatternCreationManager.start(), - list: this.indexPatternListConfig.start(), + creation: this.indexPatternCreationManager.start({ httpClient, uiSettings }), + list: this.indexPatternListConfig.start({ uiSettings }), }; } diff --git a/src/plugins/index_pattern_management/public/service/list/manager.ts b/src/plugins/index_pattern_management/public/service/list/manager.ts index 22877f78d46fc..2164d77006978 100644 --- a/src/plugins/index_pattern_management/public/service/list/manager.ts +++ b/src/plugins/index_pattern_management/public/service/list/manager.ts @@ -8,31 +8,35 @@ import { IIndexPattern, IFieldType } from 'src/plugins/data/public'; import { SimpleSavedObject } from 'src/core/public'; +import { memoize } from 'lodash'; +import { CoreStart } from '../../../../../core/public'; import { IndexPatternListConfig, IndexPatternTag } from './config'; +import { CONFIG_ROLLUPS } from '../../constants'; +// @ts-ignore +import { RollupIndexPatternListConfig } from './rollup_list_config'; -export class IndexPatternListManager { - private configs: IndexPatternListConfig[] = []; +interface IndexPatternListManagerStart { + uiSettings: CoreStart['uiSettings']; +} - setup() { - return { - addListConfig: (Config: typeof IndexPatternListConfig) => { - const config = new Config(); +export class IndexPatternListManager { + start({ uiSettings }: IndexPatternListManagerStart) { + const getConfigs = memoize(() => { + const configs: IndexPatternListConfig[] = []; + configs.push(new IndexPatternListConfig()); - if (this.configs.findIndex((c) => c.key === config.key) !== -1) { - throw new Error(`${config.key} exists in IndexPatternListManager.`); - } - this.configs.push(config); - }, - }; - } + if (uiSettings.get(CONFIG_ROLLUPS, false)) { + configs.push(new RollupIndexPatternListConfig()); + } - start() { + return configs; + }); return { getIndexPatternTags: ( indexPattern: IIndexPattern | SimpleSavedObject, isDefault: boolean ) => - this.configs.reduce( + getConfigs().reduce( (tags: IndexPatternTag[], config) => config.getIndexPatternTags ? tags.concat(config.getIndexPatternTags(indexPattern, isDefault)) @@ -41,14 +45,14 @@ export class IndexPatternListManager { ), getFieldInfo: (indexPattern: IIndexPattern, field: IFieldType): string[] => - this.configs.reduce( + getConfigs().reduce( (info: string[], config) => config.getFieldInfo ? info.concat(config.getFieldInfo(indexPattern, field)) : info, [] ), areScriptedFieldsEnabled: (indexPattern: IIndexPattern): boolean => - this.configs.every((config) => + getConfigs().every((config) => config.areScriptedFieldsEnabled ? config.areScriptedFieldsEnabled(indexPattern) : true ), }; From 217e30412bf14d457f99a789d34bc6d24b58ab3b Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Wed, 16 Jun 2021 10:00:40 -0500 Subject: [PATCH 021/130] check if uiSetting is declared before checking for value --- .../index_pattern_management/public/service/creation/manager.ts | 2 +- .../index_pattern_management/public/service/list/manager.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/index_pattern_management/public/service/creation/manager.ts b/src/plugins/index_pattern_management/public/service/creation/manager.ts index f1fdb68418a65..7a15b1869469d 100644 --- a/src/plugins/index_pattern_management/public/service/creation/manager.ts +++ b/src/plugins/index_pattern_management/public/service/creation/manager.ts @@ -24,7 +24,7 @@ export class IndexPatternCreationManager { const configs: IndexPatternCreationConfig[] = []; configs.push(new IndexPatternCreationConfig({ httpClient })); - if (uiSettings.get(CONFIG_ROLLUPS, false)) { + if (uiSettings.isDeclared(CONFIG_ROLLUPS) && uiSettings.get(CONFIG_ROLLUPS)) { configs.push(new RollupIndexPatternCreationConfig({ httpClient })); } diff --git a/src/plugins/index_pattern_management/public/service/list/manager.ts b/src/plugins/index_pattern_management/public/service/list/manager.ts index 2164d77006978..7cd55988c6b5b 100644 --- a/src/plugins/index_pattern_management/public/service/list/manager.ts +++ b/src/plugins/index_pattern_management/public/service/list/manager.ts @@ -25,7 +25,7 @@ export class IndexPatternListManager { const configs: IndexPatternListConfig[] = []; configs.push(new IndexPatternListConfig()); - if (uiSettings.get(CONFIG_ROLLUPS, false)) { + if (uiSettings.isDeclared(CONFIG_ROLLUPS) && uiSettings.get(CONFIG_ROLLUPS)) { configs.push(new RollupIndexPatternListConfig()); } From 4dd2931d1b8475a5463ba6ff24745690841cb07a Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Wed, 16 Jun 2021 18:08:54 -0500 Subject: [PATCH 022/130] memoize => once --- .../public/service/creation/manager.ts | 4 ++-- .../index_pattern_management/public/service/list/manager.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/index_pattern_management/public/service/creation/manager.ts b/src/plugins/index_pattern_management/public/service/creation/manager.ts index 7a15b1869469d..cc2285bbfcafb 100644 --- a/src/plugins/index_pattern_management/public/service/creation/manager.ts +++ b/src/plugins/index_pattern_management/public/service/creation/manager.ts @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -import { memoize } from 'lodash'; +import { once } from 'lodash'; import { HttpStart, CoreStart } from '../../../../../core/public'; import { IndexPatternCreationConfig, UrlHandler, IndexPatternCreationOption } from './config'; import { CONFIG_ROLLUPS } from '../../constants'; @@ -20,7 +20,7 @@ interface IndexPatternCreationManagerStart { export class IndexPatternCreationManager { start({ httpClient, uiSettings }: IndexPatternCreationManagerStart) { - const getConfigs = memoize(() => { + const getConfigs = once(() => { const configs: IndexPatternCreationConfig[] = []; configs.push(new IndexPatternCreationConfig({ httpClient })); diff --git a/src/plugins/index_pattern_management/public/service/list/manager.ts b/src/plugins/index_pattern_management/public/service/list/manager.ts index 7cd55988c6b5b..bdb2d47057f1f 100644 --- a/src/plugins/index_pattern_management/public/service/list/manager.ts +++ b/src/plugins/index_pattern_management/public/service/list/manager.ts @@ -8,7 +8,7 @@ import { IIndexPattern, IFieldType } from 'src/plugins/data/public'; import { SimpleSavedObject } from 'src/core/public'; -import { memoize } from 'lodash'; +import { once } from 'lodash'; import { CoreStart } from '../../../../../core/public'; import { IndexPatternListConfig, IndexPatternTag } from './config'; import { CONFIG_ROLLUPS } from '../../constants'; @@ -21,7 +21,7 @@ interface IndexPatternListManagerStart { export class IndexPatternListManager { start({ uiSettings }: IndexPatternListManagerStart) { - const getConfigs = memoize(() => { + const getConfigs = once(() => { const configs: IndexPatternListConfig[] = []; configs.push(new IndexPatternListConfig()); From a4b169e7db77ef972b953590f7140bff0429c629 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Sat, 19 Jun 2021 23:15:33 -0500 Subject: [PATCH 023/130] rollup index pattern support --- .../data/common/index_patterns/utils.ts | 2 +- .../public/components/form_fields/index.ts | 2 + .../form_fields/timestamp_field.tsx | 5 +- .../components/form_fields/title_field.tsx | 72 ++++++++++ .../components/form_fields/type_field.tsx | 75 +++++++++++ .../public/components/form_schema.ts | 8 +- .../index_pattern_editor_flyout_content.tsx | 127 +++++++----------- .../index_pattern_editor/public/constants.ts | 1 + .../public/lib/get_indices.ts | 7 +- .../public/open_editor.tsx | 11 +- .../index_pattern_editor/public/plugin.ts | 9 ++ .../components/rollup_prompt/index.ts | 0 .../rollup_prompt/rollup_prompt.tsx | 0 .../public/service/creation/config.ts | 4 +- .../public/service/creation/index.ts | 0 .../public/service/creation/manager.ts | 0 .../creation/rollup_creation_config.js | 32 +++-- .../public/service/index.ts | 1 - .../index_pattern_management_service.ts | 4 - .../public/shared_imports.ts | 1 + .../index_pattern_editor/public/types.ts | 63 ++++++++- .../edit_index_pattern/edit_index_pattern.tsx | 11 +- .../edit_index_pattern/tabs/tabs.tsx | 21 ++- .../edit_index_pattern/tabs/utils.ts | 10 +- .../index_pattern_table.tsx | 24 +--- .../public/components/utils.test.ts | 9 +- .../public/components/utils.ts | 81 ++++++++++- .../mount_management_section.tsx | 3 +- .../index_pattern_management/public/mocks.ts | 1 - .../index_pattern_management/public/plugin.ts | 27 ++-- .../public/service/list/config.ts | 49 ------- .../public/service/list/index.ts | 12 -- .../public/service/list/manager.ts | 60 --------- .../public/service/list/rollup_list_config.js | 64 --------- .../index_pattern_management/public/types.ts | 2 + 35 files changed, 409 insertions(+), 389 deletions(-) create mode 100644 src/plugins/index_pattern_editor/public/components/form_fields/title_field.tsx create mode 100644 src/plugins/index_pattern_editor/public/components/form_fields/type_field.tsx rename src/plugins/{index_pattern_management => index_pattern_editor}/public/service/creation/components/rollup_prompt/index.ts (100%) rename src/plugins/{index_pattern_management => index_pattern_editor}/public/service/creation/components/rollup_prompt/rollup_prompt.tsx (100%) rename src/plugins/{index_pattern_management => index_pattern_editor}/public/service/creation/config.ts (95%) rename src/plugins/{index_pattern_management => index_pattern_editor}/public/service/creation/index.ts (100%) rename src/plugins/{index_pattern_management => index_pattern_editor}/public/service/creation/manager.ts (100%) rename src/plugins/{index_pattern_management => index_pattern_editor}/public/service/creation/rollup_creation_config.js (98%) rename src/plugins/{index_pattern_management => index_pattern_editor}/public/service/index.ts (90%) rename src/plugins/{index_pattern_management => index_pattern_editor}/public/service/index_pattern_management_service.ts (85%) delete mode 100644 src/plugins/index_pattern_management/public/service/list/config.ts delete mode 100644 src/plugins/index_pattern_management/public/service/list/index.ts delete mode 100644 src/plugins/index_pattern_management/public/service/list/manager.ts delete mode 100644 src/plugins/index_pattern_management/public/service/list/rollup_list_config.js diff --git a/src/plugins/data/common/index_patterns/utils.ts b/src/plugins/data/common/index_patterns/utils.ts index 941ad3c47066b..b350f1f7692a0 100644 --- a/src/plugins/data/common/index_patterns/utils.ts +++ b/src/plugins/data/common/index_patterns/utils.ts @@ -6,8 +6,8 @@ * Side Public License, v 1. */ -import type { IndexPatternSavedObjectAttrs } from './index_patterns'; import type { SavedObjectsClientCommon } from '../types'; +import type { IndexPatternSavedObjectAttrs } from './index_patterns'; /** * Returns an object matching a given title diff --git a/src/plugins/index_pattern_editor/public/components/form_fields/index.ts b/src/plugins/index_pattern_editor/public/components/form_fields/index.ts index 2c74ffba7263d..0d2091c065771 100644 --- a/src/plugins/index_pattern_editor/public/components/form_fields/index.ts +++ b/src/plugins/index_pattern_editor/public/components/form_fields/index.ts @@ -7,3 +7,5 @@ */ export { TimestampField } from './timestamp_field'; +export { TypeField } from './type_field'; +export { TitleField } from './title_field'; diff --git a/src/plugins/index_pattern_editor/public/components/form_fields/timestamp_field.tsx b/src/plugins/index_pattern_editor/public/components/form_fields/timestamp_field.tsx index 573505a82e23d..400047e1de138 100644 --- a/src/plugins/index_pattern_editor/public/components/form_fields/timestamp_field.tsx +++ b/src/plugins/index_pattern_editor/public/components/form_fields/timestamp_field.tsx @@ -16,11 +16,10 @@ import { UseField } from '../../shared_imports'; import { TimestampOption } from '../index_pattern_editor_flyout_content'; interface Props { - isDisabled?: boolean; options: TimestampOption[]; } -export const TimestampField = ({ isDisabled = false, options = [] }: Props) => { +export const TimestampField = ({ options = [] }: Props) => { const optionsAsComboBoxOptions = options.map(({ display, fieldName }) => ({ label: display, value: fieldName, @@ -54,7 +53,7 @@ export const TimestampField = ({ isDisabled = false, options = [] }: Props) => { setValue(newValue[0].label); }} isClearable={false} - isDisabled={isDisabled} + isDisabled={!optionsAsComboBoxOptions.length} data-test-subj="timestampField" aria-label={i18n.translate('indexPatternEditor.editor.form.typeSelectAriaLabel', { defaultMessage: 'Timestamp field', diff --git a/src/plugins/index_pattern_editor/public/components/form_fields/title_field.tsx b/src/plugins/index_pattern_editor/public/components/form_fields/title_field.tsx new file mode 100644 index 0000000000000..4b445909dd8b6 --- /dev/null +++ b/src/plugins/index_pattern_editor/public/components/form_fields/title_field.tsx @@ -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 React, { ChangeEvent, useState } from 'react'; +import { i18n } from '@kbn/i18n'; +import { EuiFormRow, EuiFieldText } from '@elastic/eui'; +import { UseField, getFieldValidityAndErrorMessage } from '../../shared_imports'; +import { IndexPatternConfig } from '../index_pattern_editor_flyout_content'; +import { canAppendWildcard } from '../../lib'; + +export const TitleField = () => { + const [appendedWildcard, setAppendedWildcard] = useState(false); + + return ( + + path="title" + // config={nameFieldConfig} + componentProps={{ + euiFieldProps: { + 'aria-label': i18n.translate('indexPatternEditor.form.titleAriaLabel', { + defaultMessage: 'Title field', + }), + }, + }} + > + {(field) => { + const { isInvalid, errorMessage } = getFieldValidityAndErrorMessage(field); + return ( + + ) => { + e.persist(); + let query = e.target.value; + if (query.length === 1 && !appendedWildcard && canAppendWildcard(query)) { + query += '*'; + setAppendedWildcard(true); + field.setValue(query); + setTimeout(() => e.target.setSelectionRange(1, 1)); + } else { + if (['', '*'].includes(query) && appendedWildcard) { + query = ''; + setAppendedWildcard(false); + } + field.setValue(query); + } + // todo + // setLastTitle(query); + }} + isLoading={field.isValidating} + fullWidth + data-test-subj="input" + /> + + ); + }} + + ); +}; diff --git a/src/plugins/index_pattern_editor/public/components/form_fields/type_field.tsx b/src/plugins/index_pattern_editor/public/components/form_fields/type_field.tsx new file mode 100644 index 0000000000000..5dda9765f8735 --- /dev/null +++ b/src/plugins/index_pattern_editor/public/components/form_fields/type_field.tsx @@ -0,0 +1,75 @@ +/* + * 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 React from 'react'; +import { i18n } from '@kbn/i18n'; +// @ts-ignore +import { euiColorAccent } from '@elastic/eui/dist/eui_theme_light.json'; +import { FormattedMessage } from '@kbn/i18n/react'; + +import { + EuiFormRow, + EuiSuperSelect, + EuiDescriptionList, + EuiDescriptionListTitle, + EuiDescriptionListDescription, + EuiBadge, +} from '@elastic/eui'; + +import { UseField } from '../../shared_imports'; + +import { IndexPatternConfig } from '../index_pattern_editor_flyout_content'; + +const standardSelectItem = ( + + + Standard + + + + + Description + +); + +export const TypeField = () => { + return ( + path="type"> + {({ label, value, setValue }) => { + if (value === undefined) { + return null; + } + return ( + <> + + { + setValue(newValue); + }} + aria-label={i18n.translate('indexPatternEditor.editor.form.typeSelectAriaLabel', { + defaultMessage: 'Type field', + })} + fullWidth + /> + + + ); + }} + + ); +}; diff --git a/src/plugins/index_pattern_editor/public/components/form_schema.ts b/src/plugins/index_pattern_editor/public/components/form_schema.ts index e4ebcc9bf4cea..0ab5533f52cb7 100644 --- a/src/plugins/index_pattern_editor/public/components/form_schema.ts +++ b/src/plugins/index_pattern_editor/public/components/form_schema.ts @@ -63,13 +63,13 @@ export const schema = { helpText: 'Kibana will provide a unique identifier for each index pattern. If you do not want to use this unique ID, enter a custom one.', }, - /* type: { - label: i18n.translate('indexPatternFieldEditor.editor.form.runtimeTypeLabel', { - defaultMessage: 'Type', + label: i18n.translate('indexPatternEditor.editor.form.TypeLabel', { + defaultMessage: 'Index pattern type', }), - defaultValue: [RUNTIME_FIELD_OPTIONS[0]], + defaultValue: 'default', }, + /* script: { source: { label: i18n.translate('indexPatternFieldEditor.editor.form.defineFieldLabel', { diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx index c27d1942aed23..f18928e9d3eec 100644 --- a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -import React, { useState, useEffect, ChangeEvent } from 'react'; +import React, { useState, useEffect } from 'react'; import { i18n } from '@kbn/i18n'; import { EuiFlyoutHeader, @@ -19,13 +19,7 @@ import { EuiButton, } from '@elastic/eui'; -import { - ensureMinimumTime, - getIndices, - extractTimeFields, - getMatchedIndices, - canAppendWildcard, -} from '../lib'; +import { ensureMinimumTime, getIndices, extractTimeFields, getMatchedIndices } from '../lib'; import { AdvancedParametersSection } from './field_editor/advanced_parameters_section'; import { @@ -47,9 +41,10 @@ import { } from '../types'; import { schema } from './form_schema'; -import { TimestampField } from './form_fields'; +import { TimestampField, TypeField, TitleField } from './form_fields'; import { EmptyState } from './empty_state'; import { EmptyIndexPatternPrompt } from './empty_index_pattern_prompt'; +import { IndexPatternCreationConfig } from '../service'; export interface Props { /** @@ -71,6 +66,7 @@ export interface IndexPatternConfig { timestampField?: string; // TimestampOption; allowHidden: boolean; id?: string; + type: string; } export interface TimestampOption { display: string; @@ -95,7 +91,7 @@ const geti18nTexts = () => { const IndexPatternEditorFlyoutContentComponent = ({ onSave, onCancel, isSaving }: Props) => { const { - services: { http, indexPatternService }, + services: { http, indexPatternService, uiSettings, indexPatternCreateService }, } = useKibana(); const i18nTexts = geti18nTexts(); @@ -105,7 +101,7 @@ const IndexPatternEditorFlyoutContentComponent = ({ onSave, onCancel, isSaving } schema, }); - const [{ title, allowHidden }] = useFormData({ form }); + const [{ title, allowHidden, type }] = useFormData({ form }); const [isLoadingSources, setIsLoadingSources] = useState(true); const [formState, setFormState] = useState<{ isSubmitted: boolean; isValid: boolean }>({ @@ -125,8 +121,12 @@ const IndexPatternEditorFlyoutContentComponent = ({ onSave, onCancel, isSaving } const [remoteClustersExist, setRemoteClustersExist] = useState(false); const [isLoadingIndexPatterns, setIsLoadingIndexPatterns] = useState(true); const [goToForm, setGoToForm] = useState(false); - const [appendedWildcard, setAppendedWildcard] = useState(false); + // const [indexPatterns, setIndexPatterns] = useState([]); + const [ + indexPatternCreationType, + setIndexPatternCreationType, + ] = useState(indexPatternCreateService.creation.getType('default')); const [existingIndexPatterns, setExistingIndexPatterns] = useState([]); @@ -180,6 +180,11 @@ const IndexPatternEditorFlyoutContentComponent = ({ onSave, onCancel, isSaving } }, [indexPatternService]); */ + useEffect(() => { + const updatedCreationType = indexPatternCreateService.creation.getType(type); + setIndexPatternCreationType(updatedCreationType); + }, [type, indexPatternCreateService.creation]); + useEffect(() => { const fetchIndices = async (query: string = '') => { if (!query) { @@ -196,7 +201,7 @@ const IndexPatternEditorFlyoutContentComponent = ({ onSave, onCancel, isSaving } if (query?.endsWith('*')) { const exactMatchedQuery = getIndices( http, - (indexName: string) => [], // indexPatternCreationType.getIndexTags(indexName), + (indexName: string) => indexPatternCreationType.getIndexTags(indexName), query, allowHidden ); @@ -205,13 +210,13 @@ const IndexPatternEditorFlyoutContentComponent = ({ onSave, onCancel, isSaving } } else { const exactMatchQuery = getIndices( http, - (indexName: string) => [], // (indexName: string) => indexPatternCreationType.getIndexTags(indexName), + (indexName: string) => indexPatternCreationType.getIndexTags(indexName), query, allowHidden ); const partialMatchQuery = getIndices( http, - (indexName: string) => [], // (indexName: string) => indexPatternCreationType.getIndexTags(indexName), + (indexName: string) => indexPatternCreationType.getIndexTags(indexName), `${query}*`, allowHidden ); @@ -273,15 +278,26 @@ const IndexPatternEditorFlyoutContentComponent = ({ onSave, onCancel, isSaving } setLastTitle(title); fetchIndices(title); - }, [title, existingIndexPatterns, http, indexPatternService, allowHidden, lastTitle]); + }, [ + title, + existingIndexPatterns, + http, + indexPatternService, + allowHidden, + lastTitle, + indexPatternCreationType, + ]); const { isValid } = formState; const onClickSave = async () => { + // todo display result + indexPatternCreationType.checkIndicesForErrors(exactMatchedIndices); const formData = form.getFormData(); await onSave({ title: formData.title, timeFieldName: formData.timestampField, id: formData.id, + ...indexPatternCreationType.getIndexPatternMappings(), }); }; @@ -309,6 +325,20 @@ const IndexPatternEditorFlyoutContentComponent = ({ onSave, onCancel, isSaving } } } + const showIndexPatternTypeSelect = () => + uiSettings.isDeclared('rollups:enableIndexPatterns') && + uiSettings.get('rollups:enableIndexPatterns'); + + const indexPatternTypeSelect = showIndexPatternTypeSelect() ? ( + + + + + + ) : ( + <> + ); + return ( <> @@ -322,80 +352,21 @@ const IndexPatternEditorFlyoutContentComponent = ({ onSave, onCancel, isSaving } possibly break out into own component */}

+ {indexPatternTypeSelect} {/* Name */} - - path="title" - // config={nameFieldConfig} - component={TextField} - data-test-subj="createIndexPatternNameInput" - componentProps={{ - onChange: (e: ChangeEvent) => { - e.persist(); - let query = e.target.value; - if (query.length === 1 && !appendedWildcard && canAppendWildcard(query)) { - query += '*'; - setAppendedWildcard(true); - form.setFieldValue('title', query); - setTimeout(() => e.target.setSelectionRange(1, 1)); - } else { - if (['', '*'].includes(query) && appendedWildcard) { - query = ''; - // this.setState({ appendedWildcard: false }); - setAppendedWildcard(false); - form.setFieldValue('title', query); - } - } - setLastTitle(query); - /* - console.log('changed', e.target.value); - form.setFieldValue('title', e.target.value + '*'); - */ - }, - euiFieldProps: { - 'aria-label': i18n.translate('indexPatternEditor.form.titleAriaLabel', { - defaultMessage: 'Title field', - }), - }, - }} - /> + - {/* disable when no time fields */} - - path="timestampField" - // config={{ options: timestampFields }} - options={timestampFields} - component={TimestampField} - data-test-subj="timestampField" - componentProps={{ - euiFieldProps: { - 'aria-label': i18n.translate('indexPatternEditor.form.timestampAriaLabel', { - defaultMessage: 'Timestamp field', - }), - }, - }} - /> +
{exactMatchedIndices.map((item) => item.name).join(', ')}
- {/* - - hi - {/* } - */} diff --git a/src/plugins/index_pattern_editor/public/constants.ts b/src/plugins/index_pattern_editor/public/constants.ts index 1b2d5dc59b17e..17b9068454139 100644 --- a/src/plugins/index_pattern_editor/public/constants.ts +++ b/src/plugins/index_pattern_editor/public/constants.ts @@ -8,3 +8,4 @@ export const pluginName = 'index_pattern_editor'; export const MAX_NUMBER_OF_MATCHING_INDICES = 6; +export const CONFIG_ROLLUPS = 'rollups:enableIndexPatterns'; diff --git a/src/plugins/index_pattern_editor/public/lib/get_indices.ts b/src/plugins/index_pattern_editor/public/lib/get_indices.ts index 52fbb25c6cc9e..d177bce92be84 100644 --- a/src/plugins/index_pattern_editor/public/lib/get_indices.ts +++ b/src/plugins/index_pattern_editor/public/lib/get_indices.ts @@ -10,7 +10,7 @@ import { sortBy } from 'lodash'; import { HttpStart } from 'kibana/public'; import { i18n } from '@kbn/i18n'; // todo move into this plugin, consider removing all ipm references -// import { IndexPatternCreationConfig } from '../../../index_pattern_management/public'; +import { IndexPatternCreationConfig } from '../service'; import { MatchedItem, ResolveIndexResponse, ResolveIndexResponseItemIndexAttrs } from '../types'; const aliasLabel = i18n.translate('indexPatternEditor.aliasLabel', { defaultMessage: 'Alias' }); @@ -29,7 +29,7 @@ const frozenLabel = i18n.translate('indexPatternEditor.frozenLabel', { export async function getIndices( http: HttpStart, // todo - getIndexTags: () => [], // IndexPatternCreationConfig['getIndexTags'], + getIndexTags: IndexPatternCreationConfig['getIndexTags'], rawPattern: string, showAllIndices: boolean ): Promise { @@ -72,8 +72,7 @@ export async function getIndices( export const responseToItemArray = ( response: ResolveIndexResponse, - // todo - getIndexTags: (a: string) => [] // IndexPatternCreationConfig['getIndexTags'] + getIndexTags: IndexPatternCreationConfig['getIndexTags'] ): MatchedItem[] => { const source: MatchedItem[] = []; diff --git a/src/plugins/index_pattern_editor/public/open_editor.tsx b/src/plugins/index_pattern_editor/public/open_editor.tsx index bca9c3b0a3e07..8f73972c531c6 100644 --- a/src/plugins/index_pattern_editor/public/open_editor.tsx +++ b/src/plugins/index_pattern_editor/public/open_editor.tsx @@ -16,6 +16,7 @@ import { IndexPattern, DataPublicPluginStart, } from './shared_imports'; +import { IndexPatternManagementServiceStart } from './service'; import { CloseEditor, IndexPatternEditorContext } from './types'; import { IndexPatternFlyoutContentContainer } from './components/index_pattern_flyout_content_container'; @@ -27,11 +28,14 @@ export interface OpenEditorOptions { interface Dependencies { core: CoreStart; indexPatternService: DataPublicPluginStart['indexPatterns']; + indexPatternCreateService: IndexPatternManagementServiceStart; } -export const getEditorOpener = ({ core, indexPatternService }: Dependencies) => ( - options: OpenEditorOptions -): CloseEditor => { +export const getEditorOpener = ({ + core, + indexPatternService, + indexPatternCreateService, +}: Dependencies) => (options: OpenEditorOptions): CloseEditor => { const { uiSettings, overlays, docLinks, notifications, http, application } = core; const { Provider: KibanaReactContextProvider, @@ -42,6 +46,7 @@ export const getEditorOpener = ({ core, indexPatternService }: Dependencies) => notifications, application, indexPatternService, + indexPatternCreateService, }); let overlayRef: OverlayRef | null = null; diff --git a/src/plugins/index_pattern_editor/public/plugin.ts b/src/plugins/index_pattern_editor/public/plugin.ts index 4e7d28632f472..de80143d9f8b0 100644 --- a/src/plugins/index_pattern_editor/public/plugin.ts +++ b/src/plugins/index_pattern_editor/public/plugin.ts @@ -10,9 +10,11 @@ import { Plugin, CoreSetup, CoreStart } from 'src/core/public'; import { PluginSetup, PluginStart, SetupPlugins, StartPlugins } from './types'; import { getEditorOpener } from './open_editor'; +import { IndexPatternManagementService } from './service'; export class IndexPatternEditorPlugin implements Plugin { + private readonly indexPatternManagementService = new IndexPatternManagementService(); public setup(core: CoreSetup, plugins: SetupPlugins): PluginSetup { return {}; } @@ -23,16 +25,23 @@ export class IndexPatternEditorPlugin } = core; const { data } = plugins; + const ipMgmtService = this.indexPatternManagementService.start({ + httpClient: core.http, + uiSettings: core.uiSettings, + }); + return { openEditor: getEditorOpener({ core, indexPatternService: data.indexPatterns, + indexPatternCreateService: ipMgmtService, }), userPermissions: { editIndexPattern: () => { return capabilities.management.kibana.indexPatterns; }, }, + indexPatternCreateService: ipMgmtService, }; } diff --git a/src/plugins/index_pattern_management/public/service/creation/components/rollup_prompt/index.ts b/src/plugins/index_pattern_editor/public/service/creation/components/rollup_prompt/index.ts similarity index 100% rename from src/plugins/index_pattern_management/public/service/creation/components/rollup_prompt/index.ts rename to src/plugins/index_pattern_editor/public/service/creation/components/rollup_prompt/index.ts diff --git a/src/plugins/index_pattern_management/public/service/creation/components/rollup_prompt/rollup_prompt.tsx b/src/plugins/index_pattern_editor/public/service/creation/components/rollup_prompt/rollup_prompt.tsx similarity index 100% rename from src/plugins/index_pattern_management/public/service/creation/components/rollup_prompt/rollup_prompt.tsx rename to src/plugins/index_pattern_editor/public/service/creation/components/rollup_prompt/rollup_prompt.tsx diff --git a/src/plugins/index_pattern_management/public/service/creation/config.ts b/src/plugins/index_pattern_editor/public/service/creation/config.ts similarity index 95% rename from src/plugins/index_pattern_management/public/service/creation/config.ts rename to src/plugins/index_pattern_editor/public/service/creation/config.ts index 6d7e3aa9e5ede..cd61ea17b6b4a 100644 --- a/src/plugins/index_pattern_management/public/service/creation/config.ts +++ b/src/plugins/index_pattern_editor/public/service/creation/config.ts @@ -7,7 +7,7 @@ */ import { i18n } from '@kbn/i18n'; -import { MatchedItem } from '../../components/create_index_pattern_wizard/types'; +import { MatchedItem } from '../../types'; const indexPatternTypeName = i18n.translate( 'indexPatternManagement.editIndexPattern.createIndex.defaultTypeName', @@ -90,7 +90,7 @@ export class IndexPatternCreationConfig { return this.showSystemIndices; } - public getIndexTags(indexName: string) { + public getIndexTags(indexName: string): Array<{ key: string; name: string; color: string }> { return []; } diff --git a/src/plugins/index_pattern_management/public/service/creation/index.ts b/src/plugins/index_pattern_editor/public/service/creation/index.ts similarity index 100% rename from src/plugins/index_pattern_management/public/service/creation/index.ts rename to src/plugins/index_pattern_editor/public/service/creation/index.ts diff --git a/src/plugins/index_pattern_management/public/service/creation/manager.ts b/src/plugins/index_pattern_editor/public/service/creation/manager.ts similarity index 100% rename from src/plugins/index_pattern_management/public/service/creation/manager.ts rename to src/plugins/index_pattern_editor/public/service/creation/manager.ts diff --git a/src/plugins/index_pattern_management/public/service/creation/rollup_creation_config.js b/src/plugins/index_pattern_editor/public/service/creation/rollup_creation_config.js similarity index 98% rename from src/plugins/index_pattern_management/public/service/creation/rollup_creation_config.js rename to src/plugins/index_pattern_editor/public/service/creation/rollup_creation_config.js index 2a85dfa01143c..7a7b4b4c723e1 100644 --- a/src/plugins/index_pattern_management/public/service/creation/rollup_creation_config.js +++ b/src/plugins/index_pattern_editor/public/service/creation/rollup_creation_config.js @@ -17,6 +17,7 @@ const rollupIndexPatternTypeName = i18n.translate( { defaultMessage: 'rollup index pattern' } ); +/* const rollupIndexPatternButtonText = i18n.translate( 'indexPatternManagement.editRollupIndexPattern.createIndex.defaultButtonText', { defaultMessage: 'Rollup index pattern' } @@ -26,7 +27,7 @@ const rollupIndexPatternButtonDescription = i18n.translate( 'indexPatternManagement.editRollupIndexPattern.createIndex.defaultButtonDescription', { defaultMessage: 'Perform limited aggregations against summarized data' } ); - +*/ const rollupIndexPatternNoMatchError = i18n.translate( 'indexPatternManagement.editRollupIndexPattern.createIndex.noMatchError', { defaultMessage: 'Rollup index pattern error: must match one rollup index' } @@ -58,6 +59,7 @@ export class RollupIndexPatternCreationConfig extends IndexPatternCreationConfig this.rollupJobs = []; this.rollupIndicesCapabilities = {}; this.rollupIndices = []; + this.setRollupIndices(); } async setRollupIndices() { @@ -76,7 +78,7 @@ export class RollupIndexPatternCreationConfig extends IndexPatternCreationConfig // Silently swallow failure responses such as expired trials } } - + /* async getIndexPatternCreationOption(urlHandler) { await this.setRollupIndices(); return this.rollupIndices && this.rollupIndices.length @@ -91,23 +93,13 @@ export class RollupIndexPatternCreationConfig extends IndexPatternCreationConfig } : null; } + */ isRollupIndex = (indexName) => { return this.rollupIndices.includes(indexName); }; - getIndexTags(indexName) { - return this.isRollupIndex(indexName) - ? [ - { - key: this.type, - name: rollupIndexPatternIndexLabel, - color: 'primary', - }, - ] - : []; - } - + // this is stateful! checkIndicesForErrors = (indices) => { this.rollupIndex = null; @@ -166,4 +158,16 @@ export class RollupIndexPatternCreationConfig extends IndexPatternCreationConfig rollupIndex: this.rollupIndex, }; }; + + getIndexTags(indexName) { + return this.isRollupIndex(indexName) + ? [ + { + key: this.type, + name: rollupIndexPatternIndexLabel, + color: 'primary', + }, + ] + : []; + } } diff --git a/src/plugins/index_pattern_management/public/service/index.ts b/src/plugins/index_pattern_editor/public/service/index.ts similarity index 90% rename from src/plugins/index_pattern_management/public/service/index.ts rename to src/plugins/index_pattern_editor/public/service/index.ts index 8bf09cf544648..11bcfb06495b4 100644 --- a/src/plugins/index_pattern_management/public/service/index.ts +++ b/src/plugins/index_pattern_editor/public/service/index.ts @@ -8,4 +8,3 @@ export * from './index_pattern_management_service'; export { IndexPatternCreationConfig, IndexPatternCreationOption } from './creation'; -export { IndexPatternListConfig } from './list'; diff --git a/src/plugins/index_pattern_management/public/service/index_pattern_management_service.ts b/src/plugins/index_pattern_editor/public/service/index_pattern_management_service.ts similarity index 85% rename from src/plugins/index_pattern_management/public/service/index_pattern_management_service.ts rename to src/plugins/index_pattern_editor/public/service/index_pattern_management_service.ts index 25a36faa1c3e3..229050640e0d7 100644 --- a/src/plugins/index_pattern_management/public/service/index_pattern_management_service.ts +++ b/src/plugins/index_pattern_editor/public/service/index_pattern_management_service.ts @@ -8,7 +8,6 @@ import { HttpStart, CoreStart } from '../../../../core/public'; import { IndexPatternCreationManager } from './creation'; -import { IndexPatternListManager } from './list'; interface StartDependencies { httpClient: HttpStart; @@ -22,11 +21,9 @@ interface StartDependencies { */ export class IndexPatternManagementService { indexPatternCreationManager: IndexPatternCreationManager; - indexPatternListConfig: IndexPatternListManager; constructor() { this.indexPatternCreationManager = new IndexPatternCreationManager(); - this.indexPatternListConfig = new IndexPatternListManager(); } public setup() {} @@ -34,7 +31,6 @@ export class IndexPatternManagementService { public start({ httpClient, uiSettings }: StartDependencies) { return { creation: this.indexPatternCreationManager.start({ httpClient, uiSettings }), - list: this.indexPatternListConfig.start({ uiSettings }), }; } diff --git a/src/plugins/index_pattern_editor/public/shared_imports.ts b/src/plugins/index_pattern_editor/public/shared_imports.ts index dc6e72d4c01c6..73e1942a1c83e 100644 --- a/src/plugins/index_pattern_editor/public/shared_imports.ts +++ b/src/plugins/index_pattern_editor/public/shared_imports.ts @@ -30,6 +30,7 @@ export { FormHook, ValidationFunc, FieldConfig, + getFieldValidityAndErrorMessage, } from '../../es_ui_shared/static/forms/hook_form_lib'; export { fieldValidators } from '../../es_ui_shared/static/forms/helpers'; diff --git a/src/plugins/index_pattern_editor/public/types.ts b/src/plugins/index_pattern_editor/public/types.ts index 74fbbb35410b7..2a7cf6c7a2c90 100644 --- a/src/plugins/index_pattern_editor/public/types.ts +++ b/src/plugins/index_pattern_editor/public/types.ts @@ -16,6 +16,7 @@ import { import { DataPublicPluginStart } from './shared_imports'; import { OpenEditorOptions } from './open_editor'; +import { IndexPatternManagementServiceStart } from './service'; export interface IndexPatternEditorContext { uiSettings: IUiSettingsClient; @@ -24,6 +25,7 @@ export interface IndexPatternEditorContext { notifications: NotificationsStart; application: ApplicationStart; indexPatternService: DataPublicPluginStart['indexPatterns']; + indexPatternCreateService: IndexPatternManagementServiceStart; } // eslint-disable-next-line @typescript-eslint/no-empty-interface @@ -34,6 +36,7 @@ export interface PluginStart { userPermissions: { editIndexPattern: () => boolean; }; + indexPatternCreateService: IndexPatternManagementServiceStart; } // eslint-disable-next-line @typescript-eslint/no-empty-interface @@ -85,13 +88,6 @@ export interface ResolveIndexResponseItemIndex extends ResolveIndexResponseItem data_stream?: string; } -export enum ResolveIndexResponseItemIndexAttrs { - OPEN = 'open', - CLOSED = 'closed', - HIDDEN = 'hidden', - FROZEN = 'frozen', -} - export interface Tag { name: string; key: string; @@ -106,3 +102,56 @@ export interface IndexPatternTableItem { tag?: string[]; sort: string; } + +// copied from index pattern management, needs review +export interface MatchedItem { + name: string; + tags: Tag[]; + item: { + name: string; + backing_indices?: string[]; + timestamp_field?: string; + indices?: string[]; + aliases?: string[]; + attributes?: ResolveIndexResponseItemIndexAttrs[]; + data_stream?: string; + }; +} + +export interface ResolveIndexResponse { + indices?: ResolveIndexResponseItemIndex[]; + aliases?: ResolveIndexResponseItemAlias[]; + data_streams?: ResolveIndexResponseItemDataStream[]; +} + +export interface ResolveIndexResponseItem { + name: string; +} + +export interface ResolveIndexResponseItemDataStream extends ResolveIndexResponseItem { + backing_indices: string[]; + timestamp_field: string; +} + +export interface ResolveIndexResponseItemAlias extends ResolveIndexResponseItem { + indices: string[]; +} + +export interface ResolveIndexResponseItemIndex extends ResolveIndexResponseItem { + aliases?: string[]; + attributes?: ResolveIndexResponseItemIndexAttrs[]; + data_stream?: string; +} + +export enum ResolveIndexResponseItemIndexAttrs { + OPEN = 'open', + CLOSED = 'closed', + HIDDEN = 'hidden', + FROZEN = 'frozen', +} + +export interface Tag { + name: string; + key: string; + color: string; +} 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 6609605da87d1..a8f89b471e4eb 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 @@ -25,6 +25,7 @@ import { useKibana } from '../../../../../plugins/kibana_react/public'; import { IndexPatternManagmentContext } from '../../types'; import { Tabs } from './tabs'; import { IndexHeader } from './index_header'; +import { getTags } from '../utils'; export interface EditIndexPatternProps extends RouteComponentProps { indexPattern: IndexPattern; @@ -57,7 +58,6 @@ export const EditIndexPattern = withRouter( ({ indexPattern, history, location }: EditIndexPatternProps) => { const { uiSettings, - indexPatternManagementStart, overlays, chrome, data, @@ -77,13 +77,8 @@ export const EditIndexPattern = withRouter( }, [indexPattern]); useEffect(() => { - const indexPatternTags = - indexPatternManagementStart.list.getIndexPatternTags( - indexPattern, - indexPattern.id === defaultIndex - ) || []; - setTags(indexPatternTags); - }, [defaultIndex, indexPattern, indexPatternManagementStart.list]); + setTags(getTags(indexPattern, indexPattern.id === defaultIndex)); + }, [defaultIndex, indexPattern]); const setDefaultPattern = useCallback(() => { uiSettings.set('defaultIndex', indexPattern.id); diff --git a/src/plugins/index_pattern_management/public/components/edit_index_pattern/tabs/tabs.tsx b/src/plugins/index_pattern_management/public/components/edit_index_pattern/tabs/tabs.tsx index 4d99bd504cd0f..6594d677884c2 100644 --- a/src/plugins/index_pattern_management/public/components/edit_index_pattern/tabs/tabs.tsx +++ b/src/plugins/index_pattern_management/public/components/edit_index_pattern/tabs/tabs.tsx @@ -35,6 +35,7 @@ import { SourceFiltersTable } from '../source_filters_table'; import { IndexedFieldsTable } from '../indexed_fields_table'; import { ScriptedFieldsTable } from '../scripted_fields_table'; import { getTabs, getPath, convertToEuiSelectOption } from './utils'; +import { getFieldInfo } from '../../utils'; interface TabsProps extends Pick { indexPattern: IndexPattern; @@ -81,7 +82,6 @@ export function Tabs({ }: TabsProps) { const { uiSettings, - indexPatternManagementStart, docLinks, indexPatternFieldEditor, } = useKibana().services; @@ -227,7 +227,7 @@ export function Tabs({ helpers={{ editField: openFieldEditor, deleteField, - getFieldInfo: indexPatternManagementStart.list.getFieldInfo, + getFieldInfo, }} /> )} @@ -280,7 +280,6 @@ export function Tabs({ getFilterSection, history, indexPattern, - indexPatternManagementStart.list.getFieldInfo, indexedFieldTypeFilter, refreshFilters, scriptedFieldLanguageFilter, @@ -293,15 +292,13 @@ export function Tabs({ const euiTabs: EuiTabbedContentTab[] = useMemo( () => - getTabs(indexPattern, fieldFilter, indexPatternManagementStart.list).map( - (tab: Pick) => { - return { - ...tab, - content: getContent(tab.id), - }; - } - ), - [fieldFilter, getContent, indexPattern, indexPatternManagementStart.list] + getTabs(indexPattern, fieldFilter).map((tab: Pick) => { + return { + ...tab, + content: getContent(tab.id), + }; + }), + [fieldFilter, getContent, indexPattern] ); const [selectedTabId, setSelectedTabId] = useState(euiTabs[0].id); diff --git a/src/plugins/index_pattern_management/public/components/edit_index_pattern/tabs/utils.ts b/src/plugins/index_pattern_management/public/components/edit_index_pattern/tabs/utils.ts index afa786b4d71e6..76bb86eb88d9b 100644 --- a/src/plugins/index_pattern_management/public/components/edit_index_pattern/tabs/utils.ts +++ b/src/plugins/index_pattern_management/public/components/edit_index_pattern/tabs/utils.ts @@ -9,8 +9,8 @@ import { Dictionary, countBy, defaults, uniq } from 'lodash'; import { i18n } from '@kbn/i18n'; import { IndexPattern, IndexPatternField } from '../../../../../../plugins/data/public'; -import { IndexPatternManagementStart } from '../../../../../../plugins/index_pattern_management/public'; import { TAB_INDEXED_FIELDS, TAB_SCRIPTED_FIELDS, TAB_SOURCE_FILTERS } from '../constants'; +import { areScriptedFieldsEnabled } from '../../utils'; function filterByName(items: IndexPatternField[], filter: string) { const lowercaseFilter = (filter || '').toLowerCase(); @@ -68,11 +68,7 @@ function getTitle(type: string, filteredCount: Dictionary, totalCount: D return title + count; } -export function getTabs( - indexPattern: IndexPattern, - fieldFilter: string, - indexPatternListProvider: IndexPatternManagementStart['list'] -) { +export function getTabs(indexPattern: IndexPattern, fieldFilter: string) { const totalCount = getCounts(indexPattern.fields.getAll(), indexPattern.getSourceFiltering()); const filteredCount = getCounts( indexPattern.fields.getAll(), @@ -88,7 +84,7 @@ export function getTabs( 'data-test-subj': 'tab-indexedFields', }); - if (indexPatternListProvider.areScriptedFieldsEnabled(indexPattern)) { + if (areScriptedFieldsEnabled(indexPattern)) { tabs.push({ name: getTitle('scripted', filteredCount, totalCount), id: TAB_SCRIPTED_FIELDS, diff --git a/src/plugins/index_pattern_management/public/components/index_pattern_table/index_pattern_table.tsx b/src/plugins/index_pattern_management/public/components/index_pattern_table/index_pattern_table.tsx index 21f8231b189a4..d60a2e7b3095b 100644 --- a/src/plugins/index_pattern_management/public/components/index_pattern_table/index_pattern_table.tsx +++ b/src/plugins/index_pattern_management/public/components/index_pattern_table/index_pattern_table.tsx @@ -21,7 +21,6 @@ import React, { useEffect, useState } from 'react'; import { i18n } from '@kbn/i18n'; import { reactRouterNavigate, useKibana } from '../../../../../plugins/kibana_react/public'; import { IndexPatternManagmentContext } from '../../types'; -import { CreateButton } from '../create_button'; import { IndexPatternCreationOption, IndexPatternTableItem } from '../types'; import { getIndexPatterns } from '../utils'; import { getListBreadcrumbs } from '../breadcrumbs'; @@ -72,6 +71,7 @@ export const IndexPatternTable = ({ http, notifications, application, + indexPatternEditor, } = useKibana().services; const [indexPatterns, setIndexPatterns] = useState([]); const [isLoadingIndexPatterns, setIsLoadingIndexPatterns] = useState(true); @@ -82,7 +82,6 @@ export const IndexPatternTable = ({ (async function () { const gettedIndexPatterns: IndexPatternTableItem[] = await getIndexPatterns( uiSettings.get('defaultIndex'), - indexPatternManagementStart, data.indexPatterns ); setIndexPatterns(gettedIndexPatterns); @@ -141,26 +140,6 @@ export const IndexPatternTable = ({ */ const createButton = canSave ? ( - /* - - indexPatternEditor.openEditor({ - onSave: async () => { - // todo dedup from useEffect code - const gettedIndexPatterns: IndexPatternTableItem[] = await getIndexPatterns( - uiSettings.get('defaultIndex'), - indexPatternManagementStart, - data.indexPatterns - ); - setIsLoadingIndexPatterns(false); - setIndexPatterns(gettedIndexPatterns); - }, - }) - } - > - */ ) : ( diff --git a/src/plugins/index_pattern_management/public/components/utils.test.ts b/src/plugins/index_pattern_management/public/components/utils.test.ts index 15e0a65390f4d..6215a8dd15c4c 100644 --- a/src/plugins/index_pattern_management/public/components/utils.test.ts +++ b/src/plugins/index_pattern_management/public/components/utils.test.ts @@ -7,7 +7,6 @@ */ import { IndexPatternsContract } from 'src/plugins/data/public'; import { getIndexPatterns } from './utils'; -import { mockManagementPlugin } from '../mocks'; const indexPatternContractMock = ({ getIdsWithTitle: jest.fn().mockReturnValue( @@ -25,13 +24,7 @@ const indexPatternContractMock = ({ get: jest.fn().mockReturnValue(Promise.resolve({})), } as unknown) as jest.Mocked; -const mockManagementPluginStart = mockManagementPlugin.createStartContract(); - test('getting index patterns', async () => { - const indexPatterns = await getIndexPatterns( - 'test', - mockManagementPluginStart, - indexPatternContractMock - ); + const indexPatterns = await getIndexPatterns('test', indexPatternContractMock); expect(indexPatterns).toMatchSnapshot(); }); diff --git a/src/plugins/index_pattern_management/public/components/utils.ts b/src/plugins/index_pattern_management/public/components/utils.ts index 68e78199798b4..0eb5544e4a2d8 100644 --- a/src/plugins/index_pattern_management/public/components/utils.ts +++ b/src/plugins/index_pattern_management/public/components/utils.ts @@ -7,11 +7,27 @@ */ import { IndexPatternsContract } from 'src/plugins/data/public'; -import { IndexPatternManagementStart } from '../plugin'; +import { IIndexPattern, IndexPattern, IFieldType } from 'src/plugins/data/public'; +import { SimpleSavedObject } from 'src/core/public'; +import { i18n } from '@kbn/i18n'; + +const defaultIndexPatternListName = i18n.translate( + 'indexPatternManagement.editIndexPattern.list.defaultIndexPatternListName', + { + defaultMessage: 'Default', + } +); + +const isRollup = (indexPattern: IIndexPattern | SimpleSavedObject) => { + return ( + indexPattern.type === 'rollup' || + ((indexPattern as SimpleSavedObject).get && + (indexPattern as SimpleSavedObject).get('type') === 'rollup') + ); +}; export async function getIndexPatterns( defaultIndex: string, - indexPatternManagementStart: IndexPatternManagementStart, indexPatternsService: IndexPatternsContract ) { const existingIndexPatterns = await indexPatternsService.getIdsWithTitle(true); @@ -19,10 +35,7 @@ export async function getIndexPatterns( existingIndexPatterns.map(async ({ id, title }) => { const isDefault = defaultIndex === id; const pattern = await indexPatternsService.get(id); - const tags = (indexPatternManagementStart as IndexPatternManagementStart).list.getIndexPatternTags( - pattern, - isDefault - ); + const tags = getTags(pattern, isDefault); return { id, @@ -49,3 +62,59 @@ export async function getIndexPatterns( }) || [] ); } + +export const getTags = ( + // todo might be able to tighten types + indexPattern: IIndexPattern | SimpleSavedObject, + isDefault: boolean +) => { + const tags = []; + if (isDefault) { + tags.push({ + key: 'default', + name: defaultIndexPatternListName, + }); + } + if (isRollup(indexPattern)) { + tags.push({ + key: 'rollup', + name: 'Rollup', // todo localize + }); + } + return tags; +}; + +export const areScriptedFieldsEnabled = ( + indexPattern: IIndexPattern | SimpleSavedObject +) => { + return !isRollup(indexPattern); +}; + +export const getFieldInfo = (indexPattern: IndexPattern, field: IFieldType) => { + if (!isRollup(indexPattern)) { + return []; + } + + const allAggs = indexPattern.typeMeta && indexPattern.typeMeta.aggs; + const fieldAggs = allAggs && Object.keys(allAggs).filter((agg) => allAggs[agg][field.name]); + + if (!fieldAggs || !fieldAggs.length) { + return []; + } + + return ['Rollup aggregations:'].concat( + fieldAggs.map((aggName) => { + const agg = allAggs![aggName][field.name]; + switch (aggName) { + case 'date_histogram': + return `${aggName} (interval: ${agg.fixed_interval}, ${ + agg.delay ? `delay: ${agg.delay},` : '' + } ${agg.time_zone})`; + case 'histogram': + return `${aggName} (interval: ${agg.fixed_interval})`; + default: + return aggName; + } + }) + ); +}; diff --git a/src/plugins/index_pattern_management/public/management_app/mount_management_section.tsx b/src/plugins/index_pattern_management/public/management_app/mount_management_section.tsx index d9b809646e538..2d079a087500c 100644 --- a/src/plugins/index_pattern_management/public/management_app/mount_management_section.tsx +++ b/src/plugins/index_pattern_management/public/management_app/mount_management_section.tsx @@ -40,7 +40,7 @@ export async function mountManagementSection( ) { const [ { chrome, application, uiSettings, notifications, overlays, http, docLinks }, - { data, indexPatternFieldEditor }, + { data, indexPatternFieldEditor, indexPatternEditor }, indexPatternManagementStart, ] = await getStartServices(); const canSave = Boolean(application.capabilities.indexPatterns.save); @@ -62,6 +62,7 @@ export async function mountManagementSection( indexPatternManagementStart: indexPatternManagementStart as IndexPatternManagementStart, setBreadcrumbs: params.setBreadcrumbs, fieldFormatEditors: indexPatternFieldEditor.fieldFormatEditors, + indexPatternEditor, }; ReactDOM.render( diff --git a/src/plugins/index_pattern_management/public/mocks.ts b/src/plugins/index_pattern_management/public/mocks.ts index 7671a532d1cb8..b709f7af25a3a 100644 --- a/src/plugins/index_pattern_management/public/mocks.ts +++ b/src/plugins/index_pattern_management/public/mocks.ts @@ -27,7 +27,6 @@ const createStartContract = (): IndexPatternManagementStart => ({ getIndexPatternCreationOptions: jest.fn(), } as any, list: { - getIndexPatternTags: jest.fn(), getFieldInfo: jest.fn(), areScriptedFieldsEnabled: jest.fn(), } as any, diff --git a/src/plugins/index_pattern_management/public/plugin.ts b/src/plugins/index_pattern_management/public/plugin.ts index 74d8ae017fc40..9527a04a6b0e2 100644 --- a/src/plugins/index_pattern_management/public/plugin.ts +++ b/src/plugins/index_pattern_management/public/plugin.ts @@ -7,14 +7,9 @@ */ import { i18n } from '@kbn/i18n'; -import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from 'src/core/public'; +import { PluginInitializerContext, CoreSetup, Plugin } from 'src/core/public'; import { DataPublicPluginStart } from 'src/plugins/data/public'; import { UrlForwardingSetup } from '../../url_forwarding/public'; -import { - IndexPatternManagementService, - IndexPatternManagementServiceSetup, - IndexPatternManagementServiceStart, -} from './service'; import { ManagementSetup } from '../../management/public'; import { IndexPatternFieldEditorStart } from '../../index_pattern_field_editor/public'; @@ -31,9 +26,11 @@ export interface IndexPatternManagementStartDependencies { indexPatternEditor: IndexPatternEditorStart; } -export type IndexPatternManagementSetup = IndexPatternManagementServiceSetup; +// eslint-disable-next-line @typescript-eslint/no-empty-interface +export interface IndexPatternManagementSetup {} -export type IndexPatternManagementStart = IndexPatternManagementServiceStart; +// eslint-disable-next-line @typescript-eslint/no-empty-interface +export interface IndexPatternManagementStart {} const sectionsHeader = i18n.translate('indexPatternManagement.indexPattern.sectionsHeader', { defaultMessage: 'Index Patterns', @@ -49,8 +46,6 @@ export class IndexPatternManagementPlugin IndexPatternManagementSetupDependencies, IndexPatternManagementStartDependencies > { - private readonly indexPatternManagementService = new IndexPatternManagementService(); - constructor(initializerContext: PluginInitializerContext) {} public setup( @@ -82,16 +77,12 @@ export class IndexPatternManagementPlugin return mountManagementSection(core.getStartServices, params); }, }); + return {}; } - public start(core: CoreStart, plugins: IndexPatternManagementStartDependencies) { - return this.indexPatternManagementService.start({ - httpClient: core.http, - uiSettings: core.uiSettings, - }); + public start() { + return {}; } - public stop() { - this.indexPatternManagementService.stop(); - } + public stop() {} } diff --git a/src/plugins/index_pattern_management/public/service/list/config.ts b/src/plugins/index_pattern_management/public/service/list/config.ts deleted file mode 100644 index e13f8c1c06241..0000000000000 --- a/src/plugins/index_pattern_management/public/service/list/config.ts +++ /dev/null @@ -1,49 +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 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 { IIndexPattern, IFieldType } from 'src/plugins/data/public'; -import { SimpleSavedObject } from 'src/core/public'; - -export interface IndexPatternTag { - key: string; - name: string; -} - -const defaultIndexPatternListName = i18n.translate( - 'indexPatternManagement.editIndexPattern.list.defaultIndexPatternListName', - { - defaultMessage: 'Default', - } -); - -export class IndexPatternListConfig { - public readonly key = 'default'; - - public getIndexPatternTags( - indexPattern: IIndexPattern | SimpleSavedObject, - isDefault: boolean - ): IndexPatternTag[] { - return isDefault - ? [ - { - key: 'default', - name: defaultIndexPatternListName, - }, - ] - : []; - } - - public getFieldInfo(indexPattern: IIndexPattern, field: IFieldType): string[] { - return []; - } - - public areScriptedFieldsEnabled(indexPattern: IIndexPattern): boolean { - return true; - } -} diff --git a/src/plugins/index_pattern_management/public/service/list/index.ts b/src/plugins/index_pattern_management/public/service/list/index.ts deleted file mode 100644 index 738b807ac7624..0000000000000 --- a/src/plugins/index_pattern_management/public/service/list/index.ts +++ /dev/null @@ -1,12 +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 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 { IndexPatternListConfig } from './config'; -export { IndexPatternListManager } from './manager'; -// @ts-ignore -export { RollupIndexPatternListConfig } from './rollup_list_config'; diff --git a/src/plugins/index_pattern_management/public/service/list/manager.ts b/src/plugins/index_pattern_management/public/service/list/manager.ts deleted file mode 100644 index bdb2d47057f1f..0000000000000 --- a/src/plugins/index_pattern_management/public/service/list/manager.ts +++ /dev/null @@ -1,60 +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 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 { IIndexPattern, IFieldType } from 'src/plugins/data/public'; -import { SimpleSavedObject } from 'src/core/public'; -import { once } from 'lodash'; -import { CoreStart } from '../../../../../core/public'; -import { IndexPatternListConfig, IndexPatternTag } from './config'; -import { CONFIG_ROLLUPS } from '../../constants'; -// @ts-ignore -import { RollupIndexPatternListConfig } from './rollup_list_config'; - -interface IndexPatternListManagerStart { - uiSettings: CoreStart['uiSettings']; -} - -export class IndexPatternListManager { - start({ uiSettings }: IndexPatternListManagerStart) { - const getConfigs = once(() => { - const configs: IndexPatternListConfig[] = []; - configs.push(new IndexPatternListConfig()); - - if (uiSettings.isDeclared(CONFIG_ROLLUPS) && uiSettings.get(CONFIG_ROLLUPS)) { - configs.push(new RollupIndexPatternListConfig()); - } - - return configs; - }); - return { - getIndexPatternTags: ( - indexPattern: IIndexPattern | SimpleSavedObject, - isDefault: boolean - ) => - getConfigs().reduce( - (tags: IndexPatternTag[], config) => - config.getIndexPatternTags - ? tags.concat(config.getIndexPatternTags(indexPattern, isDefault)) - : tags, - [] - ), - - getFieldInfo: (indexPattern: IIndexPattern, field: IFieldType): string[] => - getConfigs().reduce( - (info: string[], config) => - config.getFieldInfo ? info.concat(config.getFieldInfo(indexPattern, field)) : info, - [] - ), - - areScriptedFieldsEnabled: (indexPattern: IIndexPattern): boolean => - getConfigs().every((config) => - config.areScriptedFieldsEnabled ? config.areScriptedFieldsEnabled(indexPattern) : true - ), - }; - } -} diff --git a/src/plugins/index_pattern_management/public/service/list/rollup_list_config.js b/src/plugins/index_pattern_management/public/service/list/rollup_list_config.js deleted file mode 100644 index 9a80d5fd0d622..0000000000000 --- a/src/plugins/index_pattern_management/public/service/list/rollup_list_config.js +++ /dev/null @@ -1,64 +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 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 { IndexPatternListConfig } from '.'; - -function isRollup(indexPattern) { - return ( - indexPattern.type === 'rollup' || (indexPattern.get && indexPattern.get('type') === 'rollup') - ); -} - -export class RollupIndexPatternListConfig extends IndexPatternListConfig { - key = 'rollup'; - - getIndexPatternTags = (indexPattern) => { - return isRollup(indexPattern) - ? [ - { - key: 'rollup', - name: 'Rollup', - }, - ] - : []; - }; - - getFieldInfo = (indexPattern, field) => { - if (!isRollup(indexPattern)) { - return []; - } - - const allAggs = indexPattern.typeMeta && indexPattern.typeMeta.aggs; - const fieldAggs = allAggs && Object.keys(allAggs).filter((agg) => allAggs[agg][field]); - - if (!fieldAggs || !fieldAggs.length) { - return []; - } - - return ['Rollup aggregations:'].concat( - fieldAggs.map((aggName) => { - const agg = allAggs[aggName][field]; - switch (aggName) { - case 'date_histogram': - return `${aggName} (interval: ${agg.interval}, ${ - agg.delay ? `delay: ${agg.delay},` : '' - } ${agg.time_zone})`; - break; - case 'histogram': - return `${aggName} (interval: ${agg.interval})`; - default: - return aggName; - } - }) - ); - }; - - areScriptedFieldsEnabled = (indexPattern) => { - return !isRollup(indexPattern); - }; -} diff --git a/src/plugins/index_pattern_management/public/types.ts b/src/plugins/index_pattern_management/public/types.ts index a61eeb99b25a5..21eb1f7cda4c3 100644 --- a/src/plugins/index_pattern_management/public/types.ts +++ b/src/plugins/index_pattern_management/public/types.ts @@ -20,6 +20,7 @@ import { ManagementAppMountParams } from '../../management/public'; import { IndexPatternManagementStart } from './index'; import { KibanaReactContextValue } from '../../kibana_react/public'; import { IndexPatternFieldEditorStart } from '../../index_pattern_field_editor/public'; +import { IndexPatternEditorStart } from '../../index_pattern_editor/public'; export interface IndexPatternManagmentContext { chrome: ChromeStart; @@ -34,6 +35,7 @@ export interface IndexPatternManagmentContext { indexPatternManagementStart: IndexPatternManagementStart; setBreadcrumbs: ManagementAppMountParams['setBreadcrumbs']; fieldFormatEditors: IndexPatternFieldEditorStart['fieldFormatEditors']; + indexPatternEditor: IndexPatternEditorStart; } export type IndexPatternManagmentContextValue = KibanaReactContextValue; From da3dc667bec8b2ad2d9ed4c8e08367610546f995 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Sat, 19 Jun 2021 23:47:48 -0500 Subject: [PATCH 024/130] remove unused export --- src/plugins/index_pattern_management/public/index.ts | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/plugins/index_pattern_management/public/index.ts b/src/plugins/index_pattern_management/public/index.ts index 726c055d1b8c3..45a2f0b5a468b 100644 --- a/src/plugins/index_pattern_management/public/index.ts +++ b/src/plugins/index_pattern_management/public/index.ts @@ -24,9 +24,3 @@ export { IndexPatternManagementSetup, IndexPatternManagementStart } from './plug export function plugin(initializerContext: PluginInitializerContext) { return new IndexPatternManagementPlugin(initializerContext); } - -export { - IndexPatternCreationConfig, - IndexPatternCreationOption, - IndexPatternListConfig, -} from './service'; From dc567f7be5926679be5e65ff089b6072bceb5344 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Sun, 20 Jun 2021 10:15:18 -0500 Subject: [PATCH 025/130] fix functional test, cleanup --- src/plugins/data/common/index_patterns/utils.ts | 2 +- .../public/components/form_fields/title_field.tsx | 2 +- .../index_pattern_editor_flyout_content.tsx | 13 ++++++++++--- test/functional/page_objects/settings_page.ts | 3 +-- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/plugins/data/common/index_patterns/utils.ts b/src/plugins/data/common/index_patterns/utils.ts index b350f1f7692a0..941ad3c47066b 100644 --- a/src/plugins/data/common/index_patterns/utils.ts +++ b/src/plugins/data/common/index_patterns/utils.ts @@ -6,8 +6,8 @@ * Side Public License, v 1. */ -import type { SavedObjectsClientCommon } from '../types'; import type { IndexPatternSavedObjectAttrs } from './index_patterns'; +import type { SavedObjectsClientCommon } from '../types'; /** * Returns an object matching a given title diff --git a/src/plugins/index_pattern_editor/public/components/form_fields/title_field.tsx b/src/plugins/index_pattern_editor/public/components/form_fields/title_field.tsx index 4b445909dd8b6..559d18751fc8a 100644 --- a/src/plugins/index_pattern_editor/public/components/form_fields/title_field.tsx +++ b/src/plugins/index_pattern_editor/public/components/form_fields/title_field.tsx @@ -62,7 +62,7 @@ export const TitleField = () => { }} isLoading={field.isValidating} fullWidth - data-test-subj="input" + data-test-subj="createIndexPatternNameInput" /> ); diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx index f18928e9d3eec..68a19a1cf7178 100644 --- a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx @@ -183,7 +183,10 @@ const IndexPatternEditorFlyoutContentComponent = ({ onSave, onCancel, isSaving } useEffect(() => { const updatedCreationType = indexPatternCreateService.creation.getType(type); setIndexPatternCreationType(updatedCreationType); - }, [type, indexPatternCreateService.creation]); + if (type === 'rollup') { + form.setFieldValue('allowHidden', false); + } + }, [type, indexPatternCreateService.creation, form]); useEffect(() => { const fetchIndices = async (query: string = '') => { @@ -263,7 +266,7 @@ const IndexPatternEditorFlyoutContentComponent = ({ onSave, onCancel, isSaving } const fields = await ensureMinimumTime( indexPatternService.getFieldsForWildcard({ pattern: query, - // ...getFetchForWildcardOptions(), + ...indexPatternCreationType.getFetchForWildcardOptions(), }) ); const timeFields = extractTimeFields(fields); @@ -425,7 +428,11 @@ const IndexPatternEditorFlyoutContentComponent = ({ onSave, onCancel, isSaving } onClick={onClickSave} data-test-subj="saveIndexPatternButton" fill - disabled={!isValid || !exactMatchedIndices.length} + disabled={ + !isValid || + !exactMatchedIndices.length || + !!indexPatternCreationType.checkIndicesForErrors(exactMatchedIndices) // todo display errors + } // isLoading={isSavingField || isValidating} > {i18nTexts.saveButtonLabel} diff --git a/test/functional/page_objects/settings_page.ts b/test/functional/page_objects/settings_page.ts index 7aef2939d5add..e5af1e462ca5d 100644 --- a/test/functional/page_objects/settings_page.ts +++ b/test/functional/page_objects/settings_page.ts @@ -122,8 +122,7 @@ export class SettingsPageObject extends FtrService { } async getIndexPatternField() { - const wrapperElement = await this.testSubjects.find('createIndexPatternNameInput'); - return wrapperElement.findByTestSubject('input'); + return this.testSubjects.find('createIndexPatternNameInput'); } async getTimeFieldNameField() { From e4713e6385535606c696dff824143d9c6e681563 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Sun, 20 Jun 2021 15:01:28 -0500 Subject: [PATCH 026/130] remove unused UI and fix localization --- .../form_fields/timestamp_field.tsx | 9 +- .../public/service/creation/config.ts | 16 +- .../creation/rollup_creation_config.js | 14 +- .../create_button/create_button.tsx | 137 ---- .../public/components/create_button/index.ts | 9 - .../CREATE_INDEX_PATTERN.md | 15 - .../create_index_pattern_wizard.test.tsx.snap | 250 -------- .../header/__snapshots__/header.test.tsx.snap | 499 --------------- .../components/header/header.test.tsx | 71 --- .../components/header/header.tsx | 88 --- .../components/header/index.ts | 9 - .../__snapshots__/loading_state.test.tsx.snap | 39 -- .../components/loading_state/index.ts | 9 - .../loading_state/loading_state.test.tsx | 19 - .../loading_state/loading_state.tsx | 32 - .../step_index_pattern.test.tsx.snap | 58 -- .../header/__snapshots__/header.test.tsx.snap | 221 ------- .../components/header/header.test.tsx | 49 -- .../components/header/header.tsx | 144 ----- .../components/header/index.ts | 9 - .../__snapshots__/indices_list.test.tsx.snap | 585 ------------------ .../components/indices_list/index.ts | 9 - .../indices_list/indices_list.test.tsx | 74 --- .../components/indices_list/indices_list.tsx | 198 ------ .../loading_indices.test.tsx.snap | 35 -- .../components/loading_indices/index.ts | 9 - .../loading_indices/loading_indices.test.tsx | 19 - .../loading_indices/loading_indices.tsx | 37 -- .../status_message.test.tsx.snap | 143 ----- .../components/status_message/index.ts | 9 - .../status_message/status_message.test.tsx | 123 ---- .../status_message/status_message.tsx | 165 ----- .../components/step_index_pattern/index.ts | 9 - .../step_index_pattern.test.tsx | 244 -------- .../step_index_pattern/step_index_pattern.tsx | 367 ----------- .../step_time_field.test.tsx.snap | 364 ----------- .../action_buttons/action_buttons.tsx | 47 -- .../components/action_buttons/index.ts | 9 - .../advanced_options.test.tsx.snap | 69 --- .../advanced_options.test.tsx | 39 -- .../advanced_options/advanced_options.tsx | 80 --- .../components/advanced_options/index.ts | 9 - .../header/__snapshots__/header.test.tsx.snap | 34 - .../components/header/header.test.tsx | 19 - .../components/header/header.tsx | 42 -- .../components/header/index.ts | 9 - .../__snapshots__/time_field.test.tsx.snap | 188 ------ .../components/time_field/index.ts | 9 - .../components/time_field/time_field.test.tsx | 73 --- .../components/time_field/time_field.tsx | 116 ---- .../components/step_time_field/index.ts | 9 - .../step_time_field/step_time_field.test.tsx | 331 ---------- .../step_time_field/step_time_field.tsx | 262 -------- .../constants/index.ts | 17 - .../create_index_pattern_wizard.test.tsx | 162 ----- .../create_index_pattern_wizard.tsx | 284 --------- .../create_index_pattern_wizard/index.ts | 9 - .../__snapshots__/get_indices.test.ts.snap | 69 --- .../lib/can_append_wildcard.test.ts | 31 - .../lib/can_append_wildcard.ts | 15 - .../lib/contains_illegal_characters.ts | 11 - .../lib/contains_invalid_characters.test.ts | 21 - .../lib/ensure_minimum_time.test.ts | 36 -- .../lib/ensure_minimum_time.ts | 50 -- .../lib/extract_time_fields.test.ts | 32 - .../lib/extract_time_fields.ts | 53 -- .../lib/get_indices.test.ts | 96 --- .../lib/get_indices.ts | 108 ---- .../lib/get_matched_indices.test.ts | 113 ---- .../lib/get_matched_indices.ts | 95 --- .../create_index_pattern_wizard/lib/index.ts | 19 - .../create_index_pattern_wizard/types.ts | 59 -- .../public/components/index.ts | 1 - .../translations/translations/ja-JP.json | 64 -- .../translations/translations/zh-CN.json | 70 --- 75 files changed, 20 insertions(+), 6827 deletions(-) delete mode 100644 src/plugins/index_pattern_management/public/components/create_button/create_button.tsx delete mode 100644 src/plugins/index_pattern_management/public/components/create_button/index.ts delete mode 100644 src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/CREATE_INDEX_PATTERN.md delete mode 100644 src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/__snapshots__/create_index_pattern_wizard.test.tsx.snap delete mode 100644 src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/header/__snapshots__/header.test.tsx.snap delete mode 100644 src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/header/header.test.tsx delete mode 100644 src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/header/header.tsx delete mode 100644 src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/header/index.ts delete mode 100644 src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/loading_state/__snapshots__/loading_state.test.tsx.snap delete mode 100644 src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/loading_state/index.ts delete mode 100644 src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/loading_state/loading_state.test.tsx delete mode 100644 src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/loading_state/loading_state.tsx delete mode 100644 src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/__snapshots__/step_index_pattern.test.tsx.snap delete mode 100644 src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/components/header/__snapshots__/header.test.tsx.snap delete mode 100644 src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/components/header/header.test.tsx delete mode 100644 src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/components/header/header.tsx delete mode 100644 src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/components/header/index.ts delete mode 100644 src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/components/indices_list/__snapshots__/indices_list.test.tsx.snap delete mode 100644 src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/components/indices_list/index.ts delete mode 100644 src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/components/indices_list/indices_list.test.tsx delete mode 100644 src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/components/indices_list/indices_list.tsx delete mode 100644 src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/components/loading_indices/__snapshots__/loading_indices.test.tsx.snap delete mode 100644 src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/components/loading_indices/index.ts delete mode 100644 src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/components/loading_indices/loading_indices.test.tsx delete mode 100644 src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/components/loading_indices/loading_indices.tsx delete mode 100644 src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/components/status_message/__snapshots__/status_message.test.tsx.snap delete mode 100644 src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/components/status_message/index.ts delete mode 100644 src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/components/status_message/status_message.test.tsx delete mode 100644 src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/components/status_message/status_message.tsx delete mode 100644 src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/index.ts delete mode 100644 src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/step_index_pattern.test.tsx delete mode 100644 src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/step_index_pattern.tsx delete mode 100644 src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/__snapshots__/step_time_field.test.tsx.snap delete mode 100644 src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/components/action_buttons/action_buttons.tsx delete mode 100644 src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/components/action_buttons/index.ts delete mode 100644 src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/components/advanced_options/__snapshots__/advanced_options.test.tsx.snap delete mode 100644 src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/components/advanced_options/advanced_options.test.tsx delete mode 100644 src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/components/advanced_options/advanced_options.tsx delete mode 100644 src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/components/advanced_options/index.ts delete mode 100644 src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/components/header/__snapshots__/header.test.tsx.snap delete mode 100644 src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/components/header/header.test.tsx delete mode 100644 src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/components/header/header.tsx delete mode 100644 src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/components/header/index.ts delete mode 100644 src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/components/time_field/__snapshots__/time_field.test.tsx.snap delete mode 100644 src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/components/time_field/index.ts delete mode 100644 src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/components/time_field/time_field.test.tsx delete mode 100644 src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/components/time_field/time_field.tsx delete mode 100644 src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/index.ts delete mode 100644 src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/step_time_field.test.tsx delete mode 100644 src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/step_time_field.tsx delete mode 100644 src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/constants/index.ts delete mode 100644 src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/create_index_pattern_wizard.test.tsx delete mode 100644 src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/create_index_pattern_wizard.tsx delete mode 100644 src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/index.ts delete mode 100644 src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/lib/__snapshots__/get_indices.test.ts.snap delete mode 100644 src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/lib/can_append_wildcard.test.ts delete mode 100644 src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/lib/can_append_wildcard.ts delete mode 100644 src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/lib/contains_illegal_characters.ts delete mode 100644 src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/lib/contains_invalid_characters.test.ts delete mode 100644 src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/lib/ensure_minimum_time.test.ts delete mode 100644 src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/lib/ensure_minimum_time.ts delete mode 100644 src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/lib/extract_time_fields.test.ts delete mode 100644 src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/lib/extract_time_fields.ts delete mode 100644 src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/lib/get_indices.test.ts delete mode 100644 src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/lib/get_indices.ts delete mode 100644 src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/lib/get_matched_indices.test.ts delete mode 100644 src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/lib/get_matched_indices.ts delete mode 100644 src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/lib/index.ts delete mode 100644 src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/types.ts diff --git a/src/plugins/index_pattern_editor/public/components/form_fields/timestamp_field.tsx b/src/plugins/index_pattern_editor/public/components/form_fields/timestamp_field.tsx index 400047e1de138..b11486dffcf8a 100644 --- a/src/plugins/index_pattern_editor/public/components/form_fields/timestamp_field.tsx +++ b/src/plugins/index_pattern_editor/public/components/form_fields/timestamp_field.tsx @@ -55,9 +55,12 @@ export const TimestampField = ({ options = [] }: Props) => { isClearable={false} isDisabled={!optionsAsComboBoxOptions.length} data-test-subj="timestampField" - aria-label={i18n.translate('indexPatternEditor.editor.form.typeSelectAriaLabel', { - defaultMessage: 'Timestamp field', - })} + aria-label={i18n.translate( + 'indexPatternEditor.editor.form.timestampSelectAriaLabel', + { + defaultMessage: 'Timestamp field', + } + )} fullWidth /> diff --git a/src/plugins/index_pattern_editor/public/service/creation/config.ts b/src/plugins/index_pattern_editor/public/service/creation/config.ts index cd61ea17b6b4a..524d8a7e240be 100644 --- a/src/plugins/index_pattern_editor/public/service/creation/config.ts +++ b/src/plugins/index_pattern_editor/public/service/creation/config.ts @@ -9,18 +9,16 @@ import { i18n } from '@kbn/i18n'; import { MatchedItem } from '../../types'; -const indexPatternTypeName = i18n.translate( - 'indexPatternManagement.editIndexPattern.createIndex.defaultTypeName', - { defaultMessage: 'index pattern' } -); +const indexPatternTypeName = i18n.translate('indexPatternEditor.createIndex.defaultTypeName', { + defaultMessage: 'index pattern', +}); -const indexPatternButtonText = i18n.translate( - 'indexPatternManagement.editIndexPattern.createIndex.defaultButtonText', - { defaultMessage: 'Standard index pattern' } -); +const indexPatternButtonText = i18n.translate('indexPatternEditor.createIndex.defaultButtonText', { + defaultMessage: 'Standard index pattern', +}); const indexPatternButtonDescription = i18n.translate( - 'indexPatternManagement.editIndexPattern.createIndex.defaultButtonDescription', + 'indexPatternEditor.createIndex.defaultButtonDescription', { defaultMessage: 'Perform full aggregations against any data' } ); diff --git a/src/plugins/index_pattern_editor/public/service/creation/rollup_creation_config.js b/src/plugins/index_pattern_editor/public/service/creation/rollup_creation_config.js index f8475f6b34371..1c5580f48f3c0 100644 --- a/src/plugins/index_pattern_editor/public/service/creation/rollup_creation_config.js +++ b/src/plugins/index_pattern_editor/public/service/creation/rollup_creation_config.js @@ -10,33 +10,33 @@ import { i18n } from '@kbn/i18n'; import { IndexPatternCreationConfig } from '.'; const rollupIndexPatternTypeName = i18n.translate( - 'indexPatternManagement.editRollupIndexPattern.createIndex.defaultTypeName', + 'indexPatternEditor.rollupIndexPattern.createIndex.defaultTypeName', { defaultMessage: 'rollup index pattern' } ); /* const rollupIndexPatternButtonText = i18n.translate( - 'indexPatternManagement.editRollupIndexPattern.createIndex.defaultButtonText', + 'indexPatternEditor.rollupIndexPattern.createIndex.defaultButtonText', { defaultMessage: 'Rollup index pattern' } ); const rollupIndexPatternButtonDescription = i18n.translate( - 'indexPatternManagement.editRollupIndexPattern.createIndex.defaultButtonDescription', + 'indexPatternEditor.rollupIndexPattern.createIndex.defaultButtonDescription', { defaultMessage: 'Perform limited aggregations against summarized data' } ); */ const rollupIndexPatternNoMatchError = i18n.translate( - 'indexPatternManagement.editRollupIndexPattern.createIndex.noMatchError', + 'indexPatternEditor.rollupIndexPattern.createIndex.noMatchError', { defaultMessage: 'Rollup index pattern error: must match one rollup index' } ); const rollupIndexPatternTooManyMatchesError = i18n.translate( - 'indexPatternManagement.editRollupIndexPattern.createIndex.tooManyMatchesError', + 'indexPatternEditor.rollupIndexPattern.createIndex.tooManyMatchesError', { defaultMessage: 'Rollup index pattern error: can only match one rollup index' } ); const rollupIndexPatternIndexLabel = i18n.translate( - 'indexPatternManagement.editRollupIndexPattern.createIndex.indexLabel', + 'indexPatternEditor.rollupIndexPattern.createIndex.indexLabel', { defaultMessage: 'Rollup' } ); @@ -117,7 +117,7 @@ export class RollupIndexPatternCreationConfig extends IndexPatternCreationConfig if (error) { const errorMessage = i18n.translate( - 'indexPatternManagement.editRollupIndexPattern.createIndex.uncaughtError', + 'indexPatternEditor.rollupIndexPattern.createIndex.uncaughtError', { defaultMessage: 'Rollup index pattern error: {error}', values: { diff --git a/src/plugins/index_pattern_management/public/components/create_button/create_button.tsx b/src/plugins/index_pattern_management/public/components/create_button/create_button.tsx deleted file mode 100644 index 0da250f5cba3b..0000000000000 --- a/src/plugins/index_pattern_management/public/components/create_button/create_button.tsx +++ /dev/null @@ -1,137 +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 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. - */ - -// @ts-ignore -import { euiColorAccent } from '@elastic/eui/dist/eui_theme_light.json'; -import React, { Component, Fragment } from 'react'; - -import { - EuiBadge, - EuiButton, - EuiContextMenuItem, - EuiContextMenuPanel, - EuiDescriptionList, - EuiDescriptionListDescription, - EuiDescriptionListTitle, - EuiPopover, -} from '@elastic/eui'; - -import { FormattedMessage } from '@kbn/i18n/react'; - -interface State { - isPopoverOpen: boolean; -} - -interface Props { - options: Array<{ - text: string; - description?: string; - testSubj?: string; - isBeta?: boolean; - onClick: () => void; - }>; -} - -export class CreateButton extends Component { - public state = { - isPopoverOpen: false, - }; - - public render() { - const { options, children } = this.props; - const { isPopoverOpen } = this.state; - - if (!options || !options.length) { - return null; - } - - if (options.length === 1) { - return ( - - {children} - - ); - } - - const button = ( - - {children} - - ); - - if (options.length > 1) { - return ( - - { - return ( - - - - {option.text} - {option.isBeta ? {this.renderBetaBadge()} : null} - - - {option.description} - - - - ); - })} - /> - - ); - } - } - - private togglePopover = () => { - this.setState({ - isPopoverOpen: !this.state.isPopoverOpen, - }); - }; - - private closePopover = () => { - this.setState({ - isPopoverOpen: false, - }); - }; - - private renderBetaBadge = () => { - return ( - - - - ); - }; -} diff --git a/src/plugins/index_pattern_management/public/components/create_button/index.ts b/src/plugins/index_pattern_management/public/components/create_button/index.ts deleted file mode 100644 index 497096d2fb7bc..0000000000000 --- a/src/plugins/index_pattern_management/public/components/create_button/index.ts +++ /dev/null @@ -1,9 +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 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 { CreateButton } from './create_button'; diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/CREATE_INDEX_PATTERN.md b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/CREATE_INDEX_PATTERN.md deleted file mode 100644 index 6e01bf001691e..0000000000000 --- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/CREATE_INDEX_PATTERN.md +++ /dev/null @@ -1,15 +0,0 @@ -# Create Index Pattern - -This is meant to serve as a guide to this area of code. - -## Bye bye regressions -In order to prevent future regressions, there are a few scenarios -that need to be tested with each change to this area of the code. - -- Cross-cluster search - - Ensure changes work properly in a CCS environment - - A solid CCS environment involves various indices on all nodes including the controlling node. -- Alias support - - Indices are the most common use case, but we also support aliases. -- Time field name - - This needs to be `undefined` if the user does not select one (other areas of Kibana depend on this) \ No newline at end of file diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/__snapshots__/create_index_pattern_wizard.test.tsx.snap b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/__snapshots__/create_index_pattern_wizard.test.tsx.snap deleted file mode 100644 index 38a9e47014416..0000000000000 --- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/__snapshots__/create_index_pattern_wizard.test.tsx.snap +++ /dev/null @@ -1,250 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`CreateIndexPatternWizard defaults to the loading state 1`] = ` - - - - -`; - -exports[`CreateIndexPatternWizard renders index pattern step when there are indices 1`] = ` - -
- - - - -`; - -exports[`CreateIndexPatternWizard renders the empty state when there are no indices 1`] = ` - -
- - - - -`; - -exports[`CreateIndexPatternWizard renders time field step when step is set to 2 1`] = ` - -
- - - - -`; - -exports[`CreateIndexPatternWizard renders when there are no indices but there are remote clusters 1`] = ` - -
- - - - -`; - -exports[`CreateIndexPatternWizard shows system indices even if there are no other indices if the include system indices is toggled 1`] = ` - -
- - - - -`; diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/header/__snapshots__/header.test.tsx.snap b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/header/__snapshots__/header.test.tsx.snap deleted file mode 100644 index ceb5b4f343568..0000000000000 --- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/header/__snapshots__/header.test.tsx.snap +++ /dev/null @@ -1,499 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`Header should render a different name, prompt, and beta tag if provided 1`] = ` -
- Test prompt - - } -> - - Create test index pattern - - - - - - } - > -
- - Create test index pattern - - - - - - } - responsive={true} - > -
- -
- -
- -

- Create test index pattern - - - - Beta - - -

- -
- -
- -
- -
- - -
-

- - multiple - , - "single": - filebeat-4-3-22 - , - "star": - filebeat-* - , - } - } - > - - An index pattern can match a single source, for example, - - - - - filebeat-4-3-22 - - - - - , or - - multiple - - data sources, - - - - - filebeat-* - - - - - . - - -
- - - -

-
- - -
- -
- Test prompt -
-
-
- -
- -
-`; - -exports[`Header should render normally 1`] = ` -
- - Create test index pattern - - } - > -
- - Create test index pattern - - } - responsive={true} - > -
- -
- -
- -

- Create test index pattern -

- -
- -
- -
- -
- - -
-

- - multiple - , - "single": - filebeat-4-3-22 - , - "star": - filebeat-* - , - } - } - > - - An index pattern can match a single source, for example, - - - - - filebeat-4-3-22 - - - - - , or - - multiple - - data sources, - - - - - filebeat-* - - - - - . - - -
- - - -

-
- -
-
- -
- -
-`; - -exports[`Header should render without including system indices 1`] = ` -
- - Create test index pattern - - } - > -
- - Create test index pattern - - } - responsive={true} - > -
- -
- -
- -

- Create test index pattern -

- -
- -
- -
- -
- - -
-

- - multiple - , - "single": - filebeat-4-3-22 - , - "star": - filebeat-* - , - } - } - > - - An index pattern can match a single source, for example, - - - - - filebeat-4-3-22 - - - - - , or - - multiple - - data sources, - - - - - filebeat-* - - - - - . - - -
- - - -

-
- -
-
- -
- -
-`; diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/header/header.test.tsx b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/header/header.test.tsx deleted file mode 100644 index 188fe2fbc02af..0000000000000 --- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/header/header.test.tsx +++ /dev/null @@ -1,71 +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 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 React from 'react'; -import { Header } from '../header'; -import { mount } from 'enzyme'; -import { KibanaContextProvider } from 'src/plugins/kibana_react/public'; -import { mockManagementPlugin } from '../../../../mocks'; -import { DocLinksStart } from 'kibana/public'; - -describe('Header', () => { - const indexPatternName = 'test index pattern'; - const mockedContext = mockManagementPlugin.createIndexPatternManagmentContext(); - const mockedDocLinks = { - links: { - indexPatterns: {}, - }, - } as DocLinksStart; - - it('should render normally', () => { - const component = mount( -
, - { - wrappingComponent: KibanaContextProvider, - wrappingComponentProps: { - services: mockedContext, - }, - } - ); - - expect(component).toMatchSnapshot(); - }); - - it('should render without including system indices', () => { - const component = mount( -
, - { - wrappingComponent: KibanaContextProvider, - wrappingComponentProps: { - services: mockedContext, - }, - } - ); - - expect(component).toMatchSnapshot(); - }); - - it('should render a different name, prompt, and beta tag if provided', () => { - const component = mount( -
Test prompt} - indexPatternName={indexPatternName} - isBeta={true} - docLinks={mockedDocLinks} - />, - { - wrappingComponent: KibanaContextProvider, - wrappingComponentProps: { - services: mockedContext, - }, - } - ); - - expect(component).toMatchSnapshot(); - }); -}); diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/header/header.tsx b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/header/header.tsx deleted file mode 100644 index c708bd3cac33e..0000000000000 --- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/header/header.tsx +++ /dev/null @@ -1,88 +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 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 React from 'react'; - -import { EuiBetaBadge, EuiCode, EuiLink, EuiPageHeader, EuiSpacer, EuiText } from '@elastic/eui'; - -import { i18n } from '@kbn/i18n'; -import { FormattedMessage } from '@kbn/i18n/react'; -import { DocLinksStart } from 'kibana/public'; -import { useKibana } from '../../../../../../../plugins/kibana_react/public'; -import { IndexPatternManagmentContext } from '../../../../types'; - -export const Header = ({ - prompt, - indexPatternName, - isBeta = false, - docLinks, -}: { - prompt?: React.ReactNode; - indexPatternName: string; - isBeta?: boolean; - docLinks: DocLinksStart; -}) => { - const changeTitle = useKibana().services.chrome.docTitle.change; - const createIndexPatternHeader = i18n.translate( - 'indexPatternManagement.createIndexPatternHeader', - { - defaultMessage: 'Create {indexPatternName}', - values: { indexPatternName }, - } - ); - - changeTitle(createIndexPatternHeader); - - return ( - - {createIndexPatternHeader} - {isBeta ? ( - <> - {' '} - - - ) : null} - - } - bottomBorder - > - -

- multiple, - single: filebeat-4-3-22, - star: filebeat-*, - }} - /> -
- - - -

- - {prompt ? ( - <> - - {prompt} - - ) : null} - - ); -}; diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/header/index.ts b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/header/index.ts deleted file mode 100644 index 8f737b3a42613..0000000000000 --- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/header/index.ts +++ /dev/null @@ -1,9 +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 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 { Header } from './header'; diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/loading_state/__snapshots__/loading_state.test.tsx.snap b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/loading_state/__snapshots__/loading_state.test.tsx.snap deleted file mode 100644 index 1e6ac56d437e1..0000000000000 --- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/loading_state/__snapshots__/loading_state.test.tsx.snap +++ /dev/null @@ -1,39 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`LoadingState should render normally 1`] = ` - - - -

- -

- - - - - - -`; diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/loading_state/index.ts b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/loading_state/index.ts deleted file mode 100644 index 6d39f5bacbcaa..0000000000000 --- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/loading_state/index.ts +++ /dev/null @@ -1,9 +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 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 { LoadingState } from './loading_state'; diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/loading_state/loading_state.test.tsx b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/loading_state/loading_state.test.tsx deleted file mode 100644 index ac10848500f63..0000000000000 --- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/loading_state/loading_state.test.tsx +++ /dev/null @@ -1,19 +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 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 React from 'react'; -import { LoadingState } from '../loading_state'; -import { shallow } from 'enzyme'; - -describe('LoadingState', () => { - it('should render normally', () => { - const component = shallow(); - - expect(component).toMatchSnapshot(); - }); -}); diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/loading_state/loading_state.tsx b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/loading_state/loading_state.tsx deleted file mode 100644 index 9cfb9321b3f00..0000000000000 --- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/loading_state/loading_state.tsx +++ /dev/null @@ -1,32 +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 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 React from 'react'; - -import { EuiFlexGroup, EuiFlexItem, EuiLoadingSpinner, EuiTitle } from '@elastic/eui'; - -import { FormattedMessage } from '@kbn/i18n/react'; - -export const LoadingState = () => ( - - - -

- -

- - - - - - - -); diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/__snapshots__/step_index_pattern.test.tsx.snap b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/__snapshots__/step_index_pattern.test.tsx.snap deleted file mode 100644 index 813a0c61c0829..0000000000000 --- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/__snapshots__/step_index_pattern.test.tsx.snap +++ /dev/null @@ -1,58 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`StepIndexPattern renders errors when input is invalid 1`] = ` -Object { - "component":
, |" - data-test-subj="createIndexPatternStep1Header" - errors={ - Array [ - "A name cannot contain spaces or the characters: \\\\, /, ?, \\", <, >, |", - ] - } - goToNextStep={[Function]} - isIncludingSystemIndices={false} - isInputInvalid={true} - isNextStepDisabled={true} - onChangeIncludingSystemIndices={[Function]} - onQueryChanged={[Function]} - query="?" - />, -} -`; - -exports[`StepIndexPattern renders indices which match the initial query 1`] = ` - -`; - -exports[`StepIndexPattern renders matching indices when input is valid 1`] = ` - -`; - -exports[`StepIndexPattern renders the loading state 1`] = ` - -`; diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/components/header/__snapshots__/header.test.tsx.snap b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/components/header/__snapshots__/header.test.tsx.snap deleted file mode 100644 index 851e5cc4c2a76..0000000000000 --- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/components/header/__snapshots__/header.test.tsx.snap +++ /dev/null @@ -1,221 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`Header should mark the input as invalid 1`] = ` -
- -

- -

- - - - - - - - * - , - } - } - /> - - - % - , - } - } - /> - - } - isInvalid={true} - label={ - - } - labelType="label" - > - - - - - - - - - - - - -
-`; - -exports[`Header should render normally 1`] = ` -
- -

- -

- - - - - - - - * - , - } - } - /> - - - % - , - } - } - /> - - } - isInvalid={false} - label={ - - } - labelType="label" - > - - - - - - - - - - - - -
-`; diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/components/header/header.test.tsx b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/components/header/header.test.tsx deleted file mode 100644 index 8c7e43ed57c77..0000000000000 --- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/components/header/header.test.tsx +++ /dev/null @@ -1,49 +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 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 React from 'react'; -import { Header } from '../header'; -import { shallowWithI18nProvider } from '@kbn/test/jest'; - -describe('Header', () => { - it('should render normally', () => { - const component = shallowWithI18nProvider( -
{}} - goToNextStep={() => {}} - isNextStepDisabled={false} - onChangeIncludingSystemIndices={() => {}} - isIncludingSystemIndices={false} - /> - ); - - expect(component).toMatchSnapshot(); - }); - - it('should mark the input as invalid', () => { - const component = shallowWithI18nProvider( -
{}} - goToNextStep={() => {}} - isNextStepDisabled={true} - onChangeIncludingSystemIndices={() => {}} - isIncludingSystemIndices={false} - /> - ); - - expect(component).toMatchSnapshot(); - }); -}); diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/components/header/header.tsx b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/components/header/header.tsx deleted file mode 100644 index 342665b185e79..0000000000000 --- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/components/header/header.tsx +++ /dev/null @@ -1,144 +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 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 React from 'react'; - -import { - EuiTitle, - EuiFlexGroup, - EuiFlexItem, - EuiSpacer, - EuiButton, - EuiForm, - EuiFormRow, - EuiFieldText, - EuiSwitchEvent, - EuiSwitch, -} from '@elastic/eui'; - -import { i18n } from '@kbn/i18n'; -import { FormattedMessage } from '@kbn/i18n/react'; - -interface HeaderProps { - isInputInvalid: boolean; - errors: any; - characterList: string; - query: string; - onQueryChanged: (e: React.ChangeEvent) => void; - goToNextStep: (query: string) => void; - isNextStepDisabled: boolean; - showSystemIndices?: boolean; - onChangeIncludingSystemIndices: (event: EuiSwitchEvent) => void; - isIncludingSystemIndices: boolean; -} - -export const Header: React.FC = ({ - isInputInvalid, - errors, - characterList, - query, - onQueryChanged, - goToNextStep, - isNextStepDisabled, - showSystemIndices = false, - onChangeIncludingSystemIndices, - isIncludingSystemIndices, - ...rest -}) => ( -
- -

- -

- - - - - - - } - isInvalid={isInputInvalid} - error={errors} - helpText={ - <> - * }} - />{' '} - {characterList} }} - /> - - } - > - - - - {showSystemIndices ? ( - - - } - id="checkboxShowSystemIndices" - checked={isIncludingSystemIndices} - onChange={onChangeIncludingSystemIndices} - data-test-subj="showSystemAndHiddenIndices" - /> - - ) : null} - - - - - goToNextStep(query)} - isDisabled={isNextStepDisabled} - data-test-subj="createIndexPatternGoToStep2Button" - > - - - - - -
-); diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/components/header/index.ts b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/components/header/index.ts deleted file mode 100644 index 8f737b3a42613..0000000000000 --- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/components/header/index.ts +++ /dev/null @@ -1,9 +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 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 { Header } from './header'; diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/components/indices_list/__snapshots__/indices_list.test.tsx.snap b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/components/indices_list/__snapshots__/indices_list.test.tsx.snap deleted file mode 100644 index ca41dddf6197e..0000000000000 --- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/components/indices_list/__snapshots__/indices_list.test.tsx.snap +++ /dev/null @@ -1,585 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`IndicesList should change pages 1`] = ` -
- - - - - kibana - - - - - - es - - - - - - - - - - - - } - closePopover={[Function]} - display="inlineBlock" - hasArrow={true} - id="customizablePagination" - isOpen={false} - ownFocus={true} - panelPaddingSize="none" - > - - 5 - , - - 10 - , - - 20 - , - - 50 - , - ] - } - /> - - - -
-`; - -exports[`IndicesList should change per page 1`] = ` -
- - - - - kibana - - - - - - - - - - - - } - closePopover={[Function]} - display="inlineBlock" - hasArrow={true} - id="customizablePagination" - isOpen={false} - ownFocus={true} - panelPaddingSize="none" - > - - 5 - , - - 10 - , - - 20 - , - - 50 - , - ] - } - /> - - - - - - -
-`; - -exports[`IndicesList should highlight the query in the matches 1`] = ` -
- - - - - - - ki - - bana - - - - - - - es - - - - - - - - - - - - } - closePopover={[Function]} - display="inlineBlock" - hasArrow={true} - id="customizablePagination" - isOpen={false} - ownFocus={true} - panelPaddingSize="none" - > - - 5 - , - - 10 - , - - 20 - , - - 50 - , - ] - } - /> - - - -
-`; - -exports[`IndicesList should render normally 1`] = ` -
- - - - - kibana - - - - - - es - - - - - - - - - - - - } - closePopover={[Function]} - display="inlineBlock" - hasArrow={true} - id="customizablePagination" - isOpen={false} - ownFocus={true} - panelPaddingSize="none" - > - - 5 - , - - 10 - , - - 20 - , - - 50 - , - ] - } - /> - - - -
-`; - -exports[`IndicesList updating props should render all new indices 1`] = ` -
- - - - - kibana - - - - - - es - - - - - - kibana - - - - - - es - - - - - - kibana - - - - - - es - - - - - - kibana - - - - - - es - - - - - - kibana - - - - - - es - - - - - - - - - - - - } - closePopover={[Function]} - display="inlineBlock" - hasArrow={true} - id="customizablePagination" - isOpen={false} - ownFocus={true} - panelPaddingSize="none" - > - - 5 - , - - 10 - , - - 20 - , - - 50 - , - ] - } - /> - - - - - - -
-`; diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/components/indices_list/index.ts b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/components/indices_list/index.ts deleted file mode 100644 index ea5ba5486c20e..0000000000000 --- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/components/indices_list/index.ts +++ /dev/null @@ -1,9 +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 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 { IndicesList } from './indices_list'; diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/components/indices_list/indices_list.test.tsx b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/components/indices_list/indices_list.test.tsx deleted file mode 100644 index e9ff29ad73f29..0000000000000 --- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/components/indices_list/indices_list.test.tsx +++ /dev/null @@ -1,74 +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 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 React from 'react'; -import { IndicesList } from '../indices_list'; -import { shallow } from 'enzyme'; -import { MatchedItem } from '../../../../types'; - -const indices = ([ - { name: 'kibana', tags: [] }, - { name: 'es', tags: [] }, -] as unknown) as MatchedItem[]; - -describe('IndicesList', () => { - it('should render normally', () => { - const component = shallow(); - - expect(component).toMatchSnapshot(); - }); - - it('should change pages', () => { - const component = shallow(); - - const instance = component.instance() as IndicesList; - - component.setState({ perPage: 1 }); - instance.onChangePage(1); - component.update(); - - expect(component).toMatchSnapshot(); - }); - - it('should change per page', () => { - const component = shallow(); - - const instance = component.instance() as IndicesList; - instance.onChangePerPage(1); - component.update(); - - expect(component).toMatchSnapshot(); - }); - - it('should highlight the query in the matches', () => { - const component = shallow(); - - expect(component).toMatchSnapshot(); - }); - - describe('updating props', () => { - it('should render all new indices', () => { - const component = shallow(); - - const moreIndices = [ - ...indices, - ...indices, - ...indices, - ...indices, - ...indices, - ...indices, - ...indices, - ...indices, - ]; - - component.setProps({ indices: moreIndices }); - component.update(); - expect(component).toMatchSnapshot(); - }); - }); -}); diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/components/indices_list/indices_list.tsx b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/components/indices_list/indices_list.tsx deleted file mode 100644 index 16c9f7b7e11b1..0000000000000 --- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/components/indices_list/indices_list.tsx +++ /dev/null @@ -1,198 +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 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 React from 'react'; - -import { - EuiBadge, - EuiFlexGroup, - EuiFlexItem, - EuiSpacer, - EuiTable, - EuiTableBody, - EuiTableRow, - EuiTableRowCell, - EuiButtonEmpty, - EuiContextMenuItem, - EuiContextMenuPanel, - EuiPagination, - EuiPopover, -} from '@elastic/eui'; - -import { Pager } from '@elastic/eui'; - -import { FormattedMessage } from '@kbn/i18n/react'; -import { PER_PAGE_INCREMENTS } from '../../../../constants'; -import { MatchedItem, Tag } from '../../../../types'; - -interface IndicesListProps { - indices: MatchedItem[]; - query: string; -} - -interface IndicesListState { - page: number; - perPage: number; - isPerPageControlOpen: boolean; -} - -export class IndicesList extends React.Component { - pager: Pager; - constructor(props: IndicesListProps) { - super(props); - - this.state = { - page: 0, - perPage: PER_PAGE_INCREMENTS[1], - isPerPageControlOpen: false, - }; - - this.pager = new Pager(props.indices.length, this.state.perPage, this.state.page); - } - - UNSAFE_componentWillReceiveProps(nextProps: IndicesListProps) { - if (nextProps.indices.length !== this.props.indices.length) { - this.pager.setTotalItems(nextProps.indices.length); - this.resetPageTo0(); - } - } - - resetPageTo0 = () => this.onChangePage(0); - - onChangePage = (page: number) => { - this.pager.goToPageIndex(page); - this.setState({ page }); - }; - - onChangePerPage = (perPage: number) => { - this.pager.setItemsPerPage(perPage); - this.setState({ perPage }); - this.resetPageTo0(); - this.closePerPageControl(); - }; - - openPerPageControl = () => { - this.setState({ isPerPageControlOpen: true }); - }; - - closePerPageControl = () => { - this.setState({ isPerPageControlOpen: false }); - }; - - renderPagination() { - const { perPage, page, isPerPageControlOpen } = this.state; - - const button = ( - - - - ); - - const items = PER_PAGE_INCREMENTS.map((increment) => { - return ( - this.onChangePerPage(increment)} - > - {increment} - - ); - }); - - const pageCount = this.pager.getTotalPages(); - - const paginationControls = - pageCount > 1 ? ( - - - - ) : null; - - return ( - - - - - - - {paginationControls} - - ); - } - - highlightIndexName(indexName: string, query: string) { - const queryIdx = indexName.indexOf(query); - if (!query || queryIdx === -1) { - return indexName; - } - - const preStr = indexName.substr(0, queryIdx); - const postStr = indexName.substr(queryIdx + query.length); - - return ( - - {preStr} - {query} - {postStr} - - ); - } - - render() { - const { indices, query, ...rest } = this.props; - - const queryWithoutWildcard = query.endsWith('*') ? query.substr(0, query.length - 1) : query; - - const paginatedIndices = indices.slice(this.pager.firstItemIndex, this.pager.lastItemIndex + 1); - const rows = paginatedIndices.map((index, key) => { - return ( - - - {this.highlightIndexName(index.name, queryWithoutWildcard)} - - - {index.tags.map((tag: Tag) => { - return ( - - {tag.name} - - ); - })} - - - ); - }); - - return ( -
- - {rows} - - - {this.renderPagination()} -
- ); - } -} diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/components/loading_indices/__snapshots__/loading_indices.test.tsx.snap b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/components/loading_indices/__snapshots__/loading_indices.test.tsx.snap deleted file mode 100644 index a5517f6d4b616..0000000000000 --- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/components/loading_indices/__snapshots__/loading_indices.test.tsx.snap +++ /dev/null @@ -1,35 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`LoadingIndices should render normally 1`] = ` - - - -

- -

- - - - - - -`; diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/components/loading_indices/index.ts b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/components/loading_indices/index.ts deleted file mode 100644 index fc8b8d8e1e946..0000000000000 --- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/components/loading_indices/index.ts +++ /dev/null @@ -1,9 +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 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 { LoadingIndices } from './loading_indices'; diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/components/loading_indices/loading_indices.test.tsx b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/components/loading_indices/loading_indices.test.tsx deleted file mode 100644 index e2b5b51402060..0000000000000 --- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/components/loading_indices/loading_indices.test.tsx +++ /dev/null @@ -1,19 +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 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 React from 'react'; -import { LoadingIndices } from '../loading_indices'; -import { shallow } from 'enzyme'; - -describe('LoadingIndices', () => { - it('should render normally', () => { - const component = shallow(); - - expect(component).toMatchSnapshot(); - }); -}); diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/components/loading_indices/loading_indices.tsx b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/components/loading_indices/loading_indices.tsx deleted file mode 100644 index eb17027c63a3d..0000000000000 --- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/components/loading_indices/loading_indices.tsx +++ /dev/null @@ -1,37 +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 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 React from 'react'; - -import { EuiFlexGroup, EuiFlexItem, EuiTitle, EuiLoadingSpinner } from '@elastic/eui'; - -import { FormattedMessage } from '@kbn/i18n/react'; - -export const LoadingIndices = ({ ...rest }) => ( - - - -

- -

- - - - - - -); diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/components/status_message/__snapshots__/status_message.test.tsx.snap b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/components/status_message/__snapshots__/status_message.test.tsx.snap deleted file mode 100644 index 44b753c473803..0000000000000 --- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/components/status_message/__snapshots__/status_message.test.tsx.snap +++ /dev/null @@ -1,143 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`StatusMessage should render with exact matches 1`] = ` - -   - - - } -/> -`; - -exports[`StatusMessage should render with no partial matches 1`] = ` - - - - , - } - } - /> - - } -/> -`; - -exports[`StatusMessage should render with partial matches 1`] = ` - - - - , - } - } - /> - - } -/> -`; - -exports[`StatusMessage should render without a query 1`] = ` - - - - } -/> -`; - -exports[`StatusMessage should show that no indices exist 1`] = ` - - - - } -/> -`; - -exports[`StatusMessage should show that system indices exist 1`] = ` - - - - } -/> -`; diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/components/status_message/index.ts b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/components/status_message/index.ts deleted file mode 100644 index 32e8ed40ce8b9..0000000000000 --- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/components/status_message/index.ts +++ /dev/null @@ -1,9 +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 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 { StatusMessage } from './status_message'; diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/components/status_message/status_message.test.tsx b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/components/status_message/status_message.test.tsx deleted file mode 100644 index 6201440d5e7ff..0000000000000 --- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/components/status_message/status_message.test.tsx +++ /dev/null @@ -1,123 +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 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 React from 'react'; -import { StatusMessage } from '../status_message'; -import { shallow } from 'enzyme'; -import { MatchedItem } from '../../../../types'; - -const tagsPartial = { - tags: [], -}; - -const matchedIndices = { - allIndices: ([ - { name: 'kibana', ...tagsPartial }, - { name: 'es', ...tagsPartial }, - ] as unknown) as MatchedItem[], - exactMatchedIndices: [] as MatchedItem[], - partialMatchedIndices: ([{ name: 'kibana', ...tagsPartial }] as unknown) as MatchedItem[], -}; - -describe('StatusMessage', () => { - it('should render without a query', () => { - const component = shallow( - - ); - - expect(component).toMatchSnapshot(); - }); - - it('should render with exact matches', () => { - const localMatchedIndices = { - ...matchedIndices, - exactMatchedIndices: ([{ name: 'kibana', ...tagsPartial }] as unknown) as MatchedItem[], - }; - - const component = shallow( - - ); - - expect(component).toMatchSnapshot(); - }); - - it('should render with partial matches', () => { - const component = shallow( - - ); - - expect(component).toMatchSnapshot(); - }); - - it('should render with no partial matches', () => { - const localMatchedIndices = { - ...matchedIndices, - partialMatchedIndices: [], - }; - - const component = shallow( - - ); - - expect(component).toMatchSnapshot(); - }); - - it('should show that system indices exist', () => { - const component = shallow( - - ); - - expect(component).toMatchSnapshot(); - }); - - it('should show that no indices exist', () => { - const component = shallow( - - ); - - expect(component).toMatchSnapshot(); - }); -}); diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/components/status_message/status_message.tsx b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/components/status_message/status_message.tsx deleted file mode 100644 index 0ab41ed1a5be4..0000000000000 --- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/components/status_message/status_message.tsx +++ /dev/null @@ -1,165 +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 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 React from 'react'; - -import { EuiCallOut } from '@elastic/eui'; -import { EuiIconType } from '@elastic/eui/src/components/icon/icon'; - -import { FormattedMessage } from '@kbn/i18n/react'; -import { MatchedItem } from '../../../../types'; - -interface StatusMessageProps { - matchedIndices: { - allIndices: MatchedItem[]; - exactMatchedIndices: MatchedItem[]; - partialMatchedIndices: MatchedItem[]; - }; - isIncludingSystemIndices: boolean; - query: string; - showSystemIndices: boolean; -} - -export const StatusMessage: React.FC = ({ - matchedIndices: { allIndices = [], exactMatchedIndices = [], partialMatchedIndices = [] }, - isIncludingSystemIndices, - query, - showSystemIndices, -}) => { - let statusIcon: EuiIconType | undefined; - let statusMessage; - let statusColor: 'primary' | 'success' | 'warning' | undefined; - - const allIndicesLength = allIndices.length; - - if (query.length === 0) { - statusIcon = undefined; - statusColor = 'primary'; - - if (allIndicesLength >= 1) { - statusMessage = ( - - - - ); - } else if (!isIncludingSystemIndices && showSystemIndices) { - statusMessage = ( - - - - ); - } else { - statusMessage = ( - - - - ); - } - } else if (exactMatchedIndices.length) { - statusIcon = 'check'; - statusColor = 'success'; - statusMessage = ( - -   - - - ); - } else if (partialMatchedIndices.length) { - statusIcon = undefined; - statusColor = 'primary'; - statusMessage = ( - - - - - ), - }} - /> - - ); - } else { - statusIcon = undefined; - statusColor = 'warning'; - statusMessage = ( - - - - - ), - indicesLength: allIndicesLength, - }} - /> - - ); - } - - return ( - - ); -}; diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/index.ts b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/index.ts deleted file mode 100644 index 3d87a6d7c39dc..0000000000000 --- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/index.ts +++ /dev/null @@ -1,9 +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 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 { StepIndexPattern } from './step_index_pattern'; diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/step_index_pattern.test.tsx b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/step_index_pattern.test.tsx deleted file mode 100644 index 8b4f751a4e3a3..0000000000000 --- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/step_index_pattern.test.tsx +++ /dev/null @@ -1,244 +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 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 React from 'react'; -import { StepIndexPattern, canPreselectTimeField } from './step_index_pattern'; -import { Header } from './components/header'; -import { IndexPatternCreationConfig } from '../../../../../../../plugins/index_pattern_management/public'; -import { mockManagementPlugin } from '../../../../mocks'; -import { createComponentWithContext } from '../../../test_utils'; - -jest.mock('../../lib/ensure_minimum_time', () => ({ - ensureMinimumTime: async (promises: Array>) => - Array.isArray(promises) ? await Promise.all(promises) : await promises, -})); - -const mockIndexPatternCreationType = new IndexPatternCreationConfig({ - type: 'default', - name: 'name', -}); - -jest.mock('../../lib/get_indices', () => ({ - getIndices: ({}, {}, query: string) => { - if (query.startsWith('e')) { - return [{ name: 'es', item: {} }]; - } - - return [{ name: 'kibana', item: {} }]; - }, -})); - -const allIndices = [ - { name: 'kibana', tags: [], item: {} }, - { name: 'es', tags: [], item: {} }, -]; - -const goToNextStep = () => {}; - -const mockContext = mockManagementPlugin.createIndexPatternManagmentContext(); - -mockContext.data.indexPatterns.getTitles = async () => Promise.resolve([]); -mockContext.uiSettings.get.mockReturnValue(''); - -describe('StepIndexPattern', () => { - it('renders the loading state', () => { - const component = createComponentWithContext( - StepIndexPattern, - { - allIndices, - isIncludingSystemIndices: false, - goToNextStep, - indexPatternCreationType: mockIndexPatternCreationType, - }, - mockContext - ); - component.setState({ isLoadingIndices: true }); - expect(component.find('[data-test-subj="createIndexPatternStep1Loading"]')).toMatchSnapshot(); - }); - - it('renders indices which match the initial query', async () => { - const component = createComponentWithContext( - StepIndexPattern, - { - allIndices, - isIncludingSystemIndices: false, - goToNextStep, - indexPatternCreationType: mockIndexPatternCreationType, - initialQuery: 'kibana', - }, - mockContext - ); - - // Ensure all promises resolve - await new Promise((resolve) => process.nextTick(resolve)); - // Ensure the state changes are reflected - await component.update(); - - expect( - component.find('[data-test-subj="createIndexPatternStep1IndicesList"]') - ).toMatchSnapshot(); - }); - - it('renders errors when input is invalid', async () => { - const component = createComponentWithContext( - StepIndexPattern, - { - allIndices, - isIncludingSystemIndices: false, - goToNextStep, - indexPatternCreationType: mockIndexPatternCreationType, - }, - mockContext - ); - const instance = component.instance() as StepIndexPattern; - instance.onQueryChanged({ target: { value: '?' } } as React.ChangeEvent); - - // Ensure all promises resolve - await new Promise((resolve) => process.nextTick(resolve)); - // Ensure the state changes are reflected - component.update(); - expect({ - component: component.find('[data-test-subj="createIndexPatternStep1Header"]'), - }).toMatchSnapshot(); - }); - - it('renders matching indices when input is valid', async () => { - const component = createComponentWithContext( - StepIndexPattern, - { - allIndices, - isIncludingSystemIndices: false, - goToNextStep, - indexPatternCreationType: mockIndexPatternCreationType, - }, - mockContext - ); - const instance = component.instance() as StepIndexPattern; - instance.onQueryChanged({ target: { value: 'k' } } as React.ChangeEvent); - - // Ensure all promises resolve - await new Promise((resolve) => process.nextTick(resolve)); - // Ensure the state changes are reflected - component.update(); - - expect( - component.find('[data-test-subj="createIndexPatternStep1IndicesList"]') - ).toMatchSnapshot(); - }); - - it('appends a wildcard automatically to queries', async () => { - const component = createComponentWithContext( - StepIndexPattern, - { - allIndices, - isIncludingSystemIndices: false, - goToNextStep, - indexPatternCreationType: mockIndexPatternCreationType, - }, - mockContext - ); - const instance = component.instance() as StepIndexPattern; - instance.onQueryChanged({ target: { value: 'k' } } as React.ChangeEvent); - expect(component.state('query')).toBe('k*'); - }); - - it('disables the next step if the index pattern exists', async () => { - const component = createComponentWithContext( - StepIndexPattern, - { - allIndices, - isIncludingSystemIndices: false, - goToNextStep, - indexPatternCreationType: mockIndexPatternCreationType, - }, - mockContext - ); - component.setState({ indexPatternExists: true }); - expect(component.find(Header).prop('isNextStepDisabled')).toBe(true); - }); - - it('ensures the response of the latest request is persisted', async () => { - const component = createComponentWithContext( - StepIndexPattern, - { - allIndices, - isIncludingSystemIndices: false, - goToNextStep, - indexPatternCreationType: mockIndexPatternCreationType, - }, - mockContext - ); - const instance = component.instance() as StepIndexPattern; - instance.onQueryChanged({ target: { value: 'e' } } as React.ChangeEvent); - instance.lastQuery = 'k'; - await new Promise((resolve) => process.nextTick(resolve)); - - // Honesty, the state would match the result of the `k` query but - // it's hard to mock this in tests but if remove our fix - // (the early return if the queries do not match) then this - // equals [{name: 'es'}] - expect(component.state('exactMatchedIndices')).toEqual([]); - - // Ensure it works in the other code flow too (the other early return) - - // Provide `es` so we do not auto append * and enter our other code flow - instance.onQueryChanged({ target: { value: 'es' } } as React.ChangeEvent); - instance.lastQuery = 'k'; - await new Promise((resolve) => process.nextTick(resolve)); - expect(component.state('exactMatchedIndices')).toEqual([]); - }); - - it('it can preselect time field', async () => { - const dataStream1 = { - name: 'data stream 1', - tags: [], - item: { name: 'data stream 1', backing_indices: [], timestamp_field: 'timestamp_field' }, - }; - - const dataStream2 = { - name: 'data stream 2', - tags: [], - item: { name: 'data stream 2', backing_indices: [], timestamp_field: 'timestamp_field' }, - }; - - const differentDataStream = { - name: 'different data stream', - tags: [], - item: { name: 'different data stream 2', backing_indices: [], timestamp_field: 'x' }, - }; - - const index = { - name: 'index', - tags: [], - item: { - name: 'index', - }, - }; - - const alias = { - name: 'alias', - tags: [], - item: { - name: 'alias', - indices: [], - }, - }; - - expect(canPreselectTimeField([index])).toEqual(undefined); - expect(canPreselectTimeField([alias])).toEqual(undefined); - expect(canPreselectTimeField([index, alias, dataStream1])).toEqual(undefined); - - expect(canPreselectTimeField([dataStream1])).toEqual('timestamp_field'); - - expect(canPreselectTimeField([dataStream1, dataStream2])).toEqual('timestamp_field'); - - expect(canPreselectTimeField([dataStream1, dataStream2, differentDataStream])).toEqual( - undefined - ); - }); -}); diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/step_index_pattern.tsx b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/step_index_pattern.tsx deleted file mode 100644 index 052e454041181..0000000000000 --- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_index_pattern/step_index_pattern.tsx +++ /dev/null @@ -1,367 +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 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 React, { Component } from 'react'; -import { EuiSpacer, EuiCallOut, EuiSwitchEvent } from '@elastic/eui'; -import { i18n } from '@kbn/i18n'; -import { FormattedMessage } from '@kbn/i18n/react'; -import { indexPatterns, UI_SETTINGS } from '../../../../../../../plugins/data/public'; -import { - getIndices, - containsIllegalCharacters, - getMatchedIndices, - canAppendWildcard, - ensureMinimumTime, -} from '../../lib'; -import { LoadingIndices } from './components/loading_indices'; -import { StatusMessage } from './components/status_message'; -import { IndicesList } from './components/indices_list'; -import { Header } from './components/header'; -import { context as contextType } from '../../../../../../kibana_react/public'; -import { IndexPatternCreationConfig } from '../../../../../../../plugins/index_pattern_management/public'; -import { MatchedItem } from '../../types'; -import { IndexPatternManagmentContextValue } from '../../../../types'; - -interface StepIndexPatternProps { - allIndices: MatchedItem[]; - indexPatternCreationType: IndexPatternCreationConfig; - goToNextStep: (query: string, timestampField?: string) => void; - initialQuery?: string; - showSystemIndices: boolean; -} - -interface StepIndexPatternState { - partialMatchedIndices: MatchedItem[]; - exactMatchedIndices: MatchedItem[]; - isLoadingIndices: boolean; - existingIndexPatterns: string[]; - indexPatternExists: boolean; - query: string; - appendedWildcard: boolean; - showingIndexPatternQueryErrors: boolean; - indexPatternName: string; - isIncludingSystemIndices: boolean; -} - -export const canPreselectTimeField = (indices: MatchedItem[]) => { - const preselectStatus = indices.reduce( - ( - { canPreselect, timeFieldName }: { canPreselect: boolean; timeFieldName?: string }, - matchedItem - ) => { - const dataStreamItem = matchedItem.item; - const dataStreamTimestampField = dataStreamItem.timestamp_field; - const isDataStream = !!dataStreamItem.timestamp_field; - const timestampFieldMatches = - timeFieldName === undefined || timeFieldName === dataStreamTimestampField; - - return { - canPreselect: canPreselect && isDataStream && timestampFieldMatches, - timeFieldName: dataStreamTimestampField || timeFieldName, - }; - }, - { - canPreselect: true, - timeFieldName: undefined, - } - ); - - return preselectStatus.canPreselect ? preselectStatus.timeFieldName : undefined; -}; - -export class StepIndexPattern extends Component { - static contextType = contextType; - - public readonly context!: IndexPatternManagmentContextValue; - - state = { - partialMatchedIndices: [], - exactMatchedIndices: [], - isLoadingIndices: false, - existingIndexPatterns: [], - indexPatternExists: false, - query: '', - appendedWildcard: false, - showingIndexPatternQueryErrors: false, - indexPatternName: '', - isIncludingSystemIndices: false, - }; - - ILLEGAL_CHARACTERS = [...indexPatterns.ILLEGAL_CHARACTERS]; - - constructor(props: StepIndexPatternProps, context: IndexPatternManagmentContextValue) { - super(props, context); - const { indexPatternCreationType, initialQuery } = this.props; - - this.state.query = - initialQuery || context.services.uiSettings.get(UI_SETTINGS.INDEXPATTERN_PLACEHOLDER); - this.state.indexPatternName = indexPatternCreationType.getIndexPatternName(); - } - - lastQuery = ''; - - async UNSAFE_componentWillMount() { - this.fetchExistingIndexPatterns(); - if (this.state.query) { - this.lastQuery = this.state.query; - this.fetchIndices(this.state.query); - } - } - - fetchExistingIndexPatterns = async () => { - const existingIndexPatterns = await this.context.services.data.indexPatterns.getTitles(); - this.setState({ existingIndexPatterns }); - }; - - fetchIndices = async (query: string) => { - const { indexPatternCreationType } = this.props; - const { existingIndexPatterns } = this.state; - - if ((existingIndexPatterns as string[]).includes(query)) { - this.setState({ indexPatternExists: true }); - return; - } - - this.setState({ isLoadingIndices: true, indexPatternExists: false }); - - if (query.endsWith('*')) { - const exactMatchedIndices = await ensureMinimumTime( - getIndices( - this.context.services.http, - (indexName: string) => indexPatternCreationType.getIndexTags(indexName), - query, - this.state.isIncludingSystemIndices - ) - ); - // If the search changed, discard this state - if (query !== this.lastQuery) { - return; - } - this.setState({ exactMatchedIndices, isLoadingIndices: false }); - return; - } - - const [partialMatchedIndices, exactMatchedIndices] = await ensureMinimumTime([ - getIndices( - this.context.services.http, - (indexName: string) => indexPatternCreationType.getIndexTags(indexName), - `${query}*`, - this.state.isIncludingSystemIndices - ), - getIndices( - this.context.services.http, - (indexName: string) => indexPatternCreationType.getIndexTags(indexName), - query, - this.state.isIncludingSystemIndices - ), - ]); - - // If the search changed, discard this state - if (query !== this.lastQuery) { - return; - } - - this.setState({ - partialMatchedIndices, - exactMatchedIndices, - isLoadingIndices: false, - }); - }; - - onQueryChanged = (e: React.ChangeEvent) => { - const { appendedWildcard } = this.state; - const { target } = e; - - let query = target.value; - if (query.length === 1 && !appendedWildcard && canAppendWildcard(query)) { - query += '*'; - this.setState({ appendedWildcard: true }); - setTimeout(() => target.setSelectionRange(1, 1)); - } else { - if (['', '*'].includes(query) && appendedWildcard) { - query = ''; - this.setState({ appendedWildcard: false }); - } - } - - this.lastQuery = query; - this.setState({ query, showingIndexPatternQueryErrors: !!query.length }); - this.fetchIndices(query); - }; - - renderLoadingState() { - const { isLoadingIndices } = this.state; - - if (!isLoadingIndices) { - return null; - } - - return ( - <> - - - - - ); - } - - renderStatusMessage(matchedIndices: { - allIndices: MatchedItem[]; - exactMatchedIndices: MatchedItem[]; - partialMatchedIndices: MatchedItem[]; - }) { - const { indexPatternCreationType } = this.props; - const { query, isLoadingIndices, indexPatternExists, isIncludingSystemIndices } = this.state; - - if (isLoadingIndices || indexPatternExists) { - return null; - } - - return ( - - ); - } - - renderList({ - visibleIndices, - allIndices, - }: { - visibleIndices: MatchedItem[]; - allIndices: MatchedItem[]; - }) { - const { query, isLoadingIndices, indexPatternExists } = this.state; - - if (isLoadingIndices || indexPatternExists) { - return null; - } - - const indicesToList = query.length ? visibleIndices : allIndices; - return ( - - ); - } - - renderIndexPatternExists() { - const { indexPatternExists, query } = this.state; - - if (!indexPatternExists) { - return null; - } - - return ( - - } - iconType="help" - color="warning" - /> - ); - } - - renderHeader({ exactMatchedIndices: indices }: { exactMatchedIndices: MatchedItem[] }) { - const { goToNextStep, indexPatternCreationType } = this.props; - const { - query, - showingIndexPatternQueryErrors, - indexPatternExists, - indexPatternName, - isIncludingSystemIndices, - } = this.state; - - let containsErrors = false; - const errors = []; - const characterList = this.ILLEGAL_CHARACTERS.slice(0, this.ILLEGAL_CHARACTERS.length - 1).join( - ', ' - ); - - const checkIndices = indexPatternCreationType.checkIndicesForErrors(indices); - - if (!query || !query.length || query === '.' || query === '..') { - // This is an error scenario but do not report an error - containsErrors = true; - } else if (containsIllegalCharacters(query, indexPatterns.ILLEGAL_CHARACTERS)) { - const errorMessage = i18n.translate( - 'indexPatternManagement.createIndexPattern.step.invalidCharactersErrorMessage', - { - defaultMessage: - 'A {indexPatternName} cannot contain spaces or the characters: {characterList}', - values: { characterList, indexPatternName }, - } - ); - - errors.push(errorMessage); - containsErrors = true; - } else if (checkIndices) { - errors.push(...(checkIndices as string[])); - containsErrors = true; - } - - const isInputInvalid = showingIndexPatternQueryErrors && containsErrors && errors.length > 0; - const isNextStepDisabled = containsErrors || indices.length === 0 || indexPatternExists; - - return ( -
goToNextStep(query, canPreselectTimeField(indices))} - isNextStepDisabled={isNextStepDisabled} - onChangeIncludingSystemIndices={this.onChangeIncludingSystemIndices} - isIncludingSystemIndices={isIncludingSystemIndices} - showSystemIndices={this.props.showSystemIndices} - /> - ); - } - - onChangeIncludingSystemIndices = (event: EuiSwitchEvent) => { - this.setState({ isIncludingSystemIndices: event.target.checked }, () => - this.fetchIndices(this.state.query) - ); - }; - - render() { - const { allIndices } = this.props; - const { partialMatchedIndices, exactMatchedIndices, isIncludingSystemIndices } = this.state; - - const matchedIndices = getMatchedIndices( - allIndices, - partialMatchedIndices, - exactMatchedIndices, - isIncludingSystemIndices - ); - - return ( - <> - {this.renderHeader(matchedIndices)} - - {this.renderLoadingState()} - {this.renderIndexPatternExists()} - {this.renderStatusMessage(matchedIndices)} - - {this.renderList(matchedIndices)} - - ); - } -} diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/__snapshots__/step_time_field.test.tsx.snap b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/__snapshots__/step_time_field.test.tsx.snap deleted file mode 100644 index 544e3ba983122..0000000000000 --- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/__snapshots__/step_time_field.test.tsx.snap +++ /dev/null @@ -1,364 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`StepTimeField should disable the action button if an invalid time field is selected 1`] = ` - -`; - -exports[`StepTimeField should enable the action button if the user decides to not select a time field 1`] = ` - -`; - -exports[`StepTimeField should render "Custom index pattern ID already exists" when error is "Conflict" 1`] = ` - -
- - - - - - - } - > -

- -

- - - - -`; - -exports[`StepTimeField should render a loading state when creating the index pattern 1`] = ` - - - -

- -

- - - - - - -`; - -exports[`StepTimeField should render a selected timeField 1`] = ` - -
- - - - - - - -`; - -exports[`StepTimeField should render advanced options 1`] = ` - -
- - - - - - - -`; - -exports[`StepTimeField should render advanced options with an index pattern id 1`] = ` - -
- - - - - - - -`; - -exports[`StepTimeField should render any error message 1`] = ` - -
- - - - - - - } - > -

- foobar -

- - - - -`; - -exports[`StepTimeField should render normally 1`] = ` - -
- - - - - - - -`; - -exports[`StepTimeField should render timeFields 1`] = ` - -
- - - - - - - -`; diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/components/action_buttons/action_buttons.tsx b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/components/action_buttons/action_buttons.tsx deleted file mode 100644 index 1f5b194fc2549..0000000000000 --- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/components/action_buttons/action_buttons.tsx +++ /dev/null @@ -1,47 +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 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 React from 'react'; - -import { EuiFlexGroup, EuiFlexItem, EuiButton, EuiButtonEmpty } from '@elastic/eui'; - -import { FormattedMessage } from '@kbn/i18n/react'; - -export const ActionButtons = ({ - goToPreviousStep, - submittable, - createIndexPattern, -}: { - goToPreviousStep: () => void; - submittable: boolean; - createIndexPattern: () => void; -}) => ( - - - - - - - - - - - - -); diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/components/action_buttons/index.ts b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/components/action_buttons/index.ts deleted file mode 100644 index 56f13b55bc6be..0000000000000 --- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/components/action_buttons/index.ts +++ /dev/null @@ -1,9 +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 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 { ActionButtons } from './action_buttons'; diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/components/advanced_options/__snapshots__/advanced_options.test.tsx.snap b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/components/advanced_options/__snapshots__/advanced_options.test.tsx.snap deleted file mode 100644 index a2d2023ea0601..0000000000000 --- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/components/advanced_options/__snapshots__/advanced_options.test.tsx.snap +++ /dev/null @@ -1,69 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`AdvancedOptions should hide if not showing 1`] = ` -
- - - - -
-`; - -exports[`AdvancedOptions should render normally 1`] = ` -
- - - - - - - } - label={ - - } - labelType="label" - > - - - -
-`; diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/components/advanced_options/advanced_options.test.tsx b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/components/advanced_options/advanced_options.test.tsx deleted file mode 100644 index 0341a760c535f..0000000000000 --- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/components/advanced_options/advanced_options.test.tsx +++ /dev/null @@ -1,39 +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 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 React from 'react'; -import { AdvancedOptions } from '../advanced_options'; -import { shallowWithI18nProvider } from '@kbn/test/jest'; - -describe('AdvancedOptions', () => { - it('should render normally', () => { - const component = shallowWithI18nProvider( - {}} - onChangeIndexPatternId={() => {}} - /> - ); - - expect(component).toMatchSnapshot(); - }); - - it('should hide if not showing', () => { - const component = shallowWithI18nProvider( - {}} - onChangeIndexPatternId={() => {}} - /> - ); - - expect(component).toMatchSnapshot(); - }); -}); diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/components/advanced_options/advanced_options.tsx b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/components/advanced_options/advanced_options.tsx deleted file mode 100644 index 665972c546158..0000000000000 --- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/components/advanced_options/advanced_options.tsx +++ /dev/null @@ -1,80 +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 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 React from 'react'; - -import { EuiForm, EuiFormRow, EuiFieldText, EuiButtonEmpty, EuiSpacer } from '@elastic/eui'; - -import { i18n } from '@kbn/i18n'; -import { FormattedMessage } from '@kbn/i18n/react'; - -interface AdvancedOptionsProps { - isVisible: boolean; - indexPatternId: string; - toggleAdvancedOptions: (e: React.FormEvent) => void; - onChangeIndexPatternId: (e: React.ChangeEvent) => void; -} - -export const AdvancedOptions: React.FC = ({ - isVisible, - indexPatternId, - toggleAdvancedOptions, - onChangeIndexPatternId, -}) => ( -
- - {isVisible ? ( - - ) : ( - - )} - - - {isVisible ? ( - - - } - helpText={ - - } - > - - - - ) : null} -
-); diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/components/advanced_options/index.ts b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/components/advanced_options/index.ts deleted file mode 100644 index 23ebc3a8c3f66..0000000000000 --- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/components/advanced_options/index.ts +++ /dev/null @@ -1,9 +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 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 { AdvancedOptions } from './advanced_options'; diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/components/header/__snapshots__/header.test.tsx.snap b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/components/header/__snapshots__/header.test.tsx.snap deleted file mode 100644 index 9efda4fdac7f9..0000000000000 --- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/components/header/__snapshots__/header.test.tsx.snap +++ /dev/null @@ -1,34 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`Header should render normally 1`] = ` -
- -

- -

- - - - - ki* - , - "indexPatternName": "ki*", - } - } - /> - -
-`; diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/components/header/header.test.tsx b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/components/header/header.test.tsx deleted file mode 100644 index 444e5c49cb497..0000000000000 --- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/components/header/header.test.tsx +++ /dev/null @@ -1,19 +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 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 React from 'react'; -import { Header } from '../header'; -import { shallow } from 'enzyme'; - -describe('Header', () => { - it('should render normally', () => { - const component = shallow(
); - - expect(component).toMatchSnapshot(); - }); -}); diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/components/header/header.tsx b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/components/header/header.tsx deleted file mode 100644 index 41cae957def2b..0000000000000 --- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/components/header/header.tsx +++ /dev/null @@ -1,42 +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 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 React from 'react'; - -import { EuiTitle, EuiSpacer, EuiText } from '@elastic/eui'; - -import { FormattedMessage } from '@kbn/i18n/react'; - -interface HeaderProps { - indexPattern: string; - indexPatternName: string; -} - -export const Header: React.FC = ({ indexPattern, indexPatternName }) => ( -
- -

- -

- - - - {indexPattern}, - indexPatternName, - }} - /> - -
-); diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/components/header/index.ts b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/components/header/index.ts deleted file mode 100644 index 8f737b3a42613..0000000000000 --- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/components/header/index.ts +++ /dev/null @@ -1,9 +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 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 { Header } from './header'; diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/components/time_field/__snapshots__/time_field.test.tsx.snap b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/components/time_field/__snapshots__/time_field.test.tsx.snap deleted file mode 100644 index 73277b1963626..0000000000000 --- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/components/time_field/__snapshots__/time_field.test.tsx.snap +++ /dev/null @@ -1,188 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`TimeField should render a loading state 1`] = ` - - -

- -

- - - - } - labelAppend={ - - } - labelType="label" - > - - - -`; - -exports[`TimeField should render a selected time field 1`] = ` - - -

- -

- - - - } - labelAppend={ - - - - - - } - labelType="label" - > - - - -`; - -exports[`TimeField should render normally 1`] = ` - - -

- -

- - - - } - labelAppend={ - - - - - - } - labelType="label" - > - - - -`; - -exports[`TimeField should render something if hiding time field 1`] = ` - - -

- -

- - -`; diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/components/time_field/index.ts b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/components/time_field/index.ts deleted file mode 100644 index 7dba3ecc1f75f..0000000000000 --- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/components/time_field/index.ts +++ /dev/null @@ -1,9 +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 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 { TimeField } from './time_field'; diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/components/time_field/time_field.test.tsx b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/components/time_field/time_field.test.tsx deleted file mode 100644 index 1f16842f3c89d..0000000000000 --- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/components/time_field/time_field.test.tsx +++ /dev/null @@ -1,73 +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 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 React from 'react'; -import { TimeField } from '../time_field'; -import { shallowWithI18nProvider } from '@kbn/test/jest'; - -describe('TimeField', () => { - it('should render normally', () => { - const component = shallowWithI18nProvider( - {}} - timeFieldOptions={[{ text: '@timestamp', value: '@timestamp' }]} - isLoading={false} - selectedTimeField={''} - onTimeFieldChanged={() => {}} - /> - ); - - expect(component).toMatchSnapshot(); - }); - - it('should render something if hiding time field', () => { - const component = shallowWithI18nProvider( - {}} - timeFieldOptions={[{ text: '@timestamp', value: '@timestamp' }]} - isLoading={false} - selectedTimeField={''} - onTimeFieldChanged={() => {}} - /> - ); - - expect(component).toMatchSnapshot(); - }); - - it('should render a selected time field', () => { - const component = shallowWithI18nProvider( - {}} - timeFieldOptions={[{ text: '@timestamp', value: '@timestamp' }]} - isLoading={false} - selectedTimeField={'@timestamp'} - onTimeFieldChanged={() => {}} - /> - ); - - expect(component).toMatchSnapshot(); - }); - - it('should render a loading state', () => { - const component = shallowWithI18nProvider( - {}} - timeFieldOptions={[{ text: '@timestamp', value: '@timestamp' }]} - isLoading={true} - selectedTimeField={'@timestamp'} - onTimeFieldChanged={() => {}} - /> - ); - - expect(component).toMatchSnapshot(); - }); -}); diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/components/time_field/time_field.tsx b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/components/time_field/time_field.tsx deleted file mode 100644 index 7fac76eb847cd..0000000000000 --- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/components/time_field/time_field.tsx +++ /dev/null @@ -1,116 +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 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 React from 'react'; - -import { - EuiForm, - EuiFormRow, - EuiSpacer, - EuiLink, - EuiSelect, - EuiText, - EuiLoadingSpinner, -} from '@elastic/eui'; - -import { i18n } from '@kbn/i18n'; -import { FormattedMessage } from '@kbn/i18n/react'; - -interface TimeFieldProps { - isVisible: boolean; - fetchTimeFields: () => void; - timeFieldOptions: Array<{ text: string; value?: string }>; - isLoading: boolean; - selectedTimeField?: string; - onTimeFieldChanged: (e: React.ChangeEvent) => void; -} - -export const TimeField: React.FC = ({ - isVisible, - fetchTimeFields, - timeFieldOptions, - isLoading, - selectedTimeField, - onTimeFieldChanged, -}) => ( - - {isVisible ? ( - <> - -

- -

- - - - } - labelAppend={ - isLoading ? ( - - ) : ( - - - - - - ) - } - > - {isLoading ? ( - - ) : ( - - )} - - - ) : ( - -

- -

- - )} - -); diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/index.ts b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/index.ts deleted file mode 100644 index 4591dc5ae83dc..0000000000000 --- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/index.ts +++ /dev/null @@ -1,9 +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 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 { StepTimeField } from './step_time_field'; diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/step_time_field.test.tsx b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/step_time_field.test.tsx deleted file mode 100644 index ac10957d68a47..0000000000000 --- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/step_time_field.test.tsx +++ /dev/null @@ -1,331 +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 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 React from 'react'; -import { IndexPatternCreationConfig } from '../../../../../../../plugins/index_pattern_management/public'; -import { IFieldType } from '../../../../../../../plugins/data/public'; -import { mockManagementPlugin } from '../../../../mocks'; -import { createComponentWithContext } from '../../../test_utils'; - -import { StepTimeField } from '../step_time_field'; - -jest.mock('./components/header', () => ({ Header: 'Header' })); -jest.mock('./components/time_field', () => ({ TimeField: 'TimeField' })); -jest.mock('./components/advanced_options', () => ({ AdvancedOptions: 'AdvancedOptions' })); -jest.mock('./components/action_buttons', () => ({ ActionButtons: 'ActionButtons' })); -jest.mock('./../../lib', () => ({ - extractTimeFields: jest.requireActual('./../../lib').extractTimeFields, - ensureMinimumTime: async (fields: IFieldType) => Promise.resolve(fields), -})); - -const mockIndexPatternCreationType = new IndexPatternCreationConfig({ - type: 'default', - name: 'name', -}); - -const noop = () => {}; -const mockContext = mockManagementPlugin.createIndexPatternManagmentContext(); -const fields = [ - { - name: '@timestamp', - type: 'date', - }, -]; -mockContext.data.indexPatterns = { - create: () => ({}), - getFieldsForWildcard: jest.fn().mockReturnValue(Promise.resolve(fields)), -} as any; - -describe('StepTimeField', () => { - it('should render normally', () => { - const component = createComponentWithContext( - StepTimeField, - { - indexPattern: 'ki*', - goToPreviousStep: noop, - createIndexPattern: noop, - indexPatternCreationType: mockIndexPatternCreationType, - }, - mockContext - ); - - expect(component).toMatchSnapshot(); - }); - - it('should render timeFields', () => { - const component = createComponentWithContext( - StepTimeField, - { - indexPattern: 'ki*', - goToPreviousStep: noop, - createIndexPattern: noop, - indexPatternCreationType: mockIndexPatternCreationType, - }, - mockContext - ); - - component.setState({ - timeFields: [ - { display: '@timestamp', fieldName: '@timestamp' }, - { display: 'name', fieldName: 'name' }, - ], - }); - - expect(component).toMatchSnapshot(); - }); - - it('should render a selected timeField', () => { - const component = createComponentWithContext( - StepTimeField, - { - indexPattern: 'ki*', - goToPreviousStep: noop, - createIndexPattern: noop, - indexPatternCreationType: mockIndexPatternCreationType, - }, - mockContext - ); - - component.setState({ - timeFields: [ - { display: '@timestamp', fieldName: '@timestamp' }, - { display: 'name', fieldName: 'name' }, - ], - selectedTimeField: '@timestamp', - timeFieldSet: true, - }); - - expect(component).toMatchSnapshot(); - }); - - it('should ensure disabled time field options work properly', () => { - const component = createComponentWithContext( - StepTimeField, - { - indexPattern: 'ki*', - goToPreviousStep: noop, - createIndexPattern: noop, - indexPatternCreationType: mockIndexPatternCreationType, - }, - mockContext - ); - - component.setState({ - timeFields: [ - { display: '@timestamp', fieldName: '@timestamp' }, - { display: 'name', fieldName: 'name' }, - ], - }); - - // If the value is undefined, that means the user selected the - // `I don't want to use a Time filter` option - (component.instance() as StepTimeField).onTimeFieldChanged(({ - target: { value: undefined }, - } as unknown) as React.ChangeEvent); - expect(component.state('timeFieldSet')).toBe(true); - - // If the value is an empty string, that means the user selected - // an invalid selection (like the empty selection or the `-----`) - (component.instance() as StepTimeField).onTimeFieldChanged(({ - target: { value: '' }, - } as unknown) as React.ChangeEvent); - expect(component.state('timeFieldSet')).toBe(false); - }); - - it('should disable the action button if an invalid time field is selected', () => { - const component = createComponentWithContext( - StepTimeField, - { - indexPattern: 'ki*', - goToPreviousStep: noop, - createIndexPattern: noop, - indexPatternCreationType: mockIndexPatternCreationType, - }, - mockContext - ); - - component.setState({ - timeFields: [ - { display: '@timestamp', fieldName: '@timestamp' }, - { display: 'name', fieldName: 'name' }, - ], - }); - - (component.instance() as StepTimeField).onTimeFieldChanged(({ - target: { value: '' }, - } as unknown) as React.ChangeEvent); - component.update(); - - expect(component.find('ActionButtons')).toMatchSnapshot(); - }); - - it('should enable the action button if the user decides to not select a time field', () => { - const component = createComponentWithContext( - StepTimeField, - { - indexPattern: 'ki*', - goToPreviousStep: noop, - createIndexPattern: noop, - indexPatternCreationType: mockIndexPatternCreationType, - }, - mockContext - ); - - component.setState({ - timeFields: [ - { display: '@timestamp', fieldName: '@timestamp' }, - { display: 'name', fieldName: 'name' }, - ], - }); - - (component.instance() as StepTimeField).onTimeFieldChanged(({ - target: { value: undefined }, - } as unknown) as React.ChangeEvent); - component.update(); - - expect(component.find('ActionButtons')).toMatchSnapshot(); - }); - - it('should render advanced options', () => { - const component = createComponentWithContext( - StepTimeField, - { - indexPattern: 'ki*', - goToPreviousStep: noop, - createIndexPattern: noop, - indexPatternCreationType: mockIndexPatternCreationType, - }, - mockContext - ); - - component.setState({ showingAdvancedOptions: true }); - - expect(component).toMatchSnapshot(); - }); - - it('should render advanced options with an index pattern id', () => { - const component = createComponentWithContext( - StepTimeField, - { - indexPattern: 'ki*', - goToPreviousStep: noop, - createIndexPattern: noop, - indexPatternCreationType: mockIndexPatternCreationType, - }, - mockContext - ); - - component.setState({ - showingAdvancedOptions: true, - indexPatternId: 'foobar', - }); - - expect(component).toMatchSnapshot(); - }); - - it('should render a loading state when creating the index pattern', () => { - const component = createComponentWithContext( - StepTimeField, - { - indexPattern: 'ki*', - goToPreviousStep: noop, - createIndexPattern: noop, - indexPatternCreationType: mockIndexPatternCreationType, - }, - mockContext - ); - - component.setState({ isCreating: true }); - - expect(component).toMatchSnapshot(); - }); - - it('should render any error message', () => { - const component = createComponentWithContext( - StepTimeField, - { - indexPattern: 'ki*', - goToPreviousStep: noop, - createIndexPattern: noop, - indexPatternCreationType: mockIndexPatternCreationType, - }, - mockContext - ); - - component.setState({ error: 'foobar' }); - - expect(component).toMatchSnapshot(); - }); - - it('should render "Custom index pattern ID already exists" when error is "Conflict"', () => { - const component = createComponentWithContext( - StepTimeField, - { - indexPattern: 'ki*', - goToPreviousStep: noop, - createIndexPattern: noop, - indexPatternCreationType: mockIndexPatternCreationType, - }, - mockContext - ); - - component.setState({ error: 'Conflict' }); - - expect(component).toMatchSnapshot(); - }); - - it('should remember error thrown by createIndexPatter() prop', async () => { - const createIndexPattern = async () => { - throw new Error('foobar'); - }; - const component = createComponentWithContext( - StepTimeField, - { - indexPattern: 'ki*', - goToPreviousStep: noop, - createIndexPattern, - indexPatternCreationType: mockIndexPatternCreationType, - }, - mockContext - ); - - await (component.instance() as StepTimeField).createIndexPattern(); - component.update(); - - expect(component.instance().state).toMatchObject({ - error: 'foobar', - }); - }); - - it('should call createIndexPattern with undefined time field when no time filter chosen', async () => { - const createIndexPattern = jest.fn(); - - const component = createComponentWithContext( - StepTimeField, - { - indexPattern: 'ki*', - goToPreviousStep: noop, - createIndexPattern, - indexPatternCreationType: mockIndexPatternCreationType, - }, - mockContext - ); - - await (component.instance() as StepTimeField).fetchTimeFields(); - - expect((component.state() as any).timeFields).toHaveLength(3); - - (component.instance() as StepTimeField).onTimeFieldChanged(({ - target: { value: undefined }, - } as unknown) as React.ChangeEvent); - - await (component.instance() as StepTimeField).createIndexPattern(); - - expect(createIndexPattern).toHaveBeenCalledWith(undefined, ''); - }); -}); diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/step_time_field.tsx b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/step_time_field.tsx deleted file mode 100644 index f489132946ec7..0000000000000 --- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/step_time_field.tsx +++ /dev/null @@ -1,262 +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 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 React, { Component } from 'react'; -import { - EuiCallOut, - EuiFlexGroup, - EuiFlexItem, - EuiTitle, - EuiSpacer, - EuiLoadingSpinner, - EuiHorizontalRule, -} from '@elastic/eui'; -import { FormattedMessage } from '@kbn/i18n/react'; -import { ensureMinimumTime, extractTimeFields } from '../../lib'; - -import { Header } from './components/header'; -import { TimeField } from './components/time_field'; -import { AdvancedOptions } from './components/advanced_options'; -import { ActionButtons } from './components/action_buttons'; -import { context } from '../../../../../../kibana_react/public'; -import { IndexPatternManagmentContextValue } from '../../../../types'; -import { IndexPatternCreationConfig } from '../../../..'; - -interface StepTimeFieldProps { - indexPattern: string; - goToPreviousStep: () => void; - createIndexPattern: (selectedTimeField: string | undefined, indexPatternId: string) => void; - indexPatternCreationType: IndexPatternCreationConfig; - selectedTimeField?: string; -} - -interface StepTimeFieldState { - error: string; - timeFields: TimeFieldConfig[]; - selectedTimeField?: string; - timeFieldSet: boolean; - isAdvancedOptionsVisible: boolean; - isFetchingTimeFields: boolean; - isCreating: boolean; - indexPatternId: string; - indexPatternType: string; - indexPatternName: string; -} - -interface TimeFieldConfig { - display: string; - fieldName?: string; - isDisabled?: boolean; -} - -export class StepTimeField extends Component { - static contextType = context; - - public readonly context!: IndexPatternManagmentContextValue; - - state: StepTimeFieldState = { - error: '', - timeFields: [], - selectedTimeField: undefined, - timeFieldSet: false, - isAdvancedOptionsVisible: false, - isFetchingTimeFields: false, - isCreating: false, - indexPatternId: '', - indexPatternType: '', - indexPatternName: '', - }; - - constructor(props: StepTimeFieldProps) { - super(props); - this.state.indexPatternType = props.indexPatternCreationType.getIndexPatternType() || ''; - this.state.indexPatternName = props.indexPatternCreationType.getIndexPatternName(); - this.state.selectedTimeField = props.selectedTimeField; - if (props.selectedTimeField) { - this.state.timeFieldSet = true; - } - } - - mounted = false; - - componentDidMount() { - this.mounted = true; - this.fetchTimeFields(); - } - - componentWillUnmount() { - this.mounted = false; - } - - fetchTimeFields = async () => { - const { indexPattern: pattern } = this.props; - const { getFetchForWildcardOptions } = this.props.indexPatternCreationType; - - this.setState({ isFetchingTimeFields: true }); - const fields = await ensureMinimumTime( - this.context.services.data.indexPatterns.getFieldsForWildcard({ - pattern, - ...getFetchForWildcardOptions(), - }) - ); - const timeFields = extractTimeFields(fields); - - this.setState({ timeFields, isFetchingTimeFields: false }); - }; - - onTimeFieldChanged = (e: React.ChangeEvent) => { - const value = e.target.value; - - // Find the time field based on the selected value - const timeField = this.state.timeFields.find( - (timeFld: TimeFieldConfig) => timeFld.fieldName === value - ); - - // If the value is an empty string, it's not a valid selection - const validSelection = value !== ''; - - this.setState({ - selectedTimeField: timeField ? (timeField as TimeFieldConfig).fieldName : undefined, - timeFieldSet: validSelection, - }); - }; - - onChangeIndexPatternId = (e: React.ChangeEvent) => { - this.setState({ indexPatternId: e.target.value }); - }; - - toggleAdvancedOptions = () => { - this.setState((state) => ({ - isAdvancedOptionsVisible: !state.isAdvancedOptionsVisible, - })); - }; - - createIndexPattern = async () => { - const { createIndexPattern } = this.props; - const { selectedTimeField, indexPatternId } = this.state; - this.setState({ isCreating: true }); - try { - await createIndexPattern(selectedTimeField, indexPatternId); - } catch (error) { - if (!this.mounted) return; - this.setState({ - error: error instanceof Error ? error.message : String(error), - isCreating: false, - }); - } - }; - - formatErrorMessage(message: string) { - // `createIndexPattern` throws "Conflict" when index pattern ID already exists. - return message === 'Conflict' ? ( - - ) : ( - message - ); - } - - render() { - const { - timeFields, - selectedTimeField, - timeFieldSet, - isAdvancedOptionsVisible, - indexPatternId, - isCreating, - isFetchingTimeFields, - indexPatternName, - } = this.state; - - if (isCreating) { - return ( - - - -

- -

- - - - - - - - ); - } - - const { indexPattern, goToPreviousStep } = this.props; - - const timeFieldOptions = - timeFields.length > 0 - ? [ - { text: '', value: '' }, - ...timeFields.map((timeField: TimeFieldConfig) => ({ - text: timeField.display, - value: timeField.fieldName, - disabled: ((timeFields as unknown) as TimeFieldConfig).isDisabled, - })), - ] - : []; - - const showTimeField = !timeFields || timeFields.length > 1; - const submittable = !showTimeField || timeFieldSet; - const error = this.state.error ? ( - <> - - } - color="danger" - iconType="cross" - > -

{this.formatErrorMessage(this.state.error)}

- - - - ) : null; - - return ( - <> -
- - - - - - {error} - - - ); - } -} diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/constants/index.ts b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/constants/index.ts deleted file mode 100644 index 8bc64bdaa490f..0000000000000 --- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/constants/index.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 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. - */ - -// This isn't ideal. We want to avoid searching for 20 indices -// then filtering out the majority of them because they are system indices. -// We'd like to filter system indices out in the query -// so if we can accomplish that in the future, this logic can go away -export const ESTIMATED_NUMBER_OF_SYSTEM_INDICES = 100; -export const MAX_NUMBER_OF_MATCHING_INDICES = 100; -export const MAX_SEARCH_SIZE = MAX_NUMBER_OF_MATCHING_INDICES + ESTIMATED_NUMBER_OF_SYSTEM_INDICES; - -export const PER_PAGE_INCREMENTS = [5, 10, 20, 50]; diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/create_index_pattern_wizard.test.tsx b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/create_index_pattern_wizard.test.tsx deleted file mode 100644 index a6c7e71445ae3..0000000000000 --- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/create_index_pattern_wizard.test.tsx +++ /dev/null @@ -1,162 +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 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 { CreateIndexPatternWizard } from './create_index_pattern_wizard'; -import { IndexPattern } from '../../../../../plugins/data/public'; -import { mockManagementPlugin } from '../../mocks'; -import { IndexPatternCreationConfig } from '../../'; -import { createComponentWithContext } from '../test_utils'; - -jest.mock('./components/step_index_pattern', () => ({ StepIndexPattern: 'StepIndexPattern' })); -jest.mock('./components/step_time_field', () => ({ StepTimeField: 'StepTimeField' })); -jest.mock('./components/header', () => ({ Header: 'Header' })); -jest.mock('./components/loading_state', () => ({ LoadingState: 'LoadingState' })); -jest.mock('./lib/get_indices', () => ({ - getIndices: () => { - return [{ name: 'kibana' }]; - }, -})); -const routeComponentPropsMock = { - history: { - push: jest.fn(), - } as any, - location: {} as any, - match: {} as any, -}; -const mockContext = mockManagementPlugin.createIndexPatternManagmentContext(); -mockContext.indexPatternManagementStart.creation.getType = () => { - return new IndexPatternCreationConfig({ - type: 'default', - name: 'name', - }); -}; - -describe('CreateIndexPatternWizard', () => { - test(`defaults to the loading state`, () => { - const component = createComponentWithContext( - CreateIndexPatternWizard, - { ...routeComponentPropsMock }, - mockContext - ); - - expect(component).toMatchSnapshot(); - }); - - test('renders the empty state when there are no indices', async () => { - const component = createComponentWithContext( - CreateIndexPatternWizard, - { ...routeComponentPropsMock }, - mockContext - ); - - component.setState({ - isInitiallyLoadingIndices: false, - allIndices: [], - remoteClustersExist: false, - }); - - await component.update(); - expect(component).toMatchSnapshot(); - }); - - test('renders when there are no indices but there are remote clusters', async () => { - const component = createComponentWithContext( - CreateIndexPatternWizard, - { ...routeComponentPropsMock }, - mockContext - ); - - component.setState({ - isInitiallyLoadingIndices: false, - allIndices: [], - remoteClustersExist: true, - }); - - await component.update(); - expect(component).toMatchSnapshot(); - }); - - test('shows system indices even if there are no other indices if the include system indices is toggled', async () => { - const component = createComponentWithContext( - CreateIndexPatternWizard, - { ...routeComponentPropsMock }, - mockContext - ); - - component.setState({ - isInitiallyLoadingIndices: false, - isIncludingSystemIndices: true, - allIndices: [{ name: '.kibana ' }], - }); - - await component.update(); - expect(component).toMatchSnapshot(); - }); - - test('renders index pattern step when there are indices', async () => { - const component = createComponentWithContext( - CreateIndexPatternWizard, - { ...routeComponentPropsMock }, - mockContext - ); - - component.setState({ - isInitiallyLoadingIndices: false, - allIndices: [{ name: 'myIndexPattern' }], - }); - - await component.update(); - expect(component).toMatchSnapshot(); - }); - - test('renders time field step when step is set to 2', async () => { - const component = createComponentWithContext( - CreateIndexPatternWizard, - { ...routeComponentPropsMock }, - mockContext - ); - - component.setState({ - isInitiallyLoadingIndices: false, - allIndices: [{ name: 'myIndexPattern' }], - step: 2, - }); - - await component.update(); - expect(component).toMatchSnapshot(); - }); - - test('invokes the provided services when creating an index pattern', async () => { - const newIndexPatternAndSave = jest.fn().mockImplementation(async () => { - return indexPattern; - }); - const clear = jest.fn(); - mockContext.data.indexPatterns.clearCache = clear; - const indexPattern = ({ - id: '1', - title: 'my-fake-index-pattern', - timeFieldName: 'timestamp', - fields: [], - _fetchFields: jest.fn(), - } as unknown) as IndexPattern; - mockContext.data.indexPatterns.createAndSave = newIndexPatternAndSave; - mockContext.data.indexPatterns.setDefault = jest.fn(); - - const component = createComponentWithContext( - CreateIndexPatternWizard, - { ...routeComponentPropsMock }, - mockContext - ); - - component.setState({ indexPattern: 'foo' }); - await (component.instance() as CreateIndexPatternWizard).createIndexPattern(undefined, 'id'); - expect(newIndexPatternAndSave).toBeCalled(); - expect(clear).toBeCalledWith('1'); - expect(routeComponentPropsMock.history.push).toBeCalledWith(`/patterns/1`); - }); -}); diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/create_index_pattern_wizard.tsx b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/create_index_pattern_wizard.tsx deleted file mode 100644 index 5bc53105dbcf8..0000000000000 --- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/create_index_pattern_wizard.tsx +++ /dev/null @@ -1,284 +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 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 React, { Component, ReactElement } from 'react'; - -import { EuiGlobalToastList, EuiGlobalToastListToast, EuiSpacer } from '@elastic/eui'; -import { FormattedMessage } from '@kbn/i18n/react'; -import { i18n } from '@kbn/i18n'; -import { RouteComponentProps, withRouter } from 'react-router-dom'; -import { DocLinksStart } from 'src/core/public'; -import { StepIndexPattern } from './components/step_index_pattern'; -import { StepTimeField } from './components/step_time_field'; -import { Header } from './components/header'; -import { LoadingState } from './components/loading_state'; - -import { context as contextType } from '../../../../kibana_react/public'; -import { getCreateBreadcrumbs } from '../breadcrumbs'; -import { ensureMinimumTime, getIndices } from './lib'; -import { IndexPatternCreationConfig } from '../..'; -import { IndexPatternManagmentContextValue } from '../../types'; -import { MatchedItem } from './types'; -import { DuplicateIndexPatternError, IndexPattern } from '../../../../data/public'; - -interface CreateIndexPatternWizardState { - step: number; - indexPattern: string; - allIndices: MatchedItem[]; - remoteClustersExist: boolean; - isInitiallyLoadingIndices: boolean; - toasts: EuiGlobalToastListToast[]; - indexPatternCreationType: IndexPatternCreationConfig; - selectedTimeField?: string; - docLinks: DocLinksStart; -} - -export class CreateIndexPatternWizard extends Component< - RouteComponentProps, - CreateIndexPatternWizardState -> { - static contextType = contextType; - - public readonly context!: IndexPatternManagmentContextValue; - - constructor(props: RouteComponentProps, context: IndexPatternManagmentContextValue) { - super(props, context); - - context.services.setBreadcrumbs(getCreateBreadcrumbs()); - - const type = new URLSearchParams(props.location.search).get('type') || undefined; - const indexPattern = new URLSearchParams(props.location.search).get('name') || ''; - - this.state = { - step: 1, - indexPattern, - allIndices: [], - remoteClustersExist: false, - isInitiallyLoadingIndices: true, - toasts: [], - indexPatternCreationType: context.services.indexPatternManagementStart.creation.getType(type), - docLinks: context.services.docLinks, - }; - } - - async UNSAFE_componentWillMount() { - this.fetchData(); - } - - catchAndWarn = async ( - asyncFn: Promise, - errorValue: [] | string[], - errorMsg: ReactElement - ) => { - try { - return await asyncFn; - } catch (errors) { - this.setState((prevState) => ({ - toasts: prevState.toasts.concat([ - { - title: errorMsg, - id: errorMsg.props.id, - color: 'warning', - iconType: 'alert', - }, - ]), - })); - return errorValue; - } - }; - - fetchData = async () => { - const indicesFailMsg = ( - - ); - - const clustersFailMsg = ( - - ); - - // query local and remote indices, updating state independently - ensureMinimumTime( - this.catchAndWarn( - getIndices( - this.context.services.http, - (indexName: string) => this.state.indexPatternCreationType.getIndexTags(indexName), - `*`, - false - ), - - [], - indicesFailMsg - ) - ).then((allIndices: MatchedItem[]) => - this.setState({ allIndices, isInitiallyLoadingIndices: false }) - ); - - this.catchAndWarn( - // if we get an error from remote cluster query, supply fallback value that allows user entry. - // ['a'] is fallback value - getIndices( - this.context.services.http, - (indexName: string) => this.state.indexPatternCreationType.getIndexTags(indexName), - `*:*`, - false - ), - - ['a'], - clustersFailMsg - ).then((remoteIndices: string[] | MatchedItem[]) => - this.setState({ remoteClustersExist: !!remoteIndices.length }) - ); - }; - - createIndexPattern = async (timeFieldName: string | undefined, indexPatternId: string) => { - let emptyPattern: IndexPattern; - const { history } = this.props; - const { indexPattern } = this.state; - - try { - emptyPattern = await this.context.services.data.indexPatterns.createAndSave({ - id: indexPatternId, - title: indexPattern, - timeFieldName, - ...this.state.indexPatternCreationType.getIndexPatternMappings(), - }); - } catch (err) { - if (err instanceof DuplicateIndexPatternError) { - const confirmMessage = i18n.translate( - 'indexPatternManagement.indexPattern.titleExistsLabel', - { - values: { title: emptyPattern!.title }, - defaultMessage: "An index pattern with the title '{title}' already exists.", - } - ); - - const isConfirmed = await this.context.services.overlays.openConfirm(confirmMessage, { - confirmButtonText: i18n.translate( - 'indexPatternManagement.indexPattern.goToPatternButtonLabel', - { - defaultMessage: 'Go to existing pattern', - } - ), - }); - - if (isConfirmed) { - return history.push(`/patterns/${indexPatternId}`); - } else { - return; - } - } else { - throw err; - } - } - - await this.context.services.data.indexPatterns.setDefault(emptyPattern.id as string); - - this.context.services.data.indexPatterns.clearCache(emptyPattern.id as string); - history.push(`/patterns/${emptyPattern.id}`); - }; - - goToTimeFieldStep = (indexPattern: string, selectedTimeField?: string) => { - this.setState({ step: 2, indexPattern, selectedTimeField }); - }; - - goToIndexPatternStep = () => { - this.setState({ step: 1 }); - }; - - renderHeader() { - const { docLinks, indexPatternCreationType } = this.state; - return ( -
- ); - } - - renderContent() { - const { allIndices, isInitiallyLoadingIndices, step, indexPattern } = this.state; - - if (isInitiallyLoadingIndices) { - return ; - } - - const header = this.renderHeader(); - - if (step === 1) { - const { location } = this.props; - const initialQuery = new URLSearchParams(location.search).get('id') || undefined; - - return ( - <> - {header} - - - - ); - } - - if (step === 2) { - return ( - <> - {header} - - - - ); - } - - return null; - } - - removeToast = (id: string) => { - this.setState((prevState) => ({ - toasts: prevState.toasts.filter((toast) => toast.id !== id), - })); - }; - - render() { - const content = this.renderContent(); - - return ( - <> - {content} - { - this.removeToast(id); - }} - toastLifeTimeMs={6000} - /> - - ); - } -} - -export const CreateIndexPatternWizardWithRouter = withRouter(CreateIndexPatternWizard); diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/index.ts b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/index.ts deleted file mode 100644 index 52087f388cb97..0000000000000 --- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/index.ts +++ /dev/null @@ -1,9 +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 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 { CreateIndexPatternWizardWithRouter } from './create_index_pattern_wizard'; diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/lib/__snapshots__/get_indices.test.ts.snap b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/lib/__snapshots__/get_indices.test.ts.snap deleted file mode 100644 index 99876383b4343..0000000000000 --- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/lib/__snapshots__/get_indices.test.ts.snap +++ /dev/null @@ -1,69 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`getIndices response object to item array 1`] = ` -Array [ - Object { - "item": Object { - "attributes": Array [ - "frozen", - ], - "name": "frozen_index", - }, - "name": "frozen_index", - "tags": Array [ - Object { - "color": "default", - "key": "index", - "name": "Index", - }, - Object { - "color": "danger", - "key": "frozen", - "name": "Frozen", - }, - ], - }, - Object { - "item": Object { - "indices": Array [], - "name": "test_alias", - }, - "name": "test_alias", - "tags": Array [ - Object { - "color": "default", - "key": "alias", - "name": "Alias", - }, - ], - }, - Object { - "item": Object { - "backing_indices": Array [], - "name": "test_data_stream", - "timestamp_field": "test_timestamp_field", - }, - "name": "test_data_stream", - "tags": Array [ - Object { - "color": "primary", - "key": "data_stream", - "name": "Data stream", - }, - ], - }, - Object { - "item": Object { - "name": "test_index", - }, - "name": "test_index", - "tags": Array [ - Object { - "color": "default", - "key": "index", - "name": "Index", - }, - ], - }, -] -`; diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/lib/can_append_wildcard.test.ts b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/lib/can_append_wildcard.test.ts deleted file mode 100644 index ff2482d1db9af..0000000000000 --- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/lib/can_append_wildcard.test.ts +++ /dev/null @@ -1,31 +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 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 { canAppendWildcard } from './can_append_wildcard'; - -describe('canAppendWildcard', () => { - test('ignores symbols', () => { - expect(canAppendWildcard('%')).toBeFalsy(); - }); - - test('accepts numbers', () => { - expect(canAppendWildcard('1')).toBeTruthy(); - }); - - test('accepts letters', () => { - expect(canAppendWildcard('b')).toBeTruthy(); - }); - - test('accepts uppercase letters', () => { - expect(canAppendWildcard('B')).toBeTruthy(); - }); - - test('ignores if more than one key pressed', () => { - expect(canAppendWildcard('ab')).toBeFalsy(); - }); -}); diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/lib/can_append_wildcard.ts b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/lib/can_append_wildcard.ts deleted file mode 100644 index 3e192a7e6acf7..0000000000000 --- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/lib/can_append_wildcard.ts +++ /dev/null @@ -1,15 +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 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 const canAppendWildcard = (keyPressed: string) => { - // If it's not a letter, number or is something longer, reject it - if (!keyPressed || !/[a-z0-9]/i.test(keyPressed) || keyPressed.length !== 1) { - return false; - } - return true; -}; diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/lib/contains_illegal_characters.ts b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/lib/contains_illegal_characters.ts deleted file mode 100644 index 362817d8338df..0000000000000 --- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/lib/contains_illegal_characters.ts +++ /dev/null @@ -1,11 +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 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 function containsIllegalCharacters(pattern: string, illegalCharacters: string[]) { - return illegalCharacters.some((char) => pattern.includes(char)); -} diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/lib/contains_invalid_characters.test.ts b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/lib/contains_invalid_characters.test.ts deleted file mode 100644 index eea2a791c322b..0000000000000 --- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/lib/contains_invalid_characters.test.ts +++ /dev/null @@ -1,21 +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 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 { containsIllegalCharacters } from './contains_illegal_characters'; - -describe('containsIllegalCharacters', () => { - it('returns true with illegal characters', () => { - const isInvalid = containsIllegalCharacters('abc', ['a']); - expect(isInvalid).toBe(true); - }); - - it('returns false with no illegal characters', () => { - const isInvalid = containsIllegalCharacters('abc', ['%']); - expect(isInvalid).toBe(false); - }); -}); diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/lib/ensure_minimum_time.test.ts b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/lib/ensure_minimum_time.test.ts deleted file mode 100644 index 1bda1b9b5394c..0000000000000 --- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/lib/ensure_minimum_time.test.ts +++ /dev/null @@ -1,36 +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 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 { ensureMinimumTime } from './ensure_minimum_time'; - -describe('ensureMinimumTime', () => { - it('resolves single promise', async (done) => { - const promiseA = new Promise((resolve) => resolve('a')); - const a = await ensureMinimumTime(promiseA, 0); - expect(a).toBe('a'); - done(); - }); - - it('resolves multiple promises', async (done) => { - const promiseA = new Promise((resolve) => resolve('a')); - const promiseB = new Promise((resolve) => resolve('b')); - const [a, b] = await ensureMinimumTime([promiseA, promiseB], 0); - expect(a).toBe('a'); - expect(b).toBe('b'); - done(); - }); - - it('resolves in the amount of time provided, at minimum', async (done) => { - const startTime = new Date().getTime(); - const promise = new Promise((resolve) => resolve()); - await ensureMinimumTime(promise, 100); - const endTime = new Date().getTime(); - expect(endTime - startTime).toBeGreaterThanOrEqual(100); - done(); - }); -}); diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/lib/ensure_minimum_time.ts b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/lib/ensure_minimum_time.ts deleted file mode 100644 index cab11ff3b5a37..0000000000000 --- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/lib/ensure_minimum_time.ts +++ /dev/null @@ -1,50 +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 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. - */ - -/** - * When you make an async request, typically you want to show the user a spinner while they wait. - * However, if the request takes less than 300 ms, the spinner will flicker in the UI and the user - * won't have time to register it as a spinner. This function ensures the spinner (or whatever - * you're showing the user) displays for at least 300 ms, even if the request completes before then. - */ - -export const DEFAULT_MINIMUM_TIME_MS = 300; - -export async function ensureMinimumTime( - promiseOrPromises: Promise | Array>, - minimumTimeMs = DEFAULT_MINIMUM_TIME_MS -) { - let returnValue; - - // https://kibana-ci.elastic.co/job/elastic+kibana+6.x+multijob-intake/128/console - // We're having periodic failures around the timing here. I'm not exactly sure - // why it's not consistent but I'm going to add some buffer space here to - // prevent these random failures - const bufferedMinimumTimeMs = minimumTimeMs + 5; - - // Block on the async action and start the clock. - const asyncActionStartTime = new Date().getTime(); - if (Array.isArray(promiseOrPromises)) { - returnValue = await Promise.all(promiseOrPromises); - } else { - returnValue = await promiseOrPromises; - } - - // Measure how long the async action took to complete. - const asyncActionCompletionTime = new Date().getTime(); - const asyncActionDuration = asyncActionCompletionTime - asyncActionStartTime; - - // Wait longer if the async action completed too quickly. - if (asyncActionDuration < bufferedMinimumTimeMs) { - const additionalWaitingTime = - bufferedMinimumTimeMs - (asyncActionCompletionTime - asyncActionStartTime); - await new Promise((resolve) => setTimeout(resolve, additionalWaitingTime)); - } - - return returnValue; -} diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/lib/extract_time_fields.test.ts b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/lib/extract_time_fields.test.ts deleted file mode 100644 index 90070c37995af..0000000000000 --- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/lib/extract_time_fields.test.ts +++ /dev/null @@ -1,32 +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 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 { extractTimeFields } from './extract_time_fields'; - -describe('extractTimeFields', () => { - it('should handle no date fields', () => { - const fields = [ - { type: 'text', name: 'name' }, - { type: 'text', name: 'name' }, - ]; - - expect(extractTimeFields(fields)).toEqual([ - { display: `The indices which match this index pattern don't contain any time fields.` }, - ]); - }); - - it('should add extra options', () => { - const fields = [{ type: 'date', name: '@timestamp' }]; - - expect(extractTimeFields(fields)).toEqual([ - { display: '@timestamp', fieldName: '@timestamp' }, - { isDisabled: true, display: '───', fieldName: '' }, - { display: `I don't want to use the time filter`, fieldName: undefined }, - ]); - }); -}); diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/lib/extract_time_fields.ts b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/lib/extract_time_fields.ts deleted file mode 100644 index 1d7e25638412e..0000000000000 --- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/lib/extract_time_fields.ts +++ /dev/null @@ -1,53 +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 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 { IFieldType } from '../../../../../../plugins/data/public'; - -export function extractTimeFields(fields: IFieldType[]) { - const dateFields = fields.filter((field) => field.type === 'date'); - const label = i18n.translate( - 'indexPatternManagement.createIndexPattern.stepTime.noTimeFieldsLabel', - { - defaultMessage: "The indices which match this index pattern don't contain any time fields.", - } - ); - - if (dateFields.length === 0) { - return [ - { - display: label, - }, - ]; - } - - const disabledDividerOption = { - isDisabled: true, - display: '───', - fieldName: '', - }; - const noTimeFieldLabel = i18n.translate( - 'indexPatternManagement.createIndexPattern.stepTime.noTimeFieldOptionLabel', - { - defaultMessage: "I don't want to use the time filter", - } - ); - const noTimeFieldOption = { - display: noTimeFieldLabel, - fieldName: undefined, - }; - - return [ - ...dateFields.map((field) => ({ - display: field.name, - fieldName: field.name, - })), - disabledDividerOption, - noTimeFieldOption, - ]; -} diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/lib/get_indices.test.ts b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/lib/get_indices.test.ts deleted file mode 100644 index 29330cefc4806..0000000000000 --- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/lib/get_indices.test.ts +++ /dev/null @@ -1,96 +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 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 { getIndices, responseToItemArray } from './get_indices'; -import { httpServiceMock } from '../../../../../../core/public/mocks'; -import { ResolveIndexResponseItemIndexAttrs } from '../types'; - -export const successfulResponse = { - indices: [ - { - name: 'remoteCluster1:bar-01', - attributes: ['open'], - }, - ], - aliases: [ - { - name: 'f-alias', - indices: ['freeze-index', 'my-index'], - }, - ], - data_streams: [ - { - name: 'foo', - backing_indices: ['foo-000001'], - timestamp_field: '@timestamp', - }, - ], -}; - -const mockGetTags = () => []; - -const http = httpServiceMock.createStartContract(); -http.get.mockResolvedValue(successfulResponse); - -describe('getIndices', () => { - it('should work in a basic case', async () => { - const result = await getIndices(http, mockGetTags, 'kibana', false); - expect(result.length).toBe(3); - expect(result[0].name).toBe('f-alias'); - expect(result[1].name).toBe('foo'); - }); - - it('should ignore ccs query-all', async () => { - expect((await getIndices(http, mockGetTags, '*:', false)).length).toBe(0); - }); - - it('should ignore a single comma', async () => { - expect((await getIndices(http, mockGetTags, ',', false)).length).toBe(0); - expect((await getIndices(http, mockGetTags, ',*', false)).length).toBe(0); - expect((await getIndices(http, mockGetTags, ',foobar', false)).length).toBe(0); - }); - - it('response object to item array', () => { - const result = { - indices: [ - { - name: 'test_index', - }, - { - name: 'frozen_index', - attributes: ['frozen' as ResolveIndexResponseItemIndexAttrs], - }, - ], - aliases: [ - { - name: 'test_alias', - indices: [], - }, - ], - data_streams: [ - { - name: 'test_data_stream', - backing_indices: [], - timestamp_field: 'test_timestamp_field', - }, - ], - }; - expect(responseToItemArray(result, mockGetTags)).toMatchSnapshot(); - expect(responseToItemArray({}, mockGetTags)).toEqual([]); - }); - - describe('errors', () => { - it('should handle errors gracefully', async () => { - http.get.mockImplementationOnce(() => { - throw new Error('Test error'); - }); - const result = await getIndices(http, mockGetTags, 'kibana', false); - expect(result.length).toBe(0); - }); - }); -}); diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/lib/get_indices.ts b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/lib/get_indices.ts deleted file mode 100644 index e7edd177c2bda..0000000000000 --- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/lib/get_indices.ts +++ /dev/null @@ -1,108 +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 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 { sortBy } from 'lodash'; -import { HttpStart } from 'kibana/public'; -import { i18n } from '@kbn/i18n'; -import { IndexPatternCreationConfig } from '../../../../../index_pattern_management/public'; -import { MatchedItem, ResolveIndexResponse, ResolveIndexResponseItemIndexAttrs } from '../types'; - -const aliasLabel = i18n.translate('indexPatternManagement.aliasLabel', { defaultMessage: 'Alias' }); -const dataStreamLabel = i18n.translate('indexPatternManagement.dataStreamLabel', { - defaultMessage: 'Data stream', -}); - -const indexLabel = i18n.translate('indexPatternManagement.indexLabel', { - defaultMessage: 'Index', -}); - -const frozenLabel = i18n.translate('indexPatternManagement.frozenLabel', { - defaultMessage: 'Frozen', -}); - -export async function getIndices( - http: HttpStart, - getIndexTags: IndexPatternCreationConfig['getIndexTags'], - rawPattern: string, - showAllIndices: boolean -): Promise { - const pattern = rawPattern.trim(); - - // Searching for `*:` fails for CCS environments. The search request - // is worthless anyways as the we should only send a request - // for a specific query (where we do not append *) if there is at - // least a single character being searched for. - if (pattern === '*:') { - return []; - } - - // This should never match anything so do not bother - if (pattern === '') { - return []; - } - - // ES does not like just a `,*` and will throw a `[string_index_out_of_bounds_exception] String index out of range: 0` - if (pattern.startsWith(',')) { - return []; - } - - const query = showAllIndices ? { expand_wildcards: 'all' } : undefined; - - try { - const response = await http.get( - `/internal/index-pattern-management/resolve_index/${pattern}`, - { query } - ); - if (!response) { - return []; - } - - return responseToItemArray(response, getIndexTags); - } catch { - return []; - } -} - -export const responseToItemArray = ( - response: ResolveIndexResponse, - getIndexTags: IndexPatternCreationConfig['getIndexTags'] -): MatchedItem[] => { - const source: MatchedItem[] = []; - - (response.indices || []).forEach((index) => { - const tags: MatchedItem['tags'] = [{ key: 'index', name: indexLabel, color: 'default' }]; - const isFrozen = (index.attributes || []).includes(ResolveIndexResponseItemIndexAttrs.FROZEN); - - tags.push(...getIndexTags(index.name)); - if (isFrozen) { - tags.push({ name: frozenLabel, key: 'frozen', color: 'danger' }); - } - - source.push({ - name: index.name, - tags, - item: index, - }); - }); - (response.aliases || []).forEach((alias) => { - source.push({ - name: alias.name, - tags: [{ key: 'alias', name: aliasLabel, color: 'default' }], - item: alias, - }); - }); - (response.data_streams || []).forEach((dataStream) => { - source.push({ - name: dataStream.name, - tags: [{ key: 'data_stream', name: dataStreamLabel, color: 'primary' }], - item: dataStream, - }); - }); - - return sortBy(source, 'name'); -}; diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/lib/get_matched_indices.test.ts b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/lib/get_matched_indices.test.ts deleted file mode 100644 index bb762e78cc893..0000000000000 --- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/lib/get_matched_indices.test.ts +++ /dev/null @@ -1,113 +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 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 { getMatchedIndices } from './get_matched_indices'; -import { Tag, MatchedItem } from '../types'; - -jest.mock('./../constants', () => ({ - MAX_NUMBER_OF_MATCHING_INDICES: 6, -})); - -const tags: Tag[] = []; -const indices = [ - { name: 'kibana', tags }, - { name: 'es', tags }, - { name: 'logstash', tags }, - { name: 'packetbeat', tags }, - { name: 'metricbeat', tags }, - { name: '.kibana', tags }, -] as MatchedItem[]; - -const partialIndices = [ - { name: 'kibana', tags }, - { name: 'es', tags }, - { name: '.kibana', tags }, -] as MatchedItem[]; - -const exactIndices = [ - { name: 'kibana', tags }, - { name: '.kibana', tags }, -] as MatchedItem[]; - -describe('getMatchedIndices', () => { - it('should return all indices', () => { - const { - allIndices, - exactMatchedIndices, - partialMatchedIndices, - visibleIndices, - } = getMatchedIndices(indices, partialIndices, exactIndices, true); - - expect(allIndices).toEqual([ - { name: 'kibana', tags }, - { name: 'es', tags }, - { name: 'logstash', tags }, - { name: 'packetbeat', tags }, - { name: 'metricbeat', tags }, - { name: '.kibana', tags }, - ]); - - expect(exactMatchedIndices).toEqual([ - { name: 'kibana', tags }, - { name: '.kibana', tags }, - ]); - - expect(partialMatchedIndices).toEqual([ - { name: 'kibana', tags }, - { name: 'es', tags }, - { name: '.kibana', tags }, - ]); - - expect(visibleIndices).toEqual([ - { name: 'kibana', tags }, - { name: '.kibana', tags }, - ]); - }); - - it('should return all indices except for system indices', () => { - const { - allIndices, - exactMatchedIndices, - partialMatchedIndices, - visibleIndices, - } = getMatchedIndices(indices, partialIndices, exactIndices, false); - - expect(allIndices).toEqual([ - { name: 'kibana', tags }, - { name: 'es', tags }, - { name: 'logstash', tags }, - { name: 'packetbeat', tags }, - { name: 'metricbeat', tags }, - ]); - - expect(exactMatchedIndices).toEqual([{ name: 'kibana', tags }]); - - expect(partialMatchedIndices).toEqual([ - { name: 'kibana', tags }, - { name: 'es', tags }, - ]); - - expect(visibleIndices).toEqual([{ name: 'kibana', tags }]); - }); - - it('should return partial matches as visible if there are no exact', () => { - const { visibleIndices } = getMatchedIndices(indices, partialIndices, [], true); - - expect(visibleIndices).toEqual([ - { name: 'kibana', tags }, - { name: 'es', tags }, - { name: '.kibana', tags }, - ]); - }); - - it('should return all indices as visible if there are no exact or partial', () => { - const { visibleIndices } = getMatchedIndices(indices, [], [], true); - - expect(visibleIndices).toEqual(indices); - }); -}); diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/lib/get_matched_indices.ts b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/lib/get_matched_indices.ts deleted file mode 100644 index e9b365474425b..0000000000000 --- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/lib/get_matched_indices.ts +++ /dev/null @@ -1,95 +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 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 { MAX_NUMBER_OF_MATCHING_INDICES } from '../constants'; - -function isSystemIndex(index: string): boolean { - if (index.startsWith('.')) { - return true; - } - - if (index.includes(':')) { - return index - .split(':') - .reduce((isSystem: boolean, idx) => isSystem || isSystemIndex(idx), false); - } - - return false; -} - -function filterSystemIndices(indices: MatchedItem[], isIncludingSystemIndices: boolean) { - if (!indices) { - return indices; - } - - const acceptableIndices = isIncludingSystemIndices - ? indices - : // All system indices begin with a period. - indices.filter((index) => !isSystemIndex(index.name)); - - return acceptableIndices.slice(0, MAX_NUMBER_OF_MATCHING_INDICES); -} - -/** - This utility is designed to do a couple of things: - - 1) Take in list of indices and filter out system indices if necessary - 2) Return a `visible` list based on a priority order. - - We are passing in three separate lists because they each represent - something slightly different. - - - `unfilteredAllIndices` - This is the result of the initial `*` query and represents all known indices - - `unfilteredPartialMatchedIndices` - This is the result of searching against the query with an added `*`. This is only - used when the query does not end in an `*` and represents potential matches in the UI - - `unfilteredExactMatchedIndices - This is the result of searching against a query that already ends in `*`. - We call this `exact` matches because ES is telling us exactly what it matches - */ - -import { MatchedItem } from '../types'; - -export function getMatchedIndices( - unfilteredAllIndices: MatchedItem[], - unfilteredPartialMatchedIndices: MatchedItem[], - unfilteredExactMatchedIndices: MatchedItem[], - isIncludingSystemIndices: boolean = false -) { - const allIndices = filterSystemIndices(unfilteredAllIndices, isIncludingSystemIndices); - const partialMatchedIndices = filterSystemIndices( - unfilteredPartialMatchedIndices, - isIncludingSystemIndices - ); - const exactMatchedIndices = filterSystemIndices( - unfilteredExactMatchedIndices, - isIncludingSystemIndices - ); - - // We need to pick one to show in the UI and there is a priority here - // 1) If there are exact matches, show those as the query is good to go - // 2) If there are no exact matches, but there are partial matches, - // show the partial matches - // 3) If there are no exact or partial matches, just show all indices - let visibleIndices; - if (exactMatchedIndices.length) { - visibleIndices = exactMatchedIndices; - } else if (partialMatchedIndices.length) { - visibleIndices = partialMatchedIndices; - } else { - visibleIndices = allIndices; - } - - return { - allIndices, - exactMatchedIndices, - partialMatchedIndices, - visibleIndices, - }; -} diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/lib/index.ts b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/lib/index.ts deleted file mode 100644 index 371712b70a0d2..0000000000000 --- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/lib/index.ts +++ /dev/null @@ -1,19 +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 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 { canAppendWildcard } from './can_append_wildcard'; - -export { ensureMinimumTime } from './ensure_minimum_time'; - -export { getIndices } from './get_indices'; - -export { getMatchedIndices } from './get_matched_indices'; - -export { containsIllegalCharacters } from './contains_illegal_characters'; - -export { extractTimeFields } from './extract_time_fields'; diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/types.ts b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/types.ts deleted file mode 100644 index 8d511a30c3532..0000000000000 --- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/types.ts +++ /dev/null @@ -1,59 +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 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 interface MatchedItem { - name: string; - tags: Tag[]; - item: { - name: string; - backing_indices?: string[]; - timestamp_field?: string; - indices?: string[]; - aliases?: string[]; - attributes?: ResolveIndexResponseItemIndexAttrs[]; - data_stream?: string; - }; -} - -export interface ResolveIndexResponse { - indices?: ResolveIndexResponseItemIndex[]; - aliases?: ResolveIndexResponseItemAlias[]; - data_streams?: ResolveIndexResponseItemDataStream[]; -} - -export interface ResolveIndexResponseItem { - name: string; -} - -export interface ResolveIndexResponseItemDataStream extends ResolveIndexResponseItem { - backing_indices: string[]; - timestamp_field: string; -} - -export interface ResolveIndexResponseItemAlias extends ResolveIndexResponseItem { - indices: string[]; -} - -export interface ResolveIndexResponseItemIndex extends ResolveIndexResponseItem { - aliases?: string[]; - attributes?: ResolveIndexResponseItemIndexAttrs[]; - data_stream?: string; -} - -export enum ResolveIndexResponseItemIndexAttrs { - OPEN = 'open', - CLOSED = 'closed', - HIDDEN = 'hidden', - FROZEN = 'frozen', -} - -export interface Tag { - name: string; - key: string; - color: string; -} diff --git a/src/plugins/index_pattern_management/public/components/index.ts b/src/plugins/index_pattern_management/public/components/index.ts index 022f32fb3defc..bbe10af809c9f 100644 --- a/src/plugins/index_pattern_management/public/components/index.ts +++ b/src/plugins/index_pattern_management/public/components/index.ts @@ -13,4 +13,3 @@ export { CreateEditField, CreateEditFieldContainer, } from './edit_index_pattern'; -export { CreateIndexPatternWizardWithRouter } from './create_index_pattern_wizard'; diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json index 48dc86e9be90d..64bac54314113 100644 --- a/x-pack/plugins/translations/translations/ja-JP.json +++ b/x-pack/plugins/translations/translations/ja-JP.json @@ -2874,49 +2874,8 @@ "indexPatternManagement.actions.createButton": "フィールドを作成", "indexPatternManagement.actions.deleteButton": "削除", "indexPatternManagement.actions.saveButton": "フィールドを保存", - "indexPatternManagement.aliasLabel": "エイリアス", "indexPatternManagement.createHeader": "スクリプトフィールドを作成", - "indexPatternManagement.createIndexPattern.betaLabel": "ベータ", - "indexPatternManagement.createIndexPattern.description": "インデックスパターンは、{single}または{multiple}データソース、{star}と一致します。", - "indexPatternManagement.createIndexPattern.documentation": "ドキュメンテーションを表示", - "indexPatternManagement.createIndexPattern.includeSystemIndicesToggleSwitchLabel": "システムと非表示のインデックスを含める", - "indexPatternManagement.createIndexPattern.loadClustersFailMsg": "リモートクラスターの読み込みに失敗", - "indexPatternManagement.createIndexPattern.loadIndicesFailMsg": "インデックスの読み込みに失敗", - "indexPatternManagement.createIndexPattern.loadingState.checkingLabel": "Elasticsearchデータを確認中", - "indexPatternManagement.createIndexPattern.step.indexPattern.allowLabel": "複数インデックスの一致にアスタリスク ({asterisk}) を使用。", - "indexPatternManagement.createIndexPattern.step.indexPattern.disallowLabel": "スペースと{characterList}は使用できません。", - "indexPatternManagement.createIndexPattern.step.indexPatternLabel": "インデックスパターン名", - "indexPatternManagement.createIndexPattern.step.indexPatternPlaceholder": "index-name-*", - "indexPatternManagement.createIndexPattern.step.invalidCharactersErrorMessage": "{indexPatternName}にはスペースや{characterList}は使えません。", - "indexPatternManagement.createIndexPattern.step.loadingHeader": "一致するインデックスを検索中…", - "indexPatternManagement.createIndexPattern.step.nextStepButton": "次のステップ", - "indexPatternManagement.createIndexPattern.step.pagingLabel": "ページごとの行数：{perPage}", - "indexPatternManagement.createIndexPattern.step.status.noSystemIndicesLabel": "パターンに一致するElasticsearchインデックスがありません。", - "indexPatternManagement.createIndexPattern.step.status.noSystemIndicesWithPromptLabel": "パターンに一致するElasticsearchインデックスがありません。一致するシステムインデックスを表示するには、上のスイッチを切り替えます。", - "indexPatternManagement.createIndexPattern.step.warningHeader": "すでに{query}という名前のインデックスパターンがあります。", - "indexPatternManagement.createIndexPattern.stepHeader": "ステップ1/2：インデックスパターンを定義", - "indexPatternManagement.createIndexPattern.stepTime.backButton": "戻る", - "indexPatternManagement.createIndexPattern.stepTime.createPatternButton": "インデックスパターンを作成", - "indexPatternManagement.createIndexPattern.stepTime.creatingLabel": "インデックスパターンを作成中…", - "indexPatternManagement.createIndexPattern.stepTime.error": "エラー", - "indexPatternManagement.createIndexPattern.stepTime.field.loadingDropDown": "読み込み中…", - "indexPatternManagement.createIndexPattern.stepTime.field.noTimeFieldsLabel": "このインデックスパターンに一致するインデックスには時間フィールドがありません。", - "indexPatternManagement.createIndexPattern.stepTime.fieldLabel": "時間フィールド", - "indexPatternManagement.createIndexPattern.stepTime.noTimeFieldOptionLabel": "時間フィルターを使用しない", - "indexPatternManagement.createIndexPattern.stepTime.noTimeFieldsLabel": "このインデックスパターンに一致するインデックスには時間フィールドがありません。", - "indexPatternManagement.createIndexPattern.stepTime.options.hideButton": "高度なSIEM設定の非表示化", - "indexPatternManagement.createIndexPattern.stepTime.options.patternHeader": "カスタムインデックスパターンID", - "indexPatternManagement.createIndexPattern.stepTime.options.patternLabel": "Kibanaはそれぞれのインデックスパターンに固有の識別子を割り当てます。固有のIDを使用しない場合は、カスタムIDを入力してください。", - "indexPatternManagement.createIndexPattern.stepTime.options.patternPlaceholder": "custom-index-pattern-id", - "indexPatternManagement.createIndexPattern.stepTime.options.showButton": "高度なSIEM設定の表示", - "indexPatternManagement.createIndexPattern.stepTime.patterAlreadyExists": "カスタムインデックスパターンIDがすでに存在します。", - "indexPatternManagement.createIndexPattern.stepTime.refreshButton": "更新", - "indexPatternManagement.createIndexPattern.stepTime.timeDescription": "グローバル時間フィルターで使用するためのプライマリ時間フィールドを選択してください。", - "indexPatternManagement.createIndexPattern.stepTimeHeader": "ステップ2/2：設定の構成", - "indexPatternManagement.createIndexPattern.stepTimeLabel": "{indexPattern} {indexPatternName}の設定を指定します。", - "indexPatternManagement.createIndexPatternHeader": "{indexPatternName}の作成", "indexPatternManagement.customLabel": "カスタムラベル", - "indexPatternManagement.dataStreamLabel": "データストリーム", "indexPatternManagement.defaultFormatDropDown": "- デフォルト -", "indexPatternManagement.defaultFormatHeader": "フォーマット (デフォルト：{defaultFormat}) ", "indexPatternManagement.deleteField.cancelButton": "キャンセル", @@ -2928,9 +2887,6 @@ "indexPatternManagement.disabledCallOutHeader": "スクリプティングが無効です", "indexPatternManagement.disabledCallOutLabel": "Elasticsearchでのすべてのインラインスクリプティングが無効になっています。Kibanaでスクリプトフィールドを使用するには、インラインスクリプティングを有効にする必要があります。", "indexPatternManagement.editHeader": "{fieldName}を編集", - "indexPatternManagement.editIndexPattern.createIndex.defaultButtonDescription": "すべてのデータに完全アグリゲーションを実行", - "indexPatternManagement.editIndexPattern.createIndex.defaultButtonText": "標準インデックスパターン", - "indexPatternManagement.editIndexPattern.createIndex.defaultTypeName": "インデックスパターン", "indexPatternManagement.editIndexPattern.deleteButton": "削除", "indexPatternManagement.editIndexPattern.deleteHeader": "インデックスパターンを削除しますか？", "indexPatternManagement.editIndexPattern.deprecation": "スクリプトフィールドは廃止予定です。代わりに{runtimeDocs}を使用してください。", @@ -3015,23 +2971,12 @@ "indexPatternManagement.editIndexPattern.timeFilterHeader": "時刻フィールド：「{timeFieldName}」", "indexPatternManagement.editIndexPattern.timeFilterLabel.mappingAPILink": "フィールドマッピング", "indexPatternManagement.editIndexPattern.timeFilterLabel.timeFilterDetail": "{indexPatternTitle}でフィールドを表示して編集します。型や検索可否などのフィールド属性はElasticsearchで{mappingAPILink}に基づきます。", - "indexPatternManagement.editIndexPatternLiveRegionAriaLabel": "インデックスパターン", - "indexPatternManagement.emptyIndexPatternPrompt.documentation": "ドキュメンテーションを表示", - "indexPatternManagement.emptyIndexPatternPrompt.indexPatternExplanation": "Kibanaでは、検索するインデックスを特定するためにインデックスパターンが必要です。インデックスパターンは、昨日のログデータなど特定のインデックス、またはログデータを含むすべてのインデックスを参照できます。", - "indexPatternManagement.emptyIndexPatternPrompt.learnMore": "詳細について", - "indexPatternManagement.emptyIndexPatternPrompt.nowCreate": "インデックスパターンを作成します。", - "indexPatternManagement.emptyIndexPatternPrompt.youHaveData": "Elasticsearchにデータがあります。", "indexPatternManagement.fieldTypeConflict": "フィールドタイプの矛盾", "indexPatternManagement.formatHeader": "フォーマット", "indexPatternManagement.formatLabel": "フォーマットは、特定の値の表示形式を管理できます。また、値を完全に変更したり、Discover でのハイライト機能を無効にしたりすることも可能です。", - "indexPatternManagement.frozenLabel": "凍結", "indexPatternManagement.header.runtimeLink": "ランタイムフィールド", - "indexPatternManagement.indexLabel": "インデックス", "indexPatternManagement.indexNameLabel": "インデックス名", - "indexPatternManagement.indexPattern.goToPatternButtonLabel": "既存のパターンに移動", "indexPatternManagement.indexPattern.sectionsHeader": "インデックスパターン", - "indexPatternManagement.indexPattern.titleExistsLabel": "「{title}」というタイトルのインデックスパターンがすでに存在します。", - "indexPatternManagement.indexPatternList.createButton.betaLabel": "ベータ", "indexPatternManagement.indexPatterns.badge.readOnly.text": "読み取り専用", "indexPatternManagement.indexPatterns.badge.readOnly.tooltip": "インデックスパターンを保存できません", "indexPatternManagement.indexPatterns.createBreadcrumb": "インデックスパターンを作成", @@ -3095,15 +3040,6 @@ "indexPatternManagement.warningHeader": "廃止警告：", "indexPatternManagement.warningLabel.painlessLinkLabel": "Painless", "indexPatternManagement.warningLabel.warningDetail": "{language}は廃止され、KibanaとElasticsearchの次のメジャーバージョンではサポートされなくなります。新規スクリプトフィールドには{painlessLink}を使うことをお勧めします。", - "indexPatternManagement.editRollupIndexPattern.createIndex.defaultButtonDescription": "要約データに制限された集約を実行します。", - "indexPatternManagement.editRollupIndexPattern.createIndex.defaultButtonText": "ロールアップインデックスパターン", - "indexPatternManagement.editRollupIndexPattern.createIndex.defaultTypeName": "ロールアップインデックスパターン", - "indexPatternManagement.editRollupIndexPattern.createIndex.indexLabel": "ロールアップ", - "indexPatternManagement.editRollupIndexPattern.createIndex.noMatchError": "ロールアップインデックスパターンエラー：ロールアップインデックスの 1 つと一致している必要があります", - "indexPatternManagement.editRollupIndexPattern.createIndex.tooManyMatchesError": "ロールアップインデックスパターンエラー：一致できるロールアップインデックスは 1 つだけです", - "indexPatternManagement.editRollupIndexPattern.createIndex.uncaughtError": "ロールアップインデックスパターンエラー：{error}", - "indexPatternManagement.editRollupIndexPattern.rollupPrompt.betaCalloutParagraph1Text": "ロールアップインデックスパターンのKibanaのサポートはベータ版です。保存された検索、可視化、ダッシュボードでこれらのパターンを使用すると問題が発生する場合があります。Timelionや機械学習などの一部の高度な機能ではサポートされていません。", - "indexPatternManagement.editRollupIndexPattern.rollupPrompt.betaCalloutParagraph2Text": "ロールアップインデックスパターンは、1つのロールアップインデックスとゼロ以上の標準インデックスと一致させることができます。ロールアップインデックスパターンでは、メトリック、フィールド、間隔、アグリゲーションが制限されています。ロールアップインデックスは、1つのジョブ構成があるインデックス、または複数のジョブと互換する構成があるインデックスに制限されています。", "inputControl.control.noIndexPatternTooltip": "index-pattern id が見つかりませんでした：{indexPatternId}.", "inputControl.control.notInitializedTooltip": "コントロールが初期化されていません", "inputControl.control.noValuesDisableTooltip": "「{indexPatternName}」インデックスパターンでいずれのドキュメントにも存在しない「{fieldName}」フィールドがフィルターの対象になっています。異なるフィールドを選択するか、このフィールドに値が入力されているドキュメントをインデックスしてください。", diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json index cdb7612376d42..700ed3ccf5888 100644 --- a/x-pack/plugins/translations/translations/zh-CN.json +++ b/x-pack/plugins/translations/translations/zh-CN.json @@ -2888,55 +2888,8 @@ "indexPatternManagement.actions.createButton": "创建字段", "indexPatternManagement.actions.deleteButton": "删除", "indexPatternManagement.actions.saveButton": "保存字段", - "indexPatternManagement.aliasLabel": "别名", "indexPatternManagement.createHeader": "创建脚本字段", - "indexPatternManagement.createIndexPattern.betaLabel": "公测版", - "indexPatternManagement.createIndexPattern.description": "索引模式可以匹配单个源，例如 {single} 或 {multiple} 个数据源、{star}。", - "indexPatternManagement.createIndexPattern.documentation": "阅读文档", - "indexPatternManagement.createIndexPattern.includeSystemIndicesToggleSwitchLabel": "包括系统和隐藏索引", - "indexPatternManagement.createIndexPattern.loadClustersFailMsg": "无法加载远程集群", - "indexPatternManagement.createIndexPattern.loadIndicesFailMsg": "无法加载索引", - "indexPatternManagement.createIndexPattern.loadingState.checkingLabel": "正在检查 Elasticsearch 数据", - "indexPatternManagement.createIndexPattern.step.indexPattern.allowLabel": "使用星号 ({asterisk}) 匹配多个索引。", - "indexPatternManagement.createIndexPattern.step.indexPattern.disallowLabel": "不允许使用空格和字符 {characterList}。", - "indexPatternManagement.createIndexPattern.step.indexPatternLabel": "索引模式名称", - "indexPatternManagement.createIndexPattern.step.indexPatternPlaceholder": "index-name-*", - "indexPatternManagement.createIndexPattern.step.invalidCharactersErrorMessage": "{indexPatternName} 不能包含空格或字符：{characterList}", - "indexPatternManagement.createIndexPattern.step.loadingHeader": "正在寻找匹配的索引......", - "indexPatternManagement.createIndexPattern.step.nextStepButton": "下一步", - "indexPatternManagement.createIndexPattern.step.pagingLabel": "每页行数：{perPage}", - "indexPatternManagement.createIndexPattern.step.status.matchAnyLabel.matchAnyDetail": "您的索引模式可以匹配{sourceCount, plural, one {您的 # 个源} other {您的 # 个源中的任何一个} }。", - "indexPatternManagement.createIndexPattern.step.status.noSystemIndicesLabel": "没有 Elasticsearch 索引匹配您的模式。", - "indexPatternManagement.createIndexPattern.step.status.noSystemIndicesWithPromptLabel": "没有 Elasticsearch 索引匹配您的模式。要查看匹配的系统索引，请切换上面的开关。", - "indexPatternManagement.createIndexPattern.step.status.notMatchLabel.allIndicesLabel": "{indicesLength, plural, other {# 个索引} }", - "indexPatternManagement.createIndexPattern.step.status.notMatchLabel.notMatchDetail": "输入的索引模式不匹配任何索引。您可以在下面匹配您的 {strongIndices}{indicesLength, plural, one {} other {中任何一个} }。", - "indexPatternManagement.createIndexPattern.step.status.partialMatchLabel.partialMatchDetail": "您的索引模式不匹配任何索引，但您的 {strongIndices}{matchedIndicesLength, plural, other {看起来} }类似。", - "indexPatternManagement.createIndexPattern.step.status.partialMatchLabel.strongIndicesLabel": "{matchedIndicesLength, plural,one {索引} other {# 个索引} }", - "indexPatternManagement.createIndexPattern.step.status.successLabel.successDetail": "您的索引模式匹配 {sourceCount} 个{sourceCount, plural, other {源} }。", - "indexPatternManagement.createIndexPattern.step.warningHeader": "已有称作“{query}”的索引模式", - "indexPatternManagement.createIndexPattern.stepHeader": "第 1 步 (共 2 步) ：定义索引模式", - "indexPatternManagement.createIndexPattern.stepTime.backButton": "返回", - "indexPatternManagement.createIndexPattern.stepTime.createPatternButton": "创建索引模式", - "indexPatternManagement.createIndexPattern.stepTime.creatingLabel": "正在创建索引模式……", - "indexPatternManagement.createIndexPattern.stepTime.error": "错误", - "indexPatternManagement.createIndexPattern.stepTime.field.loadingDropDown": "正在加载……", - "indexPatternManagement.createIndexPattern.stepTime.field.noTimeFieldsLabel": "匹配此索引模式的索引不包含任何时间字段。", - "indexPatternManagement.createIndexPattern.stepTime.fieldLabel": "时间字段", - "indexPatternManagement.createIndexPattern.stepTime.noTimeFieldOptionLabel": "我不想使用时间筛选", - "indexPatternManagement.createIndexPattern.stepTime.noTimeFieldsLabel": "匹配此索引模式的索引不包含任何时间字段。", - "indexPatternManagement.createIndexPattern.stepTime.options.hideButton": "隐藏高级设置", - "indexPatternManagement.createIndexPattern.stepTime.options.patternHeader": "定制索引模式 ID", - "indexPatternManagement.createIndexPattern.stepTime.options.patternLabel": "Kibana 将为每个索引模式提供唯一的标识符。如果不想使用此唯一 ID，请输入定制 ID。", - "indexPatternManagement.createIndexPattern.stepTime.options.patternPlaceholder": "custom-index-pattern-id", - "indexPatternManagement.createIndexPattern.stepTime.options.showButton": "显示高级设置", - "indexPatternManagement.createIndexPattern.stepTime.patterAlreadyExists": "自定义索引模式 ID 已存在。", - "indexPatternManagement.createIndexPattern.stepTime.refreshButton": "刷新", - "indexPatternManagement.createIndexPattern.stepTime.timeDescription": "选择用于全局时间筛选的主要时间字段。", - "indexPatternManagement.createIndexPattern.stepTimeHeader": "第 2 步 (共 2 步) ：配置设置", - "indexPatternManagement.createIndexPattern.stepTimeLabel": "为您的 {indexPattern} {indexPatternName} 指定设置。", - "indexPatternManagement.createIndexPatternHeader": "创建 {indexPatternName}", "indexPatternManagement.customLabel": "定制标签", - "indexPatternManagement.dataStreamLabel": "数据流", "indexPatternManagement.defaultFormatDropDown": "- 默认值 -", "indexPatternManagement.defaultFormatHeader": "格式 (默认值：{defaultFormat}) ", "indexPatternManagement.deleteField.cancelButton": "取消", @@ -2948,9 +2901,6 @@ "indexPatternManagement.disabledCallOutHeader": "脚本已禁用", "indexPatternManagement.disabledCallOutLabel": "所有内联脚本在 Elasticsearch 中已禁用。必须至少为一种语言启用内联脚本，才能在 Kibana 中使用脚本字段。", "indexPatternManagement.editHeader": "编辑 {fieldName}", - "indexPatternManagement.editIndexPattern.createIndex.defaultButtonDescription": "对任何数据执行完全聚合", - "indexPatternManagement.editIndexPattern.createIndex.defaultButtonText": "标准索引模式", - "indexPatternManagement.editIndexPattern.createIndex.defaultTypeName": "索引模式", "indexPatternManagement.editIndexPattern.deleteButton": "删除", "indexPatternManagement.editIndexPattern.deleteHeader": "删除索引模式？", "indexPatternManagement.editIndexPattern.deprecation": "脚本字段已弃用。改用 {runtimeDocs}。", @@ -3036,23 +2986,12 @@ "indexPatternManagement.editIndexPattern.timeFilterHeader": "时间字段：“{timeFieldName}”", "indexPatternManagement.editIndexPattern.timeFilterLabel.mappingAPILink": "字段映射", "indexPatternManagement.editIndexPattern.timeFilterLabel.timeFilterDetail": "查看和编辑 {indexPatternTitle} 中的字段。字段属性，如类型和可搜索性，基于 Elasticsearch 中的 {mappingAPILink}。", - "indexPatternManagement.editIndexPatternLiveRegionAriaLabel": "索引模式", - "indexPatternManagement.emptyIndexPatternPrompt.documentation": "阅读文档", - "indexPatternManagement.emptyIndexPatternPrompt.indexPatternExplanation": "Kibana 需要索引模式，以识别您要浏览的索引。索引模式可以指向特定索引 (例如昨天的日志数据) ，或包含日志数据的所有索引。", - "indexPatternManagement.emptyIndexPatternPrompt.learnMore": "希望了解详情？", - "indexPatternManagement.emptyIndexPatternPrompt.nowCreate": "现在，创建索引模式。", - "indexPatternManagement.emptyIndexPatternPrompt.youHaveData": "您在 Elasticsearch 中有数据。", "indexPatternManagement.fieldTypeConflict": "字段类型冲突", "indexPatternManagement.formatHeader": "格式", "indexPatternManagement.formatLabel": "设置格式允许您控制特定值的显示方式。其还会导致值完全更改，并阻止 Discover 中的突出显示起作用。", - "indexPatternManagement.frozenLabel": "已冻结", "indexPatternManagement.header.runtimeLink": "运行时字段", - "indexPatternManagement.indexLabel": "索引", "indexPatternManagement.indexNameLabel": "索引名称", - "indexPatternManagement.indexPattern.goToPatternButtonLabel": "前往现有模式", "indexPatternManagement.indexPattern.sectionsHeader": "索引模式", - "indexPatternManagement.indexPattern.titleExistsLabel": "具有标题“{title}”的索引模式已存在。", - "indexPatternManagement.indexPatternList.createButton.betaLabel": "公测版", "indexPatternManagement.indexPatterns.badge.readOnly.text": "只读", "indexPatternManagement.indexPatterns.badge.readOnly.tooltip": "无法保存索引模式", "indexPatternManagement.indexPatterns.createBreadcrumb": "创建索引模式", @@ -3116,15 +3055,6 @@ "indexPatternManagement.warningHeader": "过时警告：", "indexPatternManagement.warningLabel.painlessLinkLabel": "Painless", "indexPatternManagement.warningLabel.warningDetail": "{language} 已过时，Kibana 和 Elasticsearch 下一主要版本将移除支持。建议将 {painlessLink} 用于新的脚本字段。", - "indexPatternManagement.editRollupIndexPattern.createIndex.defaultButtonDescription": "针对汇总数据执行有限聚合", - "indexPatternManagement.editRollupIndexPattern.createIndex.defaultButtonText": "汇总/打包索引模式", - "indexPatternManagement.editRollupIndexPattern.createIndex.defaultTypeName": "汇总/打包索引模式", - "indexPatternManagement.editRollupIndexPattern.createIndex.indexLabel": "汇总/打包", - "indexPatternManagement.editRollupIndexPattern.createIndex.noMatchError": "汇总/打包索引模式错误：必须匹配一个汇总/打包索引", - "indexPatternManagement.editRollupIndexPattern.createIndex.tooManyMatchesError": "汇总/打包索引模式错误：只能匹配一个汇总/打包索引", - "indexPatternManagement.editRollupIndexPattern.createIndex.uncaughtError": "汇总索引模式错误：{error}", - "indexPatternManagement.editRollupIndexPattern.rollupPrompt.betaCalloutParagraph1Text": "Kibana 对汇总/打包索引模式的支持处于公测版状态。将这些模式用于已保存搜索、可视化以及仪表板可能会遇到问题。某些高级功能，如 Timelion 和 Machine Learning，不支持这些模式。", - "indexPatternManagement.editRollupIndexPattern.rollupPrompt.betaCalloutParagraph2Text": "可以根据一个汇总/打包索引和零个或更多常规索引匹配汇总/打包索引模式。汇总/打包索引模式的指标、字段、时间间隔和聚合有限。汇总/打包索引仅限于具有一个作业配置或多个作业配置兼容的索引。", "inputControl.control.noIndexPatternTooltip": "找不到索引模式 ID：{indexPatternId}。", "inputControl.control.notInitializedTooltip": "尚未初始化控件", "inputControl.control.noValuesDisableTooltip": "按 “{fieldName}” 字段进行了筛选，但 “{indexPatternName}” 索引模式中的任何文档上都不存在该字段。选择不同的字段或索引包含此字段的值的文档。", From f0dd1dc4cb2e3c315f1ae52042f5f133b43cff35 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Mon, 21 Jun 2021 17:52:50 -0500 Subject: [PATCH 027/130] implement selected indices list --- .../components/flyout_panels/flyout_panel.tsx | 120 ++++ .../flyout_panels/flyout_panels.scss | 42 ++ .../flyout_panels/flyout_panels.tsx | 119 ++++ .../flyout_panels/flyout_panels_content.tsx | 20 + .../flyout_panels/flyout_panels_footer.tsx | 23 + .../flyout_panels/flyout_panels_header.tsx | 19 + .../public/components/flyout_panels/index.ts | 21 + .../index_pattern_editor_flyout_content.tsx | 229 ++++--- .../__snapshots__/indices_list.test.tsx.snap | 585 ++++++++++++++++++ .../public/components/indices_list/index.ts | 9 + .../indices_list/indices_list.test.tsx | 74 +++ .../components/indices_list/indices_list.tsx | 199 ++++++ .../status_message.test.tsx.snap | 143 +++++ .../public/components/status_message/index.ts | 9 + .../status_message/status_message.test.tsx | 123 ++++ .../status_message/status_message.tsx | 165 +++++ .../index_pattern_editor/public/constants.ts | 2 +- .../public/lib/get_matched_indices.ts | 13 +- .../index_pattern_editor/public/lib/index.ts | 2 +- 19 files changed, 1826 insertions(+), 91 deletions(-) create mode 100644 src/plugins/index_pattern_editor/public/components/flyout_panels/flyout_panel.tsx create mode 100644 src/plugins/index_pattern_editor/public/components/flyout_panels/flyout_panels.scss create mode 100644 src/plugins/index_pattern_editor/public/components/flyout_panels/flyout_panels.tsx create mode 100644 src/plugins/index_pattern_editor/public/components/flyout_panels/flyout_panels_content.tsx create mode 100644 src/plugins/index_pattern_editor/public/components/flyout_panels/flyout_panels_footer.tsx create mode 100644 src/plugins/index_pattern_editor/public/components/flyout_panels/flyout_panels_header.tsx create mode 100644 src/plugins/index_pattern_editor/public/components/flyout_panels/index.ts create mode 100644 src/plugins/index_pattern_editor/public/components/indices_list/__snapshots__/indices_list.test.tsx.snap create mode 100644 src/plugins/index_pattern_editor/public/components/indices_list/index.ts create mode 100644 src/plugins/index_pattern_editor/public/components/indices_list/indices_list.test.tsx create mode 100644 src/plugins/index_pattern_editor/public/components/indices_list/indices_list.tsx create mode 100644 src/plugins/index_pattern_editor/public/components/status_message/__snapshots__/status_message.test.tsx.snap create mode 100644 src/plugins/index_pattern_editor/public/components/status_message/index.ts create mode 100644 src/plugins/index_pattern_editor/public/components/status_message/status_message.test.tsx create mode 100644 src/plugins/index_pattern_editor/public/components/status_message/status_message.tsx diff --git a/src/plugins/index_pattern_editor/public/components/flyout_panels/flyout_panel.tsx b/src/plugins/index_pattern_editor/public/components/flyout_panels/flyout_panel.tsx new file mode 100644 index 0000000000000..8f9193a47327f --- /dev/null +++ b/src/plugins/index_pattern_editor/public/components/flyout_panels/flyout_panel.tsx @@ -0,0 +1,120 @@ +/* + * 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 React, { + CSSProperties, + useState, + useLayoutEffect, + useCallback, + createContext, + useContext, +} from 'react'; +import classnames from 'classnames'; +import { EuiFlexItem } from '@elastic/eui'; + +import { useFlyoutPanelsContext } from './flyout_panels'; + +interface Context { + registerFooter: () => void; + registerContent: () => void; +} + +const flyoutPanelContext = createContext({ + registerFooter: () => {}, + registerContent: () => {}, +}); + +export interface Props { + /** Width of the panel (in percent %) */ + width?: number; + /** EUI sass background */ + backgroundColor?: 'euiPageBackground' | 'euiEmptyShade'; + /** Add a border to the panel */ + border?: 'left' | 'right'; +} + +export const Panel: React.FC> = ({ + children, + width, + className = '', + backgroundColor, + border, + ...rest +}) => { + const [config, setConfig] = useState<{ hasFooter: boolean; hasContent: boolean }>({ + hasContent: false, + hasFooter: false, + }); + + /* eslint-disable @typescript-eslint/naming-convention */ + const classes = classnames('fieldEditor__flyoutPanel', className, { + 'fieldEditor__flyoutPanel--pageBackground': backgroundColor === 'euiPageBackground', + 'fieldEditor__flyoutPanel--emptyShade': backgroundColor === 'euiEmptyShade', + 'fieldEditor__flyoutPanel--leftBorder': border === 'left', + 'fieldEditor__flyoutPanel--rightBorder': border === 'right', + 'fieldEditor__flyoutPanel--withContent': config.hasContent, + }); + /* eslint-enable @typescript-eslint/naming-convention */ + + const { addPanel } = useFlyoutPanelsContext(); + + const registerContent = useCallback(() => { + setConfig((prev) => { + return { + ...prev, + hasContent: true, + }; + }); + }, []); + + const registerFooter = useCallback(() => { + setConfig((prev) => { + if (!prev.hasContent) { + throw new Error( + 'You need to add a when you add a ' + ); + } + return { + ...prev, + hasFooter: true, + }; + }); + }, []); + + useLayoutEffect(() => { + const removePanel = addPanel({ width }); + + return removePanel; + }, [width, addPanel]); + + const styles: CSSProperties = {}; + + if (width) { + styles.flexBasis = `${width}%`; + } + + return ( + + +
+ {children} +
+ + + ); +}; + +export const useFlyoutPanelContext = (): Context => { + const ctx = useContext(flyoutPanelContext); + + if (ctx === undefined) { + throw new Error('useFlyoutPanel() must be used within a '); + } + + return ctx; +}; diff --git a/src/plugins/index_pattern_editor/public/components/flyout_panels/flyout_panels.scss b/src/plugins/index_pattern_editor/public/components/flyout_panels/flyout_panels.scss new file mode 100644 index 0000000000000..ec6e84e5d4311 --- /dev/null +++ b/src/plugins/index_pattern_editor/public/components/flyout_panels/flyout_panels.scss @@ -0,0 +1,42 @@ +.fieldEditor__flyoutPanels { + height: 100%; +} + +.fieldEditor__flyoutPanel { + height: 100%; + overflow-y: auto; + padding: $euiSizeL; + + &--pageBackground { + background-color: $euiPageBackgroundColor; + } + &--emptyShade { + background-color: $euiColorEmptyShade; + } + &--leftBorder { + border-left: $euiBorderThin; + } + &--rightBorder { + border-right: $euiBorderThin; + } + &--withContent { + padding: 0; + overflow-y: hidden; + display: flex; + flex-direction: column; + } + + &__header { + padding: 0 !important; + } + + &__content { + flex: 1; + overflow-y: auto; + padding: $euiSizeL; + } + + &__footer { + flex: 0; + } +} diff --git a/src/plugins/index_pattern_editor/public/components/flyout_panels/flyout_panels.tsx b/src/plugins/index_pattern_editor/public/components/flyout_panels/flyout_panels.tsx new file mode 100644 index 0000000000000..c878090ec7c1b --- /dev/null +++ b/src/plugins/index_pattern_editor/public/components/flyout_panels/flyout_panels.tsx @@ -0,0 +1,119 @@ +/* + * 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 React, { + useState, + createContext, + useContext, + useCallback, + useMemo, + useLayoutEffect, +} from 'react'; +import { EuiFlexGroup, EuiFlexGroupProps } from '@elastic/eui'; + +import './flyout_panels.scss'; + +interface Panel { + width?: number; +} + +interface Context { + addPanel: (panel: Panel) => () => void; +} + +let idx = 0; + +const panelId = () => idx++; + +const flyoutPanelsContext = createContext({ + addPanel() { + return () => {}; + }, +}); + +export interface Props { + /** + * The total max width with all the panels in the DOM + * Corresponds to the "maxWidth" prop passed to the EuiFlyout + */ + maxWidth: number; + /** The className selector of the flyout */ + flyoutClassName: string; + /** The size between the panels. Corresponds to EuiFlexGroup gutterSize */ + gutterSize?: EuiFlexGroupProps['gutterSize']; +} + +export const Panels: React.FC = ({ maxWidth, flyoutClassName, ...props }) => { + const flyoutDOMelement = useMemo(() => { + const el = document.getElementsByClassName(flyoutClassName); + + if (el.length === 0) { + // throw new Error(`Flyout with className "${flyoutClassName}" not found.`); + return null; + } + + return el.item(0) as HTMLDivElement; + }, [flyoutClassName]); + + const [panels, setPanels] = useState<{ [id: number]: Panel }>({}); + + const removePanel = useCallback((id: number) => { + setPanels((prev) => { + const { [id]: panelToRemove, ...rest } = prev; + return rest; + }); + }, []); + + const addPanel = useCallback( + (panel: Panel) => { + const nextId = panelId(); + setPanels((prev) => { + return { ...prev, [nextId]: panel }; + }); + return removePanel.bind(null, nextId); + }, + [removePanel] + ); + + const ctx: Context = useMemo( + () => ({ + addPanel, + }), + [addPanel] + ); + + useLayoutEffect(() => { + if (!flyoutDOMelement) { + return; + } + + const totalPercentWidth = Math.min( + 100, + Object.values(panels).reduce((acc, { width = 0 }) => acc + width, 0) + ); + const currentWidth = (maxWidth * totalPercentWidth) / 100; + + flyoutDOMelement.style.maxWidth = `${currentWidth}px`; + }, [panels, maxWidth, flyoutClassName, flyoutDOMelement]); + + return ( + + + + ); +}; + +export const useFlyoutPanelsContext = (): Context => { + const ctx = useContext(flyoutPanelsContext); + + if (ctx === undefined) { + throw new Error(' must be used within a wrapper'); + } + + return ctx; +}; diff --git a/src/plugins/index_pattern_editor/public/components/flyout_panels/flyout_panels_content.tsx b/src/plugins/index_pattern_editor/public/components/flyout_panels/flyout_panels_content.tsx new file mode 100644 index 0000000000000..a25d4a03a83c8 --- /dev/null +++ b/src/plugins/index_pattern_editor/public/components/flyout_panels/flyout_panels_content.tsx @@ -0,0 +1,20 @@ +/* + * 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 React, { useEffect } from 'react'; + +import { useFlyoutPanelContext } from './flyout_panel'; + +export const PanelContent: React.FC = (props) => { + const { registerContent } = useFlyoutPanelContext(); + + useEffect(() => { + registerContent(); + }, [registerContent]); + + return
; +}; diff --git a/src/plugins/index_pattern_editor/public/components/flyout_panels/flyout_panels_footer.tsx b/src/plugins/index_pattern_editor/public/components/flyout_panels/flyout_panels_footer.tsx new file mode 100644 index 0000000000000..8a987420dd84b --- /dev/null +++ b/src/plugins/index_pattern_editor/public/components/flyout_panels/flyout_panels_footer.tsx @@ -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 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 React, { useEffect } from 'react'; +import { EuiFlyoutFooter, EuiFlyoutFooterProps } from '@elastic/eui'; + +import { useFlyoutPanelContext } from './flyout_panel'; + +export const PanelFooter: React.FC< + { children: React.ReactNode } & Omit +> = (props) => { + const { registerFooter } = useFlyoutPanelContext(); + + useEffect(() => { + registerFooter(); + }, [registerFooter]); + + return ; +}; diff --git a/src/plugins/index_pattern_editor/public/components/flyout_panels/flyout_panels_header.tsx b/src/plugins/index_pattern_editor/public/components/flyout_panels/flyout_panels_header.tsx new file mode 100644 index 0000000000000..00edf1c637fc1 --- /dev/null +++ b/src/plugins/index_pattern_editor/public/components/flyout_panels/flyout_panels_header.tsx @@ -0,0 +1,19 @@ +/* + * 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 React from 'react'; +import { EuiSpacer, EuiFlyoutHeader, EuiFlyoutHeaderProps } from '@elastic/eui'; + +export const PanelHeader: React.FunctionComponent< + { children: React.ReactNode } & Omit +> = (props) => ( + <> + + + +); diff --git a/src/plugins/index_pattern_editor/public/components/flyout_panels/index.ts b/src/plugins/index_pattern_editor/public/components/flyout_panels/index.ts new file mode 100644 index 0000000000000..9fc9a7a916f56 --- /dev/null +++ b/src/plugins/index_pattern_editor/public/components/flyout_panels/index.ts @@ -0,0 +1,21 @@ +/* + * 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 { PanelFooter } from './flyout_panels_footer'; +import { PanelHeader } from './flyout_panels_header'; +import { PanelContent } from './flyout_panels_content'; +import { Panel } from './flyout_panel'; +import { Panels } from './flyout_panels'; + +export const FlyoutPanels = { + Group: Panels, + Item: Panel, + Content: PanelContent, + Header: PanelHeader, + Footer: PanelFooter, +}; diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx index 68a19a1cf7178..8ecf8754a9777 100644 --- a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -import React, { useState, useEffect } from 'react'; +import React, { useState, useEffect, useCallback } from 'react'; import { i18n } from '@kbn/i18n'; import { EuiFlyoutHeader, @@ -17,10 +17,18 @@ import { EuiFlexItem, EuiButtonEmpty, EuiButton, + EuiSpacer, } from '@elastic/eui'; -import { ensureMinimumTime, getIndices, extractTimeFields, getMatchedIndices } from '../lib'; +import { + ensureMinimumTime, + getIndices, + extractTimeFields, + getMatchedIndices, + MatchedIndicesSet, +} from '../lib'; import { AdvancedParametersSection } from './field_editor/advanced_parameters_section'; +import { FlyoutPanels } from './flyout_panels'; import { IndexPatternSpec, @@ -45,6 +53,8 @@ import { TimestampField, TypeField, TitleField } from './form_fields'; import { EmptyState } from './empty_state'; import { EmptyIndexPatternPrompt } from './empty_index_pattern_prompt'; import { IndexPatternCreationConfig } from '../service'; +import { IndicesList } from './indices_list'; +import { StatusMessage } from './status_message'; export interface Props { /** @@ -115,12 +125,18 @@ const IndexPatternEditorFlyoutContentComponent = ({ onSave, onCancel, isSaving } }); const [lastTitle, setLastTitle] = useState(''); const [exactMatchedIndices, setExactMatchedIndices] = useState([]); - const [partialMatchedIndices, setPartialMatchedIndices] = useState([]); const [timestampFields, setTimestampFields] = useState([]); const [sources, setSources] = useState([]); const [remoteClustersExist, setRemoteClustersExist] = useState(false); const [isLoadingIndexPatterns, setIsLoadingIndexPatterns] = useState(true); const [goToForm, setGoToForm] = useState(false); + const [isInitiallyLoadingIndices, setIsInitiallyLoadingIndices] = useState(true); + const [matchedIndices, setMatchedIndices] = useState({ + allIndices: [], + exactMatchedIndices: [], + partialMatchedIndices: [], + visibleIndices: [], + }); // const [indexPatterns, setIndexPatterns] = useState([]); const [ @@ -133,17 +149,25 @@ const IndexPatternEditorFlyoutContentComponent = ({ onSave, onCancel, isSaving } const removeAliases = (item: MatchedItem) => !((item as unknown) as ResolveIndexResponseItemAlias).indices; - const loadSources = () => { - getIndices(http, () => [], '*', false).then((dataSources) => - setSources(dataSources.filter(removeAliases)) - ); + // loading main source list - but we need to filter out `.` indices + const loadSources = useCallback(() => { + getIndices(http, () => [], '*', allowHidden).then((dataSources) => { + // todo why was this being done? + // setSources(dataSources.filter(removeAliases)) + setSources(dataSources); + // todo - why two? + setIsLoadingSources(false); + setIsInitiallyLoadingIndices(false); + }); getIndices(http, () => [], '*:*', false).then((dataSources) => setRemoteClustersExist(!!dataSources.filter(removeAliases).length) ); - }; + }, [http, allowHidden]); + // loading list of index patterns useEffect(() => { let isMounted = true; + /* getIndices(http, () => [], '*', false).then(async (dataSources) => { if (isMounted) { setSources(dataSources.filter(removeAliases)); @@ -155,7 +179,8 @@ const IndexPatternEditorFlyoutContentComponent = ({ onSave, onCancel, isSaving } setRemoteClustersExist(!!dataSources.filter(removeAliases).length); } }); - + */ + loadSources(); const getTitles = async () => { const indexPatternTitles = await indexPatternService.getTitles(); if (isMounted) { @@ -167,19 +192,9 @@ const IndexPatternEditorFlyoutContentComponent = ({ onSave, onCancel, isSaving } return () => { isMounted = false; }; - }, [http, indexPatternService]); - - /* - useEffect(() => { - const getTitles = async () => { - const indexPatternTitles = await indexPatternService.getTitles(); - setExistingIndexPatterns(indexPatternTitles); - setIsLoadingIndexPatterns(false); - }; - getTitles(); - }, [indexPatternService]); - */ + }, [http, indexPatternService, loadSources]); + // updates index pattern creation type based on selection useEffect(() => { const updatedCreationType = indexPatternCreateService.creation.getType(type); setIndexPatternCreationType(updatedCreationType); @@ -190,12 +205,12 @@ const IndexPatternEditorFlyoutContentComponent = ({ onSave, onCancel, isSaving } useEffect(() => { const fetchIndices = async (query: string = '') => { + /* if (!query) { - setExactMatchedIndices([]); - setPartialMatchedIndices([]); - setTimestampFields([]); + setMatchedIndices(getMatchedIndices(sources, [], [], allowHidden)); return; } + */ // const { indexPatternCreationType } = this.props; // this.setState({ isLoadingIndices: true, indexPatternExists: false }); @@ -241,11 +256,6 @@ const IndexPatternEditorFlyoutContentComponent = ({ onSave, onCancel, isSaving } // return; // } - // this.setState({ - // partialMatchedIndices, - // exactMatchedIndices, - // isLoadingIndices: false, - // }); const isValidResult = !!title?.length && !existingIndexPatterns.includes(title) && exactMatched.length > 0; @@ -253,14 +263,15 @@ const IndexPatternEditorFlyoutContentComponent = ({ onSave, onCancel, isSaving } isSubmitted: false, isValid: isValidResult, // todo show error when index pattern already exists }); - const matchedIndices = getMatchedIndices( - [], // allIndices, + + const matchedIndicesResult = getMatchedIndices( + sources, partialMatched, exactMatched, allowHidden ); - setExactMatchedIndices(matchedIndices.exactMatchedIndices); - setPartialMatchedIndices(matchedIndices.partialMatchedIndices); + + setMatchedIndices(matchedIndicesResult); if (isValidResult) { const fields = await ensureMinimumTime( @@ -289,6 +300,7 @@ const IndexPatternEditorFlyoutContentComponent = ({ onSave, onCancel, isSaving } allowHidden, lastTitle, indexPatternCreationType, + sources, ]); const { isValid } = formState; @@ -305,7 +317,6 @@ const IndexPatternEditorFlyoutContentComponent = ({ onSave, onCancel, isSaving } }; // todo - if (isLoadingSources || isLoadingIndexPatterns) { return <>loading; } @@ -342,6 +353,46 @@ const IndexPatternEditorFlyoutContentComponent = ({ onSave, onCancel, isSaving } <> ); + const renderIndexList = () => { + // todo indexPatternExists + if (isLoadingSources) { + // || indexPatternExists) { + return <>; + } + + // const indicesToList = title?.length ? visibleIndices : sources; + const indicesToList = title?.length ? matchedIndices.visibleIndices : matchedIndices.allIndices; + return ( + + ); + }; + + const renderStatusMessage = (matched: { + allIndices: MatchedItem[]; + exactMatchedIndices: MatchedItem[]; + partialMatchedIndices: MatchedItem[]; + }) => { + // const { query, isLoadingIndices, indexPatternExists, isIncludingSystemIndices } = this.state; + // todo index patterns exist + if (isLoadingSources) { + // || indexPatternExists) { + return null; + } + + return ( + + ); + }; + return ( <> @@ -349,66 +400,77 @@ const IndexPatternEditorFlyoutContentComponent = ({ onSave, onCancel, isSaving }

Create index pattern

 - - - {/* + + + {/* */} + {/* possibly break out into own component */} - - {indexPatternTypeSelect} - - {/* Name */} - - - - - - - - - - -
{exactMatchedIndices.map((item) => item.name).join(', ')}
- + + {indexPatternTypeSelect} + {/* Name */} - - path={'allowHidden'} - component={ToggleField} - data-test-subj="allowHiddenField" - componentProps={{ - euiFieldProps: { - 'aria-label': i18n.translate('indexPatternEditor.form.allowHiddenAriaLabel', { - defaultMessage: 'Allow hidden and system indices', - }), - }, - }} - /> + - - path={'id'} - component={TextField} - data-test-subj="savedObjectIdField" - componentProps={{ - euiFieldProps: { - 'aria-label': i18n.translate( - 'indexPatternEditor.form.customIndexPatternIdLabel', - { - defaultMessage: 'Custom index pattern ID', - } - ), - }, - }} - /> + - - - +
{exactMatchedIndices.map((item) => item.name).join(', ')}
+ + + + + path={'allowHidden'} + component={ToggleField} + data-test-subj="allowHiddenField" + componentProps={{ + euiFieldProps: { + 'aria-label': i18n.translate( + 'indexPatternEditor.form.allowHiddenAriaLabel', + { + defaultMessage: 'Allow hidden and system indices', + } + ), + }, + }} + /> + + + + + + path={'id'} + component={TextField} + data-test-subj="savedObjectIdField" + componentProps={{ + euiFieldProps: { + 'aria-label': i18n.translate( + 'indexPatternEditor.form.customIndexPatternIdLabel', + { + defaultMessage: 'Custom index pattern ID', + } + ), + }, + }} + /> + + + + + {/* */} + {/* modal */} + + + {renderStatusMessage(matchedIndices)} + + {renderIndexList()} + + @@ -440,7 +502,6 @@ const IndexPatternEditorFlyoutContentComponent = ({ onSave, onCancel, isSaving } - {/* modal */} ); }; diff --git a/src/plugins/index_pattern_editor/public/components/indices_list/__snapshots__/indices_list.test.tsx.snap b/src/plugins/index_pattern_editor/public/components/indices_list/__snapshots__/indices_list.test.tsx.snap new file mode 100644 index 0000000000000..ca41dddf6197e --- /dev/null +++ b/src/plugins/index_pattern_editor/public/components/indices_list/__snapshots__/indices_list.test.tsx.snap @@ -0,0 +1,585 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`IndicesList should change pages 1`] = ` +
+ + + + + kibana + + + + + + es + + + + + + + + + + + + } + closePopover={[Function]} + display="inlineBlock" + hasArrow={true} + id="customizablePagination" + isOpen={false} + ownFocus={true} + panelPaddingSize="none" + > + + 5 + , + + 10 + , + + 20 + , + + 50 + , + ] + } + /> + + + +
+`; + +exports[`IndicesList should change per page 1`] = ` +
+ + + + + kibana + + + + + + + + + + + + } + closePopover={[Function]} + display="inlineBlock" + hasArrow={true} + id="customizablePagination" + isOpen={false} + ownFocus={true} + panelPaddingSize="none" + > + + 5 + , + + 10 + , + + 20 + , + + 50 + , + ] + } + /> + + + + + + +
+`; + +exports[`IndicesList should highlight the query in the matches 1`] = ` +
+ + + + + + + ki + + bana + + + + + + + es + + + + + + + + + + + + } + closePopover={[Function]} + display="inlineBlock" + hasArrow={true} + id="customizablePagination" + isOpen={false} + ownFocus={true} + panelPaddingSize="none" + > + + 5 + , + + 10 + , + + 20 + , + + 50 + , + ] + } + /> + + + +
+`; + +exports[`IndicesList should render normally 1`] = ` +
+ + + + + kibana + + + + + + es + + + + + + + + + + + + } + closePopover={[Function]} + display="inlineBlock" + hasArrow={true} + id="customizablePagination" + isOpen={false} + ownFocus={true} + panelPaddingSize="none" + > + + 5 + , + + 10 + , + + 20 + , + + 50 + , + ] + } + /> + + + +
+`; + +exports[`IndicesList updating props should render all new indices 1`] = ` +
+ + + + + kibana + + + + + + es + + + + + + kibana + + + + + + es + + + + + + kibana + + + + + + es + + + + + + kibana + + + + + + es + + + + + + kibana + + + + + + es + + + + + + + + + + + + } + closePopover={[Function]} + display="inlineBlock" + hasArrow={true} + id="customizablePagination" + isOpen={false} + ownFocus={true} + panelPaddingSize="none" + > + + 5 + , + + 10 + , + + 20 + , + + 50 + , + ] + } + /> + + + + + + +
+`; diff --git a/src/plugins/index_pattern_editor/public/components/indices_list/index.ts b/src/plugins/index_pattern_editor/public/components/indices_list/index.ts new file mode 100644 index 0000000000000..ea5ba5486c20e --- /dev/null +++ b/src/plugins/index_pattern_editor/public/components/indices_list/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 { IndicesList } from './indices_list'; diff --git a/src/plugins/index_pattern_editor/public/components/indices_list/indices_list.test.tsx b/src/plugins/index_pattern_editor/public/components/indices_list/indices_list.test.tsx new file mode 100644 index 0000000000000..e9ff29ad73f29 --- /dev/null +++ b/src/plugins/index_pattern_editor/public/components/indices_list/indices_list.test.tsx @@ -0,0 +1,74 @@ +/* + * 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 React from 'react'; +import { IndicesList } from '../indices_list'; +import { shallow } from 'enzyme'; +import { MatchedItem } from '../../../../types'; + +const indices = ([ + { name: 'kibana', tags: [] }, + { name: 'es', tags: [] }, +] as unknown) as MatchedItem[]; + +describe('IndicesList', () => { + it('should render normally', () => { + const component = shallow(); + + expect(component).toMatchSnapshot(); + }); + + it('should change pages', () => { + const component = shallow(); + + const instance = component.instance() as IndicesList; + + component.setState({ perPage: 1 }); + instance.onChangePage(1); + component.update(); + + expect(component).toMatchSnapshot(); + }); + + it('should change per page', () => { + const component = shallow(); + + const instance = component.instance() as IndicesList; + instance.onChangePerPage(1); + component.update(); + + expect(component).toMatchSnapshot(); + }); + + it('should highlight the query in the matches', () => { + const component = shallow(); + + expect(component).toMatchSnapshot(); + }); + + describe('updating props', () => { + it('should render all new indices', () => { + const component = shallow(); + + const moreIndices = [ + ...indices, + ...indices, + ...indices, + ...indices, + ...indices, + ...indices, + ...indices, + ...indices, + ]; + + component.setProps({ indices: moreIndices }); + component.update(); + expect(component).toMatchSnapshot(); + }); + }); +}); diff --git a/src/plugins/index_pattern_editor/public/components/indices_list/indices_list.tsx b/src/plugins/index_pattern_editor/public/components/indices_list/indices_list.tsx new file mode 100644 index 0000000000000..1e5d6ac426270 --- /dev/null +++ b/src/plugins/index_pattern_editor/public/components/indices_list/indices_list.tsx @@ -0,0 +1,199 @@ +/* + * 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 React from 'react'; + +import { + EuiBadge, + EuiFlexGroup, + EuiFlexItem, + EuiSpacer, + EuiTable, + EuiTableBody, + EuiTableRow, + EuiTableRowCell, + EuiButtonEmpty, + EuiContextMenuItem, + EuiContextMenuPanel, + EuiPagination, + EuiPopover, +} from '@elastic/eui'; + +import { Pager } from '@elastic/eui'; + +import { FormattedMessage } from '@kbn/i18n/react'; +import { MatchedItem, Tag } from '../../types'; + +interface IndicesListProps { + indices: MatchedItem[]; + query: string; +} + +interface IndicesListState { + page: number; + perPage: number; + isPerPageControlOpen: boolean; +} + +const PER_PAGE_INCREMENTS = [5, 10, 20, 50]; + +export class IndicesList extends React.Component { + pager: Pager; + constructor(props: IndicesListProps) { + super(props); + + this.state = { + page: 0, + perPage: PER_PAGE_INCREMENTS[1], + isPerPageControlOpen: false, + }; + + this.pager = new Pager(props.indices.length, this.state.perPage, this.state.page); + } + + UNSAFE_componentWillReceiveProps(nextProps: IndicesListProps) { + if (nextProps.indices.length !== this.props.indices.length) { + this.pager.setTotalItems(nextProps.indices.length); + this.resetPageTo0(); + } + } + + resetPageTo0 = () => this.onChangePage(0); + + onChangePage = (page: number) => { + this.pager.goToPageIndex(page); + this.setState({ page }); + }; + + onChangePerPage = (perPage: number) => { + this.pager.setItemsPerPage(perPage); + this.setState({ perPage }); + this.resetPageTo0(); + this.closePerPageControl(); + }; + + openPerPageControl = () => { + this.setState({ isPerPageControlOpen: true }); + }; + + closePerPageControl = () => { + this.setState({ isPerPageControlOpen: false }); + }; + + renderPagination() { + const { perPage, page, isPerPageControlOpen } = this.state; + + const button = ( + + + + ); + + const items = PER_PAGE_INCREMENTS.map((increment) => { + return ( + this.onChangePerPage(increment)} + > + {increment} + + ); + }); + + const pageCount = this.pager.getTotalPages(); + + const paginationControls = + pageCount > 1 ? ( + + + + ) : null; + + return ( + + + + + + + {paginationControls} + + ); + } + + highlightIndexName(indexName: string, query: string) { + const queryIdx = indexName.indexOf(query); + if (!query || queryIdx === -1) { + return indexName; + } + + const preStr = indexName.substr(0, queryIdx); + const postStr = indexName.substr(queryIdx + query.length); + + return ( + + {preStr} + {query} + {postStr} + + ); + } + + render() { + const { indices, query, ...rest } = this.props; + + const queryWithoutWildcard = query.endsWith('*') ? query.substr(0, query.length - 1) : query; + + const paginatedIndices = indices.slice(this.pager.firstItemIndex, this.pager.lastItemIndex + 1); + const rows = paginatedIndices.map((index, key) => { + return ( + + + {this.highlightIndexName(index.name, queryWithoutWildcard)} + + + {index.tags.map((tag: Tag) => { + return ( + + {tag.name} + + ); + })} + + + ); + }); + + return ( +
+ + {rows} + + + {this.renderPagination()} +
+ ); + } +} diff --git a/src/plugins/index_pattern_editor/public/components/status_message/__snapshots__/status_message.test.tsx.snap b/src/plugins/index_pattern_editor/public/components/status_message/__snapshots__/status_message.test.tsx.snap new file mode 100644 index 0000000000000..44b753c473803 --- /dev/null +++ b/src/plugins/index_pattern_editor/public/components/status_message/__snapshots__/status_message.test.tsx.snap @@ -0,0 +1,143 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`StatusMessage should render with exact matches 1`] = ` + +   + + + } +/> +`; + +exports[`StatusMessage should render with no partial matches 1`] = ` + + + + , + } + } + /> + + } +/> +`; + +exports[`StatusMessage should render with partial matches 1`] = ` + + + + , + } + } + /> + + } +/> +`; + +exports[`StatusMessage should render without a query 1`] = ` + + + + } +/> +`; + +exports[`StatusMessage should show that no indices exist 1`] = ` + + + + } +/> +`; + +exports[`StatusMessage should show that system indices exist 1`] = ` + + + + } +/> +`; diff --git a/src/plugins/index_pattern_editor/public/components/status_message/index.ts b/src/plugins/index_pattern_editor/public/components/status_message/index.ts new file mode 100644 index 0000000000000..32e8ed40ce8b9 --- /dev/null +++ b/src/plugins/index_pattern_editor/public/components/status_message/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 { StatusMessage } from './status_message'; diff --git a/src/plugins/index_pattern_editor/public/components/status_message/status_message.test.tsx b/src/plugins/index_pattern_editor/public/components/status_message/status_message.test.tsx new file mode 100644 index 0000000000000..6201440d5e7ff --- /dev/null +++ b/src/plugins/index_pattern_editor/public/components/status_message/status_message.test.tsx @@ -0,0 +1,123 @@ +/* + * 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 React from 'react'; +import { StatusMessage } from '../status_message'; +import { shallow } from 'enzyme'; +import { MatchedItem } from '../../../../types'; + +const tagsPartial = { + tags: [], +}; + +const matchedIndices = { + allIndices: ([ + { name: 'kibana', ...tagsPartial }, + { name: 'es', ...tagsPartial }, + ] as unknown) as MatchedItem[], + exactMatchedIndices: [] as MatchedItem[], + partialMatchedIndices: ([{ name: 'kibana', ...tagsPartial }] as unknown) as MatchedItem[], +}; + +describe('StatusMessage', () => { + it('should render without a query', () => { + const component = shallow( + + ); + + expect(component).toMatchSnapshot(); + }); + + it('should render with exact matches', () => { + const localMatchedIndices = { + ...matchedIndices, + exactMatchedIndices: ([{ name: 'kibana', ...tagsPartial }] as unknown) as MatchedItem[], + }; + + const component = shallow( + + ); + + expect(component).toMatchSnapshot(); + }); + + it('should render with partial matches', () => { + const component = shallow( + + ); + + expect(component).toMatchSnapshot(); + }); + + it('should render with no partial matches', () => { + const localMatchedIndices = { + ...matchedIndices, + partialMatchedIndices: [], + }; + + const component = shallow( + + ); + + expect(component).toMatchSnapshot(); + }); + + it('should show that system indices exist', () => { + const component = shallow( + + ); + + expect(component).toMatchSnapshot(); + }); + + it('should show that no indices exist', () => { + const component = shallow( + + ); + + expect(component).toMatchSnapshot(); + }); +}); diff --git a/src/plugins/index_pattern_editor/public/components/status_message/status_message.tsx b/src/plugins/index_pattern_editor/public/components/status_message/status_message.tsx new file mode 100644 index 0000000000000..ecca40b6886aa --- /dev/null +++ b/src/plugins/index_pattern_editor/public/components/status_message/status_message.tsx @@ -0,0 +1,165 @@ +/* + * 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 React from 'react'; + +import { EuiCallOut } from '@elastic/eui'; +import { EuiIconType } from '@elastic/eui/src/components/icon/icon'; + +import { FormattedMessage } from '@kbn/i18n/react'; +import { MatchedItem } from '../../types'; + +interface StatusMessageProps { + matchedIndices: { + allIndices: MatchedItem[]; + exactMatchedIndices: MatchedItem[]; + partialMatchedIndices: MatchedItem[]; + }; + isIncludingSystemIndices: boolean; + query: string; + showSystemIndices: boolean; +} + +export const StatusMessage: React.FC = ({ + matchedIndices: { allIndices = [], exactMatchedIndices = [], partialMatchedIndices = [] }, + isIncludingSystemIndices, + query, + showSystemIndices, +}) => { + let statusIcon: EuiIconType | undefined; + let statusMessage; + let statusColor: 'primary' | 'success' | 'warning' | undefined; + + const allIndicesLength = allIndices.length; + + if (query.length === 0) { + statusIcon = undefined; + statusColor = 'primary'; + + if (allIndicesLength >= 1) { + statusMessage = ( + + + + ); + } else if (!isIncludingSystemIndices && showSystemIndices) { + statusMessage = ( + + + + ); + } else { + statusMessage = ( + + + + ); + } + } else if (exactMatchedIndices.length) { + statusIcon = 'check'; + statusColor = 'success'; + statusMessage = ( + +   + + + ); + } else if (partialMatchedIndices.length) { + statusIcon = undefined; + statusColor = 'primary'; + statusMessage = ( + + + + + ), + }} + /> + + ); + } else { + statusIcon = undefined; + statusColor = 'warning'; + statusMessage = ( + + + + + ), + indicesLength: allIndicesLength, + }} + /> + + ); + } + + return ( + + ); +}; diff --git a/src/plugins/index_pattern_editor/public/constants.ts b/src/plugins/index_pattern_editor/public/constants.ts index 17b9068454139..ff74e0827fa50 100644 --- a/src/plugins/index_pattern_editor/public/constants.ts +++ b/src/plugins/index_pattern_editor/public/constants.ts @@ -7,5 +7,5 @@ */ export const pluginName = 'index_pattern_editor'; -export const MAX_NUMBER_OF_MATCHING_INDICES = 6; +export const MAX_NUMBER_OF_MATCHING_INDICES = 100; export const CONFIG_ROLLUPS = 'rollups:enableIndexPatterns'; diff --git a/src/plugins/index_pattern_editor/public/lib/get_matched_indices.ts b/src/plugins/index_pattern_editor/public/lib/get_matched_indices.ts index e9b365474425b..57c951c80c6a6 100644 --- a/src/plugins/index_pattern_editor/public/lib/get_matched_indices.ts +++ b/src/plugins/index_pattern_editor/public/lib/get_matched_indices.ts @@ -23,10 +23,6 @@ function isSystemIndex(index: string): boolean { } function filterSystemIndices(indices: MatchedItem[], isIncludingSystemIndices: boolean) { - if (!indices) { - return indices; - } - const acceptableIndices = isIncludingSystemIndices ? indices : // All system indices begin with a period. @@ -56,12 +52,19 @@ function filterSystemIndices(indices: MatchedItem[], isIncludingSystemIndices: b import { MatchedItem } from '../types'; +export interface MatchedIndicesSet { + allIndices: MatchedItem[]; + exactMatchedIndices: MatchedItem[]; + partialMatchedIndices: MatchedItem[]; + visibleIndices: MatchedItem[]; +} + export function getMatchedIndices( unfilteredAllIndices: MatchedItem[], unfilteredPartialMatchedIndices: MatchedItem[], unfilteredExactMatchedIndices: MatchedItem[], isIncludingSystemIndices: boolean = false -) { +): MatchedIndicesSet { const allIndices = filterSystemIndices(unfilteredAllIndices, isIncludingSystemIndices); const partialMatchedIndices = filterSystemIndices( unfilteredPartialMatchedIndices, diff --git a/src/plugins/index_pattern_editor/public/lib/index.ts b/src/plugins/index_pattern_editor/public/lib/index.ts index 371712b70a0d2..8e1ed7b95aa44 100644 --- a/src/plugins/index_pattern_editor/public/lib/index.ts +++ b/src/plugins/index_pattern_editor/public/lib/index.ts @@ -12,7 +12,7 @@ export { ensureMinimumTime } from './ensure_minimum_time'; export { getIndices } from './get_indices'; -export { getMatchedIndices } from './get_matched_indices'; +export { getMatchedIndices, MatchedIndicesSet } from './get_matched_indices'; export { containsIllegalCharacters } from './contains_illegal_characters'; From 5bdf45211bede3623acb498288e7f15feb3c141e Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Tue, 22 Jun 2021 10:38:14 -0500 Subject: [PATCH 028/130] fix functional tests by bringing buttons back into view --- .../index_pattern_editor_flyout_content.tsx | 73 +++++++++---------- 1 file changed, 36 insertions(+), 37 deletions(-) diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx index 8ecf8754a9777..6b352d3317108 100644 --- a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx @@ -395,17 +395,16 @@ const IndexPatternEditorFlyoutContentComponent = ({ onSave, onCancel, isSaving } return ( <> - - -

Create index pattern

- - - {/* */} {/* possibly break out into own component */} + {/* */} + +

Create index pattern

+ + {/* */}
{indexPatternTypeSelect} @@ -464,6 +463,37 @@ const IndexPatternEditorFlyoutContentComponent = ({ onSave, onCancel, isSaving } {/*
*/} {/* modal */} + + + + + {i18nTexts.closeButtonLabel} + + + + + + {i18nTexts.saveButtonLabel} + + + + {renderStatusMessage(matchedIndices)} @@ -471,37 +501,6 @@ const IndexPatternEditorFlyoutContentComponent = ({ onSave, onCancel, isSaving } {renderIndexList()} - - - - - {i18nTexts.closeButtonLabel} - - - - - - {i18nTexts.saveButtonLabel} - - - - ); }; From b252c06b4e73f4305a5aa4bed0a127777d418bb4 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Tue, 22 Jun 2021 17:44:12 -0500 Subject: [PATCH 029/130] set flyout size, nav to create rollup kip, show loading indicator --- packages/kbn-optimizer/limits.yml | 2 +- .../components/form_fields/type_field.tsx | 32 +++++++- .../components/index_pattern_editor.tsx | 16 +++- .../index_pattern_editor_flyout_content.tsx | 79 ++++++++++--------- ...index_pattern_flyout_content_container.tsx | 8 +- .../loading_indices.test.tsx.snap | 35 ++++++++ .../components/loading_indices/index.ts | 9 +++ .../loading_indices/loading_indices.test.tsx | 19 +++++ .../loading_indices/loading_indices.tsx | 37 +++++++++ .../public/lib/extract_time_fields.ts | 10 +-- .../public/open_editor.tsx | 3 +- .../index_pattern_table.tsx | 20 ++--- 12 files changed, 201 insertions(+), 69 deletions(-) create mode 100644 src/plugins/index_pattern_editor/public/components/loading_indices/__snapshots__/loading_indices.test.tsx.snap create mode 100644 src/plugins/index_pattern_editor/public/components/loading_indices/index.ts create mode 100644 src/plugins/index_pattern_editor/public/components/loading_indices/loading_indices.test.tsx create mode 100644 src/plugins/index_pattern_editor/public/components/loading_indices/loading_indices.tsx diff --git a/packages/kbn-optimizer/limits.yml b/packages/kbn-optimizer/limits.yml index c94278226a7de..3373aea567642 100644 --- a/packages/kbn-optimizer/limits.yml +++ b/packages/kbn-optimizer/limits.yml @@ -33,7 +33,7 @@ pageLoadAssetSize: indexLifecycleManagement: 107090 indexManagement: 140608 indexPatternManagement: 28222 - indexPatternEditor: 70000 + indexPatternEditor: 90000 infra: 184320 fleet: 465774 ingestPipelines: 58003 diff --git a/src/plugins/index_pattern_editor/public/components/form_fields/type_field.tsx b/src/plugins/index_pattern_editor/public/components/form_fields/type_field.tsx index 5dda9765f8735..e70d5b447186e 100644 --- a/src/plugins/index_pattern_editor/public/components/form_fields/type_field.tsx +++ b/src/plugins/index_pattern_editor/public/components/form_fields/type_field.tsx @@ -28,12 +28,38 @@ import { IndexPatternConfig } from '../index_pattern_editor_flyout_content'; const standardSelectItem = ( - Standard + + + + + + +); + +const rollupSelectItem = ( + + + +   - Description + + + ); @@ -55,7 +81,7 @@ export const TypeField = () => { inputDisplay: 'Standard', dropdownDisplay: standardSelectItem, }, - { value: 'rollup', inputDisplay: 'Rollup' }, + { value: 'rollup', inputDisplay: 'Rollup', dropdownDisplay: rollupSelectItem }, ]} valueOfSelected={value} onChange={(newValue) => { diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_editor.tsx b/src/plugins/index_pattern_editor/public/components/index_pattern_editor.tsx index 11c72fc8a95d2..dc77a9408ecf3 100644 --- a/src/plugins/index_pattern_editor/public/components/index_pattern_editor.tsx +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_editor.tsx @@ -16,17 +16,27 @@ export interface IndexPatternEditorProps { onSave: (indexPattern: IndexPattern) => void; closeEditor: () => void; services: IndexPatternEditorContext; + defaultTypeIsRollup?: boolean; } -export const IndexPatternEditor = ({ onSave, closeEditor, services }: IndexPatternEditorProps) => { +export const IndexPatternEditor = ({ + onSave, + closeEditor, + services, + defaultTypeIsRollup, +}: IndexPatternEditorProps) => { const { Provider: KibanaReactContextProvider, } = createKibanaReactContext(services); return ( - - + + ); diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx index 6b352d3317108..94d03b2173203 100644 --- a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx @@ -55,6 +55,7 @@ import { EmptyIndexPatternPrompt } from './empty_index_pattern_prompt'; import { IndexPatternCreationConfig } from '../service'; import { IndicesList } from './indices_list'; import { StatusMessage } from './status_message'; +import { LoadingIndices } from './loading_indices'; export interface Props { /** @@ -69,6 +70,7 @@ export interface Props { // uiSettings: CoreStart['uiSettings']; isSaving: boolean; existingIndexPatterns: string[]; + defaultTypeIsRollup?: boolean; } export interface IndexPatternConfig { @@ -81,7 +83,6 @@ export interface IndexPatternConfig { export interface TimestampOption { display: string; fieldName?: string; - isDisabled?: boolean; } export interface FormInternal extends Omit { @@ -94,12 +95,17 @@ const geti18nTexts = () => { defaultMessage: 'Close', }), saveButtonLabel: i18n.translate('indexPatternEditor.editor.flyoutSaveButtonLabel', { - defaultMessage: 'Save', + defaultMessage: 'Create index pattern', }), }; }; -const IndexPatternEditorFlyoutContentComponent = ({ onSave, onCancel, isSaving }: Props) => { +const IndexPatternEditorFlyoutContentComponent = ({ + onSave, + onCancel, + isSaving, + defaultTypeIsRollup, +}: Props) => { const { services: { http, indexPatternService, uiSettings, indexPatternCreateService }, } = useKibana(); @@ -107,11 +113,11 @@ const IndexPatternEditorFlyoutContentComponent = ({ onSave, onCancel, isSaving } // return type, interal type const { form } = useForm({ - defaultValue: { title: '' }, + defaultValue: { type: defaultTypeIsRollup ? 'rollup' : 'default' }, schema, }); - const [{ title, allowHidden, type }] = useFormData({ form }); + const [{ title, allowHidden, type, timestampField }] = useFormData({ form }); const [isLoadingSources, setIsLoadingSources] = useState(true); const [formState, setFormState] = useState<{ isSubmitted: boolean; isValid: boolean }>({ @@ -124,8 +130,7 @@ const IndexPatternEditorFlyoutContentComponent = ({ onSave, onCancel, isSaving } */ }); const [lastTitle, setLastTitle] = useState(''); - const [exactMatchedIndices, setExactMatchedIndices] = useState([]); - const [timestampFields, setTimestampFields] = useState([]); + const [timestampFieldOptions, setTimestampFieldOptions] = useState([]); const [sources, setSources] = useState([]); const [remoteClustersExist, setRemoteClustersExist] = useState(false); const [isLoadingIndexPatterns, setIsLoadingIndexPatterns] = useState(true); @@ -149,7 +154,6 @@ const IndexPatternEditorFlyoutContentComponent = ({ onSave, onCancel, isSaving } const removeAliases = (item: MatchedItem) => !((item as unknown) as ResolveIndexResponseItemAlias).indices; - // loading main source list - but we need to filter out `.` indices const loadSources = useCallback(() => { getIndices(http, () => [], '*', allowHidden).then((dataSources) => { // todo why was this being done? @@ -167,19 +171,6 @@ const IndexPatternEditorFlyoutContentComponent = ({ onSave, onCancel, isSaving } // loading list of index patterns useEffect(() => { let isMounted = true; - /* - getIndices(http, () => [], '*', false).then(async (dataSources) => { - if (isMounted) { - setSources(dataSources.filter(removeAliases)); - setIsLoadingSources(false); - } - }); - getIndices(http, () => [], '*:*', false).then((dataSources) => { - if (isMounted) { - setRemoteClustersExist(!!dataSources.filter(removeAliases).length); - } - }); - */ loadSources(); const getTitles = async () => { const indexPatternTitles = await indexPatternService.getTitles(); @@ -203,6 +194,7 @@ const IndexPatternEditorFlyoutContentComponent = ({ onSave, onCancel, isSaving } } }, [type, indexPatternCreateService.creation, form]); + // fetches indices and timestamp options useEffect(() => { const fetchIndices = async (query: string = '') => { /* @@ -281,9 +273,9 @@ const IndexPatternEditorFlyoutContentComponent = ({ onSave, onCancel, isSaving } }) ); const timeFields = extractTimeFields(fields); - setTimestampFields(timeFields); + setTimestampFieldOptions(timeFields); } else { - setTimestampFields([]); + setTimestampFieldOptions([]); } }; @@ -301,12 +293,13 @@ const IndexPatternEditorFlyoutContentComponent = ({ onSave, onCancel, isSaving } lastTitle, indexPatternCreationType, sources, + form, ]); const { isValid } = formState; const onClickSave = async () => { // todo display result - indexPatternCreationType.checkIndicesForErrors(exactMatchedIndices); + indexPatternCreationType.checkIndicesForErrors(matchedIndices.exactMatchedIndices); const formData = form.getFormData(); await onSave({ title: formData.title, @@ -377,7 +370,8 @@ const IndexPatternEditorFlyoutContentComponent = ({ onSave, onCancel, isSaving } partialMatchedIndices: MatchedItem[]; }) => { // const { query, isLoadingIndices, indexPatternExists, isIncludingSystemIndices } = this.state; - // todo index patterns exist + // todo previously this code wouldn't show the status message if it was a dupe index pattern + // but I think we should just go ahead if (isLoadingSources) { // || indexPatternExists) { return null; @@ -393,6 +387,25 @@ const IndexPatternEditorFlyoutContentComponent = ({ onSave, onCancel, isSaving } ); }; + const disableSubmit = + !isValid || + !matchedIndices.exactMatchedIndices.length || + // todo display errors + !!indexPatternCreationType.checkIndicesForErrors(matchedIndices.exactMatchedIndices) || + (!!timestampFieldOptions.length && timestampField === undefined) || + // todo display error + existingIndexPatterns.includes(title); + + const previewPanelContent = isLoadingIndexPatterns ? ( + + ) : ( + <> + {renderStatusMessage(matchedIndices)} + + {renderIndexList()} + + ); + return ( <> @@ -415,11 +428,11 @@ const IndexPatternEditorFlyoutContentComponent = ({ onSave, onCancel, isSaving } - + -
{exactMatchedIndices.map((item) => item.name).join(', ')}
+
{matchedIndices.exactMatchedIndices.map((item) => item.name).join(', ')}
@@ -482,11 +495,7 @@ const IndexPatternEditorFlyoutContentComponent = ({ onSave, onCancel, isSaving } onClick={onClickSave} data-test-subj="saveIndexPatternButton" fill - disabled={ - !isValid || - !exactMatchedIndices.length || - !!indexPatternCreationType.checkIndicesForErrors(exactMatchedIndices) // todo display errors - } + disabled={disableSubmit} // isLoading={isSavingField || isValidating} > {i18nTexts.saveButtonLabel} @@ -495,11 +504,7 @@ const IndexPatternEditorFlyoutContentComponent = ({ onSave, onCancel, isSaving } - - {renderStatusMessage(matchedIndices)} - - {renderIndexList()} - + {previewPanelContent} ); diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_flyout_content_container.tsx b/src/plugins/index_pattern_editor/public/components/index_pattern_flyout_content_container.tsx index 5816fd2353809..323c2406e8253 100644 --- a/src/plugins/index_pattern_editor/public/components/index_pattern_flyout_content_container.tsx +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_flyout_content_container.tsx @@ -25,6 +25,7 @@ export interface Props { * Handler for the "cancel" footer button */ onCancel: () => void; + defaultTypeIsRollup?: boolean; } /** @@ -34,7 +35,11 @@ export interface Props { * anything about where a field comes from and where it should be persisted. */ -export const IndexPatternFlyoutContentContainer = ({ onSave, onCancel }: Props) => { +export const IndexPatternFlyoutContentContainer = ({ + onSave, + onCancel, + defaultTypeIsRollup, +}: Props) => { const { services: { indexPatternService, notifications }, } = useKibana(); @@ -71,6 +76,7 @@ export const IndexPatternFlyoutContentContainer = ({ onSave, onCancel }: Props) onCancel={onCancel} isSaving={false} existingIndexPatterns={existingIndexPatterns} + defaultTypeIsRollup={defaultTypeIsRollup} /> ); }; diff --git a/src/plugins/index_pattern_editor/public/components/loading_indices/__snapshots__/loading_indices.test.tsx.snap b/src/plugins/index_pattern_editor/public/components/loading_indices/__snapshots__/loading_indices.test.tsx.snap new file mode 100644 index 0000000000000..a5517f6d4b616 --- /dev/null +++ b/src/plugins/index_pattern_editor/public/components/loading_indices/__snapshots__/loading_indices.test.tsx.snap @@ -0,0 +1,35 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`LoadingIndices should render normally 1`] = ` + + + +

+ +

+ + + + + + +`; diff --git a/src/plugins/index_pattern_editor/public/components/loading_indices/index.ts b/src/plugins/index_pattern_editor/public/components/loading_indices/index.ts new file mode 100644 index 0000000000000..fc8b8d8e1e946 --- /dev/null +++ b/src/plugins/index_pattern_editor/public/components/loading_indices/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 { LoadingIndices } from './loading_indices'; diff --git a/src/plugins/index_pattern_editor/public/components/loading_indices/loading_indices.test.tsx b/src/plugins/index_pattern_editor/public/components/loading_indices/loading_indices.test.tsx new file mode 100644 index 0000000000000..e2b5b51402060 --- /dev/null +++ b/src/plugins/index_pattern_editor/public/components/loading_indices/loading_indices.test.tsx @@ -0,0 +1,19 @@ +/* + * 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 React from 'react'; +import { LoadingIndices } from '../loading_indices'; +import { shallow } from 'enzyme'; + +describe('LoadingIndices', () => { + it('should render normally', () => { + const component = shallow(); + + expect(component).toMatchSnapshot(); + }); +}); diff --git a/src/plugins/index_pattern_editor/public/components/loading_indices/loading_indices.tsx b/src/plugins/index_pattern_editor/public/components/loading_indices/loading_indices.tsx new file mode 100644 index 0000000000000..14ae51567938d --- /dev/null +++ b/src/plugins/index_pattern_editor/public/components/loading_indices/loading_indices.tsx @@ -0,0 +1,37 @@ +/* + * 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 React from 'react'; + +import { EuiFlexGroup, EuiFlexItem, EuiTitle, EuiLoadingSpinner } from '@elastic/eui'; + +import { FormattedMessage } from '@kbn/i18n/react'; + +export const LoadingIndices = ({ ...rest }) => ( + + + +

+ +

+ + + + + + +); diff --git a/src/plugins/index_pattern_editor/public/lib/extract_time_fields.ts b/src/plugins/index_pattern_editor/public/lib/extract_time_fields.ts index cb861ae48a151..4c521f8eb2687 100644 --- a/src/plugins/index_pattern_editor/public/lib/extract_time_fields.ts +++ b/src/plugins/index_pattern_editor/public/lib/extract_time_fields.ts @@ -24,20 +24,15 @@ export function extractTimeFields(fields: IFieldType[]): TimestampOption[] { ]; } - const disabledDividerOption = { - isDisabled: true, - display: '───', - fieldName: '', - }; const noTimeFieldLabel = i18n.translate( 'indexPatternEditor.createIndexPattern.stepTime.noTimeFieldOptionLabel', { - defaultMessage: "I don't want to use the time filter", + defaultMessage: "--- I don't want to use the time filter ---", } ); const noTimeFieldOption = { display: noTimeFieldLabel, - fieldName: undefined, + fieldName: '', }; return [ @@ -45,7 +40,6 @@ export function extractTimeFields(fields: IFieldType[]): TimestampOption[] { display: field.name, fieldName: field.name, })), - disabledDividerOption, noTimeFieldOption, ]; } diff --git a/src/plugins/index_pattern_editor/public/open_editor.tsx b/src/plugins/index_pattern_editor/public/open_editor.tsx index 8f73972c531c6..fd4f691c1566b 100644 --- a/src/plugins/index_pattern_editor/public/open_editor.tsx +++ b/src/plugins/index_pattern_editor/public/open_editor.tsx @@ -76,7 +76,8 @@ export const getEditorOpener = ({ ), { - // hideCloseButton: true, + hideCloseButton: true, + size: 'l', } ); diff --git a/src/plugins/index_pattern_management/public/components/index_pattern_table/index_pattern_table.tsx b/src/plugins/index_pattern_management/public/components/index_pattern_table/index_pattern_table.tsx index d60a2e7b3095b..ef909a913f71e 100644 --- a/src/plugins/index_pattern_management/public/components/index_pattern_table/index_pattern_table.tsx +++ b/src/plugins/index_pattern_management/public/components/index_pattern_table/index_pattern_table.tsx @@ -16,12 +16,12 @@ import { EuiSpacer, } from '@elastic/eui'; import { FormattedMessage } from '@kbn/i18n/react'; -import { RouteComponentProps, withRouter } from 'react-router-dom'; +import { RouteComponentProps, withRouter, useLocation } from 'react-router-dom'; import React, { useEffect, useState } from 'react'; import { i18n } from '@kbn/i18n'; import { reactRouterNavigate, useKibana } from '../../../../../plugins/kibana_react/public'; import { IndexPatternManagmentContext } from '../../types'; -import { IndexPatternCreationOption, IndexPatternTableItem } from '../types'; +import { IndexPatternTableItem } from '../types'; import { getIndexPatterns } from '../utils'; import { getListBreadcrumbs } from '../breadcrumbs'; import { IndexPatternEditor } from '../../../../index_pattern_editor/public'; @@ -94,6 +94,8 @@ export const IndexPatternTable = ({ chrome.docTitle.change(title); + const isRollup = new URLSearchParams(useLocation().search).get('type') === 'rollup'; + const columns = [ { field: 'title', @@ -126,19 +128,6 @@ export const IndexPatternTable = ({ }, ]; - /* - const createButton = canSave ? ( - - - - ) : ( - <> - ); - */ - const createButton = canSave ? ( ) : ( <> From 55810763cab909d168a2b82f7bcff6f122d0791c Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Tue, 22 Jun 2021 21:47:34 -0500 Subject: [PATCH 030/130] time field improvements, code cleanup --- .../form_fields/timestamp_field.tsx | 73 +++++---- .../public/components/index.ts | 10 ++ .../index_pattern_editor_flyout_content.tsx | 150 +++++++----------- ...index_pattern_flyout_content_container.tsx | 4 - .../public/lib/extract_time_fields.ts | 10 +- 5 files changed, 116 insertions(+), 131 deletions(-) diff --git a/src/plugins/index_pattern_editor/public/components/form_fields/timestamp_field.tsx b/src/plugins/index_pattern_editor/public/components/form_fields/timestamp_field.tsx index b11486dffcf8a..c12f48db4cbf3 100644 --- a/src/plugins/index_pattern_editor/public/components/form_fields/timestamp_field.tsx +++ b/src/plugins/index_pattern_editor/public/components/form_fields/timestamp_field.tsx @@ -9,7 +9,7 @@ import React from 'react'; import { i18n } from '@kbn/i18n'; -import { EuiFormRow, EuiComboBox } from '@elastic/eui'; +import { EuiFormRow, EuiComboBox, EuiFormHelpText } from '@elastic/eui'; import { UseField } from '../../shared_imports'; @@ -17,9 +17,15 @@ import { TimestampOption } from '../index_pattern_editor_flyout_content'; interface Props { options: TimestampOption[]; + isLoadingOptions: boolean; + helpText: string; } -export const TimestampField = ({ options = [] }: Props) => { +export const TimestampField = ({ + options = [], + helpText = '', + isLoadingOptions = false, +}: Props) => { const optionsAsComboBoxOptions = options.map(({ display, fieldName }) => ({ label: display, value: fieldName, @@ -31,38 +37,43 @@ export const TimestampField = ({ options = [] }: Props) => { if (value === undefined) { return null; } + return ( <> - - placeholder={i18n.translate( - 'indexPatternEditor.editor.form.runtimeType.placeholderLabel', - { - defaultMessage: 'Select a timestamp field', - } - )} - singleSelection={{ asPlainText: true }} - options={optionsAsComboBoxOptions} - selectedOptions={[{ label: value }]} - onChange={(newValue) => { - if (newValue.length === 0) { - // Don't allow clearing the type. One must always be selected - return; - } - // - setValue(newValue[0].label); - }} - isClearable={false} - isDisabled={!optionsAsComboBoxOptions.length} - data-test-subj="timestampField" - aria-label={i18n.translate( - 'indexPatternEditor.editor.form.timestampSelectAriaLabel', - { - defaultMessage: 'Timestamp field', - } - )} - fullWidth - /> + <> + + placeholder={i18n.translate( + 'indexPatternEditor.editor.form.runtimeType.placeholderLabel', + { + defaultMessage: 'Select a timestamp field', + } + )} + singleSelection={{ asPlainText: true }} + options={optionsAsComboBoxOptions} + selectedOptions={[{ label: value }]} + onChange={(newValue) => { + if (newValue.length === 0) { + // Don't allow clearing the type. One must always be selected + return; + } + // + setValue(newValue[0].label); + }} + isClearable={false} + isDisabled={!optionsAsComboBoxOptions.length} + data-test-subj="timestampField" + aria-label={i18n.translate( + 'indexPatternEditor.editor.form.timestampSelectAriaLabel', + { + defaultMessage: 'Timestamp field', + } + )} + isLoading={isLoadingOptions} + fullWidth + /> + {helpText || <> } + ); diff --git a/src/plugins/index_pattern_editor/public/components/index.ts b/src/plugins/index_pattern_editor/public/components/index.ts index b7e2e031c352e..d266e62550ece 100644 --- a/src/plugins/index_pattern_editor/public/components/index.ts +++ b/src/plugins/index_pattern_editor/public/components/index.ts @@ -17,3 +17,13 @@ export { } from './index_pattern_flyout_content_container'; export { IndexPatternEditor } from './index_pattern_editor'; + +export { schema } from './form_schema'; +export { TimestampField, TypeField, TitleField } from './form_fields'; +export { EmptyState } from './empty_state'; +export { EmptyIndexPatternPrompt } from './empty_index_pattern_prompt'; +export { IndexPatternCreationConfig } from '../service'; +export { IndicesList } from './indices_list'; +export { StatusMessage } from './status_message'; +export { LoadingIndices } from './loading_indices'; +export { geti18nTexts } from './i18n_texts'; diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx index 94d03b2173203..7fb7033e303bb 100644 --- a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx @@ -7,10 +7,7 @@ */ import React, { useState, useEffect, useCallback } from 'react'; -import { i18n } from '@kbn/i18n'; import { - EuiFlyoutHeader, - EuiFlyoutBody, EuiFlyoutFooter, EuiTitle, EuiFlexGroup, @@ -18,18 +15,9 @@ import { EuiButtonEmpty, EuiButton, EuiSpacer, + EuiLoadingSpinner, } from '@elastic/eui'; -import { - ensureMinimumTime, - getIndices, - extractTimeFields, - getMatchedIndices, - MatchedIndicesSet, -} from '../lib'; -import { AdvancedParametersSection } from './field_editor/advanced_parameters_section'; -import { FlyoutPanels } from './flyout_panels'; - import { IndexPatternSpec, Form, @@ -42,20 +30,30 @@ import { } from '../shared_imports'; import { - MatchedItem, - ResolveIndexResponseItemAlias, - // IndexPatternTableItem, - IndexPatternEditorContext, -} from '../types'; - -import { schema } from './form_schema'; -import { TimestampField, TypeField, TitleField } from './form_fields'; -import { EmptyState } from './empty_state'; -import { EmptyIndexPatternPrompt } from './empty_index_pattern_prompt'; + ensureMinimumTime, + getIndices, + extractTimeFields, + getMatchedIndices, + MatchedIndicesSet, +} from '../lib'; +import { AdvancedParametersSection } from './field_editor/advanced_parameters_section'; +import { FlyoutPanels } from './flyout_panels'; + +import { MatchedItem, ResolveIndexResponseItemAlias, IndexPatternEditorContext } from '../types'; + import { IndexPatternCreationConfig } from '../service'; -import { IndicesList } from './indices_list'; -import { StatusMessage } from './status_message'; -import { LoadingIndices } from './loading_indices'; +import { + LoadingIndices, + StatusMessage, + IndicesList, + EmptyIndexPatternPrompt, + EmptyState, + TimestampField, + TypeField, + TitleField, + schema, + geti18nTexts, +} from '.'; export interface Props { /** @@ -66,16 +64,13 @@ export interface Props { * Handler for the "cancel" footer button */ onCancel: () => void; - - // uiSettings: CoreStart['uiSettings']; - isSaving: boolean; existingIndexPatterns: string[]; defaultTypeIsRollup?: boolean; } export interface IndexPatternConfig { title: string; - timestampField?: string; // TimestampOption; + timestampField?: string; allowHidden: boolean; id?: string; type: string; @@ -89,26 +84,15 @@ export interface FormInternal extends Omit timestampField?: TimestampOption; } -const geti18nTexts = () => { - return { - closeButtonLabel: i18n.translate('indexPatternEditor.editor.flyoutCloseButtonLabel', { - defaultMessage: 'Close', - }), - saveButtonLabel: i18n.translate('indexPatternEditor.editor.flyoutSaveButtonLabel', { - defaultMessage: 'Create index pattern', - }), - }; -}; - const IndexPatternEditorFlyoutContentComponent = ({ onSave, onCancel, - isSaving, defaultTypeIsRollup, }: Props) => { const { services: { http, indexPatternService, uiSettings, indexPatternCreateService }, } = useKibana(); + const i18nTexts = geti18nTexts(); // return type, interal type @@ -131,37 +115,32 @@ const IndexPatternEditorFlyoutContentComponent = ({ }); const [lastTitle, setLastTitle] = useState(''); const [timestampFieldOptions, setTimestampFieldOptions] = useState([]); - const [sources, setSources] = useState([]); + const [isLoadingTimestampFields, setIsLoadingTimestampFields] = useState(false); + const [isLoadingMatchedIndices, setIsLoadingMatchedIndices] = useState(false); + const [allSources, setAllSources] = useState([]); const [remoteClustersExist, setRemoteClustersExist] = useState(false); const [isLoadingIndexPatterns, setIsLoadingIndexPatterns] = useState(true); const [goToForm, setGoToForm] = useState(false); - const [isInitiallyLoadingIndices, setIsInitiallyLoadingIndices] = useState(true); + const [existingIndexPatterns, setExistingIndexPatterns] = useState([]); const [matchedIndices, setMatchedIndices] = useState({ allIndices: [], exactMatchedIndices: [], partialMatchedIndices: [], visibleIndices: [], }); - - // const [indexPatterns, setIndexPatterns] = useState([]); const [ indexPatternCreationType, setIndexPatternCreationType, ] = useState(indexPatternCreateService.creation.getType('default')); - const [existingIndexPatterns, setExistingIndexPatterns] = useState([]); - const removeAliases = (item: MatchedItem) => !((item as unknown) as ResolveIndexResponseItemAlias).indices; + // load all data sources const loadSources = useCallback(() => { getIndices(http, () => [], '*', allowHidden).then((dataSources) => { - // todo why was this being done? - // setSources(dataSources.filter(removeAliases)) - setSources(dataSources); - // todo - why two? + setAllSources(dataSources); setIsLoadingSources(false); - setIsInitiallyLoadingIndices(false); }); getIndices(http, () => [], '*:*', false).then((dataSources) => setRemoteClustersExist(!!dataSources.filter(removeAliases).length) @@ -197,15 +176,7 @@ const IndexPatternEditorFlyoutContentComponent = ({ // fetches indices and timestamp options useEffect(() => { const fetchIndices = async (query: string = '') => { - /* - if (!query) { - setMatchedIndices(getMatchedIndices(sources, [], [], allowHidden)); - return; - } - */ - // const { indexPatternCreationType } = this.props; - - // this.setState({ isLoadingIndices: true, indexPatternExists: false }); + setIsLoadingMatchedIndices(true); const indexRequests = []; if (query?.endsWith('*')) { @@ -235,18 +206,13 @@ const IndexPatternEditorFlyoutContentComponent = ({ indexRequests.push(partialMatchQuery); } - if (query !== lastTitle) { - return; - } const [exactMatched, partialMatched] = (await ensureMinimumTime( indexRequests )) as MatchedItem[][]; - // If the search changed, discard this state - - // if (query !== this.lastQuery) { - // return; - // } + if (query !== lastTitle) { + return; + } const isValidResult = !!title?.length && !existingIndexPatterns.includes(title) && exactMatched.length > 0; @@ -257,15 +223,17 @@ const IndexPatternEditorFlyoutContentComponent = ({ }); const matchedIndicesResult = getMatchedIndices( - sources, + allSources, partialMatched, exactMatched, allowHidden ); setMatchedIndices(matchedIndicesResult); + setIsLoadingMatchedIndices(false); if (isValidResult) { + setIsLoadingTimestampFields(true); const fields = await ensureMinimumTime( indexPatternService.getFieldsForWildcard({ pattern: query, @@ -273,16 +241,14 @@ const IndexPatternEditorFlyoutContentComponent = ({ }) ); const timeFields = extractTimeFields(fields); + setIsLoadingTimestampFields(false); setTimestampFieldOptions(timeFields); } else { setTimestampFieldOptions([]); } }; - // Whenever the field "type" changes we clear any possible painless syntax - // error as it is possibly stale. setLastTitle(title); - fetchIndices(title); }, [ title, @@ -292,7 +258,7 @@ const IndexPatternEditorFlyoutContentComponent = ({ allowHidden, lastTitle, indexPatternCreationType, - sources, + allSources, form, ]); @@ -311,10 +277,10 @@ const IndexPatternEditorFlyoutContentComponent = ({ // todo if (isLoadingSources || isLoadingIndexPatterns) { - return <>loading; + return ; } - const hasDataIndices = sources.some(({ name }: MatchedItem) => !name.startsWith('.')); + const hasDataIndices = allSources.some(({ name }: MatchedItem) => !name.startsWith('.')); if (!existingIndexPatterns.length && !goToForm) { if (!hasDataIndices && !remoteClustersExist) { @@ -406,6 +372,15 @@ const IndexPatternEditorFlyoutContentComponent = ({ ); + const noFieldsMsg = + title?.length && + timestampFieldOptions.length === 0 && + !existingIndexPatterns.includes(title || '') && + !isLoadingMatchedIndices && + !isLoadingTimestampFields + ? i18nTexts.noTimestampOptionText + : ''; + return ( <> @@ -428,11 +403,14 @@ const IndexPatternEditorFlyoutContentComponent = ({ - + -
{matchedIndices.exactMatchedIndices.map((item) => item.name).join(', ')}
@@ -442,12 +420,7 @@ const IndexPatternEditorFlyoutContentComponent = ({ data-test-subj="allowHiddenField" componentProps={{ euiFieldProps: { - 'aria-label': i18n.translate( - 'indexPatternEditor.form.allowHiddenAriaLabel', - { - defaultMessage: 'Allow hidden and system indices', - } - ), + 'aria-label': i18nTexts.allowHiddenAriaLabel, }, }} /> @@ -461,12 +434,7 @@ const IndexPatternEditorFlyoutContentComponent = ({ data-test-subj="savedObjectIdField" componentProps={{ euiFieldProps: { - 'aria-label': i18n.translate( - 'indexPatternEditor.form.customIndexPatternIdLabel', - { - defaultMessage: 'Custom index pattern ID', - } - ), + 'aria-label': i18nTexts.customIndexPatternIdLabel, }, }} /> diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_flyout_content_container.tsx b/src/plugins/index_pattern_editor/public/components/index_pattern_flyout_content_container.tsx index 323c2406e8253..e224ad5c8620b 100644 --- a/src/plugins/index_pattern_editor/public/components/index_pattern_flyout_content_container.tsx +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_flyout_content_container.tsx @@ -10,9 +10,6 @@ import React, { useEffect, useState } from 'react'; import { i18n } from '@kbn/i18n'; import { IndexPattern, IndexPatternSpec, useKibana } from '../shared_imports'; -// import { PluginStart, InternalFieldType } from '../types'; -// import { deserializeField, getRuntimeFieldValidator } from '../lib'; -// import { Props as FieldEditorProps } from './field_editor/field_editor'; import { IndexPatternEditorFlyoutContent } from './index_pattern_editor_flyout_content'; import { IndexPatternEditorContext } from '../types'; @@ -74,7 +71,6 @@ export const IndexPatternFlyoutContentContainer = ({ diff --git a/src/plugins/index_pattern_editor/public/lib/extract_time_fields.ts b/src/plugins/index_pattern_editor/public/lib/extract_time_fields.ts index 4c521f8eb2687..11cfb2354978f 100644 --- a/src/plugins/index_pattern_editor/public/lib/extract_time_fields.ts +++ b/src/plugins/index_pattern_editor/public/lib/extract_time_fields.ts @@ -12,16 +12,16 @@ import { TimestampOption } from '../components/index_pattern_editor_flyout_conte export function extractTimeFields(fields: IFieldType[]): TimestampOption[] { const dateFields = fields.filter((field) => field.type === 'date'); + + // todo - display somewhere + /* const label = i18n.translate('indexPatternEditor.createIndexPattern.stepTime.noTimeFieldsLabel', { defaultMessage: "The indices which match this index pattern don't contain any time fields.", }); + */ if (dateFields.length === 0) { - return [ - { - display: label, - }, - ]; + return []; } const noTimeFieldLabel = i18n.translate( From 0a9899238848cfad7967490dfb407013af0b3c1a Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Tue, 22 Jun 2021 21:47:53 -0500 Subject: [PATCH 031/130] time field improvements, code cleanup --- .../public/components/i18n_texts.ts | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 src/plugins/index_pattern_editor/public/components/i18n_texts.ts diff --git a/src/plugins/index_pattern_editor/public/components/i18n_texts.ts b/src/plugins/index_pattern_editor/public/components/i18n_texts.ts new file mode 100644 index 0000000000000..de847c752f5ec --- /dev/null +++ b/src/plugins/index_pattern_editor/public/components/i18n_texts.ts @@ -0,0 +1,32 @@ +/* + * 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'; + +export const geti18nTexts = () => { + return { + closeButtonLabel: i18n.translate('indexPatternEditor.editor.flyoutCloseButtonLabel', { + defaultMessage: 'Close', + }), + saveButtonLabel: i18n.translate('indexPatternEditor.editor.flyoutSaveButtonLabel', { + defaultMessage: 'Create index pattern', + }), + noTimestampOptionText: i18n.translate( + 'indexPatternEditor.createIndexPattern.stepTime.noTimeFieldsLabel', + { + defaultMessage: "The matching data sources don't have time fields.", + } + ), + allowHiddenAriaLabel: i18n.translate('indexPatternEditor.form.allowHiddenAriaLabel', { + defaultMessage: 'Allow hidden and system indices', + }), + customIndexPatternIdLabel: i18n.translate('indexPatternEditor.form.customIndexPatternIdLabel', { + defaultMessage: 'Custom index pattern ID', + }), + }; +}; From 9d605624141bccd8d3b5889493e3adcb1bbefa7b Mon Sep 17 00:00:00 2001 From: Andrea Del Rio Date: Wed, 23 Jun 2021 15:42:56 -0700 Subject: [PATCH 032/130] design changes --- .../components/field_editor/advanced_parameters_section.tsx | 2 +- .../public/components/index_pattern_editor.scss | 3 +++ .../public/components/index_pattern_editor.tsx | 3 ++- .../public/components/index_pattern_editor_flyout_content.tsx | 4 ++-- 4 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 src/plugins/index_pattern_editor/public/components/index_pattern_editor.scss diff --git a/src/plugins/index_pattern_editor/public/components/field_editor/advanced_parameters_section.tsx b/src/plugins/index_pattern_editor/public/components/field_editor/advanced_parameters_section.tsx index c74ff81fe36e9..3b868f9f6df6c 100644 --- a/src/plugins/index_pattern_editor/public/components/field_editor/advanced_parameters_section.tsx +++ b/src/plugins/index_pattern_editor/public/components/field_editor/advanced_parameters_section.tsx @@ -35,7 +35,7 @@ export const AdvancedParametersSection = ({ children }: Props) => {
- + {/* We ned to wrap the children inside a "div" to have our css :first-child rule */}
{children}
diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_editor.scss b/src/plugins/index_pattern_editor/public/components/index_pattern_editor.scss new file mode 100644 index 0000000000000..0902a1b59b55d --- /dev/null +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_editor.scss @@ -0,0 +1,3 @@ +.indexPatternEditor__form { + padding-top: $euiSize * 3; +} \ No newline at end of file diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_editor.tsx b/src/plugins/index_pattern_editor/public/components/index_pattern_editor.tsx index dc77a9408ecf3..12fee4b51e2ba 100644 --- a/src/plugins/index_pattern_editor/public/components/index_pattern_editor.tsx +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_editor.tsx @@ -11,6 +11,7 @@ import { EuiFlyout } from '@elastic/eui'; import { IndexPatternFlyoutContentContainer } from './index_pattern_flyout_content_container'; import { IndexPatternEditorContext } from '../types'; import { createKibanaReactContext, IndexPattern } from '../shared_imports'; +import './index_pattern_editor.scss'; export interface IndexPatternEditorProps { onSave: (indexPattern: IndexPattern) => void; @@ -31,7 +32,7 @@ export const IndexPatternEditor = ({ return ( - + - + {/* possibly break out into own component */} @@ -444,7 +444,7 @@ const IndexPatternEditorFlyoutContentComponent = ({ {/* */} {/* modal */} - + Date: Wed, 23 Jun 2021 16:10:09 -0700 Subject: [PATCH 033/130] go back to l --- .../public/components/index_pattern_editor.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_editor.tsx b/src/plugins/index_pattern_editor/public/components/index_pattern_editor.tsx index 12fee4b51e2ba..9593308c5be0e 100644 --- a/src/plugins/index_pattern_editor/public/components/index_pattern_editor.tsx +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_editor.tsx @@ -32,7 +32,7 @@ export const IndexPatternEditor = ({ return ( - + Date: Wed, 23 Jun 2021 18:37:55 -0500 Subject: [PATCH 034/130] allow forcing timestamp field, localization fixes --- src/plugins/index_pattern_editor/kibana.json | 2 +- .../components/form_fields/title_field.tsx | 22 ++++++++- .../public/components/form_schema.ts | 10 ++-- .../public/components/i18n_texts.ts | 3 ++ .../index_pattern_editor_flyout_content.tsx | 49 ++++++++++++------- ...index_pattern_flyout_content_container.tsx | 3 ++ .../components/indices_list/indices_list.tsx | 2 +- .../status_message/status_message.tsx | 12 ++--- .../public/lib/extract_time_fields.ts | 22 ++++++--- 9 files changed, 85 insertions(+), 40 deletions(-) diff --git a/src/plugins/index_pattern_editor/kibana.json b/src/plugins/index_pattern_editor/kibana.json index 72f296d2435c2..c59e4d69cc63d 100644 --- a/src/plugins/index_pattern_editor/kibana.json +++ b/src/plugins/index_pattern_editor/kibana.json @@ -9,5 +9,5 @@ "name": "App Services", "githubTeam": "kibana-app-services" }, - "description": "This plugin provides the ability to create index patterns via a EuiFlyout from any app" + "description": "This plugin provides the ability to create index patterns via an EuiFlyout from any app" } diff --git a/src/plugins/index_pattern_editor/public/components/form_fields/title_field.tsx b/src/plugins/index_pattern_editor/public/components/form_fields/title_field.tsx index 559d18751fc8a..90f67711f08b0 100644 --- a/src/plugins/index_pattern_editor/public/components/form_fields/title_field.tsx +++ b/src/plugins/index_pattern_editor/public/components/form_fields/title_field.tsx @@ -13,7 +13,11 @@ import { UseField, getFieldValidityAndErrorMessage } from '../../shared_imports' import { IndexPatternConfig } from '../index_pattern_editor_flyout_content'; import { canAppendWildcard } from '../../lib'; -export const TitleField = () => { +interface TitleFieldProps { + existingIndexPatterns: string[]; +} + +export const TitleField = ({ existingIndexPatterns }: TitleFieldProps) => { const [appendedWildcard, setAppendedWildcard] = useState(false); return ( @@ -57,6 +61,22 @@ export const TitleField = () => { } field.setValue(query); } + /* + if (query.length > 1) { + if (existingIndexPatterns.includes(query)) { + console.log('setting error'); + field.setErrors([ + { + message: 'Index pattern exists already!', + // __isBlocking__: true, + code: 'INDEX_PATTERN_ALREADY_EXISTS', + }, + ]); + } + } else { + field.clearErrors(); + } + */ // todo // setLastTitle(query); }} diff --git a/src/plugins/index_pattern_editor/public/components/form_schema.ts b/src/plugins/index_pattern_editor/public/components/form_schema.ts index 0ab5533f52cb7..702ae92037ef7 100644 --- a/src/plugins/index_pattern_editor/public/components/form_schema.ts +++ b/src/plugins/index_pattern_editor/public/components/form_schema.ts @@ -19,12 +19,14 @@ export const schema = { defaultMessage: 'Name', }), defaultValue: '', - helpText: - 'Use an asterisk (*) to match multiple indices. Spaces and the characters , /, ?, ", <, >, | are not allowed.', + helpText: i18n.translate('indexPatternEditor.validations.titleHelpText', { + defaultMessage: + 'Use an asterisk (*) to match multiple indices. Spaces and the characters , /, ?, ", <, >, | are not allowed.', + }), validations: [ { validator: fieldValidators.emptyField( - i18n.translate('indexPatternEditor.editor.form.validations.titleIsRequiredErrorMessage', { + i18n.translate('indexPatternEditor.validations.titleIsRequiredErrorMessage', { defaultMessage: 'A name is required.', }) ), @@ -41,7 +43,7 @@ export const schema = { { validator: fieldValidators.emptyField( i18n.translate( - 'indexPatternEditor.editor.form.validations.timeFieldSelectionIsRequiredErrorMessage', + 'indexPatternEditor.validations.timeFieldSelectionIsRequiredErrorMessage', { defaultMessage: 'A time field selection is required.', } diff --git a/src/plugins/index_pattern_editor/public/components/i18n_texts.ts b/src/plugins/index_pattern_editor/public/components/i18n_texts.ts index de847c752f5ec..6da8baf7091cc 100644 --- a/src/plugins/index_pattern_editor/public/components/i18n_texts.ts +++ b/src/plugins/index_pattern_editor/public/components/i18n_texts.ts @@ -28,5 +28,8 @@ export const geti18nTexts = () => { customIndexPatternIdLabel: i18n.translate('indexPatternEditor.form.customIndexPatternIdLabel', { defaultMessage: 'Custom index pattern ID', }), + timestampFieldHelp: i18n.translate('indexPatternEditor.editor.form.timeFieldHelp', { + defaultMessage: 'Select a primary time field for use with the global time filter.', + }), }; }; diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx index 7fb7033e303bb..224aef2d40ab9 100644 --- a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx @@ -66,6 +66,7 @@ export interface Props { onCancel: () => void; existingIndexPatterns: string[]; defaultTypeIsRollup?: boolean; + requireTimestampField?: boolean; } export interface IndexPatternConfig { @@ -88,6 +89,7 @@ const IndexPatternEditorFlyoutContentComponent = ({ onSave, onCancel, defaultTypeIsRollup, + requireTimestampField = false, }: Props) => { const { services: { http, indexPatternService, uiSettings, indexPatternCreateService }, @@ -99,6 +101,20 @@ const IndexPatternEditorFlyoutContentComponent = ({ const { form } = useForm({ defaultValue: { type: defaultTypeIsRollup ? 'rollup' : 'default' }, schema, + // todo use isValid? + onSubmit: async (formData, isValid) => { + if (!isValid) { + return; + } + // todo show errors + indexPatternCreationType.checkIndicesForErrors(matchedIndices.exactMatchedIndices); + await onSave({ + title: formData.title, + timeFieldName: formData.timestampField, + id: formData.id, + ...indexPatternCreationType.getIndexPatternMappings(), + }); + }, }); const [{ title, allowHidden, type, timestampField }] = useFormData({ form }); @@ -240,7 +256,7 @@ const IndexPatternEditorFlyoutContentComponent = ({ ...indexPatternCreationType.getFetchForWildcardOptions(), }) ); - const timeFields = extractTimeFields(fields); + const timeFields = extractTimeFields(fields, requireTimestampField); setIsLoadingTimestampFields(false); setTimestampFieldOptions(timeFields); } else { @@ -259,21 +275,10 @@ const IndexPatternEditorFlyoutContentComponent = ({ lastTitle, indexPatternCreationType, allSources, - form, + requireTimestampField, ]); const { isValid } = formState; - const onClickSave = async () => { - // todo display result - indexPatternCreationType.checkIndicesForErrors(matchedIndices.exactMatchedIndices); - const formData = form.getFormData(); - await onSave({ - title: formData.title, - timeFieldName: formData.timestampField, - id: formData.id, - ...indexPatternCreationType.getIndexPatternMappings(), - }); - }; // todo if (isLoadingSources || isLoadingIndexPatterns) { @@ -353,6 +358,7 @@ const IndexPatternEditorFlyoutContentComponent = ({ ); }; + // move into render fn const disableSubmit = !isValid || !matchedIndices.exactMatchedIndices.length || @@ -372,14 +378,18 @@ const IndexPatternEditorFlyoutContentComponent = ({ ); - const noFieldsMsg = - title?.length && + // todo try to move within component + const selectTimestampHelp = timestampFieldOptions.length ? i18nTexts.timestampFieldHelp : ''; + + const timestampNoFieldsHelp = timestampFieldOptions.length === 0 && !existingIndexPatterns.includes(title || '') && !isLoadingMatchedIndices && - !isLoadingTimestampFields + !isLoadingTimestampFields && + matchedIndices.exactMatchedIndices.length ? i18nTexts.noTimestampOptionText : ''; + // return ( <> @@ -398,7 +408,7 @@ const IndexPatternEditorFlyoutContentComponent = ({ {/* Name */} - + @@ -406,7 +416,7 @@ const IndexPatternEditorFlyoutContentComponent = ({ @@ -460,7 +470,8 @@ const IndexPatternEditorFlyoutContentComponent = ({ form.submit()} data-test-subj="saveIndexPatternButton" fill disabled={disableSubmit} diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_flyout_content_container.tsx b/src/plugins/index_pattern_editor/public/components/index_pattern_flyout_content_container.tsx index e224ad5c8620b..c19b2f5271045 100644 --- a/src/plugins/index_pattern_editor/public/components/index_pattern_flyout_content_container.tsx +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_flyout_content_container.tsx @@ -23,6 +23,7 @@ export interface Props { */ onCancel: () => void; defaultTypeIsRollup?: boolean; + requireTimestampField?: boolean; } /** @@ -36,6 +37,7 @@ export const IndexPatternFlyoutContentContainer = ({ onSave, onCancel, defaultTypeIsRollup, + requireTimestampField = false, }: Props) => { const { services: { indexPatternService, notifications }, @@ -73,6 +75,7 @@ export const IndexPatternFlyoutContentContainer = ({ onCancel={onCancel} existingIndexPatterns={existingIndexPatterns} defaultTypeIsRollup={defaultTypeIsRollup} + requireTimestampField={requireTimestampField} /> ); }; diff --git a/src/plugins/index_pattern_editor/public/components/indices_list/indices_list.tsx b/src/plugins/index_pattern_editor/public/components/indices_list/indices_list.tsx index 1e5d6ac426270..1119f824b3c7e 100644 --- a/src/plugins/index_pattern_editor/public/components/indices_list/indices_list.tsx +++ b/src/plugins/index_pattern_editor/public/components/indices_list/indices_list.tsx @@ -97,7 +97,7 @@ export class IndicesList extends React.Component diff --git a/src/plugins/index_pattern_editor/public/components/status_message/status_message.tsx b/src/plugins/index_pattern_editor/public/components/status_message/status_message.tsx index ecca40b6886aa..a619b43744c14 100644 --- a/src/plugins/index_pattern_editor/public/components/status_message/status_message.tsx +++ b/src/plugins/index_pattern_editor/public/components/status_message/status_message.tsx @@ -67,7 +67,7 @@ export const StatusMessage: React.FC = ({ statusMessage = ( @@ -80,7 +80,7 @@ export const StatusMessage: React.FC = ({   + {/* possibly break out into own component */} From 30b5547ba9d18d79587d60950e605d0ec09e901e Mon Sep 17 00:00:00 2001 From: Andrea Del Rio Date: Wed, 23 Jun 2021 17:06:03 -0700 Subject: [PATCH 036/130] adjust spacing between fields --- .../components/field_editor/advanced_parameters_section.tsx | 2 +- .../public/components/index_pattern_editor_flyout_content.tsx | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/plugins/index_pattern_editor/public/components/field_editor/advanced_parameters_section.tsx b/src/plugins/index_pattern_editor/public/components/field_editor/advanced_parameters_section.tsx index 3b868f9f6df6c..c74ff81fe36e9 100644 --- a/src/plugins/index_pattern_editor/public/components/field_editor/advanced_parameters_section.tsx +++ b/src/plugins/index_pattern_editor/public/components/field_editor/advanced_parameters_section.tsx @@ -35,7 +35,7 @@ export const AdvancedParametersSection = ({ children }: Props) => {
- + {/* We ned to wrap the children inside a "div" to have our css :first-child rule */}
{children}
diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx index 2f1a06c2d518a..26eff07a1e314 100644 --- a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx @@ -395,12 +395,14 @@ const IndexPatternEditorFlyoutContentComponent = ({ {/* */}
{indexPatternTypeSelect} + {/* Name */} + + From b5d06da078bd13cca719b994857a4fb8b6bd4a4d Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Thu, 24 Jun 2021 15:08:20 -0500 Subject: [PATCH 037/130] improved timestamp field validation --- .../form_fields/timestamp_field.tsx | 8 +-- .../components/form_fields/title_field.tsx | 53 ++++++++++++------- .../index_pattern_editor_flyout_content.tsx | 42 ++++----------- 3 files changed, 50 insertions(+), 53 deletions(-) diff --git a/src/plugins/index_pattern_editor/public/components/form_fields/timestamp_field.tsx b/src/plugins/index_pattern_editor/public/components/form_fields/timestamp_field.tsx index c12f48db4cbf3..f12be5364226a 100644 --- a/src/plugins/index_pattern_editor/public/components/form_fields/timestamp_field.tsx +++ b/src/plugins/index_pattern_editor/public/components/form_fields/timestamp_field.tsx @@ -9,7 +9,7 @@ import React from 'react'; import { i18n } from '@kbn/i18n'; -import { EuiFormRow, EuiComboBox, EuiFormHelpText } from '@elastic/eui'; +import { EuiFormRow, EuiComboBox, EuiFormHelpText, EuiComboBoxOptionOption } from '@elastic/eui'; import { UseField } from '../../shared_imports'; @@ -32,7 +32,7 @@ export const TimestampField = ({ })); return ( - path="timestampField"> + > path="timestampField"> {({ label, value, setValue }) => { if (value === undefined) { return null; @@ -51,14 +51,14 @@ export const TimestampField = ({ )} singleSelection={{ asPlainText: true }} options={optionsAsComboBoxOptions} - selectedOptions={[{ label: value }]} + selectedOptions={value ? [value] : undefined} onChange={(newValue) => { if (newValue.length === 0) { // Don't allow clearing the type. One must always be selected return; } // - setValue(newValue[0].label); + setValue(newValue[0]); }} isClearable={false} isDisabled={!optionsAsComboBoxOptions.length} diff --git a/src/plugins/index_pattern_editor/public/components/form_fields/title_field.tsx b/src/plugins/index_pattern_editor/public/components/form_fields/title_field.tsx index 90f67711f08b0..dff44a7a6c42d 100644 --- a/src/plugins/index_pattern_editor/public/components/form_fields/title_field.tsx +++ b/src/plugins/index_pattern_editor/public/components/form_fields/title_field.tsx @@ -9,21 +9,54 @@ import React, { ChangeEvent, useState } from 'react'; import { i18n } from '@kbn/i18n'; import { EuiFormRow, EuiFieldText } from '@elastic/eui'; -import { UseField, getFieldValidityAndErrorMessage } from '../../shared_imports'; +import { + UseField, + getFieldValidityAndErrorMessage, + ValidationFunc, + FieldConfig, +} from '../../shared_imports'; import { IndexPatternConfig } from '../index_pattern_editor_flyout_content'; import { canAppendWildcard } from '../../lib'; +import { schema } from '../form_schema'; interface TitleFieldProps { existingIndexPatterns: string[]; } +const createTitlesNotAllowedValidator = ( + namesNotAllowed: string[] +): ValidationFunc<{}, string, string> => ({ value }) => { + if (namesNotAllowed.includes(value)) { + return { + message: i18n.translate('indexPatternEditor.indexPatternExists.ValidationErrorMessage', { + defaultMessage: 'An index pattern with this title already exists.', + }), + }; + } +}; + +const getTitleConfig = (namesNotAllowed: string[]): FieldConfig => { + const titleFieldConfig = schema.title; + + // Add validation to not allow duplicates + return { + ...titleFieldConfig!, + validations: [ + ...(titleFieldConfig.validations ?? []), + { + validator: createTitlesNotAllowedValidator(namesNotAllowed), + }, + ], + }; +}; + export const TitleField = ({ existingIndexPatterns }: TitleFieldProps) => { const [appendedWildcard, setAppendedWildcard] = useState(false); return ( path="title" - // config={nameFieldConfig} + config={getTitleConfig(existingIndexPatterns)} componentProps={{ euiFieldProps: { 'aria-label': i18n.translate('indexPatternEditor.form.titleAriaLabel', { @@ -61,22 +94,6 @@ export const TitleField = ({ existingIndexPatterns }: TitleFieldProps) => { } field.setValue(query); } - /* - if (query.length > 1) { - if (existingIndexPatterns.includes(query)) { - console.log('setting error'); - field.setErrors([ - { - message: 'Index pattern exists already!', - // __isBlocking__: true, - code: 'INDEX_PATTERN_ALREADY_EXISTS', - }, - ]); - } - } else { - field.clearErrors(); - } - */ // todo // setLastTitle(query); }} diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx index 224aef2d40ab9..ffe812b1ab413 100644 --- a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx @@ -16,6 +16,7 @@ import { EuiButton, EuiSpacer, EuiLoadingSpinner, + EuiComboBoxOptionOption, } from '@elastic/eui'; import { @@ -71,7 +72,7 @@ export interface Props { export interface IndexPatternConfig { title: string; - timestampField?: string; + timestampField?: EuiComboBoxOptionOption; allowHidden: boolean; id?: string; type: string; @@ -108,9 +109,10 @@ const IndexPatternEditorFlyoutContentComponent = ({ } // todo show errors indexPatternCreationType.checkIndicesForErrors(matchedIndices.exactMatchedIndices); + await onSave({ title: formData.title, - timeFieldName: formData.timestampField, + timeFieldName: formData.timestampField?.value, id: formData.id, ...indexPatternCreationType.getIndexPatternMappings(), }); @@ -120,15 +122,6 @@ const IndexPatternEditorFlyoutContentComponent = ({ const [{ title, allowHidden, type, timestampField }] = useFormData({ form }); const [isLoadingSources, setIsLoadingSources] = useState(true); - const [formState, setFormState] = useState<{ isSubmitted: boolean; isValid: boolean }>({ - isSubmitted: false, - isValid: false, - /* isValid: field ? true : undefined, - submit: field - ? async () => ({ isValid: true, data: field }) - : async () => ({ isValid: false, data: {} as Field }), - */ - }); const [lastTitle, setLastTitle] = useState(''); const [timestampFieldOptions, setTimestampFieldOptions] = useState([]); const [isLoadingTimestampFields, setIsLoadingTimestampFields] = useState(false); @@ -233,11 +226,6 @@ const IndexPatternEditorFlyoutContentComponent = ({ const isValidResult = !!title?.length && !existingIndexPatterns.includes(title) && exactMatched.length > 0; - setFormState({ - isSubmitted: false, - isValid: isValidResult, // todo show error when index pattern already exists - }); - const matchedIndicesResult = getMatchedIndices( allSources, partialMatched, @@ -278,8 +266,6 @@ const IndexPatternEditorFlyoutContentComponent = ({ requireTimestampField, ]); - const { isValid } = formState; - // todo if (isLoadingSources || isLoadingIndexPatterns) { return ; @@ -318,13 +304,10 @@ const IndexPatternEditorFlyoutContentComponent = ({ ); const renderIndexList = () => { - // todo indexPatternExists if (isLoadingSources) { - // || indexPatternExists) { return <>; } - // const indicesToList = title?.length ? visibleIndices : sources; const indicesToList = title?.length ? matchedIndices.visibleIndices : matchedIndices.allIndices; return ( { - // const { query, isLoadingIndices, indexPatternExists, isIncludingSystemIndices } = this.state; - // todo previously this code wouldn't show the status message if it was a dupe index pattern - // but I think we should just go ahead if (isLoadingSources) { - // || indexPatternExists) { return null; } @@ -358,15 +337,18 @@ const IndexPatternEditorFlyoutContentComponent = ({ ); }; + // needed to trigger validation without touching advanced options + if (title && timestampField) { + form.validate(); + } + // move into render fn const disableSubmit = - !isValid || + !form.isValid || !matchedIndices.exactMatchedIndices.length || // todo display errors !!indexPatternCreationType.checkIndicesForErrors(matchedIndices.exactMatchedIndices) || - (!!timestampFieldOptions.length && timestampField === undefined) || - // todo display error - existingIndexPatterns.includes(title); + (!!timestampFieldOptions.length && timestampField === undefined); const previewPanelContent = isLoadingIndexPatterns ? ( @@ -470,12 +452,10 @@ const IndexPatternEditorFlyoutContentComponent = ({ form.submit()} data-test-subj="saveIndexPatternButton" fill disabled={disableSubmit} - // isLoading={isSavingField || isValidating} > {i18nTexts.saveButtonLabel} From 4c02e11bb2d02c30d91edd33533a19a9ceb558b1 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Thu, 24 Jun 2021 23:11:57 -0500 Subject: [PATCH 038/130] remove index pattern create service and inline rollup logic --- ...na-plugin-plugins-data-public.esfilters.md | 8 +- ...bana-plugin-plugins-data-public.eskuery.md | 2 +- ...bana-plugin-plugins-data-public.esquery.md | 2 +- ...ta-public.getfieldsoptions.allownoindex.md | 11 ++ ...s-data-public.getfieldsoptions.lookback.md | 11 ++ ...in-plugins-data-public.getfieldsoptions.md | 23 +++ ...data-public.getfieldsoptions.metafields.md | 11 ++ ...ns-data-public.getfieldsoptions.pattern.md | 11 ++ ...ata-public.getfieldsoptions.rollupindex.md | 11 ++ ...ugins-data-public.getfieldsoptions.type.md | 11 ++ ...lugin-plugins-data-public.iindexpattern.md | 2 +- .../kibana-plugin-plugins-data-public.md | 1 + src/plugins/data/public/index.ts | 1 + src/plugins/data/public/public.api.md | 47 +++-- .../components/form_fields/title_field.tsx | 88 ++++++++-- .../public/components/i18n_texts.ts | 3 + .../index_pattern_editor_flyout_content.tsx | 146 +++++++++++---- .../public/open_editor.tsx | 11 +- .../index_pattern_editor/public/plugin.ts | 9 - .../public/service/creation/config.ts | 110 ------------ .../public/service/creation/index.ts | 12 -- .../public/service/creation/manager.ts | 70 -------- .../creation/rollup_creation_config.js | 166 ------------------ .../public/service/index.ts | 10 -- .../index_pattern_management_service.ts | 44 ----- .../public/shared_imports.ts | 2 + .../index_pattern_editor/public/types.ts | 3 - 27 files changed, 321 insertions(+), 505 deletions(-) create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.getfieldsoptions.allownoindex.md create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.getfieldsoptions.lookback.md create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.getfieldsoptions.md create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.getfieldsoptions.metafields.md create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.getfieldsoptions.pattern.md create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.getfieldsoptions.rollupindex.md create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.getfieldsoptions.type.md delete mode 100644 src/plugins/index_pattern_editor/public/service/creation/config.ts delete mode 100644 src/plugins/index_pattern_editor/public/service/creation/index.ts delete mode 100644 src/plugins/index_pattern_editor/public/service/creation/manager.ts delete mode 100644 src/plugins/index_pattern_editor/public/service/creation/rollup_creation_config.js delete mode 100644 src/plugins/index_pattern_editor/public/service/index.ts delete mode 100644 src/plugins/index_pattern_editor/public/service/index_pattern_management_service.ts diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.esfilters.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.esfilters.md index 2ca4847d6dc39..80c321ce6b320 100644 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.esfilters.md +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.esfilters.md @@ -13,11 +13,11 @@ esFilters: { FILTERS: typeof FILTERS; FilterStateStore: typeof FilterStateStore; buildEmptyFilter: (isPinned: boolean, index?: string | undefined) => import("../common").Filter; - buildPhrasesFilter: (field: import("../common").IFieldType, params: any[], indexPattern: import("../common").MinimalIndexPattern) => import("../common").PhrasesFilter; - buildExistsFilter: (field: import("../common").IFieldType, indexPattern: import("../common").MinimalIndexPattern) => import("../common").ExistsFilter; - buildPhraseFilter: (field: import("../common").IFieldType, value: any, indexPattern: import("../common").MinimalIndexPattern) => import("../common").PhraseFilter; + buildPhrasesFilter: (field: import("../common").IFieldType, params: any[], indexPattern: import("../common").IndexPatternBase) => import("../common").PhrasesFilter; + buildExistsFilter: (field: import("../common").IFieldType, indexPattern: import("../common").IndexPatternBase) => import("../common").ExistsFilter; + buildPhraseFilter: (field: import("../common").IFieldType, value: any, indexPattern: import("../common").IndexPatternBase) => import("../common").PhraseFilter; buildQueryFilter: (query: any, index: string, alias: string) => import("../common").QueryStringFilter; - buildRangeFilter: (field: import("../common").IFieldType, params: import("../common").RangeFilterParams, indexPattern: import("../common").MinimalIndexPattern, formattedValue?: string | undefined) => import("../common").RangeFilter; + buildRangeFilter: (field: import("../common").IFieldType, params: import("../common").RangeFilterParams, indexPattern: import("../common").IndexPatternBase, formattedValue?: string | undefined) => import("../common").RangeFilter; isPhraseFilter: (filter: any) => filter is import("../common").PhraseFilter; isExistsFilter: (filter: any) => filter is import("../common").ExistsFilter; isPhrasesFilter: (filter: any) => filter is import("../common").PhrasesFilter; diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.eskuery.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.eskuery.md index 881a1fa803ca6..332114e637586 100644 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.eskuery.md +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.eskuery.md @@ -10,6 +10,6 @@ esKuery: { nodeTypes: import("../common/es_query/kuery/node_types").NodeTypes; fromKueryExpression: (expression: any, parseOptions?: Partial) => import("../common").KueryNode; - toElasticsearchQuery: (node: import("../common").KueryNode, indexPattern?: import("../common").MinimalIndexPattern | undefined, config?: Record | undefined, context?: Record | undefined) => import("@kbn/common-utils").JsonObject; + toElasticsearchQuery: (node: import("../common").KueryNode, indexPattern?: import("../common").IndexPatternBase | undefined, config?: Record | undefined, context?: Record | undefined) => import("@kbn/common-utils").JsonObject; } ``` diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.esquery.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.esquery.md index 70805aaaaee8c..0bc9c0c12fc3a 100644 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.esquery.md +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.esquery.md @@ -10,7 +10,7 @@ esQuery: { buildEsQuery: typeof buildEsQuery; getEsQueryConfig: typeof getEsQueryConfig; - buildQueryFromFilters: (filters: import("../common").Filter[] | undefined, indexPattern: import("../common").MinimalIndexPattern | undefined, ignoreFilterIfFieldNotInIndex?: boolean) => { + buildQueryFromFilters: (filters: import("../common").Filter[] | undefined, indexPattern: import("../common").IndexPatternBase | undefined, ignoreFilterIfFieldNotInIndex?: boolean) => { must: never[]; filter: import("../common").Filter[]; should: never[]; diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.getfieldsoptions.allownoindex.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.getfieldsoptions.allownoindex.md new file mode 100644 index 0000000000000..091fb4d8aaa44 --- /dev/null +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.getfieldsoptions.allownoindex.md @@ -0,0 +1,11 @@ + + +[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [GetFieldsOptions](./kibana-plugin-plugins-data-public.getfieldsoptions.md) > [allowNoIndex](./kibana-plugin-plugins-data-public.getfieldsoptions.allownoindex.md) + +## GetFieldsOptions.allowNoIndex property + +Signature: + +```typescript +allowNoIndex?: boolean; +``` diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.getfieldsoptions.lookback.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.getfieldsoptions.lookback.md new file mode 100644 index 0000000000000..0e8c7e34b1fe8 --- /dev/null +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.getfieldsoptions.lookback.md @@ -0,0 +1,11 @@ + + +[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [GetFieldsOptions](./kibana-plugin-plugins-data-public.getfieldsoptions.md) > [lookBack](./kibana-plugin-plugins-data-public.getfieldsoptions.lookback.md) + +## GetFieldsOptions.lookBack property + +Signature: + +```typescript +lookBack?: boolean; +``` diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.getfieldsoptions.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.getfieldsoptions.md new file mode 100644 index 0000000000000..056018174baf6 --- /dev/null +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.getfieldsoptions.md @@ -0,0 +1,23 @@ + + +[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [GetFieldsOptions](./kibana-plugin-plugins-data-public.getfieldsoptions.md) + +## GetFieldsOptions interface + +Signature: + +```typescript +export interface GetFieldsOptions +``` + +## Properties + +| Property | Type | Description | +| --- | --- | --- | +| [allowNoIndex](./kibana-plugin-plugins-data-public.getfieldsoptions.allownoindex.md) | boolean | | +| [lookBack](./kibana-plugin-plugins-data-public.getfieldsoptions.lookback.md) | boolean | | +| [metaFields](./kibana-plugin-plugins-data-public.getfieldsoptions.metafields.md) | string[] | | +| [pattern](./kibana-plugin-plugins-data-public.getfieldsoptions.pattern.md) | string | | +| [rollupIndex](./kibana-plugin-plugins-data-public.getfieldsoptions.rollupindex.md) | string | | +| [type](./kibana-plugin-plugins-data-public.getfieldsoptions.type.md) | string | | + diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.getfieldsoptions.metafields.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.getfieldsoptions.metafields.md new file mode 100644 index 0000000000000..87c0f9d9bfe5b --- /dev/null +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.getfieldsoptions.metafields.md @@ -0,0 +1,11 @@ + + +[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [GetFieldsOptions](./kibana-plugin-plugins-data-public.getfieldsoptions.md) > [metaFields](./kibana-plugin-plugins-data-public.getfieldsoptions.metafields.md) + +## GetFieldsOptions.metaFields property + +Signature: + +```typescript +metaFields?: string[]; +``` diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.getfieldsoptions.pattern.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.getfieldsoptions.pattern.md new file mode 100644 index 0000000000000..c6c53b2cf7bc8 --- /dev/null +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.getfieldsoptions.pattern.md @@ -0,0 +1,11 @@ + + +[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [GetFieldsOptions](./kibana-plugin-plugins-data-public.getfieldsoptions.md) > [pattern](./kibana-plugin-plugins-data-public.getfieldsoptions.pattern.md) + +## GetFieldsOptions.pattern property + +Signature: + +```typescript +pattern: string; +``` diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.getfieldsoptions.rollupindex.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.getfieldsoptions.rollupindex.md new file mode 100644 index 0000000000000..4711e3bdfce92 --- /dev/null +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.getfieldsoptions.rollupindex.md @@ -0,0 +1,11 @@ + + +[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [GetFieldsOptions](./kibana-plugin-plugins-data-public.getfieldsoptions.md) > [rollupIndex](./kibana-plugin-plugins-data-public.getfieldsoptions.rollupindex.md) + +## GetFieldsOptions.rollupIndex property + +Signature: + +```typescript +rollupIndex?: string; +``` diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.getfieldsoptions.type.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.getfieldsoptions.type.md new file mode 100644 index 0000000000000..cdc4c562b5611 --- /dev/null +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.getfieldsoptions.type.md @@ -0,0 +1,11 @@ + + +[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [GetFieldsOptions](./kibana-plugin-plugins-data-public.getfieldsoptions.md) > [type](./kibana-plugin-plugins-data-public.getfieldsoptions.type.md) + +## GetFieldsOptions.type property + +Signature: + +```typescript +type?: string; +``` diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpattern.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpattern.md index 88d8520a373c6..ec29ef81a6e69 100644 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpattern.md +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpattern.md @@ -12,7 +12,7 @@ Signature: ```typescript -export interface IIndexPattern extends MinimalIndexPattern +export interface IIndexPattern extends IndexPatternBase ``` ## Properties diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md index 7c023e756ebd5..02afe2d8257a4 100644 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md @@ -63,6 +63,7 @@ | [DataPublicPluginStartUi](./kibana-plugin-plugins-data-public.datapublicpluginstartui.md) | Data plugin prewired UI components | | [EsQueryConfig](./kibana-plugin-plugins-data-public.esqueryconfig.md) | | | [FieldFormatConfig](./kibana-plugin-plugins-data-public.fieldformatconfig.md) | | +| [GetFieldsOptions](./kibana-plugin-plugins-data-public.getfieldsoptions.md) | | | [IDataPluginServices](./kibana-plugin-plugins-data-public.idatapluginservices.md) | | | [IEsSearchRequest](./kibana-plugin-plugins-data-public.iessearchrequest.md) | | | [IFieldSubType](./kibana-plugin-plugins-data-public.ifieldsubtype.md) | | diff --git a/src/plugins/data/public/index.ts b/src/plugins/data/public/index.ts index d7667f20d517e..a05f7eda7ad06 100644 --- a/src/plugins/data/public/index.ts +++ b/src/plugins/data/public/index.ts @@ -268,6 +268,7 @@ export { IndexPatternSpec, IndexPatternLoadExpressionFunctionDefinition, fieldList, + GetFieldsOptions, } from '../common'; export { DuplicateIndexPatternError } from '../common/index_patterns/errors'; diff --git a/src/plugins/data/public/public.api.md b/src/plugins/data/public/public.api.md index 2849b93b14483..52eeb2865bad3 100644 --- a/src/plugins/data/public/public.api.md +++ b/src/plugins/data/public/public.api.md @@ -1133,6 +1133,24 @@ export function getDefaultQuery(language?: QueryLanguage): { // @public (undocumented) export function getEsPreference(uiSettings: IUiSettingsClient_2, sessionId?: string): any; +// Warning: (ae-missing-release-tag) "GetFieldsOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) +// +// @public (undocumented) +export interface GetFieldsOptions { + // (undocumented) + allowNoIndex?: boolean; + // (undocumented) + lookBack?: boolean; + // (undocumented) + metaFields?: string[]; + // (undocumented) + pattern: string; + // (undocumented) + rollupIndex?: string; + // (undocumented) + type?: string; +} + // Warning: (ae-missing-release-tag) "getKbnTypeNames" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) // // @public @@ -1680,7 +1698,6 @@ export class IndexPatternsService { getDefault: () => Promise; getDefaultId: () => Promise; getFieldsForIndexPattern: (indexPattern: IndexPattern | IndexPatternSpec, options?: GetFieldsOptions | undefined) => Promise; - // Warning: (ae-forgotten-export) The symbol "GetFieldsOptions" needs to be exported by the entry point index.d.ts getFieldsForWildcard: (options: GetFieldsOptions) => Promise; getIds: (refresh?: boolean) => Promise; getIdsWithTitle: (refresh?: boolean) => Promise => ({ value }) => { - if (namesNotAllowed.includes(value)) { - return { - message: i18n.translate('indexPatternEditor.indexPatternExists.ValidationErrorMessage', { - defaultMessage: 'An index pattern with this title already exists.', - }), - }; - } -}; +): ValidationConfig<{}, string, string> => ({ + validator: ({ value }) => { + if (namesNotAllowed.includes(value)) { + return { + message: i18n.translate('indexPatternEditor.indexPatternExists.ValidationErrorMessage', { + defaultMessage: 'An index pattern with this title already exists.', + }), + }; + } + }, +}); -const getTitleConfig = (namesNotAllowed: string[]): FieldConfig => { +const rollupIndexPatternValidator = ( + rollupIndices: string[], + matchedIndices: MatchedItem[] +): ValidationConfig<{}, string, string> => ({ + validator: ({ value }) => { + if (!rollupIndices || !rollupIndices.length) { + return; + } + + const rollupIndexMatches = matchedIndices.filter((matchedIndex) => + rollupIndices.includes(matchedIndex.name) + ); + + if (!rollupIndexMatches.length) { + return rollupIndexPatternNoMatchError; + } else if (rollupIndexMatches.length > 1) { + return rollupIndexPatternTooManyMatchesError; + } + }, +}); + +const getTitleConfig = ( + namesNotAllowed: string[], + isRollup: boolean, + matchedIndices: MatchedItem[] +): FieldConfig => { const titleFieldConfig = schema.title; + const validations = [ + ...titleFieldConfig.validations, + createTitlesNotAllowedValidator(namesNotAllowed), + ]; + + if (isRollup) { + validations.push(rollupIndexPatternValidator(['test-rollup', 'test-rollup2'], matchedIndices)); + } + // Add validation to not allow duplicates return { ...titleFieldConfig!, - validations: [ - ...(titleFieldConfig.validations ?? []), - { - validator: createTitlesNotAllowedValidator(namesNotAllowed), - }, - ], + validations, }; }; -export const TitleField = ({ existingIndexPatterns }: TitleFieldProps) => { +export const TitleField = ({ + existingIndexPatterns, + isRollup, + matchedIndices, +}: TitleFieldProps) => { const [appendedWildcard, setAppendedWildcard] = useState(false); return ( path="title" - config={getTitleConfig(existingIndexPatterns)} + config={getTitleConfig(existingIndexPatterns, isRollup, matchedIndices)} componentProps={{ euiFieldProps: { 'aria-label': i18n.translate('indexPatternEditor.form.titleAriaLabel', { diff --git a/src/plugins/index_pattern_editor/public/components/i18n_texts.ts b/src/plugins/index_pattern_editor/public/components/i18n_texts.ts index 6da8baf7091cc..70b37004def32 100644 --- a/src/plugins/index_pattern_editor/public/components/i18n_texts.ts +++ b/src/plugins/index_pattern_editor/public/components/i18n_texts.ts @@ -31,5 +31,8 @@ export const geti18nTexts = () => { timestampFieldHelp: i18n.translate('indexPatternEditor.editor.form.timeFieldHelp', { defaultMessage: 'Select a primary time field for use with the global time filter.', }), + rollupLabel: i18n.translate('indexPatternEditor.rollupIndexPattern.createIndex.indexLabel', { + defaultMessage: 'Rollup', + }), }; }; diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx index ffe812b1ab413..551b5f8e0f195 100644 --- a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx @@ -28,6 +28,7 @@ import { useFormData, ToggleField, useKibana, + GetFieldsOptions, } from '../shared_imports'; import { @@ -42,7 +43,6 @@ import { FlyoutPanels } from './flyout_panels'; import { MatchedItem, ResolveIndexResponseItemAlias, IndexPatternEditorContext } from '../types'; -import { IndexPatternCreationConfig } from '../service'; import { LoadingIndices, StatusMessage, @@ -56,6 +56,8 @@ import { geti18nTexts, } from '.'; +const ROLLUP_TYPE = 'rollup'; + export interface Props { /** * Handler for the "save" footer button @@ -93,29 +95,45 @@ const IndexPatternEditorFlyoutContentComponent = ({ requireTimestampField = false, }: Props) => { const { - services: { http, indexPatternService, uiSettings, indexPatternCreateService }, + services: { http, indexPatternService, uiSettings }, } = useKibana(); const i18nTexts = geti18nTexts(); // return type, interal type const { form } = useForm({ - defaultValue: { type: defaultTypeIsRollup ? 'rollup' : 'default' }, + defaultValue: { type: defaultTypeIsRollup ? ROLLUP_TYPE : 'default' }, schema, - // todo use isValid? onSubmit: async (formData, isValid) => { if (!isValid) { return; } - // todo show errors - indexPatternCreationType.checkIndicesForErrors(matchedIndices.exactMatchedIndices); + const indexPatternStub: IndexPatternSpec = { + title: formData.title, + timeFieldName: formData.timestampField?.value, + id: formData.id, + }; + + if (type === ROLLUP_TYPE && rollupIndex) { + indexPatternStub.type = ROLLUP_TYPE; + indexPatternStub.typeMeta = { + params: { + rollup_index: rollupIndex, // name as string + }, + aggs: (rollupIndicesCapabilities[rollupIndex] as any).aggs, // todo + }; + } + + await onSave(indexPatternStub); + /* await onSave({ title: formData.title, timeFieldName: formData.timestampField?.value, id: formData.id, ...indexPatternCreationType.getIndexPatternMappings(), }); + */ }, }); @@ -130,17 +148,24 @@ const IndexPatternEditorFlyoutContentComponent = ({ const [remoteClustersExist, setRemoteClustersExist] = useState(false); const [isLoadingIndexPatterns, setIsLoadingIndexPatterns] = useState(true); const [goToForm, setGoToForm] = useState(false); + const [disableSubmit, setDisableSubmit] = useState(true); const [existingIndexPatterns, setExistingIndexPatterns] = useState([]); + const [rollupIndex, setRollupIndex] = useState(); + const [rollupIndicesCapabilities, setRollupIndicesCapabilities] = useState< + Record + >({}); const [matchedIndices, setMatchedIndices] = useState({ allIndices: [], exactMatchedIndices: [], partialMatchedIndices: [], visibleIndices: [], }); + /* const [ indexPatternCreationType, setIndexPatternCreationType, ] = useState(indexPatternCreateService.creation.getType('default')); + */ const removeAliases = (item: MatchedItem) => !((item as unknown) as ResolveIndexResponseItemAlias).indices; @@ -173,43 +198,64 @@ const IndexPatternEditorFlyoutContentComponent = ({ }; }, [http, indexPatternService, loadSources]); + // loading rollup info + useEffect(() => { + let isMounted = true; + const getRollups = async () => { + try { + const response = await http.get('/api/rollup/indices'); + if (isMounted) { + setRollupIndicesCapabilities(response || {}); + } + } catch (e) { + // Silently swallow failure responses such as expired trials + } + }; + if (type === ROLLUP_TYPE) { + getRollups(); + } + return () => { + isMounted = false; + }; + }, [http, type]); + // updates index pattern creation type based on selection + // todo can I do this without effect? useEffect(() => { - const updatedCreationType = indexPatternCreateService.creation.getType(type); - setIndexPatternCreationType(updatedCreationType); - if (type === 'rollup') { + // const updatedCreationType = indexPatternCreateService.creation.getType(type); + // setIndexPatternCreationType(updatedCreationType); + if (type === ROLLUP_TYPE) { form.setFieldValue('allowHidden', false); } - }, [type, indexPatternCreateService.creation, form]); + // }, [type, indexPatternCreateService.creation, form]); + }, [type, form]); // fetches indices and timestamp options useEffect(() => { + const getRollupIndices = () => Object.keys(rollupIndicesCapabilities); + const isRollupIndex = (indexName: string) => getRollupIndices().includes(indexName); + const getIndexTags = (indexName: string) => + isRollupIndex(indexName) + ? [ + { + key: ROLLUP_TYPE, + name: i18nTexts.rollupLabel, + color: 'primary', + }, + ] + : []; + const fetchIndices = async (query: string = '') => { setIsLoadingMatchedIndices(true); const indexRequests = []; if (query?.endsWith('*')) { - const exactMatchedQuery = getIndices( - http, - (indexName: string) => indexPatternCreationType.getIndexTags(indexName), - query, - allowHidden - ); + const exactMatchedQuery = getIndices(http, getIndexTags, query, allowHidden); indexRequests.push(exactMatchedQuery); indexRequests.push(Promise.resolve([])); } else { - const exactMatchQuery = getIndices( - http, - (indexName: string) => indexPatternCreationType.getIndexTags(indexName), - query, - allowHidden - ); - const partialMatchQuery = getIndices( - http, - (indexName: string) => indexPatternCreationType.getIndexTags(indexName), - `${query}*`, - allowHidden - ); + const exactMatchQuery = getIndices(http, getIndexTags, query, allowHidden); + const partialMatchQuery = getIndices(http, getIndexTags, `${query}*`, allowHidden); indexRequests.push(exactMatchQuery); indexRequests.push(partialMatchQuery); @@ -233,17 +279,36 @@ const IndexPatternEditorFlyoutContentComponent = ({ allowHidden ); + if (type === ROLLUP_TYPE) { + const rollupIndices = exactMatched.filter((index) => isRollupIndex(index.name)); + setRollupIndex(rollupIndices.length === 1 ? rollupIndices[0].name : undefined); + } else { + setRollupIndex(undefined); + } + setMatchedIndices(matchedIndicesResult); setIsLoadingMatchedIndices(false); if (isValidResult) { setIsLoadingTimestampFields(true); + const getFieldsOptions: GetFieldsOptions = { + pattern: query, + }; + if (type === ROLLUP_TYPE) { + getFieldsOptions.type = ROLLUP_TYPE; + getFieldsOptions.rollupIndex = rollupIndex; + } + /* const fields = await ensureMinimumTime( indexPatternService.getFieldsForWildcard({ pattern: query, ...indexPatternCreationType.getFetchForWildcardOptions(), }) ); + */ + const fields = await ensureMinimumTime( + indexPatternService.getFieldsForWildcard(getFieldsOptions) + ); const timeFields = extractTimeFields(fields, requireTimestampField); setIsLoadingTimestampFields(false); setTimestampFieldOptions(timeFields); @@ -261,9 +326,12 @@ const IndexPatternEditorFlyoutContentComponent = ({ indexPatternService, allowHidden, lastTitle, - indexPatternCreationType, allSources, requireTimestampField, + rollupIndex, + type, + i18nTexts.rollupLabel, + rollupIndicesCapabilities, ]); // todo @@ -330,7 +398,7 @@ const IndexPatternEditorFlyoutContentComponent = ({ return ( @@ -339,16 +407,26 @@ const IndexPatternEditorFlyoutContentComponent = ({ // needed to trigger validation without touching advanced options if (title && timestampField) { - form.validate(); + form.validate().then((isValid) => { + const disable = + !isValid || + !matchedIndices.exactMatchedIndices.length || + // todo display errors + // !!indexPatternCreationType.checkIndicesForErrors(matchedIndices.exactMatchedIndices) || + (!!timestampFieldOptions.length && timestampField === undefined); + setDisableSubmit(disable); + }); } // move into render fn + /* const disableSubmit = !form.isValid || !matchedIndices.exactMatchedIndices.length || // todo display errors !!indexPatternCreationType.checkIndicesForErrors(matchedIndices.exactMatchedIndices) || (!!timestampFieldOptions.length && timestampField === undefined); + */ const previewPanelContent = isLoadingIndexPatterns ? ( @@ -390,7 +468,11 @@ const IndexPatternEditorFlyoutContentComponent = ({ {/* Name */} - + diff --git a/src/plugins/index_pattern_editor/public/open_editor.tsx b/src/plugins/index_pattern_editor/public/open_editor.tsx index fd4f691c1566b..b5a014ac55eb4 100644 --- a/src/plugins/index_pattern_editor/public/open_editor.tsx +++ b/src/plugins/index_pattern_editor/public/open_editor.tsx @@ -16,7 +16,6 @@ import { IndexPattern, DataPublicPluginStart, } from './shared_imports'; -import { IndexPatternManagementServiceStart } from './service'; import { CloseEditor, IndexPatternEditorContext } from './types'; import { IndexPatternFlyoutContentContainer } from './components/index_pattern_flyout_content_container'; @@ -28,14 +27,11 @@ export interface OpenEditorOptions { interface Dependencies { core: CoreStart; indexPatternService: DataPublicPluginStart['indexPatterns']; - indexPatternCreateService: IndexPatternManagementServiceStart; } -export const getEditorOpener = ({ - core, - indexPatternService, - indexPatternCreateService, -}: Dependencies) => (options: OpenEditorOptions): CloseEditor => { +export const getEditorOpener = ({ core, indexPatternService }: Dependencies) => ( + options: OpenEditorOptions +): CloseEditor => { const { uiSettings, overlays, docLinks, notifications, http, application } = core; const { Provider: KibanaReactContextProvider, @@ -46,7 +42,6 @@ export const getEditorOpener = ({ notifications, application, indexPatternService, - indexPatternCreateService, }); let overlayRef: OverlayRef | null = null; diff --git a/src/plugins/index_pattern_editor/public/plugin.ts b/src/plugins/index_pattern_editor/public/plugin.ts index de80143d9f8b0..4e7d28632f472 100644 --- a/src/plugins/index_pattern_editor/public/plugin.ts +++ b/src/plugins/index_pattern_editor/public/plugin.ts @@ -10,11 +10,9 @@ import { Plugin, CoreSetup, CoreStart } from 'src/core/public'; import { PluginSetup, PluginStart, SetupPlugins, StartPlugins } from './types'; import { getEditorOpener } from './open_editor'; -import { IndexPatternManagementService } from './service'; export class IndexPatternEditorPlugin implements Plugin { - private readonly indexPatternManagementService = new IndexPatternManagementService(); public setup(core: CoreSetup, plugins: SetupPlugins): PluginSetup { return {}; } @@ -25,23 +23,16 @@ export class IndexPatternEditorPlugin } = core; const { data } = plugins; - const ipMgmtService = this.indexPatternManagementService.start({ - httpClient: core.http, - uiSettings: core.uiSettings, - }); - return { openEditor: getEditorOpener({ core, indexPatternService: data.indexPatterns, - indexPatternCreateService: ipMgmtService, }), userPermissions: { editIndexPattern: () => { return capabilities.management.kibana.indexPatterns; }, }, - indexPatternCreateService: ipMgmtService, }; } diff --git a/src/plugins/index_pattern_editor/public/service/creation/config.ts b/src/plugins/index_pattern_editor/public/service/creation/config.ts deleted file mode 100644 index 524d8a7e240be..0000000000000 --- a/src/plugins/index_pattern_editor/public/service/creation/config.ts +++ /dev/null @@ -1,110 +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 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 { MatchedItem } from '../../types'; - -const indexPatternTypeName = i18n.translate('indexPatternEditor.createIndex.defaultTypeName', { - defaultMessage: 'index pattern', -}); - -const indexPatternButtonText = i18n.translate('indexPatternEditor.createIndex.defaultButtonText', { - defaultMessage: 'Standard index pattern', -}); - -const indexPatternButtonDescription = i18n.translate( - 'indexPatternEditor.createIndex.defaultButtonDescription', - { defaultMessage: 'Perform full aggregations against any data' } -); - -export type UrlHandler = (url: string) => void; - -export interface IndexPatternCreationOption { - text: string; - description: string; - testSubj: string; - onClick: () => void; - isBeta?: boolean; -} - -export class IndexPatternCreationConfig { - public readonly key = 'default'; - - protected type?: string; - protected name: string; - protected showSystemIndices: boolean; - protected httpClient: object | null; - protected isBeta: boolean; - - constructor({ - type = undefined, - name = indexPatternTypeName, - showSystemIndices = true, - httpClient = null, - isBeta = false, - }: { - type?: string; - name?: string; - showSystemIndices?: boolean; - httpClient?: object | null; - isBeta?: boolean; - }) { - this.type = type; - this.name = name; - this.showSystemIndices = showSystemIndices; - this.httpClient = httpClient; - this.isBeta = isBeta; - } - - public getIndexPatternCreationOption(urlHandler: UrlHandler): IndexPatternCreationOption { - return { - text: indexPatternButtonText, - description: indexPatternButtonDescription, - testSubj: `createStandardIndexPatternButton`, - onClick: () => { - urlHandler('/create'); - }, - }; - } - - public getIndexPatternType() { - return this.type; - } - - public getIndexPatternName() { - return this.name; - } - - public getIsBeta() { - return this.isBeta; - } - - public getShowSystemIndices() { - return this.showSystemIndices; - } - - public getIndexTags(indexName: string): Array<{ key: string; name: string; color: string }> { - return []; - } - - public checkIndicesForErrors(indices: MatchedItem[]) { - return undefined; - } - - public getIndexPatternMappings() { - return {}; - } - - public renderPrompt() { - return null; - } - - public getFetchForWildcardOptions() { - return {}; - } -} diff --git a/src/plugins/index_pattern_editor/public/service/creation/index.ts b/src/plugins/index_pattern_editor/public/service/creation/index.ts deleted file mode 100644 index e1f464b01e550..0000000000000 --- a/src/plugins/index_pattern_editor/public/service/creation/index.ts +++ /dev/null @@ -1,12 +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 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 { IndexPatternCreationConfig, IndexPatternCreationOption } from './config'; -export { IndexPatternCreationManager } from './manager'; -// @ts-ignore -export { RollupIndexPatternCreationConfig } from './rollup_creation_config'; diff --git a/src/plugins/index_pattern_editor/public/service/creation/manager.ts b/src/plugins/index_pattern_editor/public/service/creation/manager.ts deleted file mode 100644 index cc2285bbfcafb..0000000000000 --- a/src/plugins/index_pattern_editor/public/service/creation/manager.ts +++ /dev/null @@ -1,70 +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 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 { once } from 'lodash'; -import { HttpStart, CoreStart } from '../../../../../core/public'; -import { IndexPatternCreationConfig, UrlHandler, IndexPatternCreationOption } from './config'; -import { CONFIG_ROLLUPS } from '../../constants'; -// @ts-ignore -import { RollupIndexPatternCreationConfig } from './rollup_creation_config'; - -interface IndexPatternCreationManagerStart { - httpClient: HttpStart; - uiSettings: CoreStart['uiSettings']; -} - -export class IndexPatternCreationManager { - start({ httpClient, uiSettings }: IndexPatternCreationManagerStart) { - const getConfigs = once(() => { - const configs: IndexPatternCreationConfig[] = []; - configs.push(new IndexPatternCreationConfig({ httpClient })); - - if (uiSettings.isDeclared(CONFIG_ROLLUPS) && uiSettings.get(CONFIG_ROLLUPS)) { - configs.push(new RollupIndexPatternCreationConfig({ httpClient })); - } - - return configs; - }); - - const getType = (key: string | undefined): IndexPatternCreationConfig => { - const configs = getConfigs(); - if (key) { - const index = configs.findIndex((config) => config.key === key); - const config = configs[index]; - - if (config) { - return config; - } else { - throw new Error(`Index pattern creation type not found: ${key}`); - } - } else { - return getType('default'); - } - }; - - return { - getType, - getIndexPatternCreationOptions: async (urlHandler: UrlHandler) => { - const options: IndexPatternCreationOption[] = []; - - await Promise.all( - getConfigs().map(async (config) => { - const option = config.getIndexPatternCreationOption - ? await config.getIndexPatternCreationOption(urlHandler) - : null; - if (option) { - options.push(option); - } - }) - ); - - return options; - }, - }; - } -} diff --git a/src/plugins/index_pattern_editor/public/service/creation/rollup_creation_config.js b/src/plugins/index_pattern_editor/public/service/creation/rollup_creation_config.js deleted file mode 100644 index 1c5580f48f3c0..0000000000000 --- a/src/plugins/index_pattern_editor/public/service/creation/rollup_creation_config.js +++ /dev/null @@ -1,166 +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 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 { IndexPatternCreationConfig } from '.'; - -const rollupIndexPatternTypeName = i18n.translate( - 'indexPatternEditor.rollupIndexPattern.createIndex.defaultTypeName', - { defaultMessage: 'rollup index pattern' } -); - -/* -const rollupIndexPatternButtonText = i18n.translate( - 'indexPatternEditor.rollupIndexPattern.createIndex.defaultButtonText', - { defaultMessage: 'Rollup index pattern' } -); - -const rollupIndexPatternButtonDescription = i18n.translate( - 'indexPatternEditor.rollupIndexPattern.createIndex.defaultButtonDescription', - { defaultMessage: 'Perform limited aggregations against summarized data' } -); -*/ -const rollupIndexPatternNoMatchError = i18n.translate( - 'indexPatternEditor.rollupIndexPattern.createIndex.noMatchError', - { defaultMessage: 'Rollup index pattern error: must match one rollup index' } -); - -const rollupIndexPatternTooManyMatchesError = i18n.translate( - 'indexPatternEditor.rollupIndexPattern.createIndex.tooManyMatchesError', - { defaultMessage: 'Rollup index pattern error: can only match one rollup index' } -); - -const rollupIndexPatternIndexLabel = i18n.translate( - 'indexPatternEditor.rollupIndexPattern.createIndex.indexLabel', - { defaultMessage: 'Rollup' } -); - -export class RollupIndexPatternCreationConfig extends IndexPatternCreationConfig { - key = 'rollup'; - - constructor(options) { - super({ - type: 'rollup', - name: rollupIndexPatternTypeName, - showSystemIndices: false, - isBeta: true, - ...options, - }); - - this.rollupIndex = null; - this.rollupJobs = []; - this.rollupIndicesCapabilities = {}; - this.rollupIndices = []; - this.setRollupIndices(); - } - - async setRollupIndices() { - try { - // This is a hack intended to prevent the getRollupIndices() request from being sent if - // we're on /logout. There is a race condition that can arise on that page, whereby this - // request resolves after the logout request resolves, and un-clears the session ID. - const isAnonymous = this.httpClient.anonymousPaths.isAnonymous(window.location.pathname); - if (!isAnonymous) { - const response = await this.httpClient.get('/api/rollup/indices'); - this.rollupIndicesCapabilities = response || {}; - } - - this.rollupIndices = Object.keys(this.rollupIndicesCapabilities); - } catch (e) { - // Silently swallow failure responses such as expired trials - } - } - /* - async getIndexPatternCreationOption(urlHandler) { - await this.setRollupIndices(); - return this.rollupIndices && this.rollupIndices.length - ? { - text: rollupIndexPatternButtonText, - description: rollupIndexPatternButtonDescription, - testSubj: `createRollupIndexPatternButton`, - isBeta: this.isBeta, - onClick: () => { - urlHandler('/create?type=rollup'); - }, - } - : null; - } - */ - - isRollupIndex = (indexName) => { - return this.rollupIndices.includes(indexName); - }; - - // this is stateful! - checkIndicesForErrors = (indices) => { - this.rollupIndex = null; - - if (!indices || !indices.length) { - return; - } - - const rollupIndices = indices.filter((index) => this.isRollupIndex(index.name)); - - if (!rollupIndices.length) { - return [rollupIndexPatternNoMatchError]; - } else if (rollupIndices.length > 1) { - return [rollupIndexPatternTooManyMatchesError]; - } - - const rollupIndexName = rollupIndices[0].name; - const error = this.rollupIndicesCapabilities[rollupIndexName].error; - - if (error) { - const errorMessage = i18n.translate( - 'indexPatternEditor.rollupIndexPattern.createIndex.uncaughtError', - { - defaultMessage: 'Rollup index pattern error: {error}', - values: { - error, - }, - } - ); - return [errorMessage]; - } - - this.rollupIndex = rollupIndexName; - }; - - getIndexPatternMappings = () => { - return this.rollupIndex - ? { - type: this.type, - typeMeta: { - params: { - rollup_index: this.rollupIndex, - }, - aggs: this.rollupIndicesCapabilities[this.rollupIndex].aggs, - }, - } - : {}; - }; - - getFetchForWildcardOptions = () => { - return { - type: this.type, - rollupIndex: this.rollupIndex, - }; - }; - - getIndexTags(indexName) { - return this.isRollupIndex(indexName) - ? [ - { - key: this.type, - name: rollupIndexPatternIndexLabel, - color: 'primary', - }, - ] - : []; - } -} diff --git a/src/plugins/index_pattern_editor/public/service/index.ts b/src/plugins/index_pattern_editor/public/service/index.ts deleted file mode 100644 index 11bcfb06495b4..0000000000000 --- a/src/plugins/index_pattern_editor/public/service/index.ts +++ /dev/null @@ -1,10 +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 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 * from './index_pattern_management_service'; -export { IndexPatternCreationConfig, IndexPatternCreationOption } from './creation'; diff --git a/src/plugins/index_pattern_editor/public/service/index_pattern_management_service.ts b/src/plugins/index_pattern_editor/public/service/index_pattern_management_service.ts deleted file mode 100644 index 229050640e0d7..0000000000000 --- a/src/plugins/index_pattern_editor/public/service/index_pattern_management_service.ts +++ /dev/null @@ -1,44 +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 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 { HttpStart, CoreStart } from '../../../../core/public'; -import { IndexPatternCreationManager } from './creation'; - -interface StartDependencies { - httpClient: HttpStart; - uiSettings: CoreStart['uiSettings']; -} - -/** - * Index patterns management service - * - * @internal - */ -export class IndexPatternManagementService { - indexPatternCreationManager: IndexPatternCreationManager; - - constructor() { - this.indexPatternCreationManager = new IndexPatternCreationManager(); - } - - public setup() {} - - public start({ httpClient, uiSettings }: StartDependencies) { - return { - creation: this.indexPatternCreationManager.start({ httpClient, uiSettings }), - }; - } - - public stop() { - // nothing to do here yet. - } -} - -/** @internal */ -export type IndexPatternManagementServiceSetup = ReturnType; -export type IndexPatternManagementServiceStart = ReturnType; diff --git a/src/plugins/index_pattern_editor/public/shared_imports.ts b/src/plugins/index_pattern_editor/public/shared_imports.ts index 73e1942a1c83e..71a1ad2ebb72b 100644 --- a/src/plugins/index_pattern_editor/public/shared_imports.ts +++ b/src/plugins/index_pattern_editor/public/shared_imports.ts @@ -11,6 +11,7 @@ export { IndexPatternField, DataPublicPluginStart, IndexPatternSpec, + GetFieldsOptions, } from '../../data/public'; export { @@ -31,6 +32,7 @@ export { ValidationFunc, FieldConfig, getFieldValidityAndErrorMessage, + ValidationConfig, } from '../../es_ui_shared/static/forms/hook_form_lib'; export { fieldValidators } from '../../es_ui_shared/static/forms/helpers'; diff --git a/src/plugins/index_pattern_editor/public/types.ts b/src/plugins/index_pattern_editor/public/types.ts index 2a7cf6c7a2c90..6f64d50be75b7 100644 --- a/src/plugins/index_pattern_editor/public/types.ts +++ b/src/plugins/index_pattern_editor/public/types.ts @@ -16,7 +16,6 @@ import { import { DataPublicPluginStart } from './shared_imports'; import { OpenEditorOptions } from './open_editor'; -import { IndexPatternManagementServiceStart } from './service'; export interface IndexPatternEditorContext { uiSettings: IUiSettingsClient; @@ -25,7 +24,6 @@ export interface IndexPatternEditorContext { notifications: NotificationsStart; application: ApplicationStart; indexPatternService: DataPublicPluginStart['indexPatterns']; - indexPatternCreateService: IndexPatternManagementServiceStart; } // eslint-disable-next-line @typescript-eslint/no-empty-interface @@ -36,7 +34,6 @@ export interface PluginStart { userPermissions: { editIndexPattern: () => boolean; }; - indexPatternCreateService: IndexPatternManagementServiceStart; } // eslint-disable-next-line @typescript-eslint/no-empty-interface From 529d0d743a087fb412a4b7127df3e6064e609b2a Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Thu, 24 Jun 2021 23:17:54 -0500 Subject: [PATCH 039/130] fix broken import --- src/plugins/index_pattern_editor/public/components/index.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/plugins/index_pattern_editor/public/components/index.ts b/src/plugins/index_pattern_editor/public/components/index.ts index d266e62550ece..39909a47f2fe7 100644 --- a/src/plugins/index_pattern_editor/public/components/index.ts +++ b/src/plugins/index_pattern_editor/public/components/index.ts @@ -22,7 +22,6 @@ export { schema } from './form_schema'; export { TimestampField, TypeField, TitleField } from './form_fields'; export { EmptyState } from './empty_state'; export { EmptyIndexPatternPrompt } from './empty_index_pattern_prompt'; -export { IndexPatternCreationConfig } from '../service'; export { IndicesList } from './indices_list'; export { StatusMessage } from './status_message'; export { LoadingIndices } from './loading_indices'; From f89174bb116a7f8ffddc07ac52c9e92273f5dfdf Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Thu, 24 Jun 2021 23:51:25 -0500 Subject: [PATCH 040/130] restore rollup error, refactor out an useEffect instance --- .../components/form_fields/title_field.tsx | 65 ++++++++++++++--- .../components/form_fields/type_field.tsx | 7 +- .../index_pattern_editor_flyout_content.tsx | 73 ++++++------------- .../index_pattern_editor/public/types.ts | 7 ++ 4 files changed, 87 insertions(+), 65 deletions(-) diff --git a/src/plugins/index_pattern_editor/public/components/form_fields/title_field.tsx b/src/plugins/index_pattern_editor/public/components/form_fields/title_field.tsx index 50cde3c9e5a46..950fb0fc26bbb 100644 --- a/src/plugins/index_pattern_editor/public/components/form_fields/title_field.tsx +++ b/src/plugins/index_pattern_editor/public/components/form_fields/title_field.tsx @@ -18,12 +18,13 @@ import { import { IndexPatternConfig } from '../index_pattern_editor_flyout_content'; import { canAppendWildcard } from '../../lib'; import { schema } from '../form_schema'; -import { MatchedItem } from '../../types'; +import { MatchedItem, RollupIndicesCapsResponse } from '../../types'; interface TitleFieldProps { existingIndexPatterns: string[]; isRollup: boolean; matchedIndices: MatchedItem[]; + rollupIndicesCapabilities: RollupIndicesCapsResponse; } const rollupIndexPatternNoMatchError = { @@ -52,10 +53,17 @@ const createTitlesNotAllowedValidator = ( }, }); -const rollupIndexPatternValidator = ( - rollupIndices: string[], - matchedIndices: MatchedItem[] -): ValidationConfig<{}, string, string> => ({ +interface RollupIndexPatternValidatorArgs { + rollupIndices: string[]; + matchedIndices: MatchedItem[]; + rollupIndicesCapabilities: Record; +} + +const rollupIndexPatternValidator = ({ + rollupIndices, + matchedIndices, + rollupIndicesCapabilities, +}: RollupIndexPatternValidatorArgs): ValidationConfig<{}, string, string> => ({ validator: ({ value }) => { if (!rollupIndices || !rollupIndices.length) { return; @@ -70,14 +78,35 @@ const rollupIndexPatternValidator = ( } else if (rollupIndexMatches.length > 1) { return rollupIndexPatternTooManyMatchesError; } + + const error = rollupIndicesCapabilities[value].error; + + if (error) { + return { + message: i18n.translate('indexPatternEditor.rollup.uncaughtError', { + defaultMessage: 'Rollup index pattern error: {error}', + values: { + error, + }, + }), + }; + } }, }); -const getTitleConfig = ( - namesNotAllowed: string[], - isRollup: boolean, - matchedIndices: MatchedItem[] -): FieldConfig => { +interface GetTitleConfigArgs { + namesNotAllowed: string[]; + isRollup: boolean; + matchedIndices: MatchedItem[]; + rollupIndicesCapabilities: RollupIndicesCapsResponse; +} + +const getTitleConfig = ({ + namesNotAllowed, + isRollup, + matchedIndices, + rollupIndicesCapabilities, +}: GetTitleConfigArgs): FieldConfig => { const titleFieldConfig = schema.title; const validations = [ @@ -86,7 +115,13 @@ const getTitleConfig = ( ]; if (isRollup) { - validations.push(rollupIndexPatternValidator(['test-rollup', 'test-rollup2'], matchedIndices)); + validations.push( + rollupIndexPatternValidator({ + rollupIndices: ['test-rollup', 'test-rollup2'], + matchedIndices, + rollupIndicesCapabilities, + }) + ); } // Add validation to not allow duplicates @@ -100,13 +135,19 @@ export const TitleField = ({ existingIndexPatterns, isRollup, matchedIndices, + rollupIndicesCapabilities, }: TitleFieldProps) => { const [appendedWildcard, setAppendedWildcard] = useState(false); return ( path="title" - config={getTitleConfig(existingIndexPatterns, isRollup, matchedIndices)} + config={getTitleConfig({ + namesNotAllowed: existingIndexPatterns, + isRollup, + matchedIndices, + rollupIndicesCapabilities, + })} componentProps={{ euiFieldProps: { 'aria-label': i18n.translate('indexPatternEditor.form.titleAriaLabel', { diff --git a/src/plugins/index_pattern_editor/public/components/form_fields/type_field.tsx b/src/plugins/index_pattern_editor/public/components/form_fields/type_field.tsx index e70d5b447186e..f049e6b47a346 100644 --- a/src/plugins/index_pattern_editor/public/components/form_fields/type_field.tsx +++ b/src/plugins/index_pattern_editor/public/components/form_fields/type_field.tsx @@ -25,6 +25,10 @@ import { UseField } from '../../shared_imports'; import { IndexPatternConfig } from '../index_pattern_editor_flyout_content'; +interface TypeFieldProps { + onChange: (type: string) => void; +} + const standardSelectItem = ( @@ -63,7 +67,7 @@ const rollupSelectItem = ( ); -export const TypeField = () => { +export const TypeField = ({ onChange }: TypeFieldProps) => { return ( path="type"> {({ label, value, setValue }) => { @@ -86,6 +90,7 @@ export const TypeField = () => { valueOfSelected={value} onChange={(newValue) => { setValue(newValue); + onChange(newValue); }} aria-label={i18n.translate('indexPatternEditor.editor.form.typeSelectAriaLabel', { defaultMessage: 'Type field', diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx index 551b5f8e0f195..c272e7366b54e 100644 --- a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx @@ -41,7 +41,12 @@ import { import { AdvancedParametersSection } from './field_editor/advanced_parameters_section'; import { FlyoutPanels } from './flyout_panels'; -import { MatchedItem, ResolveIndexResponseItemAlias, IndexPatternEditorContext } from '../types'; +import { + MatchedItem, + ResolveIndexResponseItemAlias, + IndexPatternEditorContext, + RollupIndicesCapsResponse, +} from '../types'; import { LoadingIndices, @@ -119,21 +124,13 @@ const IndexPatternEditorFlyoutContentComponent = ({ indexPatternStub.type = ROLLUP_TYPE; indexPatternStub.typeMeta = { params: { - rollup_index: rollupIndex, // name as string + rollup_index: rollupIndex, }, - aggs: (rollupIndicesCapabilities[rollupIndex] as any).aggs, // todo + aggs: (rollupIndicesCapabilities[rollupIndex] as any).aggs, }; } await onSave(indexPatternStub); - /* - await onSave({ - title: formData.title, - timeFieldName: formData.timestampField?.value, - id: formData.id, - ...indexPatternCreationType.getIndexPatternMappings(), - }); - */ }, }); @@ -151,21 +148,16 @@ const IndexPatternEditorFlyoutContentComponent = ({ const [disableSubmit, setDisableSubmit] = useState(true); const [existingIndexPatterns, setExistingIndexPatterns] = useState([]); const [rollupIndex, setRollupIndex] = useState(); - const [rollupIndicesCapabilities, setRollupIndicesCapabilities] = useState< - Record - >({}); + const [ + rollupIndicesCapabilities, + setRollupIndicesCapabilities, + ] = useState({}); const [matchedIndices, setMatchedIndices] = useState({ allIndices: [], exactMatchedIndices: [], partialMatchedIndices: [], visibleIndices: [], }); - /* - const [ - indexPatternCreationType, - setIndexPatternCreationType, - ] = useState(indexPatternCreateService.creation.getType('default')); - */ const removeAliases = (item: MatchedItem) => !((item as unknown) as ResolveIndexResponseItemAlias).indices; @@ -219,17 +211,6 @@ const IndexPatternEditorFlyoutContentComponent = ({ }; }, [http, type]); - // updates index pattern creation type based on selection - // todo can I do this without effect? - useEffect(() => { - // const updatedCreationType = indexPatternCreateService.creation.getType(type); - // setIndexPatternCreationType(updatedCreationType); - if (type === ROLLUP_TYPE) { - form.setFieldValue('allowHidden', false); - } - // }, [type, indexPatternCreateService.creation, form]); - }, [type, form]); - // fetches indices and timestamp options useEffect(() => { const getRollupIndices = () => Object.keys(rollupIndicesCapabilities); @@ -298,14 +279,7 @@ const IndexPatternEditorFlyoutContentComponent = ({ getFieldsOptions.type = ROLLUP_TYPE; getFieldsOptions.rollupIndex = rollupIndex; } - /* - const fields = await ensureMinimumTime( - indexPatternService.getFieldsForWildcard({ - pattern: query, - ...indexPatternCreationType.getFetchForWildcardOptions(), - }) - ); - */ + const fields = await ensureMinimumTime( indexPatternService.getFieldsForWildcard(getFieldsOptions) ); @@ -364,7 +338,13 @@ const IndexPatternEditorFlyoutContentComponent = ({ const indexPatternTypeSelect = showIndexPatternTypeSelect() ? ( - + { + if (newType === ROLLUP_TYPE) { + form.setFieldValue('allowHidden', false); + } + }} + /> ) : ( @@ -411,23 +391,11 @@ const IndexPatternEditorFlyoutContentComponent = ({ const disable = !isValid || !matchedIndices.exactMatchedIndices.length || - // todo display errors - // !!indexPatternCreationType.checkIndicesForErrors(matchedIndices.exactMatchedIndices) || (!!timestampFieldOptions.length && timestampField === undefined); setDisableSubmit(disable); }); } - // move into render fn - /* - const disableSubmit = - !form.isValid || - !matchedIndices.exactMatchedIndices.length || - // todo display errors - !!indexPatternCreationType.checkIndicesForErrors(matchedIndices.exactMatchedIndices) || - (!!timestampFieldOptions.length && timestampField === undefined); - */ - const previewPanelContent = isLoadingIndexPatterns ? ( ) : ( @@ -472,6 +440,7 @@ const IndexPatternEditorFlyoutContentComponent = ({ isRollup={form.getFields().type?.value === ROLLUP_TYPE} existingIndexPatterns={existingIndexPatterns} matchedIndices={matchedIndices.exactMatchedIndices} + rollupIndicesCapabilities={rollupIndicesCapabilities} /> diff --git a/src/plugins/index_pattern_editor/public/types.ts b/src/plugins/index_pattern_editor/public/types.ts index 6f64d50be75b7..4bc1aa0f11574 100644 --- a/src/plugins/index_pattern_editor/public/types.ts +++ b/src/plugins/index_pattern_editor/public/types.ts @@ -152,3 +152,10 @@ export interface Tag { key: string; color: string; } + +export interface RollupIndiciesCapability { + aggs: unknown; + error: string; +} + +export type RollupIndicesCapsResponse = Record; From 2c18a25f43d2db6ea68ef5944e1da48fb97407ed Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Fri, 25 Jun 2021 00:03:52 -0500 Subject: [PATCH 041/130] use an enum instead of strings --- .../components/form_fields/type_field.tsx | 16 ++++++++--- .../index_pattern_editor_flyout_content.tsx | 27 ++++++++++--------- .../index_pattern_editor/public/types.ts | 5 ++++ 3 files changed, 32 insertions(+), 16 deletions(-) diff --git a/src/plugins/index_pattern_editor/public/components/form_fields/type_field.tsx b/src/plugins/index_pattern_editor/public/components/form_fields/type_field.tsx index f049e6b47a346..077b64154b3fd 100644 --- a/src/plugins/index_pattern_editor/public/components/form_fields/type_field.tsx +++ b/src/plugins/index_pattern_editor/public/components/form_fields/type_field.tsx @@ -25,6 +25,8 @@ import { UseField } from '../../shared_imports'; import { IndexPatternConfig } from '../index_pattern_editor_flyout_content'; +import { INDEX_PATTERN_TYPE } from '../../types'; + interface TypeFieldProps { onChange: (type: string) => void; } @@ -81,11 +83,19 @@ export const TypeField = ({ onChange }: TypeFieldProps) => { data-test-subj="typeField" options={[ { - value: 'default', - inputDisplay: 'Standard', + value: INDEX_PATTERN_TYPE.DEFAULT, + inputDisplay: i18n.translate('indexPatternEditor.typeSelect.standard', { + defaultMessage: 'Standard', + }), dropdownDisplay: standardSelectItem, }, - { value: 'rollup', inputDisplay: 'Rollup', dropdownDisplay: rollupSelectItem }, + { + value: INDEX_PATTERN_TYPE.ROLLUP, + inputDisplay: i18n.translate('indexPatternEditor.typeSelect.rollup', { + defaultMessage: 'Rollup', + }), + dropdownDisplay: rollupSelectItem, + }, ]} valueOfSelected={value} onChange={(newValue) => { diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx index c272e7366b54e..3384e0c9fc402 100644 --- a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx @@ -46,6 +46,7 @@ import { ResolveIndexResponseItemAlias, IndexPatternEditorContext, RollupIndicesCapsResponse, + INDEX_PATTERN_TYPE, } from '../types'; import { @@ -61,8 +62,6 @@ import { geti18nTexts, } from '.'; -const ROLLUP_TYPE = 'rollup'; - export interface Props { /** * Handler for the "save" footer button @@ -107,7 +106,9 @@ const IndexPatternEditorFlyoutContentComponent = ({ // return type, interal type const { form } = useForm({ - defaultValue: { type: defaultTypeIsRollup ? ROLLUP_TYPE : 'default' }, + defaultValue: { + type: defaultTypeIsRollup ? INDEX_PATTERN_TYPE.ROLLUP : INDEX_PATTERN_TYPE.DEFAULT, + }, schema, onSubmit: async (formData, isValid) => { if (!isValid) { @@ -120,8 +121,8 @@ const IndexPatternEditorFlyoutContentComponent = ({ id: formData.id, }; - if (type === ROLLUP_TYPE && rollupIndex) { - indexPatternStub.type = ROLLUP_TYPE; + if (type === INDEX_PATTERN_TYPE.ROLLUP && rollupIndex) { + indexPatternStub.type = INDEX_PATTERN_TYPE.ROLLUP; indexPatternStub.typeMeta = { params: { rollup_index: rollupIndex, @@ -203,7 +204,7 @@ const IndexPatternEditorFlyoutContentComponent = ({ // Silently swallow failure responses such as expired trials } }; - if (type === ROLLUP_TYPE) { + if (type === INDEX_PATTERN_TYPE.ROLLUP) { getRollups(); } return () => { @@ -219,7 +220,7 @@ const IndexPatternEditorFlyoutContentComponent = ({ isRollupIndex(indexName) ? [ { - key: ROLLUP_TYPE, + key: INDEX_PATTERN_TYPE.ROLLUP, name: i18nTexts.rollupLabel, color: 'primary', }, @@ -260,7 +261,7 @@ const IndexPatternEditorFlyoutContentComponent = ({ allowHidden ); - if (type === ROLLUP_TYPE) { + if (type === INDEX_PATTERN_TYPE.ROLLUP) { const rollupIndices = exactMatched.filter((index) => isRollupIndex(index.name)); setRollupIndex(rollupIndices.length === 1 ? rollupIndices[0].name : undefined); } else { @@ -275,8 +276,8 @@ const IndexPatternEditorFlyoutContentComponent = ({ const getFieldsOptions: GetFieldsOptions = { pattern: query, }; - if (type === ROLLUP_TYPE) { - getFieldsOptions.type = ROLLUP_TYPE; + if (type === INDEX_PATTERN_TYPE.ROLLUP) { + getFieldsOptions.type = INDEX_PATTERN_TYPE.ROLLUP; getFieldsOptions.rollupIndex = rollupIndex; } @@ -340,7 +341,7 @@ const IndexPatternEditorFlyoutContentComponent = ({ { - if (newType === ROLLUP_TYPE) { + if (newType === INDEX_PATTERN_TYPE.ROLLUP) { form.setFieldValue('allowHidden', false); } }} @@ -378,7 +379,7 @@ const IndexPatternEditorFlyoutContentComponent = ({ return ( @@ -437,7 +438,7 @@ const IndexPatternEditorFlyoutContentComponent = ({ {/* Name */} ; + +export enum INDEX_PATTERN_TYPE { + ROLLUP = 'rollup', + DEFAULT = 'default', +} From bf10a4e6ab2546a2c20db73021691512497fbfdf Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Fri, 25 Jun 2021 00:06:13 -0500 Subject: [PATCH 042/130] use an enum instead of strings --- .../empty_index_pattern_prompt.test.tsx | 9 +-------- .../public/components/form_schema.ts | 3 ++- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/empty_index_pattern_prompt.test.tsx b/src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/empty_index_pattern_prompt.test.tsx index 1cd0574a35d15..dce4b33fb8305 100644 --- a/src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/empty_index_pattern_prompt.test.tsx +++ b/src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/empty_index_pattern_prompt.test.tsx @@ -12,14 +12,7 @@ import { shallowWithI18nProvider } from '@kbn/test/jest'; describe('EmptyIndexPatternPrompt', () => { it('should render normally', () => { - const component = shallowWithI18nProvider( - {} }]} - docLinksIndexPatternIntro={'testUrl'} - setBreadcrumbs={() => {}} - /> - ); + const component = shallowWithI18nProvider( {}} />); expect(component).toMatchSnapshot(); }); diff --git a/src/plugins/index_pattern_editor/public/components/form_schema.ts b/src/plugins/index_pattern_editor/public/components/form_schema.ts index 702ae92037ef7..7faaa235aad2a 100644 --- a/src/plugins/index_pattern_editor/public/components/form_schema.ts +++ b/src/plugins/index_pattern_editor/public/components/form_schema.ts @@ -8,6 +8,7 @@ import { i18n } from '@kbn/i18n'; import { fieldValidators } from '../shared_imports'; +import { INDEX_PATTERN_TYPE } from '../types'; // import { RUNTIME_FIELD_OPTIONS } from './constants'; @@ -69,7 +70,7 @@ export const schema = { label: i18n.translate('indexPatternEditor.editor.form.TypeLabel', { defaultMessage: 'Index pattern type', }), - defaultValue: 'default', + defaultValue: INDEX_PATTERN_TYPE.DEFAULT, }, /* script: { From 1318b922eeb4957639381df6f3d58740279fb69d Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Fri, 25 Jun 2021 00:38:21 -0500 Subject: [PATCH 043/130] break rendering into smaller files --- .../advanced_params_content.tsx | 61 ++++++++++++ .../advanced_params_section.tsx} | 2 +- .../advanced_params_content/index.ts | 9 ++ .../public/components/footer/footer.tsx | 63 +++++++++++++ .../public/components/footer/index.ts | 9 ++ .../public/components/i18n_texts.ts | 3 - .../public/components/index.ts | 2 + .../index_pattern_editor_flyout_content.tsx | 93 ++----------------- .../index_pattern_editor/public/types.ts | 10 ++ 9 files changed, 165 insertions(+), 87 deletions(-) create mode 100644 src/plugins/index_pattern_editor/public/components/advanced_params_content/advanced_params_content.tsx rename src/plugins/index_pattern_editor/public/components/{field_editor/advanced_parameters_section.tsx => advanced_params_content/advanced_params_section.tsx} (95%) create mode 100644 src/plugins/index_pattern_editor/public/components/advanced_params_content/index.ts create mode 100644 src/plugins/index_pattern_editor/public/components/footer/footer.tsx create mode 100644 src/plugins/index_pattern_editor/public/components/footer/index.ts diff --git a/src/plugins/index_pattern_editor/public/components/advanced_params_content/advanced_params_content.tsx b/src/plugins/index_pattern_editor/public/components/advanced_params_content/advanced_params_content.tsx new file mode 100644 index 0000000000000..536944a81d445 --- /dev/null +++ b/src/plugins/index_pattern_editor/public/components/advanced_params_content/advanced_params_content.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 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 React from 'react'; +import { i18n } from '@kbn/i18n'; +import { EuiFlexGroup, EuiFlexItem, EuiSpacer } from '@elastic/eui'; + +import { UseField, TextField, ToggleField } from '../../shared_imports'; +import { IndexPatternConfig } from '../../types'; + +import { AdvancedParamsSection } from './advanced_params_section'; + +const allowHiddenAriaLabel = i18n.translate('indexPatternEditor.form.allowHiddenAriaLabel', { + defaultMessage: 'Allow hidden and system indices', +}); + +const customIndexPatternIdLabel = i18n.translate( + 'indexPatternEditor.form.customIndexPatternIdLabel', + { + defaultMessage: 'Custom index pattern ID', + } +); + +export const AdvancedParamsContent = () => ( + + + + + path={'allowHidden'} + component={ToggleField} + data-test-subj="allowHiddenField" + componentProps={{ + euiFieldProps: { + 'aria-label': allowHiddenAriaLabel, + }, + }} + /> + + + + + + + path={'id'} + component={TextField} + data-test-subj="savedObjectIdField" + componentProps={{ + euiFieldProps: { + 'aria-label': customIndexPatternIdLabel, + }, + }} + /> + + + +); diff --git a/src/plugins/index_pattern_editor/public/components/field_editor/advanced_parameters_section.tsx b/src/plugins/index_pattern_editor/public/components/advanced_params_content/advanced_params_section.tsx similarity index 95% rename from src/plugins/index_pattern_editor/public/components/field_editor/advanced_parameters_section.tsx rename to src/plugins/index_pattern_editor/public/components/advanced_params_content/advanced_params_section.tsx index c74ff81fe36e9..cdfff74daa3cc 100644 --- a/src/plugins/index_pattern_editor/public/components/field_editor/advanced_parameters_section.tsx +++ b/src/plugins/index_pattern_editor/public/components/advanced_params_content/advanced_params_section.tsx @@ -15,7 +15,7 @@ interface Props { children: React.ReactNode; } -export const AdvancedParametersSection = ({ children }: Props) => { +export const AdvancedParamsSection = ({ children }: Props) => { const [isVisible, setIsVisible] = useState(false); const toggleIsVisible = () => { diff --git a/src/plugins/index_pattern_editor/public/components/advanced_params_content/index.ts b/src/plugins/index_pattern_editor/public/components/advanced_params_content/index.ts new file mode 100644 index 0000000000000..a285004d1f45d --- /dev/null +++ b/src/plugins/index_pattern_editor/public/components/advanced_params_content/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 { AdvancedParamsContent } from './advanced_params_content'; diff --git a/src/plugins/index_pattern_editor/public/components/footer/footer.tsx b/src/plugins/index_pattern_editor/public/components/footer/footer.tsx new file mode 100644 index 0000000000000..0c80d0e77534c --- /dev/null +++ b/src/plugins/index_pattern_editor/public/components/footer/footer.tsx @@ -0,0 +1,63 @@ +/* + * 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 React from 'react'; +import { i18n } from '@kbn/i18n'; + +import { + EuiFlyoutFooter, + EuiFlexGroup, + EuiFlexItem, + EuiButtonEmpty, + EuiButton, +} from '@elastic/eui'; + +interface FooterProps { + onCancel: () => void; + onSubmit: () => void; + submitDisabled: boolean; +} + +const closeButtonLabel = i18n.translate('indexPatternEditor.editor.flyoutCloseButtonLabel', { + defaultMessage: 'Close', +}); + +const saveButtonLabel = i18n.translate('indexPatternEditor.editor.flyoutSaveButtonLabel', { + defaultMessage: 'Create index pattern', +}); + +export const Footer = ({ onCancel, onSubmit, submitDisabled }: FooterProps) => { + return ( + + + + + {closeButtonLabel} + + + + + + {saveButtonLabel} + + + + + ); +}; diff --git a/src/plugins/index_pattern_editor/public/components/footer/index.ts b/src/plugins/index_pattern_editor/public/components/footer/index.ts new file mode 100644 index 0000000000000..e3103aab170e0 --- /dev/null +++ b/src/plugins/index_pattern_editor/public/components/footer/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 { Footer } from './footer'; diff --git a/src/plugins/index_pattern_editor/public/components/i18n_texts.ts b/src/plugins/index_pattern_editor/public/components/i18n_texts.ts index 70b37004def32..3249938233535 100644 --- a/src/plugins/index_pattern_editor/public/components/i18n_texts.ts +++ b/src/plugins/index_pattern_editor/public/components/i18n_texts.ts @@ -10,9 +10,6 @@ import { i18n } from '@kbn/i18n'; export const geti18nTexts = () => { return { - closeButtonLabel: i18n.translate('indexPatternEditor.editor.flyoutCloseButtonLabel', { - defaultMessage: 'Close', - }), saveButtonLabel: i18n.translate('indexPatternEditor.editor.flyoutSaveButtonLabel', { defaultMessage: 'Create index pattern', }), diff --git a/src/plugins/index_pattern_editor/public/components/index.ts b/src/plugins/index_pattern_editor/public/components/index.ts index 39909a47f2fe7..6ead6fbcb7e2b 100644 --- a/src/plugins/index_pattern_editor/public/components/index.ts +++ b/src/plugins/index_pattern_editor/public/components/index.ts @@ -26,3 +26,5 @@ export { IndicesList } from './indices_list'; export { StatusMessage } from './status_message'; export { LoadingIndices } from './loading_indices'; export { geti18nTexts } from './i18n_texts'; +export { Footer } from './footer'; +export { AdvancedParamsContent } from './advanced_params_content'; diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx index c2ac7bcf3c0a5..1e5b02fc5fc2f 100644 --- a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx @@ -7,26 +7,13 @@ */ import React, { useState, useEffect, useCallback } from 'react'; -import { - EuiFlyoutFooter, - EuiTitle, - EuiFlexGroup, - EuiFlexItem, - EuiButtonEmpty, - EuiButton, - EuiSpacer, - EuiLoadingSpinner, - EuiComboBoxOptionOption, -} from '@elastic/eui'; +import { EuiTitle, EuiFlexGroup, EuiFlexItem, EuiSpacer, EuiLoadingSpinner } from '@elastic/eui'; import { IndexPatternSpec, Form, - UseField, useForm, - TextField, useFormData, - ToggleField, useKibana, GetFieldsOptions, } from '../shared_imports'; @@ -38,7 +25,6 @@ import { getMatchedIndices, MatchedIndicesSet, } from '../lib'; -import { AdvancedParametersSection } from './field_editor/advanced_parameters_section'; import { FlyoutPanels } from './flyout_panels'; import { @@ -47,6 +33,7 @@ import { IndexPatternEditorContext, RollupIndicesCapsResponse, INDEX_PATTERN_TYPE, + IndexPatternConfig, } from '../types'; import { @@ -60,6 +47,8 @@ import { TitleField, schema, geti18nTexts, + Footer, + AdvancedParamsContent, } from '.'; export interface Props { @@ -75,14 +64,6 @@ export interface Props { defaultTypeIsRollup?: boolean; requireTimestampField?: boolean; } - -export interface IndexPatternConfig { - title: string; - timestampField?: EuiComboBoxOptionOption; - allowHidden: boolean; - id?: string; - type: string; -} export interface TimestampOption { display: string; fieldName?: string; @@ -456,67 +437,13 @@ const IndexPatternEditorFlyoutContentComponent = ({ /> - - - - - - path={'allowHidden'} - component={ToggleField} - data-test-subj="allowHiddenField" - componentProps={{ - euiFieldProps: { - 'aria-label': i18nTexts.allowHiddenAriaLabel, - }, - }} - /> - - - - - - - path={'id'} - component={TextField} - data-test-subj="savedObjectIdField" - componentProps={{ - euiFieldProps: { - 'aria-label': i18nTexts.customIndexPatternIdLabel, - }, - }} - /> - - - + - {/* */} - {/* modal */} - - - - - {i18nTexts.closeButtonLabel} - - - - - form.submit()} - data-test-subj="saveIndexPatternButton" - fill - disabled={disableSubmit} - > - {i18nTexts.saveButtonLabel} - - - - +
form.submit()} + submitDisabled={disableSubmit} + /> {previewPanelContent} diff --git a/src/plugins/index_pattern_editor/public/types.ts b/src/plugins/index_pattern_editor/public/types.ts index e555695362f1c..98a5ce1e43dc4 100644 --- a/src/plugins/index_pattern_editor/public/types.ts +++ b/src/plugins/index_pattern_editor/public/types.ts @@ -14,6 +14,8 @@ import { HttpSetup, } from 'src/core/public'; +import { EuiComboBoxOptionOption } from '@elastic/eui'; + import { DataPublicPluginStart } from './shared_imports'; import { OpenEditorOptions } from './open_editor'; @@ -164,3 +166,11 @@ export enum INDEX_PATTERN_TYPE { ROLLUP = 'rollup', DEFAULT = 'default', } + +export interface IndexPatternConfig { + title: string; + timestampField?: EuiComboBoxOptionOption; + allowHidden: boolean; + id?: string; + type: string; +} From 3d82f7f4d4bc0a55d7ba66be9d24225eb8d071b5 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Fri, 25 Jun 2021 00:51:53 -0500 Subject: [PATCH 044/130] disable allow hidden when rollup is selected, minor cleanup --- .../advanced_params_content/advanced_params_content.tsx | 7 ++++++- .../index_pattern_editor/public/components/i18n_texts.ts | 9 --------- .../components/index_pattern_editor_flyout_content.tsx | 8 +------- 3 files changed, 7 insertions(+), 17 deletions(-) diff --git a/src/plugins/index_pattern_editor/public/components/advanced_params_content/advanced_params_content.tsx b/src/plugins/index_pattern_editor/public/components/advanced_params_content/advanced_params_content.tsx index 536944a81d445..ad876fed51801 100644 --- a/src/plugins/index_pattern_editor/public/components/advanced_params_content/advanced_params_content.tsx +++ b/src/plugins/index_pattern_editor/public/components/advanced_params_content/advanced_params_content.tsx @@ -26,7 +26,11 @@ const customIndexPatternIdLabel = i18n.translate( } ); -export const AdvancedParamsContent = () => ( +interface AdvancedParamsContentProps { + disableAllowHidden: boolean; +} + +export const AdvancedParamsContent = ({ disableAllowHidden }: AdvancedParamsContentProps) => ( @@ -37,6 +41,7 @@ export const AdvancedParamsContent = () => ( componentProps={{ euiFieldProps: { 'aria-label': allowHiddenAriaLabel, + disabled: disableAllowHidden, }, }} /> diff --git a/src/plugins/index_pattern_editor/public/components/i18n_texts.ts b/src/plugins/index_pattern_editor/public/components/i18n_texts.ts index 3249938233535..8231901012e05 100644 --- a/src/plugins/index_pattern_editor/public/components/i18n_texts.ts +++ b/src/plugins/index_pattern_editor/public/components/i18n_texts.ts @@ -10,21 +10,12 @@ import { i18n } from '@kbn/i18n'; export const geti18nTexts = () => { return { - saveButtonLabel: i18n.translate('indexPatternEditor.editor.flyoutSaveButtonLabel', { - defaultMessage: 'Create index pattern', - }), noTimestampOptionText: i18n.translate( 'indexPatternEditor.createIndexPattern.stepTime.noTimeFieldsLabel', { defaultMessage: "The matching data sources don't have time fields.", } ), - allowHiddenAriaLabel: i18n.translate('indexPatternEditor.form.allowHiddenAriaLabel', { - defaultMessage: 'Allow hidden and system indices', - }), - customIndexPatternIdLabel: i18n.translate('indexPatternEditor.form.customIndexPatternIdLabel', { - defaultMessage: 'Custom index pattern ID', - }), timestampFieldHelp: i18n.translate('indexPatternEditor.editor.form.timeFieldHelp', { defaultMessage: 'Select a primary time field for use with the global time filter.', }), diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx index 1e5b02fc5fc2f..76fd1854c60d4 100644 --- a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx @@ -405,19 +405,13 @@ const IndexPatternEditorFlyoutContentComponent = ({ <> - {/* - possibly break out into own component - */} - {/* */}

Create index pattern

 - {/* */}
{indexPatternTypeSelect} - {/* Name */} - +
Date: Fri, 25 Jun 2021 02:05:47 -0500 Subject: [PATCH 045/130] I think rollup validation is working --- .../components/form_fields/title_field.tsx | 22 +- .../index_pattern_editor_flyout_content.tsx | 188 +++++++++--------- .../public/lib/get_matched_indices.ts | 9 +- .../index_pattern_editor/public/lib/index.ts | 2 +- .../index_pattern_editor/public/types.ts | 7 + 5 files changed, 119 insertions(+), 109 deletions(-) diff --git a/src/plugins/index_pattern_editor/public/components/form_fields/title_field.tsx b/src/plugins/index_pattern_editor/public/components/form_fields/title_field.tsx index 950fb0fc26bbb..1864513a47abf 100644 --- a/src/plugins/index_pattern_editor/public/components/form_fields/title_field.tsx +++ b/src/plugins/index_pattern_editor/public/components/form_fields/title_field.tsx @@ -15,16 +15,21 @@ import { ValidationConfig, FieldConfig, } from '../../shared_imports'; -import { IndexPatternConfig } from '../index_pattern_editor_flyout_content'; import { canAppendWildcard } from '../../lib'; import { schema } from '../form_schema'; -import { MatchedItem, RollupIndicesCapsResponse } from '../../types'; +import { + MatchedItem, + RollupIndicesCapsResponse, + IndexPatternConfig, + MatchedIndicesSet, +} from '../../types'; interface TitleFieldProps { existingIndexPatterns: string[]; isRollup: boolean; matchedIndices: MatchedItem[]; rollupIndicesCapabilities: RollupIndicesCapsResponse; + refreshMatchedIndices: (title: string) => Promise; } const rollupIndexPatternNoMatchError = { @@ -57,19 +62,23 @@ interface RollupIndexPatternValidatorArgs { rollupIndices: string[]; matchedIndices: MatchedItem[]; rollupIndicesCapabilities: Record; + refreshMatchedIndices: (title: string) => Promise; } const rollupIndexPatternValidator = ({ rollupIndices, matchedIndices, rollupIndicesCapabilities, + refreshMatchedIndices, }: RollupIndexPatternValidatorArgs): ValidationConfig<{}, string, string> => ({ - validator: ({ value }) => { + validator: async ({ value }) => { if (!rollupIndices || !rollupIndices.length) { return; } - const rollupIndexMatches = matchedIndices.filter((matchedIndex) => + const results = await refreshMatchedIndices(value); + + const rollupIndexMatches = results.exactMatchedIndices.filter((matchedIndex) => rollupIndices.includes(matchedIndex.name) ); @@ -99,6 +108,7 @@ interface GetTitleConfigArgs { isRollup: boolean; matchedIndices: MatchedItem[]; rollupIndicesCapabilities: RollupIndicesCapsResponse; + refreshMatchedIndices: (title: string) => Promise; } const getTitleConfig = ({ @@ -106,6 +116,7 @@ const getTitleConfig = ({ isRollup, matchedIndices, rollupIndicesCapabilities, + refreshMatchedIndices, }: GetTitleConfigArgs): FieldConfig => { const titleFieldConfig = schema.title; @@ -120,6 +131,7 @@ const getTitleConfig = ({ rollupIndices: ['test-rollup', 'test-rollup2'], matchedIndices, rollupIndicesCapabilities, + refreshMatchedIndices, }) ); } @@ -136,6 +148,7 @@ export const TitleField = ({ isRollup, matchedIndices, rollupIndicesCapabilities, + refreshMatchedIndices, }: TitleFieldProps) => { const [appendedWildcard, setAppendedWildcard] = useState(false); @@ -147,6 +160,7 @@ export const TitleField = ({ isRollup, matchedIndices, rollupIndicesCapabilities, + refreshMatchedIndices, })} componentProps={{ euiFieldProps: { diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx index 76fd1854c60d4..a85bfbf723b09 100644 --- a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx @@ -18,13 +18,7 @@ import { GetFieldsOptions, } from '../shared_imports'; -import { - ensureMinimumTime, - getIndices, - extractTimeFields, - getMatchedIndices, - MatchedIndicesSet, -} from '../lib'; +import { ensureMinimumTime, getIndices, extractTimeFields, getMatchedIndices } from '../lib'; import { FlyoutPanels } from './flyout_panels'; import { @@ -34,6 +28,7 @@ import { RollupIndicesCapsResponse, INDEX_PATTERN_TYPE, IndexPatternConfig, + MatchedIndicesSet, } from '../types'; import { @@ -119,7 +114,7 @@ const IndexPatternEditorFlyoutContentComponent = ({ const [{ title, allowHidden, type, timestampField }] = useFormData({ form }); const [isLoadingSources, setIsLoadingSources] = useState(true); - const [lastTitle, setLastTitle] = useState(''); + // const [lastTitle, setLastTitle] = useState(''); const [timestampFieldOptions, setTimestampFieldOptions] = useState([]); const [isLoadingTimestampFields, setIsLoadingTimestampFields] = useState(false); const [isLoadingMatchedIndices, setIsLoadingMatchedIndices] = useState(false); @@ -193,102 +188,100 @@ const IndexPatternEditorFlyoutContentComponent = ({ }; }, [http, type]); - // fetches indices and timestamp options - useEffect(() => { - const getRollupIndices = () => Object.keys(rollupIndicesCapabilities); - const isRollupIndex = (indexName: string) => getRollupIndices().includes(indexName); - const getIndexTags = (indexName: string) => - isRollupIndex(indexName) - ? [ - { - key: INDEX_PATTERN_TYPE.ROLLUP, - name: i18nTexts.rollupLabel, - color: 'primary', - }, - ] - : []; - - const fetchIndices = async (query: string = '') => { - setIsLoadingMatchedIndices(true); - const indexRequests = []; - - if (query?.endsWith('*')) { - const exactMatchedQuery = getIndices(http, getIndexTags, query, allowHidden); - indexRequests.push(exactMatchedQuery); - indexRequests.push(Promise.resolve([])); - } else { - const exactMatchQuery = getIndices(http, getIndexTags, query, allowHidden); - const partialMatchQuery = getIndices(http, getIndexTags, `${query}*`, allowHidden); - - indexRequests.push(exactMatchQuery); - indexRequests.push(partialMatchQuery); - } - - const [exactMatched, partialMatched] = (await ensureMinimumTime( - indexRequests - )) as MatchedItem[][]; - - if (query !== lastTitle) { - return; - } + const reloadMatchedIndices = useCallback( + async (title2: string) => { + const getRollupIndices = () => Object.keys(rollupIndicesCapabilities); + const isRollupIndex = (indexName: string) => getRollupIndices().includes(indexName); + const getIndexTags = (indexName: string) => + isRollupIndex(indexName) + ? [ + { + key: INDEX_PATTERN_TYPE.ROLLUP, + name: i18nTexts.rollupLabel, + color: 'primary', + }, + ] + : []; + + const fetchIndices = async (query: string = '') => { + setIsLoadingMatchedIndices(true); + const indexRequests = []; + + if (query?.endsWith('*')) { + const exactMatchedQuery = getIndices(http, getIndexTags, query, allowHidden); + indexRequests.push(exactMatchedQuery); + indexRequests.push(Promise.resolve([])); + } else { + const exactMatchQuery = getIndices(http, getIndexTags, query, allowHidden); + const partialMatchQuery = getIndices(http, getIndexTags, `${query}*`, allowHidden); + + indexRequests.push(exactMatchQuery); + indexRequests.push(partialMatchQuery); + } - const isValidResult = - !!title?.length && !existingIndexPatterns.includes(title) && exactMatched.length > 0; + const [exactMatched, partialMatched] = (await ensureMinimumTime( + indexRequests + )) as MatchedItem[][]; - const matchedIndicesResult = getMatchedIndices( - allSources, - partialMatched, - exactMatched, - allowHidden - ); + const isValidResult = + !!title?.length && !existingIndexPatterns.includes(title) && exactMatched.length > 0; - if (type === INDEX_PATTERN_TYPE.ROLLUP) { - const rollupIndices = exactMatched.filter((index) => isRollupIndex(index.name)); - setRollupIndex(rollupIndices.length === 1 ? rollupIndices[0].name : undefined); - } else { - setRollupIndex(undefined); - } - - setMatchedIndices(matchedIndicesResult); - setIsLoadingMatchedIndices(false); + const matchedIndicesResult = getMatchedIndices( + allSources, + partialMatched, + exactMatched, + allowHidden + ); - if (isValidResult) { - setIsLoadingTimestampFields(true); - const getFieldsOptions: GetFieldsOptions = { - pattern: query, - }; if (type === INDEX_PATTERN_TYPE.ROLLUP) { - getFieldsOptions.type = INDEX_PATTERN_TYPE.ROLLUP; - getFieldsOptions.rollupIndex = rollupIndex; + const rollupIndices = exactMatched.filter((index) => isRollupIndex(index.name)); + setRollupIndex(rollupIndices.length === 1 ? rollupIndices[0].name : undefined); + } else { + setRollupIndex(undefined); } - const fields = await ensureMinimumTime( - indexPatternService.getFieldsForWildcard(getFieldsOptions) - ); - const timeFields = extractTimeFields(fields, requireTimestampField); - setIsLoadingTimestampFields(false); - setTimestampFieldOptions(timeFields); - } else { - setTimestampFieldOptions([]); - } - }; + setMatchedIndices(matchedIndicesResult); + setIsLoadingMatchedIndices(false); + + if (isValidResult) { + setIsLoadingTimestampFields(true); + const getFieldsOptions: GetFieldsOptions = { + pattern: query, + }; + if (type === INDEX_PATTERN_TYPE.ROLLUP) { + getFieldsOptions.type = INDEX_PATTERN_TYPE.ROLLUP; + getFieldsOptions.rollupIndex = rollupIndex; + } + + const fields = await ensureMinimumTime( + indexPatternService.getFieldsForWildcard(getFieldsOptions) + ); + const timeFields = extractTimeFields(fields, requireTimestampField); + setIsLoadingTimestampFields(false); + setTimestampFieldOptions(timeFields); + } else { + setTimestampFieldOptions([]); + } + return matchedIndicesResult; + }; - setLastTitle(title); - fetchIndices(title); - }, [ - title, - existingIndexPatterns, - http, - indexPatternService, - allowHidden, - lastTitle, - allSources, - requireTimestampField, - rollupIndex, - type, - i18nTexts.rollupLabel, - rollupIndicesCapabilities, - ]); + setLastTitle(title2); + return fetchIndices(title2); + }, + [ + title, + existingIndexPatterns, + http, + indexPatternService, + allowHidden, + allSources, + requireTimestampField, + rollupIndex, + type, + i18nTexts.rollupLabel, + rollupIndicesCapabilities, + ] + ); // todo if (isLoadingSources || isLoadingIndexPatterns) { @@ -322,6 +315,8 @@ const IndexPatternEditorFlyoutContentComponent = ({ { + form.setFieldValue('title', ''); + form.setFieldValue('timestampField', ''); if (newType === INDEX_PATTERN_TYPE.ROLLUP) { form.setFieldValue('allowHidden', false); } @@ -416,6 +411,7 @@ const IndexPatternEditorFlyoutContentComponent = ({ diff --git a/src/plugins/index_pattern_editor/public/lib/get_matched_indices.ts b/src/plugins/index_pattern_editor/public/lib/get_matched_indices.ts index 57c951c80c6a6..0b659aa5fbc76 100644 --- a/src/plugins/index_pattern_editor/public/lib/get_matched_indices.ts +++ b/src/plugins/index_pattern_editor/public/lib/get_matched_indices.ts @@ -50,14 +50,7 @@ function filterSystemIndices(indices: MatchedItem[], isIncludingSystemIndices: b We call this `exact` matches because ES is telling us exactly what it matches */ -import { MatchedItem } from '../types'; - -export interface MatchedIndicesSet { - allIndices: MatchedItem[]; - exactMatchedIndices: MatchedItem[]; - partialMatchedIndices: MatchedItem[]; - visibleIndices: MatchedItem[]; -} +import { MatchedItem, MatchedIndicesSet } from '../types'; export function getMatchedIndices( unfilteredAllIndices: MatchedItem[], diff --git a/src/plugins/index_pattern_editor/public/lib/index.ts b/src/plugins/index_pattern_editor/public/lib/index.ts index 8e1ed7b95aa44..371712b70a0d2 100644 --- a/src/plugins/index_pattern_editor/public/lib/index.ts +++ b/src/plugins/index_pattern_editor/public/lib/index.ts @@ -12,7 +12,7 @@ export { ensureMinimumTime } from './ensure_minimum_time'; export { getIndices } from './get_indices'; -export { getMatchedIndices, MatchedIndicesSet } from './get_matched_indices'; +export { getMatchedIndices } from './get_matched_indices'; export { containsIllegalCharacters } from './contains_illegal_characters'; diff --git a/src/plugins/index_pattern_editor/public/types.ts b/src/plugins/index_pattern_editor/public/types.ts index 98a5ce1e43dc4..dd76b560f1c52 100644 --- a/src/plugins/index_pattern_editor/public/types.ts +++ b/src/plugins/index_pattern_editor/public/types.ts @@ -174,3 +174,10 @@ export interface IndexPatternConfig { id?: string; type: string; } + +export interface MatchedIndicesSet { + allIndices: MatchedItem[]; + exactMatchedIndices: MatchedItem[]; + partialMatchedIndices: MatchedItem[]; + visibleIndices: MatchedItem[]; +} From 08fca30b44b27392282aaf0183b161b0de3f2265 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Fri, 25 Jun 2021 02:08:56 -0500 Subject: [PATCH 046/130] I think rollup validation is working --- .../components/index_pattern_editor_flyout_content.tsx | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx index a85bfbf723b09..17b200b82deff 100644 --- a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx @@ -265,7 +265,7 @@ const IndexPatternEditorFlyoutContentComponent = ({ return matchedIndicesResult; }; - setLastTitle(title2); + // setLastTitle(title2); return fetchIndices(title2); }, [ @@ -328,6 +328,13 @@ const IndexPatternEditorFlyoutContentComponent = ({ <> ); + /* + +TODO MOVE SOME OF THIS COMPLEXITY INTO A COMPONENT + + + */ + const renderIndexList = () => { if (isLoadingSources) { return <>; From c88c528892b6d1999474d345e33bac2baeb06799 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Fri, 25 Jun 2021 09:41:21 -0500 Subject: [PATCH 047/130] fix title validation --- .../components/form_fields/title_field.tsx | 31 +++++++------------ 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/src/plugins/index_pattern_editor/public/components/form_fields/title_field.tsx b/src/plugins/index_pattern_editor/public/components/form_fields/title_field.tsx index 1864513a47abf..0ff1a8185cbec 100644 --- a/src/plugins/index_pattern_editor/public/components/form_fields/title_field.tsx +++ b/src/plugins/index_pattern_editor/public/components/form_fields/title_field.tsx @@ -30,6 +30,7 @@ interface TitleFieldProps { matchedIndices: MatchedItem[]; rollupIndicesCapabilities: RollupIndicesCapsResponse; refreshMatchedIndices: (title: string) => Promise; + rollupIndices: string[]; } const rollupIndexPatternNoMatchError = { @@ -59,25 +60,24 @@ const createTitlesNotAllowedValidator = ( }); interface RollupIndexPatternValidatorArgs { - rollupIndices: string[]; - matchedIndices: MatchedItem[]; rollupIndicesCapabilities: Record; refreshMatchedIndices: (title: string) => Promise; + isRollup: boolean; } const rollupIndexPatternValidator = ({ - rollupIndices, - matchedIndices, rollupIndicesCapabilities, refreshMatchedIndices, + isRollup, }: RollupIndexPatternValidatorArgs): ValidationConfig<{}, string, string> => ({ validator: async ({ value }) => { - if (!rollupIndices || !rollupIndices.length) { + const results = await refreshMatchedIndices(value); + const rollupIndices = Object.keys(rollupIndicesCapabilities); + + if (!isRollup || !rollupIndices || !rollupIndices.length) { return; } - const results = await refreshMatchedIndices(value); - const rollupIndexMatches = results.exactMatchedIndices.filter((matchedIndex) => rollupIndices.includes(matchedIndex.name) ); @@ -114,7 +114,6 @@ interface GetTitleConfigArgs { const getTitleConfig = ({ namesNotAllowed, isRollup, - matchedIndices, rollupIndicesCapabilities, refreshMatchedIndices, }: GetTitleConfigArgs): FieldConfig => { @@ -123,19 +122,13 @@ const getTitleConfig = ({ const validations = [ ...titleFieldConfig.validations, createTitlesNotAllowedValidator(namesNotAllowed), + rollupIndexPatternValidator({ + rollupIndicesCapabilities, + refreshMatchedIndices, + isRollup, + }), ]; - if (isRollup) { - validations.push( - rollupIndexPatternValidator({ - rollupIndices: ['test-rollup', 'test-rollup2'], - matchedIndices, - rollupIndicesCapabilities, - refreshMatchedIndices, - }) - ); - } - // Add validation to not allow duplicates return { ...titleFieldConfig!, From d21ce0b22b299449ea762667fc047ffd9e7d37db Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Fri, 25 Jun 2021 12:20:34 -0500 Subject: [PATCH 048/130] cleanup --- .../components/field_editor/form_row.tsx | 86 ------------------- .../public/components/field_editor/index.ts | 10 --- .../components/form_fields/title_field.tsx | 2 +- .../components/form_fields/type_field.tsx | 4 +- .../public/lib/get_indices.ts | 7 +- .../public/open_editor.tsx | 3 +- .../index_pattern_table.tsx | 2 - .../index_pattern_management/public/mocks.ts | 20 +---- .../components/rollup_prompt/index.ts | 9 -- 9 files changed, 11 insertions(+), 132 deletions(-) delete mode 100644 src/plugins/index_pattern_editor/public/components/field_editor/form_row.tsx delete mode 100644 src/plugins/index_pattern_editor/public/components/field_editor/index.ts delete mode 100644 src/plugins/index_pattern_management/public/service/creation/components/rollup_prompt/index.ts diff --git a/src/plugins/index_pattern_editor/public/components/field_editor/form_row.tsx b/src/plugins/index_pattern_editor/public/components/field_editor/form_row.tsx deleted file mode 100644 index 66f5af09c8b2f..0000000000000 --- a/src/plugins/index_pattern_editor/public/components/field_editor/form_row.tsx +++ /dev/null @@ -1,86 +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 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 React from 'react'; -import { get } from 'lodash'; -import { - EuiFlexGroup, - EuiFlexItem, - EuiTitle, - EuiText, - EuiHorizontalRule, - EuiSpacer, -} from '@elastic/eui'; - -import { UseField, ToggleField, useFormData } from '../../shared_imports'; - -interface Props { - title: string; - formFieldPath: string; - children: React.ReactNode; - description?: string | JSX.Element; - withDividerRule?: boolean; - 'data-test-subj'?: string; -} - -export const FormRow = ({ - title, - description, - children, - formFieldPath, - withDividerRule = false, - 'data-test-subj': dataTestSubj, -}: Props) => { - const [formData] = useFormData({ watch: formFieldPath }); - const isContentVisible = Boolean(get(formData, formFieldPath)); - - return ( - <> - - - - - - -
- {/* Title */} - -

{title}

- - - - {/* Description */} - - {description} - - - {/* Content */} - {isContentVisible && ( - <> - - {children} - - )} -
- - - - {withDividerRule && } - - ); -}; diff --git a/src/plugins/index_pattern_editor/public/components/field_editor/index.ts b/src/plugins/index_pattern_editor/public/components/field_editor/index.ts deleted file mode 100644 index ac1fc933441d8..0000000000000 --- a/src/plugins/index_pattern_editor/public/components/field_editor/index.ts +++ /dev/null @@ -1,10 +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 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 { AdvancedParametersSection } from './advanced_parameters_section'; -export { FormRow } from './form_row'; diff --git a/src/plugins/index_pattern_editor/public/components/form_fields/title_field.tsx b/src/plugins/index_pattern_editor/public/components/form_fields/title_field.tsx index 0ff1a8185cbec..4a5ff941cdf98 100644 --- a/src/plugins/index_pattern_editor/public/components/form_fields/title_field.tsx +++ b/src/plugins/index_pattern_editor/public/components/form_fields/title_field.tsx @@ -30,7 +30,6 @@ interface TitleFieldProps { matchedIndices: MatchedItem[]; rollupIndicesCapabilities: RollupIndicesCapsResponse; refreshMatchedIndices: (title: string) => Promise; - rollupIndices: string[]; } const rollupIndexPatternNoMatchError = { @@ -122,6 +121,7 @@ const getTitleConfig = ({ const validations = [ ...titleFieldConfig.validations, createTitlesNotAllowedValidator(namesNotAllowed), + // note this is responsible for triggering the state update for the selected source list. rollupIndexPatternValidator({ rollupIndicesCapabilities, refreshMatchedIndices, diff --git a/src/plugins/index_pattern_editor/public/components/form_fields/type_field.tsx b/src/plugins/index_pattern_editor/public/components/form_fields/type_field.tsx index 077b64154b3fd..7d8232164a4bf 100644 --- a/src/plugins/index_pattern_editor/public/components/form_fields/type_field.tsx +++ b/src/plugins/index_pattern_editor/public/components/form_fields/type_field.tsx @@ -23,9 +23,7 @@ import { import { UseField } from '../../shared_imports'; -import { IndexPatternConfig } from '../index_pattern_editor_flyout_content'; - -import { INDEX_PATTERN_TYPE } from '../../types'; +import { INDEX_PATTERN_TYPE, IndexPatternConfig } from '../../types'; interface TypeFieldProps { onChange: (type: string) => void; diff --git a/src/plugins/index_pattern_editor/public/lib/get_indices.ts b/src/plugins/index_pattern_editor/public/lib/get_indices.ts index d177bce92be84..2e9d2ba5c524f 100644 --- a/src/plugins/index_pattern_editor/public/lib/get_indices.ts +++ b/src/plugins/index_pattern_editor/public/lib/get_indices.ts @@ -9,8 +9,8 @@ import { sortBy } from 'lodash'; import { HttpStart } from 'kibana/public'; import { i18n } from '@kbn/i18n'; +import { Tag } from '../types'; // todo move into this plugin, consider removing all ipm references -import { IndexPatternCreationConfig } from '../service'; import { MatchedItem, ResolveIndexResponse, ResolveIndexResponseItemIndexAttrs } from '../types'; const aliasLabel = i18n.translate('indexPatternEditor.aliasLabel', { defaultMessage: 'Alias' }); @@ -28,8 +28,7 @@ const frozenLabel = i18n.translate('indexPatternEditor.frozenLabel', { export async function getIndices( http: HttpStart, - // todo - getIndexTags: IndexPatternCreationConfig['getIndexTags'], + getIndexTags: (indexName: string) => Tag[], rawPattern: string, showAllIndices: boolean ): Promise { @@ -72,7 +71,7 @@ export async function getIndices( export const responseToItemArray = ( response: ResolveIndexResponse, - getIndexTags: IndexPatternCreationConfig['getIndexTags'] + getIndexTags: (indexName: string) => Tag[] ): MatchedItem[] => { const source: MatchedItem[] = []; diff --git a/src/plugins/index_pattern_editor/public/open_editor.tsx b/src/plugins/index_pattern_editor/public/open_editor.tsx index b5a014ac55eb4..2ab43fcfee03e 100644 --- a/src/plugins/index_pattern_editor/public/open_editor.tsx +++ b/src/plugins/index_pattern_editor/public/open_editor.tsx @@ -71,7 +71,8 @@ export const getEditorOpener = ({ core, indexPatternService }: Dependencies) => ), { - hideCloseButton: true, + // todo - I'm confused why this is throwing ts errors + // hideCloseButton: true, size: 'l', } ); diff --git a/src/plugins/index_pattern_management/public/components/index_pattern_table/index_pattern_table.tsx b/src/plugins/index_pattern_management/public/components/index_pattern_table/index_pattern_table.tsx index ef909a913f71e..5640f1655a687 100644 --- a/src/plugins/index_pattern_management/public/components/index_pattern_table/index_pattern_table.tsx +++ b/src/plugins/index_pattern_management/public/components/index_pattern_table/index_pattern_table.tsx @@ -71,7 +71,6 @@ export const IndexPatternTable = ({ http, notifications, application, - indexPatternEditor, } = useKibana().services; const [indexPatterns, setIndexPatterns] = useState([]); const [isLoadingIndexPatterns, setIsLoadingIndexPatterns] = useState(true); @@ -161,7 +160,6 @@ export const IndexPatternTable = ({ notifications, application, indexPatternService: data.indexPatterns, - indexPatternCreateService: indexPatternEditor.indexPatternCreateService, }} defaultTypeIsRollup={isRollup} /> diff --git a/src/plugins/index_pattern_management/public/mocks.ts b/src/plugins/index_pattern_management/public/mocks.ts index b709f7af25a3a..e44eabaded6da 100644 --- a/src/plugins/index_pattern_management/public/mocks.ts +++ b/src/plugins/index_pattern_management/public/mocks.ts @@ -19,18 +19,9 @@ import { } from './plugin'; import { IndexPatternManagmentContext } from './types'; -const createSetupContract = (): IndexPatternManagementSetup => {}; +const createSetupContract = (): IndexPatternManagementSetup => ({}); -const createStartContract = (): IndexPatternManagementStart => ({ - creation: { - getType: jest.fn(), - getIndexPatternCreationOptions: jest.fn(), - } as any, - list: { - getFieldInfo: jest.fn(), - areScriptedFieldsEnabled: jest.fn(), - } as any, -}); +const createStartContract = (): IndexPatternManagementStart => ({}); const createInstance = async () => { const plugin = new IndexPatternManagementPlugin({} as PluginInitializerContext); @@ -39,11 +30,7 @@ const createInstance = async () => { management: managementPluginMock.createSetupContract(), urlForwarding: urlForwardingPluginMock.createSetupContract(), }); - const doStart = () => - plugin.start(coreMock.createStart(), { - data: dataPluginMock.createStartContract(), - indexPatternFieldEditor: indexPatternFieldEditorPluginMock.createStartContract(), - }); + const doStart = () => plugin.start(); return { plugin, @@ -83,6 +70,7 @@ const createIndexPatternManagmentContext = (): { indexPatternManagementStart: createStartContract(), setBreadcrumbs: () => {}, fieldFormatEditors: indexPatternFieldEditor.fieldFormatEditors, + indexPatternEditor: {}, // todo }; }; diff --git a/src/plugins/index_pattern_management/public/service/creation/components/rollup_prompt/index.ts b/src/plugins/index_pattern_management/public/service/creation/components/rollup_prompt/index.ts deleted file mode 100644 index d1fc2fa242eb1..0000000000000 --- a/src/plugins/index_pattern_management/public/service/creation/components/rollup_prompt/index.ts +++ /dev/null @@ -1,9 +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 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 { RollupPrompt } from './rollup_prompt'; From e14dbdbf8a9d12f4f072d2778642efe362cb87e7 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Fri, 25 Jun 2021 14:03:07 -0500 Subject: [PATCH 049/130] fix index patterns without timestamps --- .../index_pattern_editor/public/components/form_schema.ts | 2 ++ .../components/index_pattern_editor_flyout_content.tsx | 7 ++----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/plugins/index_pattern_editor/public/components/form_schema.ts b/src/plugins/index_pattern_editor/public/components/form_schema.ts index 7faaa235aad2a..1830dd006ae70 100644 --- a/src/plugins/index_pattern_editor/public/components/form_schema.ts +++ b/src/plugins/index_pattern_editor/public/components/form_schema.ts @@ -40,6 +40,7 @@ export const schema = { }), // defaultValue: '', helpText: 'Select a primary time field for use with the global time filter.', + /* validations: [ { validator: fieldValidators.emptyField( @@ -52,6 +53,7 @@ export const schema = { ), }, ], + */ }, allowHidden: { label: i18n.translate('indexPatternEditor.editor.form.allowHiddenLabel', { diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx index 17b200b82deff..ba5157b11f9df 100644 --- a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx @@ -370,12 +370,9 @@ TODO MOVE SOME OF THIS COMPLEXITY INTO A COMPONENT }; // needed to trigger validation without touching advanced options - if (title && timestampField) { + if (title) { form.validate().then((isValid) => { - const disable = - !isValid || - !matchedIndices.exactMatchedIndices.length || - (!!timestampFieldOptions.length && timestampField === undefined); + const disable = !isValid || !matchedIndices.exactMatchedIndices.length; setDisableSubmit(disable); }); } From 692b6bb5e60c49a40d2dbe0b65c203fb6cba8f1c Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Fri, 25 Jun 2021 18:23:36 -0500 Subject: [PATCH 050/130] fix alias test --- test/functional/page_objects/settings_page.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test/functional/page_objects/settings_page.ts b/test/functional/page_objects/settings_page.ts index 8b2bf1f6c1164..d019731bd544a 100644 --- a/test/functional/page_objects/settings_page.ts +++ b/test/functional/page_objects/settings_page.ts @@ -43,7 +43,10 @@ export class SettingsPageObject extends FtrService { async clickKibanaIndexPatterns() { this.log.debug('clickKibanaIndexPatterns link'); - await this.testSubjects.click('indexPatterns'); + const currentUrl = await this.browser.getCurrentUrl(); + if (!currentUrl.endsWith('indexPatterns')) { + await this.testSubjects.click('indexPatterns'); + } await this.header.waitUntilLoadingHasFinished(); } From b6d5f9c9467b0c202080de4b03ea7c9cb32ec66e Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Fri, 25 Jun 2021 21:02:01 -0500 Subject: [PATCH 051/130] fix accessibility functional test --- test/accessibility/apps/management.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/test/accessibility/apps/management.ts b/test/accessibility/apps/management.ts index 7a99e5832448f..538755b482fbf 100644 --- a/test/accessibility/apps/management.ts +++ b/test/accessibility/apps/management.ts @@ -70,6 +70,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { await PageObjects.settings.clickAddNewIndexPatternButton(); await PageObjects.header.waitUntilLoadingHasFinished(); await a11y.testAppSnapshot(); + await testSubjects.click('closeFlyoutButton'); }); // We are navigating back to index pattern page to test field formatters From 7f93419bc42309a3dd1b5918b0642bda79929689 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Fri, 25 Jun 2021 23:35:43 -0500 Subject: [PATCH 052/130] ensure rollup index patterns are created with the correct type --- src/plugins/index_pattern_editor/README.md | 6 +++--- .../public/components/form_fields/type_field.tsx | 4 ++-- test/functional/page_objects/settings_page.ts | 15 +++++++++++---- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/src/plugins/index_pattern_editor/README.md b/src/plugins/index_pattern_editor/README.md index cfd70d58d9798..b020fcd7811e4 100644 --- a/src/plugins/index_pattern_editor/README.md +++ b/src/plugins/index_pattern_editor/README.md @@ -4,16 +4,16 @@ // TODO -The reusable field editor across Kibana! +Create index patterns from within Kibana apps. This editor can be used to -* create or edit a runtime field inside an index pattern. +* create an index pattern. * edit concrete (mapped) fields. In this case certain functionalities will be disabled like the possibility to change the field _type_ or to set the field _value_. ## How to use -You first need to add in your kibana.json the "`indexPatternFieldEditor`" plugin as a required dependency of your plugin. +You first need to add in your kibana.json the "`indexPatternEditor`" plugin as a required dependency of your plugin. You will then receive in the start contract of the indexPatternFieldEditor plugin the following API: diff --git a/src/plugins/index_pattern_editor/public/components/form_fields/type_field.tsx b/src/plugins/index_pattern_editor/public/components/form_fields/type_field.tsx index 7d8232164a4bf..76d0307cd61aa 100644 --- a/src/plugins/index_pattern_editor/public/components/form_fields/type_field.tsx +++ b/src/plugins/index_pattern_editor/public/components/form_fields/type_field.tsx @@ -30,7 +30,7 @@ interface TypeFieldProps { } const standardSelectItem = ( - + + { await this.setIndexPatternField(indexPatternName); }); @@ -368,6 +368,12 @@ export class SettingsPageObject extends FtrService { } }); + if (!isStandardIndexPattern) { + const badges = await this.find.byClassName('euiBadge__text'); + const text = await badges.getVisibleText(); + expect(text).to.equal('Rollup'); + } + return await this.getIndexPatternIdFromUrl(); } @@ -391,8 +397,9 @@ export class SettingsPageObject extends FtrService { } } - async clickCreateNewRollupButton() { - await this.testSubjects.click('createRollupIndexPatternButton'); + async selectRollupIndexPatternType() { + await this.testSubjects.click('typeField'); + await this.testSubjects.click('rollupType'); } async getIndexPatternIdFromUrl() { From 1628c74ff63ec373b429e430414d33be3045007a Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Sat, 26 Jun 2021 00:11:20 -0500 Subject: [PATCH 053/130] remove unneeded import, fix test --- .../index_pattern_editor_flyout_content.tsx | 2 +- .../public/plugin.test.tsx | 105 +----------------- 2 files changed, 5 insertions(+), 102 deletions(-) diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx index ba5157b11f9df..e4fa515dc2c97 100644 --- a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx @@ -111,7 +111,7 @@ const IndexPatternEditorFlyoutContentComponent = ({ }, }); - const [{ title, allowHidden, type, timestampField }] = useFormData({ form }); + const [{ title, allowHidden, type }] = useFormData({ form }); const [isLoadingSources, setIsLoadingSources] = useState(true); // const [lastTitle, setLastTitle] = useState(''); diff --git a/src/plugins/index_pattern_editor/public/plugin.test.tsx b/src/plugins/index_pattern_editor/public/plugin.test.tsx index b21e5c17f2085..f34e10f2a9f4e 100644 --- a/src/plugins/index_pattern_editor/public/plugin.test.tsx +++ b/src/plugins/index_pattern_editor/public/plugin.test.tsx @@ -21,15 +21,12 @@ import { coreMock } from 'src/core/public/mocks'; import { dataPluginMock } from '../../data/public/mocks'; import { usageCollectionPluginMock } from '../../usage_collection/public/mocks'; -import { registerTestBed } from './test_utils'; - import { IndexPatternFlyoutContentContainer } from './components/index_pattern_flyout_content_container'; import { IndexPatternEditorPlugin } from './plugin'; -import { IndexPattern } from './shared_imports'; const noop = () => {}; -describe('IndexPatternFieldEditorPlugin', () => { +describe('IndexPatternEditorPlugin', () => { const coreStart: CoreStart = coreMock.createStart(); const pluginStart = { data: dataPluginMock.createStartContract(), @@ -60,12 +57,12 @@ describe('IndexPatternFieldEditorPlugin', () => { }; const { openEditor } = await plugin.start(coreStartMocked, pluginStart); - openEditor({ onSave: onSaveSpy, ctx: { indexPattern: {} as any } }); + openEditor({ onSave: onSaveSpy }); expect(openFlyout).toHaveBeenCalled(); const [[arg]] = openFlyout.mock.calls; - expect(arg.props.children.type).toBe(FieldEditorFlyoutContentContainer); + expect(arg.props.children.type).toBe(IndexPatternFlyoutContentContainer); // We force call the "onSave" prop from the component // and make sure that the the spy is being called. @@ -79,101 +76,7 @@ describe('IndexPatternFieldEditorPlugin', () => { test('should return a handler to close the flyout', async () => { const { openEditor } = await plugin.start(coreStart, pluginStart); - const closeEditorHandler = openEditor({ onSave: noop, ctx: { indexPattern: {} as any } }); + const closeEditorHandler = openEditor({ onSave: noop }); expect(typeof closeEditorHandler).toBe('function'); }); - - test('should expose a handler to open field deletion modal', async () => { - const startApi = await plugin.start(coreStart, pluginStart); - expect(startApi.openDeleteModal).toBeDefined(); - }); - - test('should call correct services when opening the deletion modal', async () => { - const openModal = jest.fn(); - const onDeleteSpy = jest.fn(); - const removeFieldSpy = jest.fn(); - - const coreStartMocked = { - ...coreStart, - overlays: { - ...coreStart.overlays, - openModal, - }, - }; - const pluginStartMocked = { - ...pluginStart, - data: { - ...pluginStart.data, - indexPatterns: { - ...pluginStart.data.indexPatterns, - updateSavedObject: jest.fn(), - }, - }, - }; - const { openDeleteModal } = await plugin.start(coreStartMocked, pluginStartMocked); - - const indexPatternMock = ({ removeRuntimeField: removeFieldSpy } as unknown) as IndexPattern; - - openDeleteModal({ - onDelete: onDeleteSpy, - ctx: { indexPattern: indexPatternMock }, - fieldName: ['a', 'b', 'c'], - }); - - expect(openModal).toHaveBeenCalled(); - - const [[arg]] = openModal.mock.calls; - expect(arg.type).toBe(DeleteFieldModal); - - // simulate user confirming deletion - await arg.props.confirmDelete(); - - // consumer should be notified - expect(onDeleteSpy).toHaveBeenCalled(); - - // fields should be removed on index pattern and changes persisted - expect(removeFieldSpy).toHaveBeenCalledWith('a'); - expect(removeFieldSpy).toHaveBeenCalledWith('b'); - expect(removeFieldSpy).toHaveBeenCalledWith('c'); - expect(pluginStartMocked.data.indexPatterns.updateSavedObject).toHaveBeenLastCalledWith( - indexPatternMock - ); - }); - - test('should return a handler to close the modal', async () => { - const { openDeleteModal } = await plugin.start(coreStart, pluginStart); - - const closeModal = openDeleteModal({ fieldName: ['a'], ctx: { indexPattern: {} as any } }); - expect(typeof closeModal).toBe('function'); - }); - - test('should expose a render props component to delete runtime fields', async () => { - const { DeleteRuntimeFieldProvider } = await plugin.start(coreStart, pluginStart); - - const TestComponent = ({ callback }: { callback: (...args: any[]) => void }) => { - return ( - - {(...args) => { - // Forward arguments passed down to children to our spy callback - callback(args); - return null; - }} - - ); - }; - - const setup = registerTestBed(TestComponent, { - memoryRouter: { wrapComponent: false }, - }); - - const spy = jest.fn(); - // Mount our dummy component and pass it the spy - setup({ callback: spy }); - - expect(spy).toHaveBeenCalled(); - const argumentsFromRenderProps = spy.mock.calls[0][0]; - - expect(argumentsFromRenderProps.length).toBe(1); - expect(typeof argumentsFromRenderProps[0]).toBe('function'); - }); }); From fdee9acdf8041c21a9f208a8f54a25a4fea901b4 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Sat, 26 Jun 2021 22:15:41 -0500 Subject: [PATCH 054/130] partial progress on jest tests --- ...dex_pattern_editor_flyout_content.test.ts} | 24 ++++++------------- 1 file changed, 7 insertions(+), 17 deletions(-) rename src/plugins/index_pattern_editor/public/components/{field_editor_flyout_content.test.ts => index_pattern_editor_flyout_content.test.ts} (87%) diff --git a/src/plugins/index_pattern_editor/public/components/field_editor_flyout_content.test.ts b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.test.ts similarity index 87% rename from src/plugins/index_pattern_editor/public/components/field_editor_flyout_content.test.ts rename to src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.test.ts index 286931ad0e854..b344b96f15087 100644 --- a/src/plugins/index_pattern_editor/public/components/field_editor_flyout_content.test.ts +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.test.ts @@ -8,27 +8,17 @@ import { act } from 'react-dom/test-utils'; import '../test_utils/setup_environment'; -import { registerTestBed, TestBed, noop, docLinks, getCommonActions } from '../test_utils'; - -import { FieldEditor } from './field_editor'; -import { FieldEditorFlyoutContent, Props } from './field_editor_flyout_content'; +import { registerTestBed, TestBed, noop, getCommonActions } from '../test_utils'; +import { IndexPatternEditorFlyoutContent, Props } from './index_pattern_editor_flyout_content'; const defaultProps: Props = { onSave: noop, onCancel: noop, - docLinks, - FieldEditor, - indexPattern: { fields: [] } as any, - uiSettings: {} as any, - fieldFormats: {} as any, - fieldFormatEditors: {} as any, - fieldTypeToProcess: 'runtime', - runtimeFieldValidator: () => Promise.resolve(null), - isSavingField: false, + existingIndexPatterns: [], }; const setup = (props: Props = defaultProps) => { - const testBed = registerTestBed(FieldEditorFlyoutContent, { + const testBed = registerTestBed(IndexPatternEditorFlyoutContent, { memoryRouter: { wrapComponent: false }, })(props) as TestBed; @@ -42,7 +32,7 @@ const setup = (props: Props = defaultProps) => { }; }; -describe('', () => { +describe('', () => { beforeAll(() => { jest.useFakeTimers(); }); @@ -66,7 +56,7 @@ describe('', () => { }, }; - const { find } = setup({ ...defaultProps, field }); + const { find } = setup({ ...defaultProps }); expect(find('flyoutTitle').text()).toBe(`Edit field 'foo'`); expect(find('nameField.input').props().value).toBe(field.name); @@ -82,7 +72,7 @@ describe('', () => { }; const onSave: jest.Mock = jest.fn(); - const { find } = setup({ ...defaultProps, onSave, field }); + const { find } = setup({ ...defaultProps, onSave }); await act(async () => { find('fieldSaveButton').simulate('click'); From 9ae1b0adea1cc51ec57096786f7dd1d76994c802 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Sat, 26 Jun 2021 22:52:43 -0500 Subject: [PATCH 055/130] type fixes --- .../public/components/indices_list/indices_list.test.tsx | 2 +- .../public/components/status_message/status_message.test.tsx | 2 +- .../public/lib/ensure_minimum_time.test.ts | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/index_pattern_editor/public/components/indices_list/indices_list.test.tsx b/src/plugins/index_pattern_editor/public/components/indices_list/indices_list.test.tsx index e9ff29ad73f29..bd5fec8cea1c6 100644 --- a/src/plugins/index_pattern_editor/public/components/indices_list/indices_list.test.tsx +++ b/src/plugins/index_pattern_editor/public/components/indices_list/indices_list.test.tsx @@ -9,7 +9,7 @@ import React from 'react'; import { IndicesList } from '../indices_list'; import { shallow } from 'enzyme'; -import { MatchedItem } from '../../../../types'; +import { MatchedItem } from '../../types'; const indices = ([ { name: 'kibana', tags: [] }, diff --git a/src/plugins/index_pattern_editor/public/components/status_message/status_message.test.tsx b/src/plugins/index_pattern_editor/public/components/status_message/status_message.test.tsx index 6201440d5e7ff..4aaf81d63c1c1 100644 --- a/src/plugins/index_pattern_editor/public/components/status_message/status_message.test.tsx +++ b/src/plugins/index_pattern_editor/public/components/status_message/status_message.test.tsx @@ -9,7 +9,7 @@ import React from 'react'; import { StatusMessage } from '../status_message'; import { shallow } from 'enzyme'; -import { MatchedItem } from '../../../../types'; +import { MatchedItem } from '../../types'; const tagsPartial = { tags: [], diff --git a/src/plugins/index_pattern_editor/public/lib/ensure_minimum_time.test.ts b/src/plugins/index_pattern_editor/public/lib/ensure_minimum_time.test.ts index 1bda1b9b5394c..00449b1030491 100644 --- a/src/plugins/index_pattern_editor/public/lib/ensure_minimum_time.test.ts +++ b/src/plugins/index_pattern_editor/public/lib/ensure_minimum_time.test.ts @@ -17,8 +17,8 @@ describe('ensureMinimumTime', () => { }); it('resolves multiple promises', async (done) => { - const promiseA = new Promise((resolve) => resolve('a')); - const promiseB = new Promise((resolve) => resolve('b')); + const promiseA = new Promise((resolve) => resolve('a')); + const promiseB = new Promise((resolve) => resolve('b')); const [a, b] = await ensureMinimumTime([promiseA, promiseB], 0); expect(a).toBe('a'); expect(b).toBe('b'); From 901c8b996cdc72aa9056ab9451bbe7a697f39223 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Sun, 27 Jun 2021 09:58:00 -0500 Subject: [PATCH 056/130] fix some jest tests --- .../__snapshots__/indices_list.test.tsx.snap | 10 +++++----- .../__snapshots__/loading_indices.test.tsx.snap | 2 +- .../__snapshots__/status_message.test.tsx.snap | 16 ++++++++-------- .../public/lib/ensure_minimum_time.test.ts | 9 +++------ .../public/lib/extract_time_fields.test.ts | 7 ++----- .../public/lib/extract_time_fields.ts | 7 ------- 6 files changed, 19 insertions(+), 32 deletions(-) diff --git a/src/plugins/index_pattern_editor/public/components/indices_list/__snapshots__/indices_list.test.tsx.snap b/src/plugins/index_pattern_editor/public/components/indices_list/__snapshots__/indices_list.test.tsx.snap index ca41dddf6197e..74d803a6ff176 100644 --- a/src/plugins/index_pattern_editor/public/components/indices_list/__snapshots__/indices_list.test.tsx.snap +++ b/src/plugins/index_pattern_editor/public/components/indices_list/__snapshots__/indices_list.test.tsx.snap @@ -47,7 +47,7 @@ exports[`IndicesList should change pages 1`] = ` > diff --git a/src/plugins/index_pattern_editor/public/components/status_message/__snapshots__/status_message.test.tsx.snap b/src/plugins/index_pattern_editor/public/components/status_message/__snapshots__/status_message.test.tsx.snap index 44b753c473803..fbc7dc3ed7124 100644 --- a/src/plugins/index_pattern_editor/public/components/status_message/__snapshots__/status_message.test.tsx.snap +++ b/src/plugins/index_pattern_editor/public/components/status_message/__snapshots__/status_message.test.tsx.snap @@ -11,7 +11,7 @@ exports[`StatusMessage should render with exact matches 1`] = `   @@ -134,7 +134,7 @@ exports[`StatusMessage should show that system indices exist 1`] = ` diff --git a/src/plugins/index_pattern_editor/public/lib/ensure_minimum_time.test.ts b/src/plugins/index_pattern_editor/public/lib/ensure_minimum_time.test.ts index 00449b1030491..6fb80df3f8932 100644 --- a/src/plugins/index_pattern_editor/public/lib/ensure_minimum_time.test.ts +++ b/src/plugins/index_pattern_editor/public/lib/ensure_minimum_time.test.ts @@ -9,28 +9,25 @@ import { ensureMinimumTime } from './ensure_minimum_time'; describe('ensureMinimumTime', () => { - it('resolves single promise', async (done) => { + it('resolves single promise', async () => { const promiseA = new Promise((resolve) => resolve('a')); const a = await ensureMinimumTime(promiseA, 0); expect(a).toBe('a'); - done(); }); - it('resolves multiple promises', async (done) => { + it('resolves multiple promises', async () => { const promiseA = new Promise((resolve) => resolve('a')); const promiseB = new Promise((resolve) => resolve('b')); const [a, b] = await ensureMinimumTime([promiseA, promiseB], 0); expect(a).toBe('a'); expect(b).toBe('b'); - done(); }); - it('resolves in the amount of time provided, at minimum', async (done) => { + it('resolves in the amount of time provided, at minimum', async () => { const startTime = new Date().getTime(); const promise = new Promise((resolve) => resolve()); await ensureMinimumTime(promise, 100); const endTime = new Date().getTime(); expect(endTime - startTime).toBeGreaterThanOrEqual(100); - done(); }); }); diff --git a/src/plugins/index_pattern_editor/public/lib/extract_time_fields.test.ts b/src/plugins/index_pattern_editor/public/lib/extract_time_fields.test.ts index 90070c37995af..ad64b7ee96a23 100644 --- a/src/plugins/index_pattern_editor/public/lib/extract_time_fields.test.ts +++ b/src/plugins/index_pattern_editor/public/lib/extract_time_fields.test.ts @@ -15,9 +15,7 @@ describe('extractTimeFields', () => { { type: 'text', name: 'name' }, ]; - expect(extractTimeFields(fields)).toEqual([ - { display: `The indices which match this index pattern don't contain any time fields.` }, - ]); + expect(extractTimeFields(fields)).toEqual([]); }); it('should add extra options', () => { @@ -25,8 +23,7 @@ describe('extractTimeFields', () => { expect(extractTimeFields(fields)).toEqual([ { display: '@timestamp', fieldName: '@timestamp' }, - { isDisabled: true, display: '───', fieldName: '' }, - { display: `I don't want to use the time filter`, fieldName: undefined }, + { display: `--- I don't want to use the time filter ---`, fieldName: '' }, ]); }); }); diff --git a/src/plugins/index_pattern_editor/public/lib/extract_time_fields.ts b/src/plugins/index_pattern_editor/public/lib/extract_time_fields.ts index c16d039a298a0..ca547fe31dee5 100644 --- a/src/plugins/index_pattern_editor/public/lib/extract_time_fields.ts +++ b/src/plugins/index_pattern_editor/public/lib/extract_time_fields.ts @@ -16,13 +16,6 @@ export function extractTimeFields( ): TimestampOption[] { const dateFields = fields.filter((field) => field.type === 'date'); - // todo - display somewhere - /* - const label = i18n.translate('indexPatternEditor.createIndexPattern.stepTime.noTimeFieldsLabel', { - defaultMessage: "The indices which match this index pattern don't contain any time fields.", - }); - */ - if (dateFields.length === 0) { return []; } From f49514bd02a23d95682ac38919434891988b301d Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Sun, 27 Jun 2021 22:17:39 -0500 Subject: [PATCH 057/130] fix preview column --- .../public/components/form_fields/title_field.tsx | 2 +- .../public/components/index_pattern_editor_flyout_content.tsx | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/plugins/index_pattern_editor/public/components/form_fields/title_field.tsx b/src/plugins/index_pattern_editor/public/components/form_fields/title_field.tsx index 4a5ff941cdf98..c3e0d80ac3802 100644 --- a/src/plugins/index_pattern_editor/public/components/form_fields/title_field.tsx +++ b/src/plugins/index_pattern_editor/public/components/form_fields/title_field.tsx @@ -120,13 +120,13 @@ const getTitleConfig = ({ const validations = [ ...titleFieldConfig.validations, - createTitlesNotAllowedValidator(namesNotAllowed), // note this is responsible for triggering the state update for the selected source list. rollupIndexPatternValidator({ rollupIndicesCapabilities, refreshMatchedIndices, isRollup, }), + createTitlesNotAllowedValidator(namesNotAllowed), ]; // Add validation to not allow duplicates diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx index e4fa515dc2c97..97ada85f9ffd1 100644 --- a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx @@ -139,10 +139,12 @@ const IndexPatternEditorFlyoutContentComponent = ({ const removeAliases = (item: MatchedItem) => !((item as unknown) as ResolveIndexResponseItemAlias).indices; - // load all data sources + // load all data sources and set initial matchedIndices const loadSources = useCallback(() => { getIndices(http, () => [], '*', allowHidden).then((dataSources) => { setAllSources(dataSources); + const matchedSet = getMatchedIndices(dataSources, [], [], allowHidden); + setMatchedIndices(matchedSet); setIsLoadingSources(false); }); getIndices(http, () => [], '*:*', false).then((dataSources) => From f7a35dcce79eb9c29037ad012476ab2c08df8742 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Mon, 28 Jun 2021 22:59:48 -0500 Subject: [PATCH 058/130] only show type selection when there are rollup indices, remove 'any' instance --- src/plugins/data/public/index.ts | 1 + .../index_pattern_editor_flyout_content.tsx | 11 +++++++---- .../index_pattern_editor/public/shared_imports.ts | 1 + src/plugins/index_pattern_editor/public/types.ts | 4 ++-- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/plugins/data/public/index.ts b/src/plugins/data/public/index.ts index 2c4262fd5660a..6ebd4f33802df 100644 --- a/src/plugins/data/public/index.ts +++ b/src/plugins/data/public/index.ts @@ -270,6 +270,7 @@ export { fieldList, GetFieldsOptions, INDEX_PATTERN_SAVED_OBJECT_TYPE, + AggregationRestrictions, } from '../common'; export { DuplicateIndexPatternError } from '../common/index_patterns/errors'; diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx index 97ada85f9ffd1..3c893535c3494 100644 --- a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx @@ -103,7 +103,7 @@ const IndexPatternEditorFlyoutContentComponent = ({ params: { rollup_index: rollupIndex, }, - aggs: (rollupIndicesCapabilities[rollupIndex] as any).aggs, + aggs: rollupIndicesCapabilities[rollupIndex].aggs, }; } @@ -190,10 +190,12 @@ const IndexPatternEditorFlyoutContentComponent = ({ }; }, [http, type]); + const getRollupIndices = (rollupCaps: RollupIndicesCapsResponse) => Object.keys(rollupCaps); + const reloadMatchedIndices = useCallback( async (title2: string) => { - const getRollupIndices = () => Object.keys(rollupIndicesCapabilities); - const isRollupIndex = (indexName: string) => getRollupIndices().includes(indexName); + const isRollupIndex = (indexName: string) => + getRollupIndices(rollupIndicesCapabilities).includes(indexName); const getIndexTags = (indexName: string) => isRollupIndex(indexName) ? [ @@ -310,7 +312,8 @@ const IndexPatternEditorFlyoutContentComponent = ({ const showIndexPatternTypeSelect = () => uiSettings.isDeclared('rollups:enableIndexPatterns') && - uiSettings.get('rollups:enableIndexPatterns'); + uiSettings.get('rollups:enableIndexPatterns') && + getRollupIndices(rollupIndicesCapabilities); const indexPatternTypeSelect = showIndexPatternTypeSelect() ? ( diff --git a/src/plugins/index_pattern_editor/public/shared_imports.ts b/src/plugins/index_pattern_editor/public/shared_imports.ts index 71a1ad2ebb72b..1147a106a6afe 100644 --- a/src/plugins/index_pattern_editor/public/shared_imports.ts +++ b/src/plugins/index_pattern_editor/public/shared_imports.ts @@ -12,6 +12,7 @@ export { DataPublicPluginStart, IndexPatternSpec, GetFieldsOptions, + AggregationRestrictions, } from '../../data/public'; export { diff --git a/src/plugins/index_pattern_editor/public/types.ts b/src/plugins/index_pattern_editor/public/types.ts index dd76b560f1c52..d813383e5e673 100644 --- a/src/plugins/index_pattern_editor/public/types.ts +++ b/src/plugins/index_pattern_editor/public/types.ts @@ -16,7 +16,7 @@ import { import { EuiComboBoxOptionOption } from '@elastic/eui'; -import { DataPublicPluginStart } from './shared_imports'; +import { DataPublicPluginStart, AggregationRestrictions } from './shared_imports'; import { OpenEditorOptions } from './open_editor'; export interface IndexPatternEditorContext { @@ -156,7 +156,7 @@ export interface Tag { } export interface RollupIndiciesCapability { - aggs: unknown; + aggs: Record; error: string; } From f11e785a7920343829e5284cf627c7cebd61e895 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Mon, 28 Jun 2021 23:22:03 -0500 Subject: [PATCH 059/130] update docs --- ...ns-data-public.aggregationrestrictions.md} | 4 +- .../kibana-plugin-plugins-data-public.md | 2 +- src/plugins/data/public/public.api.md | 58 ++++++++++--------- 3 files changed, 34 insertions(+), 30 deletions(-) rename docs/development/plugins/data/public/{kibana-plugin-plugins-data-public.indexpatternaggrestrictions.md => kibana-plugin-plugins-data-public.aggregationrestrictions.md} (69%) diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternaggrestrictions.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggregationrestrictions.md similarity index 69% rename from docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternaggrestrictions.md rename to docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggregationrestrictions.md index 324bd1e410c6c..b3d04027980ca 100644 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternaggrestrictions.md +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggregationrestrictions.md @@ -1,8 +1,8 @@ -[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [IndexPatternAggRestrictions](./kibana-plugin-plugins-data-public.indexpatternaggrestrictions.md) +[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [AggregationRestrictions](./kibana-plugin-plugins-data-public.aggregationrestrictions.md) -## IndexPatternAggRestrictions type +## AggregationRestrictions type Signature: diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md index c62f55a5b24f3..fa6a5cf46c4f4 100644 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md @@ -145,6 +145,7 @@ | [AggConfigOptions](./kibana-plugin-plugins-data-public.aggconfigoptions.md) | | | [AggGroupName](./kibana-plugin-plugins-data-public.agggroupname.md) | | | [AggParam](./kibana-plugin-plugins-data-public.aggparam.md) | | +| [AggregationRestrictions](./kibana-plugin-plugins-data-public.aggregationrestrictions.md) | | | [AggsStart](./kibana-plugin-plugins-data-public.aggsstart.md) | AggsStart represents the actual external contract as AggsCommonStart is only used internally. The difference is that AggsStart includes the typings for the registry with initialized agg types. | | [AutocompleteStart](./kibana-plugin-plugins-data-public.autocompletestart.md) | \* | | [AutoRefreshDoneFn](./kibana-plugin-plugins-data-public.autorefreshdonefn.md) | | @@ -171,7 +172,6 @@ | [IFieldFormatsRegistry](./kibana-plugin-plugins-data-public.ifieldformatsregistry.md) | | | [IFieldParamType](./kibana-plugin-plugins-data-public.ifieldparamtype.md) | | | [IMetricAggType](./kibana-plugin-plugins-data-public.imetricaggtype.md) | | -| [IndexPatternAggRestrictions](./kibana-plugin-plugins-data-public.indexpatternaggrestrictions.md) | | | [IndexPatternLoadExpressionFunctionDefinition](./kibana-plugin-plugins-data-public.indexpatternloadexpressionfunctiondefinition.md) | | | [IndexPatternsContract](./kibana-plugin-plugins-data-public.indexpatternscontract.md) | | | [IndexPatternSelectProps](./kibana-plugin-plugins-data-public.indexpatternselectprops.md) | | diff --git a/src/plugins/data/public/public.api.md b/src/plugins/data/public/public.api.md index 68e05074768ac..f41084787fb54 100644 --- a/src/plugins/data/public/public.api.md +++ b/src/plugins/data/public/public.api.md @@ -523,6 +523,22 @@ export class AggParamType extends Ba makeAgg: (agg: TAggConfig, state?: AggConfigSerialized) => TAggConfig; } +// Warning: (ae-missing-release-tag) "AggregationRestrictions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) +// +// @public (undocumented) +type AggregationRestrictions = Record; + +export { AggregationRestrictions } + +export { AggregationRestrictions as IndexPatternAggRestrictions } + // Warning: (ae-forgotten-export) The symbol "AggsCommonStart" needs to be exported by the entry point index.d.ts // // @public @@ -1496,18 +1512,6 @@ export class IndexPattern implements IIndexPattern { version: string | undefined; } -// Warning: (ae-missing-release-tag) "AggregationRestrictions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) -// -// @public (undocumented) -export type IndexPatternAggRestrictions = Record; - // Warning: (ae-missing-release-tag) "IndexPatternAttributes" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) // // @public @@ -1721,7 +1725,7 @@ export interface IndexPatternTypeMeta { // (undocumented) [key: string]: any; // (undocumented) - aggs?: Record; + aggs?: Record; } // Warning: (ae-missing-release-tag) "injectReferences" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) @@ -2792,20 +2796,20 @@ export interface WaitUntilNextSessionCompletesOptions { // src/plugins/data/public/index.ts:238:27 - (ae-forgotten-export) The symbol "validateIndexPattern" needs to be exported by the entry point index.d.ts // src/plugins/data/public/index.ts:238:27 - (ae-forgotten-export) The symbol "flattenHitWrapper" needs to be exported by the entry point index.d.ts // src/plugins/data/public/index.ts:238:27 - (ae-forgotten-export) The symbol "formatHitProvider" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:409:20 - (ae-forgotten-export) The symbol "getResponseInspectorStats" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:409:20 - (ae-forgotten-export) The symbol "tabifyAggResponse" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:409:20 - (ae-forgotten-export) The symbol "tabifyGetColumns" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:411:1 - (ae-forgotten-export) The symbol "CidrMask" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:412:1 - (ae-forgotten-export) The symbol "dateHistogramInterval" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:421:1 - (ae-forgotten-export) The symbol "InvalidEsCalendarIntervalError" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:422:1 - (ae-forgotten-export) The symbol "InvalidEsIntervalFormatError" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:423:1 - (ae-forgotten-export) The symbol "IpAddress" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:424:1 - (ae-forgotten-export) The symbol "isDateHistogramBucketAggConfig" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:428:1 - (ae-forgotten-export) The symbol "isValidEsInterval" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:429:1 - (ae-forgotten-export) The symbol "isValidInterval" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:432:1 - (ae-forgotten-export) The symbol "parseInterval" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:433:1 - (ae-forgotten-export) The symbol "propFilter" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:436:1 - (ae-forgotten-export) The symbol "toAbsoluteDates" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:411:20 - (ae-forgotten-export) The symbol "getResponseInspectorStats" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:411:20 - (ae-forgotten-export) The symbol "tabifyAggResponse" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:411:20 - (ae-forgotten-export) The symbol "tabifyGetColumns" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:413:1 - (ae-forgotten-export) The symbol "CidrMask" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:414:1 - (ae-forgotten-export) The symbol "dateHistogramInterval" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:423:1 - (ae-forgotten-export) The symbol "InvalidEsCalendarIntervalError" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:424:1 - (ae-forgotten-export) The symbol "InvalidEsIntervalFormatError" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:425:1 - (ae-forgotten-export) The symbol "IpAddress" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:426:1 - (ae-forgotten-export) The symbol "isDateHistogramBucketAggConfig" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:430:1 - (ae-forgotten-export) The symbol "isValidEsInterval" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:431:1 - (ae-forgotten-export) The symbol "isValidInterval" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:434:1 - (ae-forgotten-export) The symbol "parseInterval" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:435:1 - (ae-forgotten-export) The symbol "propFilter" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:438:1 - (ae-forgotten-export) The symbol "toAbsoluteDates" needs to be exported by the entry point index.d.ts // src/plugins/data/public/query/state_sync/connect_to_query_state.ts:34:5 - (ae-forgotten-export) The symbol "FilterStateStore" needs to be exported by the entry point index.d.ts // src/plugins/data/public/search/session/session_service.ts:56:5 - (ae-forgotten-export) The symbol "UrlGeneratorStateMapping" needs to be exported by the entry point index.d.ts From a84d7580b84b0d3a797058a6d442a5ac5f679359 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Tue, 29 Jun 2021 20:32:45 -0500 Subject: [PATCH 060/130] refactor requirement to match an index pattern --- .../components/form_fields/title_field.tsx | 23 ++++--- .../public/components/form_schema.ts | 4 -- .../index_pattern_editor_flyout_content.tsx | 63 ++++++++++--------- 3 files changed, 50 insertions(+), 40 deletions(-) diff --git a/src/plugins/index_pattern_editor/public/components/form_fields/title_field.tsx b/src/plugins/index_pattern_editor/public/components/form_fields/title_field.tsx index c3e0d80ac3802..bd0461709c82b 100644 --- a/src/plugins/index_pattern_editor/public/components/form_fields/title_field.tsx +++ b/src/plugins/index_pattern_editor/public/components/form_fields/title_field.tsx @@ -44,7 +44,13 @@ const rollupIndexPatternTooManyMatchesError = { }), }; -const createTitlesNotAllowedValidator = ( +const mustMatchError = { + message: i18n.translate('indexPatternEditor.createIndex.noMatch', { + defaultMessage: 'Must match one or more indices, data streams, or index aliases', + }), +}; + +const createTitlesNoDupesValidator = ( namesNotAllowed: string[] ): ValidationConfig<{}, string, string> => ({ validator: ({ value }) => { @@ -58,21 +64,25 @@ const createTitlesNotAllowedValidator = ( }, }); -interface RollupIndexPatternValidatorArgs { +interface MatchesValidatorArgs { rollupIndicesCapabilities: Record; refreshMatchedIndices: (title: string) => Promise; isRollup: boolean; } -const rollupIndexPatternValidator = ({ +const matchesValidator = ({ rollupIndicesCapabilities, refreshMatchedIndices, isRollup, -}: RollupIndexPatternValidatorArgs): ValidationConfig<{}, string, string> => ({ +}: MatchesValidatorArgs): ValidationConfig<{}, string, string> => ({ validator: async ({ value }) => { const results = await refreshMatchedIndices(value); const rollupIndices = Object.keys(rollupIndicesCapabilities); + if (results.exactMatchedIndices.length === 0) { + return mustMatchError; + } + if (!isRollup || !rollupIndices || !rollupIndices.length) { return; } @@ -121,15 +131,14 @@ const getTitleConfig = ({ const validations = [ ...titleFieldConfig.validations, // note this is responsible for triggering the state update for the selected source list. - rollupIndexPatternValidator({ + matchesValidator({ rollupIndicesCapabilities, refreshMatchedIndices, isRollup, }), - createTitlesNotAllowedValidator(namesNotAllowed), + createTitlesNoDupesValidator(namesNotAllowed), ]; - // Add validation to not allow duplicates return { ...titleFieldConfig!, validations, diff --git a/src/plugins/index_pattern_editor/public/components/form_schema.ts b/src/plugins/index_pattern_editor/public/components/form_schema.ts index 1830dd006ae70..2555818583410 100644 --- a/src/plugins/index_pattern_editor/public/components/form_schema.ts +++ b/src/plugins/index_pattern_editor/public/components/form_schema.ts @@ -10,10 +10,6 @@ import { i18n } from '@kbn/i18n'; import { fieldValidators } from '../shared_imports'; import { INDEX_PATTERN_TYPE } from '../types'; -// import { RUNTIME_FIELD_OPTIONS } from './constants'; - -// const { emptyField, numberGreaterThanField } = fieldValidators; - export const schema = { title: { label: i18n.translate('indexPatternEditor.editor.form.titleLabel', { diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx index 3c893535c3494..c170817241ef5 100644 --- a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx @@ -192,10 +192,39 @@ const IndexPatternEditorFlyoutContentComponent = ({ const getRollupIndices = (rollupCaps: RollupIndicesCapsResponse) => Object.keys(rollupCaps); + const loadTimestampFieldOptions = useCallback( + async (query: string, exactMatched: MatchedItem[]) => { + const isValidResult = !existingIndexPatterns.includes(title) && exactMatched.length > 0; + if (isValidResult) { + setIsLoadingTimestampFields(true); + const getFieldsOptions: GetFieldsOptions = { + pattern: query, + }; + if (type === INDEX_PATTERN_TYPE.ROLLUP) { + getFieldsOptions.type = INDEX_PATTERN_TYPE.ROLLUP; + getFieldsOptions.rollupIndex = rollupIndex; + } + + const fields = await ensureMinimumTime( + indexPatternService.getFieldsForWildcard(getFieldsOptions) + ); + const timeFields = extractTimeFields(fields, requireTimestampField); + setIsLoadingTimestampFields(false); + setTimestampFieldOptions(timeFields); + } else { + setTimestampFieldOptions([]); + } + }, + [existingIndexPatterns, indexPatternService, requireTimestampField, rollupIndex, title, type] + ); + const reloadMatchedIndices = useCallback( async (title2: string) => { + // todo move to utility lib const isRollupIndex = (indexName: string) => getRollupIndices(rollupIndicesCapabilities).includes(indexName); + + // move inside getIndices const getIndexTags = (indexName: string) => isRollupIndex(indexName) ? [ @@ -227,8 +256,7 @@ const IndexPatternEditorFlyoutContentComponent = ({ indexRequests )) as MatchedItem[][]; - const isValidResult = - !!title?.length && !existingIndexPatterns.includes(title) && exactMatched.length > 0; + await loadTimestampFieldOptions(query, exactMatched); const matchedIndicesResult = getMatchedIndices( allSources, @@ -247,25 +275,6 @@ const IndexPatternEditorFlyoutContentComponent = ({ setMatchedIndices(matchedIndicesResult); setIsLoadingMatchedIndices(false); - if (isValidResult) { - setIsLoadingTimestampFields(true); - const getFieldsOptions: GetFieldsOptions = { - pattern: query, - }; - if (type === INDEX_PATTERN_TYPE.ROLLUP) { - getFieldsOptions.type = INDEX_PATTERN_TYPE.ROLLUP; - getFieldsOptions.rollupIndex = rollupIndex; - } - - const fields = await ensureMinimumTime( - indexPatternService.getFieldsForWildcard(getFieldsOptions) - ); - const timeFields = extractTimeFields(fields, requireTimestampField); - setIsLoadingTimestampFields(false); - setTimestampFieldOptions(timeFields); - } else { - setTimestampFieldOptions([]); - } return matchedIndicesResult; }; @@ -273,17 +282,13 @@ const IndexPatternEditorFlyoutContentComponent = ({ return fetchIndices(title2); }, [ - title, - existingIndexPatterns, http, - indexPatternService, allowHidden, allSources, - requireTimestampField, - rollupIndex, type, i18nTexts.rollupLabel, rollupIndicesCapabilities, + loadTimestampFieldOptions, ] ); @@ -313,7 +318,7 @@ const IndexPatternEditorFlyoutContentComponent = ({ const showIndexPatternTypeSelect = () => uiSettings.isDeclared('rollups:enableIndexPatterns') && uiSettings.get('rollups:enableIndexPatterns') && - getRollupIndices(rollupIndicesCapabilities); + getRollupIndices(rollupIndicesCapabilities).length; const indexPatternTypeSelect = showIndexPatternTypeSelect() ? ( @@ -374,10 +379,10 @@ TODO MOVE SOME OF THIS COMPLEXITY INTO A COMPONENT ); }; - // needed to trigger validation without touching advanced options if (title) { + // needed to trigger validation without touching advanced options form.validate().then((isValid) => { - const disable = !isValid || !matchedIndices.exactMatchedIndices.length; + const disable = !isValid; setDisableSubmit(disable); }); } From 080b0f0697ce9b4dfe7f6aae7b4b9ebb7d33702c Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Tue, 6 Jul 2021 23:01:39 -0500 Subject: [PATCH 061/130] reset timestamp field when title changes --- .../index_pattern_editor_flyout_content.tsx | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx index c170817241ef5..3a931ee613de1 100644 --- a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx @@ -194,6 +194,7 @@ const IndexPatternEditorFlyoutContentComponent = ({ const loadTimestampFieldOptions = useCallback( async (query: string, exactMatched: MatchedItem[]) => { + let timestampOptions: TimestampOption[] = []; const isValidResult = !existingIndexPatterns.includes(title) && exactMatched.length > 0; if (isValidResult) { setIsLoadingTimestampFields(true); @@ -208,14 +209,21 @@ const IndexPatternEditorFlyoutContentComponent = ({ const fields = await ensureMinimumTime( indexPatternService.getFieldsForWildcard(getFieldsOptions) ); - const timeFields = extractTimeFields(fields, requireTimestampField); - setIsLoadingTimestampFields(false); - setTimestampFieldOptions(timeFields); - } else { - setTimestampFieldOptions([]); + timestampOptions = extractTimeFields(fields, requireTimestampField); } + setIsLoadingTimestampFields(false); + setTimestampFieldOptions(timestampOptions); + form.getFields().timestampField.reset(); }, - [existingIndexPatterns, indexPatternService, requireTimestampField, rollupIndex, title, type] + [ + existingIndexPatterns, + indexPatternService, + requireTimestampField, + rollupIndex, + title, + type, + form, + ] ); const reloadMatchedIndices = useCallback( From c2f21021a6f701f9cddfac5e926bb38d4f688941 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Tue, 6 Jul 2021 23:42:39 -0500 Subject: [PATCH 062/130] remove unused code --- .../public/components/form_schema.ts | 97 +------------------ 1 file changed, 1 insertion(+), 96 deletions(-) diff --git a/src/plugins/index_pattern_editor/public/components/form_schema.ts b/src/plugins/index_pattern_editor/public/components/form_schema.ts index 2555818583410..044124d1de6d2 100644 --- a/src/plugins/index_pattern_editor/public/components/form_schema.ts +++ b/src/plugins/index_pattern_editor/public/components/form_schema.ts @@ -34,22 +34,8 @@ export const schema = { label: i18n.translate('indexPatternEditor.editor.form.timeFieldLabel', { defaultMessage: 'Timestamp field', }), - // defaultValue: '', helpText: 'Select a primary time field for use with the global time filter.', - /* - validations: [ - { - validator: fieldValidators.emptyField( - i18n.translate( - 'indexPatternEditor.validations.timeFieldSelectionIsRequiredErrorMessage', - { - defaultMessage: 'A time field selection is required.', - } - ) - ), - }, - ], - */ + validations: [], }, allowHidden: { label: i18n.translate('indexPatternEditor.editor.form.allowHiddenLabel', { @@ -70,85 +56,4 @@ export const schema = { }), defaultValue: INDEX_PATTERN_TYPE.DEFAULT, }, - /* - script: { - source: { - label: i18n.translate('indexPatternFieldEditor.editor.form.defineFieldLabel', { - defaultMessage: 'Define script', - }), - validations: [ - { - validator: emptyField( - i18n.translate( - 'indexPatternFieldEditor.editor.form.validations.scriptIsRequiredErrorMessage', - { - defaultMessage: 'A script is required to set the field value.', - } - ) - ), - }, - ], - }, - }, - customLabel: { - label: i18n.translate('indexPatternFieldEditor.editor.form.customLabelLabel', { - defaultMessage: 'Custom label', - }), - validations: [ - { - validator: emptyField( - i18n.translate( - 'indexPatternFieldEditor.editor.form.validations.customLabelIsRequiredErrorMessage', - { - defaultMessage: 'Give a label to the field.', - } - ) - ), - }, - ], - }, - popularity: { - label: i18n.translate('indexPatternFieldEditor.editor.form.popularityLabel', { - defaultMessage: 'Popularity', - }), - validations: [ - { - validator: emptyField( - i18n.translate( - 'indexPatternFieldEditor.editor.form.validations.popularityIsRequiredErrorMessage', - { - defaultMessage: 'Give a popularity to the field.', - } - ) - ), - }, - { - validator: numberGreaterThanField({ - than: 0, - allowEquality: true, - message: i18n.translate( - 'indexPatternFieldEditor.editor.form.validations.popularityGreaterThan0ErrorMessage', - { - defaultMessage: 'The popularity must be zero or greater.', - } - ), - }), - }, - ], - }, - __meta__: { - isCustomLabelVisible: { - defaultValue: false, - }, - isValueVisible: { - defaultValue: false, - }, - isFormatVisible: { - defaultValue: false, - }, - isPopularityVisible: { - defaultValue: false, - }, - }, - */ }; From 94ec0de67edf1ac257a24546b604c4631ac5b7c2 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Wed, 14 Jul 2021 17:07:25 -0500 Subject: [PATCH 063/130] cleanup --- .../form_fields/timestamp_field.tsx | 51 ++++++++++++++++++- .../public/components/form_schema.ts | 10 ++-- .../index_pattern_editor_flyout_content.tsx | 27 +++++----- 3 files changed, 69 insertions(+), 19 deletions(-) diff --git a/src/plugins/index_pattern_editor/public/components/form_fields/timestamp_field.tsx b/src/plugins/index_pattern_editor/public/components/form_fields/timestamp_field.tsx index f12be5364226a..07e023311048c 100644 --- a/src/plugins/index_pattern_editor/public/components/form_fields/timestamp_field.tsx +++ b/src/plugins/index_pattern_editor/public/components/form_fields/timestamp_field.tsx @@ -11,20 +11,63 @@ import { i18n } from '@kbn/i18n'; import { EuiFormRow, EuiComboBox, EuiFormHelpText, EuiComboBoxOptionOption } from '@elastic/eui'; -import { UseField } from '../../shared_imports'; +import { UseField, FieldConfig, ValidationConfig } from '../../shared_imports'; import { TimestampOption } from '../index_pattern_editor_flyout_content'; +import { schema } from '../form_schema'; interface Props { options: TimestampOption[]; isLoadingOptions: boolean; helpText: string; + loadTimestampFieldOptions: (title: string) => Promise; } +interface GetTimestampConfigArgs { + loadTimestampFieldOptions: (title: string) => Promise; +} + +const requireTimestampOptionValidator = ( + loadTimestampFieldOptions: (title: string) => Promise +): ValidationConfig => ({ + validator: async ({ value, formData }) => { + const options = await loadTimestampFieldOptions(formData.title); + const isValueRequired = !!options.length; + if (isValueRequired && !value) { + return { + message: i18n.translate( + 'indexPatternEditor.requireTimestampOption.ValidationErrorMessage', + { + defaultMessage: 'Please select a timestamp field option.', + } + ), + }; + } + }, +}); + +const getTimestampConfig = ({ + loadTimestampFieldOptions, +}: GetTimestampConfigArgs): FieldConfig> => { + const timestampFieldConfig = schema.timestampField; + + const validations = [ + ...timestampFieldConfig.validations, + // note this is responsible for triggering the state update for the selected source list. + requireTimestampOptionValidator(loadTimestampFieldOptions), + ]; + + return { + ...timestampFieldConfig!, + validations, + }; +}; + export const TimestampField = ({ options = [], helpText = '', isLoadingOptions = false, + loadTimestampFieldOptions, }: Props) => { const optionsAsComboBoxOptions = options.map(({ display, fieldName }) => ({ label: display, @@ -32,7 +75,11 @@ export const TimestampField = ({ })); return ( - > path="timestampField"> + > + config={getTimestampConfig({ loadTimestampFieldOptions })} + // config={getTimestampConfig({ options })} + path="timestampField" + > {({ label, value, setValue }) => { if (value === undefined) { return null; diff --git a/src/plugins/index_pattern_editor/public/components/form_schema.ts b/src/plugins/index_pattern_editor/public/components/form_schema.ts index 044124d1de6d2..6ae62921e58da 100644 --- a/src/plugins/index_pattern_editor/public/components/form_schema.ts +++ b/src/plugins/index_pattern_editor/public/components/form_schema.ts @@ -34,7 +34,9 @@ export const schema = { label: i18n.translate('indexPatternEditor.editor.form.timeFieldLabel', { defaultMessage: 'Timestamp field', }), - helpText: 'Select a primary time field for use with the global time filter.', + helpText: i18n.translate('indexPatternEditor.editor.form.timestampFieldHelp', { + defaultMessage: 'Select a primary time field for use with the global time filter.', + }), validations: [], }, allowHidden: { @@ -47,8 +49,10 @@ export const schema = { label: i18n.translate('indexPatternEditor.editor.form.customIdLabel', { defaultMessage: 'Custom index pattern ID', }), - helpText: - 'Kibana will provide a unique identifier for each index pattern. If you do not want to use this unique ID, enter a custom one.', + helpText: i18n.translate('indexPatternEditor.editor.form.customIdHelp', { + defaultMessage: + 'Kibana will provide a unique identifier for each index pattern. If you do not want to use this unique ID, enter a custom one.', + }), }, type: { label: i18n.translate('indexPatternEditor.editor.form.TypeLabel', { diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx index 3a931ee613de1..d8aa1d0555cfb 100644 --- a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx @@ -193,9 +193,11 @@ const IndexPatternEditorFlyoutContentComponent = ({ const getRollupIndices = (rollupCaps: RollupIndicesCapsResponse) => Object.keys(rollupCaps); const loadTimestampFieldOptions = useCallback( - async (query: string, exactMatched: MatchedItem[]) => { + async (query: string) => { let timestampOptions: TimestampOption[] = []; - const isValidResult = !existingIndexPatterns.includes(title) && exactMatched.length > 0; + // async (query: string, exactMatched: MatchedItem[]) => { + // const isValidResult = !existingIndexPatterns.includes(title) && exactMatched.length > 0; + const isValidResult = !existingIndexPatterns.includes(title); // && exactMatched.length > 0; if (isValidResult) { setIsLoadingTimestampFields(true); const getFieldsOptions: GetFieldsOptions = { @@ -213,17 +215,9 @@ const IndexPatternEditorFlyoutContentComponent = ({ } setIsLoadingTimestampFields(false); setTimestampFieldOptions(timestampOptions); - form.getFields().timestampField.reset(); + return timestampOptions; }, - [ - existingIndexPatterns, - indexPatternService, - requireTimestampField, - rollupIndex, - title, - type, - form, - ] + [existingIndexPatterns, indexPatternService, requireTimestampField, rollupIndex, title, type] ); const reloadMatchedIndices = useCallback( @@ -264,7 +258,8 @@ const IndexPatternEditorFlyoutContentComponent = ({ indexRequests )) as MatchedItem[][]; - await loadTimestampFieldOptions(query, exactMatched); + // console.log('loadTimestampFieldOptions', query, exactMatched); + // await loadTimestampFieldOptions(query, exactMatched); const matchedIndicesResult = getMatchedIndices( allSources, @@ -282,6 +277,7 @@ const IndexPatternEditorFlyoutContentComponent = ({ setMatchedIndices(matchedIndicesResult); setIsLoadingMatchedIndices(false); + form.getFields().timestampField.reset(); return matchedIndicesResult; }; @@ -296,7 +292,8 @@ const IndexPatternEditorFlyoutContentComponent = ({ type, i18nTexts.rollupLabel, rollupIndicesCapabilities, - loadTimestampFieldOptions, + // loadTimestampFieldOptions, + form, ] ); @@ -446,6 +443,8 @@ TODO MOVE SOME OF THIS COMPLEXITY INTO A COMPONENT options={timestampFieldOptions} isLoadingOptions={isLoadingTimestampFields} helpText={timestampNoFieldsHelp || selectTimestampHelp} + loadTimestampFieldOptions={loadTimestampFieldOptions} + // loadTimestampFieldOptions={() => Promise.resolve([])} /> From aaa1558b241c7fa681dc0636a710fc2754b308ea Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Wed, 14 Jul 2021 22:01:02 -0500 Subject: [PATCH 064/130] remove code comments, localization --- .../public/components/utils.ts | 42 ++++++++++++++++--- .../_create_index_pattern_wizard.js | 21 ---------- 2 files changed, 37 insertions(+), 26 deletions(-) diff --git a/src/plugins/index_pattern_management/public/components/utils.ts b/src/plugins/index_pattern_management/public/components/utils.ts index 0eb5544e4a2d8..805c51c296bf2 100644 --- a/src/plugins/index_pattern_management/public/components/utils.ts +++ b/src/plugins/index_pattern_management/public/components/utils.ts @@ -18,6 +18,13 @@ const defaultIndexPatternListName = i18n.translate( } ); +const rollupIndexPatternListName = i18n.translate( + 'indexPatternManagement.editIndexPattern.list.rollupIndexPatternListName', + { + defaultMessage: 'Rollup', + } +); + const isRollup = (indexPattern: IIndexPattern | SimpleSavedObject) => { return ( indexPattern.type === 'rollup' || @@ -78,7 +85,7 @@ export const getTags = ( if (isRollup(indexPattern)) { tags.push({ key: 'rollup', - name: 'Rollup', // todo localize + name: rollupIndexPatternListName, }); } return tags; @@ -107,11 +114,36 @@ export const getFieldInfo = (indexPattern: IndexPattern, field: IFieldType) => { const agg = allAggs![aggName][field.name]; switch (aggName) { case 'date_histogram': - return `${aggName} (interval: ${agg.fixed_interval}, ${ - agg.delay ? `delay: ${agg.delay},` : '' - } ${agg.time_zone})`; + return i18n.translate( + 'indexPatternManagement.editIndexPattern.list.dateHistogramSummary', + { + defaultMessage: '{aggName} (interval: {interval}, {delay} {time_zone})', + values: { + aggName, + interval: agg.fixed_interval, + delay: agg.delay + ? i18n.translate( + 'indexPatternManagement.editIndexPattern.list.DateHistogramDelaySummary', + { + defaultMessage: 'delay: {delay},', + values: { + delay: agg.delay, + }, + } + ) + : '', + time_zone: agg.time_zone, + }, + } + ); case 'histogram': - return `${aggName} (interval: ${agg.fixed_interval})`; + return i18n.translate('indexPatternManagement.editIndexPattern.list.histogramSummary', { + defaultMessage: '{aggName} (interval: {interval})', + values: { + aggName, + interval: agg.fixed_interval, + }, + }); default: return aggName; } diff --git a/test/functional/apps/management/_create_index_pattern_wizard.js b/test/functional/apps/management/_create_index_pattern_wizard.js index eb0491ec00519..b2f24e530cb12 100644 --- a/test/functional/apps/management/_create_index_pattern_wizard.js +++ b/test/functional/apps/management/_create_index_pattern_wizard.js @@ -6,8 +6,6 @@ * Side Public License, v 1. */ -// import expect from '@kbn/expect'; - export default function ({ getService, getPageObjects }) { const kibanaServer = getService('kibanaServer'); const testSubjects = getService('testSubjects'); @@ -23,25 +21,6 @@ export default function ({ getService, getPageObjects }) { await PageObjects.settings.clickKibanaIndexPatterns(); }); - /* - describe('step 1 next button', function () { - it('is disabled by default', async function () { - await (await testSubjects.find('createIndexPatternButton')).click(); - const btn = await PageObjects.settings.getCreateIndexPatternGoToStep2Button(); - const isEnabled = await btn.isEnabled(); - expect(isEnabled).not.to.be.ok(); - }); - - it('is enabled once an index pattern with matching indices has been entered', async function () { - await PageObjects.settings.setIndexPatternField(); - await PageObjects.common.sleep(1000); - const btn = await PageObjects.settings.getCreateIndexPatternGoToStep2Button(); - const isEnabled = await btn.isEnabled(); - expect(isEnabled).to.be.ok(); - }); - }); - */ - describe('index alias', () => { before(async function () { await security.testUser.setRoles(['kibana_admin', 'test_alias1_reader']); From a5f518e3cc311515c4e0603953a3b4c7a8ee1a0d Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Wed, 14 Jul 2021 22:40:50 -0500 Subject: [PATCH 065/130] fix rollup index patterns --- .../components/index_pattern_editor_flyout_content.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx index eee74d57fdcdc..eaf4d7262cbd8 100644 --- a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx @@ -182,9 +182,9 @@ const IndexPatternEditorFlyoutContentComponent = ({ // Silently swallow failure responses such as expired trials } }; - if (type === INDEX_PATTERN_TYPE.ROLLUP) { - getRollups(); - } + + getRollups(); + return () => { isMounted = false; }; From b21b87b25a676ce5cda3b0fdd58b96f601441ee6 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Wed, 14 Jul 2021 22:57:56 -0500 Subject: [PATCH 066/130] update docs, no close button on flyout --- src/plugins/data/public/public.api.md | 51 +++++-------------- .../public/open_editor.tsx | 3 +- 2 files changed, 15 insertions(+), 39 deletions(-) diff --git a/src/plugins/data/public/public.api.md b/src/plugins/data/public/public.api.md index 569717dbc7c77..0a71c9d394f8a 100644 --- a/src/plugins/data/public/public.api.md +++ b/src/plugins/data/public/public.api.md @@ -1724,17 +1724,11 @@ export enum IndexPatternType { // @public (undocumented) export interface IndexPatternTypeMeta { // (undocumented) -<<<<<<< HEAD - [key: string]: any; - // (undocumented) aggs?: Record; -======= - aggs?: Record; // (undocumented) params?: { rollup_index: string; }; ->>>>>>> master } // Warning: (ae-missing-release-tag) "injectReferences" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) @@ -2809,37 +2803,20 @@ export interface WaitUntilNextSessionCompletesOptions { // src/plugins/data/public/index.ts:238:27 - (ae-forgotten-export) The symbol "validateIndexPattern" needs to be exported by the entry point index.d.ts // src/plugins/data/public/index.ts:238:27 - (ae-forgotten-export) The symbol "flattenHitWrapper" needs to be exported by the entry point index.d.ts // src/plugins/data/public/index.ts:238:27 - (ae-forgotten-export) The symbol "formatHitProvider" needs to be exported by the entry point index.d.ts -<<<<<<< HEAD -// src/plugins/data/public/index.ts:411:20 - (ae-forgotten-export) The symbol "getResponseInspectorStats" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:411:20 - (ae-forgotten-export) The symbol "tabifyAggResponse" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:411:20 - (ae-forgotten-export) The symbol "tabifyGetColumns" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:413:1 - (ae-forgotten-export) The symbol "CidrMask" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:414:1 - (ae-forgotten-export) The symbol "dateHistogramInterval" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:423:1 - (ae-forgotten-export) The symbol "InvalidEsCalendarIntervalError" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:424:1 - (ae-forgotten-export) The symbol "InvalidEsIntervalFormatError" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:425:1 - (ae-forgotten-export) The symbol "IpAddress" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:426:1 - (ae-forgotten-export) The symbol "isDateHistogramBucketAggConfig" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:430:1 - (ae-forgotten-export) The symbol "isValidEsInterval" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:431:1 - (ae-forgotten-export) The symbol "isValidInterval" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:434:1 - (ae-forgotten-export) The symbol "parseInterval" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:435:1 - (ae-forgotten-export) The symbol "propFilter" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:438:1 - (ae-forgotten-export) The symbol "toAbsoluteDates" needs to be exported by the entry point index.d.ts -======= -// src/plugins/data/public/index.ts:410:20 - (ae-forgotten-export) The symbol "getResponseInspectorStats" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:410:20 - (ae-forgotten-export) The symbol "tabifyAggResponse" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:410:20 - (ae-forgotten-export) The symbol "tabifyGetColumns" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:412:1 - (ae-forgotten-export) The symbol "CidrMask" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:413:1 - (ae-forgotten-export) The symbol "dateHistogramInterval" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:422:1 - (ae-forgotten-export) The symbol "InvalidEsCalendarIntervalError" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:423:1 - (ae-forgotten-export) The symbol "InvalidEsIntervalFormatError" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:424:1 - (ae-forgotten-export) The symbol "IpAddress" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:425:1 - (ae-forgotten-export) The symbol "isDateHistogramBucketAggConfig" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:429:1 - (ae-forgotten-export) The symbol "isValidEsInterval" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:430:1 - (ae-forgotten-export) The symbol "isValidInterval" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:433:1 - (ae-forgotten-export) The symbol "parseInterval" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:434:1 - (ae-forgotten-export) The symbol "propFilter" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:437:1 - (ae-forgotten-export) The symbol "toAbsoluteDates" needs to be exported by the entry point index.d.ts ->>>>>>> master +// src/plugins/data/public/index.ts:412:20 - (ae-forgotten-export) The symbol "getResponseInspectorStats" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:412:20 - (ae-forgotten-export) The symbol "tabifyAggResponse" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:412:20 - (ae-forgotten-export) The symbol "tabifyGetColumns" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:414:1 - (ae-forgotten-export) The symbol "CidrMask" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:415:1 - (ae-forgotten-export) The symbol "dateHistogramInterval" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:424:1 - (ae-forgotten-export) The symbol "InvalidEsCalendarIntervalError" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:425:1 - (ae-forgotten-export) The symbol "InvalidEsIntervalFormatError" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:426:1 - (ae-forgotten-export) The symbol "IpAddress" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:427:1 - (ae-forgotten-export) The symbol "isDateHistogramBucketAggConfig" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:431:1 - (ae-forgotten-export) The symbol "isValidEsInterval" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:432:1 - (ae-forgotten-export) The symbol "isValidInterval" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:435:1 - (ae-forgotten-export) The symbol "parseInterval" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:436:1 - (ae-forgotten-export) The symbol "propFilter" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:439:1 - (ae-forgotten-export) The symbol "toAbsoluteDates" needs to be exported by the entry point index.d.ts // src/plugins/data/public/query/state_sync/connect_to_query_state.ts:34:5 - (ae-forgotten-export) The symbol "FilterStateStore" needs to be exported by the entry point index.d.ts // src/plugins/data/public/search/session/session_service.ts:62:5 - (ae-forgotten-export) The symbol "UrlGeneratorStateMapping" needs to be exported by the entry point index.d.ts diff --git a/src/plugins/index_pattern_editor/public/open_editor.tsx b/src/plugins/index_pattern_editor/public/open_editor.tsx index 2ab43fcfee03e..b5a014ac55eb4 100644 --- a/src/plugins/index_pattern_editor/public/open_editor.tsx +++ b/src/plugins/index_pattern_editor/public/open_editor.tsx @@ -71,8 +71,7 @@ export const getEditorOpener = ({ core, indexPatternService }: Dependencies) => ), { - // todo - I'm confused why this is throwing ts errors - // hideCloseButton: true, + hideCloseButton: true, size: 'l', } ); From a2eb3e0e28c33396de4f3fe02516b0280383745a Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Wed, 14 Jul 2021 23:13:38 -0500 Subject: [PATCH 067/130] update plugin list doc --- docs/developer/plugin-list.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/developer/plugin-list.asciidoc b/docs/developer/plugin-list.asciidoc index c06a617e93d16..b6c8b701db7a2 100644 --- a/docs/developer/plugin-list.asciidoc +++ b/docs/developer/plugin-list.asciidoc @@ -100,7 +100,7 @@ for use in their own application. |{kib-repo}blob/{branch}/src/plugins/index_pattern_editor/README.md[indexPatternEditor] -|The reusable index pattern creation flyout UI +|Create index patterns from within Kibana apps. |{kib-repo}blob/{branch}/src/plugins/index_pattern_field_editor/README.md[indexPatternFieldEditor] From 9e8329ae0167f16560c78f8d549a406dfa6e4d20 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Thu, 15 Jul 2021 07:15:13 -0500 Subject: [PATCH 068/130] fixing functional tests --- .../components/index_pattern_editor_flyout_content.tsx | 5 +++-- .../apps/management/_index_pattern_create_delete.js | 2 +- .../test/functional/apps/rollup_job/hybrid_index_pattern.js | 2 +- .../test/functional/apps/visualize/hybrid_visualization.ts | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx index eaf4d7262cbd8..9a52ff352ac32 100644 --- a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx @@ -284,7 +284,8 @@ const IndexPatternEditorFlyoutContentComponent = ({ setMatchedIndices(matchedIndicesResult); setIsLoadingMatchedIndices(false); - form.getFields().timestampField.reset(); + // todo reenable + // form.getFields().timestampField.reset(); return matchedIndicesResult; }; @@ -300,7 +301,7 @@ const IndexPatternEditorFlyoutContentComponent = ({ i18nTexts.rollupLabel, rollupIndicesCapabilities, // loadTimestampFieldOptions, - form, + // form, ] ); diff --git a/test/functional/apps/management/_index_pattern_create_delete.js b/test/functional/apps/management/_index_pattern_create_delete.js index f0fe983f26e7a..b195e4c8d5857 100644 --- a/test/functional/apps/management/_index_pattern_create_delete.js +++ b/test/functional/apps/management/_index_pattern_create_delete.js @@ -29,7 +29,7 @@ export default function ({ getService, getPageObjects }) { }); }); - describe.skip('special character handling', () => { + describe('special character handling', () => { it('should handle special charaters in template input', async () => { await PageObjects.settings.clickAddNewIndexPatternButton(); await PageObjects.header.waitUntilLoadingHasFinished(); diff --git a/x-pack/test/functional/apps/rollup_job/hybrid_index_pattern.js b/x-pack/test/functional/apps/rollup_job/hybrid_index_pattern.js index 6d684f5b2a6da..1986efe202224 100644 --- a/x-pack/test/functional/apps/rollup_job/hybrid_index_pattern.js +++ b/x-pack/test/functional/apps/rollup_job/hybrid_index_pattern.js @@ -17,7 +17,7 @@ export default function ({ getService, getPageObjects }) { const PageObjects = getPageObjects(['common', 'settings']); const esDeleteAllIndices = getService('esDeleteAllIndices'); - describe.skip('hybrid index pattern', function () { + describe('hybrid index pattern', function () { //Since rollups can only be created once with the same name (even if you delete it), //we add the Date.now() to avoid name collision if you run the tests locally back to back. const rollupJobName = `hybrid-index-pattern-test-rollup-job-${Date.now()}`; diff --git a/x-pack/test/functional/apps/visualize/hybrid_visualization.ts b/x-pack/test/functional/apps/visualize/hybrid_visualization.ts index 118822f2ddc51..41c393398b256 100644 --- a/x-pack/test/functional/apps/visualize/hybrid_visualization.ts +++ b/x-pack/test/functional/apps/visualize/hybrid_visualization.ts @@ -12,7 +12,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { const PageObjects = getPageObjects(['common', 'visualize', 'timePicker', 'visChart']); const inspector = getService('inspector'); - describe.skip('hybrid index pattern', () => { + describe('hybrid index pattern', () => { before(async () => { await esArchiver.load('x-pack/test/functional/es_archives/hybrid/kibana'); await esArchiver.load('x-pack/test/functional/es_archives/hybrid/logstash'); From 47d8b14d063b7e00a0b35c3bcc31367618ee92ed Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Thu, 15 Jul 2021 17:54:13 -0500 Subject: [PATCH 069/130] refactor title and timestamp field validation --- .../form_fields/timestamp_field.tsx | 53 ++++++++++--------- .../index_pattern_editor_flyout_content.tsx | 26 ++++----- .../indexed_fields_table.test.tsx.snap | 2 +- 3 files changed, 38 insertions(+), 43 deletions(-) diff --git a/src/plugins/index_pattern_editor/public/components/form_fields/timestamp_field.tsx b/src/plugins/index_pattern_editor/public/components/form_fields/timestamp_field.tsx index 07e023311048c..99e499a368b59 100644 --- a/src/plugins/index_pattern_editor/public/components/form_fields/timestamp_field.tsx +++ b/src/plugins/index_pattern_editor/public/components/form_fields/timestamp_field.tsx @@ -6,12 +6,17 @@ * Side Public License, v 1. */ -import React from 'react'; +import React, { useMemo } from 'react'; import { i18n } from '@kbn/i18n'; import { EuiFormRow, EuiComboBox, EuiFormHelpText, EuiComboBoxOptionOption } from '@elastic/eui'; -import { UseField, FieldConfig, ValidationConfig } from '../../shared_imports'; +import { + UseField, + FieldConfig, + ValidationConfig, + getFieldValidityAndErrorMessage, +} from '../../shared_imports'; import { TimestampOption } from '../index_pattern_editor_flyout_content'; import { schema } from '../form_schema'; @@ -20,18 +25,10 @@ interface Props { options: TimestampOption[]; isLoadingOptions: boolean; helpText: string; - loadTimestampFieldOptions: (title: string) => Promise; } -interface GetTimestampConfigArgs { - loadTimestampFieldOptions: (title: string) => Promise; -} - -const requireTimestampOptionValidator = ( - loadTimestampFieldOptions: (title: string) => Promise -): ValidationConfig => ({ - validator: async ({ value, formData }) => { - const options = await loadTimestampFieldOptions(formData.title); +const requireTimestampOptionValidator = (options: Props['options']): ValidationConfig => ({ + validator: async ({ value }) => { const isValueRequired = !!options.length; if (isValueRequired && !value) { return { @@ -46,15 +43,15 @@ const requireTimestampOptionValidator = ( }, }); -const getTimestampConfig = ({ - loadTimestampFieldOptions, -}: GetTimestampConfigArgs): FieldConfig> => { +const getTimestampConfig = ( + options: Props['options'] +): FieldConfig> => { const timestampFieldConfig = schema.timestampField; const validations = [ ...timestampFieldConfig.validations, // note this is responsible for triggering the state update for the selected source list. - requireTimestampOptionValidator(loadTimestampFieldOptions), + requireTimestampOptionValidator(options), ]; return { @@ -67,27 +64,33 @@ export const TimestampField = ({ options = [], helpText = '', isLoadingOptions = false, - loadTimestampFieldOptions, }: Props) => { const optionsAsComboBoxOptions = options.map(({ display, fieldName }) => ({ label: display, value: fieldName, })); + const timestampConfig = useMemo(() => getTimestampConfig(options), [options]); return ( - > - config={getTimestampConfig({ loadTimestampFieldOptions })} - // config={getTimestampConfig({ options })} - path="timestampField" - > - {({ label, value, setValue }) => { + > config={timestampConfig} path="timestampField"> + {(field) => { + const { label, value, setValue } = field; + if (value === undefined) { return null; } + const { isInvalid, errorMessage } = getFieldValidityAndErrorMessage(field); + const isDisabled = !optionsAsComboBoxOptions.length; + return ( <> - + <> placeholder={i18n.translate( @@ -108,7 +111,7 @@ export const TimestampField = ({ setValue(newValue[0]); }} isClearable={false} - isDisabled={!optionsAsComboBoxOptions.length} + isDisabled={isDisabled} data-test-subj="timestampField" aria-label={i18n.translate( 'indexPatternEditor.editor.form.timestampSelectAriaLabel', diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx index 9a52ff352ac32..526e682188580 100644 --- a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx @@ -111,6 +111,8 @@ const IndexPatternEditorFlyoutContentComponent = ({ }, }); + const { getFields } = form; + const [{ title, allowHidden, type }] = useFormData({ form }); const [isLoadingSources, setIsLoadingSources] = useState(true); @@ -122,7 +124,6 @@ const IndexPatternEditorFlyoutContentComponent = ({ const [remoteClustersExist, setRemoteClustersExist] = useState(false); const [isLoadingIndexPatterns, setIsLoadingIndexPatterns] = useState(true); const [goToForm, setGoToForm] = useState(false); - const [disableSubmit, setDisableSubmit] = useState(true); const [existingIndexPatterns, setExistingIndexPatterns] = useState([]); const [rollupIndex, setRollupIndex] = useState(); const [ @@ -196,7 +197,7 @@ const IndexPatternEditorFlyoutContentComponent = ({ async (query: string) => { let timestampOptions: TimestampOption[] = []; const isValidResult = - !existingIndexPatterns.includes(title) && matchedIndices.exactMatchedIndices.length > 0; + !existingIndexPatterns.includes(query) && matchedIndices.exactMatchedIndices.length > 0; if (isValidResult) { setIsLoadingTimestampFields(true); const getFieldsOptions: GetFieldsOptions = { @@ -221,12 +222,16 @@ const IndexPatternEditorFlyoutContentComponent = ({ indexPatternService, requireTimestampField, rollupIndex, - title, type, matchedIndices.exactMatchedIndices, ] ); + useEffect(() => { + loadTimestampFieldOptions(title); + getFields().timestampField?.setValue(''); + }, [matchedIndices, loadTimestampFieldOptions, title, getFields]); + const reloadMatchedIndices = useCallback( async (title2: string) => { // todo move to utility lib @@ -284,8 +289,6 @@ const IndexPatternEditorFlyoutContentComponent = ({ setMatchedIndices(matchedIndicesResult); setIsLoadingMatchedIndices(false); - // todo reenable - // form.getFields().timestampField.reset(); return matchedIndicesResult; }; @@ -392,14 +395,6 @@ TODO MOVE SOME OF THIS COMPLEXITY INTO A COMPONENT ); }; - if (title) { - // needed to trigger validation without touching advanced options - form.validate().then((isValid) => { - const disable = !isValid; - setDisableSubmit(disable); - }); - } - const previewPanelContent = isLoadingIndexPatterns ? ( ) : ( @@ -421,7 +416,6 @@ TODO MOVE SOME OF THIS COMPLEXITY INTO A COMPONENT matchedIndices.exactMatchedIndices.length ? i18nTexts.noTimestampOptionText : ''; - // return ( <> @@ -451,8 +445,6 @@ TODO MOVE SOME OF THIS COMPLEXITY INTO A COMPONENT options={timestampFieldOptions} isLoadingOptions={isLoadingTimestampFields} helpText={timestampNoFieldsHelp || selectTimestampHelp} - loadTimestampFieldOptions={loadTimestampFieldOptions} - // loadTimestampFieldOptions={() => Promise.resolve([])} /> @@ -461,7 +453,7 @@ TODO MOVE SOME OF THIS COMPLEXITY INTO A COMPONENT
form.submit()} - submitDisabled={disableSubmit} + submitDisabled={form.isSubmitted && !form.isValid} /> {previewPanelContent} diff --git a/src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/__snapshots__/indexed_fields_table.test.tsx.snap b/src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/__snapshots__/indexed_fields_table.test.tsx.snap index c03899554ffff..239f09d7a8ec6 100644 --- a/src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/__snapshots__/indexed_fields_table.test.tsx.snap +++ b/src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/__snapshots__/indexed_fields_table.test.tsx.snap @@ -125,7 +125,7 @@ exports[`IndexedFieldsTable IndexedFieldsTable with rollup index pattern should "hasRuntime": false, "info": Array [ "Rollup aggregations:", - "histogram (interval: 5)", + "histogram (interval: )", "avg", "max", "min", From ceab21ba210e6c0fd1aa6af695584ec16a3452bc Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Fri, 16 Jul 2021 09:12:05 -0500 Subject: [PATCH 070/130] update snapshot --- .../public/components/__snapshots__/utils.test.ts.snap | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/plugins/index_pattern_management/public/components/__snapshots__/utils.test.ts.snap b/src/plugins/index_pattern_management/public/components/__snapshots__/utils.test.ts.snap index 224a5c992d58b..3a25a78472b50 100644 --- a/src/plugins/index_pattern_management/public/components/__snapshots__/utils.test.ts.snap +++ b/src/plugins/index_pattern_management/public/components/__snapshots__/utils.test.ts.snap @@ -6,14 +6,19 @@ Array [ "default": true, "id": "test", "sort": "0test name", - "tags": undefined, + "tags": Array [ + Object { + "key": "default", + "name": "Default", + }, + ], "title": "test name", }, Object { "default": false, "id": "test1", "sort": "1test name 1", - "tags": undefined, + "tags": Array [], "title": "test name 1", }, ] From b3a8714ef29580f3da9990589a1cf3595ecbf358 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Sat, 17 Jul 2021 23:07:23 -0500 Subject: [PATCH 071/130] fix tests --- .../empty_index_pattern_prompt.test.tsx.snap | 40 ++++++++++--------- .../empty_index_pattern_prompt.test.tsx | 8 +++- .../empty_index_pattern_prompt.tsx | 19 +++++---- .../empty_state/empty_state.test.tsx | 18 ++++++++- .../components/empty_state/empty_state.tsx | 21 +++++----- .../index_pattern_editor_flyout_content.tsx | 13 +++++- .../public/test_utils/mocks.ts | 7 ---- .../public/components/utils.ts | 8 +--- .../management/create_index_pattern_wizard.js | 2 +- 9 files changed, 77 insertions(+), 59 deletions(-) diff --git a/src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/__snapshots__/empty_index_pattern_prompt.test.tsx.snap b/src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/__snapshots__/empty_index_pattern_prompt.test.tsx.snap index bc69fa29e6904..c1a0b039c58d4 100644 --- a/src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/__snapshots__/empty_index_pattern_prompt.test.tsx.snap +++ b/src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/__snapshots__/empty_index_pattern_prompt.test.tsx.snap @@ -19,7 +19,15 @@ exports[`EmptyIndexPatternPrompt should render normally 1`] = ` className="inpEmptyIndexPatternPrompt__illustration" grow={1} > - + + ...loading... +
+ } + > + +

- - + @@ -79,19 +83,19 @@ exports[`EmptyIndexPatternPrompt should render normally 1`] = ` > diff --git a/src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/empty_index_pattern_prompt.test.tsx b/src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/empty_index_pattern_prompt.test.tsx index dce4b33fb8305..4cf3c4b55acde 100644 --- a/src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/empty_index_pattern_prompt.test.tsx +++ b/src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/empty_index_pattern_prompt.test.tsx @@ -12,7 +12,13 @@ import { shallowWithI18nProvider } from '@kbn/test/jest'; describe('EmptyIndexPatternPrompt', () => { it('should render normally', () => { - const component = shallowWithI18nProvider( {}} />); + const component = shallowWithI18nProvider( + {}} + canSaveIndexPattern={true} + indexPatternsIntroUrl={'http://elastic.co/'} + /> + ); expect(component).toMatchSnapshot(); }); diff --git a/src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/empty_index_pattern_prompt.tsx b/src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/empty_index_pattern_prompt.tsx index 452d47a7e025b..1678dab1cf233 100644 --- a/src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/empty_index_pattern_prompt.tsx +++ b/src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/empty_index_pattern_prompt.tsx @@ -15,18 +15,17 @@ import { EuiPageContent, EuiSpacer, EuiText, EuiFlexItem, EuiFlexGroup } from '@ import { EuiDescriptionListTitle } from '@elastic/eui'; import { EuiDescriptionListDescription, EuiDescriptionList } from '@elastic/eui'; import { EuiLink, EuiButton } from '@elastic/eui'; -import { useKibana } from '../../shared_imports'; -import { IndexPatternEditorContext } from '../../types'; - interface Props { goToCreate: () => void; + canSaveIndexPattern: boolean; + indexPatternsIntroUrl: string; } -export const EmptyIndexPatternPrompt = ({ goToCreate }: Props) => { - const { - services: { docLinks, application }, - } = useKibana(); - +export const EmptyIndexPatternPrompt = ({ + goToCreate, + canSaveIndexPattern, + indexPatternsIntroUrl, +}: Props) => { const Illustration = lazy(() => import('./assets/index_pattern_illustration')); return ( @@ -65,7 +64,7 @@ export const EmptyIndexPatternPrompt = ({ goToCreate }: Props) => { yesterday, or all indices that contain your log data." />

- {application.capabilities.indexPatterns.save && ( + {canSaveIndexPattern && ( { /> - + ({ describe('EmptyState', () => { it('should render normally', () => { const component = shallow( - {}} createAnyway={() => {}} closeFlyout={() => {}} /> + {}} + createAnyway={() => {}} + closeFlyout={() => {}} + addDataUrl={'http://elastic.co'} + navigateToApp={async (appId) => {}} + canSaveIndexPattern={true} + /> ); expect(component).toMatchSnapshot(); @@ -34,7 +41,14 @@ describe('EmptyState', () => { const onRefreshHandler = sinon.stub(); const component = mountWithIntl( - {}} closeFlyout={() => {}} /> + {}} + closeFlyout={() => {}} + addDataUrl={'http://elastic.co'} + navigateToApp={async (appId) => {}} + canSaveIndexPattern={true} + /> ); findTestSubject(component, 'refreshIndicesButton').simulate('click'); diff --git a/src/plugins/index_pattern_editor/public/components/empty_state/empty_state.tsx b/src/plugins/index_pattern_editor/public/components/empty_state/empty_state.tsx index 49ad346647c50..f16e75395a41f 100644 --- a/src/plugins/index_pattern_editor/public/components/empty_state/empty_state.tsx +++ b/src/plugins/index_pattern_editor/public/components/empty_state/empty_state.tsx @@ -26,26 +26,23 @@ import { EuiFlexGroup, } from '@elastic/eui'; -import { IndexPatternEditorContext } from '../../types'; - -import { useKibana } from '../../shared_imports'; +import { ApplicationStart } from 'src/core/public'; export const EmptyState = ({ onRefresh, closeFlyout, createAnyway, + canSaveIndexPattern, + addDataUrl, + navigateToApp, }: { onRefresh: () => void; closeFlyout: () => void; createAnyway: () => void; + canSaveIndexPattern: boolean; + addDataUrl: string; + navigateToApp: ApplicationStart['navigateToApp']; }) => { - const { - services: { - docLinks, - application: { navigateToApp, capabilities }, - }, - } = useKibana(); - const createAnywayLink = ( ), description: ( - + - {capabilities.indexPatterns.save && createAnywayLink} + {canSaveIndexPattern && createAnywayLink} ); }; diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx index 526e682188580..592ea2642fb5e 100644 --- a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx @@ -75,7 +75,7 @@ const IndexPatternEditorFlyoutContentComponent = ({ requireTimestampField = false, }: Props) => { const { - services: { http, indexPatternService, uiSettings }, + services: { http, indexPatternService, uiSettings, docLinks, application }, } = useKibana(); const i18nTexts = geti18nTexts(); @@ -323,11 +323,20 @@ const IndexPatternEditorFlyoutContentComponent = ({ onRefresh={loadSources} closeFlyout={onCancel} createAnyway={() => setGoToForm(true)} + canSaveIndexPattern={application.capabilities.indexPatterns.save as boolean} + navigateToApp={application.navigateToApp} + addDataUrl={docLinks.links.indexPatterns.introduction} /> ); } else { // first time - return setGoToForm(true)} />; + return ( + setGoToForm(true)} + indexPatternsIntroUrl={docLinks.links.indexPatterns.introduction} + canSaveIndexPattern={application.capabilities.indexPatterns.save as boolean} + /> + ); } } diff --git a/src/plugins/index_pattern_editor/public/test_utils/mocks.ts b/src/plugins/index_pattern_editor/public/test_utils/mocks.ts index c6bc24f176858..5d0296a04ea51 100644 --- a/src/plugins/index_pattern_editor/public/test_utils/mocks.ts +++ b/src/plugins/index_pattern_editor/public/test_utils/mocks.ts @@ -15,10 +15,3 @@ export const docLinks: DocLinksStart = { DOC_LINK_VERSION: 'jest', links: {} as any, }; - -// TODO check how we can better stub an index pattern format -export const fieldFormats = { - getDefaultInstance: () => ({ - convert: (val: any) => val, - }), -} as any; diff --git a/src/plugins/index_pattern_management/public/components/utils.ts b/src/plugins/index_pattern_management/public/components/utils.ts index 805c51c296bf2..2974f6d49c138 100644 --- a/src/plugins/index_pattern_management/public/components/utils.ts +++ b/src/plugins/index_pattern_management/public/components/utils.ts @@ -7,7 +7,7 @@ */ import { IndexPatternsContract } from 'src/plugins/data/public'; -import { IIndexPattern, IndexPattern, IFieldType } from 'src/plugins/data/public'; +import { IndexPattern, IndexPattern, IFieldType } from 'src/plugins/data/public'; import { SimpleSavedObject } from 'src/core/public'; import { i18n } from '@kbn/i18n'; @@ -26,11 +26,7 @@ const rollupIndexPatternListName = i18n.translate( ); const isRollup = (indexPattern: IIndexPattern | SimpleSavedObject) => { - return ( - indexPattern.type === 'rollup' || - ((indexPattern as SimpleSavedObject).get && - (indexPattern as SimpleSavedObject).get('type') === 'rollup') - ); + return indexPattern.type === 'rollup'; }; export async function getIndexPatterns( diff --git a/x-pack/test/functional/apps/management/create_index_pattern_wizard.js b/x-pack/test/functional/apps/management/create_index_pattern_wizard.js index 246256cb4c2a1..445e340d236e6 100644 --- a/x-pack/test/functional/apps/management/create_index_pattern_wizard.js +++ b/x-pack/test/functional/apps/management/create_index_pattern_wizard.js @@ -43,7 +43,7 @@ export default function ({ getService, getPageObjects }) { method: 'PUT', }); - await PageObjects.settings.createIndexPattern('test_data_stream', false); + await PageObjects.settings.createIndexPattern('test_data_stream'); await es.transport.request({ path: '/_data_stream/test_data_stream', From 88d51a439bffc7177ae527ba7cfe95586898d90a Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Sun, 18 Jul 2021 01:49:08 -0500 Subject: [PATCH 072/130] fix import, update snapshot --- .../__snapshots__/empty_state.test.tsx.snap | 28 +++++++++---------- .../public/components/utils.ts | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/plugins/index_pattern_editor/public/components/empty_state/__snapshots__/empty_state.test.tsx.snap b/src/plugins/index_pattern_editor/public/components/empty_state/__snapshots__/empty_state.test.tsx.snap index 75b8177d9dac3..db3b3d2190e0f 100644 --- a/src/plugins/index_pattern_editor/public/components/empty_state/__snapshots__/empty_state.test.tsx.snap +++ b/src/plugins/index_pattern_editor/public/components/empty_state/__snapshots__/empty_state.test.tsx.snap @@ -16,7 +16,7 @@ exports[`EmptyState should render normally 1`] = `

@@ -38,7 +38,7 @@ exports[`EmptyState should render normally 1`] = ` description={ } @@ -53,7 +53,7 @@ exports[`EmptyState should render normally 1`] = ` title={ } @@ -65,7 +65,7 @@ exports[`EmptyState should render normally 1`] = ` description={ } @@ -80,7 +80,7 @@ exports[`EmptyState should render normally 1`] = ` title={ } @@ -92,7 +92,7 @@ exports[`EmptyState should render normally 1`] = ` description={ } @@ -107,7 +107,7 @@ exports[`EmptyState should render normally 1`] = ` title={ } @@ -131,18 +131,18 @@ exports[`EmptyState should render normally 1`] = ` Object { "description": , "title": , }, @@ -164,7 +164,7 @@ exports[`EmptyState should render normally 1`] = ` > @@ -175,7 +175,7 @@ exports[`EmptyState should render normally 1`] = ` , "title": , }, @@ -195,7 +195,7 @@ exports[`EmptyState should render normally 1`] = ` > , diff --git a/src/plugins/index_pattern_management/public/components/utils.ts b/src/plugins/index_pattern_management/public/components/utils.ts index 2974f6d49c138..58fa44e01ea69 100644 --- a/src/plugins/index_pattern_management/public/components/utils.ts +++ b/src/plugins/index_pattern_management/public/components/utils.ts @@ -7,7 +7,7 @@ */ import { IndexPatternsContract } from 'src/plugins/data/public'; -import { IndexPattern, IndexPattern, IFieldType } from 'src/plugins/data/public'; +import { IndexPattern, IFieldType } from 'src/plugins/data/public'; import { SimpleSavedObject } from 'src/core/public'; import { i18n } from '@kbn/i18n'; From 5683c7ac9da8305edd3472456a09efcf57e4deae Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Sun, 18 Jul 2021 10:45:25 -0500 Subject: [PATCH 073/130] remove IIndexPattern --- .../public/components/utils.ts | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/plugins/index_pattern_management/public/components/utils.ts b/src/plugins/index_pattern_management/public/components/utils.ts index 58fa44e01ea69..f88ea8a5020dd 100644 --- a/src/plugins/index_pattern_management/public/components/utils.ts +++ b/src/plugins/index_pattern_management/public/components/utils.ts @@ -25,7 +25,7 @@ const rollupIndexPatternListName = i18n.translate( } ); -const isRollup = (indexPattern: IIndexPattern | SimpleSavedObject) => { +const isRollup = (indexPattern: IndexPattern) => { return indexPattern.type === 'rollup'; }; @@ -66,11 +66,7 @@ export async function getIndexPatterns( ); } -export const getTags = ( - // todo might be able to tighten types - indexPattern: IIndexPattern | SimpleSavedObject, - isDefault: boolean -) => { +export const getTags = (indexPattern: IndexPattern, isDefault: boolean) => { const tags = []; if (isDefault) { tags.push({ @@ -87,9 +83,7 @@ export const getTags = ( return tags; }; -export const areScriptedFieldsEnabled = ( - indexPattern: IIndexPattern | SimpleSavedObject -) => { +export const areScriptedFieldsEnabled = (indexPattern: IndexPattern) => { return !isRollup(indexPattern); }; From 1f29f445c973a28c144b2979f51bd4d6f4a632e2 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Sun, 18 Jul 2021 13:05:40 -0500 Subject: [PATCH 074/130] remove IIndexPattern --- src/plugins/index_pattern_management/public/components/utils.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/plugins/index_pattern_management/public/components/utils.ts b/src/plugins/index_pattern_management/public/components/utils.ts index f88ea8a5020dd..b05fa03b7decf 100644 --- a/src/plugins/index_pattern_management/public/components/utils.ts +++ b/src/plugins/index_pattern_management/public/components/utils.ts @@ -8,7 +8,6 @@ import { IndexPatternsContract } from 'src/plugins/data/public'; import { IndexPattern, IFieldType } from 'src/plugins/data/public'; -import { SimpleSavedObject } from 'src/core/public'; import { i18n } from '@kbn/i18n'; const defaultIndexPatternListName = i18n.translate( From d219d41dfeaf60311c78f6953208a1126a8e1528 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Mon, 19 Jul 2021 12:07:47 -0500 Subject: [PATCH 075/130] factor out IFieldType and type fixes --- .../public/lib/extract_time_fields.test.ts | 6 ++++-- .../index_pattern_editor/public/lib/extract_time_fields.ts | 4 ++-- src/plugins/index_pattern_editor/public/shared_imports.ts | 2 +- src/plugins/index_pattern_editor/public/types.ts | 4 ++-- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/plugins/index_pattern_editor/public/lib/extract_time_fields.test.ts b/src/plugins/index_pattern_editor/public/lib/extract_time_fields.test.ts index ad64b7ee96a23..f8ebfadcb7058 100644 --- a/src/plugins/index_pattern_editor/public/lib/extract_time_fields.test.ts +++ b/src/plugins/index_pattern_editor/public/lib/extract_time_fields.test.ts @@ -7,20 +7,22 @@ */ import { extractTimeFields } from './extract_time_fields'; +import { IndexPatternField } from '../../../../plugins/data/public'; describe('extractTimeFields', () => { it('should handle no date fields', () => { const fields = [ { type: 'text', name: 'name' }, { type: 'text', name: 'name' }, - ]; + ] as IndexPatternField[]; expect(extractTimeFields(fields)).toEqual([]); }); it('should add extra options', () => { - const fields = [{ type: 'date', name: '@timestamp' }]; + const fields = [{ type: 'date', name: '@timestamp' }] as IndexPatternField[]; + // const extractedFields = extractTimeFields(fields); expect(extractTimeFields(fields)).toEqual([ { display: '@timestamp', fieldName: '@timestamp' }, { display: `--- I don't want to use the time filter ---`, fieldName: '' }, diff --git a/src/plugins/index_pattern_editor/public/lib/extract_time_fields.ts b/src/plugins/index_pattern_editor/public/lib/extract_time_fields.ts index ca547fe31dee5..19bab817efb5d 100644 --- a/src/plugins/index_pattern_editor/public/lib/extract_time_fields.ts +++ b/src/plugins/index_pattern_editor/public/lib/extract_time_fields.ts @@ -7,11 +7,11 @@ */ import { i18n } from '@kbn/i18n'; -import { IFieldType } from '../../../../plugins/data/public'; +import { IndexPatternField } from '../../../../plugins/data/public'; import { TimestampOption } from '../components/index_pattern_editor_flyout_content'; export function extractTimeFields( - fields: IFieldType[], + fields: IndexPatternField[], requireTimestampField: boolean = false ): TimestampOption[] { const dateFields = fields.filter((field) => field.type === 'date'); diff --git a/src/plugins/index_pattern_editor/public/shared_imports.ts b/src/plugins/index_pattern_editor/public/shared_imports.ts index 1147a106a6afe..dcdcf4e9ae3f0 100644 --- a/src/plugins/index_pattern_editor/public/shared_imports.ts +++ b/src/plugins/index_pattern_editor/public/shared_imports.ts @@ -12,7 +12,7 @@ export { DataPublicPluginStart, IndexPatternSpec, GetFieldsOptions, - AggregationRestrictions, + IndexPatternAggRestrictions, } from '../../data/public'; export { diff --git a/src/plugins/index_pattern_editor/public/types.ts b/src/plugins/index_pattern_editor/public/types.ts index 892335088c0b6..f0fd4757b8e56 100644 --- a/src/plugins/index_pattern_editor/public/types.ts +++ b/src/plugins/index_pattern_editor/public/types.ts @@ -16,7 +16,7 @@ import { import { EuiComboBoxOptionOption } from '@elastic/eui'; -import { DataPublicPluginStart, AggregationRestrictions } from './shared_imports'; +import { DataPublicPluginStart, IndexPatternAggRestrictions } from './shared_imports'; import { OpenEditorOptions } from './open_editor'; export interface IndexPatternEditorContext { @@ -125,7 +125,7 @@ export enum ResolveIndexResponseItemIndexAttrs { } export interface RollupIndiciesCapability { - aggs: Record; + aggs: Record; error: string; } From a4f492dc9939acb91d7e9646030aec5f1a3e7df1 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Thu, 22 Jul 2021 17:36:32 -0500 Subject: [PATCH 076/130] refactor components --- .../empty_index_list_prompt.test.tsx.snap} | 2 +- .../empty_index_list_prompt.scss} | 4 +- .../empty_index_list_prompt.test.tsx} | 8 +- .../empty_index_list_prompt.tsx} | 4 +- .../empty_index_list_prompt/index.ts | 9 ++ .../empty_index_pattern_prompt.test.tsx.snap | 0 .../assets/index_pattern_illustration.scss | 0 .../assets/index_pattern_illustration.tsx | 0 .../empty_index_pattern_prompt.scss | 4 +- .../empty_index_pattern_prompt.test.tsx | 0 .../empty_index_pattern_prompt.tsx | 0 .../empty_index_pattern_prompt/index.tsx | 0 .../empty_prompts/empty_prompts.tsx | 77 +++++++++ .../public/components/empty_prompts/index.tsx | 9 ++ .../form_fields/timestamp_field.tsx | 30 +++- .../components/form_fields/type_field.tsx | 4 +- .../public/components/index.ts | 6 +- .../index_pattern_editor_flyout_content.tsx | 149 +++--------------- .../{empty_state => preview_panel}/index.ts | 2 +- .../__snapshots__/indices_list.test.tsx.snap | 0 .../{ => preview_panel}/indices_list/index.ts | 0 .../indices_list/indices_list.test.tsx | 0 .../indices_list/indices_list.tsx | 0 .../preview_panel/preview_panel.tsx | 40 +++++ .../status_message.test.tsx.snap | 0 .../status_message/index.ts | 0 .../status_message/status_message.test.tsx | 0 .../status_message/status_message.tsx | 0 .../index_pattern_editor/public/types.ts | 2 +- 29 files changed, 205 insertions(+), 145 deletions(-) rename src/plugins/index_pattern_editor/public/components/{empty_state/__snapshots__/empty_state.test.tsx.snap => empty_prompts/empty_index_list_prompt/__snapshots__/empty_index_list_prompt.test.tsx.snap} (99%) rename src/plugins/index_pattern_editor/public/components/{empty_state/empty_state.scss => empty_prompts/empty_index_list_prompt/empty_index_list_prompt.scss} (87%) rename src/plugins/index_pattern_editor/public/components/{empty_state/empty_state.test.tsx => empty_prompts/empty_index_list_prompt/empty_index_list_prompt.test.tsx} (90%) rename src/plugins/index_pattern_editor/public/components/{empty_state/empty_state.tsx => empty_prompts/empty_index_list_prompt/empty_index_list_prompt.tsx} (98%) create mode 100644 src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_list_prompt/index.ts rename src/plugins/index_pattern_editor/public/components/{ => empty_prompts}/empty_index_pattern_prompt/__snapshots__/empty_index_pattern_prompt.test.tsx.snap (100%) rename src/plugins/index_pattern_editor/public/components/{ => empty_prompts}/empty_index_pattern_prompt/assets/index_pattern_illustration.scss (100%) rename src/plugins/index_pattern_editor/public/components/{ => empty_prompts}/empty_index_pattern_prompt/assets/index_pattern_illustration.tsx (100%) rename src/plugins/index_pattern_editor/public/components/{ => empty_prompts}/empty_index_pattern_prompt/empty_index_pattern_prompt.scss (93%) rename src/plugins/index_pattern_editor/public/components/{ => empty_prompts}/empty_index_pattern_prompt/empty_index_pattern_prompt.test.tsx (100%) rename src/plugins/index_pattern_editor/public/components/{ => empty_prompts}/empty_index_pattern_prompt/empty_index_pattern_prompt.tsx (100%) rename src/plugins/index_pattern_editor/public/components/{ => empty_prompts}/empty_index_pattern_prompt/index.tsx (100%) create mode 100644 src/plugins/index_pattern_editor/public/components/empty_prompts/empty_prompts.tsx create mode 100644 src/plugins/index_pattern_editor/public/components/empty_prompts/index.tsx rename src/plugins/index_pattern_editor/public/components/{empty_state => preview_panel}/index.ts (88%) rename src/plugins/index_pattern_editor/public/components/{ => preview_panel}/indices_list/__snapshots__/indices_list.test.tsx.snap (100%) rename src/plugins/index_pattern_editor/public/components/{ => preview_panel}/indices_list/index.ts (100%) rename src/plugins/index_pattern_editor/public/components/{ => preview_panel}/indices_list/indices_list.test.tsx (100%) rename src/plugins/index_pattern_editor/public/components/{ => preview_panel}/indices_list/indices_list.tsx (100%) create mode 100644 src/plugins/index_pattern_editor/public/components/preview_panel/preview_panel.tsx rename src/plugins/index_pattern_editor/public/components/{ => preview_panel}/status_message/__snapshots__/status_message.test.tsx.snap (100%) rename src/plugins/index_pattern_editor/public/components/{ => preview_panel}/status_message/index.ts (100%) rename src/plugins/index_pattern_editor/public/components/{ => preview_panel}/status_message/status_message.test.tsx (100%) rename src/plugins/index_pattern_editor/public/components/{ => preview_panel}/status_message/status_message.tsx (100%) diff --git a/src/plugins/index_pattern_editor/public/components/empty_state/__snapshots__/empty_state.test.tsx.snap b/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_list_prompt/__snapshots__/empty_index_list_prompt.test.tsx.snap similarity index 99% rename from src/plugins/index_pattern_editor/public/components/empty_state/__snapshots__/empty_state.test.tsx.snap rename to src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_list_prompt/__snapshots__/empty_index_list_prompt.test.tsx.snap index db3b3d2190e0f..ee964260e94e5 100644 --- a/src/plugins/index_pattern_editor/public/components/empty_state/__snapshots__/empty_state.test.tsx.snap +++ b/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_list_prompt/__snapshots__/empty_index_list_prompt.test.tsx.snap @@ -1,6 +1,6 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`EmptyState should render normally 1`] = ` +exports[`EmptyIndexListPrompt should render normally 1`] = ` ({ }), })); -describe('EmptyState', () => { +describe('EmptyIndexListPrompt', () => { it('should render normally', () => { const component = shallow( - {}} createAnyway={() => {}} closeFlyout={() => {}} @@ -41,7 +41,7 @@ describe('EmptyState', () => { const onRefreshHandler = sinon.stub(); const component = mountWithIntl( - {}} closeFlyout={() => {}} diff --git a/src/plugins/index_pattern_editor/public/components/empty_state/empty_state.tsx b/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_list_prompt/empty_index_list_prompt.tsx similarity index 98% rename from src/plugins/index_pattern_editor/public/components/empty_state/empty_state.tsx rename to src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_list_prompt/empty_index_list_prompt.tsx index f16e75395a41f..39002252c1f7b 100644 --- a/src/plugins/index_pattern_editor/public/components/empty_state/empty_state.tsx +++ b/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_list_prompt/empty_index_list_prompt.tsx @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -import './empty_state.scss'; +import './empty_index_list_prompt.scss'; import React from 'react'; import { FormattedMessage } from '@kbn/i18n/react'; import { @@ -28,7 +28,7 @@ import { import { ApplicationStart } from 'src/core/public'; -export const EmptyState = ({ +export const EmptyIndexListPrompt = ({ onRefresh, closeFlyout, createAnyway, diff --git a/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_list_prompt/index.ts b/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_list_prompt/index.ts new file mode 100644 index 0000000000000..ae5dcecf069c7 --- /dev/null +++ b/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_list_prompt/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 { EmptyIndexListPrompt } from './empty_index_list_prompt'; diff --git a/src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/__snapshots__/empty_index_pattern_prompt.test.tsx.snap b/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_pattern_prompt/__snapshots__/empty_index_pattern_prompt.test.tsx.snap similarity index 100% rename from src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/__snapshots__/empty_index_pattern_prompt.test.tsx.snap rename to src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_pattern_prompt/__snapshots__/empty_index_pattern_prompt.test.tsx.snap diff --git a/src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/assets/index_pattern_illustration.scss b/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_pattern_prompt/assets/index_pattern_illustration.scss similarity index 100% rename from src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/assets/index_pattern_illustration.scss rename to src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_pattern_prompt/assets/index_pattern_illustration.scss diff --git a/src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/assets/index_pattern_illustration.tsx b/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_pattern_prompt/assets/index_pattern_illustration.tsx similarity index 100% rename from src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/assets/index_pattern_illustration.tsx rename to src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_pattern_prompt/assets/index_pattern_illustration.tsx diff --git a/src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/empty_index_pattern_prompt.scss b/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_pattern_prompt/empty_index_pattern_prompt.scss similarity index 93% rename from src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/empty_index_pattern_prompt.scss rename to src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_pattern_prompt/empty_index_pattern_prompt.scss index ad2eb5edf7fcb..f6db2fc89f353 100644 --- a/src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/empty_index_pattern_prompt.scss +++ b/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_pattern_prompt/empty_index_pattern_prompt.scss @@ -1,5 +1,5 @@ -@import '../variables'; -@import '../templates'; +@import '../../variables'; +@import '../../templates'; .inpEmptyIndexPatternPrompt { // override EUI specificity diff --git a/src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/empty_index_pattern_prompt.test.tsx b/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_pattern_prompt/empty_index_pattern_prompt.test.tsx similarity index 100% rename from src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/empty_index_pattern_prompt.test.tsx rename to src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_pattern_prompt/empty_index_pattern_prompt.test.tsx diff --git a/src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/empty_index_pattern_prompt.tsx b/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_pattern_prompt/empty_index_pattern_prompt.tsx similarity index 100% rename from src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/empty_index_pattern_prompt.tsx rename to src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_pattern_prompt/empty_index_pattern_prompt.tsx diff --git a/src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/index.tsx b/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_pattern_prompt/index.tsx similarity index 100% rename from src/plugins/index_pattern_editor/public/components/empty_index_pattern_prompt/index.tsx rename to src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_pattern_prompt/index.tsx diff --git a/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_prompts.tsx b/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_prompts.tsx new file mode 100644 index 0000000000000..a9f5d622d24b8 --- /dev/null +++ b/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_prompts.tsx @@ -0,0 +1,77 @@ +/* + * 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 React, { useState, useCallback, FC } from 'react'; + +import { useKibana } from '../../shared_imports'; + +import { MatchedItem, ResolveIndexResponseItemAlias, IndexPatternEditorContext } from '../../types'; + +import { getIndices } from '../../lib'; + +import { EmptyIndexListPrompt } from './empty_index_list_prompt'; +import { EmptyIndexPatternPrompt } from './empty_index_pattern_prompt'; + +const removeAliases = (item: MatchedItem) => + !((item as unknown) as ResolveIndexResponseItemAlias).indices; + +interface Props { + onCancel: () => void; + allSources: MatchedItem[]; + hasExistingIndexPatterns: boolean; +} + +export const EmptyPrompts: FC = ({ + hasExistingIndexPatterns, + allSources, + onCancel, + children, +}) => { + const { + services: { docLinks, application, http }, + } = useKibana(); + + const [remoteClustersExist, setRemoteClustersExist] = useState(false); + const [goToForm, setGoToForm] = useState(false); + + const hasDataIndices = allSources.some(({ name }: MatchedItem) => !name.startsWith('.')); + + const loadSources = useCallback(() => { + if (!hasDataIndices) + getIndices(http, () => [], '*:*', false).then((dataSources) => + setRemoteClustersExist(!!dataSources.filter(removeAliases).length) + ); + }, [http, hasDataIndices]); + + if (!hasExistingIndexPatterns && !goToForm) { + if (!hasDataIndices && !remoteClustersExist) { + // load data + return ( + setGoToForm(true)} + canSaveIndexPattern={application.capabilities.indexPatterns.save as boolean} + navigateToApp={application.navigateToApp} + addDataUrl={docLinks.links.indexPatterns.introduction} + /> + ); + } else { + // first time + return ( + setGoToForm(true)} + indexPatternsIntroUrl={docLinks.links.indexPatterns.introduction} + canSaveIndexPattern={application.capabilities.indexPatterns.save as boolean} + /> + ); + } + } + + return <>{children}; +}; diff --git a/src/plugins/index_pattern_editor/public/components/empty_prompts/index.tsx b/src/plugins/index_pattern_editor/public/components/empty_prompts/index.tsx new file mode 100644 index 0000000000000..20bf754e3771a --- /dev/null +++ b/src/plugins/index_pattern_editor/public/components/empty_prompts/index.tsx @@ -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 { EmptyPrompts } from './empty_prompts'; diff --git a/src/plugins/index_pattern_editor/public/components/form_fields/timestamp_field.tsx b/src/plugins/index_pattern_editor/public/components/form_fields/timestamp_field.tsx index 99e499a368b59..366f22f6020e5 100644 --- a/src/plugins/index_pattern_editor/public/components/form_fields/timestamp_field.tsx +++ b/src/plugins/index_pattern_editor/public/components/form_fields/timestamp_field.tsx @@ -24,7 +24,9 @@ import { schema } from '../form_schema'; interface Props { options: TimestampOption[]; isLoadingOptions: boolean; - helpText: string; + isExistingIndexPattern: boolean; + isLoadingMatchedIndices: boolean; + hasMatchedIndices: boolean; } const requireTimestampOptionValidator = (options: Props['options']): ValidationConfig => ({ @@ -60,16 +62,36 @@ const getTimestampConfig = ( }; }; +const noTimestampOptionText = i18n.translate('indexPatternEditor.editor.form.noTimeFieldsLabel', { + defaultMessage: "The matching data sources don't have time fields.", +}); + +const timestampFieldHelp = i18n.translate('indexPatternEditor.editor.form.timeFieldHelp', { + defaultMessage: 'Select a primary time field for use with the global time filter.', +}); + export const TimestampField = ({ options = [], - helpText = '', isLoadingOptions = false, + isExistingIndexPattern, + isLoadingMatchedIndices, + hasMatchedIndices, }: Props) => { const optionsAsComboBoxOptions = options.map(({ display, fieldName }) => ({ label: display, value: fieldName, })); const timestampConfig = useMemo(() => getTimestampConfig(options), [options]); + const selectTimestampHelp = options.length ? timestampFieldHelp : ''; + + const timestampNoFieldsHelp = + options.length === 0 && + !isExistingIndexPattern && + !isLoadingMatchedIndices && + !isLoadingOptions && + hasMatchedIndices + ? noTimestampOptionText + : ''; return ( > config={timestampConfig} path="timestampField"> @@ -122,7 +144,9 @@ export const TimestampField = ({ isLoading={isLoadingOptions} fullWidth /> - {helpText || <> } + + {timestampNoFieldsHelp || selectTimestampHelp || <> } + diff --git a/src/plugins/index_pattern_editor/public/components/form_fields/type_field.tsx b/src/plugins/index_pattern_editor/public/components/form_fields/type_field.tsx index 76d0307cd61aa..606197159e53c 100644 --- a/src/plugins/index_pattern_editor/public/components/form_fields/type_field.tsx +++ b/src/plugins/index_pattern_editor/public/components/form_fields/type_field.tsx @@ -26,7 +26,7 @@ import { UseField } from '../../shared_imports'; import { INDEX_PATTERN_TYPE, IndexPatternConfig } from '../../types'; interface TypeFieldProps { - onChange: (type: string) => void; + onChange: (type: INDEX_PATTERN_TYPE) => void; } const standardSelectItem = ( @@ -69,7 +69,7 @@ const rollupSelectItem = ( export const TypeField = ({ onChange }: TypeFieldProps) => { return ( - path="type"> + path="type"> {({ label, value, setValue }) => { if (value === undefined) { return null; diff --git a/src/plugins/index_pattern_editor/public/components/index.ts b/src/plugins/index_pattern_editor/public/components/index.ts index 6ead6fbcb7e2b..2a6db999b7ec9 100644 --- a/src/plugins/index_pattern_editor/public/components/index.ts +++ b/src/plugins/index_pattern_editor/public/components/index.ts @@ -20,10 +20,8 @@ export { IndexPatternEditor } from './index_pattern_editor'; export { schema } from './form_schema'; export { TimestampField, TypeField, TitleField } from './form_fields'; -export { EmptyState } from './empty_state'; -export { EmptyIndexPatternPrompt } from './empty_index_pattern_prompt'; -export { IndicesList } from './indices_list'; -export { StatusMessage } from './status_message'; +export { EmptyPrompts } from './empty_prompts'; +export { PreviewPanel } from './preview_panel'; export { LoadingIndices } from './loading_indices'; export { geti18nTexts } from './i18n_texts'; export { Footer } from './footer'; diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx index 592ea2642fb5e..f41cf345c3582 100644 --- a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx @@ -23,7 +23,6 @@ import { FlyoutPanels } from './flyout_panels'; import { MatchedItem, - ResolveIndexResponseItemAlias, IndexPatternEditorContext, RollupIndicesCapsResponse, INDEX_PATTERN_TYPE, @@ -32,11 +31,6 @@ import { } from '../types'; import { - LoadingIndices, - StatusMessage, - IndicesList, - EmptyIndexPatternPrompt, - EmptyState, TimestampField, TypeField, TitleField, @@ -44,6 +38,8 @@ import { geti18nTexts, Footer, AdvancedParamsContent, + EmptyPrompts, + PreviewPanel, } from '.'; export interface Props { @@ -75,7 +71,7 @@ const IndexPatternEditorFlyoutContentComponent = ({ requireTimestampField = false, }: Props) => { const { - services: { http, indexPatternService, uiSettings, docLinks, application }, + services: { http, indexPatternService, uiSettings }, } = useKibana(); const i18nTexts = geti18nTexts(); @@ -121,9 +117,7 @@ const IndexPatternEditorFlyoutContentComponent = ({ const [isLoadingTimestampFields, setIsLoadingTimestampFields] = useState(false); const [isLoadingMatchedIndices, setIsLoadingMatchedIndices] = useState(false); const [allSources, setAllSources] = useState([]); - const [remoteClustersExist, setRemoteClustersExist] = useState(false); const [isLoadingIndexPatterns, setIsLoadingIndexPatterns] = useState(true); - const [goToForm, setGoToForm] = useState(false); const [existingIndexPatterns, setExistingIndexPatterns] = useState([]); const [rollupIndex, setRollupIndex] = useState(); const [ @@ -137,9 +131,6 @@ const IndexPatternEditorFlyoutContentComponent = ({ visibleIndices: [], }); - const removeAliases = (item: MatchedItem) => - !((item as unknown) as ResolveIndexResponseItemAlias).indices; - // load all data sources and set initial matchedIndices const loadSources = useCallback(() => { getIndices(http, () => [], '*', allowHidden).then((dataSources) => { @@ -148,9 +139,6 @@ const IndexPatternEditorFlyoutContentComponent = ({ setMatchedIndices(matchedSet); setIsLoadingSources(false); }); - getIndices(http, () => [], '*:*', false).then((dataSources) => - setRemoteClustersExist(!!dataSources.filter(removeAliases).length) - ); }, [http, allowHidden]); // loading list of index patterns @@ -270,9 +258,6 @@ const IndexPatternEditorFlyoutContentComponent = ({ indexRequests )) as MatchedItem[][]; - // console.log('loadTimestampFieldOptions', query, exactMatched); - // await loadTimestampFieldOptions(query, exactMatched); - const matchedIndicesResult = getMatchedIndices( allSources, partialMatched, @@ -296,50 +281,14 @@ const IndexPatternEditorFlyoutContentComponent = ({ // setLastTitle(title2); return fetchIndices(title2); }, - [ - http, - allowHidden, - allSources, - type, - i18nTexts.rollupLabel, - rollupIndicesCapabilities, - // loadTimestampFieldOptions, - // form, - ] + [http, allowHidden, allSources, type, i18nTexts.rollupLabel, rollupIndicesCapabilities] ); - // todo + // todo test if (isLoadingSources || isLoadingIndexPatterns) { return ; } - const hasDataIndices = allSources.some(({ name }: MatchedItem) => !name.startsWith('.')); - - if (!existingIndexPatterns.length && !goToForm) { - if (!hasDataIndices && !remoteClustersExist) { - // load data - return ( - setGoToForm(true)} - canSaveIndexPattern={application.capabilities.indexPatterns.save as boolean} - navigateToApp={application.navigateToApp} - addDataUrl={docLinks.links.indexPatterns.introduction} - /> - ); - } else { - // first time - return ( - setGoToForm(true)} - indexPatternsIntroUrl={docLinks.links.indexPatterns.introduction} - canSaveIndexPattern={application.capabilities.indexPatterns.save as boolean} - /> - ); - } - } - const showIndexPatternTypeSelect = () => uiSettings.isDeclared('rollups:enableIndexPatterns') && uiSettings.get('rollups:enableIndexPatterns') && @@ -363,71 +312,12 @@ const IndexPatternEditorFlyoutContentComponent = ({ <> ); - /* - -TODO MOVE SOME OF THIS COMPLEXITY INTO A COMPONENT - - - */ - - const renderIndexList = () => { - if (isLoadingSources) { - return <>; - } - - const indicesToList = title?.length ? matchedIndices.visibleIndices : matchedIndices.allIndices; - return ( - - ); - }; - - const renderStatusMessage = (matched: { - allIndices: MatchedItem[]; - exactMatchedIndices: MatchedItem[]; - partialMatchedIndices: MatchedItem[]; - }) => { - if (isLoadingSources) { - return null; - } - - return ( - - ); - }; - - const previewPanelContent = isLoadingIndexPatterns ? ( - - ) : ( - <> - {renderStatusMessage(matchedIndices)} - - {renderIndexList()} - - ); - - // todo try to move within component - const selectTimestampHelp = timestampFieldOptions.length ? i18nTexts.timestampFieldHelp : ''; - - const timestampNoFieldsHelp = - timestampFieldOptions.length === 0 && - !existingIndexPatterns.includes(title || '') && - !isLoadingMatchedIndices && - !isLoadingTimestampFields && - matchedIndices.exactMatchedIndices.length - ? i18nTexts.noTimestampOptionText - : ''; - return ( - <> + @@ -453,7 +343,9 @@ TODO MOVE SOME OF THIS COMPLEXITY INTO A COMPONENT @@ -465,9 +357,20 @@ TODO MOVE SOME OF THIS COMPLEXITY INTO A COMPONENT submitDisabled={form.isSubmitted && !form.isValid} /> - {previewPanelContent} + + {isLoadingSources ? ( + <> + ) : ( + + )} + - + ); }; diff --git a/src/plugins/index_pattern_editor/public/components/empty_state/index.ts b/src/plugins/index_pattern_editor/public/components/preview_panel/index.ts similarity index 88% rename from src/plugins/index_pattern_editor/public/components/empty_state/index.ts rename to src/plugins/index_pattern_editor/public/components/preview_panel/index.ts index 4e19a60d5a769..c677d9878f183 100644 --- a/src/plugins/index_pattern_editor/public/components/empty_state/index.ts +++ b/src/plugins/index_pattern_editor/public/components/preview_panel/index.ts @@ -6,4 +6,4 @@ * Side Public License, v 1. */ -export { EmptyState } from './empty_state'; +export { PreviewPanel } from './preview_panel'; diff --git a/src/plugins/index_pattern_editor/public/components/indices_list/__snapshots__/indices_list.test.tsx.snap b/src/plugins/index_pattern_editor/public/components/preview_panel/indices_list/__snapshots__/indices_list.test.tsx.snap similarity index 100% rename from src/plugins/index_pattern_editor/public/components/indices_list/__snapshots__/indices_list.test.tsx.snap rename to src/plugins/index_pattern_editor/public/components/preview_panel/indices_list/__snapshots__/indices_list.test.tsx.snap diff --git a/src/plugins/index_pattern_editor/public/components/indices_list/index.ts b/src/plugins/index_pattern_editor/public/components/preview_panel/indices_list/index.ts similarity index 100% rename from src/plugins/index_pattern_editor/public/components/indices_list/index.ts rename to src/plugins/index_pattern_editor/public/components/preview_panel/indices_list/index.ts diff --git a/src/plugins/index_pattern_editor/public/components/indices_list/indices_list.test.tsx b/src/plugins/index_pattern_editor/public/components/preview_panel/indices_list/indices_list.test.tsx similarity index 100% rename from src/plugins/index_pattern_editor/public/components/indices_list/indices_list.test.tsx rename to src/plugins/index_pattern_editor/public/components/preview_panel/indices_list/indices_list.test.tsx diff --git a/src/plugins/index_pattern_editor/public/components/indices_list/indices_list.tsx b/src/plugins/index_pattern_editor/public/components/preview_panel/indices_list/indices_list.tsx similarity index 100% rename from src/plugins/index_pattern_editor/public/components/indices_list/indices_list.tsx rename to src/plugins/index_pattern_editor/public/components/preview_panel/indices_list/indices_list.tsx diff --git a/src/plugins/index_pattern_editor/public/components/preview_panel/preview_panel.tsx b/src/plugins/index_pattern_editor/public/components/preview_panel/preview_panel.tsx new file mode 100644 index 0000000000000..0eea9af7086cd --- /dev/null +++ b/src/plugins/index_pattern_editor/public/components/preview_panel/preview_panel.tsx @@ -0,0 +1,40 @@ +/* + * 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 React from 'react'; +import { EuiSpacer } from '@elastic/eui'; +import { StatusMessage } from './status_message'; +import { IndicesList } from './indices_list'; + +import { INDEX_PATTERN_TYPE, MatchedIndicesSet } from '../../types'; + +interface Props { + type: INDEX_PATTERN_TYPE; + allowHidden: boolean; + title: string; + matched: MatchedIndicesSet; +} + +export const PreviewPanel = ({ type, allowHidden, title = '', matched }: Props) => { + return ( + <> + + + + + ); +}; diff --git a/src/plugins/index_pattern_editor/public/components/status_message/__snapshots__/status_message.test.tsx.snap b/src/plugins/index_pattern_editor/public/components/preview_panel/status_message/__snapshots__/status_message.test.tsx.snap similarity index 100% rename from src/plugins/index_pattern_editor/public/components/status_message/__snapshots__/status_message.test.tsx.snap rename to src/plugins/index_pattern_editor/public/components/preview_panel/status_message/__snapshots__/status_message.test.tsx.snap diff --git a/src/plugins/index_pattern_editor/public/components/status_message/index.ts b/src/plugins/index_pattern_editor/public/components/preview_panel/status_message/index.ts similarity index 100% rename from src/plugins/index_pattern_editor/public/components/status_message/index.ts rename to src/plugins/index_pattern_editor/public/components/preview_panel/status_message/index.ts diff --git a/src/plugins/index_pattern_editor/public/components/status_message/status_message.test.tsx b/src/plugins/index_pattern_editor/public/components/preview_panel/status_message/status_message.test.tsx similarity index 100% rename from src/plugins/index_pattern_editor/public/components/status_message/status_message.test.tsx rename to src/plugins/index_pattern_editor/public/components/preview_panel/status_message/status_message.test.tsx diff --git a/src/plugins/index_pattern_editor/public/components/status_message/status_message.tsx b/src/plugins/index_pattern_editor/public/components/preview_panel/status_message/status_message.tsx similarity index 100% rename from src/plugins/index_pattern_editor/public/components/status_message/status_message.tsx rename to src/plugins/index_pattern_editor/public/components/preview_panel/status_message/status_message.tsx diff --git a/src/plugins/index_pattern_editor/public/types.ts b/src/plugins/index_pattern_editor/public/types.ts index f0fd4757b8e56..233b53cd45360 100644 --- a/src/plugins/index_pattern_editor/public/types.ts +++ b/src/plugins/index_pattern_editor/public/types.ts @@ -141,7 +141,7 @@ export interface IndexPatternConfig { timestampField?: EuiComboBoxOptionOption; allowHidden: boolean; id?: string; - type: string; + type: INDEX_PATTERN_TYPE; } export interface MatchedIndicesSet { From 4ccbd0203b8f0dfb7853a06926a58760cd62d1fc Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Thu, 22 Jul 2021 22:26:14 -0500 Subject: [PATCH 077/130] fix tests and import paths for types --- .../empty_index_list_prompt/empty_index_list_prompt.tsx | 4 ++-- .../preview_panel/indices_list/indices_list.test.tsx | 2 +- .../components/preview_panel/indices_list/indices_list.tsx | 2 +- .../preview_panel/status_message/status_message.test.tsx | 2 +- .../preview_panel/status_message/status_message.tsx | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_list_prompt/empty_index_list_prompt.tsx b/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_list_prompt/empty_index_list_prompt.tsx index 39002252c1f7b..fe1e65464bc4b 100644 --- a/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_list_prompt/empty_index_list_prompt.tsx +++ b/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_list_prompt/empty_index_list_prompt.tsx @@ -202,9 +202,9 @@ export const EmptyIndexListPrompt = ({ + + {canSaveIndexPattern && createAnywayLink} - - {canSaveIndexPattern && createAnywayLink} ); }; diff --git a/src/plugins/index_pattern_editor/public/components/preview_panel/indices_list/indices_list.test.tsx b/src/plugins/index_pattern_editor/public/components/preview_panel/indices_list/indices_list.test.tsx index bd5fec8cea1c6..6d40861cb4e0f 100644 --- a/src/plugins/index_pattern_editor/public/components/preview_panel/indices_list/indices_list.test.tsx +++ b/src/plugins/index_pattern_editor/public/components/preview_panel/indices_list/indices_list.test.tsx @@ -9,7 +9,7 @@ import React from 'react'; import { IndicesList } from '../indices_list'; import { shallow } from 'enzyme'; -import { MatchedItem } from '../../types'; +import { MatchedItem } from '../../../types'; const indices = ([ { name: 'kibana', tags: [] }, diff --git a/src/plugins/index_pattern_editor/public/components/preview_panel/indices_list/indices_list.tsx b/src/plugins/index_pattern_editor/public/components/preview_panel/indices_list/indices_list.tsx index 1119f824b3c7e..dc0d8dc984216 100644 --- a/src/plugins/index_pattern_editor/public/components/preview_panel/indices_list/indices_list.tsx +++ b/src/plugins/index_pattern_editor/public/components/preview_panel/indices_list/indices_list.tsx @@ -27,7 +27,7 @@ import { import { Pager } from '@elastic/eui'; import { FormattedMessage } from '@kbn/i18n/react'; -import { MatchedItem, Tag } from '../../types'; +import { MatchedItem, Tag } from '../../../types'; interface IndicesListProps { indices: MatchedItem[]; diff --git a/src/plugins/index_pattern_editor/public/components/preview_panel/status_message/status_message.test.tsx b/src/plugins/index_pattern_editor/public/components/preview_panel/status_message/status_message.test.tsx index 4aaf81d63c1c1..314cb77e262ab 100644 --- a/src/plugins/index_pattern_editor/public/components/preview_panel/status_message/status_message.test.tsx +++ b/src/plugins/index_pattern_editor/public/components/preview_panel/status_message/status_message.test.tsx @@ -9,7 +9,7 @@ import React from 'react'; import { StatusMessage } from '../status_message'; import { shallow } from 'enzyme'; -import { MatchedItem } from '../../types'; +import { MatchedItem } from '../../../types'; const tagsPartial = { tags: [], diff --git a/src/plugins/index_pattern_editor/public/components/preview_panel/status_message/status_message.tsx b/src/plugins/index_pattern_editor/public/components/preview_panel/status_message/status_message.tsx index a619b43744c14..40a7aa1a8d555 100644 --- a/src/plugins/index_pattern_editor/public/components/preview_panel/status_message/status_message.tsx +++ b/src/plugins/index_pattern_editor/public/components/preview_panel/status_message/status_message.tsx @@ -12,7 +12,7 @@ import { EuiCallOut } from '@elastic/eui'; import { EuiIconType } from '@elastic/eui/src/components/icon/icon'; import { FormattedMessage } from '@kbn/i18n/react'; -import { MatchedItem } from '../../types'; +import { MatchedItem } from '../../../types'; interface StatusMessageProps { matchedIndices: { From e6abcb675f150c9afcc4723677a9b709902a599b Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Thu, 22 Jul 2021 23:55:19 -0500 Subject: [PATCH 078/130] fix hybrid index pattern and functional tests --- .../components/form_fields/title_field.tsx | 19 ++++++++++++------- .../index_pattern_editor_flyout_content.tsx | 6 ++++-- test/functional/page_objects/settings_page.ts | 4 ++-- .../apps/rollup_job/hybrid_index_pattern.js | 5 ----- 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/src/plugins/index_pattern_editor/public/components/form_fields/title_field.tsx b/src/plugins/index_pattern_editor/public/components/form_fields/title_field.tsx index bd0461709c82b..9b9a3977024fd 100644 --- a/src/plugins/index_pattern_editor/public/components/form_fields/title_field.tsx +++ b/src/plugins/index_pattern_editor/public/components/form_fields/title_field.tsx @@ -24,12 +24,17 @@ import { MatchedIndicesSet, } from '../../types'; +interface RefreshMatchedIndicesResult { + matchedIndicesResult: MatchedIndicesSet; + newRollupIndexName?: string; +} + interface TitleFieldProps { existingIndexPatterns: string[]; isRollup: boolean; matchedIndices: MatchedItem[]; rollupIndicesCapabilities: RollupIndicesCapsResponse; - refreshMatchedIndices: (title: string) => Promise; + refreshMatchedIndices: (title: string) => Promise; } const rollupIndexPatternNoMatchError = { @@ -66,7 +71,7 @@ const createTitlesNoDupesValidator = ( interface MatchesValidatorArgs { rollupIndicesCapabilities: Record; - refreshMatchedIndices: (title: string) => Promise; + refreshMatchedIndices: (title: string) => Promise; isRollup: boolean; } @@ -76,10 +81,10 @@ const matchesValidator = ({ isRollup, }: MatchesValidatorArgs): ValidationConfig<{}, string, string> => ({ validator: async ({ value }) => { - const results = await refreshMatchedIndices(value); + const { matchedIndicesResult, newRollupIndexName } = await refreshMatchedIndices(value); const rollupIndices = Object.keys(rollupIndicesCapabilities); - if (results.exactMatchedIndices.length === 0) { + if (matchedIndicesResult.exactMatchedIndices.length === 0) { return mustMatchError; } @@ -87,7 +92,7 @@ const matchesValidator = ({ return; } - const rollupIndexMatches = results.exactMatchedIndices.filter((matchedIndex) => + const rollupIndexMatches = matchedIndicesResult.exactMatchedIndices.filter((matchedIndex) => rollupIndices.includes(matchedIndex.name) ); @@ -97,7 +102,7 @@ const matchesValidator = ({ return rollupIndexPatternTooManyMatchesError; } - const error = rollupIndicesCapabilities[value].error; + const error = newRollupIndexName && rollupIndicesCapabilities[newRollupIndexName].error; if (error) { return { @@ -117,7 +122,7 @@ interface GetTitleConfigArgs { isRollup: boolean; matchedIndices: MatchedItem[]; rollupIndicesCapabilities: RollupIndicesCapsResponse; - refreshMatchedIndices: (title: string) => Promise; + refreshMatchedIndices: (title: string) => Promise; } const getTitleConfig = ({ diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx index f41cf345c3582..a89cf0dba1dc7 100644 --- a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx @@ -225,6 +225,7 @@ const IndexPatternEditorFlyoutContentComponent = ({ // todo move to utility lib const isRollupIndex = (indexName: string) => getRollupIndices(rollupIndicesCapabilities).includes(indexName); + let newRollupIndexName: string | undefined; // move inside getIndices const getIndexTags = (indexName: string) => @@ -267,7 +268,8 @@ const IndexPatternEditorFlyoutContentComponent = ({ if (type === INDEX_PATTERN_TYPE.ROLLUP) { const rollupIndices = exactMatched.filter((index) => isRollupIndex(index.name)); - setRollupIndex(rollupIndices.length === 1 ? rollupIndices[0].name : undefined); + newRollupIndexName = rollupIndices.length === 1 ? rollupIndices[0].name : undefined; + setRollupIndex(newRollupIndexName); } else { setRollupIndex(undefined); } @@ -275,7 +277,7 @@ const IndexPatternEditorFlyoutContentComponent = ({ setMatchedIndices(matchedIndicesResult); setIsLoadingMatchedIndices(false); - return matchedIndicesResult; + return { matchedIndicesResult, newRollupIndexName }; }; // setLastTitle(title2); diff --git a/test/functional/page_objects/settings_page.ts b/test/functional/page_objects/settings_page.ts index e5d38d61c6459..9cdd33ef768f9 100644 --- a/test/functional/page_objects/settings_page.ts +++ b/test/functional/page_objects/settings_page.ts @@ -369,8 +369,8 @@ export class SettingsPageObject extends FtrService { }); if (!isStandardIndexPattern) { - const badges = await this.find.byClassName('euiBadge__text'); - const text = await badges.getVisibleText(); + const badges = await this.find.allByCssSelector('.euiBadge__text'); + const text = await badges[1].getVisibleText(); expect(text).to.equal('Rollup'); } diff --git a/x-pack/test/functional/apps/rollup_job/hybrid_index_pattern.js b/x-pack/test/functional/apps/rollup_job/hybrid_index_pattern.js index 1986efe202224..e479c6729d8c3 100644 --- a/x-pack/test/functional/apps/rollup_job/hybrid_index_pattern.js +++ b/x-pack/test/functional/apps/rollup_job/hybrid_index_pattern.js @@ -12,7 +12,6 @@ import mockRolledUpData, { mockIndices } from './hybrid_index_helper'; export default function ({ getService, getPageObjects }) { const es = getService('es'); const esArchiver = getService('esArchiver'); - const find = getService('find'); const retry = getService('retry'); const PageObjects = getPageObjects(['common', 'settings']); const esDeleteAllIndices = getService('esDeleteAllIndices'); @@ -91,10 +90,6 @@ export default function ({ getService, getPageObjects }) { ); expect(filteredIndexPatternNames.length).to.be(1); - // make sure there are no toasts which might be showing unexpected errors - const toastShown = await find.existsByCssSelector('.euiToast'); - expect(toastShown).to.be(false); - // ensure all fields are available await PageObjects.settings.clickIndexPatternByName(rollupIndexPatternName); const fields = await PageObjects.settings.getFieldNames(); From 6a3c8bd0ae017170eb6c288177b42b1b4a49efff Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Fri, 23 Jul 2021 01:22:20 -0500 Subject: [PATCH 079/130] fix empty view functional test --- .../public/components/empty_prompts/empty_prompts.tsx | 4 +++- .../public/components/index_pattern_editor_flyout_content.tsx | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_prompts.tsx b/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_prompts.tsx index a9f5d622d24b8..c50b81a7d8daf 100644 --- a/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_prompts.tsx +++ b/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_prompts.tsx @@ -24,6 +24,7 @@ interface Props { onCancel: () => void; allSources: MatchedItem[]; hasExistingIndexPatterns: boolean; + loadSources: () => void; } export const EmptyPrompts: FC = ({ @@ -31,6 +32,7 @@ export const EmptyPrompts: FC = ({ allSources, onCancel, children, + loadSources, }) => { const { services: { docLinks, application, http }, @@ -41,7 +43,7 @@ export const EmptyPrompts: FC = ({ const hasDataIndices = allSources.some(({ name }: MatchedItem) => !name.startsWith('.')); - const loadSources = useCallback(() => { + useCallback(() => { if (!hasDataIndices) getIndices(http, () => [], '*:*', false).then((dataSources) => setRemoteClustersExist(!!dataSources.filter(removeAliases).length) diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx index a89cf0dba1dc7..9b2e434c5e1ec 100644 --- a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx @@ -319,6 +319,7 @@ const IndexPatternEditorFlyoutContentComponent = ({ onCancel={onCancel} allSources={allSources} hasExistingIndexPatterns={!!existingIndexPatterns.length} + loadSources={loadSources} > From 4b28d992637500c45e7102ee86564de3b2278151 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Fri, 23 Jul 2021 02:10:01 -0500 Subject: [PATCH 080/130] fix jest tests and improve mocks --- .../empty_index_list_prompt.test.tsx.snap | 50 ++++++------ ...ndex_pattern_editor_flyout_content.test.ts | 1 - .../index_pattern_editor/public/mocks.ts | 4 +- .../public/plugin.test.tsx | 7 +- .../public/test_utils/setup_environment.tsx | 80 ------------------- 5 files changed, 30 insertions(+), 112 deletions(-) delete mode 100644 src/plugins/index_pattern_editor/public/test_utils/setup_environment.tsx diff --git a/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_list_prompt/__snapshots__/empty_index_list_prompt.test.tsx.snap b/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_list_prompt/__snapshots__/empty_index_list_prompt.test.tsx.snap index ee964260e94e5..fbda331f72164 100644 --- a/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_list_prompt/__snapshots__/empty_index_list_prompt.test.tsx.snap +++ b/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_list_prompt/__snapshots__/empty_index_list_prompt.test.tsx.snap @@ -186,31 +186,31 @@ exports[`EmptyIndexListPrompt should render normally 1`] = ` - - - - - - , + + + + + , + } } - } - /> - + /> + + `; diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.test.ts b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.test.ts index b344b96f15087..773b32f52f6b3 100644 --- a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.test.ts +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.test.ts @@ -7,7 +7,6 @@ */ import { act } from 'react-dom/test-utils'; -import '../test_utils/setup_environment'; import { registerTestBed, TestBed, noop, getCommonActions } from '../test_utils'; import { IndexPatternEditorFlyoutContent, Props } from './index_pattern_editor_flyout_content'; diff --git a/src/plugins/index_pattern_editor/public/mocks.ts b/src/plugins/index_pattern_editor/public/mocks.ts index c172a85e5ccee..8b27ad6202598 100644 --- a/src/plugins/index_pattern_editor/public/mocks.ts +++ b/src/plugins/index_pattern_editor/public/mocks.ts @@ -8,9 +8,7 @@ import { IndexPatternEditorPlugin } from './plugin'; -export type Start = jest.Mocked< - Omit, 'DeleteRuntimeFieldProvider'> ->; +export type Start = jest.Mocked>; export type Setup = jest.Mocked>; diff --git a/src/plugins/index_pattern_editor/public/plugin.test.tsx b/src/plugins/index_pattern_editor/public/plugin.test.tsx index f34e10f2a9f4e..7b75fc83ff6cf 100644 --- a/src/plugins/index_pattern_editor/public/plugin.test.tsx +++ b/src/plugins/index_pattern_editor/public/plugin.test.tsx @@ -62,14 +62,15 @@ describe('IndexPatternEditorPlugin', () => { expect(openFlyout).toHaveBeenCalled(); const [[arg]] = openFlyout.mock.calls; - expect(arg.props.children.type).toBe(IndexPatternFlyoutContentContainer); + const i18nProvider = arg.props.children; + expect(i18nProvider.props.children.type).toBe(IndexPatternFlyoutContentContainer); // We force call the "onSave" prop from the component // and make sure that the the spy is being called. // Note: we are testing implementation details, if we change or rename the "onSave" prop on // the component, we will need to update this test accordingly. - expect(arg.props.children.props.onSave).toBeDefined(); - arg.props.children.props.onSave(); + expect(i18nProvider.props.children.props.onSave).toBeDefined(); + i18nProvider.props.children.props.onSave(); expect(onSaveSpy).toHaveBeenCalled(); }); diff --git a/src/plugins/index_pattern_editor/public/test_utils/setup_environment.tsx b/src/plugins/index_pattern_editor/public/test_utils/setup_environment.tsx deleted file mode 100644 index 885bcc87f89df..0000000000000 --- a/src/plugins/index_pattern_editor/public/test_utils/setup_environment.tsx +++ /dev/null @@ -1,80 +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 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 React from 'react'; - -const EDITOR_ID = 'testEditor'; - -jest.mock('../../../kibana_react/public', () => { - const original = jest.requireActual('../../../kibana_react/public'); - - /** - * We mock the CodeEditor because it requires the - * with the uiSettings passed down. Let's use a simple in our tests. - */ - const CodeEditorMock = (props: any) => { - // Forward our deterministic ID to the consumer - // We need below for the PainlessLang.getSyntaxErrors mock - props.editorDidMount({ - getModel() { - return { - id: EDITOR_ID, - }; - }, - }); - - return ( - ) => { - props.onChange(e.target.value); - }} - /> - ); - }; - - return { - ...original, - CodeEditor: CodeEditorMock, - }; -}); - -jest.mock('@elastic/eui', () => { - const original = jest.requireActual('@elastic/eui'); - - return { - ...original, - EuiComboBox: (props: any) => ( - { - props.onChange([syntheticEvent['0']]); - }} - /> - ), - }; -}); - -jest.mock('@kbn/monaco', () => { - const original = jest.requireActual('@kbn/monaco'); - - return { - ...original, - PainlessLang: { - ID: 'painless', - getSuggestionProvider: () => undefined, - getSyntaxErrors: () => ({ - [EDITOR_ID]: [], - }), - }, - }; -}); From 9b6ed6c018a55fea5710a8bd8caaa0cd7af38b64 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Mon, 26 Jul 2021 22:09:22 -0500 Subject: [PATCH 081/130] update readme and refactor api args --- src/plugins/index_pattern_editor/README.md | 78 +++----- .../public/components/index.ts | 2 +- .../components/index_pattern_editor.tsx | 22 ++- ...ndex_pattern_editor_flyout_content.test.ts | 180 ------------------ ...index_pattern_flyout_content_container.tsx | 4 +- .../public/open_editor.tsx | 22 ++- .../index_pattern_table.tsx | 2 +- 7 files changed, 57 insertions(+), 253 deletions(-) delete mode 100644 src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.test.ts diff --git a/src/plugins/index_pattern_editor/README.md b/src/plugins/index_pattern_editor/README.md index 78f56b6569cc8..d14a6e63a3afb 100644 --- a/src/plugins/index_pattern_editor/README.md +++ b/src/plugins/index_pattern_editor/README.md @@ -6,79 +6,45 @@ Create index patterns from within Kibana apps. You first need to add in your kibana.json the "`indexPatternEditor`" plugin as a required dependency of your plugin. -You will then receive in the start contract of the indexPatternFieldEditor plugin the following API: +You can use the `` component or the API available on the start contract of the indexPatternEditor plugin: ### `userPermissions.editIndexPattern(): boolean` Convenience method that uses the `core.application.capabilities` api to determine whether the user can edit the index pattern. -### `openEditor(options: OpenFieldEditorOptions): CloseEditor` +### `openEditor(options: OpenEditorOptions): CloseEditor` -Use this method to open the index pattern field editor to either create (runtime) or edit (concrete | runtime) a field. +Use this method to display the index pattern editor to create an index pattern. #### `options` -`ctx: FieldEditorContext` (**required**) +`onSave: (indexPattern: IndexPattern) => void` (**required**) -This is the only required option. You need to provide the context in which the editor is being consumed. This object has the following properties: +You must provide an `onSave` handler to be notified when an index pattern has been created/updated. This handler is called after the index pattern has been persisted as a saved object. -- `indexPattern: IndexPattern`: the index pattern you want to create/edit the field into. +`onCancel: () => void;` (optional) -`onSave(field: IndexPatternField): void` (optional) +You can optionally pass an `onCancel` handler which is called when the index pattern creation flyout is closed wihtout creating an index pattern. -You can provide an optional `onSave` handler to be notified when the field has being created/updated. This handler is called after the field has been persisted to the saved object. +`defaultTypeIsRollup: boolean` (optional, default false) -`fieldName: string` (optional) +The default index pattern type can be optionally specified as `rollup`. -You can optionally pass the name of a field to edit. Leave empty to create a new runtime field based field. +`requireTimestampField: boolean` (optional, default false) -### `openDeleteModal(options: OpenFieldDeleteModalOptions): CloseEditor` +The editor can require a timestamp field on the index pattern. -Use this method to open a confirmation modal to delete runtime fields from an index pattern. +### `` -#### `options` - -`ctx: FieldEditorContext` (**required**) - -You need to provide the context in which the deletion modal is being consumed. This object has the following properties: - -- `indexPattern: IndexPattern`: the index pattern you want to delete fields from. - -`onDelete(fieldNames: string[]): void` (optional) - -You can provide an optional `onDelete` handler to be notified when the fields have been deleted. This handler is called after the deletion has been persisted to the saved object. - -`fieldName: string | string[]` (**required**) - -You have to pass the field or fields to delete. - -### `` - -This children func React component provides a handler to delete one or multiple runtime fields. It can be used as an alternative to `openDeleteModal` in a react context. - -#### Props - -* `indexPattern: IndexPattern`: the current index pattern. (**required**) - -```js - -const { DeleteRuntimeFieldProvider } = indexPatternFieldEditor; - -// Single field - - {(deleteField) => ( - deleteField('myField')}> - Delete - - )} - +This the React component interface equivalent to `openEditor`. It takes the same arguments but also requires a `services` object argument of type `IndexPatternEditorContext` - -// Multiple fields - - {(deleteFields) => ( - deleteFields(['field1', 'field2', 'field3'])}> - Delete - - )} - +```ts +export interface IndexPatternEditorContext { + uiSettings: IUiSettingsClient; + docLinks: DocLinksStart; + http: HttpSetup; + notifications: NotificationsStart; + application: ApplicationStart; + indexPatternService: DataPublicPluginStart['indexPatterns']; +} ``` diff --git a/src/plugins/index_pattern_editor/public/components/index.ts b/src/plugins/index_pattern_editor/public/components/index.ts index 2a6db999b7ec9..3b333737ca813 100644 --- a/src/plugins/index_pattern_editor/public/components/index.ts +++ b/src/plugins/index_pattern_editor/public/components/index.ts @@ -13,7 +13,7 @@ export { export { IndexPatternFlyoutContentContainer, - Props as IndexPatternEditorFlyoutContentContainerProps, + IndexPatternFlyoutContentContainerProps, } from './index_pattern_flyout_content_container'; export { IndexPatternEditor } from './index_pattern_editor'; diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_editor.tsx b/src/plugins/index_pattern_editor/public/components/index_pattern_editor.tsx index 9593308c5be0e..a59dc0faada36 100644 --- a/src/plugins/index_pattern_editor/public/components/index_pattern_editor.tsx +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_editor.tsx @@ -8,23 +8,24 @@ import React from 'react'; import { EuiFlyout } from '@elastic/eui'; -import { IndexPatternFlyoutContentContainer } from './index_pattern_flyout_content_container'; +import { + IndexPatternFlyoutContentContainer, + IndexPatternFlyoutContentContainerProps, +} from './index_pattern_flyout_content_container'; import { IndexPatternEditorContext } from '../types'; -import { createKibanaReactContext, IndexPattern } from '../shared_imports'; +import { createKibanaReactContext } from '../shared_imports'; import './index_pattern_editor.scss'; -export interface IndexPatternEditorProps { - onSave: (indexPattern: IndexPattern) => void; - closeEditor: () => void; +export interface IndexPatternEditorProps extends IndexPatternFlyoutContentContainerProps { services: IndexPatternEditorContext; - defaultTypeIsRollup?: boolean; } export const IndexPatternEditor = ({ onSave, - closeEditor, + onCancel = () => {}, services, - defaultTypeIsRollup, + defaultTypeIsRollup = false, + requireTimestampField = false, }: IndexPatternEditorProps) => { const { Provider: KibanaReactContextProvider, @@ -32,11 +33,12 @@ export const IndexPatternEditor = ({ return ( - + {}} hideCloseButton={true} size="l"> diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.test.ts b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.test.ts deleted file mode 100644 index 773b32f52f6b3..0000000000000 --- a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.test.ts +++ /dev/null @@ -1,180 +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 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 { act } from 'react-dom/test-utils'; - -import { registerTestBed, TestBed, noop, getCommonActions } from '../test_utils'; -import { IndexPatternEditorFlyoutContent, Props } from './index_pattern_editor_flyout_content'; - -const defaultProps: Props = { - onSave: noop, - onCancel: noop, - existingIndexPatterns: [], -}; - -const setup = (props: Props = defaultProps) => { - const testBed = registerTestBed(IndexPatternEditorFlyoutContent, { - memoryRouter: { wrapComponent: false }, - })(props) as TestBed; - - const actions = { - ...getCommonActions(testBed), - }; - - return { - ...testBed, - actions, - }; -}; - -describe('', () => { - beforeAll(() => { - jest.useFakeTimers(); - }); - - afterAll(() => { - jest.useRealTimers(); - }); - - test('should have the correct title', () => { - const { exists, find } = setup(); - expect(exists('flyoutTitle')).toBe(true); - expect(find('flyoutTitle').text()).toBe('Create field'); - }); - - test('should allow a field to be provided', () => { - const field = { - name: 'foo', - type: 'ip', - script: { - source: 'emit("hello world")', - }, - }; - - const { find } = setup({ ...defaultProps }); - - expect(find('flyoutTitle').text()).toBe(`Edit field 'foo'`); - expect(find('nameField.input').props().value).toBe(field.name); - expect(find('typeField').props().value).toBe(field.type); - expect(find('scriptField').props().value).toBe(field.script.source); - }); - - test('should accept an "onSave" prop', async () => { - const field = { - name: 'foo', - type: 'date', - script: { source: 'test=123' }, - }; - const onSave: jest.Mock = jest.fn(); - - const { find } = setup({ ...defaultProps, onSave }); - - await act(async () => { - find('fieldSaveButton').simulate('click'); - }); - - await act(async () => { - // The painless syntax validation has a timeout set to 600ms - // we give it a bit more time just to be on the safe side - jest.advanceTimersByTime(1000); - }); - - expect(onSave).toHaveBeenCalled(); - const fieldReturned = onSave.mock.calls[onSave.mock.calls.length - 1][0]; - expect(fieldReturned).toEqual(field); - }); - - test('should accept an onCancel prop', () => { - const onCancel = jest.fn(); - const { find } = setup({ ...defaultProps, onCancel }); - - find('closeFlyoutButton').simulate('click'); - - expect(onCancel).toHaveBeenCalled(); - }); - - describe('validation', () => { - test('should validate the fields and prevent saving invalid form', async () => { - const onSave: jest.Mock = jest.fn(); - - const { find, exists, form, component } = setup({ ...defaultProps, onSave }); - - expect(find('fieldSaveButton').props().disabled).toBe(false); - - await act(async () => { - find('fieldSaveButton').simulate('click'); - }); - - await act(async () => { - jest.advanceTimersByTime(1000); - }); - - component.update(); - - expect(onSave).toHaveBeenCalledTimes(0); - expect(find('fieldSaveButton').props().disabled).toBe(true); - expect(form.getErrorsMessages()).toEqual(['A name is required.']); - expect(exists('formError')).toBe(true); - expect(find('formError').text()).toBe('Fix errors in form before continuing.'); - }); - - test('should forward values from the form', async () => { - const onSave: jest.Mock = jest.fn(); - - const { - find, - component, - form, - actions: { toggleFormRow, changeFieldType }, - } = setup({ ...defaultProps, onSave }); - - act(() => { - form.setInputValue('nameField.input', 'someName'); - toggleFormRow('value'); - }); - component.update(); - - await act(async () => { - form.setInputValue('scriptField', 'echo("hello")'); - }); - - await act(async () => { - // Let's make sure that validation has finished running - jest.advanceTimersByTime(1000); - }); - - await act(async () => { - find('fieldSaveButton').simulate('click'); - }); - - expect(onSave).toHaveBeenCalled(); - - let fieldReturned = onSave.mock.calls[onSave.mock.calls.length - 1][0]; - - expect(fieldReturned).toEqual({ - name: 'someName', - type: 'keyword', // default to keyword - script: { source: 'echo("hello")' }, - }); - - // Change the type and make sure it is forwarded - await changeFieldType('other_type', 'Other type'); - - await act(async () => { - find('fieldSaveButton').simulate('click'); - }); - - fieldReturned = onSave.mock.calls[onSave.mock.calls.length - 1][0]; - - expect(fieldReturned).toEqual({ - name: 'someName', - type: 'other_type', - script: { source: 'echo("hello")' }, - }); - }); - }); -}); diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_flyout_content_container.tsx b/src/plugins/index_pattern_editor/public/components/index_pattern_flyout_content_container.tsx index c19b2f5271045..3e598056310df 100644 --- a/src/plugins/index_pattern_editor/public/components/index_pattern_flyout_content_container.tsx +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_flyout_content_container.tsx @@ -13,7 +13,7 @@ import { IndexPattern, IndexPatternSpec, useKibana } from '../shared_imports'; import { IndexPatternEditorFlyoutContent } from './index_pattern_editor_flyout_content'; import { IndexPatternEditorContext } from '../types'; -export interface Props { +export interface IndexPatternFlyoutContentContainerProps { /** * Handler for the "save" footer button */ @@ -38,7 +38,7 @@ export const IndexPatternFlyoutContentContainer = ({ onCancel, defaultTypeIsRollup, requireTimestampField = false, -}: Props) => { +}: IndexPatternFlyoutContentContainerProps) => { const { services: { indexPatternService, notifications }, } = useKibana(); diff --git a/src/plugins/index_pattern_editor/public/open_editor.tsx b/src/plugins/index_pattern_editor/public/open_editor.tsx index b5a014ac55eb4..86f92361c3f11 100644 --- a/src/plugins/index_pattern_editor/public/open_editor.tsx +++ b/src/plugins/index_pattern_editor/public/open_editor.tsx @@ -22,6 +22,9 @@ import { IndexPatternFlyoutContentContainer } from './components/index_pattern_f export interface OpenEditorOptions { onSave: (indexPattern: IndexPattern) => void; + onCancel?: () => void; + defaultTypeIsRollup?: boolean; + requireTimestampField?: boolean; } interface Dependencies { @@ -46,7 +49,12 @@ export const getEditorOpener = ({ core, indexPatternService }: Dependencies) => let overlayRef: OverlayRef | null = null; - const openEditor = ({ onSave }: OpenEditorOptions): CloseEditor => { + const openEditor = ({ + onSave, + onCancel = () => {}, + defaultTypeIsRollup = false, + requireTimestampField = false, + }: OpenEditorOptions): CloseEditor => { const closeEditor = () => { if (overlayRef) { overlayRef.close(); @@ -54,7 +62,7 @@ export const getEditorOpener = ({ core, indexPatternService }: Dependencies) => } }; - const onSaveField = (indexPattern: IndexPattern) => { + const onSaveIndexPattern = (indexPattern: IndexPattern) => { closeEditor(); if (onSave) { @@ -66,7 +74,15 @@ export const getEditorOpener = ({ core, indexPatternService }: Dependencies) => toMountPoint( - + { + closeEditor(); + onCancel(); + }} + defaultTypeIsRollup={defaultTypeIsRollup} + requireTimestampField={requireTimestampField} + /> ), diff --git a/src/plugins/index_pattern_management/public/components/index_pattern_table/index_pattern_table.tsx b/src/plugins/index_pattern_management/public/components/index_pattern_table/index_pattern_table.tsx index 1292ced46b1a5..dbd1859227fb3 100644 --- a/src/plugins/index_pattern_management/public/components/index_pattern_table/index_pattern_table.tsx +++ b/src/plugins/index_pattern_management/public/components/index_pattern_table/index_pattern_table.tsx @@ -152,7 +152,7 @@ export const IndexPatternTable = ({ onSave={(indexPattern) => { history.push(`patterns/${indexPattern.id}`); }} - closeEditor={() => setShowCreateDialog(false)} + onCancel={() => setShowCreateDialog(false)} services={{ uiSettings, docLinks, From 434aad22ad8f9bd39eb3ad41a9569a7d944e164a Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Tue, 27 Jul 2021 12:58:34 -0500 Subject: [PATCH 082/130] add beta warning to rollup index patterns --- .../public/components/i18n_texts.ts | 3 + .../index_pattern_editor_flyout_content.tsx | 65 +++++++++++++++---- 2 files changed, 54 insertions(+), 14 deletions(-) diff --git a/src/plugins/index_pattern_editor/public/components/i18n_texts.ts b/src/plugins/index_pattern_editor/public/components/i18n_texts.ts index 8231901012e05..bb78ee031c533 100644 --- a/src/plugins/index_pattern_editor/public/components/i18n_texts.ts +++ b/src/plugins/index_pattern_editor/public/components/i18n_texts.ts @@ -22,5 +22,8 @@ export const geti18nTexts = () => { rollupLabel: i18n.translate('indexPatternEditor.rollupIndexPattern.createIndex.indexLabel', { defaultMessage: 'Rollup', }), + rollupBetaWarningTitle: i18n.translate('indexPatternEditor.rollupIndexPattern.warning.title', { + defaultMessage: 'Beta feature', + }), }; }; diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx index 9b2e434c5e1ec..8604bc41229db 100644 --- a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx @@ -7,7 +7,15 @@ */ import React, { useState, useEffect, useCallback } from 'react'; -import { EuiTitle, EuiFlexGroup, EuiFlexItem, EuiSpacer, EuiLoadingSpinner } from '@elastic/eui'; +import { FormattedMessage } from '@kbn/i18n/react'; +import { + EuiTitle, + EuiFlexGroup, + EuiFlexItem, + EuiSpacer, + EuiLoadingSpinner, + EuiCallOut, +} from '@elastic/eui'; import { IndexPatternSpec, @@ -297,19 +305,48 @@ const IndexPatternEditorFlyoutContentComponent = ({ getRollupIndices(rollupIndicesCapabilities).length; const indexPatternTypeSelect = showIndexPatternTypeSelect() ? ( - - - { - form.setFieldValue('title', ''); - form.setFieldValue('timestampField', ''); - if (newType === INDEX_PATTERN_TYPE.ROLLUP) { - form.setFieldValue('allowHidden', false); - } - }} - /> - - + <> + + + { + form.setFieldValue('title', ''); + form.setFieldValue('timestampField', ''); + if (newType === INDEX_PATTERN_TYPE.ROLLUP) { + form.setFieldValue('allowHidden', false); + } + }} + /> + + + {type === INDEX_PATTERN_TYPE.ROLLUP ? ( + + + +

+ +

+

+ +

+ + + + ) : ( + <> + )} + ) : ( <> ); From 1c1a5d48ff6e5eec149796c9e677f72e1cf4412c Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Tue, 27 Jul 2021 18:17:50 -0500 Subject: [PATCH 083/130] refactor component, increase bundle size --- packages/kbn-optimizer/limits.yml | 2 +- .../public/components/i18n_texts.ts | 3 -- .../public/components/index.ts | 1 + .../index_pattern_editor_flyout_content.tsx | 31 ++------------ .../components/rollup_beta_warning/index.ts | 9 ++++ .../rollup_beta_warning.tsx | 42 +++++++++++++++++++ 6 files changed, 56 insertions(+), 32 deletions(-) create mode 100644 src/plugins/index_pattern_editor/public/components/rollup_beta_warning/index.ts create mode 100644 src/plugins/index_pattern_editor/public/components/rollup_beta_warning/rollup_beta_warning.tsx diff --git a/packages/kbn-optimizer/limits.yml b/packages/kbn-optimizer/limits.yml index 7a79d11d5448c..8e078e7b1d26e 100644 --- a/packages/kbn-optimizer/limits.yml +++ b/packages/kbn-optimizer/limits.yml @@ -33,7 +33,7 @@ pageLoadAssetSize: indexLifecycleManagement: 107090 indexManagement: 140608 indexPatternManagement: 28222 - indexPatternEditor: 90000 + indexPatternEditor: 99999 infra: 184320 fleet: 465774 ingestPipelines: 58003 diff --git a/src/plugins/index_pattern_editor/public/components/i18n_texts.ts b/src/plugins/index_pattern_editor/public/components/i18n_texts.ts index bb78ee031c533..8231901012e05 100644 --- a/src/plugins/index_pattern_editor/public/components/i18n_texts.ts +++ b/src/plugins/index_pattern_editor/public/components/i18n_texts.ts @@ -22,8 +22,5 @@ export const geti18nTexts = () => { rollupLabel: i18n.translate('indexPatternEditor.rollupIndexPattern.createIndex.indexLabel', { defaultMessage: 'Rollup', }), - rollupBetaWarningTitle: i18n.translate('indexPatternEditor.rollupIndexPattern.warning.title', { - defaultMessage: 'Beta feature', - }), }; }; diff --git a/src/plugins/index_pattern_editor/public/components/index.ts b/src/plugins/index_pattern_editor/public/components/index.ts index 3b333737ca813..3712232fac9b3 100644 --- a/src/plugins/index_pattern_editor/public/components/index.ts +++ b/src/plugins/index_pattern_editor/public/components/index.ts @@ -26,3 +26,4 @@ export { LoadingIndices } from './loading_indices'; export { geti18nTexts } from './i18n_texts'; export { Footer } from './footer'; export { AdvancedParamsContent } from './advanced_params_content'; +export { RollupBetaWarning } from './rollup_beta_warning'; diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx index 8604bc41229db..372f46aaec87c 100644 --- a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx @@ -7,15 +7,7 @@ */ import React, { useState, useEffect, useCallback } from 'react'; -import { FormattedMessage } from '@kbn/i18n/react'; -import { - EuiTitle, - EuiFlexGroup, - EuiFlexItem, - EuiSpacer, - EuiLoadingSpinner, - EuiCallOut, -} from '@elastic/eui'; +import { EuiTitle, EuiFlexGroup, EuiFlexItem, EuiSpacer, EuiLoadingSpinner } from '@elastic/eui'; import { IndexPatternSpec, @@ -48,6 +40,7 @@ import { AdvancedParamsContent, EmptyPrompts, PreviewPanel, + RollupBetaWarning, } from '.'; export interface Props { @@ -322,25 +315,7 @@ const IndexPatternEditorFlyoutContentComponent = ({ {type === INDEX_PATTERN_TYPE.ROLLUP ? ( - -

- -

-

- -

- + ) : ( diff --git a/src/plugins/index_pattern_editor/public/components/rollup_beta_warning/index.ts b/src/plugins/index_pattern_editor/public/components/rollup_beta_warning/index.ts new file mode 100644 index 0000000000000..4c72c12312855 --- /dev/null +++ b/src/plugins/index_pattern_editor/public/components/rollup_beta_warning/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 { RollupBetaWarning } from './rollup_beta_warning'; diff --git a/src/plugins/index_pattern_editor/public/components/rollup_beta_warning/rollup_beta_warning.tsx b/src/plugins/index_pattern_editor/public/components/rollup_beta_warning/rollup_beta_warning.tsx new file mode 100644 index 0000000000000..fcd61bab07d4c --- /dev/null +++ b/src/plugins/index_pattern_editor/public/components/rollup_beta_warning/rollup_beta_warning.tsx @@ -0,0 +1,42 @@ +/* + * 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 React from 'react'; +import { i18n } from '@kbn/i18n'; +import { FormattedMessage } from '@kbn/i18n/react'; + +import { EuiCallOut } from '@elastic/eui'; + +const rollupBetaWarningTitle = i18n.translate( + 'indexPatternEditor.rollupIndexPattern.warning.title', + { + defaultMessage: 'Beta feature', + } +); + +export const RollupBetaWarning = () => ( + +

+ +

+

+ +

+ +); From 50625810bd81753dc11db5eec6b8ae909090a974 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Tue, 27 Jul 2021 18:29:08 -0500 Subject: [PATCH 084/130] improve mock --- src/plugins/index_pattern_editor/public/mocks.ts | 2 +- src/plugins/index_pattern_management/public/mocks.ts | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/plugins/index_pattern_editor/public/mocks.ts b/src/plugins/index_pattern_editor/public/mocks.ts index 8b27ad6202598..a96f65fd7643b 100644 --- a/src/plugins/index_pattern_editor/public/mocks.ts +++ b/src/plugins/index_pattern_editor/public/mocks.ts @@ -25,7 +25,7 @@ const createStartContract = (): Start => { }; }; -export const indexPatternFieldEditorPluginMock = { +export const indexPatternEditorPluginMock = { createSetupContract, createStartContract, }; diff --git a/src/plugins/index_pattern_management/public/mocks.ts b/src/plugins/index_pattern_management/public/mocks.ts index e44eabaded6da..884cadd0206aa 100644 --- a/src/plugins/index_pattern_management/public/mocks.ts +++ b/src/plugins/index_pattern_management/public/mocks.ts @@ -12,6 +12,7 @@ import { managementPluginMock } from '../../management/public/mocks'; import { urlForwardingPluginMock } from '../../url_forwarding/public/mocks'; import { dataPluginMock } from '../../data/public/mocks'; import { indexPatternFieldEditorPluginMock } from '../../index_pattern_field_editor/public/mocks'; +import { indexPatternEditorPluginMock } from '../../index_pattern_editor/public/mocks'; import { IndexPatternManagementSetup, IndexPatternManagementStart, @@ -70,7 +71,7 @@ const createIndexPatternManagmentContext = (): { indexPatternManagementStart: createStartContract(), setBreadcrumbs: () => {}, fieldFormatEditors: indexPatternFieldEditor.fieldFormatEditors, - indexPatternEditor: {}, // todo + indexPatternEditor: indexPatternEditorPluginMock.createStartContract(), }; }; From 8f129ee8257e18b3629bb46bcb65fdea82d0dbdf Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Tue, 27 Jul 2021 21:50:33 -0500 Subject: [PATCH 085/130] refactor how index tags are calculated --- .../empty_prompts/empty_prompts.tsx | 2 +- .../index_pattern_editor_flyout_content.tsx | 34 ++++--------------- .../public/lib/get_indices.ts | 25 +++++++++++--- 3 files changed, 28 insertions(+), 33 deletions(-) diff --git a/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_prompts.tsx b/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_prompts.tsx index c50b81a7d8daf..f6d46f8667892 100644 --- a/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_prompts.tsx +++ b/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_prompts.tsx @@ -45,7 +45,7 @@ export const EmptyPrompts: FC = ({ useCallback(() => { if (!hasDataIndices) - getIndices(http, () => [], '*:*', false).then((dataSources) => + getIndices(http, () => false, '*:*', false).then((dataSources) => setRemoteClustersExist(!!dataSources.filter(removeAliases).length) ); }, [http, hasDataIndices]); diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx index 372f46aaec87c..6f4bbe0e35c1e 100644 --- a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx @@ -35,7 +35,6 @@ import { TypeField, TitleField, schema, - geti18nTexts, Footer, AdvancedParamsContent, EmptyPrompts, @@ -75,9 +74,6 @@ const IndexPatternEditorFlyoutContentComponent = ({ services: { http, indexPatternService, uiSettings }, } = useKibana(); - const i18nTexts = geti18nTexts(); - - // return type, interal type const { form } = useForm({ defaultValue: { type: defaultTypeIsRollup ? INDEX_PATTERN_TYPE.ROLLUP : INDEX_PATTERN_TYPE.DEFAULT, @@ -113,7 +109,6 @@ const IndexPatternEditorFlyoutContentComponent = ({ const [{ title, allowHidden, type }] = useFormData({ form }); const [isLoadingSources, setIsLoadingSources] = useState(true); - // const [lastTitle, setLastTitle] = useState(''); const [timestampFieldOptions, setTimestampFieldOptions] = useState([]); const [isLoadingTimestampFields, setIsLoadingTimestampFields] = useState(false); const [isLoadingMatchedIndices, setIsLoadingMatchedIndices] = useState(false); @@ -134,7 +129,7 @@ const IndexPatternEditorFlyoutContentComponent = ({ // load all data sources and set initial matchedIndices const loadSources = useCallback(() => { - getIndices(http, () => [], '*', allowHidden).then((dataSources) => { + getIndices(http, () => false, '*', allowHidden).then((dataSources) => { setAllSources(dataSources); const matchedSet = getMatchedIndices(dataSources, [], [], allowHidden); setMatchedIndices(matchedSet); @@ -222,35 +217,22 @@ const IndexPatternEditorFlyoutContentComponent = ({ }, [matchedIndices, loadTimestampFieldOptions, title, getFields]); const reloadMatchedIndices = useCallback( - async (title2: string) => { - // todo move to utility lib + async (newTitle: string) => { const isRollupIndex = (indexName: string) => getRollupIndices(rollupIndicesCapabilities).includes(indexName); let newRollupIndexName: string | undefined; - // move inside getIndices - const getIndexTags = (indexName: string) => - isRollupIndex(indexName) - ? [ - { - key: INDEX_PATTERN_TYPE.ROLLUP, - name: i18nTexts.rollupLabel, - color: 'primary', - }, - ] - : []; - const fetchIndices = async (query: string = '') => { setIsLoadingMatchedIndices(true); const indexRequests = []; if (query?.endsWith('*')) { - const exactMatchedQuery = getIndices(http, getIndexTags, query, allowHidden); + const exactMatchedQuery = getIndices(http, isRollupIndex, query, allowHidden); indexRequests.push(exactMatchedQuery); indexRequests.push(Promise.resolve([])); } else { - const exactMatchQuery = getIndices(http, getIndexTags, query, allowHidden); - const partialMatchQuery = getIndices(http, getIndexTags, `${query}*`, allowHidden); + const exactMatchQuery = getIndices(http, isRollupIndex, query, allowHidden); + const partialMatchQuery = getIndices(http, isRollupIndex, `${query}*`, allowHidden); indexRequests.push(exactMatchQuery); indexRequests.push(partialMatchQuery); @@ -281,13 +263,11 @@ const IndexPatternEditorFlyoutContentComponent = ({ return { matchedIndicesResult, newRollupIndexName }; }; - // setLastTitle(title2); - return fetchIndices(title2); + return fetchIndices(newTitle); }, - [http, allowHidden, allSources, type, i18nTexts.rollupLabel, rollupIndicesCapabilities] + [http, allowHidden, allSources, type, rollupIndicesCapabilities] ); - // todo test if (isLoadingSources || isLoadingIndexPatterns) { return ; } diff --git a/src/plugins/index_pattern_editor/public/lib/get_indices.ts b/src/plugins/index_pattern_editor/public/lib/get_indices.ts index 2e9d2ba5c524f..625e99ecbcdc5 100644 --- a/src/plugins/index_pattern_editor/public/lib/get_indices.ts +++ b/src/plugins/index_pattern_editor/public/lib/get_indices.ts @@ -9,7 +9,7 @@ import { sortBy } from 'lodash'; import { HttpStart } from 'kibana/public'; import { i18n } from '@kbn/i18n'; -import { Tag } from '../types'; +import { Tag, INDEX_PATTERN_TYPE } from '../types'; // todo move into this plugin, consider removing all ipm references import { MatchedItem, ResolveIndexResponse, ResolveIndexResponseItemIndexAttrs } from '../types'; @@ -26,9 +26,24 @@ const frozenLabel = i18n.translate('indexPatternEditor.frozenLabel', { defaultMessage: 'Frozen', }); +const rollupLabel = i18n.translate('indexPatternEditor.rollupLabel', { + defaultMessage: 'Rollup', +}); + +const getIndexTags = (isRollupIndex: (indexName: string) => boolean) => (indexName: string) => + isRollupIndex(indexName) + ? [ + { + key: INDEX_PATTERN_TYPE.ROLLUP, + name: rollupLabel, + color: 'primary', + }, + ] + : []; + export async function getIndices( http: HttpStart, - getIndexTags: (indexName: string) => Tag[], + isRollupIndex: (indexName: string) => boolean, rawPattern: string, showAllIndices: boolean ): Promise { @@ -63,7 +78,7 @@ export async function getIndices( return []; } - return responseToItemArray(response, getIndexTags); + return responseToItemArray(response, getIndexTags(isRollupIndex)); } catch { return []; } @@ -71,7 +86,7 @@ export async function getIndices( export const responseToItemArray = ( response: ResolveIndexResponse, - getIndexTags: (indexName: string) => Tag[] + getTags: (indexName: string) => Tag[] ): MatchedItem[] => { const source: MatchedItem[] = []; @@ -79,7 +94,7 @@ export const responseToItemArray = ( const tags: MatchedItem['tags'] = [{ key: 'index', name: indexLabel, color: 'default' }]; const isFrozen = (index.attributes || []).includes(ResolveIndexResponseItemIndexAttrs.FROZEN); - tags.push(...getIndexTags(index.name)); + tags.push(...getTags(index.name)); if (isFrozen) { tags.push({ name: frozenLabel, key: 'frozen', color: 'danger' }); } From 4e6e4b55d33758aa17c9469db638882aacc2a00f Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Tue, 27 Jul 2021 23:02:34 -0500 Subject: [PATCH 086/130] fix jest test --- .../public/lib/get_indices.test.ts | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/plugins/index_pattern_editor/public/lib/get_indices.test.ts b/src/plugins/index_pattern_editor/public/lib/get_indices.test.ts index f96043bce0739..fc96482f0379f 100644 --- a/src/plugins/index_pattern_editor/public/lib/get_indices.test.ts +++ b/src/plugins/index_pattern_editor/public/lib/get_indices.test.ts @@ -33,26 +33,27 @@ export const successfulResponse = { }; const mockGetTags = () => []; +const mockIsRollupIndex = () => false; const http = httpServiceMock.createStartContract(); http.get.mockResolvedValue(successfulResponse); describe('getIndices', () => { it('should work in a basic case', async () => { - const result = await getIndices(http, mockGetTags, 'kibana', false); + const result = await getIndices(http, mockIsRollupIndex, 'kibana', false); expect(result.length).toBe(3); expect(result[0].name).toBe('f-alias'); expect(result[1].name).toBe('foo'); }); it('should ignore ccs query-all', async () => { - expect((await getIndices(http, mockGetTags, '*:', false)).length).toBe(0); + expect((await getIndices(http, mockIsRollupIndex, '*:', false)).length).toBe(0); }); it('should ignore a single comma', async () => { - expect((await getIndices(http, mockGetTags, ',', false)).length).toBe(0); - expect((await getIndices(http, mockGetTags, ',*', false)).length).toBe(0); - expect((await getIndices(http, mockGetTags, ',foobar', false)).length).toBe(0); + expect((await getIndices(http, mockIsRollupIndex, ',', false)).length).toBe(0); + expect((await getIndices(http, mockIsRollupIndex, ',*', false)).length).toBe(0); + expect((await getIndices(http, mockIsRollupIndex, ',foobar', false)).length).toBe(0); }); it('response object to item array', () => { @@ -89,7 +90,7 @@ describe('getIndices', () => { http.get.mockImplementationOnce(() => { throw new Error('Test error'); }); - const result = await getIndices(http, mockGetTags, 'kibana', false); + const result = await getIndices(http, mockIsRollupIndex, 'kibana', false); expect(result.length).toBe(0); }); }); From 52d8ce460d43c72fa57fcae4cb85b9afd333b617 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Wed, 28 Jul 2021 12:41:09 -0500 Subject: [PATCH 087/130] update docs --- .../public/kibana-plugin-plugins-data-public.customfilter.md | 2 +- .../data/public/kibana-plugin-plugins-data-public.esfilters.md | 2 +- .../data/public/kibana-plugin-plugins-data-public.eskuery.md | 2 +- .../data/public/kibana-plugin-plugins-data-public.esquery.md | 2 +- .../public/kibana-plugin-plugins-data-public.esqueryconfig.md | 2 +- .../public/kibana-plugin-plugins-data-public.existsfilter.md | 2 +- .../data/public/kibana-plugin-plugins-data-public.filter.md | 2 +- .../public/kibana-plugin-plugins-data-public.ifieldsubtype.md | 2 +- .../data/public/kibana-plugin-plugins-data-public.isfilter.md | 2 +- .../data/public/kibana-plugin-plugins-data-public.isfilters.md | 2 +- .../data/public/kibana-plugin-plugins-data-public.kuerynode.md | 2 +- .../public/kibana-plugin-plugins-data-public.matchallfilter.md | 2 +- .../public/kibana-plugin-plugins-data-public.phrasefilter.md | 2 +- .../public/kibana-plugin-plugins-data-public.phrasesfilter.md | 2 +- .../public/kibana-plugin-plugins-data-public.rangefilter.md | 2 +- .../public/kibana-plugin-plugins-data-public.rangefiltermeta.md | 2 +- .../kibana-plugin-plugins-data-public.rangefilterparams.md | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.customfilter.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.customfilter.md index 6763a8d2ba0bf..5c666c7f9fe1e 100644 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.customfilter.md +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.customfilter.md @@ -6,7 +6,7 @@ > Warning: This API is now obsolete. > -> Please import from the package kbn/es-query directly. This import will be deprecated in v8.0.0. +> Please import from the package kbn/es-query directly. This import will be removed in v8.0.0. > Signature: diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.esfilters.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.esfilters.md index 2976c0884fc4c..ee04b37bb153c 100644 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.esfilters.md +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.esfilters.md @@ -6,7 +6,7 @@ > Warning: This API is now obsolete. > -> Please import helpers from the package kbn/es-query directly. This import will be deprecated in v8.0.0. +> Please import helpers from the package kbn/es-query directly. This import will be removed in v8.0.0. > Filter helpers namespace: diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.eskuery.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.eskuery.md index 6ed9898ddd718..48cb20e0b9032 100644 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.eskuery.md +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.eskuery.md @@ -6,7 +6,7 @@ > Warning: This API is now obsolete. > -> Please import helpers from the package kbn/es-query directly. This import will be deprecated in v8.0.0. +> Please import helpers from the package kbn/es-query directly. This import will be removed in v8.0.0. > Signature: diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.esquery.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.esquery.md index fa2ee4faa7466..deb50b1928010 100644 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.esquery.md +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.esquery.md @@ -6,7 +6,7 @@ > Warning: This API is now obsolete. > -> Please import helpers from the package kbn/es-query directly. This import will be deprecated in v8.0.0. +> Please import helpers from the package kbn/es-query directly. This import will be removed in v8.0.0. > Signature: diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.esqueryconfig.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.esqueryconfig.md index 4480329c2df19..3e8c370941260 100644 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.esqueryconfig.md +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.esqueryconfig.md @@ -6,7 +6,7 @@ > Warning: This API is now obsolete. > -> Please import from the package kbn/es-query directly. This import will be deprecated in v8.0.0. +> Please import from the package kbn/es-query directly. This import will be removed in v8.0.0. > Signature: diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.existsfilter.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.existsfilter.md index ab756295eac8c..ec5bc71c614ec 100644 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.existsfilter.md +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.existsfilter.md @@ -6,7 +6,7 @@ > Warning: This API is now obsolete. > -> Please import from the package kbn/es-query directly. This import will be deprecated in v8.0.0. +> Please import from the package kbn/es-query directly. This import will be removed in v8.0.0. > Signature: diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.filter.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.filter.md index bf8d4ced016a3..454dde806532f 100644 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.filter.md +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.filter.md @@ -6,7 +6,7 @@ > Warning: This API is now obsolete. > -> Please import from the package kbn/es-query directly. This import will be deprecated in v8.0.0. +> Please import from the package kbn/es-query directly. This import will be removed in v8.0.0. > Signature: diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.ifieldsubtype.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.ifieldsubtype.md index d5d8a0b62d3c5..e2fa06a8acc6c 100644 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.ifieldsubtype.md +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.ifieldsubtype.md @@ -6,7 +6,7 @@ > Warning: This API is now obsolete. > -> Please import from the package kbn/es-query directly. This import will be deprecated in v8.0.0. +> Please import from the package kbn/es-query directly. This import will be removed in v8.0.0. > Signature: diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.isfilter.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.isfilter.md index 2848e20edde1b..eb6b9968544c7 100644 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.isfilter.md +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.isfilter.md @@ -6,7 +6,7 @@ > Warning: This API is now obsolete. > -> Please import from the package kbn/es-query directly. This import will be deprecated in v8.0.0. +> Please import from the package kbn/es-query directly. This import will be removed in v8.0.0. > Signature: diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.isfilters.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.isfilters.md index 881d50b8a49e1..52bfaa67e2258 100644 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.isfilters.md +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.isfilters.md @@ -6,7 +6,7 @@ > Warning: This API is now obsolete. > -> Please import from the package kbn/es-query directly. This import will be deprecated in v8.0.0. +> Please import from the package kbn/es-query directly. This import will be removed in v8.0.0. > Signature: diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.kuerynode.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.kuerynode.md index 9cea144ff9d46..bb3eb02dc88b9 100644 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.kuerynode.md +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.kuerynode.md @@ -6,7 +6,7 @@ > Warning: This API is now obsolete. > -> Please import from the package kbn/es-query directly. This import will be deprecated in v8.0.0. +> Please import from the package kbn/es-query directly. This import will be removed in v8.0.0. > Signature: diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.matchallfilter.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.matchallfilter.md index 39ae82865808c..36712d80ff644 100644 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.matchallfilter.md +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.matchallfilter.md @@ -6,7 +6,7 @@ > Warning: This API is now obsolete. > -> Please import from the package kbn/es-query directly. This import will be deprecated in v8.0.0. +> Please import from the package kbn/es-query directly. This import will be removed in v8.0.0. > Signature: diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.phrasefilter.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.phrasefilter.md index ca38ac25dcf50..1c0dcc0589d0a 100644 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.phrasefilter.md +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.phrasefilter.md @@ -6,7 +6,7 @@ > Warning: This API is now obsolete. > -> Please import from the package kbn/es-query directly. This import will be deprecated in v8.0.0. +> Please import from the package kbn/es-query directly. This import will be removed in v8.0.0. > Signature: diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.phrasesfilter.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.phrasesfilter.md index 0c293cb909276..64bce6d4f6111 100644 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.phrasesfilter.md +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.phrasesfilter.md @@ -6,7 +6,7 @@ > Warning: This API is now obsolete. > -> Please import from the package kbn/es-query directly. This import will be deprecated in v8.0.0. +> Please import from the package kbn/es-query directly. This import will be removed in v8.0.0. > Signature: diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.rangefilter.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.rangefilter.md index 3d9af100a707a..9f072aae6e194 100644 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.rangefilter.md +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.rangefilter.md @@ -6,7 +6,7 @@ > Warning: This API is now obsolete. > -> Please import from the package kbn/es-query directly. This import will be deprecated in v8.0.0. +> Please import from the package kbn/es-query directly. This import will be removed in v8.0.0. > Signature: diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.rangefiltermeta.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.rangefiltermeta.md index 4060a71e62cd0..e1b4f2886a6de 100644 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.rangefiltermeta.md +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.rangefiltermeta.md @@ -6,7 +6,7 @@ > Warning: This API is now obsolete. > -> Please import from the package kbn/es-query directly. This import will be deprecated in v8.0.0. +> Please import from the package kbn/es-query directly. This import will be removed in v8.0.0. > Signature: diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.rangefilterparams.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.rangefilterparams.md index cdf237ea5a1ec..23c11b1317c7e 100644 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.rangefilterparams.md +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.rangefilterparams.md @@ -6,7 +6,7 @@ > Warning: This API is now obsolete. > -> Please import from the package kbn/es-query directly. This import will be deprecated in v8.0.0. +> Please import from the package kbn/es-query directly. This import will be removed in v8.0.0. > Signature: From 398074aff94e141bc1ac35cef0ad6232544d7462 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Wed, 28 Jul 2021 15:55:56 -0500 Subject: [PATCH 088/130] add functional tests for validation --- .../_index_pattern_create_delete.js | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/test/functional/apps/management/_index_pattern_create_delete.js b/test/functional/apps/management/_index_pattern_create_delete.js index b195e4c8d5857..5be5cb3418bf8 100644 --- a/test/functional/apps/management/_index_pattern_create_delete.js +++ b/test/functional/apps/management/_index_pattern_create_delete.js @@ -14,6 +14,7 @@ export default function ({ getService, getPageObjects }) { const log = getService('log'); const retry = getService('retry'); const testSubjects = getService('testSubjects'); + const find = getService('find'); const PageObjects = getPageObjects(['settings', 'common', 'header']); describe('creating and deleting default index', function describeIndexTests() { @@ -29,6 +30,30 @@ export default function ({ getService, getPageObjects }) { }); }); + describe('can open and close editor', function () { + it('without creating index pattern', async function () { + await PageObjects.settings.clickKibanaIndexPatterns(); + await PageObjects.settings.clickAddNewIndexPatternButton(); + await testSubjects.click('closeFlyoutButton'); + await testSubjects.find('createIndexPatternButton'); + }); + }); + + describe('validation', function () { + it('can display errors', async function () { + await PageObjects.settings.clickAddNewIndexPatternButton(); + await PageObjects.settings.setIndexPatternField('log*'); + await (await PageObjects.settings.getSaveIndexPatternButton()).click(); + await find.byClassName('euiFormErrorText'); + }); + + it('can resolve errors and submit', async function () { + await PageObjects.settings.selectTimeFieldOption('@timestamp'); + await (await PageObjects.settings.getSaveIndexPatternButton()).click(); + await PageObjects.settings.removeIndexPattern(); + }); + }); + describe('special character handling', () => { it('should handle special charaters in template input', async () => { await PageObjects.settings.clickAddNewIndexPatternButton(); From 62dbf53cf8929b9f6de2fd662bec6a133c14b9e1 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Sat, 31 Jul 2021 22:59:05 -0500 Subject: [PATCH 089/130] add close footer to empty views --- .../empty_prompts/empty_prompts.tsx | 33 +++++++++------ .../empty_prompts/prompt_footer/index.ts | 9 ++++ .../prompt_footer/prompt_footer.tsx | 42 +++++++++++++++++++ 3 files changed, 71 insertions(+), 13 deletions(-) create mode 100644 src/plugins/index_pattern_editor/public/components/empty_prompts/prompt_footer/index.ts create mode 100644 src/plugins/index_pattern_editor/public/components/empty_prompts/prompt_footer/prompt_footer.tsx diff --git a/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_prompts.tsx b/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_prompts.tsx index f6d46f8667892..1f62a3739c060 100644 --- a/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_prompts.tsx +++ b/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_prompts.tsx @@ -16,6 +16,7 @@ import { getIndices } from '../../lib'; import { EmptyIndexListPrompt } from './empty_index_list_prompt'; import { EmptyIndexPatternPrompt } from './empty_index_pattern_prompt'; +import { PromptFooter } from './prompt_footer'; const removeAliases = (item: MatchedItem) => !((item as unknown) as ResolveIndexResponseItemAlias).indices; @@ -54,23 +55,29 @@ export const EmptyPrompts: FC = ({ if (!hasDataIndices && !remoteClustersExist) { // load data return ( - setGoToForm(true)} - canSaveIndexPattern={application.capabilities.indexPatterns.save as boolean} - navigateToApp={application.navigateToApp} - addDataUrl={docLinks.links.indexPatterns.introduction} - /> + <> + setGoToForm(true)} + canSaveIndexPattern={application.capabilities.indexPatterns.save as boolean} + navigateToApp={application.navigateToApp} + addDataUrl={docLinks.links.indexPatterns.introduction} + /> + + ); } else { // first time return ( - setGoToForm(true)} - indexPatternsIntroUrl={docLinks.links.indexPatterns.introduction} - canSaveIndexPattern={application.capabilities.indexPatterns.save as boolean} - /> + <> + setGoToForm(true)} + indexPatternsIntroUrl={docLinks.links.indexPatterns.introduction} + canSaveIndexPattern={application.capabilities.indexPatterns.save as boolean} + /> + + ); } } diff --git a/src/plugins/index_pattern_editor/public/components/empty_prompts/prompt_footer/index.ts b/src/plugins/index_pattern_editor/public/components/empty_prompts/prompt_footer/index.ts new file mode 100644 index 0000000000000..52b2a82651b28 --- /dev/null +++ b/src/plugins/index_pattern_editor/public/components/empty_prompts/prompt_footer/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 { PromptFooter } from './prompt_footer'; diff --git a/src/plugins/index_pattern_editor/public/components/empty_prompts/prompt_footer/prompt_footer.tsx b/src/plugins/index_pattern_editor/public/components/empty_prompts/prompt_footer/prompt_footer.tsx new file mode 100644 index 0000000000000..d1ab3febc5ed3 --- /dev/null +++ b/src/plugins/index_pattern_editor/public/components/empty_prompts/prompt_footer/prompt_footer.tsx @@ -0,0 +1,42 @@ +/* + * 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 React from 'react'; +import { i18n } from '@kbn/i18n'; + +import { EuiFlyoutFooter, EuiFlexGroup, EuiFlexItem, EuiButtonEmpty } from '@elastic/eui'; + +const closeButtonLabel = i18n.translate( + 'indexPatternEditor.editor.emptyPrompt.flyoutCloseButtonLabel', + { + defaultMessage: 'Close', + } +); + +interface PromptFooterProps { + onCancel: () => void; +} + +export const PromptFooter = ({ onCancel }: PromptFooterProps) => { + return ( + + + + + {closeButtonLabel} + + + + + ); +}; From 859f6e1b535e9cb5417ddb74d919df2fed9f79fd Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Mon, 2 Aug 2021 18:06:07 -0500 Subject: [PATCH 090/130] add loading spinner --- .../__snapshots__/empty_index_pattern_prompt.test.tsx.snap | 6 +++--- .../empty_index_pattern_prompt.tsx | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_pattern_prompt/__snapshots__/empty_index_pattern_prompt.test.tsx.snap b/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_pattern_prompt/__snapshots__/empty_index_pattern_prompt.test.tsx.snap index c1a0b039c58d4..62adf88cc2a0e 100644 --- a/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_pattern_prompt/__snapshots__/empty_index_pattern_prompt.test.tsx.snap +++ b/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_pattern_prompt/__snapshots__/empty_index_pattern_prompt.test.tsx.snap @@ -21,9 +21,9 @@ exports[`EmptyIndexPatternPrompt should render normally 1`] = ` > - ...loading... - + } > diff --git a/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_pattern_prompt/empty_index_pattern_prompt.tsx b/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_pattern_prompt/empty_index_pattern_prompt.tsx index 1678dab1cf233..77f6de4abd8c3 100644 --- a/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_pattern_prompt/empty_index_pattern_prompt.tsx +++ b/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_pattern_prompt/empty_index_pattern_prompt.tsx @@ -14,7 +14,7 @@ import { FormattedMessage } from '@kbn/i18n/react'; import { EuiPageContent, EuiSpacer, EuiText, EuiFlexItem, EuiFlexGroup } from '@elastic/eui'; import { EuiDescriptionListTitle } from '@elastic/eui'; import { EuiDescriptionListDescription, EuiDescriptionList } from '@elastic/eui'; -import { EuiLink, EuiButton } from '@elastic/eui'; +import { EuiLink, EuiButton, EuiLoadingSpinner } from '@elastic/eui'; interface Props { goToCreate: () => void; canSaveIndexPattern: boolean; @@ -39,7 +39,7 @@ export const EmptyIndexPatternPrompt = ({ > - ...loading...}> + }> From 730b6621d5e846f89b0a0a80c953281e1287a3f9 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Mon, 2 Aug 2021 20:47:48 -0500 Subject: [PATCH 091/130] check to see if component is mounted before setting state --- .../empty_prompts/empty_prompts.tsx | 12 ++++-- .../index_pattern_editor_flyout_content.tsx | 42 +++++++++---------- 2 files changed, 30 insertions(+), 24 deletions(-) diff --git a/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_prompts.tsx b/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_prompts.tsx index 1f62a3739c060..3b06fa1cff298 100644 --- a/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_prompts.tsx +++ b/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_prompts.tsx @@ -45,10 +45,16 @@ export const EmptyPrompts: FC = ({ const hasDataIndices = allSources.some(({ name }: MatchedItem) => !name.startsWith('.')); useCallback(() => { + let isMounted = true; if (!hasDataIndices) - getIndices(http, () => false, '*:*', false).then((dataSources) => - setRemoteClustersExist(!!dataSources.filter(removeAliases).length) - ); + getIndices(http, () => false, '*:*', false).then((dataSources) => { + if (isMounted) { + setRemoteClustersExist(!!dataSources.filter(removeAliases).length); + } + }); + return () => { + isMounted = false; + }; }, [http, hasDataIndices]); if (!hasExistingIndexPatterns && !goToForm) { diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx index 6f4bbe0e35c1e..7573a0e611844 100644 --- a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -import React, { useState, useEffect, useCallback } from 'react'; +import React, { useState, useEffect, useCallback, useRef } from 'react'; import { EuiTitle, EuiFlexGroup, EuiFlexItem, EuiSpacer, EuiLoadingSpinner } from '@elastic/eui'; import { @@ -70,6 +70,7 @@ const IndexPatternEditorFlyoutContentComponent = ({ defaultTypeIsRollup, requireTimestampField = false, }: Props) => { + const isMounted = useRef(false); const { services: { http, indexPatternService, uiSettings }, } = useKibana(); @@ -139,28 +140,27 @@ const IndexPatternEditorFlyoutContentComponent = ({ // loading list of index patterns useEffect(() => { - let isMounted = true; + isMounted.current = true; loadSources(); const getTitles = async () => { const indexPatternTitles = await indexPatternService.getTitles(); - if (isMounted) { + if (isMounted.current) { setExistingIndexPatterns(indexPatternTitles); setIsLoadingIndexPatterns(false); } }; getTitles(); return () => { - isMounted = false; + isMounted.current = false; }; }, [http, indexPatternService, loadSources]); // loading rollup info useEffect(() => { - let isMounted = true; const getRollups = async () => { try { const response = await http.get('/api/rollup/indices'); - if (isMounted) { + if (isMounted.current) { setRollupIndicesCapabilities(response || {}); } } catch (e) { @@ -169,10 +169,6 @@ const IndexPatternEditorFlyoutContentComponent = ({ }; getRollups(); - - return () => { - isMounted = false; - }; }, [http, type]); const getRollupIndices = (rollupCaps: RollupIndicesCapsResponse) => Object.keys(rollupCaps); @@ -197,8 +193,10 @@ const IndexPatternEditorFlyoutContentComponent = ({ ); timestampOptions = extractTimeFields(fields, requireTimestampField); } - setIsLoadingTimestampFields(false); - setTimestampFieldOptions(timestampOptions); + if (isMounted.current) { + setIsLoadingTimestampFields(false); + setTimestampFieldOptions(timestampOptions); + } return timestampOptions; }, [ @@ -249,17 +247,19 @@ const IndexPatternEditorFlyoutContentComponent = ({ allowHidden ); - if (type === INDEX_PATTERN_TYPE.ROLLUP) { - const rollupIndices = exactMatched.filter((index) => isRollupIndex(index.name)); - newRollupIndexName = rollupIndices.length === 1 ? rollupIndices[0].name : undefined; - setRollupIndex(newRollupIndexName); - } else { - setRollupIndex(undefined); + if (isMounted.current) { + if (type === INDEX_PATTERN_TYPE.ROLLUP) { + const rollupIndices = exactMatched.filter((index) => isRollupIndex(index.name)); + newRollupIndexName = rollupIndices.length === 1 ? rollupIndices[0].name : undefined; + setRollupIndex(newRollupIndexName); + } else { + setRollupIndex(undefined); + } + + setMatchedIndices(matchedIndicesResult); + setIsLoadingMatchedIndices(false); } - setMatchedIndices(matchedIndicesResult); - setIsLoadingMatchedIndices(false); - return { matchedIndicesResult, newRollupIndexName }; }; From bc8a8f25959813da1603a92d283de939e35d92ca Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Mon, 2 Aug 2021 21:58:46 -0500 Subject: [PATCH 092/130] return component via plugin contract with dependencies --- .../index_pattern_editor/public/index.ts | 4 +-- .../public/{plugin.ts => plugin.tsx} | 29 +++++++++++++++---- .../index_pattern_editor/public/types.ts | 16 ++++++++++ .../index_pattern_table.tsx | 14 +-------- .../mount_management_section.tsx | 2 +- .../index_pattern_management/public/types.ts | 2 +- 6 files changed, 44 insertions(+), 23 deletions(-) rename src/plugins/index_pattern_editor/public/{plugin.ts => plugin.tsx} (60%) diff --git a/src/plugins/index_pattern_editor/public/index.ts b/src/plugins/index_pattern_editor/public/index.ts index 5cdbafd63126c..0947c30f418cc 100644 --- a/src/plugins/index_pattern_editor/public/index.ts +++ b/src/plugins/index_pattern_editor/public/index.ts @@ -22,11 +22,9 @@ import { IndexPatternEditorPlugin } from './plugin'; export { PluginStart as IndexPatternEditorStart } from './types'; -export { IndexPatternEditor } from './components'; - export function plugin() { return new IndexPatternEditorPlugin(); } -// Expose types +// TODO Expose types export type { OpenEditorOptions } from './open_editor'; diff --git a/src/plugins/index_pattern_editor/public/plugin.ts b/src/plugins/index_pattern_editor/public/plugin.tsx similarity index 60% rename from src/plugins/index_pattern_editor/public/plugin.ts rename to src/plugins/index_pattern_editor/public/plugin.tsx index 4e7d28632f472..e3b9b587beed7 100644 --- a/src/plugins/index_pattern_editor/public/plugin.ts +++ b/src/plugins/index_pattern_editor/public/plugin.tsx @@ -6,10 +6,18 @@ * Side Public License, v 1. */ +import React from 'react'; import { Plugin, CoreSetup, CoreStart } from 'src/core/public'; -import { PluginSetup, PluginStart, SetupPlugins, StartPlugins } from './types'; +import { + PluginSetup, + PluginStart, + SetupPlugins, + StartPlugins, + IndexPatternEditorProps, +} from './types'; import { getEditorOpener } from './open_editor'; +import { IndexPatternEditor } from './components'; export class IndexPatternEditorPlugin implements Plugin { @@ -18,9 +26,7 @@ export class IndexPatternEditorPlugin } public start(core: CoreStart, plugins: StartPlugins) { - const { - application: { capabilities }, - } = core; + const { application, uiSettings, docLinks, http, notifications } = core; const { data } = plugins; return { @@ -28,9 +34,22 @@ export class IndexPatternEditorPlugin core, indexPatternService: data.indexPatterns, }), + IndexPatternEditorComponent: (props: IndexPatternEditorProps) => ( + + ), userPermissions: { editIndexPattern: () => { - return capabilities.management.kibana.indexPatterns; + return application.capabilities.management.kibana.indexPatterns; }, }, }; diff --git a/src/plugins/index_pattern_editor/public/types.ts b/src/plugins/index_pattern_editor/public/types.ts index 233b53cd45360..bb0598d266643 100644 --- a/src/plugins/index_pattern_editor/public/types.ts +++ b/src/plugins/index_pattern_editor/public/types.ts @@ -6,6 +6,7 @@ * Side Public License, v 1. */ +import { FC } from 'react'; import { ApplicationStart, IUiSettingsClient, @@ -16,6 +17,7 @@ import { import { EuiComboBoxOptionOption } from '@elastic/eui'; +import type { IndexPattern } from 'src/plugins/data/public'; import { DataPublicPluginStart, IndexPatternAggRestrictions } from './shared_imports'; import { OpenEditorOptions } from './open_editor'; @@ -28,11 +30,25 @@ export interface IndexPatternEditorContext { indexPatternService: DataPublicPluginStart['indexPatterns']; } +export interface IndexPatternEditorProps { + /** + * Handler for the "save" footer button + */ + onSave: (indexPattern: IndexPattern) => void; + /** + * Handler for the "cancel" footer button + */ + onCancel: () => void; + defaultTypeIsRollup?: boolean; + requireTimestampField?: boolean; +} + // eslint-disable-next-line @typescript-eslint/no-empty-interface export interface PluginSetup {} export interface PluginStart { openEditor(options: OpenEditorOptions): () => void; + IndexPatternEditorComponent: FC; userPermissions: { editIndexPattern: () => boolean; }; diff --git a/src/plugins/index_pattern_management/public/components/index_pattern_table/index_pattern_table.tsx b/src/plugins/index_pattern_management/public/components/index_pattern_table/index_pattern_table.tsx index dbd1859227fb3..ef99be4df7cb8 100644 --- a/src/plugins/index_pattern_management/public/components/index_pattern_table/index_pattern_table.tsx +++ b/src/plugins/index_pattern_management/public/components/index_pattern_table/index_pattern_table.tsx @@ -24,7 +24,6 @@ import { IndexPatternManagmentContext } from '../../types'; import { IndexPatternTableItem } from '../types'; import { getIndexPatterns } from '../utils'; import { getListBreadcrumbs } from '../breadcrumbs'; -import { IndexPatternEditor } from '../../../../index_pattern_editor/public'; const pagination = { initialPageSize: 10, @@ -67,10 +66,7 @@ export const IndexPatternTable = ({ indexPatternManagementStart, chrome, data, - docLinks, - http, - notifications, - application, + IndexPatternEditor, } = useKibana().services; const [indexPatterns, setIndexPatterns] = useState([]); const [isLoadingIndexPatterns, setIsLoadingIndexPatterns] = useState(true); @@ -153,14 +149,6 @@ export const IndexPatternTable = ({ history.push(`patterns/${indexPattern.id}`); }} onCancel={() => setShowCreateDialog(false)} - services={{ - uiSettings, - docLinks, - http, - notifications, - application, - indexPatternService: data.indexPatterns, - }} defaultTypeIsRollup={isRollup} /> ) : ( diff --git a/src/plugins/index_pattern_management/public/management_app/mount_management_section.tsx b/src/plugins/index_pattern_management/public/management_app/mount_management_section.tsx index 2d079a087500c..e493595c848cf 100644 --- a/src/plugins/index_pattern_management/public/management_app/mount_management_section.tsx +++ b/src/plugins/index_pattern_management/public/management_app/mount_management_section.tsx @@ -62,7 +62,7 @@ export async function mountManagementSection( indexPatternManagementStart: indexPatternManagementStart as IndexPatternManagementStart, setBreadcrumbs: params.setBreadcrumbs, fieldFormatEditors: indexPatternFieldEditor.fieldFormatEditors, - indexPatternEditor, + IndexPatternEditor: indexPatternEditor.IndexPatternEditorComponent, }; ReactDOM.render( diff --git a/src/plugins/index_pattern_management/public/types.ts b/src/plugins/index_pattern_management/public/types.ts index 21eb1f7cda4c3..b2c77fccf90b9 100644 --- a/src/plugins/index_pattern_management/public/types.ts +++ b/src/plugins/index_pattern_management/public/types.ts @@ -35,7 +35,7 @@ export interface IndexPatternManagmentContext { indexPatternManagementStart: IndexPatternManagementStart; setBreadcrumbs: ManagementAppMountParams['setBreadcrumbs']; fieldFormatEditors: IndexPatternFieldEditorStart['fieldFormatEditors']; - indexPatternEditor: IndexPatternEditorStart; + IndexPatternEditor: IndexPatternEditorStart['IndexPatternEditorComponent']; } export type IndexPatternManagmentContextValue = KibanaReactContextValue; From 2f451e049314fe4120168576d010abbc05de4eea Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Mon, 2 Aug 2021 22:17:28 -0500 Subject: [PATCH 093/130] fix mock --- src/plugins/index_pattern_editor/public/mocks.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/plugins/index_pattern_editor/public/mocks.ts b/src/plugins/index_pattern_editor/public/mocks.ts index a96f65fd7643b..c7ac1d61e3c10 100644 --- a/src/plugins/index_pattern_editor/public/mocks.ts +++ b/src/plugins/index_pattern_editor/public/mocks.ts @@ -19,6 +19,7 @@ const createSetupContract = (): Setup => { const createStartContract = (): Start => { return { openEditor: jest.fn(), + IndexPatternEditorComponent: jest.fn(), userPermissions: { editIndexPattern: jest.fn(), }, From 91373b4b42ebc0eb79f4c50974d8126ff9069f1d Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Mon, 2 Aug 2021 23:20:24 -0500 Subject: [PATCH 094/130] fix mock --- src/plugins/index_pattern_management/public/mocks.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/index_pattern_management/public/mocks.ts b/src/plugins/index_pattern_management/public/mocks.ts index 884cadd0206aa..a41fa58ec3a69 100644 --- a/src/plugins/index_pattern_management/public/mocks.ts +++ b/src/plugins/index_pattern_management/public/mocks.ts @@ -71,7 +71,7 @@ const createIndexPatternManagmentContext = (): { indexPatternManagementStart: createStartContract(), setBreadcrumbs: () => {}, fieldFormatEditors: indexPatternFieldEditor.fieldFormatEditors, - indexPatternEditor: indexPatternEditorPluginMock.createStartContract(), + IndexPatternEditor: indexPatternEditorPluginMock.createStartContract().IndexPatternEditorComponent, }; }; From 7dbccca2f7b445366d56b680b3d8e226b81c2ddf Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Tue, 3 Aug 2021 09:33:51 -0500 Subject: [PATCH 095/130] lint fix --- src/plugins/index_pattern_management/public/mocks.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/plugins/index_pattern_management/public/mocks.ts b/src/plugins/index_pattern_management/public/mocks.ts index a41fa58ec3a69..5bcca1f09029f 100644 --- a/src/plugins/index_pattern_management/public/mocks.ts +++ b/src/plugins/index_pattern_management/public/mocks.ts @@ -71,7 +71,8 @@ const createIndexPatternManagmentContext = (): { indexPatternManagementStart: createStartContract(), setBreadcrumbs: () => {}, fieldFormatEditors: indexPatternFieldEditor.fieldFormatEditors, - IndexPatternEditor: indexPatternEditorPluginMock.createStartContract().IndexPatternEditorComponent, + IndexPatternEditor: indexPatternEditorPluginMock.createStartContract() + .IndexPatternEditorComponent, }; }; From 6cd0e5f5fc36eb8a152f748498954e1ab22be581 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Tue, 3 Aug 2021 10:21:06 -0500 Subject: [PATCH 096/130] rendering tweaks --- .../empty_index_list_prompt.test.tsx.snap | 50 +++++++++---------- .../empty_index_list_prompt.tsx | 4 +- .../components/index_pattern_editor.scss | 3 +- 3 files changed, 28 insertions(+), 29 deletions(-) diff --git a/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_list_prompt/__snapshots__/empty_index_list_prompt.test.tsx.snap b/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_list_prompt/__snapshots__/empty_index_list_prompt.test.tsx.snap index fbda331f72164..a104c36e3a8a0 100644 --- a/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_list_prompt/__snapshots__/empty_index_list_prompt.test.tsx.snap +++ b/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_list_prompt/__snapshots__/empty_index_list_prompt.test.tsx.snap @@ -184,33 +184,33 @@ exports[`EmptyIndexListPrompt should render normally 1`] = ` /> + + + + + , + } + } + /> + - - - - - , - } - } - /> - `; diff --git a/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_list_prompt/empty_index_list_prompt.tsx b/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_list_prompt/empty_index_list_prompt.tsx index fe1e65464bc4b..1331eb9b7c4ac 100644 --- a/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_list_prompt/empty_index_list_prompt.tsx +++ b/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_list_prompt/empty_index_list_prompt.tsx @@ -200,10 +200,10 @@ export const EmptyIndexListPrompt = ({ /> + + {canSaveIndexPattern && createAnywayLink} - - {canSaveIndexPattern && createAnywayLink} ); diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_editor.scss b/src/plugins/index_pattern_editor/public/components/index_pattern_editor.scss index a0840f57c2b17..5b3a30effc767 100644 --- a/src/plugins/index_pattern_editor/public/components/index_pattern_editor.scss +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_editor.scss @@ -1,5 +1,4 @@ .indexPatternEditor__form { - padding-top: $euiSize * 3; flex-grow: 1; } @@ -11,4 +10,4 @@ .indexPatternEditor__footer { margin-left: -$euiSizeL; margin-right: -$euiSizeL; -} \ No newline at end of file +} From d336609d9a949c6ba62124086e7027e351e413d7 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Tue, 3 Aug 2021 14:11:00 -0500 Subject: [PATCH 097/130] fix rollup field info --- .../__snapshots__/indexed_fields_table.test.tsx.snap | 2 +- src/plugins/index_pattern_management/public/components/utils.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/__snapshots__/indexed_fields_table.test.tsx.snap b/src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/__snapshots__/indexed_fields_table.test.tsx.snap index 239f09d7a8ec6..c03899554ffff 100644 --- a/src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/__snapshots__/indexed_fields_table.test.tsx.snap +++ b/src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/__snapshots__/indexed_fields_table.test.tsx.snap @@ -125,7 +125,7 @@ exports[`IndexedFieldsTable IndexedFieldsTable with rollup index pattern should "hasRuntime": false, "info": Array [ "Rollup aggregations:", - "histogram (interval: )", + "histogram (interval: 5)", "avg", "max", "min", diff --git a/src/plugins/index_pattern_management/public/components/utils.ts b/src/plugins/index_pattern_management/public/components/utils.ts index b05fa03b7decf..6520de95028c6 100644 --- a/src/plugins/index_pattern_management/public/components/utils.ts +++ b/src/plugins/index_pattern_management/public/components/utils.ts @@ -130,7 +130,7 @@ export const getFieldInfo = (indexPattern: IndexPattern, field: IFieldType) => { defaultMessage: '{aggName} (interval: {interval})', values: { aggName, - interval: agg.fixed_interval, + interval: agg.interval, }, }); default: From 5c00ee6a8aa92445b039de2f87694a1d1fecb4d5 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Tue, 3 Aug 2021 14:31:38 -0500 Subject: [PATCH 098/130] hide pagination when there aren't any indices --- .../preview_panel/preview_panel.tsx | 21 ++++-- .../status_message/status_message.tsx | 67 +++++++++++-------- 2 files changed, 55 insertions(+), 33 deletions(-) diff --git a/src/plugins/index_pattern_editor/public/components/preview_panel/preview_panel.tsx b/src/plugins/index_pattern_editor/public/components/preview_panel/preview_panel.tsx index 0eea9af7086cd..28413debdb2a9 100644 --- a/src/plugins/index_pattern_editor/public/components/preview_panel/preview_panel.tsx +++ b/src/plugins/index_pattern_editor/public/components/preview_panel/preview_panel.tsx @@ -21,6 +21,20 @@ interface Props { } export const PreviewPanel = ({ type, allowHidden, title = '', matched }: Props) => { + const indicesListContent = + matched.visibleIndices.length || matched.allIndices.length ? ( + <> + + + + ) : ( + <> + ); + return ( <> - - + {indicesListContent} ); }; diff --git a/src/plugins/index_pattern_editor/public/components/preview_panel/status_message/status_message.tsx b/src/plugins/index_pattern_editor/public/components/preview_panel/status_message/status_message.tsx index 40a7aa1a8d555..6cd83eb26b5d6 100644 --- a/src/plugins/index_pattern_editor/public/components/preview_panel/status_message/status_message.tsx +++ b/src/plugins/index_pattern_editor/public/components/preview_panel/status_message/status_message.tsx @@ -25,6 +25,43 @@ interface StatusMessageProps { showSystemIndices: boolean; } +const NoMatchStatusMessage = (allIndicesLength: number) => ( + + + + + ), + indicesLength: allIndicesLength, + }} + /> + +); + +const NoMatchNoIndicesStatusMessage = () => ( + + + +); + export const StatusMessage: React.FC = ({ matchedIndices: { allIndices = [], exactMatchedIndices = [], partialMatchedIndices = [] }, isIncludingSystemIndices, @@ -124,33 +161,9 @@ export const StatusMessage: React.FC = ({ } else { statusIcon = undefined; statusColor = 'warning'; - statusMessage = ( - - - - - ), - indicesLength: allIndicesLength, - }} - /> - - ); + statusMessage = allIndicesLength + ? NoMatchStatusMessage(allIndicesLength) + : NoMatchNoIndicesStatusMessage(); } return ( From ed375e735aa9b08ce73b33f88d7a3ea9ce2d8ca9 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Tue, 3 Aug 2021 14:35:54 -0500 Subject: [PATCH 099/130] simplify title field set value --- .../public/components/form_fields/title_field.tsx | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/plugins/index_pattern_editor/public/components/form_fields/title_field.tsx b/src/plugins/index_pattern_editor/public/components/form_fields/title_field.tsx index 9b9a3977024fd..454d5b1b868da 100644 --- a/src/plugins/index_pattern_editor/public/components/form_fields/title_field.tsx +++ b/src/plugins/index_pattern_editor/public/components/form_fields/title_field.tsx @@ -197,17 +197,14 @@ export const TitleField = ({ if (query.length === 1 && !appendedWildcard && canAppendWildcard(query)) { query += '*'; setAppendedWildcard(true); - field.setValue(query); setTimeout(() => e.target.setSelectionRange(1, 1)); } else { if (['', '*'].includes(query) && appendedWildcard) { query = ''; setAppendedWildcard(false); } - field.setValue(query); } - // todo - // setLastTitle(query); + field.setValue(query); }} isLoading={field.isValidating} fullWidth From adf13238f49f47a3363527b91b585fb2e8acd9d4 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Tue, 3 Aug 2021 14:45:34 -0500 Subject: [PATCH 100/130] memoize title field config --- .../components/form_fields/title_field.tsx | 26 ++++++++++++++----- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/src/plugins/index_pattern_editor/public/components/form_fields/title_field.tsx b/src/plugins/index_pattern_editor/public/components/form_fields/title_field.tsx index 454d5b1b868da..ef023d6d7568e 100644 --- a/src/plugins/index_pattern_editor/public/components/form_fields/title_field.tsx +++ b/src/plugins/index_pattern_editor/public/components/form_fields/title_field.tsx @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -import React, { ChangeEvent, useState } from 'react'; +import React, { ChangeEvent, useState, useMemo } from 'react'; import { i18n } from '@kbn/i18n'; import { EuiFormRow, EuiFieldText } from '@elastic/eui'; import { @@ -159,16 +159,28 @@ export const TitleField = ({ }: TitleFieldProps) => { const [appendedWildcard, setAppendedWildcard] = useState(false); - return ( - - path="title" - config={getTitleConfig({ + const fieldConfig = useMemo( + () => + getTitleConfig({ namesNotAllowed: existingIndexPatterns, isRollup, matchedIndices, rollupIndicesCapabilities, refreshMatchedIndices, - })} + }), + [ + existingIndexPatterns, + isRollup, + matchedIndices, + rollupIndicesCapabilities, + refreshMatchedIndices, + ] + ); + + return ( + + path="title" + config={fieldConfig} componentProps={{ euiFieldProps: { 'aria-label': i18n.translate('indexPatternEditor.form.titleAriaLabel', { @@ -190,7 +202,7 @@ export const TitleField = ({ > ) => { e.persist(); let query = e.target.value; From a8d7d36ba30c4ca66ee0c0ec1c67d362369cd0ac Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Tue, 3 Aug 2021 14:58:02 -0500 Subject: [PATCH 101/130] improve types, add useCallbacks --- .../advanced_params_section.tsx | 6 +++--- .../index_pattern_editor_flyout_content.tsx | 21 +++++++++++-------- .../status_message/status_message.tsx | 8 ++----- 3 files changed, 17 insertions(+), 18 deletions(-) diff --git a/src/plugins/index_pattern_editor/public/components/advanced_params_content/advanced_params_section.tsx b/src/plugins/index_pattern_editor/public/components/advanced_params_content/advanced_params_section.tsx index cdfff74daa3cc..b313fddb8ee2d 100644 --- a/src/plugins/index_pattern_editor/public/components/advanced_params_content/advanced_params_section.tsx +++ b/src/plugins/index_pattern_editor/public/components/advanced_params_content/advanced_params_section.tsx @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -import React, { useState } from 'react'; +import React, { useState, useCallback } from 'react'; import { i18n } from '@kbn/i18n'; import { EuiButtonEmpty, EuiSpacer } from '@elastic/eui'; @@ -18,9 +18,9 @@ interface Props { export const AdvancedParamsSection = ({ children }: Props) => { const [isVisible, setIsVisible] = useState(false); - const toggleIsVisible = () => { + const toggleIsVisible = useCallback(() => { setIsVisible(!isVisible); - }; + }, [isVisible]); return ( <> diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx index 7573a0e611844..1f7e62d47451e 100644 --- a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx @@ -268,6 +268,17 @@ const IndexPatternEditorFlyoutContentComponent = ({ [http, allowHidden, allSources, type, rollupIndicesCapabilities] ); + const onTypeChange = useCallback( + (newType) => { + form.setFieldValue('title', ''); + form.setFieldValue('timestampField', ''); + if (newType === INDEX_PATTERN_TYPE.ROLLUP) { + form.setFieldValue('allowHidden', false); + } + }, + [form] + ); + if (isLoadingSources || isLoadingIndexPatterns) { return ; } @@ -281,15 +292,7 @@ const IndexPatternEditorFlyoutContentComponent = ({ <> - { - form.setFieldValue('title', ''); - form.setFieldValue('timestampField', ''); - if (newType === INDEX_PATTERN_TYPE.ROLLUP) { - form.setFieldValue('allowHidden', false); - } - }} - /> + {type === INDEX_PATTERN_TYPE.ROLLUP ? ( diff --git a/src/plugins/index_pattern_editor/public/components/preview_panel/status_message/status_message.tsx b/src/plugins/index_pattern_editor/public/components/preview_panel/status_message/status_message.tsx index 6cd83eb26b5d6..4eb7682cfd1a4 100644 --- a/src/plugins/index_pattern_editor/public/components/preview_panel/status_message/status_message.tsx +++ b/src/plugins/index_pattern_editor/public/components/preview_panel/status_message/status_message.tsx @@ -12,14 +12,10 @@ import { EuiCallOut } from '@elastic/eui'; import { EuiIconType } from '@elastic/eui/src/components/icon/icon'; import { FormattedMessage } from '@kbn/i18n/react'; -import { MatchedItem } from '../../../types'; +import { MatchedIndicesSet } from '../../../types'; interface StatusMessageProps { - matchedIndices: { - allIndices: MatchedItem[]; - exactMatchedIndices: MatchedItem[]; - partialMatchedIndices: MatchedItem[]; - }; + matchedIndices: MatchedIndicesSet; isIncludingSystemIndices: boolean; query: string; showSystemIndices: boolean; From e07ead7d13d33994b6921a01a7e134a1c7f9d4ab Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Tue, 3 Aug 2021 15:08:13 -0500 Subject: [PATCH 102/130] localize text, add comment, fix type --- .../index_pattern_editor_flyout_content.tsx | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx index 1f7e62d47451e..b15f9643485b3 100644 --- a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx @@ -8,6 +8,7 @@ import React, { useState, useEffect, useCallback, useRef } from 'react'; import { EuiTitle, EuiFlexGroup, EuiFlexItem, EuiSpacer, EuiLoadingSpinner } from '@elastic/eui'; +import { i18n } from '@kbn/i18n'; import { IndexPatternSpec, @@ -64,6 +65,12 @@ export interface FormInternal extends Omit timestampField?: TimestampOption; } +const editorTitle = { + message: i18n.translate('indexPatternEditor.title', { + defaultMessage: 'Create index pattern', + }), +}; + const IndexPatternEditorFlyoutContentComponent = ({ onSave, onCancel, @@ -227,6 +234,7 @@ const IndexPatternEditorFlyoutContentComponent = ({ if (query?.endsWith('*')) { const exactMatchedQuery = getIndices(http, isRollupIndex, query, allowHidden); indexRequests.push(exactMatchedQuery); + // provide default value when not making a request for the partialMatchQuery indexRequests.push(Promise.resolve([])); } else { const exactMatchQuery = getIndices(http, isRollupIndex, query, allowHidden); @@ -319,7 +327,7 @@ const IndexPatternEditorFlyoutContentComponent = ({ -

Create index pattern

+

{editorTitle}
{indexPatternTypeSelect} @@ -360,7 +368,7 @@ const IndexPatternEditorFlyoutContentComponent = ({ <> ) : ( Date: Tue, 3 Aug 2021 15:57:45 -0500 Subject: [PATCH 103/130] fix jest test typescript, refactor type field, add code comments --- .../components/form_fields/title_field.tsx | 6 +- .../components/form_fields/type_field.tsx | 80 ++++++++----------- .../index_pattern_editor_flyout_content.tsx | 8 +- .../status_message/status_message.test.tsx | 3 + .../public/shared_imports.ts | 1 + 5 files changed, 43 insertions(+), 55 deletions(-) diff --git a/src/plugins/index_pattern_editor/public/components/form_fields/title_field.tsx b/src/plugins/index_pattern_editor/public/components/form_fields/title_field.tsx index ef023d6d7568e..55f1ecb4c8da8 100644 --- a/src/plugins/index_pattern_editor/public/components/form_fields/title_field.tsx +++ b/src/plugins/index_pattern_editor/public/components/form_fields/title_field.tsx @@ -75,7 +75,7 @@ interface MatchesValidatorArgs { isRollup: boolean; } -const matchesValidator = ({ +const createMatchesIndicesValidator = ({ rollupIndicesCapabilities, refreshMatchedIndices, isRollup, @@ -92,6 +92,7 @@ const matchesValidator = ({ return; } + // A rollup index pattern needs to match one and only one rollup index. const rollupIndexMatches = matchedIndicesResult.exactMatchedIndices.filter((matchedIndex) => rollupIndices.includes(matchedIndex.name) ); @@ -102,6 +103,7 @@ const matchesValidator = ({ return rollupIndexPatternTooManyMatchesError; } + // Error info is potentially provided via the rollup indices caps request const error = newRollupIndexName && rollupIndicesCapabilities[newRollupIndexName].error; if (error) { @@ -136,7 +138,7 @@ const getTitleConfig = ({ const validations = [ ...titleFieldConfig.validations, // note this is responsible for triggering the state update for the selected source list. - matchesValidator({ + createMatchesIndicesValidator({ rollupIndicesCapabilities, refreshMatchedIndices, isRollup, diff --git a/src/plugins/index_pattern_editor/public/components/form_fields/type_field.tsx b/src/plugins/index_pattern_editor/public/components/form_fields/type_field.tsx index 606197159e53c..23504d713fd8c 100644 --- a/src/plugins/index_pattern_editor/public/components/form_fields/type_field.tsx +++ b/src/plugins/index_pattern_editor/public/components/form_fields/type_field.tsx @@ -13,15 +13,13 @@ import { euiColorAccent } from '@elastic/eui/dist/eui_theme_light.json'; import { FormattedMessage } from '@kbn/i18n/react'; import { - EuiFormRow, - EuiSuperSelect, EuiDescriptionList, EuiDescriptionListTitle, EuiDescriptionListDescription, EuiBadge, } from '@elastic/eui'; -import { UseField } from '../../shared_imports'; +import { UseField, SuperSelectField } from '../../shared_imports'; import { INDEX_PATTERN_TYPE, IndexPatternConfig } from '../../types'; @@ -67,48 +65,34 @@ const rollupSelectItem = ( ); -export const TypeField = ({ onChange }: TypeFieldProps) => { - return ( - path="type"> - {({ label, value, setValue }) => { - if (value === undefined) { - return null; - } - return ( - <> - - { - setValue(newValue); - onChange(newValue); - }} - aria-label={i18n.translate('indexPatternEditor.editor.form.typeSelectAriaLabel', { - defaultMessage: 'Type field', - })} - fullWidth - /> - - - ); - }} - - ); -}; +export const TypeField = ({ onChange }: TypeFieldProps) => ( + + path="type" + data-test-subj="typeField" + onChange={onChange} + component={SuperSelectField} + componentProps={{ + euiFieldProps: { + options: [ + { + value: INDEX_PATTERN_TYPE.DEFAULT, + inputDisplay: i18n.translate('indexPatternEditor.typeSelect.standard', { + defaultMessage: 'Standard', + }), + dropdownDisplay: standardSelectItem, + }, + { + value: INDEX_PATTERN_TYPE.ROLLUP, + inputDisplay: i18n.translate('indexPatternEditor.typeSelect.rollup', { + defaultMessage: 'Rollup', + }), + dropdownDisplay: rollupSelectItem, + }, + ], + 'aria-label': i18n.translate('indexPatternEditor.editor.form.typeSelectAriaLabel', { + defaultMessage: 'Type field', + }), + }, + }} + /> +); diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx index b15f9643485b3..f2bfd7b6781cb 100644 --- a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx @@ -65,11 +65,9 @@ export interface FormInternal extends Omit timestampField?: TimestampOption; } -const editorTitle = { - message: i18n.translate('indexPatternEditor.title', { - defaultMessage: 'Create index pattern', - }), -}; +const editorTitle = i18n.translate('indexPatternEditor.title', { + defaultMessage: 'Create index pattern', +}); const IndexPatternEditorFlyoutContentComponent = ({ onSave, diff --git a/src/plugins/index_pattern_editor/public/components/preview_panel/status_message/status_message.test.tsx b/src/plugins/index_pattern_editor/public/components/preview_panel/status_message/status_message.test.tsx index 314cb77e262ab..1bae9bdf3c666 100644 --- a/src/plugins/index_pattern_editor/public/components/preview_panel/status_message/status_message.test.tsx +++ b/src/plugins/index_pattern_editor/public/components/preview_panel/status_message/status_message.test.tsx @@ -22,6 +22,7 @@ const matchedIndices = { ] as unknown) as MatchedItem[], exactMatchedIndices: [] as MatchedItem[], partialMatchedIndices: ([{ name: 'kibana', ...tagsPartial }] as unknown) as MatchedItem[], + visibleIndices: [], }; describe('StatusMessage', () => { @@ -94,6 +95,7 @@ describe('StatusMessage', () => { allIndices: [], exactMatchedIndices: [], partialMatchedIndices: [], + visibleIndices: [], }} isIncludingSystemIndices={false} query={''} @@ -111,6 +113,7 @@ describe('StatusMessage', () => { allIndices: [], exactMatchedIndices: [], partialMatchedIndices: [], + visibleIndices: [], }} isIncludingSystemIndices={true} query={''} diff --git a/src/plugins/index_pattern_editor/public/shared_imports.ts b/src/plugins/index_pattern_editor/public/shared_imports.ts index dcdcf4e9ae3f0..c99d32e0c8a28 100644 --- a/src/plugins/index_pattern_editor/public/shared_imports.ts +++ b/src/plugins/index_pattern_editor/public/shared_imports.ts @@ -44,6 +44,7 @@ export { NumericField, SelectField, FormRow, + SuperSelectField, } from '../../es_ui_shared/static/forms/components'; export { HttpStart } from '../../../core/public'; From 9d0345407a576221956069084841a338d1ac1e1f Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Tue, 3 Aug 2021 22:49:09 -0500 Subject: [PATCH 104/130] fix title input --- .../components/form_fields/type_field.tsx | 80 +++++++++++-------- 1 file changed, 48 insertions(+), 32 deletions(-) diff --git a/src/plugins/index_pattern_editor/public/components/form_fields/type_field.tsx b/src/plugins/index_pattern_editor/public/components/form_fields/type_field.tsx index 23504d713fd8c..606197159e53c 100644 --- a/src/plugins/index_pattern_editor/public/components/form_fields/type_field.tsx +++ b/src/plugins/index_pattern_editor/public/components/form_fields/type_field.tsx @@ -13,13 +13,15 @@ import { euiColorAccent } from '@elastic/eui/dist/eui_theme_light.json'; import { FormattedMessage } from '@kbn/i18n/react'; import { + EuiFormRow, + EuiSuperSelect, EuiDescriptionList, EuiDescriptionListTitle, EuiDescriptionListDescription, EuiBadge, } from '@elastic/eui'; -import { UseField, SuperSelectField } from '../../shared_imports'; +import { UseField } from '../../shared_imports'; import { INDEX_PATTERN_TYPE, IndexPatternConfig } from '../../types'; @@ -65,34 +67,48 @@ const rollupSelectItem = ( ); -export const TypeField = ({ onChange }: TypeFieldProps) => ( - - path="type" - data-test-subj="typeField" - onChange={onChange} - component={SuperSelectField} - componentProps={{ - euiFieldProps: { - options: [ - { - value: INDEX_PATTERN_TYPE.DEFAULT, - inputDisplay: i18n.translate('indexPatternEditor.typeSelect.standard', { - defaultMessage: 'Standard', - }), - dropdownDisplay: standardSelectItem, - }, - { - value: INDEX_PATTERN_TYPE.ROLLUP, - inputDisplay: i18n.translate('indexPatternEditor.typeSelect.rollup', { - defaultMessage: 'Rollup', - }), - dropdownDisplay: rollupSelectItem, - }, - ], - 'aria-label': i18n.translate('indexPatternEditor.editor.form.typeSelectAriaLabel', { - defaultMessage: 'Type field', - }), - }, - }} - /> -); +export const TypeField = ({ onChange }: TypeFieldProps) => { + return ( + path="type"> + {({ label, value, setValue }) => { + if (value === undefined) { + return null; + } + return ( + <> + + { + setValue(newValue); + onChange(newValue); + }} + aria-label={i18n.translate('indexPatternEditor.editor.form.typeSelectAriaLabel', { + defaultMessage: 'Type field', + })} + fullWidth + /> + + + ); + }} + + ); +}; From 5be1a92ae73031738455c2423fa66f199993f78b Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Tue, 3 Aug 2021 23:23:54 -0500 Subject: [PATCH 105/130] update select timestamp field error text --- .../public/components/form_fields/timestamp_field.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/index_pattern_editor/public/components/form_fields/timestamp_field.tsx b/src/plugins/index_pattern_editor/public/components/form_fields/timestamp_field.tsx index 366f22f6020e5..e51b7e7a6c465 100644 --- a/src/plugins/index_pattern_editor/public/components/form_fields/timestamp_field.tsx +++ b/src/plugins/index_pattern_editor/public/components/form_fields/timestamp_field.tsx @@ -37,7 +37,7 @@ const requireTimestampOptionValidator = (options: Props['options']): ValidationC message: i18n.translate( 'indexPatternEditor.requireTimestampOption.ValidationErrorMessage', { - defaultMessage: 'Please select a timestamp field option.', + defaultMessage: 'Select a timestamp field option.', } ), }; From f77447d01d4bab1abc9fc26b82f2f43796d6b5e7 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Wed, 4 Aug 2021 00:07:04 -0500 Subject: [PATCH 106/130] remove dupe code --- .../index_pattern_editor_flyout_content.tsx | 1 - ...index_pattern_flyout_content_container.tsx | 19 +------------------ 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx index f2bfd7b6781cb..56789c0838ccb 100644 --- a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx @@ -52,7 +52,6 @@ export interface Props { * Handler for the "cancel" footer button */ onCancel: () => void; - existingIndexPatterns: string[]; defaultTypeIsRollup?: boolean; requireTimestampField?: boolean; } diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_flyout_content_container.tsx b/src/plugins/index_pattern_editor/public/components/index_pattern_flyout_content_container.tsx index 3e598056310df..124bf42d029c3 100644 --- a/src/plugins/index_pattern_editor/public/components/index_pattern_flyout_content_container.tsx +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_flyout_content_container.tsx @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -import React, { useEffect, useState } from 'react'; +import React from 'react'; import { i18n } from '@kbn/i18n'; import { IndexPattern, IndexPatternSpec, useKibana } from '../shared_imports'; @@ -53,27 +53,10 @@ export const IndexPatternFlyoutContentContainer = ({ await onSave(indexPattern); }; - const [existingIndexPatterns, setExistingIndexPatterns] = useState([]); - - useEffect(() => { - let isMounted = true; - const getTitles = async () => { - const indexPatternTitles = await indexPatternService.getTitles(); - if (isMounted) { - setExistingIndexPatterns(indexPatternTitles); - } - }; - getTitles(); - return () => { - isMounted = false; - }; - }, [indexPatternService]); - return ( From 446755fc59e2b057ab1aacfee41e2354ad68899e Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Wed, 4 Aug 2021 11:54:22 -0500 Subject: [PATCH 107/130] add spacer to form layout, move types to type file --- .../index_pattern_editor_flyout_content.tsx | 11 +++-------- src/plugins/index_pattern_editor/public/types.ts | 9 +++++++++ 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx index 56789c0838ccb..d78790d562f6c 100644 --- a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx @@ -29,6 +29,8 @@ import { INDEX_PATTERN_TYPE, IndexPatternConfig, MatchedIndicesSet, + FormInternal, + TimestampOption, } from '../types'; import { @@ -55,14 +57,6 @@ export interface Props { defaultTypeIsRollup?: boolean; requireTimestampField?: boolean; } -export interface TimestampOption { - display: string; - fieldName?: string; -} - -export interface FormInternal extends Omit { - timestampField?: TimestampOption; -} const editorTitle = i18n.translate('indexPatternEditor.title', { defaultMessage: 'Create index pattern', @@ -295,6 +289,7 @@ const IndexPatternEditorFlyoutContentComponent = ({ const indexPatternTypeSelect = showIndexPatternTypeSelect() ? ( <> + diff --git a/src/plugins/index_pattern_editor/public/types.ts b/src/plugins/index_pattern_editor/public/types.ts index bb0598d266643..120eb3fe8bed2 100644 --- a/src/plugins/index_pattern_editor/public/types.ts +++ b/src/plugins/index_pattern_editor/public/types.ts @@ -160,6 +160,15 @@ export interface IndexPatternConfig { type: INDEX_PATTERN_TYPE; } +export interface FormInternal extends Omit { + timestampField?: TimestampOption; +} + +export interface TimestampOption { + display: string; + fieldName?: string; +} + export interface MatchedIndicesSet { allIndices: MatchedItem[]; exactMatchedIndices: MatchedItem[]; From ffaf7cff5ed1c81bcb10b94ca702650000c44ac8 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Wed, 4 Aug 2021 12:35:55 -0500 Subject: [PATCH 108/130] type fixes --- .../public/components/form_fields/timestamp_field.tsx | 2 +- .../index_pattern_editor/public/lib/extract_time_fields.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/index_pattern_editor/public/components/form_fields/timestamp_field.tsx b/src/plugins/index_pattern_editor/public/components/form_fields/timestamp_field.tsx index e51b7e7a6c465..643c73bb9fdf5 100644 --- a/src/plugins/index_pattern_editor/public/components/form_fields/timestamp_field.tsx +++ b/src/plugins/index_pattern_editor/public/components/form_fields/timestamp_field.tsx @@ -18,7 +18,7 @@ import { getFieldValidityAndErrorMessage, } from '../../shared_imports'; -import { TimestampOption } from '../index_pattern_editor_flyout_content'; +import { TimestampOption } from '../../types'; import { schema } from '../form_schema'; interface Props { diff --git a/src/plugins/index_pattern_editor/public/lib/extract_time_fields.ts b/src/plugins/index_pattern_editor/public/lib/extract_time_fields.ts index 19bab817efb5d..82b94b5c6744a 100644 --- a/src/plugins/index_pattern_editor/public/lib/extract_time_fields.ts +++ b/src/plugins/index_pattern_editor/public/lib/extract_time_fields.ts @@ -8,7 +8,7 @@ import { i18n } from '@kbn/i18n'; import { IndexPatternField } from '../../../../plugins/data/public'; -import { TimestampOption } from '../components/index_pattern_editor_flyout_content'; +import { TimestampOption } from '../types'; export function extractTimeFields( fields: IndexPatternField[], From fa3de3a785c3ab2523b5bc5213d7f9c3ce49a714 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Wed, 4 Aug 2021 18:42:26 -0500 Subject: [PATCH 109/130] Update readme --- src/plugins/index_pattern_editor/README.md | 24 ++++++++++------------ 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/src/plugins/index_pattern_editor/README.md b/src/plugins/index_pattern_editor/README.md index d14a6e63a3afb..06903168ca0e9 100644 --- a/src/plugins/index_pattern_editor/README.md +++ b/src/plugins/index_pattern_editor/README.md @@ -6,13 +6,13 @@ Create index patterns from within Kibana apps. You first need to add in your kibana.json the "`indexPatternEditor`" plugin as a required dependency of your plugin. -You can use the `` component or the API available on the start contract of the indexPatternEditor plugin: +You will then receive in the start contract of the indexPatternEditor plugin the following API: ### `userPermissions.editIndexPattern(): boolean` Convenience method that uses the `core.application.capabilities` api to determine whether the user can edit the index pattern. -### `openEditor(options: OpenEditorOptions): CloseEditor` +### `openEditor(options: IndexPatternEditorProps): CloseEditor` Use this method to display the index pattern editor to create an index pattern. @@ -34,17 +34,15 @@ The default index pattern type can be optionally specified as `rollup`. The editor can require a timestamp field on the index pattern. -### `` +### IndexPatternEditorComponent -This the React component interface equivalent to `openEditor`. It takes the same arguments but also requires a `services` object argument of type `IndexPatternEditorContext` - +This the React component interface equivalent to `openEditor`. It takes the same arguments - -```ts -export interface IndexPatternEditorContext { - uiSettings: IUiSettingsClient; - docLinks: DocLinksStart; - http: HttpSetup; - notifications: NotificationsStart; - application: ApplicationStart; - indexPatternService: DataPublicPluginStart['indexPatterns']; -} +```tsx + ``` From 33ccbdb62a74b1852c66164948eae3b233ea468a Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Wed, 4 Aug 2021 20:44:26 -0500 Subject: [PATCH 110/130] added comments/docs --- src/plugins/index_pattern_editor/README.md | 2 +- .../index_pattern_editor/public/open_editor.tsx | 13 +++---------- .../index_pattern_editor/public/plugin.tsx | 15 +++++++++++++++ src/plugins/index_pattern_editor/public/types.ts | 11 +++++++++-- 4 files changed, 28 insertions(+), 13 deletions(-) diff --git a/src/plugins/index_pattern_editor/README.md b/src/plugins/index_pattern_editor/README.md index 06903168ca0e9..3ffb589230732 100644 --- a/src/plugins/index_pattern_editor/README.md +++ b/src/plugins/index_pattern_editor/README.md @@ -10,7 +10,7 @@ You will then receive in the start contract of the indexPatternEditor plugin the ### `userPermissions.editIndexPattern(): boolean` -Convenience method that uses the `core.application.capabilities` api to determine whether the user can edit the index pattern. +Convenience method that uses the `core.application.capabilities` api to determine whether the user can create or edit the index pattern. ### `openEditor(options: IndexPatternEditorProps): CloseEditor` diff --git a/src/plugins/index_pattern_editor/public/open_editor.tsx b/src/plugins/index_pattern_editor/public/open_editor.tsx index 86f92361c3f11..20b0d34f2c236 100644 --- a/src/plugins/index_pattern_editor/public/open_editor.tsx +++ b/src/plugins/index_pattern_editor/public/open_editor.tsx @@ -17,23 +17,16 @@ import { DataPublicPluginStart, } from './shared_imports'; -import { CloseEditor, IndexPatternEditorContext } from './types'; +import { CloseEditor, IndexPatternEditorContext, IndexPatternEditorProps } from './types'; import { IndexPatternFlyoutContentContainer } from './components/index_pattern_flyout_content_container'; -export interface OpenEditorOptions { - onSave: (indexPattern: IndexPattern) => void; - onCancel?: () => void; - defaultTypeIsRollup?: boolean; - requireTimestampField?: boolean; -} - interface Dependencies { core: CoreStart; indexPatternService: DataPublicPluginStart['indexPatterns']; } export const getEditorOpener = ({ core, indexPatternService }: Dependencies) => ( - options: OpenEditorOptions + options: IndexPatternEditorProps ): CloseEditor => { const { uiSettings, overlays, docLinks, notifications, http, application } = core; const { @@ -54,7 +47,7 @@ export const getEditorOpener = ({ core, indexPatternService }: Dependencies) => onCancel = () => {}, defaultTypeIsRollup = false, requireTimestampField = false, - }: OpenEditorOptions): CloseEditor => { + }: IndexPatternEditorProps): CloseEditor => { const closeEditor = () => { if (overlayRef) { overlayRef.close(); diff --git a/src/plugins/index_pattern_editor/public/plugin.tsx b/src/plugins/index_pattern_editor/public/plugin.tsx index e3b9b587beed7..39e218b954108 100644 --- a/src/plugins/index_pattern_editor/public/plugin.tsx +++ b/src/plugins/index_pattern_editor/public/plugin.tsx @@ -30,10 +30,20 @@ export class IndexPatternEditorPlugin const { data } = plugins; return { + /** + * Index pattern editor flyout via function interface + * @param IndexPatternEditorProps - index pattern editor config + * @returns method to close editor + */ openEditor: getEditorOpener({ core, indexPatternService: data.indexPatterns, }), + /** + * Index pattern editor flyout via react component + * @param IndexPatternEditorProps - index pattern editor config + * @returns JSX.Element + */ IndexPatternEditorComponent: (props: IndexPatternEditorProps) => ( ), + /** + * Convenience method to determine whether the user can create or edit edit the index patterns. + * + * @returns boolean + */ userPermissions: { editIndexPattern: () => { return application.capabilities.management.kibana.indexPatterns; diff --git a/src/plugins/index_pattern_editor/public/types.ts b/src/plugins/index_pattern_editor/public/types.ts index 120eb3fe8bed2..1e55c0056d900 100644 --- a/src/plugins/index_pattern_editor/public/types.ts +++ b/src/plugins/index_pattern_editor/public/types.ts @@ -19,7 +19,6 @@ import { EuiComboBoxOptionOption } from '@elastic/eui'; import type { IndexPattern } from 'src/plugins/data/public'; import { DataPublicPluginStart, IndexPatternAggRestrictions } from './shared_imports'; -import { OpenEditorOptions } from './open_editor'; export interface IndexPatternEditorContext { uiSettings: IUiSettingsClient; @@ -30,16 +29,24 @@ export interface IndexPatternEditorContext { indexPatternService: DataPublicPluginStart['indexPatterns']; } +/** @public */ export interface IndexPatternEditorProps { /** * Handler for the "save" footer button + * @param indexPattern - newly created index pattern */ onSave: (indexPattern: IndexPattern) => void; /** * Handler for the "cancel" footer button */ onCancel: () => void; + /** + * Sets the default index pattern type to rollup. Defaults to false. + */ defaultTypeIsRollup?: boolean; + /** + * Sets whether a timestamp field is required to create an index pattern. Defaults to false. + */ requireTimestampField?: boolean; } @@ -47,7 +54,7 @@ export interface IndexPatternEditorProps { export interface PluginSetup {} export interface PluginStart { - openEditor(options: OpenEditorOptions): () => void; + openEditor(options: IndexPatternEditorProps): () => void; IndexPatternEditorComponent: FC; userPermissions: { editIndexPattern: () => boolean; From 3d49067a76588588ebf6c52c21da239a35db6aa2 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Wed, 4 Aug 2021 22:24:10 -0500 Subject: [PATCH 111/130] grammar fixes --- .../empty_index_pattern_prompt.test.tsx.snap | 2 +- .../empty_index_pattern_prompt.tsx | 2 +- .../form_fields/timestamp_field.tsx | 4 ++-- .../components/form_fields/title_field.tsx | 2 +- .../public/components/form_schema.ts | 4 ++-- .../public/components/i18n_texts.ts | 4 ++-- .../status_message/status_message.tsx | 23 ++++++++----------- 7 files changed, 19 insertions(+), 22 deletions(-) diff --git a/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_pattern_prompt/__snapshots__/empty_index_pattern_prompt.test.tsx.snap b/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_pattern_prompt/__snapshots__/empty_index_pattern_prompt.test.tsx.snap index 62adf88cc2a0e..7ffa13d58ee61 100644 --- a/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_pattern_prompt/__snapshots__/empty_index_pattern_prompt.test.tsx.snap +++ b/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_pattern_prompt/__snapshots__/empty_index_pattern_prompt.test.tsx.snap @@ -51,7 +51,7 @@ exports[`EmptyIndexPatternPrompt should render normally 1`] = `

diff --git a/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_pattern_prompt/empty_index_pattern_prompt.tsx b/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_pattern_prompt/empty_index_pattern_prompt.tsx index 77f6de4abd8c3..f7526263601ad 100644 --- a/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_pattern_prompt/empty_index_pattern_prompt.tsx +++ b/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_pattern_prompt/empty_index_pattern_prompt.tsx @@ -59,7 +59,7 @@ export const EmptyIndexPatternPrompt = ({

diff --git a/src/plugins/index_pattern_editor/public/components/form_fields/timestamp_field.tsx b/src/plugins/index_pattern_editor/public/components/form_fields/timestamp_field.tsx index 643c73bb9fdf5..9cbff901a52a9 100644 --- a/src/plugins/index_pattern_editor/public/components/form_fields/timestamp_field.tsx +++ b/src/plugins/index_pattern_editor/public/components/form_fields/timestamp_field.tsx @@ -63,11 +63,11 @@ const getTimestampConfig = ( }; const noTimestampOptionText = i18n.translate('indexPatternEditor.editor.form.noTimeFieldsLabel', { - defaultMessage: "The matching data sources don't have time fields.", + defaultMessage: "The matching sources don't have a time field.", }); const timestampFieldHelp = i18n.translate('indexPatternEditor.editor.form.timeFieldHelp', { - defaultMessage: 'Select a primary time field for use with the global time filter.', + defaultMessage: 'Select a primary timestamp field for use with the global time filter.', }); export const TimestampField = ({ diff --git a/src/plugins/index_pattern_editor/public/components/form_fields/title_field.tsx b/src/plugins/index_pattern_editor/public/components/form_fields/title_field.tsx index 55f1ecb4c8da8..69ae4ef68a189 100644 --- a/src/plugins/index_pattern_editor/public/components/form_fields/title_field.tsx +++ b/src/plugins/index_pattern_editor/public/components/form_fields/title_field.tsx @@ -51,7 +51,7 @@ const rollupIndexPatternTooManyMatchesError = { const mustMatchError = { message: i18n.translate('indexPatternEditor.createIndex.noMatch', { - defaultMessage: 'Must match one or more indices, data streams, or index aliases', + defaultMessage: 'Name must match one or more indices, data streams, or index aliases.', }), }; diff --git a/src/plugins/index_pattern_editor/public/components/form_schema.ts b/src/plugins/index_pattern_editor/public/components/form_schema.ts index 6ae62921e58da..89348a32035d3 100644 --- a/src/plugins/index_pattern_editor/public/components/form_schema.ts +++ b/src/plugins/index_pattern_editor/public/components/form_schema.ts @@ -35,7 +35,7 @@ export const schema = { defaultMessage: 'Timestamp field', }), helpText: i18n.translate('indexPatternEditor.editor.form.timestampFieldHelp', { - defaultMessage: 'Select a primary time field for use with the global time filter.', + defaultMessage: 'Select a primary timestamp field for use with the global time filter.', }), validations: [], }, @@ -51,7 +51,7 @@ export const schema = { }), helpText: i18n.translate('indexPatternEditor.editor.form.customIdHelp', { defaultMessage: - 'Kibana will provide a unique identifier for each index pattern. If you do not want to use this unique ID, enter a custom one.', + 'Kibana provides a unique identifier for each index pattern, or you can create your own.', }), }, type: { diff --git a/src/plugins/index_pattern_editor/public/components/i18n_texts.ts b/src/plugins/index_pattern_editor/public/components/i18n_texts.ts index 8231901012e05..21c6b1495b468 100644 --- a/src/plugins/index_pattern_editor/public/components/i18n_texts.ts +++ b/src/plugins/index_pattern_editor/public/components/i18n_texts.ts @@ -13,11 +13,11 @@ export const geti18nTexts = () => { noTimestampOptionText: i18n.translate( 'indexPatternEditor.createIndexPattern.stepTime.noTimeFieldsLabel', { - defaultMessage: "The matching data sources don't have time fields.", + defaultMessage: "The matching sources don't have time fields.", } ), timestampFieldHelp: i18n.translate('indexPatternEditor.editor.form.timeFieldHelp', { - defaultMessage: 'Select a primary time field for use with the global time filter.', + defaultMessage: 'Select a primary timestamp field for use with the global time filter.', }), rollupLabel: i18n.translate('indexPatternEditor.rollupIndexPattern.createIndex.indexLabel', { defaultMessage: 'Rollup', diff --git a/src/plugins/index_pattern_editor/public/components/preview_panel/status_message/status_message.tsx b/src/plugins/index_pattern_editor/public/components/preview_panel/status_message/status_message.tsx index 4eb7682cfd1a4..d3e8995dc9359 100644 --- a/src/plugins/index_pattern_editor/public/components/preview_panel/status_message/status_message.tsx +++ b/src/plugins/index_pattern_editor/public/components/preview_panel/status_message/status_message.tsx @@ -26,18 +26,15 @@ const NoMatchStatusMessage = (allIndicesLength: number) => ( @@ -80,8 +77,8 @@ export const StatusMessage: React.FC = ({ @@ -131,10 +128,10 @@ export const StatusMessage: React.FC = ({ = ({ From 5c4c640c1684a3f425c49a8331ea1341cee80bf7 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Wed, 4 Aug 2021 22:26:55 -0500 Subject: [PATCH 112/130] fix types --- src/plugins/index_pattern_editor/public/index.ts | 5 +---- src/plugins/index_pattern_editor/public/types.ts | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/plugins/index_pattern_editor/public/index.ts b/src/plugins/index_pattern_editor/public/index.ts index 0947c30f418cc..8acd8eaccc4d7 100644 --- a/src/plugins/index_pattern_editor/public/index.ts +++ b/src/plugins/index_pattern_editor/public/index.ts @@ -20,11 +20,8 @@ import { IndexPatternEditorPlugin } from './plugin'; -export { PluginStart as IndexPatternEditorStart } from './types'; +export { PluginStart as IndexPatternEditorStart, IndexPatternEditorProps } from './types'; export function plugin() { return new IndexPatternEditorPlugin(); } - -// TODO Expose types -export type { OpenEditorOptions } from './open_editor'; diff --git a/src/plugins/index_pattern_editor/public/types.ts b/src/plugins/index_pattern_editor/public/types.ts index 1e55c0056d900..2a2abe249b330 100644 --- a/src/plugins/index_pattern_editor/public/types.ts +++ b/src/plugins/index_pattern_editor/public/types.ts @@ -39,7 +39,7 @@ export interface IndexPatternEditorProps { /** * Handler for the "cancel" footer button */ - onCancel: () => void; + onCancel?: () => void; /** * Sets the default index pattern type to rollup. Defaults to false. */ From 9dab76a2dc0b36349a4ad5db85414ae5acca743b Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Wed, 4 Aug 2021 22:39:45 -0500 Subject: [PATCH 113/130] fix localization --- .../components/preview_panel/status_message/status_message.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/plugins/index_pattern_editor/public/components/preview_panel/status_message/status_message.tsx b/src/plugins/index_pattern_editor/public/components/preview_panel/status_message/status_message.tsx index d3e8995dc9359..67c348361d196 100644 --- a/src/plugins/index_pattern_editor/public/components/preview_panel/status_message/status_message.tsx +++ b/src/plugins/index_pattern_editor/public/components/preview_panel/status_message/status_message.tsx @@ -40,7 +40,6 @@ const NoMatchStatusMessage = (allIndicesLength: number) => ( /> ), - indicesLength: allIndicesLength, }} /> From 12829d72ade6704bee21fbd19bcff88fc8e06080 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Wed, 4 Aug 2021 23:01:53 -0500 Subject: [PATCH 114/130] more type cleanup --- ...index_pattern_flyout_content_container.tsx | 28 +++---------------- 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_flyout_content_container.tsx b/src/plugins/index_pattern_editor/public/components/index_pattern_flyout_content_container.tsx index 124bf42d029c3..481c3afb2dc05 100644 --- a/src/plugins/index_pattern_editor/public/components/index_pattern_flyout_content_container.tsx +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_flyout_content_container.tsx @@ -9,36 +9,16 @@ import React from 'react'; import { i18n } from '@kbn/i18n'; -import { IndexPattern, IndexPatternSpec, useKibana } from '../shared_imports'; +import { IndexPatternSpec, useKibana } from '../shared_imports'; import { IndexPatternEditorFlyoutContent } from './index_pattern_editor_flyout_content'; -import { IndexPatternEditorContext } from '../types'; - -export interface IndexPatternFlyoutContentContainerProps { - /** - * Handler for the "save" footer button - */ - onSave: (indexPattern: IndexPattern) => void; - /** - * Handler for the "cancel" footer button - */ - onCancel: () => void; - defaultTypeIsRollup?: boolean; - requireTimestampField?: boolean; -} - -/** - * The container component will be in charge of the communication with the index pattern service - * to retrieve/save the field in the saved object. - * The component is the presentational component that won't know - * anything about where a field comes from and where it should be persisted. - */ +import { IndexPatternEditorContext, IndexPatternEditorProps } from '../types'; export const IndexPatternFlyoutContentContainer = ({ onSave, - onCancel, + onCancel = () => {}, defaultTypeIsRollup, requireTimestampField = false, -}: IndexPatternFlyoutContentContainerProps) => { +}: IndexPatternEditorProps) => { const { services: { indexPatternService, notifications }, } = useKibana(); From 57ee2827acb30e949b52d1656e22b0b28d66911c Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Wed, 4 Aug 2021 23:20:27 -0500 Subject: [PATCH 115/130] display error on failure to save, type cleanup --- .../index_patterns/index_patterns.ts | 15 ++++++++++++--- .../public/components/index.ts | 5 +---- .../public/components/index_pattern_editor.tsx | 11 ++++------- .../index_pattern_flyout_content_container.tsx | 15 +++++++++------ 4 files changed, 26 insertions(+), 20 deletions(-) diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts index cecf3b8c07d1a..d24ac1897317e 100644 --- a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts +++ b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts @@ -526,9 +526,18 @@ export class IndexPatternsService { async createAndSave(spec: IndexPatternSpec, override = false, skipFetchFields = false) { const indexPattern = await this.create(spec, skipFetchFields); - const createdIndexPattern = await this.createSavedObject(indexPattern, override); - await this.setDefault(createdIndexPattern.id!); - return createdIndexPattern; + let createdIndexPattern: IndexPattern; + try { + createdIndexPattern = await this.createSavedObject(indexPattern, override); + await this.setDefault(createdIndexPattern.id!); + } catch (e) { + const title = i18n.translate('data.indexPatterns.unableSaveLabel', { + defaultMessage: 'Failed to save index pattern.', + }); + + this.onNotification({ title, color: 'danger' }); + } + return createdIndexPattern!; } /** diff --git a/src/plugins/index_pattern_editor/public/components/index.ts b/src/plugins/index_pattern_editor/public/components/index.ts index 3712232fac9b3..700dceb11a9c7 100644 --- a/src/plugins/index_pattern_editor/public/components/index.ts +++ b/src/plugins/index_pattern_editor/public/components/index.ts @@ -11,10 +11,7 @@ export { Props as IndexPatternEditorFlyoutContentProps, } from './index_pattern_editor_flyout_content'; -export { - IndexPatternFlyoutContentContainer, - IndexPatternFlyoutContentContainerProps, -} from './index_pattern_flyout_content_container'; +export { IndexPatternFlyoutContentContainer } from './index_pattern_flyout_content_container'; export { IndexPatternEditor } from './index_pattern_editor'; diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_editor.tsx b/src/plugins/index_pattern_editor/public/components/index_pattern_editor.tsx index a59dc0faada36..ca15eb0b5326f 100644 --- a/src/plugins/index_pattern_editor/public/components/index_pattern_editor.tsx +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_editor.tsx @@ -8,15 +8,12 @@ import React from 'react'; import { EuiFlyout } from '@elastic/eui'; -import { - IndexPatternFlyoutContentContainer, - IndexPatternFlyoutContentContainerProps, -} from './index_pattern_flyout_content_container'; -import { IndexPatternEditorContext } from '../types'; +import { IndexPatternFlyoutContentContainer } from './index_pattern_flyout_content_container'; +import { IndexPatternEditorContext, IndexPatternEditorProps } from '../types'; import { createKibanaReactContext } from '../shared_imports'; import './index_pattern_editor.scss'; -export interface IndexPatternEditorProps extends IndexPatternFlyoutContentContainerProps { +export interface IndexPatternEditorPropsWithServices extends IndexPatternEditorProps { services: IndexPatternEditorContext; } @@ -26,7 +23,7 @@ export const IndexPatternEditor = ({ services, defaultTypeIsRollup = false, requireTimestampField = false, -}: IndexPatternEditorProps) => { +}: IndexPatternEditorPropsWithServices) => { const { Provider: KibanaReactContextProvider, } = createKibanaReactContext(services); diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_flyout_content_container.tsx b/src/plugins/index_pattern_editor/public/components/index_pattern_flyout_content_container.tsx index 481c3afb2dc05..40959bc5e6ad7 100644 --- a/src/plugins/index_pattern_editor/public/components/index_pattern_flyout_content_container.tsx +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_flyout_content_container.tsx @@ -25,12 +25,15 @@ export const IndexPatternFlyoutContentContainer = ({ const onSaveClick = async (indexPatternSpec: IndexPatternSpec) => { const indexPattern = await indexPatternService.createAndSave(indexPatternSpec); - const message = i18n.translate('indexPatternEditor.saved', { - defaultMessage: "Saved '{indexPatternTitle}'", - values: { indexPatternTitle: indexPattern.title }, - }); - notifications.toasts.addSuccess(message); - await onSave(indexPattern); + // if there's a failure to save, indexPattern will be undefined + if (indexPattern) { + const message = i18n.translate('indexPatternEditor.saved', { + defaultMessage: "Saved '{indexPatternTitle}'", + values: { indexPatternTitle: indexPattern.title }, + }); + notifications.toasts.addSuccess(message); + await onSave(indexPattern); + } }; return ( From e60c7460ea948b02bfb9b25b8132f85820bf1133 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Thu, 5 Aug 2021 00:24:02 -0500 Subject: [PATCH 116/130] fix allowHidden --- .../public/components/index_pattern_editor_flyout_content.tsx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx index d78790d562f6c..cabff9bfb009b 100644 --- a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx @@ -267,6 +267,10 @@ const IndexPatternEditorFlyoutContentComponent = ({ [http, allowHidden, allSources, type, rollupIndicesCapabilities] ); + useEffect(() => { + reloadMatchedIndices(title); + }, [allowHidden, reloadMatchedIndices, title]); + const onTypeChange = useCallback( (newType) => { form.setFieldValue('title', ''); From a7a45a29e7b982abb4c96ad29589aecf85ca396f Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Thu, 5 Aug 2021 00:40:55 -0500 Subject: [PATCH 117/130] fix jest snapshots --- .../__snapshots__/status_message.test.tsx.snap | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/plugins/index_pattern_editor/public/components/preview_panel/status_message/__snapshots__/status_message.test.tsx.snap b/src/plugins/index_pattern_editor/public/components/preview_panel/status_message/__snapshots__/status_message.test.tsx.snap index fbc7dc3ed7124..fe8a161ba5524 100644 --- a/src/plugins/index_pattern_editor/public/components/preview_panel/status_message/__snapshots__/status_message.test.tsx.snap +++ b/src/plugins/index_pattern_editor/public/components/preview_panel/status_message/__snapshots__/status_message.test.tsx.snap @@ -31,14 +31,13 @@ exports[`StatusMessage should render with no partial matches 1`] = ` title={ Date: Thu, 5 Aug 2021 01:14:28 -0500 Subject: [PATCH 118/130] fix functional test --- .../index_patterns/index_patterns/index_patterns.ts | 13 ++----------- .../index_pattern_flyout_content_container.tsx | 12 +++++++++--- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts index d24ac1897317e..0c09e7f0772d0 100644 --- a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts +++ b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts @@ -526,17 +526,8 @@ export class IndexPatternsService { async createAndSave(spec: IndexPatternSpec, override = false, skipFetchFields = false) { const indexPattern = await this.create(spec, skipFetchFields); - let createdIndexPattern: IndexPattern; - try { - createdIndexPattern = await this.createSavedObject(indexPattern, override); - await this.setDefault(createdIndexPattern.id!); - } catch (e) { - const title = i18n.translate('data.indexPatterns.unableSaveLabel', { - defaultMessage: 'Failed to save index pattern.', - }); - - this.onNotification({ title, color: 'danger' }); - } + const createdIndexPattern = await this.createSavedObject(indexPattern, override); + await this.setDefault(createdIndexPattern.id!); return createdIndexPattern!; } diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_flyout_content_container.tsx b/src/plugins/index_pattern_editor/public/components/index_pattern_flyout_content_container.tsx index 40959bc5e6ad7..f67823bac73a7 100644 --- a/src/plugins/index_pattern_editor/public/components/index_pattern_flyout_content_container.tsx +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_flyout_content_container.tsx @@ -24,15 +24,21 @@ export const IndexPatternFlyoutContentContainer = ({ } = useKibana(); const onSaveClick = async (indexPatternSpec: IndexPatternSpec) => { - const indexPattern = await indexPatternService.createAndSave(indexPatternSpec); - // if there's a failure to save, indexPattern will be undefined - if (indexPattern) { + try { + const indexPattern = await indexPatternService.createAndSave(indexPatternSpec); + const message = i18n.translate('indexPatternEditor.saved', { defaultMessage: "Saved '{indexPatternTitle}'", values: { indexPatternTitle: indexPattern.title }, }); notifications.toasts.addSuccess(message); await onSave(indexPattern); + } catch (e) { + const title = i18n.translate('data.indexPatterns.unableSaveLabel', { + defaultMessage: 'Failed to save index pattern.', + }); + + notifications.toasts.addDanger({ title }); } }; From 7049cae4fe77683bb6007f253f1d56b6334edfe5 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Thu, 5 Aug 2021 07:04:15 -0500 Subject: [PATCH 119/130] fix localization --- .../components/index_pattern_flyout_content_container.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_flyout_content_container.tsx b/src/plugins/index_pattern_editor/public/components/index_pattern_flyout_content_container.tsx index f67823bac73a7..27c6fc8d4cdf4 100644 --- a/src/plugins/index_pattern_editor/public/components/index_pattern_flyout_content_container.tsx +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_flyout_content_container.tsx @@ -34,7 +34,7 @@ export const IndexPatternFlyoutContentContainer = ({ notifications.toasts.addSuccess(message); await onSave(indexPattern); } catch (e) { - const title = i18n.translate('data.indexPatterns.unableSaveLabel', { + const title = i18n.translate('indexPatternEditor.indexPatterns.unableSaveLabel', { defaultMessage: 'Failed to save index pattern.', }); From c9d68350aae1069bc2276db152664112f3e48faf Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Thu, 5 Aug 2021 09:17:49 -0500 Subject: [PATCH 120/130] add lazy loading --- .../empty_index_pattern_prompt.tsx | 4 ++-- .../public/components/index.ts | 2 -- .../components/index_pattern_editor.tsx | 4 ++-- .../components/index_pattern_editor_lazy.tsx | 22 +++++++++++++++++++ ...index_pattern_flyout_content_container.tsx | 5 ++++- .../index_pattern_editor/public/index.ts | 2 +- .../public/open_editor.tsx | 4 ++-- .../index_pattern_editor/public/plugin.tsx | 2 +- 8 files changed, 34 insertions(+), 11 deletions(-) create mode 100644 src/plugins/index_pattern_editor/public/components/index_pattern_editor_lazy.tsx diff --git a/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_pattern_prompt/empty_index_pattern_prompt.tsx b/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_pattern_prompt/empty_index_pattern_prompt.tsx index f7526263601ad..b0bf37c7a007f 100644 --- a/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_pattern_prompt/empty_index_pattern_prompt.tsx +++ b/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_pattern_prompt/empty_index_pattern_prompt.tsx @@ -21,13 +21,13 @@ interface Props { indexPatternsIntroUrl: string; } +const Illustration = lazy(() => import('./assets/index_pattern_illustration')); + export const EmptyIndexPatternPrompt = ({ goToCreate, canSaveIndexPattern, indexPatternsIntroUrl, }: Props) => { - const Illustration = lazy(() => import('./assets/index_pattern_illustration')); - return ( {}} hideCloseButton={true} size="l"> - import('./index_pattern_flyout_content_container') +); + +export const IndexPatternEditorLazy = (props: IndexPatternEditorProps) => ( + }> + + +); diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_flyout_content_container.tsx b/src/plugins/index_pattern_editor/public/components/index_pattern_flyout_content_container.tsx index 27c6fc8d4cdf4..2f60d85677207 100644 --- a/src/plugins/index_pattern_editor/public/components/index_pattern_flyout_content_container.tsx +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_flyout_content_container.tsx @@ -13,7 +13,7 @@ import { IndexPatternSpec, useKibana } from '../shared_imports'; import { IndexPatternEditorFlyoutContent } from './index_pattern_editor_flyout_content'; import { IndexPatternEditorContext, IndexPatternEditorProps } from '../types'; -export const IndexPatternFlyoutContentContainer = ({ +const IndexPatternFlyoutContentContainer = ({ onSave, onCancel = () => {}, defaultTypeIsRollup, @@ -51,3 +51,6 @@ export const IndexPatternFlyoutContentContainer = ({ /> ); }; + +/* eslint-disable import/no-default-export */ +export default IndexPatternFlyoutContentContainer; diff --git a/src/plugins/index_pattern_editor/public/index.ts b/src/plugins/index_pattern_editor/public/index.ts index 8acd8eaccc4d7..76c184f9399f1 100644 --- a/src/plugins/index_pattern_editor/public/index.ts +++ b/src/plugins/index_pattern_editor/public/index.ts @@ -20,7 +20,7 @@ import { IndexPatternEditorPlugin } from './plugin'; -export { PluginStart as IndexPatternEditorStart, IndexPatternEditorProps } from './types'; +export type { PluginStart as IndexPatternEditorStart, IndexPatternEditorProps } from './types'; export function plugin() { return new IndexPatternEditorPlugin(); diff --git a/src/plugins/index_pattern_editor/public/open_editor.tsx b/src/plugins/index_pattern_editor/public/open_editor.tsx index 20b0d34f2c236..ec62a1d6ec7c6 100644 --- a/src/plugins/index_pattern_editor/public/open_editor.tsx +++ b/src/plugins/index_pattern_editor/public/open_editor.tsx @@ -18,7 +18,7 @@ import { } from './shared_imports'; import { CloseEditor, IndexPatternEditorContext, IndexPatternEditorProps } from './types'; -import { IndexPatternFlyoutContentContainer } from './components/index_pattern_flyout_content_container'; +import { IndexPatternEditorLazy } from './components/index_pattern_editor_lazy'; interface Dependencies { core: CoreStart; @@ -67,7 +67,7 @@ export const getEditorOpener = ({ core, indexPatternService }: Dependencies) => toMountPoint( - { closeEditor(); diff --git a/src/plugins/index_pattern_editor/public/plugin.tsx b/src/plugins/index_pattern_editor/public/plugin.tsx index 39e218b954108..ca72249496e77 100644 --- a/src/plugins/index_pattern_editor/public/plugin.tsx +++ b/src/plugins/index_pattern_editor/public/plugin.tsx @@ -17,7 +17,7 @@ import { IndexPatternEditorProps, } from './types'; import { getEditorOpener } from './open_editor'; -import { IndexPatternEditor } from './components'; +import { IndexPatternEditor } from './components/index_pattern_editor'; export class IndexPatternEditorPlugin implements Plugin { From f1b809314eb69eb9f378a5d18694afa67a0bd7f3 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Thu, 5 Aug 2021 09:41:37 -0500 Subject: [PATCH 121/130] fix jest test import --- src/plugins/index_pattern_editor/public/plugin.test.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/index_pattern_editor/public/plugin.test.tsx b/src/plugins/index_pattern_editor/public/plugin.test.tsx index 7b75fc83ff6cf..b11d6b0c176b6 100644 --- a/src/plugins/index_pattern_editor/public/plugin.test.tsx +++ b/src/plugins/index_pattern_editor/public/plugin.test.tsx @@ -21,7 +21,7 @@ import { coreMock } from 'src/core/public/mocks'; import { dataPluginMock } from '../../data/public/mocks'; import { usageCollectionPluginMock } from '../../usage_collection/public/mocks'; -import { IndexPatternFlyoutContentContainer } from './components/index_pattern_flyout_content_container'; +import { IndexPatternEditorLazy } from './components/index_pattern_editor_lazy'; import { IndexPatternEditorPlugin } from './plugin'; const noop = () => {}; @@ -63,7 +63,7 @@ describe('IndexPatternEditorPlugin', () => { const [[arg]] = openFlyout.mock.calls; const i18nProvider = arg.props.children; - expect(i18nProvider.props.children.type).toBe(IndexPatternFlyoutContentContainer); + expect(i18nProvider.props.children.type).toBe(IndexPatternEditorLazy); // We force call the "onSave" prop from the component // and make sure that the the spy is being called. From dee5b1b4158572201f193fcafcec30b274cd05dc Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Thu, 5 Aug 2021 13:26:04 -0500 Subject: [PATCH 122/130] add to tsconfig.ref.json and update docs --- .../kibana-plugin-plugins-data-public.md | 4 -- src/plugins/data/public/public.api.md | 67 ++++--------------- tsconfig.refs.json | 1 + 3 files changed, 15 insertions(+), 57 deletions(-) diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md index d954ff9dacf6e..3716f5cb4febf 100644 --- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md +++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md @@ -63,11 +63,7 @@ | [DataPublicPluginStart](./kibana-plugin-plugins-data-public.datapublicpluginstart.md) | Data plugin public Start contract | | [DataPublicPluginStartActions](./kibana-plugin-plugins-data-public.datapublicpluginstartactions.md) | utilities to generate filters from action context | | [DataPublicPluginStartUi](./kibana-plugin-plugins-data-public.datapublicpluginstartui.md) | Data plugin prewired UI components | -<<<<<<< HEAD -| [FieldFormatConfig](./kibana-plugin-plugins-data-public.fieldformatconfig.md) | | | [GetFieldsOptions](./kibana-plugin-plugins-data-public.getfieldsoptions.md) | | -======= ->>>>>>> ca6182cd20d88f7717f6495d52190a204c537152 | [IDataPluginServices](./kibana-plugin-plugins-data-public.idatapluginservices.md) | | | [IEsSearchRequest](./kibana-plugin-plugins-data-public.iessearchrequest.md) | | | [IFieldType](./kibana-plugin-plugins-data-public.ifieldtype.md) | | diff --git a/src/plugins/data/public/public.api.md b/src/plugins/data/public/public.api.md index 8611f56f1bbcf..64b73ded88eef 100644 --- a/src/plugins/data/public/public.api.md +++ b/src/plugins/data/public/public.api.md @@ -2498,65 +2498,26 @@ export interface WaitUntilNextSessionCompletesOptions { // src/plugins/data/public/deprecated.ts:98:23 - (ae-forgotten-export) The symbol "changeTimeFilter" needs to be exported by the entry point index.d.ts // src/plugins/data/public/deprecated.ts:98:23 - (ae-forgotten-export) The symbol "convertRangeFilterToTimeRangeString" needs to be exported by the entry point index.d.ts // src/plugins/data/public/deprecated.ts:98:23 - (ae-forgotten-export) The symbol "extractTimeFilter" needs to be exported by the entry point index.d.ts -<<<<<<< HEAD -// src/plugins/data/public/field_formats/field_formats_service.ts:51:3 - (ae-forgotten-export) The symbol "FormatFactory" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:53:26 - (ae-forgotten-export) The symbol "FieldFormatsRegistry" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:53:26 - (ae-forgotten-export) The symbol "BoolFormat" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:53:26 - (ae-forgotten-export) The symbol "BytesFormat" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:53:26 - (ae-forgotten-export) The symbol "ColorFormat" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:53:26 - (ae-forgotten-export) The symbol "DurationFormat" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:53:26 - (ae-forgotten-export) The symbol "IpFormat" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:53:26 - (ae-forgotten-export) The symbol "NumberFormat" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:53:26 - (ae-forgotten-export) The symbol "PercentFormat" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:53:26 - (ae-forgotten-export) The symbol "RelativeDateFormat" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:53:26 - (ae-forgotten-export) The symbol "SourceFormat" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:53:26 - (ae-forgotten-export) The symbol "StaticLookupFormat" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:53:26 - (ae-forgotten-export) The symbol "UrlFormat" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:53:26 - (ae-forgotten-export) The symbol "StringFormat" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:53:26 - (ae-forgotten-export) The symbol "TruncateFormat" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:53:26 - (ae-forgotten-export) The symbol "HistogramFormat" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:96:23 - (ae-forgotten-export) The symbol "datatableToCSV" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:123:27 - (ae-forgotten-export) The symbol "isFilterable" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:123:27 - (ae-forgotten-export) The symbol "isNestedField" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:123:27 - (ae-forgotten-export) The symbol "validateIndexPattern" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:123:27 - (ae-forgotten-export) The symbol "flattenHitWrapper" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:123:27 - (ae-forgotten-export) The symbol "formatHitProvider" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:296:20 - (ae-forgotten-export) The symbol "getResponseInspectorStats" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:296:20 - (ae-forgotten-export) The symbol "tabifyAggResponse" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:296:20 - (ae-forgotten-export) The symbol "tabifyGetColumns" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:298:1 - (ae-forgotten-export) The symbol "CidrMask" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:299:1 - (ae-forgotten-export) The symbol "dateHistogramInterval" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:308:1 - (ae-forgotten-export) The symbol "InvalidEsCalendarIntervalError" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:309:1 - (ae-forgotten-export) The symbol "InvalidEsIntervalFormatError" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:310:1 - (ae-forgotten-export) The symbol "IpAddress" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:311:1 - (ae-forgotten-export) The symbol "isDateHistogramBucketAggConfig" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:315:1 - (ae-forgotten-export) The symbol "isValidEsInterval" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:316:1 - (ae-forgotten-export) The symbol "isValidInterval" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:319:1 - (ae-forgotten-export) The symbol "parseInterval" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:320:1 - (ae-forgotten-export) The symbol "propFilter" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:323:1 - (ae-forgotten-export) The symbol "toAbsoluteDates" needs to be exported by the entry point index.d.ts -======= // src/plugins/data/public/index.ts:27:23 - (ae-forgotten-export) The symbol "datatableToCSV" needs to be exported by the entry point index.d.ts // src/plugins/data/public/index.ts:54:27 - (ae-forgotten-export) The symbol "isFilterable" needs to be exported by the entry point index.d.ts // src/plugins/data/public/index.ts:54:27 - (ae-forgotten-export) The symbol "isNestedField" needs to be exported by the entry point index.d.ts // src/plugins/data/public/index.ts:54:27 - (ae-forgotten-export) The symbol "validateIndexPattern" needs to be exported by the entry point index.d.ts // src/plugins/data/public/index.ts:54:27 - (ae-forgotten-export) The symbol "flattenHitWrapper" needs to be exported by the entry point index.d.ts // src/plugins/data/public/index.ts:54:27 - (ae-forgotten-export) The symbol "formatHitProvider" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:225:20 - (ae-forgotten-export) The symbol "getResponseInspectorStats" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:225:20 - (ae-forgotten-export) The symbol "tabifyAggResponse" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:225:20 - (ae-forgotten-export) The symbol "tabifyGetColumns" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:227:1 - (ae-forgotten-export) The symbol "CidrMask" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:228:1 - (ae-forgotten-export) The symbol "dateHistogramInterval" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:237:1 - (ae-forgotten-export) The symbol "InvalidEsCalendarIntervalError" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:238:1 - (ae-forgotten-export) The symbol "InvalidEsIntervalFormatError" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:239:1 - (ae-forgotten-export) The symbol "IpAddress" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:240:1 - (ae-forgotten-export) The symbol "isDateHistogramBucketAggConfig" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:244:1 - (ae-forgotten-export) The symbol "isValidEsInterval" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:245:1 - (ae-forgotten-export) The symbol "isValidInterval" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:248:1 - (ae-forgotten-export) The symbol "parseInterval" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:249:1 - (ae-forgotten-export) The symbol "propFilter" needs to be exported by the entry point index.d.ts -// src/plugins/data/public/index.ts:252:1 - (ae-forgotten-export) The symbol "toAbsoluteDates" needs to be exported by the entry point index.d.ts ->>>>>>> ca6182cd20d88f7717f6495d52190a204c537152 +// src/plugins/data/public/index.ts:227:20 - (ae-forgotten-export) The symbol "getResponseInspectorStats" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:227:20 - (ae-forgotten-export) The symbol "tabifyAggResponse" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:227:20 - (ae-forgotten-export) The symbol "tabifyGetColumns" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:229:1 - (ae-forgotten-export) The symbol "CidrMask" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:230:1 - (ae-forgotten-export) The symbol "dateHistogramInterval" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:239:1 - (ae-forgotten-export) The symbol "InvalidEsCalendarIntervalError" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:240:1 - (ae-forgotten-export) The symbol "InvalidEsIntervalFormatError" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:241:1 - (ae-forgotten-export) The symbol "IpAddress" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:242:1 - (ae-forgotten-export) The symbol "isDateHistogramBucketAggConfig" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:246:1 - (ae-forgotten-export) The symbol "isValidEsInterval" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:247:1 - (ae-forgotten-export) The symbol "isValidInterval" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:250:1 - (ae-forgotten-export) The symbol "parseInterval" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:251:1 - (ae-forgotten-export) The symbol "propFilter" needs to be exported by the entry point index.d.ts +// src/plugins/data/public/index.ts:254:1 - (ae-forgotten-export) The symbol "toAbsoluteDates" needs to be exported by the entry point index.d.ts // src/plugins/data/public/search/session/session_service.ts:62:5 - (ae-forgotten-export) The symbol "UrlGeneratorStateMapping" needs to be exported by the entry point index.d.ts // (No @packageDocumentation comment for this package) diff --git a/tsconfig.refs.json b/tsconfig.refs.json index 1def88087ed86..1807a7014e389 100644 --- a/tsconfig.refs.json +++ b/tsconfig.refs.json @@ -57,6 +57,7 @@ { "path": "./src/plugins/visualizations/tsconfig.json" }, { "path": "./src/plugins/visualize/tsconfig.json" }, { "path": "./src/plugins/index_pattern_management/tsconfig.json" }, + { "path": "./src/plugins/index_pattern_editor/tsconfig.json" }, { "path": "./test/tsconfig.json" }, { "path": "./x-pack/plugins/actions/tsconfig.json" }, { "path": "./x-pack/plugins/alerting/tsconfig.json" }, From df77a3ac18ffe7bd0dfaa3261a16514193e7658d Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Thu, 5 Aug 2021 13:34:41 -0500 Subject: [PATCH 123/130] reduce limits.yml value --- packages/kbn-optimizer/limits.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/kbn-optimizer/limits.yml b/packages/kbn-optimizer/limits.yml index 62276343df207..c2eeebc45df25 100644 --- a/packages/kbn-optimizer/limits.yml +++ b/packages/kbn-optimizer/limits.yml @@ -34,7 +34,7 @@ pageLoadAssetSize: indexLifecycleManagement: 107090 indexManagement: 140608 indexPatternManagement: 28222 - indexPatternEditor: 99999 + indexPatternEditor: 25000 infra: 184320 fleet: 465774 ingestPipelines: 58003 @@ -120,4 +120,3 @@ pageLoadAssetSize: expressionMetric: 22238 expressionShape: 34008 interactiveSetup: 18532 - \ No newline at end of file From 02d00fa674fa601d4fe5bb6c25d057cf0356de29 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Thu, 5 Aug 2021 14:03:51 -0500 Subject: [PATCH 124/130] more text updates --- .../components/form_fields/timestamp_field.tsx | 4 ++-- .../public/components/form_schema.ts | 2 +- .../public/components/i18n_texts.ts | 2 +- .../__snapshots__/status_message.test.tsx.snap | 6 +++--- .../preview_panel/status_message/status_message.tsx | 12 ++++++------ 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/plugins/index_pattern_editor/public/components/form_fields/timestamp_field.tsx b/src/plugins/index_pattern_editor/public/components/form_fields/timestamp_field.tsx index 9cbff901a52a9..6c80b3a9f0768 100644 --- a/src/plugins/index_pattern_editor/public/components/form_fields/timestamp_field.tsx +++ b/src/plugins/index_pattern_editor/public/components/form_fields/timestamp_field.tsx @@ -63,11 +63,11 @@ const getTimestampConfig = ( }; const noTimestampOptionText = i18n.translate('indexPatternEditor.editor.form.noTimeFieldsLabel', { - defaultMessage: "The matching sources don't have a time field.", + defaultMessage: 'No matching index, data stream, or index alias has a time field.', }); const timestampFieldHelp = i18n.translate('indexPatternEditor.editor.form.timeFieldHelp', { - defaultMessage: 'Select a primary timestamp field for use with the global time filter.', + defaultMessage: 'Select a timestamp field for use with the global time filter.', }); export const TimestampField = ({ diff --git a/src/plugins/index_pattern_editor/public/components/form_schema.ts b/src/plugins/index_pattern_editor/public/components/form_schema.ts index 89348a32035d3..4e852285031ca 100644 --- a/src/plugins/index_pattern_editor/public/components/form_schema.ts +++ b/src/plugins/index_pattern_editor/public/components/form_schema.ts @@ -35,7 +35,7 @@ export const schema = { defaultMessage: 'Timestamp field', }), helpText: i18n.translate('indexPatternEditor.editor.form.timestampFieldHelp', { - defaultMessage: 'Select a primary timestamp field for use with the global time filter.', + defaultMessage: 'Select a timestamp field for use with the global time filter.', }), validations: [], }, diff --git a/src/plugins/index_pattern_editor/public/components/i18n_texts.ts b/src/plugins/index_pattern_editor/public/components/i18n_texts.ts index 21c6b1495b468..4dd38a96b871d 100644 --- a/src/plugins/index_pattern_editor/public/components/i18n_texts.ts +++ b/src/plugins/index_pattern_editor/public/components/i18n_texts.ts @@ -17,7 +17,7 @@ export const geti18nTexts = () => { } ), timestampFieldHelp: i18n.translate('indexPatternEditor.editor.form.timeFieldHelp', { - defaultMessage: 'Select a primary timestamp field for use with the global time filter.', + defaultMessage: 'Select a timestamp field for use with the global time filter.', }), rollupLabel: i18n.translate('indexPatternEditor.rollupIndexPattern.createIndex.indexLabel', { defaultMessage: 'Rollup', diff --git a/src/plugins/index_pattern_editor/public/components/preview_panel/status_message/__snapshots__/status_message.test.tsx.snap b/src/plugins/index_pattern_editor/public/components/preview_panel/status_message/__snapshots__/status_message.test.tsx.snap index fe8a161ba5524..8b492be417bff 100644 --- a/src/plugins/index_pattern_editor/public/components/preview_panel/status_message/__snapshots__/status_message.test.tsx.snap +++ b/src/plugins/index_pattern_editor/public/components/preview_panel/status_message/__snapshots__/status_message.test.tsx.snap @@ -31,7 +31,7 @@ exports[`StatusMessage should render with no partial matches 1`] = ` title={ ( = ({ @@ -129,8 +129,8 @@ export const StatusMessage: React.FC = ({ id="indexPatternEditor.status.partialMatchLabel.partialMatchDetail" defaultMessage="Your index pattern doesn't match any sources, but you have {strongIndices} which {matchedIndicesLength, plural, - one {source looks} - other {sources look} + one {is} + other {are} } similar." values={{ matchedIndicesLength: partialMatchedIndices.length, From 48e465cc7eaa822b3e538b7cfe51db6b0a63ede0 Mon Sep 17 00:00:00 2001 From: Matthew Kime Date: Thu, 5 Aug 2021 18:57:03 -0500 Subject: [PATCH 125/130] Update src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_pattern_prompt/empty_index_pattern_prompt.tsx Co-authored-by: gchaps <33642766+gchaps@users.noreply.github.com> --- .../empty_index_pattern_prompt/empty_index_pattern_prompt.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_pattern_prompt/empty_index_pattern_prompt.tsx b/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_pattern_prompt/empty_index_pattern_prompt.tsx index b0bf37c7a007f..054ff9d13b043 100644 --- a/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_pattern_prompt/empty_index_pattern_prompt.tsx +++ b/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_pattern_prompt/empty_index_pattern_prompt.tsx @@ -59,7 +59,7 @@ export const EmptyIndexPatternPrompt = ({

From 295b22b43b84cc64c55c59f9e9f8ac5ee08d38c4 Mon Sep 17 00:00:00 2001 From: Matthew Kime Date: Thu, 5 Aug 2021 18:57:17 -0500 Subject: [PATCH 126/130] Update src/plugins/index_pattern_editor/public/components/form_fields/timestamp_field.tsx Co-authored-by: gchaps <33642766+gchaps@users.noreply.github.com> --- .../public/components/form_fields/timestamp_field.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/index_pattern_editor/public/components/form_fields/timestamp_field.tsx b/src/plugins/index_pattern_editor/public/components/form_fields/timestamp_field.tsx index 6c80b3a9f0768..c36141c6839bf 100644 --- a/src/plugins/index_pattern_editor/public/components/form_fields/timestamp_field.tsx +++ b/src/plugins/index_pattern_editor/public/components/form_fields/timestamp_field.tsx @@ -37,7 +37,7 @@ const requireTimestampOptionValidator = (options: Props['options']): ValidationC message: i18n.translate( 'indexPatternEditor.requireTimestampOption.ValidationErrorMessage', { - defaultMessage: 'Select a timestamp field option.', + defaultMessage: 'Select a timestamp field.', } ), }; From 942af1dd5a0cfe89ed5df2188119abc6ef319978 Mon Sep 17 00:00:00 2001 From: Matthew Kime Date: Thu, 5 Aug 2021 18:57:28 -0500 Subject: [PATCH 127/130] Update src/plugins/index_pattern_editor/public/components/form_fields/timestamp_field.tsx Co-authored-by: gchaps <33642766+gchaps@users.noreply.github.com> --- .../public/components/form_fields/timestamp_field.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/index_pattern_editor/public/components/form_fields/timestamp_field.tsx b/src/plugins/index_pattern_editor/public/components/form_fields/timestamp_field.tsx index c36141c6839bf..93cb39ea1ba33 100644 --- a/src/plugins/index_pattern_editor/public/components/form_fields/timestamp_field.tsx +++ b/src/plugins/index_pattern_editor/public/components/form_fields/timestamp_field.tsx @@ -63,7 +63,7 @@ const getTimestampConfig = ( }; const noTimestampOptionText = i18n.translate('indexPatternEditor.editor.form.noTimeFieldsLabel', { - defaultMessage: 'No matching index, data stream, or index alias has a time field.', + defaultMessage: 'No matching data stream, index, or alias has a timestamp field.', }); const timestampFieldHelp = i18n.translate('indexPatternEditor.editor.form.timeFieldHelp', { From 7b4a42e56aaf24fe9b1203f9fbc34bccfdc050cf Mon Sep 17 00:00:00 2001 From: Matthew Kime Date: Thu, 5 Aug 2021 18:57:53 -0500 Subject: [PATCH 128/130] Update src/plugins/index_pattern_editor/public/components/i18n_texts.ts Co-authored-by: gchaps <33642766+gchaps@users.noreply.github.com> --- .../index_pattern_editor/public/components/i18n_texts.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/index_pattern_editor/public/components/i18n_texts.ts b/src/plugins/index_pattern_editor/public/components/i18n_texts.ts index 4dd38a96b871d..97e108baeb4f2 100644 --- a/src/plugins/index_pattern_editor/public/components/i18n_texts.ts +++ b/src/plugins/index_pattern_editor/public/components/i18n_texts.ts @@ -13,7 +13,7 @@ export const geti18nTexts = () => { noTimestampOptionText: i18n.translate( 'indexPatternEditor.createIndexPattern.stepTime.noTimeFieldsLabel', { - defaultMessage: "The matching sources don't have time fields.", + defaultMessage: "No matching data stream, index, or alias has a timestamp field.", } ), timestampFieldHelp: i18n.translate('indexPatternEditor.editor.form.timeFieldHelp', { From 0f8caa44c7c20a074d5efbdc923dcc4127514ba7 Mon Sep 17 00:00:00 2001 From: Matthew Kime Date: Thu, 5 Aug 2021 18:58:13 -0500 Subject: [PATCH 129/130] Update src/plugins/index_pattern_editor/public/components/form_fields/title_field.tsx Co-authored-by: gchaps <33642766+gchaps@users.noreply.github.com> --- .../public/components/form_fields/title_field.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/index_pattern_editor/public/components/form_fields/title_field.tsx b/src/plugins/index_pattern_editor/public/components/form_fields/title_field.tsx index 69ae4ef68a189..aa16351e0922f 100644 --- a/src/plugins/index_pattern_editor/public/components/form_fields/title_field.tsx +++ b/src/plugins/index_pattern_editor/public/components/form_fields/title_field.tsx @@ -51,7 +51,7 @@ const rollupIndexPatternTooManyMatchesError = { const mustMatchError = { message: i18n.translate('indexPatternEditor.createIndex.noMatch', { - defaultMessage: 'Name must match one or more indices, data streams, or index aliases.', + defaultMessage: 'Name must match one or more data streams, indices, or aliases.', }), }; From da62c854ee381ab12aae3a46611ba0a267a2d7bd Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Thu, 5 Aug 2021 20:35:32 -0500 Subject: [PATCH 130/130] fix snapshot and eslint fix --- .../__snapshots__/empty_index_pattern_prompt.test.tsx.snap | 2 +- .../index_pattern_editor/public/components/i18n_texts.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_pattern_prompt/__snapshots__/empty_index_pattern_prompt.test.tsx.snap b/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_pattern_prompt/__snapshots__/empty_index_pattern_prompt.test.tsx.snap index 7ffa13d58ee61..6216f04c0a1a9 100644 --- a/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_pattern_prompt/__snapshots__/empty_index_pattern_prompt.test.tsx.snap +++ b/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_pattern_prompt/__snapshots__/empty_index_pattern_prompt.test.tsx.snap @@ -51,7 +51,7 @@ exports[`EmptyIndexPatternPrompt should render normally 1`] = `

diff --git a/src/plugins/index_pattern_editor/public/components/i18n_texts.ts b/src/plugins/index_pattern_editor/public/components/i18n_texts.ts index 97e108baeb4f2..5745714ae7bd8 100644 --- a/src/plugins/index_pattern_editor/public/components/i18n_texts.ts +++ b/src/plugins/index_pattern_editor/public/components/i18n_texts.ts @@ -13,7 +13,7 @@ export const geti18nTexts = () => { noTimestampOptionText: i18n.translate( 'indexPatternEditor.createIndexPattern.stepTime.noTimeFieldsLabel', { - defaultMessage: "No matching data stream, index, or alias has a timestamp field.", + defaultMessage: 'No matching data stream, index, or alias has a timestamp field.', } ), timestampFieldHelp: i18n.translate('indexPatternEditor.editor.form.timeFieldHelp', {