starred/coolify
1
0
Fork 0
mirror of https://github.com/coollabsio/coolify.git synced 2026-08-24 02:24:11 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix(ui): release modal scroll lock before confirmation submission

Browse Source 
Close the confirmation modal before submitting destructive actions and reopen it when submission fails or returns an error.
This commit is contained in:
Andras Bacsai
2026-08-21 11:23:04 +02:00
parent 65f4649a7d
commit 15072b9cf7
2 changed files with 32 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/components/modal-confirmation.blade.php
+24 -17
View File
@@ -334,12 +334,15 @@
step++;
} else {
submitting = true;
submitForm().then((result) => {
submitting = false;
modalOpen = false;
resetModal();
}).catch(() => {
submitting = false;
modalOpen = false;
$nextTick(() => {
submitForm().then((result) => {
submitting = false;
resetModal();
}).catch(() => {
submitting = false;
modalOpen = true;
});
});
}
">
@@ -388,17 +391,21 @@
$wire.dispatch(dispatchEventType, dispatchEventMessage);
}
submitting = true;
submitForm().then((result) => {
submitting = false;
if (result === true) {
modalOpen = false;
resetModal();
} else {
passwordError = result;
password = '';
}
}).catch(() => {
submitting = false;
modalOpen = false;
$nextTick(() => {
submitForm().then((result) => {
submitting = false;
if (result === true) {
resetModal();
} else {
modalOpen = true;
passwordError = result;
password = '';
}
}).catch(() => {
submitting = false;
modalOpen = true;
});
});
">
<x-loading-on-button x-show="submitting" x-cloak />
tests/Feature/ModalScrollLockTest.php
+8
View File
@@ -7,3 +7,11 @@ test('confirmation modal closes before dispatching an event that can open anothe
'/if \(dispatchEvent\) \{\s*modalOpen = false;\s*\$nextTick\(\(\) => \$wire\.dispatch\(dispatchEventType, dispatchEventMessage\)\);/s'
);
});
test('confirmation modal releases its scroll lock before submitting a destructive action', function () {
$modal = file_get_contents(resource_path('views/components/modal-confirmation.blade.php'));
expect($modal)
->toMatch('/submitting = true;\s*modalOpen = false;\s*\$nextTick\(\(\) => \{\s*submitForm\(\)/s')
->toMatch('/if \(result === true\) \{\s*resetModal\(\);/s');
});