refactor: merge template node update into vault update

Author: brufdev

app/Actions/UpdateVault.php

@@ -14,6 +14,13 @@
     /** @param array{name?: string, templates_node_id?: int|null} $attributes */
     public function handle(Vault $vault, array $attributes): Vault
     {
+        if (
+            isset($attributes['templates_node_id'])
+            && $attributes['templates_node_id'] === $vault->templates_node_id
+        ) {
+            $attributes['templates_node_id'] = null;
+        }
+
         $vault->update($attributes);
 
         // Broadcast events

app/Http/Controllers/VaultController.php

@@ -46,9 +46,15 @@ public function show(): void
         //
     }
 
-    public function update(UpdateVaultRequest $request, Vault $vault, UpdateVault $updateVault): JsonResponse
-    {
-        /** @var array{name: string} $data */
+    public function update(
+        UpdateVaultRequest $request,
+        Vault $vault,
+        #[CurrentUser] User $currentUser,
+        UpdateVault $updateVault,
+    ): JsonResponse {
+        abort_unless($currentUser->can('update', $vault), 403);
+
+        /** @var array{name?: string, templates_node_id?: int} $data */
         $data = $request->validated();
 
         $vault = $updateVault->handle($vault, $data);

app/Http/Controllers/VaultTemplatesNodeController.php

@@ -8,30 +8,20 @@
 use App\Models\Vault;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
-use Illuminate\Validation\Rules\Unique;
-use Illuminate\Validation\ValidationException;
 
 final class UpdateVaultRequest extends FormRequest
 {
-    public function authorize(): bool
-    {
-        /** @var User $user */
-        $user = $this->user();
-
-        return $user->can('update', $this->route('vault'));
-    }
-
-    /**
-     * @return array<string, array<int, string|Unique>>
-     */
+    /** @return array<string, array<int, mixed>> */
     public function rules(): array
     {
         /** @var User $user */
         $user = $this->user();
 
+        /** @var Vault $vault */
+        $vault = $this->route('vault');
+
         return [
             'name' => [
-                'required',
                 'string',
                 'max:255',
                 // One or more allowed characters, not starting with a dot or space
@@ -40,13 +30,12 @@ public function rules(): array
                     ->where('created_by', $user->id)
                     ->ignore($this->route('vault')),
             ],
+            'templates_node_id' => [
+                'integer',
+                Rule::exists('vault_nodes', 'id')
+                    ->where('vault_id', $vault->id)
+                    ->where('is_file', 0),
+            ],
         ];
     }
-
-    protected function failedAuthorization(): void
-    {
-        throw ValidationException::withMessages([
-            'update' => __('Not allowed'),
-        ]);
-    }
 }

app/Http/Requests/UpdateVaultRequest.php

@@ -5,11 +5,10 @@
 namespace Database\Factories;
 
 use App\Models\Vault;
+use App\Models\VaultNode;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
-/**
- * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\VaultNode>
- */
+/** @extends Factory<VaultNode> */
 final class VaultNodeFactory extends Factory
 {
     /**
@@ -22,10 +21,21 @@ public function definition(): array
         return [
             'vault_id' => Vault::factory(),
             'parent_id' => null,
-            'is_file' => true,
+            'is_file' => false,
             'name' => fake()->words(3, true),
-            'extension' => 'md',
-            'content' => fake()->paragraph(),
+            'extension' => null,
+            'content' => null,
         ];
     }
+
+    public function file(): Factory
+    {
+        return $this->state(function (array $attributes) {
+            return [
+                'is_file' => true,
+                'extension' => 'md',
+                'content' => fake()->paragraph(),
+            ];
+        });
+    }
 }

app/Http/Requests/UpdateVaultTemplatesNodeRequest.php

@@ -1,8 +1,7 @@
-import { show, templatesNode } from '@/routes/vaults';
+import { show, update } from '@/routes/vaults';
 import { children, move } from '@/routes/vaults/nodes';
 import { useVaultStore } from '@/stores/vault';
 import { useVaultTreeStore } from '@/stores/vaultTree';
-import { Vault } from '@/types/vault';
 import { VaultShowPageProps } from '@/types/vault.pages';
 import { router, usePage } from '@inertiajs/vue3';
 import { AxiosError, AxiosResponse } from 'axios';
@@ -100,7 +99,7 @@ export function useVaultTreeActions() {
     }
 
     function setTemplateFolder(nodeId: number): void {
-        const url = templatesNode.url({ vault: vaultTreeStore.getActiveVaultId() });
+        const url = update.url({ vault: vaultTreeStore.getActiveVaultId() });
 
         if (vaultTreeStore.isFolderLoading(nodeId)) {
             return;
@@ -115,9 +114,9 @@ export function useVaultTreeActions() {
                 templates_node_id: nodeId,
             },
         })
-            .then((response: AxiosResponse<{ vault: Vault }>) => {
+            .then((response: AxiosResponse) => {
                 createToast('Template folder updated', 'success');
-                vaultStore.setVault(response.data.vault);
+                vaultStore.updateVault(response.data.data);
             })
             .catch((error: AxiosError) => {
                 createToast(error.response?.statusText ?? 'Something went wrong', 'error');

database/factories/VaultNodeFactory.php

@@ -23,7 +23,6 @@
 use App\Http\Controllers\VaultNodeController;
 use App\Http\Controllers\VaultNodeImportController;
 use App\Http\Controllers\VaultNodeMoveController;
-use App\Http\Controllers\VaultTemplatesNodeController;
 use App\Http\Middleware\EnsureEmailIsConfigured;
 use App\Http\Middleware\EnsureRegistrationIsEnabled;
 use App\Http\Middleware\EnsureUserIsAdmin;
@@ -41,7 +40,6 @@
             Route::patch('', [VaultController::class, 'update'])->name('update');
             Route::delete('', [VaultController::class, 'destroy'])->name('destroy');
             Route::get('export', VaultExportController::class)->name('export');
-            Route::patch('templates-node', VaultTemplatesNodeController::class)->name('templates-node');
         });
 
         Route::post('import', VaultImportController::class)->name('import');