From 2caf640d4824a43ad57de79f3424cb4063e9a03d Mon Sep 17 00:00:00 2001 From: Luke Elmers Date: Thu, 12 Dec 2019 08:00:44 -0700 Subject: [PATCH] [Data Plugin]: Remove `export *` for common code from public/server index files (#52821) --- .../data/common/es_query/es_query/index.ts | 2 - .../{utils => filters}/get_display_value.ts | 0 .../get_index_pattern_from_filter.test.ts | 0 .../get_index_pattern_from_filter.ts | 0 .../data/common/es_query/filters/index.ts | 7 +- src/plugins/data/common/es_query/index.ts | 3 +- .../common/es_query/kuery/functions/is.js | 2 +- .../common/es_query/kuery/functions/range.js | 2 +- ...et_time_zone_from_settings.ts => utils.ts} | 0 .../data/common/es_query/utils/index.ts | 22 ------ src/plugins/data/public/index.ts | 68 +++++++++++++++++-- .../apply_filter_popover_content.tsx | 4 +- .../ui/filter_bar/filter_editor/index.tsx | 4 +- .../data/public/ui/filter_bar/filter_item.tsx | 4 +- src/plugins/data/server/index.ts | 64 +++++++++++++++-- .../components/description_step/index.tsx | 3 +- 16 files changed, 136 insertions(+), 49 deletions(-) rename src/plugins/data/common/es_query/{utils => filters}/get_display_value.ts (100%) rename src/plugins/data/common/es_query/{utils => filters}/get_index_pattern_from_filter.test.ts (100%) rename src/plugins/data/common/es_query/{utils => filters}/get_index_pattern_from_filter.ts (100%) rename src/plugins/data/common/es_query/{utils/get_time_zone_from_settings.ts => utils.ts} (100%) delete mode 100644 src/plugins/data/common/es_query/utils/index.ts diff --git a/src/plugins/data/common/es_query/es_query/index.ts b/src/plugins/data/common/es_query/es_query/index.ts index 82cbc543e19d..39b10be4c75b 100644 --- a/src/plugins/data/common/es_query/es_query/index.ts +++ b/src/plugins/data/common/es_query/es_query/index.ts @@ -20,7 +20,5 @@ export { buildEsQuery, EsQueryConfig } from './build_es_query'; export { buildQueryFromFilters } from './from_filters'; export { luceneStringToDsl } from './lucene_string_to_dsl'; -export { migrateFilter } from './migrate_filter'; export { decorateQuery } from './decorate_query'; -export { filterMatchesIndex } from './filter_matches_index'; export { getEsQueryConfig } from './get_es_query_config'; diff --git a/src/plugins/data/common/es_query/utils/get_display_value.ts b/src/plugins/data/common/es_query/filters/get_display_value.ts similarity index 100% rename from src/plugins/data/common/es_query/utils/get_display_value.ts rename to src/plugins/data/common/es_query/filters/get_display_value.ts diff --git a/src/plugins/data/common/es_query/utils/get_index_pattern_from_filter.test.ts b/src/plugins/data/common/es_query/filters/get_index_pattern_from_filter.test.ts similarity index 100% rename from src/plugins/data/common/es_query/utils/get_index_pattern_from_filter.test.ts rename to src/plugins/data/common/es_query/filters/get_index_pattern_from_filter.test.ts diff --git a/src/plugins/data/common/es_query/utils/get_index_pattern_from_filter.ts b/src/plugins/data/common/es_query/filters/get_index_pattern_from_filter.ts similarity index 100% rename from src/plugins/data/common/es_query/utils/get_index_pattern_from_filter.ts rename to src/plugins/data/common/es_query/filters/get_index_pattern_from_filter.ts diff --git a/src/plugins/data/common/es_query/filters/index.ts b/src/plugins/data/common/es_query/filters/index.ts index 403ff2b79b55..990d58835944 100644 --- a/src/plugins/data/common/es_query/filters/index.ts +++ b/src/plugins/data/common/es_query/filters/index.ts @@ -21,13 +21,14 @@ import { omit, get } from 'lodash'; import { Filter } from './meta_filter'; export * from './build_filters'; -export * from './get_filter_params'; -export * from './get_filter_field'; - export * from './custom_filter'; export * from './exists_filter'; export * from './geo_bounding_box_filter'; export * from './geo_polygon_filter'; +export * from './get_display_value'; +export * from './get_filter_field'; +export * from './get_filter_params'; +export * from './get_index_pattern_from_filter'; export * from './match_all_filter'; export * from './meta_filter'; export * from './missing_filter'; diff --git a/src/plugins/data/common/es_query/index.ts b/src/plugins/data/common/es_query/index.ts index 937fe09903b6..e585fda8aff8 100644 --- a/src/plugins/data/common/es_query/index.ts +++ b/src/plugins/data/common/es_query/index.ts @@ -19,6 +19,5 @@ import * as esQuery from './es_query'; import * as esFilters from './filters'; import * as esKuery from './kuery'; -import * as utils from './utils'; -export { esFilters, esQuery, utils, esKuery }; +export { esFilters, esQuery, esKuery }; diff --git a/src/plugins/data/common/es_query/kuery/functions/is.js b/src/plugins/data/common/es_query/kuery/functions/is.js index 4f2f298c4707..120dd9352d9a 100644 --- a/src/plugins/data/common/es_query/kuery/functions/is.js +++ b/src/plugins/data/common/es_query/kuery/functions/is.js @@ -20,7 +20,7 @@ import { get, isUndefined } from 'lodash'; import { getPhraseScript } from '../../filters'; import { getFields } from './utils/get_fields'; -import { getTimeZoneFromSettings } from '../../utils/get_time_zone_from_settings'; +import { getTimeZoneFromSettings } from '../../utils'; import { getFullFieldNameNode } from './utils/get_full_field_name_node'; import * as ast from '../ast'; diff --git a/src/plugins/data/common/es_query/kuery/functions/range.js b/src/plugins/data/common/es_query/kuery/functions/range.js index 80181cfc003f..d5eba8e20253 100644 --- a/src/plugins/data/common/es_query/kuery/functions/range.js +++ b/src/plugins/data/common/es_query/kuery/functions/range.js @@ -22,7 +22,7 @@ import { nodeTypes } from '../node_types'; import * as ast from '../ast'; import { getRangeScript } from '../../filters'; import { getFields } from './utils/get_fields'; -import { getTimeZoneFromSettings } from '../../utils/get_time_zone_from_settings'; +import { getTimeZoneFromSettings } from '../../utils'; import { getFullFieldNameNode } from './utils/get_full_field_name_node'; export function buildNodeParams(fieldName, params) { diff --git a/src/plugins/data/common/es_query/utils/get_time_zone_from_settings.ts b/src/plugins/data/common/es_query/utils.ts similarity index 100% rename from src/plugins/data/common/es_query/utils/get_time_zone_from_settings.ts rename to src/plugins/data/common/es_query/utils.ts diff --git a/src/plugins/data/common/es_query/utils/index.ts b/src/plugins/data/common/es_query/utils/index.ts deleted file mode 100644 index 79856c9e0267..000000000000 --- a/src/plugins/data/common/es_query/utils/index.ts +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -export * from './get_time_zone_from_settings'; -export * from './get_index_pattern_from_filter'; -export * from './get_display_value'; diff --git a/src/plugins/data/public/index.ts b/src/plugins/data/public/index.ts index e54278698a05..967887764237 100644 --- a/src/plugins/data/public/index.ts +++ b/src/plugins/data/public/index.ts @@ -22,19 +22,75 @@ export function plugin(initializerContext: PluginInitializerContext) { return new DataPublicPlugin(initializerContext); } -export * from '../common'; +/** + * Types to be shared externally + * @public + */ +export { IRequestTypesMap, IResponseTypesMap } from './search'; +export * from './types'; +export { + // field formats + ContentType, // only used in agg_type + FIELD_FORMAT_IDS, + IFieldFormat, + IFieldFormatId, + IFieldFormatType, + // index patterns + IIndexPattern, + IFieldType, + IFieldSubType, + // kbn field types + ES_FIELD_TYPES, + KBN_FIELD_TYPES, + // query + Query, + // timefilter + RefreshInterval, + TimeRange, +} from '../common'; +/** + * Static code to be shared externally + * @public + */ export * from './autocomplete_provider'; export * from './field_formats_provider'; export * from './index_patterns'; - -export * from './types'; - -export { IRequestTypesMap, IResponseTypesMap } from './search'; export * from './search'; export * from './query'; - export * from './ui'; +export { + // es query + esFilters, + esKuery, + esQuery, + // field formats + BoolFormat, + BytesFormat, + ColorFormat, + DateFormat, + DateNanosFormat, + DEFAULT_CONVERTER_COLOR, + DurationFormat, + FieldFormat, + getHighlightRequest, // only used in search source + IpFormat, + NumberFormat, + PercentFormat, + RelativeDateFormat, + SourceFormat, + StaticLookupFormat, + StringFormat, + TEXT_CONTEXT_TYPE, // only used in agg_types + TruncateFormat, + UrlFormat, + // index patterns + isFilterable, + // kbn field types + castEsToKbnFieldTypeName, + getKbnFieldType, + getKbnTypeNames, +} from '../common'; // Export plugin after all other imports import { DataPublicPlugin } from './plugin'; diff --git a/src/plugins/data/public/ui/apply_filters/apply_filter_popover_content.tsx b/src/plugins/data/public/ui/apply_filters/apply_filter_popover_content.tsx index affbb8acecb2..92582ef1d15c 100644 --- a/src/plugins/data/public/ui/apply_filters/apply_filter_popover_content.tsx +++ b/src/plugins/data/public/ui/apply_filters/apply_filter_popover_content.tsx @@ -30,7 +30,7 @@ import { } from '@elastic/eui'; import { FormattedMessage } from '@kbn/i18n/react'; import React, { Component } from 'react'; -import { mapAndFlattenFilters, esFilters, utils, IIndexPattern } from '../..'; +import { mapAndFlattenFilters, esFilters, IIndexPattern } from '../..'; import { FilterLabel } from '../filter_bar'; interface Props { @@ -56,7 +56,7 @@ export class ApplyFiltersPopoverContent extends Component { }; } private getLabel(filter: esFilters.Filter) { - const valueLabel = utils.getDisplayValueFromFilter(filter, this.props.indexPatterns); + const valueLabel = esFilters.getDisplayValueFromFilter(filter, this.props.indexPatterns); return ; } diff --git a/src/plugins/data/public/ui/filter_bar/filter_editor/index.tsx b/src/plugins/data/public/ui/filter_bar/filter_editor/index.tsx index 12da4cbab02d..b058d231b830 100644 --- a/src/plugins/data/public/ui/filter_bar/filter_editor/index.tsx +++ b/src/plugins/data/public/ui/filter_bar/filter_editor/index.tsx @@ -48,7 +48,7 @@ import { Operator } from './lib/filter_operators'; import { PhraseValueInput } from './phrase_value_input'; import { PhrasesValuesInput } from './phrases_values_input'; import { RangeValueInput } from './range_value_input'; -import { esFilters, utils, IIndexPattern, IFieldType } from '../../..'; +import { esFilters, IIndexPattern, IFieldType } from '../../..'; interface Props { filter: esFilters.Filter; @@ -371,7 +371,7 @@ class FilterEditorUI extends Component { } private getIndexPatternFromFilter() { - return utils.getIndexPatternFromFilter(this.props.filter, this.props.indexPatterns); + return esFilters.getIndexPatternFromFilter(this.props.filter, this.props.indexPatterns); } private getFieldFromFilter() { diff --git a/src/plugins/data/public/ui/filter_bar/filter_item.tsx b/src/plugins/data/public/ui/filter_bar/filter_item.tsx index b26bb05f926d..788663041fd0 100644 --- a/src/plugins/data/public/ui/filter_bar/filter_item.tsx +++ b/src/plugins/data/public/ui/filter_bar/filter_item.tsx @@ -24,7 +24,7 @@ import React, { Component, MouseEvent } from 'react'; import { IUiSettingsClient } from 'src/core/public'; import { FilterEditor } from './filter_editor'; import { FilterView } from './filter_view'; -import { esFilters, utils, IIndexPattern } from '../..'; +import { esFilters, IIndexPattern } from '../..'; interface Props { id: string; @@ -67,7 +67,7 @@ class FilterItemUI extends Component { this.props.className ); - const valueLabel = utils.getDisplayValueFromFilter(filter, this.props.indexPatterns); + const valueLabel = esFilters.getDisplayValueFromFilter(filter, this.props.indexPatterns); const dataTestSubjKey = filter.meta.key ? `filter-key-${filter.meta.key}` : ''; const dataTestSubjValue = filter.meta.value ? `filter-value-${valueLabel}` : ''; const dataTestSubjDisabled = `filter-${ diff --git a/src/plugins/data/server/index.ts b/src/plugins/data/server/index.ts index 81906a63bd49..022eb0ae5029 100644 --- a/src/plugins/data/server/index.ts +++ b/src/plugins/data/server/index.ts @@ -24,14 +24,70 @@ export function plugin(initializerContext: PluginInitializerContext) { return new DataServerPlugin(initializerContext); } -export { DataServerPlugin as Plugin }; +/** + * Types to be shared externally + * @public + */ +export { IRequestTypesMap, IResponseTypesMap } from './search'; +export { + // field formats + FIELD_FORMAT_IDS, + IFieldFormat, + IFieldFormatId, + IFieldFormatType, + // index patterns + IIndexPattern, + IFieldType, + IFieldSubType, + // kbn field types + ES_FIELD_TYPES, + KBN_FIELD_TYPES, + // query + Query, + // timefilter + RefreshInterval, + TimeRange, +} from '../common'; + +/** + * Static code to be shared externally + * @public + */ export { IndexPatternsFetcher, FieldDescriptor, shouldReadFieldFromDocValues, } from './index_patterns'; - export * from './search'; -export * from '../common'; +export { + // es query + esFilters, + esKuery, + esQuery, + // field formats + BoolFormat, + BytesFormat, + ColorFormat, + DateFormat, + DateNanosFormat, + DEFAULT_CONVERTER_COLOR, + DurationFormat, + FieldFormat, + IpFormat, + NumberFormat, + PercentFormat, + RelativeDateFormat, + SourceFormat, + StaticLookupFormat, + StringFormat, + TruncateFormat, + UrlFormat, + // index patterns + isFilterable, + // kbn field types + castEsToKbnFieldTypeName, + getKbnFieldType, + getKbnTypeNames, +} from '../common'; -export { IRequestTypesMap, IResponseTypesMap } from './search'; +export { DataServerPlugin as Plugin }; diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/components/description_step/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/components/description_step/index.tsx index 29e1bc228e06..e6fec597ed8e 100644 --- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/components/description_step/index.tsx +++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/components/description_step/index.tsx @@ -22,7 +22,6 @@ import { IIndexPattern, esFilters, Query, - utils, } from '../../../../../../../../../../src/plugins/data/public'; import { FilterLabel } from './filter_label'; @@ -126,7 +125,7 @@ const getDescriptionItem = (