Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into support-tls-13
Browse files Browse the repository at this point in the history
Signed-off-by: Kajetan Nobel <kajetan.nobel@eliatra.com>
  • Loading branch information
kajetan-nobel committed Sep 27, 2023
2 parents 4e8474a + 6ca6227 commit 6243eee
Show file tree
Hide file tree
Showing 12 changed files with 61 additions and 8 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -75,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

Expand Down
8 changes: 5 additions & 3 deletions DEVELOPER_GUIDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,15 +64,17 @@ 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:
OpenSearch Dashboards is set up using yarn, which can be installed through corepack. To install yarn, run:

```bash
$ # Update corepack to the latest version
$ npm i -g corepack

$ corepack prepare yarn@<version> --activate
$ # 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

Expand Down
1 change: 1 addition & 0 deletions MAINTAINERS.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
"bugs": {
"url": "http://github.com/opensearch-project/OpenSearch-Dashboards/issues"
},
"packageManager": "yarn@1.22.19",
"opensearchDashboards": {
"clean": {
"extraPatterns": [
Expand Down
15 changes: 15 additions & 0 deletions packages/osd-optimizer/src/worker/webpack.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down
24 changes: 24 additions & 0 deletions release-notes/opensearch-dashboards.release-notes-1.3.13.md
Original file line number Diff line number Diff line change
@@ -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))
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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}`}
/>
</EuiToolTip>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
<EuiFlyout onClose={onClose} size="m">
<EuiFlyout onClose={onClose} size="m" data-test-subj="documentDetailFlyOut">
<EuiFlyoutHeader>
<EuiTitle>
<h2>Document Details</h2>
Expand Down

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

Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,12 @@ export function DocViewerLinks(renderProps: DocViewLinkRenderProps) {
<EuiFlexGroup gutterSize="m" justifyContent="flexEnd">
{listItems.map((item, index) => (
<EuiFlexItem key={index} grow={false}>
<EuiLink href={item.href} target="_blank" style={{ fontWeight: 'normal' }}>
<EuiLink
href={item.href}
target="_blank"
style={{ fontWeight: 'normal' }}
data-test-subj={item['data-test-subj']}
>
{item.label}
</EuiLink>
</EuiFlexItem>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export const DiscoverChartContainer = ({ hits, bucketInterval, chartData }: Sear
indexPattern,
]);

if (!hits || !chartData || !bucketInterval) return null;
if (!hits) return null;

return (
<DiscoverChart
Expand Down

0 comments on commit 6243eee

Please sign in to comment.