feat(ui): clear panel form inputs when closed

This commit replaces the SSH key-specific code in favor of resetting
panel forms when closed, which thus carries the same behavior over to
the GPG key field.
This commit is contained in:
Jordan Atwood 2025-08-29 14:29:18 -07:00
commit 4dcec32505
No known key found for this signature in database
GPG key ID: 615A619C2D73A6DF
5 changed files with 29 additions and 12 deletions

View file

@ -96,3 +96,16 @@ test('User: Canceling adding SSH key clears inputs', async ({browser}, workerInf
const content = page.locator('#ssh-key-content'); const content = page.locator('#ssh-key-content');
await expect(content).toHaveValue(''); await expect(content).toHaveValue('');
}); });
test('User: Canceling adding GPG key clears input', async ({browser}, workerInfo) => {
const page = await login({browser}, workerInfo);
await page.goto('/user/settings/keys');
await page.locator('.show-panel[data-panel="#add-gpg-key-panel"]').click();
const gpgKeyContent = page.locator('#gpg-key-content');
await gpgKeyContent.fill('Wront key material');
await page.locator('.hide-panel[data-panel="#add-gpg-key-panel"]').click();
await expect(gpgKeyContent).toHaveValue('');
});

View file

@ -5,7 +5,7 @@ import {createDropzone} from './dropzone.js';
import {showGlobalErrorMessage} from '../bootstrap.js'; import {showGlobalErrorMessage} from '../bootstrap.js';
import {handleGlobalEnterQuickSubmit} from './comp/QuickSubmit.js'; import {handleGlobalEnterQuickSubmit} from './comp/QuickSubmit.js';
import {svg} from '../svg.js'; import {svg} from '../svg.js';
import {hideElem, showElem, toggleElem, initSubmitEventPolyfill, submitEventSubmitter} from '../utils/dom.js'; import {hideElem, showElem, toggleElem, resetForms, initSubmitEventPolyfill, submitEventSubmitter} from '../utils/dom.js';
import {htmlEscape} from 'escape-goat'; import {htmlEscape} from 'escape-goat';
import {showTemporaryTooltip} from '../modules/tippy.js'; import {showTemporaryTooltip} from '../modules/tippy.js';
import {confirmModal} from './comp/ConfirmModal.js'; import {confirmModal} from './comp/ConfirmModal.js';
@ -507,12 +507,16 @@ export function initGlobalButtons() {
e.preventDefault(); e.preventDefault();
let sel = e.currentTarget.getAttribute('data-panel'); let sel = e.currentTarget.getAttribute('data-panel');
if (sel) { if (sel) {
hideElem(sel); const element = document.querySelector(sel);
hideElem(element);
resetForms(element);
return; return;
} }
sel = e.currentTarget.getAttribute('data-panel-closest'); sel = e.currentTarget.getAttribute('data-panel-closest');
if (sel) { if (sel) {
hideElem(e.currentTarget.closest(sel)); const element = e.currentTarget.closest(sel);
hideElem(element);
resetForms(element);
return; return;
} }
// should never happen, otherwise there is a bug in code // should never happen, otherwise there is a bug in code

View file

@ -8,10 +8,3 @@ export function initSshKeyFormParser() {
} }
}); });
} }
export function initSshKeyCancelButton() {
document.getElementById('cancel-ssh-button')?.addEventListener('click', () => {
document.getElementById('ssh-key-title').value = '';
document.getElementById('ssh-key-content').value = '';
});
}

View file

@ -49,7 +49,7 @@ import {initAdminEmails} from './features/admin/emails.js';
import {initAdminCommon} from './features/admin/common.js'; import {initAdminCommon} from './features/admin/common.js';
import {initRepoTemplateSearch} from './features/repo-template.js'; import {initRepoTemplateSearch} from './features/repo-template.js';
import {initRepoCodeView} from './features/repo-code.js'; import {initRepoCodeView} from './features/repo-code.js';
import {initSshKeyFormParser, initSshKeyCancelButton} from './features/sshkey-helper.js'; import {initSshKeyFormParser} from './features/sshkey-helper.js';
import {initRepoArchiveLinks} from './features/repo-common.js'; import {initRepoArchiveLinks} from './features/repo-common.js';
import {initRepoMigrationStatusChecker} from './features/repo-migrate.js'; import {initRepoMigrationStatusChecker} from './features/repo-migrate.js';
import { import {
@ -122,7 +122,6 @@ onDomReady(() => {
initMarkupAnchors(); initMarkupAnchors();
initMarkupContent(); initMarkupContent();
initSshKeyFormParser(); initSshKeyFormParser();
initSshKeyCancelButton();
initStopwatch(); initStopwatch();
initTableSort(); initTableSort();
initAutoFocusEnd(); initAutoFocusEnd();

View file

@ -51,6 +51,14 @@ export function isElemHidden(el) {
return res[0]; return res[0];
} }
export function resetForms(el) {
queryElemChildren(el, 'form', resetForm);
}
function resetForm(form) {
form.reset();
}
function applyElemsCallback(elems, fn) { function applyElemsCallback(elems, fn) {
if (fn) { if (fn) {
for (const el of elems) { for (const el of elems) {