Skip to content

Commit 800b7d4

Browse files
authored
Merge branch 'main' into fix-eui-oui-type-errors
2 parents f24faca + 8121c9d commit 800b7d4

File tree

15 files changed

+192
-42
lines changed

15 files changed

+192
-42
lines changed

.github/workflows/build_and_test_workflow.yml

+19
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ env:
2525
TEST_OPENSEARCH_TRANSPORT_PORT: 9403
2626
TEST_OPENSEARCH_PORT: 9400
2727
OSD_SNAPSHOT_SKIP_VERIFY_CHECKSUM: true
28+
# Version 112.0.5615.0
29+
CHROME_VERSION: 1109208
2830

2931
jobs:
3032
build-lint-test:
@@ -122,6 +124,7 @@ jobs:
122124
functional-tests:
123125
name: Run functional tests on ${{ matrix.name }} (ciGroup${{ matrix.group }})
124126
strategy:
127+
fail-fast: false
125128
matrix:
126129
os: [ubuntu-latest, windows-latest]
127130
group: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13]
@@ -134,6 +137,22 @@ jobs:
134137
steps:
135138
- run: echo Running functional tests for ciGroup${{ matrix.group }}
136139

140+
- name: Setup Chrome
141+
id: setup-chrome
142+
uses: browser-actions/setup-chrome@v1
143+
with:
144+
chrome-version: ${{ env.CHROME_VERSION }}
145+
146+
- name: Set Chrome Path
147+
if: matrix.os != 'windows-latest'
148+
run: |
149+
echo "TEST_BROWSER_BINARY_PATH=${{ steps.setup-chrome.outputs.chrome-path }}" >> $GITHUB_ENV
150+
151+
- name: Set Chrome Path (Windows)
152+
if: matrix.os == 'windows-latest'
153+
run: |
154+
echo "TEST_BROWSER_BINARY_PATH=${{ steps.setup-chrome.outputs.chrome-path }}" >> $env:GITHUB_ENV
155+
137156
- name: Configure git's autocrlf (Windows only)
138157
if: matrix.os == 'windows-latest'
139158
run: |

CHANGELOG.md

+8-2
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,17 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
1414
- Eliminate dependency on `got` versions older than 11.8.5 ([#2801](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2801))
1515
- [Multi DataSource] Add explicit no spellcheck on password fields ([#2818](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2818))
1616
- [CVE-2022-25912] Bumps simple-git from 3.4.0 to 3.15.0 ([#3036](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3036))
17-
- [CVE-2022-35256] Bumps node version from 14.20.0 to 14.20.1 [#3166](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3166))
17+
- [CVE-2022-35256] Bumps node version from 14.20.0 to 14.20.1 ([#3166](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3166))
1818
- [CVE-2022-46175] Bumps json5 version from 1.0.1 and 2.2.1 to 1.0.2 and 2.2.3 ([#3201](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3201))
1919
- [CVE-2022-25860] Bumps simple-git from 3.15.1 to 3.16.0 ([#3345](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3345))
2020
- [Security] Bumps hapi/statehood to 7.0.4 ([#3411](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3411))
2121
- [CVE-2023-25166] Bump formula to 3.0.1 ([#3416](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3416))
2222
- [CVE-2023-25653] Bump node-jose to 2.2.0 ([#3445](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3445))
2323
- [CVE-2023-26486][cve-2023-26487] Bump vega from 5.22.1 to 5.23.0 ([#3533](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3533))
2424
- [CVE-2023-0842] Bump xml2js from 0.4.23 to 0.5.0 ([#3842](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3842))
25-
- [Multi DataSource] Add private IP blocking validation on server side([#3912](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3912))
25+
- [Multi DataSource] Add private IP blocking validation on server side ([#3912](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3912))
26+
- Bump `joi` to v14 to avoid the possibility of prototype poisoning in a nested dependency ([#3952](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3952))
27+
- [CVE-2023-2251] Bump yaml to 2.2.2 ([#3947](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3947))
2628

2729
### 📈 Features/Enhancements
2830

@@ -146,6 +148,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
146148
- Upgrade yarn version to be compatible with @openearch-project/opensearch ([#3443](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3443))
147149
- [CI] Reduce redundancy by using matrix strategy on Windows and Linux workflows ([#3514](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3514))
148150
- Add an achievement badger to the PR ([#3721](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3721))
151+
- Install chrome driver for functional tests from path set by environment variable `TEST_BROWSER_BINARY_PATH`([#3997](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3997))
149152

150153
### 📝 Documentation
151154

@@ -165,6 +168,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
165168
- [Doc] Update SECURITY.md with instructions for nested dependencies and backporting ([#3497](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3497))
166169
- [Doc] [Console] Fix/update documentation links in Dev Tools console ([#3724](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3724))
167170
- [Doc] Update DEVELOPER_GUIDE.md with added manual bootstrap timeout solution and max virtual memory error solution with docker ([#3764](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3764))
171+
- [Doc] Add COMMUNICATIONS.md with info about Slack, forum, office hours ([#3837](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3837))
168172
- [Doc] Add docker files and instructions for debugging Selenium functional tests ([#3747](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3747))
169173

170174
### 🛠 Maintenance
@@ -209,6 +213,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
209213
- Prevent primitive linting limitations from being applied to unit tests found under `src/setup_node_env` ([#3403](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3403))
210214
- [Tests] Fix unit tests for `get_keystore` ([#3854](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3854))
211215
- [Tests] Use `scripts/use_node` instead of `node` in functional test plugins ([#3783](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3783))
216+
- Temporarily hardcode the largest support `chromedriver` version to `112.0.0` to enable all ftr tests ([#3976](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3976))
212217

213218
## [2.x]
214219

@@ -251,6 +256,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
251256
- [Console] Fix dev tool console autocomplete not loading issue ([#3775](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3775))
252257
- [Console] Fix dev tool console run command with query parameter error ([#3813](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3813))
253258
- Add clarifying tooltips to header navigation ([#3573](https://github.com/opensearch-project/OpenSearch-Dashboards/issues/3573))
259+
- [Dashboards Listing] Fix listing limit to utilize `savedObjects:listingLimit` instead of `savedObjects:perPage` ([#4021](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4021))
254260

255261
### 🚞 Infrastructure
256262

COMMUNICATIONS.md

+83
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
# OpenSearch Dashboards Communication
2+
3+
- [Overview](#overview)
4+
- [Slack](#slack)
5+
- [Forum](#forum)
6+
- [Developer Office Hours](#developer-office-hours)
7+
- [What it is](#what-it-is)
8+
- [When](#when)
9+
- [How to sign up](#how-to-sign-up)
10+
- [FAQ](#faq)
11+
12+
## Overview
13+
14+
The purpose of this document is to provide information regarding the communication channels for OpenSearch Dashboards. All communication is subject to the [OpenSearch Code of Conduct](CODE_OF_CONDUCT.md). Please see [CONTRIBUTING](CONTRIBUTING.md) if you're interested in contributing to the project.
15+
16+
## Slack
17+
18+
The OpenSearch project has a public workspace on [Slack](https://opensearch.slack.com). See the [Getting Started guide]() for steps to register and setup the workspace.
19+
20+
Once registered, check out these channels for discussion of OpenSearch Dashboards topics:
21+
22+
- [#dashboards](https://opensearch.slack.com/archives/C01QENNTGUD)
23+
- [#dashboards-ux](https://opensearch.slack.com/archives/C05389T9LJC)
24+
25+
## Forum
26+
27+
Slack conversations are not searchable outside the workspace. For this reason we encourage using the [OpenSearch Dashboards category](https://forum.opensearch.org/c/opensearch-dashboards/57) of the forum for technical support discussions or summarizing findings for the rest of the community.
28+
29+
## Developer Office Hours
30+
31+
### What it is
32+
33+
A recurring 1-hour virtual meeting for community developers to chat with [OpenSearch Dashboards project maintainers](MAINTAINERS.md). Priority will be given to topics that are signed-up in advance, but ad-hoc discussions are welcome in any remaining time.
34+
35+
While we'll always prioritize asynchronous communication, sometimes a community call is the most effective and efficient venue to share information and knowledge. Some reasons to sign up:
36+
37+
1. Review a proposal or technical design for a new feature in OpenSearch Dashboards or an OpenSearch Dashboards plugin
38+
2. Learn more about how to build and extend OpenSearch Dashboards - which APIs, plugins, resources, and services are available to speed development
39+
3. Discuss OpenSearch Dashboard roadmap and technical initiatives
40+
41+
Signing up isn't required to attend - all OpenSearch Dashboards contributors or interested developers are welcome as participants.
42+
43+
Bring your ideas and projects early, while you still have time and flexibility to make significant changes.
44+
45+
### When
46+
47+
Every other Thursday, 10AM-11AM PT.
48+
49+
### How to sign up
50+
51+
There will be a forum post for each iteration of the meeting, with pre-defined slots. To sign-up, simply reply in the forum thread with the following template:
52+
53+
* Topic: [a brief description of what you'd like to discuss]
54+
* Requested by: [provide GitHub aliases of attendees]
55+
* GitHub issues or PRs: [before signing up, make sure to create an issue, whether in the OpenSearch Dashboards repository or your own plugin repository]
56+
* Time required [choose 15, 30, 45, or 60 minutes]
57+
* Requested maintainer: [optional; provide GitHub alias of any particular maintainer you’d like to attend]
58+
59+
### FAQ
60+
61+
#### Will the meetings be recorded?
62+
63+
Yes, we plan to record each office hours session and post to our YouTube channel so the information can be more easily shared and referenced.
64+
65+
#### Will all maintainers attend?
66+
67+
Generally no, but there will always be at least one maintainer. We'll review the sign-ups ahead of time to make sure the right subject-matter experts will attend, depending on the topics.
68+
69+
#### What happens if there are no sign-ups for a particular session?
70+
71+
The session will still occur, and the maintainers will present a brief knowledge-sharing session or demo. We'll also hold ad-hoc discussions, but the session may end early.
72+
73+
#### Is it first come first serve or do we get to decide which topics we discuss in a session?
74+
75+
For sign-ups, it’s first-come first served, until we decide we need another method.
76+
77+
#### Will there also be meeting notes? or is the recording the only available transcript?
78+
79+
No. But we’ll also post the chat transcript and any slides shared (see https://forum.opensearch.org/t/opensearch-community-meeting-2023-0131/11892/5 as example)
80+
81+
#### How can I cancel or reschedule?
82+
83+
Just leave another forum reply, as early as possible so other folks have the opportunity to sign-up for the same spot.

CONTRIBUTING.md

+6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
- [Contributing to OpenSearch](#contributing-to-opensearch-dashboards)
22
- [First Things First](#first-things-first)
33
- [Ways to Contribute](#ways-to-contribute)
4+
- [Join the Discussion](#join-the-discussion)
45
- [Bug Reports](#bug-reports)
56
- [Feature Requests](#feature-requests)
67
- [Documentation Changes](#documentation-changes)
@@ -19,6 +20,11 @@ OpenSearch is a community project that is built and maintained by people just li
1920
**Only submit your own work** (or work you have sufficient rights to submit) - Please make sure that any code or documentation you submit is your work or you have the rights to submit. We respect the intellectual property rights of others, and as part of contributing, we'll ask you to sign your contribution with a "Developer Certificate of Origin" (DCO) that states you have the rights to submit this work and you understand we'll use your contribution. There's more information about this topic in the [DCO section](#developer-certificate-of-origin).
2021

2122
## Ways to Contribute
23+
24+
### Join the Discussion
25+
26+
See the [communication guide](COMMUNICATION.md)for information on how to join our slack workspace, forum, or developer office hours.
27+
2228
### Bug Reports
2329

2430
A bug is when software behaves in a way that you didn't expect and the developer didn't intend. To help us understand what's going on, we first want to make sure you're working from the latest version. Please make sure you're testing against the [latest version](https://github.com/opensearch-project/OpenSearch-Dashboards).

DEVELOPER_GUIDE.md

+4
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,10 @@ $ yarn start --run-examples
209209
- [Project testing guidelines](https://github.com/opensearch-project/OpenSearch-Dashboards/blob/main/TESTING.md)
210210
- [Plugin conventions](https://github.com/opensearch-project/OpenSearch-Dashboards/blob/main/src/core/CONVENTIONS.md#technical-conventions)
211211

212+
#### Join the discussion
213+
214+
See the [communication guide](COMMUNICATION.md)for information on how to join our slack workspace, forum, or developer office hours.
215+
212216
## Alternative development installations
213217

214218
Although the [getting started guide](#getting-started-guide) covers the recommended development environment setup, there are several alternatives worth being aware of.

README.md

+7-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,13 @@
88

99
## Welcome
1010

11-
OpenSearch Dashboards is an open source search and analytics visualization. We aim to be the best community-driven platform and provide all the contributors a great open source experience.
11+
OpenSearch Dashboards is an open-source data visualization tool designed to work with OpenSearch. OpenSearch Dashboards gives you data visualization tools to improve and automate business intelligence and support data-driven decision-making and strategic planning.
1212

13-
Feel free to take a look at what the community has been up to, and then head over to the [Project Board](https://github.com/opensearch-project/OpenSearch-Dashboards/projects) to track release targets, or jump in and [start opening issues](https://github.com/opensearch-project/OpenSearch-Dashboards/issues/new/choose), [set up your development environment](DEVELOPER_GUIDE.md#getting-started), or [start contributing](CONTRIBUTING.md).
13+
We aim to be an exceptional community-driven platform and to foster open participation and collective contribution with all contributors. Stay up to date on what's happening with the OpenSearch Project by tracking GitHub [issues](https://github.com/opensearch-project/OpenSearch-Dashboards/issues) and [pull requests](https://github.com/opensearch-project/OpenSearch-Dashboards/pulls).
14+
15+
You can [contribute to this project](https://github.com/opensearch-project/OpenSearch-Dashboards/issues/CONTRIBUTING.md) by [opening issues](https://github.com/opensearch-project/OpenSearch-Dashboards/issues/new/choose) to give feedback, share ideas, identify bugs, and contribute code.
16+
17+
Set up your [OpenSearch Dashboards development environment](ttps://github.com/opensearch-project/OpenSearch-Dashboards/blob/main/DEVELOPER_GUIDE.md#getting-started-guide) today! The project team looks forward to your contributions.
1418

1519
## Code Summary
1620

@@ -23,7 +27,7 @@ Feel free to take a look at what the community has been up to, and then head ove
2327
* [Project Website](https://opensearch.org/)
2428
* [Downloads](https://opensearch.org/downloads.html)
2529
* [Documentation](https://opensearch.org/docs/)
26-
* Need help? Try [Forums](https://discuss.opendistrocommunity.dev/)
30+
* Need help? See the [communication guide](COMMUNICATION.md) for various options
2731
* [Project Principles](https://opensearch.org/#principles)
2832
* [Developer Guide](DEVELOPER_GUIDE.md)
2933
* [Contributing to OpenSearch](CONTRIBUTING.md)

examples/embeddable_examples/public/searchable_list_container/searchable_list_container_component.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ export class SearchableListContainerComponentInner extends Component<Props, Stat
8282
const output = props.embeddable.getChild(id).getOutput();
8383
hasMatch[id] = hasHasMatchOutput(output) && output.hasMatch;
8484
});
85-
props.embeddable.getChildIds().forEach((id) => (checked[id] = false));
8685
this.state = {
8786
checked,
8887
hasMatch,

examples/embeddable_explorer/public/list_container_example.tsx

+9
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,15 @@ export function ListContainerExample({
164164
The first HelloWorldEmbeddable does not emit the hasMatch output variable, so the
165165
container chooses to hide it.
166166
</p>
167+
<p>
168+
Type some strings in the search bar, and press Check matching button. If the search
169+
string matches with any strings from the title or the description of the children
170+
embeddables, the child embeddable&#39;s check box will be checked. Noted that the
171+
search filter is case sensitive. However, even if the search string matches with the
172+
strings in the HelloWorldEmbeddable, its check box will not be checked because of the
173+
reason explained above. If we click Delete checked, all the selected child embeddables
174+
will be deleted from the container.
175+
</p>
167176

168177
<p>
169178
Check out the &quot;Dynamically adding children&quot; section, to see how to add

package.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,8 @@
9797
"**/unset-value": "^2.0.1",
9898
"**/jest-config": "npm:@amoo-miki/jest-config@27.5.1",
9999
"**/jest-jasmine2": "npm:@amoo-miki/jest-jasmine2@27.5.1",
100-
"**/xml2js": "^0.5.0"
100+
"**/xml2js": "^0.5.0",
101+
"**/yaml": "^2.2.2"
101102
},
102103
"workspaces": {
103104
"packages": [
@@ -183,7 +184,7 @@
183184
"https-proxy-agent": "^5.0.0",
184185
"inline-style": "^2.0.0",
185186
"ip-cidr": "^2.1.0",
186-
"joi": "^13.5.2",
187+
"joi": "^14.3.1",
187188
"js-yaml": "^4.1.0",
188189
"json-stable-stringify": "^1.0.1",
189190
"json-stringify-safe": "5.0.1",

packages/osd-config-schema/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
},
1717
"peerDependencies": {
1818
"lodash": "^4.17.21",
19-
"joi": "^13.5.2",
19+
"joi": "^14.3.1",
2020
"moment": "^2.24.0",
2121
"type-detect": "^4.0.8"
2222
}

packages/osd-test/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"exit-hook": "^2.2.0",
3232
"getopts": "^2.2.5",
3333
"glob": "^7.1.7",
34-
"joi": "^13.5.2",
34+
"joi": "^14.3.1",
3535
"lodash": "^4.17.21",
3636
"parse-link-header": "^2.0.0",
3737
"rxjs": "^6.5.5",

0 commit comments

Comments
 (0)