Skip to content

fix(manager): Enter saves / Escape cancels per-key data limit dialog #2883

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

Open
whoalin1 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix(manager): Enter saves / Escape cancels per-key data limit dialog #2883

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
513b83a
fix(manager): Enter saves / Escape cancels per-key data limit dialog
whoalin1 Oct 7, 2026
3430943
fix(manager): use paper-dialog Escape handling and guard Enter save
whoalin1 Oct 8, 2026
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
39 changes: 30 additions & 9 deletions server_manager/www/ui_components/outline-per-key-data-limit-dialog.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,10 @@ export class OutlinePerKeyDataLimitDialog extends LitElement {
* input.
*/
@state() _enableSave = false;
/**
* @member _saving Whether a save request is in flight.
*/
@state() _saving = false;

/**
* @member language The ISO 3166-1 alpha-2 language code used for i18n.
Expand Down Expand Up @@ -204,7 +208,7 @@ export class OutlinePerKeyDataLimitDialog extends LitElement {
<div id="buttonsSection">
<paper-button
id="save"
?disabled=${!this._enableSave}
?disabled=${!this._enableSave || this._saving}
@tap=${this._onSaveButtonTapped}
>${this.localize('save')}</paper-button
>
Expand All @@ -231,6 +235,7 @@ export class OutlinePerKeyDataLimitDialog extends LitElement {
value=${this._initialValue()}
size="7"
@keyup=${this._setSaveButtonDisabledState}
@keydown=${this._onDataLimitInputKeydown}
>
</paper-input>
<paper-dropdown-menu id="unitsDropdown" noink>
Expand Down Expand Up @@ -297,19 +302,35 @@ export class OutlinePerKeyDataLimitDialog extends LitElement {
this._enableSave = !(this._input?.invalid ?? false);
}

private _onDataLimitInputKeydown(event: KeyboardEvent) {
if (event.key !== 'Enter') {
return;
}
event.preventDefault();
void this._onSaveButtonTapped();
}

private async _onSaveButtonTapped() {
if (!this._enableSave || this._saving) {
return;
}
const change = this._dataLimitChange();
if (change === Change.UNCHANGED) {
return;
}
const result =
change === Change.SET
? await this._onDataLimitSet(
displayDataAmountToBytes(this.inputDataLimit())
)
: await this._onDataLimitRemoved();
if (result) {
this.close();
this._saving = true;
try {
const result =
change === Change.SET
? await this._onDataLimitSet(
displayDataAmountToBytes(this.inputDataLimit())
)
: await this._onDataLimitRemoved();
if (result) {
this.close();
}
} finally {
this._saving = false;
}
}

Expand Down