team folder browsing with static team folder details

src/Domain/Browsing/Controllers/BrowseFolderController.php

@@ -1,16 +1,14 @@
 <?php
-
 namespace Domain\Browsing\Controllers;
 
-use DB;
-use Domain\Files\Resources\FilesCollection;
-use Domain\Folders\Resources\FolderCollection;
-use Domain\Folders\Resources\FolderResource;
+use Str;
 use Illuminate\Http\Request;
 use Domain\Files\Models\File;
 use Domain\Folders\Models\Folder;
 use Illuminate\Support\Facades\Auth;
-use Str;
+use Domain\Files\Resources\FilesCollection;
+use Domain\Folders\Resources\FolderResource;
+use Domain\Folders\Resources\FolderCollection;
 
 class BrowseFolderController
 {

src/Domain/Browsing/Controllers/BrowseLatestFilesController.php

@@ -2,8 +2,8 @@
 namespace Domain\Browsing\Controllers;
 
 use App\Users\Models\User;
-use Domain\Files\Resources\FilesCollection;
 use Illuminate\Support\Facades\Auth;
+use Domain\Files\Resources\FilesCollection;
 
 class BrowseLatestFilesController
 {

src/Domain/Browsing/Controllers/BrowseSharedItemsController.php

@@ -2,11 +2,11 @@
 namespace Domain\Browsing\Controllers;
 
 use Domain\Files\Models\File;
-use Domain\Files\Resources\FilesCollection;
-use Domain\Folders\Resources\FolderCollection;
 use Domain\Sharing\Models\Share;
 use Domain\Folders\Models\Folder;
 use Illuminate\Support\Facades\Auth;
+use Domain\Files\Resources\FilesCollection;
+use Domain\Folders\Resources\FolderCollection;
 
 class BrowseSharedItemsController
 {

src/Domain/Browsing/Controllers/BrowseTrashContentController.php

@@ -2,11 +2,10 @@
 namespace Domain\Browsing\Controllers;
 
 use Domain\Files\Models\File;
-use Domain\Files\Resources\FilesCollection;
 use Domain\Folders\Models\Folder;
-use Domain\Folders\Resources\FolderCollection;
-use Illuminate\Http\Resources\Json\ResourceCollection;
 use Illuminate\Support\Facades\Auth;
+use Domain\Files\Resources\FilesCollection;
+use Domain\Folders\Resources\FolderCollection;
 
 class BrowseTrashContentController
 {

src/Domain/Browsing/Controllers/SearchFilesAndFoldersController.php

@@ -2,11 +2,11 @@
 namespace Domain\Browsing\Controllers;
 
 use Domain\Files\Models\File;
-use Domain\Files\Resources\FilesCollection;
 use Domain\Folders\Models\Folder;
-use Domain\Folders\Resources\FolderCollection;
 use Illuminate\Support\Facades\Auth;
 use Domain\Items\Requests\SearchRequest;
+use Domain\Files\Resources\FilesCollection;
+use Domain\Folders\Resources\FolderCollection;
 
 class SearchFilesAndFoldersController
 {

src/Domain/Browsing/Controllers/VisitorBrowseFolderController.php

@@ -2,13 +2,12 @@
 namespace Domain\Browsing\Controllers;
 
 use Domain\Files\Models\File;
-use Domain\Files\Resources\FilesCollection;
-use Domain\Folders\Resources\FolderCollection;
 use Domain\Sharing\Models\Share;
 use Domain\Folders\Models\Folder;
+use Domain\Files\Resources\FilesCollection;
+use Domain\Folders\Resources\FolderCollection;
 use Domain\Sharing\Actions\ProtectShareRecordAction;
 use Domain\Sharing\Actions\VerifyAccessToItemAction;
-use Illuminate\Http\Resources\Json\ResourceCollection;
 
 /**
  * Browse shared folder

src/Domain/Browsing/Controllers/VisitorSearchFilesAndFoldersController.php

@@ -1,14 +1,14 @@
 <?php
 namespace Domain\Browsing\Controllers;
 
-use Domain\Files\Resources\FilesCollection;
-use Domain\Folders\Resources\FolderCollection;
 use Illuminate\Support\Arr;
 use Illuminate\Http\Request;
 use Domain\Files\Models\File;
 use Domain\Sharing\Models\Share;
 use Domain\Folders\Models\Folder;
 use App\Http\Controllers\Controller;
+use Domain\Files\Resources\FilesCollection;
+use Domain\Folders\Resources\FolderCollection;
 use Domain\Sharing\Actions\ProtectShareRecordAction;
 
 /**

src/Domain/Files/Controllers/UploadFileController.php

@@ -2,11 +2,11 @@
 namespace Domain\Files\Controllers;
 
 use Domain\Files\Models\File;
+use Illuminate\Http\Response;
 use App\Http\Controllers\Controller;
 use Domain\Files\Requests\UploadRequest;
-use Domain\Files\Actions\UploadFileAction;
 use Domain\Files\Resources\FileResource;
-use Illuminate\Http\Response;
+use Domain\Files\Actions\UploadFileAction;
 use Support\Demo\Actions\FakeUploadFileAction;
 
 class UploadFileController extends Controller
@@ -22,8 +22,7 @@ class UploadFileController extends Controller
      */
     public function __invoke(
         UploadRequest $request,
-    ): Response|array {
-
+    ): Response | array {
         if (is_demo_account('howdy@hi5ve.digital')) {
             return ($this->fakeUploadFile)($request);
         }

src/Domain/Files/Resources/FileResource.php

@@ -1,5 +1,4 @@
 <?php
-
 namespace Domain\Files\Resources;
 
 use Domain\Sharing\Resources\ShareResource;
@@ -40,10 +39,10 @@ class FileResource extends JsonResource
                     ),*/
                 ],
                 'relationships' => [
-                    $this->mergeWhen($this->shared, fn() => [
+                    $this->mergeWhen($this->shared, fn () => [
                         'shared' => new ShareResource($this->shared),
                     ]),
-                    $this->mergeWhen($this->parent, fn() => [
+                    $this->mergeWhen($this->parent, fn () => [
                         'parent' => [
                             'data' => [
                                 'type'       => 'folder',
@@ -54,7 +53,7 @@ class FileResource extends JsonResource
                             ],
                         ],
                     ]),
-                ]
+                ],
             ],
         ];
     }

src/Domain/Folders/Controllers/CreateFolderController.php

@@ -2,9 +2,9 @@
 namespace Domain\Folders\Controllers;
 
 use Auth;
-use Domain\Folders\Resources\FolderResource;
 use Illuminate\Http\Response;
 use App\Http\Controllers\Controller;
+use Domain\Folders\Resources\FolderResource;
 use Domain\Folders\Actions\CreateFolderAction;
 use Domain\Folders\Requests\CreateFolderRequest;
 use Support\Demo\Actions\FakeCreateFolderAction;

src/Domain/Folders/Models/Folder.php

@@ -203,6 +203,16 @@ class Folder extends Model
             ->withPivot('permission');
     }
 
+    public function parents(): HasMany
+    {
+        return $this->hasMany(Folder::class, 'id', 'parent_id');
+    }
+
+    public function teamRoot(): HasMany
+    {
+        return $this->parents()->with('teamRoot');
+    }
+
     // Delete all folder children
     public static function boot()
     {
@@ -214,30 +224,28 @@ class Folder extends Model
 
         static::deleting(function ($item) {
             if ($item->isForceDeleting()) {
-                $item->trashedChildren()->each(function ($folder) {
-                    $folder->forceDelete();
-                });
+                $item
+                    ->trashedChildren()
+                    ->each(fn ($folder) => $folder->forceDelete());
             } else {
-                $item->children()->each(function ($folder) {
-                    $folder->delete();
-                });
+                $item
+                    ->children()
+                    ->each(fn ($folder) => $folder->delete());
 
-                $item->files()->each(function ($file) {
-                    $file->delete();
-                });
+                $item
+                    ->files()
+                    ->each(fn ($file) => $file->delete());
             }
         });
 
+        // Restore children folders and files
         static::restoring(function ($item) {
-            // Restore children folders
-            $item->trashedChildren()->each(function ($folder) {
-                $folder->restore();
-            });
-
-            // Restore children files
-            $item->trashedFiles()->each(function ($files) {
-                $files->restore();
-            });
+            $item
+                ->trashedChildren()
+                ->each(fn ($folder) => $folder->restore());
+            $item
+                ->trashedFiles()
+                ->each(fn ($files) => $files->restore());
         });
     }
 }

src/Domain/Folders/Resources/FolderResource.php

@@ -1,11 +1,10 @@
 <?php
-
 namespace Domain\Folders\Resources;
 
 use Domain\Sharing\Resources\ShareResource;
-use Domain\Teams\Resources\TeamInvitationsCollection;
-use Domain\Teams\Resources\TeamMembersCollection;
 use Illuminate\Http\Resources\Json\JsonResource;
+use Domain\Teams\Resources\TeamMembersCollection;
+use Domain\Teams\Resources\TeamInvitationsCollection;
 
 class FolderResource extends JsonResource
 {
@@ -34,16 +33,16 @@ class FolderResource extends JsonResource
                     ),*/
                 ],
                 'relationships' => [
-                    $this->mergeWhen($this->teamMembers, fn() => [
+                    $this->mergeWhen($this->teamMembers, fn () => [
                         'members' => new TeamMembersCollection($this->teamMembers),
                     ]),
-                    $this->mergeWhen($this->teamInvitations, fn() => [
+                    $this->mergeWhen($this->teamInvitations, fn () => [
                         'invitations' => new TeamInvitationsCollection($this->teamInvitations),
                     ]),
-                    $this->mergeWhen($this->shared, fn() => [
+                    $this->mergeWhen($this->shared, fn () => [
                         'shared' => new ShareResource($this->shared),
                     ]),
-                    $this->mergeWhen($this->parent, fn() => [
+                    $this->mergeWhen($this->parent, fn () => [
                         'parent' => [
                             'data' => [
                                 'type'       => 'folder',

src/Domain/Items/Actions/RenameFileOrFolderAction.php

@@ -1,8 +1,6 @@
 <?php
 namespace Domain\Items\Actions;
 
-use Domain\Files\Resources\FileResource;
-use Domain\Folders\Resources\FolderResource;
 use Domain\Items\Requests\RenameItemRequest;
 
 class RenameFileOrFolderAction
@@ -14,7 +12,6 @@ class RenameFileOrFolderAction
         RenameItemRequest $request,
         string $id,
     ) {
-
         // Get item
         $item = get_item($request->input('type'), $id);
 

src/Domain/Items/Controllers/RenameFileOrFolderController.php

@@ -25,7 +25,7 @@ class RenameFileOrFolderController extends Controller
     public function __invoke(
         RenameItemRequest $request,
         string $id,
-    ): FileResource|FolderResource|array {
+    ): FileResource | FolderResource | array {
         if (is_demo_account(Auth::user()->email)) {
             return ($this->fakeRenameFileOrFolder)($request, $id);
         }

src/Domain/Items/Controllers/VisitorRenameFileOrFolderController.php

@@ -1,12 +1,11 @@
 <?php
 namespace Domain\Items\Controllers;
 
-use Domain\Files\Resources\FileResource;
-use Domain\Folders\Resources\FolderResource;
-use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Http\Response;
 use Domain\Sharing\Models\Share;
 use App\Http\Controllers\Controller;
+use Domain\Files\Resources\FileResource;
+use Domain\Folders\Resources\FolderResource;
 use Domain\Items\Requests\RenameItemRequest;
 use Domain\Items\Actions\RenameFileOrFolderAction;
 use Domain\Sharing\Actions\ProtectShareRecordAction;

src/Domain/Localization/Controllers/LanguageController.php

@@ -1,12 +1,12 @@
 <?php
 namespace Domain\Localization\Controllers;
 
-use Domain\Localization\Resources\LanguageCollection;
-use Domain\Localization\Resources\LanguageResource;
 use Illuminate\Http\Response;
 use Domain\Settings\Models\Setting;
 use App\Http\Controllers\Controller;
 use Domain\Localization\Models\Language;
+use Domain\Localization\Resources\LanguageResource;
+use Domain\Localization\Resources\LanguageCollection;
 use Domain\Localization\Requests\CreateLanguageRequest;
 use Domain\Localization\Requests\UpdateLanguageRequest;
 

src/Domain/Sharing/Actions/SendViaEmailAction.php

@@ -1,9 +1,9 @@
 <?php
 namespace Domain\Sharing\Actions;
 
-use Domain\Sharing\Notifications\SharedSendViaEmail;
 use Spatie\QueueableAction\QueueableAction;
 use Illuminate\Support\Facades\Notification;
+use Domain\Sharing\Notifications\SharedSendViaEmail;
 
 class SendViaEmailAction
 {

src/Domain/Sharing/Resources/ShareResource.php

@@ -1,5 +1,4 @@
 <?php
-
 namespace Domain\Sharing\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
@@ -22,7 +21,7 @@ class ShareResource extends JsonResource
                     'permission' => $this->permission,
                     'protected'  => $this->is_protected,
                     'item_id'    => $this->item_id,
-                    'expire_in'  => (int)$this->expire_in,
+                    'expire_in'  => (int) $this->expire_in,
                     'token'      => $this->token,
                     'link'       => $this->link,
                     'type'       => $this->type,

src/Domain/Teams/Controllers/BrowseSharedWithMeController.php

@@ -16,7 +16,7 @@ class BrowseSharedWithMeController
 
         $relations = [
             'parent:id,name',
-            'shared:token,id,item_id,permission,is_protected,expire_in'
+            'shared:token,id,item_id,permission,is_protected,expire_in',
         ];
 
         if ($rootId) {

src/Domain/Teams/Controllers/ConvertFolderIntoTeamFolderController.php

@@ -1,11 +1,11 @@
 <?php
 namespace Domain\Teams\Controllers;
 
-use Domain\Teams\Requests\ConvertIntoTeamFolderRequest;
-use Illuminate\Contracts\Routing\ResponseFactory;
 use Illuminate\Http\Response;
 use Domain\Folders\Models\Folder;
 use App\Http\Controllers\Controller;
+use Illuminate\Contracts\Routing\ResponseFactory;
+use Domain\Teams\Requests\ConvertIntoTeamFolderRequest;
 use Domain\Teams\Actions\InviteMembersIntoTeamFolderAction;
 
 class ConvertFolderIntoTeamFolderController extends Controller
@@ -18,7 +18,7 @@ class ConvertFolderIntoTeamFolderController extends Controller
     public function __invoke(
         ConvertIntoTeamFolderRequest $request,
         Folder $folder
-    ): ResponseFactory|Response {
+    ): ResponseFactory | Response {
         $folder->update([
             'team_folder' => 1,
             'parent_id'   => null,

src/Domain/Teams/Controllers/InvitationsController.php

@@ -10,11 +10,9 @@ use Illuminate\Contracts\Routing\ResponseFactory;
 
 class InvitationsController extends Controller
 {
-
     public function update(
         TeamFolderInvitation $invitation
-    ): ResponseFactory|Response {
-
+    ): ResponseFactory | Response {
         $user = User::where('email', $invitation->email)
             ->firstOrFail();
 
@@ -34,7 +32,7 @@ class InvitationsController extends Controller
 
     public function destroy(
         TeamFolderInvitation $invitation
-    ): ResponseFactory|Response {
+    ): ResponseFactory | Response {
         $invitation->update([
             'status' => 'rejected',
         ]);

src/Domain/Teams/Controllers/TeamFoldersController.php

@@ -1,25 +1,23 @@
 <?php
 namespace Domain\Teams\Controllers;
 
-use DB;
-use Domain\Files\Resources\FilesCollection;
-use Domain\Folders\Resources\FolderCollection;
-use Domain\Folders\Resources\FolderResource;
-use Domain\Teams\Requests\CreateTeamFolderRequest;
-use Domain\Teams\Requests\UpdateTeamFolderMembersRequest;
-use Illuminate\Contracts\Routing\ResponseFactory;
+use Illuminate\Support\Str;
 use Domain\Files\Models\File;
-use Illuminate\Http\Resources\Json\JsonResource;
-use Illuminate\Http\Resources\Json\ResourceCollection;
 use Illuminate\Http\Response;
 use Domain\Folders\Models\Folder;
+use Illuminate\Support\Facades\DB;
 use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Auth;
 use Domain\Teams\DTO\CreateTeamFolderData;
+use Domain\Files\Resources\FilesCollection;
+use Domain\Folders\Resources\FolderResource;
 use Domain\Teams\Actions\UpdateMembersAction;
+use Domain\Folders\Resources\FolderCollection;
 use Domain\Teams\Actions\UpdateInvitationsAction;
+use Illuminate\Contracts\Routing\ResponseFactory;
+use Domain\Teams\Requests\CreateTeamFolderRequest;
+use Domain\Teams\Requests\UpdateTeamFolderMembersRequest;
 use Domain\Teams\Actions\InviteMembersIntoTeamFolderAction;
-use Str;
 
 class TeamFoldersController extends Controller
 {
@@ -28,28 +26,35 @@ class TeamFoldersController extends Controller
     ) {
     }
 
-    public function show($id)
+    public function show($id): array
     {
-        $isHomepage = $id === 'undefined';
-        $rootId = $id === 'undefined' ? null : $id;
-        $requestedFolder = $rootId ? new FolderResource(Folder::findOrFail($rootId)) : null;
         $files = [];
+        $teamRootFolder = null;
 
-        $folders = Folder::with([
-            'teamMembers',
-            'teamInvitations',
-            'parent:id,name',
-            'shared:token,id,item_id,permission,is_protected,expire_in'
-        ])
-            ->where('parent_id', $rootId)
-            ->where('team_folder', $isHomepage)
+        $rootId = Str::isUuid($id) ? $id : null;
+        $requestedFolder = $rootId ? Folder::findOrFail($rootId) : null;
+
+        $folders = Folder::where('parent_id', $rootId)
+            ->where('team_folder', ! Str::isUuid($id))
             ->where('user_id', Auth::id())
             ->sortable()
             ->get();
 
-        if (Str::isUuid($id)) {
-            $files = File::with(['parent:id,name', 'shared:token,id,item_id,permission,is_protected,expire_in'])
-                ->where('folder_id', $rootId)
+        if ($requestedFolder) {
+            // Get root team folder
+            $teamRootIdResults = recursiveFind(
+                $requestedFolder->teamRoot->toArray(),
+                'id'
+            );
+
+            $teamRootId = end($teamRootIdResults);
+
+            $teamRootFolder = $teamRootId
+                ? Folder::findOrFail($teamRootId)
+                : $requestedFolder;
+
+            // Get files
+            $files = File::where('folder_id', $rootId)
                 ->where('user_id', Auth::id())
                 ->sortable()
                 ->get();
@@ -57,15 +62,16 @@ class TeamFoldersController extends Controller
 
         // Collect folders and files to single array
         return [
-            'folders' => new FolderCollection($folders),
-            'files'   => new FilesCollection($files),
-            'root'    => $requestedFolder,
+            'folders'    => new FolderCollection($folders),
+            'files'      => new FilesCollection($files),
+            'root'       => $requestedFolder ? new FolderResource($requestedFolder) : null,
+            'teamFolder' => $teamRootFolder ? new FolderResource($teamRootFolder) : null,
         ];
     }
 
     public function store(
         CreateTeamFolderRequest $request,
-    ): ResponseFactory|Response {
+    ): ResponseFactory | Response {
         $data = CreateTeamFolderData::fromRequest($request);
 
         $folder = Folder::create([
@@ -85,7 +91,7 @@ class TeamFoldersController extends Controller
         Folder $folder,
         UpdateInvitationsAction $updateInvitations,
         UpdateMembersAction $updateMembers,
-    ): ResponseFactory|Response {
+    ): ResponseFactory | Response {
         $updateInvitations(
             $folder,
             $request->input('invitations')
@@ -99,7 +105,7 @@ class TeamFoldersController extends Controller
         return response(new FolderResource($folder), 201);
     }
 
-    public function destroy(Folder $folder): ResponseFactory|Response
+    public function destroy(Folder $folder): ResponseFactory | Response
     {
         // Delete existing invitations
         DB::table('team_folder_invitations')

src/Domain/Teams/DTO/CreateTeamFolderData.php

@@ -1,5 +1,4 @@
 <?php
-
 namespace Domain\Teams\DTO;
 
 use Spatie\DataTransferObject\DataTransferObject;

src/Domain/Teams/Requests/ConvertIntoTeamFolderRequest.php

@@ -1,5 +1,4 @@
 <?php
-
 namespace Domain\Teams\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;

src/Domain/Teams/Requests/CreateTeamFolderRequest.php

@@ -1,5 +1,4 @@
 <?php
-
 namespace Domain\Teams\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;

src/Domain/Teams/Requests/UpdateTeamFolderMembersRequest.php

@@ -1,5 +1,4 @@
 <?php
-
 namespace Domain\Teams\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;

src/Domain/Teams/Resources/TeamInvitationResource.php

@@ -1,5 +1,4 @@
 <?php
-
 namespace Domain\Teams\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;

src/Domain/Teams/Resources/TeamMemberResource.php

@@ -1,5 +1,4 @@
 <?php
-
 namespace Domain\Teams\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;