mirror of
https://github.com/VueFileManager/vuefilemanager.git
synced 2026-04-20 00:42:16 +00:00
Merge remote-tracking branch 'origin/infinite_scroll' into api
# Conflicts: # config/vuefilemanager.php # package-lock.json # package.json # public/mix-manifest.json # resources/js/store/modules/fileBrowser.js # resources/js/store/modules/sharing.js # resources/js/store/modules/teams.js # resources/js/store/modules/userAuth.js # src/App/Socialite/Controllers/SocialiteCallbackController.php # src/Domain/Browsing/Controllers/BrowseTrashContentController.php # src/Domain/Browsing/Controllers/VisitorBrowseFolderController.php # src/Domain/Files/Controllers/UploadFileController.php # src/Domain/Items/Controllers/RenameFileOrFolderController.php # src/Support/helpers.php
This commit is contained in:
@@ -9,6 +9,7 @@ use Domain\Files\Models\File;
|
||||
use Domain\Sharing\Models\Share;
|
||||
use Domain\Folders\Models\Folder;
|
||||
use Illuminate\Support\Collection;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
use Domain\Settings\Models\Setting;
|
||||
use Illuminate\Support\Facades\Http;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
@@ -1208,4 +1209,93 @@ if (! function_exists('extractItemsFromGetAttribute')) {
|
||||
];
|
||||
});
|
||||
}
|
||||
|
||||
if (! function_exists('generatePaginationCounts')) {
|
||||
/**
|
||||
* Group paginate of Foldes and Files
|
||||
*/
|
||||
function generatePaginationCounts(
|
||||
int $totalItemsCount
|
||||
) : array {
|
||||
$perPage = config('vuefilemanager.paginate.perPage');
|
||||
$currentPage = request()->input('page') === 'all' ? 1 : (int) request()->input('page');
|
||||
|
||||
$uri = request()->fullUrl();
|
||||
$lastPage = ceil($totalItemsCount / $perPage);
|
||||
|
||||
return [
|
||||
[
|
||||
'currentPage' => $currentPage,
|
||||
'from' => 1,
|
||||
'lastPage' => $lastPage,
|
||||
'path' => $uri,
|
||||
'perPage' => $perPage,
|
||||
'to' => $perPage,
|
||||
'total' => $totalItemsCount,
|
||||
],
|
||||
[
|
||||
'first' => $uri . '&page=1',
|
||||
'last' => $uri . '&page=' . $lastPage,
|
||||
'next' => $currentPage == $lastPage ? null : $uri . '&page=' . $currentPage + 1,
|
||||
'prev' => $currentPage == 1 ? null : $uri . '&page=' . $currentPage - 1,
|
||||
],
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
if (! function_exists('getRecordsCount')) {
|
||||
/**
|
||||
* Get count of items from the Database
|
||||
*/
|
||||
function getRecordsCount(
|
||||
array $folderQuery,
|
||||
array $fileQuery,
|
||||
string $page
|
||||
) : array {
|
||||
$perPage = config('vuefilemanager.paginate.perPage');
|
||||
$currentPage = $page === 'all' ? 1 : (int) $page;
|
||||
|
||||
$foldersSkip = 0;
|
||||
$foldersTake = 0;
|
||||
$filesSkip = 0;
|
||||
$filesTake = 0;
|
||||
|
||||
$foldersCount = DB::table('folders')
|
||||
->where($folderQuery)
|
||||
->count();
|
||||
|
||||
$filesCount = DB::table('files')
|
||||
->where($fileQuery)
|
||||
->count();
|
||||
|
||||
$totalItemsCount = $foldersCount + $filesCount;
|
||||
|
||||
if ($page !== 'all') {
|
||||
// Folders pages
|
||||
if ($foldersCount >= $currentPage * $perPage) {
|
||||
$foldersTake = $perPage;
|
||||
$foldersSkip = ($currentPage - 1) * $perPage;
|
||||
}
|
||||
|
||||
// Mixed page
|
||||
if ($foldersCount < $currentPage * $perPage && ceil($currentPage) === ceil($foldersCount / $perPage)) {
|
||||
$foldersSkip = ($currentPage - 1) * $perPage;
|
||||
$foldersTake = $foldersCount - $foldersSkip;
|
||||
$filesTake = ($currentPage * $perPage) - $foldersCount;
|
||||
$filesSkip = 0;
|
||||
}
|
||||
|
||||
// Files pages
|
||||
if ($currentPage > ceil($foldersCount / $perPage)) {
|
||||
$filesTake = $perPage;
|
||||
$filesSkip = ((ceil($foldersCount / $perPage) * $perPage) - $foldersCount) + ($currentPage - (ceil($foldersCount / $perPage)) - 1) * $perPage;
|
||||
}
|
||||
} else {
|
||||
$foldersTake = $foldersCount;
|
||||
$filesTake = $filesCount;
|
||||
}
|
||||
|
||||
return [$foldersTake, $foldersSkip, $filesTake, $filesSkip, $totalItemsCount];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user