create folder in upload request

resources/js/components/Others/TreeMenu.vue

@@ -27,25 +27,25 @@
             <hard-drive-icon
                 v-if="['public', 'files'].includes(nodes.location)"
                 size="17"
-                class="icon vue-feather"
+                class="icon vue-feather shrink-0"
                 :class="{ 'text-theme dark-text-theme': isSelectedItem }"
             />
             <users-icon
                 v-if="nodes.location === 'team-folders'"
                 size="17"
-                class="icon vue-feather"
+                class="icon vue-feather shrink-0"
                 :class="{ 'text-theme dark-text-theme': isSelectedItem }"
             />
             <user-plus-icon
                 v-if="nodes.location === 'shared-with-me'"
                 size="17"
-                class="icon vue-feather"
+                class="icon vue-feather shrink-0"
                 :class="{ 'text-theme dark-text-theme': isSelectedItem }"
             />
             <folder-icon
                 v-if="!nodes.location"
                 size="17"
-                class="icon vue-feather"
+                class="icon vue-feather shrink-0"
                 :class="{ 'text-theme dark-text-theme': isSelectedItem }"
             />
 

resources/js/components/Others/TreeMenuNavigator.vue

@@ -22,7 +22,7 @@
                     }"
                 />
             </div>
-            <folder-icon size="17" class="vue-feather mr-2.5" :class="{ 'text-theme': isSelected }" />
+            <folder-icon size="17" class="vue-feather mr-2.5 shrink-0" :class="{ 'text-theme': isSelected }" />
             <b
                 class="max-w-1 overflow-hidden text-ellipsis whitespace-nowrap text-xs font-bold"
                 :class="{ 'text-theme': isSelected }"

resources/js/store/modules/fileFunctions.js

@@ -84,17 +84,16 @@ const actions = {
     },
     createFolder: ({ commit, getters, dispatch }, folder) => {
         // Get route
-        let route = getters.sharedDetail
-            ? `/api/editor/create-folder/${router.currentRoute.params.token}`
-            : '/api/create-folder'
-
-        let parent_id = getters.currentFolder ? getters.currentFolder.data.id : undefined
+        let route = {
+            RequestUpload: `/api/upload-request/${router.currentRoute.params.token}/create-folder`,
+            Public: `/api/editor/create-folder/${router.currentRoute.params.token}`,
+        }[router.currentRoute.name] || '/api/create-folder'
 
         axios
             .post(route, {
-                parent_id: parent_id,
                 name: folder.name,
                 emoji: folder.emoji,
+                parent_id: getters.currentFolder?.data.id,
             })
             .then((response) => {
                 commit('ADD_NEW_FOLDER', response.data)
@@ -120,7 +119,7 @@ const actions = {
     },
     renameItem: ({ commit, getters, dispatch }, data) => {
         // Updated name in favourites panel
-        if (getters.permission === 'master' && data.type === 'folder')
+        if (data.type === 'folder' && getters.user)
             commit('UPDATE_NAME_IN_FAVOURITES', data)
 
         // Get route

routes/upload-request.php

@@ -1,5 +1,6 @@
 <?php
 
+use Domain\UploadRequest\Controllers\CreateFolderController;
 use Tests\Domain\UploadRequest\RenameFileOrFolderController;
 use Domain\UploadRequest\Controllers\GetUploadRequestController;
 use Domain\UploadRequest\Controllers\CreateUploadRequestController;
@@ -12,6 +13,7 @@ Route::post('/{uploadRequest}/upload', UploadFilesForUploadRequestController::cl
 
 // Edit
 Route::patch('/{uploadRequest}/rename/{id}', RenameFileOrFolderController::class);
+Route::post('/{uploadRequest}/create-folder', CreateFolderController::class);
 
 Route::group(['middleware' => ['auth:sanctum']], function () {
     Route::post('/', CreateUploadRequestController::class);

src/Domain/UploadRequest/Controllers/CreateFolderController.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace Domain\UploadRequest\Controllers;
+
+use Domain\Folders\Actions\CreateFolderAction;
+use Domain\Folders\Models\Folder;
+use Domain\Folders\Requests\CreateFolderRequest;
+use Domain\Folders\Resources\FolderResource;
+use Domain\UploadRequest\Models\UploadRequest;
+use Support\Demo\Actions\FakeCreateFolderAction;
+
+class CreateFolderController
+{
+    public function __construct(
+        public CreateFolderAction $createFolder,
+        public FakeCreateFolderAction $fakeCreateFolder,
+    ) {
+    }
+
+    public function __invoke(CreateFolderRequest $request, UploadRequest $uploadRequest)
+    {
+        // Check if upload request is active
+        if ($uploadRequest->status !== 'active') {
+            return response('Gone', 410);
+        }
+
+        // Check privileges
+        if (! in_array($request->input('parent_id'), getChildrenFolderIds($uploadRequest->id))) {
+            return response('Access Denied', 403);
+        }
+
+        // Create new folder
+        $folder = Folder::create([
+            'parent_id'   => $request->input('parent_id'),
+            'name'        => $request->input('name'),
+            'color'       => $request->input('color') ?? null,
+            'emoji'       => $request->input('emoji') ?? null,
+            'author'      => 'visitor',
+            'user_id'     => $uploadRequest->user_id,
+            'team_folder' => false,
+        ]);
+
+        // Return new folder
+        return response(new FolderResource($folder), 201);
+    }
+}

src/Support/helpers.php

@@ -3,6 +3,7 @@
 use Carbon\Carbon;
 use ByteUnits\Metric;
 use App\Users\Models\User;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
 use Domain\Files\Models\File;
 use Domain\Sharing\Models\Share;
@@ -27,6 +28,22 @@ if (! function_exists('isRunningCron')) {
     }
 }
 
+if (! function_exists('getInnerFolderIds')) {
+    /**
+     * Get all folder children ids
+     */
+    function getChildrenFolderIds(string $id): array
+    {
+        // Get folders within upload request
+        $folderWithinIds = Folder::with('folders:id,parent_id')
+            ->where('parent_id', $id)
+            ->get(['id']);
+
+        // Then get all accessible folders within
+        return Arr::flatten([filter_folders_ids($folderWithinIds), $id]);
+    }
+}
+
 if (! function_exists('obfuscate_email')) {
     /**
      * Obfuscate email

tests/Domain/UploadRequest/RenameFileOrFolderController.php

@@ -1,8 +1,6 @@
 <?php
 namespace Tests\Domain\UploadRequest;
 
-use Illuminate\Support\Arr;
-use Domain\Folders\Models\Folder;
 use App\Http\Controllers\Controller;
 use Domain\Files\Resources\FileResource;
 use Domain\Folders\Resources\FolderResource;
@@ -29,16 +27,8 @@ class RenameFileOrFolderController extends Controller
         // Get item
         $item = get_item($request->input('type'), $id);
 
-        // Get folders within upload request
-        $folderWithinIds = Folder::with('folders:id,parent_id')
-            ->where('parent_id', $uploadRequest->id)
-            ->get(['id']);
-
-        // Then get all accessible folders within
-        $accessibleParentIds = Arr::flatten([filter_folders_ids($folderWithinIds), $uploadRequest->id]);
-
         // Check privileges
-        if (! in_array($item->parent_id, $accessibleParentIds)) {
+        if (! in_array($item->parent_id, getChildrenFolderIds($uploadRequest->id))) {
             return response('Access Denied', 403);
         }
 

tests/Domain/UploadRequest/UploadRequestEditingTest.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tests\Domain\UploadRequest;
 
 use Tests\TestCase;
@@ -32,7 +33,7 @@ class UploadRequestEditingTest extends TestCase
 
         $this
             ->actingAs($user)
-            ->postJson("/api/upload-request/$uploadRequest->id/rename/$folder->id", [
+            ->patchJson("/api/upload-request/$uploadRequest->id/rename/$folder->id", [
                 'name' => 'Renamed Folder',
                 'type' => 'folder',
             ])
@@ -45,6 +46,7 @@ class UploadRequestEditingTest extends TestCase
             'name' => 'Renamed Folder',
         ]);
     }
+
     /**
      * @test
      */
@@ -68,7 +70,7 @@ class UploadRequestEditingTest extends TestCase
 
         $this
             ->actingAs($user)
-            ->postJson("/api/upload-request/$uploadRequest->id/rename/$file->id", [
+            ->patchJson("/api/upload-request/$uploadRequest->id/rename/$file->id", [
                 'name' => 'Renamed File',
                 'type' => 'file',
             ])
@@ -81,4 +83,36 @@ class UploadRequestEditingTest extends TestCase
             'name' => 'Renamed File',
         ]);
     }
+
+    /**
+     * @test
+     */
+    public function it_create_new_folder_in_upload_request()
+    {
+        $user = User::factory()
+            ->hasSettings()
+            ->create();
+
+        $uploadRequest = UploadRequest::factory()
+            ->create([
+                'status'  => 'active',
+                'user_id' => $user->id,
+            ]);
+
+        $this
+            ->actingAs($user)
+            ->postJson("/api/upload-request/$uploadRequest->id/create-folder", [
+                'name'      => 'New Folder',
+                'parent_id' => $uploadRequest->id,
+            ])
+            ->assertStatus(201)
+            ->assertJsonFragment([
+                'name'      => 'New Folder',
+            ]);
+
+        $this->assertDatabaseHas('folders', [
+            'name'      => 'New Folder',
+            'parent_id' => $uploadRequest->id,
+        ]);
+    }
 }