Skip to content

Commit

Permalink
[7.15] Upgrade EUI to v37.1.3 (#111199)
Browse files Browse the repository at this point in the history
* bump eui to 37.1.3

* i18n token mapping

* snapshots & translations

* Remove translations for core.euiColumnSortingDraggable.activeSortLabel token so they can be reprocessed
  • Loading branch information
chandlerprall authored Sep 7, 2021
1 parent a20e4c8 commit 73033c7
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 15 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
"@elastic/datemath": "link:bazel-bin/packages/elastic-datemath",
"@elastic/elasticsearch": "npm:@elastic/elasticsearch-canary@^7.15.0-canary.3",
"@elastic/ems-client": "7.15.0",
"@elastic/eui": "37.1.2",
"@elastic/eui": "37.1.3",
"@elastic/filesaver": "1.1.2",
"@elastic/good": "^9.0.1-kibana3",
"@elastic/maki": "6.3.0",
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 5 additions & 6 deletions src/core/public/i18n/i18n_eui_mapping.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -275,12 +275,11 @@ export const getEuiContextMapping = (): EuiTokensObject => {
'euiColumnSorting.buttonActive': i18n.translate('core.euiColumnSorting.buttonActive', {
defaultMessage: 'fields sorted',
}),
'euiColumnSortingDraggable.activeSortLabel': i18n.translate(
'core.euiColumnSortingDraggable.activeSortLabel',
{
defaultMessage: 'is sorting this data grid',
}
),
'euiColumnSortingDraggable.activeSortLabel': ({ display }: EuiValues) =>
i18n.translate('core.euiColumnSortingDraggable.activeSortLabel', {
defaultMessage: '{display} is sorting this data grid',
values: { display },
}),
'euiColumnSortingDraggable.defaultSortAsc': i18n.translate(
'core.euiColumnSortingDraggable.defaultSortAsc',
{
Expand Down
2 changes: 1 addition & 1 deletion src/dev/license_checker/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ export const LICENSE_OVERRIDES = {
'@mapbox/jsonlint-lines-primitives@2.0.2': ['MIT'], // license in readme https://github.com/tmcw/jsonlint
'node-sql-parser@3.6.1': ['(GPL-2.0 OR MIT)'], // GPL-2.0* https://github.com/taozhi8833998/node-sql-parser
'@elastic/ems-client@7.15.0': ['Elastic License 2.0'],
'@elastic/eui@37.1.2': ['SSPL-1.0 OR Elastic License 2.0'],
'@elastic/eui@37.1.3': ['SSPL-1.0 OR Elastic License 2.0'],

// TODO can be removed if the https://github.com/jindw/xmldom/issues/239 is released
'xmldom@0.1.27': ['MIT'],
Expand Down
1 change: 0 additions & 1 deletion x-pack/plugins/translations/translations/ja-JP.json
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,6 @@
"core.euiColumnSorting.emptySorting": "現在並び替えられているフィールドはありません",
"core.euiColumnSorting.pickFields": "並び替え基準でフィールドの選択",
"core.euiColumnSorting.sortFieldAriaLabel": "並べ替え基準:",
"core.euiColumnSortingDraggable.activeSortLabel": "このデータグリッドを並び替え中",
"core.euiColumnSortingDraggable.defaultSortAsc": "A-Z",
"core.euiColumnSortingDraggable.defaultSortDesc": "Z-A",
"core.euiColumnSortingDraggable.removeSortLabel": "データグリッドの並び替えから削除:",
Expand Down
1 change: 0 additions & 1 deletion x-pack/plugins/translations/translations/zh-CN.json
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,6 @@
"core.euiColumnSorting.emptySorting": "当前未排序任何字段",
"core.euiColumnSorting.pickFields": "选取排序依据的字段",
"core.euiColumnSorting.sortFieldAriaLabel": "排序依据:",
"core.euiColumnSortingDraggable.activeSortLabel": "正在排序此数据网格",
"core.euiColumnSortingDraggable.defaultSortAsc": "A-Z",
"core.euiColumnSortingDraggable.defaultSortDesc": "Z-A",
"core.euiColumnSortingDraggable.removeSortLabel": "从数据网格排序中移除:",
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1487,10 +1487,10 @@
resolved "https://registry.yarnpkg.com/@elastic/eslint-plugin-eui/-/eslint-plugin-eui-0.0.2.tgz#56b9ef03984a05cc213772ae3713ea8ef47b0314"
integrity sha512-IoxURM5zraoQ7C8f+mJb9HYSENiZGgRVcG4tLQxE61yHNNRDXtGDWTZh8N1KIHcsqN1CEPETjuzBXkJYF/fDiQ==

"@elastic/eui@37.1.2":
version "37.1.2"
resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-37.1.2.tgz#1a420d1c3ac8577d547c54459c7a3fdd098e1b48"
integrity sha512-jQhg6jzG9L0+2fHjFvqYbLF41lXPN1EtikPatNP7Hywa3zjVhAWdcSpUbeAEGfq9wqlb+qdpvGShEOR6K14EKg==
"@elastic/eui@37.1.3":
version "37.1.3"
resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-37.1.3.tgz#3a652a1bcfe24fe344edfcdfd355a4bba42ce774"
integrity sha512-PYklLcepl7NIDWJfd5z2sZ4OxuybuW1HegtdpOZCkiW39gliL5+3b41eExr5MQQlXcA3rL1yh/VpcJoRb/gK3w==
dependencies:
"@types/chroma-js" "^2.0.0"
"@types/lodash" "^4.14.160"
Expand Down

0 comments on commit 73033c7

Please sign in to comment.