Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport 2.x] [Create detector] Update data source selection label and help text #1101

Merged
merged 1 commit into from
Jul 30, 2024
Merged

[Backport 2.x] [Create detector] Update data source selection label and help text #1101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cypress/integration/1_detectors.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ const validateAlertPanel = (alertName) =>
.eq(2)
.within(() => cy.getElementByText('button', alertName));

const dataSourceLabel = 'Select or input source indexes or index patterns';
const dataSourceLabel = 'Select indexes/aliases';

const getDataSourceField = () => cy.getFieldByLabel(dataSourceLabel);

Expand Down
9 changes: 8 additions & 1 deletion public/pages/Alerts/containers/Alerts/__snapshots__/Alerts.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,7 @@ exports[`<Alerts /> spec renders the component 1`] = `
},
]
}
compressed={false}
dateFormat="MMM D, YYYY @ HH:mm:ss.SSS"
end="now"
isAutoRefreshOnly={false}
Expand Down Expand Up @@ -330,6 +331,7 @@ exports[`<Alerts /> spec renders the component 1`] = `
>
<EuiFormControlLayout
className="euiSuperDatePicker"
compressed={false}
isDisabled={false}
prepend={
<EuiQuickSelectPopover
Expand Down Expand Up @@ -595,7 +597,9 @@ exports[`<Alerts /> spec renders the component 1`] = `
</button>
</div>
</EuiDatePickerRange>
<EuiFormControlLayoutIcons />
<EuiFormControlLayoutIcons
compressed={false}
/>
</div>
</div>
</EuiFormControlLayout>
Expand All @@ -608,6 +612,7 @@ exports[`<Alerts /> spec renders the component 1`] = `
className="euiFlexItem euiFlexItem--flexGrowZero"
>
<EuiSuperUpdateButton
compressed={false}
data-test-subj="superDatePickerApplyTimeButton"
fill={false}
isDisabled={false}
Expand Down Expand Up @@ -637,6 +642,7 @@ exports[`<Alerts /> spec renders the component 1`] = `
onBlur={[Function]}
onClick={[Function]}
onFocus={[Function]}
size="m"
textProps={
Object {
"className": "euiSuperUpdateButton__text",
Expand All @@ -657,6 +663,7 @@ exports[`<Alerts /> spec renders the component 1`] = `
onBlur={[Function]}
onClick={[Function]}
onFocus={[Function]}
size="m"
textProps={
Object {
"className": "euiSuperUpdateButton__text",
Expand Down
13 changes: 10 additions & 3 deletions ...teDetector/components/DefineDetector/components/DetectorDataSource/DetectorDataSource.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import {
EuiCallOut,
EuiTextColor,
EuiTitle,
EuiLink,
} from '@elastic/eui';
import { FormFieldHeader } from '../../../../../../components/FormFieldHeader/FormFieldHeader';
import { IndexOption } from '../../../../../Detectors/models/interfaces';
Expand Down Expand Up @@ -155,11 +156,17 @@ export default class DetectorDataSource extends Component<
</EuiTitle>
<EuiSpacer size={'m'} />
<EuiFormRow
label={
<FormFieldHeader headerTitle={'Select or input source indexes or index patterns'} />
}
label={<FormFieldHeader headerTitle={'Select indexes/aliases'} />}
isInvalid={isInvalid}
error={isInvalid && (errorMessage || 'Select an input source.')}
helpText={
<span>
<a href="https://opensearch.org/docs/latest/im-plugin/index-alias" target="_blank">
Aliases
</a>{' '}
are recommended for optimal functioning of detectors.
</span>
}
>
<EuiComboBox
placeholder={'Select an input source for the detector.'}
Expand Down
41 changes: 38 additions & 3 deletions ...tors/components/UpdateBasicDetails/__snapshots__/UpdateDetectorBasicDetails.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -710,10 +710,22 @@ exports[`<UpdateDetectorBasicDetails /> spec renders the component 1`] = `
fullWidth={false}
hasChildLabel={true}
hasEmptyLabelSpace={false}
helpText={
<span>
<a
href="https://opensearch.org/docs/latest/im-plugin/index-alias"
target="_blank"
>
Aliases
</a>

are recommended for optimal functioning of detectors.
</span>
}
isInvalid={false}
label={
<FormFieldHeader
headerTitle="Select or input source indexes or index patterns"
headerTitle="Select indexes/aliases"
/>
}
labelType="label"
Expand All @@ -739,7 +751,7 @@ exports[`<UpdateDetectorBasicDetails /> spec renders the component 1`] = `
htmlFor="some_html_id"
>
<FormFieldHeader
headerTitle="Select or input source indexes or index patterns"
headerTitle="Select indexes/aliases"
>
<EuiText
size="s"
Expand All @@ -748,7 +760,7 @@ exports[`<UpdateDetectorBasicDetails /> spec renders the component 1`] = `
className="euiText euiText--small"
>
<strong>
Select or input source indexes or index patterns
Select indexes/aliases
</strong>
</div>
</EuiText>
Expand All @@ -760,6 +772,7 @@ exports[`<UpdateDetectorBasicDetails /> spec renders the component 1`] = `
className="euiFormRow__fieldWrapper"
>
<EuiComboBox
aria-describedby="some_html_id-help-0"
async={false}
compressed={false}
data-test-subj="define-detector-select-data-source"
Expand Down Expand Up @@ -797,6 +810,7 @@ exports[`<UpdateDetectorBasicDetails /> spec renders the component 1`] = `
sortMatchesBy="none"
>
<div
aria-describedby="some_html_id-help-0"
aria-expanded={false}
aria-haspopup="listbox"
className="euiComboBox"
Expand Down Expand Up @@ -1083,6 +1097,27 @@ exports[`<UpdateDetectorBasicDetails /> spec renders the component 1`] = `
</EuiComboBoxInput>
</div>
</EuiComboBox>
<EuiFormHelpText
className="euiFormRow__text"
id="some_html_id-help-0"
key="0"
>
<div
className="euiFormHelpText euiFormRow__text"
id="some_html_id-help-0"
>
<span>
<a
href="https://opensearch.org/docs/latest/im-plugin/index-alias"
target="_blank"
>
Aliases
</a>

are recommended for optimal functioning of detectors.
</span>
</div>
</EuiFormHelpText>
</div>
</div>
</EuiFormRow>
Expand Down
Loading