search team folder contents

public/mix-manifest.json

@@ -574,7 +574,7 @@
     "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.a14b8f8cb897fb6ae4ab.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.a14b8f8cb897fb6ae4ab.hot-update.js",
     "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.86b4136c22d756f423b4.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.86b4136c22d756f423b4.hot-update.js",
     "/js/main.3e07bae3987249743b99.hot-update.js": "/js/main.3e07bae3987249743b99.hot-update.js",
-    "/chunks/admin~chunks/files~chunks/invitation~chunks/my-shared-items~chunks/platform~chunks/recent-upl~dfa67595.js": "/chunks/admin~chunks/files~chunks/invitation~chunks/my-shared-items~chunks/platform~chunks/recent-upl~dfa67595.js?id=8b63f1df2980adfabef3",
+    "/chunks/admin~chunks/files~chunks/invitation~chunks/my-shared-items~chunks/platform~chunks/recent-upl~dfa67595.js": "/chunks/admin~chunks/files~chunks/invitation~chunks/my-shared-items~chunks/platform~chunks/recent-upl~dfa67595.js?id=bcec1c96b2248aa0d451",
     "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.3e07bae3987249743b99.hot-update.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.3e07bae3987249743b99.hot-update.js",
     "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.3e07bae3987249743b99.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.3e07bae3987249743b99.hot-update.js",
     "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~bf3ddedc.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~bf3ddedc.js?id=9a1bb33d3b2a29b1e823",
@@ -1278,5 +1278,13 @@
     "/chunks/platform~chunks/shared.72607ccdad32efc80f18.hot-update.js": "/chunks/platform~chunks/shared.72607ccdad32efc80f18.hot-update.js",
     "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.6f02e7a9087328e90c0e.hot-update.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.6f02e7a9087328e90c0e.hot-update.js",
     "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~c7960950.35d8fc34bb0909af669a.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~c7960950.35d8fc34bb0909af669a.hot-update.js",
-    "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~c7960950.adefeadfc7fcc11dc901.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~c7960950.adefeadfc7fcc11dc901.hot-update.js"
+    "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~c7960950.adefeadfc7fcc11dc901.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~c7960950.adefeadfc7fcc11dc901.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/invitation~chunks/my-shared-items~chunks/platform~chunks/recent-upl~dfa67595.d783500cfab24c40e3b9.hot-update.js": "/chunks/admin~chunks/files~chunks/invitation~chunks/my-shared-items~chunks/platform~chunks/recent-upl~dfa67595.d783500cfab24c40e3b9.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/invitation~chunks/my-shared-items~chunks/platform~chunks/recent-upl~dfa67595.1c45a52350296206235b.hot-update.js": "/chunks/admin~chunks/files~chunks/invitation~chunks/my-shared-items~chunks/platform~chunks/recent-upl~dfa67595.1c45a52350296206235b.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/invitation~chunks/my-shared-items~chunks/platform~chunks/recent-upl~dfa67595.ca97f0bc82658e8eccb3.hot-update.js": "/chunks/admin~chunks/files~chunks/invitation~chunks/my-shared-items~chunks/platform~chunks/recent-upl~dfa67595.ca97f0bc82658e8eccb3.hot-update.js",
+    "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.e3646795fb8bf80aea69.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.e3646795fb8bf80aea69.hot-update.js",
+    "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.9f0b5306550607ac0355.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.9f0b5306550607ac0355.hot-update.js",
+    "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.f605c583768e448fdbaf.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.f605c583768e448fdbaf.hot-update.js",
+    "/js/main.41be49db7b2bfe9e8d01.hot-update.js": "/js/main.41be49db7b2bfe9e8d01.hot-update.js",
+    "/js/main.655b1f79df9155310ca7.hot-update.js": "/js/main.655b1f79df9155310ca7.hot-update.js"
 }

resources/js/components/FilesView/Icons/VueFolderTeamIcon.vue

@@ -22,7 +22,7 @@
 					  fill="green">
 
 				</path>
-				<g id="Icon" transform="translate(8.000000, 20.000000)" class="svg-stroke-theme-darken" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.3" stroke="black" stroke-opacity="0.2">
+				<g id="Icon" transform="translate(8.000000, 20.000000)" class="svg-stroke-theme-darken" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.3" stroke="black" stroke-opacity="0.25">
 					<path d="M9.59999943,10.7999994 L9.59999943,9.59999943 C9.59999943,8.27451611 8.52548289,7.19999957 7.19999957,7.19999957 L2.39999986,7.19999957 C1.07451654,7.19999957 0,8.27451611 0,9.59999943 L0,10.7999994"></path>
 					<circle cx="4.79999971" cy="2.39999986" r="2.39999986"></circle>
 					<path d="M13.1999992,10.7999994 L13.1999992,9.59999943 C13.1991834,8.50627014 12.4589985,7.55143166 11.3999993,7.27799957"></path>

src/Domain/Browsing/Controllers/SearchFilesAndFoldersController.php

@@ -1,8 +1,10 @@
 <?php
 namespace Domain\Browsing\Controllers;
 
+use DB;
 use Domain\Files\Models\File;
 use Domain\Folders\Models\Folder;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Auth;
 use Domain\Items\Requests\SearchRequest;
 use Domain\Files\Resources\FilesCollection;
@@ -15,17 +17,45 @@ class SearchFilesAndFoldersController
     ): array {
         $user_id = Auth::id();
 
+        // Prepare queries
         $query = remove_accents(
             $request->input('query')
         );
 
-        // Search files id db
+        // Get "shared with me" folders
-        $files = File::search($query)
+        $sharedWithMeFolderIds = DB::table('team_folder_members')
             ->where('user_id', $user_id)
+            ->pluck('parent_id');
+
+        // Next get their folder tree for ids extraction
+        $folderWithinIds = Folder::with('folders:id,parent_id')
+            ->whereIn('parent_id', $sharedWithMeFolderIds)
+            ->get(['id']);
+
+        // Then get all accessible shared folders within
+        $accessible_parent_ids = Arr::flatten([filter_folders_ids($folderWithinIds), $sharedWithMeFolderIds]);
+
+        // Prepare eloquent builder
+        $folder = new Folder();
+        $file = new File();
+
+        // Prepare folders constrain
+        $folderConstrain = $folder
+            ->where('user_id', $user_id)
+            ->orWhereIn('id', $accessible_parent_ids);
+
+        // Prepare files constrain
+        $fileConstrain = $file
+            ->where('user_id', $user_id)
+            ->orWhereIn('parent_id', $accessible_parent_ids);
+
+        // Search files and folders
+        $files = File::search($query)
+            ->constrain($fileConstrain)
             ->get();
 
         $folders = Folder::search($query)
-            ->where('user_id', $user_id)
+            ->constrain($folderConstrain)
             ->get();
 
         // Collect folders and files to single array

src/Domain/Folders/Controllers/NavigationTreeController.php

@@ -10,20 +10,20 @@ class NavigationTreeController
     public function __invoke(): array
     {
         // Get signed user folders
-        $folders = Folder::with('folders:id,parent_id,id,name,team_folder')
+        $folders = Folder::with('folders:id,parent_id,name,team_folder')
             ->where('parent_id')
             ->where('team_folder', false)
             ->where('user_id', Auth::id())
             ->sortable()
-            ->get(['id', 'parent_id', 'id', 'name', 'team_folder']);
+            ->get(['id', 'parent_id', 'name', 'team_folder']);
 
         // Get signed user team folders
-        $teamFolders = Folder::with('folders:id,parent_id,id,name,team_folder')
+        $teamFolders = Folder::with('folders:id,parent_id,name,team_folder')
             ->where('parent_id')
             ->where('team_folder', true)
             ->where('user_id', Auth::id())
             ->sortable()
-            ->get(['id', 'parent_id', 'id', 'name']);
+            ->get(['id', 'parent_id', 'name']);
 
         // Get signed user folder which are shared with him
         $sharedFolderIds = DB::table('team_folder_members')
@@ -31,10 +31,10 @@ class NavigationTreeController
             ->whereIn('permission', ['can-edit', 'can-view'])
             ->pluck('parent_id');
 
-        $sharedWithMeFolders = Folder::with('folders:id,parent_id,id,name,team_folder')
+        $sharedWithMeFolders = Folder::with('folders:id,parent_id,name,team_folder')
             ->whereIn('id', $sharedFolderIds)
             ->sortable()
-            ->get(['id', 'parent_id', 'id', 'name']);
+            ->get(['id', 'parent_id', 'name']);
 
         return [
             [

tests/Domain/Spotlight/SearchTest.php

@@ -1,6 +1,8 @@
 <?php
+
 namespace Tests\Domain\Spotlight;
 
+use Illuminate\Support\Facades\DB;
 use Tests\TestCase;
 use App\Users\Models\User;
 use Domain\Files\Models\File;
@@ -36,7 +38,7 @@ class SearchTest extends TestCase
 
         collect([$english, $russian, $turkish])
             ->each(
-                fn ($file) => $this
+                fn($file) => $this
                     ->actingAs($user)
                     ->getJson('/api/browse/search?query=' . mb_strtolower(mb_substr($file->name, 0, 3)))
                     ->assertStatus(200)
@@ -69,4 +71,67 @@ class SearchTest extends TestCase
                 'id' => $folder->id,
             ]);
     }
+
+    /**
+     * @test
+     */
+    public function it_get_searched_shared_with_me_file_and_folders()
+    {
+        $owner = User::factory()
+            ->create();
+
+        $member = User::factory()
+            ->create();
+
+        $folder = Folder::factory()
+            ->create([
+                'name'    => "Alice's files",
+                'user_id' => $owner->id,
+            ]);
+
+        $folderWithin = Folder::factory()
+            ->create([
+                'name'      => "Folder within Alice",
+                'parent_id' => $folder->id,
+                'user_id'   => $owner->id,
+            ]);
+
+        $document = File::factory()
+            ->create([
+                'name'      => 'Document',
+                'user_id'   => $owner->id,
+                'parent_id' => $folderWithin->id,
+            ]);
+
+        DB::table('team_folder_members')
+            ->insert([
+                'parent_id'  => $folder->id,
+                'user_id'    => $member->id,
+                'permission' => 'can-edit',
+            ]);
+
+        $this
+            ->actingAs($member)
+            ->getJson('/api/browse/search?query=ali')
+            ->assertStatus(200)
+            ->assertJsonFragment([
+                'id' => $folder->id,
+            ]);
+
+        $this
+            ->actingAs($member)
+            ->getJson('/api/browse/search?query=Fol')
+            ->assertStatus(200)
+            ->assertJsonFragment([
+                'id' => $folder->id,
+            ]);
+
+        $this
+            ->actingAs($member)
+            ->getJson('/api/browse/search?query=doc')
+            ->assertStatus(200)
+            ->assertJsonFragment([
+                'id' => $document->id,
+            ]);
+    }
 }