Update all remaining code pathways to use new search tooling

This commit is contained in:
Dane Everitt 2020-09-13 12:21:44 -07:00
parent 12fe3f1a4e
commit d8c338df3e
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
14 changed files with 54 additions and 305 deletions

View file

@ -3,6 +3,8 @@
namespace Pterodactyl\Http\Controllers\Admin\Nodes;
use Illuminate\Http\Request;
use Pterodactyl\Models\Node;
use Spatie\QueryBuilder\QueryBuilder;
use Illuminate\Contracts\View\Factory;
use Pterodactyl\Http\Controllers\Controller;
use Pterodactyl\Repositories\Eloquent\NodeRepository;
@ -39,10 +41,13 @@ class NodeController extends Controller
*/
public function index(Request $request)
{
$nodes = $this->repository
->setSearchTerm($request->input('query'))
->getNodeListingData();
$nodes = QueryBuilder::for(
Node::query()->with('location')->withCount('servers')
)
->allowedFilters(['uuid', 'name'])
->allowedSorts(['id'])
->paginate(25);
return $this->view->make('admin.nodes.index', compact('nodes'));
return $this->view->make('admin.nodes.index', ['nodes' => $nodes]);
}
}

View file

@ -3,6 +3,8 @@
namespace Pterodactyl\Http\Controllers\Admin\Servers;
use Illuminate\Http\Request;
use Pterodactyl\Models\Server;
use Spatie\QueryBuilder\QueryBuilder;
use Illuminate\Contracts\View\Factory;
use Pterodactyl\Http\Controllers\Controller;
use Pterodactyl\Repositories\Eloquent\ServerRepository;
@ -42,10 +44,11 @@ class ServerController extends Controller
*/
public function index(Request $request)
{
return $this->view->make('admin.servers.index', [
'servers' => $this->repository->setSearchTerm($request->input('query'))->getAllServers(
config()->get('pterodactyl.paginate.admin.servers')
),
]);
$servers = QueryBuilder::for(Server::query()->with('node', 'user', 'allocation'))
->allowedIncludes(['uuid', 'name', 'image'])
->allowedSorts(['id', 'uuid'])
->paginate(config()->get('pterodactyl.paginate.admin.servers'));
return $this->view->make('admin.servers.index', ['servers' => $servers]);
}
}

View file

@ -5,6 +5,7 @@ namespace Pterodactyl\Http\Controllers\Admin;
use Illuminate\Http\Request;
use Pterodactyl\Models\User;
use Prologue\Alerts\AlertsMessageBag;
use Spatie\QueryBuilder\QueryBuilder;
use Pterodactyl\Exceptions\DisplayException;
use Pterodactyl\Http\Controllers\Controller;
use Illuminate\Contracts\Translation\Translator;
@ -83,7 +84,10 @@ class UserController extends Controller
*/
public function index(Request $request)
{
$users = $this->repository->setSearchTerm($request->input('query'))->getAllUsersWithCounts();
$users = QueryBuilder::for(User::query()->withCount('servers'))
->allowedIncludes(['username', 'email', 'uuid'])
->allowedSorts(['id', 'uuid'])
->paginate(50);
return view('admin.users.index', ['users' => $users]);
}