Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions src/Hooks/CP/AssetsIndexQuery.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?php

namespace Statamic\Hooks\CP;

use Statamic\Contracts\Assets\AssetContainer;
use Statamic\Support\Traits\Hookable;

class AssetsIndexQuery
{
use Hookable;

public function __construct(private $query, private AssetContainer $container)
{
//
}

public function query()
{
$payload = $this->runHooksWith('query', [
'query' => $this->query,
'container' => $this->container,
]);

return $payload->query;
}
}
7 changes: 5 additions & 2 deletions src/Http/Controllers/CP/Assets/BrowserController.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
use Statamic\Facades\Asset;
use Statamic\Facades\Scope;
use Statamic\Facades\User;
use Statamic\Hooks\CP\AssetsIndexQuery;
use Statamic\Http\Controllers\CP\CpController;
use Statamic\Http\Requests\FilteredRequest;
use Statamic\Http\Resources\CP\Assets\Folder;
Expand Down Expand Up @@ -105,7 +106,8 @@ public function folder(Request $request, $container, $path = '/')
$totalFolders = $folders->count();
$lastFolderPage = (int) ceil($totalFolders / $perPage) ?: 1;

$totalAssets = $folder->queryAssets()->count();
$query = (new AssetsIndexQuery($folder->queryAssets(), $container))->query();
$totalAssets = $query->count();
$totalItems = $totalAssets + $totalFolders;

if ($request->sort) {
Expand All @@ -125,7 +127,6 @@ public function folder(Request $request, $container, $path = '/')
$folders = $folders->slice(($page - 1) * $perPage, $perPage);

if ($page >= $lastFolderPage) {
$query = $folder->queryAssets();
$query->orderBy($sort, $order);
$this->applyQueryScopes($query, $request->all());

Expand Down Expand Up @@ -190,6 +191,8 @@ public function search(FilteredRequest $request, $container, $path = null)
$query->where('folder', $path);
}

$query = (new AssetsIndexQuery($query, $container))->query();

if ($request->sort) {
$query->orderBy($request->sort, $request->order ?? 'asc');
}
Expand Down
Loading