nexus/vuefilemanager
2
0
Fork 0
mirror of https://github.com/VueFileManager/vuefilemanager.git synced 2026-04-18 00:02:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

browsing api update

Browse Source
This commit is contained in:
Čarodej
2022-05-03 16:18:44 +02:00
parent 89e4ae6737
commit 4fc5ccd26d
5 changed files with 31 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Domain/Browsing/Controllers/BrowseFolderController.php
View File

@@ -13,7 +13,6 @@ use Domain\Folders\Resources\FolderCollection;
class BrowseFolderController
{
public function __invoke(
Request $request,
string $id,
): array {
$root_id = Str::isUuid($id) ? $id : null;

23
src/Domain/Browsing/Controllers/BrowseTrashContentController.php
View File

@@ -6,26 +6,31 @@ use Domain\Folders\Models\Folder;
use Illuminate\Support\Facades\Auth;
use Domain\Files\Resources\FilesCollection;
use Domain\Folders\Resources\FolderCollection;
use Str;
class BrowseTrashContentController
{
public function __invoke(string $id): array
{
$user_id = Auth::id();
$root_id = $id === 'undefined' ? null : $id;
$requestedFolder = $root_id ? Folder::withTrashed()->findOrFail($root_id) : null;
$userId = Auth::id();
$rootId = Str::isUuid($id) ? $id : null;
if ($root_id) {
$requestedFolder = $rootId
? Folder::withTrashed()
->findOrFail($rootId)
: null;
if ($rootId) {
// Get folders and files
$folders = Folder::onlyTrashed()
->with('parent')
->where('parent_id', $root_id)
->where('parent_id', $rootId)
->sortable()
->get();
$files = File::onlyTrashed()
->with('parent')
->where('parent_id', $root_id)
->where('parent_id', $rootId)
->sortable()
->get();
@@ -40,12 +45,12 @@ class BrowseTrashContentController
// Get folders and files
$folders_trashed = Folder::onlyTrashed()
->with(['trashedFolders', 'parent'])
->where('user_id', $user_id)
->where('user_id', $userId)
->get(['parent_id', 'id', 'name']);
$folders = Folder::onlyTrashed()
->with(['parent'])
->where('user_id', $user_id)
->where('user_id', $userId)
->whereIn('id', filter_folders_ids($folders_trashed))
->sortable()
->get();
@@ -53,7 +58,7 @@ class BrowseTrashContentController
// Get files trashed
$files_trashed = File::onlyTrashed()
->with(['parent'])
->where('user_id', $user_id)
->where('user_id', $userId)
->where(function ($query) use ($folders_trashed) {
$query->whereNull('parent_id');
$query->orWhereNotIn('parent_id', array_values(array_unique(recursiveFind($folders_trashed->toArray(), 'id'))));