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

fix(components): fix all outdated OUIA props passing #2169

Merged
merged 1 commit into from
Feb 14, 2025
Merged

fix(components): fix all outdated OUIA props passing #2169

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
38 changes: 19 additions & 19 deletions package-lock.json
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions packages/components/src/BulkSelect/BulkSelect.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ const BulkSelect: React.FunctionComponent<BulkSelectProps> = ({
<Dropdown
onSelect={() => onToggle(false)}
onOpenChange={(isOpen: boolean) => setIsOpen(isOpen)}
data-ouia-component-id={dropdownOuiaId ?? 'BulkSelect'}
ouiaId={dropdownOuiaId ?? 'BulkSelect'}
{...props}
className={classnames(className, 'ins-c-bulk-select')}
ouiaSafe={ouiaSafe}
Expand All @@ -77,7 +77,7 @@ const BulkSelect: React.FunctionComponent<BulkSelectProps> = ({
isExpanded={isOpen}
ref={toggleRef}
onClick={() => setIsOpen((prev) => !prev)}
data-ouia-component-id={dropdownOuiaId ?? 'BulkSelect'}
ouiaId={dropdownOuiaId ?? 'BulkSelect'}
>
{toggleProps?.children ? (
toggleProps?.children
Expand Down
8 changes: 4 additions & 4 deletions packages/components/src/BulkSelect/__snapshots__/BulkSelect.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ exports[`BulkSelect should render correctly - null checked 1`] = `
<button
aria-expanded="false"
class="pf-v5-c-menu-toggle"
data-ouia-component-id="OUIA-Generated-MenuToggle-3"
data-ouia-component-id="BulkSelect"
data-ouia-component-type="PF5/MenuToggle"
data-ouia-safe="true"
type="button"
Expand Down Expand Up @@ -77,7 +77,7 @@ exports[`BulkSelect should render correctly 1`] = `
<button
aria-expanded="false"
class="pf-v5-c-menu-toggle"
data-ouia-component-id="OUIA-Generated-MenuToggle-1"
data-ouia-component-id="BulkSelect"
data-ouia-component-type="PF5/MenuToggle"
data-ouia-safe="true"
type="button"
Expand Down Expand Up @@ -137,7 +137,7 @@ exports[`BulkSelect should render correctly 2`] = `
<button
aria-expanded="false"
class="pf-v5-c-menu-toggle"
data-ouia-component-id="OUIA-Generated-MenuToggle-2"
data-ouia-component-id="BulkSelect"
data-ouia-component-type="PF5/MenuToggle"
data-ouia-safe="true"
type="button"
Expand Down Expand Up @@ -190,7 +190,7 @@ exports[`BulkSelect should render custom props 1`] = `
<button
aria-expanded="false"
class="pf-v5-c-menu-toggle"
data-ouia-component-id="OUIA-Generated-MenuToggle-4"
data-ouia-component-id="BulkSelect"
data-ouia-component-type="PF5/MenuToggle"
data-ouia-safe="true"
type="button"
Expand Down
4 changes: 2 additions & 2 deletions packages/components/src/PageHeader/PageHeaderTitle.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ const PageHeaderTitle: React.FC<PageHeaderTitleProps> = ({ className, title, act
className={pageHeaderTitleClasses}
widget-type="InsightsPageHeaderTitle"
data-ouia-component-type={ouiaComponentType}
data-ouia-component-id={ouiaFinalId}
data-ouia-safe={ouiaSafe}
ouiaId={ouiaFinalId}
ouiaSafe={ouiaSafe}
{...props}
>
{title}
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/PrimaryToolbar/Actions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ const Actions: React.FunctionComponent<ActionsProps> = ({
variant="plain"
onClick={() => setIsOpen((prev) => !prev)}
isExpanded={isOpen}
data-ouia-component-id="BulkActionsToggle"
ouiaId="BulkActionsToggle"
>
<EllipsisVIcon />
</MenuToggle>
Expand Down
14 changes: 7 additions & 7 deletions packages/components/src/PrimaryToolbar/__snapshots__/Actions.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ exports[`Actions - component API should update open 1`] = `
aria-expanded="true"
aria-label="kebab dropdown toggle"
class="pf-v5-c-menu-toggle pf-m-expanded pf-m-plain"
data-ouia-component-id="OUIA-Generated-MenuToggle-plain-8"
data-ouia-component-id="BulkActionsToggle"
data-ouia-component-type="PF5/MenuToggle"
data-ouia-safe="true"
type="button"
Expand Down Expand Up @@ -172,7 +172,7 @@ exports[`Actions - component should render actionObject as first action 1`] = `
aria-expanded="false"
aria-label="kebab dropdown toggle"
class="pf-v5-c-menu-toggle pf-m-plain"
data-ouia-component-id="OUIA-Generated-MenuToggle-plain-7"
data-ouia-component-id="BulkActionsToggle"
data-ouia-component-type="PF5/MenuToggle"
data-ouia-safe="true"
type="button"
Expand Down Expand Up @@ -211,7 +211,7 @@ exports[`Actions - component should render actions and overflow 1`] = `
aria-expanded="false"
aria-label="kebab dropdown toggle"
class="pf-v5-c-menu-toggle pf-m-plain"
data-ouia-component-id="OUIA-Generated-MenuToggle-plain-3"
data-ouia-component-id="BulkActionsToggle"
data-ouia-component-type="PF5/MenuToggle"
data-ouia-safe="true"
type="button"
Expand Down Expand Up @@ -243,7 +243,7 @@ exports[`Actions - component should render empty actions 1`] = `
aria-expanded="false"
aria-label="kebab dropdown toggle"
class="pf-v5-c-menu-toggle pf-m-plain"
data-ouia-component-id="OUIA-Generated-MenuToggle-plain-2"
data-ouia-component-id="BulkActionsToggle"
data-ouia-component-type="PF5/MenuToggle"
data-ouia-safe="true"
type="button"
Expand Down Expand Up @@ -282,7 +282,7 @@ exports[`Actions - component should render just actions 1`] = `
aria-expanded="false"
aria-label="kebab dropdown toggle"
class="pf-v5-c-menu-toggle pf-m-plain"
data-ouia-component-id="OUIA-Generated-MenuToggle-plain-1"
data-ouia-component-id="BulkActionsToggle"
data-ouia-component-type="PF5/MenuToggle"
data-ouia-safe="true"
type="button"
Expand Down Expand Up @@ -323,7 +323,7 @@ exports[`Actions - component should render one action 1`] = `
aria-expanded="false"
aria-label="kebab dropdown toggle"
class="pf-v5-c-menu-toggle pf-m-plain"
data-ouia-component-id="OUIA-Generated-MenuToggle-plain-4"
data-ouia-component-id="BulkActionsToggle"
data-ouia-component-type="PF5/MenuToggle"
data-ouia-safe="true"
type="button"
Expand Down Expand Up @@ -362,7 +362,7 @@ exports[`Actions - component should render one action and multiple overflow 1`]
aria-expanded="false"
aria-label="kebab dropdown toggle"
class="pf-v5-c-menu-toggle pf-m-plain"
data-ouia-component-id="OUIA-Generated-MenuToggle-plain-5"
data-ouia-component-id="BulkActionsToggle"
data-ouia-component-type="PF5/MenuToggle"
data-ouia-safe="true"
type="button"
Expand Down
10 changes: 5 additions & 5 deletions packages/components/src/PrimaryToolbar/__snapshots__/PrimaryToolbar.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ exports[`PrimaryToolbar should render with data full config 1`] = `
<button
aria-expanded="false"
class="pf-v5-c-menu-toggle"
data-ouia-component-id="OUIA-Generated-MenuToggle-1"
data-ouia-component-id="BulkSelect"
data-ouia-component-type="PF5/MenuToggle"
data-ouia-safe="true"
type="button"
Expand Down Expand Up @@ -410,7 +410,7 @@ exports[`PrimaryToolbar should render with data full config 1`] = `
aria-expanded="false"
aria-label="kebab dropdown toggle"
class="pf-v5-c-menu-toggle pf-m-plain"
data-ouia-component-id="OUIA-Generated-MenuToggle-plain-2"
data-ouia-component-id="BulkActionsToggle"
data-ouia-component-type="PF5/MenuToggle"
data-ouia-safe="true"
type="button"
Expand Down Expand Up @@ -933,7 +933,7 @@ exports[`PrimaryToolbar should render with data only - bulk select 1`] = `
<button
aria-expanded="false"
class="pf-v5-c-menu-toggle"
data-ouia-component-id="OUIA-Generated-MenuToggle-3"
data-ouia-component-id="BulkSelect"
data-ouia-component-type="PF5/MenuToggle"
data-ouia-safe="true"
type="button"
Expand Down Expand Up @@ -1173,7 +1173,7 @@ exports[`PrimaryToolbar should render wrong actionsConfig 1`] = `
<button
aria-expanded="false"
class="pf-v5-c-menu-toggle"
data-ouia-component-id="OUIA-Generated-MenuToggle-5"
data-ouia-component-id="BulkSelect"
data-ouia-component-type="PF5/MenuToggle"
data-ouia-safe="true"
type="button"
Expand Down Expand Up @@ -1380,7 +1380,7 @@ exports[`PrimaryToolbar should render wrong actionsConfig 1`] = `
aria-expanded="false"
aria-label="kebab dropdown toggle"
class="pf-v5-c-menu-toggle pf-m-plain"
data-ouia-component-id="OUIA-Generated-MenuToggle-plain-4"
data-ouia-component-id="BulkActionsToggle"
data-ouia-component-type="PF5/MenuToggle"
data-ouia-safe="true"
type="button"
Expand Down
8 changes: 1 addition & 7 deletions packages/components/src/TableToolbar/TableToolbar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,7 @@ const TableToolbar: React.FunctionComponent<TableToolbarProps> = ({

return (
<Fragment>
<Toolbar
className={tableToolbarClasses}
data-ouia-component-type={ouiaComponentType}
data-ouia-component-id={ouiaFinalId}
data-ouia-safe={ouiaSafe}
{...props}
>
<Toolbar className={tableToolbarClasses} data-ouia-component-type={ouiaComponentType} ouiaId={ouiaFinalId} ouiaSafe={ouiaSafe} {...props}>
{children}
</Toolbar>
{((results && results >= 0) || (selected && selected >= 0)) && (
Expand Down
4 changes: 2 additions & 2 deletions packages/components/src/TagModal/__snapshots__/TableWithFilter.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ exports[`TableWithFilter should render with data and bulk select with calculate
<button
aria-expanded="false"
class="pf-v5-c-menu-toggle"
data-ouia-component-id="OUIA-Generated-MenuToggle-2"
data-ouia-component-id="BulkSelect"
data-ouia-component-type="PF5/MenuToggle"
data-ouia-safe="true"
type="button"
Expand Down Expand Up @@ -771,7 +771,7 @@ exports[`TableWithFilter should render with data and bulk select without calcula
<button
aria-expanded="false"
class="pf-v5-c-menu-toggle"
data-ouia-component-id="OUIA-Generated-MenuToggle-1"
data-ouia-component-id="BulkSelect"
data-ouia-component-type="PF5/MenuToggle"
data-ouia-safe="true"
type="button"
Expand Down
Loading