[Maps] Remove * exports (#111003)

* [Maps] Remove * exports

* update extraPublicDirs

* clean up some more imports

* tslint

* eslint

* eslint

* fix import in functional tests

* eslint

* eslint take 2

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
This commit is contained in:
Nathan Reese 2021-09-10 06:16:37 -06:00 committed by GitHub
parent 70090e326c
commit a779ea3818
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
46 changed files with 92 additions and 90 deletions

View file

@ -1,18 +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.
*/
// Default config for the elastic hosted EMS endpoints
export const DEFAULT_EMS_FILE_API_URL = 'https://vector.maps.elastic.co';
export const DEFAULT_EMS_TILE_API_URL = 'https://tiles.maps.elastic.co';
export const DEFAULT_EMS_LANDING_PAGE_URL = 'https://maps.elastic.co/v7.15';
export const DEFAULT_EMS_FONT_LIBRARY_URL =
'https://tiles.maps.elastic.co/fonts/{fontstack}/{range}.pbf';
export const DEFAULT_EMS_ROADMAP_ID = 'road_map';
export const DEFAULT_EMS_ROADMAP_DESATURATED_ID = 'road_map_desaturated';
export const DEFAULT_EMS_DARKMAP_ID = 'dark_map';

View file

@ -6,10 +6,16 @@
* Side Public License, v 1.
*/
// TODO: https://github.com/elastic/kibana/issues/109853
/* eslint-disable @kbn/eslint/no_export_all */
export const TMS_IN_YML_ID = 'TMS in config/kibana.yml';
export * from './ems_defaults';
export const DEFAULT_EMS_FILE_API_URL = 'https://vector.maps.elastic.co';
export const DEFAULT_EMS_TILE_API_URL = 'https://tiles.maps.elastic.co';
export const DEFAULT_EMS_LANDING_PAGE_URL = 'https://maps.elastic.co/v7.15';
export const DEFAULT_EMS_FONT_LIBRARY_URL =
'https://tiles.maps.elastic.co/fonts/{fontstack}/{range}.pbf';
export const DEFAULT_EMS_ROADMAP_ID = 'road_map';
export const DEFAULT_EMS_ROADMAP_DESATURATED_ID = 'road_map_desaturated';
export const DEFAULT_EMS_DARKMAP_ID = 'dark_map';
export { ORIGIN } from './origin';

View file

@ -6,9 +6,6 @@
* Side Public License, v 1.
*/
// TODO: https://github.com/elastic/kibana/issues/109853
/* eslint-disable @kbn/eslint/no_export_all */
import { PluginInitializerContext } from 'kibana/public';
import { MapsEmsPlugin } from './plugin';
import { IServiceSettings } from './service_settings';
@ -27,9 +24,9 @@ export function plugin(initializerContext: PluginInitializerContext) {
return new MapsEmsPlugin(initializerContext);
}
export type { MapsEmsConfig } from '../config';
export { TMS_IN_YML_ID } from '../common';
export * from '../common';
export type { MapsEmsConfig } from '../config';
export interface MapsEmsPluginSetup {
config: MapsEmsConfig;

View file

@ -13,7 +13,7 @@ import {
MapEmbeddable,
MapEmbeddableInput,
} from '../../../../../../maps/public';
import { MAP_SAVED_OBJECT_TYPE } from '../../../../../../maps/common/constants';
import { MAP_SAVED_OBJECT_TYPE } from '../../../../../../maps/common';
import { useKibana } from '../../../../../../../../src/plugins/kibana_react/public';
import {
ErrorEmbeddable,

View file

@ -11,8 +11,6 @@ import {
LayerDescriptor as BaseLayerDescriptor,
VectorLayerDescriptor as BaseVectorLayerDescriptor,
VectorStyleDescriptor,
} from '../../../../../../maps/common/descriptor_types';
import {
AGG_TYPE,
COLOR_MAP_TYPE,
FIELD_ORIGIN,
@ -20,7 +18,7 @@ import {
SOURCE_TYPES,
STYLE_TYPE,
SYMBOLIZE_AS_TYPES,
} from '../../../../../../maps/common/constants';
} from '../../../../../../maps/common';
import { APM_STATIC_INDEX_PATTERN_ID } from '../../../../../common/index_pattern_constants';
import { useUrlParams } from '../../../../context/url_params_context/use_url_params';

View file

@ -5,7 +5,7 @@
* 2.0.
*/
import { MAP_SAVED_OBJECT_TYPE } from '../../../../plugins/maps/common/constants';
import { MAP_SAVED_OBJECT_TYPE } from '../../../../plugins/maps/common';
import { VISUALIZE_EMBEDDABLE_TYPE } from '../../../../../src/plugins/visualizations/common/constants';
import { LENS_EMBEDDABLE_TYPE } from '../../../../plugins/lens/common/constants';
import { SEARCH_EMBEDDABLE_TYPE } from '../../../../../src/plugins/discover/common';

View file

@ -8,8 +8,7 @@
import React, { useEffect, useRef, useState } from 'react';
import { htmlIdGenerator } from '@elastic/eui';
import { LayerDescriptor } from '../../../../../../maps/common/descriptor_types';
import { INITIAL_LOCATION } from '../../../../../../maps/common/constants';
import { INITIAL_LOCATION, LayerDescriptor } from '../../../../../../maps/common';
import {
MapEmbeddable,
MapEmbeddableInput,

View file

@ -8,7 +8,7 @@
import { Feature, Point } from 'geojson';
import { euiPaletteColorBlind } from '@elastic/eui';
import { DEFAULT_GEO_REGEX } from './geo_point_content';
import { SOURCE_TYPES } from '../../../../../../../maps/common/constants';
import { SOURCE_TYPES } from '../../../../../../../maps/common';
export const convertWKTGeoToLonLat = (
value: string | number

View file

@ -13,10 +13,9 @@ import { ExpandedRowContent } from '../../stats_table/components/field_data_expa
import { DocumentStatsTable } from '../../stats_table/components/field_data_expanded_row/document_stats';
import { ExamplesList } from '../../examples_list';
import { FieldVisConfig } from '../../stats_table/types';
import { LayerDescriptor } from '../../../../../../../maps/common/descriptor_types';
import { useDataVisualizerKibana } from '../../../../kibana_context';
import { JOB_FIELD_TYPES } from '../../../../../../common';
import { ES_GEO_FIELD_TYPE } from '../../../../../../../maps/common';
import { ES_GEO_FIELD_TYPE, LayerDescriptor } from '../../../../../../../maps/common';
import { EmbeddedMapComponent } from '../../embedded_map';
export const GeoPointContentWithMap: FC<{

View file

@ -14,9 +14,9 @@ import {
SOURCE_TYPES,
STYLE_TYPE,
COLOR_MAP_TYPE,
} from '../../../../../../../../maps/common/constants';
VectorLayerDescriptor,
} from '../../../../../../../../maps/common';
import { EMSTermJoinConfig } from '../../../../../../../../maps/public';
import { VectorLayerDescriptor } from '../../../../../../../../maps/common/descriptor_types';
import { EmbeddedMapComponent } from '../../../embedded_map';
import { FieldVisStats } from '../../../../../../../common/types';

View file

@ -5,8 +5,24 @@
* 2.0.
*/
// TODO: https://github.com/elastic/kibana/issues/109853
/* eslint-disable @kbn/eslint/no_export_all */
export {
AGG_TYPE,
COLOR_MAP_TYPE,
ES_GEO_FIELD_TYPE,
FIELD_ORIGIN,
INITIAL_LOCATION,
LABEL_BORDER_SIZES,
MAP_SAVED_OBJECT_TYPE,
SOURCE_TYPES,
STYLE_TYPE,
SYMBOLIZE_AS_TYPES,
} from './constants';
export * from './constants';
export * from './types';
export {
EMSFileSourceDescriptor,
ESTermSourceDescriptor,
LayerDescriptor,
TooltipFeature,
VectorLayerDescriptor,
VectorStyleDescriptor,
} from './descriptor_types';

View file

@ -34,7 +34,7 @@
"ui": true,
"server": true,
"extraPublicDirs": [
"common/constants"
"common"
],
"requiredBundles": [
"kibanaReact",

View file

@ -12,7 +12,7 @@ import { getFlyoutDisplay } from '../selectors/ui_selectors';
import { FLYOUT_STATE } from '../reducers/ui';
import { setQuery, trackMapSettings } from './map_actions';
import { setSelectedLayer } from './layer_actions';
import { DRAW_MODE } from '../../common';
import { DRAW_MODE } from '../../common/constants';
import { UPDATE_EDIT_STATE } from './map_action_constants';
export const UPDATE_FLYOUT = 'UPDATE_FLYOUT';

View file

@ -11,7 +11,7 @@ import { LayerWizard, RenderWizardArguments } from '../../layers/layer_wizard_re
import { NewVectorLayerEditor } from './wizard';
import { DrawLayerIcon } from '../../layers/icons/draw_layer_icon';
import { getFileUpload } from '../../../kibana_services';
import { LAYER_WIZARD_CATEGORY } from '../../../../common';
import { LAYER_WIZARD_CATEGORY } from '../../../../common/constants';
const ADD_VECTOR_DRAWING_LAYER = 'ADD_VECTOR_DRAWING_LAYER';

View file

@ -6,11 +6,8 @@
*/
import { getHttp } from '../../../kibana_services';
import {
CreateDocSourceResp,
INDEX_SOURCE_API_PATH,
IndexSourceMappings,
} from '../../../../common';
import { CreateDocSourceResp, IndexSourceMappings } from '../../../../common/types';
import { INDEX_SOURCE_API_PATH } from '../../../../common/constants';
export const createNewIndexAndPattern = async ({
indexName,

View file

@ -5,7 +5,7 @@
* 2.0.
*/
import { emsWorldLayerId } from '../../../../../common';
import { emsWorldLayerId } from '../../../../../common/constants';
jest.mock('../../../../kibana_services', () => {
return {

View file

@ -11,7 +11,7 @@ import {
CHECK_IS_DRAWING_INDEX,
GET_MATCHING_INDEXES_PATH,
INDEX_FEATURE_PATH,
} from '../../../../../common';
} from '../../../../../common/constants';
import { getHttp } from '../../../../kibana_services';
export const addFeatureToIndex = async (

View file

@ -22,7 +22,7 @@ import {
import { MapStoreState } from '../../reducers/store';
import { LayerDescriptor } from '../../../common/descriptor_types';
import { hasPreviewLayers, isLoadingPreviewLayers } from '../../selectors/map_selectors';
import { DRAW_MODE } from '../../../common';
import { DRAW_MODE } from '../../../common/constants';
function mapStateToProps(state: MapStoreState) {
return {

View file

@ -16,7 +16,7 @@ import * as jsts from 'jsts';
import { MapMouseEvent } from '@kbn/mapbox-gl';
import { getToasts } from '../../../../kibana_services';
import { DrawControl } from '../';
import { DRAW_MODE, DRAW_SHAPE } from '../../../../../common';
import { DRAW_MODE, DRAW_SHAPE } from '../../../../../common/constants';
import { ILayer } from '../../../../classes/layers/layer';
import {
EXCLUDE_CENTROID_FEATURES,

View file

@ -11,7 +11,7 @@ import { connect } from 'react-redux';
import { DrawFilterControl } from './draw_filter_control';
import { setDrawMode, updateDrawState } from '../../../../actions';
import { getDrawState, getGeoFieldNames } from '../../../../selectors/map_selectors';
import { DRAW_MODE } from '../../../../../common';
import { DRAW_MODE } from '../../../../../common/constants';
import { MapStoreState } from '../../../../reducers/store';
import { getDrawMode } from '../../../../selectors/ui_selectors';

View file

@ -11,7 +11,7 @@ import { connect } from 'react-redux';
import { updateEditShape } from '../../../actions';
import { MapStoreState } from '../../../reducers/store';
import { DrawControl } from './draw_control';
import { DRAW_SHAPE } from '../../../../common';
import { DRAW_SHAPE } from '../../../../common/constants';
function mapDispatchToProps(dispatch: ThunkDispatch<MapStoreState, void, AnyAction>) {
return {

View file

@ -32,7 +32,7 @@ import {
import { getDrawMode, getIsFullScreen } from '../../selectors/ui_selectors';
import { getInspectorAdapters } from '../../reducers/non_serializable_instances';
import { MapStoreState } from '../../reducers/store';
import { DRAW_MODE } from '../../../common';
import { DRAW_MODE } from '../../../common/constants';
import { TileMetaFeature } from '../../../common/descriptor_types';
import type { MapExtentState } from '../../reducers/map/types';

View file

@ -23,7 +23,7 @@ import {
getGeoFieldNames,
} from '../../../selectors/map_selectors';
import { getDrawMode } from '../../../selectors/ui_selectors';
import { DRAW_MODE } from '../../../../common';
import { DRAW_MODE } from '../../../../common/constants';
import { MapStoreState } from '../../../reducers/store';
function mapStateToProps(state: MapStoreState) {

View file

@ -19,7 +19,7 @@ import {
} from '../../../selectors/ui_selectors';
import { getLayerList } from '../../../selectors/map_selectors';
import { MapStoreState } from '../../../reducers/store';
import { DRAW_MODE } from '../../../../common';
import { DRAW_MODE } from '../../../../common/constants';
function mapStateToProps(state: MapStoreState) {
return {

View file

@ -32,7 +32,7 @@ import {
setDrawMode,
updateDrawState,
} from '../../../../../actions';
import { DRAW_MODE } from '../../../../../../common';
import { DRAW_MODE } from '../../../../../../common/constants';
function mapStateToProps(state: MapStoreState, ownProps: OwnProps): ReduxStateProps {
const flyoutDisplay = getFlyoutDisplay(state);

View file

@ -21,7 +21,7 @@ import {
import { getLayerListRaw } from '../../../../../../selectors/map_selectors';
import { getIsReadOnly } from '../../../../../../selectors/ui_selectors';
import { TOCEntryActionsPopover } from './toc_entry_actions_popover';
import { DRAW_MODE } from '../../../../../../../common';
import { DRAW_MODE } from '../../../../../../../common/constants';
function mapStateToProps(state: MapStoreState) {
return {

View file

@ -19,7 +19,7 @@ import {
} from '../action_labels';
import { ESSearchSource } from '../../../../../../classes/sources/es_search_source';
import { VectorLayer } from '../../../../../../classes/layers/vector_layer';
import { SCALING_TYPES, VECTOR_SHAPE_TYPE } from '../../../../../../../common';
import { SCALING_TYPES, VECTOR_SHAPE_TYPE } from '../../../../../../../common/constants';
import { ESSearchSourceSyncMeta } from '../../../../../../../common/descriptor_types';
export interface Props {

View file

@ -16,7 +16,7 @@ import {
} from './feature_edit_tools';
import { updateEditShape } from '../../../../actions';
import { MapStoreState } from '../../../../reducers/store';
import { DRAW_SHAPE } from '../../../../../common';
import { DRAW_SHAPE } from '../../../../../common/constants';
import { getEditState } from '../../../../selectors/map_selectors';
function mapStateToProps(state: MapStoreState): ReduxStateProps {

View file

@ -10,7 +10,7 @@ import { ToolbarOverlay } from './toolbar_overlay';
import { MapStoreState } from '../../reducers/store';
import { getDrawMode } from '../../selectors/ui_selectors';
import { getGeoFieldNames } from '../../selectors/map_selectors';
import { DRAW_MODE } from '../../../common';
import { DRAW_MODE } from '../../../common/constants';
function mapStateToProps(state: MapStoreState) {
return {

View file

@ -12,7 +12,7 @@ import { ToolsControl } from './tools_control';
import { setDrawMode, updateDrawState } from '../../../actions';
import { MapStoreState } from '../../../reducers/store';
import { DrawState } from '../../../../common/descriptor_types';
import { DRAW_MODE } from '../../../../common';
import { DRAW_MODE } from '../../../../common/constants';
import { getDrawMode } from '../../../selectors/ui_selectors';
function mapStateToProps(state: MapStoreState) {

View file

@ -20,7 +20,7 @@ import {
HIDE_TOC_DETAILS,
SET_DRAW_MODE,
} from '../actions';
import { DRAW_MODE } from '../../common';
import { DRAW_MODE } from '../../common/constants';
export enum FLYOUT_STATE {
NONE = 'NONE',

View file

@ -5,7 +5,7 @@
* 2.0.
*/
import { LAYER_STYLE_TYPE, LAYER_TYPE, SOURCE_TYPES } from '../../common';
import { LAYER_STYLE_TYPE, LAYER_TYPE, SOURCE_TYPES } from '../../common/constants';
jest.mock('../classes/layers/tiled_vector_layer/tiled_vector_layer', () => {});
jest.mock('../classes/layers/blended_vector_layer/blended_vector_layer', () => {});

View file

@ -8,7 +8,7 @@
import { MapStoreState } from '../reducers/store';
import { FLYOUT_STATE } from '../reducers/ui';
import { DRAW_MODE } from '../../common';
import { DRAW_MODE } from '../../common/constants';
export const getFlyoutDisplay = ({ ui }: MapStoreState): FLYOUT_STATE => ui.flyoutDisplay;
export const getDrawMode = ({ ui }: MapStoreState): DRAW_MODE => ui.drawMode;

View file

@ -6,12 +6,8 @@
*/
import { ElasticsearchClient, IScopedClusterClient } from 'kibana/server';
import {
MAPS_NEW_VECTOR_LAYER_META_CREATED_BY,
CreateDocSourceResp,
IndexSourceMappings,
BodySettings,
} from '../../common';
import { CreateDocSourceResp, IndexSourceMappings, BodySettings } from '../../common/types';
import { MAPS_NEW_VECTOR_LAYER_META_CREATED_BY } from '../../common/constants';
import { IndexPatternsCommonService } from '../../../../../src/plugins/data/server';
const DEFAULT_SETTINGS = { number_of_shards: 1 };

View file

@ -7,7 +7,7 @@
import { i18n } from '@kbn/i18n';
import { ElasticsearchClient } from 'kibana/server';
import { WriteSettings } from '../../common';
import { WriteSettings } from '../../common/types';
export async function writeDataToIndex(
index: string,

View file

@ -11,7 +11,13 @@ import {
ESSearchSourceDescriptor,
LayerDescriptor,
} from '../../common/descriptor_types';
import { GRID_RESOLUTION, LAYER_TYPE, RENDER_AS, SCALING_TYPES, SOURCE_TYPES } from '../../common';
import {
GRID_RESOLUTION,
LAYER_TYPE,
RENDER_AS,
SCALING_TYPES,
SOURCE_TYPES,
} from '../../common/constants';
import {
DEFAULT_EMS_DARKMAP_ID,
DEFAULT_EMS_ROADMAP_DESATURATED_ID,

View file

@ -22,7 +22,7 @@ import {
INDEX_SETTINGS_API_PATH,
FONTS_API_PATH,
API_ROOT_PATH,
} from '../common';
} from '../common/constants';
import { EMSClient } from '@elastic/ems-client';
import fetch from 'node-fetch';
import { i18n } from '@kbn/i18n';

View file

@ -6,7 +6,7 @@
*/
import { i18n } from '@kbn/i18n';
import { emsWorldLayerId } from '../../common';
import { emsWorldLayerId } from '../../common/constants';
const layerList = [
{

View file

@ -6,7 +6,7 @@
*/
import { i18n } from '@kbn/i18n';
import { emsWorldLayerId } from '../../common';
import { emsWorldLayerId } from '../../common/constants';
const layerList = [
{

View file

@ -8,15 +8,17 @@
import React, { useEffect, useRef, useState } from 'react';
import { htmlIdGenerator } from '@elastic/eui';
import { LayerDescriptor } from '../../../../../maps/common/descriptor_types';
import { INITIAL_LOCATION } from '../../../../../maps/common/constants';
import {
INITIAL_LOCATION,
LayerDescriptor,
MAP_SAVED_OBJECT_TYPE,
} from '../../../../../maps/common';
import type {
MapEmbeddable,
MapEmbeddableInput,
MapEmbeddableOutput,
RenderTooltipContentParams,
} from '../../../../../maps/public';
import { MAP_SAVED_OBJECT_TYPE } from '../../../../../maps/public';
import {
EmbeddableFactory,

View file

@ -16,13 +16,13 @@ import {
EuiTitle,
htmlIdGenerator,
} from '@elastic/eui';
import { VectorLayerDescriptor } from '../../../../maps/common/descriptor_types';
import {
FIELD_ORIGIN,
SOURCE_TYPES,
STYLE_TYPE,
COLOR_MAP_TYPE,
} from '../../../../maps/common/constants';
VectorLayerDescriptor,
} from '../../../../maps/common';
import { useMlKibana } from '../contexts/kibana';
import { isDefined } from '../../../common/types/guards';
import { MlEmbeddedMapComponent } from '../components/ml_embedded_map';

View file

@ -7,7 +7,7 @@
import React, { useState, useEffect } from 'react';
import { Dictionary } from '../../../../common/types/common';
import { LayerDescriptor } from '../../../../../maps/common/descriptor_types';
import { LayerDescriptor } from '../../../../../maps/common';
import { getMLAnomaliesActualLayer, getMLAnomaliesTypicalLayer } from './map_config';
import { MlEmbeddedMapComponent } from '../../components/ml_embedded_map';
interface Props {

View file

@ -5,7 +5,7 @@
* 2.0.
*/
import { FIELD_ORIGIN, STYLE_TYPE } from '../../../../../maps/common/constants';
import { FIELD_ORIGIN, STYLE_TYPE } from '../../../../../maps/common';
import { ANOMALY_THRESHOLD, SEVERITY_COLORS } from '../../../../common';
import { AnomaliesTableData } from '../explorer_utils';

View file

@ -14,7 +14,7 @@ import {
LayerMappingDetails,
} from './types';
import * as i18n from './translations';
import { SOURCE_TYPES } from '../../../../../maps/common/constants';
import { SOURCE_TYPES } from '../../../../../maps/common';
const euiVisColorPalette = euiPaletteColorBlind();
// Update field mappings to modify what fields will be returned to map tooltip

View file

@ -9,7 +9,7 @@ import { shallow } from 'enzyme';
import React from 'react';
import '../../../../common/mock/match_media';
import { MapToolTipComponent } from './map_tool_tip';
import { TooltipFeature } from '../../../../../../maps/common/descriptor_types';
import { TooltipFeature } from '../../../../../../maps/common';
describe('MapToolTip', () => {
test('placeholder component renders correctly against snapshot', () => {

View file

@ -6,7 +6,10 @@
*/
import expect from '@kbn/expect';
import { KBN_IS_TILE_COMPLETE, KBN_METADATA_FEATURE } from '../../../../plugins/maps/common';
import {
KBN_IS_TILE_COMPLETE,
KBN_METADATA_FEATURE,
} from '../../../../plugins/maps/common/constants';
export default function ({ getPageObjects, getService }) {
const PageObjects = getPageObjects(['maps']);
@ -219,6 +222,7 @@ export default function ({ getPageObjects, getService }) {
const layer = mapboxStyle.layers.find((mbLayer) => {
return mbLayer.id === 'n1t6f_toomanyfeatures';
});
expect(layer).to.eql({
id: 'n1t6f_toomanyfeatures',
type: 'fill',