From bd13173f45ea2c8f7c48452cdbe564173a3bded9 Mon Sep 17 00:00:00 2001 From: Tiago Costa Date: Tue, 23 Jun 2020 16:36:32 +0100 Subject: [PATCH] chore(NA): upgrade oss to lodash4 chore(NA): migrate cli, cli_plugin, cli_keystore, dev, test_utils and apm src script to lodash4 chore(NA): missing file for cli plugin chore(NA): add src core chore(NA): es archiver and fixtures chore(NA): try to fix functional test failure chore(NA): migrate src/legacy entirely to lodash4 except src/legacy/core_plugins chore(NA): move legacy core plugins to lodash4 chore(NA): upgrade optimize to lodash4 chore(NA): upgrade to lodash4 on advanced_settings, charts, console and dashboard chore(NA): migrate to lodash4 on dev_tools, discover, embeddable, es_ui)shared, expressions, home plugins chore(NA): upgrade data plugin to lodash4 chore(NA): upgrade usage_collection, ui_actions, tile_map, telemtry, share, saved_objects, saved_objects_management, region_map and navigation to lodash4 chore(NA): missing data upgrades to lodash4 Revert "chore(NA): upgrade usage_collection, ui_actions, tile_map, telemtry, share, saved_objects, saved_objects_management, region_map and navigation to lodash4" This reverts commit 137055c5fed2fc52bb26547e0bc1ad2e3d4fe309. Revert "Revert "chore(NA): upgrade usage_collection, ui_actions, tile_map, telemtry, share, saved_objects, saved_objects_management, region_map and navigation to lodash4"" This reverts commit f7e73688782998513d9fb6d7e8f0765e9beb28d1. Revert "chore(NA): missing data upgrades to lodash4" This reverts commit 92b85bf947a89bfc70cc4052738a6b2128ffb076. Revert "chore(NA): upgrade data plugin to lodash4" This reverts commit 88fdb075ee1e26c4ac979b6681d8a2b002df74c6. chore(NA): upgrade idx_pattern_mgt, input_control_vis, inspector, kbn_legacy, kbn_react, kbn_usage_collections, kbn_utils, management and maps_legacy to lodash4 chore(NA): map src plugin data to lodash3 chore(NA): missing lodash.clonedeep dep chore(NA): change packages kbn-config-schema deps chore(NA): update renovate config chore(NA): upgrade vis_type plugins to lodash4 chore(NA): move vis_type_vislib to lodash3 chore(NA): update visualizations and visualize to lodash4 chore(NA): remove lodash 3 types from src and move test to lodash4 chore(NA): move home, usage_collection and management to lodash 3 Revert "chore(NA): move home, usage_collection and management to lodash 3" This reverts commit f86e8585f02d21550746569af54215b076a79a3d. chore(NA): move kibana_legacy, saved_objects saved_objects_management into lodash3 chore(NA): update x-pack test to mock lodash4 Revert "chore(NA): move kibana_legacy, saved_objects saved_objects_management into lodash3" This reverts commit 2d10fe450533e1b36db21d99cfae3ce996a244e0. --- package.json | 4 + packages/kbn-config-schema/package.json | 1 + .../kbn-config-schema/src/internals/index.ts | 2 +- renovate.json5 | 16 +++ src/apm.js | 2 +- src/cli/cli.js | 2 +- src/cli/cluster/cluster.mock.ts | 2 +- src/cli/cluster/cluster_manager.test.ts | 4 +- src/cli/cluster/worker.ts | 4 +- src/cli/command.js | 2 +- src/cli/help.js | 4 +- src/cli/serve/read_keystore.js | 2 +- src/cli/serve/serve.js | 2 +- src/cli_keystore/cli_keystore.js | 2 +- src/cli_plugin/cli.js | 2 +- src/cli_plugin/install/rename.js | 2 +- src/cli_plugin/install/zip.js | 2 +- .../chrome/doc_title/doc_title_service.ts | 2 +- .../nav_controls/nav_controls_service.ts | 2 +- .../chrome/nav_links/nav_links_service.ts | 2 +- .../chrome/recently_accessed/persisted_log.ts | 2 +- .../chrome/ui/header/collapsible_nav.tsx | 2 +- src/core/public/http/fetch.ts | 4 +- .../injected_metadata_service.ts | 2 +- .../public/overlays/banners/priority_map.ts | 2 +- src/core/public/plugins/plugin_context.ts | 2 +- .../public/plugins/plugins_service.test.ts | 12 +- .../saved_objects/saved_objects_client.ts | 6 +- .../saved_objects/simple_saved_object.ts | 4 +- .../public/ui_settings/ui_settings_client.ts | 2 +- .../server/capabilities/merge_capabilities.ts | 4 +- .../capabilities/resolve_capabilities.ts | 2 +- src/core/server/config/config_service.ts | 2 +- .../config/deprecation/apply_deprecations.ts | 2 +- .../config/deprecation/core_deprecations.ts | 4 +- .../config/deprecation/deprecation_factory.ts | 2 +- .../server/config/object_to_config_adapter.ts | 2 +- src/core/server/config/raw_config_service.ts | 2 +- src/core/server/config/read_config.ts | 2 +- .../elasticsearch/cluster_client.test.ts | 2 +- .../server/elasticsearch/cluster_client.ts | 2 +- .../elasticsearch_client_config.ts | 2 +- src/core/server/elasticsearch/errors.ts | 4 +- .../elasticsearch/scoped_cluster_client.ts | 2 +- .../server/http/base_path_proxy_server.ts | 4 +- src/core/server/http/http_server.mocks.ts | 2 +- src/core/server/http/http_service.test.ts | 2 +- ...gacy_object_to_config_adapter.test.ts.snap | 5 +- .../legacy/config/get_unused_config_keys.ts | 2 +- .../logging/layouts/conversions/date.ts | 2 +- .../discovery/plugin_manifest_parser.ts | 2 +- .../mappings/lib/get_property.ts | 2 +- .../migrations/core/build_active_mappings.ts | 2 +- .../migrations/core/document_migrator.test.ts | 2 +- .../migrations/core/document_migrator.ts | 6 +- .../migrations/core/elastic_index.test.ts | 2 +- .../migrations/core/elastic_index.ts | 2 +- .../migrations/core/index_migrator.test.ts | 2 +- .../migrations/core/migrate_raw_docs.test.ts | 2 +- .../core/migration_coordinator.test.ts | 1 - .../migrations/core/migration_coordinator.ts | 2 +- .../serialization/serializer.test.ts | 2 +- .../service/lib/decorate_es_error.ts | 2 +- .../saved_objects/service/lib/filter_utils.ts | 2 +- .../saved_objects/service/lib/repository.ts | 4 +- .../create_or_upgrade_saved_config.ts | 2 +- .../server/ui_settings/ui_settings_client.ts | 2 +- src/core/utils/context.ts | 2 +- src/core/utils/merge.ts | 2 +- .../installed_packages.test.ts | 2 +- src/dev/precommit_hook/casing_check_config.js | 1 - src/dev/sass/build_sass.js | 2 +- src/es_archiver/lib/__tests__/stats.ts | 2 +- src/es_archiver/lib/docs/__tests__/stubs.ts | 2 +- .../lib/indices/create_index_stream.ts | 2 +- src/es_archiver/lib/indices/delete_index.ts | 2 +- src/es_archiver/lib/stats.ts | 2 +- src/fixtures/agg_resp/geohash_grid.js | 4 +- src/fixtures/mock_state.js | 2 +- src/fixtures/mock_ui_state.js | 2 +- src/legacy/core_plugins/apm_oss/index.js | 2 +- .../core_plugins/console_legacy/index.ts | 4 +- .../server/lib/handle_es_error.js | 4 +- .../public/__tests__/discover/doc_table.js | 2 +- .../public/__tests__/discover/row_headers.js | 2 +- .../__tests__/vis_type_table/agg_table.js | 2 +- .../__tests__/vis_type_tagcloud/tag_cloud.js | 2 +- .../__tests__/vis_type_vislib/_vis_fixture.js | 2 +- .../vis_type_vislib/lib/chart_title.js | 2 +- .../__tests__/vis_type_vislib/lib/dispatch.js | 4 +- .../public/__tests__/vis_type_vislib/vis.js | 2 +- .../visualizations/area_chart.js | 2 +- .../visualizations/column_chart.js | 6 +- .../visualizations/gauge_chart.js | 2 +- .../visualizations/heatmap_chart.js | 2 +- .../visualizations/line_chart.js | 2 +- .../visualizations/pie_chart.js | 2 +- .../server/lib/export/export_dashboards.js | 2 +- .../server/lib/import/import_dashboards.js | 2 +- .../management/saved_objects/relationships.js | 2 +- .../status_page/public/lib/load_status.js | 2 +- .../tests_bundle/find_source_files.js | 2 +- .../core_plugins/timelion/public/app.js | 4 +- .../timelion/public/directives/cells/cells.js | 2 +- .../public/directives/saved_object_finder.js | 4 +- .../directives/timelion_expression_input.js | 4 +- .../timelion_expression_input_helpers.js | 2 +- .../directives/timelion_help/timelion_help.js | 2 +- .../timelion_interval/timelion_interval.js | 4 +- .../public/panels/timechart/schema.ts | 4 +- .../public/shim/timelion_legacy_module.ts | 2 +- src/legacy/deprecation/create_transform.js | 2 +- src/legacy/deprecation/deprecations/rename.js | 2 +- src/legacy/deprecation/deprecations/unused.js | 2 +- src/legacy/deprecation/get_transform.js | 2 +- .../__tests__/find_plugin_specs.js | 2 +- .../plugin_config/settings.js | 2 +- .../plugin_spec/plugin_spec.js | 3 +- src/legacy/server/config/config.js | 2 +- src/legacy/server/config/config.test.js | 2 +- src/legacy/server/http/index.js | 2 +- .../i18n/localization/file_integrity.ts | 4 +- .../telemetry_localization_collector.ts | 2 +- src/legacy/server/kbn_server.js | 2 +- src/legacy/server/logging/configuration.js | 2 +- src/legacy/server/logging/log_format.js | 4 +- .../server/logging/log_format_string.js | 2 +- src/legacy/server/logging/log_interceptor.js | 2 +- .../server/logging/log_with_metadata.js | 2 +- .../server/logging/rotate/log_rotator.test.ts | 4 +- .../server/logging/rotate/log_rotator.ts | 2 +- src/legacy/server/pid/index.js | 2 +- .../server/plugins/lib/call_plugin_hook.js | 2 +- src/legacy/server/plugins/lib/plugin.js | 2 +- src/legacy/server/status/index.js | 2 +- .../server/status/lib/case_conversion.ts | 2 +- .../status/lib/get_kibana_info_for_stats.js | 2 +- src/legacy/server/status/lib/metrics.js | 2 +- src/legacy/server/status/lib/metrics.test.js | 2 +- src/legacy/server/status/samples.js | 2 +- src/legacy/server/status/server_status.js | 4 +- .../server/status/server_status.test.js | 2 +- src/legacy/server/status/states.js | 4 +- src/legacy/server/status/wrap_auth_config.js | 2 +- src/legacy/ui/public/__tests__/events.js | 2 +- src/legacy/ui/public/bound_to_config_obj.js | 2 +- .../ui/public/chrome/__mocks__/index.js | 2 +- .../ui/public/chrome/api/__tests__/angular.js | 2 +- src/legacy/ui/public/chrome/api/apps.js | 2 +- .../ui/public/chrome/api/injected_vars.ts | 2 +- src/legacy/ui/public/chrome/chrome.js | 2 +- src/legacy/ui/public/config/config.js | 2 +- src/legacy/ui/public/directives/kbn_href.js | 2 +- .../render_directive/apply_scope_bindings.js | 2 +- .../render_directive/render_directive.js | 2 +- .../watch_multi/__tests__/watch_multi.js | 2 +- src/legacy/ui/public/doc_title/doc_title.js | 2 +- .../documentation_links/get_doc_link.ts | 2 +- src/legacy/ui/public/events.js | 6 +- .../indexed_array/__tests__/indexed_array.js | 10 +- .../indexed_array/helpers/organize_by.test.ts | 2 +- .../indexed_array/helpers/organize_by.ts | 2 +- src/legacy/ui/public/indexed_array/index.d.ts | 2 +- .../ui/public/indexed_array/indexed_array.js | 4 +- src/legacy/ui/public/kfetch/kfetch.ts | 2 +- src/legacy/ui/public/modules.js | 2 +- .../ui/public/new_platform/set_services.ts | 2 +- src/legacy/ui/public/registry/_registry.js | 2 +- .../public/routes/__tests__/_route_manager.js | 4 +- .../ui/public/routes/__tests__/_work_queue.js | 2 +- .../routes/__tests__/_wrap_route_with_prep.js | 2 +- src/legacy/ui/public/routes/breadcrumbs.js | 2 +- src/legacy/ui/public/routes/route_manager.js | 2 +- .../ui/public/routes/route_setup_manager.js | 2 +- .../ui/public/routes/wrap_route_with_prep.js | 2 +- .../__tests__/state_monitor_factory.js | 2 +- .../ui/public/state_management/state.js | 4 +- .../state_management/state_monitor_factory.ts | 2 +- .../test_sharding/setup_test_sharding.js | 2 +- .../ui/public/timefilter/setup_router.ts | 2 +- src/legacy/ui/public/url/__tests__/url.js | 2 +- src/legacy/ui/public/url/prepend_path.ts | 2 +- src/legacy/ui/public/url/url.js | 2 +- src/legacy/ui/public/utils/collection.ts | 4 +- .../ui_export_types/webpack_customizations.js | 2 +- src/legacy/utils/deep_clone_with_buffers.ts | 4 +- src/legacy/utils/unset.js | 5 +- .../dynamic_dll_plugin/dll_compiler.js | 2 +- src/optimize/watch/proxy_role.js | 2 +- .../management_app/components/form/form.tsx | 2 +- .../management_app/lib/get_aria_name.ts | 2 +- .../public/services/colors/color_palette.ts | 2 +- .../charts/public/services/colors/colors.ts | 2 +- .../services/colors/mapped_colors.test.ts | 4 +- .../public/services/colors/mapped_colors.ts | 10 +- .../public/static/color_maps/heatmap_color.ts | 2 +- .../public/static/components/color_ranges.tsx | 2 +- .../application/components/settings_modal.tsx | 1 + .../console_history/console_history.tsx | 2 +- .../application/containers/editor/editor.tsx | 2 +- .../editor/legacy/console_editor/editor.tsx | 2 +- .../console_editor/keyboard_shortcuts.ts | 2 +- .../hooks/use_save_current_text_object.ts | 2 +- .../legacy_core_editor/create_readonly.ts | 2 +- .../models/legacy_core_editor/smart_resize.ts | 2 +- .../__tests__/integration.test.js | 4 +- .../__tests__/sense_editor.test.js | 2 +- .../models/sense_editor/sense_editor.ts | 2 +- .../__jest__/url_autocomplete.test.js | 2 +- .../autocomplete/__jest__/url_params.test.js | 2 +- .../public/lib/autocomplete/autocomplete.ts | 2 +- .../public/lib/autocomplete/body_completer.js | 4 +- .../components/accept_endpoint_component.js | 2 +- .../components/constant_component.js | 2 +- .../field_autocomplete_component.js | 2 +- .../components/id_autocomplete_component.js | 2 +- .../index_autocomplete_component.js | 2 +- .../autocomplete/components/list_component.js | 4 +- .../components/object_component.js | 2 +- .../components/shared_component.js | 2 +- .../components/type_autocomplete_component.js | 2 +- .../components/url_pattern_matcher.js | 111 ++++++++---------- .../username_autocomplete_component.js | 2 +- .../console/public/lib/autocomplete/engine.js | 20 ++-- .../public/lib/autocomplete/url_params.js | 22 ++-- .../__tests__/curl_parsing.test.js | 2 +- .../public/lib/kb/__tests__/kb.test.js | 2 +- src/plugins/console/public/lib/kb/api.js | 14 +-- src/plugins/console/public/lib/kb/kb.js | 2 +- .../console/public/lib/mappings/mappings.js | 6 +- src/plugins/console/public/lib/utils/index.ts | 2 +- .../console/public/services/storage.ts | 2 +- .../server/lib/elasticsearch_proxy_config.ts | 4 +- .../console/server/lib/proxy_config.ts | 2 +- .../server/lib/proxy_config_collection.ts | 2 +- src/plugins/console/server/lib/set_headers.ts | 2 +- .../lib/spec_definitions/js/mappings.ts | 2 +- .../lib/spec_definitions/js/query/dsl.ts | 2 +- .../api/console/proxy/create_handler.ts | 4 +- .../services/spec_definitions_service.ts | 9 +- .../actions/clone_panel_action.tsx | 1 + .../actions/replace_panel_flyout.tsx | 1 + .../application/dashboard_app_controller.tsx | 6 +- .../application/dashboard_state_manager.ts | 2 +- .../embeddable/grid/dashboard_grid.tsx | 2 +- .../embeddable/panel/create_panel_state.ts | 1 - .../panel/dashboard_panel_placement.ts | 1 + .../lib/embeddable_saved_object_converters.ts | 2 +- .../public/application/lib/filter_utils.ts | 2 +- .../application/lib/update_saved_dashboard.ts | 4 +- .../listing/dashboard_listing.test.js | 4 +- .../saved_objects/dashboard_migrations.ts | 8 +- .../saved_objects/migrate_match_all_query.ts | 4 +- .../es_query/es_query/build_es_query.ts | 2 +- .../es_query/es_query/decorate_query.ts | 2 +- .../common/es_query/es_query/es_query_dsl.ts | 2 +- .../common/es_query/es_query/from_filters.ts | 2 +- .../es_query/get_es_query_config.test.ts | 2 +- .../es_query/es_query/lucene_string_to_dsl.ts | 2 +- .../es_query/es_query/migrate_filter.test.ts | 2 +- .../es_query/es_query/migrate_filter.ts | 2 +- .../es_query/filters/get_display_value.ts | 2 +- .../data/common/es_query/filters/index.ts | 2 +- .../common/es_query/filters/phrase_filter.ts | 2 +- .../es_query/filters/range_filter.test.ts | 2 +- .../common/es_query/filters/range_filter.ts | 2 +- .../common/es_query/kuery/functions/exists.ts | 2 +- .../kuery/functions/geo_bounding_box.test.ts | 2 +- .../kuery/functions/geo_bounding_box.ts | 2 +- .../common/es_query/kuery/functions/is.ts | 2 +- .../es_query/kuery/functions/range.test.ts | 2 +- .../common/es_query/kuery/functions/range.ts | 2 +- .../es_query/kuery/kuery_syntax_error.ts | 2 +- .../es_query/kuery/node_types/function.ts | 2 +- .../es_query/kuery/node_types/named_arg.ts | 2 +- .../content_types/html_content_type.ts | 2 +- .../content_types/text_content_type.ts | 2 +- .../common/field_formats/converters/color.ts | 2 +- .../field_formats/converters/date_nanos.ts | 2 +- .../common/field_formats/converters/source.ts | 2 +- .../field_formats/converters/truncate.ts | 2 +- .../common/field_formats/converters/url.ts | 2 +- .../common/field_formats/field_format.test.ts | 2 +- .../data/common/field_formats/field_format.ts | 2 +- .../field_formats/field_formats_registry.ts | 2 +- .../utils/highlight/highlight_html.ts | 2 +- .../common/field_mapping/mapping_setup.ts | 2 +- .../index_patterns/fields/field_list.ts | 2 +- .../index_patterns/fields/obj_define.js | 2 +- .../ensure_default_index_pattern.ts | 2 +- .../index_patterns/flatten_hit.ts | 2 +- .../index_patterns/format_hit.ts | 2 +- .../index_patterns/index_pattern.test.ts | 2 +- .../index_patterns/index_pattern.ts | 2 +- .../lib/get_from_saved_object.ts | 2 +- .../data/common/index_patterns/utils.ts | 2 +- .../query/filter_manager/compare_filters.ts | 2 +- .../query/filter_manager/dedup_filters.ts | 2 +- .../query/filter_manager/uniq_filters.ts | 2 +- .../date_interval_utils/parse_interval.ts | 2 +- .../create_filters_from_range_select.ts | 2 +- .../providers/value_suggestion_provider.ts | 2 +- .../public/field_formats/converters/date.ts | 2 +- .../public/field_formats/utils/deserialize.ts | 2 +- .../filter_manager/filter_manager.test.ts | 2 +- .../query/filter_manager/filter_manager.ts | 2 +- .../filter_manager/lib/generate_filters.ts | 2 +- .../lib/map_and_flatten_filters.ts | 2 +- .../query/filter_manager/lib/map_filter.ts | 2 +- .../filter_manager/lib/mappers/map_default.ts | 2 +- .../filter_manager/lib/mappers/map_exists.ts | 2 +- .../filter_manager/lib/mappers/map_phrase.ts | 2 +- .../filter_manager/lib/mappers/map_range.ts | 2 +- .../query/filter_manager/lib/only_disabled.ts | 2 +- .../data/public/query/lib/from_user.ts | 2 +- .../query/persisted_log/persisted_log.ts | 2 +- .../state_sync/connect_to_query_state.ts | 2 +- .../timefilter/lib/change_time_filter.ts | 2 +- .../timefilter/lib/diff_time_picker_vals.ts | 2 +- .../timefilter/lib/extract_time_filter.ts | 2 +- .../public/query/timefilter/timefilter.ts | 2 +- .../public/search/aggs/agg_config.test.ts | 2 +- .../data/public/search/aggs/agg_config.ts | 2 +- .../public/search/aggs/agg_configs.test.ts | 2 +- .../data/public/search/aggs/agg_configs.ts | 2 +- .../data/public/search/aggs/agg_type.ts | 2 +- .../buckets/_terms_other_bucket_helper.ts | 2 +- .../aggs/buckets/create_filter/filters.ts | 2 +- .../search/aggs/buckets/date_histogram.ts | 2 +- .../public/search/aggs/buckets/date_range.ts | 2 +- .../public/search/aggs/buckets/filters.ts | 2 +- .../public/search/aggs/buckets/geo_tile.ts | 2 +- .../public/search/aggs/buckets/histogram.ts | 2 +- .../public/search/aggs/buckets/ip_range.ts | 2 +- .../buckets/lib/time_buckets/time_buckets.ts | 2 +- .../buckets/migrate_include_exclude_format.ts | 2 +- .../data/public/search/aggs/buckets/terms.ts | 2 +- .../public/search/aggs/metrics/bucket_avg.ts | 2 +- .../lib/get_response_agg_config_class.ts | 2 +- .../aggs/metrics/lib/make_nested_label.ts | 2 +- .../aggs/metrics/lib/ordinal_suffix.test.ts | 2 +- .../metrics/lib/parent_pipeline_agg_helper.ts | 2 +- .../lib/sibling_pipeline_agg_helper.ts | 2 +- .../aggs/metrics/percentiles_get_value.ts | 2 +- .../search/aggs/metrics/std_deviation.ts | 2 +- .../search/aggs/metrics/top_hit.test.ts | 2 +- .../public/search/aggs/metrics/top_hit.ts | 2 +- .../public/search/aggs/param_types/json.ts | 2 +- .../aggs/test_helpers/function_wrapper.ts | 2 +- .../public/search/aggs/utils/prop_filter.ts | 2 +- .../build_tabular_inspector_data.ts | 2 +- .../data/public/search/expressions/esaggs.ts | 2 +- .../search/search_source/search_source.ts | 2 +- .../data/public/search/tabify/buckets.ts | 2 +- .../data/public/search/tabify/get_columns.ts | 2 +- .../public/search/tabify/response_writer.ts | 2 +- .../data/public/search/tabify/tabify.ts | 2 +- .../ui/filter_bar/filter_editor/index.tsx | 2 +- .../filter_editor/phrase_suggestor.tsx | 2 +- .../filter_editor/phrase_value_input.tsx | 2 +- .../filter_editor/phrases_values_input.tsx | 2 +- .../filter_editor/range_value_input.tsx | 2 +- .../filter_editor/value_input_type.tsx | 2 +- .../index_pattern_select.tsx | 2 +- .../fetch_index_patterns.ts | 2 +- .../query_string_input.test.mocks.ts | 6 +- .../query_string_input/query_string_input.tsx | 2 +- .../ui/saved_query_form/save_query_form.tsx | 2 +- .../saved_query_management_component.tsx | 2 +- .../data/public/ui/search_bar/search_bar.tsx | 4 +- .../ui/typeahead/suggestions_component.tsx | 2 +- .../autocomplete/value_suggestions_route.ts | 2 +- .../field_formats/converters/date_server.ts | 2 +- .../field_formats/field_formats_service.ts | 2 +- .../index_patterns/fetcher/lib/errors.ts | 2 +- .../field_capabilities.test.js | 2 +- .../field_capabilities/field_capabilities.ts | 2 +- .../field_caps_response.test.js | 2 +- .../field_capabilities/field_caps_response.ts | 2 +- .../lib/field_capabilities/overrides.ts | 2 +- .../fetcher/lib/resolve_time_pattern.test.js | 2 +- .../fetcher/lib/resolve_time_pattern.ts | 2 +- .../kql_telemetry/usage_collector/fetch.ts | 2 +- .../saved_objects/index_pattern_migrations.ts | 2 +- .../server/saved_objects/search_migrations.ts | 2 +- src/plugins/dev_tools/public/plugin.ts | 2 +- .../public/application/angular/context.js | 2 +- .../application/angular/context/api/anchor.js | 2 +- .../context/api/context.predecessors.test.js | 2 +- .../context/api/context.successors.test.js | 2 +- .../angular/context/query/actions.js | 4 +- .../context/query_parameters/actions.js | 2 +- .../public/application/angular/context_app.js | 2 +- .../application/angular/context_state.ts | 2 +- .../collapsible_sidebar.ts | 2 +- .../angular/directives/debounce/debounce.js | 2 +- .../angular/directives/fixed_scroll.js | 2 +- .../public/application/angular/discover.js | 2 +- .../application/angular/discover_state.ts | 2 +- .../angular/doc_table/components/table_row.ts | 2 +- .../angular/doc_table/lib/get_sort.ts | 2 +- .../application/angular/get_painless_error.ts | 2 +- .../angular/helpers/point_series.ts | 2 +- .../sidebar/discover_sidebar.test.tsx | 2 +- .../components/sidebar/discover_sidebar.tsx | 2 +- .../sidebar/lib/field_calculator.js | 2 +- .../sidebar/lib/field_calculator.test.ts | 4 +- .../lib/get_index_pattern_field_list.ts | 2 +- .../application/components/table/table.tsx | 2 +- .../embeddable/search_embeddable.ts | 2 +- .../discover/public/kibana_services.ts | 2 + .../public/lib/embeddables/embeddable.tsx | 2 +- .../components/cron_editor/cron_editor.js | 6 +- .../components/json_editor/json_editor.tsx | 2 +- .../lexer_rules/x_json_highlight_rules.ts | 2 +- .../json_xjson_translation_tools.test.ts | 2 +- .../forms/hook_form_lib/hooks/use_form.ts | 2 +- .../static/forms/hook_form_lib/lib/utils.ts | 2 +- .../expressions/common/execution/execution.ts | 2 +- .../specs/kibana_context.ts | 6 +- .../expression_functions/specs/tests/utils.ts | 2 +- .../expression_types/specs/datatable.ts | 4 +- .../specs/kibana_datatable.ts | 4 +- src/plugins/expressions/public/loader.ts | 3 +- .../components/sample_data_set_cards.js | 2 +- .../components/tutorial/tutorial.js | 2 +- .../components/tutorial_directory.js | 2 +- .../home/public/application/load_tutorials.js | 2 +- .../services/sample_data/routes/uninstall.ts | 2 +- .../sample_data/usage/collector_fetch.ts | 2 +- .../lib/get_indices.ts | 2 +- .../edit_index_pattern/edit_index_pattern.tsx | 2 +- .../lib/get_field_format.ts | 2 +- .../components/table/table.tsx | 2 +- .../edit_index_pattern/tabs/utils.ts | 4 +- .../components/field_editor/field_editor.tsx | 2 +- .../public/components/editor/field_select.tsx | 2 +- .../public/components/vis/list_control.tsx | 2 +- .../public/components/vis/range_control.tsx | 2 +- .../public/control/control.ts | 2 +- .../control/filter_manager/filter_manager.ts | 2 +- .../filter_manager/phrase_filter_manager.ts | 8 +- .../filter_manager/range_filter_manager.ts | 2 +- .../public/control/list_control_factory.ts | 2 +- .../public/control/range_control_factory.ts | 2 +- .../public/lineage/lineage_map.ts | 2 +- .../adapters/request/request_adapter.ts | 1 - .../public/views/data/lib/export_csv.ts | 4 +- .../public/angular/angular_config.tsx | 2 +- .../kibana_legacy/public/angular/promises.js | 2 +- .../public/angular/watch_multi.js | 2 +- .../public/angular_bootstrap/index.ts | 2 +- .../public/notify/lib/format_es_msg.ts | 2 +- .../public/notify/lib/format_msg.ts | 2 +- .../kibana_legacy/public/paginate/paginate.js | 2 +- .../public/utils/migrate_legacy_query.ts | 2 +- .../kibana_legacy/public/utils/private.js | 2 +- src/plugins/kibana_legacy/server/index.ts | 2 +- .../kibana_react/public/markdown/markdown.tsx | 2 +- .../table_list_view/table_list_view.tsx | 4 +- .../kibana/get_saved_object_counts.ts | 2 +- .../ops_stats/ops_stats_collector.ts | 2 +- .../common/url/encode_uri_query.ts | 4 +- .../public/field_wildcard/field_wildcard.ts | 2 +- .../public/resize_checker/resize_checker.ts | 2 +- .../utils/diff_object.test.ts | 2 +- .../state_management/utils/diff_object.ts | 2 +- .../hashed_item_store/hashed_item_store.ts | 2 +- .../management_sidebar_nav.tsx | 2 +- .../public/map/base_maps_visualization.js | 2 +- .../maps_legacy/public/map/decode_geo_hash.ts | 2 +- .../maps_legacy/public/map/grid_dimensions.js | 2 +- .../maps_legacy/public/map/kibana_map.js | 2 +- .../public/map/service_settings.js | 2 +- .../public/top_nav_menu/top_nav_menu_item.tsx | 6 +- .../__tests__/region_map_visualization.js | 2 +- .../region_map/public/choropleth_layer.js | 2 +- .../finder/saved_object_finder.test.tsx | 2 +- .../public/finder/saved_object_finder.tsx | 2 +- .../saved_object/helpers/apply_es_resp.ts | 2 +- .../helpers/build_saved_object.ts | 2 +- .../saved_object/helpers/create_source.ts | 2 +- .../helpers/initialize_saved_object.ts | 2 +- .../helpers/save_with_confirmation.ts | 2 +- .../helpers/serialize_saved_object.ts | 2 +- .../public/lib/case_conversion.ts | 2 +- .../public/lib/create_field_list.ts | 6 +- .../public/lib/get_relationships.ts | 2 +- .../public/lib/numeric.ts | 2 +- .../public/lib/resolve_saved_objects.ts | 2 +- .../object_view/components/form.tsx | 2 +- .../objects_table/components/flyout.tsx | 2 +- .../saved_objects_table.test.mocks.ts | 4 +- .../objects_table/saved_objects_table.tsx | 2 +- .../saved_objects_table_page.tsx | 4 +- .../server/lib/find_all.test.ts | 2 +- .../routes/lib/short_url_assert_valid.ts | 2 +- .../server/routes/lib/short_url_lookup.ts | 2 +- src/plugins/share/server/saved_objects/url.ts | 6 +- .../__tests__/get_local_stats.js | 2 +- .../server/telemetry_collection/get_kibana.ts | 2 +- src/plugins/tile_map/public/css_filters.js | 2 +- src/plugins/tile_map/public/geohash_layer.js | 2 +- .../tile_map/public/markers/heatmap.js | 2 +- .../tile_map/public/markers/scaled_circles.js | 2 +- .../tile_map/public/markers/shaded_circles.js | 2 +- .../tile_map/public/tile_map_visualization.js | 2 +- .../build_eui_context_menu_panels.tsx | 2 +- .../server/collector/collector_set.test.ts | 2 +- .../server/collector/collector_set.ts | 2 +- .../public/components/agg_group_helper.tsx | 2 +- .../public/components/agg_params_helper.ts | 4 +- .../public/components/agg_select.tsx | 2 +- .../controls/components/input_list.tsx | 4 +- .../components/number_list/range.test.ts | 2 +- .../controls/components/number_list/utils.ts | 4 +- .../components/simple_number_list.tsx | 2 +- .../components/controls/date_ranges.tsx | 2 +- .../components/controls/extended_bounds.tsx | 2 +- .../public/components/controls/field.tsx | 2 +- .../public/components/controls/filters.tsx | 8 +- .../components/controls/number_interval.tsx | 4 +- .../public/components/controls/ranges.tsx | 2 +- .../public/components/controls/size.tsx | 2 +- .../components/controls/time_interval.tsx | 4 +- .../public/components/sidebar/data_tab.tsx | 7 +- .../public/components/sidebar/sidebar.tsx | 2 +- .../components/sidebar/state/reducers.ts | 2 +- .../vis_default_editor/public/schemas.ts | 3 +- .../components/metric_vis_component.tsx | 6 +- .../public/agg_table/agg_table.js | 2 +- .../public/components/table_vis_options.tsx | 2 +- .../public/paginated_table/paginated_table.js | 2 +- .../paginated_table/paginated_table.test.ts | 2 +- .../public/paginated_table/rows.js | 2 +- .../public/table_vis_controller.js | 2 +- .../common/lib/to_milliseconds.ts | 2 +- .../public/components/panel.tsx | 2 +- .../timelion_expression_input_helpers.ts | 2 +- .../public/helpers/arg_value_suggestions.ts | 2 +- .../public/helpers/panel_utils.ts | 4 +- .../public/helpers/tick_formatters.ts | 2 +- .../public/timelion_vis_fn.ts | 9 +- .../server/fit_functions/average.js | 4 +- .../server/fit_functions/average.test.js | 2 +- .../server/fit_functions/carry.js | 2 +- .../server/fit_functions/carry.test.js | 2 +- .../server/fit_functions/nearest.js | 2 +- .../server/fit_functions/scale.js | 2 +- .../server/handlers/chain_runner.js | 4 +- .../server/handlers/lib/arg_type.js | 2 +- .../server/handlers/lib/index_arguments.js | 2 +- .../server/handlers/lib/parse_sheet.js | 2 +- .../server/handlers/lib/preprocess_chain.js | 2 +- .../handlers/lib/reposition_arguments.js | 2 +- .../server/handlers/lib/tl_config.js | 2 +- .../server/handlers/lib/validate_arg.js | 4 +- .../vis_type_timelion/server/lib/alter.js | 2 +- .../vis_type_timelion/server/lib/as_sorted.js | 4 +- .../server/lib/classes/datasource.js | 2 +- .../server/lib/classes/timelion_function.js | 4 +- .../server/lib/functions_md.js | 2 +- .../server/lib/get_namespaced_settings.js | 2 +- .../server/lib/load_functions.js | 4 +- .../server/lib/process_function_definition.js | 2 +- .../vis_type_timelion/server/lib/reduce.js | 4 +- .../server/lib/unzip_pairs.js | 4 +- .../server/routes/functions.ts | 2 +- .../vis_type_timelion/server/routes/run.ts | 2 +- .../server/routes/validate_es.ts | 2 +- .../server/series_functions/abs.js | 2 +- .../server/series_functions/abs.test.js | 2 +- .../aggregate/aggregate.test.js | 2 +- .../server/series_functions/aggregate/avg.js | 2 +- .../series_functions/aggregate/cardinality.js | 2 +- .../series_functions/aggregate/first.js | 2 +- .../series_functions/aggregate/index.js | 2 +- .../server/series_functions/aggregate/last.js | 2 +- .../server/series_functions/aggregate/max.js | 2 +- .../server/series_functions/aggregate/min.js | 2 +- .../server/series_functions/aggregate/sum.js | 2 +- .../server/series_functions/bars.test.js | 2 +- .../server/series_functions/color.test.js | 2 +- .../server/series_functions/condition.js | 2 +- .../server/series_functions/condition.test.js | 2 +- .../server/series_functions/cusum.js | 2 +- .../server/series_functions/cusum.test.js | 2 +- .../server/series_functions/derivative.js | 2 +- .../series_functions/derivative.test.js | 2 +- .../server/series_functions/divide.test.js | 2 +- .../server/series_functions/es/es.test.js | 2 +- .../server/series_functions/es/index.js | 2 +- .../es/lib/agg_response_to_series_list.js | 4 +- .../series_functions/es/lib/build_request.js | 4 +- .../es/lib/create_date_agg.js | 2 +- .../server/series_functions/fit.js | 2 +- .../server/series_functions/fit.test.js | 2 +- .../server/series_functions/graphite.js | 2 +- .../series_functions/helpers/get_series.js | 2 +- .../helpers/get_series_list.js | 2 +- .../helpers/get_single_series_list.js | 2 +- .../helpers/invoke_series_fn.js | 2 +- .../server/series_functions/hide.test.js | 2 +- .../server/series_functions/holt/index.js | 2 +- .../server/series_functions/holt/lib/des.js | 2 +- .../server/series_functions/holt/lib/ses.js | 2 +- .../server/series_functions/holt/lib/tes.js | 2 +- .../server/series_functions/label.test.js | 2 +- .../server/series_functions/log.js | 2 +- .../server/series_functions/log.test.js | 2 +- .../server/series_functions/max.test.js | 2 +- .../server/series_functions/min.test.js | 2 +- .../server/series_functions/movingaverage.js | 4 +- .../series_functions/movingaverage.test.js | 2 +- .../server/series_functions/movingstd.js | 4 +- .../server/series_functions/multiply.test.js | 2 +- .../server/series_functions/points.js | 4 +- .../server/series_functions/points.test.js | 2 +- .../server/series_functions/precision.test.js | 2 +- .../server/series_functions/props.js | 2 +- .../server/series_functions/quandl.js | 2 +- .../server/series_functions/range.js | 2 +- .../server/series_functions/range.test.js | 2 +- .../server/series_functions/scale_interval.js | 2 +- .../series_functions/scale_interval.test.js | 2 +- .../server/series_functions/static.js | 2 +- .../server/series_functions/static.test.js | 4 +- .../server/series_functions/subtract.test.js | 2 +- .../server/series_functions/sum.test.js | 2 +- .../server/series_functions/title.test.js | 2 +- .../server/series_functions/trend/index.js | 2 +- .../series_functions/trend/lib/regress.js | 2 +- .../server/series_functions/trim.js | 2 +- .../server/series_functions/trim.test.js | 2 +- .../server/series_functions/worldbank.js | 2 +- .../series_functions/worldbank_indicators.js | 2 +- .../server/series_functions/yaxis.js | 2 +- .../vis_type_timeseries/common/agg_lookup.js | 2 +- .../common/calculate_label.js | 2 +- .../common/extract_index_patterns.js | 2 +- .../common/get_last_value.js | 2 +- .../components/add_delete_buttons.js | 2 +- .../application/components/aggs/agg_row.js | 2 +- .../components/aggs/metric_select.js | 2 +- .../aggs/percentile_rank/multi_value_row.js | 2 +- .../aggs/percentile_rank/percentile_rank.js | 2 +- .../percentile_rank/percentile_rank_values.js | 2 +- .../components/aggs/percentile_ui.js | 2 +- .../application/components/aggs/vars.js | 2 +- .../components/annotations_editor.js | 2 +- .../application/components/color_rules.js | 2 +- .../components/data_format_picker.js | 2 +- .../public/application/components/error.js | 2 +- .../application/components/index_pattern.js | 2 +- .../components/lib/calculate_siblings.js | 2 +- .../application/components/lib/charts.js | 2 +- .../components/lib/convert_series_to_vars.js | 2 +- .../components/lib/create_change_handler.js | 2 +- .../components/lib/create_number_handler.js | 2 +- .../components/lib/create_select_handler.js | 2 +- .../components/lib/create_text_handler.js | 2 +- .../components/lib/get_interval.js | 2 +- .../components/lib/new_series_fn.js | 2 +- .../components/lib/re_id_series.js | 2 +- .../components/lib/replace_vars.js | 2 +- .../components/lib/series_change_handler.js | 4 +- .../components/lib/tick_formatter.js | 2 +- .../application/components/markdown_editor.js | 2 +- .../components/panel_config/table.js | 2 +- .../public/application/components/series.js | 2 +- .../application/components/series_editor.js | 2 +- .../public/application/components/split.js | 2 +- .../components/splits/filter_items.js | 2 +- .../application/components/splits/terms.js | 2 +- .../application/components/vis_editor.js | 2 +- .../components/vis_editor_visualization.js | 2 +- .../components/vis_types/gauge/vis.js | 2 +- .../components/vis_types/markdown/vis.js | 2 +- .../components/vis_types/metric/vis.js | 2 +- .../components/vis_types/table/vis.js | 2 +- .../components/vis_types/timeseries/vis.js | 2 +- .../components/vis_types/top_n/vis.js | 2 +- .../application/components/vis_with_splits.js | 2 +- .../application/components/visualization.js | 2 +- .../public/application/components/yes_no.js | 2 +- .../application/lib/check_ui_restrictions.js | 2 +- .../visualizations/lib/get_value_by.js | 2 +- .../application/visualizations/views/gauge.js | 2 +- .../visualizations/views/gauge_vis.js | 2 +- .../visualizations/views/metric.js | 2 +- .../vis_type_timeseries/public/metrics_fn.ts | 2 +- .../server/lib/get_fields.ts | 4 +- .../server/lib/get_vis_data.ts | 2 +- .../vis_data/get_interval_and_timefield.js | 2 +- .../server/lib/vis_data/get_table_data.js | 2 +- .../lib/vis_data/helpers/bucket_transform.js | 2 +- .../lib/vis_data/helpers/get_agg_value.js | 2 +- .../lib/vis_data/helpers/get_buckets_path.js | 2 +- .../lib/vis_data/helpers/get_index_pattern.js | 2 +- .../lib/vis_data/helpers/get_last_metric.js | 2 +- .../vis_data/helpers/get_sibling_agg_value.js | 2 +- .../server/lib/vis_data/helpers/get_splits.js | 2 +- .../lib/vis_data/helpers/parse_interval.js | 2 +- .../server/lib/vis_data/helpers/timestamp.js | 2 +- .../lib/vis_data/helpers/unit_to_seconds.js | 2 +- .../series/normalize_query.js | 2 +- .../table/calculate_agg_root.js | 2 +- .../table/normalize_query.js | 2 +- .../request_processors/table/pivot.js | 2 +- .../annotations/buckets.js | 2 +- .../response_processors/annotations/index.js | 2 +- .../response_processors/series/_series_agg.js | 2 +- .../series/drop_last_bucket.js | 2 +- .../response_processors/series/math.js | 2 +- .../response_processors/series/series_agg.js | 2 +- .../response_processors/series/time_shift.js | 2 +- .../response_processors/table/_series_agg.js | 2 +- .../response_processors/table/percentile.js | 2 +- .../table/percentile_rank.js | 2 +- .../response_processors/table/series_agg.js | 2 +- .../vis_data/series/handle_response_body.js | 2 +- .../lib/vis_data/table/process_bucket.js | 2 +- .../server/saved_objects/tsvb_telemetry.ts | 6 +- .../public/data_model/es_query_parser.js | 2 +- .../public/data_model/es_query_parser.test.js | 2 +- .../public/data_model/vega_parser.js | 2 +- .../public/data_model/vega_parser.test.js | 2 +- src/plugins/vis_type_vega/public/vega_fn.ts | 8 +- .../public/vega_view/vega_tooltip.js | 2 +- .../components/options/metrics_axes/index.tsx | 2 +- .../components/options/metrics_axes/utils.ts | 2 +- .../fixtures/mock_data/filters/_columns.js | 2 +- .../fixtures/mock_data/filters/_rows.js | 2 +- .../fixtures/mock_data/filters/_series.js | 2 +- .../fixtures/mock_data/geohash/_columns.js | 2 +- .../fixtures/mock_data/geohash/_geo_json.js | 2 +- .../fixtures/mock_data/geohash/_rows.js | 2 +- .../fixtures/mock_data/histogram/_columns.js | 2 +- .../fixtures/mock_data/histogram/_rows.js | 2 +- .../fixtures/mock_data/histogram/_series.js | 2 +- .../fixtures/mock_data/histogram/_slices.js | 2 +- .../mock_data/not_enough_data/_one_point.js | 2 +- .../fixtures/mock_data/range/_columns.js | 2 +- .../public/fixtures/mock_data/range/_rows.js | 2 +- .../fixtures/mock_data/range/_series.js | 2 +- .../mock_data/significant_terms/_columns.js | 2 +- .../mock_data/significant_terms/_rows.js | 2 +- .../mock_data/significant_terms/_series.js | 2 +- .../fixtures/mock_data/terms/_columns.js | 2 +- .../public/fixtures/mock_data/terms/_rows.js | 2 +- .../fixtures/mock_data/terms/_series.js | 2 +- .../mock_data/terms/_series_multiple.js | 2 +- .../vislib/components/labels/data_array.js | 2 +- .../components/labels/flatten_series.js | 2 +- .../public/vislib/components/labels/labels.js | 2 +- .../vislib/components/labels/labels.test.js | 2 +- .../vislib/components/labels/uniq_labels.js | 2 +- .../vislib/components/legend/legend.tsx | 2 +- .../vislib/components/legend/pie_utils.ts | 2 +- .../_hierarchical_tooltip_formatter.js | 2 +- .../_pointseries_tooltip_formatter.test.js | 2 +- .../components/tooltip/position_tooltip.js | 2 +- .../tooltip/position_tooltip.test.js | 2 +- .../vislib/components/tooltip/tooltip.js | 2 +- .../components/zero_injection/flatten_data.js | 2 +- .../zero_injection/ordered_x_keys.js | 2 +- .../components/zero_injection/uniq_keys.js | 2 +- .../zero_injection/zero_fill_data_array.js | 2 +- .../zero_injection/zero_injection.test.js | 2 +- .../hierarchical/build_hierarchical_data.ts | 2 +- .../helpers/point_series/_get_series.ts | 4 +- .../helpers/point_series/_init_x_axis.ts | 2 +- .../helpers/point_series/_init_y_axis.test.ts | 2 +- .../point_series/_ordered_date_axis.test.ts | 2 +- .../helpers/point_series/point_series.test.ts | 2 +- .../public/vislib/lib/_error_handler.js | 2 +- .../public/vislib/lib/alerts.js | 2 +- .../public/vislib/lib/axis/axis.js | 2 +- .../public/vislib/lib/axis/axis.test.js | 2 +- .../public/vislib/lib/axis/axis_config.js | 2 +- .../public/vislib/lib/axis/axis_scale.js | 2 +- .../public/vislib/lib/axis/axis_title.test.js | 2 +- .../public/vislib/lib/axis/x_axis.test.js | 2 +- .../public/vislib/lib/axis/y_axis.test.js | 2 +- .../public/vislib/lib/chart_grid.js | 2 +- .../public/vislib/lib/chart_title.js | 2 +- .../vis_type_vislib/public/vislib/lib/data.js | 2 +- .../public/vislib/lib/data.test.js | 2 +- .../public/vislib/lib/dispatch.js | 2 +- .../public/vislib/lib/handler.js | 2 +- .../public/vislib/lib/layout/layout.js | 2 +- .../vislib/lib/layout/layout_types.test.js | 2 +- .../lib/layout/types/column_layout.test.js | 2 +- .../public/vislib/lib/types/pie.js | 2 +- .../public/vislib/lib/types/point_series.js | 2 +- .../public/vislib/lib/vis_config.js | 2 +- .../vis_type_vislib/public/vislib/vis.js | 2 +- .../public/vislib/visualizations/_chart.js | 2 +- .../vislib/visualizations/gauges/meter.js | 2 +- .../public/vislib/visualizations/pie_chart.js | 2 +- .../vislib/visualizations/point_series.js | 2 +- .../point_series/_point_series.js | 2 +- .../visualizations/point_series/area_chart.js | 2 +- .../point_series/column_chart.js | 2 +- .../point_series/heatmap_chart.js | 2 +- .../visualizations/point_series/line_chart.js | 2 +- .../vislib/visualizations/vis_types.test.js | 2 +- .../public/components/visualization.tsx | 2 +- .../public/embeddable/visualize_embeddable.ts | 2 +- .../visualizations/public/expressions/vis.ts | 2 +- .../expressions/visualization_function.ts | 2 +- .../public/legacy/build_pipeline.ts | 2 +- .../public/legacy/vis_update_state.js | 2 +- .../public/legacy/vis_update_state.test.js | 2 +- .../public/persisted_state/persisted_state.ts | 17 ++- .../saved_visualizations/find_list_items.ts | 4 +- src/plugins/visualizations/public/vis.ts | 2 +- .../public/vis_types/base_vis_type.ts | 2 +- .../public/vis_types/react_vis_type.test.ts | 2 +- .../wizard/type_selection/type_selection.tsx | 4 +- .../saved_objects/visualization_migrations.ts | 60 +++++----- .../public/application/editor/editor.js | 2 +- .../editor/lib/migrate_app_state.ts | 4 +- .../editor/lib/visualize_app_state.ts | 6 +- .../public/application/legacy_app.js | 2 +- src/test_utils/expect_deep_equal.js | 2 +- src/test_utils/get_url.js | 4 +- src/test_utils/kbn_server.ts | 4 +- src/test_utils/public/simulate_keys.js | 2 +- .../fields_for_wildcard_route/response.js | 2 +- .../apis/kql_telemetry/kql_telemetry.js | 2 +- .../apis/saved_objects/bulk_update.js | 2 +- .../apis/saved_objects/migrations.js | 4 +- .../apis/telemetry/telemetry_local.js | 2 +- .../apps/management/_import_objects.js | 29 ++--- .../functional/apps/visualize/_chart_types.ts | 2 +- test/functional/page_objects/common_page.ts | 2 +- test/functional/services/common/browser.ts | 6 +- test/tsconfig.json | 1 - .../services/visual_testing/visual_testing.ts | 1 - typings/lodash.topath/index.d.ts | 23 ---- .../load_mappings_provider.test.tsx | 4 +- yarn.lock | 51 ++++---- 843 files changed, 1158 insertions(+), 1162 deletions(-) delete mode 100644 typings/lodash.topath/index.d.ts diff --git a/package.json b/package.json index ee9e0df0423c4..0b22f1c4b60c7 100644 --- a/package.json +++ b/package.json @@ -213,6 +213,8 @@ "leaflet.heat": "0.2.0", "less": "npm:@elastic/less@2.7.3-kibana", "less-loader": "5.0.0", + "lodash4": "npm:lodash@^4.17.15", + "lodash3": "npm:@elastic/lodash@3.10.1-kibana4", "lodash": "npm:@elastic/lodash@3.10.1-kibana4", "lodash.clonedeep": "^4.5.0", "lru-cache": "4.1.5", @@ -354,6 +356,8 @@ "@types/json5": "^0.0.30", "@types/license-checker": "15.0.0", "@types/listr": "^0.14.0", + "@types/lodash4": "npm:@types/lodash@^4.14.155", + "@types/lodash3": "npm:@types/lodash@^3.10.1", "@types/lodash": "^3.10.1", "@types/lodash.clonedeep": "^4.5.4", "@types/lru-cache": "^5.1.0", diff --git a/packages/kbn-config-schema/package.json b/packages/kbn-config-schema/package.json index 015dca128ce91..163b6058f3552 100644 --- a/packages/kbn-config-schema/package.json +++ b/packages/kbn-config-schema/package.json @@ -14,6 +14,7 @@ "tsd": "^0.7.4" }, "peerDependencies": { + "lodash3": "npm:@elastic/lodash@3.10.1-kibana4", "joi": "^13.5.2", "moment": "^2.24.0", "type-detect": "^4.0.8" diff --git a/packages/kbn-config-schema/src/internals/index.ts b/packages/kbn-config-schema/src/internals/index.ts index f3756aaf90793..aaf0e60c5fd34 100644 --- a/packages/kbn-config-schema/src/internals/index.ts +++ b/packages/kbn-config-schema/src/internals/index.ts @@ -27,7 +27,7 @@ import { ValidationErrorItem, ValidationOptions, } from 'joi'; -import { isPlainObject } from 'lodash'; +import { isPlainObject } from 'lodash3'; import { isDuration } from 'moment'; import { Stream } from 'stream'; import { ByteSizeValue, ensureByteSizeValue } from '../byte_size_value'; diff --git a/renovate.json5 b/renovate.json5 index b4f1441a50d60..d77c2e787f6eb 100644 --- a/renovate.json5 +++ b/renovate.json5 @@ -565,6 +565,22 @@ '@types/lodash.clonedeepwith', ], }, + { + groupSlug: 'lodash3', + groupName: 'lodash3 related packages', + packageNames: [ + 'lodash3', + '@types/lodash3', + ], + }, + { + groupSlug: 'lodash4', + groupName: 'lodash4 related packages', + packageNames: [ + 'lodash4', + '@types/lodash4', + ], + }, { groupSlug: 'log-symbols', groupName: 'log-symbols related packages', diff --git a/src/apm.js b/src/apm.js index 6c10539c6b7d3..99347e7b19e0a 100644 --- a/src/apm.js +++ b/src/apm.js @@ -20,7 +20,7 @@ const { join } = require('path'); const { readFileSync } = require('fs'); const { execSync } = require('child_process'); -const merge = require('lodash.merge'); +const merge = require('lodash4/merge'); const { name, version, build } = require('../package.json'); const ROOT_DIR = join(__dirname, '..'); diff --git a/src/cli/cli.js b/src/cli/cli.js index 50a8d4c7f7f01..d7d18998257af 100644 --- a/src/cli/cli.js +++ b/src/cli/cli.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { pkg } from '../core/server/utils'; import Command from './command'; import serveCommand from './serve/serve'; diff --git a/src/cli/cluster/cluster.mock.ts b/src/cli/cluster/cluster.mock.ts index 332f8aad53ba1..362d48d47ca86 100644 --- a/src/cli/cluster/cluster.mock.ts +++ b/src/cli/cluster/cluster.mock.ts @@ -20,7 +20,7 @@ // eslint-disable-next-line max-classes-per-file import EventEmitter from 'events'; -import { assign, random } from 'lodash'; +import { assign, random } from 'lodash4'; import { delay } from 'bluebird'; class MockClusterFork extends EventEmitter { diff --git a/src/cli/cluster/cluster_manager.test.ts b/src/cli/cluster/cluster_manager.test.ts index 66f68f815edac..d20d169670d2b 100644 --- a/src/cli/cluster/cluster_manager.test.ts +++ b/src/cli/cluster/cluster_manager.test.ts @@ -50,7 +50,7 @@ const mockConfig: any = { }, }; -import { sample } from 'lodash'; +import { sample } from 'lodash4'; import { ClusterManager } from './cluster_manager'; import { Worker } from './worker'; @@ -93,7 +93,7 @@ describe('CLI cluster manager', () => { } const football = {}; - const messenger = sample(manager.workers); + const messenger = sample(manager.workers) as any; messenger.emit('broadcast', football); for (const worker of manager.workers) { diff --git a/src/cli/cluster/worker.ts b/src/cli/cluster/worker.ts index dc6e6d5676651..8874c94905e44 100644 --- a/src/cli/cluster/worker.ts +++ b/src/cli/cluster/worker.ts @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import cluster from 'cluster'; import { EventEmitter } from 'events'; @@ -177,7 +177,7 @@ export class Worker extends EventEmitter { } flushChangeBuffer() { - const files = _.unique(this.changes.splice(0)); + const files = _.uniq(this.changes.splice(0)); const prefix = files.length > 1 ? '\n - ' : ''; return files.reduce(function (list, file) { return `${list || ''}${prefix}"${file}"`; diff --git a/src/cli/command.js b/src/cli/command.js index f4781fcab1e20..c9b8c67f7772e 100644 --- a/src/cli/command.js +++ b/src/cli/command.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import Chalk from 'chalk'; import help from './help'; diff --git a/src/cli/help.js b/src/cli/help.js index 656944d85b254..6ed2aa27ad52d 100644 --- a/src/cli/help.js +++ b/src/cli/help.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; export default function help(command, spaces) { if (!_.size(command.commands)) { @@ -72,7 +72,7 @@ function commandsSummary(program) { }, 0); return cmds.reduce(function (help, cmd) { - return `${help || ''}${_.padRight(cmd[0], cmdLColWidth)} ${cmd[1] || ''}\n`; + return `${help || ''}${_.padEnd(cmd[0], cmdLColWidth)} ${cmd[1] || ''}\n`; }, ''); } diff --git a/src/cli/serve/read_keystore.js b/src/cli/serve/read_keystore.js index cfe02735630f2..46839ba73fccb 100644 --- a/src/cli/serve/read_keystore.js +++ b/src/cli/serve/read_keystore.js @@ -18,7 +18,7 @@ */ import path from 'path'; -import { set } from 'lodash'; +import { set } from 'lodash4'; import { Keystore } from '../../legacy/server/keystore'; import { getDataPath } from '../../core/server/path'; diff --git a/src/cli/serve/serve.js b/src/cli/serve/serve.js index 8bc65f3da7111..0dd8844d06f39 100644 --- a/src/cli/serve/serve.js +++ b/src/cli/serve/serve.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { statSync } from 'fs'; import { resolve } from 'path'; import url from 'url'; diff --git a/src/cli_keystore/cli_keystore.js b/src/cli_keystore/cli_keystore.js index e1561b343ef39..8d7f45e70bf88 100644 --- a/src/cli_keystore/cli_keystore.js +++ b/src/cli_keystore/cli_keystore.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { join } from 'path'; import { pkg } from '../core/server/utils'; diff --git a/src/cli_plugin/cli.js b/src/cli_plugin/cli.js index da1068b54b4b5..537a01b7ae6e7 100644 --- a/src/cli_plugin/cli.js +++ b/src/cli_plugin/cli.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { pkg } from '../core/server/utils'; import Command from '../cli/command'; import listCommand from './list'; diff --git a/src/cli_plugin/install/rename.js b/src/cli_plugin/install/rename.js index 1e5d94d474375..7b4b86b6d136f 100644 --- a/src/cli_plugin/install/rename.js +++ b/src/cli_plugin/install/rename.js @@ -18,7 +18,7 @@ */ import { rename } from 'fs'; -import { delay } from 'lodash'; +import { delay } from 'lodash4'; export function renamePlugin(workingPath, finalPath) { return new Promise(function (resolve, reject) { diff --git a/src/cli_plugin/install/zip.js b/src/cli_plugin/install/zip.js index 52eba2ea239a2..51e57c5b7a5c2 100644 --- a/src/cli_plugin/install/zip.js +++ b/src/cli_plugin/install/zip.js @@ -20,7 +20,7 @@ import yauzl from 'yauzl'; import path from 'path'; import { createWriteStream, mkdir } from 'fs'; -import { get } from 'lodash'; +import { get } from 'lodash4'; /** * Returns an array of package objects. There will be one for each of diff --git a/src/core/public/chrome/doc_title/doc_title_service.ts b/src/core/public/chrome/doc_title/doc_title_service.ts index c6e9ec7a40b77..76a77dbae3ec0 100644 --- a/src/core/public/chrome/doc_title/doc_title_service.ts +++ b/src/core/public/chrome/doc_title/doc_title_service.ts @@ -17,7 +17,7 @@ * under the License. */ -import { compact, flattenDeep, isString } from 'lodash'; +import { compact, flattenDeep, isString } from 'lodash4'; interface StartDeps { document: { title: string }; diff --git a/src/core/public/chrome/nav_controls/nav_controls_service.ts b/src/core/public/chrome/nav_controls/nav_controls_service.ts index 167948e01cb36..37fd4bebcb95a 100644 --- a/src/core/public/chrome/nav_controls/nav_controls_service.ts +++ b/src/core/public/chrome/nav_controls/nav_controls_service.ts @@ -17,7 +17,7 @@ * under the License. */ -import { sortBy } from 'lodash'; +import { sortBy } from 'lodash4'; import { BehaviorSubject, ReplaySubject, Observable } from 'rxjs'; import { map, takeUntil } from 'rxjs/operators'; import { MountPoint } from '../../types'; diff --git a/src/core/public/chrome/nav_links/nav_links_service.ts b/src/core/public/chrome/nav_links/nav_links_service.ts index 3095bb86b72e2..8b82425341bff 100644 --- a/src/core/public/chrome/nav_links/nav_links_service.ts +++ b/src/core/public/chrome/nav_links/nav_links_service.ts @@ -17,7 +17,7 @@ * under the License. */ -import { sortBy } from 'lodash'; +import { sortBy } from 'lodash4'; import { BehaviorSubject, combineLatest, Observable, ReplaySubject } from 'rxjs'; import { map, takeUntil } from 'rxjs/operators'; diff --git a/src/core/public/chrome/recently_accessed/persisted_log.ts b/src/core/public/chrome/recently_accessed/persisted_log.ts index ca94e0bcddfaf..af6f51d12ffbc 100644 --- a/src/core/public/chrome/recently_accessed/persisted_log.ts +++ b/src/core/public/chrome/recently_accessed/persisted_log.ts @@ -17,7 +17,7 @@ * under the License. */ -import { cloneDeep, isEqual, take } from 'lodash'; +import { cloneDeep, isEqual, take } from 'lodash4'; import * as Rx from 'rxjs'; import { map } from 'rxjs/operators'; diff --git a/src/core/public/chrome/ui/header/collapsible_nav.tsx b/src/core/public/chrome/ui/header/collapsible_nav.tsx index 9494e22920de8..9193e8bb23854 100644 --- a/src/core/public/chrome/ui/header/collapsible_nav.tsx +++ b/src/core/public/chrome/ui/header/collapsible_nav.tsx @@ -29,7 +29,7 @@ import { EuiText, } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; -import { groupBy, sortBy } from 'lodash'; +import { groupBy, sortBy } from 'lodash4'; import React, { useRef } from 'react'; import { useObservable } from 'react-use'; import * as Rx from 'rxjs'; diff --git a/src/core/public/http/fetch.ts b/src/core/public/http/fetch.ts index bf9b4235e9444..3b736d1146e7c 100644 --- a/src/core/public/http/fetch.ts +++ b/src/core/public/http/fetch.ts @@ -17,7 +17,7 @@ * under the License. */ -import { merge } from 'lodash'; +import { merge } from 'lodash3'; import { format } from 'url'; import { BehaviorSubject } from 'rxjs'; @@ -111,6 +111,7 @@ export class Fetch { }); }; + // TODO: need to migrate this to lodash4 private createRequest(options: HttpFetchOptionsWithPath): Request { // Merge and destructure options out that are not applicable to the Fetch API. const { @@ -134,6 +135,7 @@ export class Fetch { }, } ); + const url = format({ pathname: shouldPrependBasePath ? this.params.basePath.prepend(options.path) : options.path, query, diff --git a/src/core/public/injected_metadata/injected_metadata_service.ts b/src/core/public/injected_metadata/injected_metadata_service.ts index 75abdd6d87d5a..8f382f9f8eaba 100644 --- a/src/core/public/injected_metadata/injected_metadata_service.ts +++ b/src/core/public/injected_metadata/injected_metadata_service.ts @@ -17,7 +17,7 @@ * under the License. */ -import { get } from 'lodash'; +import { get } from 'lodash4'; import { DiscoveredPlugin, PluginName } from '../../server'; import { EnvironmentMode, diff --git a/src/core/public/overlays/banners/priority_map.ts b/src/core/public/overlays/banners/priority_map.ts index c6d493b380b4c..c942f884fe779 100644 --- a/src/core/public/overlays/banners/priority_map.ts +++ b/src/core/public/overlays/banners/priority_map.ts @@ -17,7 +17,7 @@ * under the License. */ -import { sortBy } from 'lodash'; +import { sortBy } from 'lodash4'; interface PriorityValue { readonly priority: number; diff --git a/src/core/public/plugins/plugin_context.ts b/src/core/public/plugins/plugin_context.ts index 65c6b6ce4edba..ee8b162cd1edb 100644 --- a/src/core/public/plugins/plugin_context.ts +++ b/src/core/public/plugins/plugin_context.ts @@ -17,7 +17,7 @@ * under the License. */ -import { omit } from 'lodash'; +import { omit } from 'lodash4'; import { DiscoveredPlugin } from '../../server'; import { PluginOpaqueId, PackageInfo, EnvironmentMode } from '../../server/types'; import { CoreContext } from '../core_system'; diff --git a/src/core/public/plugins/plugins_service.test.ts b/src/core/public/plugins/plugins_service.test.ts index 05127e73d0c7a..0de208f4a9f14 100644 --- a/src/core/public/plugins/plugins_service.test.ts +++ b/src/core/public/plugins/plugins_service.test.ts @@ -17,7 +17,7 @@ * under the License. */ -import { omit, pick } from 'lodash'; +import { omit, pick } from 'lodash4'; import { MockedPluginInitializer, @@ -92,7 +92,10 @@ describe('PluginsService', () => { docLinks: docLinksServiceMock.createSetupContract(), fatalErrors: fatalErrorsServiceMock.createSetupContract(), http: httpServiceMock.createSetupContract(), - injectedMetadata: pick(injectedMetadataServiceMock.createStartContract(), 'getInjectedVar'), + injectedMetadata: pick( + injectedMetadataServiceMock.createStartContract(), + 'getInjectedVar' + ) as any, notifications: notificationServiceMock.createSetupContract(), uiSettings: uiSettingsServiceMock.createSetupContract(), }; @@ -107,7 +110,10 @@ describe('PluginsService', () => { http: httpServiceMock.createStartContract(), chrome: chromeServiceMock.createStartContract(), i18n: i18nServiceMock.createStartContract(), - injectedMetadata: pick(injectedMetadataServiceMock.createStartContract(), 'getInjectedVar'), + injectedMetadata: pick( + injectedMetadataServiceMock.createStartContract(), + 'getInjectedVar' + ) as any, notifications: notificationServiceMock.createStartContract(), overlays: overlayServiceMock.createStartContract(), uiSettings: uiSettingsServiceMock.createStartContract(), diff --git a/src/core/public/saved_objects/saved_objects_client.ts b/src/core/public/saved_objects/saved_objects_client.ts index 5c8eca4a33ec5..0f7d89092241e 100644 --- a/src/core/public/saved_objects/saved_objects_client.ts +++ b/src/core/public/saved_objects/saved_objects_client.ts @@ -17,7 +17,7 @@ * under the License. */ -import { cloneDeep, pick, throttle } from 'lodash'; +import { cloneDeep, pick, throttle } from 'lodash4'; import { resolve as resolveUrl } from 'url'; import { @@ -162,7 +162,9 @@ export class SavedObjectsClient { }); if (!foundObject) { - return queueItem.resolve(this.createSavedObject(pick(queueItem, ['id', 'type']))); + return queueItem.resolve( + this.createSavedObject(pick(queueItem, ['id', 'type']) as SavedObject) + ); } queueItem.resolve(foundObject); diff --git a/src/core/public/saved_objects/simple_saved_object.ts b/src/core/public/saved_objects/simple_saved_object.ts index d3ba506b865a4..f53a973c18654 100644 --- a/src/core/public/saved_objects/simple_saved_object.ts +++ b/src/core/public/saved_objects/simple_saved_object.ts @@ -17,7 +17,7 @@ * under the License. */ -import { get, has, set } from 'lodash'; +import { get, has, set } from 'lodash4'; import { SavedObject as SavedObjectType } from '../../server'; import { SavedObjectsClientContract } from './saved_objects_client'; @@ -60,7 +60,7 @@ export class SimpleSavedObject { } public set(key: string, value: any): T { - return set(this.attributes, key, value); + return set(this.attributes as any, key, value) as any; } public has(key: string): boolean { diff --git a/src/core/public/ui_settings/ui_settings_client.ts b/src/core/public/ui_settings/ui_settings_client.ts index 2a7c3c2fab2f3..e6ce9e5e8210a 100644 --- a/src/core/public/ui_settings/ui_settings_client.ts +++ b/src/core/public/ui_settings/ui_settings_client.ts @@ -17,7 +17,7 @@ * under the License. */ -import { cloneDeep, defaultsDeep } from 'lodash'; +import { cloneDeep, defaultsDeep } from 'lodash4'; import { Observable, Subject, concat, defer, of } from 'rxjs'; import { filter, map } from 'rxjs/operators'; diff --git a/src/core/server/capabilities/merge_capabilities.ts b/src/core/server/capabilities/merge_capabilities.ts index 95296346ad835..372c2ba3dcb44 100644 --- a/src/core/server/capabilities/merge_capabilities.ts +++ b/src/core/server/capabilities/merge_capabilities.ts @@ -17,11 +17,11 @@ * under the License. */ -import { merge } from 'lodash'; +import { mergeWith } from 'lodash4'; import { Capabilities } from './types'; export const mergeCapabilities = (...sources: Array>): Capabilities => - merge({}, ...sources, (a: any, b: any) => { + mergeWith({}, ...sources, (a: any, b: any) => { if ( (typeof a === 'boolean' && typeof b === 'object') || (typeof a === 'object' && typeof b === 'boolean') diff --git a/src/core/server/capabilities/resolve_capabilities.ts b/src/core/server/capabilities/resolve_capabilities.ts index 1be504d4bc314..101c5b899472c 100644 --- a/src/core/server/capabilities/resolve_capabilities.ts +++ b/src/core/server/capabilities/resolve_capabilities.ts @@ -17,7 +17,7 @@ * under the License. */ -import { cloneDeep } from 'lodash'; +import { cloneDeep } from 'lodash4'; import { Capabilities, CapabilitiesSwitcher } from './types'; import { KibanaRequest } from '../http'; diff --git a/src/core/server/config/config_service.ts b/src/core/server/config/config_service.ts index bceba420bb6ce..f6fbb2c7fc845 100644 --- a/src/core/server/config/config_service.ts +++ b/src/core/server/config/config_service.ts @@ -18,7 +18,7 @@ */ import { Type } from '@kbn/config-schema'; -import { isEqual } from 'lodash'; +import { isEqual } from 'lodash4'; import { BehaviorSubject, combineLatest, Observable } from 'rxjs'; import { distinctUntilChanged, first, map, shareReplay, take } from 'rxjs/operators'; diff --git a/src/core/server/config/deprecation/apply_deprecations.ts b/src/core/server/config/deprecation/apply_deprecations.ts index f7f95709ed846..691167f451195 100644 --- a/src/core/server/config/deprecation/apply_deprecations.ts +++ b/src/core/server/config/deprecation/apply_deprecations.ts @@ -17,7 +17,7 @@ * under the License. */ -import { cloneDeep } from 'lodash'; +import { cloneDeep } from 'lodash4'; import { ConfigDeprecationWithContext, ConfigDeprecationLogger } from './types'; const noopLogger = (msg: string) => undefined; diff --git a/src/core/server/config/deprecation/core_deprecations.ts b/src/core/server/config/deprecation/core_deprecations.ts index 483534e0c145b..4d09d219ba109 100644 --- a/src/core/server/config/deprecation/core_deprecations.ts +++ b/src/core/server/config/deprecation/core_deprecations.ts @@ -17,7 +17,7 @@ * under the License. */ -import { has, get } from 'lodash'; +import { has, get } from 'lodash4'; import { ConfigDeprecationProvider, ConfigDeprecation } from './types'; const configPathDeprecation: ConfigDeprecation = (settings, fromPath, log) => { @@ -41,7 +41,7 @@ const dataPathDeprecation: ConfigDeprecation = (settings, fromPath, log) => { const xsrfDeprecation: ConfigDeprecation = (settings, fromPath, log) => { if ( has(settings, 'server.xsrf.whitelist') && - get(settings, 'server.xsrf.whitelist').length > 0 + get(settings, 'server.xsrf.whitelist' as any).length > 0 ) { log( 'It is not recommended to disable xsrf protections for API endpoints via [server.xsrf.whitelist]. ' + diff --git a/src/core/server/config/deprecation/deprecation_factory.ts b/src/core/server/config/deprecation/deprecation_factory.ts index 0b19a99624311..4576b4cf51fde 100644 --- a/src/core/server/config/deprecation/deprecation_factory.ts +++ b/src/core/server/config/deprecation/deprecation_factory.ts @@ -17,7 +17,7 @@ * under the License. */ -import { get, set } from 'lodash'; +import { get, set } from 'lodash4'; import { ConfigDeprecation, ConfigDeprecationLogger, ConfigDeprecationFactory } from './types'; import { unset } from '../../../utils'; diff --git a/src/core/server/config/object_to_config_adapter.ts b/src/core/server/config/object_to_config_adapter.ts index d4c2f73364060..28d7dc40fafab 100644 --- a/src/core/server/config/object_to_config_adapter.ts +++ b/src/core/server/config/object_to_config_adapter.ts @@ -17,7 +17,7 @@ * under the License. */ -import { cloneDeep, get, has, set } from 'lodash'; +import { cloneDeep, get, has, set } from 'lodash4'; import { getFlattenedObject } from '../../utils'; import { Config, ConfigPath } from './'; diff --git a/src/core/server/config/raw_config_service.ts b/src/core/server/config/raw_config_service.ts index 257ec612f3249..b291a29d2775b 100644 --- a/src/core/server/config/raw_config_service.ts +++ b/src/core/server/config/raw_config_service.ts @@ -17,7 +17,7 @@ * under the License. */ -import { cloneDeep, isPlainObject } from 'lodash'; +import { cloneDeep, isPlainObject } from 'lodash4'; import { Observable, ReplaySubject } from 'rxjs'; import { map } from 'rxjs/operators'; import typeDetect from 'type-detect'; diff --git a/src/core/server/config/read_config.ts b/src/core/server/config/read_config.ts index eac3535c9d4ed..128eb8f482b9d 100644 --- a/src/core/server/config/read_config.ts +++ b/src/core/server/config/read_config.ts @@ -20,7 +20,7 @@ import { readFileSync } from 'fs'; import { safeLoad } from 'js-yaml'; -import { isPlainObject, set } from 'lodash'; +import { isPlainObject, set } from 'lodash4'; import { ensureDeepObject } from './ensure_deep_object'; const readYaml = (path: string) => safeLoad(readFileSync(path, 'utf8')); diff --git a/src/core/server/elasticsearch/cluster_client.test.ts b/src/core/server/elasticsearch/cluster_client.test.ts index db277fa0e0607..05a88dee00851 100644 --- a/src/core/server/elasticsearch/cluster_client.test.ts +++ b/src/core/server/elasticsearch/cluster_client.test.ts @@ -26,7 +26,7 @@ import { } from './cluster_client.test.mocks'; import { errors } from 'elasticsearch'; -import { get } from 'lodash'; +import { get } from 'lodash4'; import { Logger } from '../logging'; import { loggingServiceMock } from '../logging/logging_service.mock'; import { httpServerMock } from '../http/http_server.mocks'; diff --git a/src/core/server/elasticsearch/cluster_client.ts b/src/core/server/elasticsearch/cluster_client.ts index 2352677b8d3e0..03579a9f0f4c0 100644 --- a/src/core/server/elasticsearch/cluster_client.ts +++ b/src/core/server/elasticsearch/cluster_client.ts @@ -17,7 +17,7 @@ * under the License. */ import { Client } from 'elasticsearch'; -import { get } from 'lodash'; +import { get } from 'lodash4'; import { ElasticsearchErrorHelpers } from './errors'; import { GetAuthHeaders, isRealRequest, LegacyRequest } from '../http'; diff --git a/src/core/server/elasticsearch/elasticsearch_client_config.ts b/src/core/server/elasticsearch/elasticsearch_client_config.ts index 287d835c40351..9f63ec6e68c10 100644 --- a/src/core/server/elasticsearch/elasticsearch_client_config.ts +++ b/src/core/server/elasticsearch/elasticsearch_client_config.ts @@ -18,7 +18,7 @@ */ import { ConfigOptions } from 'elasticsearch'; -import { cloneDeep } from 'lodash'; +import { cloneDeep } from 'lodash4'; import { Duration } from 'moment'; import { checkServerIdentity } from 'tls'; import url from 'url'; diff --git a/src/core/server/elasticsearch/errors.ts b/src/core/server/elasticsearch/errors.ts index 6852b8632ebf1..a6204a9bc4140 100644 --- a/src/core/server/elasticsearch/errors.ts +++ b/src/core/server/elasticsearch/errors.ts @@ -18,7 +18,7 @@ */ import Boom from 'boom'; -import { get } from 'lodash'; +import { get } from 'lodash4'; const code = Symbol('ElasticsearchError'); @@ -81,7 +81,7 @@ export class ElasticsearchErrorHelpers { public static decorateNotAuthorizedError(error: Error, reason?: string) { const decoratedError = decorate(error, ErrorCode.NOT_AUTHORIZED, 401, reason); - const wwwAuthHeader = get(error, 'body.error.header[WWW-Authenticate]'); + const wwwAuthHeader = get(error as any, 'body.error.header[WWW-Authenticate]' as any); decoratedError.output.headers['WWW-Authenticate'] = wwwAuthHeader || 'Basic realm="Authorization Required"'; diff --git a/src/core/server/elasticsearch/scoped_cluster_client.ts b/src/core/server/elasticsearch/scoped_cluster_client.ts index 4b64bfba15190..b7f5d273b6abe 100644 --- a/src/core/server/elasticsearch/scoped_cluster_client.ts +++ b/src/core/server/elasticsearch/scoped_cluster_client.ts @@ -17,7 +17,7 @@ * under the License. */ -import { intersection, isObject } from 'lodash'; +import { intersection, isObject } from 'lodash4'; import { Headers } from '../http/router'; import { APICaller, CallAPIOptions } from './api_types'; diff --git a/src/core/server/http/base_path_proxy_server.ts b/src/core/server/http/base_path_proxy_server.ts index ffbdabadd03f7..a22f2c0921b0b 100644 --- a/src/core/server/http/base_path_proxy_server.ts +++ b/src/core/server/http/base_path_proxy_server.ts @@ -24,7 +24,7 @@ import apm from 'elastic-apm-node'; import { ByteSizeValue } from '@kbn/config-schema'; import { Server, Request, ResponseToolkit } from 'hapi'; import HapiProxy from 'h2o2'; -import { sample } from 'lodash'; +import { sampleSize } from 'lodash4'; import BrowserslistUserAgent from 'browserslist-useragent'; import * as Rx from 'rxjs'; import { take } from 'rxjs/operators'; @@ -90,7 +90,7 @@ export class BasePathProxyServer { httpConfig.maxPayload = new ByteSizeValue(ONE_GIGABYTE); if (!httpConfig.basePath) { - httpConfig.basePath = `/${sample(alphabet, 3).join('')}`; + httpConfig.basePath = `/${sampleSize(alphabet, 3).join('')}`; } } diff --git a/src/core/server/http/http_server.mocks.ts b/src/core/server/http/http_server.mocks.ts index bbef0a105c089..f13e5d0bed213 100644 --- a/src/core/server/http/http_server.mocks.ts +++ b/src/core/server/http/http_server.mocks.ts @@ -17,7 +17,7 @@ * under the License. */ import { Request } from 'hapi'; -import { merge } from 'lodash'; +import { merge } from 'lodash4'; import { Socket } from 'net'; import { stringify } from 'query-string'; diff --git a/src/core/server/http/http_service.test.ts b/src/core/server/http/http_service.test.ts index 8b500caf217dc..cdd7a922921a6 100644 --- a/src/core/server/http/http_service.test.ts +++ b/src/core/server/http/http_service.test.ts @@ -19,7 +19,7 @@ import { mockHttpServer } from './http_service.test.mocks'; -import { noop } from 'lodash'; +import { noop } from 'lodash4'; import { BehaviorSubject } from 'rxjs'; import { HttpService } from '.'; import { HttpConfigType, config } from './http_config'; diff --git a/src/core/server/legacy/config/__snapshots__/legacy_object_to_config_adapter.test.ts.snap b/src/core/server/legacy/config/__snapshots__/legacy_object_to_config_adapter.test.ts.snap index 3b16bed92df97..4a6d86a0dfba6 100644 --- a/src/core/server/legacy/config/__snapshots__/legacy_object_to_config_adapter.test.ts.snap +++ b/src/core/server/legacy/config/__snapshots__/legacy_object_to_config_adapter.test.ts.snap @@ -119,7 +119,10 @@ Object { exports[`#set correctly sets values for paths that do not exist. 1`] = ` Object { - "unknown": "value", + "unknown": Object { + "sub1": "sub-value-1", + "sub2": "sub-value-2", + }, } `; diff --git a/src/core/server/legacy/config/get_unused_config_keys.ts b/src/core/server/legacy/config/get_unused_config_keys.ts index 6cd193d896109..be31ba0356e7d 100644 --- a/src/core/server/legacy/config/get_unused_config_keys.ts +++ b/src/core/server/legacy/config/get_unused_config_keys.ts @@ -17,7 +17,7 @@ * under the License. */ -import { difference, get, set } from 'lodash'; +import { difference, get, set } from 'lodash4'; // @ts-ignore import { getTransform } from '../../../../legacy/deprecation/index'; import { unset } from '../../../../legacy/utils'; diff --git a/src/core/server/logging/layouts/conversions/date.ts b/src/core/server/logging/layouts/conversions/date.ts index d3ed54fb98240..5dbb5c7ed49b0 100644 --- a/src/core/server/logging/layouts/conversions/date.ts +++ b/src/core/server/logging/layouts/conversions/date.ts @@ -17,7 +17,7 @@ * under the License. */ import moment from 'moment-timezone'; -import { last } from 'lodash'; +import { last } from 'lodash4'; import { Conversion } from './type'; import { LogRecord } from '../../log_record'; diff --git a/src/core/server/plugins/discovery/plugin_manifest_parser.ts b/src/core/server/plugins/discovery/plugin_manifest_parser.ts index 27c3ca5a71e16..ac6f93ef16b03 100644 --- a/src/core/server/plugins/discovery/plugin_manifest_parser.ts +++ b/src/core/server/plugins/discovery/plugin_manifest_parser.ts @@ -21,7 +21,7 @@ import { readFile, stat } from 'fs'; import { resolve } from 'path'; import { coerce } from 'semver'; import { promisify } from 'util'; -import { snakeCase } from 'lodash'; +import { snakeCase } from 'lodash4'; import { isConfigPath, PackageInfo } from '../../config'; import { Logger } from '../../logging'; import { PluginManifest } from '../types'; diff --git a/src/core/server/saved_objects/mappings/lib/get_property.ts b/src/core/server/saved_objects/mappings/lib/get_property.ts index a31c9fe0c3ba1..0589c99b5bc0b 100644 --- a/src/core/server/saved_objects/mappings/lib/get_property.ts +++ b/src/core/server/saved_objects/mappings/lib/get_property.ts @@ -17,7 +17,7 @@ * under the License. */ -import toPath from 'lodash/internal/toPath'; +import { toPath } from 'lodash4'; import { SavedObjectsCoreFieldMapping, SavedObjectsFieldMapping, IndexMapping } from '../types'; function getPropertyMappingFromObjectMapping( diff --git a/src/core/server/saved_objects/migrations/core/build_active_mappings.ts b/src/core/server/saved_objects/migrations/core/build_active_mappings.ts index c2a7b11e057cd..9b38038f59a18 100644 --- a/src/core/server/saved_objects/migrations/core/build_active_mappings.ts +++ b/src/core/server/saved_objects/migrations/core/build_active_mappings.ts @@ -22,7 +22,7 @@ */ import crypto from 'crypto'; -import { cloneDeep, mapValues } from 'lodash'; +import { cloneDeep, mapValues } from 'lodash4'; import { IndexMapping, SavedObjectsMappingProperties, diff --git a/src/core/server/saved_objects/migrations/core/document_migrator.test.ts b/src/core/server/saved_objects/migrations/core/document_migrator.test.ts index a364710322524..bdd0b74b6f043 100644 --- a/src/core/server/saved_objects/migrations/core/document_migrator.test.ts +++ b/src/core/server/saved_objects/migrations/core/document_migrator.test.ts @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { SavedObjectUnsanitizedDoc } from '../../serialization'; import { DocumentMigrator } from './document_migrator'; import { loggingServiceMock } from '../../../logging/logging_service.mock'; diff --git a/src/core/server/saved_objects/migrations/core/document_migrator.ts b/src/core/server/saved_objects/migrations/core/document_migrator.ts index 376f823267ebe..d5a2b7432f36b 100644 --- a/src/core/server/saved_objects/migrations/core/document_migrator.ts +++ b/src/core/server/saved_objects/migrations/core/document_migrator.ts @@ -61,8 +61,7 @@ */ import Boom from 'boom'; -import _ from 'lodash'; -import cloneDeep from 'lodash.clonedeep'; +import _ from 'lodash4'; import Semver from 'semver'; import { Logger } from '../../../logging'; import { SavedObjectUnsanitizedDoc } from '../../serialization'; @@ -151,7 +150,7 @@ export class DocumentMigrator implements VersionedTransformer { // Clone the document to prevent accidental mutations on the original data // Ex: Importing sample data that is cached at import level, migrations would // execute on mutated data the second time. - const clonedDoc = cloneDeep(doc); + const clonedDoc = _.cloneDeep(doc); return this.transformDoc(clonedDoc); }; } @@ -220,6 +219,7 @@ function buildActiveMigrations( return { ...migrations, [type.name]: { + // @ts-ignore latestVersion: _.last(transforms).version, transforms, }, diff --git a/src/core/server/saved_objects/migrations/core/elastic_index.test.ts b/src/core/server/saved_objects/migrations/core/elastic_index.test.ts index 393cbb7fbb2ae..2d104c00f32c7 100644 --- a/src/core/server/saved_objects/migrations/core/elastic_index.test.ts +++ b/src/core/server/saved_objects/migrations/core/elastic_index.test.ts @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import * as Index from './elastic_index'; describe('ElasticIndex', () => { diff --git a/src/core/server/saved_objects/migrations/core/elastic_index.ts b/src/core/server/saved_objects/migrations/core/elastic_index.ts index e87c3e3ff0d64..cf8d5cb4a5f7c 100644 --- a/src/core/server/saved_objects/migrations/core/elastic_index.ts +++ b/src/core/server/saved_objects/migrations/core/elastic_index.ts @@ -22,7 +22,7 @@ * elasticsearch indices. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { IndexMapping } from '../../mappings'; import { SavedObjectsMigrationVersion } from '../../types'; import { AliasAction, CallCluster, NotFound, RawDoc, ShardsInfo } from './call_cluster'; diff --git a/src/core/server/saved_objects/migrations/core/index_migrator.test.ts b/src/core/server/saved_objects/migrations/core/index_migrator.test.ts index 392089c69f5a0..35fdeb9dcfc2e 100644 --- a/src/core/server/saved_objects/migrations/core/index_migrator.test.ts +++ b/src/core/server/saved_objects/migrations/core/index_migrator.test.ts @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { SavedObjectUnsanitizedDoc, SavedObjectsSerializer } from '../../serialization'; import { SavedObjectTypeRegistry } from '../../saved_objects_type_registry'; import { IndexMigrator } from './index_migrator'; diff --git a/src/core/server/saved_objects/migrations/core/migrate_raw_docs.test.ts b/src/core/server/saved_objects/migrations/core/migrate_raw_docs.test.ts index e55b72be2436d..cb18b71994300 100644 --- a/src/core/server/saved_objects/migrations/core/migrate_raw_docs.test.ts +++ b/src/core/server/saved_objects/migrations/core/migrate_raw_docs.test.ts @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { SavedObjectTypeRegistry } from '../../saved_objects_type_registry'; import { SavedObjectsSerializer } from '../../serialization'; import { migrateRawDocs } from './migrate_raw_docs'; diff --git a/src/core/server/saved_objects/migrations/core/migration_coordinator.test.ts b/src/core/server/saved_objects/migrations/core/migration_coordinator.test.ts index 3f2c31a7c0e5c..2d27ca7c8a29b 100644 --- a/src/core/server/saved_objects/migrations/core/migration_coordinator.test.ts +++ b/src/core/server/saved_objects/migrations/core/migration_coordinator.test.ts @@ -17,7 +17,6 @@ * under the License. */ -import _ from 'lodash'; import { coordinateMigration } from './migration_coordinator'; import { createSavedObjectsMigrationLoggerMock } from '../mocks'; diff --git a/src/core/server/saved_objects/migrations/core/migration_coordinator.ts b/src/core/server/saved_objects/migrations/core/migration_coordinator.ts index 2e32763f4e637..e2661b046ee67 100644 --- a/src/core/server/saved_objects/migrations/core/migration_coordinator.ts +++ b/src/core/server/saved_objects/migrations/core/migration_coordinator.ts @@ -34,7 +34,7 @@ * Kibana. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { SavedObjectsMigrationLogger } from './migration_logger'; const DEFAULT_POLL_INTERVAL = 15000; diff --git a/src/core/server/saved_objects/serialization/serializer.test.ts b/src/core/server/saved_objects/serialization/serializer.test.ts index 1a7dfdd2d130e..d89d9cb162fd7 100644 --- a/src/core/server/saved_objects/serialization/serializer.test.ts +++ b/src/core/server/saved_objects/serialization/serializer.test.ts @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { SavedObjectsSerializer } from './serializer'; import { SavedObjectsRawDoc } from './types'; import { typeRegistryMock } from '../saved_objects_type_registry.mock'; diff --git a/src/core/server/saved_objects/service/lib/decorate_es_error.ts b/src/core/server/saved_objects/service/lib/decorate_es_error.ts index e57f08aa7a527..cc5ccc717c011 100644 --- a/src/core/server/saved_objects/service/lib/decorate_es_error.ts +++ b/src/core/server/saved_objects/service/lib/decorate_es_error.ts @@ -18,7 +18,7 @@ */ import * as legacyElasticsearch from 'elasticsearch'; -import { get } from 'lodash'; +import { get } from 'lodash4'; const { ConnectionFault, diff --git a/src/core/server/saved_objects/service/lib/filter_utils.ts b/src/core/server/saved_objects/service/lib/filter_utils.ts index 4c31f37f63dad..68a4b7cd32907 100644 --- a/src/core/server/saved_objects/service/lib/filter_utils.ts +++ b/src/core/server/saved_objects/service/lib/filter_utils.ts @@ -17,7 +17,7 @@ * under the License. */ -import { get, set } from 'lodash'; +import { get, set } from 'lodash4'; import { SavedObjectsErrorHelpers } from './errors'; import { IndexMapping } from '../../mappings'; // eslint-disable-next-line @kbn/eslint/no-restricted-paths diff --git a/src/core/server/saved_objects/service/lib/repository.ts b/src/core/server/saved_objects/service/lib/repository.ts index 03538f2394845..2586d05e9569d 100644 --- a/src/core/server/saved_objects/service/lib/repository.ts +++ b/src/core/server/saved_objects/service/lib/repository.ts @@ -17,7 +17,7 @@ * under the License. */ -import { omit } from 'lodash'; +import { omit } from 'lodash4'; import uuid from 'uuid'; import { retryCallCluster } from '../../../elasticsearch/retry_call_cluster'; import { APICaller } from '../../../elasticsearch/'; @@ -1342,7 +1342,7 @@ export class SavedObjectsRepository { // method transparently to the specified namespace. private _rawToSavedObject(raw: SavedObjectsRawDoc): SavedObject { const savedObject = this._serializer.rawToSavedObject(raw); - return omit(savedObject, 'namespace'); + return omit(savedObject, 'namespace') as SavedObject; } /** diff --git a/src/core/server/ui_settings/create_or_upgrade_saved_config/create_or_upgrade_saved_config.ts b/src/core/server/ui_settings/create_or_upgrade_saved_config/create_or_upgrade_saved_config.ts index 55e32b1e3bb37..8cf79e697ffde 100644 --- a/src/core/server/ui_settings/create_or_upgrade_saved_config/create_or_upgrade_saved_config.ts +++ b/src/core/server/ui_settings/create_or_upgrade_saved_config/create_or_upgrade_saved_config.ts @@ -17,7 +17,7 @@ * under the License. */ -import { defaults } from 'lodash'; +import { defaults } from 'lodash4'; import { SavedObjectsClientContract } from '../../saved_objects/types'; import { SavedObjectsErrorHelpers } from '../../saved_objects/'; diff --git a/src/core/server/ui_settings/ui_settings_client.ts b/src/core/server/ui_settings/ui_settings_client.ts index f168784a93330..1cf5516324f75 100644 --- a/src/core/server/ui_settings/ui_settings_client.ts +++ b/src/core/server/ui_settings/ui_settings_client.ts @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { defaultsDeep, omit } from 'lodash'; +import { defaultsDeep, omit } from 'lodash4'; import { SavedObjectsErrorHelpers } from '../saved_objects'; import { SavedObjectsClientContract } from '../saved_objects/types'; diff --git a/src/core/utils/context.ts b/src/core/utils/context.ts index 941bbceb0cd92..02a6e56d900a7 100644 --- a/src/core/utils/context.ts +++ b/src/core/utils/context.ts @@ -17,7 +17,7 @@ * under the License. */ -import { flatten } from 'lodash'; +import { flatten } from 'lodash4'; import { ShallowPromise } from '@kbn/utility-types'; import { pick } from '.'; import { CoreId, PluginOpaqueId } from '../server'; diff --git a/src/core/utils/merge.ts b/src/core/utils/merge.ts index 43878c27b1e19..d9d74152dcbd7 100644 --- a/src/core/utils/merge.ts +++ b/src/core/utils/merge.ts @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { isPlainObject } from 'lodash'; +import { isPlainObject } from 'lodash4'; /** * Deeply merges two objects, omitting undefined values, and not deeply merging Arrays. * diff --git a/src/dev/npm/integration_tests/installed_packages.test.ts b/src/dev/npm/integration_tests/installed_packages.test.ts index 58c954cbc12f7..e0cab4dedb476 100644 --- a/src/dev/npm/integration_tests/installed_packages.test.ts +++ b/src/dev/npm/integration_tests/installed_packages.test.ts @@ -19,7 +19,7 @@ import { resolve, sep } from 'path'; -import { uniq } from 'lodash'; +import { uniq } from 'lodash4'; import { getInstalledPackages, InstalledPackage } from '../installed_packages'; import { REPO_ROOT } from '../../constants'; diff --git a/src/dev/precommit_hook/casing_check_config.js b/src/dev/precommit_hook/casing_check_config.js index bc3a6265cc582..cec80dd547a53 100644 --- a/src/dev/precommit_hook/casing_check_config.js +++ b/src/dev/precommit_hook/casing_check_config.js @@ -98,7 +98,6 @@ export const IGNORE_DIRECTORY_GLOBS = [ 'packages/*', 'packages/kbn-ui-framework/generator-kui', 'src/legacy/ui/public/flot-charts', - 'src/legacy/ui/public/utils/lodash-mixins', 'test/functional/fixtures/es_archiver/visualize_source-filters', 'packages/kbn-pm/src/utils/__fixtures__/*', 'x-pack/dev-tools', diff --git a/src/dev/sass/build_sass.js b/src/dev/sass/build_sass.js index 7075bcf55adf5..a3c7093f3e656 100644 --- a/src/dev/sass/build_sass.js +++ b/src/dev/sass/build_sass.js @@ -27,7 +27,7 @@ import { findPluginSpecs } from '../../legacy/plugin_discovery'; import { collectUiExports } from '../../legacy/ui'; import { buildAll } from '../../legacy/server/sass/build_all'; import chokidar from 'chokidar'; -import debounce from 'lodash/function/debounce'; +import debounce from 'lodash4/debounce'; // TODO: clintandrewhall - Extract and use FSWatcher from legacy/server/sass const build = async ({ log, kibanaDir, styleSheetPaths, watch }) => { diff --git a/src/es_archiver/lib/__tests__/stats.ts b/src/es_archiver/lib/__tests__/stats.ts index 0ab7d161feb6e..00dbcb9e2f513 100644 --- a/src/es_archiver/lib/__tests__/stats.ts +++ b/src/es_archiver/lib/__tests__/stats.ts @@ -17,7 +17,7 @@ * under the License. */ -import { uniq } from 'lodash'; +import { uniq } from 'lodash4'; import sinon from 'sinon'; import expect from '@kbn/expect'; import { ToolingLog } from '@kbn/dev-utils'; diff --git a/src/es_archiver/lib/docs/__tests__/stubs.ts b/src/es_archiver/lib/docs/__tests__/stubs.ts index d8d961fa054ff..bc110168f0435 100644 --- a/src/es_archiver/lib/docs/__tests__/stubs.ts +++ b/src/es_archiver/lib/docs/__tests__/stubs.ts @@ -20,7 +20,7 @@ import { Client } from 'elasticsearch'; import sinon from 'sinon'; import Chance from 'chance'; -import { times } from 'lodash'; +import { times } from 'lodash4'; import { Stats } from '../../stats'; diff --git a/src/es_archiver/lib/indices/create_index_stream.ts b/src/es_archiver/lib/indices/create_index_stream.ts index df9d3bb623ad6..e096f416d43b5 100644 --- a/src/es_archiver/lib/indices/create_index_stream.ts +++ b/src/es_archiver/lib/indices/create_index_stream.ts @@ -18,7 +18,7 @@ */ import { Transform, Readable } from 'stream'; -import { get, once } from 'lodash'; +import { get, once } from 'lodash4'; import { Client } from 'elasticsearch'; import { ToolingLog } from '@kbn/dev-utils'; diff --git a/src/es_archiver/lib/indices/delete_index.ts b/src/es_archiver/lib/indices/delete_index.ts index d7ef20b072b26..5e1a84b259fa8 100644 --- a/src/es_archiver/lib/indices/delete_index.ts +++ b/src/es_archiver/lib/indices/delete_index.ts @@ -17,7 +17,7 @@ * under the License. */ -import { get } from 'lodash'; +import { get } from 'lodash4'; import { Client } from 'elasticsearch'; import { ToolingLog } from '@kbn/dev-utils'; import { Stats } from '../stats'; diff --git a/src/es_archiver/lib/stats.ts b/src/es_archiver/lib/stats.ts index c7b98c42d3efb..a9c12c9842fe4 100644 --- a/src/es_archiver/lib/stats.ts +++ b/src/es_archiver/lib/stats.ts @@ -18,7 +18,7 @@ */ import { ToolingLog } from '@kbn/dev-utils'; -import { cloneDeep } from 'lodash'; +import { cloneDeep } from 'lodash4'; export interface IndexStats { skipped: boolean; diff --git a/src/fixtures/agg_resp/geohash_grid.js b/src/fixtures/agg_resp/geohash_grid.js index 0e576a88ab36a..01c79e37c22e6 100644 --- a/src/fixtures/agg_resp/geohash_grid.js +++ b/src/fixtures/agg_resp/geohash_grid.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; export default function GeoHashGridAggResponseFixture() { // for vis: // @@ -44,7 +44,7 @@ export default function GeoHashGridAggResponseFixture() { // random number of tags let docCount = 0; const buckets = _.times(_.random(40, 200), function () { - return _.sample(geoHashCharts, 3).join(''); + return _.sampleSize(geoHashCharts, 3).join(''); }) .sort() .map(function (geoHash) { diff --git a/src/fixtures/mock_state.js b/src/fixtures/mock_state.js index e78c919b5036b..f2dac448359bd 100644 --- a/src/fixtures/mock_state.js +++ b/src/fixtures/mock_state.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import sinon from 'sinon'; function MockState(defaults) { diff --git a/src/fixtures/mock_ui_state.js b/src/fixtures/mock_ui_state.js index 919274390d4d0..3cf3e3cea7c9b 100644 --- a/src/fixtures/mock_ui_state.js +++ b/src/fixtures/mock_ui_state.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; let values = {}; export default { get: function (path, def) { diff --git a/src/legacy/core_plugins/apm_oss/index.js b/src/legacy/core_plugins/apm_oss/index.js index b7ab6797c0de9..33942db0d49fc 100644 --- a/src/legacy/core_plugins/apm_oss/index.js +++ b/src/legacy/core_plugins/apm_oss/index.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; export default function apmOss(kibana) { return new kibana.Plugin({ diff --git a/src/legacy/core_plugins/console_legacy/index.ts b/src/legacy/core_plugins/console_legacy/index.ts index c588b941112d1..e0fac123f7072 100644 --- a/src/legacy/core_plugins/console_legacy/index.ts +++ b/src/legacy/core_plugins/console_legacy/index.ts @@ -18,7 +18,7 @@ */ import { first } from 'rxjs/operators'; -import { head } from 'lodash'; +import { head } from 'lodash4'; import url from 'url'; // TODO: Remove this hack once we can get the ES config we need for Console proxy a better way. @@ -41,7 +41,7 @@ export default function (kibana: any) { uiExports: { injectDefaultVars: () => ({ elasticsearchUrl: url.format( - Object.assign(url.parse(head(_legacyEsConfig.hosts)), { auth: false }) + Object.assign(url.parse(head(_legacyEsConfig.hosts) as any), { auth: false }) ), }), }, diff --git a/src/legacy/core_plugins/elasticsearch/server/lib/handle_es_error.js b/src/legacy/core_plugins/elasticsearch/server/lib/handle_es_error.js index fc4ff512e2bd5..b3ce262fc3de7 100644 --- a/src/legacy/core_plugins/elasticsearch/server/lib/handle_es_error.js +++ b/src/legacy/core_plugins/elasticsearch/server/lib/handle_es_error.js @@ -18,7 +18,7 @@ */ import Boom from 'boom'; -import _ from 'lodash'; +import _ from 'lodash4'; import { errors as esErrors } from 'elasticsearch'; export function handleESError(error) { @@ -35,7 +35,7 @@ export function handleESError(error) { return Boom.serverUnavailable(error); } else if ( error instanceof esErrors.Conflict || - _.contains(error.message, 'index_template_already_exists') + _.includes(error.message, 'index_template_already_exists') ) { return Boom.conflict(error); } else if (error instanceof esErrors[403]) { diff --git a/src/legacy/core_plugins/kibana/public/__tests__/discover/doc_table.js b/src/legacy/core_plugins/kibana/public/__tests__/discover/doc_table.js index 504b00808718b..a57274e5e1aeb 100644 --- a/src/legacy/core_plugins/kibana/public/__tests__/discover/doc_table.js +++ b/src/legacy/core_plugins/kibana/public/__tests__/discover/doc_table.js @@ -18,7 +18,7 @@ */ import angular from 'angular'; import expect from '@kbn/expect'; -import _ from 'lodash'; +import _ from 'lodash4'; import ngMock from 'ng_mock'; import 'ui/private'; import { pluginInstance } from './legacy'; diff --git a/src/legacy/core_plugins/kibana/public/__tests__/discover/row_headers.js b/src/legacy/core_plugins/kibana/public/__tests__/discover/row_headers.js index 29c301bf065c4..a39bd6e3af118 100644 --- a/src/legacy/core_plugins/kibana/public/__tests__/discover/row_headers.js +++ b/src/legacy/core_plugins/kibana/public/__tests__/discover/row_headers.js @@ -17,7 +17,7 @@ * under the License. */ import angular from 'angular'; -import _ from 'lodash'; +import _ from 'lodash4'; import sinon from 'sinon'; import expect from '@kbn/expect'; import ngMock from 'ng_mock'; diff --git a/src/legacy/core_plugins/kibana/public/__tests__/vis_type_table/agg_table.js b/src/legacy/core_plugins/kibana/public/__tests__/vis_type_table/agg_table.js index 88eb299e3c3a8..e5c69187b26df 100644 --- a/src/legacy/core_plugins/kibana/public/__tests__/vis_type_table/agg_table.js +++ b/src/legacy/core_plugins/kibana/public/__tests__/vis_type_table/agg_table.js @@ -25,7 +25,7 @@ import sinon from 'sinon'; import './legacy'; // eslint-disable-next-line @kbn/eslint/no-restricted-paths import { npStart } from 'ui/new_platform'; -import { round } from 'lodash'; +import { round } from 'lodash4'; // eslint-disable-next-line @kbn/eslint/no-restricted-paths import { getInnerAngular } from '../../../../../../plugins/vis_type_table/public/get_inner_angular'; diff --git a/src/legacy/core_plugins/kibana/public/__tests__/vis_type_tagcloud/tag_cloud.js b/src/legacy/core_plugins/kibana/public/__tests__/vis_type_tagcloud/tag_cloud.js index 35c7b77687b94..5ad7f3e87dee5 100644 --- a/src/legacy/core_plugins/kibana/public/__tests__/vis_type_tagcloud/tag_cloud.js +++ b/src/legacy/core_plugins/kibana/public/__tests__/vis_type_tagcloud/tag_cloud.js @@ -18,7 +18,7 @@ */ import expect from '@kbn/expect'; -import _ from 'lodash'; +import _ from 'lodash4'; import d3 from 'd3'; import { fromNode, delay } from 'bluebird'; diff --git a/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/_vis_fixture.js b/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/_vis_fixture.js index 7a68e847f13b1..f7895b6b6d206 100644 --- a/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/_vis_fixture.js +++ b/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/_vis_fixture.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import $ from 'jquery'; import { Vis } from '../../../../../../plugins/vis_type_vislib/public/vislib/vis'; diff --git a/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/lib/chart_title.js b/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/lib/chart_title.js index 6790c49691dfd..e18f3fc7c2c8f 100644 --- a/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/lib/chart_title.js +++ b/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/lib/chart_title.js @@ -18,7 +18,7 @@ */ import d3 from 'd3'; -import _ from 'lodash'; +import _ from 'lodash4'; import expect from '@kbn/expect'; import { ChartTitle } from '../../../../../../../plugins/vis_type_vislib/public/vislib/lib/chart_title'; diff --git a/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/lib/dispatch.js b/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/lib/dispatch.js index 4f8cee2651a9f..cbe67a389351e 100644 --- a/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/lib/dispatch.js +++ b/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/lib/dispatch.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import d3 from 'd3'; import expect from '@kbn/expect'; @@ -51,7 +51,7 @@ describe('Vislib Dispatch Class Test Suite', function () { }); it('implements on, off, emit methods', function () { - const events = _.pluck(vis.handler.charts, 'events'); + const events = _.map(vis.handler.charts, 'events'); expect(events.length).to.be.above(0); events.forEach(function (dispatch) { expect(dispatch).to.have.property('on'); diff --git a/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/vis.js b/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/vis.js index 36decdc415ed8..92f0e86b6738b 100644 --- a/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/vis.js +++ b/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/vis.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import $ from 'jquery'; import expect from '@kbn/expect'; diff --git a/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/visualizations/area_chart.js b/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/visualizations/area_chart.js index fd2240c0c64c5..ddac8b3e330af 100644 --- a/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/visualizations/area_chart.js +++ b/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/visualizations/area_chart.js @@ -18,7 +18,7 @@ */ import d3 from 'd3'; -import _ from 'lodash'; +import _ from 'lodash4'; import $ from 'jquery'; import expect from '@kbn/expect'; diff --git a/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/visualizations/column_chart.js b/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/visualizations/column_chart.js index f075dff466793..3b348709d2aaa 100644 --- a/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/visualizations/column_chart.js +++ b/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/visualizations/column_chart.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import d3 from 'd3'; import $ from 'jquery'; import expect from '@kbn/expect'; @@ -267,7 +267,7 @@ describe('stackData method - data set with zeros in percentage mode', function ( expect(chart.chartData.series).to.have.length(1); const series = chart.chartData.series[0].values; // with the interval set in seriesMonthlyInterval data, the point at x=1454309600000 does not exist - const point = _.find(series, 'x', 1454309600000); + const point = _.find(series, ['x', 1454309600000]); expect(point).to.not.be(undefined); expect(point.y).to.be(0); }); @@ -279,7 +279,7 @@ describe('stackData method - data set with zeros in percentage mode', function ( const chart = vis.handler.charts[0]; expect(chart.chartData.series).to.have.length(5); const series = chart.chartData.series[0].values; - const point = _.find(series, 'x', 1415826240000); + const point = _.find(series, ['x', 1415826240000]); expect(point).to.not.be(undefined); expect(point.y).to.be(0); }); diff --git a/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/visualizations/gauge_chart.js b/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/visualizations/gauge_chart.js index 7c588800ae659..2f7bf34af28cd 100644 --- a/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/visualizations/gauge_chart.js +++ b/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/visualizations/gauge_chart.js @@ -18,7 +18,7 @@ */ import $ from 'jquery'; -import _ from 'lodash'; +import _ from 'lodash4'; import expect from '@kbn/expect'; import data from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/terms/_series_multiple'; diff --git a/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/visualizations/heatmap_chart.js b/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/visualizations/heatmap_chart.js index 9fa51fb59ed48..4786e2bfc356b 100644 --- a/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/visualizations/heatmap_chart.js +++ b/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/visualizations/heatmap_chart.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import $ from 'jquery'; import d3 from 'd3'; import expect from '@kbn/expect'; diff --git a/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/visualizations/line_chart.js b/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/visualizations/line_chart.js index dae92c831cd8d..4c45baf729095 100644 --- a/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/visualizations/line_chart.js +++ b/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/visualizations/line_chart.js @@ -20,7 +20,7 @@ import d3 from 'd3'; import expect from '@kbn/expect'; import $ from 'jquery'; -import _ from 'lodash'; +import _ from 'lodash4'; // Data import seriesPos from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_series'; diff --git a/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/visualizations/pie_chart.js b/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/visualizations/pie_chart.js index d245905729c7e..fbaac945b2535 100644 --- a/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/visualizations/pie_chart.js +++ b/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/visualizations/pie_chart.js @@ -18,7 +18,7 @@ */ import d3 from 'd3'; -import _ from 'lodash'; +import _ from 'lodash4'; import $ from 'jquery'; import expect from '@kbn/expect'; diff --git a/src/legacy/core_plugins/kibana/server/lib/export/export_dashboards.js b/src/legacy/core_plugins/kibana/server/lib/export/export_dashboards.js index 913ebff588f84..537a6ad88d7ec 100644 --- a/src/legacy/core_plugins/kibana/server/lib/export/export_dashboards.js +++ b/src/legacy/core_plugins/kibana/server/lib/export/export_dashboards.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { collectReferencesDeep } from './collect_references_deep'; export async function exportDashboards(req) { diff --git a/src/legacy/core_plugins/kibana/server/lib/import/import_dashboards.js b/src/legacy/core_plugins/kibana/server/lib/import/import_dashboards.js index 7c28b184144f1..633e2bdf2e4fe 100644 --- a/src/legacy/core_plugins/kibana/server/lib/import/import_dashboards.js +++ b/src/legacy/core_plugins/kibana/server/lib/import/import_dashboards.js @@ -17,7 +17,7 @@ * under the License. */ -import { flatten } from 'lodash'; +import { flatten } from 'lodash4'; export async function importDashboards(req) { const { payload } = req; diff --git a/src/legacy/core_plugins/kibana/server/lib/management/saved_objects/relationships.js b/src/legacy/core_plugins/kibana/server/lib/management/saved_objects/relationships.js index e0a6c574b7ad8..35be2bb8bb99b 100644 --- a/src/legacy/core_plugins/kibana/server/lib/management/saved_objects/relationships.js +++ b/src/legacy/core_plugins/kibana/server/lib/management/saved_objects/relationships.js @@ -17,7 +17,7 @@ * under the License. */ -import { pick } from 'lodash'; +import { pick } from 'lodash4'; import { injectMetaAttributes } from './inject_meta_attributes'; export async function findRelationships(type, id, options = {}) { diff --git a/src/legacy/core_plugins/status_page/public/lib/load_status.js b/src/legacy/core_plugins/status_page/public/lib/load_status.js index d033e5f147d9d..5318db1378f5e 100644 --- a/src/legacy/core_plugins/status_page/public/lib/load_status.js +++ b/src/legacy/core_plugins/status_page/public/lib/load_status.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import chrome from 'ui/chrome'; import { toastNotifications } from 'ui/notify'; diff --git a/src/legacy/core_plugins/tests_bundle/find_source_files.js b/src/legacy/core_plugins/tests_bundle/find_source_files.js index eed88a5ecb8b0..abf3b4507fb96 100644 --- a/src/legacy/core_plugins/tests_bundle/find_source_files.js +++ b/src/legacy/core_plugins/tests_bundle/find_source_files.js @@ -19,7 +19,7 @@ // eslint-disable-next-line @kbn/eslint/no-restricted-paths import { fromRoot } from '../../../core/server/utils'; -import { chain } from 'lodash'; +import { chain } from 'lodash4'; import { resolve } from 'path'; import { fromNode } from 'bluebird'; import glob from 'glob-all'; diff --git a/src/legacy/core_plugins/timelion/public/app.js b/src/legacy/core_plugins/timelion/public/app.js index b5501982cec09..68151cb21368c 100644 --- a/src/legacy/core_plugins/timelion/public/app.js +++ b/src/legacy/core_plugins/timelion/public/app.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; // required for `ngSanitize` angular module import 'angular-sanitize'; @@ -427,7 +427,7 @@ app.controller('timelion', function ( const httpResult = $http .post('../api/timelion/run', { sheet: $scope.state.sheet, - time: _.extend( + time: _.assignIn( { from: timeRangeBounds.min, to: timeRangeBounds.max, diff --git a/src/legacy/core_plugins/timelion/public/directives/cells/cells.js b/src/legacy/core_plugins/timelion/public/directives/cells/cells.js index 104af3b1043d6..a782d5f00fa31 100644 --- a/src/legacy/core_plugins/timelion/public/directives/cells/cells.js +++ b/src/legacy/core_plugins/timelion/public/directives/cells/cells.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { move } from 'ui/utils/collection'; require('angular-sortable-view'); diff --git a/src/legacy/core_plugins/timelion/public/directives/saved_object_finder.js b/src/legacy/core_plugins/timelion/public/directives/saved_object_finder.js index 879fab206b99d..ce10ab4074c64 100644 --- a/src/legacy/core_plugins/timelion/public/directives/saved_object_finder.js +++ b/src/legacy/core_plugins/timelion/public/directives/saved_object_finder.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import rison from 'rison-node'; import { uiModules } from 'ui/modules'; import 'ui/directives/input_focus'; @@ -165,7 +165,7 @@ module }; self.getLabel = function () { - return _.words(self.properties.nouns).map(_.capitalize).join(' '); + return _.words(self.properties.nouns).map(_.upperFirst).join(' '); }; //key handler for the filter text box diff --git a/src/legacy/core_plugins/timelion/public/directives/timelion_expression_input.js b/src/legacy/core_plugins/timelion/public/directives/timelion_expression_input.js index f3fd2fde8f2c5..04b97a99cedc3 100644 --- a/src/legacy/core_plugins/timelion/public/directives/timelion_expression_input.js +++ b/src/legacy/core_plugins/timelion/public/directives/timelion_expression_input.js @@ -40,7 +40,7 @@ * that has more than a single consecutive newline. */ -import _ from 'lodash'; +import _ from 'lodash4'; import $ from 'jquery'; import PEG from 'pegjs'; import grammar from 'raw-loader!../../../../../plugins/vis_type_timelion/common/chain.peg'; @@ -78,7 +78,7 @@ export function TimelionExpInput($http, $timeout) { function init() { $http.get('../api/timelion/functions').then(function (resp) { Object.assign(functionReference, { - byName: _.indexBy(resp.data, 'name'), + byName: _.keyBy(resp.data, 'name'), list: resp.data, }); }); diff --git a/src/legacy/core_plugins/timelion/public/directives/timelion_expression_input_helpers.js b/src/legacy/core_plugins/timelion/public/directives/timelion_expression_input_helpers.js index 20edee82f9486..3c012eb7baee5 100644 --- a/src/legacy/core_plugins/timelion/public/directives/timelion_expression_input_helpers.js +++ b/src/legacy/core_plugins/timelion/public/directives/timelion_expression_input_helpers.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; export const SUGGESTION_TYPE = { ARGUMENTS: 'arguments', diff --git a/src/legacy/core_plugins/timelion/public/directives/timelion_help/timelion_help.js b/src/legacy/core_plugins/timelion/public/directives/timelion_help/timelion_help.js index 25f3df13153ba..1022e51b4b129 100644 --- a/src/legacy/core_plugins/timelion/public/directives/timelion_help/timelion_help.js +++ b/src/legacy/core_plugins/timelion/public/directives/timelion_help/timelion_help.js @@ -20,7 +20,7 @@ import template from './timelion_help.html'; import { i18n } from '@kbn/i18n'; import { uiModules } from 'ui/modules'; -import _ from 'lodash'; +import _ from 'lodash4'; import moment from 'moment'; import '../../components/timelionhelp_tabs_directive'; diff --git a/src/legacy/core_plugins/timelion/public/directives/timelion_interval/timelion_interval.js b/src/legacy/core_plugins/timelion/public/directives/timelion_interval/timelion_interval.js index 577ee984e05c6..d301bc7bb72db 100644 --- a/src/legacy/core_plugins/timelion/public/directives/timelion_interval/timelion_interval.js +++ b/src/legacy/core_plugins/timelion/public/directives/timelion_interval/timelion_interval.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import $ from 'jquery'; import template from './timelion_interval.html'; @@ -47,7 +47,7 @@ export function TimelionInterval($timeout) { // Only run this on initialization if (newVal !== oldVal || oldVal == null) return; - if (_.contains($scope.intervalOptions, newVal)) { + if (_.includes($scope.intervalOptions, newVal)) { $scope.interval = newVal; } else { $scope.interval = 'other'; diff --git a/src/legacy/core_plugins/timelion/public/panels/timechart/schema.ts b/src/legacy/core_plugins/timelion/public/panels/timechart/schema.ts index b1999eb4b483c..868e5271f0e43 100644 --- a/src/legacy/core_plugins/timelion/public/panels/timechart/schema.ts +++ b/src/legacy/core_plugins/timelion/public/panels/timechart/schema.ts @@ -19,7 +19,7 @@ // eslint-disable-next-line @kbn/eslint/no-restricted-paths import '../../../../../../plugins/vis_type_timelion/public/flot'; -import _ from 'lodash'; +import _ from 'lodash4'; import $ from 'jquery'; import moment from 'moment-timezone'; import { timefilter } from 'ui/timefilter'; @@ -346,7 +346,7 @@ export function timechartFn(dependencies: TimelionVisualizationDependencies) { } if (serie._global) { - _.merge(options, serie._global, function (objVal, srcVal) { + _.mergeWith(options, serie._global, function (objVal, srcVal) { // This is kind of gross, it means that you can't replace a global value with a null // best you can do is an empty string. Deal with it. if (objVal == null) return srcVal; diff --git a/src/legacy/core_plugins/timelion/public/shim/timelion_legacy_module.ts b/src/legacy/core_plugins/timelion/public/shim/timelion_legacy_module.ts index 8122259f1c991..5fd12857b17b1 100644 --- a/src/legacy/core_plugins/timelion/public/shim/timelion_legacy_module.ts +++ b/src/legacy/core_plugins/timelion/public/shim/timelion_legacy_module.ts @@ -22,7 +22,7 @@ import 'brace/mode/hjson'; import 'brace/ext/searchbox'; import 'ui/accessibility/kbn_ui_ace_keyboard_mode'; -import { once } from 'lodash'; +import { once } from 'lodash4'; // @ts-ignore import { uiModules } from 'ui/modules'; import { Panel } from '../panels/panel'; diff --git a/src/legacy/deprecation/create_transform.js b/src/legacy/deprecation/create_transform.js index 72e8e153ed819..94a5c6cd0805d 100644 --- a/src/legacy/deprecation/create_transform.js +++ b/src/legacy/deprecation/create_transform.js @@ -18,7 +18,7 @@ */ import { deepCloneWithBuffers as clone } from '../utils'; -import { forEach, noop } from 'lodash'; +import { forEach, noop } from 'lodash4'; export function createTransform(deprecations) { return (settings, log = noop) => { diff --git a/src/legacy/deprecation/deprecations/rename.js b/src/legacy/deprecation/deprecations/rename.js index b47a745519b1e..0f82954f081a7 100644 --- a/src/legacy/deprecation/deprecations/rename.js +++ b/src/legacy/deprecation/deprecations/rename.js @@ -17,7 +17,7 @@ * under the License. */ -import { get, isUndefined, noop, set } from 'lodash'; +import { get, isUndefined, noop, set } from 'lodash4'; import { unset } from '../../utils'; export function rename(oldKey, newKey) { diff --git a/src/legacy/deprecation/deprecations/unused.js b/src/legacy/deprecation/deprecations/unused.js index 4291063dc482b..4eb76c3489098 100644 --- a/src/legacy/deprecation/deprecations/unused.js +++ b/src/legacy/deprecation/deprecations/unused.js @@ -17,7 +17,7 @@ * under the License. */ -import { get, isUndefined, noop } from 'lodash'; +import { get, isUndefined, noop } from 'lodash4'; import { unset } from '../../utils'; export function unused(oldKey) { diff --git a/src/legacy/deprecation/get_transform.js b/src/legacy/deprecation/get_transform.js index bf286901af62c..93f4776a4f9b6 100644 --- a/src/legacy/deprecation/get_transform.js +++ b/src/legacy/deprecation/get_transform.js @@ -17,7 +17,7 @@ * under the License. */ -import { noop } from 'lodash'; +import { noop } from 'lodash4'; import { createTransform } from './create_transform'; import { rename, unused } from './deprecations'; diff --git a/src/legacy/plugin_discovery/__tests__/find_plugin_specs.js b/src/legacy/plugin_discovery/__tests__/find_plugin_specs.js index e6af23d69c549..5aa8689710999 100644 --- a/src/legacy/plugin_discovery/__tests__/find_plugin_specs.js +++ b/src/legacy/plugin_discovery/__tests__/find_plugin_specs.js @@ -21,7 +21,7 @@ import { resolve } from 'path'; import { toArray } from 'rxjs/operators'; import expect from '@kbn/expect'; -import { isEqual } from 'lodash'; +import { isEqual } from 'lodash4'; import { findPluginSpecs } from '../find_plugin_specs'; import { PluginSpec } from '../plugin_spec'; diff --git a/src/legacy/plugin_discovery/plugin_config/settings.js b/src/legacy/plugin_discovery/plugin_config/settings.js index 44ecb5718fe21..cf9c49003bf92 100644 --- a/src/legacy/plugin_discovery/plugin_config/settings.js +++ b/src/legacy/plugin_discovery/plugin_config/settings.js @@ -17,7 +17,7 @@ * under the License. */ -import { get } from 'lodash'; +import { get } from 'lodash4'; import { getTransform } from '../../deprecation'; diff --git a/src/legacy/plugin_discovery/plugin_spec/plugin_spec.js b/src/legacy/plugin_discovery/plugin_spec/plugin_spec.js index 17da5ffca1242..28a4a29516ce1 100644 --- a/src/legacy/plugin_discovery/plugin_spec/plugin_spec.js +++ b/src/legacy/plugin_discovery/plugin_spec/plugin_spec.js @@ -19,8 +19,7 @@ import { resolve, basename, isAbsolute as isAbsolutePath } from 'path'; -import toPath from 'lodash/internal/toPath'; -import { get } from 'lodash'; +import { get, toPath } from 'lodash4'; import { createInvalidPluginError } from '../errors'; import { isVersionCompatible } from './is_version_compatible'; diff --git a/src/legacy/server/config/config.js b/src/legacy/server/config/config.js index d32ec29e6d701..00a1d21441f49 100644 --- a/src/legacy/server/config/config.js +++ b/src/legacy/server/config/config.js @@ -18,7 +18,7 @@ */ import Joi from 'joi'; -import _ from 'lodash'; +import _ from 'lodash4'; import { override } from './override'; import createDefaultSchema from './schema'; import { unset, deepCloneWithBuffers as clone, IS_KIBANA_DISTRIBUTABLE } from '../../utils'; diff --git a/src/legacy/server/config/config.test.js b/src/legacy/server/config/config.test.js index d7dec19b7ca6e..0a8f8d9d668c0 100644 --- a/src/legacy/server/config/config.test.js +++ b/src/legacy/server/config/config.test.js @@ -18,7 +18,7 @@ */ import { Config } from './config'; -import _ from 'lodash'; +import _ from 'lodash4'; import Joi from 'joi'; /** diff --git a/src/legacy/server/http/index.js b/src/legacy/server/http/index.js index 2d62d12dfd9f3..8d201b1cd34b2 100644 --- a/src/legacy/server/http/index.js +++ b/src/legacy/server/http/index.js @@ -18,7 +18,7 @@ */ import { format } from 'url'; -import _ from 'lodash'; +import _ from 'lodash4'; import Boom from 'boom'; import { registerHapiPlugins } from './register_hapi_plugins'; diff --git a/src/legacy/server/i18n/localization/file_integrity.ts b/src/legacy/server/i18n/localization/file_integrity.ts index a852fba4a1c5a..e88b625dc7d50 100644 --- a/src/legacy/server/i18n/localization/file_integrity.ts +++ b/src/legacy/server/i18n/localization/file_integrity.ts @@ -19,7 +19,7 @@ import { createHash } from 'crypto'; import * as fs from 'fs'; -import { zipObject } from 'lodash'; +import { zipObject } from 'lodash4'; import * as stream from 'stream'; import * as util from 'util'; @@ -33,7 +33,7 @@ export interface Integrities { export async function getIntegrityHashes(filepaths: string[]): Promise { const hashes = await Promise.all(filepaths.map(getIntegrityHash)); - return zipObject(filepaths, hashes); + return zipObject(filepaths, hashes) as Integrities; } export async function getIntegrityHash(filepath: string): Promise { diff --git a/src/legacy/server/i18n/localization/telemetry_localization_collector.ts b/src/legacy/server/i18n/localization/telemetry_localization_collector.ts index 89566dfd4ef68..4019230b888ec 100644 --- a/src/legacy/server/i18n/localization/telemetry_localization_collector.ts +++ b/src/legacy/server/i18n/localization/telemetry_localization_collector.ts @@ -18,7 +18,7 @@ */ import { i18nLoader } from '@kbn/i18n'; -import { size } from 'lodash'; +import { size } from 'lodash4'; import { UsageCollectionSetup } from 'src/plugins/usage_collection/server'; import { getIntegrityHashes, Integrities } from './file_integrity'; import { KIBANA_LOCALIZATION_STATS_TYPE } from '../constants'; diff --git a/src/legacy/server/kbn_server.js b/src/legacy/server/kbn_server.js index 1168d24254911..d10fb92fa3b84 100644 --- a/src/legacy/server/kbn_server.js +++ b/src/legacy/server/kbn_server.js @@ -17,7 +17,7 @@ * under the License. */ -import { constant, once, compact, flatten } from 'lodash'; +import { constant, once, compact, flatten } from 'lodash4'; import { isWorker } from 'cluster'; // eslint-disable-next-line @kbn/eslint/no-restricted-paths diff --git a/src/legacy/server/logging/configuration.js b/src/legacy/server/logging/configuration.js index 267dc9a334de8..e075416efc449 100644 --- a/src/legacy/server/logging/configuration.js +++ b/src/legacy/server/logging/configuration.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { getLoggerStream } from './log_reporter'; export default function loggingConfiguration(config) { diff --git a/src/legacy/server/logging/log_format.js b/src/legacy/server/logging/log_format.js index 9bc1d67dd5857..5cac5cedca365 100644 --- a/src/legacy/server/logging/log_format.js +++ b/src/legacy/server/logging/log_format.js @@ -19,7 +19,7 @@ import Stream from 'stream'; import moment from 'moment-timezone'; -import { get, _ } from 'lodash'; +import { get, _ } from 'lodash4'; import queryString from 'query-string'; import numeral from '@elastic/numeral'; import chalk from 'chalk'; @@ -144,7 +144,7 @@ export default class TransformObjStream extends Stream.Transform { data.message = message || 'Unknown error (no message)'; } else if (event.error instanceof Error) { data.type = 'error'; - data.level = _.contains(event.tags, 'fatal') ? 'fatal' : 'error'; + data.level = _.includes(event.tags, 'fatal') ? 'fatal' : 'error'; data.error = serializeError(event.error); const message = get(event, 'error.message'); data.message = message || 'Unknown error object (no message)'; diff --git a/src/legacy/server/logging/log_format_string.js b/src/legacy/server/logging/log_format_string.js index 3c18aab2e3d09..9f181a1262a8e 100644 --- a/src/legacy/server/logging/log_format_string.js +++ b/src/legacy/server/logging/log_format_string.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import chalk from 'chalk'; import LogFormat from './log_format'; diff --git a/src/legacy/server/logging/log_interceptor.js b/src/legacy/server/logging/log_interceptor.js index 0754557044583..5ed9a7378f02c 100644 --- a/src/legacy/server/logging/log_interceptor.js +++ b/src/legacy/server/logging/log_interceptor.js @@ -18,7 +18,7 @@ */ import Stream from 'stream'; -import { get, isEqual } from 'lodash'; +import { get, isEqual } from 'lodash4'; const GET_CLIENT_HELLO = /GET_CLIENT_HELLO:http/; diff --git a/src/legacy/server/logging/log_with_metadata.js b/src/legacy/server/logging/log_with_metadata.js index 73e03a154907a..a170558b9c226 100644 --- a/src/legacy/server/logging/log_with_metadata.js +++ b/src/legacy/server/logging/log_with_metadata.js @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { isPlainObject } from 'lodash'; +import { isPlainObject } from 'lodash4'; import { metadataSymbol, diff --git a/src/legacy/server/logging/rotate/log_rotator.test.ts b/src/legacy/server/logging/rotate/log_rotator.test.ts index 70842d42f5e1f..60ec51fbd2507 100644 --- a/src/legacy/server/logging/rotate/log_rotator.test.ts +++ b/src/legacy/server/logging/rotate/log_rotator.test.ts @@ -31,8 +31,8 @@ jest.mock('chokidar', () => ({ })), })); -jest.mock('lodash', () => ({ - ...require.requireActual('lodash'), +jest.mock('lodash4', () => ({ + ...require.requireActual('lodash4'), throttle: (fn: any) => fn, })); diff --git a/src/legacy/server/logging/rotate/log_rotator.ts b/src/legacy/server/logging/rotate/log_rotator.ts index 22183b2f0777a..d6072ec54b5a3 100644 --- a/src/legacy/server/logging/rotate/log_rotator.ts +++ b/src/legacy/server/logging/rotate/log_rotator.ts @@ -21,7 +21,7 @@ import * as chokidar from 'chokidar'; import { isMaster } from 'cluster'; import fs from 'fs'; import { Server } from 'hapi'; -import { throttle } from 'lodash'; +import { throttle } from 'lodash4'; import { tmpdir } from 'os'; import { basename, dirname, join, sep } from 'path'; import { Observable } from 'rxjs'; diff --git a/src/legacy/server/pid/index.js b/src/legacy/server/pid/index.js index d7b9da1292252..8e961e32719d1 100644 --- a/src/legacy/server/pid/index.js +++ b/src/legacy/server/pid/index.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import Boom from 'boom'; import Bluebird from 'bluebird'; import { unlinkSync as unlink } from 'fs'; diff --git a/src/legacy/server/plugins/lib/call_plugin_hook.js b/src/legacy/server/plugins/lib/call_plugin_hook.js index b665869f5d25f..c551f16fd8590 100644 --- a/src/legacy/server/plugins/lib/call_plugin_hook.js +++ b/src/legacy/server/plugins/lib/call_plugin_hook.js @@ -17,7 +17,7 @@ * under the License. */ -import { last } from 'lodash'; +import { last } from 'lodash4'; export async function callPluginHook(hookName, plugins, id, history) { const plugin = plugins.find((plugin) => plugin.id === id); diff --git a/src/legacy/server/plugins/lib/plugin.js b/src/legacy/server/plugins/lib/plugin.js index 2b392d13d595a..ace1926219e56 100644 --- a/src/legacy/server/plugins/lib/plugin.js +++ b/src/legacy/server/plugins/lib/plugin.js @@ -17,7 +17,7 @@ * under the License. */ -import { once } from 'lodash'; +import { once } from 'lodash4'; /** * The server plugin class, used to extend the server diff --git a/src/legacy/server/status/index.js b/src/legacy/server/status/index.js index 377a5d74610a9..cd509a2eff951 100644 --- a/src/legacy/server/status/index.js +++ b/src/legacy/server/status/index.js @@ -21,7 +21,7 @@ import ServerStatus from './server_status'; import { Metrics } from './lib/metrics'; import { registerStatusPage, registerStatusApi, registerStatsApi } from './routes'; import Oppsy from 'oppsy'; -import { cloneDeep } from 'lodash'; +import { cloneDeep } from 'lodash4'; import { getOSInfo } from './lib/get_os_info'; export function statusMixin(kbnServer, server, config) { diff --git a/src/legacy/server/status/lib/case_conversion.ts b/src/legacy/server/status/lib/case_conversion.ts index a3ae15028daeb..9a574c28e963f 100644 --- a/src/legacy/server/status/lib/case_conversion.ts +++ b/src/legacy/server/status/lib/case_conversion.ts @@ -17,7 +17,7 @@ * under the License. */ -import { mapKeys, snakeCase } from 'lodash'; +import { mapKeys, snakeCase } from 'lodash4'; export function keysToSnakeCaseShallow(object: Record) { return mapKeys(object, (value, key) => snakeCase(key)); diff --git a/src/legacy/server/status/lib/get_kibana_info_for_stats.js b/src/legacy/server/status/lib/get_kibana_info_for_stats.js index 62628a2c40ff9..db48c2e8d9e03 100644 --- a/src/legacy/server/status/lib/get_kibana_info_for_stats.js +++ b/src/legacy/server/status/lib/get_kibana_info_for_stats.js @@ -17,7 +17,7 @@ * under the License. */ -import { get } from 'lodash'; +import { get } from 'lodash4'; const snapshotRegex = /-snapshot/i; diff --git a/src/legacy/server/status/lib/metrics.js b/src/legacy/server/status/lib/metrics.js index 2631b245e72ab..1bd907ea92ffd 100644 --- a/src/legacy/server/status/lib/metrics.js +++ b/src/legacy/server/status/lib/metrics.js @@ -19,7 +19,7 @@ import os from 'os'; import v8 from 'v8'; -import { get, isObject, merge } from 'lodash'; +import { get, isObject, merge } from 'lodash4'; import { keysToSnakeCaseShallow } from './case_conversion'; import { getAllStats as cGroupStats } from './cgroup'; import { getOSInfo } from './get_os_info'; diff --git a/src/legacy/server/status/lib/metrics.test.js b/src/legacy/server/status/lib/metrics.test.js index 6a734941eb70c..b53519d043e46 100644 --- a/src/legacy/server/status/lib/metrics.test.js +++ b/src/legacy/server/status/lib/metrics.test.js @@ -35,7 +35,7 @@ jest.mock('process', () => ({ import fs from 'fs'; import os from 'os'; -import _ from 'lodash'; +import _ from 'lodash4'; import sinon from 'sinon'; import { cGroups as cGroupsFsStub, setMockFiles, readFileMock } from './__mocks__/_fs_stubs'; import { Metrics } from './metrics'; diff --git a/src/legacy/server/status/samples.js b/src/legacy/server/status/samples.js index 9c41e29945a77..772faf47eb6a3 100644 --- a/src/legacy/server/status/samples.js +++ b/src/legacy/server/status/samples.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; function Samples(max) { this.vals = {}; diff --git a/src/legacy/server/status/server_status.js b/src/legacy/server/status/server_status.js index 3ee4d37d0b823..7b59f719e99a2 100644 --- a/src/legacy/server/status/server_status.js +++ b/src/legacy/server/status/server_status.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import * as states from './states'; import Status from './status'; @@ -81,7 +81,7 @@ export default class ServerStatus { // reduce to the state with the highest severity, defaulting to green .reduce((a, b) => (a.severity > b.severity ? a : b), states.get('green')); - const statuses = _.where(this._created, { state: state.id }); + const statuses = _.filter(this._created, { state: state.id }); const since = _.get(_.sortBy(statuses, 'since'), [0, 'since']); return { diff --git a/src/legacy/server/status/server_status.test.js b/src/legacy/server/status/server_status.test.js index bf94d693b1310..7f13d843665bd 100644 --- a/src/legacy/server/status/server_status.test.js +++ b/src/legacy/server/status/server_status.test.js @@ -17,7 +17,7 @@ * under the License. */ -import { find } from 'lodash'; +import { find } from 'lodash4'; import sinon from 'sinon'; import * as states from './states'; diff --git a/src/legacy/server/status/states.js b/src/legacy/server/status/states.js index bf05f45ff856c..71fe88a15ffba 100644 --- a/src/legacy/server/status/states.js +++ b/src/legacy/server/status/states.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { i18n } from '@kbn/i18n'; export const getAll = () => [ @@ -73,7 +73,7 @@ export const getAll = () => [ }, ]; -export const getAllById = () => _.indexBy(exports.getAll(), 'id'); +export const getAllById = () => _.keyBy(exports.getAll(), 'id'); export const defaults = { icon: 'question', diff --git a/src/legacy/server/status/wrap_auth_config.js b/src/legacy/server/status/wrap_auth_config.js index 04e71a02d30de..1b5f1749cc362 100644 --- a/src/legacy/server/status/wrap_auth_config.js +++ b/src/legacy/server/status/wrap_auth_config.js @@ -17,7 +17,7 @@ * under the License. */ -import { assign, identity } from 'lodash'; +import { assign, identity } from 'lodash4'; export const wrapAuthConfig = (allowAnonymous) => { if (allowAnonymous) { diff --git a/src/legacy/ui/public/__tests__/events.js b/src/legacy/ui/public/__tests__/events.js index c225c2a8ac1c0..0564a08c28eb9 100644 --- a/src/legacy/ui/public/__tests__/events.js +++ b/src/legacy/ui/public/__tests__/events.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import sinon from 'sinon'; import ngMock from 'ng_mock'; import { EventsProvider } from '../events'; diff --git a/src/legacy/ui/public/bound_to_config_obj.js b/src/legacy/ui/public/bound_to_config_obj.js index dc1eedebe2b77..71e0bd953bc26 100644 --- a/src/legacy/ui/public/bound_to_config_obj.js +++ b/src/legacy/ui/public/bound_to_config_obj.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; export function BoundToConfigObjProvider(config) { /** diff --git a/src/legacy/ui/public/chrome/__mocks__/index.js b/src/legacy/ui/public/chrome/__mocks__/index.js index d6f0df83a0e3d..f127c4fc6af90 100644 --- a/src/legacy/ui/public/chrome/__mocks__/index.js +++ b/src/legacy/ui/public/chrome/__mocks__/index.js @@ -42,7 +42,7 @@ const chrome = { export default chrome; // Copied from `src/legacy/ui/public/chrome/chrome.js` -import _ from 'lodash'; +import _ from 'lodash4'; import angular from 'angular'; import { metadata } from '../../metadata'; diff --git a/src/legacy/ui/public/chrome/api/__tests__/angular.js b/src/legacy/ui/public/chrome/api/__tests__/angular.js index 797498a24265e..a09cc5920e907 100644 --- a/src/legacy/ui/public/chrome/api/__tests__/angular.js +++ b/src/legacy/ui/public/chrome/api/__tests__/angular.js @@ -18,7 +18,7 @@ */ import { initAngularApi } from '../angular'; -import { noop } from 'lodash'; +import { noop } from 'lodash4'; describe('Chrome API :: Angular', () => { describe('location helper methods', () => { diff --git a/src/legacy/ui/public/chrome/api/apps.js b/src/legacy/ui/public/chrome/api/apps.js index c4cbe7be6f1c3..97cd34517029b 100644 --- a/src/legacy/ui/public/chrome/api/apps.js +++ b/src/legacy/ui/public/chrome/api/apps.js @@ -17,7 +17,7 @@ * under the License. */ -import { clone, get } from 'lodash'; +import { clone, get } from 'lodash4'; import { resolve } from 'url'; // eslint-disable-next-line import/no-default-export diff --git a/src/legacy/ui/public/chrome/api/injected_vars.ts b/src/legacy/ui/public/chrome/api/injected_vars.ts index a827c1bf65f51..b3c6697d7c864 100644 --- a/src/legacy/ui/public/chrome/api/injected_vars.ts +++ b/src/legacy/ui/public/chrome/api/injected_vars.ts @@ -17,7 +17,7 @@ * under the License. */ -import { cloneDeep } from 'lodash'; +import { cloneDeep } from 'lodash4'; import { npSetup } from 'ui/new_platform'; const newPlatformInjectedVars = npSetup.core.injectedMetadata; diff --git a/src/legacy/ui/public/chrome/chrome.js b/src/legacy/ui/public/chrome/chrome.js index 0640017f7806a..e6ead16ab1baf 100644 --- a/src/legacy/ui/public/chrome/chrome.js +++ b/src/legacy/ui/public/chrome/chrome.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import angular from 'angular'; import { metadata } from '../metadata'; diff --git a/src/legacy/ui/public/config/config.js b/src/legacy/ui/public/config/config.js index a8f24c126caff..abe7b285d670d 100644 --- a/src/legacy/ui/public/config/config.js +++ b/src/legacy/ui/public/config/config.js @@ -20,7 +20,7 @@ import angular from 'angular'; import { fatalError } from 'ui/notify/fatal_error'; import chrome from '../chrome'; -import { isPlainObject } from 'lodash'; +import { isPlainObject } from 'lodash4'; import { uiModules } from '../modules'; import { subscribeWithScope } from '../../../../plugins/kibana_legacy/public'; diff --git a/src/legacy/ui/public/directives/kbn_href.js b/src/legacy/ui/public/directives/kbn_href.js index 5c71396e6c4de..f82341121c9bb 100644 --- a/src/legacy/ui/public/directives/kbn_href.js +++ b/src/legacy/ui/public/directives/kbn_href.js @@ -18,7 +18,7 @@ */ import { uiModules } from '../modules'; -import { words, kebabCase } from 'lodash'; +import { words, kebabCase } from 'lodash4'; export function kbnUrlDirective(name) { const attr = kebabCase(words(name).slice(1)); diff --git a/src/legacy/ui/public/directives/render_directive/apply_scope_bindings.js b/src/legacy/ui/public/directives/render_directive/apply_scope_bindings.js index 09948bda96b9f..ba31cbedf2f09 100644 --- a/src/legacy/ui/public/directives/render_directive/apply_scope_bindings.js +++ b/src/legacy/ui/public/directives/render_directive/apply_scope_bindings.js @@ -17,7 +17,7 @@ * under the License. */ -import { forOwn, noop } from 'lodash'; +import { forOwn, noop } from 'lodash4'; import '../../directives/bind'; diff --git a/src/legacy/ui/public/directives/render_directive/render_directive.js b/src/legacy/ui/public/directives/render_directive/render_directive.js index a5232f39b82c3..00eb3969616d2 100644 --- a/src/legacy/ui/public/directives/render_directive/render_directive.js +++ b/src/legacy/ui/public/directives/render_directive/render_directive.js @@ -17,7 +17,7 @@ * under the License. */ -import { isPlainObject } from 'lodash'; +import { isPlainObject } from 'lodash4'; import { uiModules } from '../../modules'; import { ApplyScopeBindingsProvider } from './apply_scope_bindings'; diff --git a/src/legacy/ui/public/directives/watch_multi/__tests__/watch_multi.js b/src/legacy/ui/public/directives/watch_multi/__tests__/watch_multi.js index 0de41a5ae57cb..e3c63c897e17b 100644 --- a/src/legacy/ui/public/directives/watch_multi/__tests__/watch_multi.js +++ b/src/legacy/ui/public/directives/watch_multi/__tests__/watch_multi.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import ngMock from 'ng_mock'; import expect from '@kbn/expect'; import sinon from 'sinon'; diff --git a/src/legacy/ui/public/doc_title/doc_title.js b/src/legacy/ui/public/doc_title/doc_title.js index 096e49e7a6de8..ec60bcc34209a 100644 --- a/src/legacy/ui/public/doc_title/doc_title.js +++ b/src/legacy/ui/public/doc_title/doc_title.js @@ -17,7 +17,7 @@ * under the License. */ -import { isArray } from 'lodash'; +import { isArray } from 'lodash4'; import { uiModules } from '../modules'; import { npStart } from '../new_platform'; diff --git a/src/legacy/ui/public/documentation_links/get_doc_link.ts b/src/legacy/ui/public/documentation_links/get_doc_link.ts index 7d0d8033e3a5f..b9cb5d0aecae4 100644 --- a/src/legacy/ui/public/documentation_links/get_doc_link.ts +++ b/src/legacy/ui/public/documentation_links/get_doc_link.ts @@ -17,7 +17,7 @@ * under the License. */ -import { get } from 'lodash'; +import { get } from 'lodash4'; import { documentationLinks } from './documentation_links'; export const getDocLink = (id: string): string | undefined => get(documentationLinks, id); diff --git a/src/legacy/ui/public/events.js b/src/legacy/ui/public/events.js index 1dc8a71afb193..120ed0878c750 100644 --- a/src/legacy/ui/public/events.js +++ b/src/legacy/ui/public/events.js @@ -23,7 +23,7 @@ * @extends EventEmitter */ -import _ from 'lodash'; +import _ from 'lodash4'; import { EventEmitter } from 'events'; import { fatalError } from './notify'; import { createLegacyClass } from './utils/legacy_class'; @@ -107,7 +107,7 @@ export function EventsProvider(Promise) { */ Events.prototype.emit = function (name) { const self = this; - const args = _.rest(arguments); + const args = _.tail(arguments); if (!self._listeners[name]) { return self._emitChain; @@ -131,7 +131,7 @@ export function EventsProvider(Promise) { * @return {array[function]} */ Events.prototype.listeners = function (name) { - return _.pluck(this._listeners[name], 'handler'); + return _.map(this._listeners[name], 'handler'); }; return Events; diff --git a/src/legacy/ui/public/indexed_array/__tests__/indexed_array.js b/src/legacy/ui/public/indexed_array/__tests__/indexed_array.js index a8abbba9df433..a2fd4ec7ef127 100644 --- a/src/legacy/ui/public/indexed_array/__tests__/indexed_array.js +++ b/src/legacy/ui/public/indexed_array/__tests__/indexed_array.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import expect from '@kbn/expect'; import { IndexedArray } from '..'; @@ -30,8 +30,8 @@ const users = [ ]; // this is how we used to accomplish this, before IndexedArray -users.byName = _.indexBy(users, 'name'); -users.byUsername = _.indexBy(users, 'username'); +users.byName = _.keyBy(users, 'name'); +users.byUsername = _.keyBy(users, 'username'); users.byGroup = _.groupBy(users, 'group'); users.inIdOrder = _.sortBy(users, 'id'); @@ -54,7 +54,7 @@ describe('IndexedArray', function () { }); it('clones to an object', function () { - expect(_.isPlainObject(_.clone(reg))).to.be(true); + expect(_.isObject(_.clone(reg))).to.be(true); expect(Array.isArray(_.clone(reg))).to.be(false); }); }); @@ -140,7 +140,7 @@ describe('IndexedArray', function () { reg.remove({ name: 'John' }); - expect(_.eq(reg.raw, reg.slice(0))).to.be(true); + expect(_.isEqual(reg.raw, reg.slice(0))).to.be(true); expect(reg.length).to.be(3); expect(reg[0].name).to.be('Anon'); }); diff --git a/src/legacy/ui/public/indexed_array/helpers/organize_by.test.ts b/src/legacy/ui/public/indexed_array/helpers/organize_by.test.ts index fc4ca8469382a..a61ff68e8e673 100644 --- a/src/legacy/ui/public/indexed_array/helpers/organize_by.test.ts +++ b/src/legacy/ui/public/indexed_array/helpers/organize_by.test.ts @@ -17,7 +17,7 @@ * under the License. */ -import { groupBy } from 'lodash'; +import { groupBy } from 'lodash4'; import { organizeBy } from './organize_by'; describe('organizeBy', () => { diff --git a/src/legacy/ui/public/indexed_array/helpers/organize_by.ts b/src/legacy/ui/public/indexed_array/helpers/organize_by.ts index e923767c892cd..bd69741889586 100644 --- a/src/legacy/ui/public/indexed_array/helpers/organize_by.ts +++ b/src/legacy/ui/public/indexed_array/helpers/organize_by.ts @@ -17,7 +17,7 @@ * under the License. */ -import { each, isFunction } from 'lodash'; +import { each, isFunction } from 'lodash4'; /** * Like _.groupBy, but allows specifying multiple groups for a diff --git a/src/legacy/ui/public/indexed_array/index.d.ts b/src/legacy/ui/public/indexed_array/index.d.ts index 21c0a818731ac..f67ac599f7381 100644 --- a/src/legacy/ui/public/indexed_array/index.d.ts +++ b/src/legacy/ui/public/indexed_array/index.d.ts @@ -17,7 +17,7 @@ * under the License. */ -import { ListIterator } from 'lodash'; +import { ListIterator } from 'lodash4'; interface IndexedArrayConfig { index?: string[]; diff --git a/src/legacy/ui/public/indexed_array/indexed_array.js b/src/legacy/ui/public/indexed_array/indexed_array.js index 79ef5e8c183da..d944424b5eb2f 100644 --- a/src/legacy/ui/public/indexed_array/indexed_array.js +++ b/src/legacy/ui/public/indexed_array/indexed_array.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { inflector } from './inflector'; import { organizeBy } from './helpers/organize_by'; @@ -52,7 +52,7 @@ export class IndexedArray { this._indexNames = _.union( this._setupIndex(config.group, inflectIndex, organizeByIndexedArray(config)), - this._setupIndex(config.index, inflectIndex, _.indexBy), + this._setupIndex(config.index, inflectIndex, _.keyBy), this._setupIndex(config.order, inflectOrder, (raw, pluckValue) => { return [...raw].sort((itemA, itemB) => { const a = pluckValue(itemA); diff --git a/src/legacy/ui/public/kfetch/kfetch.ts b/src/legacy/ui/public/kfetch/kfetch.ts index 4eb7149931575..e9d633eeb1f70 100644 --- a/src/legacy/ui/public/kfetch/kfetch.ts +++ b/src/legacy/ui/public/kfetch/kfetch.ts @@ -17,7 +17,7 @@ * under the License. */ -import { merge } from 'lodash'; +import { merge } from 'lodash4'; // @ts-ignore not really worth typing import { KFetchError } from './kfetch_error'; diff --git a/src/legacy/ui/public/modules.js b/src/legacy/ui/public/modules.js index bb1c8aead1c34..11e6ce4f7290f 100644 --- a/src/legacy/ui/public/modules.js +++ b/src/legacy/ui/public/modules.js @@ -18,7 +18,7 @@ */ import angular from 'angular'; -import _ from 'lodash'; +import _ from 'lodash4'; /** * This module is used by Kibana to create and reuse angular modules. Angular modules * can only be created once and need to have their dependencies at creation. This is diff --git a/src/legacy/ui/public/new_platform/set_services.ts b/src/legacy/ui/public/new_platform/set_services.ts index ee92eda064aa8..c225879f680d4 100644 --- a/src/legacy/ui/public/new_platform/set_services.ts +++ b/src/legacy/ui/public/new_platform/set_services.ts @@ -17,7 +17,7 @@ * under the License. */ -import { pick } from 'lodash'; +import { pick } from 'lodash4'; import { PluginsSetup, PluginsStart } from './new_platform'; import { LegacyCoreSetup, LegacyCoreStart } from '../../../../core/public'; diff --git a/src/legacy/ui/public/registry/_registry.js b/src/legacy/ui/public/registry/_registry.js index 85aa1d9f2eca8..245ca5372a11e 100644 --- a/src/legacy/ui/public/registry/_registry.js +++ b/src/legacy/ui/public/registry/_registry.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { IndexedArray } from '../indexed_array'; const notPropsOptNames = IndexedArray.OPT_NAMES.concat('constructor', 'invokeProviders'); diff --git a/src/legacy/ui/public/routes/__tests__/_route_manager.js b/src/legacy/ui/public/routes/__tests__/_route_manager.js index 51bde8b8605ac..c48f6505a55a7 100644 --- a/src/legacy/ui/public/routes/__tests__/_route_manager.js +++ b/src/legacy/ui/public/routes/__tests__/_route_manager.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import ngMock from 'ng_mock'; import sinon from 'sinon'; import RouteManager from '../route_manager'; @@ -46,7 +46,7 @@ describe('routes/route_manager', function () { }) ); - it('should have chainable methods: ' + _.pluck(chainableMethods, 'name').join(', '), function () { + it('should have chainable methods: ' + _.map(chainableMethods, 'name').join(', '), function () { chainableMethods.forEach(function (meth) { expect(routes[meth.name].apply(routes, _.clone(meth.args))).to.be(routes); }); diff --git a/src/legacy/ui/public/routes/__tests__/_work_queue.js b/src/legacy/ui/public/routes/__tests__/_work_queue.js index 72891f7321fbd..8440e7666fd2f 100644 --- a/src/legacy/ui/public/routes/__tests__/_work_queue.js +++ b/src/legacy/ui/public/routes/__tests__/_work_queue.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import expect from '@kbn/expect'; import ngMock from 'ng_mock'; import { WorkQueue } from '../work_queue'; diff --git a/src/legacy/ui/public/routes/__tests__/_wrap_route_with_prep.js b/src/legacy/ui/public/routes/__tests__/_wrap_route_with_prep.js index 8ae85fce591a1..81fa612b3dd11 100644 --- a/src/legacy/ui/public/routes/__tests__/_wrap_route_with_prep.js +++ b/src/legacy/ui/public/routes/__tests__/_wrap_route_with_prep.js @@ -21,7 +21,7 @@ import RouteManager from '../route_manager'; import expect from '@kbn/expect'; import ngMock from 'ng_mock'; -import _ from 'lodash'; +import _ from 'lodash4'; import '../../private'; let routes; diff --git a/src/legacy/ui/public/routes/breadcrumbs.js b/src/legacy/ui/public/routes/breadcrumbs.js index 7917ffbd7c6e6..9080f98d41ae7 100644 --- a/src/legacy/ui/public/routes/breadcrumbs.js +++ b/src/legacy/ui/public/routes/breadcrumbs.js @@ -17,7 +17,7 @@ * under the License. */ -import { trim, startCase } from 'lodash'; +import { trim, startCase } from 'lodash4'; /** * Take a path (from $location.path() usually) and parse diff --git a/src/legacy/ui/public/routes/route_manager.js b/src/legacy/ui/public/routes/route_manager.js index de8a541d1c50a..96dd25e853144 100644 --- a/src/legacy/ui/public/routes/route_manager.js +++ b/src/legacy/ui/public/routes/route_manager.js @@ -17,7 +17,7 @@ * under the License. */ -import { cloneDeep, defaultsDeep, wrap } from 'lodash'; +import { cloneDeep, defaultsDeep, wrap } from 'lodash4'; import { wrapRouteWithPrep } from './wrap_route_with_prep'; import { RouteSetupManager } from './route_setup_manager'; diff --git a/src/legacy/ui/public/routes/route_setup_manager.js b/src/legacy/ui/public/routes/route_setup_manager.js index a7a2f078f40fb..4ac58c2e30f0c 100644 --- a/src/legacy/ui/public/routes/route_setup_manager.js +++ b/src/legacy/ui/public/routes/route_setup_manager.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { createDefer } from 'ui/promises'; // Throw this inside of an Angular route resolver after calling `kbnUrl.change` diff --git a/src/legacy/ui/public/routes/wrap_route_with_prep.js b/src/legacy/ui/public/routes/wrap_route_with_prep.js index e9ed33148d9ac..67750a2c7f368 100644 --- a/src/legacy/ui/public/routes/wrap_route_with_prep.js +++ b/src/legacy/ui/public/routes/wrap_route_with_prep.js @@ -18,7 +18,7 @@ */ import angular from 'angular'; -import _ from 'lodash'; +import _ from 'lodash4'; import { createDefer } from 'ui/promises'; import { WorkQueue } from './work_queue'; diff --git a/src/legacy/ui/public/state_management/__tests__/state_monitor_factory.js b/src/legacy/ui/public/state_management/__tests__/state_monitor_factory.js index dc00d4e05e82f..6e0903b29bad9 100644 --- a/src/legacy/ui/public/state_management/__tests__/state_monitor_factory.js +++ b/src/legacy/ui/public/state_management/__tests__/state_monitor_factory.js @@ -20,7 +20,7 @@ import expect from '@kbn/expect'; import sinon from 'sinon'; import { EventEmitter } from 'events'; -import { cloneDeep } from 'lodash'; +import { cloneDeep } from 'lodash4'; import { stateMonitorFactory } from '../state_monitor_factory'; describe('stateMonitorFactory', function () { diff --git a/src/legacy/ui/public/state_management/state.js b/src/legacy/ui/public/state_management/state.js index 93428e9f8fa4e..ad11df640bc48 100644 --- a/src/legacy/ui/public/state_management/state.js +++ b/src/legacy/ui/public/state_management/state.js @@ -25,7 +25,7 @@ * @description Persists generic "state" to and reads it from the URL. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { i18n } from '@kbn/i18n'; import angular from 'angular'; import rison from 'rison-node'; @@ -341,7 +341,7 @@ export function StateProvider( * @return {object} */ State.prototype.toObject = function () { - return _.omit(this, (value, key) => { + return _.omitBy(this, (value, key) => { return key.charAt(0) === '$' || key.charAt(0) === '_' || _.isFunction(value); }); }; diff --git a/src/legacy/ui/public/state_management/state_monitor_factory.ts b/src/legacy/ui/public/state_management/state_monitor_factory.ts index 454fefd4f8253..949382d792e35 100644 --- a/src/legacy/ui/public/state_management/state_monitor_factory.ts +++ b/src/legacy/ui/public/state_management/state_monitor_factory.ts @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { cloneDeep, isEqual, isPlainObject, set } from 'lodash'; +import { cloneDeep, isEqual, isPlainObject, set } from 'lodash4'; import { State } from './state'; export const stateMonitorFactory = { diff --git a/src/legacy/ui/public/test_harness/test_sharding/setup_test_sharding.js b/src/legacy/ui/public/test_harness/test_sharding/setup_test_sharding.js index fce1876162387..0362d23f14167 100644 --- a/src/legacy/ui/public/test_harness/test_sharding/setup_test_sharding.js +++ b/src/legacy/ui/public/test_harness/test_sharding/setup_test_sharding.js @@ -17,7 +17,7 @@ * under the License. */ -import { uniq, defaults } from 'lodash'; +import { uniq, defaults } from 'lodash4'; import { findTestBundleUrl } from './find_test_bundle_url'; import { getShardingParamsFromUrl } from './get_sharding_params_from_url'; diff --git a/src/legacy/ui/public/timefilter/setup_router.ts b/src/legacy/ui/public/timefilter/setup_router.ts index 7c25c6aa3166e..9416d0d70c050 100644 --- a/src/legacy/ui/public/timefilter/setup_router.ts +++ b/src/legacy/ui/public/timefilter/setup_router.ts @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { IScope } from 'angular'; import moment from 'moment'; import chrome from 'ui/chrome'; diff --git a/src/legacy/ui/public/url/__tests__/url.js b/src/legacy/ui/public/url/__tests__/url.js index 8b173482e1bb4..45902a1a5a6d5 100644 --- a/src/legacy/ui/public/url/__tests__/url.js +++ b/src/legacy/ui/public/url/__tests__/url.js @@ -21,7 +21,7 @@ import sinon from 'sinon'; import expect from '@kbn/expect'; import ngMock from 'ng_mock'; import faker from 'faker'; -import _ from 'lodash'; +import _ from 'lodash4'; import { AppStateProvider } from '../../state_management/app_state'; import '..'; diff --git a/src/legacy/ui/public/url/prepend_path.ts b/src/legacy/ui/public/url/prepend_path.ts index b8a77d5c23bee..b7bfa0ba618c6 100644 --- a/src/legacy/ui/public/url/prepend_path.ts +++ b/src/legacy/ui/public/url/prepend_path.ts @@ -17,7 +17,7 @@ * under the License. */ -import { isString } from 'lodash'; +import { isString } from 'lodash4'; import { format, parse } from 'url'; /** diff --git a/src/legacy/ui/public/url/url.js b/src/legacy/ui/public/url/url.js index fb243b02e05c7..8dbdbd41218fa 100644 --- a/src/legacy/ui/public/url/url.js +++ b/src/legacy/ui/public/url/url.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { i18n } from '@kbn/i18n'; import { uiModules } from '../modules'; import { AppStateProvider } from '../state_management/app_state'; diff --git a/src/legacy/ui/public/utils/collection.ts b/src/legacy/ui/public/utils/collection.ts index 45e5a0704c37b..85fc1b4733ccc 100644 --- a/src/legacy/ui/public/utils/collection.ts +++ b/src/legacy/ui/public/utils/collection.ts @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; /** * move an obj either up or down in the collection by @@ -50,7 +50,7 @@ export function move( } below = !!below; - qualifier = qualifier && _.callback(qualifier); + qualifier = qualifier && _.iteratee(qualifier); const above = !below; const finder = below ? _.findIndex : _.findLastIndex; diff --git a/src/legacy/ui/ui_exports/ui_export_types/webpack_customizations.js b/src/legacy/ui/ui_exports/ui_export_types/webpack_customizations.js index 3f3ff8b97999c..7872cb59541e1 100644 --- a/src/legacy/ui/ui_exports/ui_export_types/webpack_customizations.js +++ b/src/legacy/ui/ui_exports/ui_export_types/webpack_customizations.js @@ -19,7 +19,7 @@ import { isAbsolute } from 'path'; -import { escapeRegExp } from 'lodash'; +import { escapeRegExp } from 'lodash4'; import { flatConcatAtType, mergeAtType } from './reduce'; import { alias, wrap, uniqueKeys, mapSpec } from './modify_reduce'; diff --git a/src/legacy/utils/deep_clone_with_buffers.ts b/src/legacy/utils/deep_clone_with_buffers.ts index 2e9120eb32b7c..ffb8819cea6a5 100644 --- a/src/legacy/utils/deep_clone_with_buffers.ts +++ b/src/legacy/utils/deep_clone_with_buffers.ts @@ -17,7 +17,7 @@ * under the License. */ -import { cloneDeep } from 'lodash'; +import { cloneDeepWith } from 'lodash4'; // We should add `any` return type to overcome bug in lodash types, customizer // in lodash 3.* can return `undefined` if cloning is handled by the lodash, but @@ -29,5 +29,5 @@ function cloneBuffersCustomizer(val: unknown): any { } export function deepCloneWithBuffers(val: T): T { - return cloneDeep(val, cloneBuffersCustomizer); + return cloneDeepWith(val, cloneBuffersCustomizer); } diff --git a/src/legacy/utils/unset.js b/src/legacy/utils/unset.js index 8b4cc0a7be1cd..5872cbb948ff3 100644 --- a/src/legacy/utils/unset.js +++ b/src/legacy/utils/unset.js @@ -17,12 +17,11 @@ * under the License. */ -import _ from 'lodash'; -import toPath from 'lodash/internal/toPath'; +import _ from 'lodash4'; export function unset(object, rawPath) { if (!object) return; - const path = toPath(rawPath); + const path = _.toPath(rawPath); switch (path.length) { case 0: diff --git a/src/optimize/dynamic_dll_plugin/dll_compiler.js b/src/optimize/dynamic_dll_plugin/dll_compiler.js index 9ab21ee0e9076..64dc75e1aca34 100644 --- a/src/optimize/dynamic_dll_plugin/dll_compiler.js +++ b/src/optimize/dynamic_dll_plugin/dll_compiler.js @@ -35,7 +35,7 @@ import webpack from 'webpack'; import { promisify } from 'util'; import path from 'path'; import del from 'del'; -import { chunk } from 'lodash'; +import { chunk } from 'lodash4'; import seedrandom from 'seedrandom'; const readFileAsync = promisify(fs.readFile); diff --git a/src/optimize/watch/proxy_role.js b/src/optimize/watch/proxy_role.js index ce2d63aa2eff0..e3dfc31211e67 100644 --- a/src/optimize/watch/proxy_role.js +++ b/src/optimize/watch/proxy_role.js @@ -19,7 +19,7 @@ import { createProxyBundlesRoute } from '../bundles_route'; import { fromNode } from 'bluebird'; -import { get, once } from 'lodash'; +import { get, once } from 'lodash4'; export default (kbnServer, server, config) => { server.route( diff --git a/src/plugins/advanced_settings/public/management_app/components/form/form.tsx b/src/plugins/advanced_settings/public/management_app/components/form/form.tsx index 142ea06c7dce4..32248a37f3c9e 100644 --- a/src/plugins/advanced_settings/public/management_app/components/form/form.tsx +++ b/src/plugins/advanced_settings/public/management_app/components/form/form.tsx @@ -35,7 +35,7 @@ import { EuiButtonEmpty, } from '@elastic/eui'; import { FormattedMessage } from '@kbn/i18n/react'; -import { isEmpty } from 'lodash'; +import { isEmpty } from 'lodash4'; import { i18n } from '@kbn/i18n'; import { toMountPoint } from '../../../../../kibana_react/public'; import { DocLinksStart, ToastsStart } from '../../../../../../core/public'; diff --git a/src/plugins/advanced_settings/public/management_app/lib/get_aria_name.ts b/src/plugins/advanced_settings/public/management_app/lib/get_aria_name.ts index c33ac6abafb54..6529a9d05674f 100644 --- a/src/plugins/advanced_settings/public/management_app/lib/get_aria_name.ts +++ b/src/plugins/advanced_settings/public/management_app/lib/get_aria_name.ts @@ -17,7 +17,7 @@ * under the License. */ -import { words } from 'lodash'; +import { words } from 'lodash4'; /** * @name {string} the name of the configuration object diff --git a/src/plugins/charts/public/services/colors/color_palette.ts b/src/plugins/charts/public/services/colors/color_palette.ts index 464e9e3a66101..986fe074a7f16 100644 --- a/src/plugins/charts/public/services/colors/color_palette.ts +++ b/src/plugins/charts/public/services/colors/color_palette.ts @@ -18,7 +18,7 @@ */ import d3 from 'd3'; -import _ from 'lodash'; +import _ from 'lodash4'; import { seedColors } from './seed_colors'; diff --git a/src/plugins/charts/public/services/colors/colors.ts b/src/plugins/charts/public/services/colors/colors.ts index 7a1ffc433ee87..3ec5276ba7a8a 100644 --- a/src/plugins/charts/public/services/colors/colors.ts +++ b/src/plugins/charts/public/services/colors/colors.ts @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { CoreSetup } from 'kibana/public'; diff --git a/src/plugins/charts/public/services/colors/mapped_colors.test.ts b/src/plugins/charts/public/services/colors/mapped_colors.test.ts index 2c9f37afc14c5..77f00dda5fea5 100644 --- a/src/plugins/charts/public/services/colors/mapped_colors.test.ts +++ b/src/plugins/charts/public/services/colors/mapped_colors.test.ts @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import d3 from 'd3'; import { coreMock } from '../../../../../core/public/mocks'; @@ -61,7 +61,7 @@ describe('Mapped Colors', () => { mappedColors.mapKeys(arr); const colorValues = _(mappedColors.mapping).values(); - expect(colorValues.contains(seedColors[0])).toBe(false); + expect(colorValues.includes(seedColors[0])).toBe(false); expect(colorValues.uniq().size()).toBe(arr.length); }); diff --git a/src/plugins/charts/public/services/colors/mapped_colors.ts b/src/plugins/charts/public/services/colors/mapped_colors.ts index fe0deac734e6b..2fd90f2b8dfc9 100644 --- a/src/plugins/charts/public/services/colors/mapped_colors.ts +++ b/src/plugins/charts/public/services/colors/mapped_colors.ts @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import d3 from 'd3'; import { CoreSetup } from 'kibana/public'; @@ -54,7 +54,7 @@ export class MappedColors { } get(key: string | number) { - return this.getConfigColorMapping()[key] || this._mapping[key]; + return this.getConfigColorMapping()[key as any] || this._mapping[key]; } flush() { @@ -75,10 +75,10 @@ export class MappedColors { const keysToMap: Array = []; _.each(keys, (key) => { // If this key is mapped in the config, it's unnecessary to have it mapped here - if (configMapping[key]) delete this._mapping[key]; + if (configMapping[key as any]) delete this._mapping[key]; // If this key is mapped to a color used by the config color mapping, we need to remap it - if (_.contains(configColors, this._mapping[key])) keysToMap.push(key); + if (_.includes(configColors, this._mapping[key])) keysToMap.push(key); // if key exist in oldMap, move it to mapping if (this._oldMap[key]) this._mapping[key] = this._oldMap[key]; @@ -93,7 +93,7 @@ export class MappedColors { let newColors = _.difference(colorPalette, allColors); while (keysToMap.length > newColors.length) { - newColors = newColors.concat(_.sample(allColors, keysToMap.length - newColors.length)); + newColors = newColors.concat(_.sampleSize(allColors, keysToMap.length - newColors.length)); } _.merge(this._mapping, _.zipObject(keysToMap, newColors)); diff --git a/src/plugins/charts/public/static/color_maps/heatmap_color.ts b/src/plugins/charts/public/static/color_maps/heatmap_color.ts index 9c3067fd8d6ac..6674e5945654e 100644 --- a/src/plugins/charts/public/static/color_maps/heatmap_color.ts +++ b/src/plugins/charts/public/static/color_maps/heatmap_color.ts @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { vislibColorMaps, RawColorSchema } from './color_maps'; diff --git a/src/plugins/charts/public/static/components/color_ranges.tsx b/src/plugins/charts/public/static/components/color_ranges.tsx index a9b05d7d91c7c..2eeb9721351ae 100644 --- a/src/plugins/charts/public/static/components/color_ranges.tsx +++ b/src/plugins/charts/public/static/components/color_ranges.tsx @@ -18,7 +18,7 @@ */ import React, { useCallback } from 'react'; -import { last } from 'lodash'; +import { last } from 'lodash4'; import { i18n } from '@kbn/i18n'; diff --git a/src/plugins/console/public/application/components/settings_modal.tsx b/src/plugins/console/public/application/components/settings_modal.tsx index 377e739a0c59a..96130b5c5c4af 100644 --- a/src/plugins/console/public/application/components/settings_modal.tsx +++ b/src/plugins/console/public/application/components/settings_modal.tsx @@ -17,6 +17,7 @@ * under the License. */ +import _ from 'lodash4'; import React, { Fragment, useState } from 'react'; import { i18n } from '@kbn/i18n'; import { FormattedMessage } from '@kbn/i18n/react'; diff --git a/src/plugins/console/public/application/containers/console_history/console_history.tsx b/src/plugins/console/public/application/containers/console_history/console_history.tsx index 8ec8b9c61bf03..5a278347bde8d 100644 --- a/src/plugins/console/public/application/containers/console_history/console_history.tsx +++ b/src/plugins/console/public/application/containers/console_history/console_history.tsx @@ -19,7 +19,7 @@ import React, { useCallback, useEffect, useMemo, useState, useRef } from 'react'; import { i18n } from '@kbn/i18n'; -import { memoize } from 'lodash'; +import { memoize } from 'lodash4'; import moment from 'moment'; import { keyCodes, diff --git a/src/plugins/console/public/application/containers/editor/editor.tsx b/src/plugins/console/public/application/containers/editor/editor.tsx index 66d3cbab20ac5..fb4f60b980054 100644 --- a/src/plugins/console/public/application/containers/editor/editor.tsx +++ b/src/plugins/console/public/application/containers/editor/editor.tsx @@ -18,7 +18,7 @@ */ import React, { useCallback, memo } from 'react'; -import { debounce } from 'lodash'; +import { debounce } from 'lodash4'; import { EuiProgress } from '@elastic/eui'; import { EditorContentSpinner } from '../../components'; diff --git a/src/plugins/console/public/application/containers/editor/legacy/console_editor/editor.tsx b/src/plugins/console/public/application/containers/editor/legacy/console_editor/editor.tsx index 6d4f532887cd9..350f257e49559 100644 --- a/src/plugins/console/public/application/containers/editor/legacy/console_editor/editor.tsx +++ b/src/plugins/console/public/application/containers/editor/legacy/console_editor/editor.tsx @@ -19,7 +19,7 @@ import { EuiFlexGroup, EuiFlexItem, EuiIcon, EuiScreenReaderOnly, EuiToolTip } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; -import { debounce } from 'lodash'; +import { debounce } from 'lodash4'; import { parse } from 'query-string'; import React, { CSSProperties, useCallback, useEffect, useRef, useState } from 'react'; import { useUIAceKeyboardMode } from '../../../../../../../es_ui_shared/public'; diff --git a/src/plugins/console/public/application/containers/editor/legacy/console_editor/keyboard_shortcuts.ts b/src/plugins/console/public/application/containers/editor/legacy/console_editor/keyboard_shortcuts.ts index 39621a9cb3dd2..81294d1388489 100644 --- a/src/plugins/console/public/application/containers/editor/legacy/console_editor/keyboard_shortcuts.ts +++ b/src/plugins/console/public/application/containers/editor/legacy/console_editor/keyboard_shortcuts.ts @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { throttle } from 'lodash'; +import { throttle } from 'lodash4'; import { SenseEditor } from '../../../../models/sense_editor'; interface Actions { diff --git a/src/plugins/console/public/application/hooks/use_save_current_text_object.ts b/src/plugins/console/public/application/hooks/use_save_current_text_object.ts index 1bd1a7fb09bd1..95fcd5d2f25d2 100644 --- a/src/plugins/console/public/application/hooks/use_save_current_text_object.ts +++ b/src/plugins/console/public/application/hooks/use_save_current_text_object.ts @@ -18,7 +18,7 @@ */ import { useRef, useCallback } from 'react'; -import { throttle } from 'lodash'; +import { throttle } from 'lodash4'; import { useEditorReadContext, useServicesContext } from '../contexts'; const WAIT_MS = 500; diff --git a/src/plugins/console/public/application/models/legacy_core_editor/create_readonly.ts b/src/plugins/console/public/application/models/legacy_core_editor/create_readonly.ts index ce8ededd0b12c..43d470eefef20 100644 --- a/src/plugins/console/public/application/models/legacy_core_editor/create_readonly.ts +++ b/src/plugins/console/public/application/models/legacy_core_editor/create_readonly.ts @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import ace from 'brace'; // @ts-ignore import * as OutputMode from './mode/output'; diff --git a/src/plugins/console/public/application/models/legacy_core_editor/smart_resize.ts b/src/plugins/console/public/application/models/legacy_core_editor/smart_resize.ts index e6d7d8272b35b..d63665ef4644e 100644 --- a/src/plugins/console/public/application/models/legacy_core_editor/smart_resize.ts +++ b/src/plugins/console/public/application/models/legacy_core_editor/smart_resize.ts @@ -17,7 +17,7 @@ * under the License. */ -import { get, throttle } from 'lodash'; +import { get, throttle } from 'lodash4'; // eslint-disable-next-line import/no-default-export export default function (editor: any) { diff --git a/src/plugins/console/public/application/models/sense_editor/__tests__/integration.test.js b/src/plugins/console/public/application/models/sense_editor/__tests__/integration.test.js index b7cc8f2f4b72f..3c98498c52bfc 100644 --- a/src/plugins/console/public/application/models/sense_editor/__tests__/integration.test.js +++ b/src/plugins/console/public/application/models/sense_editor/__tests__/integration.test.js @@ -18,7 +18,7 @@ */ import '../sense_editor.test.mocks'; import { create } from '../create'; -import _ from 'lodash'; +import _ from 'lodash4'; import $ from 'jquery'; import * as kb from '../../../../lib/kb/kb'; @@ -117,7 +117,7 @@ describe('Integration', () => { return t; }); if (terms.length !== expectedTerms.length) { - expect(_.pluck(terms, 'name')).toEqual(_.pluck(expectedTerms, 'name')); + expect(_.map(terms, 'name')).toEqual(_.map(expectedTerms, 'name')); } else { const filteredActualTerms = _.map(terms, function (actualTerm, i) { const expectedTerm = expectedTerms[i]; diff --git a/src/plugins/console/public/application/models/sense_editor/__tests__/sense_editor.test.js b/src/plugins/console/public/application/models/sense_editor/__tests__/sense_editor.test.js index c3fb879f2eeeb..e4d7d08bb0158 100644 --- a/src/plugins/console/public/application/models/sense_editor/__tests__/sense_editor.test.js +++ b/src/plugins/console/public/application/models/sense_editor/__tests__/sense_editor.test.js @@ -19,7 +19,7 @@ import '../sense_editor.test.mocks'; import $ from 'jquery'; -import _ from 'lodash'; +import _ from 'lodash4'; import { create } from '../create'; import { collapseLiteralStrings } from '../../../../../../es_ui_shared/public'; diff --git a/src/plugins/console/public/application/models/sense_editor/sense_editor.ts b/src/plugins/console/public/application/models/sense_editor/sense_editor.ts index dbf4f1adcba0a..a4436cc1deee8 100644 --- a/src/plugins/console/public/application/models/sense_editor/sense_editor.ts +++ b/src/plugins/console/public/application/models/sense_editor/sense_editor.ts @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import RowParser from '../../../lib/row_parser'; import { collapseLiteralStrings } from '../../../../../es_ui_shared/public'; import * as utils from '../../../lib/utils'; diff --git a/src/plugins/console/public/lib/autocomplete/__jest__/url_autocomplete.test.js b/src/plugins/console/public/lib/autocomplete/__jest__/url_autocomplete.test.js index 0c3fcbafbe9f9..054ae21f8713c 100644 --- a/src/plugins/console/public/lib/autocomplete/__jest__/url_autocomplete.test.js +++ b/src/plugins/console/public/lib/autocomplete/__jest__/url_autocomplete.test.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { URL_PATH_END_MARKER, UrlPatternMatcher, diff --git a/src/plugins/console/public/lib/autocomplete/__jest__/url_params.test.js b/src/plugins/console/public/lib/autocomplete/__jest__/url_params.test.js index e624e7ba57b61..c490eb81d0ab6 100644 --- a/src/plugins/console/public/lib/autocomplete/__jest__/url_params.test.js +++ b/src/plugins/console/public/lib/autocomplete/__jest__/url_params.test.js @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { UrlParams } from '../../autocomplete/url_params'; import { populateContext } from '../../autocomplete/engine'; diff --git a/src/plugins/console/public/lib/autocomplete/autocomplete.ts b/src/plugins/console/public/lib/autocomplete/autocomplete.ts index 3959f2ed8cf46..436dbf000abab 100644 --- a/src/plugins/console/public/lib/autocomplete/autocomplete.ts +++ b/src/plugins/console/public/lib/autocomplete/autocomplete.ts @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { i18n } from '@kbn/i18n'; // TODO: All of these imports need to be moved to the core editor so that it can inject components from there. diff --git a/src/plugins/console/public/lib/autocomplete/body_completer.js b/src/plugins/console/public/lib/autocomplete/body_completer.js index f37b3ac0cca9c..83c3b805a149c 100644 --- a/src/plugins/console/public/lib/autocomplete/body_completer.js +++ b/src/plugins/console/public/lib/autocomplete/body_completer.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { WalkingState, walkTokenPath, wrapComponentWithDefaults } from './engine'; import { ConstantComponent, @@ -51,7 +51,7 @@ function resolvePathToComponents(tokenPath, context, editor, components) { context, editor ); - const result = [].concat.apply([], _.pluck(walkStates, 'components')); + const result = [].concat.apply([], _.map(walkStates, 'components')); return result; } diff --git a/src/plugins/console/public/lib/autocomplete/components/accept_endpoint_component.js b/src/plugins/console/public/lib/autocomplete/components/accept_endpoint_component.js index b2d4888b34d6f..5c3ecfec73620 100644 --- a/src/plugins/console/public/lib/autocomplete/components/accept_endpoint_component.js +++ b/src/plugins/console/public/lib/autocomplete/components/accept_endpoint_component.js @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { SharedComponent } from './shared_component'; export const URL_PATH_END_MARKER = '__url_path_end__'; diff --git a/src/plugins/console/public/lib/autocomplete/components/constant_component.js b/src/plugins/console/public/lib/autocomplete/components/constant_component.js index 44361d646c4aa..1dc95b5624a70 100644 --- a/src/plugins/console/public/lib/autocomplete/components/constant_component.js +++ b/src/plugins/console/public/lib/autocomplete/components/constant_component.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { SharedComponent } from './shared_component'; export class ConstantComponent extends SharedComponent { constructor(name, parent, options) { diff --git a/src/plugins/console/public/lib/autocomplete/components/field_autocomplete_component.js b/src/plugins/console/public/lib/autocomplete/components/field_autocomplete_component.js index 05c72ea8a8dc5..3d6f96eaa43aa 100644 --- a/src/plugins/console/public/lib/autocomplete/components/field_autocomplete_component.js +++ b/src/plugins/console/public/lib/autocomplete/components/field_autocomplete_component.js @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { getFields } from '../../mappings/mappings'; import { ListComponent } from './list_component'; diff --git a/src/plugins/console/public/lib/autocomplete/components/id_autocomplete_component.js b/src/plugins/console/public/lib/autocomplete/components/id_autocomplete_component.js index 88b9320b3c45e..9c1c6df82791d 100644 --- a/src/plugins/console/public/lib/autocomplete/components/id_autocomplete_component.js +++ b/src/plugins/console/public/lib/autocomplete/components/id_autocomplete_component.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { SharedComponent } from './shared_component'; export class IdAutocompleteComponent extends SharedComponent { constructor(name, parent, multi) { diff --git a/src/plugins/console/public/lib/autocomplete/components/index_autocomplete_component.js b/src/plugins/console/public/lib/autocomplete/components/index_autocomplete_component.js index ec6f24253e78d..221c382e21856 100644 --- a/src/plugins/console/public/lib/autocomplete/components/index_autocomplete_component.js +++ b/src/plugins/console/public/lib/autocomplete/components/index_autocomplete_component.js @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { getIndices } from '../../mappings/mappings'; import { ListComponent } from './list_component'; function nonValidIndexType(token) { diff --git a/src/plugins/console/public/lib/autocomplete/components/list_component.js b/src/plugins/console/public/lib/autocomplete/components/list_component.js index b770638a61ff7..968e5209f53cd 100644 --- a/src/plugins/console/public/lib/autocomplete/components/list_component.js +++ b/src/plugins/console/public/lib/autocomplete/components/list_component.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { SharedComponent } from './shared_component'; /** A component that suggests one of the give options, but accepts anything */ export class ListComponent extends SharedComponent { @@ -62,7 +62,7 @@ export class ListComponent extends SharedComponent { // verify we have all tokens const list = this.listGenerator(); - const notFound = _.any(tokens, function (token) { + const notFound = _.some(tokens, function (token) { return list.indexOf(token) === -1; }); diff --git a/src/plugins/console/public/lib/autocomplete/components/object_component.js b/src/plugins/console/public/lib/autocomplete/components/object_component.js index 34cfb892a65d9..3857df331c7d4 100644 --- a/src/plugins/console/public/lib/autocomplete/components/object_component.js +++ b/src/plugins/console/public/lib/autocomplete/components/object_component.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { SharedComponent } from './index'; /** * @param constants list of components that represent constant keys diff --git a/src/plugins/console/public/lib/autocomplete/components/shared_component.js b/src/plugins/console/public/lib/autocomplete/components/shared_component.js index eeebf95063701..eb9cbb97159ed 100644 --- a/src/plugins/console/public/lib/autocomplete/components/shared_component.js +++ b/src/plugins/console/public/lib/autocomplete/components/shared_component.js @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { AutocompleteComponent } from './autocomplete_component'; export class SharedComponent extends AutocompleteComponent { constructor(name, parent) { diff --git a/src/plugins/console/public/lib/autocomplete/components/type_autocomplete_component.js b/src/plugins/console/public/lib/autocomplete/components/type_autocomplete_component.js index 03d85eccaf385..d944a41f819c0 100644 --- a/src/plugins/console/public/lib/autocomplete/components/type_autocomplete_component.js +++ b/src/plugins/console/public/lib/autocomplete/components/type_autocomplete_component.js @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { ListComponent } from './list_component'; import { getTypes } from '../../mappings/mappings'; function TypeGenerator(context) { diff --git a/src/plugins/console/public/lib/autocomplete/components/url_pattern_matcher.js b/src/plugins/console/public/lib/autocomplete/components/url_pattern_matcher.js index 79a332624e5e1..7c5d38444ec9c 100644 --- a/src/plugins/console/public/lib/autocomplete/components/url_pattern_matcher.js +++ b/src/plugins/console/public/lib/autocomplete/components/url_pattern_matcher.js @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { SharedComponent, ConstantComponent, @@ -61,73 +61,64 @@ export class UrlPatternMatcher { } const endpointComponents = endpoint.url_components || {}; const partList = pattern.split('/'); - _.each( - partList, - function (part, partIndex) { - if (part.search(/^{.+}$/) >= 0) { - part = part.substr(1, part.length - 2); - if (activeComponent.getComponent(part)) { - // we already have something for this, reuse - activeComponent = activeComponent.getComponent(part); - return; - } - // a new path, resolve. + _.each(partList, (part, partIndex) => { + if (part.search(/^{.+}$/) >= 0) { + part = part.substr(1, part.length - 2); + if (activeComponent.getComponent(part)) { + // we already have something for this, reuse + activeComponent = activeComponent.getComponent(part); + return; + } + // a new path, resolve. - if ((c = endpointComponents[part])) { - // endpoint specific. Support list - if (Array.isArray(c)) { - c = new ListComponent(part, c, activeComponent); - } else if (_.isObject(c) && c.type === 'list') { - c = new ListComponent( - part, - c.list, - activeComponent, - c.multiValued, - c.allow_non_valid - ); - } else { - console.warn( - 'incorrectly configured url component ', - part, - ' in endpoint', - endpoint - ); - c = new SharedComponent(part); - } - } else if ((c = this[method].parametrizedComponentFactories.getComponent(part))) { - // c is a f - c = c(part, activeComponent); + if ((c = endpointComponents[part])) { + // endpoint specific. Support list + if (Array.isArray(c)) { + c = new ListComponent(part, c, activeComponent); + } else if (_.isObject(c) && c.type === 'list') { + c = new ListComponent( + part, + c.list, + activeComponent, + c.multiValued, + c.allow_non_valid + ); } else { - // just accept whatever with not suggestions - c = new SimpleParamComponent(part, activeComponent); + console.warn('incorrectly configured url component ', part, ' in endpoint', endpoint); + c = new SharedComponent(part); } - - activeComponent = c; + } else if ((c = this[method].parametrizedComponentFactories.getComponent(part))) { + // c is a f + c = c(part, activeComponent); } else { - // not pattern - let lookAhead = part; - let s; + // just accept whatever with not suggestions + c = new SimpleParamComponent(part, activeComponent); + } - for (partIndex++; partIndex < partList.length; partIndex++) { - s = partList[partIndex]; - if (s.indexOf('{') >= 0) { - break; - } - lookAhead += '/' + s; - } + activeComponent = c; + } else { + // not pattern + let lookAhead = part; + let s; - if (activeComponent.getComponent(part)) { - // we already have something for this, reuse - activeComponent = activeComponent.getComponent(part); - activeComponent.addOption(lookAhead); - } else { - c = new ConstantComponent(part, activeComponent, lookAhead); - activeComponent = c; + for (partIndex++; partIndex < partList.length; partIndex++) { + s = partList[partIndex]; + if (s.indexOf('{') >= 0) { + break; } + lookAhead += '/' + s; } - }, - this - ); + + if (activeComponent.getComponent(part)) { + // we already have something for this, reuse + activeComponent = activeComponent.getComponent(part); + activeComponent.addOption(lookAhead); + } else { + c = new ConstantComponent(part, activeComponent, lookAhead); + activeComponent = c; + } + } + }); // mark end of endpoint path new AcceptEndpointComponent(endpoint, activeComponent); }); diff --git a/src/plugins/console/public/lib/autocomplete/components/username_autocomplete_component.js b/src/plugins/console/public/lib/autocomplete/components/username_autocomplete_component.js index 14b77d4e70625..1e53cf882fd39 100644 --- a/src/plugins/console/public/lib/autocomplete/components/username_autocomplete_component.js +++ b/src/plugins/console/public/lib/autocomplete/components/username_autocomplete_component.js @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { getIndices } from '../../mappings/mappings'; import { ListComponent } from './list_component'; function nonValidUsernameType(token) { diff --git a/src/plugins/console/public/lib/autocomplete/engine.js b/src/plugins/console/public/lib/autocomplete/engine.js index 38be0d8a7e4c9..2db6bf281f164 100644 --- a/src/plugins/console/public/lib/autocomplete/engine.js +++ b/src/plugins/console/public/lib/autocomplete/engine.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; export function wrapComponentWithDefaults(component, defaults) { const originalGetTerms = component.getTerms; @@ -26,16 +26,12 @@ export function wrapComponentWithDefaults(component, defaults) { if (!result) { return result; } - result = _.map( - result, - function (term) { - if (!_.isObject(term)) { - term = { name: term }; - } - return _.defaults(term, defaults); - }, - this - ); + result = _.map(result, (term) => { + if (!_.isObject(term)) { + term = { name: term }; + } + return _.defaults(term, defaults); + }); return result; }; return component; @@ -145,7 +141,7 @@ export function populateContext(tokenPath, context, editor, includeAutoComplete, }); }); }); - autoCompleteSet = _.uniq(autoCompleteSet, false); + autoCompleteSet = _.uniq(autoCompleteSet); context.autoCompleteSet = autoCompleteSet; } diff --git a/src/plugins/console/public/lib/autocomplete/url_params.js b/src/plugins/console/public/lib/autocomplete/url_params.js index a237fe5dd59d6..a929aff95908b 100644 --- a/src/plugins/console/public/lib/autocomplete/url_params.js +++ b/src/plugins/console/public/lib/autocomplete/url_params.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { ConstantComponent, ListComponent, SharedComponent } from './components'; export class ParamComponent extends ConstantComponent { @@ -50,18 +50,14 @@ export class UrlParams { } description = _.clone(description || {}); _.defaults(description, defaults); - _.each( - description, - function (pDescription, param) { - const component = new ParamComponent(param, this.rootComponent, pDescription); - if (Array.isArray(pDescription)) { - new ListComponent(param, pDescription, component); - } else if (pDescription === '__flag__') { - new ListComponent(param, ['true', 'false'], component); - } - }, - this - ); + _.each(description, (pDescription, param) => { + const component = new ParamComponent(param, this.rootComponent, pDescription); + if (Array.isArray(pDescription)) { + new ListComponent(param, pDescription, component); + } else if (pDescription === '__flag__') { + new ListComponent(param, ['true', 'false'], component); + } + }); } getTopLevelComponents() { return this.rootComponent.next; diff --git a/src/plugins/console/public/lib/curl_parsing/__tests__/curl_parsing.test.js b/src/plugins/console/public/lib/curl_parsing/__tests__/curl_parsing.test.js index 068dd68be4ba8..f5bdeb1be325b 100644 --- a/src/plugins/console/public/lib/curl_parsing/__tests__/curl_parsing.test.js +++ b/src/plugins/console/public/lib/curl_parsing/__tests__/curl_parsing.test.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { detectCURL, parseCURL } from '../curl'; import curlTests from './curl_parsing.txt'; diff --git a/src/plugins/console/public/lib/kb/__tests__/kb.test.js b/src/plugins/console/public/lib/kb/__tests__/kb.test.js index eaf5023053880..cfd13f20aaefa 100644 --- a/src/plugins/console/public/lib/kb/__tests__/kb.test.js +++ b/src/plugins/console/public/lib/kb/__tests__/kb.test.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { populateContext } from '../../autocomplete/engine'; import '../../../application/models/sense_editor/sense_editor.test.mocks'; diff --git a/src/plugins/console/public/lib/kb/api.js b/src/plugins/console/public/lib/kb/api.js index aafb234b0f446..9bf339eb72d75 100644 --- a/src/plugins/console/public/lib/kb/api.js +++ b/src/plugins/console/public/lib/kb/api.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { UrlPatternMatcher } from '../autocomplete/components'; import { UrlParams } from '../autocomplete/url_params'; import { @@ -60,19 +60,15 @@ function Api(urlParametrizedComponentFactories, bodyParametrizedComponentFactori cls.addEndpointDescription = function (endpoint, description) { const copiedDescription = {}; - _.extend(copiedDescription, description || {}); + _.assignIn(copiedDescription, description || {}); _.defaults(copiedDescription, { id: endpoint, patterns: [endpoint], methods: ['GET'], }); - _.each( - copiedDescription.patterns, - function (p) { - this.urlPatternMatcher.addEndpoint(p, copiedDescription); - }, - this - ); + _.each(copiedDescription.patterns, (p) => { + this.urlPatternMatcher.addEndpoint(p, copiedDescription); + }); copiedDescription.paramsAutocomplete = new UrlParams(copiedDescription.url_params); copiedDescription.bodyAutocompleteRootComponents = compileBodyDescription( diff --git a/src/plugins/console/public/lib/kb/kb.js b/src/plugins/console/public/lib/kb/kb.js index e0bf1ef09c4d3..0d78c035819ca 100644 --- a/src/plugins/console/public/lib/kb/kb.js +++ b/src/plugins/console/public/lib/kb/kb.js @@ -27,7 +27,7 @@ import { } from '../autocomplete/components'; import $ from 'jquery'; -import _ from 'lodash'; +import _ from 'lodash4'; import Api from './api'; diff --git a/src/plugins/console/public/lib/mappings/mappings.js b/src/plugins/console/public/lib/mappings/mappings.js index 22aae8da030d4..3a29f8a42cf3b 100644 --- a/src/plugins/console/public/lib/mappings/mappings.js +++ b/src/plugins/console/public/lib/mappings/mappings.js @@ -18,7 +18,7 @@ */ import $ from 'jquery'; -import _ from 'lodash'; +import _ from 'lodash4'; import * as es from '../es/es'; // NOTE: If this value ever changes to be a few seconds or less, it might introduce flakiness @@ -98,7 +98,7 @@ export function getFields(indices, types) { ret = [].concat.apply([], ret); } - return _.uniq(ret, function (f) { + return _.uniqBy(ret, function (f) { return f.name + ':' + f.type; }); } @@ -191,7 +191,7 @@ function getFieldNamesFromProperties(properties = {}) { }); // deduping - return _.uniq(fieldList, function (f) { + return _.uniqBy(fieldList, function (f) { return f.name + ':' + f.type; }); } diff --git a/src/plugins/console/public/lib/utils/index.ts b/src/plugins/console/public/lib/utils/index.ts index 917988e0e811b..7ba83dc2aa20f 100644 --- a/src/plugins/console/public/lib/utils/index.ts +++ b/src/plugins/console/public/lib/utils/index.ts @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { expandLiteralStrings, collapseLiteralStrings } from '../../../../es_ui_shared/public'; export function textFromRequest(request: any) { diff --git a/src/plugins/console/public/services/storage.ts b/src/plugins/console/public/services/storage.ts index 2ac6fc5861ad2..feaa7e21048cf 100644 --- a/src/plugins/console/public/services/storage.ts +++ b/src/plugins/console/public/services/storage.ts @@ -17,7 +17,7 @@ * under the License. */ -import { transform, keys, startsWith } from 'lodash'; +import { transform, keys, startsWith } from 'lodash4'; type IStorageEngine = typeof window.localStorage; diff --git a/src/plugins/console/server/lib/elasticsearch_proxy_config.ts b/src/plugins/console/server/lib/elasticsearch_proxy_config.ts index 28a971794d403..80596da3ab06f 100644 --- a/src/plugins/console/server/lib/elasticsearch_proxy_config.ts +++ b/src/plugins/console/server/lib/elasticsearch_proxy_config.ts @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import http from 'http'; import https from 'https'; import url from 'url'; @@ -25,7 +25,7 @@ import url from 'url'; import { ESConfigForProxy } from '../types'; const createAgent = (legacyConfig: ESConfigForProxy) => { - const target = url.parse(_.head(legacyConfig.hosts)); + const target = url.parse(_.head(legacyConfig.hosts) as any); if (!/^https/.test(target.protocol || '')) return new http.Agent(); const agentOptions: https.AgentOptions = {}; diff --git a/src/plugins/console/server/lib/proxy_config.ts b/src/plugins/console/server/lib/proxy_config.ts index 5adb9c58f784e..94ad81a985cea 100644 --- a/src/plugins/console/server/lib/proxy_config.ts +++ b/src/plugins/console/server/lib/proxy_config.ts @@ -17,7 +17,7 @@ * under the License. */ -import { values } from 'lodash'; +import { values } from 'lodash4'; import { format as formatUrl } from 'url'; import { Agent as HttpsAgent, AgentOptions } from 'https'; diff --git a/src/plugins/console/server/lib/proxy_config_collection.ts b/src/plugins/console/server/lib/proxy_config_collection.ts index 36f4f8359c5fe..cb7f565e372e3 100644 --- a/src/plugins/console/server/lib/proxy_config_collection.ts +++ b/src/plugins/console/server/lib/proxy_config_collection.ts @@ -17,7 +17,7 @@ * under the License. */ -import { defaultsDeep } from 'lodash'; +import { defaultsDeep } from 'lodash4'; import { parse as parseUrl } from 'url'; import { ProxyConfig } from './proxy_config'; diff --git a/src/plugins/console/server/lib/set_headers.ts b/src/plugins/console/server/lib/set_headers.ts index ee0be40312a4d..dcecc970bad68 100644 --- a/src/plugins/console/server/lib/set_headers.ts +++ b/src/plugins/console/server/lib/set_headers.ts @@ -17,7 +17,7 @@ * under the License. */ -import { isPlainObject } from 'lodash'; +import { isPlainObject } from 'lodash4'; export function setHeaders(originalHeaders: object, newHeaders: object) { if (!isPlainObject(originalHeaders)) { diff --git a/src/plugins/console/server/lib/spec_definitions/js/mappings.ts b/src/plugins/console/server/lib/spec_definitions/js/mappings.ts index fbc9a822e509c..03e1cc396647d 100644 --- a/src/plugins/console/server/lib/spec_definitions/js/mappings.ts +++ b/src/plugins/console/server/lib/spec_definitions/js/mappings.ts @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { SpecDefinitionsService } from '../../../services'; diff --git a/src/plugins/console/server/lib/spec_definitions/js/query/dsl.ts b/src/plugins/console/server/lib/spec_definitions/js/query/dsl.ts index d6e5030fb6928..8cff7967c5238 100644 --- a/src/plugins/console/server/lib/spec_definitions/js/query/dsl.ts +++ b/src/plugins/console/server/lib/spec_definitions/js/query/dsl.ts @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { SpecDefinitionsService } from '../../../../services'; diff --git a/src/plugins/console/server/routes/api/console/proxy/create_handler.ts b/src/plugins/console/server/routes/api/console/proxy/create_handler.ts index 272f63322ffaa..84f2cf2d7a48f 100644 --- a/src/plugins/console/server/routes/api/console/proxy/create_handler.ts +++ b/src/plugins/console/server/routes/api/console/proxy/create_handler.ts @@ -19,7 +19,7 @@ import { Agent, IncomingMessage } from 'http'; import * as url from 'url'; -import { pick, trimLeft, trimRight } from 'lodash'; +import { pick, trimStart, trimEnd } from 'lodash4'; import { KibanaRequest, Logger, RequestHandler } from 'kibana/server'; @@ -46,7 +46,7 @@ export interface CreateHandlerDependencies { } function toURL(base: string, path: string) { - const urlResult = new url.URL(`${trimRight(base, '/')}/${trimLeft(path, '/')}`); + const urlResult = new url.URL(`${trimEnd(base, '/')}/${trimStart(path, '/')}`); // Appending pretty here to have Elasticsearch do the JSON formatting, as doing // in JS can lead to data loss (7.0 will get munged into 7, thus losing indication of // measurement precision) diff --git a/src/plugins/console/server/services/spec_definitions_service.ts b/src/plugins/console/server/services/spec_definitions_service.ts index ccd3b6b1c0a82..1a0da2a2ff073 100644 --- a/src/plugins/console/server/services/spec_definitions_service.ts +++ b/src/plugins/console/server/services/spec_definitions_service.ts @@ -17,7 +17,7 @@ * under the License. */ -import _, { merge } from 'lodash'; +import _, { merge } from 'lodash4'; import glob from 'glob'; import { basename, join, resolve } from 'path'; import { readFileSync } from 'fs'; @@ -55,11 +55,14 @@ export class SpecDefinitionsService { }); if (urlParamsDef) { - description.url_params = _.extend(description.url_params || {}, copiedDescription.url_params); + description.url_params = _.assignIn( + description.url_params || {}, + copiedDescription.url_params + ); _.defaults(description.url_params, urlParamsDef); } - _.extend(copiedDescription, description); + _.assignIn(copiedDescription, description); _.defaults(copiedDescription, { id: endpoint, patterns: [endpoint], diff --git a/src/plugins/dashboard/public/application/actions/clone_panel_action.tsx b/src/plugins/dashboard/public/application/actions/clone_panel_action.tsx index 96210358c05e4..a8db83b8fa509 100644 --- a/src/plugins/dashboard/public/application/actions/clone_panel_action.tsx +++ b/src/plugins/dashboard/public/application/actions/clone_panel_action.tsx @@ -20,6 +20,7 @@ import { i18n } from '@kbn/i18n'; import { CoreStart } from 'src/core/public'; import uuid from 'uuid'; +import _ from 'lodash4'; import { ActionByType, IncompatibleActionError } from '../../ui_actions_plugin'; import { ViewMode, PanelState, IEmbeddable } from '../../embeddable_plugin'; import { SavedObject } from '../../../../saved_objects/public'; diff --git a/src/plugins/dashboard/public/application/actions/replace_panel_flyout.tsx b/src/plugins/dashboard/public/application/actions/replace_panel_flyout.tsx index 57fe4acf08145..b9e6cc721040b 100644 --- a/src/plugins/dashboard/public/application/actions/replace_panel_flyout.tsx +++ b/src/plugins/dashboard/public/application/actions/replace_panel_flyout.tsx @@ -19,6 +19,7 @@ import { i18n } from '@kbn/i18n'; import React from 'react'; +import _ from 'lodash4'; import { EuiFlyout, EuiFlyoutBody, EuiFlyoutHeader, EuiTitle } from '@elastic/eui'; import { NotificationsStart, Toast } from 'src/core/public'; import { DashboardPanelState } from '../embeddable'; diff --git a/src/plugins/dashboard/public/application/dashboard_app_controller.tsx b/src/plugins/dashboard/public/application/dashboard_app_controller.tsx index 206ef4f3d4313..ad737a98f8918 100644 --- a/src/plugins/dashboard/public/application/dashboard_app_controller.tsx +++ b/src/plugins/dashboard/public/application/dashboard_app_controller.tsx @@ -17,7 +17,7 @@ * under the License. */ -import _, { uniq } from 'lodash'; +import _, { uniqBy } from 'lodash4'; import { i18n } from '@kbn/i18n'; import { EUI_MODAL_CANCEL_BUTTON, EuiCheckboxGroup } from '@elastic/eui'; import { EuiCheckboxGroupIdToSelectedMap } from '@elastic/eui/src/components/form/checkbox/checkbox_group'; @@ -264,7 +264,7 @@ export class DashboardAppController { if (!embeddableIndexPatterns) return; panelIndexPatterns.push(...embeddableIndexPatterns); }); - panelIndexPatterns = uniq(panelIndexPatterns, 'id'); + panelIndexPatterns = uniqBy(panelIndexPatterns, 'id'); if (panelIndexPatterns && panelIndexPatterns.length > 0) { $scope.$evalAsync(() => { @@ -512,7 +512,7 @@ export class DashboardAppController { differences.filters = appStateDashboardInput.filters; } - Object.keys(_.omit(containerInput, 'filters')).forEach((key) => { + Object.keys(_.omit(containerInput, ['filters'])).forEach((key) => { const containerValue = (containerInput as { [key: string]: unknown })[key]; const appStateValue = ((appStateDashboardInput as unknown) as { [key: string]: unknown })[ key diff --git a/src/plugins/dashboard/public/application/dashboard_state_manager.ts b/src/plugins/dashboard/public/application/dashboard_state_manager.ts index 5fed38487dc54..03bf0e596b07e 100644 --- a/src/plugins/dashboard/public/application/dashboard_state_manager.ts +++ b/src/plugins/dashboard/public/application/dashboard_state_manager.ts @@ -18,7 +18,7 @@ */ import { i18n } from '@kbn/i18n'; -import _ from 'lodash'; +import _ from 'lodash4'; import { Observable, Subscription } from 'rxjs'; import { Moment } from 'moment'; import { History } from 'history'; diff --git a/src/plugins/dashboard/public/application/embeddable/grid/dashboard_grid.tsx b/src/plugins/dashboard/public/application/embeddable/grid/dashboard_grid.tsx index dcd07fe394c7d..d5e4a84ab3ebc 100644 --- a/src/plugins/dashboard/public/application/embeddable/grid/dashboard_grid.tsx +++ b/src/plugins/dashboard/public/application/embeddable/grid/dashboard_grid.tsx @@ -25,7 +25,7 @@ import sizeMe from 'react-sizeme'; import { injectI18n } from '@kbn/i18n/react'; import classNames from 'classnames'; -import _ from 'lodash'; +import _ from 'lodash4'; import React from 'react'; import { Subscription } from 'rxjs'; import ReactGridLayout, { Layout } from 'react-grid-layout'; diff --git a/src/plugins/dashboard/public/application/embeddable/panel/create_panel_state.ts b/src/plugins/dashboard/public/application/embeddable/panel/create_panel_state.ts index 79116a57869d3..a6928c0608bd2 100644 --- a/src/plugins/dashboard/public/application/embeddable/panel/create_panel_state.ts +++ b/src/plugins/dashboard/public/application/embeddable/panel/create_panel_state.ts @@ -17,7 +17,6 @@ * under the License. */ -import _ from 'lodash'; import { PanelState, EmbeddableInput } from '../../../embeddable_plugin'; import { DEFAULT_PANEL_HEIGHT, DEFAULT_PANEL_WIDTH } from '../dashboard_constants'; import { DashboardPanelState } from '../types'; diff --git a/src/plugins/dashboard/public/application/embeddable/panel/dashboard_panel_placement.ts b/src/plugins/dashboard/public/application/embeddable/panel/dashboard_panel_placement.ts index 1b060c186db97..7550b6f493083 100644 --- a/src/plugins/dashboard/public/application/embeddable/panel/dashboard_panel_placement.ts +++ b/src/plugins/dashboard/public/application/embeddable/panel/dashboard_panel_placement.ts @@ -17,6 +17,7 @@ * under the License. */ +import _ from 'lodash4'; import { PanelNotFoundError } from '../../../embeddable_plugin'; import { GridData } from '../../../../common'; import { DashboardPanelState, DASHBOARD_GRID_COLUMN_COUNT } from '..'; diff --git a/src/plugins/dashboard/public/application/lib/embeddable_saved_object_converters.ts b/src/plugins/dashboard/public/application/lib/embeddable_saved_object_converters.ts index b19ef31ccb9ac..9091b2f9ee0ea 100644 --- a/src/plugins/dashboard/public/application/lib/embeddable_saved_object_converters.ts +++ b/src/plugins/dashboard/public/application/lib/embeddable_saved_object_converters.ts @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { omit } from 'lodash'; +import { omit } from 'lodash4'; import { SavedDashboardPanel } from '../../types'; import { DashboardPanelState } from '../embeddable'; import { SavedObjectEmbeddableInput } from '../../embeddable_plugin'; diff --git a/src/plugins/dashboard/public/application/lib/filter_utils.ts b/src/plugins/dashboard/public/application/lib/filter_utils.ts index b6b935d6050ae..15370acada622 100644 --- a/src/plugins/dashboard/public/application/lib/filter_utils.ts +++ b/src/plugins/dashboard/public/application/lib/filter_utils.ts @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import moment, { Moment } from 'moment'; import { Filter } from '../../../../data/public'; diff --git a/src/plugins/dashboard/public/application/lib/update_saved_dashboard.ts b/src/plugins/dashboard/public/application/lib/update_saved_dashboard.ts index e3b6725ce7449..81e0300f04c71 100644 --- a/src/plugins/dashboard/public/application/lib/update_saved_dashboard.ts +++ b/src/plugins/dashboard/public/application/lib/update_saved_dashboard.ts @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { RefreshInterval, TimefilterContract } from 'src/plugins/data/public'; import { FilterUtils } from './filter_utils'; import { SavedObjectDashboard } from '../../saved_dashboards'; @@ -47,7 +47,7 @@ export function updateSavedDashboard( 'pause', 'section', 'value', - ]); + ]) as RefreshInterval; savedDashboard.refreshInterval = savedDashboard.timeRestore ? timeRestoreObj : undefined; // save only unpinned filters diff --git a/src/plugins/dashboard/public/application/listing/dashboard_listing.test.js b/src/plugins/dashboard/public/application/listing/dashboard_listing.test.js index dccac4e7c3c76..9923c7ecf0496 100644 --- a/src/plugins/dashboard/public/application/listing/dashboard_listing.test.js +++ b/src/plugins/dashboard/public/application/listing/dashboard_listing.test.js @@ -18,9 +18,9 @@ */ jest.mock( - 'lodash', + 'lodash4', () => ({ - ...require.requireActual('lodash'), + ...require.requireActual('lodash4'), // mock debounce to fire immediately with no internal timer debounce: (func) => { function debounced(...args) { diff --git a/src/plugins/dashboard/server/saved_objects/dashboard_migrations.ts b/src/plugins/dashboard/server/saved_objects/dashboard_migrations.ts index 4f7945d6dd601..456ac009d5dce 100644 --- a/src/plugins/dashboard/server/saved_objects/dashboard_migrations.ts +++ b/src/plugins/dashboard/server/saved_objects/dashboard_migrations.ts @@ -17,7 +17,7 @@ * under the License. */ -import { get, flow } from 'lodash'; +import { get, flow } from 'lodash4'; import { SavedObjectMigrationFn } from 'kibana/server'; import { migrations730 } from './migrations_730'; @@ -111,7 +111,7 @@ export const dashboardSavedObjectTypeMigrations = { * in that version. So we apply this twice, once with 6.7.2 and once with 7.0.1 while the backport to 6.7 * only contained the 6.7.2 migration and not the 7.0.1 migration. */ - '6.7.2': flow>(migrateMatchAllQuery), - '7.0.0': flow>(migrations700), - '7.3.0': flow>(migrations730), + '6.7.2': flow(migrateMatchAllQuery), + '7.0.0': flow(migrations700), + '7.3.0': flow(migrations730), }; diff --git a/src/plugins/dashboard/server/saved_objects/migrate_match_all_query.ts b/src/plugins/dashboard/server/saved_objects/migrate_match_all_query.ts index 75e169b79f320..73274f7cf624e 100644 --- a/src/plugins/dashboard/server/saved_objects/migrate_match_all_query.ts +++ b/src/plugins/dashboard/server/saved_objects/migrate_match_all_query.ts @@ -18,11 +18,11 @@ */ import { SavedObjectMigrationFn } from 'kibana/server'; -import { get } from 'lodash'; +import { get } from 'lodash4'; import { DEFAULT_QUERY_LANGUAGE } from '../../../data/common'; export const migrateMatchAllQuery: SavedObjectMigrationFn = (doc) => { - const searchSourceJSON = get(doc, 'attributes.kibanaSavedObjectMeta.searchSourceJSON'); + const searchSourceJSON = get(doc, 'attributes.kibanaSavedObjectMeta.searchSourceJSON'); if (searchSourceJSON) { let searchSource: any; diff --git a/src/plugins/data/common/es_query/es_query/build_es_query.ts b/src/plugins/data/common/es_query/es_query/build_es_query.ts index 66d44f5e0747f..f8b74f1981e57 100644 --- a/src/plugins/data/common/es_query/es_query/build_es_query.ts +++ b/src/plugins/data/common/es_query/es_query/build_es_query.ts @@ -17,7 +17,7 @@ * under the License. */ -import { groupBy, has } from 'lodash'; +import { groupBy, has } from 'lodash3'; import { buildQueryFromKuery } from './from_kuery'; import { buildQueryFromFilters } from './from_filters'; import { buildQueryFromLucene } from './from_lucene'; diff --git a/src/plugins/data/common/es_query/es_query/decorate_query.ts b/src/plugins/data/common/es_query/es_query/decorate_query.ts index 891712d057886..828e7b0bcd990 100644 --- a/src/plugins/data/common/es_query/es_query/decorate_query.ts +++ b/src/plugins/data/common/es_query/es_query/decorate_query.ts @@ -17,7 +17,7 @@ * under the License. */ -import { extend, defaults } from 'lodash'; +import { extend, defaults } from 'lodash3'; import { getTimeZoneFromSettings } from '../utils'; import { DslQuery, isEsQueryString } from './es_query_dsl'; diff --git a/src/plugins/data/common/es_query/es_query/es_query_dsl.ts b/src/plugins/data/common/es_query/es_query/es_query_dsl.ts index d906ae5359ec2..02dccfa426326 100644 --- a/src/plugins/data/common/es_query/es_query/es_query_dsl.ts +++ b/src/plugins/data/common/es_query/es_query/es_query_dsl.ts @@ -17,7 +17,7 @@ * under the License. */ -import { has } from 'lodash'; +import { has } from 'lodash3'; export interface DslRangeQuery { range: { diff --git a/src/plugins/data/common/es_query/es_query/from_filters.ts b/src/plugins/data/common/es_query/es_query/from_filters.ts index d2d52efedd085..af93ec5484fe3 100644 --- a/src/plugins/data/common/es_query/es_query/from_filters.ts +++ b/src/plugins/data/common/es_query/es_query/from_filters.ts @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { isUndefined } from 'lodash'; +import { isUndefined } from 'lodash3'; import { migrateFilter } from './migrate_filter'; import { filterMatchesIndex } from './filter_matches_index'; import { Filter, cleanFilter, isFilterDisabled } from '../filters'; diff --git a/src/plugins/data/common/es_query/es_query/get_es_query_config.test.ts b/src/plugins/data/common/es_query/es_query/get_es_query_config.test.ts index 5fa3c67dea400..69ddfb88cbc9a 100644 --- a/src/plugins/data/common/es_query/es_query/get_es_query_config.test.ts +++ b/src/plugins/data/common/es_query/es_query/get_es_query_config.test.ts @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { get } from 'lodash'; +import { get } from 'lodash3'; import { getEsQueryConfig } from './get_es_query_config'; import { IUiSettingsClient } from 'kibana/public'; import { UI_SETTINGS } from '../../'; diff --git a/src/plugins/data/common/es_query/es_query/lucene_string_to_dsl.ts b/src/plugins/data/common/es_query/es_query/lucene_string_to_dsl.ts index 6e8d519ec0ce2..6b5b47f6a063b 100644 --- a/src/plugins/data/common/es_query/es_query/lucene_string_to_dsl.ts +++ b/src/plugins/data/common/es_query/es_query/lucene_string_to_dsl.ts @@ -17,7 +17,7 @@ * under the License. */ -import { isString } from 'lodash'; +import { isString } from 'lodash3'; import { DslQuery } from './es_query_dsl'; export function luceneStringToDsl(query: string | any): DslQuery { diff --git a/src/plugins/data/common/es_query/es_query/migrate_filter.test.ts b/src/plugins/data/common/es_query/es_query/migrate_filter.test.ts index ae9d1c7921955..41f48d9b94664 100644 --- a/src/plugins/data/common/es_query/es_query/migrate_filter.test.ts +++ b/src/plugins/data/common/es_query/es_query/migrate_filter.test.ts @@ -17,7 +17,7 @@ * under the License. */ -import { isEqual, clone } from 'lodash'; +import { isEqual, clone } from 'lodash3'; import { migrateFilter, DeprecatedMatchPhraseFilter } from './migrate_filter'; import { PhraseFilter, MatchAllFilter } from '../filters'; diff --git a/src/plugins/data/common/es_query/es_query/migrate_filter.ts b/src/plugins/data/common/es_query/es_query/migrate_filter.ts index 498763be538de..cec6a23318e11 100644 --- a/src/plugins/data/common/es_query/es_query/migrate_filter.ts +++ b/src/plugins/data/common/es_query/es_query/migrate_filter.ts @@ -17,7 +17,7 @@ * under the License. */ -import { get, omit } from 'lodash'; +import { get, omit } from 'lodash3'; import { getConvertedValueForField } from '../filters'; import { Filter } from '../filters'; import { IIndexPattern } from '../../index_patterns'; diff --git a/src/plugins/data/common/es_query/filters/get_display_value.ts b/src/plugins/data/common/es_query/filters/get_display_value.ts index 10b4dab3f46ef..1c71d6891a6f8 100644 --- a/src/plugins/data/common/es_query/filters/get_display_value.ts +++ b/src/plugins/data/common/es_query/filters/get_display_value.ts @@ -17,7 +17,7 @@ * under the License. */ -import { get } from 'lodash'; +import { get } from 'lodash3'; import { i18n } from '@kbn/i18n'; import { IIndexPattern, IFieldType } from '../..'; import { getIndexPatternFromFilter } from './get_index_pattern_from_filter'; diff --git a/src/plugins/data/common/es_query/filters/index.ts b/src/plugins/data/common/es_query/filters/index.ts index 990d588359442..982ea58c45769 100644 --- a/src/plugins/data/common/es_query/filters/index.ts +++ b/src/plugins/data/common/es_query/filters/index.ts @@ -17,7 +17,7 @@ * under the License. */ -import { omit, get } from 'lodash'; +import { omit, get } from 'lodash3'; import { Filter } from './meta_filter'; export * from './build_filters'; diff --git a/src/plugins/data/common/es_query/filters/phrase_filter.ts b/src/plugins/data/common/es_query/filters/phrase_filter.ts index 167bb3f840350..b8ad6d3495575 100644 --- a/src/plugins/data/common/es_query/filters/phrase_filter.ts +++ b/src/plugins/data/common/es_query/filters/phrase_filter.ts @@ -17,7 +17,7 @@ * under the License. */ -import { get, isPlainObject } from 'lodash'; +import { get, isPlainObject } from 'lodash3'; import { Filter, FilterMeta } from './meta_filter'; import { IIndexPattern, IFieldType } from '../../index_patterns'; diff --git a/src/plugins/data/common/es_query/filters/range_filter.test.ts b/src/plugins/data/common/es_query/filters/range_filter.test.ts index 8accca5c29a45..df07e62f83f47 100644 --- a/src/plugins/data/common/es_query/filters/range_filter.test.ts +++ b/src/plugins/data/common/es_query/filters/range_filter.test.ts @@ -17,7 +17,7 @@ * under the License. */ -import { each } from 'lodash'; +import { each } from 'lodash3'; import { buildRangeFilter, getRangeFilterField, RangeFilter } from './range_filter'; import { fields, getField } from '../../index_patterns/mocks'; import { IIndexPattern, IFieldType } from '../../index_patterns'; diff --git a/src/plugins/data/common/es_query/filters/range_filter.ts b/src/plugins/data/common/es_query/filters/range_filter.ts index c318a0f0c2c3d..1c886a9d90ced 100644 --- a/src/plugins/data/common/es_query/filters/range_filter.ts +++ b/src/plugins/data/common/es_query/filters/range_filter.ts @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { map, reduce, mapValues, get, keys, pick } from 'lodash'; +import { map, reduce, mapValues, get, keys, pick } from 'lodash3'; import { Filter, FilterMeta } from './meta_filter'; import { IIndexPattern, IFieldType } from '../../index_patterns'; diff --git a/src/plugins/data/common/es_query/kuery/functions/exists.ts b/src/plugins/data/common/es_query/kuery/functions/exists.ts index eb6829fca58d9..e194c770a5815 100644 --- a/src/plugins/data/common/es_query/kuery/functions/exists.ts +++ b/src/plugins/data/common/es_query/kuery/functions/exists.ts @@ -17,7 +17,7 @@ * under the License. */ -import { get } from 'lodash'; +import { get } from 'lodash3'; import * as literal from '../node_types/literal'; import { IIndexPattern, KueryNode, IFieldType } from '../../..'; diff --git a/src/plugins/data/common/es_query/kuery/functions/geo_bounding_box.test.ts b/src/plugins/data/common/es_query/kuery/functions/geo_bounding_box.test.ts index cf287ff2c437a..4a8b595bb4599 100644 --- a/src/plugins/data/common/es_query/kuery/functions/geo_bounding_box.test.ts +++ b/src/plugins/data/common/es_query/kuery/functions/geo_bounding_box.test.ts @@ -17,7 +17,7 @@ * under the License. */ -import { get } from 'lodash'; +import { get } from 'lodash3'; import { nodeTypes } from '../node_types'; import { fields } from '../../../index_patterns/mocks'; import { IIndexPattern } from '../../../index_patterns'; diff --git a/src/plugins/data/common/es_query/kuery/functions/geo_bounding_box.ts b/src/plugins/data/common/es_query/kuery/functions/geo_bounding_box.ts index d61b16f8dcd85..da68539cbcc04 100644 --- a/src/plugins/data/common/es_query/kuery/functions/geo_bounding_box.ts +++ b/src/plugins/data/common/es_query/kuery/functions/geo_bounding_box.ts @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash3'; import { nodeTypes } from '../node_types'; import * as ast from '../ast'; import { IIndexPattern, KueryNode, IFieldType, LatLon } from '../../..'; diff --git a/src/plugins/data/common/es_query/kuery/functions/is.ts b/src/plugins/data/common/es_query/kuery/functions/is.ts index 89aec6e55e81b..00885712acbef 100644 --- a/src/plugins/data/common/es_query/kuery/functions/is.ts +++ b/src/plugins/data/common/es_query/kuery/functions/is.ts @@ -17,7 +17,7 @@ * under the License. */ -import { get, isUndefined } from 'lodash'; +import { get, isUndefined } from 'lodash3'; import { getPhraseScript } from '../../filters'; import { getFields } from './utils/get_fields'; import { getTimeZoneFromSettings } from '../../utils'; diff --git a/src/plugins/data/common/es_query/kuery/functions/range.test.ts b/src/plugins/data/common/es_query/kuery/functions/range.test.ts index ed8e40830df02..abc72c9d6ad5a 100644 --- a/src/plugins/data/common/es_query/kuery/functions/range.test.ts +++ b/src/plugins/data/common/es_query/kuery/functions/range.test.ts @@ -17,7 +17,7 @@ * under the License. */ -import { get } from 'lodash'; +import { get } from 'lodash3'; import { nodeTypes } from '../node_types'; import { fields } from '../../../index_patterns/mocks'; import { IIndexPattern } from '../../../index_patterns'; diff --git a/src/plugins/data/common/es_query/kuery/functions/range.ts b/src/plugins/data/common/es_query/kuery/functions/range.ts index feffaa3ec7dda..22c7a2cbc469a 100644 --- a/src/plugins/data/common/es_query/kuery/functions/range.ts +++ b/src/plugins/data/common/es_query/kuery/functions/range.ts @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash3'; import { nodeTypes } from '../node_types'; import * as ast from '../ast'; import { getRangeScript, RangeFilterParams } from '../../filters'; diff --git a/src/plugins/data/common/es_query/kuery/kuery_syntax_error.ts b/src/plugins/data/common/es_query/kuery/kuery_syntax_error.ts index 6aac1a3b3486d..24cb48aba52d5 100644 --- a/src/plugins/data/common/es_query/kuery/kuery_syntax_error.ts +++ b/src/plugins/data/common/es_query/kuery/kuery_syntax_error.ts @@ -17,7 +17,7 @@ * under the License. */ -import { repeat } from 'lodash'; +import { repeat } from 'lodash3'; import { i18n } from '@kbn/i18n'; const endOfInputText = i18n.translate('data.common.kql.errors.endOfInputText', { diff --git a/src/plugins/data/common/es_query/kuery/node_types/function.ts b/src/plugins/data/common/es_query/kuery/node_types/function.ts index fd4e408acb57a..9a497bec8d7fd 100644 --- a/src/plugins/data/common/es_query/kuery/node_types/function.ts +++ b/src/plugins/data/common/es_query/kuery/node_types/function.ts @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash3'; import { functions } from '../functions'; import { IIndexPattern, KueryNode } from '../../..'; diff --git a/src/plugins/data/common/es_query/kuery/node_types/named_arg.ts b/src/plugins/data/common/es_query/kuery/node_types/named_arg.ts index df1fdd1e0d514..0b654388b5667 100644 --- a/src/plugins/data/common/es_query/kuery/node_types/named_arg.ts +++ b/src/plugins/data/common/es_query/kuery/node_types/named_arg.ts @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash3'; import * as ast from '../ast'; import { nodeTypes } from '../node_types'; import { NamedArgTypeBuildNode } from './types'; diff --git a/src/plugins/data/common/field_formats/content_types/html_content_type.ts b/src/plugins/data/common/field_formats/content_types/html_content_type.ts index d4701200d99e0..551aab5f5069a 100644 --- a/src/plugins/data/common/field_formats/content_types/html_content_type.ts +++ b/src/plugins/data/common/field_formats/content_types/html_content_type.ts @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { escape, isFunction } from 'lodash'; +import { escape, isFunction } from 'lodash3'; import { IFieldFormat, HtmlContextTypeConvert, FieldFormatsContentType } from '../types'; import { asPrettyString, getHighlightHtml } from '../utils'; diff --git a/src/plugins/data/common/field_formats/content_types/text_content_type.ts b/src/plugins/data/common/field_formats/content_types/text_content_type.ts index 4a90ba6c0b203..dfa53c2d993d1 100644 --- a/src/plugins/data/common/field_formats/content_types/text_content_type.ts +++ b/src/plugins/data/common/field_formats/content_types/text_content_type.ts @@ -17,7 +17,7 @@ * under the License. */ -import { isFunction } from 'lodash'; +import { isFunction } from 'lodash3'; import { IFieldFormat, TextContextTypeConvert, FieldFormatsContentType } from '../types'; import { asPrettyString } from '../utils'; diff --git a/src/plugins/data/common/field_formats/converters/color.ts b/src/plugins/data/common/field_formats/converters/color.ts index ca659916f7671..30d943699fe14 100644 --- a/src/plugins/data/common/field_formats/converters/color.ts +++ b/src/plugins/data/common/field_formats/converters/color.ts @@ -18,7 +18,7 @@ */ import { i18n } from '@kbn/i18n'; -import { findLast, cloneDeep, template, escape } from 'lodash'; +import { findLast, cloneDeep, template, escape } from 'lodash3'; import { KBN_FIELD_TYPES } from '../../kbn_field_types/types'; import { FieldFormat } from '../field_format'; import { HtmlContextTypeConvert, FIELD_FORMAT_IDS } from '../types'; diff --git a/src/plugins/data/common/field_formats/converters/date_nanos.ts b/src/plugins/data/common/field_formats/converters/date_nanos.ts index 3fa2b1c276cd7..35e476c610716 100644 --- a/src/plugins/data/common/field_formats/converters/date_nanos.ts +++ b/src/plugins/data/common/field_formats/converters/date_nanos.ts @@ -19,7 +19,7 @@ import { i18n } from '@kbn/i18n'; import moment, { Moment } from 'moment'; -import { memoize, noop } from 'lodash'; +import { memoize, noop } from 'lodash3'; import { KBN_FIELD_TYPES } from '../../kbn_field_types/types'; import { FieldFormat } from '../field_format'; import { TextContextTypeConvert, FIELD_FORMAT_IDS } from '../types'; diff --git a/src/plugins/data/common/field_formats/converters/source.ts b/src/plugins/data/common/field_formats/converters/source.ts index f00261e00971a..ac41d91255e3a 100644 --- a/src/plugins/data/common/field_formats/converters/source.ts +++ b/src/plugins/data/common/field_formats/converters/source.ts @@ -17,7 +17,7 @@ * under the License. */ -import { template, escape, keys } from 'lodash'; +import { template, escape, keys } from 'lodash3'; import { shortenDottedString } from '../../utils'; import { KBN_FIELD_TYPES } from '../../kbn_field_types/types'; import { FieldFormat } from '../field_format'; diff --git a/src/plugins/data/common/field_formats/converters/truncate.ts b/src/plugins/data/common/field_formats/converters/truncate.ts index a6c4a1133a2ed..071c7bd554764 100644 --- a/src/plugins/data/common/field_formats/converters/truncate.ts +++ b/src/plugins/data/common/field_formats/converters/truncate.ts @@ -18,7 +18,7 @@ */ import { i18n } from '@kbn/i18n'; -import { trunc } from 'lodash'; +import { trunc } from 'lodash3'; import { KBN_FIELD_TYPES } from '../../kbn_field_types/types'; import { FieldFormat } from '../field_format'; import { TextContextTypeConvert, FIELD_FORMAT_IDS } from '../types'; diff --git a/src/plugins/data/common/field_formats/converters/url.ts b/src/plugins/data/common/field_formats/converters/url.ts index a0a498b6cab34..a0cb4270c8dd1 100644 --- a/src/plugins/data/common/field_formats/converters/url.ts +++ b/src/plugins/data/common/field_formats/converters/url.ts @@ -18,7 +18,7 @@ */ import { i18n } from '@kbn/i18n'; -import { escape, memoize } from 'lodash'; +import { escape, memoize } from 'lodash3'; import { getHighlightHtml } from '../utils'; import { KBN_FIELD_TYPES } from '../../kbn_field_types/types'; import { FieldFormat } from '../field_format'; diff --git a/src/plugins/data/common/field_formats/field_format.test.ts b/src/plugins/data/common/field_formats/field_format.test.ts index 2229601994496..8f73829e106fb 100644 --- a/src/plugins/data/common/field_formats/field_format.test.ts +++ b/src/plugins/data/common/field_formats/field_format.test.ts @@ -17,7 +17,7 @@ * under the License. */ -import { constant, trimRight, trimLeft, get } from 'lodash'; +import { constant, trimRight, trimLeft, get } from 'lodash3'; import { FieldFormat } from './field_format'; import { asPrettyString } from './utils'; diff --git a/src/plugins/data/common/field_formats/field_format.ts b/src/plugins/data/common/field_formats/field_format.ts index 26f07a12067ce..12a530e081348 100644 --- a/src/plugins/data/common/field_formats/field_format.ts +++ b/src/plugins/data/common/field_formats/field_format.ts @@ -17,7 +17,7 @@ * under the License. */ -import { transform, size, cloneDeep, get, defaults } from 'lodash'; +import { transform, size, cloneDeep, get, defaults } from 'lodash3'; import { createCustomFieldFormat } from './converters/custom'; import { FieldFormatsGetConfigFn, diff --git a/src/plugins/data/common/field_formats/field_formats_registry.ts b/src/plugins/data/common/field_formats/field_formats_registry.ts index 9325485bce75d..e269da139d113 100644 --- a/src/plugins/data/common/field_formats/field_formats_registry.ts +++ b/src/plugins/data/common/field_formats/field_formats_registry.ts @@ -18,7 +18,7 @@ */ // eslint-disable-next-line max-classes-per-file -import { forOwn, isFunction, memoize, identity } from 'lodash'; +import { forOwn, isFunction, memoize, identity } from 'lodash3'; import { FieldFormatsGetConfigFn, diff --git a/src/plugins/data/common/field_formats/utils/highlight/highlight_html.ts b/src/plugins/data/common/field_formats/utils/highlight/highlight_html.ts index 23c72e94b120a..12a11e0977469 100644 --- a/src/plugins/data/common/field_formats/utils/highlight/highlight_html.ts +++ b/src/plugins/data/common/field_formats/utils/highlight/highlight_html.ts @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash3'; import { highlightTags } from './highlight_tags'; import { htmlTags } from './html_tags'; diff --git a/src/plugins/data/common/field_mapping/mapping_setup.ts b/src/plugins/data/common/field_mapping/mapping_setup.ts index 99b49b401a8b8..f2a79a8ec1fce 100644 --- a/src/plugins/data/common/field_mapping/mapping_setup.ts +++ b/src/plugins/data/common/field_mapping/mapping_setup.ts @@ -17,7 +17,7 @@ * under the License. */ -import { mapValues, isString } from 'lodash'; +import { mapValues, isString } from 'lodash3'; import { FieldMappingSpec, MappingObject } from './types'; // import from ./common/types to prevent circular dependency of kibana_utils <-> data plugin diff --git a/src/plugins/data/common/index_patterns/fields/field_list.ts b/src/plugins/data/common/index_patterns/fields/field_list.ts index 173a629863a71..2eec4fd9f375a 100644 --- a/src/plugins/data/common/index_patterns/fields/field_list.ts +++ b/src/plugins/data/common/index_patterns/fields/field_list.ts @@ -17,7 +17,7 @@ * under the License. */ -import { findIndex } from 'lodash'; +import { findIndex } from 'lodash3'; import { IIndexPattern } from '../../types'; import { IFieldType } from '../../../common'; import { Field, FieldSpec } from './field'; diff --git a/src/plugins/data/common/index_patterns/fields/obj_define.js b/src/plugins/data/common/index_patterns/fields/obj_define.js index 9c9e5c8f3d55f..a40df0d533095 100644 --- a/src/plugins/data/common/index_patterns/fields/obj_define.js +++ b/src/plugins/data/common/index_patterns/fields/obj_define.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash3'; export function ObjDefine(defaults, prototype) { this.obj; // created by this.create() diff --git a/src/plugins/data/common/index_patterns/index_patterns/ensure_default_index_pattern.ts b/src/plugins/data/common/index_patterns/index_patterns/ensure_default_index_pattern.ts index 2737627bf1977..a5995b997dc17 100644 --- a/src/plugins/data/common/index_patterns/index_patterns/ensure_default_index_pattern.ts +++ b/src/plugins/data/common/index_patterns/index_patterns/ensure_default_index_pattern.ts @@ -17,7 +17,7 @@ * under the License. */ -import { contains } from 'lodash'; +import { contains } from 'lodash3'; import { CoreStart } from 'kibana/public'; import { IndexPatternsContract } from './index_patterns'; diff --git a/src/plugins/data/common/index_patterns/index_patterns/flatten_hit.ts b/src/plugins/data/common/index_patterns/index_patterns/flatten_hit.ts index c194687b7c3bf..388403cd00f54 100644 --- a/src/plugins/data/common/index_patterns/index_patterns/flatten_hit.ts +++ b/src/plugins/data/common/index_patterns/index_patterns/flatten_hit.ts @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash3'; import { IndexPattern } from './index_pattern'; // Takes a hit, merges it with any stored/scripted fields, and with the metaFields diff --git a/src/plugins/data/common/index_patterns/index_patterns/format_hit.ts b/src/plugins/data/common/index_patterns/index_patterns/format_hit.ts index a0597ed4b9026..34e3b9cab94ea 100644 --- a/src/plugins/data/common/index_patterns/index_patterns/format_hit.ts +++ b/src/plugins/data/common/index_patterns/index_patterns/format_hit.ts @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash3'; import { IndexPattern } from './index_pattern'; import { FieldFormatsContentType } from '../../../common'; diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.test.ts b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.test.ts index cea476781ad3b..43d9c294fd89d 100644 --- a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.test.ts +++ b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.test.ts @@ -17,7 +17,7 @@ * under the License. */ -import { defaults, pluck, last, get } from 'lodash'; +import { defaults, pluck, last, get } from 'lodash3'; import { IndexPattern } from './index_pattern'; diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts index 666d99362ce80..38fa1a9dcba80 100644 --- a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts +++ b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts @@ -17,7 +17,7 @@ * under the License. */ -import _, { each, reject } from 'lodash'; +import _, { each, reject } from 'lodash3'; import { i18n } from '@kbn/i18n'; import { SavedObjectsClientContract } from 'src/core/public'; import { DuplicateField, SavedObjectNotFound } from '../../../../kibana_utils/common'; diff --git a/src/plugins/data/common/index_patterns/lib/get_from_saved_object.ts b/src/plugins/data/common/index_patterns/lib/get_from_saved_object.ts index 1630a4547b7a1..decbea05e01c8 100644 --- a/src/plugins/data/common/index_patterns/lib/get_from_saved_object.ts +++ b/src/plugins/data/common/index_patterns/lib/get_from_saved_object.ts @@ -18,7 +18,7 @@ */ import { SavedObject } from 'src/core/public'; -import { get } from 'lodash'; +import { get } from 'lodash3'; import { IIndexPattern, IndexPatternAttributes } from '../..'; export function getFromSavedObject( diff --git a/src/plugins/data/common/index_patterns/utils.ts b/src/plugins/data/common/index_patterns/utils.ts index c3f9af62f8c0e..e3767e015c59c 100644 --- a/src/plugins/data/common/index_patterns/utils.ts +++ b/src/plugins/data/common/index_patterns/utils.ts @@ -17,7 +17,7 @@ * under the License. */ -import { find } from 'lodash'; +import { find } from 'lodash3'; import { SavedObjectsClientContract, SimpleSavedObject } from 'src/core/public'; /** diff --git a/src/plugins/data/common/query/filter_manager/compare_filters.ts b/src/plugins/data/common/query/filter_manager/compare_filters.ts index 65df6e26a25b3..d309243edf5ee 100644 --- a/src/plugins/data/common/query/filter_manager/compare_filters.ts +++ b/src/plugins/data/common/query/filter_manager/compare_filters.ts @@ -17,7 +17,7 @@ * under the License. */ -import { defaults, isEqual, omit, map } from 'lodash'; +import { defaults, isEqual, omit, map } from 'lodash3'; import { FilterMeta, Filter } from '../../es_query'; export interface FilterCompareOptions { diff --git a/src/plugins/data/common/query/filter_manager/dedup_filters.ts b/src/plugins/data/common/query/filter_manager/dedup_filters.ts index 7d1b00ac10c0d..7bf3d9e03472f 100644 --- a/src/plugins/data/common/query/filter_manager/dedup_filters.ts +++ b/src/plugins/data/common/query/filter_manager/dedup_filters.ts @@ -17,7 +17,7 @@ * under the License. */ -import { filter, find } from 'lodash'; +import { filter, find } from 'lodash3'; import { compareFilters, FilterCompareOptions } from './compare_filters'; import { Filter } from '../../es_query'; diff --git a/src/plugins/data/common/query/filter_manager/uniq_filters.ts b/src/plugins/data/common/query/filter_manager/uniq_filters.ts index 683cbf7c78a89..a683d453cf540 100644 --- a/src/plugins/data/common/query/filter_manager/uniq_filters.ts +++ b/src/plugins/data/common/query/filter_manager/uniq_filters.ts @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { each, union } from 'lodash'; +import { each, union } from 'lodash3'; import { Filter } from '../../es_query'; import { dedupFilters } from './dedup_filters'; diff --git a/src/plugins/data/common/search/aggs/date_interval_utils/parse_interval.ts b/src/plugins/data/common/search/aggs/date_interval_utils/parse_interval.ts index e9d708d7061d2..643d8c5b25244 100644 --- a/src/plugins/data/common/search/aggs/date_interval_utils/parse_interval.ts +++ b/src/plugins/data/common/search/aggs/date_interval_utils/parse_interval.ts @@ -17,7 +17,7 @@ * under the License. */ -import { find } from 'lodash'; +import { find } from 'lodash3'; import moment, { unitOfTime } from 'moment'; import dateMath from '@elastic/datemath'; diff --git a/src/plugins/data/public/actions/filters/create_filters_from_range_select.ts b/src/plugins/data/public/actions/filters/create_filters_from_range_select.ts index 409614ca9c380..3bcb040452673 100644 --- a/src/plugins/data/public/actions/filters/create_filters_from_range_select.ts +++ b/src/plugins/data/public/actions/filters/create_filters_from_range_select.ts @@ -17,7 +17,7 @@ * under the License. */ -import { last } from 'lodash'; +import { last } from 'lodash3'; import moment from 'moment'; import { esFilters, IFieldType, RangeFilterParams } from '../../../public'; import { getIndexPatterns } from '../../../public/services'; diff --git a/src/plugins/data/public/autocomplete/providers/value_suggestion_provider.ts b/src/plugins/data/public/autocomplete/providers/value_suggestion_provider.ts index a6a45a26f06b3..39335cc060709 100644 --- a/src/plugins/data/public/autocomplete/providers/value_suggestion_provider.ts +++ b/src/plugins/data/public/autocomplete/providers/value_suggestion_provider.ts @@ -17,7 +17,7 @@ * under the License. */ -import { memoize } from 'lodash'; +import { memoize } from 'lodash3'; import { CoreSetup } from 'src/core/public'; import { IIndexPattern, IFieldType, UI_SETTINGS } from '../../../common'; diff --git a/src/plugins/data/public/field_formats/converters/date.ts b/src/plugins/data/public/field_formats/converters/date.ts index 78ef8b293e8b9..4e01fa8cac9f2 100644 --- a/src/plugins/data/public/field_formats/converters/date.ts +++ b/src/plugins/data/public/field_formats/converters/date.ts @@ -18,7 +18,7 @@ */ import { i18n } from '@kbn/i18n'; -import { memoize, noop } from 'lodash'; +import { memoize, noop } from 'lodash3'; import moment from 'moment'; import { FieldFormat, diff --git a/src/plugins/data/public/field_formats/utils/deserialize.ts b/src/plugins/data/public/field_formats/utils/deserialize.ts index d9c713c8b1eb4..70737a8761232 100644 --- a/src/plugins/data/public/field_formats/utils/deserialize.ts +++ b/src/plugins/data/public/field_formats/utils/deserialize.ts @@ -17,7 +17,7 @@ * under the License. */ -import { identity } from 'lodash'; +import { identity } from 'lodash3'; import { i18n } from '@kbn/i18n'; import { convertDateRangeToString, DateRangeKey } from '../../search/aggs/buckets/lib/date_range'; import { convertIPRangeToString, IpRangeKey } from '../../search/aggs/buckets/lib/ip_range'; diff --git a/src/plugins/data/public/query/filter_manager/filter_manager.test.ts b/src/plugins/data/public/query/filter_manager/filter_manager.test.ts index 878142906f54b..6d13b30f0a56d 100644 --- a/src/plugins/data/public/query/filter_manager/filter_manager.test.ts +++ b/src/plugins/data/public/query/filter_manager/filter_manager.test.ts @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash3'; import sinon from 'sinon'; import { Subscription } from 'rxjs'; diff --git a/src/plugins/data/public/query/filter_manager/filter_manager.ts b/src/plugins/data/public/query/filter_manager/filter_manager.ts index 60a49a4bd50f4..61c8b0fc2cde6 100644 --- a/src/plugins/data/public/query/filter_manager/filter_manager.ts +++ b/src/plugins/data/public/query/filter_manager/filter_manager.ts @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash3'; import { Subject } from 'rxjs'; import { IUiSettingsClient } from 'src/core/public'; diff --git a/src/plugins/data/public/query/filter_manager/lib/generate_filters.ts b/src/plugins/data/public/query/filter_manager/lib/generate_filters.ts index 432a763bfd48c..d0106b78ad95d 100644 --- a/src/plugins/data/public/query/filter_manager/lib/generate_filters.ts +++ b/src/plugins/data/public/query/filter_manager/lib/generate_filters.ts @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash3'; import { IFieldType, IIndexPattern, diff --git a/src/plugins/data/public/query/filter_manager/lib/map_and_flatten_filters.ts b/src/plugins/data/public/query/filter_manager/lib/map_and_flatten_filters.ts index 13c99e1655d4c..24988441d71a4 100644 --- a/src/plugins/data/public/query/filter_manager/lib/map_and_flatten_filters.ts +++ b/src/plugins/data/public/query/filter_manager/lib/map_and_flatten_filters.ts @@ -17,7 +17,7 @@ * under the License. */ -import { compact, flatten } from 'lodash'; +import { compact, flatten } from 'lodash3'; import { mapFilter } from './map_filter'; import { Filter } from '../../../../common'; diff --git a/src/plugins/data/public/query/filter_manager/lib/map_filter.ts b/src/plugins/data/public/query/filter_manager/lib/map_filter.ts index 7b223a6845559..bdf01b061512f 100644 --- a/src/plugins/data/public/query/filter_manager/lib/map_filter.ts +++ b/src/plugins/data/public/query/filter_manager/lib/map_filter.ts @@ -17,7 +17,7 @@ * under the License. */ -import { reduceRight } from 'lodash'; +import { reduceRight } from 'lodash3'; import { mapSpatialFilter } from './mappers/map_spatial_filter'; import { mapMatchAll } from './mappers/map_match_all'; diff --git a/src/plugins/data/public/query/filter_manager/lib/mappers/map_default.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_default.ts index b5715e33a4677..f067effad813b 100644 --- a/src/plugins/data/public/query/filter_manager/lib/mappers/map_default.ts +++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_default.ts @@ -17,7 +17,7 @@ * under the License. */ -import { find, keys, get } from 'lodash'; +import { find, keys, get } from 'lodash3'; import { Filter, FILTERS } from '../../../../../common'; export const mapDefault = (filter: Filter) => { diff --git a/src/plugins/data/public/query/filter_manager/lib/mappers/map_exists.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_exists.ts index 6555652a37ca8..0b36e452bef2e 100644 --- a/src/plugins/data/public/query/filter_manager/lib/mappers/map_exists.ts +++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_exists.ts @@ -17,7 +17,7 @@ * under the License. */ -import { get } from 'lodash'; +import { get } from 'lodash3'; import { Filter, isExistsFilter, FILTERS } from '../../../../../common'; export const mapExists = (filter: Filter) => { diff --git a/src/plugins/data/public/query/filter_manager/lib/mappers/map_phrase.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_phrase.ts index a5e92d57d6a5b..5485a4b6c8484 100644 --- a/src/plugins/data/public/query/filter_manager/lib/mappers/map_phrase.ts +++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_phrase.ts @@ -17,7 +17,7 @@ * under the License. */ -import { get } from 'lodash'; +import { get } from 'lodash3'; import { PhraseFilter, FilterValueFormatter, diff --git a/src/plugins/data/public/query/filter_manager/lib/mappers/map_range.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_range.ts index d2d5a4b069218..8cdc6d929259c 100644 --- a/src/plugins/data/public/query/filter_manager/lib/mappers/map_range.ts +++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_range.ts @@ -17,7 +17,7 @@ * under the License. */ -import { get, has } from 'lodash'; +import { get, has } from 'lodash3'; import { FilterValueFormatter, RangeFilter, diff --git a/src/plugins/data/public/query/filter_manager/lib/only_disabled.ts b/src/plugins/data/public/query/filter_manager/lib/only_disabled.ts index 18c51ebeabe54..08cc747c511f4 100644 --- a/src/plugins/data/public/query/filter_manager/lib/only_disabled.ts +++ b/src/plugins/data/public/query/filter_manager/lib/only_disabled.ts @@ -17,7 +17,7 @@ * under the License. */ -import { filter } from 'lodash'; +import { filter } from 'lodash3'; import { Filter, compareFilters, COMPARE_ALL_OPTIONS } from '../../../../common'; const isEnabled = (f: Filter) => f && f.meta && !f.meta.disabled; diff --git a/src/plugins/data/public/query/lib/from_user.ts b/src/plugins/data/public/query/lib/from_user.ts index fbb1726fc99ea..09b3fd74e0edb 100644 --- a/src/plugins/data/public/query/lib/from_user.ts +++ b/src/plugins/data/public/query/lib/from_user.ts @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash3'; /** * Take userInput from the user and make it into a query object diff --git a/src/plugins/data/public/query/persisted_log/persisted_log.ts b/src/plugins/data/public/query/persisted_log/persisted_log.ts index f61315b85b195..5b985d8af8da6 100644 --- a/src/plugins/data/public/query/persisted_log/persisted_log.ts +++ b/src/plugins/data/public/query/persisted_log/persisted_log.ts @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash3'; import * as Rx from 'rxjs'; import { map } from 'rxjs/operators'; import { IStorageWrapper } from 'src/plugins/kibana_utils/public'; diff --git a/src/plugins/data/public/query/state_sync/connect_to_query_state.ts b/src/plugins/data/public/query/state_sync/connect_to_query_state.ts index e74497a5053b4..0865bca2cab53 100644 --- a/src/plugins/data/public/query/state_sync/connect_to_query_state.ts +++ b/src/plugins/data/public/query/state_sync/connect_to_query_state.ts @@ -19,7 +19,7 @@ import { Subscription } from 'rxjs'; import { filter, map } from 'rxjs/operators'; -import _ from 'lodash'; +import _ from 'lodash3'; import { BaseStateContainer } from '../../../../kibana_utils/public'; import { QuerySetup, QueryStart } from '../query_service'; import { QueryState, QueryStateChange } from './types'; diff --git a/src/plugins/data/public/query/timefilter/lib/change_time_filter.ts b/src/plugins/data/public/query/timefilter/lib/change_time_filter.ts index cbbf2f2754312..d9870447956a6 100644 --- a/src/plugins/data/public/query/timefilter/lib/change_time_filter.ts +++ b/src/plugins/data/public/query/timefilter/lib/change_time_filter.ts @@ -18,7 +18,7 @@ */ import moment from 'moment'; -import { keys } from 'lodash'; +import { keys } from 'lodash3'; import { TimefilterContract } from '../../timefilter'; import { RangeFilter, TimeRange } from '../../../../common'; diff --git a/src/plugins/data/public/query/timefilter/lib/diff_time_picker_vals.ts b/src/plugins/data/public/query/timefilter/lib/diff_time_picker_vals.ts index 3a9402209be20..7f79f4d2bb568 100644 --- a/src/plugins/data/public/query/timefilter/lib/diff_time_picker_vals.ts +++ b/src/plugins/data/public/query/timefilter/lib/diff_time_picker_vals.ts @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash3'; import { RefreshInterval } from '../../../../common'; import { InputTimeRange } from '../types'; diff --git a/src/plugins/data/public/query/timefilter/lib/extract_time_filter.ts b/src/plugins/data/public/query/timefilter/lib/extract_time_filter.ts index 23dd1547baf10..686f328c44940 100644 --- a/src/plugins/data/public/query/timefilter/lib/extract_time_filter.ts +++ b/src/plugins/data/public/query/timefilter/lib/extract_time_filter.ts @@ -17,7 +17,7 @@ * under the License. */ -import { keys, partition } from 'lodash'; +import { keys, partition } from 'lodash3'; import { Filter, isRangeFilter, RangeFilter } from '../../../../common'; export function extractTimeFilter(timeFieldName: string, filters: Filter[]) { diff --git a/src/plugins/data/public/query/timefilter/timefilter.ts b/src/plugins/data/public/query/timefilter/timefilter.ts index 86ef69be572a9..609b2263b1fb2 100644 --- a/src/plugins/data/public/query/timefilter/timefilter.ts +++ b/src/plugins/data/public/query/timefilter/timefilter.ts @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash3'; import { Subject, BehaviorSubject } from 'rxjs'; import moment from 'moment'; import { areRefreshIntervalsDifferent, areTimeRangesDifferent } from './lib/diff_time_picker_vals'; diff --git a/src/plugins/data/public/search/aggs/agg_config.test.ts b/src/plugins/data/public/search/aggs/agg_config.test.ts index 6a0dad07b69bb..d73a27d1b94f7 100644 --- a/src/plugins/data/public/search/aggs/agg_config.test.ts +++ b/src/plugins/data/public/search/aggs/agg_config.test.ts @@ -17,7 +17,7 @@ * under the License. */ -import { identity } from 'lodash'; +import { identity } from 'lodash3'; import { AggConfig, IAggConfig } from './agg_config'; import { AggConfigs, CreateAggConfigParams } from './agg_configs'; diff --git a/src/plugins/data/public/search/aggs/agg_config.ts b/src/plugins/data/public/search/aggs/agg_config.ts index ee4116eefc0e2..dcd31e6d824ba 100644 --- a/src/plugins/data/public/search/aggs/agg_config.ts +++ b/src/plugins/data/public/search/aggs/agg_config.ts @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash3'; import { i18n } from '@kbn/i18n'; import { Assign, Ensure } from '@kbn/utility-types'; import { ExpressionAstFunction, ExpressionAstArgument } from 'src/plugins/expressions/public'; diff --git a/src/plugins/data/public/search/aggs/agg_configs.test.ts b/src/plugins/data/public/search/aggs/agg_configs.test.ts index 6e6fb3350d901..be559cc65926b 100644 --- a/src/plugins/data/public/search/aggs/agg_configs.test.ts +++ b/src/plugins/data/public/search/aggs/agg_configs.test.ts @@ -17,7 +17,7 @@ * under the License. */ -import { indexBy } from 'lodash'; +import { indexBy } from 'lodash3'; import { AggConfig } from './agg_config'; import { AggConfigs } from './agg_configs'; import { AggTypesRegistryStart } from './agg_types_registry'; diff --git a/src/plugins/data/public/search/aggs/agg_configs.ts b/src/plugins/data/public/search/aggs/agg_configs.ts index 6cc03be292d7b..9ce4281c5c9e6 100644 --- a/src/plugins/data/public/search/aggs/agg_configs.ts +++ b/src/plugins/data/public/search/aggs/agg_configs.ts @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash3'; import { Assign } from '@kbn/utility-types'; import { AggConfig, AggConfigSerialized, IAggConfig } from './agg_config'; diff --git a/src/plugins/data/public/search/aggs/agg_type.ts b/src/plugins/data/public/search/aggs/agg_type.ts index fb0cb609a08cf..cd27e80a7a6aa 100644 --- a/src/plugins/data/public/search/aggs/agg_type.ts +++ b/src/plugins/data/public/search/aggs/agg_type.ts @@ -17,7 +17,7 @@ * under the License. */ -import { constant, noop, identity } from 'lodash'; +import { constant, noop, identity } from 'lodash3'; import { i18n } from '@kbn/i18n'; import { initParams } from './agg_params'; diff --git a/src/plugins/data/public/search/aggs/buckets/_terms_other_bucket_helper.ts b/src/plugins/data/public/search/aggs/buckets/_terms_other_bucket_helper.ts index fba3d35f002af..676918814da47 100644 --- a/src/plugins/data/public/search/aggs/buckets/_terms_other_bucket_helper.ts +++ b/src/plugins/data/public/search/aggs/buckets/_terms_other_bucket_helper.ts @@ -17,7 +17,7 @@ * under the License. */ -import { isNumber, keys, values, find, each, cloneDeep, flatten } from 'lodash'; +import { isNumber, keys, values, find, each, cloneDeep, flatten } from 'lodash3'; import { buildExistsFilter, buildPhrasesFilter, buildQueryFromFilters } from '../../../../common'; import { AggGroupNames } from '../agg_groups'; import { IAggConfigs } from '../agg_configs'; diff --git a/src/plugins/data/public/search/aggs/buckets/create_filter/filters.ts b/src/plugins/data/public/search/aggs/buckets/create_filter/filters.ts index 72d2029a12b0d..3cea070d16684 100644 --- a/src/plugins/data/public/search/aggs/buckets/create_filter/filters.ts +++ b/src/plugins/data/public/search/aggs/buckets/create_filter/filters.ts @@ -17,7 +17,7 @@ * under the License. */ -import { get } from 'lodash'; +import { get } from 'lodash3'; import { IBucketAggConfig } from '../bucket_agg_type'; import { buildQueryFilter } from '../../../../../common'; diff --git a/src/plugins/data/public/search/aggs/buckets/date_histogram.ts b/src/plugins/data/public/search/aggs/buckets/date_histogram.ts index 8a5596f669cb7..3b2dcfe988379 100644 --- a/src/plugins/data/public/search/aggs/buckets/date_histogram.ts +++ b/src/plugins/data/public/search/aggs/buckets/date_histogram.ts @@ -17,7 +17,7 @@ * under the License. */ -import { get, noop, find, every } from 'lodash'; +import { get, noop, find, every } from 'lodash3'; import moment from 'moment-timezone'; import { i18n } from '@kbn/i18n'; import { IUiSettingsClient } from 'src/core/public'; diff --git a/src/plugins/data/public/search/aggs/buckets/date_range.ts b/src/plugins/data/public/search/aggs/buckets/date_range.ts index 447347dbfbe10..d3b268782e65a 100644 --- a/src/plugins/data/public/search/aggs/buckets/date_range.ts +++ b/src/plugins/data/public/search/aggs/buckets/date_range.ts @@ -17,7 +17,7 @@ * under the License. */ -import { get } from 'lodash'; +import { get } from 'lodash3'; import moment from 'moment-timezone'; import { i18n } from '@kbn/i18n'; import { IUiSettingsClient } from 'src/core/public'; diff --git a/src/plugins/data/public/search/aggs/buckets/filters.ts b/src/plugins/data/public/search/aggs/buckets/filters.ts index 4052c0b390155..1ab49c3836acb 100644 --- a/src/plugins/data/public/search/aggs/buckets/filters.ts +++ b/src/plugins/data/public/search/aggs/buckets/filters.ts @@ -18,7 +18,7 @@ */ import { i18n } from '@kbn/i18n'; -import { size, transform, cloneDeep } from 'lodash'; +import { size, transform, cloneDeep } from 'lodash3'; import { IUiSettingsClient } from 'src/core/public'; import { createFilterFilters } from './create_filter/filters'; diff --git a/src/plugins/data/public/search/aggs/buckets/geo_tile.ts b/src/plugins/data/public/search/aggs/buckets/geo_tile.ts index 1212bba23a93a..31b6000cd2159 100644 --- a/src/plugins/data/public/search/aggs/buckets/geo_tile.ts +++ b/src/plugins/data/public/search/aggs/buckets/geo_tile.ts @@ -18,7 +18,7 @@ */ import { i18n } from '@kbn/i18n'; -import { noop } from 'lodash'; +import { noop } from 'lodash3'; import { BucketAggType, IBucketAggConfig } from './bucket_agg_type'; import { BUCKET_TYPES } from './bucket_agg_types'; diff --git a/src/plugins/data/public/search/aggs/buckets/histogram.ts b/src/plugins/data/public/search/aggs/buckets/histogram.ts index c1fad17f488db..f5d91bdf80a5c 100644 --- a/src/plugins/data/public/search/aggs/buckets/histogram.ts +++ b/src/plugins/data/public/search/aggs/buckets/histogram.ts @@ -17,7 +17,7 @@ * under the License. */ -import { get } from 'lodash'; +import { get } from 'lodash3'; import { i18n } from '@kbn/i18n'; import { IUiSettingsClient } from 'src/core/public'; diff --git a/src/plugins/data/public/search/aggs/buckets/ip_range.ts b/src/plugins/data/public/search/aggs/buckets/ip_range.ts index 10fdb2d93b56e..9457663067503 100644 --- a/src/plugins/data/public/search/aggs/buckets/ip_range.ts +++ b/src/plugins/data/public/search/aggs/buckets/ip_range.ts @@ -17,7 +17,7 @@ * under the License. */ -import { noop, map, omit, isNull } from 'lodash'; +import { noop, map, omit, isNull } from 'lodash3'; import { i18n } from '@kbn/i18n'; import { BucketAggType } from './bucket_agg_type'; import { BUCKET_TYPES } from './bucket_agg_types'; diff --git a/src/plugins/data/public/search/aggs/buckets/lib/time_buckets/time_buckets.ts b/src/plugins/data/public/search/aggs/buckets/lib/time_buckets/time_buckets.ts index b8d6586652d6b..76e42f29cf4c7 100644 --- a/src/plugins/data/public/search/aggs/buckets/lib/time_buckets/time_buckets.ts +++ b/src/plugins/data/public/search/aggs/buckets/lib/time_buckets/time_buckets.ts @@ -17,7 +17,7 @@ * under the License. */ -import { isString, isObject as isObjectLodash, isPlainObject, sortBy } from 'lodash'; +import { isString, isObject as isObjectLodash, isPlainObject, sortBy } from 'lodash3'; import moment, { Moment } from 'moment'; import { parseInterval } from '../../../../../../common'; diff --git a/src/plugins/data/public/search/aggs/buckets/migrate_include_exclude_format.ts b/src/plugins/data/public/search/aggs/buckets/migrate_include_exclude_format.ts index 47da7e59af5e0..1e9521e7a5086 100644 --- a/src/plugins/data/public/search/aggs/buckets/migrate_include_exclude_format.ts +++ b/src/plugins/data/public/search/aggs/buckets/migrate_include_exclude_format.ts @@ -17,7 +17,7 @@ * under the License. */ -import { isString, isObject } from 'lodash'; +import { isString, isObject } from 'lodash3'; import { IBucketAggConfig, BucketAggType, BucketAggParam } from './bucket_agg_type'; import { IAggConfig } from '../agg_config'; diff --git a/src/plugins/data/public/search/aggs/buckets/terms.ts b/src/plugins/data/public/search/aggs/buckets/terms.ts index 45a76f08ddd13..caad806d5380d 100644 --- a/src/plugins/data/public/search/aggs/buckets/terms.ts +++ b/src/plugins/data/public/search/aggs/buckets/terms.ts @@ -17,7 +17,7 @@ * under the License. */ -import { noop } from 'lodash'; +import { noop } from 'lodash3'; import { i18n } from '@kbn/i18n'; import { BucketAggType, IBucketAggConfig } from './bucket_agg_type'; import { BUCKET_TYPES } from './bucket_agg_types'; diff --git a/src/plugins/data/public/search/aggs/metrics/bucket_avg.ts b/src/plugins/data/public/search/aggs/metrics/bucket_avg.ts index 927e9a7ae4458..8c155759b7602 100644 --- a/src/plugins/data/public/search/aggs/metrics/bucket_avg.ts +++ b/src/plugins/data/public/search/aggs/metrics/bucket_avg.ts @@ -18,7 +18,7 @@ */ import { i18n } from '@kbn/i18n'; -import { get } from 'lodash'; +import { get } from 'lodash3'; import { MetricAggType } from './metric_agg_type'; import { makeNestedLabel } from './lib/make_nested_label'; import { siblingPipelineAggHelper } from './lib/sibling_pipeline_agg_helper'; diff --git a/src/plugins/data/public/search/aggs/metrics/lib/get_response_agg_config_class.ts b/src/plugins/data/public/search/aggs/metrics/lib/get_response_agg_config_class.ts index 00d866e6f2b3e..6c07e22bc4575 100644 --- a/src/plugins/data/public/search/aggs/metrics/lib/get_response_agg_config_class.ts +++ b/src/plugins/data/public/search/aggs/metrics/lib/get_response_agg_config_class.ts @@ -17,7 +17,7 @@ * under the License. */ -import { assign } from 'lodash'; +import { assign } from 'lodash3'; import { IMetricAggConfig } from '../metric_agg_type'; /** diff --git a/src/plugins/data/public/search/aggs/metrics/lib/make_nested_label.ts b/src/plugins/data/public/search/aggs/metrics/lib/make_nested_label.ts index 95bcdf6e99fd9..80f39d07e2389 100644 --- a/src/plugins/data/public/search/aggs/metrics/lib/make_nested_label.ts +++ b/src/plugins/data/public/search/aggs/metrics/lib/make_nested_label.ts @@ -17,7 +17,7 @@ * under the License. */ -import { startCase } from 'lodash'; +import { startCase } from 'lodash3'; import { IMetricAggConfig } from '../metric_agg_type'; export const makeNestedLabel = (aggConfig: IMetricAggConfig, label: string) => { diff --git a/src/plugins/data/public/search/aggs/metrics/lib/ordinal_suffix.test.ts b/src/plugins/data/public/search/aggs/metrics/lib/ordinal_suffix.test.ts index 18ee6b4de3204..5ae060390a659 100644 --- a/src/plugins/data/public/search/aggs/metrics/lib/ordinal_suffix.test.ts +++ b/src/plugins/data/public/search/aggs/metrics/lib/ordinal_suffix.test.ts @@ -17,7 +17,7 @@ * under the License. */ -import { forOwn } from 'lodash'; +import { forOwn } from 'lodash3'; import { ordinalSuffix } from './ordinal_suffix'; describe('ordinal suffix util', () => { diff --git a/src/plugins/data/public/search/aggs/metrics/lib/parent_pipeline_agg_helper.ts b/src/plugins/data/public/search/aggs/metrics/lib/parent_pipeline_agg_helper.ts index 947394c97bdcd..a138dc62be5f4 100644 --- a/src/plugins/data/public/search/aggs/metrics/lib/parent_pipeline_agg_helper.ts +++ b/src/plugins/data/public/search/aggs/metrics/lib/parent_pipeline_agg_helper.ts @@ -18,7 +18,7 @@ */ import { i18n } from '@kbn/i18n'; -import { noop, identity } from 'lodash'; +import { noop, identity } from 'lodash3'; import { forwardModifyAggConfigOnSearchRequestStart } from './nested_agg_helpers'; import { IMetricAggConfig, MetricAggParam } from '../metric_agg_type'; diff --git a/src/plugins/data/public/search/aggs/metrics/lib/sibling_pipeline_agg_helper.ts b/src/plugins/data/public/search/aggs/metrics/lib/sibling_pipeline_agg_helper.ts index cee7841a8c3b9..3017ac3c3d0fc 100644 --- a/src/plugins/data/public/search/aggs/metrics/lib/sibling_pipeline_agg_helper.ts +++ b/src/plugins/data/public/search/aggs/metrics/lib/sibling_pipeline_agg_helper.ts @@ -17,7 +17,7 @@ * under the License. */ -import { identity } from 'lodash'; +import { identity } from 'lodash3'; import { i18n } from '@kbn/i18n'; import { siblingPipelineAggWriter } from './sibling_pipeline_agg_writer'; import { forwardModifyAggConfigOnSearchRequestStart } from './nested_agg_helpers'; diff --git a/src/plugins/data/public/search/aggs/metrics/percentiles_get_value.ts b/src/plugins/data/public/search/aggs/metrics/percentiles_get_value.ts index 980d969a8ea0c..dc88ea4ae7375 100644 --- a/src/plugins/data/public/search/aggs/metrics/percentiles_get_value.ts +++ b/src/plugins/data/public/search/aggs/metrics/percentiles_get_value.ts @@ -17,7 +17,7 @@ * under the License. */ -import { find } from 'lodash'; +import { find } from 'lodash3'; import { IResponseAggConfig } from './lib/get_response_agg_config_class'; export const getPercentileValue = ( diff --git a/src/plugins/data/public/search/aggs/metrics/std_deviation.ts b/src/plugins/data/public/search/aggs/metrics/std_deviation.ts index 1733d5476f667..29f67cc827598 100644 --- a/src/plugins/data/public/search/aggs/metrics/std_deviation.ts +++ b/src/plugins/data/public/search/aggs/metrics/std_deviation.ts @@ -17,7 +17,7 @@ * under the License. */ -import { get } from 'lodash'; +import { get } from 'lodash3'; import { i18n } from '@kbn/i18n'; import { MetricAggType } from './metric_agg_type'; import { METRIC_TYPES } from './metric_agg_types'; diff --git a/src/plugins/data/public/search/aggs/metrics/top_hit.test.ts b/src/plugins/data/public/search/aggs/metrics/top_hit.test.ts index 49e0a3e4b349a..02f71d65a0fb5 100644 --- a/src/plugins/data/public/search/aggs/metrics/top_hit.test.ts +++ b/src/plugins/data/public/search/aggs/metrics/top_hit.test.ts @@ -17,7 +17,7 @@ * under the License. */ -import { dropRight, last } from 'lodash'; +import { dropRight, last } from 'lodash3'; import { getTopHitMetricAgg, TopHitMetricAggDependencies } from './top_hit'; import { AggConfigs } from '../agg_configs'; import { mockAggTypesRegistry } from '../test_helpers'; diff --git a/src/plugins/data/public/search/aggs/metrics/top_hit.ts b/src/plugins/data/public/search/aggs/metrics/top_hit.ts index c6890f98b20e4..c6b87c303e319 100644 --- a/src/plugins/data/public/search/aggs/metrics/top_hit.ts +++ b/src/plugins/data/public/search/aggs/metrics/top_hit.ts @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash3'; import { i18n } from '@kbn/i18n'; import { IMetricAggConfig, MetricAggType } from './metric_agg_type'; import { METRIC_TYPES } from './metric_agg_types'; diff --git a/src/plugins/data/public/search/aggs/param_types/json.ts b/src/plugins/data/public/search/aggs/param_types/json.ts index 461f3c300c1d3..9a939d22e76c3 100644 --- a/src/plugins/data/public/search/aggs/param_types/json.ts +++ b/src/plugins/data/public/search/aggs/param_types/json.ts @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash3'; import { IAggConfig } from '../agg_config'; import { BaseParamType } from './base'; diff --git a/src/plugins/data/public/search/aggs/test_helpers/function_wrapper.ts b/src/plugins/data/public/search/aggs/test_helpers/function_wrapper.ts index aa27bab8f4bd8..f5b8935240e1b 100644 --- a/src/plugins/data/public/search/aggs/test_helpers/function_wrapper.ts +++ b/src/plugins/data/public/search/aggs/test_helpers/function_wrapper.ts @@ -17,7 +17,7 @@ * under the License. */ -import { mapValues } from 'lodash'; +import { mapValues } from 'lodash3'; import { AnyExpressionFunctionDefinition, ExpressionFunctionDefinition, diff --git a/src/plugins/data/public/search/aggs/utils/prop_filter.ts b/src/plugins/data/public/search/aggs/utils/prop_filter.ts index cad5c437fc896..50d91878010f5 100644 --- a/src/plugins/data/public/search/aggs/utils/prop_filter.ts +++ b/src/plugins/data/public/search/aggs/utils/prop_filter.ts @@ -17,7 +17,7 @@ * under the License. */ -import { isFunction } from 'lodash'; +import { isFunction } from 'lodash3'; type FilterFunc

= (item: T[P]) => boolean; diff --git a/src/plugins/data/public/search/expressions/build_tabular_inspector_data.ts b/src/plugins/data/public/search/expressions/build_tabular_inspector_data.ts index 906b8862d00aa..6256ebd0dd3ea 100644 --- a/src/plugins/data/public/search/expressions/build_tabular_inspector_data.ts +++ b/src/plugins/data/public/search/expressions/build_tabular_inspector_data.ts @@ -17,7 +17,7 @@ * under the License. */ -import { set } from 'lodash'; +import { set } from 'lodash3'; import { FormattedData } from '../../../../../plugins/inspector/public'; import { TabbedTable } from '../tabify'; import { createFilter } from './create_filter'; diff --git a/src/plugins/data/public/search/expressions/esaggs.ts b/src/plugins/data/public/search/expressions/esaggs.ts index 153eb7de6f2de..29ac40a998b6d 100644 --- a/src/plugins/data/public/search/expressions/esaggs.ts +++ b/src/plugins/data/public/search/expressions/esaggs.ts @@ -17,7 +17,7 @@ * under the License. */ -import { get, has } from 'lodash'; +import { get, has } from 'lodash3'; import { i18n } from '@kbn/i18n'; import { KibanaContext, diff --git a/src/plugins/data/public/search/search_source/search_source.ts b/src/plugins/data/public/search/search_source/search_source.ts index a33cda964bd1d..52db1fad7d260 100644 --- a/src/plugins/data/public/search/search_source/search_source.ts +++ b/src/plugins/data/public/search/search_source/search_source.ts @@ -69,7 +69,7 @@ * `appSearchSource`. */ -import { uniqueId, uniq, extend, pick, difference, omit, set, keys, isFunction } from 'lodash'; +import { uniqueId, uniq, extend, pick, difference, omit, set, keys, isFunction } from 'lodash3'; import { map } from 'rxjs/operators'; import { CoreStart } from 'kibana/public'; import { normalizeSortRequest } from './normalize_sort_request'; diff --git a/src/plugins/data/public/search/tabify/buckets.ts b/src/plugins/data/public/search/tabify/buckets.ts index e6e5ba4e68ea3..646a497c680f3 100644 --- a/src/plugins/data/public/search/tabify/buckets.ts +++ b/src/plugins/data/public/search/tabify/buckets.ts @@ -17,7 +17,7 @@ * under the License. */ -import { get, isPlainObject, keys, findKey } from 'lodash'; +import { get, isPlainObject, keys, findKey } from 'lodash3'; import moment from 'moment'; import { IAggConfig } from '../aggs'; import { AggResponseBucket, TabbedRangeFilterParams, TimeRangeInformation } from './types'; diff --git a/src/plugins/data/public/search/tabify/get_columns.ts b/src/plugins/data/public/search/tabify/get_columns.ts index 8c538288d2fea..72efd02705424 100644 --- a/src/plugins/data/public/search/tabify/get_columns.ts +++ b/src/plugins/data/public/search/tabify/get_columns.ts @@ -17,7 +17,7 @@ * under the License. */ -import { groupBy } from 'lodash'; +import { groupBy } from 'lodash3'; import { IAggConfig } from '../aggs'; import { TabbedAggColumn } from './types'; diff --git a/src/plugins/data/public/search/tabify/response_writer.ts b/src/plugins/data/public/search/tabify/response_writer.ts index da9b59cc92791..8f4e15fbf2448 100644 --- a/src/plugins/data/public/search/tabify/response_writer.ts +++ b/src/plugins/data/public/search/tabify/response_writer.ts @@ -17,7 +17,7 @@ * under the License. */ -import { isEmpty } from 'lodash'; +import { isEmpty } from 'lodash3'; import { IAggConfigs } from '../aggs'; import { tabifyGetColumns } from './get_columns'; diff --git a/src/plugins/data/public/search/tabify/tabify.ts b/src/plugins/data/public/search/tabify/tabify.ts index 9cb55f94537c5..e2434c0438cb7 100644 --- a/src/plugins/data/public/search/tabify/tabify.ts +++ b/src/plugins/data/public/search/tabify/tabify.ts @@ -17,7 +17,7 @@ * under the License. */ -import { get } from 'lodash'; +import { get } from 'lodash3'; import { TabbedAggResponseWriter } from './response_writer'; import { TabifyBuckets } from './buckets'; import { TabbedResponseWriterOptions } from './types'; 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 0e2bcc7581950..7e33be6aa41e8 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 @@ -34,7 +34,7 @@ import { } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; import { FormattedMessage, InjectedIntl, injectI18n } from '@kbn/i18n/react'; -import { get } from 'lodash'; +import { get } from 'lodash3'; import React, { Component } from 'react'; import { GenericComboBox, GenericComboBoxProps } from './generic_combo_box'; import { diff --git a/src/plugins/data/public/ui/filter_bar/filter_editor/phrase_suggestor.tsx b/src/plugins/data/public/ui/filter_bar/filter_editor/phrase_suggestor.tsx index 8e8054ac204d9..119bb7aabfab0 100644 --- a/src/plugins/data/public/ui/filter_bar/filter_editor/phrase_suggestor.tsx +++ b/src/plugins/data/public/ui/filter_bar/filter_editor/phrase_suggestor.tsx @@ -18,7 +18,7 @@ */ import React from 'react'; -import { debounce } from 'lodash'; +import { debounce } from 'lodash3'; import { withKibana, KibanaReactContextValue } from '../../../../../kibana_react/public'; import { IDataPluginServices, IIndexPattern, IFieldType } from '../../..'; diff --git a/src/plugins/data/public/ui/filter_bar/filter_editor/phrase_value_input.tsx b/src/plugins/data/public/ui/filter_bar/filter_editor/phrase_value_input.tsx index ca94970afbafd..8eb4899a888d0 100644 --- a/src/plugins/data/public/ui/filter_bar/filter_editor/phrase_value_input.tsx +++ b/src/plugins/data/public/ui/filter_bar/filter_editor/phrase_value_input.tsx @@ -19,7 +19,7 @@ import { EuiFormRow } from '@elastic/eui'; import { InjectedIntl, injectI18n } from '@kbn/i18n/react'; -import { uniq } from 'lodash'; +import { uniq } from 'lodash3'; import React from 'react'; import { GenericComboBox, GenericComboBoxProps } from './generic_combo_box'; import { PhraseSuggestorUI, PhraseSuggestorProps } from './phrase_suggestor'; diff --git a/src/plugins/data/public/ui/filter_bar/filter_editor/phrases_values_input.tsx b/src/plugins/data/public/ui/filter_bar/filter_editor/phrases_values_input.tsx index 7ca46f60bba5b..e5dd8ba59cbc2 100644 --- a/src/plugins/data/public/ui/filter_bar/filter_editor/phrases_values_input.tsx +++ b/src/plugins/data/public/ui/filter_bar/filter_editor/phrases_values_input.tsx @@ -19,7 +19,7 @@ import { EuiFormRow } from '@elastic/eui'; import { InjectedIntl, injectI18n } from '@kbn/i18n/react'; -import { uniq } from 'lodash'; +import { uniq } from 'lodash3'; import React from 'react'; import { GenericComboBox, GenericComboBoxProps } from './generic_combo_box'; import { PhraseSuggestorUI, PhraseSuggestorProps } from './phrase_suggestor'; diff --git a/src/plugins/data/public/ui/filter_bar/filter_editor/range_value_input.tsx b/src/plugins/data/public/ui/filter_bar/filter_editor/range_value_input.tsx index 65b842f0bd4aa..24d1f92fdedad 100644 --- a/src/plugins/data/public/ui/filter_bar/filter_editor/range_value_input.tsx +++ b/src/plugins/data/public/ui/filter_bar/filter_editor/range_value_input.tsx @@ -19,7 +19,7 @@ import { EuiIcon, EuiLink, EuiFormHelpText, EuiFormControlLayoutDelimited } from '@elastic/eui'; import { FormattedMessage, InjectedIntl, injectI18n } from '@kbn/i18n/react'; -import { get } from 'lodash'; +import { get } from 'lodash3'; import React from 'react'; import { useKibana } from '../../../../../kibana_react/public'; import { IFieldType } from '../../..'; diff --git a/src/plugins/data/public/ui/filter_bar/filter_editor/value_input_type.tsx b/src/plugins/data/public/ui/filter_bar/filter_editor/value_input_type.tsx index 3737dae1bf9ef..c7c7c88615480 100644 --- a/src/plugins/data/public/ui/filter_bar/filter_editor/value_input_type.tsx +++ b/src/plugins/data/public/ui/filter_bar/filter_editor/value_input_type.tsx @@ -19,7 +19,7 @@ import { EuiFieldNumber, EuiFieldText, EuiSelect } from '@elastic/eui'; import { InjectedIntl, injectI18n } from '@kbn/i18n/react'; -import { isEmpty } from 'lodash'; +import { isEmpty } from 'lodash3'; import React, { Component } from 'react'; import { validateParams } from './lib/filter_editor_utils'; diff --git a/src/plugins/data/public/ui/index_pattern_select/index_pattern_select.tsx b/src/plugins/data/public/ui/index_pattern_select/index_pattern_select.tsx index 20e3fdae5ce5f..36f06a1621b08 100644 --- a/src/plugins/data/public/ui/index_pattern_select/index_pattern_select.tsx +++ b/src/plugins/data/public/ui/index_pattern_select/index_pattern_select.tsx @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash3'; import React, { Component } from 'react'; import { Required } from '@kbn/utility-types'; diff --git a/src/plugins/data/public/ui/query_string_input/fetch_index_patterns.ts b/src/plugins/data/public/ui/query_string_input/fetch_index_patterns.ts index 127dc0f1f41d3..98daa07e87948 100644 --- a/src/plugins/data/public/ui/query_string_input/fetch_index_patterns.ts +++ b/src/plugins/data/public/ui/query_string_input/fetch_index_patterns.ts @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { isEmpty } from 'lodash'; +import { isEmpty } from 'lodash3'; import { IUiSettingsClient, SavedObjectsClientContract } from 'src/core/public'; import { indexPatterns, IndexPatternAttributes } from '../..'; diff --git a/src/plugins/data/public/ui/query_string_input/query_string_input.test.mocks.ts b/src/plugins/data/public/ui/query_string_input/query_string_input.test.mocks.ts index 12222ee7ad267..bac4d56256569 100644 --- a/src/plugins/data/public/ui/query_string_input/query_string_input.test.mocks.ts +++ b/src/plugins/data/public/ui/query_string_input/query_string_input.test.mocks.ts @@ -39,9 +39,9 @@ jest.mock('./fetch_index_patterns', () => ({ fetchIndexPatterns: mockFetchIndexPatterns, })); -import _ from 'lodash'; -// Using doMock to avoid hoisting so that I can override only the debounce method in lodash -jest.doMock('lodash', () => ({ +import _ from 'lodash3'; +// Using doMock to avoid hoisting so that I can override only the debounce method in lodash3 +jest.doMock('lodash3', () => ({ ..._, debounce: (func: () => any) => func, })); diff --git a/src/plugins/data/public/ui/query_string_input/query_string_input.tsx b/src/plugins/data/public/ui/query_string_input/query_string_input.tsx index 32295745ce217..7028072641984 100644 --- a/src/plugins/data/public/ui/query_string_input/query_string_input.tsx +++ b/src/plugins/data/public/ui/query_string_input/query_string_input.tsx @@ -32,7 +32,7 @@ import { } from '@elastic/eui'; import { FormattedMessage } from '@kbn/i18n/react'; -import { debounce, compact, isEqual } from 'lodash'; +import { debounce, compact, isEqual } from 'lodash3'; import { Toast } from 'src/core/public'; import { IDataPluginServices, IIndexPattern, Query } from '../..'; import { QuerySuggestion, QuerySuggestionTypes } from '../../autocomplete'; diff --git a/src/plugins/data/public/ui/saved_query_form/save_query_form.tsx b/src/plugins/data/public/ui/saved_query_form/save_query_form.tsx index c61625dc06c18..7dcdf98caa4da 100644 --- a/src/plugins/data/public/ui/saved_query_form/save_query_form.tsx +++ b/src/plugins/data/public/ui/saved_query_form/save_query_form.tsx @@ -34,7 +34,7 @@ import { EuiText, } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; -import { sortBy, isEqual } from 'lodash'; +import { sortBy, isEqual } from 'lodash3'; import { SavedQuery, SavedQueryService } from '../..'; import { SavedQueryAttributes } from '../../query'; diff --git a/src/plugins/data/public/ui/saved_query_management/saved_query_management_component.tsx b/src/plugins/data/public/ui/saved_query_management/saved_query_management_component.tsx index 6108de0280183..e93281879a70f 100644 --- a/src/plugins/data/public/ui/saved_query_management/saved_query_management_component.tsx +++ b/src/plugins/data/public/ui/saved_query_management/saved_query_management_component.tsx @@ -34,7 +34,7 @@ import { import { i18n } from '@kbn/i18n'; import React, { useEffect, useState, Fragment, useRef } from 'react'; -import { sortBy } from 'lodash'; +import { sortBy } from 'lodash3'; import { SavedQuery, SavedQueryService } from '../..'; import { SavedQueryListItem } from './saved_query_list_item'; diff --git a/src/plugins/data/public/ui/search_bar/search_bar.tsx b/src/plugins/data/public/ui/search_bar/search_bar.tsx index a5ac227559115..bc9cec9917048 100644 --- a/src/plugins/data/public/ui/search_bar/search_bar.tsx +++ b/src/plugins/data/public/ui/search_bar/search_bar.tsx @@ -17,12 +17,12 @@ * under the License. */ -import { compact } from 'lodash'; +import { compact } from 'lodash3'; import { InjectedIntl, injectI18n } from '@kbn/i18n/react'; import classNames from 'classnames'; import React, { Component } from 'react'; import ResizeObserver from 'resize-observer-polyfill'; -import { get, isEqual } from 'lodash'; +import { get, isEqual } from 'lodash3'; import { withKibana, KibanaReactContextValue } from '../../../../kibana_react/public'; diff --git a/src/plugins/data/public/ui/typeahead/suggestions_component.tsx b/src/plugins/data/public/ui/typeahead/suggestions_component.tsx index 77dd7dcec01ee..6a7eff919e087 100644 --- a/src/plugins/data/public/ui/typeahead/suggestions_component.tsx +++ b/src/plugins/data/public/ui/typeahead/suggestions_component.tsx @@ -17,7 +17,7 @@ * under the License. */ -import { isEmpty } from 'lodash'; +import { isEmpty } from 'lodash3'; import React, { Component } from 'react'; import { QuerySuggestion } from '../../autocomplete'; import { SuggestionComponent } from './suggestion_component'; diff --git a/src/plugins/data/server/autocomplete/value_suggestions_route.ts b/src/plugins/data/server/autocomplete/value_suggestions_route.ts index f68d7e1552ccb..72a314dd86490 100644 --- a/src/plugins/data/server/autocomplete/value_suggestions_route.ts +++ b/src/plugins/data/server/autocomplete/value_suggestions_route.ts @@ -17,7 +17,7 @@ * under the License. */ -import { get, map } from 'lodash'; +import { get, map } from 'lodash3'; import { schema } from '@kbn/config-schema'; import { IRouter, SharedGlobalConfig } from 'kibana/server'; diff --git a/src/plugins/data/server/field_formats/converters/date_server.ts b/src/plugins/data/server/field_formats/converters/date_server.ts index 85eb65dfc6a8d..bd5d80af91884 100644 --- a/src/plugins/data/server/field_formats/converters/date_server.ts +++ b/src/plugins/data/server/field_formats/converters/date_server.ts @@ -18,7 +18,7 @@ */ import { i18n } from '@kbn/i18n'; -import { memoize, noop } from 'lodash'; +import { memoize, noop } from 'lodash3'; import moment from 'moment-timezone'; import { FieldFormat, diff --git a/src/plugins/data/server/field_formats/field_formats_service.ts b/src/plugins/data/server/field_formats/field_formats_service.ts index 70584efbee0a0..a4b4148e9db8d 100644 --- a/src/plugins/data/server/field_formats/field_formats_service.ts +++ b/src/plugins/data/server/field_formats/field_formats_service.ts @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { has } from 'lodash'; +import { has } from 'lodash3'; import { FieldFormatsRegistry, FieldFormatInstanceType, diff --git a/src/plugins/data/server/index_patterns/fetcher/lib/errors.ts b/src/plugins/data/server/index_patterns/fetcher/lib/errors.ts index e5a96c67c56b5..e2bb9b8ff320f 100644 --- a/src/plugins/data/server/index_patterns/fetcher/lib/errors.ts +++ b/src/plugins/data/server/index_patterns/fetcher/lib/errors.ts @@ -18,7 +18,7 @@ */ import Boom from 'boom'; -import { get } from 'lodash'; +import { get } from 'lodash3'; const ERR_ES_INDEX_NOT_FOUND = 'index_not_found_exception'; const ERR_NO_MATCHING_INDICES = 'no_matching_indices'; diff --git a/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_capabilities.test.js b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_capabilities.test.js index a0af7582ac6f3..3dca8dbdb9464 100644 --- a/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_capabilities.test.js +++ b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_capabilities.test.js @@ -19,7 +19,7 @@ /* eslint import/no-duplicates: 0 */ import sinon from 'sinon'; -import { identity, shuffle, sortBy } from 'lodash'; +import { identity, shuffle, sortBy } from 'lodash3'; import { getFieldCapabilities } from '../field_capabilities'; diff --git a/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_capabilities.ts b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_capabilities.ts index d8c9466432204..27fcc8dd40cee 100644 --- a/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_capabilities.ts +++ b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_capabilities.ts @@ -17,7 +17,7 @@ * under the License. */ -import { defaults, indexBy, sortBy } from 'lodash'; +import { defaults, indexBy, sortBy } from 'lodash3'; import { APICaller } from 'kibana/server'; import { callFieldCapsApi } from '../es_api'; diff --git a/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_caps_response.test.js b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_caps_response.test.js index 1a4e2b1fe9ee2..69fcecf52c6bf 100644 --- a/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_caps_response.test.js +++ b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_caps_response.test.js @@ -18,7 +18,7 @@ */ /* eslint import/no-duplicates: 0 */ -import { cloneDeep, omit } from 'lodash'; +import { cloneDeep, omit } from 'lodash3'; import sinon from 'sinon'; import * as shouldReadFieldFromDocValuesNS from './should_read_field_from_doc_values'; diff --git a/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_caps_response.ts b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_caps_response.ts index cb1ec6a2ebcf3..19c1a2a4bef12 100644 --- a/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_caps_response.ts +++ b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_caps_response.ts @@ -17,7 +17,7 @@ * under the License. */ -import { uniq } from 'lodash'; +import { uniq } from 'lodash3'; import { castEsToKbnFieldTypeName } from '../../../../../common'; import { shouldReadFieldFromDocValues } from './should_read_field_from_doc_values'; import { FieldDescriptor } from '../../../fetcher'; diff --git a/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/overrides.ts b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/overrides.ts index 518bfeccac01a..974da07edde74 100644 --- a/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/overrides.ts +++ b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/overrides.ts @@ -17,7 +17,7 @@ * under the License. */ -import { merge } from 'lodash'; +import { merge } from 'lodash3'; import { FieldDescriptor } from '../../index_patterns_fetcher'; const OVERRIDES: Record> = { diff --git a/src/plugins/data/server/index_patterns/fetcher/lib/resolve_time_pattern.test.js b/src/plugins/data/server/index_patterns/fetcher/lib/resolve_time_pattern.test.js index 660e9ec30db6a..fa35d4090c792 100644 --- a/src/plugins/data/server/index_patterns/fetcher/lib/resolve_time_pattern.test.js +++ b/src/plugins/data/server/index_patterns/fetcher/lib/resolve_time_pattern.test.js @@ -19,7 +19,7 @@ /* eslint import/no-duplicates: 0 */ import sinon from 'sinon'; -import { noop } from 'lodash'; +import { noop } from 'lodash3'; import { callIndexAliasApi } from './es_api'; import * as callIndexAliasApiNS from './es_api'; diff --git a/src/plugins/data/server/index_patterns/fetcher/lib/resolve_time_pattern.ts b/src/plugins/data/server/index_patterns/fetcher/lib/resolve_time_pattern.ts index 764307bef0ba6..6932882a434c7 100644 --- a/src/plugins/data/server/index_patterns/fetcher/lib/resolve_time_pattern.ts +++ b/src/plugins/data/server/index_patterns/fetcher/lib/resolve_time_pattern.ts @@ -17,7 +17,7 @@ * under the License. */ -import { chain } from 'lodash'; +import { chain } from 'lodash3'; import moment from 'moment'; import { APICaller } from 'kibana/server'; diff --git a/src/plugins/data/server/kql_telemetry/usage_collector/fetch.ts b/src/plugins/data/server/kql_telemetry/usage_collector/fetch.ts index 157716b38f523..3dc53b4a81bc5 100644 --- a/src/plugins/data/server/kql_telemetry/usage_collector/fetch.ts +++ b/src/plugins/data/server/kql_telemetry/usage_collector/fetch.ts @@ -17,7 +17,7 @@ * under the License. */ -import { get } from 'lodash'; +import { get } from 'lodash3'; import { APICaller } from 'kibana/server'; import { DEFAULT_QUERY_LANGUAGE, UI_SETTINGS } from '../../../common'; diff --git a/src/plugins/data/server/saved_objects/index_pattern_migrations.ts b/src/plugins/data/server/saved_objects/index_pattern_migrations.ts index 37819a13b6518..7f522906b9dfe 100644 --- a/src/plugins/data/server/saved_objects/index_pattern_migrations.ts +++ b/src/plugins/data/server/saved_objects/index_pattern_migrations.ts @@ -17,7 +17,7 @@ * under the License. */ -import { flow, omit } from 'lodash'; +import { flow, omit } from 'lodash3'; import { SavedObjectMigrationFn } from 'kibana/server'; const migrateAttributeTypeAndAttributeTypeMeta: SavedObjectMigrationFn = (doc) => ({ diff --git a/src/plugins/data/server/saved_objects/search_migrations.ts b/src/plugins/data/server/saved_objects/search_migrations.ts index 2e37cd1255cee..10b85a860d0f4 100644 --- a/src/plugins/data/server/saved_objects/search_migrations.ts +++ b/src/plugins/data/server/saved_objects/search_migrations.ts @@ -17,7 +17,7 @@ * under the License. */ -import { flow, get } from 'lodash'; +import { flow, get } from 'lodash3'; import { SavedObjectMigrationFn } from 'kibana/server'; import { DEFAULT_QUERY_LANGUAGE } from '../../common'; diff --git a/src/plugins/dev_tools/public/plugin.ts b/src/plugins/dev_tools/public/plugin.ts index 130d07b441b83..3d0ef64819ad9 100644 --- a/src/plugins/dev_tools/public/plugin.ts +++ b/src/plugins/dev_tools/public/plugin.ts @@ -20,7 +20,7 @@ import { BehaviorSubject } from 'rxjs'; import { AppUpdater, CoreSetup, Plugin } from 'kibana/public'; import { i18n } from '@kbn/i18n'; -import { sortBy } from 'lodash'; +import { sortBy } from 'lodash4'; import { KibanaLegacySetup } from '../../kibana_legacy/public'; import { CreateDevToolArgs, DevToolApp, createDevToolApp } from './dev_tool'; import { AppNavLinkStatus, DEFAULT_APP_CATEGORIES } from '../../../core/public'; diff --git a/src/plugins/discover/public/application/angular/context.js b/src/plugins/discover/public/application/angular/context.js index a6f591eebb52d..2db7735dbc091 100644 --- a/src/plugins/discover/public/application/angular/context.js +++ b/src/plugins/discover/public/application/angular/context.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { i18n } from '@kbn/i18n'; import { CONTEXT_DEFAULT_SIZE_SETTING } from '../../../common'; import { getAngularModule, getServices } from '../../kibana_services'; diff --git a/src/plugins/discover/public/application/angular/context/api/anchor.js b/src/plugins/discover/public/application/angular/context/api/anchor.js index 4df5ba989f798..74aa2404497fc 100644 --- a/src/plugins/discover/public/application/angular/context/api/anchor.js +++ b/src/plugins/discover/public/application/angular/context/api/anchor.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { i18n } from '@kbn/i18n'; export function fetchAnchorProvider(indexPatterns, searchSource) { diff --git a/src/plugins/discover/public/application/angular/context/api/context.predecessors.test.js b/src/plugins/discover/public/application/angular/context/api/context.predecessors.test.js index fcde2ade0b2c6..2e656a7bb3caf 100644 --- a/src/plugins/discover/public/application/angular/context/api/context.predecessors.test.js +++ b/src/plugins/discover/public/application/angular/context/api/context.predecessors.test.js @@ -18,7 +18,7 @@ */ import moment from 'moment'; -import * as _ from 'lodash'; +import * as _ from 'lodash4'; import { createIndexPatternsStub, createContextSearchSourceStub } from './_stubs'; import { fetchContextProvider } from './context'; import { setServices } from '../../../../kibana_services'; diff --git a/src/plugins/discover/public/application/angular/context/api/context.successors.test.js b/src/plugins/discover/public/application/angular/context/api/context.successors.test.js index 0f84aa82a989a..64ed20c06d670 100644 --- a/src/plugins/discover/public/application/angular/context/api/context.successors.test.js +++ b/src/plugins/discover/public/application/angular/context/api/context.successors.test.js @@ -18,7 +18,7 @@ */ import moment from 'moment'; -import * as _ from 'lodash'; +import * as _ from 'lodash4'; import { createIndexPatternsStub, createContextSearchSourceStub } from './_stubs'; import { setServices } from '../../../../kibana_services'; diff --git a/src/plugins/discover/public/application/angular/context/query/actions.js b/src/plugins/discover/public/application/angular/context/query/actions.js index 0e057e0a715c4..b639e73e3c097 100644 --- a/src/plugins/discover/public/application/angular/context/query/actions.js +++ b/src/plugins/discover/public/application/angular/context/query/actions.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { i18n } from '@kbn/i18n'; import React from 'react'; import { getServices } from '../../../../kibana_services'; @@ -70,7 +70,7 @@ export function QueryActionsProvider(Promise) { setLoadingStatus(state)('anchor'); return Promise.try(() => - fetchAnchor(indexPatternId, anchorId, [_.zipObject([sort]), { [tieBreakerField]: sort[1] }]) + fetchAnchor(indexPatternId, anchorId, [_.fromPairs([sort]), { [tieBreakerField]: sort[1] }]) ).then( (anchorDocument) => { setLoadedStatus(state)('anchor'); diff --git a/src/plugins/discover/public/application/angular/context/query_parameters/actions.js b/src/plugins/discover/public/application/angular/context/query_parameters/actions.js index fcd4b8ac02cfb..a0fc64ad12ad4 100644 --- a/src/plugins/discover/public/application/angular/context/query_parameters/actions.js +++ b/src/plugins/discover/public/application/angular/context/query_parameters/actions.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { esFilters } from '../../../../../../data/public'; import { MAX_CONTEXT_SIZE, MIN_CONTEXT_SIZE, QUERY_PARAMETER_KEYS } from './constants'; diff --git a/src/plugins/discover/public/application/angular/context_app.js b/src/plugins/discover/public/application/angular/context_app.js index f698ed84a8948..274eff2ffa24c 100644 --- a/src/plugins/discover/public/application/angular/context_app.js +++ b/src/plugins/discover/public/application/angular/context_app.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { CONTEXT_STEP_SETTING, CONTEXT_TIE_BREAKER_FIELDS_SETTING } from '../../../common'; import { getAngularModule, getServices } from '../../kibana_services'; import contextAppTemplate from './context_app.html'; diff --git a/src/plugins/discover/public/application/angular/context_state.ts b/src/plugins/discover/public/application/angular/context_state.ts index 7a92a6ace125b..fa76d31e66de9 100644 --- a/src/plugins/discover/public/application/angular/context_state.ts +++ b/src/plugins/discover/public/application/angular/context_state.ts @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { History } from 'history'; import { createStateContainer, diff --git a/src/plugins/discover/public/application/angular/directives/collapsible_sidebar/collapsible_sidebar.ts b/src/plugins/discover/public/application/angular/directives/collapsible_sidebar/collapsible_sidebar.ts index 16fbb0af9f3fd..edbc7affd3215 100644 --- a/src/plugins/discover/public/application/angular/directives/collapsible_sidebar/collapsible_sidebar.ts +++ b/src/plugins/discover/public/application/angular/directives/collapsible_sidebar/collapsible_sidebar.ts @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import $ from 'jquery'; import { IScope } from 'angular'; diff --git a/src/plugins/discover/public/application/angular/directives/debounce/debounce.js b/src/plugins/discover/public/application/angular/directives/debounce/debounce.js index 586e8ed4fab59..b41ba00cd7e80 100644 --- a/src/plugins/discover/public/application/angular/directives/debounce/debounce.js +++ b/src/plugins/discover/public/application/angular/directives/debounce/debounce.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; // Debounce service, angularized version of lodash debounce // borrowed heavily from https://github.com/shahata/angular-debounce diff --git a/src/plugins/discover/public/application/angular/directives/fixed_scroll.js b/src/plugins/discover/public/application/angular/directives/fixed_scroll.js index 182b4aeca9a23..d8fbfbf42b89e 100644 --- a/src/plugins/discover/public/application/angular/directives/fixed_scroll.js +++ b/src/plugins/discover/public/application/angular/directives/fixed_scroll.js @@ -18,7 +18,7 @@ */ import $ from 'jquery'; -import _ from 'lodash'; +import _ from 'lodash4'; import { DebounceProvider } from './debounce'; const SCROLLER_HEIGHT = 20; diff --git a/src/plugins/discover/public/application/angular/discover.js b/src/plugins/discover/public/application/angular/discover.js index 8ff5af1e3a767..7caac582da1e2 100644 --- a/src/plugins/discover/public/application/angular/discover.js +++ b/src/plugins/discover/public/application/angular/discover.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import React from 'react'; import { Subscription, Subject, merge } from 'rxjs'; import { debounceTime } from 'rxjs/operators'; diff --git a/src/plugins/discover/public/application/angular/discover_state.ts b/src/plugins/discover/public/application/angular/discover_state.ts index 46500d9fdf85e..79cd8f397b054 100644 --- a/src/plugins/discover/public/application/angular/discover_state.ts +++ b/src/plugins/discover/public/application/angular/discover_state.ts @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { isEqual } from 'lodash'; +import { isEqual } from 'lodash4'; import { History } from 'history'; import { createStateContainer, diff --git a/src/plugins/discover/public/application/angular/doc_table/components/table_row.ts b/src/plugins/discover/public/application/angular/doc_table/components/table_row.ts index b1e6d27d76656..bff18b865e658 100644 --- a/src/plugins/discover/public/application/angular/doc_table/components/table_row.ts +++ b/src/plugins/discover/public/application/angular/doc_table/components/table_row.ts @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import $ from 'jquery'; // @ts-ignore import rison from 'rison-node'; diff --git a/src/plugins/discover/public/application/angular/doc_table/lib/get_sort.ts b/src/plugins/discover/public/application/angular/doc_table/lib/get_sort.ts index c28519692318e..30dc7f97b1b0f 100644 --- a/src/plugins/discover/public/application/angular/doc_table/lib/get_sort.ts +++ b/src/plugins/discover/public/application/angular/doc_table/lib/get_sort.ts @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { IndexPattern } from '../../../../../../data/public'; export type SortPairObj = Record; diff --git a/src/plugins/discover/public/application/angular/get_painless_error.ts b/src/plugins/discover/public/application/angular/get_painless_error.ts index e1e98d9df27b1..ccdc2443c01eb 100644 --- a/src/plugins/discover/public/application/angular/get_painless_error.ts +++ b/src/plugins/discover/public/application/angular/get_painless_error.ts @@ -18,7 +18,7 @@ */ import { i18n } from '@kbn/i18n'; -import { get } from 'lodash'; +import { get } from 'lodash4'; export function getPainlessError(error: Error) { const rootCause: Array<{ lang: string; script: string }> | undefined = get( diff --git a/src/plugins/discover/public/application/angular/helpers/point_series.ts b/src/plugins/discover/public/application/angular/helpers/point_series.ts index 4c280bf43ea12..a963a2fa43447 100644 --- a/src/plugins/discover/public/application/angular/helpers/point_series.ts +++ b/src/plugins/discover/public/application/angular/helpers/point_series.ts @@ -17,7 +17,7 @@ * under the License. */ -import { uniq } from 'lodash'; +import { uniq } from 'lodash4'; import { Duration, Moment } from 'moment'; import { Unit } from '@elastic/datemath'; diff --git a/src/plugins/discover/public/application/components/sidebar/discover_sidebar.test.tsx b/src/plugins/discover/public/application/components/sidebar/discover_sidebar.test.tsx index 90ade60d2073d..0a2edcf69f90b 100644 --- a/src/plugins/discover/public/application/components/sidebar/discover_sidebar.test.tsx +++ b/src/plugins/discover/public/application/components/sidebar/discover_sidebar.test.tsx @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { ReactWrapper } from 'enzyme'; // @ts-ignore import { findTestSubject } from '@elastic/eui/lib/test'; diff --git a/src/plugins/discover/public/application/components/sidebar/discover_sidebar.tsx b/src/plugins/discover/public/application/components/sidebar/discover_sidebar.tsx index 96e04c13d70e9..58092960107db 100644 --- a/src/plugins/discover/public/application/components/sidebar/discover_sidebar.tsx +++ b/src/plugins/discover/public/application/components/sidebar/discover_sidebar.tsx @@ -20,7 +20,7 @@ import './discover_sidebar.scss'; import React, { useCallback, useEffect, useState, useMemo } from 'react'; import { i18n } from '@kbn/i18n'; import { EuiButtonIcon, EuiTitle } from '@elastic/eui'; -import { sortBy } from 'lodash'; +import { sortBy } from 'lodash4'; import { FormattedMessage, I18nProvider } from '@kbn/i18n/react'; import { DiscoverField } from './discover_field'; import { DiscoverIndexPattern } from './discover_index_pattern'; diff --git a/src/plugins/discover/public/application/components/sidebar/lib/field_calculator.js b/src/plugins/discover/public/application/components/sidebar/lib/field_calculator.js index e055d644e1f91..eb09ba5bffe0b 100644 --- a/src/plugins/discover/public/application/components/sidebar/lib/field_calculator.js +++ b/src/plugins/discover/public/application/components/sidebar/lib/field_calculator.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { i18n } from '@kbn/i18n'; function getFieldValues(hits, field) { diff --git a/src/plugins/discover/public/application/components/sidebar/lib/field_calculator.test.ts b/src/plugins/discover/public/application/components/sidebar/lib/field_calculator.test.ts index 875cbf4075aa2..8cc5f384672e4 100644 --- a/src/plugins/discover/public/application/components/sidebar/lib/field_calculator.test.ts +++ b/src/plugins/discover/public/application/components/sidebar/lib/field_calculator.test.ts @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; // @ts-ignore import realHits from 'fixtures/real_hits.js'; // @ts-ignore @@ -186,7 +186,7 @@ describe('fieldCalculator', function () { expect(extensions).toBeInstanceOf(Object); expect(extensions.buckets).toBeInstanceOf(Array); expect(extensions.buckets.length).toBe(3); - expect(_.pluck(extensions.buckets, 'value')).toEqual(['html', 'php', 'gif']); + expect(_.map(extensions.buckets, 'value')).toEqual(['html', 'php', 'gif']); expect(extensions.error).toBe(undefined); }); diff --git a/src/plugins/discover/public/application/components/sidebar/lib/get_index_pattern_field_list.ts b/src/plugins/discover/public/application/components/sidebar/lib/get_index_pattern_field_list.ts index 0fcbe925e0798..19995babd9c9e 100644 --- a/src/plugins/discover/public/application/components/sidebar/lib/get_index_pattern_field_list.ts +++ b/src/plugins/discover/public/application/components/sidebar/lib/get_index_pattern_field_list.ts @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { difference, map } from 'lodash'; +import { difference, map } from 'lodash4'; import { IndexPattern, IndexPatternField } from 'src/plugins/data/public'; import { DiscoverServices } from '../../../../build_services'; diff --git a/src/plugins/discover/public/application/components/table/table.tsx b/src/plugins/discover/public/application/components/table/table.tsx index 9b95f2fc6bd27..4733727aac25c 100644 --- a/src/plugins/discover/public/application/components/table/table.tsx +++ b/src/plugins/discover/public/application/components/table/table.tsx @@ -17,7 +17,7 @@ * under the License. */ import React, { useState } from 'react'; -import { escapeRegExp } from 'lodash'; +import { escapeRegExp } from 'lodash4'; import { DocViewTableRow } from './table_row'; import { arrayContainsObjects, trimAngularSpan } from './table_helper'; import { DocViewRenderProps } from '../../doc_views/doc_views_types'; diff --git a/src/plugins/discover/public/application/embeddable/search_embeddable.ts b/src/plugins/discover/public/application/embeddable/search_embeddable.ts index e03a6b938bc4f..8e750e2e16550 100644 --- a/src/plugins/discover/public/application/embeddable/search_embeddable.ts +++ b/src/plugins/discover/public/application/embeddable/search_embeddable.ts @@ -18,7 +18,7 @@ */ import './search_embeddable.scss'; import angular from 'angular'; -import _ from 'lodash'; +import _ from 'lodash4'; import * as Rx from 'rxjs'; import { Subscription } from 'rxjs'; import { i18n } from '@kbn/i18n'; diff --git a/src/plugins/discover/public/kibana_services.ts b/src/plugins/discover/public/kibana_services.ts index bbd0357f41ed4..c7929de2ac062 100644 --- a/src/plugins/discover/public/kibana_services.ts +++ b/src/plugins/discover/public/kibana_services.ts @@ -16,6 +16,8 @@ * specific language governing permissions and limitations * under the License. */ + +import _ from 'lodash4'; import { createHashHistory } from 'history'; import { ScopedHistory } from 'kibana/public'; import { DiscoverServices } from './build_services'; diff --git a/src/plugins/embeddable/public/lib/embeddables/embeddable.tsx b/src/plugins/embeddable/public/lib/embeddables/embeddable.tsx index 9c544e86e189a..6572525fa6083 100644 --- a/src/plugins/embeddable/public/lib/embeddables/embeddable.tsx +++ b/src/plugins/embeddable/public/lib/embeddables/embeddable.tsx @@ -17,7 +17,7 @@ * under the License. */ -import { cloneDeep, isEqual } from 'lodash'; +import { cloneDeep, isEqual } from 'lodash4'; import * as Rx from 'rxjs'; import { Adapters, ViewMode } from '../types'; import { IContainer } from '../containers'; diff --git a/src/plugins/es_ui_shared/public/components/cron_editor/cron_editor.js b/src/plugins/es_ui_shared/public/components/cron_editor/cron_editor.js index 18e9ffcb27c56..b38900aece94d 100644 --- a/src/plugins/es_ui_shared/public/components/cron_editor/cron_editor.js +++ b/src/plugins/es_ui_shared/public/components/cron_editor/cron_editor.js @@ -19,7 +19,7 @@ import React, { Component, Fragment } from 'react'; import PropTypes from 'prop-types'; -import { padLeft } from 'lodash'; +import { padStart } from 'lodash4'; import { FormattedMessage } from '@kbn/i18n/react'; import { i18n } from '@kbn/i18n'; @@ -55,12 +55,12 @@ function makeSequence(min, max) { const MINUTE_OPTIONS = makeSequence(0, 59).map((value) => ({ value: value.toString(), - text: padLeft(value, 2, '0'), + text: padStart(value, 2, '0'), })); const HOUR_OPTIONS = makeSequence(0, 23).map((value) => ({ value: value.toString(), - text: padLeft(value, 2, '0'), + text: padStart(value, 2, '0'), })); const DAY_OPTIONS = makeSequence(1, 7).map((value) => ({ diff --git a/src/plugins/es_ui_shared/public/components/json_editor/json_editor.tsx b/src/plugins/es_ui_shared/public/components/json_editor/json_editor.tsx index 8c63cc8494a8b..19986d63c1893 100644 --- a/src/plugins/es_ui_shared/public/components/json_editor/json_editor.tsx +++ b/src/plugins/es_ui_shared/public/components/json_editor/json_editor.tsx @@ -19,7 +19,7 @@ import React, { useCallback } from 'react'; import { EuiFormRow, EuiCodeEditor } from '@elastic/eui'; -import { debounce } from 'lodash'; +import { debounce } from 'lodash4'; import { isJSON } from '../../../static/validators/string'; import { useJson, OnJsonEditorUpdateHandler } from './use_json'; diff --git a/src/plugins/es_ui_shared/public/console_lang/ace/modes/lexer_rules/x_json_highlight_rules.ts b/src/plugins/es_ui_shared/public/console_lang/ace/modes/lexer_rules/x_json_highlight_rules.ts index 951cf5fa279b5..9e31e6661888d 100644 --- a/src/plugins/es_ui_shared/public/console_lang/ace/modes/lexer_rules/x_json_highlight_rules.ts +++ b/src/plugins/es_ui_shared/public/console_lang/ace/modes/lexer_rules/x_json_highlight_rules.ts @@ -17,7 +17,7 @@ * under the License. */ -import * as _ from 'lodash'; +import * as _ from 'lodash4'; import ace from 'brace'; import 'brace/mode/json'; diff --git a/src/plugins/es_ui_shared/public/console_lang/lib/json_xjson_translation_tools/__tests__/json_xjson_translation_tools.test.ts b/src/plugins/es_ui_shared/public/console_lang/lib/json_xjson_translation_tools/__tests__/json_xjson_translation_tools.test.ts index 419e80ad1608f..59d9a31109581 100644 --- a/src/plugins/es_ui_shared/public/console_lang/lib/json_xjson_translation_tools/__tests__/json_xjson_translation_tools.test.ts +++ b/src/plugins/es_ui_shared/public/console_lang/lib/json_xjson_translation_tools/__tests__/json_xjson_translation_tools.test.ts @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; // @ts-ignore import collapsingTests from './utils_string_collapsing.txt'; // @ts-ignore diff --git a/src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form.ts b/src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form.ts index f9286d99cbf80..2bb4461dbfe56 100644 --- a/src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form.ts +++ b/src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form.ts @@ -18,7 +18,7 @@ */ import { useState, useRef, useEffect, useMemo } from 'react'; -import { get } from 'lodash'; +import { get } from 'lodash4'; import { FormHook, FieldHook, FormData, FieldConfig, FieldsMap, FormConfig } from '../types'; import { mapFormFields, unflattenObject, Subject, Subscription } from '../lib'; diff --git a/src/plugins/es_ui_shared/static/forms/hook_form_lib/lib/utils.ts b/src/plugins/es_ui_shared/static/forms/hook_form_lib/lib/utils.ts index 65cd7792a0189..fcbd1311c655e 100644 --- a/src/plugins/es_ui_shared/static/forms/hook_form_lib/lib/utils.ts +++ b/src/plugins/es_ui_shared/static/forms/hook_form_lib/lib/utils.ts @@ -17,7 +17,7 @@ * under the License. */ -import { set } from 'lodash'; +import { set } from 'lodash4'; import { FieldHook } from '../types'; export const unflattenObject = (object: any) => diff --git a/src/plugins/expressions/common/execution/execution.ts b/src/plugins/expressions/common/execution/execution.ts index 7bfb14b8bfa1c..95d2a1ba7c6f6 100644 --- a/src/plugins/expressions/common/execution/execution.ts +++ b/src/plugins/expressions/common/execution/execution.ts @@ -17,7 +17,7 @@ * under the License. */ -import { keys, last, mapValues, reduce, zipObject } from 'lodash'; +import { keys, last, mapValues, reduce, zipObject } from 'lodash4'; import { Executor } from '../executor'; import { createExecutionContainer, ExecutionContainer } from './container'; import { createError } from '../util'; diff --git a/src/plugins/expressions/common/expression_functions/specs/kibana_context.ts b/src/plugins/expressions/common/expression_functions/specs/kibana_context.ts index b8be273d7bbd3..7b0180ff47d81 100644 --- a/src/plugins/expressions/common/expression_functions/specs/kibana_context.ts +++ b/src/plugins/expressions/common/expression_functions/specs/kibana_context.ts @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { uniq } from 'lodash'; +import { uniqBy } from 'lodash4'; import { i18n } from '@kbn/i18n'; import { ExpressionFunctionDefinition } from '../../expression_functions'; import { KibanaContext } from '../../expression_types'; @@ -40,9 +40,9 @@ const getParsedValue = (data: any, defaultValue: any) => typeof data === 'string' && data.length ? JSON.parse(data) || defaultValue : defaultValue; const mergeQueries = (first: Query | Query[] = [], second: Query | Query[]) => - uniq( + uniqBy( [...(Array.isArray(first) ? first : [first]), ...(Array.isArray(second) ? second : [second])], - (n: any) => JSON.stringify(n.query) + (n: any) => JSON.stringify(n.query) as any ); export const kibanaContextFunction: ExpressionFunctionKibanaContext = { diff --git a/src/plugins/expressions/common/expression_functions/specs/tests/utils.ts b/src/plugins/expressions/common/expression_functions/specs/tests/utils.ts index 016208aefdfc6..7d2def0ef4685 100644 --- a/src/plugins/expressions/common/expression_functions/specs/tests/utils.ts +++ b/src/plugins/expressions/common/expression_functions/specs/tests/utils.ts @@ -17,7 +17,7 @@ * under the License. */ -import { mapValues } from 'lodash'; +import { mapValues } from 'lodash4'; import { AnyExpressionFunctionDefinition } from '../../types'; import { ExecutionContext } from '../../../execution/types'; diff --git a/src/plugins/expressions/common/expression_types/specs/datatable.ts b/src/plugins/expressions/common/expression_types/specs/datatable.ts index c113765f8e7e7..f30c106b10018 100644 --- a/src/plugins/expressions/common/expression_types/specs/datatable.ts +++ b/src/plugins/expressions/common/expression_types/specs/datatable.ts @@ -17,7 +17,7 @@ * under the License. */ -import { map, pick, zipObject } from 'lodash'; +import { map, pick, zipObject } from 'lodash4'; import { ExpressionTypeDefinition } from '../types'; import { PointSeries } from './pointseries'; @@ -109,7 +109,7 @@ export const datatable: ExpressionTypeDefinition ({ type: name, rows: value.rows, - columns: map(value.columns, (val, colName) => { + columns: map(value.columns, (val: any, colName) => { return { name: colName!, type: val.type }; }), }), diff --git a/src/plugins/expressions/common/expression_types/specs/kibana_datatable.ts b/src/plugins/expressions/common/expression_types/specs/kibana_datatable.ts index 7f2f3c37c587c..3dbdafc3cc420 100644 --- a/src/plugins/expressions/common/expression_types/specs/kibana_datatable.ts +++ b/src/plugins/expressions/common/expression_types/specs/kibana_datatable.ts @@ -17,7 +17,7 @@ * under the License. */ -import { map } from 'lodash'; +import { map } from 'lodash4'; import { SerializedFieldFormat } from '../../types/common'; import { Datatable, PointSeries } from '.'; @@ -62,7 +62,7 @@ export const kibanaDatatable = { }; }, pointseries: (context: PointSeries) => { - const columns = map(context.columns, (column, n) => { + const columns = map(context.columns, (column: any, n) => { return { id: n, name: n, ...column }; }); return { diff --git a/src/plugins/expressions/public/loader.ts b/src/plugins/expressions/public/loader.ts index 9428d7db1d9d0..76a5adcbe62e1 100644 --- a/src/plugins/expressions/public/loader.ts +++ b/src/plugins/expressions/public/loader.ts @@ -19,6 +19,7 @@ import { BehaviorSubject, Observable, Subject } from 'rxjs'; import { filter, map } from 'rxjs/operators'; +import { defaults } from 'lodash4'; import { Adapters } from '../../inspector/public'; import { IExpressionLoaderParams } from './types'; import { ExpressionAstExpression } from '../common'; @@ -168,7 +169,7 @@ export class ExpressionLoader { } if (params.searchContext) { - this.params.searchContext = _.defaults( + this.params.searchContext = defaults( {}, params.searchContext, this.params.searchContext || {} diff --git a/src/plugins/home/public/application/components/sample_data_set_cards.js b/src/plugins/home/public/application/components/sample_data_set_cards.js index 255fc57054083..55d9b5eae29f7 100644 --- a/src/plugins/home/public/application/components/sample_data_set_cards.js +++ b/src/plugins/home/public/application/components/sample_data_set_cards.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import React from 'react'; import PropTypes from 'prop-types'; import { EuiFlexGrid, EuiFlexItem } from '@elastic/eui'; diff --git a/src/plugins/home/public/application/components/tutorial/tutorial.js b/src/plugins/home/public/application/components/tutorial/tutorial.js index 576f732278b8e..6b17105b9b716 100644 --- a/src/plugins/home/public/application/components/tutorial/tutorial.js +++ b/src/plugins/home/public/application/components/tutorial/tutorial.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import React from 'react'; import PropTypes from 'prop-types'; import { Footer } from './footer'; diff --git a/src/plugins/home/public/application/components/tutorial_directory.js b/src/plugins/home/public/application/components/tutorial_directory.js index 774b23af11ac8..94498d289a771 100644 --- a/src/plugins/home/public/application/components/tutorial_directory.js +++ b/src/plugins/home/public/application/components/tutorial_directory.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import React from 'react'; import PropTypes from 'prop-types'; import { Synopsis } from './synopsis'; diff --git a/src/plugins/home/public/application/load_tutorials.js b/src/plugins/home/public/application/load_tutorials.js index 6d42c9a1072d6..27cea7ccf71e2 100644 --- a/src/plugins/home/public/application/load_tutorials.js +++ b/src/plugins/home/public/application/load_tutorials.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { getServices } from './kibana_services'; import { i18n } from '@kbn/i18n'; diff --git a/src/plugins/home/server/services/sample_data/routes/uninstall.ts b/src/plugins/home/server/services/sample_data/routes/uninstall.ts index 9bb260460b38a..327710e1cb0bf 100644 --- a/src/plugins/home/server/services/sample_data/routes/uninstall.ts +++ b/src/plugins/home/server/services/sample_data/routes/uninstall.ts @@ -17,7 +17,7 @@ * under the License. */ import { schema } from '@kbn/config-schema'; -import _ from 'lodash'; +import _ from 'lodash4'; import { IRouter } from 'src/core/server'; import { SampleDatasetSchema } from '../lib/sample_dataset_registry_types'; import { createIndexName } from '../lib/create_index_name'; diff --git a/src/plugins/home/server/services/sample_data/usage/collector_fetch.ts b/src/plugins/home/server/services/sample_data/usage/collector_fetch.ts index 4c7316c853018..3428d569b3130 100644 --- a/src/plugins/home/server/services/sample_data/usage/collector_fetch.ts +++ b/src/plugins/home/server/services/sample_data/usage/collector_fetch.ts @@ -17,7 +17,7 @@ * under the License. */ -import { get } from 'lodash'; +import { get } from 'lodash4'; import moment from 'moment'; interface SearchHit { 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 index 9f75dc39a654c..859d4f290a0f6 100644 --- 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 @@ -17,7 +17,7 @@ * under the License. */ -import { get, sortBy } from 'lodash'; +import { get, sortBy } from 'lodash4'; import { IndexPatternCreationConfig } from '../../../../../index_pattern_management/public'; import { DataPublicPluginStart } from '../../../../../data/public'; import { MatchedIndex } from '../types'; 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 eab8b2c231c9c..39b69b4a943fd 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 @@ -17,7 +17,7 @@ * under the License. */ -import { filter } from 'lodash'; +import { filter } from 'lodash4'; import React, { useEffect, useState, useCallback } from 'react'; import { withRouter, RouteComponentProps } from 'react-router-dom'; import { diff --git a/src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/lib/get_field_format.ts b/src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/lib/get_field_format.ts index 861017d99962e..01cc751c053cf 100644 --- a/src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/lib/get_field_format.ts +++ b/src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/lib/get_field_format.ts @@ -17,7 +17,7 @@ * under the License. */ -import { get } from 'lodash'; +import { get } from 'lodash4'; import { IIndexPattern } from '../../../../../../data/public'; export function getFieldFormat(indexPattern?: IIndexPattern, fieldName?: string): string { diff --git a/src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/components/table/table.tsx b/src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/components/table/table.tsx index 51ca59ee7b032..aa7180a55fb4d 100644 --- a/src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/components/table/table.tsx +++ b/src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/components/table/table.tsx @@ -18,7 +18,7 @@ */ import React, { PureComponent } from 'react'; -import { get } from 'lodash'; +import { get } from 'lodash4'; import { i18n } from '@kbn/i18n'; import { EuiInMemoryTable, EuiBasicTableColumn } from '@elastic/eui'; 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 52cd5b0c3f5bd..8998f8f98addc 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 @@ -17,7 +17,7 @@ * under the License. */ -import { Dictionary, countBy, defaults, unique } from 'lodash'; +import { Dictionary, countBy, defaults, uniq } from 'lodash4'; import { i18n } from '@kbn/i18n'; import { IndexPattern, IndexPatternField } from '../../../../../../plugins/data/public'; import { IndexPatternManagementStart } from '../../../../../../plugins/index_pattern_management/public'; @@ -145,7 +145,7 @@ export function convertToEuiSelectOption(options: string[], type: string) { ] : []; return euiOptions.concat( - unique(options).map((option) => { + uniq(options).map((option) => { return { value: option, text: option, diff --git a/src/plugins/index_pattern_management/public/components/field_editor/field_editor.tsx b/src/plugins/index_pattern_management/public/components/field_editor/field_editor.tsx index 5ae50098e79e7..26f3aa61a95cd 100644 --- a/src/plugins/index_pattern_management/public/components/field_editor/field_editor.tsx +++ b/src/plugins/index_pattern_management/public/components/field_editor/field_editor.tsx @@ -18,7 +18,7 @@ */ import React, { PureComponent, Fragment } from 'react'; -import { intersection, union, get } from 'lodash'; +import { intersection, union, get } from 'lodash4'; import { EuiBasicTable, diff --git a/src/plugins/input_control_vis/public/components/editor/field_select.tsx b/src/plugins/input_control_vis/public/components/editor/field_select.tsx index 2885cbf24553f..18062d5a56ef7 100644 --- a/src/plugins/input_control_vis/public/components/editor/field_select.tsx +++ b/src/plugins/input_control_vis/public/components/editor/field_select.tsx @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import React, { Component } from 'react'; import { InjectedIntlProps } from 'react-intl'; diff --git a/src/plugins/input_control_vis/public/components/vis/list_control.tsx b/src/plugins/input_control_vis/public/components/vis/list_control.tsx index 8ca93a302be89..9d68c67f4aac3 100644 --- a/src/plugins/input_control_vis/public/components/vis/list_control.tsx +++ b/src/plugins/input_control_vis/public/components/vis/list_control.tsx @@ -18,7 +18,7 @@ */ import React, { PureComponent } from 'react'; -import _ from 'lodash'; +import _ from 'lodash4'; import { injectI18n } from '@kbn/i18n/react'; import { InjectedIntlProps } from 'react-intl'; diff --git a/src/plugins/input_control_vis/public/components/vis/range_control.tsx b/src/plugins/input_control_vis/public/components/vis/range_control.tsx index f028feaf5f84f..fe1dd94ab87d7 100644 --- a/src/plugins/input_control_vis/public/components/vis/range_control.tsx +++ b/src/plugins/input_control_vis/public/components/vis/range_control.tsx @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import React, { PureComponent } from 'react'; import { ValidatedDualRange } from '../../../../kibana_react/public'; import { FormRow } from './form_row'; diff --git a/src/plugins/input_control_vis/public/control/control.ts b/src/plugins/input_control_vis/public/control/control.ts index 1e1e05c96cc1a..c6c8be659dac5 100644 --- a/src/plugins/input_control_vis/public/control/control.ts +++ b/src/plugins/input_control_vis/public/control/control.ts @@ -19,7 +19,7 @@ /* eslint-disable no-multi-str*/ -import _ from 'lodash'; +import _ from 'lodash4'; import { i18n } from '@kbn/i18n'; import { Filter } from 'src/plugins/data/public'; diff --git a/src/plugins/input_control_vis/public/control/filter_manager/filter_manager.ts b/src/plugins/input_control_vis/public/control/filter_manager/filter_manager.ts index ece3f7a88ba37..4ea70dd4652de 100644 --- a/src/plugins/input_control_vis/public/control/filter_manager/filter_manager.ts +++ b/src/plugins/input_control_vis/public/control/filter_manager/filter_manager.ts @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { FilterManager as QueryFilterManager, IndexPattern, Filter } from '../../../../data/public'; diff --git a/src/plugins/input_control_vis/public/control/filter_manager/phrase_filter_manager.ts b/src/plugins/input_control_vis/public/control/filter_manager/phrase_filter_manager.ts index 4eff5112c0c07..7856415f66295 100644 --- a/src/plugins/input_control_vis/public/control/filter_manager/phrase_filter_manager.ts +++ b/src/plugins/input_control_vis/public/control/filter_manager/phrase_filter_manager.ts @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { FilterManager } from './filter_manager'; import { @@ -86,11 +86,11 @@ export class PhraseFilterManager extends FilterManager { private getValueFromFilter(kbnFilter: PhraseFilter): any { // bool filter - multiple phrase filters if (_.has(kbnFilter, 'query.bool.should')) { - return _.get(kbnFilter, 'query.bool.should') - .map((kbnQueryFilter) => { + return _.get(kbnFilter, 'query.bool.should') + .map((kbnQueryFilter: any) => { return this.getValueFromFilter(kbnQueryFilter); }) - .filter((value) => { + .filter((value: any) => { if (value) { return true; } diff --git a/src/plugins/input_control_vis/public/control/filter_manager/range_filter_manager.ts b/src/plugins/input_control_vis/public/control/filter_manager/range_filter_manager.ts index 1a884cf267c41..b6d91445d3c44 100644 --- a/src/plugins/input_control_vis/public/control/filter_manager/range_filter_manager.ts +++ b/src/plugins/input_control_vis/public/control/filter_manager/range_filter_manager.ts @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { FilterManager } from './filter_manager'; import { esFilters, RangeFilter, RangeFilterParams, IFieldType } from '../../../../data/public'; diff --git a/src/plugins/input_control_vis/public/control/list_control_factory.ts b/src/plugins/input_control_vis/public/control/list_control_factory.ts index 65a3e37a93edf..dc8158f75a58f 100644 --- a/src/plugins/input_control_vis/public/control/list_control_factory.ts +++ b/src/plugins/input_control_vis/public/control/list_control_factory.ts @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { i18n } from '@kbn/i18n'; import { IFieldType, diff --git a/src/plugins/input_control_vis/public/control/range_control_factory.ts b/src/plugins/input_control_vis/public/control/range_control_factory.ts index eac79ca5fcca8..22f87db1a8298 100644 --- a/src/plugins/input_control_vis/public/control/range_control_factory.ts +++ b/src/plugins/input_control_vis/public/control/range_control_factory.ts @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { i18n } from '@kbn/i18n'; import { IFieldType, TimefilterContract, DataPublicPluginStart } from 'src/plugins/data/public'; diff --git a/src/plugins/input_control_vis/public/lineage/lineage_map.ts b/src/plugins/input_control_vis/public/lineage/lineage_map.ts index c6c8bc88308b8..67926171d2980 100644 --- a/src/plugins/input_control_vis/public/lineage/lineage_map.ts +++ b/src/plugins/input_control_vis/public/lineage/lineage_map.ts @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { ControlParams } from '../editor_utils'; export function getLineageMap(controlParamsList: ControlParams[]) { diff --git a/src/plugins/inspector/common/adapters/request/request_adapter.ts b/src/plugins/inspector/common/adapters/request/request_adapter.ts index 70af6b5b51d18..af10d1b77b16d 100644 --- a/src/plugins/inspector/common/adapters/request/request_adapter.ts +++ b/src/plugins/inspector/common/adapters/request/request_adapter.ts @@ -18,7 +18,6 @@ */ import { EventEmitter } from 'events'; -import _ from 'lodash'; import uuid from 'uuid/v4'; import { RequestResponder } from './request_responder'; import { Request, RequestParams, RequestStatus } from './types'; diff --git a/src/plugins/inspector/public/views/data/lib/export_csv.ts b/src/plugins/inspector/public/views/data/lib/export_csv.ts index c0e0153c6053e..65815d2a7dcd3 100644 --- a/src/plugins/inspector/public/views/data/lib/export_csv.ts +++ b/src/plugins/inspector/public/views/data/lib/export_csv.ts @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { isObject } from 'lodash'; +import { isObject } from 'lodash4'; // @ts-ignore import { saveAs } from '@elastic/filesaver'; @@ -29,7 +29,7 @@ const allDoubleQuoteRE = /"/g; function escape(val: string, quoteValues: boolean) { if (isObject(val)) { - val = val.valueOf(); + val = (val as any).valueOf(); } val = String(val); diff --git a/src/plugins/kibana_legacy/public/angular/angular_config.tsx b/src/plugins/kibana_legacy/public/angular/angular_config.tsx index 25cbb0631a652..4422fb8222873 100644 --- a/src/plugins/kibana_legacy/public/angular/angular_config.tsx +++ b/src/plugins/kibana_legacy/public/angular/angular_config.tsx @@ -26,7 +26,7 @@ import { IRootScopeService, } from 'angular'; import $ from 'jquery'; -import { cloneDeep, forOwn, get, set } from 'lodash'; +import { cloneDeep, forOwn, get, set } from 'lodash4'; import * as Rx from 'rxjs'; import { ChromeBreadcrumb, EnvironmentMode, PackageInfo } from 'kibana/public'; import { History } from 'history'; diff --git a/src/plugins/kibana_legacy/public/angular/promises.js b/src/plugins/kibana_legacy/public/angular/promises.js index f5d188e227ca8..4610b823d5ad2 100644 --- a/src/plugins/kibana_legacy/public/angular/promises.js +++ b/src/plugins/kibana_legacy/public/angular/promises.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; export function PromiseServiceCreator($q, $timeout) { function Promise(fn) { diff --git a/src/plugins/kibana_legacy/public/angular/watch_multi.js b/src/plugins/kibana_legacy/public/angular/watch_multi.js index ed5f0288c0e93..d011f49dd1763 100644 --- a/src/plugins/kibana_legacy/public/angular/watch_multi.js +++ b/src/plugins/kibana_legacy/public/angular/watch_multi.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; export function watchMultiDecorator($provide) { $provide.decorator('$rootScope', function ($delegate) { diff --git a/src/plugins/kibana_legacy/public/angular_bootstrap/index.ts b/src/plugins/kibana_legacy/public/angular_bootstrap/index.ts index 1f15107a02762..ee66e23c7e6cd 100644 --- a/src/plugins/kibana_legacy/public/angular_bootstrap/index.ts +++ b/src/plugins/kibana_legacy/public/angular_bootstrap/index.ts @@ -1,6 +1,6 @@ /* eslint-disable */ -import { once } from 'lodash'; +import { once } from 'lodash4'; import angular from 'angular'; // @ts-ignore diff --git a/src/plugins/kibana_legacy/public/notify/lib/format_es_msg.ts b/src/plugins/kibana_legacy/public/notify/lib/format_es_msg.ts index 7305bec5348e5..eebf5bb435b33 100644 --- a/src/plugins/kibana_legacy/public/notify/lib/format_es_msg.ts +++ b/src/plugins/kibana_legacy/public/notify/lib/format_es_msg.ts @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; const getRootCause = (err: Record | string) => _.get(err, 'resp.error.root_cause'); diff --git a/src/plugins/kibana_legacy/public/notify/lib/format_msg.ts b/src/plugins/kibana_legacy/public/notify/lib/format_msg.ts index afc1b9cbf1dd6..9e7dafbff0834 100644 --- a/src/plugins/kibana_legacy/public/notify/lib/format_msg.ts +++ b/src/plugins/kibana_legacy/public/notify/lib/format_msg.ts @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { i18n } from '@kbn/i18n'; import { formatESMsg } from './format_es_msg'; const has = _.has; diff --git a/src/plugins/kibana_legacy/public/paginate/paginate.js b/src/plugins/kibana_legacy/public/paginate/paginate.js index ea93a969d08c7..738cc1c24ad64 100644 --- a/src/plugins/kibana_legacy/public/paginate/paginate.js +++ b/src/plugins/kibana_legacy/public/paginate/paginate.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { i18n } from '@kbn/i18n'; import paginateControlsTemplate from './paginate_controls.html'; diff --git a/src/plugins/kibana_legacy/public/utils/migrate_legacy_query.ts b/src/plugins/kibana_legacy/public/utils/migrate_legacy_query.ts index 8d9b50d5a66b2..c4abb5ee3736d 100644 --- a/src/plugins/kibana_legacy/public/utils/migrate_legacy_query.ts +++ b/src/plugins/kibana_legacy/public/utils/migrate_legacy_query.ts @@ -17,7 +17,7 @@ * under the License. */ -import { has } from 'lodash'; +import { has } from 'lodash4'; import { Query } from 'src/plugins/data/public'; /** diff --git a/src/plugins/kibana_legacy/public/utils/private.js b/src/plugins/kibana_legacy/public/utils/private.js index 8119a73215796..d60f072d0830a 100644 --- a/src/plugins/kibana_legacy/public/utils/private.js +++ b/src/plugins/kibana_legacy/public/utils/private.js @@ -93,7 +93,7 @@ * * @param {[type]} prov [description] */ -import _ from 'lodash'; +import _ from 'lodash4'; const nextId = _.partial(_.uniqueId, 'privateProvider#'); diff --git a/src/plugins/kibana_legacy/server/index.ts b/src/plugins/kibana_legacy/server/index.ts index 0188f9b1ec515..ae891880f1475 100644 --- a/src/plugins/kibana_legacy/server/index.ts +++ b/src/plugins/kibana_legacy/server/index.ts @@ -23,7 +23,7 @@ import { CoreStart, PluginConfigDescriptor, } from 'kibana/server'; -import { get } from 'lodash'; +import { get } from 'lodash4'; import { configSchema, ConfigSchema } from '../config'; diff --git a/src/plugins/kibana_react/public/markdown/markdown.tsx b/src/plugins/kibana_react/public/markdown/markdown.tsx index 15d1c4931e60b..1570bb5bd8633 100644 --- a/src/plugins/kibana_react/public/markdown/markdown.tsx +++ b/src/plugins/kibana_react/public/markdown/markdown.tsx @@ -20,7 +20,7 @@ import classNames from 'classnames'; import React, { PureComponent } from 'react'; import MarkdownIt from 'markdown-it'; -import { memoize } from 'lodash'; +import { memoize } from 'lodash4'; import { getSecureRelForTarget } from '@elastic/eui'; import './index.scss'; diff --git a/src/plugins/kibana_react/public/table_list_view/table_list_view.tsx b/src/plugins/kibana_react/public/table_list_view/table_list_view.tsx index 87fdf0730c880..0e7fed2811d11 100644 --- a/src/plugins/kibana_react/public/table_list_view/table_list_view.tsx +++ b/src/plugins/kibana_react/public/table_list_view/table_list_view.tsx @@ -20,7 +20,7 @@ import React from 'react'; import { FormattedMessage } from '@kbn/i18n/react'; import { i18n } from '@kbn/i18n'; -import { debounce, indexBy, sortBy, uniq } from 'lodash'; +import { debounce, keyBy, sortBy, uniq } from 'lodash4'; import { EuiTitle, EuiInMemoryTable, @@ -178,7 +178,7 @@ class TableListView extends React.Component itemsById[id])); } catch (error) { this.props.toastNotifications.addDanger({ diff --git a/src/plugins/kibana_usage_collection/server/collectors/kibana/get_saved_object_counts.ts b/src/plugins/kibana_usage_collection/server/collectors/kibana/get_saved_object_counts.ts index 804c8b0ed2026..a940eb4e13153 100644 --- a/src/plugins/kibana_usage_collection/server/collectors/kibana/get_saved_object_counts.ts +++ b/src/plugins/kibana_usage_collection/server/collectors/kibana/get_saved_object_counts.ts @@ -26,7 +26,7 @@ * Unifying this logic from Monitoring that makes sense to have in OSS here and we will import it on the monitoring side to reuse it. */ -import { snakeCase } from 'lodash'; +import { snakeCase } from 'lodash4'; import { APICaller } from 'kibana/server'; const TYPES = [ diff --git a/src/plugins/kibana_usage_collection/server/collectors/ops_stats/ops_stats_collector.ts b/src/plugins/kibana_usage_collection/server/collectors/ops_stats/ops_stats_collector.ts index df9d6eb146eab..e7b936bfdabea 100644 --- a/src/plugins/kibana_usage_collection/server/collectors/ops_stats/ops_stats_collector.ts +++ b/src/plugins/kibana_usage_collection/server/collectors/ops_stats/ops_stats_collector.ts @@ -18,7 +18,7 @@ */ import { Observable } from 'rxjs'; -import { cloneDeep } from 'lodash'; +import { cloneDeep } from 'lodash4'; import moment from 'moment'; import { OpsMetrics } from 'kibana/server'; import { UsageCollectionSetup } from 'src/plugins/usage_collection/server'; diff --git a/src/plugins/kibana_utils/common/url/encode_uri_query.ts b/src/plugins/kibana_utils/common/url/encode_uri_query.ts index fb60f0ceff10f..8f8bdc6acec56 100644 --- a/src/plugins/kibana_utils/common/url/encode_uri_query.ts +++ b/src/plugins/kibana_utils/common/url/encode_uri_query.ts @@ -18,7 +18,7 @@ */ import { ParsedQuery } from 'query-string'; -import { transform } from 'lodash'; +import { transform } from 'lodash4'; /** * This method is intended for encoding *key* or *value* parts of query component. We need a custom @@ -45,7 +45,7 @@ export const encodeQuery = ( query: ParsedQuery, encodeFunction: (val: string, pctEncodeSpaces?: boolean) => string = encodeUriQuery ) => - transform(query, (result, value, key) => { + transform(query, (result: any, value, key) => { if (key) { const singleValue = Array.isArray(value) ? value.join(',') : value; diff --git a/src/plugins/kibana_utils/public/field_wildcard/field_wildcard.ts b/src/plugins/kibana_utils/public/field_wildcard/field_wildcard.ts index 2aa9a255bd5cf..abf07d3c7fcae 100644 --- a/src/plugins/kibana_utils/public/field_wildcard/field_wildcard.ts +++ b/src/plugins/kibana_utils/public/field_wildcard/field_wildcard.ts @@ -17,7 +17,7 @@ * under the License. */ -import { escapeRegExp, memoize } from 'lodash'; +import { escapeRegExp, memoize } from 'lodash4'; export const makeRegEx = memoize(function makeRegEx(glob: string) { const globRegex = glob.split('*').map(escapeRegExp).join('.*'); diff --git a/src/plugins/kibana_utils/public/resize_checker/resize_checker.ts b/src/plugins/kibana_utils/public/resize_checker/resize_checker.ts index bc514474e73fb..27114ff09804e 100644 --- a/src/plugins/kibana_utils/public/resize_checker/resize_checker.ts +++ b/src/plugins/kibana_utils/public/resize_checker/resize_checker.ts @@ -18,7 +18,7 @@ */ import { EventEmitter } from 'events'; -import { isEqual } from 'lodash'; +import { isEqual } from 'lodash4'; import ResizeObserver from 'resize-observer-polyfill'; function getSize(el: HTMLElement): [number, number] { diff --git a/src/plugins/kibana_utils/public/state_management/utils/diff_object.test.ts b/src/plugins/kibana_utils/public/state_management/utils/diff_object.test.ts index d93fa0fe5a169..3a4d8fe91ec3d 100644 --- a/src/plugins/kibana_utils/public/state_management/utils/diff_object.test.ts +++ b/src/plugins/kibana_utils/public/state_management/utils/diff_object.test.ts @@ -17,7 +17,7 @@ * under the License. */ -import { cloneDeep } from 'lodash'; +import { cloneDeep } from 'lodash4'; import { applyDiff } from './diff_object'; describe('diff_object', () => { diff --git a/src/plugins/kibana_utils/public/state_management/utils/diff_object.ts b/src/plugins/kibana_utils/public/state_management/utils/diff_object.ts index 65eb8a3cc8fcc..27082b1f8991b 100644 --- a/src/plugins/kibana_utils/public/state_management/utils/diff_object.ts +++ b/src/plugins/kibana_utils/public/state_management/utils/diff_object.ts @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { keys, isFunction, difference, filter, union, pick, each, assign, isEqual } from 'lodash'; +import { keys, isFunction, difference, filter, union, pick, each, assign, isEqual } from 'lodash4'; export interface IDiffObject { removed: string[]; diff --git a/src/plugins/kibana_utils/public/storage/hashed_item_store/hashed_item_store.ts b/src/plugins/kibana_utils/public/storage/hashed_item_store/hashed_item_store.ts index fe18f426f226b..fcf7290aff55f 100644 --- a/src/plugins/kibana_utils/public/storage/hashed_item_store/hashed_item_store.ts +++ b/src/plugins/kibana_utils/public/storage/hashed_item_store/hashed_item_store.ts @@ -70,7 +70,7 @@ * For these reasons, HashedItemStore doesn't concern itself with this constraint. */ -import { pull, sortBy } from 'lodash'; +import { pull, sortBy } from 'lodash4'; import { IStorage } from '../types'; interface IndexedItem { diff --git a/src/plugins/management/public/components/management_sidebar_nav/management_sidebar_nav.tsx b/src/plugins/management/public/components/management_sidebar_nav/management_sidebar_nav.tsx index 055dda5ed84a1..c6cc9880cfc4c 100644 --- a/src/plugins/management/public/components/management_sidebar_nav/management_sidebar_nav.tsx +++ b/src/plugins/management/public/components/management_sidebar_nav/management_sidebar_nav.tsx @@ -19,7 +19,7 @@ import React, { useState } from 'react'; import { i18n } from '@kbn/i18n'; -import { sortBy } from 'lodash'; +import { sortBy } from 'lodash4'; import { EuiIcon, EuiSideNav, EuiScreenReaderOnly, EuiSideNavItemType } from '@elastic/eui'; import { AppMountParameters } from 'kibana/public'; diff --git a/src/plugins/maps_legacy/public/map/base_maps_visualization.js b/src/plugins/maps_legacy/public/map/base_maps_visualization.js index 2d1a45beb5d87..64b9c7db903f9 100644 --- a/src/plugins/maps_legacy/public/map/base_maps_visualization.js +++ b/src/plugins/maps_legacy/public/map/base_maps_visualization.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { i18n } from '@kbn/i18n'; import * as Rx from 'rxjs'; import { filter, first } from 'rxjs/operators'; diff --git a/src/plugins/maps_legacy/public/map/decode_geo_hash.ts b/src/plugins/maps_legacy/public/map/decode_geo_hash.ts index 8c39ada03a46b..ba2fc40c147a0 100644 --- a/src/plugins/maps_legacy/public/map/decode_geo_hash.ts +++ b/src/plugins/maps_legacy/public/map/decode_geo_hash.ts @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; interface DecodedGeoHash { latitude: number[]; diff --git a/src/plugins/maps_legacy/public/map/grid_dimensions.js b/src/plugins/maps_legacy/public/map/grid_dimensions.js index b3438914d5636..d655b956ee3f6 100644 --- a/src/plugins/maps_legacy/public/map/grid_dimensions.js +++ b/src/plugins/maps_legacy/public/map/grid_dimensions.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; // geohash precision mapping of geohash grid cell dimensions (width x height, in meters) at equator. // https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-geohashgrid-aggregation.html#_cell_dimensions_at_the_equator diff --git a/src/plugins/maps_legacy/public/map/kibana_map.js b/src/plugins/maps_legacy/public/map/kibana_map.js index ad5d2c089b875..a86aeebff4303 100644 --- a/src/plugins/maps_legacy/public/map/kibana_map.js +++ b/src/plugins/maps_legacy/public/map/kibana_map.js @@ -20,7 +20,7 @@ import { EventEmitter } from 'events'; import { createZoomWarningMsg } from './map_messages'; import $ from 'jquery'; -import _ from 'lodash'; +import _ from 'lodash4'; import { zoomToPrecision } from './zoom_to_precision'; import { i18n } from '@kbn/i18n'; import { ORIGIN } from '../common/constants/origin'; diff --git a/src/plugins/maps_legacy/public/map/service_settings.js b/src/plugins/maps_legacy/public/map/service_settings.js index 7c2b841e4adf3..e3557390499eb 100644 --- a/src/plugins/maps_legacy/public/map/service_settings.js +++ b/src/plugins/maps_legacy/public/map/service_settings.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import MarkdownIt from 'markdown-it'; import { EMSClient } from '@elastic/ems-client'; import { i18n } from '@kbn/i18n'; diff --git a/src/plugins/navigation/public/top_nav_menu/top_nav_menu_item.tsx b/src/plugins/navigation/public/top_nav_menu/top_nav_menu_item.tsx index 3a05ce59f5d13..5f1f8331a99a3 100644 --- a/src/plugins/navigation/public/top_nav_menu/top_nav_menu_item.tsx +++ b/src/plugins/navigation/public/top_nav_menu/top_nav_menu_item.tsx @@ -17,7 +17,7 @@ * under the License. */ -import { capitalize, isFunction } from 'lodash'; +import { upperFirst, isFunction } from 'lodash4'; import React, { MouseEvent } from 'react'; import { EuiButtonEmpty, EuiToolTip } from '@elastic/eui'; @@ -50,11 +50,11 @@ export function TopNavMenuItem(props: TopNavMenuData) { const btn = props.emphasize ? ( - {capitalize(props.label || props.id!)} + {upperFirst(props.label || props.id!)} ) : ( - {capitalize(props.label || props.id!)} + {upperFirst(props.label || props.id!)} ); diff --git a/src/plugins/region_map/public/__tests__/region_map_visualization.js b/src/plugins/region_map/public/__tests__/region_map_visualization.js index 3dcfc7c2fc6fa..d694b045aac1d 100644 --- a/src/plugins/region_map/public/__tests__/region_map_visualization.js +++ b/src/plugins/region_map/public/__tests__/region_map_visualization.js @@ -19,7 +19,7 @@ import expect from '@kbn/expect'; import ngMock from 'ng_mock'; -import _ from 'lodash'; +import _ from 'lodash4'; import ChoroplethLayer from '../choropleth_layer'; import { ImageComparator } from 'test_utils/image_comparator'; diff --git a/src/plugins/region_map/public/choropleth_layer.js b/src/plugins/region_map/public/choropleth_layer.js index 30fa8b544cdec..3fd9e246e9d37 100644 --- a/src/plugins/region_map/public/choropleth_layer.js +++ b/src/plugins/region_map/public/choropleth_layer.js @@ -18,7 +18,7 @@ */ import $ from 'jquery'; -import _ from 'lodash'; +import _ from 'lodash4'; import d3 from 'd3'; import { i18n } from '@kbn/i18n'; import * as topojson from 'topojson-client'; diff --git a/src/plugins/saved_objects/public/finder/saved_object_finder.test.tsx b/src/plugins/saved_objects/public/finder/saved_object_finder.test.tsx index 8a644a718c9d3..8f624c6272174 100644 --- a/src/plugins/saved_objects/public/finder/saved_object_finder.test.tsx +++ b/src/plugins/saved_objects/public/finder/saved_object_finder.test.tsx @@ -17,7 +17,7 @@ * under the License. */ -jest.mock('lodash', () => ({ +jest.mock('lodash4', () => ({ debounce: (fn: any) => fn, })); diff --git a/src/plugins/saved_objects/public/finder/saved_object_finder.tsx b/src/plugins/saved_objects/public/finder/saved_object_finder.tsx index 9ef4f2fbe7c55..28b552604b066 100644 --- a/src/plugins/saved_objects/public/finder/saved_object_finder.tsx +++ b/src/plugins/saved_objects/public/finder/saved_object_finder.tsx @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import PropTypes from 'prop-types'; import React from 'react'; diff --git a/src/plugins/saved_objects/public/saved_object/helpers/apply_es_resp.ts b/src/plugins/saved_objects/public/saved_object/helpers/apply_es_resp.ts index 47390c7dc9104..0b9d973dc9f24 100644 --- a/src/plugins/saved_objects/public/saved_object/helpers/apply_es_resp.ts +++ b/src/plugins/saved_objects/public/saved_object/helpers/apply_es_resp.ts @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { EsResponse, SavedObject, SavedObjectConfig, SavedObjectKibanaServices } from '../../types'; import { SavedObjectNotFound } from '../../../../kibana_utils/public'; import { diff --git a/src/plugins/saved_objects/public/saved_object/helpers/build_saved_object.ts b/src/plugins/saved_objects/public/saved_object/helpers/build_saved_object.ts index fdc8d79c9428a..b604f2e8b5f89 100644 --- a/src/plugins/saved_objects/public/saved_object/helpers/build_saved_object.ts +++ b/src/plugins/saved_objects/public/saved_object/helpers/build_saved_object.ts @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { once } from 'lodash'; +import { once } from 'lodash4'; import { hydrateIndexPattern } from './hydrate_index_pattern'; import { intializeSavedObject } from './initialize_saved_object'; import { serializeSavedObject } from './serialize_saved_object'; diff --git a/src/plugins/saved_objects/public/saved_object/helpers/create_source.ts b/src/plugins/saved_objects/public/saved_object/helpers/create_source.ts index 25ed4d527b833..4d6da734fd0a8 100644 --- a/src/plugins/saved_objects/public/saved_object/helpers/create_source.ts +++ b/src/plugins/saved_objects/public/saved_object/helpers/create_source.ts @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { i18n } from '@kbn/i18n'; import { SavedObjectAttributes } from 'kibana/public'; import { SavedObject, SavedObjectKibanaServices } from '../../types'; diff --git a/src/plugins/saved_objects/public/saved_object/helpers/initialize_saved_object.ts b/src/plugins/saved_objects/public/saved_object/helpers/initialize_saved_object.ts index ae8d7ac8a6526..efd772edce292 100644 --- a/src/plugins/saved_objects/public/saved_object/helpers/initialize_saved_object.ts +++ b/src/plugins/saved_objects/public/saved_object/helpers/initialize_saved_object.ts @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { SavedObjectsClientContract } from 'kibana/public'; import { SavedObject, SavedObjectConfig } from '../../types'; diff --git a/src/plugins/saved_objects/public/saved_object/helpers/save_with_confirmation.ts b/src/plugins/saved_objects/public/saved_object/helpers/save_with_confirmation.ts index b413ea19a932d..255bb6786786a 100644 --- a/src/plugins/saved_objects/public/saved_object/helpers/save_with_confirmation.ts +++ b/src/plugins/saved_objects/public/saved_object/helpers/save_with_confirmation.ts @@ -17,7 +17,7 @@ * under the License. */ -import { get } from 'lodash'; +import { get } from 'lodash4'; import { i18n } from '@kbn/i18n'; import { SavedObjectAttributes, diff --git a/src/plugins/saved_objects/public/saved_object/helpers/serialize_saved_object.ts b/src/plugins/saved_objects/public/saved_object/helpers/serialize_saved_object.ts index 24e467ad18ac4..0afb985425b81 100644 --- a/src/plugins/saved_objects/public/saved_object/helpers/serialize_saved_object.ts +++ b/src/plugins/saved_objects/public/saved_object/helpers/serialize_saved_object.ts @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { SavedObject, SavedObjectConfig } from '../../types'; import { extractSearchSourceReferences, expandShorthand } from '../../../../data/public'; diff --git a/src/plugins/saved_objects_management/public/lib/case_conversion.ts b/src/plugins/saved_objects_management/public/lib/case_conversion.ts index 718530eb3b602..654cbffee28c8 100644 --- a/src/plugins/saved_objects_management/public/lib/case_conversion.ts +++ b/src/plugins/saved_objects_management/public/lib/case_conversion.ts @@ -17,7 +17,7 @@ * under the License. */ -import { mapKeys, camelCase } from 'lodash'; +import { mapKeys, camelCase } from 'lodash4'; export function keysToCamelCaseShallow(object: Record) { return mapKeys(object, (value, key) => camelCase(key)); diff --git a/src/plugins/saved_objects_management/public/lib/create_field_list.ts b/src/plugins/saved_objects_management/public/lib/create_field_list.ts index 5f424751dd58e..902f077761d18 100644 --- a/src/plugins/saved_objects_management/public/lib/create_field_list.ts +++ b/src/plugins/saved_objects_management/public/lib/create_field_list.ts @@ -17,7 +17,7 @@ * under the License. */ -import { forOwn, indexBy, isNumber, isBoolean, isPlainObject, isString } from 'lodash'; +import { forOwn, keyBy, isNumber, isBoolean, isPlainObject, isString } from 'lodash4'; import { SimpleSavedObject } from '../../../../core/public'; import { castEsToKbnFieldTypeName } from '../../../data/public'; import { ObjectField } from '../management_section/types'; @@ -93,9 +93,9 @@ const addFieldsFromClass = function ( Class: { mapping: Record; searchSource: any }, fields: ObjectField[] ) { - const fieldMap = indexBy(fields, 'name'); + const fieldMap = keyBy(fields, 'name'); - _.forOwn(Class.mapping, (esType, name) => { + forOwn(Class.mapping, (esType, name) => { if (!name || fieldMap[name]) { return; } diff --git a/src/plugins/saved_objects_management/public/lib/get_relationships.ts b/src/plugins/saved_objects_management/public/lib/get_relationships.ts index bf2e651aa6593..a2ba11ce0bc84 100644 --- a/src/plugins/saved_objects_management/public/lib/get_relationships.ts +++ b/src/plugins/saved_objects_management/public/lib/get_relationships.ts @@ -18,7 +18,7 @@ */ import { HttpStart } from 'src/core/public'; -import { get } from 'lodash'; +import { get } from 'lodash4'; import { SavedObjectRelation } from '../types'; export async function getRelationships( diff --git a/src/plugins/saved_objects_management/public/lib/numeric.ts b/src/plugins/saved_objects_management/public/lib/numeric.ts index c7bc6c26a378f..525e5c1845ea2 100644 --- a/src/plugins/saved_objects_management/public/lib/numeric.ts +++ b/src/plugins/saved_objects_management/public/lib/numeric.ts @@ -17,7 +17,7 @@ * under the License. */ -import { isNaN } from 'lodash'; +import { isNaN } from 'lodash4'; export function isNumeric(v: any): boolean { return !isNaN(v) && (typeof v === 'number' || (!Array.isArray(v) && !isNaN(parseFloat(v)))); diff --git a/src/plugins/saved_objects_management/public/lib/resolve_saved_objects.ts b/src/plugins/saved_objects_management/public/lib/resolve_saved_objects.ts index 79b8c33b84cfe..7fb86afede699 100644 --- a/src/plugins/saved_objects_management/public/lib/resolve_saved_objects.ts +++ b/src/plugins/saved_objects_management/public/lib/resolve_saved_objects.ts @@ -18,7 +18,7 @@ */ import { i18n } from '@kbn/i18n'; -import { cloneDeep } from 'lodash'; +import { cloneDeep } from 'lodash4'; import { OverlayStart, SavedObjectReference } from 'src/core/public'; import { SavedObject, SavedObjectLoader } from '../../../saved_objects/public'; import { diff --git a/src/plugins/saved_objects_management/public/management_section/object_view/components/form.tsx b/src/plugins/saved_objects_management/public/management_section/object_view/components/form.tsx index d273ffb4c1052..769d1d69a06c3 100644 --- a/src/plugins/saved_objects_management/public/management_section/object_view/components/form.tsx +++ b/src/plugins/saved_objects_management/public/management_section/object_view/components/form.tsx @@ -26,7 +26,7 @@ import { EuiButtonEmpty, EuiSpacer, } from '@elastic/eui'; -import { cloneDeep, set } from 'lodash'; +import { cloneDeep, set } from 'lodash4'; import { i18n } from '@kbn/i18n'; import { FormattedMessage } from '@kbn/i18n/react'; import { SimpleSavedObject, SavedObjectsClientContract } from '../../../../../../core/public'; diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.tsx b/src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.tsx index 6e7397d1058bf..8884f23e5035a 100644 --- a/src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.tsx +++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.tsx @@ -18,7 +18,7 @@ */ import React, { Component, Fragment } from 'react'; -import { take, get as getField } from 'lodash'; +import { take, get as getField } from 'lodash4'; import { EuiFlyout, EuiFlyoutBody, diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.test.mocks.ts b/src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.test.mocks.ts index 6b4659a6b5a13..7bdc65b1e73dd 100644 --- a/src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.test.mocks.ts +++ b/src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.test.mocks.ts @@ -22,8 +22,8 @@ jest.doMock('@elastic/filesaver', () => ({ saveAs: saveAsMock, })); -jest.doMock('lodash', () => ({ - ...jest.requireActual('lodash'), +jest.doMock('lodash4', () => ({ + ...jest.requireActual('lodash4'), debounce: (func: Function) => { function debounced(this: any, ...args: any[]) { return func.apply(this, args); diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.tsx b/src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.tsx index 54bc649c33b60..ba02aa9c50236 100644 --- a/src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.tsx +++ b/src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.tsx @@ -18,7 +18,7 @@ */ import React, { Component } from 'react'; -import { debounce } from 'lodash'; +import { debounce } from 'lodash4'; // @ts-ignore import { saveAs } from '@elastic/filesaver'; import { diff --git a/src/plugins/saved_objects_management/public/management_section/saved_objects_table_page.tsx b/src/plugins/saved_objects_management/public/management_section/saved_objects_table_page.tsx index 75692777f08bb..5ba73bd32b8f7 100644 --- a/src/plugins/saved_objects_management/public/management_section/saved_objects_table_page.tsx +++ b/src/plugins/saved_objects_management/public/management_section/saved_objects_table_page.tsx @@ -18,7 +18,7 @@ */ import React, { useEffect } from 'react'; -import { get } from 'lodash'; +import { get } from 'lodash4'; import { i18n } from '@kbn/i18n'; import { CoreStart, ChromeBreadcrumb } from 'src/core/public'; import { DataPublicPluginStart } from '../../../data/public'; @@ -78,7 +78,7 @@ const SavedObjectsTablePage = ({ }} canGoInApp={(savedObject) => { const { inAppUrl } = savedObject.meta; - return inAppUrl ? get(capabilities, inAppUrl.uiCapabilitiesPath) : false; + return inAppUrl ? (get(capabilities, inAppUrl.uiCapabilitiesPath) as any) : false; }} /> ); diff --git a/src/plugins/saved_objects_management/server/lib/find_all.test.ts b/src/plugins/saved_objects_management/server/lib/find_all.test.ts index 2515d11f6d4bb..04d7c3ca7934a 100644 --- a/src/plugins/saved_objects_management/server/lib/find_all.test.ts +++ b/src/plugins/saved_objects_management/server/lib/find_all.test.ts @@ -17,7 +17,7 @@ * under the License. */ -import { times } from 'lodash'; +import { times } from 'lodash4'; import { SavedObjectsFindOptions, SavedObject } from 'src/core/server'; import { savedObjectsClientMock } from '../../../../core/server/mocks'; import { findAll } from './find_all'; diff --git a/src/plugins/share/server/routes/lib/short_url_assert_valid.ts b/src/plugins/share/server/routes/lib/short_url_assert_valid.ts index 2f120bbc03cd7..fe61855f97ce6 100644 --- a/src/plugins/share/server/routes/lib/short_url_assert_valid.ts +++ b/src/plugins/share/server/routes/lib/short_url_assert_valid.ts @@ -18,7 +18,7 @@ */ import { parse } from 'url'; -import { trim } from 'lodash'; +import { trim } from 'lodash4'; import Boom from 'boom'; export function shortUrlAssertValid(url: string) { diff --git a/src/plugins/share/server/routes/lib/short_url_lookup.ts b/src/plugins/share/server/routes/lib/short_url_lookup.ts index a858b7c54ac4f..0a3983972fee7 100644 --- a/src/plugins/share/server/routes/lib/short_url_lookup.ts +++ b/src/plugins/share/server/routes/lib/short_url_lookup.ts @@ -18,7 +18,7 @@ */ import crypto from 'crypto'; -import { get } from 'lodash'; +import { get } from 'lodash4'; import { Logger, SavedObject, SavedObjectsClientContract } from 'kibana/server'; diff --git a/src/plugins/share/server/saved_objects/url.ts b/src/plugins/share/server/saved_objects/url.ts index 3103777179741..7f2f8fa1d3ff4 100644 --- a/src/plugins/share/server/saved_objects/url.ts +++ b/src/plugins/share/server/saved_objects/url.ts @@ -16,8 +16,8 @@ * specific language governing permissions and limitations * under the License. */ -import { SavedObjectMigrationFn, SavedObjectsType } from 'kibana/server'; -import { flow } from 'lodash'; +import { SavedObjectsType } from 'kibana/server'; +import { flow } from 'lodash4'; import { migrateLegacyKibanaAppShortUrls } from './kibana_app_migration'; export const url: SavedObjectsType = { @@ -33,7 +33,7 @@ export const url: SavedObjectsType = { }, }, migrations: { - '7.9.0': flow(migrateLegacyKibanaAppShortUrls), + '7.9.0': flow(migrateLegacyKibanaAppShortUrls), }, mappings: { properties: { diff --git a/src/plugins/telemetry/server/telemetry_collection/__tests__/get_local_stats.js b/src/plugins/telemetry/server/telemetry_collection/__tests__/get_local_stats.js index 29076537e9ae8..d44bd16b1b43c 100644 --- a/src/plugins/telemetry/server/telemetry_collection/__tests__/get_local_stats.js +++ b/src/plugins/telemetry/server/telemetry_collection/__tests__/get_local_stats.js @@ -23,7 +23,7 @@ import sinon from 'sinon'; import { mockGetClusterInfo } from './get_cluster_info'; import { mockGetClusterStats } from './get_cluster_stats'; -import { omit } from 'lodash'; +import { omit } from 'lodash4'; import { getLocalStats, handleLocalStats } from '../get_local_stats'; const mockUsageCollection = (kibanaUsage = {}) => ({ diff --git a/src/plugins/telemetry/server/telemetry_collection/get_kibana.ts b/src/plugins/telemetry/server/telemetry_collection/get_kibana.ts index 645c5a4be8a6c..a8681c987f994 100644 --- a/src/plugins/telemetry/server/telemetry_collection/get_kibana.ts +++ b/src/plugins/telemetry/server/telemetry_collection/get_kibana.ts @@ -17,7 +17,7 @@ * under the License. */ -import { omit } from 'lodash'; +import { omit } from 'lodash4'; import { UsageCollectionSetup } from 'src/plugins/usage_collection/server'; import { APICaller } from 'kibana/server'; import { StatsCollectionContext } from 'src/plugins/telemetry_collection_manager/server'; diff --git a/src/plugins/tile_map/public/css_filters.js b/src/plugins/tile_map/public/css_filters.js index b41ea6955663b..157c548838323 100644 --- a/src/plugins/tile_map/public/css_filters.js +++ b/src/plugins/tile_map/public/css_filters.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; /** * just a place to put feature detection checks diff --git a/src/plugins/tile_map/public/geohash_layer.js b/src/plugins/tile_map/public/geohash_layer.js index ca2f49a1f31e0..b6cdbd988fc2b 100644 --- a/src/plugins/tile_map/public/geohash_layer.js +++ b/src/plugins/tile_map/public/geohash_layer.js @@ -17,7 +17,7 @@ * under the License. */ -import { min, isEqual } from 'lodash'; +import { min, isEqual } from 'lodash4'; import { i18n } from '@kbn/i18n'; import { L, KibanaMapLayer, MapTypes } from '../../maps_legacy/public'; import { HeatmapMarkers } from './markers/heatmap'; diff --git a/src/plugins/tile_map/public/markers/heatmap.js b/src/plugins/tile_map/public/markers/heatmap.js index f2d014797bce0..43379fa53470c 100644 --- a/src/plugins/tile_map/public/markers/heatmap.js +++ b/src/plugins/tile_map/public/markers/heatmap.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import d3 from 'd3'; import { EventEmitter } from 'events'; import { L } from '../../../maps_legacy/public'; diff --git a/src/plugins/tile_map/public/markers/scaled_circles.js b/src/plugins/tile_map/public/markers/scaled_circles.js index cb111107f6fe3..6bd1f5b067438 100644 --- a/src/plugins/tile_map/public/markers/scaled_circles.js +++ b/src/plugins/tile_map/public/markers/scaled_circles.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import d3 from 'd3'; import $ from 'jquery'; import { EventEmitter } from 'events'; diff --git a/src/plugins/tile_map/public/markers/shaded_circles.js b/src/plugins/tile_map/public/markers/shaded_circles.js index 745d0422856c6..24020cb1ecdf6 100644 --- a/src/plugins/tile_map/public/markers/shaded_circles.js +++ b/src/plugins/tile_map/public/markers/shaded_circles.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { ScaledCirclesMarkers } from './scaled_circles'; import { L } from '../../../maps_legacy/public'; diff --git a/src/plugins/tile_map/public/tile_map_visualization.js b/src/plugins/tile_map/public/tile_map_visualization.js index 1f4e5f09a9aa4..84104b52b82bd 100644 --- a/src/plugins/tile_map/public/tile_map_visualization.js +++ b/src/plugins/tile_map/public/tile_map_visualization.js @@ -17,7 +17,7 @@ * under the License. */ -import { get } from 'lodash'; +import { get } from 'lodash4'; import { GeohashLayer } from './geohash_layer'; import { getFormatService, getQueryService } from './services'; import { scaleBounds, geoContains, mapTooltipProvider } from '../../maps_legacy/public'; diff --git a/src/plugins/ui_actions/public/context_menu/build_eui_context_menu_panels.tsx b/src/plugins/ui_actions/public/context_menu/build_eui_context_menu_panels.tsx index 74e9ef96b575b..82cceb04a687f 100644 --- a/src/plugins/ui_actions/public/context_menu/build_eui_context_menu_panels.tsx +++ b/src/plugins/ui_actions/public/context_menu/build_eui_context_menu_panels.tsx @@ -19,7 +19,7 @@ import * as React from 'react'; import { EuiContextMenuPanelDescriptor, EuiContextMenuPanelItemDescriptor } from '@elastic/eui'; -import _ from 'lodash'; +import _ from 'lodash4'; import { i18n } from '@kbn/i18n'; import { uiToReactComponent } from '../../../kibana_react/public'; import { Action } from '../actions'; diff --git a/src/plugins/usage_collection/server/collector/collector_set.test.ts b/src/plugins/usage_collection/server/collector/collector_set.test.ts index ced5206cee318..4cf1601713fee 100644 --- a/src/plugins/usage_collection/server/collector/collector_set.test.ts +++ b/src/plugins/usage_collection/server/collector/collector_set.test.ts @@ -17,7 +17,7 @@ * under the License. */ -import { noop } from 'lodash'; +import { noop } from 'lodash4'; import { Collector } from './collector'; import { CollectorSet } from './collector_set'; import { UsageCollector } from './usage_collector'; diff --git a/src/plugins/usage_collection/server/collector/collector_set.ts b/src/plugins/usage_collection/server/collector/collector_set.ts index e8791138c5e26..12f354509b764 100644 --- a/src/plugins/usage_collection/server/collector/collector_set.ts +++ b/src/plugins/usage_collection/server/collector/collector_set.ts @@ -17,7 +17,7 @@ * under the License. */ -import { snakeCase } from 'lodash'; +import { snakeCase } from 'lodash4'; import { Logger, APICaller } from 'kibana/server'; import { Collector, CollectorOptions } from './collector'; import { UsageCollector } from './usage_collector'; diff --git a/src/plugins/vis_default_editor/public/components/agg_group_helper.tsx b/src/plugins/vis_default_editor/public/components/agg_group_helper.tsx index a5a949ce66c82..226b108444b31 100644 --- a/src/plugins/vis_default_editor/public/components/agg_group_helper.tsx +++ b/src/plugins/vis_default_editor/public/components/agg_group_helper.tsx @@ -17,7 +17,7 @@ * under the License. */ -import { findIndex, isEmpty } from 'lodash'; +import { findIndex, isEmpty } from 'lodash4'; import { IAggConfig } from 'src/plugins/data/public'; import { AggsState } from './agg_group_state'; import { Schema, getSchemaByName } from '../schemas'; diff --git a/src/plugins/vis_default_editor/public/components/agg_params_helper.ts b/src/plugins/vis_default_editor/public/components/agg_params_helper.ts index 45abbf8d2b2dd..6044007fdf9a2 100644 --- a/src/plugins/vis_default_editor/public/components/agg_params_helper.ts +++ b/src/plugins/vis_default_editor/public/components/agg_params_helper.ts @@ -17,7 +17,7 @@ * under the License. */ -import { get, isEmpty } from 'lodash'; +import { get, isEmpty } from 'lodash4'; import { IAggConfig, @@ -87,7 +87,7 @@ function getAggParamsToRender({ // should be refactored in the future to provide a more general way // for visualization to override some agg config settings if (agg.type.name === 'top_hits' && param.name === 'field') { - const allowStrings = _.get(schema, `aggSettings[${agg.type.name}].allowStrings`, false); + const allowStrings = get(schema, `aggSettings[${agg.type.name}].allowStrings`, false); if (!allowStrings) { availableFields = availableFields.filter((field) => field.type === 'number'); } diff --git a/src/plugins/vis_default_editor/public/components/agg_select.tsx b/src/plugins/vis_default_editor/public/components/agg_select.tsx index 8d03940a92d34..08ca350a9126e 100644 --- a/src/plugins/vis_default_editor/public/components/agg_select.tsx +++ b/src/plugins/vis_default_editor/public/components/agg_select.tsx @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { get, has } from 'lodash'; +import { get, has } from 'lodash4'; import React, { useEffect, useCallback, useState } from 'react'; import { EuiComboBox, EuiComboBoxOptionOption, EuiFormRow, EuiLink, EuiText } from '@elastic/eui'; diff --git a/src/plugins/vis_default_editor/public/components/controls/components/input_list.tsx b/src/plugins/vis_default_editor/public/components/controls/components/input_list.tsx index a0bc0d78a2889..668636671efbe 100644 --- a/src/plugins/vis_default_editor/public/components/controls/components/input_list.tsx +++ b/src/plugins/vis_default_editor/public/components/controls/components/input_list.tsx @@ -18,7 +18,7 @@ */ import React, { useState, useEffect, Fragment, useCallback } from 'react'; -import { isEmpty, isEqual, mapValues, omit, pick } from 'lodash'; +import { isEmpty, isEqual, mapValues, omitBy, pick } from 'lodash4'; import { EuiButtonIcon, EuiFlexGroup, @@ -173,7 +173,7 @@ function InputList({ config, list, onChange, setValidity }: InputListProps) { const model: InputObject = mapValues(pick(models[index], modelNames), 'model'); // we need to skip empty values since they are not stored in saved object - return !isEqual(item, omit(model, isEmpty)); + return !isEqual(item, omitBy(model, isEmpty)); }) ) { setModels( diff --git a/src/plugins/vis_default_editor/public/components/controls/components/number_list/range.test.ts b/src/plugins/vis_default_editor/public/components/controls/components/number_list/range.test.ts index c50ac929dc7bd..cb15d7448afb4 100644 --- a/src/plugins/vis_default_editor/public/components/controls/components/number_list/range.test.ts +++ b/src/plugins/vis_default_editor/public/components/controls/components/number_list/range.test.ts @@ -17,7 +17,7 @@ * under the License. */ -import { forOwn } from 'lodash'; +import { forOwn } from 'lodash4'; import { parseRange } from './range'; describe('Range parsing utility', () => { diff --git a/src/plugins/vis_default_editor/public/components/controls/components/number_list/utils.ts b/src/plugins/vis_default_editor/public/components/controls/components/number_list/utils.ts index 6eaef3050029a..be60ddae01219 100644 --- a/src/plugins/vis_default_editor/public/components/controls/components/number_list/utils.ts +++ b/src/plugins/vis_default_editor/public/components/controls/components/number_list/utils.ts @@ -17,7 +17,7 @@ * under the License. */ -import { last } from 'lodash'; +import { last } from 'lodash4'; import { i18n } from '@kbn/i18n'; import { htmlIdGenerator } from '@elastic/eui'; @@ -105,7 +105,7 @@ function validateValueUnique( } function getNextModel(list: NumberRowModel[], range: NumberListRange): NumberRowModel { - const lastValue = last(list).value; + const lastValue = (last(list) as any).value; let next = Number(lastValue) ? Number(lastValue) + 1 : 1; if (next >= range.max) { diff --git a/src/plugins/vis_default_editor/public/components/controls/components/simple_number_list.tsx b/src/plugins/vis_default_editor/public/components/controls/components/simple_number_list.tsx index 079fa95d362ac..d48c736eb9d2f 100644 --- a/src/plugins/vis_default_editor/public/components/controls/components/simple_number_list.tsx +++ b/src/plugins/vis_default_editor/public/components/controls/components/simple_number_list.tsx @@ -18,7 +18,7 @@ */ import React, { Fragment, useCallback, useEffect, useMemo, useState } from 'react'; -import { isArray } from 'lodash'; +import { isArray } from 'lodash4'; import { EuiButtonEmpty, EuiFlexItem, EuiFormRow, EuiSpacer, htmlIdGenerator } from '@elastic/eui'; import { FormattedMessage } from '@kbn/i18n/react'; import { EMPTY_STRING, getInitModelList, getRange, parse } from './number_list/utils'; diff --git a/src/plugins/vis_default_editor/public/components/controls/date_ranges.tsx b/src/plugins/vis_default_editor/public/components/controls/date_ranges.tsx index d3cf87c9ef14a..8e1dc464e3ab3 100644 --- a/src/plugins/vis_default_editor/public/components/controls/date_ranges.tsx +++ b/src/plugins/vis_default_editor/public/components/controls/date_ranges.tsx @@ -35,7 +35,7 @@ import { import dateMath from '@elastic/datemath'; import { FormattedMessage } from '@kbn/i18n/react'; import { i18n } from '@kbn/i18n'; -import { isEqual, omit } from 'lodash'; +import { isEqual, omit } from 'lodash4'; import { useMount } from 'react-use'; import { useKibana } from '../../../../kibana_react/public'; diff --git a/src/plugins/vis_default_editor/public/components/controls/extended_bounds.tsx b/src/plugins/vis_default_editor/public/components/controls/extended_bounds.tsx index 11df63c9a3fa1..516347625aaaa 100644 --- a/src/plugins/vis_default_editor/public/components/controls/extended_bounds.tsx +++ b/src/plugins/vis_default_editor/public/components/controls/extended_bounds.tsx @@ -21,7 +21,7 @@ import React, { ChangeEvent } from 'react'; import { EuiFieldNumber, EuiFlexGroup, EuiFlexItem, EuiFormRow } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; -import { isUndefined } from 'lodash'; +import { isUndefined } from 'lodash4'; import { useValidation } from './utils'; import { AggParamEditorProps } from '../agg_param_props'; diff --git a/src/plugins/vis_default_editor/public/components/controls/field.tsx b/src/plugins/vis_default_editor/public/components/controls/field.tsx index 24d94c2b18feb..3e5f46438aab8 100644 --- a/src/plugins/vis_default_editor/public/components/controls/field.tsx +++ b/src/plugins/vis_default_editor/public/components/controls/field.tsx @@ -17,7 +17,7 @@ * under the License. */ -import { get } from 'lodash'; +import { get } from 'lodash4'; import React, { useState, useCallback } from 'react'; import { useMount } from 'react-use'; diff --git a/src/plugins/vis_default_editor/public/components/controls/filters.tsx b/src/plugins/vis_default_editor/public/components/controls/filters.tsx index 9a9933b5e1e83..cd8f596c426d6 100644 --- a/src/plugins/vis_default_editor/public/components/controls/filters.tsx +++ b/src/plugins/vis_default_editor/public/components/controls/filters.tsx @@ -18,7 +18,7 @@ */ import React, { useState, useEffect } from 'react'; -import { omit, isEqual } from 'lodash'; +import { omit, isEqual } from 'lodash4'; import { htmlIdGenerator, EuiButton, EuiSpacer } from '@elastic/eui'; import { FormattedMessage } from '@kbn/i18n/react'; import { useMount } from 'react-use'; @@ -43,7 +43,9 @@ function FiltersParamEditor({ agg, value = [], setValue }: AggParamEditorProps { // set parsed values into model after initialization - setValue(filters.map((filter) => omit({ ...filter, input: filter.input }, 'id'))); + setValue( + filters.map((filter) => omit({ ...filter, input: filter.input }, 'id') as FilterValue) + ); }); useEffect(() => { @@ -58,7 +60,7 @@ function FiltersParamEditor({ agg, value = [], setValue }: AggParamEditorProps { // do not set internal id parameter into saved object - setValue(updatedFilters.map((filter) => omit(filter, 'id'))); + setValue(updatedFilters.map((filter) => omit(filter, 'id') as FilterValue)); setFilters(updatedFilters); }; diff --git a/src/plugins/vis_default_editor/public/components/controls/number_interval.tsx b/src/plugins/vis_default_editor/public/components/controls/number_interval.tsx index 0d21eb04c12b2..be24a626c6126 100644 --- a/src/plugins/vis_default_editor/public/components/controls/number_interval.tsx +++ b/src/plugins/vis_default_editor/public/components/controls/number_interval.tsx @@ -17,7 +17,7 @@ * under the License. */ -import { get } from 'lodash'; +import { get } from 'lodash4'; import React, { useEffect, useCallback } from 'react'; import { EuiFieldNumber, EuiFormRow, EuiIconTip } from '@elastic/eui'; @@ -56,7 +56,7 @@ function NumberIntervalParamEditor({ setValidity, setValue, }: AggParamEditorProps) { - const base: number = get(editorConfig, 'interval.base'); + const base: number = get(editorConfig, 'interval.base') as number; const min = base || 0; const isValid = value !== undefined && value >= min; diff --git a/src/plugins/vis_default_editor/public/components/controls/ranges.tsx b/src/plugins/vis_default_editor/public/components/controls/ranges.tsx index e5f5b53a3d879..d5aa43f765899 100644 --- a/src/plugins/vis_default_editor/public/components/controls/ranges.tsx +++ b/src/plugins/vis_default_editor/public/components/controls/ranges.tsx @@ -34,7 +34,7 @@ import { } from '@elastic/eui'; import { FormattedMessage } from '@kbn/i18n/react'; import { i18n } from '@kbn/i18n'; -import { isEqual, omit } from 'lodash'; +import { isEqual, omit } from 'lodash4'; const FROM_PLACEHOLDER = '\u2212\u221E'; const TO_PLACEHOLDER = '+\u221E'; diff --git a/src/plugins/vis_default_editor/public/components/controls/size.tsx b/src/plugins/vis_default_editor/public/components/controls/size.tsx index 159607cbdbd57..656fd15c6c770 100644 --- a/src/plugins/vis_default_editor/public/components/controls/size.tsx +++ b/src/plugins/vis_default_editor/public/components/controls/size.tsx @@ -18,7 +18,7 @@ */ import React, { useEffect } from 'react'; -import { isUndefined } from 'lodash'; +import { isUndefined } from 'lodash4'; import { EuiFormRow, EuiFieldNumber } from '@elastic/eui'; import { FormattedMessage } from '@kbn/i18n/react'; diff --git a/src/plugins/vis_default_editor/public/components/controls/time_interval.tsx b/src/plugins/vis_default_editor/public/components/controls/time_interval.tsx index 4af41f67bc524..49767f7e3fe45 100644 --- a/src/plugins/vis_default_editor/public/components/controls/time_interval.tsx +++ b/src/plugins/vis_default_editor/public/components/controls/time_interval.tsx @@ -17,7 +17,7 @@ * under the License. */ -import { get, find } from 'lodash'; +import { get, find } from 'lodash4'; import React, { useEffect } from 'react'; import { EuiFormRow, EuiIconTip, EuiComboBox, EuiComboBoxOptionOption } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; @@ -107,7 +107,7 @@ function TimeIntervalParamEditor({ setTouched, setValidity, }: AggParamEditorProps) { - const timeBase: string = get(editorConfig, 'interval.timeBase'); + const timeBase: string = get(editorConfig, 'interval.timeBase') as string; const options = timeBase ? [] : ((aggParam as any).options || []).reduce( diff --git a/src/plugins/vis_default_editor/public/components/sidebar/data_tab.tsx b/src/plugins/vis_default_editor/public/components/sidebar/data_tab.tsx index 26567d05e0427..7af18cb9e1d75 100644 --- a/src/plugins/vis_default_editor/public/components/sidebar/data_tab.tsx +++ b/src/plugins/vis_default_editor/public/components/sidebar/data_tab.tsx @@ -18,7 +18,7 @@ */ import React, { useMemo, useCallback } from 'react'; -import { findLast } from 'lodash'; +import { findLast } from 'lodash4'; import { EuiSpacer } from '@elastic/eui'; import { @@ -74,7 +74,8 @@ function DefaultEditorDataTab({ ), [metricAggs] ); - const lastParentPipelineAggTitle = lastParentPipelineAgg && lastParentPipelineAgg.type.title; + const lastParentPipelineAggTitle = + lastParentPipelineAgg && (lastParentPipelineAgg as IAggConfig).type.title; const addSchema: AddSchema = useCallback((schema) => dispatch(addNewAgg(schema)), [dispatch]); @@ -116,7 +117,7 @@ function DefaultEditorDataTab({ setValidity, setTouched, removeAgg: onAggRemove, - }; + } as any; return ( <> diff --git a/src/plugins/vis_default_editor/public/components/sidebar/sidebar.tsx b/src/plugins/vis_default_editor/public/components/sidebar/sidebar.tsx index 837dd9bff2c6d..a1b63b8cbe517 100644 --- a/src/plugins/vis_default_editor/public/components/sidebar/sidebar.tsx +++ b/src/plugins/vis_default_editor/public/components/sidebar/sidebar.tsx @@ -18,7 +18,7 @@ */ import React, { useMemo, useState, useCallback, KeyboardEventHandler, useEffect } from 'react'; -import { get, isEqual } from 'lodash'; +import { get, isEqual } from 'lodash4'; import { i18n } from '@kbn/i18n'; import { keyCodes, EuiButtonIcon, EuiFlexGroup, EuiFlexItem } from '@elastic/eui'; import { EventEmitter } from 'events'; diff --git a/src/plugins/vis_default_editor/public/components/sidebar/state/reducers.ts b/src/plugins/vis_default_editor/public/components/sidebar/state/reducers.ts index f5efb6263166a..c4e0e5a1871b1 100644 --- a/src/plugins/vis_default_editor/public/components/sidebar/state/reducers.ts +++ b/src/plugins/vis_default_editor/public/components/sidebar/state/reducers.ts @@ -17,7 +17,7 @@ * under the License. */ -import { cloneDeep } from 'lodash'; +import { cloneDeep } from 'lodash4'; import { Vis } from 'src/plugins/visualizations/public'; import { AggGroupNames, DataPublicPluginStart } from '../../../../../data/public'; diff --git a/src/plugins/vis_default_editor/public/schemas.ts b/src/plugins/vis_default_editor/public/schemas.ts index 54520b85cb5ec..5acefa6fc87bb 100644 --- a/src/plugins/vis_default_editor/public/schemas.ts +++ b/src/plugins/vis_default_editor/public/schemas.ts @@ -17,7 +17,7 @@ * under the License. */ -import _, { defaults } from 'lodash'; +import _, { defaults } from 'lodash4'; import { Optional } from '@kbn/utility-types'; @@ -58,6 +58,7 @@ export class Schemas implements ISchemas { > ) { _(schemas || []) + .chain() .map((schema) => { if (!schema.name) throw new Error('all schema must have a unique name'); diff --git a/src/plugins/vis_type_metric/public/components/metric_vis_component.tsx b/src/plugins/vis_type_metric/public/components/metric_vis_component.tsx index 5e8a463748188..09fabc50d89bd 100644 --- a/src/plugins/vis_type_metric/public/components/metric_vis_component.tsx +++ b/src/plugins/vis_type_metric/public/components/metric_vis_component.tsx @@ -17,7 +17,7 @@ * under the License. */ -import { last, findIndex, isNaN } from 'lodash'; +import { last, findIndex, isNaN } from 'lodash4'; import React, { Component } from 'react'; import { isColorDark } from '@elastic/eui'; import { MetricVisValue } from './metric_vis_value'; @@ -41,7 +41,7 @@ export class MetricVisComponent extends Component { const config = this.props.visParams.metric; const isPercentageMode = config.percentageMode; const colorsRange = config.colorsRange; - const max = last(colorsRange).to; + const max = (last(colorsRange) as any).to; const labels: string[] = []; colorsRange.forEach((range: any) => { @@ -111,7 +111,7 @@ export class MetricVisComponent extends Component { const dimensions = this.props.visParams.dimensions; const isPercentageMode = config.percentageMode; const min = config.colorsRange[0].from; - const max = last(config.colorsRange).to; + const max = (last(config.colorsRange) as any).to; const colors = this.getColors(); const labels = this.getLabels(); const metrics: MetricVisMetric[] = []; diff --git a/src/plugins/vis_type_table/public/agg_table/agg_table.js b/src/plugins/vis_type_table/public/agg_table/agg_table.js index bd7626a493338..eadf985c50461 100644 --- a/src/plugins/vis_type_table/public/agg_table/agg_table.js +++ b/src/plugins/vis_type_table/public/agg_table/agg_table.js @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { CSV_SEPARATOR_SETTING, CSV_QUOTE_VALUES_SETTING } from '../../../share/public'; import aggTableTemplate from './agg_table.html'; import { getFormatService } from '../services'; diff --git a/src/plugins/vis_type_table/public/components/table_vis_options.tsx b/src/plugins/vis_type_table/public/components/table_vis_options.tsx index d220a6b2db842..55a7993cd668b 100644 --- a/src/plugins/vis_type_table/public/components/table_vis_options.tsx +++ b/src/plugins/vis_type_table/public/components/table_vis_options.tsx @@ -17,7 +17,7 @@ * under the License. */ -import { get } from 'lodash'; +import { get } from 'lodash4'; import React, { useEffect, useMemo } from 'react'; import { EuiIconTip, EuiPanel } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; diff --git a/src/plugins/vis_type_table/public/paginated_table/paginated_table.js b/src/plugins/vis_type_table/public/paginated_table/paginated_table.js index b1810e7143326..4fc5b933e55a2 100644 --- a/src/plugins/vis_type_table/public/paginated_table/paginated_table.js +++ b/src/plugins/vis_type_table/public/paginated_table/paginated_table.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import paginatedTableTemplate from './paginated_table.html'; export function PaginatedTable($filter) { diff --git a/src/plugins/vis_type_table/public/paginated_table/paginated_table.test.ts b/src/plugins/vis_type_table/public/paginated_table/paginated_table.test.ts index de253f26ff9e7..16b0d86d78ee7 100644 --- a/src/plugins/vis_type_table/public/paginated_table/paginated_table.test.ts +++ b/src/plugins/vis_type_table/public/paginated_table/paginated_table.test.ts @@ -17,7 +17,7 @@ * under the License. */ -import { isNumber, times, identity, random } from 'lodash'; +import { isNumber, times, identity, random } from 'lodash4'; import angular, { IRootScopeService, IScope, ICompileService } from 'angular'; import $ from 'jquery'; import 'angular-sanitize'; diff --git a/src/plugins/vis_type_table/public/paginated_table/rows.js b/src/plugins/vis_type_table/public/paginated_table/rows.js index d2192a5843644..620bf98330e4d 100644 --- a/src/plugins/vis_type_table/public/paginated_table/rows.js +++ b/src/plugins/vis_type_table/public/paginated_table/rows.js @@ -18,7 +18,7 @@ */ import $ from 'jquery'; -import _ from 'lodash'; +import _ from 'lodash4'; import tableCellFilterHtml from './table_cell_filter.html'; export function KbnRows($compile) { diff --git a/src/plugins/vis_type_table/public/table_vis_controller.js b/src/plugins/vis_type_table/public/table_vis_controller.js index 8a620df986090..5d2922e62a51a 100644 --- a/src/plugins/vis_type_table/public/table_vis_controller.js +++ b/src/plugins/vis_type_table/public/table_vis_controller.js @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { assign } from 'lodash'; +import { assign } from 'lodash4'; export function TableVisController($scope) { const uiStateSort = $scope.uiState ? $scope.uiState.get('vis.params.sort') : {}; diff --git a/src/plugins/vis_type_timelion/common/lib/to_milliseconds.ts b/src/plugins/vis_type_timelion/common/lib/to_milliseconds.ts index 3dfa4602a9525..01b9880481068 100644 --- a/src/plugins/vis_type_timelion/common/lib/to_milliseconds.ts +++ b/src/plugins/vis_type_timelion/common/lib/to_milliseconds.ts @@ -17,7 +17,7 @@ * under the License. */ -import { keys } from 'lodash'; +import { keys } from 'lodash4'; import moment, { unitOfTime } from 'moment'; type Units = unitOfTime.Base | unitOfTime._quarter; diff --git a/src/plugins/vis_type_timelion/public/components/panel.tsx b/src/plugins/vis_type_timelion/public/components/panel.tsx index f4f1cd84613be..86dd1adebb0a8 100644 --- a/src/plugins/vis_type_timelion/public/components/panel.tsx +++ b/src/plugins/vis_type_timelion/public/components/panel.tsx @@ -20,7 +20,7 @@ import React, { useState, useEffect, useMemo, useCallback } from 'react'; import $ from 'jquery'; import moment from 'moment-timezone'; -import { debounce, compact, get, each, cloneDeep, last, map } from 'lodash'; +import { debounce, compact, get, each, cloneDeep, last, map } from 'lodash4'; import { useKibana } from '../../../kibana_react/public'; import '../flot'; diff --git a/src/plugins/vis_type_timelion/public/components/timelion_expression_input_helpers.ts b/src/plugins/vis_type_timelion/public/components/timelion_expression_input_helpers.ts index 8db057cdb3cc5..37cd6a6f42cf8 100644 --- a/src/plugins/vis_type_timelion/public/components/timelion_expression_input_helpers.ts +++ b/src/plugins/vis_type_timelion/public/components/timelion_expression_input_helpers.ts @@ -17,7 +17,7 @@ * under the License. */ -import { get, startsWith } from 'lodash'; +import { get, startsWith } from 'lodash4'; import { i18n } from '@kbn/i18n'; import { monaco } from '@kbn/monaco'; diff --git a/src/plugins/vis_type_timelion/public/helpers/arg_value_suggestions.ts b/src/plugins/vis_type_timelion/public/helpers/arg_value_suggestions.ts index 19ec46bd7f659..a69a3429c2fcb 100644 --- a/src/plugins/vis_type_timelion/public/helpers/arg_value_suggestions.ts +++ b/src/plugins/vis_type_timelion/public/helpers/arg_value_suggestions.ts @@ -17,7 +17,7 @@ * under the License. */ -import { get } from 'lodash'; +import { get } from 'lodash4'; import { getIndexPatterns, getSavedObjectsClient } from './plugin_services'; import { TimelionFunctionArgs } from '../../common/types'; import { indexPatterns as indexPatternsUtils, IndexPatternAttributes } from '../../../data/public'; diff --git a/src/plugins/vis_type_timelion/public/helpers/panel_utils.ts b/src/plugins/vis_type_timelion/public/helpers/panel_utils.ts index db29d9112be8e..47cbb7ed5b4bb 100644 --- a/src/plugins/vis_type_timelion/public/helpers/panel_utils.ts +++ b/src/plugins/vis_type_timelion/public/helpers/panel_utils.ts @@ -17,7 +17,7 @@ * under the License. */ -import { cloneDeep, defaults, merge, compact } from 'lodash'; +import { cloneDeep, defaults, mergeWith, compact } from 'lodash4'; import moment, { Moment } from 'moment-timezone'; import { TimefilterContract } from 'src/plugins/data/public'; @@ -91,7 +91,7 @@ function buildSeriesData(chart: Series[], options: jquery.flot.plotOptions) { } if (series._global) { - merge(options, series._global, (objVal, srcVal) => { + mergeWith(options, series._global, (objVal, srcVal) => { // This is kind of gross, it means that you can't replace a global value with a null // best you can do is an empty string. Deal with it. if (objVal == null) { diff --git a/src/plugins/vis_type_timelion/public/helpers/tick_formatters.ts b/src/plugins/vis_type_timelion/public/helpers/tick_formatters.ts index c80f9c3ed5f4b..2719131bf2f3b 100644 --- a/src/plugins/vis_type_timelion/public/helpers/tick_formatters.ts +++ b/src/plugins/vis_type_timelion/public/helpers/tick_formatters.ts @@ -17,7 +17,7 @@ * under the License. */ -import { get } from 'lodash'; +import { get } from 'lodash4'; import { Axis } from './panel_utils'; diff --git a/src/plugins/vis_type_timelion/public/timelion_vis_fn.ts b/src/plugins/vis_type_timelion/public/timelion_vis_fn.ts index c02f43818af9c..6fd68f0f974d5 100644 --- a/src/plugins/vis_type_timelion/public/timelion_vis_fn.ts +++ b/src/plugins/vis_type_timelion/public/timelion_vis_fn.ts @@ -17,7 +17,7 @@ * under the License. */ -import { get } from 'lodash'; +import { get } from 'lodash4'; import { i18n } from '@kbn/i18n'; import { ExpressionFunctionDefinition, @@ -27,6 +27,7 @@ import { import { getTimelionRequestHandler } from './helpers/timelion_request_handler'; import { TIMELION_VIS_NAME } from './timelion_vis_type'; import { TimelionVisDependencies } from './plugin'; +import { Filter, Query, TimeRange } from '../../data/common'; type Input = KibanaContext | null; type Output = Promise>; @@ -71,9 +72,9 @@ export const getTimelionVisualizationConfig = ( const visParams = { expression: args.expression, interval: args.interval }; const response = await timelionRequestHandler({ - timeRange: get(input, 'timeRange'), - query: get(input, 'query'), - filters: get(input, 'filters'), + timeRange: get(input, 'timeRange') as TimeRange, + query: get(input, 'query') as Query, + filters: get(input, 'filters') as Filter[], visParams, forceFetch: true, }); diff --git a/src/plugins/vis_type_timelion/server/fit_functions/average.js b/src/plugins/vis_type_timelion/server/fit_functions/average.js index 06db7bd0e9324..4f50dab4e9d0e 100644 --- a/src/plugins/vis_type_timelion/server/fit_functions/average.js +++ b/src/plugins/vis_type_timelion/server/fit_functions/average.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; // Upsampling and down sampling of non-cumulative sets // Good: min, max, average @@ -27,7 +27,7 @@ export default function average(dataTuples, targetTuples) { // Phase 1: Downsample // We necessarily won't well match the dataSource here as we don't know how much data // they had when creating their own average - const resultTimes = _.pluck(targetTuples, 0); + const resultTimes = _.map(targetTuples, 0); const dataTuplesQueue = _.clone(dataTuples); const resultValues = _.map(targetTuples, function (bucket) { const time = bucket[0]; diff --git a/src/plugins/vis_type_timelion/server/fit_functions/average.test.js b/src/plugins/vis_type_timelion/server/fit_functions/average.test.js index 595a5f79a2e13..72e78a7cd3f0b 100644 --- a/src/plugins/vis_type_timelion/server/fit_functions/average.test.js +++ b/src/plugins/vis_type_timelion/server/fit_functions/average.test.js @@ -20,7 +20,7 @@ import fn from './average'; import moment from 'moment'; const expect = require('chai').expect; -import _ from 'lodash'; +import _ from 'lodash4'; describe('average.js', function () { describe('average', function () { diff --git a/src/plugins/vis_type_timelion/server/fit_functions/carry.js b/src/plugins/vis_type_timelion/server/fit_functions/carry.js index 155ed9ebeecbf..8bcd3a55dc927 100644 --- a/src/plugins/vis_type_timelion/server/fit_functions/carry.js +++ b/src/plugins/vis_type_timelion/server/fit_functions/carry.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { i18n } from '@kbn/i18n'; // Upsampling of non-cumulative sets diff --git a/src/plugins/vis_type_timelion/server/fit_functions/carry.test.js b/src/plugins/vis_type_timelion/server/fit_functions/carry.test.js index 79575911d2022..5ed3bcc5c51e8 100644 --- a/src/plugins/vis_type_timelion/server/fit_functions/carry.test.js +++ b/src/plugins/vis_type_timelion/server/fit_functions/carry.test.js @@ -20,7 +20,7 @@ import fn from './carry'; import moment from 'moment'; const expect = require('chai').expect; -import _ from 'lodash'; +import _ from 'lodash4'; describe('carry.js', function () { it('fills holes in the data', function () { diff --git a/src/plugins/vis_type_timelion/server/fit_functions/nearest.js b/src/plugins/vis_type_timelion/server/fit_functions/nearest.js index f15f529b5fde4..3ddbe427ca8c2 100644 --- a/src/plugins/vis_type_timelion/server/fit_functions/nearest.js +++ b/src/plugins/vis_type_timelion/server/fit_functions/nearest.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; // Upsampling and downsampling of non-cumulative sets // Good: average, min, max diff --git a/src/plugins/vis_type_timelion/server/fit_functions/scale.js b/src/plugins/vis_type_timelion/server/fit_functions/scale.js index 3c80d8611b205..f81ecb9dd9a46 100644 --- a/src/plugins/vis_type_timelion/server/fit_functions/scale.js +++ b/src/plugins/vis_type_timelion/server/fit_functions/scale.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; // Downsampling of cumulative metrics // Good: count, sum diff --git a/src/plugins/vis_type_timelion/server/handlers/chain_runner.js b/src/plugins/vis_type_timelion/server/handlers/chain_runner.js index 59adea30730c7..8a6cab876f911 100644 --- a/src/plugins/vis_type_timelion/server/handlers/chain_runner.js +++ b/src/plugins/vis_type_timelion/server/handlers/chain_runner.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import Bluebird from 'bluebird'; import { i18n } from '@kbn/i18n'; import moment from 'moment'; @@ -132,7 +132,7 @@ export default function chainRunner(tlConfig) { }); }); return Bluebird.all(seriesList).then(function (args) { - const list = _.chain(args).pluck('list').flatten().value(); + const list = _.chain(args).map('list').flatten().value(); const seriesList = _.merge.apply(this, _.flatten([{}, args])); seriesList.list = list; return seriesList; diff --git a/src/plugins/vis_type_timelion/server/handlers/lib/arg_type.js b/src/plugins/vis_type_timelion/server/handlers/lib/arg_type.js index 69e105ebaac9f..eed880514d1d0 100644 --- a/src/plugins/vis_type_timelion/server/handlers/lib/arg_type.js +++ b/src/plugins/vis_type_timelion/server/handlers/lib/arg_type.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; export default function argType(arg) { if (Array.isArray(arg)) { diff --git a/src/plugins/vis_type_timelion/server/handlers/lib/index_arguments.js b/src/plugins/vis_type_timelion/server/handlers/lib/index_arguments.js index 7ea8cd362c94b..a02ee46dabd23 100644 --- a/src/plugins/vis_type_timelion/server/handlers/lib/index_arguments.js +++ b/src/plugins/vis_type_timelion/server/handlers/lib/index_arguments.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { i18n } from '@kbn/i18n'; // Only applies to already resolved arguments diff --git a/src/plugins/vis_type_timelion/server/handlers/lib/parse_sheet.js b/src/plugins/vis_type_timelion/server/handlers/lib/parse_sheet.js index a210cf594f48b..81fcbedb968bf 100644 --- a/src/plugins/vis_type_timelion/server/handlers/lib/parse_sheet.js +++ b/src/plugins/vis_type_timelion/server/handlers/lib/parse_sheet.js @@ -20,7 +20,7 @@ import { i18n } from '@kbn/i18n'; import fs from 'fs'; import path from 'path'; -import _ from 'lodash'; +import _ from 'lodash4'; const grammar = fs.readFileSync(path.resolve(__dirname, '../../../common/chain.peg'), 'utf8'); import PEG from 'pegjs'; const Parser = PEG.generate(grammar); diff --git a/src/plugins/vis_type_timelion/server/handlers/lib/preprocess_chain.js b/src/plugins/vis_type_timelion/server/handlers/lib/preprocess_chain.js index 78b71b8ced282..5b0ff61fbcb18 100644 --- a/src/plugins/vis_type_timelion/server/handlers/lib/preprocess_chain.js +++ b/src/plugins/vis_type_timelion/server/handlers/lib/preprocess_chain.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; export default function preProcessChainFn(tlConfig) { return function preProcessChain(chain, queries) { diff --git a/src/plugins/vis_type_timelion/server/handlers/lib/reposition_arguments.js b/src/plugins/vis_type_timelion/server/handlers/lib/reposition_arguments.js index aa9992495b201..619387f8fba77 100644 --- a/src/plugins/vis_type_timelion/server/handlers/lib/reposition_arguments.js +++ b/src/plugins/vis_type_timelion/server/handlers/lib/reposition_arguments.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { i18n } from '@kbn/i18n'; // Applies to unresolved arguments in the AST diff --git a/src/plugins/vis_type_timelion/server/handlers/lib/tl_config.js b/src/plugins/vis_type_timelion/server/handlers/lib/tl_config.js index bb97e92ef0eed..c043aad605340 100644 --- a/src/plugins/vis_type_timelion/server/handlers/lib/tl_config.js +++ b/src/plugins/vis_type_timelion/server/handlers/lib/tl_config.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import buildTarget from '../../lib/build_target.js'; export default function tlConfigFn(setup) { diff --git a/src/plugins/vis_type_timelion/server/handlers/lib/validate_arg.js b/src/plugins/vis_type_timelion/server/handlers/lib/validate_arg.js index 9b4fdddc2186e..9dfa1f9aed9a8 100644 --- a/src/plugins/vis_type_timelion/server/handlers/lib/validate_arg.js +++ b/src/plugins/vis_type_timelion/server/handlers/lib/validate_arg.js @@ -18,7 +18,7 @@ */ import argType from './arg_type'; -import _ from 'lodash'; +import _ from 'lodash4'; import { i18n } from '@kbn/i18n'; export default function validateArgFn(functionDef) { @@ -28,7 +28,7 @@ export default function validateArgFn(functionDef) { const multi = argDef.multi; const isCorrectType = (function () { // If argument is not allow to be specified multiple times, we're dealing with a plain value for type - if (!multi) return _.contains(required, type); + if (!multi) return _.includes(required, type); // If it is, we'll get an array for type return _.difference(type, required).length === 0; })(); diff --git a/src/plugins/vis_type_timelion/server/lib/alter.js b/src/plugins/vis_type_timelion/server/lib/alter.js index 46bf0a44aaf76..9923ec893b438 100644 --- a/src/plugins/vis_type_timelion/server/lib/alter.js +++ b/src/plugins/vis_type_timelion/server/lib/alter.js @@ -18,7 +18,7 @@ */ import Bluebird from 'bluebird'; -import _ from 'lodash'; +import _ from 'lodash4'; /* @param {Array} args * - args[0] must be a seriesList diff --git a/src/plugins/vis_type_timelion/server/lib/as_sorted.js b/src/plugins/vis_type_timelion/server/lib/as_sorted.js index 536145a6b8dcd..d7b7b0b2c87a4 100644 --- a/src/plugins/vis_type_timelion/server/lib/as_sorted.js +++ b/src/plugins/vis_type_timelion/server/lib/as_sorted.js @@ -17,10 +17,10 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import unzipPairs from './unzip_pairs.js'; export default function asSorted(timeValObject, fn) { const data = unzipPairs(timeValObject); - return _.zipObject(fn(data)); + return _.fromPairs(fn(data)); } diff --git a/src/plugins/vis_type_timelion/server/lib/classes/datasource.js b/src/plugins/vis_type_timelion/server/lib/classes/datasource.js index c694942ee8793..92d4b61034d00 100644 --- a/src/plugins/vis_type_timelion/server/lib/classes/datasource.js +++ b/src/plugins/vis_type_timelion/server/lib/classes/datasource.js @@ -22,7 +22,7 @@ import loadFunctions from '../load_functions.js'; const fitFunctions = loadFunctions('fit_functions'); import TimelionFunction from './timelion_function'; import { offsetTime, preprocessOffset } from '../offset_time'; -import _ from 'lodash'; +import _ from 'lodash4'; function offsetSeries(response, offset) { if (offset) { diff --git a/src/plugins/vis_type_timelion/server/lib/classes/timelion_function.js b/src/plugins/vis_type_timelion/server/lib/classes/timelion_function.js index 83466e263cf2f..f5f39a4eeeaa7 100644 --- a/src/plugins/vis_type_timelion/server/lib/classes/timelion_function.js +++ b/src/plugins/vis_type_timelion/server/lib/classes/timelion_function.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import loadFunctions from '../load_functions.js'; const fitFunctions = loadFunctions('fit_functions'); @@ -25,7 +25,7 @@ export default class TimelionFunction { constructor(name, config) { this.name = name; this.args = config.args || []; - this.argsByName = _.indexBy(this.args, 'name'); + this.argsByName = _.keyBy(this.args, 'name'); this.help = config.help || ''; this.aliases = config.aliases || []; this.extended = config.extended || false; diff --git a/src/plugins/vis_type_timelion/server/lib/functions_md.js b/src/plugins/vis_type_timelion/server/lib/functions_md.js index 275e27e5081a9..e3ebe4ac84992 100644 --- a/src/plugins/vis_type_timelion/server/lib/functions_md.js +++ b/src/plugins/vis_type_timelion/server/lib/functions_md.js @@ -19,7 +19,7 @@ import loadFunctions from './load_functions.js'; const functions = loadFunctions('series_functions/'); -import _ from 'lodash'; +import _ from 'lodash4'; export default (function () { const functionArray = _.map(functions, function (val, key) { diff --git a/src/plugins/vis_type_timelion/server/lib/get_namespaced_settings.js b/src/plugins/vis_type_timelion/server/lib/get_namespaced_settings.js index 51264decf8a31..d6cbeb4a678c7 100644 --- a/src/plugins/vis_type_timelion/server/lib/get_namespaced_settings.js +++ b/src/plugins/vis_type_timelion/server/lib/get_namespaced_settings.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import configFile from '../timelion.json'; export default function () { diff --git a/src/plugins/vis_type_timelion/server/lib/load_functions.js b/src/plugins/vis_type_timelion/server/lib/load_functions.js index d6cb63b7c427b..5e1d04a24390d 100644 --- a/src/plugins/vis_type_timelion/server/lib/load_functions.js +++ b/src/plugins/vis_type_timelion/server/lib/load_functions.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import glob from 'glob'; import path from 'path'; import processFunctionDefinition from './process_function_definition'; @@ -47,7 +47,7 @@ export default function (directory) { }) .value(); - const functions = _.zipObject(files.concat(directories)); + const functions = _.fromPairs(files.concat(directories)); _.each(functions, function (func) { _.assign(functions, processFunctionDefinition(func)); diff --git a/src/plugins/vis_type_timelion/server/lib/process_function_definition.js b/src/plugins/vis_type_timelion/server/lib/process_function_definition.js index 3159d33c884e8..2f79a602aec54 100644 --- a/src/plugins/vis_type_timelion/server/lib/process_function_definition.js +++ b/src/plugins/vis_type_timelion/server/lib/process_function_definition.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; export default function (func) { const functions = {}; diff --git a/src/plugins/vis_type_timelion/server/lib/reduce.js b/src/plugins/vis_type_timelion/server/lib/reduce.js index cc13b75fde12d..cff8d0aa7ba98 100644 --- a/src/plugins/vis_type_timelion/server/lib/reduce.js +++ b/src/plugins/vis_type_timelion/server/lib/reduce.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; function allSeriesContainKey(seriesList, key) { const containsKeyInitialValue = true; @@ -42,7 +42,7 @@ async function pairwiseReduce(left, right, fn) { if (allSeriesContainKey(left, 'split') && allSeriesContainKey(right, 'split')) { pairwiseField = 'split'; } - const indexedList = _.indexBy(right.list, pairwiseField); + const indexedList = _.keyBy(right.list, pairwiseField); // ensure seriesLists contain same pairwise labels left.list.forEach((leftSeries) => { diff --git a/src/plugins/vis_type_timelion/server/lib/unzip_pairs.js b/src/plugins/vis_type_timelion/server/lib/unzip_pairs.js index 7a34b5ec98ff0..5c30f53fd530e 100644 --- a/src/plugins/vis_type_timelion/server/lib/unzip_pairs.js +++ b/src/plugins/vis_type_timelion/server/lib/unzip_pairs.js @@ -17,11 +17,11 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; export default function unzipPairs(timeValObject) { const paired = _.chain(timeValObject) - .pairs() + .toPairs() .map(function (point) { return [parseInt(point[0], 10), point[1]]; }) diff --git a/src/plugins/vis_type_timelion/server/routes/functions.ts b/src/plugins/vis_type_timelion/server/routes/functions.ts index 85723824d2141..4321f3cea531b 100644 --- a/src/plugins/vis_type_timelion/server/routes/functions.ts +++ b/src/plugins/vis_type_timelion/server/routes/functions.ts @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { IRouter } from 'kibana/server'; import { LoadFunctions } from '../lib/load_functions'; diff --git a/src/plugins/vis_type_timelion/server/routes/run.ts b/src/plugins/vis_type_timelion/server/routes/run.ts index b8cefc8a07f28..c96011eceac67 100644 --- a/src/plugins/vis_type_timelion/server/routes/run.ts +++ b/src/plugins/vis_type_timelion/server/routes/run.ts @@ -19,7 +19,7 @@ import { IRouter, Logger } from 'kibana/server'; import { schema } from '@kbn/config-schema'; import Bluebird from 'bluebird'; -import _ from 'lodash'; +import _ from 'lodash4'; // @ts-ignore import chainRunnerFn from '../handlers/chain_runner.js'; // @ts-ignore diff --git a/src/plugins/vis_type_timelion/server/routes/validate_es.ts b/src/plugins/vis_type_timelion/server/routes/validate_es.ts index d5ce80dc151a2..82c43879eaa2a 100644 --- a/src/plugins/vis_type_timelion/server/routes/validate_es.ts +++ b/src/plugins/vis_type_timelion/server/routes/validate_es.ts @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { IRouter } from 'kibana/server'; export function validateEsRoute(router: IRouter) { diff --git a/src/plugins/vis_type_timelion/server/series_functions/abs.js b/src/plugins/vis_type_timelion/server/series_functions/abs.js index d55da3b7ec0e0..653943d657840 100644 --- a/src/plugins/vis_type_timelion/server/series_functions/abs.js +++ b/src/plugins/vis_type_timelion/server/series_functions/abs.js @@ -19,7 +19,7 @@ import { i18n } from '@kbn/i18n'; import alter from '../lib/alter.js'; -import _ from 'lodash'; +import _ from 'lodash4'; import Chainable from '../lib/classes/chainable'; export default new Chainable('abs', { diff --git a/src/plugins/vis_type_timelion/server/series_functions/abs.test.js b/src/plugins/vis_type_timelion/server/series_functions/abs.test.js index 2e01370ddfb99..49c2bf269a0d6 100644 --- a/src/plugins/vis_type_timelion/server/series_functions/abs.test.js +++ b/src/plugins/vis_type_timelion/server/series_functions/abs.test.js @@ -19,7 +19,7 @@ import fn from './abs'; -import _ from 'lodash'; +import _ from 'lodash4'; const expect = require('chai').expect; const seriesList = require('./fixtures/series_list.js')(); import invoke from './helpers/invoke_series_fn.js'; diff --git a/src/plugins/vis_type_timelion/server/series_functions/aggregate/aggregate.test.js b/src/plugins/vis_type_timelion/server/series_functions/aggregate/aggregate.test.js index 8686c6b6542db..a27ba30e11923 100644 --- a/src/plugins/vis_type_timelion/server/series_functions/aggregate/aggregate.test.js +++ b/src/plugins/vis_type_timelion/server/series_functions/aggregate/aggregate.test.js @@ -19,7 +19,7 @@ import fn from './index'; -import _ from 'lodash'; +import _ from 'lodash4'; const expect = require('chai').expect; import invoke from '../helpers/invoke_series_fn.js'; diff --git a/src/plugins/vis_type_timelion/server/series_functions/aggregate/avg.js b/src/plugins/vis_type_timelion/server/series_functions/aggregate/avg.js index 853ce337efac2..8572171525d7b 100644 --- a/src/plugins/vis_type_timelion/server/series_functions/aggregate/avg.js +++ b/src/plugins/vis_type_timelion/server/series_functions/aggregate/avg.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; export default function (points) { return _.sum(points) / points.length; diff --git a/src/plugins/vis_type_timelion/server/series_functions/aggregate/cardinality.js b/src/plugins/vis_type_timelion/server/series_functions/aggregate/cardinality.js index 807e620ee941b..74ce1126aac83 100644 --- a/src/plugins/vis_type_timelion/server/series_functions/aggregate/cardinality.js +++ b/src/plugins/vis_type_timelion/server/series_functions/aggregate/cardinality.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; export default function (points) { return _.uniq(points).length; diff --git a/src/plugins/vis_type_timelion/server/series_functions/aggregate/first.js b/src/plugins/vis_type_timelion/server/series_functions/aggregate/first.js index 05e560b84335f..c3c91b8275f6a 100644 --- a/src/plugins/vis_type_timelion/server/series_functions/aggregate/first.js +++ b/src/plugins/vis_type_timelion/server/series_functions/aggregate/first.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; export default function (points) { return _.first(points); diff --git a/src/plugins/vis_type_timelion/server/series_functions/aggregate/index.js b/src/plugins/vis_type_timelion/server/series_functions/aggregate/index.js index 2340456e589ad..ccb554e190c9c 100644 --- a/src/plugins/vis_type_timelion/server/series_functions/aggregate/index.js +++ b/src/plugins/vis_type_timelion/server/series_functions/aggregate/index.js @@ -20,7 +20,7 @@ import { i18n } from '@kbn/i18n'; import alter from '../../lib/alter.js'; import Chainable from '../../lib/classes/chainable'; -import _ from 'lodash'; +import _ from 'lodash4'; const functions = { avg: require('./avg'), diff --git a/src/plugins/vis_type_timelion/server/series_functions/aggregate/last.js b/src/plugins/vis_type_timelion/server/series_functions/aggregate/last.js index 8f252fb451027..4c0b4213966fd 100644 --- a/src/plugins/vis_type_timelion/server/series_functions/aggregate/last.js +++ b/src/plugins/vis_type_timelion/server/series_functions/aggregate/last.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; export default function (points) { return _.last(points); diff --git a/src/plugins/vis_type_timelion/server/series_functions/aggregate/max.js b/src/plugins/vis_type_timelion/server/series_functions/aggregate/max.js index 5b2610f07bbea..3a7372f1f9d20 100644 --- a/src/plugins/vis_type_timelion/server/series_functions/aggregate/max.js +++ b/src/plugins/vis_type_timelion/server/series_functions/aggregate/max.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; export default function (points) { return _.max(points); diff --git a/src/plugins/vis_type_timelion/server/series_functions/aggregate/min.js b/src/plugins/vis_type_timelion/server/series_functions/aggregate/min.js index 1ebf9be2f9146..fd49a76643e58 100644 --- a/src/plugins/vis_type_timelion/server/series_functions/aggregate/min.js +++ b/src/plugins/vis_type_timelion/server/series_functions/aggregate/min.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; export default function (points) { return _.min(points); diff --git a/src/plugins/vis_type_timelion/server/series_functions/aggregate/sum.js b/src/plugins/vis_type_timelion/server/series_functions/aggregate/sum.js index 34b5fe277dd34..88398679f2bbc 100644 --- a/src/plugins/vis_type_timelion/server/series_functions/aggregate/sum.js +++ b/src/plugins/vis_type_timelion/server/series_functions/aggregate/sum.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; export default function (points) { return _.sum(points); diff --git a/src/plugins/vis_type_timelion/server/series_functions/bars.test.js b/src/plugins/vis_type_timelion/server/series_functions/bars.test.js index 936c68b64d580..ecc6a04777706 100644 --- a/src/plugins/vis_type_timelion/server/series_functions/bars.test.js +++ b/src/plugins/vis_type_timelion/server/series_functions/bars.test.js @@ -19,7 +19,7 @@ import fn from './bars'; -import _ from 'lodash'; +import _ from 'lodash4'; const expect = require('chai').expect; import invoke from './helpers/invoke_series_fn.js'; diff --git a/src/plugins/vis_type_timelion/server/series_functions/color.test.js b/src/plugins/vis_type_timelion/server/series_functions/color.test.js index b0eb11219ed01..e7ee8c0ab5b57 100644 --- a/src/plugins/vis_type_timelion/server/series_functions/color.test.js +++ b/src/plugins/vis_type_timelion/server/series_functions/color.test.js @@ -19,7 +19,7 @@ import fn from './color'; -import _ from 'lodash'; +import _ from 'lodash4'; const expect = require('chai').expect; import invoke from './helpers/invoke_series_fn.js'; diff --git a/src/plugins/vis_type_timelion/server/series_functions/condition.js b/src/plugins/vis_type_timelion/server/series_functions/condition.js index 789b3c60e4a9c..ee5d31bdf1bf6 100644 --- a/src/plugins/vis_type_timelion/server/series_functions/condition.js +++ b/src/plugins/vis_type_timelion/server/series_functions/condition.js @@ -19,7 +19,7 @@ import { i18n } from '@kbn/i18n'; import alter from '../lib/alter.js'; -import _ from 'lodash'; +import _ from 'lodash4'; import Chainable from '../lib/classes/chainable'; import argType from '../handlers/lib/arg_type.js'; diff --git a/src/plugins/vis_type_timelion/server/series_functions/condition.test.js b/src/plugins/vis_type_timelion/server/series_functions/condition.test.js index 7730bcc1acca3..e4abcf4fca7b0 100644 --- a/src/plugins/vis_type_timelion/server/series_functions/condition.test.js +++ b/src/plugins/vis_type_timelion/server/series_functions/condition.test.js @@ -22,7 +22,7 @@ import moment from 'moment'; const expect = require('chai').expect; import invoke from './helpers/invoke_series_fn.js'; import getSeriesList from './helpers/get_single_series_list'; -import _ from 'lodash'; +import _ from 'lodash4'; describe('condition.js', function () { let comparable; diff --git a/src/plugins/vis_type_timelion/server/series_functions/cusum.js b/src/plugins/vis_type_timelion/server/series_functions/cusum.js index decbd22b4345c..5eee545c79e7f 100644 --- a/src/plugins/vis_type_timelion/server/series_functions/cusum.js +++ b/src/plugins/vis_type_timelion/server/series_functions/cusum.js @@ -19,7 +19,7 @@ import { i18n } from '@kbn/i18n'; import alter from '../lib/alter.js'; -import _ from 'lodash'; +import _ from 'lodash4'; import Chainable from '../lib/classes/chainable'; export default new Chainable('cusum', { diff --git a/src/plugins/vis_type_timelion/server/series_functions/cusum.test.js b/src/plugins/vis_type_timelion/server/series_functions/cusum.test.js index 91d01e10c5826..0b0efe87ad5f6 100644 --- a/src/plugins/vis_type_timelion/server/series_functions/cusum.test.js +++ b/src/plugins/vis_type_timelion/server/series_functions/cusum.test.js @@ -19,7 +19,7 @@ import fn from './cusum'; -import _ from 'lodash'; +import _ from 'lodash4'; const expect = require('chai').expect; import invoke from './helpers/invoke_series_fn.js'; diff --git a/src/plugins/vis_type_timelion/server/series_functions/derivative.js b/src/plugins/vis_type_timelion/server/series_functions/derivative.js index a034585597d63..1bc02aa3be681 100644 --- a/src/plugins/vis_type_timelion/server/series_functions/derivative.js +++ b/src/plugins/vis_type_timelion/server/series_functions/derivative.js @@ -19,7 +19,7 @@ import { i18n } from '@kbn/i18n'; import alter from '../lib/alter.js'; -import _ from 'lodash'; +import _ from 'lodash4'; import Chainable from '../lib/classes/chainable'; export default new Chainable('derivative', { diff --git a/src/plugins/vis_type_timelion/server/series_functions/derivative.test.js b/src/plugins/vis_type_timelion/server/series_functions/derivative.test.js index 2da72ecf9f4e0..bc690ba23c4ab 100644 --- a/src/plugins/vis_type_timelion/server/series_functions/derivative.test.js +++ b/src/plugins/vis_type_timelion/server/series_functions/derivative.test.js @@ -19,7 +19,7 @@ import fn from './derivative'; -import _ from 'lodash'; +import _ from 'lodash4'; const expect = require('chai').expect; import invoke from './helpers/invoke_series_fn.js'; diff --git a/src/plugins/vis_type_timelion/server/series_functions/divide.test.js b/src/plugins/vis_type_timelion/server/series_functions/divide.test.js index ceb435f6c9898..5c9ed748e61b0 100644 --- a/src/plugins/vis_type_timelion/server/series_functions/divide.test.js +++ b/src/plugins/vis_type_timelion/server/series_functions/divide.test.js @@ -19,7 +19,7 @@ import fn from './divide'; -import _ from 'lodash'; +import _ from 'lodash4'; const expect = require('chai').expect; import invoke from './helpers/invoke_series_fn.js'; diff --git a/src/plugins/vis_type_timelion/server/series_functions/es/es.test.js b/src/plugins/vis_type_timelion/server/series_functions/es/es.test.js index a624ff72ead69..78cfcba1cafa9 100644 --- a/src/plugins/vis_type_timelion/server/series_functions/es/es.test.js +++ b/src/plugins/vis_type_timelion/server/series_functions/es/es.test.js @@ -26,7 +26,7 @@ import createDateAgg from './lib/create_date_agg'; import esResponse from '../fixtures/es_response'; import Bluebird from 'bluebird'; -import _ from 'lodash'; +import _ from 'lodash4'; import { expect } from 'chai'; import sinon from 'sinon'; import invoke from '../helpers/invoke_series_fn.js'; diff --git a/src/plugins/vis_type_timelion/server/series_functions/es/index.js b/src/plugins/vis_type_timelion/server/series_functions/es/index.js index fd392f599c1d2..e7d8aa9730e81 100644 --- a/src/plugins/vis_type_timelion/server/series_functions/es/index.js +++ b/src/plugins/vis_type_timelion/server/series_functions/es/index.js @@ -18,7 +18,7 @@ */ import { i18n } from '@kbn/i18n'; -import _ from 'lodash'; +import _ from 'lodash4'; import Datasource from '../../lib/classes/datasource'; import buildRequest from './lib/build_request'; import toSeriesList from './lib/agg_response_to_series_list'; diff --git a/src/plugins/vis_type_timelion/server/series_functions/es/lib/agg_response_to_series_list.js b/src/plugins/vis_type_timelion/server/series_functions/es/lib/agg_response_to_series_list.js index 409372da24724..1cf150eb3ab61 100644 --- a/src/plugins/vis_type_timelion/server/series_functions/es/lib/agg_response_to_series_list.js +++ b/src/plugins/vis_type_timelion/server/series_functions/es/lib/agg_response_to_series_list.js @@ -17,10 +17,10 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; export function timeBucketsToPairs(buckets) { - const timestamps = _.pluck(buckets, 'key'); + const timestamps = _.map(buckets, 'key'); const series = {}; _.each(buckets, function (bucket) { _.forOwn(bucket, function (val, key) { diff --git a/src/plugins/vis_type_timelion/server/series_functions/es/lib/build_request.js b/src/plugins/vis_type_timelion/server/series_functions/es/lib/build_request.js index bc0e368fbdab1..2b6e962d3dbfe 100644 --- a/src/plugins/vis_type_timelion/server/series_functions/es/lib/build_request.js +++ b/src/plugins/vis_type_timelion/server/series_functions/es/lib/build_request.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import moment from 'moment'; import { buildAggBody } from './agg_body'; import createDateAgg from './create_date_agg'; @@ -50,7 +50,7 @@ export default function buildRequest(config, tlConfig, scriptedFields, timeout) .map(function (q) { return [q, { query_string: { query: q } }]; }) - .zipObject() + .fromPairs() .value(), }, aggs: {}, diff --git a/src/plugins/vis_type_timelion/server/series_functions/es/lib/create_date_agg.js b/src/plugins/vis_type_timelion/server/series_functions/es/lib/create_date_agg.js index 904fe69cbc57c..ae498f6fd94ae 100644 --- a/src/plugins/vis_type_timelion/server/series_functions/es/lib/create_date_agg.js +++ b/src/plugins/vis_type_timelion/server/series_functions/es/lib/create_date_agg.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { buildAggBody } from './agg_body'; export default function createDateAgg(config, tlConfig, scriptedFields) { diff --git a/src/plugins/vis_type_timelion/server/series_functions/fit.js b/src/plugins/vis_type_timelion/server/series_functions/fit.js index b472c23b9c79f..843bf6c731fcc 100644 --- a/src/plugins/vis_type_timelion/server/series_functions/fit.js +++ b/src/plugins/vis_type_timelion/server/series_functions/fit.js @@ -19,7 +19,7 @@ import { i18n } from '@kbn/i18n'; import alter from '../lib/alter.js'; -import _ from 'lodash'; +import _ from 'lodash4'; import Chainable from '../lib/classes/chainable'; import loadFunctions from '../lib/load_functions.js'; const fitFunctions = loadFunctions('fit_functions'); diff --git a/src/plugins/vis_type_timelion/server/series_functions/fit.test.js b/src/plugins/vis_type_timelion/server/series_functions/fit.test.js index c352f3ba60b87..6a8596f1488eb 100644 --- a/src/plugins/vis_type_timelion/server/series_functions/fit.test.js +++ b/src/plugins/vis_type_timelion/server/series_functions/fit.test.js @@ -22,7 +22,7 @@ import moment from 'moment'; const expect = require('chai').expect; import invoke from './helpers/invoke_series_fn.js'; import getSeriesList from './helpers/get_single_series_list'; -import _ from 'lodash'; +import _ from 'lodash4'; describe('fit.js', function () { describe('should not filter out zeros', function () { diff --git a/src/plugins/vis_type_timelion/server/series_functions/graphite.js b/src/plugins/vis_type_timelion/server/series_functions/graphite.js index c0b6ba1bc0fff..fb3da108a67dd 100644 --- a/src/plugins/vis_type_timelion/server/series_functions/graphite.js +++ b/src/plugins/vis_type_timelion/server/series_functions/graphite.js @@ -18,7 +18,7 @@ */ import { i18n } from '@kbn/i18n'; -import _ from 'lodash'; +import _ from 'lodash4'; import fetch from 'node-fetch'; import moment from 'moment'; import Datasource from '../lib/classes/datasource'; diff --git a/src/plugins/vis_type_timelion/server/series_functions/helpers/get_series.js b/src/plugins/vis_type_timelion/server/series_functions/helpers/get_series.js index 76ac57f8247ec..9f33faef46d7d 100644 --- a/src/plugins/vis_type_timelion/server/series_functions/helpers/get_series.js +++ b/src/plugins/vis_type_timelion/server/series_functions/helpers/get_series.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; export default function getSeries(name, buckets, points) { const fill = _.partial( diff --git a/src/plugins/vis_type_timelion/server/series_functions/helpers/get_series_list.js b/src/plugins/vis_type_timelion/server/series_functions/helpers/get_series_list.js index c32f919a269b8..8f34e589dccf0 100644 --- a/src/plugins/vis_type_timelion/server/series_functions/helpers/get_series_list.js +++ b/src/plugins/vis_type_timelion/server/series_functions/helpers/get_series_list.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; export default function (list, overrides) { return _.merge( diff --git a/src/plugins/vis_type_timelion/server/series_functions/helpers/get_single_series_list.js b/src/plugins/vis_type_timelion/server/series_functions/helpers/get_single_series_list.js index b307461a4133e..193aca481112d 100644 --- a/src/plugins/vis_type_timelion/server/series_functions/helpers/get_single_series_list.js +++ b/src/plugins/vis_type_timelion/server/series_functions/helpers/get_single_series_list.js @@ -19,7 +19,7 @@ import getSeries from './get_series'; import getSeriesList from './get_series_list'; -import _ from 'lodash'; +import _ from 'lodash4'; export default function (name, data) { return getSeriesList([getSeries(name, _.map(data, 0), _.map(data, 1))]); diff --git a/src/plugins/vis_type_timelion/server/series_functions/helpers/invoke_series_fn.js b/src/plugins/vis_type_timelion/server/series_functions/helpers/invoke_series_fn.js index 8ea6e7af59231..bdc4b70511c55 100644 --- a/src/plugins/vis_type_timelion/server/series_functions/helpers/invoke_series_fn.js +++ b/src/plugins/vis_type_timelion/server/series_functions/helpers/invoke_series_fn.js @@ -18,7 +18,7 @@ */ // invokes a series_function with the specified arguments -import _ from 'lodash'; +import _ from 'lodash4'; import indexArguments from '../../handlers/lib/index_arguments'; diff --git a/src/plugins/vis_type_timelion/server/series_functions/hide.test.js b/src/plugins/vis_type_timelion/server/series_functions/hide.test.js index ad330bb7844de..75faa5d9398ac 100644 --- a/src/plugins/vis_type_timelion/server/series_functions/hide.test.js +++ b/src/plugins/vis_type_timelion/server/series_functions/hide.test.js @@ -19,7 +19,7 @@ import fn from './hide'; -import _ from 'lodash'; +import _ from 'lodash4'; const expect = require('chai').expect; import invoke from './helpers/invoke_series_fn.js'; diff --git a/src/plugins/vis_type_timelion/server/series_functions/holt/index.js b/src/plugins/vis_type_timelion/server/series_functions/holt/index.js index dd3274c5766af..b7d81c64bf005 100644 --- a/src/plugins/vis_type_timelion/server/series_functions/holt/index.js +++ b/src/plugins/vis_type_timelion/server/series_functions/holt/index.js @@ -18,7 +18,7 @@ */ import { i18n } from '@kbn/i18n'; -import _ from 'lodash'; +import _ from 'lodash4'; import Chainable from '../../lib/classes/chainable'; import ses from './lib/ses'; import des from './lib/des'; diff --git a/src/plugins/vis_type_timelion/server/series_functions/holt/lib/des.js b/src/plugins/vis_type_timelion/server/series_functions/holt/lib/des.js index a1fe4b1f1f52c..5b51f0fb68c94 100644 --- a/src/plugins/vis_type_timelion/server/series_functions/holt/lib/des.js +++ b/src/plugins/vis_type_timelion/server/series_functions/holt/lib/des.js @@ -18,7 +18,7 @@ */ import { i18n } from '@kbn/i18n'; -import _ from 'lodash'; +import _ from 'lodash4'; export default function des(points, alpha, beta) { let level; diff --git a/src/plugins/vis_type_timelion/server/series_functions/holt/lib/ses.js b/src/plugins/vis_type_timelion/server/series_functions/holt/lib/ses.js index 5fe4eddc4ab15..38a351fa534ff 100644 --- a/src/plugins/vis_type_timelion/server/series_functions/holt/lib/ses.js +++ b/src/plugins/vis_type_timelion/server/series_functions/holt/lib/ses.js @@ -21,7 +21,7 @@ Single exponential smoothing. Assuming even interval */ -import _ from 'lodash'; +import _ from 'lodash4'; export default function ses(points, alpha) { let origin; diff --git a/src/plugins/vis_type_timelion/server/series_functions/holt/lib/tes.js b/src/plugins/vis_type_timelion/server/series_functions/holt/lib/tes.js index d8d136a5e78ce..bb60ef6d5ac49 100644 --- a/src/plugins/vis_type_timelion/server/series_functions/holt/lib/tes.js +++ b/src/plugins/vis_type_timelion/server/series_functions/holt/lib/tes.js @@ -27,7 +27,7 @@ Hourly data might have: - Annual seasonality (frequency=24×365.25=8766) */ -import _ from 'lodash'; +import _ from 'lodash4'; // Uh, I don't think this will work when you have nulls in the initial seasonal components function initSeasonalComponents(samplePoints, seasonLength) { diff --git a/src/plugins/vis_type_timelion/server/series_functions/label.test.js b/src/plugins/vis_type_timelion/server/series_functions/label.test.js index 6ce6b688c77c4..681aff257f82c 100644 --- a/src/plugins/vis_type_timelion/server/series_functions/label.test.js +++ b/src/plugins/vis_type_timelion/server/series_functions/label.test.js @@ -19,7 +19,7 @@ import fn from './label'; -import _ from 'lodash'; +import _ from 'lodash4'; const expect = require('chai').expect; import invoke from './helpers/invoke_series_fn.js'; diff --git a/src/plugins/vis_type_timelion/server/series_functions/log.js b/src/plugins/vis_type_timelion/server/series_functions/log.js index 7b9ce4c9f68ec..6fe57f7c66576 100644 --- a/src/plugins/vis_type_timelion/server/series_functions/log.js +++ b/src/plugins/vis_type_timelion/server/series_functions/log.js @@ -19,7 +19,7 @@ import { i18n } from '@kbn/i18n'; import alter from '../lib/alter.js'; -import _ from 'lodash'; +import _ from 'lodash4'; import Chainable from '../lib/classes/chainable'; export default new Chainable('log', { diff --git a/src/plugins/vis_type_timelion/server/series_functions/log.test.js b/src/plugins/vis_type_timelion/server/series_functions/log.test.js index b658d84cd1afa..766189888513a 100644 --- a/src/plugins/vis_type_timelion/server/series_functions/log.test.js +++ b/src/plugins/vis_type_timelion/server/series_functions/log.test.js @@ -19,7 +19,7 @@ import fn from './log'; -import _ from 'lodash'; +import _ from 'lodash4'; const expect = require('chai').expect; import invoke from './helpers/invoke_series_fn.js'; diff --git a/src/plugins/vis_type_timelion/server/series_functions/max.test.js b/src/plugins/vis_type_timelion/server/series_functions/max.test.js index 9ac9a3eff5582..fb085050c7983 100644 --- a/src/plugins/vis_type_timelion/server/series_functions/max.test.js +++ b/src/plugins/vis_type_timelion/server/series_functions/max.test.js @@ -19,7 +19,7 @@ import fn from './max'; -import _ from 'lodash'; +import _ from 'lodash4'; const expect = require('chai').expect; import invoke from './helpers/invoke_series_fn.js'; diff --git a/src/plugins/vis_type_timelion/server/series_functions/min.test.js b/src/plugins/vis_type_timelion/server/series_functions/min.test.js index 691185a7d068e..d8e4e842765f2 100644 --- a/src/plugins/vis_type_timelion/server/series_functions/min.test.js +++ b/src/plugins/vis_type_timelion/server/series_functions/min.test.js @@ -19,7 +19,7 @@ import fn from './min'; -import _ from 'lodash'; +import _ from 'lodash4'; const expect = require('chai').expect; import invoke from './helpers/invoke_series_fn.js'; diff --git a/src/plugins/vis_type_timelion/server/series_functions/movingaverage.js b/src/plugins/vis_type_timelion/server/series_functions/movingaverage.js index 108eb0c72f19d..3b1b7fc1d3f0f 100644 --- a/src/plugins/vis_type_timelion/server/series_functions/movingaverage.js +++ b/src/plugins/vis_type_timelion/server/series_functions/movingaverage.js @@ -19,7 +19,7 @@ import { i18n } from '@kbn/i18n'; import alter from '../lib/alter.js'; -import _ from 'lodash'; +import _ from 'lodash4'; import Chainable from '../lib/classes/chainable'; import { toMS } from '../../common/lib/to_milliseconds'; @@ -81,7 +81,7 @@ export default new Chainable('movingaverage', { } _position = _position || defaultPosition; - if (!_.contains(validPositions, _position)) { + if (!_.includes(validPositions, _position)) { throw new Error( i18n.translate( 'timelion.serverSideErrors.movingaverageFunction.notValidPositionErrorMessage', diff --git a/src/plugins/vis_type_timelion/server/series_functions/movingaverage.test.js b/src/plugins/vis_type_timelion/server/series_functions/movingaverage.test.js index a71c57cab28e3..d382308447a6b 100644 --- a/src/plugins/vis_type_timelion/server/series_functions/movingaverage.test.js +++ b/src/plugins/vis_type_timelion/server/series_functions/movingaverage.test.js @@ -21,7 +21,7 @@ import fn from './movingaverage'; const expect = require('chai').expect; import moment from 'moment'; -import _ from 'lodash'; +import _ from 'lodash4'; import buckets from './fixtures/bucket_list'; import getSeries from './helpers/get_series'; import getSeriesList from './helpers/get_series_list'; diff --git a/src/plugins/vis_type_timelion/server/series_functions/movingstd.js b/src/plugins/vis_type_timelion/server/series_functions/movingstd.js index a7ecb4d5b4738..c144fa5f9154c 100644 --- a/src/plugins/vis_type_timelion/server/series_functions/movingstd.js +++ b/src/plugins/vis_type_timelion/server/series_functions/movingstd.js @@ -19,7 +19,7 @@ import { i18n } from '@kbn/i18n'; import alter from '../lib/alter.js'; -import _ from 'lodash'; +import _ from 'lodash4'; import Chainable from '../lib/classes/chainable'; const positions = ['left', 'right', 'center']; @@ -61,7 +61,7 @@ export default new Chainable('movingstd', { return alter(args, function (eachSeries, _window, _position) { _position = _position || defaultPosition; - if (!_.contains(positions, _position)) { + if (!_.includes(positions, _position)) { throw new Error( i18n.translate( 'timelion.serverSideErrors.movingstdFunction.notValidPositionErrorMessage', diff --git a/src/plugins/vis_type_timelion/server/series_functions/multiply.test.js b/src/plugins/vis_type_timelion/server/series_functions/multiply.test.js index 906646cf971b5..ae9f823767df9 100644 --- a/src/plugins/vis_type_timelion/server/series_functions/multiply.test.js +++ b/src/plugins/vis_type_timelion/server/series_functions/multiply.test.js @@ -19,7 +19,7 @@ import fn from './multiply'; -import _ from 'lodash'; +import _ from 'lodash4'; const expect = require('chai').expect; import invoke from './helpers/invoke_series_fn.js'; diff --git a/src/plugins/vis_type_timelion/server/series_functions/points.js b/src/plugins/vis_type_timelion/server/series_functions/points.js index bf797bb5aa343..89bb71768a584 100644 --- a/src/plugins/vis_type_timelion/server/series_functions/points.js +++ b/src/plugins/vis_type_timelion/server/series_functions/points.js @@ -19,7 +19,7 @@ import { i18n } from '@kbn/i18n'; import alter from '../lib/alter.js'; -import _ from 'lodash'; +import _ from 'lodash4'; import Chainable from '../lib/classes/chainable'; const validSymbols = ['triangle', 'cross', 'square', 'diamond', 'circle']; @@ -105,7 +105,7 @@ export default new Chainable('points', { } symbol = symbol || defaultSymbol; - if (!_.contains(validSymbols, symbol)) { + if (!_.includes(validSymbols, symbol)) { throw new Error( i18n.translate('timelion.serverSideErrors.pointsFunction.notValidSymbolErrorMessage', { defaultMessage: 'Valid symbols are: {validSymbols}', diff --git a/src/plugins/vis_type_timelion/server/series_functions/points.test.js b/src/plugins/vis_type_timelion/server/series_functions/points.test.js index fe7b6f13e1378..e3d339f4791d0 100644 --- a/src/plugins/vis_type_timelion/server/series_functions/points.test.js +++ b/src/plugins/vis_type_timelion/server/series_functions/points.test.js @@ -19,7 +19,7 @@ import fn from './points'; -import _ from 'lodash'; +import _ from 'lodash4'; import assert from 'chai'; const expect = assert.expect; import invoke from './helpers/invoke_series_fn.js'; diff --git a/src/plugins/vis_type_timelion/server/series_functions/precision.test.js b/src/plugins/vis_type_timelion/server/series_functions/precision.test.js index e56feb3d7c420..c69d07ba94a2c 100644 --- a/src/plugins/vis_type_timelion/server/series_functions/precision.test.js +++ b/src/plugins/vis_type_timelion/server/series_functions/precision.test.js @@ -19,7 +19,7 @@ import fn from './precision'; -import _ from 'lodash'; +import _ from 'lodash4'; const expect = require('chai').expect; import invoke from './helpers/invoke_series_fn.js'; diff --git a/src/plugins/vis_type_timelion/server/series_functions/props.js b/src/plugins/vis_type_timelion/server/series_functions/props.js index 6205e4d43fbf0..037b76b1834a1 100644 --- a/src/plugins/vis_type_timelion/server/series_functions/props.js +++ b/src/plugins/vis_type_timelion/server/series_functions/props.js @@ -20,7 +20,7 @@ import { i18n } from '@kbn/i18n'; import alter from '../lib/alter.js'; import Chainable from '../lib/classes/chainable'; -import _ from 'lodash'; +import _ from 'lodash4'; function unflatten(data) { if (Object(data) !== data || Array.isArray(data)) return data; diff --git a/src/plugins/vis_type_timelion/server/series_functions/quandl.js b/src/plugins/vis_type_timelion/server/series_functions/quandl.js index 775ebb17a8d2c..2394118be240f 100644 --- a/src/plugins/vis_type_timelion/server/series_functions/quandl.js +++ b/src/plugins/vis_type_timelion/server/series_functions/quandl.js @@ -18,7 +18,7 @@ */ import { i18n } from '@kbn/i18n'; -import _ from 'lodash'; +import _ from 'lodash4'; import fetch from 'node-fetch'; import moment from 'moment'; fetch.Promise = require('bluebird'); diff --git a/src/plugins/vis_type_timelion/server/series_functions/range.js b/src/plugins/vis_type_timelion/server/series_functions/range.js index 38525bec7226a..4b97583c22458 100644 --- a/src/plugins/vis_type_timelion/server/series_functions/range.js +++ b/src/plugins/vis_type_timelion/server/series_functions/range.js @@ -19,7 +19,7 @@ import { i18n } from '@kbn/i18n'; import alter from '../lib/alter.js'; -import _ from 'lodash'; +import _ from 'lodash4'; import Chainable from '../lib/classes/chainable'; export default new Chainable('range', { diff --git a/src/plugins/vis_type_timelion/server/series_functions/range.test.js b/src/plugins/vis_type_timelion/server/series_functions/range.test.js index b9a514602e364..a647ee60f193e 100644 --- a/src/plugins/vis_type_timelion/server/series_functions/range.test.js +++ b/src/plugins/vis_type_timelion/server/series_functions/range.test.js @@ -19,7 +19,7 @@ import fn from './range'; -import _ from 'lodash'; +import _ from 'lodash4'; const expect = require('chai').expect; import invoke from './helpers/invoke_series_fn.js'; diff --git a/src/plugins/vis_type_timelion/server/series_functions/scale_interval.js b/src/plugins/vis_type_timelion/server/series_functions/scale_interval.js index 8d7ea463df186..e4764939c221a 100644 --- a/src/plugins/vis_type_timelion/server/series_functions/scale_interval.js +++ b/src/plugins/vis_type_timelion/server/series_functions/scale_interval.js @@ -20,7 +20,7 @@ import { i18n } from '@kbn/i18n'; import alter from '../lib/alter.js'; import { toMS } from '../../common/lib/to_milliseconds'; -import _ from 'lodash'; +import _ from 'lodash4'; import Chainable from '../lib/classes/chainable'; export default new Chainable('scale_interval', { diff --git a/src/plugins/vis_type_timelion/server/series_functions/scale_interval.test.js b/src/plugins/vis_type_timelion/server/series_functions/scale_interval.test.js index 24e7e1b07048d..1320cdc4d569f 100644 --- a/src/plugins/vis_type_timelion/server/series_functions/scale_interval.test.js +++ b/src/plugins/vis_type_timelion/server/series_functions/scale_interval.test.js @@ -19,7 +19,7 @@ import fn from './scale_interval'; -import _ from 'lodash'; +import _ from 'lodash4'; const expect = require('chai').expect; import invoke from './helpers/invoke_series_fn.js'; diff --git a/src/plugins/vis_type_timelion/server/series_functions/static.js b/src/plugins/vis_type_timelion/server/series_functions/static.js index 631131e6f0b57..03c0cbd79b170 100644 --- a/src/plugins/vis_type_timelion/server/series_functions/static.js +++ b/src/plugins/vis_type_timelion/server/series_functions/static.js @@ -18,7 +18,7 @@ */ import { i18n } from '@kbn/i18n'; -import _ from 'lodash'; +import _ from 'lodash4'; import Datasource from '../lib/classes/datasource'; import Bluebird from 'bluebird'; diff --git a/src/plugins/vis_type_timelion/server/series_functions/static.test.js b/src/plugins/vis_type_timelion/server/series_functions/static.test.js index 88ec9fecd904a..8ea1dcda2a098 100644 --- a/src/plugins/vis_type_timelion/server/series_functions/static.test.js +++ b/src/plugins/vis_type_timelion/server/series_functions/static.test.js @@ -19,14 +19,14 @@ import fn from './static'; -import _ from 'lodash'; +import _ from 'lodash4'; const expect = require('chai').expect; import invoke from './helpers/invoke_series_fn.js'; describe('static.js', () => { it('returns a series in which all numbers are the same', () => { return invoke(fn, [5]).then((r) => { - expect(_.unique(_.map(r.output.list[0].data, 1))).to.eql([5]); + expect(_.uniq(_.map(r.output.list[0].data, 1))).to.eql([5]); }); }); diff --git a/src/plugins/vis_type_timelion/server/series_functions/subtract.test.js b/src/plugins/vis_type_timelion/server/series_functions/subtract.test.js index 7085e0baed023..63550221dee18 100644 --- a/src/plugins/vis_type_timelion/server/series_functions/subtract.test.js +++ b/src/plugins/vis_type_timelion/server/series_functions/subtract.test.js @@ -19,7 +19,7 @@ import fn from './subtract'; -import _ from 'lodash'; +import _ from 'lodash4'; const expect = require('chai').expect; import invoke from './helpers/invoke_series_fn.js'; diff --git a/src/plugins/vis_type_timelion/server/series_functions/sum.test.js b/src/plugins/vis_type_timelion/server/series_functions/sum.test.js index 360f19c97f8e1..efb98b6ec3175 100644 --- a/src/plugins/vis_type_timelion/server/series_functions/sum.test.js +++ b/src/plugins/vis_type_timelion/server/series_functions/sum.test.js @@ -19,7 +19,7 @@ import fn from './sum'; -import _ from 'lodash'; +import _ from 'lodash4'; const expect = require('chai').expect; import invoke from './helpers/invoke_series_fn.js'; diff --git a/src/plugins/vis_type_timelion/server/series_functions/title.test.js b/src/plugins/vis_type_timelion/server/series_functions/title.test.js index c45b91ebfd4d1..3ce844e76d10b 100644 --- a/src/plugins/vis_type_timelion/server/series_functions/title.test.js +++ b/src/plugins/vis_type_timelion/server/series_functions/title.test.js @@ -19,7 +19,7 @@ import fn from './title'; -import _ from 'lodash'; +import _ from 'lodash4'; const expect = require('chai').expect; import invoke from './helpers/invoke_series_fn.js'; diff --git a/src/plugins/vis_type_timelion/server/series_functions/trend/index.js b/src/plugins/vis_type_timelion/server/series_functions/trend/index.js index ea5175db3c84b..e78c5544b7533 100644 --- a/src/plugins/vis_type_timelion/server/series_functions/trend/index.js +++ b/src/plugins/vis_type_timelion/server/series_functions/trend/index.js @@ -18,7 +18,7 @@ */ import { i18n } from '@kbn/i18n'; -import _ from 'lodash'; +import _ from 'lodash4'; import Chainable from '../../lib/classes/chainable'; import { linear, log } from './lib/regress'; diff --git a/src/plugins/vis_type_timelion/server/series_functions/trend/lib/regress.js b/src/plugins/vis_type_timelion/server/series_functions/trend/lib/regress.js index 816692da7d017..40611b4b721d7 100644 --- a/src/plugins/vis_type_timelion/server/series_functions/trend/lib/regress.js +++ b/src/plugins/vis_type_timelion/server/series_functions/trend/lib/regress.js @@ -23,7 +23,7 @@ * Licensed under the MIT license. */ -import _ from 'lodash'; +import _ from 'lodash4'; function sum(data, fn) { return _.reduce( diff --git a/src/plugins/vis_type_timelion/server/series_functions/trim.js b/src/plugins/vis_type_timelion/server/series_functions/trim.js index 8a8e38ab3a5a7..5ce1408882162 100644 --- a/src/plugins/vis_type_timelion/server/series_functions/trim.js +++ b/src/plugins/vis_type_timelion/server/series_functions/trim.js @@ -19,7 +19,7 @@ import { i18n } from '@kbn/i18n'; import alter from '../lib/alter.js'; -import _ from 'lodash'; +import _ from 'lodash4'; import Chainable from '../lib/classes/chainable'; export default new Chainable('trim', { diff --git a/src/plugins/vis_type_timelion/server/series_functions/trim.test.js b/src/plugins/vis_type_timelion/server/series_functions/trim.test.js index 6b1e88f37c145..ebe77ec04531a 100644 --- a/src/plugins/vis_type_timelion/server/series_functions/trim.test.js +++ b/src/plugins/vis_type_timelion/server/series_functions/trim.test.js @@ -19,7 +19,7 @@ import fn from './trim'; -import _ from 'lodash'; +import _ from 'lodash4'; const expect = require('chai').expect; import invoke from './helpers/invoke_series_fn.js'; diff --git a/src/plugins/vis_type_timelion/server/series_functions/worldbank.js b/src/plugins/vis_type_timelion/server/series_functions/worldbank.js index 7a73fd341a8da..7a8e95d50cdab 100644 --- a/src/plugins/vis_type_timelion/server/series_functions/worldbank.js +++ b/src/plugins/vis_type_timelion/server/series_functions/worldbank.js @@ -18,7 +18,7 @@ */ import { i18n } from '@kbn/i18n'; -import _ from 'lodash'; +import _ from 'lodash4'; import fetch from 'node-fetch'; import moment from 'moment'; import Datasource from '../lib/classes/datasource'; diff --git a/src/plugins/vis_type_timelion/server/series_functions/worldbank_indicators.js b/src/plugins/vis_type_timelion/server/series_functions/worldbank_indicators.js index 305c586a2090f..c1e311ea8d29a 100644 --- a/src/plugins/vis_type_timelion/server/series_functions/worldbank_indicators.js +++ b/src/plugins/vis_type_timelion/server/series_functions/worldbank_indicators.js @@ -18,7 +18,7 @@ */ import { i18n } from '@kbn/i18n'; -import _ from 'lodash'; +import _ from 'lodash4'; import worldbank from './worldbank.js'; import Bluebird from 'bluebird'; import Datasource from '../lib/classes/datasource'; diff --git a/src/plugins/vis_type_timelion/server/series_functions/yaxis.js b/src/plugins/vis_type_timelion/server/series_functions/yaxis.js index 7a249305ee76e..6dea51e8d243a 100644 --- a/src/plugins/vis_type_timelion/server/series_functions/yaxis.js +++ b/src/plugins/vis_type_timelion/server/series_functions/yaxis.js @@ -18,7 +18,7 @@ */ import { i18n } from '@kbn/i18n'; -import _ from 'lodash'; +import _ from 'lodash4'; import alter from '../lib/alter.js'; import Chainable from '../lib/classes/chainable'; const tickFormatters = { diff --git a/src/plugins/vis_type_timeseries/common/agg_lookup.js b/src/plugins/vis_type_timeseries/common/agg_lookup.js index 432da03e3d45d..8922a279a7400 100644 --- a/src/plugins/vis_type_timeseries/common/agg_lookup.js +++ b/src/plugins/vis_type_timeseries/common/agg_lookup.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { i18n } from '@kbn/i18n'; export const lookup = { diff --git a/src/plugins/vis_type_timeseries/common/calculate_label.js b/src/plugins/vis_type_timeseries/common/calculate_label.js index 9f3030eeb6eae..309c854065ed7 100644 --- a/src/plugins/vis_type_timeseries/common/calculate_label.js +++ b/src/plugins/vis_type_timeseries/common/calculate_label.js @@ -17,7 +17,7 @@ * under the License. */ -import { includes, startsWith } from 'lodash'; +import { includes, startsWith } from 'lodash4'; import { lookup } from './agg_lookup'; import { i18n } from '@kbn/i18n'; diff --git a/src/plugins/vis_type_timeseries/common/extract_index_patterns.js b/src/plugins/vis_type_timeseries/common/extract_index_patterns.js index 3fb005b477199..b90073c96913b 100644 --- a/src/plugins/vis_type_timeseries/common/extract_index_patterns.js +++ b/src/plugins/vis_type_timeseries/common/extract_index_patterns.js @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { uniq } from 'lodash'; +import { uniq } from 'lodash4'; export function extractIndexPatterns(panel, excludedFields = {}) { const patterns = []; diff --git a/src/plugins/vis_type_timeseries/common/get_last_value.js b/src/plugins/vis_type_timeseries/common/get_last_value.js index 4ee7d122b3c03..391d24dbb6429 100644 --- a/src/plugins/vis_type_timeseries/common/get_last_value.js +++ b/src/plugins/vis_type_timeseries/common/get_last_value.js @@ -17,7 +17,7 @@ * under the License. */ -import { isArray, last } from 'lodash'; +import { isArray, last } from 'lodash4'; const DEFAULT_VALUE = 0; const extractValue = (data) => (data && data[1]) || null; diff --git a/src/plugins/vis_type_timeseries/public/application/components/add_delete_buttons.js b/src/plugins/vis_type_timeseries/public/application/components/add_delete_buttons.js index 798d16947c3d9..c2c92aaff6489 100644 --- a/src/plugins/vis_type_timeseries/public/application/components/add_delete_buttons.js +++ b/src/plugins/vis_type_timeseries/public/application/components/add_delete_buttons.js @@ -21,7 +21,7 @@ import PropTypes from 'prop-types'; import React from 'react'; import { EuiToolTip, EuiButtonIcon, EuiFlexGroup, EuiFlexItem } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; -import { isBoolean } from 'lodash'; +import { isBoolean } from 'lodash4'; export function AddDeleteButtons(props) { const { testSubj } = props; diff --git a/src/plugins/vis_type_timeseries/public/application/components/aggs/agg_row.js b/src/plugins/vis_type_timeseries/public/application/components/aggs/agg_row.js index a2f1640904dd0..0e79b52629c07 100644 --- a/src/plugins/vis_type_timeseries/public/application/components/aggs/agg_row.js +++ b/src/plugins/vis_type_timeseries/public/application/components/aggs/agg_row.js @@ -19,7 +19,7 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { last } from 'lodash'; +import { last } from 'lodash4'; import { AddDeleteButtons } from '../add_delete_buttons'; import { EuiIcon, EuiFlexGroup, EuiFlexItem } from '@elastic/eui'; import { SeriesDragHandler } from '../series_drag_handler'; diff --git a/src/plugins/vis_type_timeseries/public/application/components/aggs/metric_select.js b/src/plugins/vis_type_timeseries/public/application/components/aggs/metric_select.js index 83ddc23648ad3..056db626e74b1 100644 --- a/src/plugins/vis_type_timeseries/public/application/components/aggs/metric_select.js +++ b/src/plugins/vis_type_timeseries/public/application/components/aggs/metric_select.js @@ -19,7 +19,7 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { includes } from 'lodash'; +import { includes } from 'lodash4'; import { injectI18n } from '@kbn/i18n/react'; import { EuiComboBox } from '@elastic/eui'; import { calculateSiblings } from '../lib/calculate_siblings'; diff --git a/src/plugins/vis_type_timeseries/public/application/components/aggs/percentile_rank/multi_value_row.js b/src/plugins/vis_type_timeseries/public/application/components/aggs/percentile_rank/multi_value_row.js index fd64559cc1ec2..a7390b23c5e22 100644 --- a/src/plugins/vis_type_timeseries/public/application/components/aggs/percentile_rank/multi_value_row.js +++ b/src/plugins/vis_type_timeseries/public/application/components/aggs/percentile_rank/multi_value_row.js @@ -18,7 +18,7 @@ */ import PropTypes from 'prop-types'; import React from 'react'; -import { get } from 'lodash'; +import { get } from 'lodash4'; import { FormattedMessage } from '@kbn/i18n/react'; import { htmlIdGenerator, diff --git a/src/plugins/vis_type_timeseries/public/application/components/aggs/percentile_rank/percentile_rank.js b/src/plugins/vis_type_timeseries/public/application/components/aggs/percentile_rank/percentile_rank.js index c8af4089ed783..b455174cd2fa0 100644 --- a/src/plugins/vis_type_timeseries/public/application/components/aggs/percentile_rank/percentile_rank.js +++ b/src/plugins/vis_type_timeseries/public/application/components/aggs/percentile_rank/percentile_rank.js @@ -19,7 +19,7 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { assign } from 'lodash'; +import { assign } from 'lodash4'; import { AggSelect } from '../agg_select'; import { FieldSelect } from '../field_select'; import { AggRow } from '../agg_row'; diff --git a/src/plugins/vis_type_timeseries/public/application/components/aggs/percentile_rank/percentile_rank_values.js b/src/plugins/vis_type_timeseries/public/application/components/aggs/percentile_rank/percentile_rank_values.js index 6d52eb9e3515c..5e05f07d69aa5 100644 --- a/src/plugins/vis_type_timeseries/public/application/components/aggs/percentile_rank/percentile_rank_values.js +++ b/src/plugins/vis_type_timeseries/public/application/components/aggs/percentile_rank/percentile_rank_values.js @@ -18,7 +18,7 @@ */ import PropTypes from 'prop-types'; import React from 'react'; -import { last } from 'lodash'; +import { last } from 'lodash4'; import { EuiFlexGroup } from '@elastic/eui'; import { MultiValueRow } from './multi_value_row'; diff --git a/src/plugins/vis_type_timeseries/public/application/components/aggs/percentile_ui.js b/src/plugins/vis_type_timeseries/public/application/components/aggs/percentile_ui.js index bd421248a3607..835d6866c22ae 100644 --- a/src/plugins/vis_type_timeseries/public/application/components/aggs/percentile_ui.js +++ b/src/plugins/vis_type_timeseries/public/application/components/aggs/percentile_ui.js @@ -19,7 +19,7 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import _ from 'lodash'; +import _ from 'lodash4'; import { collectionActions } from '../lib/collection_actions'; import { AddDeleteButtons } from '../add_delete_buttons'; import uuid from 'uuid'; diff --git a/src/plugins/vis_type_timeseries/public/application/components/aggs/vars.js b/src/plugins/vis_type_timeseries/public/application/components/aggs/vars.js index 004a378f5d86f..abbccf5f9b717 100644 --- a/src/plugins/vis_type_timeseries/public/application/components/aggs/vars.js +++ b/src/plugins/vis_type_timeseries/public/application/components/aggs/vars.js @@ -21,7 +21,7 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import uuid from 'uuid'; import { i18n } from '@kbn/i18n'; -import _ from 'lodash'; +import _ from 'lodash4'; import { AddDeleteButtons } from '../add_delete_buttons'; import { collectionActions } from '../lib/collection_actions'; import { MetricSelect } from './metric_select'; diff --git a/src/plugins/vis_type_timeseries/public/application/components/annotations_editor.js b/src/plugins/vis_type_timeseries/public/application/components/annotations_editor.js index 34132e5f72716..7811238ad067a 100644 --- a/src/plugins/vis_type_timeseries/public/application/components/annotations_editor.js +++ b/src/plugins/vis_type_timeseries/public/application/components/annotations_editor.js @@ -19,7 +19,7 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import _ from 'lodash'; +import _ from 'lodash4'; import { collectionActions } from './lib/collection_actions'; import { KBN_FIELD_TYPES } from '../../../../../plugins/data/public'; import { AddDeleteButtons } from './add_delete_buttons'; diff --git a/src/plugins/vis_type_timeseries/public/application/components/color_rules.js b/src/plugins/vis_type_timeseries/public/application/components/color_rules.js index 46b2886daf36d..fba92f3fb7e39 100644 --- a/src/plugins/vis_type_timeseries/public/application/components/color_rules.js +++ b/src/plugins/vis_type_timeseries/public/application/components/color_rules.js @@ -19,7 +19,7 @@ import PropTypes from 'prop-types'; import React, { Component, Fragment } from 'react'; -import _ from 'lodash'; +import _ from 'lodash4'; import { AddDeleteButtons } from './add_delete_buttons'; import { collectionActions } from './lib/collection_actions'; import { ColorPicker } from './color_picker'; diff --git a/src/plugins/vis_type_timeseries/public/application/components/data_format_picker.js b/src/plugins/vis_type_timeseries/public/application/components/data_format_picker.js index dca82cdc0b6b6..a90f808929eae 100644 --- a/src/plugins/vis_type_timeseries/public/application/components/data_format_picker.js +++ b/src/plugins/vis_type_timeseries/public/application/components/data_format_picker.js @@ -19,7 +19,7 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import _ from 'lodash'; +import _ from 'lodash4'; import { htmlIdGenerator, EuiComboBox, diff --git a/src/plugins/vis_type_timeseries/public/application/components/error.js b/src/plugins/vis_type_timeseries/public/application/components/error.js index 2bdce7839621d..e7aa806bbf5fc 100644 --- a/src/plugins/vis_type_timeseries/public/application/components/error.js +++ b/src/plugins/vis_type_timeseries/public/application/components/error.js @@ -20,7 +20,7 @@ import { EuiIcon, EuiSpacer, EuiText } from '@elastic/eui'; import PropTypes from 'prop-types'; import React from 'react'; -import _ from 'lodash'; +import _ from 'lodash4'; import { FormattedMessage } from '@kbn/i18n/react'; const guidPattern = /\[[[a-f\d-\\]{36}\]/g; diff --git a/src/plugins/vis_type_timeseries/public/application/components/index_pattern.js b/src/plugins/vis_type_timeseries/public/application/components/index_pattern.js index 30c6d5b51d187..9c741627b5c63 100644 --- a/src/plugins/vis_type_timeseries/public/application/components/index_pattern.js +++ b/src/plugins/vis_type_timeseries/public/application/components/index_pattern.js @@ -17,7 +17,7 @@ * under the License. */ -import { get } from 'lodash'; +import { get } from 'lodash4'; import PropTypes from 'prop-types'; import React, { useContext } from 'react'; import { diff --git a/src/plugins/vis_type_timeseries/public/application/components/lib/calculate_siblings.js b/src/plugins/vis_type_timeseries/public/application/components/lib/calculate_siblings.js index d813a3536f9d8..8ee5f7f82c7fd 100644 --- a/src/plugins/vis_type_timeseries/public/application/components/lib/calculate_siblings.js +++ b/src/plugins/vis_type_timeseries/public/application/components/lib/calculate_siblings.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; function getAncestors(siblings, item) { const ancestors = (item.id && [item.id]) || []; diff --git a/src/plugins/vis_type_timeseries/public/application/components/lib/charts.js b/src/plugins/vis_type_timeseries/public/application/components/lib/charts.js index 2495026304be8..c9198d942b19b 100644 --- a/src/plugins/vis_type_timeseries/public/application/components/lib/charts.js +++ b/src/plugins/vis_type_timeseries/public/application/components/lib/charts.js @@ -17,6 +17,6 @@ * under the License. */ -import { uniq, map, size, flow } from 'lodash'; +import { uniq, map, size, flow } from 'lodash4'; export const areFieldsDifferent = (name) => (series) => flow(uniq, size)(map(series, name)) > 1; diff --git a/src/plugins/vis_type_timeseries/public/application/components/lib/convert_series_to_vars.js b/src/plugins/vis_type_timeseries/public/application/components/lib/convert_series_to_vars.js index 4d48095898b80..42f302808c6a4 100644 --- a/src/plugins/vis_type_timeseries/public/application/components/lib/convert_series_to_vars.js +++ b/src/plugins/vis_type_timeseries/public/application/components/lib/convert_series_to_vars.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { getLastValue } from '../../../../../../plugins/vis_type_timeseries/common/get_last_value'; import { createTickFormatter } from './tick_formatter'; import moment from 'moment'; diff --git a/src/plugins/vis_type_timeseries/public/application/components/lib/create_change_handler.js b/src/plugins/vis_type_timeseries/public/application/components/lib/create_change_handler.js index beee459c65458..1fc90527d29d0 100644 --- a/src/plugins/vis_type_timeseries/public/application/components/lib/create_change_handler.js +++ b/src/plugins/vis_type_timeseries/public/application/components/lib/create_change_handler.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; export const createChangeHandler = (handleChange, model) => (part) => { const doc = _.assign({}, model, part); diff --git a/src/plugins/vis_type_timeseries/public/application/components/lib/create_number_handler.js b/src/plugins/vis_type_timeseries/public/application/components/lib/create_number_handler.js index 961f5e95a9f10..608dd29eb755d 100644 --- a/src/plugins/vis_type_timeseries/public/application/components/lib/create_number_handler.js +++ b/src/plugins/vis_type_timeseries/public/application/components/lib/create_number_handler.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { detectIE } from './detect_ie'; export const createNumberHandler = (handleChange) => { diff --git a/src/plugins/vis_type_timeseries/public/application/components/lib/create_select_handler.js b/src/plugins/vis_type_timeseries/public/application/components/lib/create_select_handler.js index ff6c2cc0767f5..d15aa1fb2bd39 100644 --- a/src/plugins/vis_type_timeseries/public/application/components/lib/create_select_handler.js +++ b/src/plugins/vis_type_timeseries/public/application/components/lib/create_select_handler.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; export const createSelectHandler = (handleChange) => { return (name) => (selectedOptions) => { diff --git a/src/plugins/vis_type_timeseries/public/application/components/lib/create_text_handler.js b/src/plugins/vis_type_timeseries/public/application/components/lib/create_text_handler.js index 1dd5e02d74980..184ef49d8dc88 100644 --- a/src/plugins/vis_type_timeseries/public/application/components/lib/create_text_handler.js +++ b/src/plugins/vis_type_timeseries/public/application/components/lib/create_text_handler.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { detectIE } from './detect_ie'; export const createTextHandler = (handleChange) => { diff --git a/src/plugins/vis_type_timeseries/public/application/components/lib/get_interval.js b/src/plugins/vis_type_timeseries/public/application/components/lib/get_interval.js index 86361afca3b12..a61635ae5edc5 100644 --- a/src/plugins/vis_type_timeseries/public/application/components/lib/get_interval.js +++ b/src/plugins/vis_type_timeseries/public/application/components/lib/get_interval.js @@ -18,7 +18,7 @@ */ import moment from 'moment'; import { i18n } from '@kbn/i18n'; -import { get } from 'lodash'; +import { get } from 'lodash4'; import { search } from '../../../../../../plugins/data/public'; const { parseEsInterval } = search.aggs; import { GTE_INTERVAL_RE } from '../../../../../../plugins/vis_type_timeseries/common/interval_regexp'; diff --git a/src/plugins/vis_type_timeseries/public/application/components/lib/new_series_fn.js b/src/plugins/vis_type_timeseries/public/application/components/lib/new_series_fn.js index 9d2398ed079a9..afc7e4c0de868 100644 --- a/src/plugins/vis_type_timeseries/public/application/components/lib/new_series_fn.js +++ b/src/plugins/vis_type_timeseries/public/application/components/lib/new_series_fn.js @@ -18,7 +18,7 @@ */ import uuid from 'uuid'; -import _ from 'lodash'; +import _ from 'lodash4'; import { newMetricAggFn } from './new_metric_agg_fn'; import { STACKED_OPTIONS } from '../../visualizations/constants'; diff --git a/src/plugins/vis_type_timeseries/public/application/components/lib/re_id_series.js b/src/plugins/vis_type_timeseries/public/application/components/lib/re_id_series.js index 2c961b00b5ef9..2f4b05a77c512 100644 --- a/src/plugins/vis_type_timeseries/public/application/components/lib/re_id_series.js +++ b/src/plugins/vis_type_timeseries/public/application/components/lib/re_id_series.js @@ -18,7 +18,7 @@ */ import uuid from 'uuid'; -import _ from 'lodash'; +import _ from 'lodash4'; export const reIdSeries = (source) => { const series = _.cloneDeep(source); diff --git a/src/plugins/vis_type_timeseries/public/application/components/lib/replace_vars.js b/src/plugins/vis_type_timeseries/public/application/components/lib/replace_vars.js index f28e06384868a..85056ea002b70 100644 --- a/src/plugins/vis_type_timeseries/public/application/components/lib/replace_vars.js +++ b/src/plugins/vis_type_timeseries/public/application/components/lib/replace_vars.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import handlebars from 'handlebars/dist/handlebars'; import { i18n } from '@kbn/i18n'; diff --git a/src/plugins/vis_type_timeseries/public/application/components/lib/series_change_handler.js b/src/plugins/vis_type_timeseries/public/application/components/lib/series_change_handler.js index beb691f4b7117..fabdb9ffd6df8 100644 --- a/src/plugins/vis_type_timeseries/public/application/components/lib/series_change_handler.js +++ b/src/plugins/vis_type_timeseries/public/application/components/lib/series_change_handler.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { newMetricAggFn } from './new_metric_agg_fn'; import { isBasicAgg } from '../../../../../../plugins/vis_type_timeseries/common/agg_lookup'; import { handleAdd, handleChange } from './collection_actions'; @@ -31,7 +31,7 @@ export const seriesChangeHandler = (props, items) => (doc) => { const metric = newMetricAggFn(); metric.type = doc.type; const incompatPipelines = ['calculation', 'series_agg']; - if (!_.contains(incompatPipelines, doc.type)) metric.field = doc.id; + if (!_.includes(incompatPipelines, doc.type)) metric.field = doc.id; return metric; }); } else { diff --git a/src/plugins/vis_type_timeseries/public/application/components/lib/tick_formatter.js b/src/plugins/vis_type_timeseries/public/application/components/lib/tick_formatter.js index e1f25fccf6369..9e13965d567e7 100644 --- a/src/plugins/vis_type_timeseries/public/application/components/lib/tick_formatter.js +++ b/src/plugins/vis_type_timeseries/public/application/components/lib/tick_formatter.js @@ -18,7 +18,7 @@ */ import handlebars from 'handlebars/dist/handlebars'; -import { isNumber } from 'lodash'; +import { isNumber } from 'lodash4'; import { inputFormats, outputFormats, isDuration } from '../lib/durations'; import { getFieldFormats } from '../../../services'; diff --git a/src/plugins/vis_type_timeseries/public/application/components/markdown_editor.js b/src/plugins/vis_type_timeseries/public/application/components/markdown_editor.js index 1de58adc7e268..15bad3647e073 100644 --- a/src/plugins/vis_type_timeseries/public/application/components/markdown_editor.js +++ b/src/plugins/vis_type_timeseries/public/application/components/markdown_editor.js @@ -25,7 +25,7 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { createTickFormatter } from './lib/tick_formatter'; import { convertSeriesToVars } from './lib/convert_series_to_vars'; -import _ from 'lodash'; +import _ from 'lodash4'; import 'brace/mode/markdown'; import 'brace/theme/github'; diff --git a/src/plugins/vis_type_timeseries/public/application/components/panel_config/table.js b/src/plugins/vis_type_timeseries/public/application/components/panel_config/table.js index 2b729e403898e..3a25e9173feae 100644 --- a/src/plugins/vis_type_timeseries/public/application/components/panel_config/table.js +++ b/src/plugins/vis_type_timeseries/public/application/components/panel_config/table.js @@ -23,7 +23,7 @@ import { FieldSelect } from '../aggs/field_select'; import { SeriesEditor } from '../series_editor'; import { IndexPattern } from '../index_pattern'; import { createTextHandler } from '../lib/create_text_handler'; -import { get } from 'lodash'; +import { get } from 'lodash4'; import uuid from 'uuid'; import { YesNo } from '../yes_no'; import { diff --git a/src/plugins/vis_type_timeseries/public/application/components/series.js b/src/plugins/vis_type_timeseries/public/application/components/series.js index 565ddb53f2633..46c405937cd16 100644 --- a/src/plugins/vis_type_timeseries/public/application/components/series.js +++ b/src/plugins/vis_type_timeseries/public/application/components/series.js @@ -19,7 +19,7 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { assign, get } from 'lodash'; +import { assign, get } from 'lodash4'; import { TimeseriesSeries as timeseries } from './vis_types/timeseries/series'; import { MetricSeries as metric } from './vis_types/metric/series'; diff --git a/src/plugins/vis_type_timeseries/public/application/components/series_editor.js b/src/plugins/vis_type_timeseries/public/application/components/series_editor.js index 7be10e42b9ca6..0106d11f14286 100644 --- a/src/plugins/vis_type_timeseries/public/application/components/series_editor.js +++ b/src/plugins/vis_type_timeseries/public/application/components/series_editor.js @@ -19,7 +19,7 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { find } from 'lodash'; +import { find } from 'lodash4'; import { reIdSeries } from './lib/re_id_series'; import { Series } from './series'; import { handleAdd, handleDelete, handleChange } from './lib/collection_actions'; diff --git a/src/plugins/vis_type_timeseries/public/application/components/split.js b/src/plugins/vis_type_timeseries/public/application/components/split.js index d1c53899db879..759514ad88849 100644 --- a/src/plugins/vis_type_timeseries/public/application/components/split.js +++ b/src/plugins/vis_type_timeseries/public/application/components/split.js @@ -20,7 +20,7 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import uuid from 'uuid'; -import { get } from 'lodash'; +import { get } from 'lodash4'; import { SplitByTerms } from './splits/terms'; import { SplitByFilter } from './splits/filter'; import { SplitByFilters } from './splits/filters'; diff --git a/src/plugins/vis_type_timeseries/public/application/components/splits/filter_items.js b/src/plugins/vis_type_timeseries/public/application/components/splits/filter_items.js index 866c9f5ee2444..2a6bba334da63 100644 --- a/src/plugins/vis_type_timeseries/public/application/components/splits/filter_items.js +++ b/src/plugins/vis_type_timeseries/public/application/components/splits/filter_items.js @@ -19,7 +19,7 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import _ from 'lodash'; +import _ from 'lodash4'; import { collectionActions } from '../lib/collection_actions'; import { AddDeleteButtons } from '../add_delete_buttons'; import { ColorPicker } from '../color_picker'; diff --git a/src/plugins/vis_type_timeseries/public/application/components/splits/terms.js b/src/plugins/vis_type_timeseries/public/application/components/splits/terms.js index b71141f44f52d..826ad262004b2 100644 --- a/src/plugins/vis_type_timeseries/public/application/components/splits/terms.js +++ b/src/plugins/vis_type_timeseries/public/application/components/splits/terms.js @@ -19,7 +19,7 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { get, find } from 'lodash'; +import { get, find } from 'lodash4'; import { GroupBySelect } from './group_by_select'; import { createTextHandler } from '../lib/create_text_handler'; import { createSelectHandler } from '../lib/create_select_handler'; diff --git a/src/plugins/vis_type_timeseries/public/application/components/vis_editor.js b/src/plugins/vis_type_timeseries/public/application/components/vis_editor.js index a96890d4d1502..754ecfbd07b2a 100644 --- a/src/plugins/vis_type_timeseries/public/application/components/vis_editor.js +++ b/src/plugins/vis_type_timeseries/public/application/components/vis_editor.js @@ -21,7 +21,7 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import * as Rx from 'rxjs'; import { share } from 'rxjs/operators'; -import { isEqual, isEmpty, debounce } from 'lodash'; +import { isEqual, isEmpty, debounce } from 'lodash4'; import { VisEditorVisualization } from './vis_editor_visualization'; import { Visualization } from './visualization'; import { VisPicker } from './vis_picker'; diff --git a/src/plugins/vis_type_timeseries/public/application/components/vis_editor_visualization.js b/src/plugins/vis_type_timeseries/public/application/components/vis_editor_visualization.js index 0ae1c86ae3117..bf34257ebb490 100644 --- a/src/plugins/vis_type_timeseries/public/application/components/vis_editor_visualization.js +++ b/src/plugins/vis_type_timeseries/public/application/components/vis_editor_visualization.js @@ -18,7 +18,7 @@ */ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { get } from 'lodash'; +import { get } from 'lodash4'; import { keyCodes, EuiFlexGroup, EuiFlexItem, EuiButton, EuiText, EuiSwitch } from '@elastic/eui'; import { FormattedMessage, injectI18n } from '@kbn/i18n/react'; import { diff --git a/src/plugins/vis_type_timeseries/public/application/components/vis_types/gauge/vis.js b/src/plugins/vis_type_timeseries/public/application/components/vis_types/gauge/vis.js index 4c029f1c0d5b0..347b9a73e3679 100644 --- a/src/plugins/vis_type_timeseries/public/application/components/vis_types/gauge/vis.js +++ b/src/plugins/vis_type_timeseries/public/application/components/vis_types/gauge/vis.js @@ -21,7 +21,7 @@ import PropTypes from 'prop-types'; import React from 'react'; import { visWithSplits } from '../../vis_with_splits'; import { createTickFormatter } from '../../lib/tick_formatter'; -import _, { get, isUndefined, assign, includes } from 'lodash'; +import _, { get, isUndefined, assign, includes } from 'lodash4'; import { Gauge } from '../../../visualizations/views/gauge'; import { getLastValue } from '../../../../../../../plugins/vis_type_timeseries/common/get_last_value'; diff --git a/src/plugins/vis_type_timeseries/public/application/components/vis_types/markdown/vis.js b/src/plugins/vis_type_timeseries/public/application/components/vis_types/markdown/vis.js index a4e7738e92318..2f83683eb4876 100644 --- a/src/plugins/vis_type_timeseries/public/application/components/vis_types/markdown/vis.js +++ b/src/plugins/vis_type_timeseries/public/application/components/vis_types/markdown/vis.js @@ -20,7 +20,7 @@ import PropTypes from 'prop-types'; import React from 'react'; import classNames from 'classnames'; import uuid from 'uuid'; -import { get } from 'lodash'; +import { get } from 'lodash4'; import { Markdown } from '../../../../../../../plugins/kibana_react/public'; import { ErrorComponent } from '../../error'; diff --git a/src/plugins/vis_type_timeseries/public/application/components/vis_types/metric/vis.js b/src/plugins/vis_type_timeseries/public/application/components/vis_types/metric/vis.js index f37971e990c96..5f1306dcd3fe2 100644 --- a/src/plugins/vis_type_timeseries/public/application/components/vis_types/metric/vis.js +++ b/src/plugins/vis_type_timeseries/public/application/components/vis_types/metric/vis.js @@ -21,7 +21,7 @@ import PropTypes from 'prop-types'; import React from 'react'; import { visWithSplits } from '../../vis_with_splits'; import { createTickFormatter } from '../../lib/tick_formatter'; -import _, { get, isUndefined, assign, includes, pick } from 'lodash'; +import _, { get, isUndefined, assign, includes, pick } from 'lodash4'; import { Metric } from '../../../visualizations/views/metric'; import { getLastValue } from '../../../../../../../plugins/vis_type_timeseries/common/get_last_value'; import { isBackgroundInverted } from '../../../lib/set_is_reversed'; diff --git a/src/plugins/vis_type_timeseries/public/application/components/vis_types/table/vis.js b/src/plugins/vis_type_timeseries/public/application/components/vis_types/table/vis.js index d55afeda62e70..fb3c562934ca8 100644 --- a/src/plugins/vis_type_timeseries/public/application/components/vis_types/table/vis.js +++ b/src/plugins/vis_type_timeseries/public/application/components/vis_types/table/vis.js @@ -17,7 +17,7 @@ * under the License. */ -import _, { isArray, last, get } from 'lodash'; +import _, { isArray, last, get } from 'lodash4'; import React, { Component } from 'react'; import PropTypes from 'prop-types'; import { createTickFormatter } from '../../lib/tick_formatter'; diff --git a/src/plugins/vis_type_timeseries/public/application/components/vis_types/timeseries/vis.js b/src/plugins/vis_type_timeseries/public/application/components/vis_types/timeseries/vis.js index ddfaf3c1428d9..cd878fb3b903e 100644 --- a/src/plugins/vis_type_timeseries/public/application/components/vis_types/timeseries/vis.js +++ b/src/plugins/vis_type_timeseries/public/application/components/vis_types/timeseries/vis.js @@ -21,7 +21,7 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import reactCSS from 'reactcss'; -import { startsWith, get, cloneDeep, map } from 'lodash'; +import { startsWith, get, cloneDeep, map } from 'lodash4'; import { htmlIdGenerator } from '@elastic/eui'; import { ScaleType } from '@elastic/charts'; diff --git a/src/plugins/vis_type_timeseries/public/application/components/vis_types/top_n/vis.js b/src/plugins/vis_type_timeseries/public/application/components/vis_types/top_n/vis.js index a4fe6f796bc0b..eab3693b7c572 100644 --- a/src/plugins/vis_type_timeseries/public/application/components/vis_types/top_n/vis.js +++ b/src/plugins/vis_type_timeseries/public/application/components/vis_types/top_n/vis.js @@ -24,7 +24,7 @@ import { isBackgroundInverted } from '../../../lib/set_is_reversed'; import { replaceVars } from '../../lib/replace_vars'; import PropTypes from 'prop-types'; import React from 'react'; -import { sortBy, first, get, gt, gte, lt, lte } from 'lodash'; +import { sortBy, first, get, gt, gte, lt, lte } from 'lodash4'; const OPERATORS = { gt, gte, lt, lte }; function sortByDirection(data, direction, fn) { diff --git a/src/plugins/vis_type_timeseries/public/application/components/vis_with_splits.js b/src/plugins/vis_type_timeseries/public/application/components/vis_with_splits.js index 8b63d1b5043f5..f474d11101291 100644 --- a/src/plugins/vis_type_timeseries/public/application/components/vis_with_splits.js +++ b/src/plugins/vis_type_timeseries/public/application/components/vis_with_splits.js @@ -19,7 +19,7 @@ import React from 'react'; import { getDisplayName } from './lib/get_display_name'; -import { last, findIndex, first } from 'lodash'; +import { last, findIndex, first } from 'lodash4'; import { calculateLabel } from '../../../../../plugins/vis_type_timeseries/common/calculate_label'; export function visWithSplits(WrappedComponent) { diff --git a/src/plugins/vis_type_timeseries/public/application/components/visualization.js b/src/plugins/vis_type_timeseries/public/application/components/visualization.js index 8b8218653f97c..0088fe2c89190 100644 --- a/src/plugins/vis_type_timeseries/public/application/components/visualization.js +++ b/src/plugins/vis_type_timeseries/public/application/components/visualization.js @@ -19,7 +19,7 @@ import PropTypes from 'prop-types'; import React from 'react'; -import _ from 'lodash'; +import _ from 'lodash4'; import { TimeseriesVisualization } from './vis_types/timeseries/vis'; import { metric } from './vis_types/metric/vis'; diff --git a/src/plugins/vis_type_timeseries/public/application/components/yes_no.js b/src/plugins/vis_type_timeseries/public/application/components/yes_no.js index 7834de0b8fa06..c75f863a53b4e 100644 --- a/src/plugins/vis_type_timeseries/public/application/components/yes_no.js +++ b/src/plugins/vis_type_timeseries/public/application/components/yes_no.js @@ -19,7 +19,7 @@ import PropTypes from 'prop-types'; import React from 'react'; -import _ from 'lodash'; +import _ from 'lodash4'; import { EuiRadio, htmlIdGenerator } from '@elastic/eui'; import { FormattedMessage } from '@kbn/i18n/react'; diff --git a/src/plugins/vis_type_timeseries/public/application/lib/check_ui_restrictions.js b/src/plugins/vis_type_timeseries/public/application/lib/check_ui_restrictions.js index 5d18c0a2f09cd..33c2b11d11941 100644 --- a/src/plugins/vis_type_timeseries/public/application/lib/check_ui_restrictions.js +++ b/src/plugins/vis_type_timeseries/public/application/lib/check_ui_restrictions.js @@ -17,7 +17,7 @@ * under the License. */ -import { get } from 'lodash'; +import { get } from 'lodash4'; import { RESTRICTIONS_KEYS, DEFAULT_UI_RESTRICTION, diff --git a/src/plugins/vis_type_timeseries/public/application/visualizations/lib/get_value_by.js b/src/plugins/vis_type_timeseries/public/application/visualizations/lib/get_value_by.js index e6a89ee2e621c..0c098efdce558 100644 --- a/src/plugins/vis_type_timeseries/public/application/visualizations/lib/get_value_by.js +++ b/src/plugins/vis_type_timeseries/public/application/visualizations/lib/get_value_by.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; export const getValueBy = (fn, data) => { if (_.isNumber(data)) return data; diff --git a/src/plugins/vis_type_timeseries/public/application/visualizations/views/gauge.js b/src/plugins/vis_type_timeseries/public/application/visualizations/views/gauge.js index 50a2042425438..686993d874b18 100644 --- a/src/plugins/vis_type_timeseries/public/application/visualizations/views/gauge.js +++ b/src/plugins/vis_type_timeseries/public/application/visualizations/views/gauge.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import PropTypes from 'prop-types'; import React, { Component } from 'react'; import classNames from 'classnames'; diff --git a/src/plugins/vis_type_timeseries/public/application/visualizations/views/gauge_vis.js b/src/plugins/vis_type_timeseries/public/application/visualizations/views/gauge_vis.js index 7a0ef67ee24f6..52d609dab585f 100644 --- a/src/plugins/vis_type_timeseries/public/application/visualizations/views/gauge_vis.js +++ b/src/plugins/vis_type_timeseries/public/application/visualizations/views/gauge_vis.js @@ -19,7 +19,7 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import _ from 'lodash'; +import _ from 'lodash4'; import reactcss from 'reactcss'; import { calculateCoordinates } from '../lib/calculate_coordinates'; import { COLORS } from '../constants/chart'; diff --git a/src/plugins/vis_type_timeseries/public/application/visualizations/views/metric.js b/src/plugins/vis_type_timeseries/public/application/visualizations/views/metric.js index 4c286f61720ac..fa93fee83cce3 100644 --- a/src/plugins/vis_type_timeseries/public/application/visualizations/views/metric.js +++ b/src/plugins/vis_type_timeseries/public/application/visualizations/views/metric.js @@ -19,7 +19,7 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import _ from 'lodash'; +import _ from 'lodash4'; import { getLastValue } from '../../../../../../plugins/vis_type_timeseries/common/get_last_value'; import reactcss from 'reactcss'; import { calculateCoordinates } from '../lib/calculate_coordinates'; diff --git a/src/plugins/vis_type_timeseries/public/metrics_fn.ts b/src/plugins/vis_type_timeseries/public/metrics_fn.ts index b573225feaab1..539083519327b 100644 --- a/src/plugins/vis_type_timeseries/public/metrics_fn.ts +++ b/src/plugins/vis_type_timeseries/public/metrics_fn.ts @@ -17,7 +17,7 @@ * under the License. */ -import { get } from 'lodash'; +import { get } from 'lodash4'; import { i18n } from '@kbn/i18n'; import { ExpressionFunctionDefinition, KibanaContext, Render } from '../../expressions/public'; diff --git a/src/plugins/vis_type_timeseries/server/lib/get_fields.ts b/src/plugins/vis_type_timeseries/server/lib/get_fields.ts index fd20ff8b024b3..516ccdb72a0d9 100644 --- a/src/plugins/vis_type_timeseries/server/lib/get_fields.ts +++ b/src/plugins/vis_type_timeseries/server/lib/get_fields.ts @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { uniq } from 'lodash'; +import { uniqBy } from 'lodash4'; import { first, map } from 'rxjs/operators'; import { KibanaRequest, RequestHandlerContext } from 'kibana/server'; @@ -87,5 +87,5 @@ export async function getFields( (field) => field.aggregatable && !indexPatterns.isNestedField(field) ); - return uniq(fields, (field) => field.name); + return uniqBy(fields, (field) => field.name); } diff --git a/src/plugins/vis_type_timeseries/server/lib/get_vis_data.ts b/src/plugins/vis_type_timeseries/server/lib/get_vis_data.ts index f697e754a2e00..f947b65c0caf1 100644 --- a/src/plugins/vis_type_timeseries/server/lib/get_vis_data.ts +++ b/src/plugins/vis_type_timeseries/server/lib/get_vis_data.ts @@ -18,7 +18,7 @@ */ import { FakeRequest, RequestHandlerContext } from 'kibana/server'; -import _ from 'lodash'; +import _ from 'lodash4'; import { first, map } from 'rxjs/operators'; import { getPanelData } from './vis_data/get_panel_data'; import { Framework } from '../index'; diff --git a/src/plugins/vis_type_timeseries/server/lib/vis_data/get_interval_and_timefield.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/get_interval_and_timefield.js index e4bda194299df..c64486a5d182c 100644 --- a/src/plugins/vis_type_timeseries/server/lib/vis_data/get_interval_and_timefield.js +++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/get_interval_and_timefield.js @@ -17,7 +17,7 @@ * under the License. */ -import { get } from 'lodash'; +import { get } from 'lodash4'; const DEFAULT_TIME_FIELD = '@timestamp'; diff --git a/src/plugins/vis_type_timeseries/server/lib/vis_data/get_table_data.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/get_table_data.js index 1d1c245907959..e3c85a2d3d928 100644 --- a/src/plugins/vis_type_timeseries/server/lib/vis_data/get_table_data.js +++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/get_table_data.js @@ -18,7 +18,7 @@ */ import { buildRequestBody } from './table/build_request_body'; import { handleErrorResponse } from './handle_error_response'; -import { get } from 'lodash'; +import { get } from 'lodash4'; import { processBucket } from './table/process_bucket'; import { getEsQueryConfig } from './helpers/get_es_query_uisettings'; import { getIndexPatternObject } from './helpers/get_index_pattern'; diff --git a/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/bucket_transform.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/bucket_transform.js index 0e4d2ce2a926c..2ad5b0b9c6187 100644 --- a/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/bucket_transform.js +++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/bucket_transform.js @@ -19,7 +19,7 @@ import { getBucketsPath } from './get_buckets_path'; import { parseInterval } from './parse_interval'; -import { set, isEmpty } from 'lodash'; +import { set, isEmpty } from 'lodash4'; import { i18n } from '@kbn/i18n'; import { MODEL_SCRIPTS } from './moving_fn_scripts'; diff --git a/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_agg_value.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_agg_value.js index c9363f32b50aa..1f17241a3a069 100644 --- a/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_agg_value.js +++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_agg_value.js @@ -17,7 +17,7 @@ * under the License. */ -import { get, includes, max, min, sum, noop } from 'lodash'; +import { get, includes, max, min, sum, noop } from 'lodash4'; import { toPercentileNumber } from '../../../../common/to_percentile_number'; import { EXTENDED_STATS_TYPES, METRIC_TYPES } from '../../../../common/metric_types'; diff --git a/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_buckets_path.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_buckets_path.js index 6855f50f956f2..3afa2f14405ac 100644 --- a/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_buckets_path.js +++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_buckets_path.js @@ -17,7 +17,7 @@ * under the License. */ -import { startsWith } from 'lodash'; +import { startsWith } from 'lodash4'; import { toPercentileNumber } from '../../../../common/to_percentile_number'; import { METRIC_TYPES } from '../../../../common/metric_types'; diff --git a/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_index_pattern.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_index_pattern.js index f37f0da4bbe93..065fc1f37b13d 100644 --- a/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_index_pattern.js +++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_index_pattern.js @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { get } from 'lodash'; +import { get } from 'lodash4'; export async function getIndexPatternObject(req, indexPatternString) { let defaultIndex; diff --git a/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_last_metric.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_last_metric.js index 113fca37de111..5875b680304f6 100644 --- a/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_last_metric.js +++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_last_metric.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; export function getLastMetric(series) { return _.last(series.metrics.filter((s) => s.type !== 'series_agg')); diff --git a/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_sibling_agg_value.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_sibling_agg_value.js index 4308c7e78485f..21c569a51c9d2 100644 --- a/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_sibling_agg_value.js +++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_sibling_agg_value.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; export const getSiblingAggValue = (row, metric) => { let key = metric.type.replace(/_bucket$/, ''); diff --git a/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_splits.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_splits.js index 54139a7c27e3f..d35a3542dba66 100644 --- a/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_splits.js +++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_splits.js @@ -19,7 +19,7 @@ import Color from 'color'; import { calculateLabel } from '../../../../common/calculate_label'; -import _ from 'lodash'; +import _ from 'lodash4'; import { getLastMetric } from './get_last_metric'; import { getSplitColors } from './get_split_colors'; import { formatKey } from './format_key'; diff --git a/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/parse_interval.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/parse_interval.js index 00cef3b0eaced..3f8db4da62b43 100644 --- a/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/parse_interval.js +++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/parse_interval.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import moment from 'moment'; import dateMath from '@elastic/datemath'; diff --git a/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/timestamp.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/timestamp.js index 533d4ef8d30cc..4ab4be73d6a30 100644 --- a/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/timestamp.js +++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/timestamp.js @@ -17,7 +17,7 @@ * under the License. */ -import { last } from 'lodash'; +import { last } from 'lodash4'; /** * @param {Array} seriesGroup diff --git a/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/unit_to_seconds.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/unit_to_seconds.js index be8f1741627ba..dad0ae308e1c8 100644 --- a/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/unit_to_seconds.js +++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/unit_to_seconds.js @@ -17,7 +17,7 @@ * under the License. */ import { INTERVAL_STRING_RE } from '../../../../common/interval_regexp'; -import { sortBy, isNumber } from 'lodash'; +import { sortBy, isNumber } from 'lodash4'; export const ASCENDING_UNIT_ORDER = ['ms', 's', 'm', 'h', 'd', 'w', 'M', 'y']; diff --git a/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/normalize_query.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/normalize_query.js index d07d343d1b1eb..64dfa953892e5 100644 --- a/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/normalize_query.js +++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/normalize_query.js @@ -17,7 +17,7 @@ * under the License. */ import { overwrite } from '../../helpers'; -import _ from 'lodash'; +import _ from 'lodash4'; const isEmptyFilter = (filter = {}) => Boolean(filter.match_all) && _.isEmpty(filter.match_all); const hasSiblingPipelineAggregation = (aggs = {}) => Object.keys(aggs).length > 1; diff --git a/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/calculate_agg_root.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/calculate_agg_root.js index ba2d64dad65fc..0efa36255dac0 100644 --- a/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/calculate_agg_root.js +++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/calculate_agg_root.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; export function calculateAggRoot(doc, column) { let aggRoot = `aggs.pivot.aggs.${column.id}.aggs`; diff --git a/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/normalize_query.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/normalize_query.js index 9fdb96fa31481..45b2a06fd0d43 100644 --- a/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/normalize_query.js +++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/normalize_query.js @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { overwrite } from '../../helpers'; const isEmptyFilter = (filter = {}) => Boolean(filter.match_all) && _.isEmpty(filter.match_all); const hasSiblingPipelineAggregation = (aggs = {}) => Object.keys(aggs).length > 1; diff --git a/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/pivot.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/pivot.js index ad085f25cf451..77ad9fe21687d 100644 --- a/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/pivot.js +++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/pivot.js @@ -17,7 +17,7 @@ * under the License. */ -import { get, last } from 'lodash'; +import { get, last } from 'lodash4'; import { overwrite } from '../../helpers'; import { basicAggs } from '../../../../../common/basic_aggs'; diff --git a/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/annotations/buckets.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/annotations/buckets.js index fc7acc7fc35c0..75d9619dc990f 100644 --- a/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/annotations/buckets.js +++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/annotations/buckets.js @@ -17,7 +17,7 @@ * under the License. */ -import { get, isEmpty } from 'lodash'; +import { get, isEmpty } from 'lodash4'; export function getAnnotationBuckets(resp, annotation) { return get(resp, `aggregations.${annotation.id}.buckets`, []) diff --git a/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/annotations/index.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/annotations/index.js index dab7e94a8194e..f70dc8b22b5a9 100644 --- a/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/annotations/index.js +++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/annotations/index.js @@ -17,7 +17,7 @@ * under the License. */ -import { flow } from 'lodash'; +import { flow } from 'lodash4'; import { filterAnnotations } from './filter'; import { getAnnotationBuckets } from './buckets'; diff --git a/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/_series_agg.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/_series_agg.js index 63b77f8ad60f4..a2c43acdb51b7 100644 --- a/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/_series_agg.js +++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/_series_agg.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; function mean(values) { return _.sum(values) / values.length; diff --git a/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/drop_last_bucket.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/drop_last_bucket.js index 9b3d8c16a1121..4d36ff9c7100d 100644 --- a/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/drop_last_bucket.js +++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/drop_last_bucket.js @@ -17,7 +17,7 @@ * under the License. */ -import { get } from 'lodash'; +import { get } from 'lodash4'; import { isLastValueTimerangeMode } from '../../helpers/get_timerange_mode'; export function dropLastBucket(resp, panel, series) { diff --git a/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/math.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/math.js index f8752ce8fa3a8..061be85e4aa4e 100644 --- a/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/math.js +++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/math.js @@ -18,7 +18,7 @@ */ const percentileValueMatch = /\[([0-9\.]+)\]$/; -import { startsWith, flatten, values, first, last } from 'lodash'; +import { startsWith, flatten, values, first, last } from 'lodash4'; import { getDefaultDecoration } from '../../helpers/get_default_decoration'; import { getSiblingAggValue } from '../../helpers/get_sibling_agg_value'; import { getSplits } from '../../helpers/get_splits'; diff --git a/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/series_agg.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/series_agg.js index d2b0ce9226bb9..717ef6fad7982 100644 --- a/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/series_agg.js +++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/series_agg.js @@ -18,7 +18,7 @@ */ import { SeriesAgg } from './_series_agg'; -import _ from 'lodash'; +import _ from 'lodash4'; import { getDefaultDecoration } from '../../helpers/get_default_decoration'; import { calculateLabel } from '../../../../../common/calculate_label'; diff --git a/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/time_shift.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/time_shift.js index 14de6aa18f872..f2d491bd4f29f 100644 --- a/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/time_shift.js +++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/time_shift.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import moment from 'moment'; export function timeShift(resp, panel, series) { diff --git a/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/_series_agg.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/_series_agg.js index 511349b89deb1..e8e3e07328115 100644 --- a/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/_series_agg.js +++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/_series_agg.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; function mean(values) { return _.sum(values) / values.length; diff --git a/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/percentile.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/percentile.js index 788bb6f14a0c7..a0e946bdc37de 100644 --- a/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/percentile.js +++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/percentile.js @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { last } from 'lodash'; +import { last } from 'lodash4'; import { getSplits } from '../../helpers/get_splits'; import { getLastMetric } from '../../helpers/get_last_metric'; import { toPercentileNumber } from '../../../../../common/to_percentile_number'; diff --git a/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/percentile_rank.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/percentile_rank.js index c280538c7ce5f..2aa436ba2ac05 100644 --- a/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/percentile_rank.js +++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/percentile_rank.js @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { last } from 'lodash'; +import { last } from 'lodash4'; import { getSplits } from '../../helpers/get_splits'; import { getLastMetric } from '../../helpers/get_last_metric'; import { toPercentileNumber } from '../../../../../common/to_percentile_number'; diff --git a/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/series_agg.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/series_agg.js index 343198bc22a6e..19909e0ea596d 100644 --- a/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/series_agg.js +++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/series_agg.js @@ -18,7 +18,7 @@ */ import { SeriesAgg } from './_series_agg'; -import _ from 'lodash'; +import _ from 'lodash4'; import { calculateLabel } from '../../../../../common/calculate_label'; export function seriesAgg(resp, panel, series) { diff --git a/src/plugins/vis_type_timeseries/server/lib/vis_data/series/handle_response_body.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/series/handle_response_body.js index eef7143990e98..5d7dd2fdc7e6a 100644 --- a/src/plugins/vis_type_timeseries/server/lib/vis_data/series/handle_response_body.js +++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/series/handle_response_body.js @@ -19,7 +19,7 @@ import { buildProcessorFunction } from '../build_processor_function'; import { processors } from '../response_processors/series'; -import { get } from 'lodash'; +import { get } from 'lodash4'; import { i18n } from '@kbn/i18n'; export function handleResponseBody(panel) { diff --git a/src/plugins/vis_type_timeseries/server/lib/vis_data/table/process_bucket.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/table/process_bucket.js index 0f2a7e153bde0..12085368f9461 100644 --- a/src/plugins/vis_type_timeseries/server/lib/vis_data/table/process_bucket.js +++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/table/process_bucket.js @@ -21,7 +21,7 @@ import { buildProcessorFunction } from '../build_processor_function'; import { processors } from '../response_processors/table'; import { getLastValue } from '../../../../common/get_last_value'; import regression from 'regression'; -import { first, get } from 'lodash'; +import { first, get } from 'lodash4'; import { overwrite } from '../helpers'; import { getActiveSeries } from '../helpers/get_active_series'; diff --git a/src/plugins/vis_type_timeseries/server/saved_objects/tsvb_telemetry.ts b/src/plugins/vis_type_timeseries/server/saved_objects/tsvb_telemetry.ts index f6754e5fd9ca4..143a8472eaa4d 100644 --- a/src/plugins/vis_type_timeseries/server/saved_objects/tsvb_telemetry.ts +++ b/src/plugins/vis_type_timeseries/server/saved_objects/tsvb_telemetry.ts @@ -17,7 +17,7 @@ * under the License. */ -import { flow } from 'lodash'; +import { flow } from 'lodash4'; import { SavedObjectMigrationFn, SavedObjectsType } from 'kibana/server'; const resetCount: SavedObjectMigrationFn = (doc) => ({ @@ -40,7 +40,7 @@ export const tsvbTelemetrySavedObjectType: SavedObjectsType = { }, }, migrations: { - '7.7.0': flow(resetCount), - '7.8.0': flow(resetCount), + '7.7.0': flow(resetCount), + '7.8.0': flow(resetCount), }, }; diff --git a/src/plugins/vis_type_vega/public/data_model/es_query_parser.js b/src/plugins/vis_type_vega/public/data_model/es_query_parser.js index f7772ff888a61..095adeeec9350 100644 --- a/src/plugins/vis_type_vega/public/data_model/es_query_parser.js +++ b/src/plugins/vis_type_vega/public/data_model/es_query_parser.js @@ -19,7 +19,7 @@ import moment from 'moment'; import { i18n } from '@kbn/i18n'; -import { isPlainObject, cloneDeep } from 'lodash'; +import { isPlainObject, cloneDeep } from 'lodash4'; const TIMEFILTER = '%timefilter%'; const AUTOINTERVAL = '%autointerval%'; diff --git a/src/plugins/vis_type_vega/public/data_model/es_query_parser.test.js b/src/plugins/vis_type_vega/public/data_model/es_query_parser.test.js index b04e221fc354e..5bc6f9cc827bf 100644 --- a/src/plugins/vis_type_vega/public/data_model/es_query_parser.test.js +++ b/src/plugins/vis_type_vega/public/data_model/es_query_parser.test.js @@ -17,7 +17,7 @@ * under the License. */ -import { cloneDeep } from 'lodash'; +import { cloneDeep } from 'lodash4'; import moment from 'moment'; import { EsQueryParser } from './es_query_parser'; diff --git a/src/plugins/vis_type_vega/public/data_model/vega_parser.js b/src/plugins/vis_type_vega/public/data_model/vega_parser.js index cbfe2a6ede4f2..8d67f8c204fd1 100644 --- a/src/plugins/vis_type_vega/public/data_model/vega_parser.js +++ b/src/plugins/vis_type_vega/public/data_model/vega_parser.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import * as vega from 'vega-lib'; import * as vegaLite from 'vega-lite'; import schemaParser from 'vega-schema-url-parser'; diff --git a/src/plugins/vis_type_vega/public/data_model/vega_parser.test.js b/src/plugins/vis_type_vega/public/data_model/vega_parser.test.js index a40ef31260b6f..340341e5984a5 100644 --- a/src/plugins/vis_type_vega/public/data_model/vega_parser.test.js +++ b/src/plugins/vis_type_vega/public/data_model/vega_parser.test.js @@ -17,7 +17,7 @@ * under the License. */ -import { cloneDeep } from 'lodash'; +import { cloneDeep } from 'lodash4'; import { VegaParser } from './vega_parser'; import { bypassExternalUrlCheck } from '../vega_view/vega_base_view'; jest.mock('../services'); diff --git a/src/plugins/vis_type_vega/public/vega_fn.ts b/src/plugins/vis_type_vega/public/vega_fn.ts index a9c915fcfb636..aec0369214737 100644 --- a/src/plugins/vis_type_vega/public/vega_fn.ts +++ b/src/plugins/vis_type_vega/public/vega_fn.ts @@ -17,7 +17,7 @@ * under the License. */ -import { get } from 'lodash'; +import { get } from 'lodash4'; import { i18n } from '@kbn/i18n'; import { ExpressionFunctionDefinition, KibanaContext, Render } from '../../expressions/public'; import { VegaVisualizationDependencies } from './plugin'; @@ -58,9 +58,9 @@ export const createVegaFn = ( const vegaRequestHandler = createVegaRequestHandler(dependencies, context.abortSignal); const response = await vegaRequestHandler({ - timeRange: get(input, 'timeRange'), - query: get(input, 'query'), - filters: get(input, 'filters'), + timeRange: get(input, 'timeRange') as any, + query: get(input, 'query') as any, + filters: get(input, 'filters') as any, visParams: { spec: args.spec }, }); diff --git a/src/plugins/vis_type_vega/public/vega_view/vega_tooltip.js b/src/plugins/vis_type_vega/public/vega_view/vega_tooltip.js index 01386fd91abc5..bb4c68fb5f464 100644 --- a/src/plugins/vis_type_vega/public/vega_view/vega_tooltip.js +++ b/src/plugins/vis_type_vega/public/vega_view/vega_tooltip.js @@ -19,7 +19,7 @@ import { calculatePopoverPosition } from '@elastic/eui'; import { formatValue as createTooltipContent } from 'vega-tooltip'; -import _ from 'lodash'; +import _ from 'lodash4'; // Some of this code was adapted from https://github.com/vega/vega-tooltip diff --git a/src/plugins/vis_type_vislib/public/components/options/metrics_axes/index.tsx b/src/plugins/vis_type_vislib/public/components/options/metrics_axes/index.tsx index d885f8fb0b12f..411b93033a81b 100644 --- a/src/plugins/vis_type_vislib/public/components/options/metrics_axes/index.tsx +++ b/src/plugins/vis_type_vislib/public/components/options/metrics_axes/index.tsx @@ -18,7 +18,7 @@ */ import React, { useState, useEffect, useCallback, useMemo } from 'react'; -import { cloneDeep, uniq, get } from 'lodash'; +import { cloneDeep, uniq, get } from 'lodash3'; import { EuiSpacer } from '@elastic/eui'; import { IAggConfig } from 'src/plugins/data/public'; diff --git a/src/plugins/vis_type_vislib/public/components/options/metrics_axes/utils.ts b/src/plugins/vis_type_vislib/public/components/options/metrics_axes/utils.ts index 7c4f3b3ec8843..972d5f6fe2c65 100644 --- a/src/plugins/vis_type_vislib/public/components/options/metrics_axes/utils.ts +++ b/src/plugins/vis_type_vislib/public/components/options/metrics_axes/utils.ts @@ -17,7 +17,7 @@ * under the License. */ -import { capitalize } from 'lodash'; +import { capitalize } from 'lodash3'; import { BasicVislibParams, ValueAxis, SeriesParam } from '../../../types'; import { ChartModes, ChartTypes, InterpolationModes, Positions } from '../../../utils/collections'; diff --git a/src/plugins/vis_type_vislib/public/fixtures/mock_data/filters/_columns.js b/src/plugins/vis_type_vislib/public/fixtures/mock_data/filters/_columns.js index cc131a0a5bc12..a07b2915f9abb 100644 --- a/src/plugins/vis_type_vislib/public/fixtures/mock_data/filters/_columns.js +++ b/src/plugins/vis_type_vislib/public/fixtures/mock_data/filters/_columns.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash3'; export default { columns: [ diff --git a/src/plugins/vis_type_vislib/public/fixtures/mock_data/filters/_rows.js b/src/plugins/vis_type_vislib/public/fixtures/mock_data/filters/_rows.js index 04fd9f19d742a..6dffcebd85ba2 100644 --- a/src/plugins/vis_type_vislib/public/fixtures/mock_data/filters/_rows.js +++ b/src/plugins/vis_type_vislib/public/fixtures/mock_data/filters/_rows.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash3'; export default { rows: [ diff --git a/src/plugins/vis_type_vislib/public/fixtures/mock_data/filters/_series.js b/src/plugins/vis_type_vislib/public/fixtures/mock_data/filters/_series.js index e016011ae5392..83d45d103a63c 100644 --- a/src/plugins/vis_type_vislib/public/fixtures/mock_data/filters/_series.js +++ b/src/plugins/vis_type_vislib/public/fixtures/mock_data/filters/_series.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash3'; export default { label: '', diff --git a/src/plugins/vis_type_vislib/public/fixtures/mock_data/geohash/_columns.js b/src/plugins/vis_type_vislib/public/fixtures/mock_data/geohash/_columns.js index c1044160c0e7a..b428c50749b43 100644 --- a/src/plugins/vis_type_vislib/public/fixtures/mock_data/geohash/_columns.js +++ b/src/plugins/vis_type_vislib/public/fixtures/mock_data/geohash/_columns.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash3'; export default { columns: [ diff --git a/src/plugins/vis_type_vislib/public/fixtures/mock_data/geohash/_geo_json.js b/src/plugins/vis_type_vislib/public/fixtures/mock_data/geohash/_geo_json.js index a26dc9bd8b181..5ec4b903e0bf5 100644 --- a/src/plugins/vis_type_vislib/public/fixtures/mock_data/geohash/_geo_json.js +++ b/src/plugins/vis_type_vislib/public/fixtures/mock_data/geohash/_geo_json.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash3'; export default { valueFormatter: _.identity, diff --git a/src/plugins/vis_type_vislib/public/fixtures/mock_data/geohash/_rows.js b/src/plugins/vis_type_vislib/public/fixtures/mock_data/geohash/_rows.js index ca4cb2a7feee1..7320c0df00c90 100644 --- a/src/plugins/vis_type_vislib/public/fixtures/mock_data/geohash/_rows.js +++ b/src/plugins/vis_type_vislib/public/fixtures/mock_data/geohash/_rows.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash3'; export default { rows: [ diff --git a/src/plugins/vis_type_vislib/public/fixtures/mock_data/histogram/_columns.js b/src/plugins/vis_type_vislib/public/fixtures/mock_data/histogram/_columns.js index 7506784099d12..14c6d1bc9a464 100644 --- a/src/plugins/vis_type_vislib/public/fixtures/mock_data/histogram/_columns.js +++ b/src/plugins/vis_type_vislib/public/fixtures/mock_data/histogram/_columns.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash3'; export default { columns: [ diff --git a/src/plugins/vis_type_vislib/public/fixtures/mock_data/histogram/_rows.js b/src/plugins/vis_type_vislib/public/fixtures/mock_data/histogram/_rows.js index 1482118587dc7..273a06764ae18 100644 --- a/src/plugins/vis_type_vislib/public/fixtures/mock_data/histogram/_rows.js +++ b/src/plugins/vis_type_vislib/public/fixtures/mock_data/histogram/_rows.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash3'; export default { rows: [ diff --git a/src/plugins/vis_type_vislib/public/fixtures/mock_data/histogram/_series.js b/src/plugins/vis_type_vislib/public/fixtures/mock_data/histogram/_series.js index c7f4b473ef7cb..9b2318db2ddfa 100644 --- a/src/plugins/vis_type_vislib/public/fixtures/mock_data/histogram/_series.js +++ b/src/plugins/vis_type_vislib/public/fixtures/mock_data/histogram/_series.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash3'; export default { label: '', diff --git a/src/plugins/vis_type_vislib/public/fixtures/mock_data/histogram/_slices.js b/src/plugins/vis_type_vislib/public/fixtures/mock_data/histogram/_slices.js index 6993016f84d02..1614f950e6414 100644 --- a/src/plugins/vis_type_vislib/public/fixtures/mock_data/histogram/_slices.js +++ b/src/plugins/vis_type_vislib/public/fixtures/mock_data/histogram/_slices.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash3'; export default { label: '', diff --git a/src/plugins/vis_type_vislib/public/fixtures/mock_data/not_enough_data/_one_point.js b/src/plugins/vis_type_vislib/public/fixtures/mock_data/not_enough_data/_one_point.js index c8aefa5a62ba5..d3c2a32c6fc09 100644 --- a/src/plugins/vis_type_vislib/public/fixtures/mock_data/not_enough_data/_one_point.js +++ b/src/plugins/vis_type_vislib/public/fixtures/mock_data/not_enough_data/_one_point.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash3'; export default { label: '', diff --git a/src/plugins/vis_type_vislib/public/fixtures/mock_data/range/_columns.js b/src/plugins/vis_type_vislib/public/fixtures/mock_data/range/_columns.js index 2deddb513e610..d35aae084dcac 100644 --- a/src/plugins/vis_type_vislib/public/fixtures/mock_data/range/_columns.js +++ b/src/plugins/vis_type_vislib/public/fixtures/mock_data/range/_columns.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash3'; export default { columns: [ diff --git a/src/plugins/vis_type_vislib/public/fixtures/mock_data/range/_rows.js b/src/plugins/vis_type_vislib/public/fixtures/mock_data/range/_rows.js index fea0e822f19c8..eda74650facbe 100644 --- a/src/plugins/vis_type_vislib/public/fixtures/mock_data/range/_rows.js +++ b/src/plugins/vis_type_vislib/public/fixtures/mock_data/range/_rows.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash3'; export default { rows: [ diff --git a/src/plugins/vis_type_vislib/public/fixtures/mock_data/range/_series.js b/src/plugins/vis_type_vislib/public/fixtures/mock_data/range/_series.js index 1a19c8c108323..563c291b2f954 100644 --- a/src/plugins/vis_type_vislib/public/fixtures/mock_data/range/_series.js +++ b/src/plugins/vis_type_vislib/public/fixtures/mock_data/range/_series.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash3'; export default { label: '', diff --git a/src/plugins/vis_type_vislib/public/fixtures/mock_data/significant_terms/_columns.js b/src/plugins/vis_type_vislib/public/fixtures/mock_data/significant_terms/_columns.js index 37d4d90be6c83..4635b24e09cd2 100644 --- a/src/plugins/vis_type_vislib/public/fixtures/mock_data/significant_terms/_columns.js +++ b/src/plugins/vis_type_vislib/public/fixtures/mock_data/significant_terms/_columns.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash3'; export default { columns: [ diff --git a/src/plugins/vis_type_vislib/public/fixtures/mock_data/significant_terms/_rows.js b/src/plugins/vis_type_vislib/public/fixtures/mock_data/significant_terms/_rows.js index 63ef1df5d259e..61368ca4edbab 100644 --- a/src/plugins/vis_type_vislib/public/fixtures/mock_data/significant_terms/_rows.js +++ b/src/plugins/vis_type_vislib/public/fixtures/mock_data/significant_terms/_rows.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash3'; export default { rows: [ diff --git a/src/plugins/vis_type_vislib/public/fixtures/mock_data/significant_terms/_series.js b/src/plugins/vis_type_vislib/public/fixtures/mock_data/significant_terms/_series.js index 94caddafc3185..a5b2082f78771 100644 --- a/src/plugins/vis_type_vislib/public/fixtures/mock_data/significant_terms/_series.js +++ b/src/plugins/vis_type_vislib/public/fixtures/mock_data/significant_terms/_series.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash3'; export default { label: '', diff --git a/src/plugins/vis_type_vislib/public/fixtures/mock_data/terms/_columns.js b/src/plugins/vis_type_vislib/public/fixtures/mock_data/terms/_columns.js index a2720ee1321ba..eeb9127752359 100644 --- a/src/plugins/vis_type_vislib/public/fixtures/mock_data/terms/_columns.js +++ b/src/plugins/vis_type_vislib/public/fixtures/mock_data/terms/_columns.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash3'; export default { columns: [ diff --git a/src/plugins/vis_type_vislib/public/fixtures/mock_data/terms/_rows.js b/src/plugins/vis_type_vislib/public/fixtures/mock_data/terms/_rows.js index 501418d6f5bdf..9bc6b398bb0eb 100644 --- a/src/plugins/vis_type_vislib/public/fixtures/mock_data/terms/_rows.js +++ b/src/plugins/vis_type_vislib/public/fixtures/mock_data/terms/_rows.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash3'; export default { rows: [ diff --git a/src/plugins/vis_type_vislib/public/fixtures/mock_data/terms/_series.js b/src/plugins/vis_type_vislib/public/fixtures/mock_data/terms/_series.js index 21885f87e4912..871fbfd202694 100644 --- a/src/plugins/vis_type_vislib/public/fixtures/mock_data/terms/_series.js +++ b/src/plugins/vis_type_vislib/public/fixtures/mock_data/terms/_series.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash3'; export default { label: '', diff --git a/src/plugins/vis_type_vislib/public/fixtures/mock_data/terms/_series_multiple.js b/src/plugins/vis_type_vislib/public/fixtures/mock_data/terms/_series_multiple.js index 460ade3cd9308..8c8dcca06a677 100644 --- a/src/plugins/vis_type_vislib/public/fixtures/mock_data/terms/_series_multiple.js +++ b/src/plugins/vis_type_vislib/public/fixtures/mock_data/terms/_series_multiple.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash3'; export default { xAxisOrderedValues: ['_all'], diff --git a/src/plugins/vis_type_vislib/public/vislib/components/labels/data_array.js b/src/plugins/vis_type_vislib/public/vislib/components/labels/data_array.js index 721391699e4f3..2ed9180476fe1 100644 --- a/src/plugins/vis_type_vislib/public/vislib/components/labels/data_array.js +++ b/src/plugins/vis_type_vislib/public/vislib/components/labels/data_array.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash3'; import { flattenSeries } from './flatten_series'; /* diff --git a/src/plugins/vis_type_vislib/public/vislib/components/labels/flatten_series.js b/src/plugins/vis_type_vislib/public/vislib/components/labels/flatten_series.js index 87477332f76e5..877685af5d3b5 100644 --- a/src/plugins/vis_type_vislib/public/vislib/components/labels/flatten_series.js +++ b/src/plugins/vis_type_vislib/public/vislib/components/labels/flatten_series.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash3'; /* * Accepts a Kibana data object with a rows or columns key diff --git a/src/plugins/vis_type_vislib/public/vislib/components/labels/labels.js b/src/plugins/vis_type_vislib/public/vislib/components/labels/labels.js index c3ed1bd0840c5..494e59472064c 100644 --- a/src/plugins/vis_type_vislib/public/vislib/components/labels/labels.js +++ b/src/plugins/vis_type_vislib/public/vislib/components/labels/labels.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash3'; import { dataArray as createArr } from './data_array'; import { uniqLabels as getArrOfUniqLabels } from './uniq_labels'; diff --git a/src/plugins/vis_type_vislib/public/vislib/components/labels/labels.test.js b/src/plugins/vis_type_vislib/public/vislib/components/labels/labels.test.js index 5e78637ef0c02..16b248de697e5 100644 --- a/src/plugins/vis_type_vislib/public/vislib/components/labels/labels.test.js +++ b/src/plugins/vis_type_vislib/public/vislib/components/labels/labels.test.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash3'; import { labels } from './labels'; import { dataArray } from './data_array'; diff --git a/src/plugins/vis_type_vislib/public/vislib/components/labels/uniq_labels.js b/src/plugins/vis_type_vislib/public/vislib/components/labels/uniq_labels.js index 489cb81306b3d..f1eb45c5fba53 100644 --- a/src/plugins/vis_type_vislib/public/vislib/components/labels/uniq_labels.js +++ b/src/plugins/vis_type_vislib/public/vislib/components/labels/uniq_labels.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash3'; /* * Accepts an array of data objects and a formatter function. diff --git a/src/plugins/vis_type_vislib/public/vislib/components/legend/legend.tsx b/src/plugins/vis_type_vislib/public/vislib/components/legend/legend.tsx index a2fe4d9249bd0..f8abdd17409d4 100644 --- a/src/plugins/vis_type_vislib/public/vislib/components/legend/legend.tsx +++ b/src/plugins/vis_type_vislib/public/vislib/components/legend/legend.tsx @@ -18,7 +18,7 @@ */ import React, { BaseSyntheticEvent, KeyboardEvent, PureComponent } from 'react'; import classNames from 'classnames'; -import { compact, uniq, map, every, isUndefined } from 'lodash'; +import { compact, uniq, map, every, isUndefined } from 'lodash3'; import { i18n } from '@kbn/i18n'; import { EuiPopoverProps, EuiIcon, keyCodes, htmlIdGenerator } from '@elastic/eui'; diff --git a/src/plugins/vis_type_vislib/public/vislib/components/legend/pie_utils.ts b/src/plugins/vis_type_vislib/public/vislib/components/legend/pie_utils.ts index 6b507862fb841..a5968913f7b77 100644 --- a/src/plugins/vis_type_vislib/public/vislib/components/legend/pie_utils.ts +++ b/src/plugins/vis_type_vislib/public/vislib/components/legend/pie_utils.ts @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash3'; /** * Returns an array of names ordered by appearance in the nested array diff --git a/src/plugins/vis_type_vislib/public/vislib/components/tooltip/_hierarchical_tooltip_formatter.js b/src/plugins/vis_type_vislib/public/vislib/components/tooltip/_hierarchical_tooltip_formatter.js index d2cf81a1410c6..bf29491e840e5 100644 --- a/src/plugins/vis_type_vislib/public/vislib/components/tooltip/_hierarchical_tooltip_formatter.js +++ b/src/plugins/vis_type_vislib/public/vislib/components/tooltip/_hierarchical_tooltip_formatter.js @@ -18,7 +18,7 @@ */ import React from 'react'; -import _ from 'lodash'; +import _ from 'lodash3'; import numeral from '@elastic/numeral'; import { renderToStaticMarkup } from 'react-dom/server'; diff --git a/src/plugins/vis_type_vislib/public/vislib/components/tooltip/_pointseries_tooltip_formatter.test.js b/src/plugins/vis_type_vislib/public/vislib/components/tooltip/_pointseries_tooltip_formatter.test.js index c01e32abb8dcb..7306bf66d09d6 100644 --- a/src/plugins/vis_type_vislib/public/vislib/components/tooltip/_pointseries_tooltip_formatter.test.js +++ b/src/plugins/vis_type_vislib/public/vislib/components/tooltip/_pointseries_tooltip_formatter.test.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash3'; import $ from 'jquery'; import { pointSeriesTooltipFormatter } from './_pointseries_tooltip_formatter'; diff --git a/src/plugins/vis_type_vislib/public/vislib/components/tooltip/position_tooltip.js b/src/plugins/vis_type_vislib/public/vislib/components/tooltip/position_tooltip.js index e22105d5a086f..7d35a4a0f008d 100644 --- a/src/plugins/vis_type_vislib/public/vislib/components/tooltip/position_tooltip.js +++ b/src/plugins/vis_type_vislib/public/vislib/components/tooltip/position_tooltip.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash3'; import $ from 'jquery'; const OFFSET = 10; diff --git a/src/plugins/vis_type_vislib/public/vislib/components/tooltip/position_tooltip.test.js b/src/plugins/vis_type_vislib/public/vislib/components/tooltip/position_tooltip.test.js index 85954aa9393e3..443c687203204 100644 --- a/src/plugins/vis_type_vislib/public/vislib/components/tooltip/position_tooltip.test.js +++ b/src/plugins/vis_type_vislib/public/vislib/components/tooltip/position_tooltip.test.js @@ -18,7 +18,7 @@ */ import $ from 'jquery'; -import _ from 'lodash'; +import _ from 'lodash3'; import sinon from 'sinon'; import { positionTooltip } from './position_tooltip'; diff --git a/src/plugins/vis_type_vislib/public/vislib/components/tooltip/tooltip.js b/src/plugins/vis_type_vislib/public/vislib/components/tooltip/tooltip.js index 0bfcedc5e6055..9837915bd520e 100644 --- a/src/plugins/vis_type_vislib/public/vislib/components/tooltip/tooltip.js +++ b/src/plugins/vis_type_vislib/public/vislib/components/tooltip/tooltip.js @@ -18,7 +18,7 @@ */ import d3 from 'd3'; -import _ from 'lodash'; +import _ from 'lodash3'; import $ from 'jquery'; import { Binder } from '../../lib/binder'; diff --git a/src/plugins/vis_type_vislib/public/vislib/components/zero_injection/flatten_data.js b/src/plugins/vis_type_vislib/public/vislib/components/zero_injection/flatten_data.js index 3269f54a621d0..c205682d5a30a 100644 --- a/src/plugins/vis_type_vislib/public/vislib/components/zero_injection/flatten_data.js +++ b/src/plugins/vis_type_vislib/public/vislib/components/zero_injection/flatten_data.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash3'; /* * Accepts a Kibana data object, flattens the data.series values array, diff --git a/src/plugins/vis_type_vislib/public/vislib/components/zero_injection/ordered_x_keys.js b/src/plugins/vis_type_vislib/public/vislib/components/zero_injection/ordered_x_keys.js index e9f75e64c1d3d..23c2a24cef2c1 100644 --- a/src/plugins/vis_type_vislib/public/vislib/components/zero_injection/ordered_x_keys.js +++ b/src/plugins/vis_type_vislib/public/vislib/components/zero_injection/ordered_x_keys.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash3'; import moment from 'moment'; import { getUniqKeys } from './uniq_keys'; diff --git a/src/plugins/vis_type_vislib/public/vislib/components/zero_injection/uniq_keys.js b/src/plugins/vis_type_vislib/public/vislib/components/zero_injection/uniq_keys.js index 8854fb13e4e90..c8d2e1aa58918 100644 --- a/src/plugins/vis_type_vislib/public/vislib/components/zero_injection/uniq_keys.js +++ b/src/plugins/vis_type_vislib/public/vislib/components/zero_injection/uniq_keys.js @@ -17,7 +17,7 @@ * under the License. */ -import { isObject, isNumber } from 'lodash'; +import { isObject, isNumber } from 'lodash3'; import { flattenData } from './flatten_data'; /* diff --git a/src/plugins/vis_type_vislib/public/vislib/components/zero_injection/zero_fill_data_array.js b/src/plugins/vis_type_vislib/public/vislib/components/zero_injection/zero_fill_data_array.js index 90c8f6ca052fb..7807e512978ee 100644 --- a/src/plugins/vis_type_vislib/public/vislib/components/zero_injection/zero_fill_data_array.js +++ b/src/plugins/vis_type_vislib/public/vislib/components/zero_injection/zero_fill_data_array.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash3'; /* * Accepts an array of zero-filled y value objects (arr1) diff --git a/src/plugins/vis_type_vislib/public/vislib/components/zero_injection/zero_injection.test.js b/src/plugins/vis_type_vislib/public/vislib/components/zero_injection/zero_injection.test.js index 23096b164b452..f3ac04cd589d9 100644 --- a/src/plugins/vis_type_vislib/public/vislib/components/zero_injection/zero_injection.test.js +++ b/src/plugins/vis_type_vislib/public/vislib/components/zero_injection/zero_injection.test.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash3'; import { injectZeros } from './inject_zeros'; import { orderXValues } from './ordered_x_keys'; import { getUniqKeys } from './uniq_keys'; diff --git a/src/plugins/vis_type_vislib/public/vislib/helpers/hierarchical/build_hierarchical_data.ts b/src/plugins/vis_type_vislib/public/vislib/helpers/hierarchical/build_hierarchical_data.ts index 3bc8fa0f035b6..bbd4b185b3744 100644 --- a/src/plugins/vis_type_vislib/public/vislib/helpers/hierarchical/build_hierarchical_data.ts +++ b/src/plugins/vis_type_vislib/public/vislib/helpers/hierarchical/build_hierarchical_data.ts @@ -17,7 +17,7 @@ * under the License. */ -import { toArray } from 'lodash'; +import { toArray } from 'lodash3'; import { SerializedFieldFormat } from '../../../../../expressions/common/types'; import { getFormatService } from '../../../services'; import { Table } from '../../types'; diff --git a/src/plugins/vis_type_vislib/public/vislib/helpers/point_series/_get_series.ts b/src/plugins/vis_type_vislib/public/vislib/helpers/point_series/_get_series.ts index c5fb4761eb9ee..d3ee0274c519a 100644 --- a/src/plugins/vis_type_vislib/public/vislib/helpers/point_series/_get_series.ts +++ b/src/plugins/vis_type_vislib/public/vislib/helpers/point_series/_get_series.ts @@ -17,7 +17,7 @@ * under the License. */ -import { partial } from 'lodash'; +import { partial } from 'lodash3'; import { getPoint } from './_get_point'; import { addToSiri, Serie } from './_add_to_siri'; import { Chart } from './point_series'; @@ -71,7 +71,7 @@ export function getSeries(table: Table, chart: Chart) { seriesLabel = prefix + seriesLabel; } - point.seriesId = seriesId; + (point.seriesId as any) = seriesId; addToSiri( seriesMap, point, diff --git a/src/plugins/vis_type_vislib/public/vislib/helpers/point_series/_init_x_axis.ts b/src/plugins/vis_type_vislib/public/vislib/helpers/point_series/_init_x_axis.ts index 32536960c59cd..d58a3704ef7a2 100644 --- a/src/plugins/vis_type_vislib/public/vislib/helpers/point_series/_init_x_axis.ts +++ b/src/plugins/vis_type_vislib/public/vislib/helpers/point_series/_init_x_axis.ts @@ -17,7 +17,7 @@ * under the License. */ -import { uniq } from 'lodash'; +import { uniq } from 'lodash3'; import moment from 'moment'; import { Chart } from './point_series'; import { Table } from '../../types'; diff --git a/src/plugins/vis_type_vislib/public/vislib/helpers/point_series/_init_y_axis.test.ts b/src/plugins/vis_type_vislib/public/vislib/helpers/point_series/_init_y_axis.test.ts index fa22ae570f38d..371e2622c827b 100644 --- a/src/plugins/vis_type_vislib/public/vislib/helpers/point_series/_init_y_axis.test.ts +++ b/src/plugins/vis_type_vislib/public/vislib/helpers/point_series/_init_y_axis.test.ts @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash3'; import { initYAxis } from './_init_y_axis'; import { Chart } from './point_series'; diff --git a/src/plugins/vis_type_vislib/public/vislib/helpers/point_series/_ordered_date_axis.test.ts b/src/plugins/vis_type_vislib/public/vislib/helpers/point_series/_ordered_date_axis.test.ts index b2e4d6e4b40c9..d70f0bac8191e 100644 --- a/src/plugins/vis_type_vislib/public/vislib/helpers/point_series/_ordered_date_axis.test.ts +++ b/src/plugins/vis_type_vislib/public/vislib/helpers/point_series/_ordered_date_axis.test.ts @@ -18,7 +18,7 @@ */ import moment from 'moment'; -import _ from 'lodash'; +import _ from 'lodash3'; import { orderedDateAxis } from './_ordered_date_axis'; import { DateHistogramParams, OrderedChart } from './point_series'; diff --git a/src/plugins/vis_type_vislib/public/vislib/helpers/point_series/point_series.test.ts b/src/plugins/vis_type_vislib/public/vislib/helpers/point_series/point_series.test.ts index 2a5ab197c9ab7..7f320fa86912b 100644 --- a/src/plugins/vis_type_vislib/public/vislib/helpers/point_series/point_series.test.ts +++ b/src/plugins/vis_type_vislib/public/vislib/helpers/point_series/point_series.test.ts @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash3'; import { buildPointSeriesData, Dimensions } from './point_series'; import { Table, Column } from '../../types'; import { setFormatService } from '../../../services'; diff --git a/src/plugins/vis_type_vislib/public/vislib/lib/_error_handler.js b/src/plugins/vis_type_vislib/public/vislib/lib/_error_handler.js index 1d1f912c64cba..f616c25aee4c3 100644 --- a/src/plugins/vis_type_vislib/public/vislib/lib/_error_handler.js +++ b/src/plugins/vis_type_vislib/public/vislib/lib/_error_handler.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash3'; import { ContainerTooSmall } from '../errors'; /** diff --git a/src/plugins/vis_type_vislib/public/vislib/lib/alerts.js b/src/plugins/vis_type_vislib/public/vislib/lib/alerts.js index b0d5e758c7d42..1b14f3f17bc8c 100644 --- a/src/plugins/vis_type_vislib/public/vislib/lib/alerts.js +++ b/src/plugins/vis_type_vislib/public/vislib/lib/alerts.js @@ -18,7 +18,7 @@ */ import $ from 'jquery'; -import _ from 'lodash'; +import _ from 'lodash3'; /** * Adds alerts that float in front of a visualization diff --git a/src/plugins/vis_type_vislib/public/vislib/lib/axis/axis.js b/src/plugins/vis_type_vislib/public/vislib/lib/axis/axis.js index cbd42d281b286..49342b0c6fd61 100644 --- a/src/plugins/vis_type_vislib/public/vislib/lib/axis/axis.js +++ b/src/plugins/vis_type_vislib/public/vislib/lib/axis/axis.js @@ -18,7 +18,7 @@ */ import d3 from 'd3'; -import _ from 'lodash'; +import _ from 'lodash3'; import $ from 'jquery'; import { ErrorHandler } from '../_error_handler'; import { AxisTitle } from './axis_title'; diff --git a/src/plugins/vis_type_vislib/public/vislib/lib/axis/axis.test.js b/src/plugins/vis_type_vislib/public/vislib/lib/axis/axis.test.js index 320d9b541de2a..8cb00583c46d2 100644 --- a/src/plugins/vis_type_vislib/public/vislib/lib/axis/axis.test.js +++ b/src/plugins/vis_type_vislib/public/vislib/lib/axis/axis.test.js @@ -18,7 +18,7 @@ */ import d3 from 'd3'; -import _ from 'lodash'; +import _ from 'lodash3'; import $ from 'jquery'; import { Axis } from './axis'; diff --git a/src/plugins/vis_type_vislib/public/vislib/lib/axis/axis_config.js b/src/plugins/vis_type_vislib/public/vislib/lib/axis/axis_config.js index faf270877217b..8bbb9438a0640 100644 --- a/src/plugins/vis_type_vislib/public/vislib/lib/axis/axis_config.js +++ b/src/plugins/vis_type_vislib/public/vislib/lib/axis/axis_config.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash3'; import d3 from 'd3'; import { SCALE_MODES } from './scale_modes'; diff --git a/src/plugins/vis_type_vislib/public/vislib/lib/axis/axis_scale.js b/src/plugins/vis_type_vislib/public/vislib/lib/axis/axis_scale.js index a24ba908e177f..e7affb349bea0 100644 --- a/src/plugins/vis_type_vislib/public/vislib/lib/axis/axis_scale.js +++ b/src/plugins/vis_type_vislib/public/vislib/lib/axis/axis_scale.js @@ -18,7 +18,7 @@ */ import d3 from 'd3'; -import _ from 'lodash'; +import _ from 'lodash3'; import moment from 'moment'; import { InvalidLogScaleValues } from '../../errors'; diff --git a/src/plugins/vis_type_vislib/public/vislib/lib/axis/axis_title.test.js b/src/plugins/vis_type_vislib/public/vislib/lib/axis/axis_title.test.js index c43f66d0ac34d..3106cc0e0e334 100644 --- a/src/plugins/vis_type_vislib/public/vislib/lib/axis/axis_title.test.js +++ b/src/plugins/vis_type_vislib/public/vislib/lib/axis/axis_title.test.js @@ -18,7 +18,7 @@ */ import d3 from 'd3'; -import _ from 'lodash'; +import _ from 'lodash3'; import $ from 'jquery'; import { AxisTitle } from './axis_title'; diff --git a/src/plugins/vis_type_vislib/public/vislib/lib/axis/x_axis.test.js b/src/plugins/vis_type_vislib/public/vislib/lib/axis/x_axis.test.js index 3127bcf17ed07..032995a0323af 100644 --- a/src/plugins/vis_type_vislib/public/vislib/lib/axis/x_axis.test.js +++ b/src/plugins/vis_type_vislib/public/vislib/lib/axis/x_axis.test.js @@ -18,7 +18,7 @@ */ import d3 from 'd3'; -import _ from 'lodash'; +import _ from 'lodash3'; import $ from 'jquery'; import { Axis } from './axis'; diff --git a/src/plugins/vis_type_vislib/public/vislib/lib/axis/y_axis.test.js b/src/plugins/vis_type_vislib/public/vislib/lib/axis/y_axis.test.js index 4d237669ff849..94b6a1d5b5ffa 100644 --- a/src/plugins/vis_type_vislib/public/vislib/lib/axis/y_axis.test.js +++ b/src/plugins/vis_type_vislib/public/vislib/lib/axis/y_axis.test.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash3'; import d3 from 'd3'; import $ from 'jquery'; diff --git a/src/plugins/vis_type_vislib/public/vislib/lib/chart_grid.js b/src/plugins/vis_type_vislib/public/vislib/lib/chart_grid.js index aac019a98e790..7b9acecc7d390 100644 --- a/src/plugins/vis_type_vislib/public/vislib/lib/chart_grid.js +++ b/src/plugins/vis_type_vislib/public/vislib/lib/chart_grid.js @@ -18,7 +18,7 @@ */ import d3 from 'd3'; -import _ from 'lodash'; +import _ from 'lodash3'; const defaults = { style: { diff --git a/src/plugins/vis_type_vislib/public/vislib/lib/chart_title.js b/src/plugins/vis_type_vislib/public/vislib/lib/chart_title.js index a281cea38bada..f1aa4c46973da 100644 --- a/src/plugins/vis_type_vislib/public/vislib/lib/chart_title.js +++ b/src/plugins/vis_type_vislib/public/vislib/lib/chart_title.js @@ -18,7 +18,7 @@ */ import d3 from 'd3'; -import _ from 'lodash'; +import _ from 'lodash3'; import { ErrorHandler } from './_error_handler'; import { Tooltip } from '../components/tooltip'; diff --git a/src/plugins/vis_type_vislib/public/vislib/lib/data.js b/src/plugins/vis_type_vislib/public/vislib/lib/data.js index 98d384f95a839..e735e22d3ff7c 100644 --- a/src/plugins/vis_type_vislib/public/vislib/lib/data.js +++ b/src/plugins/vis_type_vislib/public/vislib/lib/data.js @@ -18,7 +18,7 @@ */ import d3 from 'd3'; -import _ from 'lodash'; +import _ from 'lodash3'; import { injectZeros } from '../components/zero_injection/inject_zeros'; import { orderXValues } from '../components/zero_injection/ordered_x_keys'; diff --git a/src/plugins/vis_type_vislib/public/vislib/lib/data.test.js b/src/plugins/vis_type_vislib/public/vislib/lib/data.test.js index 82bb472f1696d..a990f728805d9 100644 --- a/src/plugins/vis_type_vislib/public/vislib/lib/data.test.js +++ b/src/plugins/vis_type_vislib/public/vislib/lib/data.test.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash3'; import { Data } from './data'; import { getMockUiState } from '../../fixtures/mocks'; diff --git a/src/plugins/vis_type_vislib/public/vislib/lib/dispatch.js b/src/plugins/vis_type_vislib/public/vislib/lib/dispatch.js index 37f395aab4011..7f6609f942a9d 100644 --- a/src/plugins/vis_type_vislib/public/vislib/lib/dispatch.js +++ b/src/plugins/vis_type_vislib/public/vislib/lib/dispatch.js @@ -18,7 +18,7 @@ */ import d3 from 'd3'; -import { get, pull, restParam, size, reduce } from 'lodash'; +import { get, pull, restParam, size, reduce } from 'lodash3'; import $ from 'jquery'; import { DIMMING_OPACITY_SETTING } from '../../../common'; diff --git a/src/plugins/vis_type_vislib/public/vislib/lib/handler.js b/src/plugins/vis_type_vislib/public/vislib/lib/handler.js index 3c1aeaa0d1d0d..cf049fcb0c438 100644 --- a/src/plugins/vis_type_vislib/public/vislib/lib/handler.js +++ b/src/plugins/vis_type_vislib/public/vislib/lib/handler.js @@ -18,7 +18,7 @@ */ import d3 from 'd3'; -import _ from 'lodash'; +import _ from 'lodash3'; import MarkdownIt from 'markdown-it'; import { NoResults } from '../errors'; diff --git a/src/plugins/vis_type_vislib/public/vislib/lib/layout/layout.js b/src/plugins/vis_type_vislib/public/vislib/lib/layout/layout.js index a5f4907f46273..5a98f7b8fed7f 100644 --- a/src/plugins/vis_type_vislib/public/vislib/lib/layout/layout.js +++ b/src/plugins/vis_type_vislib/public/vislib/lib/layout/layout.js @@ -18,7 +18,7 @@ */ import d3 from 'd3'; -import _ from 'lodash'; +import _ from 'lodash3'; import $ from 'jquery'; import { layoutTypes } from './layout_types'; import { Axis } from '../axis'; diff --git a/src/plugins/vis_type_vislib/public/vislib/lib/layout/layout_types.test.js b/src/plugins/vis_type_vislib/public/vislib/lib/layout/layout_types.test.js index 8b727ea3aa5fe..49eb0cac943ed 100644 --- a/src/plugins/vis_type_vislib/public/vislib/lib/layout/layout_types.test.js +++ b/src/plugins/vis_type_vislib/public/vislib/lib/layout/layout_types.test.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash3'; import { layoutTypes as layoutType } from './layout_types'; diff --git a/src/plugins/vis_type_vislib/public/vislib/lib/layout/types/column_layout.test.js b/src/plugins/vis_type_vislib/public/vislib/lib/layout/types/column_layout.test.js index f6ee5d13badf2..3a5f0705516e3 100644 --- a/src/plugins/vis_type_vislib/public/vislib/lib/layout/types/column_layout.test.js +++ b/src/plugins/vis_type_vislib/public/vislib/lib/layout/types/column_layout.test.js @@ -18,7 +18,7 @@ */ import d3 from 'd3'; -import _ from 'lodash'; +import _ from 'lodash3'; import { layoutTypes } from '../layout_types'; diff --git a/src/plugins/vis_type_vislib/public/vislib/lib/types/pie.js b/src/plugins/vis_type_vislib/public/vislib/lib/types/pie.js index af500c7185a3a..c6f2f87676c5b 100644 --- a/src/plugins/vis_type_vislib/public/vislib/lib/types/pie.js +++ b/src/plugins/vis_type_vislib/public/vislib/lib/types/pie.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash3'; export function vislibPieConfig(config) { if (!config.chart) { diff --git a/src/plugins/vis_type_vislib/public/vislib/lib/types/point_series.js b/src/plugins/vis_type_vislib/public/vislib/lib/types/point_series.js index 438c071d74532..dcfb766821083 100644 --- a/src/plugins/vis_type_vislib/public/vislib/lib/types/point_series.js +++ b/src/plugins/vis_type_vislib/public/vislib/lib/types/point_series.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash3'; import { i18n } from '@kbn/i18n'; function getSeriId(seri) { diff --git a/src/plugins/vis_type_vislib/public/vislib/lib/vis_config.js b/src/plugins/vis_type_vislib/public/vislib/lib/vis_config.js index 0354724703208..248f68b78cac1 100644 --- a/src/plugins/vis_type_vislib/public/vislib/lib/vis_config.js +++ b/src/plugins/vis_type_vislib/public/vislib/lib/vis_config.js @@ -20,7 +20,7 @@ /** * Provides vislib configuration, throws error if invalid property is accessed without providing defaults */ -import _ from 'lodash'; +import _ from 'lodash3'; import { vislibTypesConfig as visTypes } from './types'; import { Data } from './data'; diff --git a/src/plugins/vis_type_vislib/public/vislib/vis.js b/src/plugins/vis_type_vislib/public/vislib/vis.js index f258cb55ba281..a701c6faa5240 100644 --- a/src/plugins/vis_type_vislib/public/vislib/vis.js +++ b/src/plugins/vis_type_vislib/public/vislib/vis.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash3'; import d3 from 'd3'; import { EventEmitter } from 'events'; diff --git a/src/plugins/vis_type_vislib/public/vislib/visualizations/_chart.js b/src/plugins/vis_type_vislib/public/vislib/visualizations/_chart.js index 5ed6d3eb79f4b..bfa845e799655 100644 --- a/src/plugins/vis_type_vislib/public/vislib/visualizations/_chart.js +++ b/src/plugins/vis_type_vislib/public/vislib/visualizations/_chart.js @@ -18,7 +18,7 @@ */ import d3 from 'd3'; -import _ from 'lodash'; +import _ from 'lodash3'; import { dataLabel } from '../lib/_data_label'; import { Dispatch } from '../lib/dispatch'; diff --git a/src/plugins/vis_type_vislib/public/vislib/visualizations/gauges/meter.js b/src/plugins/vis_type_vislib/public/vislib/visualizations/gauges/meter.js index a252002534775..0ad7bbce15304 100644 --- a/src/plugins/vis_type_vislib/public/vislib/visualizations/gauges/meter.js +++ b/src/plugins/vis_type_vislib/public/vislib/visualizations/gauges/meter.js @@ -18,7 +18,7 @@ */ import d3 from 'd3'; -import _ from 'lodash'; +import _ from 'lodash3'; import { getHeatmapColors } from '../../../../../charts/public'; diff --git a/src/plugins/vis_type_vislib/public/vislib/visualizations/pie_chart.js b/src/plugins/vis_type_vislib/public/vislib/visualizations/pie_chart.js index 938d3d0ec6d74..aff44c9fdf2d3 100644 --- a/src/plugins/vis_type_vislib/public/vislib/visualizations/pie_chart.js +++ b/src/plugins/vis_type_vislib/public/vislib/visualizations/pie_chart.js @@ -18,7 +18,7 @@ */ import d3 from 'd3'; -import _ from 'lodash'; +import _ from 'lodash3'; import $ from 'jquery'; import numeral from '@elastic/numeral'; import { PieContainsAllZeros, ContainerTooSmall } from '../errors'; diff --git a/src/plugins/vis_type_vislib/public/vislib/visualizations/point_series.js b/src/plugins/vis_type_vislib/public/vislib/visualizations/point_series.js index 9a25d041f6567..4a52912bdf8a8 100644 --- a/src/plugins/vis_type_vislib/public/vislib/visualizations/point_series.js +++ b/src/plugins/vis_type_vislib/public/vislib/visualizations/point_series.js @@ -18,7 +18,7 @@ */ import d3 from 'd3'; -import _ from 'lodash'; +import _ from 'lodash3'; import $ from 'jquery'; import { Tooltip } from '../components/tooltip'; diff --git a/src/plugins/vis_type_vislib/public/vislib/visualizations/point_series/_point_series.js b/src/plugins/vis_type_vislib/public/vislib/visualizations/point_series/_point_series.js index 1b084e4142445..482952c4d3b6c 100644 --- a/src/plugins/vis_type_vislib/public/vislib/visualizations/point_series/_point_series.js +++ b/src/plugins/vis_type_vislib/public/vislib/visualizations/point_series/_point_series.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash3'; import { euiPaletteColorBlind } from '@elastic/eui/lib/services'; const thresholdLineDefaults = { diff --git a/src/plugins/vis_type_vislib/public/vislib/visualizations/point_series/area_chart.js b/src/plugins/vis_type_vislib/public/vislib/visualizations/point_series/area_chart.js index e3e2d31ecd4f4..90b1aef9627de 100644 --- a/src/plugins/vis_type_vislib/public/vislib/visualizations/point_series/area_chart.js +++ b/src/plugins/vis_type_vislib/public/vislib/visualizations/point_series/area_chart.js @@ -18,7 +18,7 @@ */ import d3 from 'd3'; -import _ from 'lodash'; +import _ from 'lodash3'; import $ from 'jquery'; import { PointSeries } from './_point_series'; diff --git a/src/plugins/vis_type_vislib/public/vislib/visualizations/point_series/column_chart.js b/src/plugins/vis_type_vislib/public/vislib/visualizations/point_series/column_chart.js index cc64e0d746fbf..3ab838974121e 100644 --- a/src/plugins/vis_type_vislib/public/vislib/visualizations/point_series/column_chart.js +++ b/src/plugins/vis_type_vislib/public/vislib/visualizations/point_series/column_chart.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash3'; import d3 from 'd3'; import { isColorDark } from '@elastic/eui/lib/services'; import { PointSeries } from './_point_series'; diff --git a/src/plugins/vis_type_vislib/public/vislib/visualizations/point_series/heatmap_chart.js b/src/plugins/vis_type_vislib/public/vislib/visualizations/point_series/heatmap_chart.js index 4564721464767..385dfd3d6b9f5 100644 --- a/src/plugins/vis_type_vislib/public/vislib/visualizations/point_series/heatmap_chart.js +++ b/src/plugins/vis_type_vislib/public/vislib/visualizations/point_series/heatmap_chart.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash3'; import moment from 'moment'; import { isColorDark } from '@elastic/eui'; diff --git a/src/plugins/vis_type_vislib/public/vislib/visualizations/point_series/line_chart.js b/src/plugins/vis_type_vislib/public/vislib/visualizations/point_series/line_chart.js index 64fbae7d1ac8c..0bb7d5241ce35 100644 --- a/src/plugins/vis_type_vislib/public/vislib/visualizations/point_series/line_chart.js +++ b/src/plugins/vis_type_vislib/public/vislib/visualizations/point_series/line_chart.js @@ -18,7 +18,7 @@ */ import d3 from 'd3'; -import _ from 'lodash'; +import _ from 'lodash3'; import { PointSeries } from './_point_series'; const defaults = { diff --git a/src/plugins/vis_type_vislib/public/vislib/visualizations/vis_types.test.js b/src/plugins/vis_type_vislib/public/vislib/visualizations/vis_types.test.js index a6f2404169f62..165507e809967 100644 --- a/src/plugins/vis_type_vislib/public/vislib/visualizations/vis_types.test.js +++ b/src/plugins/vis_type_vislib/public/vislib/visualizations/vis_types.test.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash3'; import { visTypes } from './vis_types'; diff --git a/src/plugins/visualizations/public/components/visualization.tsx b/src/plugins/visualizations/public/components/visualization.tsx index c17e088d7635b..b88597c084a9c 100644 --- a/src/plugins/visualizations/public/components/visualization.tsx +++ b/src/plugins/visualizations/public/components/visualization.tsx @@ -17,7 +17,7 @@ * under the License. */ -import { get } from 'lodash'; +import { get } from 'lodash4'; import React from 'react'; import { PersistedState } from '../../../../plugins/visualizations/public'; import { memoizeLast } from '../legacy/memoize'; diff --git a/src/plugins/visualizations/public/embeddable/visualize_embeddable.ts b/src/plugins/visualizations/public/embeddable/visualize_embeddable.ts index 26fdd665192a6..4a3832d0b9fa0 100644 --- a/src/plugins/visualizations/public/embeddable/visualize_embeddable.ts +++ b/src/plugins/visualizations/public/embeddable/visualize_embeddable.ts @@ -17,7 +17,7 @@ * under the License. */ -import _, { get } from 'lodash'; +import _, { get } from 'lodash4'; import { Subscription } from 'rxjs'; import * as Rx from 'rxjs'; import { VISUALIZE_EMBEDDABLE_TYPE } from './constants'; diff --git a/src/plugins/visualizations/public/expressions/vis.ts b/src/plugins/visualizations/public/expressions/vis.ts index eafa112156716..d967e40e97fd4 100644 --- a/src/plugins/visualizations/public/expressions/vis.ts +++ b/src/plugins/visualizations/public/expressions/vis.ts @@ -28,7 +28,7 @@ */ import { EventEmitter } from 'events'; -import _ from 'lodash'; +import _ from 'lodash4'; import { VisParams, PersistedState } from '../../../../plugins/visualizations/public'; import { getTypes } from '../services'; diff --git a/src/plugins/visualizations/public/expressions/visualization_function.ts b/src/plugins/visualizations/public/expressions/visualization_function.ts index 222479158934b..c29815517ee98 100644 --- a/src/plugins/visualizations/public/expressions/visualization_function.ts +++ b/src/plugins/visualizations/public/expressions/visualization_function.ts @@ -17,7 +17,7 @@ * under the License. */ -import { get } from 'lodash'; +import { get } from 'lodash4'; import { i18n } from '@kbn/i18n'; import { VisResponseValue, PersistedState } from '../../../../plugins/visualizations/public'; import { ExpressionFunctionDefinition, Render } from '../../../../plugins/expressions/public'; diff --git a/src/plugins/visualizations/public/legacy/build_pipeline.ts b/src/plugins/visualizations/public/legacy/build_pipeline.ts index 5d74cb3d3b1e5..ab51f5fca4e49 100644 --- a/src/plugins/visualizations/public/legacy/build_pipeline.ts +++ b/src/plugins/visualizations/public/legacy/build_pipeline.ts @@ -17,7 +17,7 @@ * under the License. */ -import { get } from 'lodash'; +import { get } from 'lodash4'; import moment from 'moment'; import { SerializedFieldFormat } from '../../../../plugins/expressions/public'; import { diff --git a/src/plugins/visualizations/public/legacy/vis_update_state.js b/src/plugins/visualizations/public/legacy/vis_update_state.js index edaf388e21060..359285f885764 100644 --- a/src/plugins/visualizations/public/legacy/vis_update_state.js +++ b/src/plugins/visualizations/public/legacy/vis_update_state.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; /** * Will figure out if an heatmap state was saved before the auto coloring diff --git a/src/plugins/visualizations/public/legacy/vis_update_state.test.js b/src/plugins/visualizations/public/legacy/vis_update_state.test.js index 7ddf0cc6e33e1..9dc934e4f524b 100644 --- a/src/plugins/visualizations/public/legacy/vis_update_state.test.js +++ b/src/plugins/visualizations/public/legacy/vis_update_state.test.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { updateOldState } from './vis_update_state'; // eslint-disable-next-line camelcase diff --git a/src/plugins/visualizations/public/persisted_state/persisted_state.ts b/src/plugins/visualizations/public/persisted_state/persisted_state.ts index 7465f969f456f..eb77d93293cd7 100644 --- a/src/plugins/visualizations/public/persisted_state/persisted_state.ts +++ b/src/plugins/visualizations/public/persisted_state/persisted_state.ts @@ -19,8 +19,17 @@ import { EventEmitter } from 'events'; -import { isPlainObject, cloneDeep, get, set, isEqual, isString, merge } from 'lodash'; -import toPath from 'lodash/internal/toPath'; +import { + isPlainObject, + cloneDeep, + get, + set, + isEqual, + isString, + merge, + mergeWith, + toPath, +} from 'lodash4'; function prepSetParams(key: PersistedStateKey, value: any, path: PersistedStatePath) { // key must be the value, set the entire state using it @@ -150,7 +159,7 @@ export class PersistedState extends EventEmitter { while (partialPath.length > 0) { const lastKey = partialPath.splice(partialPath.length - 1, 1)[0]; const statePath = [...this._path, partialPath]; - const stateVal = statePath.length > 0 ? get(stateTree, statePath) : stateTree; + const stateVal = statePath.length > 0 ? get(stateTree, statePath as string[]) : stateTree; // if stateVal isn't an object, do nothing if (!isPlainObject(stateVal)) return; @@ -240,7 +249,7 @@ export class PersistedState extends EventEmitter { // If `mergeMethod` is provided it is invoked to produce the merged values of the // destination and source properties. // If `mergeMethod` returns `undefined` the default merging method is used - this._mergedState = merge(targetObj, sourceObj, mergeMethod); + this._mergedState = mergeWith(targetObj, sourceObj, mergeMethod); // sanity check; verify that there are actually changes if (isEqual(this._mergedState, this._defaultState)) this._changedState = {}; diff --git a/src/plugins/visualizations/public/saved_visualizations/find_list_items.ts b/src/plugins/visualizations/public/saved_visualizations/find_list_items.ts index 0c27c3a2c7782..d661c3e750017 100644 --- a/src/plugins/visualizations/public/saved_visualizations/find_list_items.ts +++ b/src/plugins/visualizations/public/saved_visualizations/find_list_items.ts @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { SavedObjectAttributes, SavedObjectsClientContract } from '../../../../core/public'; import { SavedObjectLoader } from '../../../../plugins/saved_objects/public'; import { VisTypeAlias } from '../vis_types'; @@ -49,7 +49,7 @@ export async function findListItems({ }, acc); }, {} as { [visType: string]: VisualizationsAppExtension }); const searchOption = (field: string, ...defaults: string[]) => - _(extensions).pluck(field).concat(defaults).compact().flatten().uniq().value() as string[]; + _(extensions).map(field).concat(defaults).compact().flatten().uniq().value() as string[]; const searchOptions = { type: searchOption('docTypes', 'visualization'), searchFields: searchOption('searchFields', 'title^3', 'description'), diff --git a/src/plugins/visualizations/public/vis.ts b/src/plugins/visualizations/public/vis.ts index aaab0566af65e..b87f2dc060bb9 100644 --- a/src/plugins/visualizations/public/vis.ts +++ b/src/plugins/visualizations/public/vis.ts @@ -27,7 +27,7 @@ * Not to be confused with vislib/vis.js. */ -import { isFunction, defaults, cloneDeep } from 'lodash'; +import { isFunction, defaults, cloneDeep } from 'lodash4'; import { Assign } from '@kbn/utility-types'; import { PersistedState } from './persisted_state'; import { getTypes, getAggs, getSearch, getSavedSearchLoader } from './services'; diff --git a/src/plugins/visualizations/public/vis_types/base_vis_type.ts b/src/plugins/visualizations/public/vis_types/base_vis_type.ts index 2464bb72d2695..aac0740369ef5 100644 --- a/src/plugins/visualizations/public/vis_types/base_vis_type.ts +++ b/src/plugins/visualizations/public/vis_types/base_vis_type.ts @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import { VisualizationControllerConstructor } from '../types'; export interface BaseVisTypeOptions { diff --git a/src/plugins/visualizations/public/vis_types/react_vis_type.test.ts b/src/plugins/visualizations/public/vis_types/react_vis_type.test.ts index 134106bb3d42a..a47d1ff991356 100644 --- a/src/plugins/visualizations/public/vis_types/react_vis_type.test.ts +++ b/src/plugins/visualizations/public/vis_types/react_vis_type.test.ts @@ -17,7 +17,7 @@ * under the License. */ -import { cloneDeep } from 'lodash'; +import { cloneDeep } from 'lodash4'; import { ReactVisType } from './react_vis_type'; describe('React Vis Type', () => { diff --git a/src/plugins/visualizations/public/wizard/type_selection/type_selection.tsx b/src/plugins/visualizations/public/wizard/type_selection/type_selection.tsx index 47757593958d6..4a4005718c0fd 100644 --- a/src/plugins/visualizations/public/wizard/type_selection/type_selection.tsx +++ b/src/plugins/visualizations/public/wizard/type_selection/type_selection.tsx @@ -19,7 +19,7 @@ import { i18n } from '@kbn/i18n'; import { FormattedMessage } from '@kbn/i18n/react'; -import { sortByOrder } from 'lodash'; +import { orderBy } from 'lodash4'; import React, { ChangeEvent } from 'react'; import { @@ -201,7 +201,7 @@ class TypeSelection extends React.Component { diff --git a/src/plugins/visualizations/server/saved_objects/visualization_migrations.ts b/src/plugins/visualizations/server/saved_objects/visualization_migrations.ts index 27fe722019a27..74d8cb1a40d55 100644 --- a/src/plugins/visualizations/server/saved_objects/visualization_migrations.ts +++ b/src/plugins/visualizations/server/saved_objects/visualization_migrations.ts @@ -18,7 +18,7 @@ */ import { SavedObjectMigrationFn } from 'kibana/server'; -import { cloneDeep, get, omit, has, flow } from 'lodash'; +import { cloneDeep, get, omit, has, flow } from 'lodash4'; import { DEFAULT_QUERY_LANGUAGE } from '../../../data/common'; const migrateIndexPattern: SavedObjectMigrationFn = (doc) => { @@ -65,7 +65,7 @@ const migrateIndexPattern: SavedObjectMigrationFn = (doc) => { // [TSVB] Migrate percentile-rank aggregation (value -> values) const migratePercentileRankAggregation: SavedObjectMigrationFn = (doc) => { - const visStateJSON = get(doc, 'attributes.visState'); + const visStateJSON = get(doc, 'attributes.visState'); let visState; if (visStateJSON) { @@ -101,7 +101,7 @@ const migratePercentileRankAggregation: SavedObjectMigrationFn = (doc) // [TSVB] Remove stale opperator key const migrateOperatorKeyTypo: SavedObjectMigrationFn = (doc) => { - const visStateJSON = get(doc, 'attributes.visState'); + const visStateJSON = get(doc, 'attributes.visState'); let visState; if (visStateJSON) { @@ -137,7 +137,7 @@ const migrateOperatorKeyTypo: SavedObjectMigrationFn = (doc) => { * @see https://github.com/elastic/kibana/pull/58462/files#diff-ae69fe15b20a5099d038e9bbe2ed3849 **/ const migrateSplitByChartRow: SavedObjectMigrationFn = (doc) => { - const visStateJSON = get(doc, 'attributes.visState'); + const visStateJSON = get(doc, 'attributes.visState'); let visState: any; if (visStateJSON) { @@ -177,7 +177,7 @@ const migrateSplitByChartRow: SavedObjectMigrationFn = (doc) => { // Migrate date histogram aggregation (remove customInterval) const migrateDateHistogramAggregation: SavedObjectMigrationFn = (doc) => { - const visStateJSON = get(doc, 'attributes.visState'); + const visStateJSON = get(doc, 'attributes.visState'); let visState; if (visStateJSON) { @@ -219,7 +219,7 @@ const migrateDateHistogramAggregation: SavedObjectMigrationFn = (doc) }; const removeDateHistogramTimeZones: SavedObjectMigrationFn = (doc) => { - const visStateJSON = get(doc, 'attributes.visState'); + const visStateJSON = get(doc, 'attributes.visState'); if (visStateJSON) { let visState; try { @@ -251,7 +251,7 @@ const removeDateHistogramTimeZones: SavedObjectMigrationFn = (doc) => // migrate gauge verticalSplit to alignment // https://github.com/elastic/kibana/issues/34636 const migrateGaugeVerticalSplitToAlignment: SavedObjectMigrationFn = (doc, logger) => { - const visStateJSON = get(doc, 'attributes.visState'); + const visStateJSON = get(doc, 'attributes.visState'); if (visStateJSON) { try { @@ -289,7 +289,7 @@ const transformFilterStringToQueryObject: SavedObjectMigrationFn = (do // Migrate filters // If any filters exist and they are a string, we assume it to be lucene and transform the filter into an object accordingly const newDoc = cloneDeep(doc); - const visStateJSON = get(doc, 'attributes.visState'); + const visStateJSON = get(doc, 'attributes.visState'); if (visStateJSON) { let visState; try { @@ -298,7 +298,7 @@ const transformFilterStringToQueryObject: SavedObjectMigrationFn = (do // let it go, the data is invalid and we'll leave it as is } if (visState) { - const visType = get(visState, 'params.type'); + const visType = get(visState, 'params.type'); const tsvbTypes = ['metric', 'markdown', 'top_n', 'gauge', 'table', 'timeseries']; if (tsvbTypes.indexOf(visType) === -1) { // skip @@ -373,7 +373,7 @@ const transformSplitFiltersStringToQueryObject: SavedObjectMigrationFn // Migrate split_filters in TSVB objects that weren't migrated in 7.3 // If any filters exist and they are a string, we assume them to be lucene syntax and transform the filter into an object accordingly const newDoc = cloneDeep(doc); - const visStateJSON = get(doc, 'attributes.visState'); + const visStateJSON = get(doc, 'attributes.visState'); if (visStateJSON) { let visState; try { @@ -382,7 +382,7 @@ const transformSplitFiltersStringToQueryObject: SavedObjectMigrationFn // let it go, the data is invalid and we'll leave it as is } if (visState) { - const visType = get(visState, 'params.type'); + const visType = get(visState, 'params.type'); const tsvbTypes = ['metric', 'markdown', 'top_n', 'gauge', 'table', 'timeseries']; if (tsvbTypes.indexOf(visType) === -1) { // skip @@ -415,7 +415,7 @@ const transformSplitFiltersStringToQueryObject: SavedObjectMigrationFn }; const migrateFiltersAggQuery: SavedObjectMigrationFn = (doc) => { - const visStateJSON = get(doc, 'attributes.visState'); + const visStateJSON = get(doc, 'attributes.visState'); if (visStateJSON) { try { @@ -447,7 +447,7 @@ const migrateFiltersAggQuery: SavedObjectMigrationFn = (doc) => { }; const replaceMovAvgToMovFn: SavedObjectMigrationFn = (doc, logger) => { - const visStateJSON = get(doc, 'attributes.visState'); + const visStateJSON = get(doc, 'attributes.visState'); let visState; if (visStateJSON) { @@ -495,7 +495,7 @@ const replaceMovAvgToMovFn: SavedObjectMigrationFn = (doc, logger) => }; const migrateFiltersAggQueryStringQueries: SavedObjectMigrationFn = (doc, logger) => { - const visStateJSON = get(doc, 'attributes.visState'); + const visStateJSON = get(doc, 'attributes.visState'); if (visStateJSON) { try { @@ -533,7 +533,7 @@ const addDocReferences: SavedObjectMigrationFn = (doc) => ({ }); const migrateSavedSearch: SavedObjectMigrationFn = (doc) => { - const savedSearchId = get(doc, 'attributes.savedSearchId'); + const savedSearchId = get(doc, 'attributes.savedSearchId'); if (savedSearchId && doc.references) { doc.references.push({ @@ -550,7 +550,7 @@ const migrateSavedSearch: SavedObjectMigrationFn = (doc) => { }; const migrateControls: SavedObjectMigrationFn = (doc) => { - const visStateJSON = get(doc, 'attributes.visState'); + const visStateJSON = get(doc, 'attributes.visState'); if (visStateJSON) { let visState; @@ -617,7 +617,7 @@ const migrateTableSplits: SavedObjectMigrationFn = (doc) => { }; const migrateMatchAllQuery: SavedObjectMigrationFn = (doc) => { - const searchSourceJSON = get(doc, 'attributes.kibanaSavedObjectMeta.searchSourceJSON'); + const searchSourceJSON = get(doc, 'attributes.kibanaSavedObjectMeta.searchSourceJSON'); if (searchSourceJSON) { let searchSource: any; @@ -651,7 +651,7 @@ const migrateMatchAllQuery: SavedObjectMigrationFn = (doc) => { // [TSVB] Default color palette is changing, keep the default for older viz const migrateTsvbDefaultColorPalettes: SavedObjectMigrationFn = (doc) => { - const visStateJSON = get(doc, 'attributes.visState'); + const visStateJSON = get(doc, 'attributes.visState'); let visState; if (visStateJSON) { @@ -693,30 +693,24 @@ export const visualizationSavedObjectTypeMigrations = { * in that version. So we apply this twice, once with 6.7.2 and once with 7.0.1 while the backport to 6.7 * only contained the 6.7.2 migration and not the 7.0.1 migration. */ - '6.7.2': flow>( - migrateMatchAllQuery, - removeDateHistogramTimeZones - ), - '7.0.0': flow>( + '6.7.2': flow(migrateMatchAllQuery, removeDateHistogramTimeZones), + '7.0.0': flow( addDocReferences, migrateIndexPattern, migrateSavedSearch, migrateControls, migrateTableSplits ), - '7.0.1': flow>(removeDateHistogramTimeZones), - '7.2.0': flow>( - migratePercentileRankAggregation, - migrateDateHistogramAggregation - ), - '7.3.0': flow>( + '7.0.1': flow(removeDateHistogramTimeZones), + '7.2.0': flow(migratePercentileRankAggregation, migrateDateHistogramAggregation), + '7.3.0': flow( migrateGaugeVerticalSplitToAlignment, transformFilterStringToQueryObject, migrateFiltersAggQuery, replaceMovAvgToMovFn ), - '7.3.1': flow>(migrateFiltersAggQueryStringQueries), - '7.4.2': flow>(transformSplitFiltersStringToQueryObject), - '7.7.0': flow>(migrateOperatorKeyTypo, migrateSplitByChartRow), - '7.8.0': flow>(migrateTsvbDefaultColorPalettes), + '7.3.1': flow(migrateFiltersAggQueryStringQueries), + '7.4.2': flow(transformSplitFiltersStringToQueryObject), + '7.7.0': flow(migrateOperatorKeyTypo, migrateSplitByChartRow), + '7.8.0': flow(migrateTsvbDefaultColorPalettes), }; diff --git a/src/plugins/visualize/public/application/editor/editor.js b/src/plugins/visualize/public/application/editor/editor.js index 0e341ebf46e3a..30a46010db9e7 100644 --- a/src/plugins/visualize/public/application/editor/editor.js +++ b/src/plugins/visualize/public/application/editor/editor.js @@ -18,7 +18,7 @@ */ import angular from 'angular'; -import _ from 'lodash'; +import _ from 'lodash4'; import { Subscription } from 'rxjs'; import { map } from 'rxjs/operators'; import { i18n } from '@kbn/i18n'; diff --git a/src/plugins/visualize/public/application/editor/lib/migrate_app_state.ts b/src/plugins/visualize/public/application/editor/lib/migrate_app_state.ts index 7e09aece52e09..7d721390105e8 100644 --- a/src/plugins/visualize/public/application/editor/lib/migrate_app_state.ts +++ b/src/plugins/visualize/public/application/editor/lib/migrate_app_state.ts @@ -17,7 +17,7 @@ * under the License. */ -import { get, omit } from 'lodash'; +import { get, omit } from 'lodash4'; import { VisualizeAppState } from '../../types'; /** @@ -36,7 +36,7 @@ export function migrateAppState(appState: VisualizeAppState) { return appState; } - const visAggs: any = get(appState, 'vis.aggs'); + const visAggs: any = get(appState, 'vis.aggs'); if (visAggs) { let splitCount = 0; diff --git a/src/plugins/visualize/public/application/editor/lib/visualize_app_state.ts b/src/plugins/visualize/public/application/editor/lib/visualize_app_state.ts index 698fe0ca8a84f..c96b5e73c5a12 100644 --- a/src/plugins/visualize/public/application/editor/lib/visualize_app_state.ts +++ b/src/plugins/visualize/public/application/editor/lib/visualize_app_state.ts @@ -17,7 +17,7 @@ * under the License. */ -import { isFunction, omit, union } from 'lodash'; +import { isFunction, omitBy, union } from 'lodash4'; import { migrateAppState } from './migrate_app_state'; import { @@ -35,9 +35,9 @@ interface Arguments { } function toObject(state: PureVisState): PureVisState { - return omit(state, (value, key: string) => { + return omitBy(state, (value, key: string) => { return key.charAt(0) === '$' || key.charAt(0) === '_' || isFunction(value); - }); + }) as PureVisState; } export function useVisualizeAppState({ stateDefaults, kbnUrlStateStorage }: Arguments) { diff --git a/src/plugins/visualize/public/application/legacy_app.js b/src/plugins/visualize/public/application/legacy_app.js index 42e8b07ee6310..624f639567bb6 100644 --- a/src/plugins/visualize/public/application/legacy_app.js +++ b/src/plugins/visualize/public/application/legacy_app.js @@ -17,7 +17,7 @@ * under the License. */ -import { find } from 'lodash'; +import { find } from 'lodash4'; import { i18n } from '@kbn/i18n'; import { createHashHistory } from 'history'; diff --git a/src/test_utils/expect_deep_equal.js b/src/test_utils/expect_deep_equal.js index e3e24cbdf5dc9..ca076483ea1e9 100644 --- a/src/test_utils/expect_deep_equal.js +++ b/src/test_utils/expect_deep_equal.js @@ -17,7 +17,7 @@ * under the License. */ -import { isEqual } from 'lodash'; +import { isEqual } from 'lodash4'; import expect from '@kbn/expect'; // expect.js's `eql` method provides nice error messages but sometimes misses things diff --git a/src/test_utils/get_url.js b/src/test_utils/get_url.js index fbe16e798fff9..e4e0b37dade48 100644 --- a/src/test_utils/get_url.js +++ b/src/test_utils/get_url.js @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import url from 'url'; /** @@ -44,7 +44,7 @@ export default function getUrl(config, app) { } getUrl.noAuth = function getUrlNoAuth(config, app) { - config = _.pick(config, function (val, param) { + config = _.pickBy(config, function (val, param) { return param !== 'auth'; }); return getUrl(config, app); diff --git a/src/test_utils/kbn_server.ts b/src/test_utils/kbn_server.ts index 12f7eb5a0a043..23eadf0adcc2c 100644 --- a/src/test_utils/kbn_server.ts +++ b/src/test_utils/kbn_server.ts @@ -28,7 +28,7 @@ import { setupUsers, // @ts-ignore: implicit any for JS file } from '@kbn/test'; -import { defaultsDeep, get } from 'lodash'; +import { defaultsDeep, get } from 'lodash4'; import { resolve } from 'path'; import { BehaviorSubject } from 'rxjs'; import supertest from 'supertest'; @@ -217,7 +217,7 @@ export function createTestServers({ if (!adjustTimeout) { throw new Error('adjustTimeout is required in order to avoid flaky tests'); } - const license = get<'oss' | 'basic' | 'gold' | 'trial'>(settings, 'es.license', 'oss'); + const license = get(settings, 'es.license', 'oss'); const usersToBeAdded = get(settings, 'users', []); if (usersToBeAdded.length > 0) { if (license !== 'trial') { diff --git a/src/test_utils/public/simulate_keys.js b/src/test_utils/public/simulate_keys.js index 56596508a2181..158036e1a57c9 100644 --- a/src/test_utils/public/simulate_keys.js +++ b/src/test_utils/public/simulate_keys.js @@ -18,7 +18,7 @@ */ import $ from 'jquery'; -import _ from 'lodash'; +import _ from 'lodash4'; import Bluebird from 'bluebird'; import { keyMap } from 'ui/directives/key_map'; const reverseKeyMap = _.mapValues(_.invert(keyMap), _.ary(_.parseInt, 1)); diff --git a/test/api_integration/apis/index_patterns/fields_for_wildcard_route/response.js b/test/api_integration/apis/index_patterns/fields_for_wildcard_route/response.js index 45a09be6c2deb..b360b7c153ff7 100644 --- a/test/api_integration/apis/index_patterns/fields_for_wildcard_route/response.js +++ b/test/api_integration/apis/index_patterns/fields_for_wildcard_route/response.js @@ -18,7 +18,7 @@ */ import expect from '@kbn/expect'; -import { sortBy } from 'lodash'; +import { sortBy } from 'lodash4'; export default function ({ getService }) { const esArchiver = getService('esArchiver'); diff --git a/test/api_integration/apis/kql_telemetry/kql_telemetry.js b/test/api_integration/apis/kql_telemetry/kql_telemetry.js index a696cd148485f..151aff1e4ce1e 100644 --- a/test/api_integration/apis/kql_telemetry/kql_telemetry.js +++ b/test/api_integration/apis/kql_telemetry/kql_telemetry.js @@ -19,7 +19,7 @@ import expect from '@kbn/expect'; import Bluebird from 'bluebird'; -import { get } from 'lodash'; +import { get } from 'lodash4'; export default function ({ getService }) { const supertest = getService('supertest'); diff --git a/test/api_integration/apis/saved_objects/bulk_update.js b/test/api_integration/apis/saved_objects/bulk_update.js index e3f994ff224e8..fe3dbbef49b1e 100644 --- a/test/api_integration/apis/saved_objects/bulk_update.js +++ b/test/api_integration/apis/saved_objects/bulk_update.js @@ -18,7 +18,7 @@ */ import expect from '@kbn/expect'; -import _ from 'lodash'; +import _ from 'lodash4'; export default function ({ getService }) { const supertest = getService('supertest'); diff --git a/test/api_integration/apis/saved_objects/migrations.js b/test/api_integration/apis/saved_objects/migrations.js index d0ff4cc06c57e..0add2423f1a54 100644 --- a/test/api_integration/apis/saved_objects/migrations.js +++ b/test/api_integration/apis/saved_objects/migrations.js @@ -21,7 +21,7 @@ * Smokescreen tests for core migration logic */ -import _ from 'lodash'; +import _ from 'lodash4'; import { assert } from 'chai'; import { DocumentMigrator, @@ -293,7 +293,7 @@ export default ({ getService }) => { // It only created the original and the dest assert.deepEqual( - _.pluck( + _.map( await callCluster('cat.indices', { index: '.migration-c*', format: 'json' }), 'index' ).sort(), diff --git a/test/api_integration/apis/telemetry/telemetry_local.js b/test/api_integration/apis/telemetry/telemetry_local.js index 2875ff09a9a8d..9a2643ea0f0c6 100644 --- a/test/api_integration/apis/telemetry/telemetry_local.js +++ b/test/api_integration/apis/telemetry/telemetry_local.js @@ -18,7 +18,7 @@ */ import expect from '@kbn/expect'; -import _ from 'lodash'; +import _ from 'lodash4'; /* * Create a single-level array with strings for all the paths to values in the diff --git a/test/functional/apps/management/_import_objects.js b/test/functional/apps/management/_import_objects.js index 6306d11eadb65..20229402140a5 100644 --- a/test/functional/apps/management/_import_objects.js +++ b/test/functional/apps/management/_import_objects.js @@ -19,7 +19,7 @@ import expect from '@kbn/expect'; import path from 'path'; -import { indexBy } from 'lodash'; +import { keyBy } from 'lodash4'; export default function ({ getService, getPageObjects }) { const kibanaServer = getService('kibanaServer'); @@ -50,15 +50,12 @@ export default function ({ getService, getPageObjects }) { await PageObjects.settings.clickImportDone(); // get all the elements in the table, and index them by the 'title' visible text field - const elements = indexBy( - await PageObjects.settings.getSavedObjectElementsInTable(), - 'title' - ); + const elements = keyBy(await PageObjects.settings.getSavedObjectElementsInTable(), 'title'); log.debug("check that 'Log Agents' is in table as a visualization"); expect(elements['Log Agents'].objectType).to.eql('visualization'); await elements['logstash-*'].relationshipsElement.click(); - const flyout = indexBy(await PageObjects.settings.getRelationshipFlyout(), 'title'); + const flyout = keyBy(await PageObjects.settings.getRelationshipFlyout(), 'title'); log.debug( "check that 'Shared-Item Visualization AreaChart' shows 'logstash-*' as it's Parent" ); @@ -153,10 +150,7 @@ export default function ({ getService, getPageObjects }) { }); it('should not import saved objects linked to saved searches when saved search index pattern does not exist', async function () { - const elements = indexBy( - await PageObjects.settings.getSavedObjectElementsInTable(), - 'title' - ); + const elements = keyBy(await PageObjects.settings.getSavedObjectElementsInTable(), 'title'); await elements['logstash-*'].checkbox.click(); await PageObjects.settings.clickSavedObjectsDelete(); @@ -188,10 +182,7 @@ export default function ({ getService, getPageObjects }) { it('should import saved objects with index patterns when index patterns does not exists', async () => { // First, we need to delete the index pattern - const elements = indexBy( - await PageObjects.settings.getSavedObjectElementsInTable(), - 'title' - ); + const elements = keyBy(await PageObjects.settings.getSavedObjectElementsInTable(), 'title'); await elements['logstash-*'].checkbox.click(); await PageObjects.settings.clickSavedObjectsDelete(); @@ -330,10 +321,7 @@ export default function ({ getService, getPageObjects }) { await PageObjects.settings.clickImportDone(); // Second, we need to delete the index pattern - const elements = indexBy( - await PageObjects.settings.getSavedObjectElementsInTable(), - 'title' - ); + const elements = keyBy(await PageObjects.settings.getSavedObjectElementsInTable(), 'title'); await elements['logstash-*'].checkbox.click(); await PageObjects.settings.clickSavedObjectsDelete(); @@ -365,10 +353,7 @@ export default function ({ getService, getPageObjects }) { it('should import saved objects with index patterns when index patterns does not exists', async () => { // First, we need to delete the index pattern - const elements = indexBy( - await PageObjects.settings.getSavedObjectElementsInTable(), - 'title' - ); + const elements = keyBy(await PageObjects.settings.getSavedObjectElementsInTable(), 'title'); await elements['logstash-*'].checkbox.click(); await PageObjects.settings.clickSavedObjectsDelete(); diff --git a/test/functional/apps/visualize/_chart_types.ts b/test/functional/apps/visualize/_chart_types.ts index 8aa8b9c32e967..b84fd8ccf31a5 100644 --- a/test/functional/apps/visualize/_chart_types.ts +++ b/test/functional/apps/visualize/_chart_types.ts @@ -17,7 +17,7 @@ * under the License. */ -import _ from 'lodash'; +import _ from 'lodash4'; import expect from '@kbn/expect'; import { FtrProviderContext } from '../../ftr_provider_context'; diff --git a/test/functional/page_objects/common_page.ts b/test/functional/page_objects/common_page.ts index fe5694efc35da..490e34abad563 100644 --- a/test/functional/page_objects/common_page.ts +++ b/test/functional/page_objects/common_page.ts @@ -19,7 +19,7 @@ import { delay } from 'bluebird'; import expect from '@kbn/expect'; -import { get } from 'lodash'; +import { get } from 'lodash4'; // @ts-ignore import fetch from 'node-fetch'; import { FtrProviderContext } from '../ftr_provider_context'; diff --git a/test/functional/services/common/browser.ts b/test/functional/services/common/browser.ts index 3f71c16bd3c44..eaec69585589f 100644 --- a/test/functional/services/common/browser.ts +++ b/test/functional/services/common/browser.ts @@ -17,7 +17,7 @@ * under the License. */ -import { cloneDeep } from 'lodash'; +import { cloneDeepWith } from 'lodash4'; import { Key, Origin } from 'selenium-webdriver'; // @ts-ignore internal modules are not typed import { LegacyActionSequence } from 'selenium-webdriver/lib/actions'; @@ -471,7 +471,7 @@ export async function BrowserProvider({ getService }: FtrProviderContext) { ): Promise { return await driver.executeScript( fn, - ...cloneDeep(args, (arg) => { + ...cloneDeepWith(args, (arg) => { if (arg instanceof WebElementWrapper) { return arg._webElement; } @@ -485,7 +485,7 @@ export async function BrowserProvider({ getService }: FtrProviderContext) { ): Promise { return await driver.executeAsyncScript( fn, - ...cloneDeep(args, (arg) => { + ...cloneDeepWith(args, (arg) => { if (arg instanceof WebElementWrapper) { return arg._webElement; } diff --git a/test/tsconfig.json b/test/tsconfig.json index a270144bd49fe..87e79b295315f 100644 --- a/test/tsconfig.json +++ b/test/tsconfig.json @@ -14,7 +14,6 @@ "include": [ "**/*.ts", "**/*.tsx", - "../typings/lodash.topath/*.ts", "../typings/elastic__node_crypto.d.ts", "typings/**/*" ], diff --git a/test/visual_regression/services/visual_testing/visual_testing.ts b/test/visual_regression/services/visual_testing/visual_testing.ts index 3a71c3aa9d3d6..e35ef41420dd6 100644 --- a/test/visual_regression/services/visual_testing/visual_testing.ts +++ b/test/visual_regression/services/visual_testing/visual_testing.ts @@ -19,7 +19,6 @@ import { postSnapshot } from '@percy/agent/dist/utils/sdk-utils'; import { Test } from 'mocha'; -import _ from 'lodash'; import testSubjSelector from '@kbn/test-subj-selector'; diff --git a/typings/lodash.topath/index.d.ts b/typings/lodash.topath/index.d.ts deleted file mode 100644 index 3630a13f72c28..0000000000000 --- a/typings/lodash.topath/index.d.ts +++ /dev/null @@ -1,23 +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. - */ - -declare module 'lodash/internal/toPath' { - function toPath(value: string | string[]): string[]; - export = toPath; -} diff --git a/x-pack/plugins/index_management/public/application/components/mappings_editor/components/load_mappings/load_mappings_provider.test.tsx b/x-pack/plugins/index_management/public/application/components/mappings_editor/components/load_mappings/load_mappings_provider.test.tsx index 86bc0900f1678..543e7f69972d5 100644 --- a/x-pack/plugins/index_management/public/application/components/mappings_editor/components/load_mappings/load_mappings_provider.test.tsx +++ b/x-pack/plugins/index_management/public/application/components/mappings_editor/components/load_mappings/load_mappings_provider.test.tsx @@ -19,8 +19,8 @@ jest.mock('@elastic/eui', () => ({ ), })); -jest.mock('lodash', () => ({ - ...jest.requireActual('lodash'), +jest.mock('lodash4', () => ({ + ...jest.requireActual('lodash4'), debounce: (fn: any) => fn, })); diff --git a/yarn.lock b/yarn.lock index 26b7dc3a20cb5..efd1206d8968a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5194,33 +5194,44 @@ "@types/webpack" "*" "@types/lodash.clonedeep@^4.5.4": - version "4.5.4" - resolved "https://registry.yarnpkg.com/@types/lodash.clonedeep/-/lodash.clonedeep-4.5.4.tgz#2515c5f08bc95afebfb597711871b0497f5d7da7" - integrity sha512-+rCVPIZOJaub++wU/lmyp/SxiKlqXQaXI5LryzjuHBKFj51ApVt38Xxk9psLWNGMuR/obEQNTH0l/yDfG4ANNQ== + version "4.5.6" + resolved "https://registry.yarnpkg.com/@types/lodash.clonedeep/-/lodash.clonedeep-4.5.6.tgz#3b6c40a0affe0799a2ce823b440a6cf33571d32b" + integrity sha512-cE1jYr2dEg1wBImvXlNtp0xDoS79rfEdGozQVgliDZj1uERH4k+rmEMTudP9b4VQ8O6nRb5gPqft0QzEQGMQgA== dependencies: "@types/lodash" "*" "@types/lodash.clonedeepwith@^4.5.3": - version "4.5.3" - resolved "https://registry.yarnpkg.com/@types/lodash.clonedeepwith/-/lodash.clonedeepwith-4.5.3.tgz#8057f074de743bdcff59fdbf26cd04c674a186cc" - integrity sha512-DNOO/Vec+yrzxxYwRXhVxTE4cOE1Xkf1xUzHhz3atoQ2URYKjvO5m9S7UxUcpn48rXkt9PxOT6cOyJCMIfjLNg== + version "4.5.6" + resolved "https://registry.yarnpkg.com/@types/lodash.clonedeepwith/-/lodash.clonedeepwith-4.5.6.tgz#a5edd6c167b70396537ce6293dd8c0383d7b75e4" + integrity sha512-lroYwAgCFPkHyxi9548a+uQMelP60AaA74CBqfn9Li27+ukUZritx+JVYJ0W54PKBaBauXzTRHEvGzYrPsPZtQ== dependencies: "@types/lodash" "*" -"@types/lodash@*", "@types/lodash@^4.14.110", "@types/lodash@^4.14.116": - version "4.14.150" - resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.150.tgz#649fe44684c3f1fcb6164d943c5a61977e8cf0bd" - integrity sha512-kMNLM5JBcasgYscD9x/Gvr6lTAv2NVgsKtet/hm93qMyf/D1pt+7jeEZklKJKxMVmXjxbRVQQGfqDSfipYCO6w== +"@types/lodash3@npm:@types/lodash@^3.10.1", "@types/lodash@^3.10.1": + name "@types/lodash3" + version "3.10.3" + resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-3.10.3.tgz#aaddec6a3c93bf03b402db3acf5d4c77bce8bdff" + integrity sha512-b9zScBKmB/RJqETbxu3YRya61vJOik89/lR+NdxjZAFMDcMSjwX6IhQoP4terJkhsa9TE1C+l6XwxCkhhsaZXg== + +"@types/lodash4@npm:@types/lodash@^4.14.155", "@types/lodash@*": + version "4.14.156" + resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.156.tgz#cbe30909c89a1feeb7c60803e785344ea0ec82d1" + integrity sha512-l2AgHXcKUwx2DsvP19wtRPqZ4NkONjmorOdq4sMcxIjqdIuuV/ULo2ftuv4NUpevwfW7Ju/UKLqo0ZXuEt/8lQ== "@types/lodash@4.14.149": version "4.14.149" resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.149.tgz#1342d63d948c6062838fbf961012f74d4e638440" integrity sha512-ijGqzZt/b7BfzcK9vTrS6MFljQRPn5BFWOx8oE0GYxribu6uV+aA9zZuXI1zc/etK9E8nrgdoF2+LgUw7+9tJQ== -"@types/lodash@^3.10.1": - version "3.10.2" - resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-3.10.2.tgz#c1fbda1562ef5603c8192fe1fe65b017849d5873" - integrity sha512-TmlYodTNhMzVzv3CK/9sXGzh31jWsRKHE3faczhVgYFCdXIRQRCOPD+0NDlR+SvJlCj914yP3q3aAupt53p2Ug== +"@types/lodash@^4.14.110": + version "4.14.155" + resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.155.tgz#e2b4514f46a261fd11542e47519c20ebce7bc23a" + integrity sha512-vEcX7S7aPhsBCivxMwAANQburHBtfN9RdyXFk84IJmu2Z4Hkg1tOFgaslRiEqqvoLtbCBi6ika1EMspE+NZ9Lg== + +"@types/lodash@^4.14.116": + version "4.14.150" + resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.150.tgz#649fe44684c3f1fcb6164d943c5a61977e8cf0bd" + integrity sha512-kMNLM5JBcasgYscD9x/Gvr6lTAv2NVgsKtet/hm93qMyf/D1pt+7jeEZklKJKxMVmXjxbRVQQGfqDSfipYCO6w== "@types/log-symbols@^2.0.0": version "2.0.0" @@ -20593,7 +20604,12 @@ lodash.uniqby@^4.7.0: resolved "https://registry.yarnpkg.com/lodash.uniqby/-/lodash.uniqby-4.7.0.tgz#d99c07a669e9e6d24e1362dfe266c67616af1302" integrity sha1-2ZwHpmnp5tJOE2Lf4mbGdhavEwI= -lodash@4.17.11, lodash@4.17.15, lodash@>4.17.4, lodash@^4, lodash@^4.0.0, lodash@^4.0.1, lodash@^4.10.0, lodash@^4.11.1, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.17.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.2, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.6.1, lodash@~4.17.10, lodash@~4.17.15, lodash@~4.17.5: +"lodash3@npm:@elastic/lodash@3.10.1-kibana4", "lodash@npm:@elastic/lodash@3.10.1-kibana4": + version "3.10.1-kibana4" + resolved "https://registry.yarnpkg.com/@elastic/lodash/-/lodash-3.10.1-kibana4.tgz#d491228fd659b4a1b0dfa08ba9c67a4979b9746d" + integrity sha512-geQqXd9ZedRCL+kq5cpeahYWYaYRV0BMXhCwzq4DpnGCVs430FTMS3Wcot3XChZZhCvkwHm15bpNjB312vPxaA== + +"lodash4@npm:lodash@^4.17.15", lodash@4.17.11, lodash@4.17.15, lodash@>4.17.4, lodash@^4, lodash@^4.0.0, lodash@^4.0.1, lodash@^4.10.0, lodash@^4.11.1, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.17.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.2, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.6.1, lodash@~4.17.10, lodash@~4.17.15, lodash@~4.17.5: version "4.17.15" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== @@ -20603,11 +20619,6 @@ lodash@^3.10.1: resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6" integrity sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y= -"lodash@npm:@elastic/lodash@3.10.1-kibana4": - version "3.10.1-kibana4" - resolved "https://registry.yarnpkg.com/@elastic/lodash/-/lodash-3.10.1-kibana4.tgz#d491228fd659b4a1b0dfa08ba9c67a4979b9746d" - integrity sha512-geQqXd9ZedRCL+kq5cpeahYWYaYRV0BMXhCwzq4DpnGCVs430FTMS3Wcot3XChZZhCvkwHm15bpNjB312vPxaA== - log-ok@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/log-ok/-/log-ok-0.1.1.tgz#bea3dd36acd0b8a7240d78736b5b97c65444a334"