From 71dd06edec4eaf2698974cc417e402571e787fc5 Mon Sep 17 00:00:00 2001 From: "opensearch-trigger-bot[bot]" <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com> Date: Tue, 19 Sep 2023 08:05:56 -0700 Subject: [PATCH 1/7] Chore: Add 1.3.13 release notes (#5030) (#5042) Signed-off-by: ananzh (cherry picked from commit 329fa729d8cf80a54fec0da848f7c5740791c58a) Signed-off-by: github-actions[bot] # Conflicts: # CHANGELOG.md Co-authored-by: github-actions[bot] --- ...nsearch-dashboards.release-notes-1.3.13.md | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 release-notes/opensearch-dashboards.release-notes-1.3.13.md diff --git a/release-notes/opensearch-dashboards.release-notes-1.3.13.md b/release-notes/opensearch-dashboards.release-notes-1.3.13.md new file mode 100644 index 000000000000..8ad93c19ba22 --- /dev/null +++ b/release-notes/opensearch-dashboards.release-notes-1.3.13.md @@ -0,0 +1,24 @@ +# Version 1.3.13 Release Notes + +### 🛡 Security + +- [CVE-2019-11358] Bump version of `tinygradient` from `0.4.3` to `1.1.5` ([#4571](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4751)) +- [CVE-2023-26136] Bump `word-wrap` from `1.2.3` to `1.2.4` ([#5002](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/5002)) +- [CVE-2022-21670] Bump `markdown-it` from `10.0.0` to `12.3.2` ([#5016](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/5016)) +- [CVE-2022-33987] Partially fix security issues for `got` by bumping `@elastic/makelogs` from `6.0.0` to `6.1.1` and updating yarn.lock ([#5006](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/5006)) +- Bump `yo` from `2.0.6` to `3.1.1` ([#5005]( https://github.com/opensearch-project/OpenSearch-Dashboards/pull/5005)) +- [CVE-2023-0842] Bump `xml2js` from `0.4.22` to `0.6.2` ([#5024](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/5024)) + +### 📈 Features/Enhancements + +### 🐛 Bug Fixes + +### 🚞 Infrastructure + +### 📝 Documentation + +### 🛠 Maintenance + +- [Version] Increment version to 1.3.13 ([#4721](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4721)) +- [Chore] Add company.net to exclusion list in linkchecker ([#4704](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4704)) +- [Chore] Exclude checking dead link in linkchecker ([#4868](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4868)) From f02a88ec18168d3baf8b762f8f246424d776aa0c Mon Sep 17 00:00:00 2001 From: David Tippett Date: Tue, 19 Sep 2023 16:33:29 -0400 Subject: [PATCH 2/7] Updating yarn installation step from the Dev guide (#5065) Signed-off-by: David Tippett <17506770+dtaivpp@users.noreply.github.com> --- DEVELOPER_GUIDE.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/DEVELOPER_GUIDE.md b/DEVELOPER_GUIDE.md index ac26f4bcd8b2..b084b32bd1f1 100644 --- a/DEVELOPER_GUIDE.md +++ b/DEVELOPER_GUIDE.md @@ -64,12 +64,10 @@ If it's the only version of node installed, it will automatically be set to the #### Install `yarn` -Take a look at the [latest Yarn release](https://github.com/yarnpkg/berry/releases/latest), note the version number, and run: +To install yarn run: ```bash -$ npm i -g corepack - -$ corepack prepare yarn@ --activate +$ npm i -g yarn ``` (See the [Yarn installation documentation](https://yarnpkg.com/getting-started/install) for more information.) From 9c192a338f60e3b8c1412196437c03c593c19dae Mon Sep 17 00:00:00 2001 From: "Qingyang(Abby) Hu" Date: Wed, 20 Sep 2023 12:19:51 -0700 Subject: [PATCH 3/7] add test ids (#5072) Signed-off-by: abbyhu2000 --- .../data_grid/data_grid_table_docview_inspect_button.tsx | 1 + .../components/data_grid/data_grid_table_flyout.tsx | 2 +- .../components/doc_viewer_links/doc_viewer_links.tsx | 7 ++++++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/plugins/discover/public/application/components/data_grid/data_grid_table_docview_inspect_button.tsx b/src/plugins/discover/public/application/components/data_grid/data_grid_table_docview_inspect_button.tsx index df5e691240e3..88341aad1b08 100644 --- a/src/plugins/discover/public/application/components/data_grid/data_grid_table_docview_inspect_button.tsx +++ b/src/plugins/discover/public/application/components/data_grid/data_grid_table_docview_inspect_button.tsx @@ -22,6 +22,7 @@ export const DocViewInspectButton = ({ rowIndex }: EuiDataGridCellValueElementPr onClick={() => setInspectedHit(isCurrentInspected ? undefined : currentInspected)} iconType={isCurrentInspected ? 'minimize' : 'inspect'} aria-label={inspectHintMsg} + data-test-subj={`docTableExpandToggleColumn-${rowIndex}`} /> ); diff --git a/src/plugins/discover/public/application/components/data_grid/data_grid_table_flyout.tsx b/src/plugins/discover/public/application/components/data_grid/data_grid_table_flyout.tsx index 957679a2faef..8cfeaf9795af 100644 --- a/src/plugins/discover/public/application/components/data_grid/data_grid_table_flyout.tsx +++ b/src/plugins/discover/public/application/components/data_grid/data_grid_table_flyout.tsx @@ -40,7 +40,7 @@ export function DataGridFlyout({ // TODO: replace EuiLink with doc_view_links registry // TODO: Also move the flyout higher in the react tree to prevent redrawing the table component and slowing down page performance return ( - +

Document Details

diff --git a/src/plugins/discover/public/application/components/doc_viewer_links/doc_viewer_links.tsx b/src/plugins/discover/public/application/components/doc_viewer_links/doc_viewer_links.tsx index ea4262814bb4..5e79c8b88e33 100644 --- a/src/plugins/discover/public/application/components/doc_viewer_links/doc_viewer_links.tsx +++ b/src/plugins/discover/public/application/components/doc_viewer_links/doc_viewer_links.tsx @@ -27,7 +27,12 @@ export function DocViewerLinks(renderProps: DocViewLinkRenderProps) { {listItems.map((item, index) => ( - + {item.label} From a10f1c7f182aa2edd95ec72994b9868ca4885726 Mon Sep 17 00:00:00 2001 From: Anan Zhuang Date: Fri, 22 Sep 2023 09:08:13 -0700 Subject: [PATCH 4/7] [Data Explorer][Discover] Fix total hits issue (#5087) Issue Resolve https://github.com/opensearch-project/OpenSearch-Dashboards/issues/5068 Signed-off-by: ananzh --- CHANGELOG.md | 1 + .../discover/public/application/components/chart/chart.tsx | 4 ++-- .../__snapshots__/doc_viewer_links.test.tsx.snap | 2 ++ .../view_components/canvas/discover_chart_container.tsx | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 93c8227d9765..395f608e85ea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -52,6 +52,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - Fix broken app when management is turned off ([#4891](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4891)) - Correct the generated path for downloading plugins by their names on Windows ([#4953](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4953)) - [BUG] Fix buildPointSeriesData unit test fails due to local timezone ([#4992](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4992)) +- [BUG][Data Explorer][Discover] Fix total hits issue for no time based data ([#5087](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/5087)) ### 🚞 Infrastructure diff --git a/src/plugins/discover/public/application/components/chart/chart.tsx b/src/plugins/discover/public/application/components/chart/chart.tsx index 8ba188af3dd9..f21ce3e4ef19 100644 --- a/src/plugins/discover/public/application/components/chart/chart.tsx +++ b/src/plugins/discover/public/application/components/chart/chart.tsx @@ -21,8 +21,8 @@ import { useDiscoverContext } from '../../view_components/context'; import { setInterval, useDispatch, useSelector } from '../../utils/state_management'; interface DiscoverChartProps { - bucketInterval: TimechartHeaderBucketInterval; - chartData: Chart; + bucketInterval?: TimechartHeaderBucketInterval; + chartData?: Chart; config: IUiSettingsClient; data: DataPublicPluginStart; hits: number; diff --git a/src/plugins/discover/public/application/components/doc_viewer_links/__snapshots__/doc_viewer_links.test.tsx.snap b/src/plugins/discover/public/application/components/doc_viewer_links/__snapshots__/doc_viewer_links.test.tsx.snap index 075cafd37471..5da67e79a7c7 100644 --- a/src/plugins/discover/public/application/components/doc_viewer_links/__snapshots__/doc_viewer_links.test.tsx.snap +++ b/src/plugins/discover/public/application/components/doc_viewer_links/__snapshots__/doc_viewer_links.test.tsx.snap @@ -17,6 +17,7 @@ exports[`Render with 2 different links 1`] = ` key="0" > with 2 different links 1`] = ` key="1" > Date: Fri, 22 Sep 2023 11:44:56 -0700 Subject: [PATCH 5/7] Update optimizer webpack config to support ReactFlow dependency (#4882) * Add reactflow with compiler fix Signed-off-by: Tyler Ohlsen * Update CHANGELOG Signed-off-by: Tyler Ohlsen * Update comment Signed-off-by: Tyler Ohlsen * Revert adding reactflow dep Signed-off-by: Tyler Ohlsen --------- Signed-off-by: Tyler Ohlsen Co-authored-by: Miki --- .../osd-optimizer/src/worker/webpack.config.ts | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/packages/osd-optimizer/src/worker/webpack.config.ts b/packages/osd-optimizer/src/worker/webpack.config.ts index 5a0f1cc36728..a66ad06de032 100644 --- a/packages/osd-optimizer/src/worker/webpack.config.ts +++ b/packages/osd-optimizer/src/worker/webpack.config.ts @@ -235,6 +235,21 @@ export function getWebpackConfig(bundle: Bundle, bundleRefs: BundleRefs, worker: }, }, }, + { + test: /\.js$/, + /* reactflow and some of its dependencies don't have es5 builds + * so we need to build from source and transpile for webpack v4 + */ + include: /node_modules[\\/]@?reactflow/, + use: { + loader: 'babel-loader', + options: { + babelrc: false, + envName: worker.dist ? 'production' : 'development', + presets: [BABEL_PRESET_PATH], + }, + }, + }, { test: /\.(html|md|txt|tmpl)$/, use: { From 46d7c2d8c1f3af737697ee984d31ea1cccf85494 Mon Sep 17 00:00:00 2001 From: Matt Provost Date: Fri, 22 Sep 2023 16:14:00 -0700 Subject: [PATCH 6/7] Update yarn install step from dev guide (#5067) * Update yarn install step from dev guide Signed-off-by: Matt Provost * Update the corepack command Signed-off-by: Matt Provost * Update to use corepack install Signed-off-by: Matt Provost * Revise corepack url Signed-off-by: Matt Provost --------- Signed-off-by: Matt Provost --- DEVELOPER_GUIDE.md | 10 +++++++--- package.json | 1 + 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/DEVELOPER_GUIDE.md b/DEVELOPER_GUIDE.md index b084b32bd1f1..24c7851c21eb 100644 --- a/DEVELOPER_GUIDE.md +++ b/DEVELOPER_GUIDE.md @@ -64,13 +64,17 @@ If it's the only version of node installed, it will automatically be set to the #### Install `yarn` -To install yarn run: +OpenSearch Dashboards is set up using yarn, which can be installed through corepack. To install yarn, run: ```bash -$ npm i -g yarn +$ # Update corepack to the latest version +$ npm i -g corepack + +$ # Install the correct version of yarn +$ corepack install ``` -(See the [Yarn installation documentation](https://yarnpkg.com/getting-started/install) for more information.) +(See the [corepack documentation](https://github.com/nodejs/corepack#-corepack) for more information.) ### Fork and clone OpenSearch Dashboards diff --git a/package.json b/package.json index 0cffb3fcc47e..1e66bbfbd290 100644 --- a/package.json +++ b/package.json @@ -23,6 +23,7 @@ "bugs": { "url": "http://github.com/opensearch-project/OpenSearch-Dashboards/issues" }, + "packageManager": "yarn@1.22.19", "opensearchDashboards": { "clean": { "extraPatterns": [ From 6ca62273c927ba72f56f79dd11baccf62158fa14 Mon Sep 17 00:00:00 2001 From: Yan Zeng <46499415+zengyan-amazon@users.noreply.github.com> Date: Tue, 26 Sep 2023 11:06:57 -0700 Subject: [PATCH 7/7] Add Bandini as maintainer (#5113) * Add Bandini as maintainer Signed-off-by: Yan Zeng --- CHANGELOG.md | 1 + MAINTAINERS.md | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 395f608e85ea..e1a20fd14d79 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -76,6 +76,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - Update webpack environment targets ([#4649](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4649)) - Add @curq as maintainer ([#4760](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4760)) - Bump `oui` to `1.3.0` ([#4941](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4941)) +- Add @bandinib-amzn as maintainer ([#5113](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/5113)) ### 🪛 Refactoring diff --git a/MAINTAINERS.md b/MAINTAINERS.md index a7ee5ce2fcdc..ad51f7334051 100644 --- a/MAINTAINERS.md +++ b/MAINTAINERS.md @@ -21,6 +21,7 @@ This document contains a list of maintainers in this repo. See [opensearch-proje | Zilong Xia | [ZilongX](https://github.com/ZilongX) | Amazon | | Matt Provost | [BSFishy](https://github.com/BSFishy) | Amazon | | Sirazh Gabdullin | [curq](https://github.com/curq) | External contributor | +| Bandini Bhopi | [bandinib-amzn](https://github.com/bandinib-amzn) | Amazon | ## Emeritus