- package updates

- feat: service fixes
- ui: help menu

app/Http/Livewire/Project/New/DockerCompose.php

@@ -6,6 +6,7 @@ use App\Models\Project;
 use App\Models\Service;
 use Livewire\Component;
 use Illuminate\Support\Str;
+use Symfony\Component\Yaml\Yaml;
 
 class DockerCompose extends Component
 {
@@ -18,57 +19,50 @@ class DockerCompose extends Component
         $this->query = request()->query();
         if (isDev()) {
             $this->dockercompose = 'services:
-  ghost:
-    documentation: https://ghost.org/docs/config
-    image: ghost:5
+  plausible_events_db:
+    image: clickhouse/clickhouse-server:23.3.7.5-alpine
+    restart: always
     volumes:
-      - ghost-content-data:/var/lib/ghost/content
-    environment:
-      - url=$SERVICE_FQDN_GHOST
-      - database__client=mysql
-      - database__connection__host=mysql
-      - database__connection__user=$SERVICE_USER_MYSQL
-      - database__connection__password=$SERVICE_PASSWORD_MYSQL
-      - database__connection__database=${MYSQL_DATABASE-ghost}
-    depends_on:
-      - mysql
-  mysql:
-    documentation: https://hub.docker.com/_/mysql
-    image: mysql:8.0
-    volumes:
-      - ghost-mysql-data:/var/lib/mysql
-    environment:
-      - MYSQL_USER=${SERVICE_USER_MYSQL}
-      - MYSQL_PASSWORD=${SERVICE_PASSWORD_MYSQL}
-      - MYSQL_DATABASE=${MYSQL_DATABASE}
-      - MYSQL_ROOT_PASSWORD=${SERVICE_PASSWORD_MYSQL_ROOT}
+        - event-data:/var/lib/clickhouse
+        - ./clickhouse/clickhouse-config.xml:/etc/clickhouse-server/config.d/logging.xml:ro
+        - ./clickhouse/clickhouse-user-config.xml:/etc/clickhouse-server/users.d/logging.xml:ro
+    ulimits:
+      nofile:
+        soft: 262144
+        hard: 262144
 ';
         }
     }
     public function submit()
     {
-        $this->validate([
-            'dockercompose' => 'required'
-        ]);
-        $server_id = $this->query['server_id'];
+        try {
+            $this->validate([
+                'dockercompose' => 'required'
+            ]);
+            $this->dockercompose = Yaml::dump(Yaml::parse($this->dockercompose), 10, 2, Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK);
+            $server_id = $this->query['server_id'];
 
-        $project = Project::where('uuid', $this->parameters['project_uuid'])->first();
-        $environment = $project->load(['environments'])->environments->where('name', $this->parameters['environment_name'])->first();
+            $project = Project::where('uuid', $this->parameters['project_uuid'])->first();
+            $environment = $project->load(['environments'])->environments->where('name', $this->parameters['environment_name'])->first();
 
-        $service = Service::create([
-            'name' => 'service' . Str::random(10),
-            'docker_compose_raw' => $this->dockercompose,
-            'environment_id' => $environment->id,
-            'server_id' => (int) $server_id,
-        ]);
-        $service->name = "service-$service->uuid";
+            $service = Service::create([
+                'name' => 'service' . Str::random(10),
+                'docker_compose_raw' => $this->dockercompose,
+                'environment_id' => $environment->id,
+                'server_id' => (int) $server_id,
+            ]);
+            $service->name = "service-$service->uuid";
 
-        $service->parse(isNew: true);
+            $service->parse(isNew: true);
+
+            return redirect()->route('project.service', [
+                'service_uuid' => $service->uuid,
+                'environment_name' => $environment->name,
+                'project_uuid' => $project->uuid,
+            ]);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
 
-        return redirect()->route('project.service', [
-            'service_uuid' => $service->uuid,
-            'environment_name' => $environment->name,
-            'project_uuid' => $project->uuid,
-        ]);
     }
 }

app/Http/Livewire/Project/Service/Application.php

@@ -8,6 +8,8 @@ use Livewire\Component;
 class Application extends Component
 {
     public ServiceApplication $application;
+    public $fileStorages = null;
+    protected $listeners = ["refreshFileStorages"];
     protected $rules = [
         'application.human_name' => 'nullable',
         'application.description' => 'nullable',
@@ -15,14 +17,22 @@ class Application extends Component
     ];
     public function render()
     {
-        ray($this->application->fileStorages()->get());
         return view('livewire.project.service.application');
     }
+    public function refreshFileStorages()
+    {
+        $this->fileStorages = $this->application->fileStorages()->get();
+    }
+    public function mount()
+    {
+        $this->refreshFileStorages();
+    }
     public function submit()
     {
         try {
             $this->validate();
             $this->application->save();
+            $this->emit('success', 'Application saved successfully.');
         } catch (\Throwable $e) {
             ray($e);
         } finally {

app/Http/Livewire/Project/Service/FileStorage.php

@@ -3,17 +3,42 @@
 namespace App\Http\Livewire\Project\Service;
 
 use App\Models\LocalFileVolume;
+use App\Models\ServiceApplication;
+use App\Models\ServiceDatabase;
 use Livewire\Component;
+use Illuminate\Support\Str;
 
 class FileStorage extends Component
 {
     public LocalFileVolume $fileStorage;
+    public ServiceApplication|ServiceDatabase $service;
+    public string $fs_path;
 
     protected $rules = [
         'fileStorage.fs_path' => 'required',
         'fileStorage.mount_path' => 'required',
         'fileStorage.content' => 'nullable',
     ];
+    public function mount() {
+        $this->service = $this->fileStorage->service;
+        $this->fs_path = Str::of($this->fileStorage->fs_path)->beforeLast('/');
+        $file = Str::of($this->fileStorage->fs_path)->afterLast('/');
+        if (Str::of($this->fs_path)->startsWith('.')) {
+            $this->fs_path = Str::of($this->fs_path)->after('.');
+            $this->fs_path = $this->service->service->workdir() . $this->fs_path . "/" .$file;
+        }
+    }
+    public function submit()
+    {
+        try {
+            $this->validate();
+            $this->fileStorage->save();
+            $this->service->saveFileVolumes();
+            $this->emit('success', 'File updated successfully.');
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
     public function render()
     {
         return view('livewire.project.service.file-storage');

app/Http/Livewire/Project/Service/Index.php

@@ -15,7 +15,7 @@ class Index extends Component
         'service.docker_compose_raw' => 'required',
         'service.docker_compose' => 'required',
         'service.name' => 'required',
-        'service.description' => 'required',
+        'service.description' => 'nullable',
     ];
 
     public function mount()
@@ -28,19 +28,23 @@ class Index extends Component
     {
         return view('livewire.project.service.index');
     }
-    public function save() {
+    public function save()
+    {
         $this->service->save();
         $this->service->parse();
         $this->service->refresh();
         $this->emit('refreshEnvs');
+        $this->emit('success', 'Service saved successfully.');
+        $this->service->saveComposeConfigs();
     }
-    public function submit() {
+    public function submit()
+    {
         try {
             $this->validate();
             $this->service->save();
+            $this->emit('success', 'Service saved successfully.');
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }
     }
-
 }