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

Jump to bottom

[MD]Update copy on index patten config DS step #2527

Merged
merged 1 commit into from
Oct 7, 2022
Merged

[MD]Update copy on index patten config DS step #2527

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
6 changes: 4 additions & 2 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
* [MD] Support legacy client for data source ([#2204](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2204))
* [Plugin Helpers] Facilitate version changes ([#2398](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2398))
* [MD] Display error toast for create index pattern with data source ([#2506](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2506))

* [Multi DataSource] UX enhacement on index pattern management stack ([#2505](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2505))
* [Multi DataSource] UX enhancement on Data source management stack ([#2521](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2521))
* [Multi DataSource] UX enhancement on Index Pattern management stack ([#2527](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2527))
### 🐛 Bug Fixes
* [Vis Builder] Fixes auto bounds for timeseries bar chart visualization ([2401](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2401))
* [Vis Builder] Fixes visualization shift when editing agg ([2401](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2401))
Expand Down Expand Up @@ -50,7 +52,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
* Add updated_at column to objects' tables ([#1218](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/1218))
* [Viz Builder] State validation before dispatching and loading ([#2351](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2351))
* [Viz Builder] Create a new wizard directly on a dashboard ([#2384](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2384))
* [Multi DataSource] UX enhacement on index pattern management stack ([#2505]https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2505))
* [Multi DataSource] UX enhacement on index pattern management stack ([#2505](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2505))
* [Multi DataSource] UX enhancement on Data source management stack ([#2521](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2521))

### 🐛 Bug Fixes
Expand Down
3 changes: 2 additions & 1 deletion src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,8 @@ export class IndexPattern implements IIndexPattern {
return this.dataSourceRef
? [
{
...this.dataSourceRef,
id: this.dataSourceRef.id,
type: this.dataSourceRef.type,
name: DATA_SOURCE_REFERNECE_NAME,
},
]
Expand Down
64 changes: 9 additions & 55 deletions ...n_wizard/components/step_data_source/components/header/__snapshots__/header.test.tsx.snap
View file
Open in desktop

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

3 changes: 0 additions & 3 deletions ...nts/create_index_pattern_wizard/components/step_data_source/components/header/header.scss
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion ...create_index_pattern_wizard/components/step_data_source/components/header/header.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

import React from 'react';
import { Header } from '../header';
import { shallow } from 'enzyme';
import { shallowWithIntl } from 'test_utils/enzyme_helpers';

jest.mock('../../../../../../../../../plugins/opensearch_dashboards_react/public', () => ({
Expand Down
33 changes: 10 additions & 23 deletions ...ents/create_index_pattern_wizard/components/step_data_source/components/header/header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
*/

import React, { Fragment, useState } from 'react';
import './header.scss';

import {
EuiButton,
Expand Down Expand Up @@ -111,7 +110,7 @@ export const Header: React.FC<HeaderProps> = (props: HeaderProps) => {
<EuiText>
<FormattedMessage
id="indexPatternManagement.createIndexPattern.stepDataSourceLabel"
defaultMessage="Please pick the data source -- within which to configure index patterns."
defaultMessage="Pick a data source within which to configure index patterns."
/>
</EuiText>
<EuiSpacer size="m" />
Expand All @@ -121,49 +120,37 @@ export const Header: React.FC<HeaderProps> = (props: HeaderProps) => {
label={
<FormattedMessage
id="indexPatternManagement.createIndexPattern.stepDataSource.useDefaultLabel"
defaultMessage="Use default"
defaultMessage="Use default data source"
/>
}
checked={defaultChecked}
onChange={(e) => onChangeDefaultChecked(e)}
compressed
/>
<EuiText size="s" className="dataSourceRadioHelperText">
<FormattedMessage
id="indexPatternManagement.createIndexPattern.stepDataSource.useDefault.helperText"
defaultMessage="Uses the default data source configured by the OpenSearch Dashboards administrator."
/>
</EuiText>
<EuiSpacer size="l" />
<EuiSpacer size="m" />
<EuiRadio
data-test-subj="createIndexPatternStepDataSourceUseDataSourceRadio"
id={'useDataSource'}
label={
<FormattedMessage
id="indexPatternManagement.createIndexPattern.stepDataSource.useDataSourceLabel"
defaultMessage="Choose data source"
defaultMessage="Use external data source connection"
/>
}
checked={dataSourceChecked}
onChange={(e) => onChangeDataSourceChecked(e)}
compressed
/>
<EuiText size="s" className="dataSourceRadioHelperText">
<FormattedMessage
id="indexPatternManagement.createIndexPattern.stepDataSource.useDataSource.helperText"
defaultMessage="Connect to an existing external data source."
/>
</EuiText>
{dataSourceChecked && (
<EuiFlexItem grow={false}>
<EuiSpacer size="m" />
<EuiSelectable
aria-label={
<FormattedMessage
id="indexPatternManagement.createIndexPattern.stepDataSource.searchLabel"
defaultMessage="Search data sources"
/>
}
aria-label={i18n.translate(
'indexPatternManagement.createIndexPattern.stepDataSource.searchlabel',
{
defaultMessage: 'Search data sources',
}
)}
searchable
searchProps={{
'data-test-subj': 'selectDataSources',
Expand Down