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

[Monitoring] h1 elements for accessibility #52276

Merged
merged 29 commits into from
Jan 9, 2020
Merged

[Monitoring] h1 elements for accessibility #52276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
be98129
Add header element to indices page for WCAG
cachedout Dec 5, 2019
11ae391
Add h1 element for WCAG to node page
cachedout Dec 5, 2019
f3e889e
Add h1 element for WCAG to stack monitoring overview page
cachedout Dec 5, 2019
8d6b71c
Add h1 to advanced nodes page in stack monitoring
cachedout Dec 5, 2019
fe298eb
Add h1 to nodes page in stack monitoring
cachedout Dec 5, 2019
4e46015
Add h1 header for index advanced page in stack monitoring
cachedout Dec 5, 2019
16845ef
Standarize more on ide for h1 tag
cachedout Dec 5, 2019
38590fd
Give heading element to beats overview
cachedout Dec 5, 2019
17853d4
Update Beats listing page for H1 compat with WAVE
cachedout Dec 11, 2019
f6a3b04
Modified beat page to comply with heading rules from WCAG
cachedout Dec 11, 2019
b1fee38
Kibana instance listing page updated for header WCAG
cachedout Dec 11, 2019
dd05b78
Add WCAG header fix to logstash listing page
cachedout Dec 11, 2019
a64a5f0
Added headings for WCAG to logstash overview page
cachedout Dec 11, 2019
0fc17cc
Update pipeline listing page for WCAG A headings
cachedout Dec 11, 2019
915c53a
Fix WCAG heading problems in pipeline viewer
cachedout Dec 11, 2019
2249dc4
Fix screen reader heading for APM overview page
cachedout Dec 13, 2019
ac69b54
Update APM instances page for screen reader headings
cachedout Dec 13, 2019
e478999
Update APM instance page for screen reader heading
cachedout Dec 13, 2019
2eb8acf
Update ccr page for screen reader headings
cachedout Dec 13, 2019
3850e2b
More a11y fixes for headings in stack monitoring
cachedout Dec 13, 2019
a15311b
Fixup
cachedout Dec 13, 2019
e6ea759
Consistant captalization per review
cachedout Dec 16, 2019
8cb71f0
Removed help text per review comment
cachedout Dec 27, 2019
9e8b05e
Include Elasticsearch node into screen reader message, per review fee…
cachedout Dec 27, 2019
130d1d8
Update snapshots
cachedout Dec 27, 2019
4f4ae09
Linting
cachedout Dec 27, 2019
84b8679
Implement review suggestion for i8n compat
cachedout Jan 2, 2020
0030579
Revert back to just plain string
cachedout Jan 3, 2020
5a2e4d5
Merge branch 'master' into issue_37539
elasticmachine Jan 8, 2020
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
10 changes: 10 additions & 0 deletions x-pack/legacy/plugins/monitoring/public/components/apm/instance/instance.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@ import {
EuiPageBody,
EuiFlexGroup,
EuiPageContent,
EuiScreenReaderOnly,
} from '@elastic/eui';
import { Status } from './status';
import { FormattedMessage } from '@kbn/i18n/react';

export function ApmServerInstance({ summary, metrics, ...props }) {
const seriesToShow = [
Expand Down Expand Up @@ -45,6 +47,14 @@ export function ApmServerInstance({ summary, metrics, ...props }) {
return (
<EuiPage>
<EuiPageBody>
<EuiScreenReaderOnly>
<h1>
<FormattedMessage
id="xpack.monitoring.apm.instance.heading"
defaultMessage="APM Instance"
/>
</h1>
</EuiScreenReaderOnly>
<EuiPageContent>
<Status stats={summary} />
<EuiSpacer size="s" />
Expand Down
18 changes: 17 additions & 1 deletion x-pack/legacy/plugins/monitoring/public/components/apm/instances/instances.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,22 @@ import React, { Fragment } from 'react';
import moment from 'moment';
import { uniq, get } from 'lodash';
import { EuiMonitoringTable } from '../../table';
import { EuiLink, EuiPage, EuiPageBody, EuiPageContent, EuiSpacer } from '@elastic/eui';
import {
EuiLink,
EuiPage,
EuiPageBody,
EuiPageContent,
EuiSpacer,
EuiScreenReaderOnly,
} from '@elastic/eui';
import { Status } from './status';
import { formatMetric } from '../../../lib/format_number';
import { formatTimestampToDuration } from '../../../../common';
import { i18n } from '@kbn/i18n';
import { APM_SYSTEM_ID } from '../../../../common/constants';
import { ListingCallOut } from '../../setup_mode/listing_callout';
import { SetupModeBadge } from '../../setup_mode/badge';
import { FormattedMessage } from '@kbn/i18n/react';

function getColumns(setupMode) {
return [
Expand Down Expand Up @@ -133,6 +141,14 @@ export function ApmServerInstances({ apms, setupMode }) {
return (
<EuiPage>
<EuiPageBody>
<EuiScreenReaderOnly>
<h1>
<FormattedMessage
id="xpack.monitoring.apm.instances.heading"
defaultMessage="APM Instances"
/>
</h1>
</EuiScreenReaderOnly>
<EuiPageContent>
<Status stats={data.stats} />
<EuiSpacer size="m" />
Expand Down
10 changes: 10 additions & 0 deletions x-pack/legacy/plugins/monitoring/public/components/apm/overview/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@ import {
EuiPageBody,
EuiPanel,
EuiPageContent,
EuiScreenReaderOnly,
} from '@elastic/eui';
import { Status } from '../instances/status';
import { FormattedMessage } from '@kbn/i18n/react';

export function ApmOverview({ stats, metrics, ...props }) {
const seriesToShow = [
Expand Down Expand Up @@ -45,6 +47,14 @@ export function ApmOverview({ stats, metrics, ...props }) {
return (
<EuiPage>
<EuiPageBody>
<EuiScreenReaderOnly>
<h1>
<FormattedMessage
id="xpack.monitoring.apm.overview.heading"
defaultMessage="APM Overview"
/>
</h1>
</EuiScreenReaderOnly>
<EuiPageContent>
<Status stats={stats} />
<EuiSpacer size="s" />
Expand Down
7 changes: 7 additions & 0 deletions x-pack/legacy/plugins/monitoring/public/components/beats/beat/beat.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,11 @@ import {
EuiSpacer,
EuiPageContent,
EuiPanel,
EuiScreenReaderOnly,
} from '@elastic/eui';
import { i18n } from '@kbn/i18n';
import { SummaryStatus } from '../../summary_status';
import { FormattedMessage } from '@kbn/i18n/react';

export function Beat({ summary, metrics, ...props }) {
const metricsToShow = [
Expand Down Expand Up @@ -137,6 +139,11 @@ export function Beat({ summary, metrics, ...props }) {
</EuiPanel>
<EuiSpacer size="m" />
<EuiPageContent>
<EuiScreenReaderOnly>
<h1>
<FormattedMessage id="xpack.monitoring.beats.beat.heading" defaultMessage="Beat" />
</h1>
</EuiScreenReaderOnly>
<EuiFlexGrid columns={2} gutterSize="s">
{metricsToShow.map((metric, index) => (
<EuiFlexItem key={index}>
Expand Down
18 changes: 17 additions & 1 deletion x-pack/legacy/plugins/monitoring/public/components/beats/listing/listing.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,22 @@

import React, { PureComponent } from 'react';
import { uniq, get } from 'lodash';
import { EuiPage, EuiPageBody, EuiPageContent, EuiSpacer, EuiLink } from '@elastic/eui';
import {
EuiPage,
EuiPageBody,
EuiPageContent,
EuiSpacer,
EuiLink,
EuiScreenReaderOnly,
} from '@elastic/eui';
import { Stats } from 'plugins/monitoring/components/beats';
import { formatMetric } from 'plugins/monitoring/lib/format_number';
import { EuiMonitoringTable } from 'plugins/monitoring/components/table';
import { i18n } from '@kbn/i18n';
import { BEATS_SYSTEM_ID } from '../../../../common/constants';
import { ListingCallOut } from '../../setup_mode/listing_callout';
import { SetupModeBadge } from '../../setup_mode/badge';
import { FormattedMessage } from '@kbn/i18n/react';

export class Listing extends PureComponent {
getColumns() {
Expand Down Expand Up @@ -139,6 +147,14 @@ export class Listing extends PureComponent {
return (
<EuiPage>
<EuiPageBody>
<EuiScreenReaderOnly>
<h1>
<FormattedMessage
id="xpack.monitoring.beats.listing.heading"
defaultMessage="Beats listing"
/>
</h1>
</EuiScreenReaderOnly>
<EuiPageContent>
<Stats stats={stats} />
<EuiSpacer size="m" />
Expand Down
30 changes: 24 additions & 6 deletions ...y/plugins/monitoring/public/components/beats/overview/__snapshots__/overview.test.js.snap
View file
Open in desktop

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

21 changes: 15 additions & 6 deletions x-pack/legacy/plugins/monitoring/public/components/beats/overview/overview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import {
EuiPageBody,
EuiPanel,
EuiPageContent,
EuiScreenReaderOnly,
} from '@elastic/eui';
import { FormattedMessage } from '@kbn/i18n/react';
import { i18n } from '@kbn/i18n';
Expand All @@ -31,12 +32,12 @@ function renderLatestActive(latestActive, latestTypes, latestVersions) {
<EuiFlexItem>
<EuiPanel>
<EuiTitle size="s">
<h3>
<h2>
<FormattedMessage
id="xpack.monitoring.beats.overview.activeBeatsInLastDayTitle"
defaultMessage="Active Beats in Last Day"
/>
</h3>
</h2>
</EuiTitle>
<EuiSpacer size="s" />
<LatestActive latestActive={latestActive} />
Expand All @@ -45,12 +46,12 @@ function renderLatestActive(latestActive, latestTypes, latestVersions) {
<EuiFlexItem>
<EuiPanel>
<EuiTitle size="s">
<h3>
<h2>
<FormattedMessage
id="xpack.monitoring.beats.overview.top5BeatTypesInLastDayTitle"
defaultMessage="Top 5 Beat Types in Last Day"
/>
</h3>
</h2>
</EuiTitle>
<EuiSpacer size="s" />
<LatestTypes latestTypes={latestTypes} />
Expand All @@ -59,12 +60,12 @@ function renderLatestActive(latestActive, latestTypes, latestVersions) {
<EuiFlexItem>
<EuiPanel>
<EuiTitle size="s">
<h3>
<h2>
<FormattedMessage
id="xpack.monitoring.beats.overview.top5VersionsInLastDayTitle"
defaultMessage="Top 5 Versions in Last Day"
/>
</h3>
</h2>
</EuiTitle>
<EuiSpacer size="s" />
<LatestVersions latestVersions={latestVersions} />
Expand Down Expand Up @@ -109,6 +110,14 @@ export function BeatsOverview({
return (
<EuiPage>
<EuiPageBody>
<EuiScreenReaderOnly>
<h1>
<FormattedMessage
id="xpack.monitoring.beats.overview.heading"
defaultMessage="Beats Overview"
/>
</h1>
</EuiScreenReaderOnly>
<EuiPageContent>
<Stats stats={stats} />
{renderLatestActive(latestActive, latestTypes, latestVersions)}
Expand Down
4 changes: 2 additions & 2 deletions x-pack/legacy/plugins/monitoring/public/components/cluster/overview/alerts_panel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,12 +91,12 @@ export function AlertsPanel({ alerts, changeUrl }) {
<EuiFlexGroup justifyContent="spaceBetween">
<EuiFlexItem grow={false}>
<EuiTitle size="s">
<h4>
<h2>
<FormattedMessage
id="xpack.monitoring.cluster.overview.alertsPanel.topClusterTitle"
defaultMessage="Top cluster alerts"
/>
</h4>
</h2>
</EuiTitle>
</EuiFlexItem>
<EuiFlexItem grow={false}>
Expand Down
11 changes: 10 additions & 1 deletion x-pack/legacy/plugins/monitoring/public/components/cluster/overview/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,25 @@ import { LogstashPanel } from './logstash_panel';
import { AlertsPanel } from './alerts_panel';
import { BeatsPanel } from './beats_panel';

import { EuiPage, EuiPageBody } from '@elastic/eui';
import { EuiPage, EuiPageBody, EuiScreenReaderOnly } from '@elastic/eui';
import { ApmPanel } from './apm_panel';
import { STANDALONE_CLUSTER_CLUSTER_UUID } from '../../../../common/constants';
import { FormattedMessage } from '@kbn/i18n/react';

export function Overview(props) {
const isFromStandaloneCluster = props.cluster.cluster_uuid === STANDALONE_CLUSTER_CLUSTER_UUID;

return (
<EuiPage>
<EuiPageBody>
<EuiScreenReaderOnly>
<h1>
<FormattedMessage
id="xpack.monitoring.overview.heading"
defaultMessage="Stack Monitoring Overview"
/>
</h1>
</EuiScreenReaderOnly>
<AlertsPanel alerts={props.cluster.alerts} changeUrl={props.changeUrl} />

{!isFromStandaloneCluster ? (
Expand Down
9 changes: 9 additions & 0 deletions ...acy/plugins/monitoring/public/components/elasticsearch/ccr/__snapshots__/ccr.test.js.snap
View file
Open in desktop

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

9 changes: 9 additions & 0 deletions x-pack/legacy/plugins/monitoring/public/components/elasticsearch/ccr/ccr.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import {
EuiIcon,
EuiIconTip,
EuiTextColor,
EuiScreenReaderOnly,
} from '@elastic/eui';

import './ccr.css';
Expand Down Expand Up @@ -270,6 +271,14 @@ export class Ccr extends Component {
return (
<EuiPage>
<EuiPageBody>
<EuiScreenReaderOnly>
<h1>
<FormattedMessage
id="xpack.monitoring.elasticsearch.ccr.heading"
defaultMessage="CCR"
/>
</h1>
</EuiScreenReaderOnly>
<EuiPageContent>
<EuiPageContentBody>{this.renderTable()}</EuiPageContentBody>
</EuiPageContent>
Expand Down
4 changes: 2 additions & 2 deletions ...monitoring/public/components/elasticsearch/ccr_shard/__snapshots__/ccr_shard.test.js.snap
View file
Open in desktop

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

Loading