Skip to content

Commit 0c96f2b

Browse files
authored
Merge branch 'main' into jquery-to-nativejs#3679
2 parents 51da17d + 8f890e9 commit 0c96f2b

File tree

210 files changed

+5133
-607
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

210 files changed

+5133
-607
lines changed

.github/CODEOWNERS

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
# This should match the owning team set up in https://github.com/orgs/opensearch-project/teams
2-
* @opensearch-project/opensearch-dashboards-core
1+
* @ananzh @kavilla @seanneumann @AMoo-Miki @ashwin-pc @joshuarrrr @abbyhu2000 @zengyan-amazon @kristenTian @zhongnansu @manasvinibs

.github/workflows/cypress_workflow.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ env:
1212
START_CMD: 'node ../scripts/opensearch_dashboards --dev --no-base-path --no-watch'
1313
OPENSEARCH_SNAPSHOT_CMD: 'node ../scripts/opensearch snapshot'
1414
SPEC: 'cypress/integration/core-opensearch-dashboards/opensearch-dashboards/**/*.js,'
15-
CYPRESS_ENV: 'env CYPRESS_VISBUILDER_ENABLED=true '
15+
CYPRESS_ENV: 'env CYPRESS_VISBUILDER_ENABLED=true CYPRESS_DATASOURCE_MANAGEMENT_ENABLED=false'
1616

1717
jobs:
1818
cypress-tests:

CHANGELOG.md

+12
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
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))
24+
- [CVE-2023-0842] Bump xml2js from 0.4.23 to 0.5.0 ([#3842](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3842))
2425

2526
### 📈 Features/Enhancements
2627

@@ -71,8 +72,11 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
7172
- Use mirrors to download Node.js binaries to escape sporadic 404 errors ([#3619](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3619))
7273
- [Multiple DataSource] Refactor dev tool console to use opensearch-js client to send requests ([#3544](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3544))
7374
- [Data] Add geo shape filter field ([#3605](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3605))
75+
- [Dashboard] Indicate that IE is no longer supported ([#3641](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3641))
76+
- [UI] Add support for comma delimiters in the global filter bar ([#3686](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3686))
7477
- [Multiple DataSource] Allow create and distinguish index pattern with same name but from different datasources ([#3571](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3571))
7578
- [Multiple DataSource] Integrate multiple datasource with dev tool console ([#3754](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3754))
79+
- Add satisfaction survey link to help menu ([#3676] (https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3676))
7680

7781
### 🐛 Bug Fixes
7882

@@ -114,6 +118,9 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
114118
- Clean up and rebuild `@osd/pm` ([#3570](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3570))
115119
- [Vega] Add Filter custom label for opensearchDashboardsAddFilter ([#3640](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3640))
116120
- [Timeline] Fix y-axis label color in dark mode ([#3698](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3698))
121+
- [Table Visualization] Fix table rendering empty unused space ([#3797](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3797))
122+
- [Table Visualization] Fix data table not adjusting height on the initial load ([#3816](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3816))
123+
- Cleanup unused url ([#3847](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3847))
117124

118125
### 🚞 Infrastructure
119126

@@ -145,6 +152,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
145152
- [Doc] Add docker dev set up instruction ([#3444](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3444))
146153
- [Doc] UI actions explorer ([#3614](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3614))
147154
- [Doc] Update SECURITY.md with instructions for nested dependencies and backporting ([#3497](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3497))
155+
- [Doc] [Console] Fix/update documentation links in Dev Tools console ([#3724](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3724))
148156
- [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))
149157

150158
### 🛠 Maintenance
@@ -185,6 +193,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
185193
- [Vis Builder] Adds field unit tests ([#3211](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3211))
186194
- [BWC Tests] Add BWC tests for 2.6.0 ([#3356](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3356))
187195
- 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))
196+
- [Tests] Use `scripts/use_node` instead of `node` in functional test plugins ([#3783](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3783))
188197

189198
## [2.x]
190199

@@ -225,6 +234,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
225234
- [BUG] Fix suggestion list cutoff issue ([#2607](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2607))
226235
- [TSVB] Fixes undefined serial diff aggregation documentation link ([#3503](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3503))
227236
- [Console] Fix dev tool console autocomplete not loading issue ([#3775](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3775))
237+
- [Console] Fix dev tool console run command with query parameter error ([#3813](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3813))
228238

229239
### 🚞 Infrastructure
230240

@@ -252,6 +262,8 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
252262

253263
### 🪛 Refactoring
254264

265+
- [Tech Debt] Clean up docs_link_service organization so that strings are in the right categories. ([#3685](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3685))
266+
255267
### 🔩 Tests
256268

257269
- Update caniuse to fix failed integration tests ([#2322](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2322))

MAINTAINERS.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ This document contains a list of maintainers in this repo. See [opensearch-proje
77
| Maintainer | GitHub ID | Affiliation |
88
| ------------------------- | --------------------------------------------------- | ----------- |
99
| Anan Zhuang | [ananzh](https://github.com/ananzh) | Amazon |
10-
| Bishoy Boktor | [boktorbb](https://github.com/boktorbb) | Amazon |
11-
| Mihir Soni | [mihirsoni](https://github.com/mihirsoni) | Amazon |
1210
| Kawika (Rocky) Avilla | [kavilla](https://github.com/kavilla) | Amazon |
1311
| Sean Neumann | [seanneumann](https://github.com/seanneumann) | Amazon |
1412
| Miki Barahmand | [AMoo-Miki](https://github.com/AMoo-Miki) | Amazon |
@@ -25,3 +23,5 @@ This document contains a list of maintainers in this repo. See [opensearch-proje
2523
| Maintainer | GitHub ID | Affiliation |
2624
| ------------- | --------------------------------------- | ----------- |
2725
| Tommy Markley | [tmarkley](https://github.com/tmarkley) | Amazon |
26+
| Mihir Soni | [mihirsoni](https://github.com/mihirsoni) | Amazon |
27+
| Bishoy Boktor | [boktorbb](https://github.com/boktorbb) | Amazon |

config/opensearch_dashboards.yml

+3
Original file line numberDiff line numberDiff line change
@@ -237,3 +237,6 @@
237237
#data_source.encryption.wrappingKeyName: 'changeme'
238238
#data_source.encryption.wrappingKeyNamespace: 'changeme'
239239
#data_source.encryption.wrappingKey: [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]
240+
241+
# Set the value of this setting to false to hide the help menu link to the OpenSearch Dashboards user survey
242+
# opensearchDashboards.survey.url: "https://survey.opensearch.org"

package.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,8 @@
9696
"**/typescript": "4.0.2",
9797
"**/unset-value": "^2.0.1",
9898
"**/jest-config": "npm:@amoo-miki/jest-config@27.5.1",
99-
"**/jest-jasmine2": "npm:@amoo-miki/jest-jasmine2@27.5.1"
99+
"**/jest-jasmine2": "npm:@amoo-miki/jest-jasmine2@27.5.1",
100+
"**/xml2js": "^0.5.0"
100101
},
101102
"workspaces": {
102103
"packages": [
@@ -462,7 +463,7 @@
462463
"vega-schema-url-parser": "^2.1.0",
463464
"vega-tooltip": "^0.30.0",
464465
"vinyl-fs": "^3.0.3",
465-
"xml2js": "^0.4.22",
466+
"xml2js": "^0.5.0",
466467
"xmlbuilder": "13.0.2",
467468
"zlib": "^1.0.5"
468469
},

packages/osd-test/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"rxjs": "^6.5.5",
3838
"strip-ansi": "^6.0.0",
3939
"tar-fs": "^2.1.0",
40-
"xml2js": "^0.4.22",
40+
"xml2js": "^0.5.0",
4141
"zlib": "^1.0.5"
4242
}
4343
}

src/core/public/chrome/chrome_service.tsx

+3-2
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ export class ChromeService {
209209
title: mountReactNode(
210210
<FormattedMessage
211211
id="core.chrome.browserDeprecationWarning"
212-
defaultMessage="Support for Internet Explorer will be dropped in future versions of this software, please check {link}."
212+
defaultMessage="Internet Explorer lacks features required for OpenSearch Dashboards to function correctly; please use one of {link}."
213213
values={{
214214
link: (
215215
<EuiLink
@@ -219,7 +219,7 @@ export class ChromeService {
219219
>
220220
<FormattedMessage
221221
id="core.chrome.browserDeprecationLink"
222-
defaultMessage="the support matrix on our website"
222+
defaultMessage="the supported browsers listed on our website"
223223
/>
224224
</EuiLink>
225225
),
@@ -261,6 +261,7 @@ export class ChromeService {
261261
onIsLockedUpdate={setIsNavDrawerLocked}
262262
isLocked$={getIsNavDrawerLocked$}
263263
branding={injectedMetadata.getBranding()}
264+
survey={injectedMetadata.getSurvey()}
264265
/>
265266
),
266267

src/core/public/chrome/constants.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
* under the License.
2929
*/
3030

31-
export const OPENSEARCH_DASHBOARDS_FEEDBACK_LINK = 'https://github.com/opensearch-project';
32-
export const OPENSEARCH_DASHBOARDS_ASK_OPENSEARCH_LINK = 'https://github.com/opensearch-project';
31+
export const OPENSEARCH_DASHBOARDS_ASK_OPENSEARCH_LINK = 'https://forum.opensearch.org/';
3332
export const GITHUB_CREATE_ISSUE_LINK =
3433
'https://github.com/opensearch-project/OpenSearch-Dashboards/issues/new/choose';

src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap

+14-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)