From 2d10fe450533e1b36db21d99cfae3ce996a244e0 Mon Sep 17 00:00:00 2001 From: Tiago Costa Date: Wed, 24 Jun 2020 21:49:52 +0100 Subject: [PATCH] chore(NA): move kibana_legacy, saved_objects saved_objects_management into lodash3 --- src/plugins/kibana_legacy/public/angular/angular_config.tsx | 2 +- src/plugins/kibana_legacy/public/angular/promises.js | 2 +- src/plugins/kibana_legacy/public/angular/watch_multi.js | 2 +- src/plugins/kibana_legacy/public/angular_bootstrap/index.ts | 2 +- .../kibana_legacy/public/notify/lib/format_es_msg.ts | 2 +- src/plugins/kibana_legacy/public/notify/lib/format_msg.ts | 2 +- src/plugins/kibana_legacy/public/paginate/paginate.js | 2 +- .../kibana_legacy/public/utils/migrate_legacy_query.ts | 2 +- src/plugins/kibana_legacy/public/utils/private.js | 2 +- src/plugins/kibana_legacy/server/index.ts | 2 +- .../public/finder/saved_object_finder.test.tsx | 2 +- .../saved_objects/public/finder/saved_object_finder.tsx | 2 +- .../public/saved_object/helpers/apply_es_resp.ts | 2 +- .../public/saved_object/helpers/build_saved_object.ts | 2 +- .../public/saved_object/helpers/create_source.ts | 2 +- .../public/saved_object/helpers/initialize_saved_object.ts | 2 +- .../public/saved_object/helpers/save_with_confirmation.ts | 2 +- .../public/saved_object/helpers/serialize_saved_object.ts | 2 +- .../saved_objects_management/public/lib/case_conversion.ts | 2 +- .../public/lib/create_field_list.ts | 6 +++--- .../public/lib/get_relationships.ts | 2 +- src/plugins/saved_objects_management/public/lib/numeric.ts | 2 +- .../public/lib/resolve_saved_objects.ts | 2 +- .../management_section/object_view/components/form.tsx | 2 +- .../management_section/objects_table/components/flyout.tsx | 2 +- .../objects_table/saved_objects_table.test.mocks.ts | 4 ++-- .../objects_table/saved_objects_table.tsx | 2 +- .../public/management_section/saved_objects_table_page.tsx | 2 +- .../saved_objects_management/server/lib/find_all.test.ts | 2 +- 29 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/plugins/kibana_legacy/public/angular/angular_config.tsx b/src/plugins/kibana_legacy/public/angular/angular_config.tsx index 4422fb82228739..3b69510199c9cd 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 'lodash4'; +import { cloneDeep, forOwn, get, set } from 'lodash3'; 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 4610b823d5ad2b..c7582d372c8946 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 'lodash4'; +import _ from 'lodash3'; 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 d011f49dd17638..e5d7531b2aa85c 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 'lodash4'; +import _ from 'lodash3'; 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 ee66e23c7e6cde..75c0aa8a483a82 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 'lodash4'; +import { once } from 'lodash3'; 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 eebf5bb435b33a..39fb93510d84a9 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 'lodash4'; +import _ from 'lodash3'; 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 9e7dafbff08340..3c35d2219f9c8a 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 'lodash4'; +import _ from 'lodash3'; 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 738cc1c24ad64d..a9e4bb52aeef03 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 'lodash4'; +import _ from 'lodash3'; 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 c4abb5ee3736d2..abaedf88cc9b92 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 'lodash4'; +import { has } from 'lodash3'; 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 d60f072d0830a7..cdcc3c0109fa38 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 'lodash4'; +import _ from 'lodash3'; const nextId = _.partial(_.uniqueId, 'privateProvider#'); diff --git a/src/plugins/kibana_legacy/server/index.ts b/src/plugins/kibana_legacy/server/index.ts index ae891880f1475a..68207f74f976e8 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 'lodash4'; +import { get } from 'lodash3'; import { configSchema, ConfigSchema } from '../config'; 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 8f624c62721744..7aa0a6efa6f51e 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('lodash4', () => ({ +jest.mock('lodash3', () => ({ 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 28b552604b0665..d05aa3550de6d9 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 'lodash4'; +import _ from 'lodash3'; 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 0b9d973dc9f24a..69f5a5ecc536db 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 'lodash4'; +import _ from 'lodash3'; 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 b604f2e8b5f89c..16d1d9fcb40f4e 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 'lodash4'; +import { once } from 'lodash3'; 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 4d6da734fd0a8b..db8e1d53bfe35c 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 'lodash4'; +import _ from 'lodash3'; 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 efd772edce292a..7110398a1ade8f 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 'lodash4'; +import _ from 'lodash3'; 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 255bb6786786a4..9d846c7384bcab 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 'lodash4'; +import { get } from 'lodash3'; 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 0afb985425b81e..7acc25a5f2ccc5 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 'lodash4'; +import _ from 'lodash3'; 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 654cbffee28c87..aea0d287a611b5 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 'lodash4'; +import { mapKeys, camelCase } from 'lodash3'; 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 902f077761d18a..f789537dab94d6 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, keyBy, isNumber, isBoolean, isPlainObject, isString } from 'lodash4'; +import { forOwn, indexBy, isNumber, isBoolean, isPlainObject, isString } from 'lodash3'; 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 = keyBy(fields, 'name'); + const fieldMap = indexBy(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 a2ba11ce0bc84b..d6b8c569838f02 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 'lodash4'; +import { get } from 'lodash3'; 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 525e5c1845ea2f..ae7a3d5fbb4ceb 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 'lodash4'; +import { isNaN } from 'lodash3'; 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 7fb86afede6997..0f1cb029959ee1 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 'lodash4'; +import { cloneDeep } from 'lodash3'; 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 769d1d69a06c31..3bed851e33e582 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 'lodash4'; +import { cloneDeep, set } from 'lodash3'; 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 8884f23e5035a3..337a60070142c2 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 'lodash4'; +import { take, get as getField } from 'lodash3'; 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 7bdc65b1e73dd0..4a809b4eee9990 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('lodash4', () => ({ - ...jest.requireActual('lodash4'), +jest.doMock('lodash3', () => ({ + ...jest.requireActual('lodash3'), 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 ba02aa9c50236d..eed524fe0b423b 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 'lodash4'; +import { debounce } from 'lodash3'; // @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 5ba73bd32b8f77..96597aa64bd241 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 'lodash4'; +import { get } from 'lodash3'; import { i18n } from '@kbn/i18n'; import { CoreStart, ChromeBreadcrumb } from 'src/core/public'; import { DataPublicPluginStart } from '../../../data/public'; 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 04d7c3ca7934a3..e7ad4319f3ac0f 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 'lodash4'; +import { times } from 'lodash3'; import { SavedObjectsFindOptions, SavedObject } from 'src/core/server'; import { savedObjectsClientMock } from '../../../../core/server/mocks'; import { findAll } from './find_all';