Skip to content

[Security Solution] [Onboarding] a11y: Fix incorrect navigation after Save on AI assistant modal dialog #219935

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
agusruidiazgd merged 7 commits into from
May 21, 2025
Merged

[Security Solution] [Onboarding] a11y: Fix incorrect navigation after Save on AI assistant modal dialog #219935

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
573128a
[Security Solution] fix incorrect navigation when getting errors afte…
agusruidiazgd May 2, 2025
fb8a51f
Merge branch 'main' into fix/a11y-security-issue-204211
elasticmachine May 2, 2025
fe9da05
Merge branch 'main' into fix/a11y-security-issue-204211
elasticmachine May 5, 2025
7c4bd6b
Merge branch 'main' into fix/a11y-security-issue-204211
elasticmachine May 8, 2025
2df47d6
Merge branch 'main' into fix/a11y-security-issue-204211
elasticmachine May 19, 2025
adad113
fix comments
agusruidiazgd May 20, 2025
ac23e57
fix incorrect use of aria-invalid
agusruidiazgd May 20, 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
200 changes: 108 additions & 92 deletions ...gers_actions_ui/public/application/sections/action_connector_form/connector_add_modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ const ConnectorAddModal = ({
const [allActionTypes, setAllActionTypes] = useState<ActionTypeIndex | undefined>(undefined);
const { isLoading: isSavingConnector, createConnector } = useCreateConnector();
const isMounted = useRef(false);
const containerRef = useRef<HTMLDivElement>(null);
const [initialConnector, setInitialConnector] = useState({
actionTypeId: actionType?.id ?? '',
isDeprecated: false,
Expand Down Expand Up @@ -163,6 +164,19 @@ const ConnectorAddModal = ({

const createdConnector = await createConnector(validConnector);
return createdConnector;
} else {
// point the user to the first invalid field
const container = containerRef.current;
if (!container) return;

const selector = 'input[aria-invalid="true"]';
const firstInputInvalid = container.querySelector<HTMLInputElement>(selector);

if (firstInputInvalid) {
window.requestAnimationFrame(() => {
firstInputInvalid.focus({ preventScroll: false });
});
}
}
}, [submit, preSubmitValidator, createConnector]);

Expand Down Expand Up @@ -222,108 +236,110 @@ const ConnectorAddModal = ({
className="actConnectorModal"
css={css`
z-index: 9000;
width: ${actionTypeRegistry.get(actionType.id).modalWidth};
Copy link
Copy Markdown
Contributor Author

@agusruidiazgd agusruidiazgd May 2, 2025

Choose a reason for hiding this comment

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

ESLint auto-fix

`}
data-test-subj="connectorAddModal"
onClose={closeModal}
style={{ width: actionTypeRegistry.get(actionType.id).modalWidth }}
aria-labelledby={modalTitleId}
>
<EuiModalHeader>
<EuiFlexGroup gutterSize="m" alignItems="center">
{actionTypeModel && actionTypeModel.iconClass ? (
<div ref={containerRef}>
<EuiModalHeader>
<EuiFlexGroup gutterSize="m" alignItems="center">
{actionTypeModel && actionTypeModel.iconClass ? (
<EuiFlexItem grow={false}>
<EuiIcon type={actionTypeModel.iconClass} size="xl" />
</EuiFlexItem>
) : null}
<EuiFlexItem grow={false}>
<EuiIcon type={actionTypeModel.iconClass} size="xl" />
<EuiFlexGroup gutterSize="s" justifyContent="center" alignItems="center">
<EuiFlexItem>
<EuiModalHeaderTitle id={modalTitleId} size="s" component="h3">
<FormattedMessage
defaultMessage="{actionTypeName} connector"
id="xpack.triggersActionsUI.sections.addModalConnectorForm.flyoutTitle"
values={{
actionTypeName: actionType.name,
}}
/>
</EuiModalHeaderTitle>
</EuiFlexItem>
{actionTypeModel && actionTypeModel.isExperimental && (
<EuiFlexItem className="betaBadgeFlexItem" grow={false}>
<EuiBetaBadge
label={TECH_PREVIEW_LABEL}
tooltipContent={TECH_PREVIEW_DESCRIPTION}
/>
</EuiFlexItem>
)}
</EuiFlexGroup>
</EuiFlexItem>
) : null}
<EuiFlexItem grow={false}>
<EuiFlexGroup gutterSize="s" justifyContent="center" alignItems="center">
<EuiFlexItem>
<EuiModalHeaderTitle id={modalTitleId} size="s" component="h3">
<FormattedMessage
defaultMessage="{actionTypeName} connector"
id="xpack.triggersActionsUI.sections.addModalConnectorForm.flyoutTitle"
values={{
actionTypeName: actionType.name,
}}
/>
</EuiModalHeaderTitle>
</EuiFlexItem>
{actionTypeModel && actionTypeModel.isExperimental && (
<EuiFlexItem className="betaBadgeFlexItem" grow={false}>
<EuiBetaBadge
label={TECH_PREVIEW_LABEL}
tooltipContent={TECH_PREVIEW_DESCRIPTION}
</EuiFlexGroup>
</EuiModalHeader>

<EuiModalBody>
{loadingActionTypes ? (
<SectionLoading>
<FormattedMessage
id="xpack.triggersActionsUI.sections.connectorAddModal.loadingConnectorTypesDescription"
defaultMessage="Loading connector types…"
/>
</SectionLoading>
) : (
<>
{groupActionTypeModel && (
<>
<EuiButtonGroup
isFullWidth
buttonSize="m"
color="primary"
legend=""
options={groupActionButtons}
idSelected={actionType.id}
onChange={onChangeGroupAction}
data-test-subj="slackTypeChangeButton"
/>
</EuiFlexItem>
<EuiSpacer size="xs" />
</>
)}
</EuiFlexGroup>
</EuiFlexItem>
</EuiFlexGroup>
</EuiModalHeader>

<EuiModalBody>
{loadingActionTypes ? (
<SectionLoading>
<FormattedMessage
id="xpack.triggersActionsUI.sections.connectorAddModal.loadingConnectorTypesDescription"
defaultMessage="Loading connector types…"
/>
</SectionLoading>
) : (
<>
{groupActionTypeModel && (
<>
<EuiButtonGroup
isFullWidth
buttonSize="m"
color="primary"
legend=""
options={groupActionButtons}
idSelected={actionType.id}
onChange={onChangeGroupAction}
data-test-subj="slackTypeChangeButton"
/>
<EuiSpacer size="xs" />
</>
)}
<ConnectorForm
actionTypeModel={actionTypeModel}
connector={initialConnector}
isEdit={false}
onChange={setFormState}
setResetForm={setResetForm}
/>
{preSubmitValidationErrorMessage}
</>
)}
</EuiModalBody>
<EuiModalFooter>
<EuiButtonEmpty onClick={closeModal} isLoading={isSaving}>
{i18n.translate(
'xpack.triggersActionsUI.sections.addModalConnectorForm.cancelButtonLabel',
{
defaultMessage: 'Cancel',
}
<ConnectorForm
actionTypeModel={actionTypeModel}
connector={initialConnector}
isEdit={false}
onChange={setFormState}
setResetForm={setResetForm}
/>
{preSubmitValidationErrorMessage}
</>
)}
</EuiButtonEmpty>
{canSave ? (
<EuiButton
fill
color="primary"
data-test-subj="saveActionButtonModal"
type="submit"
iconType="check"
isLoading={isSaving}
disabled={hasErrors}
onClick={onSubmit}
>
<FormattedMessage
id="xpack.triggersActionsUI.sections.addModalConnectorForm.saveButtonLabel"
defaultMessage="Save"
/>
</EuiButton>
) : null}
</EuiModalFooter>
</EuiModalBody>
<EuiModalFooter>
<EuiButtonEmpty onClick={closeModal} isLoading={isSaving}>
{i18n.translate(
'xpack.triggersActionsUI.sections.addModalConnectorForm.cancelButtonLabel',
{
defaultMessage: 'Cancel',
}
)}
</EuiButtonEmpty>
{canSave ? (
<EuiButton
fill
color="primary"
data-test-subj="saveActionButtonModal"
type="submit"
iconType="check"
isLoading={isSaving}
disabled={hasErrors}
onClick={onSubmit}
>
<FormattedMessage
id="xpack.triggersActionsUI.sections.addModalConnectorForm.saveButtonLabel"
defaultMessage="Save"
/>
</EuiButton>
) : null}
</EuiModalFooter>
</div>
</EuiModal>
);
};
Expand Down