diff --git a/app/Jobs/CheckHelperImageJob.php b/app/Jobs/CheckHelperImageJob.php index 30bb679a4..d62ad601f 100644 --- a/app/Jobs/CheckHelperImageJob.php +++ b/app/Jobs/CheckHelperImageJob.php @@ -2,7 +2,6 @@ namespace App\Jobs; -use App\Models\Server; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldBeEncrypted; use Illuminate\Contracts\Queue\ShouldQueue; diff --git a/app/Livewire/Project/Database/Redis/General.php b/app/Livewire/Project/Database/Redis/General.php index 9fbceda0c..25a96b292 100644 --- a/app/Livewire/Project/Database/Redis/General.php +++ b/app/Livewire/Project/Database/Redis/General.php @@ -141,7 +141,9 @@ class General extends Component $this->database->refresh(); $this->refreshView(); } - private function refreshView() { + + private function refreshView() + { $this->db_url = $this->database->internal_db_url; $this->db_url_public = $this->database->external_db_url; $this->redis_version = $this->database->getRedisVersion(); @@ -158,5 +160,4 @@ class General extends Component { return $this->database->runtime_environment_variables()->where('key', $name)->where('is_shared', true)->exists(); } - } diff --git a/app/Models/InstanceSettings.php b/app/Models/InstanceSettings.php index a7a00a869..8ac6e892a 100644 --- a/app/Models/InstanceSettings.php +++ b/app/Models/InstanceSettings.php @@ -101,5 +101,4 @@ class InstanceSettings extends Model implements SendsEmail return "[{$instanceName}]"; } - } diff --git a/app/Models/StandaloneRedis.php b/app/Models/StandaloneRedis.php index d63a8a6b3..097d6b0de 100644 --- a/app/Models/StandaloneRedis.php +++ b/app/Models/StandaloneRedis.php @@ -16,7 +16,6 @@ class StandaloneRedis extends BaseModel protected $appends = ['internal_db_url', 'external_db_url', 'database_type', 'server_status']; - protected static function booted() { static::created(function ($database) { @@ -333,8 +332,9 @@ class StandaloneRedis extends BaseModel get: function () { $username = $this->runtime_environment_variables()->where('key', 'REDIS_USERNAME')->first(); if (! $username) { - return null; + return null; } + return $username->value; } ); diff --git a/database/migrations/2024_10_16_120026_move_redis_password_to_envs.php b/database/migrations/2024_10_16_120026_move_redis_password_to_envs.php index 6fcac2512..fa01e8e85 100644 --- a/database/migrations/2024_10_16_120026_move_redis_password_to_envs.php +++ b/database/migrations/2024_10_16_120026_move_redis_password_to_envs.php @@ -4,7 +4,6 @@ use App\Models\EnvironmentVariable; use App\Models\StandaloneRedis; use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; -use Illuminate\Support\Facades\Crypt; use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Schema; diff --git a/resources/views/livewire/settings/index.blade.php b/resources/views/livewire/settings/index.blade.php index bf776d90a..3bd7a2b41 100644 --- a/resources/views/livewire/settings/index.blade.php +++ b/resources/views/livewire/settings/index.blade.php @@ -1,24 +1,26 @@