From 8afbb03b78625477cae121b4dac3562a5568dd17 Mon Sep 17 00:00:00 2001 From: Nathan Reese Date: Wed, 5 Sep 2018 15:46:57 -0600 Subject: [PATCH 1/4] bump EUI to 3.9.0 --- package.json | 2 +- .../__snapshots__/table.test.js.snap | 2 ++ .../inspector_panel.test.js.snap | 4 ++- x-pack/package.json | 4 +-- .../__test__/__snapshots__/List.test.js.snap | 16 +++++++++--- .../__test__/__snapshots__/List.test.js.snap | 16 +++++++++--- .../__snapshots__/Timeline.test.js.snap | 12 ++++----- .../__snapshots__/upload_license.test.js.snap | 25 ++++++++++++++----- .../condition_expression.test.js.snap | 2 ++ .../edit_description_popover.test.js.snap | 3 +++ .../collapsible_statement.test.js.snap | 1 + x-pack/yarn.lock | 6 ++--- yarn.lock | 6 ++--- 13 files changed, 69 insertions(+), 30 deletions(-) diff --git a/package.json b/package.json index 5ea6728b6458e..b56db744f237f 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "url": "https://github.com/elastic/kibana.git" }, "dependencies": { - "@elastic/eui": "3.7.0", + "@elastic/eui": "3.9.0", "@elastic/filesaver": "1.1.2", "@elastic/numeral": "2.3.2", "@elastic/ui-ace": "0.2.3", diff --git a/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/source_filters_table/components/table/__tests__/__snapshots__/table.test.js.snap b/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/source_filters_table/components/table/__tests__/__snapshots__/table.test.js.snap index 43f0e5f43be47..66a56b51986f4 100644 --- a/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/source_filters_table/components/table/__tests__/__snapshots__/table.test.js.snap +++ b/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/source_filters_table/components/table/__tests__/__snapshots__/table.test.js.snap @@ -6,6 +6,7 @@ exports[`Table editing should show a save button 1`] = ` - + View: View 1 diff --git a/x-pack/package.json b/x-pack/package.json index 17cef7c7d79ba..658432725b30b 100644 --- a/x-pack/package.json +++ b/x-pack/package.json @@ -80,7 +80,7 @@ "yargs": "4.7.1" }, "dependencies": { - "@elastic/eui": "3.7.0", + "@elastic/eui": "3.9.0", "@elastic/node-crypto": "0.1.2", "@elastic/node-phantom-simple": "2.2.4", "@elastic/numeral": "2.3.2", @@ -170,4 +170,4 @@ "engines": { "yarn": "^1.6.0" } -} \ No newline at end of file +} diff --git a/x-pack/plugins/apm/public/components/app/ErrorGroupOverview/List/__test__/__snapshots__/List.test.js.snap b/x-pack/plugins/apm/public/components/app/ErrorGroupOverview/List/__test__/__snapshots__/List.test.js.snap index 56a2847ca4824..5b30c7820e93f 100644 --- a/x-pack/plugins/apm/public/components/app/ErrorGroupOverview/List/__test__/__snapshots__/List.test.js.snap +++ b/x-pack/plugins/apm/public/components/app/ErrorGroupOverview/List/__test__/__snapshots__/List.test.js.snap @@ -54,7 +54,9 @@ exports[`ErrorGroupOverview -> List should render empty state 1`] = ` xlinkHref="#arrow_down-a" /> - + Sorting @@ -262,7 +264,9 @@ exports[`ErrorGroupOverview -> List should render empty state 1`] = ` xlinkHref="#arrow_down-a" /> - + Rows per page: 25 @@ -358,7 +362,9 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = ` xlinkHref="#arrow_down-a" /> - + Sorting @@ -872,7 +878,9 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = ` xlinkHref="#arrow_down-a" /> - + Rows per page: 25 diff --git a/x-pack/plugins/apm/public/components/app/ServiceOverview/List/__test__/__snapshots__/List.test.js.snap b/x-pack/plugins/apm/public/components/app/ServiceOverview/List/__test__/__snapshots__/List.test.js.snap index f8a6516239197..cd13a5c689a58 100644 --- a/x-pack/plugins/apm/public/components/app/ServiceOverview/List/__test__/__snapshots__/List.test.js.snap +++ b/x-pack/plugins/apm/public/components/app/ServiceOverview/List/__test__/__snapshots__/List.test.js.snap @@ -54,7 +54,9 @@ exports[`ErrorGroupOverview -> List should render empty state 1`] = ` xlinkHref="#arrow_down-a" /> - + Sorting @@ -286,7 +288,9 @@ exports[`ErrorGroupOverview -> List should render empty state 1`] = ` xlinkHref="#arrow_down-a" /> - + Rows per page: 10 @@ -366,7 +370,9 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = ` xlinkHref="#arrow_down-a" /> - + Sorting @@ -708,7 +714,9 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = ` xlinkHref="#arrow_down-a" /> - + Rows per page: 10 diff --git a/x-pack/plugins/apm/public/components/shared/charts/Timeline/__test__/__snapshots__/Timeline.test.js.snap b/x-pack/plugins/apm/public/components/shared/charts/Timeline/__test__/__snapshots__/Timeline.test.js.snap index 3ba61791679f8..dc61c85c9db76 100644 --- a/x-pack/plugins/apm/public/components/shared/charts/Timeline/__test__/__snapshots__/Timeline.test.js.snap +++ b/x-pack/plugins/apm/public/components/shared/charts/Timeline/__test__/__snapshots__/Timeline.test.js.snap @@ -540,6 +540,8 @@ exports[`Timeline should render with data 1`] = ` >
- + Cancel @@ -454,7 +457,9 @@ exports[`UploadLicense should display a modal when license requires acknowledgem - + Cancel @@ -778,7 +783,9 @@ exports[`UploadLicense should display an error when ES says license is expired 1 - + Cancel @@ -1102,7 +1109,9 @@ exports[`UploadLicense should display an error when ES says license is invalid 1 - + Cancel @@ -1426,7 +1435,9 @@ exports[`UploadLicense should display an error when submitting invalid JSON 1`] - + Cancel @@ -1750,7 +1761,9 @@ exports[`UploadLicense should display error when ES returns error 1`] = ` - + Cancel diff --git a/x-pack/plugins/ml/public/components/rule_editor/__snapshots__/condition_expression.test.js.snap b/x-pack/plugins/ml/public/components/rule_editor/__snapshots__/condition_expression.test.js.snap index 640f5fbf5e5d8..af09eaffe2a85 100644 --- a/x-pack/plugins/ml/public/components/rule_editor/__snapshots__/condition_expression.test.js.snap +++ b/x-pack/plugins/ml/public/components/rule_editor/__snapshots__/condition_expression.test.js.snap @@ -191,6 +191,7 @@ exports[`ConditionExpression renders with appliesTo, operator and value supplied Date: Wed, 5 Sep 2018 16:18:44 -0600 Subject: [PATCH 2/4] add @types/react-virtualized --- package.json | 1 + x-pack/package.json | 1 + x-pack/yarn.lock | 24 ++++++++++++++++++++++++ yarn.lock | 13 +++++++++++++ 4 files changed, 39 insertions(+) diff --git a/package.json b/package.json index b56db744f237f..de30fd0f96ea7 100644 --- a/package.json +++ b/package.json @@ -236,6 +236,7 @@ "@types/react": "^16.3.14", "@types/react-dom": "^16.0.5", "@types/react-redux": "^6.0.6", + "@types/react-virtualized": "^9.18.7", "@types/redux-actions": "^2.2.1", "@types/sinon": "^5.0.0", "@types/strip-ansi": "^3.0.0", diff --git a/x-pack/package.json b/x-pack/package.json index 658432725b30b..149aaedfe069e 100644 --- a/x-pack/package.json +++ b/x-pack/package.json @@ -29,6 +29,7 @@ "@kbn/test": "link:../packages/kbn-test", "@types/jest": "^22.2.3", "@types/pngjs": "^3.3.1", + "@types/react-virtualized": "^9.18.7", "abab": "^1.0.4", "ansicolors": "0.3.2", "aws-sdk": "2.2.33", diff --git a/x-pack/yarn.lock b/x-pack/yarn.lock index 40ce9a92ed54a..9e566b2b0859f 100644 --- a/x-pack/yarn.lock +++ b/x-pack/yarn.lock @@ -186,6 +186,26 @@ dependencies: "@types/node" "*" +"@types/prop-types@*": + version "15.5.5" + resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.5.5.tgz#17038dd322c2325f5da650a94d5f9974943625e3" + dependencies: + "@types/react" "*" + +"@types/react-virtualized@^9.18.7": + version "9.18.7" + resolved "https://registry.yarnpkg.com/@types/react-virtualized/-/react-virtualized-9.18.7.tgz#8703d8904236819facff90b8b320f29233160c90" + dependencies: + "@types/prop-types" "*" + "@types/react" "*" + +"@types/react@*": + version "16.4.13" + resolved "https://registry.yarnpkg.com/@types/react/-/react-16.4.13.tgz#1385f5dc3486aa493849a32ccce626a817543e28" + dependencies: + "@types/prop-types" "*" + csstype "^2.2.0" + "@types/retry@*", "@types/retry@^0.10.2": version "0.10.2" resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.10.2.tgz#bd1740c4ad51966609b058803ee6874577848b37" @@ -1705,6 +1725,10 @@ cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0": dependencies: cssom "0.3.x" +csstype@^2.2.0: + version "2.5.6" + resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.5.6.tgz#2ae1db2319642d8b80a668d2d025c6196071e788" + currently-unhandled@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea" diff --git a/yarn.lock b/yarn.lock index d84d233b13572..8e9666169d055 100644 --- a/yarn.lock +++ b/yarn.lock @@ -484,6 +484,12 @@ version "1.0.0" resolved "https://registry.yarnpkg.com/@types/podium/-/podium-1.0.0.tgz#bfaa2151be2b1d6109cc69f7faa9dac2cba3bb20" +"@types/prop-types@*": + version "15.5.5" + resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.5.5.tgz#17038dd322c2325f5da650a94d5f9974943625e3" + dependencies: + "@types/react" "*" + "@types/prop-types@^15.5.3": version "15.5.3" resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.5.3.tgz#bef071852dca2a2dbb65fecdb7bfb30cedae2de2" @@ -502,6 +508,13 @@ "@types/react" "*" redux "^4.0.0" +"@types/react-virtualized@^9.18.7": + version "9.18.7" + resolved "https://registry.yarnpkg.com/@types/react-virtualized/-/react-virtualized-9.18.7.tgz#8703d8904236819facff90b8b320f29233160c90" + dependencies: + "@types/prop-types" "*" + "@types/react" "*" + "@types/react@*", "@types/react@^16.3.14": version "16.3.14" resolved "https://registry.yarnpkg.com/@types/react/-/react-16.3.14.tgz#f90ac6834de172e13ecca430dcb6814744225d36" From 556ddff0a4952b9e2257dcff84e28887c02de24d Mon Sep 17 00:00:00 2001 From: Nathan Reese Date: Wed, 12 Sep 2018 10:33:07 -0600 Subject: [PATCH 3/4] remove react-virtualized from x-pack package.json --- x-pack/package.json | 1 - x-pack/yarn.lock | 24 ------------------------ 2 files changed, 25 deletions(-) diff --git a/x-pack/package.json b/x-pack/package.json index 8d065fab8fafe..3fd6de273fa36 100644 --- a/x-pack/package.json +++ b/x-pack/package.json @@ -27,7 +27,6 @@ "@kbn/test": "link:../packages/kbn-test", "@types/jest": "^23.3.1", "@types/pngjs": "^3.3.1", - "@types/react-virtualized": "^9.18.7", "abab": "^1.0.4", "ansi-colors": "^3.0.5", "ansicolors": "0.3.2", diff --git a/x-pack/yarn.lock b/x-pack/yarn.lock index 725b5f8d54d3a..4750397776ce6 100644 --- a/x-pack/yarn.lock +++ b/x-pack/yarn.lock @@ -192,26 +192,6 @@ dependencies: "@types/node" "*" -"@types/prop-types@*": - version "15.5.5" - resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.5.5.tgz#17038dd322c2325f5da650a94d5f9974943625e3" - dependencies: - "@types/react" "*" - -"@types/react-virtualized@^9.18.7": - version "9.18.7" - resolved "https://registry.yarnpkg.com/@types/react-virtualized/-/react-virtualized-9.18.7.tgz#8703d8904236819facff90b8b320f29233160c90" - dependencies: - "@types/prop-types" "*" - "@types/react" "*" - -"@types/react@*": - version "16.4.13" - resolved "https://registry.yarnpkg.com/@types/react/-/react-16.4.13.tgz#1385f5dc3486aa493849a32ccce626a817543e28" - dependencies: - "@types/prop-types" "*" - csstype "^2.2.0" - "@types/retry@*", "@types/retry@^0.10.2": version "0.10.2" resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.10.2.tgz#bd1740c4ad51966609b058803ee6874577848b37" @@ -1742,10 +1722,6 @@ cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0": dependencies: cssom "0.3.x" -csstype@^2.2.0: - version "2.5.6" - resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.5.6.tgz#2ae1db2319642d8b80a668d2d025c6196071e788" - currently-unhandled@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea" From 1bf52a519e63346382de3c8c54ec17fa6df4699f Mon Sep 17 00:00:00 2001 From: Nathan Reese Date: Wed, 12 Sep 2018 13:47:19 -0600 Subject: [PATCH 4/4] bump to 3.11.0 --- package.json | 2 +- .../__snapshots__/clone_modal.test.js.snap | 1 + .../__snapshots__/save_modal.test.js.snap | 1 + x-pack/package.json | 2 +- .../__test__/__snapshots__/List.test.js.snap | 20 +++++++++++++++++++ .../__test__/__snapshots__/List.test.js.snap | 20 +++++++++++++++++++ .../__snapshots__/upload_license.test.js.snap | 3 ++- x-pack/yarn.lock | 6 +++--- yarn.lock | 6 +++--- 9 files changed, 52 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 0220adb43c495..d232c0c72f63a 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "url": "https://github.com/elastic/kibana.git" }, "dependencies": { - "@elastic/eui": "3.9.0", + "@elastic/eui": "3.11.0", "@elastic/filesaver": "1.1.2", "@elastic/numeral": "2.3.2", "@elastic/ui-ace": "0.2.3", diff --git a/src/core_plugins/kibana/public/dashboard/top_nav/__snapshots__/clone_modal.test.js.snap b/src/core_plugins/kibana/public/dashboard/top_nav/__snapshots__/clone_modal.test.js.snap index da7fe1b4c960c..3d31ffb7957d5 100644 --- a/src/core_plugins/kibana/public/dashboard/top_nav/__snapshots__/clone_modal.test.js.snap +++ b/src/core_plugins/kibana/public/dashboard/top_nav/__snapshots__/clone_modal.test.js.snap @@ -5,6 +5,7 @@ exports[`renders DashboardCloneModal 1`] = ` diff --git a/src/core_plugins/kibana/public/dashboard/top_nav/__snapshots__/save_modal.test.js.snap b/src/core_plugins/kibana/public/dashboard/top_nav/__snapshots__/save_modal.test.js.snap index 82275bb96b2d9..7e350b1149e59 100644 --- a/src/core_plugins/kibana/public/dashboard/top_nav/__snapshots__/save_modal.test.js.snap +++ b/src/core_plugins/kibana/public/dashboard/top_nav/__snapshots__/save_modal.test.js.snap @@ -5,6 +5,7 @@ exports[`renders DashboardSaveModal 1`] = ` diff --git a/x-pack/package.json b/x-pack/package.json index 3fd6de273fa36..64f9d05316253 100644 --- a/x-pack/package.json +++ b/x-pack/package.json @@ -76,7 +76,7 @@ "yargs": "4.7.1" }, "dependencies": { - "@elastic/eui": "3.9.0", + "@elastic/eui": "3.11.0", "@elastic/node-crypto": "0.1.2", "@elastic/node-phantom-simple": "2.2.4", "@elastic/numeral": "2.3.2", diff --git a/x-pack/plugins/apm/public/components/app/ErrorGroupOverview/List/__test__/__snapshots__/List.test.js.snap b/x-pack/plugins/apm/public/components/app/ErrorGroupOverview/List/__test__/__snapshots__/List.test.js.snap index d9d37e43211c6..45f29ec8663e2 100644 --- a/x-pack/plugins/apm/public/components/app/ErrorGroupOverview/List/__test__/__snapshots__/List.test.js.snap +++ b/x-pack/plugins/apm/public/components/app/ErrorGroupOverview/List/__test__/__snapshots__/List.test.js.snap @@ -68,6 +68,16 @@ exports[`ErrorGroupOverview -> List should render empty state 1`] = ` +
+ Below is a table of + 0 + items. +
List should render with data 1`] = ` +
+ Below is a table of + 4 + items. +
List should render empty state 1`] = ` +
+ Below is a table of + 0 + items. +
List should render with data 1`] = ` +
+ Below is a table of + 2 + items. +
diff --git a/x-pack/yarn.lock b/x-pack/yarn.lock index 4750397776ce6..74cf054129c65 100644 --- a/x-pack/yarn.lock +++ b/x-pack/yarn.lock @@ -10,9 +10,9 @@ esutils "^2.0.2" js-tokens "^3.0.0" -"@elastic/eui@3.9.0": - version "3.9.0" - resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-3.9.0.tgz#5930350ab5b0a5caba0c1e257f0c50ddd732c594" +"@elastic/eui@3.11.0": + version "3.11.0" + resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-3.11.0.tgz#272c4a4d59149421b968a670fa84fa704260d345" dependencies: classnames "^2.2.5" core-js "^2.5.1" diff --git a/yarn.lock b/yarn.lock index ee7fc0d331687..fc8ba445932d2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -81,9 +81,9 @@ version "0.0.0" uid "" -"@elastic/eui@3.9.0": - version "3.9.0" - resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-3.9.0.tgz#5930350ab5b0a5caba0c1e257f0c50ddd732c594" +"@elastic/eui@3.11.0": + version "3.11.0" + resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-3.11.0.tgz#272c4a4d59149421b968a670fa84fa704260d345" dependencies: classnames "^2.2.5" core-js "^2.5.1"