Skip to content

Commit 5da3261

Browse files
authored
Merge branch 'opensearch-project:main' into main
2 parents 19ce99d + 6c815fe commit 5da3261

File tree

394 files changed

+20369
-12467
lines changed

Some content is hidden

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

394 files changed

+20369
-12467
lines changed

.github/CODEOWNERS

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
* @amsiglan @AWSHurneyt @bowenlan-amzn @getsaurabh02 @praveensameneni @xluo-aws @gaobinlong @Hailong-am @SuZhou-Joe @lezzago @sbcd90 @eirsep @r1walz @vikasvb90
1+
* @bowenlan-amzn @Hailong-am @RamakrishnaChilaka @vikasvb90 @SuZhou-Joe

MAINTAINERS.md

+18-18
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,26 @@ This document contains a list of maintainers in this repo. See [opensearch-proje
44

55
## Current Maintainers
66

7+
| Maintainer | GitHub ID | Affiliation |
8+
|-----------------------| ------------------------------------------------------------ | ----------- |
9+
| Bowen Lan | [bowenlan-amzn](https://github.com/bowenlan-amzn) | Amazon |
10+
| Hailong Cui | [Hailong-am](https://github.com/Hailong-am) | Amazon |
11+
| Ramakrishna Chilaka | [RamakrishnaChilaka](https://github.com/RamakrishnaChilaka) | Amazon |
12+
| Vikas Bansal | [vikasvb90](https://github.com/vikasvb90) | Amazon |
13+
| Zhou Su | [SuZhou-Joe](https://github.com/SuZhou-Joe) | Amazon |
14+
15+
## Emeritus
16+
717
| Maintainer | GitHub ID | Affiliation |
8-
|-----------------------| ----------------------------------------------------- | ----------- |
9-
| Bowen Lan | [bowenlan-amzn](https://github.com/bowenlan-amzn) | Amazon |
10-
| Saurabh Singh | [getsaurabh02](https://github.com/getsaurabh02) | Amazon |
11-
| Praveen Sameneni | [praveensameneni](https://github.com/praveensameneni) | Amazon |
12-
| Xuesong Luo | [xluo-aws](https://github.com/xluo-aws) | Amazon |
13-
| Hailong Cui | [Hailong-am](https://github.com/Hailong-am) | Amazon |
14-
| Binlong Gao | [gaobinlong](https://github.com/gaobinlong) | Amazon |
15-
| Zhou Su | [SuZhou-Joe](https://github.com/SuZhou-Joe) | Amazon |
18+
| --------------------- | ----------------------------------------------------- | ----------- |
1619
| Amardeepsingh Siglani | [amsiglan](https://github.com/amsiglan) | Amazon |
17-
| Thomas Hurney | [AWSHurneyt](https://github.com/AWSHurneyt) | Amazon |
20+
| Angie Zhang | [Angie-Zhang](https://github.com/Angie-Zhang) | Amazon |
1821
| Ashish Agrawal | [lezzago](https://github.com/lezzago) | Amazon |
22+
| Binlong Gao | [gaobinlong](https://github.com/gaobinlong) | Amazon |
23+
| Praveen Sameneni | [praveensameneni](https://github.com/praveensameneni) | Amazon |
24+
| Rohit Ashiwal | [r1walz](https://github.com/r1walz) | Amazon |
25+
| Saurabh Singh | [getsaurabh02](https://github.com/getsaurabh02) | Amazon |
1926
| Subhobrata DEY | [sbcd90](https://github.com/sbcd90) | Amazon |
2027
| Surya Sashank Nistala | [eirsep](https://github.com/eirsep) | Amazon |
21-
| Rohit Ashiwal | [r1walz](https://github.com/r1walz) | Amazon |
22-
| Vikas Bansal | [vikasvb90](https://github.com/vikasvb90) | Amazon |
23-
| Ramakrishna Chilaka | [RamakrishnaChilaka](https://github.com/RamakrishnaChilaka) | Amazon |
24-
25-
## Emeritus
26-
27-
| Maintainer | GitHub ID | Affiliation |
28-
| ------------- | --------------------------------------------- | ----------- |
29-
| Angie Zhang | [Angie-Zhang](https://github.com/Angie-Zhang) | Amazon |
28+
| Thomas Hurney | [AWSHurneyt](https://github.com/AWSHurneyt) | Amazon |
29+
| Xuesong Luo | [xluo-aws](https://github.com/xluo-aws) | Amazon |

cypress/integration/plugins/index-management-dashboards-plugin/aliases.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ describe("Aliases", () => {
8181
describe("can create a alias with wildcard and specific name", () => {
8282
it("successfully", () => {
8383
cy.get('[data-test-subj="Create aliasButton"]').click();
84-
cy.get('[data-test-subj="form-name-alias"]').type(CREATE_ALIAS);
84+
cy.get('[data-test-subj="form-name-alias"] input').type(CREATE_ALIAS);
8585
cy.get('[data-test-subj="form-name-indexArray"] [data-test-subj="comboBoxSearchInput"]').type(
8686
`${EDIT_INDEX}{enter}${SAMPLE_INDEX_PREFIX}-*{enter}`
8787
);

public/JobHandler/components/ErrorToastContentForJob.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Copyright OpenSearch Contributors
33
* SPDX-License-Identifier: Apache-2.0
44
*/
5-
import { EuiButton, EuiSpacer, EuiText } from "@elastic/eui";
5+
import { EuiSmallButton, EuiSpacer, EuiText } from "@elastic/eui";
66
import React from "react";
77
import { Modal } from "../../components/Modal";
88

@@ -14,7 +14,7 @@ export const ErrorToastContentForJob = (props: { shortError?: React.ReactChild;
1414
{fullError ? (
1515
<>
1616
<EuiSpacer />
17-
<EuiButton
17+
<EuiSmallButton
1818
onClick={
1919
/* istanbul ignore next */ () => {
2020
Modal.show({
@@ -34,7 +34,7 @@ export const ErrorToastContentForJob = (props: { shortError?: React.ReactChild;
3434
color="danger"
3535
>
3636
See full error
37-
</EuiButton>
37+
</EuiSmallButton>
3838
</>
3939
) : null}
4040
</div>

public/JobHandler/components/__snapshots__/components.test.tsx.snap

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ exports[`<ErrorToastContentForJob /> spec render with action 1`] = `
4848
class="euiSpacer euiSpacer--l"
4949
/>
5050
<button
51-
class="euiButton euiButton--danger"
51+
class="euiButton euiButton--danger euiButton--small"
5252
style="float: right;"
5353
type="button"
5454
>

public/components/AdvancedSettings/__snapshots__/AdvancedSettings.test.tsx.snap

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ HTMLCollection [
4141
class="euiSpacer euiSpacer--s"
4242
/>
4343
<div
44-
class="euiFormRow"
44+
class="euiFormRow euiFormRow--compressed"
4545
id="some_html_id-row"
4646
>
4747
<div

public/components/AliasSelect/__snapshots__/AliasSelect.test.tsx.snap

+6-6
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@ exports[`<AliasSelect /> spec renders the component and remove duplicate aliases
44
<div
55
aria-expanded="false"
66
aria-haspopup="listbox"
7-
class="euiComboBox"
7+
class="euiComboBox euiComboBox--compressed"
88
role="combobox"
99
>
1010
<div
11-
class="euiFormControlLayout"
11+
class="euiFormControlLayout euiFormControlLayout--compressed"
1212
>
1313
<div
1414
class="euiFormControlLayout__childrenWrapper"
1515
>
1616
<div
17-
class="euiComboBox__inputWrap euiComboBox__inputWrap-isClearable"
17+
class="euiComboBox__inputWrap euiComboBox__inputWrap--compressed euiComboBox__inputWrap-isClearable"
1818
data-test-subj="comboBoxInput"
1919
tabindex="-1"
2020
>
@@ -61,17 +61,17 @@ exports[`<AliasSelect /> spec renders with error 1`] = `
6161
<div
6262
aria-expanded="false"
6363
aria-haspopup="listbox"
64-
class="euiComboBox"
64+
class="euiComboBox euiComboBox--compressed"
6565
role="combobox"
6666
>
6767
<div
68-
class="euiFormControlLayout"
68+
class="euiFormControlLayout euiFormControlLayout--compressed"
6969
>
7070
<div
7171
class="euiFormControlLayout__childrenWrapper"
7272
>
7373
<div
74-
class="euiComboBox__inputWrap euiComboBox__inputWrap-isClearable"
74+
class="euiComboBox__inputWrap euiComboBox__inputWrap--compressed euiComboBox__inputWrap-isClearable"
7575
data-test-subj="comboBoxInput"
7676
tabindex="-1"
7777
>

public/components/BottomBar/BottomBar.tsx

+5-1
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,9 @@ export default function BottomBar(props: CustomFormRowProps) {
2929
};
3030
}, []);
3131

32-
return <EuiBottomBar ref={bottomBarRef}>{props.children}</EuiBottomBar>;
32+
return (
33+
<EuiBottomBar ref={bottomBarRef} position="sticky">
34+
{props.children}
35+
</EuiBottomBar>
36+
);
3337
}

public/components/BottomBar/__snapshots__/BottomBar.test.tsx.snap

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22

33
exports[`<FormGenerator /> spec render the component 1`] = `
44
HTMLCollection [
5-
<div />,
65
<div>
76
<section
87
aria-label="Page level controls"
9-
class="euiBottomBar euiBottomBar--fixed euiBottomBar--paddingMedium"
8+
class="euiBottomBar euiBottomBar--sticky euiBottomBar--paddingMedium"
109
>
1110
<h2
1211
class="euiScreenReaderOnly"

public/components/ChannelNotification/ChannelNotification.tsx

+7-7
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*/
55

66
import React, { ChangeEvent } from "react";
7-
import { EuiSpacer, EuiFormRow, EuiTextArea, EuiSelect, EuiButton, EuiFlexGroup, EuiFlexItem } from "@elastic/eui";
7+
import { EuiSpacer, EuiCompressedFormRow, EuiTextArea, EuiCompressedSelect, EuiSmallButton, EuiFlexGroup, EuiFlexItem } from "@elastic/eui";
88
import "brace/theme/github";
99
import "brace/mode/json";
1010
import { FeatureChannelList } from "../../../server/models/interfaces";
@@ -36,7 +36,7 @@ const ChannelNotification = ({
3636
<CustomFormRow label="Channel ID">
3737
<EuiFlexGroup gutterSize="s" style={{ maxWidth: 600, width: 600 }}>
3838
<EuiFlexItem>
39-
<EuiSelect
39+
<EuiCompressedSelect
4040
id={actionNotification ? "action-channel-id" : "channel-id"}
4141
placeholder="Select channel ID"
4242
hasNoInitialSelection
@@ -48,7 +48,7 @@ const ChannelNotification = ({
4848
/>
4949
</EuiFlexItem>
5050
<EuiFlexItem grow={false}>
51-
<EuiButton
51+
<EuiSmallButton
5252
iconType="refresh"
5353
onClick={getChannels}
5454
disabled={loadingChannels}
@@ -57,9 +57,9 @@ const ChannelNotification = ({
5757
/>
5858
</EuiFlexItem>
5959
<EuiFlexItem grow={false}>
60-
<EuiButton iconType="popout" href="notifications-dashboards#/channels" target="_blank">
60+
<EuiSmallButton iconType="popout" href="notifications-dashboards#/channels" target="_blank">
6161
Manage channels
62-
</EuiButton>
62+
</EuiSmallButton>
6363
</EuiFlexItem>
6464
</EuiFlexGroup>
6565
</CustomFormRow>
@@ -68,7 +68,7 @@ const ChannelNotification = ({
6868
<>
6969
<EuiSpacer size="m" />
7070

71-
<EuiFormRow title="Notification message" helpText="Embed variables in your message using Mustache template.">
71+
<EuiCompressedFormRow title="Notification message" helpText="Embed variables in your message using Mustache template.">
7272
<EuiTextArea
7373
placeholder="The index {{ctx.index}} failed during policy execution."
7474
style={{ minHeight: "150px" }}
@@ -77,7 +77,7 @@ const ChannelNotification = ({
7777
onChange={onChangeMessage}
7878
data-test-subj={actionNotification ? "create-policy-notification-action-message" : "create-policy-notification-message"}
7979
/>
80-
</EuiFormRow>
80+
</EuiCompressedFormRow>
8181
</>
8282
)}
8383
</>

public/components/ChannelNotification/__snapshots__/ChannelNotification.test.tsx.snap

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
exports[`<ChannelNotification /> spec renders the component 1`] = `
44
<div
5-
class="euiFormRow"
5+
class="euiFormRow euiFormRow--compressed"
66
id="some_html_id-row"
77
>
88
<div
@@ -26,13 +26,13 @@ exports[`<ChannelNotification /> spec renders the component 1`] = `
2626
class="euiFlexItem"
2727
>
2828
<div
29-
class="euiFormControlLayout"
29+
class="euiFormControlLayout euiFormControlLayout--compressed"
3030
>
3131
<div
3232
class="euiFormControlLayout__childrenWrapper"
3333
>
3434
<select
35-
class="euiSelect"
35+
class="euiSelect euiSelect--compressed"
3636
data-test-subj="create-policy-notification-channel-id"
3737
id="channel-id"
3838
placeholder="Select channel ID"
@@ -67,7 +67,7 @@ exports[`<ChannelNotification /> spec renders the component 1`] = `
6767
class="euiFlexItem euiFlexItem--flexGrowZero"
6868
>
6969
<button
70-
class="euiButton euiButton--primary refresh-button"
70+
class="euiButton euiButton--primary euiButton--small refresh-button"
7171
data-test-subj="channel-notification-refresh"
7272
type="button"
7373
>
@@ -85,7 +85,7 @@ exports[`<ChannelNotification /> spec renders the component 1`] = `
8585
class="euiFlexItem euiFlexItem--flexGrowZero"
8686
>
8787
<a
88-
class="euiButton euiButton--primary"
88+
class="euiButton euiButton--primary euiButton--small"
8989
href="notifications-dashboards#/channels"
9090
rel="noopener noreferrer"
9191
target="_blank"

public/components/ComboBoxWithoutWarning/index.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
* Copyright OpenSearch Contributors
33
* SPDX-License-Identifier: Apache-2.0
44
*/
5-
import { EuiComboBox, EuiComboBoxProps } from "@elastic/eui";
5+
import { EuiCompressedComboBox, EuiComboBoxProps } from "@elastic/eui";
66

77
/**
88
* The EuiComboBox has an issue when calling closeList.
99
* It does not check if the component is still mounted.
1010
* And it will give a warning in browser console and terminal when running unittest.
1111
*/
12-
export default class ComboBoxWithoutWarning<T> extends EuiComboBox<T> {
12+
export default class ComboBoxWithoutWarning<T> extends EuiCompressedComboBox<T> {
1313
memoriedCloseList: (event?: Event) => void;
1414
constructor(props: EuiComboBoxProps<T>) {
1515
super(props as any);

public/components/ConfirmationModal/ConfirmationModal.tsx

+17-8
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@
55

66
import React from "react";
77
import {
8-
EuiButton,
8+
EuiSmallButton,
99
EuiModal,
1010
EuiModalBody,
1111
EuiModalFooter,
1212
EuiModalHeader,
1313
EuiModalHeaderTitle,
1414
EuiOverlayMask,
15-
EuiButtonEmpty,
15+
EuiSmallButtonEmpty,
16+
EuiText,
1617
// @ts-ignore
1718
} from "@elastic/eui";
1819

@@ -41,16 +42,24 @@ const ConfirmationModal: React.SFC<ConfirmationModalProps> = ({
4142
// @ts-ignore */}
4243
<EuiModal onCancel={onClose} onClose={onClose} maxWidth={1000} {...modalProps}>
4344
<EuiModalHeader>
44-
<EuiModalHeaderTitle>{title}</EuiModalHeaderTitle>
45+
<EuiModalHeaderTitle>
46+
<EuiText size="s">
47+
<h2>{title}</h2>
48+
</EuiText>
49+
</EuiModalHeaderTitle>
4550
</EuiModalHeader>
4651

47-
<EuiModalBody>{bodyMessage}</EuiModalBody>
52+
<EuiModalBody>
53+
<EuiText size="s">
54+
<p>{bodyMessage}</p>
55+
</EuiText>
56+
</EuiModalBody>
4857

4958
<EuiModalFooter>
50-
<EuiButtonEmpty onClick={onClose} data-test-subj="confirmationModalCloseButton">
59+
<EuiSmallButtonEmpty onClick={onClose} data-test-subj="confirmationModalCloseButton">
5160
Cancel
52-
</EuiButtonEmpty>
53-
<EuiButton
61+
</EuiSmallButtonEmpty>
62+
<EuiSmallButton
5463
onClick={() => {
5564
onAction();
5665
onClose();
@@ -60,7 +69,7 @@ const ConfirmationModal: React.SFC<ConfirmationModalProps> = ({
6069
{...actionProps}
6170
>
6271
{actionMessage}
63-
</EuiButton>
72+
</EuiSmallButton>
6473
</EuiModalFooter>
6574
</EuiModal>
6675
</EuiOverlayMask>

public/components/ConfirmationModal/__snapshots__/ConfirmationModal.test.tsx.snap

+16-4
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,13 @@ exports[`<ConfirmationModal /> spec renders the component 1`] = `
3535
<div
3636
class="euiModalHeader__title"
3737
>
38-
some title
38+
<div
39+
class="euiText euiText--small"
40+
>
41+
<h2>
42+
some title
43+
</h2>
44+
</div>
3945
</div>
4046
</div>
4147
<div
@@ -44,14 +50,20 @@ exports[`<ConfirmationModal /> spec renders the component 1`] = `
4450
<div
4551
class="euiModalBody__overflow"
4652
>
47-
some body message
53+
<div
54+
class="euiText euiText--small"
55+
>
56+
<p>
57+
some body message
58+
</p>
59+
</div>
4860
</div>
4961
</div>
5062
<div
5163
class="euiModalFooter"
5264
>
5365
<button
54-
class="euiButtonEmpty euiButtonEmpty--primary"
66+
class="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--small"
5567
data-test-subj="confirmationModalCloseButton"
5668
type="button"
5769
>
@@ -66,7 +78,7 @@ exports[`<ConfirmationModal /> spec renders the component 1`] = `
6678
</span>
6779
</button>
6880
<button
69-
class="euiButton euiButton--primary euiButton--fill"
81+
class="euiButton euiButton--primary euiButton--small euiButton--fill"
7082
data-test-subj="confirmationModalActionButton"
7183
type="button"
7284
>

0 commit comments

Comments
 (0)