Skip to content

Installer: Improves user accessibility by adding missing <form> elements and setting the right focus #20265

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
leekelleher merged 2 commits into from
Sep 25, 2025
Merged

Installer: Improves user accessibility by adding missing <form> elements and setting the right focus #20265

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
edc8009
fix: adds a <form> element around the consent/telemetry step to ensur…
iOvergaard Sep 25, 2025
a099287
fix: adds umbFocus to select inputs to allow the user to proceed with…
iOvergaard Sep 25, 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
20 changes: 13 additions & 7 deletions src/Umbraco.Web.UI.Client/src/apps/installer/consent/installer-consent.element.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import type {
TelemetryResponseModel,
} from '@umbraco-cms/backoffice/external/backend-api';
import { TelemetryLevelModel } from '@umbraco-cms/backoffice/external/backend-api';
import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
import { umbFocus, UmbLitElement } from '@umbraco-cms/backoffice/lit-element';

@customElement('umb-installer-consent')
export class UmbInstallerConsentElement extends UmbLitElement {
Expand Down Expand Up @@ -54,7 +54,8 @@ export class UmbInstallerConsentElement extends UmbLitElement {
this._installerContext?.appendData(value);
}

private _onNext() {
private _onNext(evt: SubmitEvent) {
evt.preventDefault();
this._installerContext?.nextStep();
}

Expand All @@ -75,6 +76,7 @@ export class UmbInstallerConsentElement extends UmbLitElement {

return html`
<uui-slider
${umbFocus()}
@input=${this._handleChange}
name="telemetryLevel"
label="telemetry-level"
Expand All @@ -91,11 +93,15 @@ export class UmbInstallerConsentElement extends UmbLitElement {
return html`
<div id="container" class="uui-text" data-test="installer-telemetry">
<h1>Consent for telemetry data</h1>
${this._renderSlider()}
<div id="buttons">
<uui-button label="Back" @click=${this._onBack} look="secondary"></uui-button>
<uui-button id="button-install" @click=${this._onNext} label="Next" look="primary"></uui-button>
</div>
<uui-form>
<form id="consent-form" name="consent" @submit=${this._onNext}>
${this._renderSlider()}
<div id="buttons">
<uui-button label="Back" @click=${this._onBack} look="secondary"></uui-button>
<uui-button id="button-install" type="submit" label="Next" look="primary"></uui-button>
</div>
</form>
</uui-form>
</div>
`;
}
Expand Down
4 changes: 3 additions & 1 deletion src/Umbraco.Web.UI.Client/src/apps/installer/database/installer-database.element.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import type {
DatabaseSettingsPresentationModel,
} from '@umbraco-cms/backoffice/external/backend-api';
import { InstallService } from '@umbraco-cms/backoffice/external/backend-api';
import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
import { umbFocus, UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
import { tryExecute, UmbApiError } from '@umbraco-cms/backoffice/resources';

@customElement('umb-installer-database')
Expand Down Expand Up @@ -238,6 +238,7 @@ export class UmbInstallerDatabaseElement extends UmbLitElement {
<uui-form-layout-item>
<uui-label for="server" slot="label" required>Server address</uui-label>
<uui-input
${umbFocus()}
type="text"
id="server"
name="server"
Expand All @@ -254,6 +255,7 @@ export class UmbInstallerDatabaseElement extends UmbLitElement {
html` <uui-form-layout-item>
<uui-label for="database-name" slot="label" required>Database Name</uui-label>
<uui-input
${umbFocus()}
type="text"
.value=${value}
id="database-name"
Expand Down
9 changes: 5 additions & 4 deletions src/Umbraco.Web.UI.Client/src/apps/installer/user/installer-user.element.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import type { UmbInstallerContext } from '../installer.context.js';
import { UMB_INSTALLER_CONTEXT } from '../installer.context.js';
import type { CSSResultGroup } from '@umbraco-cms/backoffice/external/lit';
import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit';
import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
import { umbFocus, UmbLitElement } from '@umbraco-cms/backoffice/lit-element';

@customElement('umb-installer-user')
export class UmbInstallerUserElement extends UmbLitElement {
Expand Down Expand Up @@ -67,9 +67,10 @@ export class UmbInstallerUserElement extends UmbLitElement {
<uui-form-layout-item>
<uui-label id="nameLabel" for="name" slot="label" required>Name</uui-label>
<uui-input
${umbFocus()}
type="text"
id="name"
.value=${this._userFormData?.name}
.value=${this._userFormData?.name ?? ''}
name="name"
label="name"
required
Expand All @@ -81,7 +82,7 @@ export class UmbInstallerUserElement extends UmbLitElement {
<uui-input
type="email"
id="email"
.value=${this._userFormData?.email}
.value=${this._userFormData?.email ?? ''}
name="email"
label="email"
required
Expand All @@ -95,7 +96,7 @@ export class UmbInstallerUserElement extends UmbLitElement {
name="password"
label="password"
minlength=${this._minimumPasswordLength}
.value=${this._userFormData?.password}
.value=${this._userFormData?.password ?? ''}
required
required-message="Password is required"></uui-input-password>
</uui-form-layout-item>
Expand Down
Loading