dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

refactor: Update confirmation button text for deletion actions

Browse Source
This commit is contained in:
Andras Bacsai
2024-09-23 08:58:04 +02:00
parent eb9bbf3eda
commit b84d39ba56
16 changed files with 115 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
resources/views/livewire/destination/form.blade.php
View File

@@ -6,18 +6,10 @@
Save
</x-forms.button>
@if ($destination->network !== 'coolify')
<x-modal-confirmation
title="Confirm Destination Deletion?"
buttonTitle="Delete Destination"
isErrorButton
submitAction="delete"
:actions="['This will delete the selected destination/network.']"
confirmationText="{{ $destination->name }}"
<x-modal-confirmation title="Confirm Destination Deletion?" buttonTitle="Delete Destination" isErrorButton
submitAction="delete" :actions="['This will delete the selected destination/network.']" confirmationText="{{ $destination->name }}"
confirmationLabel="Please confirm the execution of the actions by entering the Destination Name below"
shortConfirmationLabel="Destination Name"
:confirmWithPassword="false"
step2ButtonText="Permanently Delete Destination"
/>
shortConfirmationLabel="Destination Name" :confirmWithPassword="false" step2ButtonText="Permanently Delete" />
@endif
</div>

2
resources/views/livewire/navbar-delete-team.blade.php
View File

@@ -8,6 +8,6 @@
confirmationText="{{ $team }}"
confirmationLabel="Please confirm the execution of the actions by entering the Team Name below"
shortConfirmationLabel="Team Name"
step3ButtonText="Permanently Delete Team"
step3ButtonText="Permanently Delete"
/>
</div>

2
resources/views/livewire/project/database/backup-executions.blade.php
View File

@@ -57,7 +57,7 @@
confirmationText="{{ data_get($execution, 'filename') }}"
confirmationLabel="Please confirm the execution of the actions by entering the Backup Filename below"
shortConfirmationLabel="Backup Filename"
step3ButtonText="Permanently Delete Backup"
step3ButtonText="Permanently Delete"
/>
</div>
</div>

18
resources/views/livewire/project/database/init-script.blade.php
View File

@@ -2,21 +2,13 @@
<div class="flex items-end gap-2">
<x-forms.input id="filename" label="Filename" />
<x-forms.button type="submit">Save</x-forms.button>
<x-modal-confirmation
title="Confirm init-script deletion?"
buttonTitle="Delete"
isErrorButton
submitAction="delete"
:actions="[
<x-modal-confirmation title="Confirm init-script deletion?" buttonTitle="Delete" isErrorButton
submitAction="delete" :actions="[
'The init-script of this database will be permanently deleted.',
'If you are actively using this init-script, it could cause errors on redeployment.'
]"
confirmationText="{{ $filename }}"
'If you are actively using this init-script, it could cause errors on redeployment.',
]" confirmationText="{{ $filename }}"
confirmationLabel="Please confirm the execution of the actions by entering the init-script name below"
shortConfirmationLabel="Init-script Name"
:confirmWithPassword=false
step2ButtonText="Permanently Delete Init-script"
/>
shortConfirmationLabel="Init-script Name" :confirmWithPassword=false step2ButtonText="Permanently Delete" />
</div>
<x-forms.textarea id="content" label="Content" />
</form>

15
resources/views/livewire/project/delete-environment.blade.php
View File

@@ -1,12 +1,5 @@
<x-modal-confirmation
title="Confirm Environment Deletion?"
buttonTitle="Delete Environment"
isErrorButton
submitAction="delete"
:actions="['This will delete the selected environment.']"
<x-modal-confirmation title="Confirm Environment Deletion?" buttonTitle="Delete Environment" isErrorButton
submitAction="delete" :actions="['This will delete the selected environment.']"
confirmationLabel="Please confirm the execution of the actions by entering the Environment Name below"
shortConfirmationLabel="Environment Name"
confirmationText="{{ $environmentName }}"
:confirmWithPassword="false"
step2ButtonText="Permanently Delete Environment"
/>
shortConfirmationLabel="Environment Name" confirmationText="{{ $environmentName }}" :confirmWithPassword="false"
step2ButtonText="Permanently Delete" />

19
resources/views/livewire/project/delete-project.blade.php
View File

@@ -1,12 +1,7 @@
<x-modal-confirmation
title="Confirm Project Deletion?"
buttonTitle="Delete Project"
isErrorButton
submitAction="delete"
:actions="['This will delete the selected project', 'All Environments inside the project will be deleted as well.']"
confirmationLabel="Please confirm the execution of the actions by entering the Project Name below"
shortConfirmationLabel="Project Name"
confirmationText="{{ $projectName }}"
:confirmWithPassword="false"
step2ButtonText="Permanently Delete Project"
/>
<x-modal-confirmation title="Confirm Project Deletion?" buttonTitle="Delete Project" isErrorButton submitAction="delete"
:actions="[
'This will delete the selected project',
'All Environments inside the project will be deleted as well.',
]" confirmationLabel="Please confirm the execution of the actions by entering the Project Name below"
shortConfirmationLabel="Project Name" confirmationText="{{ $projectName }}" :confirmWithPassword="false"
step2ButtonText="Permanently Delete" />

60
resources/views/livewire/project/service/file-storage.blade.php
View File

@@ -15,56 +15,32 @@
<form wire:submit='submit' class="flex flex-col gap-2">
<div class="flex gap-2">
@if ($fileStorage->is_directory)
<x-modal-confirmation
title="Confirm Directory Conversion to File?"
buttonTitle="Convert to file"
submitAction="convertToFile"
:actions="['All files in this directory will be permanently deleted and an empty file will be created in its place.']"
confirmationText="{{ $fs_path }}"
<x-modal-confirmation title="Confirm Directory Conversion to File?" buttonTitle="Convert to file"
submitAction="convertToFile" :actions="[
'All files in this directory will be permanently deleted and an empty file will be created in its place.',
]" confirmationText="{{ $fs_path }}"
confirmationLabel="Please confirm the execution of the actions by entering the Filepath below"
shortConfirmationLabel="Filepath"
:confirmWithPassword="false"
step2ButtonText="Convert to file"
/>
shortConfirmationLabel="Filepath" :confirmWithPassword="false" step2ButtonText="Convert to file" />
@else
<x-modal-confirmation
title="Confirm File Conversion to Directory?"
buttonTitle="Convert to directory"
submitAction="convertToDirectory"
:actions="['The selected file will be permanently deleted and an empty directory will be created in its place.']"
confirmationText="{{ $fs_path }}"
<x-modal-confirmation title="Confirm File Conversion to Directory?" buttonTitle="Convert to directory"
submitAction="convertToDirectory" :actions="[
'The selected file will be permanently deleted and an empty directory will be created in its place.',
]" confirmationText="{{ $fs_path }}"
confirmationLabel="Please confirm the execution of the actions by entering the Filepath below"
shortConfirmationLabel="Filepath"
:confirmWithPassword="false"
step2ButtonText="Convert to directory"
/>
shortConfirmationLabel="Filepath" :confirmWithPassword="false" step2ButtonText="Convert to directory" />
@endif
@if ($fileStorage->is_directory)
<x-modal-confirmation
title="Confirm Directory Deletion?"
buttonTitle="Delete Directory"
isErrorButton
submitAction="delete"
:checkboxes="$directoryDeletionCheckboxes"
:actions="['The selected directory and all its contents will be permanently deleted from the container.']"
confirmationText="{{ $fs_path }}"
<x-modal-confirmation title="Confirm Directory Deletion?" buttonTitle="Delete Directory" isErrorButton
submitAction="delete" :checkboxes="$directoryDeletionCheckboxes" :actions="[
'The selected directory and all its contents will be permanently deleted from the container.',
]" confirmationText="{{ $fs_path }}"
confirmationLabel="Please confirm the execution of the actions by entering the Filepath below"
shortConfirmationLabel="Filepath"
step3ButtonText="Permanently Delete Directory"
/>
shortConfirmationLabel="Filepath" step3ButtonText="Permanently Delete" />
@else
<x-modal-confirmation
title="Confirm File Deletion?"
buttonTitle="Delete File"
isErrorButton
submitAction="delete"
:checkboxes="$fileDeletionCheckboxes"
:actions="['The selected file will be permanently deleted from the container.']"
confirmationText="{{ $fs_path }}"
<x-modal-confirmation title="Confirm File Deletion?" buttonTitle="Delete File" isErrorButton
submitAction="delete" :checkboxes="$fileDeletionCheckboxes" :actions="['The selected file will be permanently deleted from the container.']" confirmationText="{{ $fs_path }}"
confirmationLabel="Please confirm the execution of the actions by entering the Filepath below"
shortConfirmationLabel="Filepath"
step3ButtonText="Permanently Delete File"
/>
shortConfirmationLabel="Filepath" step3ButtonText="Permanently Delete" />
@endif
@if (!$fileStorage->is_based_on_git)

15
resources/views/livewire/project/service/service-application-view.blade.php
View File

@@ -7,20 +7,11 @@
<h2>{{ Str::headline($application->name) }}</h2>
@endif
<x-forms.button type="submit">Save</x-forms.button>
<x-modal-confirmation
title="Confirm Service Application Deletion?"
buttonTitle="Delete"
isErrorButton
submitAction="delete"
{{-- :checkboxes="$checkboxes" --}}
:actions="[
'The selected service application container will be stopped and permanently deleted.'
]"
<x-modal-confirmation title="Confirm Service Application Deletion?" buttonTitle="Delete" isErrorButton
submitAction="delete" {{-- :checkboxes="$checkboxes" --}} :actions="['The selected service application container will be stopped and permanently deleted.']"
confirmationText="{{ Str::headline($application->name) }}"
confirmationLabel="Please confirm the execution of the actions by entering the Service Application Name below"
shortConfirmationLabel="Service Application Name"
step3ButtonText="Permanently Delete Service Application"
/>
shortConfirmationLabel="Service Application Name" step3ButtonText="Permanently Delete" />
</div>
<div class="flex flex-col gap-2">
<div class="flex gap-2">

49
resources/views/livewire/project/shared/environment-variable/show.blade.php
View File

@@ -11,20 +11,11 @@
<path d="M11 16a1 1 0 1 0 2 0a1 1 0 0 0-2 0m-3-5V7a4 4 0 1 1 8 0v4" />
</g>
</svg>
<x-modal-confirmation
title="Confirm Environment Variable Deletion?"
isErrorButton
buttonTitle="Delete"
submitAction="delete"
:actions="[
'The selected environment variable will be permanently deleted.'
]"
confirmationText="{{ $env->key }}"
<x-modal-confirmation title="Confirm Environment Variable Deletion?" isErrorButton buttonTitle="Delete"
submitAction="delete" :actions="['The selected environment variable will be permanently deleted.']" confirmationText="{{ $env->key }}"
confirmationLabel="Please confirm the execution of the actions by entering the Environment Variable Name below"
shortConfirmationLabel="Environment Variable Name"
:confirmWithPassword="false"
step2ButtonText="Permanently Delete Environment Variable"
/>
shortConfirmationLabel="Environment Variable Name" :confirmWithPassword="false"
step2ButtonText="Permanently Delete" />
</div>
@else
@if ($isDisabled)
@@ -80,20 +71,12 @@
<x-forms.button wire:click='lock'>
Lock
</x-forms.button>
<x-modal-confirmation
title="Confirm Environment Variable Deletion?"
isErrorButton
buttonTitle="Delete"
submitAction="delete"
:actions="[
'The selected environment variable will be permanently deleted.'
]"
<x-modal-confirmation title="Confirm Environment Variable Deletion?" isErrorButton
buttonTitle="Delete" submitAction="delete" :actions="['The selected environment variable will be permanently deleted.']"
confirmationText="{{ $env->key }}"
confirmationLabel="Please confirm the execution of the actions by entering the Environment Variable Name below"
shortConfirmationLabel="Environment Variable Name"
:confirmWithPassword="false"
step2ButtonText="Permanently Delete Environment Variable"
/>
shortConfirmationLabel="Environment Variable Name" :confirmWithPassword="false"
step2ButtonText="Permanently Delete" />
@else
<x-forms.button type="submit">
Update
@@ -101,20 +84,12 @@
<x-forms.button wire:click='lock'>
Lock
</x-forms.button>
<x-modal-confirmation
title="Confirm Environment Variable Deletion?"
isErrorButton
buttonTitle="Delete"
submitAction="delete"
:actions="[
'The selected environment variable will be permanently deleted.'
]"
<x-modal-confirmation title="Confirm Environment Variable Deletion?" isErrorButton
buttonTitle="Delete" submitAction="delete" :actions="['The selected environment variable will be permanently deleted.']"
confirmationText="{{ $env->key }}"
confirmationLabel="Please confirm the execution of the actions by entering the Environment Variable Name below"
shortConfirmationLabel="Environment Variable Name"
:confirmWithPassword="false"
step2ButtonText="Permanently Delete Environment Variable"
/>
shortConfirmationLabel="Environment Variable Name" :confirmWithPassword="false"
step2ButtonText="Permanently Delete" />
@endif
</div>
@endif

18
resources/views/livewire/project/shared/scheduled-task/show.blade.php
View File

@@ -16,18 +16,11 @@
<x-forms.button type="submit">
Save
</x-forms.button>
<x-modal-confirmation
title="Confirm Scheduled Task Deletion?"
isErrorButton
buttonTitle="Delete"
submitAction="delete({{ $task->id }})"
:actions="['The selected scheduled task will be permanently deleted.']"
confirmationText="{{ $task->name }}"
<x-modal-confirmation title="Confirm Scheduled Task Deletion?" isErrorButton buttonTitle="Delete"
submitAction="delete({{ $task->id }})" :actions="['The selected scheduled task will be permanently deleted.']" confirmationText="{{ $task->name }}"
confirmationLabel="Please confirm the execution of the actions by entering the Scheduled Task Name below"
shortConfirmationLabel="Scheduled Task Name"
:confirmWithPassword="false"
step2ButtonText="Permanently Delete Scheduled Task"
/>
shortConfirmationLabel="Scheduled Task Name" :confirmWithPassword="false"
step2ButtonText="Permanently Delete" />
</div>
<div class="flex w-full gap-2">
@@ -48,6 +41,7 @@
<div class="pt-4">
<h3 class="py-4">Recent executions <span class="text-xs text-neutral-500">(click to check output)</span></h3>
<livewire:project.shared.scheduled-task.executions :task="$task" key="{{ $task->id }}" selectedKey="" :executions="$task->executions->take(20)" />
<livewire:project.shared.scheduled-task.executions :task="$task" key="{{ $task->id }}" selectedKey=""
:executions="$task->executions->take(20)" />
</div>
</div>

16
resources/views/livewire/project/shared/storages/show.blade.php
View File

@@ -46,17 +46,13 @@
<x-forms.button type="submit">
Update
</x-forms.button>
<x-modal-confirmation
title="Confirm persistent storage deletion?"
isErrorButton
buttonTitle="Delete"
submitAction="delete"
:actions="['The selected persistent storage/volume will be permanently deleted.', 'If the persistent storage/volume is actvily used by a resource data will be lost.']"
confirmationText="{{ $storage->name }}"
<x-modal-confirmation title="Confirm persistent storage deletion?" isErrorButton buttonTitle="Delete"
submitAction="delete" :actions="[
'The selected persistent storage/volume will be permanently deleted.',
'If the persistent storage/volume is actvily used by a resource data will be lost.',
]" confirmationText="{{ $storage->name }}"
confirmationLabel="Please confirm the execution of the actions by entering the Storage Name below"
shortConfirmationLabel="Storage Name"
step3ButtonText="Permanently Delete Persistent Storage/Volume"
/>
shortConfirmationLabel="Storage Name" step3ButtonText="Permanently Delete" />
</div>
@endif
</form>

26
resources/views/livewire/server/delete.blade.php
View File

@@ -8,29 +8,15 @@
</div>
@if ($server->definedResources()->count() > 0)
<div class="pb-2 text-red-500">You need to delete all resources before deleting this server.</div>
<x-modal-confirmation
title="Confirm Server Deletion?"
isErrorButton
buttonTitle="Delete"
submitAction="delete"
:actions="['This server will be permanently deleted.']"
confirmationText="{{ $server->name }}"
<x-modal-confirmation title="Confirm Server Deletion?" isErrorButton buttonTitle="Delete" submitAction="delete"
:actions="['This server will be permanently deleted.']" confirmationText="{{ $server->name }}"
confirmationLabel="Please confirm the execution of the actions by entering the Server Name below"
shortConfirmationLabel="Server Name"
step3ButtonText="Permanently Delete Server"
/>
shortConfirmationLabel="Server Name" step3ButtonText="Permanently Delete" />
@else
<x-modal-confirmation
title="Confirm Server Deletion?"
isErrorButton
buttonTitle="Delete"
submitAction="delete"
:actions="['This server will be permanently deleted.']"
confirmationText="{{ $server->name }}"
<x-modal-confirmation title="Confirm Server Deletion?" isErrorButton buttonTitle="Delete"
submitAction="delete" :actions="['This server will be permanently deleted.']" confirmationText="{{ $server->name }}"
confirmationLabel="Please confirm the execution of the actions by entering the Server Name below"
shortConfirmationLabel="Server Name"
step2ButtonText="Permanently Delete Server"
/>
shortConfirmationLabel="Server Name" step2ButtonText="Permanently Delete" />
@endif
@endif
</div>

6
resources/views/livewire/source/github/change.blade.php
View File

@@ -24,7 +24,7 @@
confirmationLabel="Please confirm the execution of the actions by entering the GitHub App Name below"
shortConfirmationLabel="GitHub App Name"
:confirmWithPassword="false"
step2ButtonText="Permanently Delete GitHub App"
step2ButtonText="Permanently Delete"
/>
@else
<x-modal-confirmation
@@ -37,7 +37,7 @@
shortConfirmationLabel="GitHub App Name"
confirmationText="{{ data_get($github_app, 'name') }}"
:confirmWithPassword="false"
step2ButtonText="Permanently Delete GitHub App"
step2ButtonText="Permanently Delete"
/>
@endif
</div>
@@ -188,7 +188,7 @@
confirmationLabel="Please confirm the execution of the actions by entering the GitHub App Name below"
shortConfirmationLabel="GitHub App Name"
:confirmWithPassword="false"
step2ButtonText="Permanently Delete GitHub App"
step2ButtonText="Permanently Delete"
/>
</div>
</div>

17
resources/views/livewire/storage/form.blade.php
View File

@@ -16,18 +16,13 @@
<x-forms.button wire:click="test_s3_connection">
Validate Connection
</x-forms.button>
<x-modal-confirmation
title="Confirm Storage Deletion?"
isErrorButton
buttonTitle="Delete"
submitAction="delete({{ $storage->id }})"
:actions="['The selected storage location will be permanently deleted from Coolify.', 'If the storage location is in use by any backup jobs those backup jobs will only store the backup locally on the server.']"
confirmationText="{{ $storage->name }}"
<x-modal-confirmation title="Confirm Storage Deletion?" isErrorButton buttonTitle="Delete"
submitAction="delete({{ $storage->id }})" :actions="[
'The selected storage location will be permanently deleted from Coolify.',
'If the storage location is in use by any backup jobs those backup jobs will only store the backup locally on the server.',
]" confirmationText="{{ $storage->name }}"
confirmationLabel="Please confirm the execution of the actions by entering the Storage Name below"
shortConfirmationLabel="Storage Name"
:confirmWithPassword="false"
step2ButtonText="Permanently Delete Storage"
/>
shortConfirmationLabel="Storage Name" :confirmWithPassword="false" step2ButtonText="Permanently Delet" />
</div>
<div class="flex gap-2">
<x-forms.input label="Name" id="storage.name" />

15
resources/views/livewire/team/admin-view.blade.php
View File

@@ -15,17 +15,14 @@
<div>{{ $user->email }}</div>
<div class="flex-1"></div>
<div class="flex items-center justify-center gap-2 mx-4 text-xs font-bold ">
<x-modal-confirmation
title="Confirm User Deletion?"
buttonTitle="Delete"
isErrorButton
submitAction="delete({{ $user->id }})"
:actions="['The selected user will be permanently deleted from Coolify and the database.', 'All resources (application, databases, services, configurations, servers, private keys, tags, etc.) related to this user will be deleted from Coolify and from the server (if the server is reachable).']"
<x-modal-confirmation title="Confirm User Deletion?" buttonTitle="Delete" isErrorButton
submitAction="delete({{ $user->id }})" :actions="[
'The selected user will be permanently deleted from Coolify and the database.',
'All resources (application, databases, services, configurations, servers, private keys, tags, etc.) related to this user will be deleted from Coolify and from the server (if the server is reachable).',
]"
confirmationText="{{ $user->name }}"
confirmationLabel="Please confirm the execution of the actions by entering the User Name below"
shortConfirmationLabel="User Name"
step3ButtonText="Permanently Delete User"
/>
shortConfirmationLabel="User Name" step3ButtonText="Permanently Delete" />
</div>
</div>
@empty

13
resources/views/livewire/team/index.blade.php
View File

@@ -31,18 +31,11 @@
@else
@if (currentTeam()->isEmpty())
<div class="pb-4">This will delete your team. Beware! There is no coming back!</div>
<x-modal-confirmation
title="Confirm Team Deletion?"
buttonTitle="Delete"
isErrorButton
submitAction="delete({{ currentTeam()->id }})"
:actions="['The current team will be permanently deleted from Coolify and the database.']"
<x-modal-confirmation title="Confirm Team Deletion?" buttonTitle="Delete" isErrorButton
submitAction="delete({{ currentTeam()->id }})" :actions="['The current team will be permanently deleted from Coolify and the database.']"
confirmationText="{{ currentTeam()->name }}"
confirmationLabel="Please confirm the execution of the actions by entering the Team Name below"
shortConfirmationLabel="Team Name"
:confirmWithPassword="false"
step2ButtonText="Permanently Delete Team"
/>
shortConfirmationLabel="Team Name" :confirmWithPassword="false" step2ButtonText="Permanently Delete" />
@else
<div>
<div class="pb-4">You need to delete the following resources to be able to delete the team:</div>