mirror of
https://github.com/vitodeploy/vito.git
synced 2025-07-02 14:36:17 +00:00
WIP notifications and other refactors (#88)
* WIP notifications and other refactors - refactor notification channels - send notifications on events related to the servers and sites - delete server log files on server deletion - add telegram notification channel - add new icons - cache configs and icons on installation and updates - new navbar for dark mode and settings * discord channel * build assets * pint
This commit is contained in:
@ -2,19 +2,21 @@
|
||||
|
||||
namespace App\Models;
|
||||
|
||||
use App\Contracts\Notification;
|
||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||
use Illuminate\Notifications\Notifiable;
|
||||
|
||||
/**
|
||||
* @property string $provider
|
||||
* @property string $label
|
||||
* @property array $data
|
||||
* @property bool $connected
|
||||
* @property bool $is_default
|
||||
* @property User $user
|
||||
* @property int $id
|
||||
* @property string provider
|
||||
* @property array data
|
||||
* @property string label
|
||||
* @property bool connected
|
||||
*/
|
||||
class NotificationChannel extends AbstractModel
|
||||
{
|
||||
use HasFactory;
|
||||
use Notifiable;
|
||||
|
||||
protected $fillable = [
|
||||
'provider',
|
||||
@ -25,15 +27,24 @@ class NotificationChannel extends AbstractModel
|
||||
];
|
||||
|
||||
protected $casts = [
|
||||
'data' => 'json',
|
||||
'project_id' => 'integer',
|
||||
'data' => 'array',
|
||||
'connected' => 'boolean',
|
||||
'is_default' => 'boolean',
|
||||
];
|
||||
|
||||
public function provider(): \App\Contracts\NotificationChannel
|
||||
{
|
||||
$provider = config('core.notification_channels_providers_class')[$this->provider];
|
||||
$class = config('core.notification_channels_providers_class')[$this->provider];
|
||||
|
||||
return new $provider($this);
|
||||
return new $class($this);
|
||||
}
|
||||
|
||||
public static function notifyAll(Notification $notification): void
|
||||
{
|
||||
$channels = self::all();
|
||||
foreach ($channels as $channel) {
|
||||
$channel->notify($notification);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -4,15 +4,18 @@
|
||||
|
||||
use App\Contracts\ServerType;
|
||||
use App\Enums\ServerStatus;
|
||||
use App\Facades\Notifier;
|
||||
use App\Facades\SSH;
|
||||
use App\Jobs\Installation\Upgrade;
|
||||
use App\Jobs\Server\CheckConnection;
|
||||
use App\Jobs\Server\RebootServer;
|
||||
use App\Notifications\ServerInstallationStarted;
|
||||
use App\Support\Testing\SSHFake;
|
||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||
use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
||||
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
|
||||
use Illuminate\Database\Eloquent\Relations\HasMany;
|
||||
use Illuminate\Filesystem\FilesystemAdapter;
|
||||
use Illuminate\Support\Facades\File;
|
||||
use Illuminate\Support\Facades\Storage;
|
||||
use Illuminate\Support\Str;
|
||||
@ -110,7 +113,9 @@ public static function boot(): void
|
||||
$site->delete();
|
||||
});
|
||||
$server->provider()->delete();
|
||||
$server->logs()->delete();
|
||||
$server->logs()->each(function (ServerLog $log) {
|
||||
$log->delete();
|
||||
});
|
||||
$server->services()->delete();
|
||||
$server->databases()->delete();
|
||||
$server->databaseUsers()->delete();
|
||||
@ -239,7 +244,7 @@ public function getServiceByUnit($unit): ?Service
|
||||
public function install(): void
|
||||
{
|
||||
$this->type()->install();
|
||||
// $this->team->notify(new ServerInstallationStarted($this));
|
||||
Notifier::send($this, new ServerInstallationStarted($this));
|
||||
}
|
||||
|
||||
public function ssh(?string $user = null): \App\Helpers\SSH|SSHFake
|
||||
@ -343,7 +348,7 @@ public function sshKey(): array
|
||||
];
|
||||
}
|
||||
|
||||
/** @var \Illuminate\Filesystem\FilesystemAdapter $storageDisk */
|
||||
/** @var FilesystemAdapter $storageDisk */
|
||||
$storageDisk = Storage::disk(config('core.key_pairs_disk'));
|
||||
|
||||
return [
|
||||
|
@ -34,6 +34,17 @@ class ServerLog extends AbstractModel
|
||||
'site_id' => 'integer',
|
||||
];
|
||||
|
||||
public static function boot(): void
|
||||
{
|
||||
parent::boot();
|
||||
|
||||
static::deleting(function (ServerLog $log) {
|
||||
if (Storage::disk($log->disk)->exists($log->name)) {
|
||||
Storage::disk($log->disk)->delete($log->name);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
public function getRouteKey(): string
|
||||
{
|
||||
return 'log';
|
||||
|
@ -8,10 +8,13 @@
|
||||
use App\Enums\SslStatus;
|
||||
use App\Events\Broadcast;
|
||||
use App\Exceptions\SourceControlIsNotConnected;
|
||||
use App\Facades\Notifier;
|
||||
use App\Jobs\Site\ChangePHPVersion;
|
||||
use App\Jobs\Site\Deploy;
|
||||
use App\Jobs\Site\DeployEnv;
|
||||
use App\Jobs\Site\UpdateBranch;
|
||||
use App\Notifications\SiteInstallationFailed;
|
||||
use App\Notifications\SiteInstallationSucceed;
|
||||
use Exception;
|
||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
@ -406,7 +409,7 @@ public function installationFinished(): void
|
||||
'site' => $this,
|
||||
])
|
||||
);
|
||||
/** @todo notify */
|
||||
Notifier::send($this, new SiteInstallationSucceed($this));
|
||||
}
|
||||
|
||||
/**
|
||||
@ -422,7 +425,7 @@ public function installationFailed(Throwable $e): void
|
||||
'site' => $this,
|
||||
])
|
||||
);
|
||||
/** @todo notify */
|
||||
Notifier::send($this, new SiteInstallationFailed($this));
|
||||
Log::error('install-site-error', [
|
||||
'error' => (string) $e,
|
||||
]);
|
||||
|
Reference in New Issue
Block a user