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

[Look&Feel] Use semantic headers for page, modal, & flyouts across the board #7616

Merged
merged 8 commits into from
Aug 8, 2024
Merged

[Look&Feel] Use semantic headers for page, modal, & flyouts across the board #7616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b20f2ee
Updated semantic headers
danieldong51 Aug 1, 2024
b192a08
Updated semantic header for data sources: create connection
danieldong51 Aug 2, 2024
d319774
Changeset file for PR #7616 created/updated
opensearch-changeset-bot[bot] Aug 3, 2024
9ad2c34
Updated semantic headers
danieldong51 Aug 5, 2024
87a17e8
Fixed data_source_page_header.test.tsx
danieldong51 Aug 5, 2024
11933d1
Updated snapshot testing
danieldong51 Aug 5, 2024
a520c29
Updated S3 page header
danieldong51 Aug 5, 2024
56a91ee
Updated console headers
danieldong51 Aug 6, 2024
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: 2 additions & 0 deletions changelogs/fragments/7616.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Refactor:
- [Look&Feel] Use semantic headers for page, modal, & flyouts across the board ([#7616](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/7616))
4 changes: 3 additions & 1 deletion ...nced_settings/public/component_registry/page_title/__snapshots__/page_title.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.

2 changes: 1 addition & 1 deletion src/plugins/advanced_settings/public/component_registry/page_title/page_title.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import { FormattedMessage } from '@osd/i18n/react';

export const PageTitle = () => {
return (
<EuiText>
<EuiText size="s">
<h1 data-test-subj="managementSettingsTitle">
<FormattedMessage id="advancedSettings.pageTitle" defaultMessage="Settings" />
</h1>
Expand Down
32 changes: 17 additions & 15 deletions src/plugins/console/public/application/components/__snapshots__/import_flyout.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.

13 changes: 3 additions & 10 deletions src/plugins/console/public/application/components/help_panel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,7 @@

import React from 'react';
import { FormattedMessage } from '@osd/i18n/react';
import {
EuiText,
EuiFlyout,
EuiFlyoutHeader,
EuiFlyoutBody,
EuiTitle,
EuiSpacer,
} from '@elastic/eui';
import { EuiText, EuiFlyout, EuiFlyoutHeader, EuiFlyoutBody, EuiSpacer } from '@elastic/eui';
import { EditorExample } from './editor_example';

interface Props {
Expand All @@ -48,11 +41,11 @@ export function HelpPanel(props: Props) {
return (
<EuiFlyout onClose={props.onClose} data-test-subj="helpFlyout" size="s">
<EuiFlyoutHeader hasBorder>
<EuiTitle size="m">
<EuiText size="s">
<h2>
<FormattedMessage id="console.helpPage.pageTitle" defaultMessage="Help" />
</h2>
</EuiTitle>
</EuiText>
</EuiFlyoutHeader>
<EuiFlyoutBody>
<EuiText>
Expand Down
5 changes: 2 additions & 3 deletions src/plugins/console/public/application/components/import_flyout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import {
EuiFlyout,
EuiFlyoutHeader,
EuiTitle,
EuiFlyoutBody,
EuiFlyoutFooter,
EuiCallOut,
Expand Down Expand Up @@ -276,14 +275,14 @@ export const ImportFlyout = ({ close, refresh }: ImportFlyoutProps) => {
return (
<EuiFlyout onClose={close} size="s">
<EuiFlyoutHeader hasBorder>
<EuiTitle size="m">
<EuiText size="s">
<h2>
<FormattedMessage
id="console.ImportFlyout.importQueriesTitle"
defaultMessage="Import queries"
/>
</h2>
</EuiTitle>
</EuiText>
</EuiFlyoutHeader>

<EuiFlyoutBody>
Expand Down
10 changes: 9 additions & 1 deletion src/plugins/console/public/application/components/settings_modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ import {
EuiModalHeader,
EuiModalHeaderTitle,
EuiCompressedSwitch,
EuiText,
} from '@elastic/eui';

import { DevToolsSettings } from '../../services';
Expand Down Expand Up @@ -179,7 +180,14 @@ export function DevToolsSettingsModal(props: Props) {
>
<EuiModalHeader>
<EuiModalHeaderTitle>
<FormattedMessage id="console.settingsPage.pageTitle" defaultMessage="Console Settings" />
<EuiText size="s">
<h2>
<FormattedMessage
id="console.settingsPage.pageTitle"
defaultMessage="Console Settings"
/>
</h2>
</EuiText>
</EuiModalHeaderTitle>
</EuiModalHeader>

Expand Down
6 changes: 3 additions & 3 deletions ...ource_management/public/components/create_data_source_wizard/components/header/header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import React from 'react';

import { EuiSpacer, EuiTitle, EuiText, EuiFlexItem, EuiFlexGroup } from '@elastic/eui';
import { EuiSpacer, EuiText, EuiFlexItem, EuiFlexGroup } from '@elastic/eui';
import { i18n } from '@osd/i18n';
import { FormattedMessage } from '@osd/i18n/react';
import { useOpenSearchDashboards } from '../../../../../../opensearch_dashboards_react/public';
Expand All @@ -25,7 +25,7 @@ export const Header = () => {
<EuiFlexGroup justifyContent="spaceBetween">
<EuiFlexItem grow={false}>
<div>
<EuiTitle>
<EuiText size="s">
<h1 data-test-subj="createDataSourceHeader">
{
<FormattedMessage
Expand All @@ -34,7 +34,7 @@ export const Header = () => {
/>
}
</h1>
</EuiTitle>
</EuiText>
<EuiSpacer size="s" />
<EuiText>
<p>
Expand Down
10 changes: 6 additions & 4 deletions ...ts/data_source_creation_panel/__snapshots__/create_data_source_panel_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.

6 changes: 3 additions & 3 deletions ...ent/public/components/data_source_creation_panel/create_data_source_panel_header.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import React from 'react';
import { shallow } from 'enzyme';
import { CreateDataSourcePanelHeader } from './create_data_source_panel_header';
import { EuiFlexGroup, EuiTitle, EuiText } from '@elastic/eui';
import { EuiText } from '@elastic/eui';
import { FormattedMessage } from '@osd/i18n/react';

describe('CreateDataSourcePanelHeader', () => {
Expand All @@ -20,11 +20,11 @@ describe('CreateDataSourcePanelHeader', () => {
test('contains correct title and description', () => {
const wrapper = shallowComponent();

const titleMessage = wrapper.find(EuiTitle).find(FormattedMessage);
const titleMessage = wrapper.find(EuiText).at(0).find(FormattedMessage);
expect(titleMessage.prop('id')).toEqual('dataSourcesManagement.createDataSourcePanel.title');
expect(titleMessage.prop('defaultMessage')).toEqual('Create Data Source');

const descriptionMessage = wrapper.find(EuiText).find(FormattedMessage);
const descriptionMessage = wrapper.find(EuiText).at(1).find(FormattedMessage);
expect(descriptionMessage.prop('id')).toEqual(
'dataSourcesManagement.createDataSourcePanel.description'
);
Expand Down
10 changes: 5 additions & 5 deletions ...nagement/public/components/data_source_creation_panel/create_data_source_panel_header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,22 @@
* SPDX-License-Identifier: Apache-2.0
*/

import { EuiFlexGroup, EuiFlexItem, EuiSpacer, EuiText, EuiTitle } from '@elastic/eui';
import { EuiFlexGroup, EuiFlexItem, EuiSpacer, EuiText } from '@elastic/eui';
import React from 'react';
import { FormattedMessage } from '@osd/i18n/react';

export const CreateDataSourcePanelHeader: React.FC = () => {
return (
<EuiFlexGroup justifyContent="spaceBetween" alignItems="center">
<EuiFlexItem grow={false}>
<EuiTitle>
<h2>
<EuiText size="s">
<h1>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why did this change to an h1? is this the title of the page?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it's the create data source page :
Screenshot 2024-08-05 at 2 52 10 PM
Screenshot 2024-08-05 at 2 52 38 PM

<FormattedMessage
id="dataSourcesManagement.createDataSourcePanel.title"
defaultMessage="Create Data Source"
/>
</h2>
</EuiTitle>
</h1>
</EuiText>
<EuiSpacer size="s" />
<EuiText>
<p>
Expand Down
10 changes: 6 additions & 4 deletions ...lic/components/data_source_home_panel/__snapshots__/data_source_page_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.

7 changes: 3 additions & 4 deletions ...urce_management/public/components/data_source_home_panel/data_source_page_header.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import React from 'react';
import { shallow } from 'enzyme';
import { DataSourceHeader } from './data_source_page_header';
import { EuiTitle, EuiText } from '@elastic/eui';
import { EuiText } from '@elastic/eui';
import { FormattedMessage } from '@osd/i18n/react';

describe('DataSourceHeader', () => {
Expand All @@ -25,12 +25,11 @@ describe('DataSourceHeader', () => {

test('contains correct title and description', () => {
const wrapper = shallowComponent();

const titleMessage = wrapper.find(EuiTitle).find(FormattedMessage);
const titleMessage = wrapper.find(EuiText).at(0).find(FormattedMessage);
expect(titleMessage.prop('id')).toEqual('dataSourcesManagement.dataSourcesTable.title');
expect(titleMessage.prop('defaultMessage')).toEqual('Data Sources');

const descriptionMessage = wrapper.find(EuiText).find(FormattedMessage);
const descriptionMessage = wrapper.find(EuiText).at(1).find(FormattedMessage);
expect(descriptionMessage.prop('id')).toEqual(
'dataSourcesManagement.dataSourcesTable.description'
);
Expand Down
10 changes: 5 additions & 5 deletions ...ta_source_management/public/components/data_source_home_panel/data_source_page_header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

import { EuiFlexGroup, EuiFlexItem, EuiSpacer, EuiText, EuiTitle } from '@elastic/eui';
import { EuiFlexGroup, EuiFlexItem, EuiSpacer, EuiText } from '@elastic/eui';
import React from 'react';
import { FormattedMessage } from '@osd/i18n/react';
import { RouteComponentProps } from 'react-router-dom';
Expand All @@ -14,14 +14,14 @@ export const DataSourceHeader: React.FC<DataSourceHeaderProps> = () => {
return (
<EuiFlexGroup justifyContent="spaceBetween" alignItems="center">
<EuiFlexItem grow={false}>
<EuiTitle>
<h2>
<EuiText size="s">
<h1>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same for this one (assuming its just the page title)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, also the title of Data Sources page
Screenshot 2024-08-05 at 2 53 23 PM

<FormattedMessage
id="dataSourcesManagement.dataSourcesTable.title"
defaultMessage="Data Sources"
/>
</h2>
</EuiTitle>
</h1>
</EuiText>
<EuiSpacer size="s" />
<EuiText>
<p>
Expand Down
13 changes: 3 additions & 10 deletions ...query_data_sources_components/acceleration_creation/create/create_acceleration_header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

import {
EuiLink,
EuiPageHeader,
EuiPageHeaderSection,
EuiSpacer,
EuiText,
EuiTitle,
} from '@elastic/eui';
import { EuiLink, EuiPageHeader, EuiPageHeaderSection, EuiSpacer, EuiText } from '@elastic/eui';
import React from 'react';
import { OPENSEARCH_ACC_DOCUMENTATION_URL } from '../../../constants';

Expand All @@ -19,9 +12,9 @@ export const CreateAccelerationHeader = () => {
<div>
<EuiPageHeader>
<EuiPageHeaderSection>
<EuiTitle size="l" data-test-subj="acceleration-header">
<EuiText size="s" data-test-subj="acceleration-header">
<h1>Accelerate data</h1>
</EuiTitle>
</EuiText>
</EuiPageHeaderSection>
</EuiPageHeader>
<EuiSpacer size="s" />
Expand Down
5 changes: 2 additions & 3 deletions ...direct_query_data_sources_components/connection_detail/direct_query_connection_detail.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import {
EuiPageHeaderSection,
EuiFlexGroup,
EuiFlexItem,
EuiTitle,
EuiPanel,
EuiSpacer,
EuiText,
Expand Down Expand Up @@ -434,9 +433,9 @@ export const DirectQueryDataConnectionDetail: React.FC<DirectQueryDataConnection
<EuiPageHeaderSection style={{ width: '100%', justifyContent: 'space-between' }}>
<EuiFlexGroup>
<EuiFlexItem grow={false}>
<EuiTitle data-test-subj="datasourceTitle" size="l">
<EuiText data-test-subj="datasourceTitle" size="s">
<h1>{datasourceDetails.name}</h1>
</EuiTitle>
</EuiText>
</EuiFlexItem>
</EuiFlexGroup>
</EuiPageHeaderSection>
Expand Down
16 changes: 10 additions & 6 deletions ...ource_configuration/amazon_s3/__snapshots__/configure_amazon_s3_data_source.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.

Loading
Loading