Skip to content

[ObsUX][A11y] Add aria-label to group by count #217302

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

Merged
MiriamAparicio merged 2 commits into from
Apr 7, 2025
Merged

[ObsUX][A11y] Add aria-label to group by count #217302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6df4b07
Add aria-lable to group by count
MiriamAparicio Apr 7, 2025
42c8a36
Merge branch 'main' into a11y-group-name-count-node-type
MiriamAparicio Apr 7, 2025
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
28 changes: 20 additions & 8 deletions ...bility/plugins/infra/public/pages/metrics/inventory_view/components/waffle/group_name.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@

import { EuiButtonEmpty, EuiScreenReaderOnly, EuiToolTip, useEuiFontSize } from '@elastic/eui';
import React, { useCallback, useState } from 'react';
import { i18n } from '@kbn/i18n';
import styled from '@emotion/styled';
import type { InventoryItemType } from '@kbn/metrics-data-access-plugin/common';
import { i18n } from '@kbn/i18n';
import type {
InfraWaffleMapGroup,
InfraWaffleMapOptions,
Expand All @@ -19,9 +20,10 @@ interface Props {
group: InfraWaffleMapGroup;
isChild?: boolean;
options: InfraWaffleMapOptions;
nodeType: InventoryItemType;
}

export const GroupName: React.FC<Props> = ({ onDrilldown, group, isChild, options }) => {
export const GroupName: React.FC<Props> = ({ onDrilldown, group, isChild, options, nodeType }) => {
const [a11yAnnouncement, setA11yAnnouncement] = useState('');

const handleClick = useCallback(
Expand Down Expand Up @@ -69,19 +71,29 @@ export const GroupName: React.FC<Props> = ({ onDrilldown, group, isChild, option
<Name>
<EuiToolTip position="top" content={group.name}>
<EuiButtonEmpty
aria-label={i18n.translate('xpack.infra.inventory.groupBySelectorButtonLabel', {
defaultMessage: 'Group by {group}',
values: { group: group.name },
})}
style={buttonStyle}
aria-label={i18n.translate(
'xpack.infra.inventory.groupBySelectorButton.ariaLabel',
{
defaultMessage: 'Group by {group}',
values: { group: group.name },
}
)}
css={buttonStyle}
onClick={handleClick}
data-test-subj="groupNameButton"
>
{group.name}
</EuiButtonEmpty>
</EuiToolTip>
</Name>
<Count>{group.count}</Count>
<Count
aria-label={i18n.translate('xpack.infra.inventory.groupByCount.ariaLabel', {
defaultMessage: '{count} {nodeType} in this group',
values: { nodeType, count: group.count },
})}
>
{group.count}
</Count>
</Inner>
</GroupNameContainer>
</>
Expand Down
7 changes: 6 additions & 1 deletion ...y/plugins/infra/public/pages/metrics/inventory_view/components/waffle/group_of_groups.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,12 @@ interface Props {
export const GroupOfGroups: React.FC<Props> = (props) => {
return (
<GroupOfGroupsContainer>
<GroupName group={props.group} onDrilldown={props.onDrilldown} options={props.options} />
<GroupName
group={props.group}
onDrilldown={props.onDrilldown}
options={props.options}
nodeType={props.nodeType}
/>
<Groups>
{props.group.groups.map((group) => (
<GroupOfNodes
Expand Down
8 changes: 7 additions & 1 deletion ...ty/plugins/infra/public/pages/metrics/inventory_view/components/waffle/group_of_nodes.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,13 @@ export const GroupOfNodes = React.memo<Props>(

return (
<GroupOfNodesContainer style={{ width }}>
<GroupName group={group} onDrilldown={onDrilldown} isChild={isChild} options={options} />
<GroupName
group={group}
onDrilldown={onDrilldown}
isChild={isChild}
options={options}
nodeType={nodeType}
/>
<Nodes>
{group.width ? (
group.nodes.map((node) => (
Expand Down