[5.x] Paginate folders in asset browser

resources/js/components/assets/Browser/Browser.vue

@@ -98,7 +98,7 @@
                                         </td>
                                         <td :colspan="columns.length" />
                                     </tr>
-                                    <tr v-for="(folder, i) in folders" :key="folder.path" v-if="!restrictFolderNavigation && page === 1">
+                                    <tr v-for="(folder, i) in folders" :key="folder.path" v-if="!restrictFolderNavigation">
                                         <td />
                                         <td @click="selectFolder(folder.path)">
                                             <a class="flex items-center cursor-pointer group">

src/Http/Controllers/CP/Assets/BrowserController.php

@@ -3,13 +3,15 @@
 namespace Statamic\Http\Controllers\CP\Assets;
 
 use Illuminate\Http\Request;
+use Illuminate\Pagination\Paginator;
 use Statamic\Contracts\Assets\AssetContainer as AssetContainerContract;
 use Statamic\Exceptions\AuthorizationException;
 use Statamic\Facades\Asset;
 use Statamic\Facades\Scope;
 use Statamic\Facades\User;
 use Statamic\Http\Controllers\CP\CpController;
-use Statamic\Http\Resources\CP\Assets\FolderAssetsCollection;
+use Statamic\Http\Resources\CP\Assets\Folder;
+use Statamic\Http\Resources\CP\Assets\FolderAsset;
 use Statamic\Http\Resources\CP\Assets\SearchedAssetsCollection;
 use Statamic\Support\Arr;
 
@@ -74,20 +76,59 @@ public function folder(Request $request, $container, $path = '/')
         $this->authorize('view', $container);
 
         $folder = $container->assetFolder($path);
+        $perPage = $request->perPage ?? config('statamic.cp.pagination_size');
+        $page = Paginator::resolveCurrentPage();
 
-        $query = $folder->queryAssets();
+        $folders = $folder->assetFolders();
+        $totalFolders = $folders->count();
+        $folders = $folders->slice(($page - 1) * $perPage, $perPage);
+        $lastFolderPage = (int) ceil($totalFolders / $perPage) ?: 1;
 
-        if ($request->sort) {
-            $query->orderBy($request->sort, $request->order ?? 'asc');
-        } else {
-            $query->orderBy($container->sortField(), $container->sortDirection());
-        }
+        $totalAssets = $folder->queryAssets()->count();
+        $totalItems = $totalAssets + $totalFolders;
 
-        $this->applyQueryScopes($query, $request->all());
+        if ($page >= $lastFolderPage) {
+            $query = $folder->queryAssets();
 
-        $assets = $query->paginate(request('perPage'));
+            if ($request->sort) {
+                $query->orderBy($request->sort, $request->order ?? 'asc');
+            } else {
+                $query->orderBy($container->sortField(), $container->sortDirection());
+            }
+
+            $this->applyQueryScopes($query, $request->all());
+
+            $offset = $page === $lastFolderPage
+                ? 0
+                : $perPage * ($page - $lastFolderPage) - ($totalFolders % $perPage);
 
-        return (new FolderAssetsCollection($assets))->folder($folder);
+            $assets = $query
+                ->offset($offset)
+                ->limit($perPage - $folders->count())
+                ->get();
+        }
+
+        return [
+            'data' => [
+                'assets' => FolderAsset::collection($assets ?? collect())->resolve(),
+                'folder' => array_merge((new Folder($folder))->resolve(), [
+                    'folders' => $folders->values(),
+                ]),
+            ],
+            'links' => [
+                'asset_action' => cp_route('assets.actions.run'),
+                'folder_action' => cp_route('assets.folders.actions.run', $container->id()),
+            ],
+            'meta' => [
+                'current_page' => $page,
+                'from' => $totalItems > 0 ? ($page - 1) * $perPage + 1 : null,
+                'last_page' => $totalItems > 0 ? max((int) ceil($totalItems / $perPage), 1) : null,
+                'path' => Paginator::resolveCurrentPath(),
+                'per_page' => $perPage,
+                'to' => $totalItems > 0 ? $page * $perPage : null,
+                'total' => $totalItems,
+            ],
+        ];
     }
 
     public function search(Request $request, $container, $path = null)