From 5580584d42d151a9a86f31334489280320532dea Mon Sep 17 00:00:00 2001 From: "opensearch-trigger-bot[bot]" <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com> Date: Wed, 1 May 2024 10:10:22 -0700 Subject: [PATCH 1/9] Fix datagrid lines (#1250) (#1252) Signed-off-by: Miki (cherry picked from commit 543435a97e4cff9610184d898d3a776465d5842c) Signed-off-by: github-actions[bot] # Conflicts: # CHANGELOG.md Co-authored-by: github-actions[bot] --- .../datagrid/_data_grid_data_row.scss | 32 ++++++++++--------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/src/components/datagrid/_data_grid_data_row.scss b/src/components/datagrid/_data_grid_data_row.scss index bae14ee8c..43c590bfa 100644 --- a/src/components/datagrid/_data_grid_data_row.scss +++ b/src/components/datagrid/_data_grid_data_row.scss @@ -166,21 +166,6 @@ } .ouiDataGridRowCell { - box-shadow: none !important; // sass-lint:disable-line no-important - - /* ToDo: Remove unnecessary logic: the old beta theme has - * evolved and the statement below about the `Next` theme - * is not valid. - */ - // Remove default .ouiButtonIcon--fill border - // This way we don't need to animate the border that is inexistent in Next and unnecessary for a fill button - border: none; - - &-isActive { - margin-left: $ouiDataGridCellPaddingM; - width: $ouiSizeM; - } - &__actionButtonIcon, &__expandButtonIcon { height: $ouiSizeM; @@ -190,6 +175,23 @@ transition: none; // Have to take out the generic transition so it is instantaneous on focus } + &__expandButtonIcon { + box-shadow: none !important; // sass-lint:disable-line no-important + + /* ToDo: Remove unnecessary logic: the old beta theme has + * evolved and the statement below about the `Next` theme + * is not valid. + */ + // Remove default .ouiButtonIcon--fill border + // This way we don't need to animate the border that is inexistent in Next and unnecessary for a fill button + border: none; + + &-isActive { + margin-left: $ouiDataGridCellPaddingM; + width: $ouiSizeM; + } + } + &__expandButton > * { z-index: 2; } From 1640f7642b3ba589a7629c675d5f96af04e1cc39 Mon Sep 17 00:00:00 2001 From: "opensearch-trigger-bot[bot]" <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com> Date: Wed, 1 May 2024 10:30:35 -0700 Subject: [PATCH 2/9] [OSCI] Clean/breadcrumb updates - Refactoring use of 'let' for 'const' keyword and CSS modifier '--last' for one class only (#1144) (#1248) * refactoring changing 'let' variables with 'const' * refactoring changing 'let' variables with 'const' * refactoring _breadcrumbs.sccs, removing '--last' modifier from .ouiBreadcrumb class, keeping it only in .ouiBreadcrumbWrapper class * refactoring _breadcrumbs.sccs, removing '--last' modifier from .ouiBreadcrumb class, keeping it only in .ouiBreadcrumbWrapper class * updating CHANGELOG.md file * fixing calculation of calculatedMax, breadcrumbs.tsx, line 310 * updating breadcrumbs JSX according suggestion from maintainer for better readability of code --------- (cherry picked from commit 064a02c0e9035ddd441376f79a6430ec7335e912) Signed-off-by: Samuel Valdes Gutierrez Signed-off-by: Josh Romero Signed-off-by: github-actions[bot] Co-authored-by: github-actions[bot] Co-authored-by: Josh Romero --- src/components/breadcrumbs/_breadcrumbs.scss | 23 +++++---- src/components/breadcrumbs/breadcrumbs.tsx | 49 +++++++++----------- 2 files changed, 38 insertions(+), 34 deletions(-) diff --git a/src/components/breadcrumbs/_breadcrumbs.scss b/src/components/breadcrumbs/_breadcrumbs.scss index c21eb599c..365303be4 100644 --- a/src/components/breadcrumbs/_breadcrumbs.scss +++ b/src/components/breadcrumbs/_breadcrumbs.scss @@ -25,18 +25,15 @@ .ouiBreadcrumb { display: inline-block; + // TODO: remove important: https://github.com/opensearch-project/oui/issues/376 + color: $ouiBreadcrumbInactiveTextColor !important; // sass-lint:disable-line no-important - &:not(.ouiBreadcrumb--last) { - // TODO: remove important: https://github.com/opensearch-project/oui/issues/376 - color: $ouiBreadcrumbInactiveTextColor !important; // sass-lint:disable-line no-important - - &:hover { - color: $ouiBreadCrumbHoverColor !important; // sass-lint:disable-line no-important - } + &:hover { + color: $ouiBreadCrumbHoverColor !important; // sass-lint:disable-line no-important } } -.ouiBreadcrumbs:not(.ouiBreadcrumbs__inPopover) .ouiBreadcrumb--last { +.ouiBreadcrumbs:not(.ouiBreadcrumbs__inPopover) .ouiBreadcrumbWrapper--last .ouiBreadcrumb { font-weight: $ouiFontWeightMedium; } @@ -114,6 +111,16 @@ margin-bottom: $ouiSizeXS; /* 1 */ padding-left: $ouiSizeL - $ouiSizeXS + calc($ouiBreadcrumbSpacing / 2); } + + // This targets the last breadcrumb wrapper and sets a different text color for the breadcrumb inside it. + &.ouiBreadcrumbWrapper--last .ouiBreadcrumb { + // TODO: remove important: https://github.com/opensearch-project/oui/issues/376 + color: inherit !important; // sass-lint:disable-line no-important + + &:hover { + color: inherit !important; // sass-lint:disable-line no-important + } + } } .ouiBreadcrumbWall { diff --git a/src/components/breadcrumbs/breadcrumbs.tsx b/src/components/breadcrumbs/breadcrumbs.tsx index 94b82627e..015b91a53 100644 --- a/src/components/breadcrumbs/breadcrumbs.tsx +++ b/src/components/breadcrumbs/breadcrumbs.tsx @@ -241,10 +241,8 @@ export const OuiBreadcrumbs: FunctionComponent = ({ 'ouiBreadcrumb--truncate': truncate, }); - let link; - - if (!href && !onClick) { - link = ( + const link = + !href && !onClick ? ( {(ref, innerText) => ( = ({ )} - ); - } else { - link = ( + ) : ( {(ref, innerText) => ( = ({ )} ); - } - - let wrapper =
{link}
; - if (isFirstBreadcrumb) { - const breadcrumbWallClasses = classNames('ouiBreadcrumbWall', { - 'ouiBreadcrumbWall--single': isLastBreadcrumb, - }); + const breadcrumbWallClasses = classNames('ouiBreadcrumbWall', { + 'ouiBreadcrumbWall--single': isFirstBreadcrumb && isLastBreadcrumb, + }); - wrapper =
{wrapper}
; - } + const wrapper =
{link}
; + const wall = isFirstBreadcrumb ? ( +
{wrapper}
+ ) : ( + wrapper + ); - return {wrapper}; + return {wall}; }); // Use the default object if they simply passed `true` for responsive @@ -297,15 +293,16 @@ export const OuiBreadcrumbs: FunctionComponent = ({ // The max property collapses any breadcrumbs past the max quantity. // This is the same behavior we want for responsiveness. // So calculate the max value based on the combination of `max` and `responsive` - let calculatedMax: OuiBreadcrumbsProps['max'] = max; - // Set the calculated max to the number associated with the currentBreakpoint key if it exists - if (responsive && responsiveObject[currentBreakpoint as OuiBreakpointSize]) { - calculatedMax = responsiveObject[currentBreakpoint as OuiBreakpointSize]; - } - // Final check is to make sure max is used over a larger breakpoint value - if (max && calculatedMax) { - calculatedMax = max < calculatedMax ? max : calculatedMax; - } + + // First, calculate the responsive max value + const responsiveMax = + responsive && responsiveObject[currentBreakpoint as OuiBreakpointSize] + ? responsiveObject[currentBreakpoint as OuiBreakpointSize] + : null; + + // Second, if both max and responsiveMax are set, use the smaller of the two. Otherwise, use the one that is set. + const calculatedMax: OuiBreadcrumbsProps['max'] = + max && responsiveMax ? Math.min(max, responsiveMax) : max || responsiveMax; const limitedBreadcrumbs = calculatedMax ? limitBreadcrumbs(breadcrumbElements, calculatedMax, breadcrumbs) From c49b65b8c92eb16b005cd92bc33a348f347c105d Mon Sep 17 00:00:00 2001 From: "opensearch-trigger-bot[bot]" <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com> Date: Wed, 1 May 2024 10:44:28 -0700 Subject: [PATCH 3/9] Convert shorthand palette colors to full 6-char hex (#1262) (#1264) Signed-off-by: Miki (cherry picked from commit 828383c4447185e1a1f02417c302b0cc9aa3edea) Signed-off-by: github-actions[bot] # Conflicts: # CHANGELOG.md Co-authored-by: github-actions[bot] --- .sass-lint.yml | 2 ++ src/services/color/oui_palettes.ts | 2 +- src/themes/oui-next/oui_next_colors_dark.scss | 2 +- src/themes/oui/oui_colors_dark.scss | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.sass-lint.yml b/.sass-lint.yml index 2b5b5da73..726b6302e 100644 --- a/.sass-lint.yml +++ b/.sass-lint.yml @@ -90,3 +90,5 @@ rules: no-warn: 0 # Transition all is useful in certain situations and there's no recent info to suggest slowdown no-transition-all: 0 + + hex-length: 'long' diff --git a/src/services/color/oui_palettes.ts b/src/services/color/oui_palettes.ts index 047df0a76..394906e99 100644 --- a/src/services/color/oui_palettes.ts +++ b/src/services/color/oui_palettes.ts @@ -178,7 +178,7 @@ export const ouiPaletteForLightBackground = function (): OuiPalette { }; export const ouiPaletteForDarkBackground = function (): OuiPalette { - return ['#1BA9F5', '#7DE2D1', '#F990C0', '#F66', '#FFCE7A']; + return ['#1BA9F5', '#7DE2D1', '#F990C0', '#FF6666', '#FFCE7A']; }; const positiveColor: HEX = '#209280'; diff --git a/src/themes/oui-next/oui_next_colors_dark.scss b/src/themes/oui-next/oui_next_colors_dark.scss index b7d1db084..78cf92ceb 100644 --- a/src/themes/oui-next/oui_next_colors_dark.scss +++ b/src/themes/oui-next/oui_next_colors_dark.scss @@ -23,7 +23,7 @@ $ouiColorAccent: #F990C0; // Status $ouiColorSuccess: $ouiColorSecondary; $ouiColorWarning: #FFCE7A; -$ouiColorDanger: #F66; +$ouiColorDanger: #FF6666; // Grays $ouiColorEmptyShade: #0A121A; diff --git a/src/themes/oui/oui_colors_dark.scss b/src/themes/oui/oui_colors_dark.scss index 4ea79a931..469dc2503 100644 --- a/src/themes/oui/oui_colors_dark.scss +++ b/src/themes/oui/oui_colors_dark.scss @@ -23,7 +23,7 @@ $ouiColorAccent: #F990C0; // Status $ouiColorSuccess: $ouiColorSecondary; $ouiColorWarning: #FFCE7A; -$ouiColorDanger: #F66; +$ouiColorDanger: #FF6666; // Grays $ouiColorEmptyShade: #1D1E24; From 1bcf3c721bf87e45fd52f889b929546630ef7a67 Mon Sep 17 00:00:00 2001 From: "opensearch-trigger-bot[bot]" <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com> Date: Wed, 1 May 2024 10:45:25 -0700 Subject: [PATCH 4/9] Bump ip from 1.1.5 to 1.1.9 (#1255) (#1265) Bumps [ip](https://github.com/indutny/node-ip) from 1.1.5 to 1.1.9. - [Commits](https://github.com/indutny/node-ip/compare/v1.1.5...v1.1.9) --- updated-dependencies: - dependency-name: ip dependency-type: indirect ... (cherry picked from commit 2f271770c9d4f19c40fc338c6d551724ff4d6a98) Signed-off-by: dependabot[bot] Signed-off-by: github-actions[bot] Co-authored-by: github-actions[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/yarn.lock b/yarn.lock index 3c607485c..86a773a23 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9106,14 +9106,14 @@ ip-regex@^2.1.0: integrity sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk= ip@^1.1.0, ip@^1.1.5: - version "1.1.5" - resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a" - integrity sha512-rBtCAQAJm8A110nbwn6YdveUnuZH3WrC36IwkRXxDnq53JvXA2NVQvB7IHyKomxK1MJ4VDNw3UtFDdXQ+AvLYA== + version "1.1.9" + resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.9.tgz#8dfbcc99a754d07f425310b86a99546b1151e396" + integrity sha512-cyRxvOEpNHNtchU3Ln9KC/auJgup87llfQpQ+t5ghoC/UhL16SWzbueiCsdTnWmqAWl7LadfuwhlqmtOaqMHdQ== ip@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz#4cf4ab182fee2314c75ede1276f8c80b479936da" - integrity sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ== + version "2.0.1" + resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.1.tgz#e8f3595d33a3ea66490204234b77636965307105" + integrity sha512-lJUL9imLTNi1ZfXT+DU6rBBdbiKGBuay9B6xGSPVjUeQwaH1RIGqef8RZkUtHioLmSNpPR5M4HVKJGm1j8FWVQ== ipaddr.js@1.9.1, ipaddr.js@^1.9.0: version "1.9.1" From 7abbe4c37c8f67e64d5876de36c13c9c64e49acc Mon Sep 17 00:00:00 2001 From: "opensearch-trigger-bot[bot]" <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com> Date: Wed, 1 May 2024 10:50:47 -0700 Subject: [PATCH 5/9] Bump express from 4.18.2 to 4.19.2 (#1259) (#1267) Bumps [express](https://github.com/expressjs/express) from 4.18.2 to 4.19.2. - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/master/History.md) - [Commits](https://github.com/expressjs/express/compare/4.18.2...4.19.2) --- updated-dependencies: - dependency-name: express dependency-type: indirect ... (cherry picked from commit a67fe67879241d4922b2dbcc7899b98b2666ada1) Signed-off-by: dependabot[bot] Signed-off-by: github-actions[bot] Co-authored-by: github-actions[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 43 ++++++++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 19 deletions(-) diff --git a/yarn.lock b/yarn.lock index 86a773a23..bffb39c48 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4014,13 +4014,13 @@ bn.js@^5.0.0, bn.js@^5.2.1: resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.1.tgz#0bc527a6a0d18d0aa8d5b0538ce4a77dccfa7b70" integrity sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ== -body-parser@1.20.1: - version "1.20.1" - resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.1.tgz#b1812a8912c195cd371a3ee5e66faa2338a5c668" - integrity sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw== +body-parser@1.20.2: + version "1.20.2" + resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.2.tgz#6feb0e21c4724d06de7ff38da36dad4f57a747fd" + integrity sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA== dependencies: bytes "3.1.2" - content-type "~1.0.4" + content-type "~1.0.5" debug "2.6.9" depd "2.0.0" destroy "1.2.0" @@ -4028,7 +4028,7 @@ body-parser@1.20.1: iconv-lite "0.4.24" on-finished "2.4.1" qs "6.11.0" - raw-body "2.5.1" + raw-body "2.5.2" type-is "~1.6.18" unpipe "1.0.0" @@ -5190,6 +5190,11 @@ content-type@~1.0.4: resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== +content-type@~1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.5.tgz#8b773162656d1d1086784c8f23a54ce6d73d7918" + integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA== + convert-source-map@^1.1.0, convert-source-map@^1.4.0, convert-source-map@^1.7.0: version "1.7.0" resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442" @@ -5202,10 +5207,10 @@ cookie-signature@1.0.6: resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" integrity sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ== -cookie@0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz#d1f5d71adec6558c58f389987c366aa47e994f8b" - integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw== +cookie@0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.6.0.tgz#2798b04b071b0ecbff0dbb62a505a8efa4e19051" + integrity sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw== cookie@^0.4.1: version "0.4.1" @@ -7151,16 +7156,16 @@ expose-gc@^1.0.0: integrity sha512-ecOHrdm+zyOCGIwX18/1RHkUWgxDqGGRiGhaNC+42jReTtudbm2ID/DMa/wpaHwqy5YQHPZvsDqRM2F2iZ0uVA== express@^4.17.1: - version "4.18.2" - resolved "https://registry.yarnpkg.com/express/-/express-4.18.2.tgz#3fabe08296e930c796c19e3c516979386ba9fd59" - integrity sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ== + version "4.19.2" + resolved "https://registry.yarnpkg.com/express/-/express-4.19.2.tgz#e25437827a3aa7f2a827bc8171bbbb664a356465" + integrity sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q== dependencies: accepts "~1.3.8" array-flatten "1.1.1" - body-parser "1.20.1" + body-parser "1.20.2" content-disposition "0.5.4" content-type "~1.0.4" - cookie "0.5.0" + cookie "0.6.0" cookie-signature "1.0.6" debug "2.6.9" depd "2.0.0" @@ -13438,10 +13443,10 @@ range-parser@^1.2.1, range-parser@~1.2.1: resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg== -raw-body@2.5.1: - version "2.5.1" - resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.1.tgz#fe1b1628b181b700215e5fd42389f98b71392857" - integrity sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig== +raw-body@2.5.2: + version "2.5.2" + resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.2.tgz#99febd83b90e08975087e8f1f9419a149366b68a" + integrity sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA== dependencies: bytes "3.1.2" http-errors "2.0.0" From efcabd6a268bf8d630b4a1d97e97c178302a8e9f Mon Sep 17 00:00:00 2001 From: "opensearch-trigger-bot[bot]" <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com> Date: Wed, 1 May 2024 11:55:06 -0700 Subject: [PATCH 6/9] Bump ejs from 3.1.8 to 3.1.10 (#1263) (#1268) Bumps [ejs](https://github.com/mde/ejs) from 3.1.8 to 3.1.10. - [Release notes](https://github.com/mde/ejs/releases) - [Commits](https://github.com/mde/ejs/compare/v3.1.8...v3.1.10) --- updated-dependencies: - dependency-name: ejs dependency-type: indirect ... (cherry picked from commit 6778930e8e3bf7b757d4c3dac33702b19637dcfc) Signed-off-by: dependabot[bot] Signed-off-by: github-actions[bot] Co-authored-by: github-actions[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index bffb39c48..fc69fd03b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6334,9 +6334,9 @@ ee-first@1.1.1: integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== ejs@^3.1.8: - version "3.1.8" - resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.8.tgz#758d32910c78047585c7ef1f92f9ee041c1c190b" - integrity sha512-/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ== + version "3.1.10" + resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.10.tgz#69ab8358b14e896f80cc39e62087b88500c3ac3b" + integrity sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA== dependencies: jake "^10.8.5" From 27333030c92dd25901c7f83e339c2bc003c6ef32 Mon Sep 17 00:00:00 2001 From: "opensearch-trigger-bot[bot]" <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com> Date: Wed, 1 May 2024 11:59:07 -0700 Subject: [PATCH 7/9] Prevent collapsable button of a resizable from adding to the height when hidden (#1241) (#1243) Supersedes #1223 Signed-off-by: Miki (cherry picked from commit cf5915dd9f67a944760d82e5606ddf1d4cbb36df) Signed-off-by: github-actions[bot] # Conflicts: # CHANGELOG.md Co-authored-by: github-actions[bot] --- .../resizable_container/_resizable_collapse_button.scss | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/components/resizable_container/_resizable_collapse_button.scss b/src/components/resizable_container/_resizable_collapse_button.scss index c4fd9b04b..d34c4d736 100644 --- a/src/components/resizable_container/_resizable_collapse_button.scss +++ b/src/components/resizable_container/_resizable_collapse_button.scss @@ -40,7 +40,9 @@ &:not(:focus):not(:active):not(.ouiResizableToggleButton-isVisible):not(.ouiResizableToggleButton-isCollapsed) { @include ouiScreenReaderOnly; - margin: -2px; // To accomodate ouiButtonIcon's border + border-width: 0; + height: 0; + width: 0; } } From ceee18dfd1a1380f92bccabb44ddc943baf3955b Mon Sep 17 00:00:00 2001 From: Miki Date: Wed, 1 May 2024 18:06:39 -0700 Subject: [PATCH 8/9] Bump tar from 6.1.11 to 6.2.1 (#1260) (#1270) cherry picked 068d41da74d84cb43e218e3825be4b1206cb1d60 from #1260 Bump follow-redirects from 1.15.4 to 1.15.6 (#1258) cherry picked 8b9325e8e04a3436677ad56c8987ff116a6cc9c5 from #1258 Signed-off-by: Miki Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- CHANGELOG.md | 2 ++ yarn.lock | 27 +++++++++++---------------- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f67fcc076..e26dd59ab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ - Bump `babel-template` from `6.26.0` to `@babel/template` `7.10.4` ([#1095](https://github.com/opensearch-project/oui/pull/1095)) - [CVE-2023-46234] Bump `browserify-sign` from `4.0.4` to `4.2.2` ([#1117](https://github.com/opensearch-project/oui/pull/1117)) - [CVE-2023-45133] Bump `@babel/traverse` from `7.12.10` to `7.23.6` ([#1174](https://github.com/opensearch-project/oui/pull/1174)) +- [CVE-2024-28863] Bump `tar` from `6.1.11` to `6.2.1` ([#1260](https://github.com/opensearch-project/oui/pull/1260)) +- [CVE-2024-28849] Bump `follow-redirects` from `1.15.4` to `1.15.6` ([#1258](https://github.com/opensearch-project/oui/pull/1258)) ### 📈 Features/Enhancements diff --git a/yarn.lock b/yarn.lock index fc69fd03b..7afe4c5ba 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2474,9 +2474,9 @@ "@types/node" "*" "@types/chroma-js@^2.4.0": - version "2.4.0" - resolved "https://registry.yarnpkg.com/@types/chroma-js/-/chroma-js-2.4.0.tgz#476a16ae848c77478079d6749236fdb98837b92c" - integrity sha512-JklMxityrwjBTjGY2anH8JaTx3yjRU3/sEHSblLH1ba5lqcSh1LnImXJZO5peJfXyqKYWjHTGy4s5Wz++hARrw== + version "2.4.3" + resolved "https://registry.yarnpkg.com/@types/chroma-js/-/chroma-js-2.4.3.tgz#2f10bd16483a87d8ead68764fc439550e9c4cbb6" + integrity sha512-1ly5ly/7S/YF8aD7MxUQnFOZxdegimuOunJl0xDsLlguu5JrwuSTVGVH3UpIUlh6YauI0RMNT4cqjBonhgbdIQ== "@types/color-name@^1.1.1": version "1.1.1" @@ -7569,15 +7569,10 @@ focus-lock@^0.6.7: resolved "https://registry.yarnpkg.com/focus-lock/-/focus-lock-0.6.8.tgz#61985fadfa92f02f2ee1d90bc738efaf7f3c9f46" integrity sha512-vkHTluRCoq9FcsrldC0ulQHiyBYgVJB2CX53I8r0nTC6KnEij7Of0jpBspjt3/CuNb6fyoj3aOh9J2HgQUM0og== -follow-redirects@^1.0.0: - version "1.15.1" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.1.tgz#0ca6a452306c9b276e4d3127483e29575e207ad5" - integrity sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA== - -follow-redirects@^1.15.0: - version "1.15.3" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.3.tgz#fe2f3ef2690afce7e82ed0b44db08165b207123a" - integrity sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q== +follow-redirects@^1.0.0, follow-redirects@^1.15.0: + version "1.15.6" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b" + integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA== for-each@^0.3.3: version "0.3.3" @@ -15780,13 +15775,13 @@ tar-stream@^2.1.4: readable-stream "^3.1.1" tar@^6.0.2, tar@^6.1.0, tar@^6.1.11, tar@^6.1.2: - version "6.1.11" - resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621" - integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA== + version "6.2.1" + resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.1.tgz#717549c541bc3c2af15751bea94b1dd068d4b03a" + integrity sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A== dependencies: chownr "^2.0.0" fs-minipass "^2.0.0" - minipass "^3.0.0" + minipass "^5.0.0" minizlib "^2.1.1" mkdirp "^1.0.3" yallist "^4.0.0" From 83a67a766f30df571a61aad3b249a3b817a58cf5 Mon Sep 17 00:00:00 2001 From: "opensearch-trigger-bot[bot]" <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com> Date: Mon, 6 May 2024 13:52:52 -0700 Subject: [PATCH 9/9] Move Kroosh and Matt to Emeritus (#1272) (#1274) (cherry picked from commit 1d739204794aa3db30d85cd188a4291647a35eec) Signed-off-by: Miki Signed-off-by: github-actions[bot] Co-authored-by: github-actions[bot] --- .github/CODEOWNERS | 2 +- MAINTAINERS.md | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index b2ae4a10d..0e8d2e062 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -* @AMoo-Miki @rednaksi91 @KrooshalUX @BSFishy @bandinib-amzn @ashwin-pc @joshuarrrr @andreymyssak @SergeyMyssak +* @AMoo-Miki @rednaksi91 @bandinib-amzn @ashwin-pc @joshuarrrr @andreymyssak @SergeyMyssak diff --git a/MAINTAINERS.md b/MAINTAINERS.md index b6b40d8da..ac0e040b1 100644 --- a/MAINTAINERS.md +++ b/MAINTAINERS.md @@ -5,11 +5,9 @@ This document contains a list of maintainers in this repo. See [opensearch-proje ## Current Maintainers | Maintainer | GitHub ID | Affiliation | -| ------------------------ | ------------------------------------------------- | ----------- | +|--------------------------|---------------------------------------------------|-------------| | Miki Barahmand | [AMoo-Miki](https://github.com/AMoo-Miki) | Amazon | | Iskander Rakhmanberdiyev | [rednaksi91](https://github.com/rednaksi91) | Amazon | -| Kroosh | [KrooshalUX](https://github.com/KrooshalUX) | Amazon | -| Matt Provost | [BSFishy](https://github.com/BSFishy) | Amazon | | Bandini | [bandinib-amzn](https://github.com/bandinib-amzn) | Amazon | | Ashwin P Chandran | [ashwin-pc](https://github.com/ashwin-pc) | Amazon | | Josh Romero | [joshuarrrr](https://github.com/joshuarrrr) | Amazon | @@ -21,4 +19,6 @@ This document contains a list of maintainers in this repo. See [opensearch-proje | Maintainer | GitHub ID | Affiliation | |--------------------------|---------------------------------------------------|-------------| +| Matt Provost | [BSFishy](https://github.com/BSFishy) | Contributor | +| Kroosh | [KrooshalUX](https://github.com/KrooshalUX) | Contributor | | Sean Neumann | [seanneumann](https://github.com/seanneumann) | Contributor |