WIP start of scheduled tasks.
This commit is contained in:
parent
d5b3e88fc4
commit
adecf328fc
59
app/Livewire/Project/Shared/ScheduledTask/Add.php
Normal file
59
app/Livewire/Project/Shared/ScheduledTask/Add.php
Normal file
@ -0,0 +1,59 @@
|
||||
<?php
|
||||
|
||||
namespace App\Livewire\Project\Shared\ScheduledTask;
|
||||
|
||||
use Livewire\Component;
|
||||
|
||||
class Add extends Component
|
||||
{
|
||||
public $parameters;
|
||||
public string $name;
|
||||
public string $command;
|
||||
public string $frequency;
|
||||
public ?string $container = '';
|
||||
|
||||
protected $listeners = ['clearScheduledTask' => 'clear'];
|
||||
protected $rules = [
|
||||
'name' => 'required|string',
|
||||
'command' => 'required|string',
|
||||
'frequency' => 'required|string',
|
||||
'container' => 'nullable|string',
|
||||
];
|
||||
protected $validationAttributes = [
|
||||
'name' => 'name',
|
||||
'command' => 'command',
|
||||
'frequency' => 'frequency',
|
||||
'container' => 'container',
|
||||
];
|
||||
|
||||
public function mount()
|
||||
{
|
||||
$this->parameters = get_route_parameters();
|
||||
}
|
||||
|
||||
public function submit()
|
||||
{
|
||||
error_log("*** IN SUBMIT");
|
||||
$this->validate();
|
||||
$isValid = validate_cron_expression($this->frequency);
|
||||
if (!$isValid) {
|
||||
$this->dispatch('error', 'Invalid Cron / Human expression.');
|
||||
return;
|
||||
}
|
||||
$this->dispatch('saveScheduledTask', [
|
||||
'name' => $this->name,
|
||||
'command' => $this->command,
|
||||
'frequency' => $this->frequency,
|
||||
'container' => $this->container,
|
||||
]);
|
||||
$this->clear();
|
||||
}
|
||||
|
||||
public function clear()
|
||||
{
|
||||
$this->name = '';
|
||||
$this->command = '';
|
||||
$this->frequency = '';
|
||||
$this->container = '';
|
||||
}
|
||||
}
|
134
app/Livewire/Project/Shared/ScheduledTask/All.php
Normal file
134
app/Livewire/Project/Shared/ScheduledTask/All.php
Normal file
@ -0,0 +1,134 @@
|
||||
<?php
|
||||
|
||||
namespace App\Livewire\Project\Shared\ScheduledTask;
|
||||
|
||||
use App\Models\ScheduledTask;
|
||||
use Livewire\Component;
|
||||
use Visus\Cuid2\Cuid2;
|
||||
use Illuminate\Support\Str;
|
||||
|
||||
class All extends Component
|
||||
{
|
||||
public $resource;
|
||||
public bool $showPreview = false;
|
||||
public string|null $modalId = null;
|
||||
public ?string $variables = null;
|
||||
public ?string $variablesPreview = null;
|
||||
protected $listeners = ['refreshTasks', 'saveScheduledTask' => 'submit'];
|
||||
|
||||
public function mount()
|
||||
{
|
||||
$resourceClass = get_class($this->resource);
|
||||
$resourceWithPreviews = ['App\Models\Application'];
|
||||
$simpleDockerfile = !is_null(data_get($this->resource, 'dockerfile'));
|
||||
if (Str::of($resourceClass)->contains($resourceWithPreviews) && !$simpleDockerfile) {
|
||||
$this->showPreview = true;
|
||||
}
|
||||
$this->modalId = new Cuid2(7);
|
||||
$this->getDevView();
|
||||
}
|
||||
public function getDevView()
|
||||
{
|
||||
$this->variables = $this->resource->scheduled_tasks->map(function ($item) {
|
||||
error_log("** got one");
|
||||
return "$item->name=$item->command";
|
||||
})->sort();
|
||||
|
||||
error_log(print_r($this->variables,1));
|
||||
}
|
||||
public function saveVariables($isPreview)
|
||||
{
|
||||
if ($isPreview) {
|
||||
$variables = parseEnvFormatToArray($this->variablesPreview);
|
||||
$this->resource->environment_variables_preview()->whereNotIn('key', array_keys($variables))->delete();
|
||||
} else {
|
||||
$variables = parseEnvFormatToArray($this->variables);
|
||||
$this->resource->environment_variables()->whereNotIn('key', array_keys($variables))->delete();
|
||||
}
|
||||
foreach ($variables as $key => $variable) {
|
||||
if ($isPreview) {
|
||||
$found = $this->resource->environment_variables_preview()->where('key', $key)->first();
|
||||
} else {
|
||||
$found = $this->resource->environment_variables()->where('key', $key)->first();
|
||||
}
|
||||
if ($found) {
|
||||
if ($found->is_shown_once) {
|
||||
continue;
|
||||
}
|
||||
$found->value = $variable;
|
||||
$found->save();
|
||||
continue;
|
||||
} else {
|
||||
$task = new ScheduledTask();
|
||||
$task->key = $key;
|
||||
$task->value = $variable;
|
||||
$task->is_build_time = false;
|
||||
$task->is_preview = $isPreview ? true : false;
|
||||
switch ($this->resource->type()) {
|
||||
case 'application':
|
||||
$task->application_id = $this->resource->id;
|
||||
break;
|
||||
case 'standalone-postgresql':
|
||||
$task->standalone_postgresql_id = $this->resource->id;
|
||||
break;
|
||||
case 'standalone-redis':
|
||||
$task->standalone_redis_id = $this->resource->id;
|
||||
break;
|
||||
case 'standalone-mongodb':
|
||||
$task->standalone_mongodb_id = $this->resource->id;
|
||||
break;
|
||||
case 'standalone-mysql':
|
||||
$task->standalone_mysql_id = $this->resource->id;
|
||||
break;
|
||||
case 'standalone-mariadb':
|
||||
$task->standalone_mariadb_id = $this->resource->id;
|
||||
break;
|
||||
case 'service':
|
||||
$task->service_id = $this->resource->id;
|
||||
break;
|
||||
}
|
||||
$task->save();
|
||||
}
|
||||
}
|
||||
if ($isPreview) {
|
||||
$this->dispatch('success', 'Preview environment variables updated successfully.');
|
||||
} else {
|
||||
$this->dispatch('success', 'Environment variables updated successfully.');
|
||||
}
|
||||
$this->refreshTasks();
|
||||
}
|
||||
public function refreshTasks()
|
||||
{
|
||||
$this->resource->refresh();
|
||||
$this->getDevView();
|
||||
}
|
||||
|
||||
public function submit($data)
|
||||
{
|
||||
error_log("** submitting the beast");
|
||||
try {
|
||||
$task = new ScheduledTask();
|
||||
$task->name = $data['name'];
|
||||
$task->command = $data['command'];
|
||||
$task->frequency = $data['frequency'];
|
||||
$task->container = $data['container'];
|
||||
|
||||
switch ($this->resource->type()) {
|
||||
case 'application':
|
||||
$task->application_id = $this->resource->id;
|
||||
break;
|
||||
case 'standalone-postgresql':
|
||||
$task->standalone_postgresql_id = $this->resource->id;
|
||||
break;
|
||||
case 'service':
|
||||
$task->service_id = $this->resource->id;
|
||||
break;
|
||||
}
|
||||
$task->save();
|
||||
$this->refreshTasks();
|
||||
$this->dispatch('success', 'Scheduled task added successfully.');
|
||||
} catch (\Throwable $e) {
|
||||
return handleError($e, $this);
|
||||
}
|
||||
}
|
||||
}
|
60
app/Livewire/Project/Shared/ScheduledTask/Show.php
Normal file
60
app/Livewire/Project/Shared/ScheduledTask/Show.php
Normal file
@ -0,0 +1,60 @@
|
||||
<?php
|
||||
|
||||
namespace App\Livewire\Project\Shared\ScheduledTask;
|
||||
|
||||
use App\Models\ScheduledTask as ModelsScheduledTask;
|
||||
use Livewire\Component;
|
||||
use Visus\Cuid2\Cuid2;
|
||||
|
||||
class Show extends Component
|
||||
{
|
||||
public $parameters;
|
||||
public ModelsScheduledTask $task;
|
||||
public ?string $modalId = null;
|
||||
public bool $isDisabled = false;
|
||||
public bool $isLocked = false;
|
||||
public string $type;
|
||||
|
||||
protected $rules = [
|
||||
'task.name' => 'required|string',
|
||||
'task.command' => 'required|string',
|
||||
];
|
||||
protected $validationAttributes = [
|
||||
'name' => 'Name',
|
||||
'command' => 'Command',
|
||||
];
|
||||
|
||||
public function mount()
|
||||
{
|
||||
$this->modalId = new Cuid2(7);
|
||||
$this->parameters = get_route_parameters();
|
||||
}
|
||||
|
||||
public function lock()
|
||||
{
|
||||
$this->task->is_shown_once = true;
|
||||
$this->task->save();
|
||||
$this->dispatch('refreshTasks');
|
||||
}
|
||||
public function instantSave()
|
||||
{
|
||||
$this->submit();
|
||||
}
|
||||
public function submit()
|
||||
{
|
||||
$this->validate();
|
||||
$this->task->save();
|
||||
$this->dispatch('success', 'Environment variable updated successfully.');
|
||||
$this->dispatch('refreshTasks');
|
||||
}
|
||||
|
||||
public function delete()
|
||||
{
|
||||
try {
|
||||
$this->task->delete();
|
||||
$this->dispatch('refreshTasks');
|
||||
} catch (\Exception $e) {
|
||||
return handleError($e);
|
||||
}
|
||||
}
|
||||
}
|
@ -315,6 +315,11 @@ class Application extends BaseModel
|
||||
return $this->hasMany(EnvironmentVariable::class)->where('is_preview', true)->where('key', 'like', 'NIXPACKS_%');
|
||||
}
|
||||
|
||||
public function scheduled_tasks(): HasMany
|
||||
{
|
||||
return $this->hasMany(ScheduledTask::class)->orderBy('name', 'asc');
|
||||
}
|
||||
|
||||
public function private_key()
|
||||
{
|
||||
return $this->belongsTo(PrivateKey::class);
|
||||
|
88
app/Models/ScheduledTask.php
Normal file
88
app/Models/ScheduledTask.php
Normal file
@ -0,0 +1,88 @@
|
||||
<?php
|
||||
|
||||
namespace App\Models;
|
||||
|
||||
use App\Models\ScheduledTask as ModelsScheduledTask;
|
||||
use Illuminate\Database\Eloquent\Casts\Attribute;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Support\Str;
|
||||
|
||||
class ScheduledTask extends BaseModel
|
||||
{
|
||||
protected $guarded = [];
|
||||
protected $casts = [
|
||||
'name' => 'string',
|
||||
'command' => 'string',
|
||||
'frequency' => 'string',
|
||||
'container' => 'string',
|
||||
];
|
||||
|
||||
// protected static function booted()
|
||||
// {
|
||||
// static::created(function ($scheduled_task) {
|
||||
// error_log("*** IN CREATED");
|
||||
// if ($scheduled_task->application_id) {
|
||||
// $found = ModelsScheduledTask::where('id', $scheduled_task->id)->where('application_id', $scheduled_task->application_id)->first();
|
||||
// $application = Application::find($scheduled_task->application_id);
|
||||
// if (!$found) {
|
||||
// ModelsScheduledTask::create([
|
||||
// 'name' => $scheduled_task->name,
|
||||
// 'command' => $scheduled_task->command,
|
||||
// 'frequency' => $scheduled_task->frequency,
|
||||
// 'container' => $scheduled_task->container,
|
||||
// 'application_id' => $scheduled_task->application_id,
|
||||
// ]);
|
||||
// }
|
||||
// }
|
||||
// });
|
||||
// }
|
||||
public function service()
|
||||
{
|
||||
return $this->belongsTo(Service::class);
|
||||
}
|
||||
// protected function value(): Attribute
|
||||
// {
|
||||
// return Attribute::make(
|
||||
// get: fn (?string $value = null) => $this->get_scheduled_tasks($value),
|
||||
// set: fn (?string $value = null) => $this->set_scheduled_tasks($value),
|
||||
// );
|
||||
// }
|
||||
|
||||
private function get_scheduled_tasks(?string $scheduled_task = null): string|null
|
||||
{
|
||||
error_log("** in get_scheduled_tasks");
|
||||
// // $team_id = currentTeam()->id;
|
||||
// if (!$scheduled_task) {
|
||||
// return null;
|
||||
// }
|
||||
// $scheduled_task = trim(decrypt($scheduled_task));
|
||||
// if (Str::startsWith($scheduled_task, '{{') && Str::endsWith($scheduled_task, '}}') && Str::contains($scheduled_task, 'global.')) {
|
||||
// $variable = Str::after($scheduled_task, 'global.');
|
||||
// $variable = Str::before($variable, '}}');
|
||||
// $variable = Str::of($variable)->trim()->value;
|
||||
// // $scheduled_task = GlobalScheduledTask::where('name', $scheduled_task)->where('team_id', $team_id)->first()?->value;
|
||||
// ray('global env variable');
|
||||
// return $scheduled_task;
|
||||
// }
|
||||
// return $scheduled_task;
|
||||
}
|
||||
|
||||
private function set_scheduled_tasks(?string $scheduled_task = null): string|null
|
||||
{
|
||||
error_log("** in set_scheduled_tasks");
|
||||
// if (is_null($scheduled_task) && $scheduled_task == '') {
|
||||
// return null;
|
||||
// }
|
||||
// $scheduled_task = trim($scheduled_task);
|
||||
// return encrypt($scheduled_task);
|
||||
}
|
||||
|
||||
// protected function key(): Attribute
|
||||
// {
|
||||
// error_log("** in key()");
|
||||
|
||||
// // return Attribute::make(
|
||||
// // set: fn (string $value) => Str::of($value)->trim(),
|
||||
// // );
|
||||
// }
|
||||
}
|
@ -0,0 +1,36 @@
|
||||
<?php
|
||||
|
||||
use Illuminate\Database\Migrations\Migration;
|
||||
use Illuminate\Database\Schema\Blueprint;
|
||||
use Illuminate\Support\Facades\Schema;
|
||||
|
||||
return new class extends Migration
|
||||
{
|
||||
/**
|
||||
* Run the migrations.
|
||||
*/
|
||||
public function up(): void
|
||||
{
|
||||
Schema::create('scheduled_tasks', function (Blueprint $table) {
|
||||
$table->id();
|
||||
$table->string('uuid')->unique();
|
||||
$table->boolean('enabled')->default(true);
|
||||
$table->string('name');
|
||||
$table->string('command');
|
||||
$table->string('frequency');
|
||||
$table->string('container')->nullable();
|
||||
$table->timestamps();
|
||||
|
||||
$table->foreignId('application_id')->nullable();
|
||||
$table->foreignId('service_id')->nullable();
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Reverse the migrations.
|
||||
*/
|
||||
public function down(): void
|
||||
{
|
||||
Schema::dropIfExists('scheduled_tasks');
|
||||
}
|
||||
};
|
@ -54,6 +54,9 @@
|
||||
href="#">Resource Limits
|
||||
</a>
|
||||
@endif
|
||||
<a :class="activeTab === 'scheduled-tasks' && 'text-white'"
|
||||
@click.prevent="activeTab = 'scheduled-tasks'; window.location.hash = 'scheduled-tasks'" href="#">Scheduled Tasks
|
||||
</a>
|
||||
<a :class="activeTab === 'danger' && 'text-white'"
|
||||
@click.prevent="activeTab = 'danger'; window.location.hash = 'danger'" href="#">Danger Zone
|
||||
</a>
|
||||
@ -97,6 +100,9 @@
|
||||
<div x-cloak x-show="activeTab === 'resource-limits'">
|
||||
<livewire:project.shared.resource-limits :resource="$application" />
|
||||
</div>
|
||||
<div x-cloak x-show="activeTab === 'scheduled-tasks'">
|
||||
<livewire:project.shared.scheduled-task.all :resource="$application" />
|
||||
</div>
|
||||
<div x-cloak x-show="activeTab === 'danger'">
|
||||
<livewire:project.shared.danger :resource="$application" />
|
||||
</div>
|
||||
|
@ -0,0 +1,15 @@
|
||||
<dialog id="newTask" class="modal">
|
||||
<form method="dialog" class="flex flex-col gap-2 rounded modal-box" wire:submit='submit'>
|
||||
<h3 class="text-lg font-bold">Add Scheduled Task</h3>
|
||||
<x-forms.input placeholder="Run cron" id="name" label="Name" required />
|
||||
<x-forms.input placeholder="php artisan schedule:run" id="command" label="Command" required />
|
||||
<x-forms.input placeholder="0 0 * * * or daily" id="frequency" label="Frequency" required />
|
||||
<x-forms.input placeholder="php" id="container" label="Container name" />
|
||||
<x-forms.button onclick="newTask.close()" type="submit">
|
||||
Save
|
||||
</x-forms.button>
|
||||
</form>
|
||||
<form method="dialog" class="modal-backdrop">
|
||||
<button>close</button>
|
||||
</form>
|
||||
</dialog>
|
@ -0,0 +1,16 @@
|
||||
<div class="flex flex-col gap-2">
|
||||
<div>
|
||||
<div class="flex items-center gap-2">
|
||||
<h2>Scheduled Tasks</h2>
|
||||
<x-forms.button class="btn" onclick="newTask.showModal()">+ Add</x-forms.button>
|
||||
<livewire:project.shared.scheduled-task.add />
|
||||
</div>
|
||||
<div>Scheduled Tasks for this resource.</div>
|
||||
</div>
|
||||
@forelse ($resource->scheduled_tasks as $task)
|
||||
<livewire:project.shared.scheduled-task.show wire:key="scheduled-task-{{ $task->id }}"
|
||||
:task="$task" :type="$resource->type()" />
|
||||
@empty
|
||||
<div class="text-neutral-500">No scheduled tasks found.</div>
|
||||
@endforelse
|
||||
</div>
|
@ -0,0 +1,21 @@
|
||||
<div>
|
||||
<x-modal yesOrNo modalId="{{ $modalId }}" modalTitle="Delete Scheduled Task">
|
||||
<x-slot:modalBody>
|
||||
<p>Are you sure you want to delete this scheduled task <span
|
||||
class="font-bold text-warning">({{ $task->name }})</span>?</p>
|
||||
</x-slot:modalBody>
|
||||
</x-modal>
|
||||
<form wire:submit='submit'
|
||||
class="flex flex-col gap-2 p-4 m-2 border lg:items-center border-coolgray-300 lg:m-0 lg:p-0 lg:border-0 lg:flex-row">
|
||||
<x-forms.input id="task.name" />
|
||||
<x-forms.input id="task.command" />
|
||||
<div class="flex gap-2">
|
||||
<x-forms.button type="submit">
|
||||
Update
|
||||
</x-forms.button>
|
||||
<x-forms.button isError isModal modalId="{{ $modalId }}">
|
||||
Delete
|
||||
</x-forms.button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
Loading…
x
Reference in New Issue
Block a user