tiennm99/coolify
1
0 Fork 0
mirror of https://github.com/tiennm99/coolify.git synced 2026-10-16 10:15:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/next' into audit-policies

Browse Source
This commit is contained in:
Andras Bacsai committed 2026-03-03 19:41:05 +01:00
2 parents dbf4fab7ef b8d57bfd3c
commit 4fa048f931
67 files changed
+3715 -973
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

resources/views/components/modal-confirmation.blade.php
+23 -10
View File
@@ -36,7 +36,7 @@
$skipPasswordConfirmation = shouldSkipPasswordConfirmation();
if ($temporaryDisableTwoStepConfirmation) {
$disableTwoStepConfirmation = false;
$skipPasswordConfirmation = false;
// Password confirmation requirement is not affected by temporary two-step disable
}
// When password step is skipped, Step 2 becomes final - change button text from "Continue" to "Confirm"
$effectiveStep2ButtonText = ($skipPasswordConfirmation && $step2ButtonText === 'Continue') ? 'Confirm' : $step2ButtonText;
@@ -60,6 +60,7 @@
confirmWithPassword: @js($confirmWithPassword && !$skipPasswordConfirmation),
submitAction: @js($submitAction),
dispatchAction: @js($dispatchAction),
submitting: false,
passwordError: '',
selectedActions: @js(collect($checkboxes)->pluck('id')->filter(fn($id) => $this->$id)->values()->all()),
dispatchEvent: @js($dispatchEvent),
@@ -71,6 +72,7 @@
this.step = this.initialStep;
this.deleteText = '';
this.password = '';
this.submitting = false;
this.userConfirmationText = '';
this.selectedActions = @js(collect($checkboxes)->pluck('id')->filter(fn($id) => $this->$id)->values()->all());
$wire.$refresh();
@@ -321,8 +323,8 @@
</x-forms.button>
@endif
<x-forms.button
x-bind:disabled="!disableTwoStepConfirmation && confirmWithText && userConfirmationText !==
confirmationText"
x-bind:disabled="submitting || (!disableTwoStepConfirmation && confirmWithText && userConfirmationText !==
confirmationText)"
class="w-auto" isError
@click="
if (dispatchEvent) {
@@ -331,12 +333,18 @@
if (confirmWithPassword && !skipPasswordConfirmation) {
step++;
} else {
modalOpen = false;
resetModal();
submitForm();
submitting = true;
submitForm().then((result) => {
submitting = false;
modalOpen = false;
resetModal();
}).catch(() => {
submitting = false;
});
}
">
<span x-text="step2ButtonText"></span>
<span x-show="!submitting" x-text="step2ButtonText"></span>
<x-loading x-show="submitting" text="Processing..." />
</x-forms.button>
</div>
</div>
@@ -374,22 +382,27 @@
class="w-24 dark:bg-coolgray-200 dark:hover:bg-coolgray-300">
Back
</x-forms.button>
<x-forms.button x-bind:disabled="!password" class="w-auto" isError
<x-forms.button x-bind:disabled="!password || submitting" class="w-auto" isError
@click="
if (dispatchEvent) {
$wire.dispatch(dispatchEventType, dispatchEventMessage);
}
submitting = true;
submitForm().then((result) => {
submitting = false;
if (result === true) {
modalOpen = false;
resetModal();
} else {
passwordError = result;
password = ''; // Clear the password field
password = '';
}
}).catch(() => {
submitting = false;
});
">
<span x-text="step3ButtonText"></span>
<span x-show="!submitting" x-text="step3ButtonText"></span>
<x-loading x-show="submitting" text="Processing..." />
</x-forms.button>
</div>
</div>