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

fix: move s3 storages to separate view

Browse Source
This commit is contained in:
Andras Bacsai
2024-04-26 14:09:54 +02:00
parent 9a9be466f7
commit f952553c76
15 changed files with 61 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Livewire/Team/Storage/Create.php → app/Livewire/Storage/Create.php
View File

@@ -1,6 +1,6 @@
<?php
namespace App\Livewire\Team\Storage;
namespace App\Livewire\Storage;
use App\Models\S3Storage;
use Livewire\Component;
@@ -65,7 +65,7 @@ class Create extends Component
$this->storage->team_id = currentTeam()->id;
$this->storage->testConnection();
$this->storage->save();
return redirect()->route('team.storage.show', $this->storage->uuid);
return redirect()->route('storage.show', $this->storage->uuid);
} catch (\Throwable $e) {
$this->dispatch('error', 'Failed to create storage.', $e->getMessage());
// return handleError($e, $this);

4
app/Livewire/Team/Storage/Form.php → app/Livewire/Storage/Form.php
View File

@@ -1,6 +1,6 @@
<?php
namespace App\Livewire\Team\Storage;
namespace App\Livewire\Storage;
use App\Models\S3Storage;
use Livewire\Component;
@@ -43,7 +43,7 @@ class Form extends Component
{
try {
$this->storage->delete();
return redirect()->route('team.storage.index');
return redirect()->route('storage.index');
} catch (\Throwable $e) {
return handleError($e, $this);
}

4
app/Livewire/Team/Storage/Index.php → app/Livewire/Storage/Index.php
View File

@@ -1,6 +1,6 @@
<?php
namespace App\Livewire\Team\Storage;
namespace App\Livewire\Storage;
use App\Models\S3Storage;
use Livewire\Component;
@@ -13,6 +13,6 @@ class Index extends Component
}
public function render()
{
return view('livewire.team.storage.index');
return view('livewire.storage.index');
}
}

22
app/Livewire/Storage/Show.php Normal file
View File

@@ -0,0 +1,22 @@
<?php
namespace App\Livewire\Storage;
use App\Models\S3Storage;
use Livewire\Component;
class Show extends Component
{
public $storage = null;
public function mount()
{
$this->storage = S3Storage::ownedByCurrentTeam()->whereUuid(request()->storage_uuid)->first();
if (!$this->storage) {
abort(404);
}
}
public function render()
{
return view('livewire.storage.show');
}
}

2
app/Livewire/Team/Storage/Show.php
View File

@@ -17,6 +17,6 @@ class Show extends Component
}
public function render()
{
return view('livewire.team.storage.show');
return view('livewire.storage.show');
}
}

2
app/Models/S3Storage.php
View File

@@ -48,7 +48,7 @@ class S3Storage extends BaseModel
if ($this->unusable_email_sent === false && is_transactional_emails_active()) {
$mail = new MailMessage();
$mail->subject('Coolify: S3 Storage Connection Error');
$mail->view('emails.s3-connection-error', ['name' => $this->name, 'reason' => $e->getMessage(), 'url' => route('team.storage.show', ['storage_uuid' => $this->uuid])]);
$mail->view('emails.s3-connection-error', ['name' => $this->name, 'reason' => $e->getMessage(), 'url' => route('storage.show', ['storage_uuid' => $this->uuid])]);
$users = collect([]);
$members = $this->team->members()->get();
foreach ($members as $user) {