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

Fix name for services and DBs

Browse Source
This commit is contained in:
ayntk-ai
2024-08-29 18:53:49 +02:00
parent d984bec175
commit 6820fcc084
2 changed files with 76 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
app/Livewire/Project/Shared/Danger.php
View File

@@ -32,16 +32,61 @@ class Danger extends Component
$this->projectUuid = data_get($parameters, 'project_uuid'); $this->projectUuid = data_get($parameters, 'project_uuid');
$this->environmentName = data_get($parameters, 'environment_name'); $this->environmentName = data_get($parameters, 'environment_name');
// Determine the resource name based on the available properties ray('Mount method called');
if ($this->resource) {
$this->resourceName = $this->resource->name ?? 'Resource'; if ($this->resource === null) {
} elseif ($this->service) { if (isset($parameters['service_uuid'])) {
$this->resourceName = $this->service->name ?? 'Service'; //this does not get the name of the service $this->resource = Service::where('uuid', $parameters['service_uuid'])->first();
} else { } elseif (isset($parameters['stack_service_uuid'])) {
$this->resourceName = 'Unknown Resource'; //service is here? $this->resource = ServiceApplication::where('uuid', $parameters['stack_service_uuid'])->first()
?? ServiceDatabase::where('uuid', $parameters['stack_service_uuid'])->first();
}
}
ray('Resource:', $this->resource);
if ($this->resource === null) {
ray('Resource is null');
$this->resourceName = 'Unknown Resource';
return;
}
if (!method_exists($this->resource, 'type')) {
ray('Resource does not have type() method');
$this->resourceName = 'Unknown Resource';
return;
}
ray('Resource type:', $this->resource->type());
switch ($this->resource->type()) {
case 'application':
$this->resourceName = $this->resource->name ?? 'Application';
break;
case 'standalone-postgresql':
case 'standalone-redis':
case 'standalone-mongodb':
case 'standalone-mysql':
case 'standalone-mariadb':
case 'standalone-keydb':
case 'standalone-dragonfly':
case 'standalone-clickhouse':
$this->resourceName = $this->resource->name ?? 'Database';
break;
case 'service':
$this->resourceName = $this->resource->name ?? 'Service';
break;
case 'service-application':
$this->resourceName = $this->resource->name ?? 'Service Application';
break;
case 'service-database':
$this->resourceName = $this->resource->name ?? 'Service Database';
break;
default:
$this->resourceName = 'Unknown Resource';
} }
ray($this->resourceName); ray('Final resource name:', $this->resourceName);
} }
public function delete($password) public function delete($password)
@@ -76,8 +121,8 @@ class Danger extends Component
} }
} }
public function render() // public function render()
{ // {
return view('livewire.project.shared.danger'); // return view('livewire.project.shared.danger');
} // }
} }

103
resources/views/components/modal-confirmation.blade.php
View File

@@ -114,34 +114,13 @@
@endif @endif
@endif @endif
<template x-teleport="body"> <template x-teleport="body">
<div x-show="modalOpen" <div x-show="modalOpen" @click.away="modalOpen = false; resetModal()" class="fixed top-0 lg:pt-10 left-0 z-[99] flex items-start justify-center w-screen h-screen" x-cloak>
@click.away="modalOpen = false; resetModal()" <div x-show="modalOpen" x-transition:enter="ease-out duration-100" x-transition:enter-start="opacity-0" x-transition:enter-end="opacity-100" x-transition:leave="ease-in duration-100" x-transition:leave-start="opacity-100" x-transition:leave-end="opacity-0" @click="modalOpen = false; resetModal()" class="absolute inset-0 w-full h-full bg-black bg-opacity-20 backdrop-blur-sm"></div>
class="fixed top-0 lg:pt-10 left-0 z-[99] flex items-start justify-center w-screen h-screen" <div x-show="modalOpen" x-trap.inert.noscroll="modalOpen" x-transition:enter="ease-out duration-100" x-transition:enter-start="opacity-0 -translate-y-2 sm:scale-95" x-transition:enter-end="opacity-100 translate-y-0 sm:scale-100" x-transition:leave="ease-in duration-100" x-transition:leave-start="opacity-100 translate-y-0 sm:scale-100" x-transition:leave-end="opacity-0 -translate-y-2 sm:scale-95" class="relative w-full py-6 border rounded min-w-full lg:min-w-[36rem] max-w-fit bg-neutral-100 border-neutral-400 dark:bg-base px-7 dark:border-coolgray-300">
x-cloak>
<div x-show="modalOpen"
x-transition:enter="ease-out duration-100"
x-transition:enter-start="opacity-0"
x-transition:enter-end="opacity-100"
x-transition:leave="ease-in duration-100"
x-transition:leave-start="opacity-100"
x-transition:leave-end="opacity-0"
@click="modalOpen = false; resetModal()"
class="absolute inset-0 w-full h-full bg-black bg-opacity-20 backdrop-blur-sm"></div>
<div x-show="modalOpen"
x-trap.inert.noscroll="modalOpen"
x-transition:enter="ease-out duration-100"
x-transition:enter-start="opacity-0 -translate-y-2 sm:scale-95"
x-transition:enter-end="opacity-100 translate-y-0 sm:scale-100"
x-transition:leave="ease-in duration-100"
x-transition:leave-start="opacity-100 translate-y-0 sm:scale-100"
x-transition:leave-end="opacity-0 -translate-y-2 sm:scale-95"
class="relative w-full py-6 border rounded min-w-full lg:min-w-[36rem] max-w-fit bg-neutral-100 border-neutral-400 dark:bg-base px-7 dark:border-coolgray-300">
<div class="flex items-center justify-between pb-3"> <div class="flex items-center justify-between pb-3">
<h3 class="text-2xl font-bold">{{ $title }}</h3> <h3 class="text-2xl font-bold">{{ $title }}</h3>
<button @click="modalOpen = false; resetModal()" <button @click="modalOpen = false; resetModal()" class="absolute top-0 right-0 flex items-center justify-center w-8 h-8 mt-5 mr-5 rounded-full dark:text-white hover:bg-coolgray-300">
class="absolute top-0 right-0 flex items-center justify-center w-8 h-8 mt-5 mr-5 rounded-full dark:text-white hover:bg-coolgray-300"> <svg class="w-5 h-5" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor">
<svg class="w-5 h-5" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
stroke-width="1.5" stroke="currentColor">
<path stroke-linecap="round" stroke-linejoin="round" d="M6 18L18 6M6 6l12 12" /> <path stroke-linecap="round" stroke-linejoin="round" d="M6 18L18 6M6 6l12 12" />
</svg> </svg>
</button> </button>
@@ -154,13 +133,7 @@
<div class="px-2">Select the actions you want to perform:</div> <div class="px-2">Select the actions you want to perform:</div>
</div> </div>
@foreach($checkboxes as $index => $checkbox) @foreach($checkboxes as $index => $checkbox)
<x-forms.checkbox <x-forms.checkbox :id="$checkbox['id']" :wire:model="$checkbox['model']" :label="$checkbox['label']" x-on:change="$event.target.checked ? (selectedActions.includes('{{ $checkbox['id'] }}') || selectedActions.push('{{ $checkbox['id'] }}')) : selectedActions = selectedActions.filter(a => a !== '{{ $checkbox['id'] }}')" :checked="$checkbox['model']"></x-forms.checkbox>
:id="$checkbox['id']"
:wire:model="$checkbox['model']"
:label="$checkbox['label']"
x-on:change="$event.target.checked ? (selectedActions.includes('{{ $checkbox['id'] }}') || selectedActions.push('{{ $checkbox['id'] }}')) : selectedActions = selectedActions.filter(a => a !== '{{ $checkbox['id'] }}')"
:checked="$checkbox['model']"
></x-forms.checkbox>
@endforeach @endforeach
</div> </div>
@endif @endif
@@ -196,20 +169,10 @@
<div class="mb-4"> <div class="mb-4">
<h4 class="text-lg font-semibold mb-2">Confirm Actions</h4> <h4 class="text-lg font-semibold mb-2">Confirm Actions</h4>
<p class="text-sm mb-2">Please confirm the execution of the actions by entering the Resource Name below</p> <p class="text-sm mb-2">Please confirm the execution of the actions by entering the Resource Name below</p>
<div class="relative mb-2"> <div class="relative mb-2">
<input <input type="text" x-model="confirmText" class="w-full p-2 pr-10 rounded text-black input cursor-text" readonly>
type="text" <button @click="copyConfirmText()" class="absolute right-2 top-1/2 transform -translate-y-1/2 text-gray-500 hover:text-gray-700" title="Copy confirmation text" x-ref="copyButton">
x-model="confirmText"
class="w-full p-2 pr-10 rounded text-black input cursor-text"
readonly
>
<button
@click="copyConfirmText()"
class="absolute right-2 top-1/2 transform -translate-y-1/2 text-gray-500 hover:text-gray-700"
title="Copy confirmation text"
x-ref="copyButton"
>
<template x-if="!copied"> <template x-if="!copied">
<svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" viewBox="0 0 20 20" fill="currentColor"> <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" viewBox="0 0 20 20" fill="currentColor">
<path d="M8 3a1 1 0 011-1h2a1 1 0 110 2H9a1 1 0 01-1-1z" /> <path d="M8 3a1 1 0 011-1h2a1 1 0 110 2H9a1 1 0 01-1-1z" />
@@ -223,16 +186,11 @@
</template> </template>
</button> </button>
</div> </div>
<label for="userConfirmText" class="block text-sm font-medium text-gray-700 dark:text-gray-300 mt-4"> <label for="userConfirmText" class="block text-sm font-medium text-gray-700 dark:text-gray-300 mt-4">
Resource Name Resource Name
</label> </label>
<input <input type="text" x-model="userConfirmText" class="w-full p-2 rounded text-black input mt-1" placeholder="Type the Resource Name here">
type="text"
x-model="userConfirmText"
class="w-full p-2 rounded text-black input mt-1"
placeholder="Type the Resource Name here"
>
</div> </div>
@endif @endif
</div> </div>
@@ -256,51 +214,30 @@
<!-- Navigation buttons --> <!-- Navigation buttons -->
<div class="flex flex-row justify-between mt-4"> <div class="flex flex-row justify-between mt-4">
<template x-if="step > initialStep"> <template x-if="step > initialStep">
<x-forms.button <x-forms.button @click="step--" class="w-24 dark:bg-coolgray-200 dark:hover:bg-coolgray-300">
@click="step--"
class="w-24 dark:bg-coolgray-200 dark:hover:bg-coolgray-300"
>
Back Back
</x-forms.button> </x-forms.button>
</template> </template>
<template x-if="step === initialStep"> <template x-if="step === initialStep">
<x-forms.button <x-forms.button @click="modalOpen = false; resetModal()" class="w-24 dark:bg-coolgray-200 dark:hover:bg-coolgray-300">
@click="modalOpen = false; resetModal()"
class="w-24 dark:bg-coolgray-200 dark:hover:bg-coolgray-300"
>
Cancel Cancel
</x-forms.button> </x-forms.button>
</template> </template>
<template x-if="step === 1"> <template x-if="step === 1">
<x-forms.button <x-forms.button @click="step++" x-bind:disabled="selectedActions.length === 0" class="w-auto" isError>
@click="step++"
x-bind:disabled="selectedActions.length === 0"
class="w-auto"
isError
>
<span x-text="step1ButtonText"></span> <span x-text="step1ButtonText"></span>
</x-forms.button> </x-forms.button>
</template> </template>
<template x-if="step === 2"> <template x-if="step === 2">
<x-forms.button <x-forms.button @click="step === finalStep ? executeAction() : step++" x-bind:disabled="confirmWithText && userConfirmText !== confirmText" class="w-auto" isError>
@click="step === finalStep ? executeAction() : step++"
x-bind:disabled="confirmWithText && userConfirmText !== confirmText"
class="w-auto"
isError
>
<span x-text="step === finalStep ? step3ButtonText : step2ButtonText"></span> <span x-text="step === finalStep ? step3ButtonText : step2ButtonText"></span>
</x-forms.button> </x-forms.button>
</template> </template>
<template x-if="step === 3"> <template x-if="step === 3">
<x-forms.button <x-forms.button @click="executeAction()" x-bind:disabled="confirmWithPassword && !password" class="w-auto" isError>
@click="executeAction()"
x-bind:disabled="confirmWithPassword && !password"
class="w-auto"
isError
>
<span x-text="step3ButtonText"></span> <span x-text="step3ButtonText"></span>
</x-forms.button> </x-forms.button>
</template> </template>
@@ -309,5 +246,3 @@
</div> </div>
</template> </template>
</div> </div>