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

browsing through upload request

Browse Source
This commit is contained in:
Čarodej
2022-02-24 10:20:38 +01:00
parent 06b28aeee3
commit a589ee5f7a
31 changed files with 311 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.env.testing
View File

@@ -1,6 +1,6 @@
APP_NAME=Laravel
APP_ENV=local
APP_KEY=base64:GhP7Rdqy8uICwxrAgwO0pf6xvWIaB/DDo6z2Ro0vIFg=
APP_KEY=base64:yCFkwqoIPdc5TZIjrgoK40pCqj+rnCOlonN6nXc/sbk=
APP_DEBUG=true
APP_URL=http://localhost
APP_DEMO=false

2
database/migrations/2022_02_17_073653_create_upload_requests_table.php
View File

@@ -17,7 +17,7 @@ class CreateUploadRequestsTable extends Migration
$table->uuid('id');
$table->uuid('user_id');
$table->uuid('folder_id');
$table->enum('status', ['active', 'filled', 'expired'])->default('active');
$table->enum('status', ['active', 'filling', 'filled', 'expired'])->default('active');
$table->string('email')->nullable();
$table->longText('notes')->nullable();
$table->timestamps();

6
public/mix-manifest.json
View File

@@ -1,5 +1,7 @@
{
"/js/main.js": "/js/main.js",
"/js/chunks/request.js": "/js/chunks/request.js",
"/js/chunks/request-upload.js": "/js/chunks/request-upload.js",
"/js/chunks/setup-wizard.js": "/js/chunks/setup-wizard.js",
"/js/chunks/status-check.js": "/js/chunks/status-check.js",
"/js/chunks/purchase-code.js": "/js/chunks/purchase-code.js",
@@ -68,7 +70,5 @@
"/js/chunks/shared-with-me.js": "/js/chunks/shared-with-me.js",
"/js/chunks/invitation.js": "/js/chunks/invitation.js",
"/css/tailwind.css": "/css/tailwind.css",
"/css/app.css": "/css/app.css",
"/js/chunks/request-upload.js": "/js/chunks/request-upload.js",
"/js/chunks/request.js": "/js/chunks/request.js"
"/css/app.css": "/css/app.css"
}

2
resources/js/components/FilePreview/FilePreviewMedia.vue
View File

@@ -141,7 +141,7 @@ export default {
this.currentIndex = index
}
})
}, 100),
}, 50),
getFilesForView() {
let requestedFile = this.clipboard[0]

2
resources/js/components/FilesView/ItemGrid.vue
View File

@@ -65,7 +65,7 @@
<img
class="h-full w-full rounded-lg object-cover shadow-lg"
:src="entry.data.attributes.thumbnail.sm"
:alt="entry.data.attributes.name"
alt=""
loading="lazy"
/>
</div>

2
resources/js/components/FilesView/ItemList.vue
View File

@@ -44,7 +44,7 @@
v-if="isImage && entry.data.attributes.thumbnail"
class="ml-0.5 h-12 w-12 rounded object-cover"
:src="entry.data.attributes.thumbnail.xs"
:alt="entry.data.attributes.name"
alt=""
loading="lazy"
/>
</div>

7
resources/js/helpers/functionHelpers.js vendored
View File

@@ -326,6 +326,7 @@ const FunctionHelpers = {
Vue.prototype.$getDataByLocation = function () {
let routes = {
RequestUpload: ['getUploadRequestFolder', router.currentRoute.params.id || undefined ],
Public: ['getSharedFolder', router.currentRoute.params.id || undefined],
Files: ['getFolder', router.currentRoute.params.id || undefined],
RecentUploads: ['getRecentUploads'],
@@ -424,10 +425,8 @@ const FunctionHelpers = {
Vue.prototype.$goToFileView = function (id) {
let locations = {
Public: {
name: 'Public',
params: { token: this.$route.params.token, id: id },
},
RequestUpload: {name: 'RequestUpload', params: { token: this.$route.params.token, id: id }},
Public: {name: 'Public', params: { token: this.$route.params.token, id: id }},
TeamFolders: { name: 'TeamFolders', params: { id: id } },
SharedWithMe: { name: 'SharedWithMe', params: { id: id } },
MySharedItems: { name: 'Files', params: { id: id } },

2
resources/js/store/modules/fileFunctions.js vendored
View File

@@ -313,7 +313,7 @@ const actions = {
commit('REMOVE_ITEM', data.data.id)
// Remove item from sidebar
if (getters.permission === 'master') {
if (! ['Public', 'RequestUpload'].includes(router.currentRoute.name)) {
if (data.data.type === 'folder') commit('REMOVE_ITEM_FROM_FAVOURITES', data)
}
})

51
resources/js/store/modules/uploadRequest.js vendored
View File

@@ -1,6 +1,5 @@
import router from '../../router'
import { events } from '../../bus'
import i18n from '../../i18n'
import axios from 'axios'
import Vue from 'vue'
@@ -9,19 +8,51 @@ const defaultState = {
}
const actions = {
getUploadRequestFolder: ({ commit, getters }, id) => {
commit('LOADING_STATE', { loading: true, data: [] })
return new Promise((resolve, reject) => {
axios
.get(`/api/upload-request/${router.currentRoute.params.token}/browse/${id}${getters.sorting.URI}`)
.then((response) => {
let folders = response.data.folders.data
let files = response.data.files.data
commit('LOADING_STATE', {
loading: false,
data: folders.concat(files),
})
commit('SET_CURRENT_FOLDER', response.data.root)
events.$emit('scrollTop')
resolve(response)
})
.catch((error) => {
Vue.prototype.$isSomethingWrong()
reject(error)
})
})
},
getUploadRequestDetail: ({ commit }) => {
axios.get(`/api/upload-request/${router.currentRoute.params.token}`)
.then((response) => {
return new Promise((resolve, reject) => {
axios.get(`/api/upload-request/${router.currentRoute.params.token}`)
.then((response) => {
resolve(response)
commit('LOADING_STATE', { loading: false, data: [] })
// Stop loading spinner
if (response.data.data.attributes.status === 'active')
commit('LOADING_STATE', { loading: false, data: [] })
commit('SET_UPLOAD_REQUEST', response.data)
commit('SET_UPLOAD_REQUEST', response.data)
// Set current folder if exist
if (response.data.data.relationships.folder) {
commit('SET_CURRENT_FOLDER', response.data.data.relationships.folder)
}
})
// Set current folder if exist
if (! router.currentRoute.params.id) {
commit('SET_CURRENT_FOLDER', response.data.data.relationships.folder)
}
})
})
},
closeUploadRequest: ({ commit }) => {
axios

71
resources/js/views/FileView/UploadRequestFiles.vue
View File

@@ -40,7 +40,7 @@
/>
</MobileMultiSelectToolbar>
<ContextMenu v-if="entries.length">
<ContextMenu v-if="uploadRequest && uploadRequest.data.attributes.status === 'filling'">
<template v-slot:empty-select>
<OptionGroup>
<OptionUpload :title="$t('actions.upload')" type="file" />
@@ -81,7 +81,7 @@
</template>
</ContextMenu>
<FileActionsMobile v-if="entries.length">
<FileActionsMobile v-if="uploadRequest && uploadRequest.data.attributes.status === 'filling'">
<!--I am Done-->
<button @click="uploadingDone" class="flex shrink-0 items-center mr-2 rounded-xl bg-theme-200 py-1 px-1 pr-3">
<MemberAvatar
@@ -109,27 +109,42 @@
</FileActionsMobile>
<EmptyFilePage v-if="uploadRequest">
<div class="relative mx-auto mb-8 w-24 text-center">
<VueFolderIcon class="inline-block w-28" />
<MemberAvatar
v-if="uploadRequest.data.attributes.status !== 'expired'"
:member="uploadRequest.data.relationships.user"
class="absolute -bottom-2.5 -right-2"
:is-border="true"
:size="32"
/>
</div>
<h1 class="title">
{{ emptyPageTitle }}
</h1>
<p class="description max-w-[420px]">
{{ emptyPageDescription }}
</p>
<div v-if="uploadRequest.data.attributes.status === 'filling'">
<h1 class="title">
{{ $t('empty_page.title') }}
</h1>
<p class="description">
{{ $t('empty_page.description') }}
</p>
<ButtonUpload button-style="theme">
{{ $t('empty_page.call_to_action') }}
</ButtonUpload>
</div>
<ButtonUpload v-if="uploadRequest.data.attributes.status === 'active'" button-style="theme">
{{ $t('empty_page.call_to_action') }}
</ButtonUpload>
<div v-if="['active', 'filled', 'expired'].includes(uploadRequest.data.attributes.status)">
<div class="relative mx-auto mb-8 w-24 text-center">
<VueFolderIcon class="inline-block w-28" />
<MemberAvatar
v-if="uploadRequest.data.attributes.status !== 'expired'"
:member="uploadRequest.data.relationships.user"
class="absolute -bottom-2.5 -right-2"
:is-border="true"
:size="32"
/>
</div>
<h1 class="title">
{{ emptyPageTitle }}
</h1>
<p class="description max-w-[420px] mx-auto">
{{ emptyPageDescription }}
</p>
<ButtonUpload v-if="uploadRequest.data.attributes.status === 'active'" button-style="theme">
{{ $t('empty_page.call_to_action') }}
</ButtonUpload>
</div>
</EmptyFilePage>
<FileBrowser />
@@ -175,7 +190,7 @@ export default {
Option,
},
computed: {
...mapGetters(['fastPreview', 'clipboard', 'config', 'user', 'entries', 'uploadRequest']),
...mapGetters(['fastPreview', 'clipboard', 'config', 'user', 'uploadRequest']),
isFolder() {
return this.item && this.item.data.type === 'folder'
},
@@ -215,12 +230,20 @@ export default {
events.$emit('popup:open', {name: 'create-folder'})
},
},
created() {
mounted() {
events.$on('context-menu:show', (event, item) => (this.item = item))
events.$on('context-menu:current-folder', (folder) => (this.item = folder))
events.$on('mobile-context-menu:show', (item) => (this.item = item))
this.$store.dispatch('getUploadRequestDetail')
// Load folder from id in router
if (this.$route.params.id) {
this.$store.dispatch('getUploadRequestFolder', this.$route.params.id)
}
// Load root folder for upload request
if (! this.$route.params.id && this.uploadRequest && this.uploadRequest.data.attributes.status === 'filling') {
this.$store.dispatch('getUploadRequestFolder')
}
},
}
</script>

17
resources/js/views/UploadRequest.vue
View File

@@ -22,8 +22,8 @@
@contextmenu.prevent.capture="contextMenu($event, undefined)"
class="transition-transform duration-200 lg:grid lg:flex-grow lg:content-start lg:px-3.5"
>
<DesktopUploadRequestToolbar v-if="entries.length" />
<MobileUploadRequestToolBar v-if="entries.length" />
<DesktopUploadRequestToolbar v-if="uploadRequest && uploadRequest.data.attributes.status === 'filling'" />
<MobileUploadRequestToolBar v-if="uploadRequest && uploadRequest.data.attributes.status === 'filling'" />
<!--Google Adsense banner-->
<div v-if="config.allowedAdsense" v-html="config.adsenseBanner01" class="mb-5 min-h-[120px]"></div>
@@ -32,7 +32,7 @@
<div class="flex space-x-3 lg:overflow-hidden">
<router-view id="file-view" class="relative w-full" :key="$route.fullPath" />
<InfoSidebarUploadRequest v-if="entries.length && isVisibleSidebar" />
<InfoSidebarUploadRequest v-if="uploadRequest && uploadRequest.data.attributes.status === 'filling' && isVisibleSidebar" />
</div>
</div>
</div>
@@ -73,7 +73,7 @@ export default {
DragUI,
},
computed: {
...mapGetters(['isVisibleSidebar', 'config', 'entries']),
...mapGetters(['isVisibleSidebar', 'config', 'uploadRequest']),
},
data() {
return {
@@ -94,6 +94,13 @@ export default {
if (data.operation === 'close-upload-request')
this.$store.dispatch('closeUploadRequest')
})
},
this.$store.dispatch('getUploadRequestDetail')
.then((response) => {
if (! this.$route.params.id && response.data.data.attributes.status === 'filling') {
this.$store.dispatch('getUploadRequestFolder')
}
})
},
}
</script>

6
routes/file.php
View File

@@ -13,8 +13,10 @@ Route::get('/avatars/{avatar}', GetAvatarController::class);
Route::get('/system/{image}', GetAppImageController::class);
// Get Upload request thumbnails and files
Route::get('/thumbnail/{name}/upload-request/{uploadRequest}', GetThumbnailFromUploadRequestController::class);
Route::get('/file/{name}/upload-request/{uploadRequest}', GetFileFromUploadRequestController::class);
Route::group(['middleware' => ['upload-request']], function () {
Route::get('/thumbnail/{name}/upload-request/{uploadRequest}', GetThumbnailFromUploadRequestController::class);
Route::get('/file/{name}/upload-request/{uploadRequest}', GetFileFromUploadRequestController::class);
});
// Get public thumbnails and files
Route::get('/thumbnail/{name}/shared/{shared}', VisitorGetThumbnailController::class);

12
routes/upload-request.php
View File

@@ -1,19 +1,20 @@
<?php
use Domain\UploadRequest\Controllers\CreateFolderController;
use Domain\UploadRequest\Controllers\DeleteFileOrFolderController;
use Domain\UploadRequest\Controllers\GetFolderTreeForUploadRequestController;
use Domain\UploadRequest\Controllers\MoveItemInUploadRequestController;
use Tests\Domain\UploadRequest\RenameFileOrFolderController;
use Domain\UploadRequest\Controllers\GetUploadRequestController;
use Domain\UploadRequest\Controllers\DeleteFileOrFolderController;
use Domain\UploadRequest\Controllers\RenameFileOrFolderController;
use Domain\UploadRequest\Controllers\BrowseUploadRequestController;
use Domain\UploadRequest\Controllers\CreateUploadRequestController;
use Domain\UploadRequest\Controllers\MoveItemInUploadRequestController;
use Domain\UploadRequest\Controllers\SetUploadRequestAsFilledController;
use Domain\UploadRequest\Controllers\UploadFilesForUploadRequestController;
use Domain\UploadRequest\Controllers\GetFolderTreeForUploadRequestController;
Route::get('/{uploadRequest}', GetUploadRequestController::class);
// Available only for active upload requests
Route::group(['middleware' => 'upload-request'], function() {
Route::group(['middleware' => 'upload-request'], function () {
// Detail
Route::delete('/{uploadRequest}', SetUploadRequestAsFilledController::class);
@@ -25,6 +26,7 @@ Route::group(['middleware' => 'upload-request'], function() {
// Browsing
Route::get('/{uploadRequest}/navigation', GetFolderTreeForUploadRequestController::class);
Route::get('/{uploadRequest}/browse/{folder?}', BrowseUploadRequestController::class);
Route::post('/{uploadRequest}/move', MoveItemInUploadRequestController::class);
});

2
src/App/Http/Kernel.php
View File

@@ -1,7 +1,6 @@
<?php
namespace App\Http;
use Domain\UploadRequest\Middleware\ProtectUploadRequestRoutes;
use Fruitcake\Cors\HandleCors;
use Support\Middleware\TrimStrings;
use Support\Middleware\TrustProxies;
@@ -15,6 +14,7 @@ use Illuminate\View\Middleware\ShareErrorsFromSession;
use Support\Middleware\PreventRequestsDuringMaintenance;
use Illuminate\Foundation\Http\Middleware\ValidatePostSize;
use Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse;
use Domain\UploadRequest\Middleware\ProtectUploadRequestRoutes;
use Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull;
use Laravel\Sanctum\Http\Middleware\EnsureFrontendRequestsAreStateful;

1
src/Domain/Folders/Resources/FolderResource.php
View File

@@ -10,7 +10,6 @@ class FolderResource extends JsonResource
{
public function toArray($request): array
{
// TODO: optimize created_at/updated_at conversion because of performance issue
return [
'data' => [
'id' => $this->id,

40
src/Domain/UploadRequest/Controllers/BrowseUploadRequestController.php Normal file
View File

@@ -0,0 +1,40 @@
<?php
namespace Domain\UploadRequest\Controllers;
use Illuminate\Support\Str;
use Domain\Files\Models\File;
use Domain\Folders\Models\Folder;
use App\Http\Controllers\Controller;
use Domain\Files\Resources\FilesCollection;
use Domain\Folders\Resources\FolderResource;
use Domain\Folders\Resources\FolderCollection;
use Domain\UploadRequest\Models\UploadRequest;
class BrowseUploadRequestController extends Controller
{
public function __invoke(UploadRequest $uploadRequest, $id): array
{
$rootId = Str::isUuid($id) ? $id : $uploadRequest->id;
$folders = Folder::with(['parent:id,name'])
->where('parent_id', $rootId)
->where('user_id', $uploadRequest->user_id)
->sortable()
->get();
// TODO: security check
$files = File::with(['parent:id,name'])
->where('parent_id', $rootId)
->where('user_id', $uploadRequest->user_id)
->sortable()
->get()
->each(fn ($file) => $file->setUploadRequestPublicUrl($uploadRequest->id));
// Collect folders and files to single array
return [
'folders' => new FolderCollection($folders),
'files' => new FilesCollection($files),
'root' => new FolderResource(Folder::find($rootId)),
];
}
}

5
src/Domain/UploadRequest/Controllers/CreateFolderController.php
View File

@@ -1,12 +1,11 @@
<?php
namespace Domain\UploadRequest\Controllers;
use Domain\Folders\Actions\CreateFolderAction;
use Domain\Folders\Models\Folder;
use Domain\Folders\Requests\CreateFolderRequest;
use Domain\Folders\Resources\FolderResource;
use Domain\Folders\Actions\CreateFolderAction;
use Domain\UploadRequest\Models\UploadRequest;
use Domain\Folders\Requests\CreateFolderRequest;
use Support\Demo\Actions\FakeCreateFolderAction;
class CreateFolderController

5
src/Domain/UploadRequest/Controllers/DeleteFileOrFolderController.php
View File

@@ -1,13 +1,12 @@
<?php
namespace Domain\UploadRequest\Controllers;
use Illuminate\Support\Arr;
use Domain\Files\Models\File;
use Domain\Folders\Models\Folder;
use Illuminate\Support\Facades\Storage;
use Domain\Items\Requests\DeleteItemRequest;
use Domain\UploadRequest\Models\UploadRequest;
use Illuminate\Support\Arr;
use Illuminate\Support\Facades\Storage;
class DeleteFileOrFolderController
{

6
src/Domain/UploadRequest/Controllers/FileAccess/GetFileFromUploadRequestController.php
View File

@@ -25,15 +25,9 @@ class GetFileFromUploadRequestController
string $filename,
UploadRequest $uploadRequest
): Application|ResponseFactory|Response|BinaryFileResponse {
// Check if upload request is active
if ($uploadRequest->status !== 'active') {
return response('Gone', 410);
}
// Get file
$file = File::where('user_id', $uploadRequest->user_id)
->where('basename', $filename)
->where('parent_id', $uploadRequest->id)
->firstOrFail();
// Store user download size

6
src/Domain/UploadRequest/Controllers/FileAccess/GetThumbnailFromUploadRequestController.php
View File

@@ -26,15 +26,9 @@ class GetThumbnailFromUploadRequestController extends Controller
string $filename,
UploadRequest $uploadRequest
): Application|ResponseFactory|Response|StreamedResponse {
// Check if upload request is active
if ($uploadRequest->status !== 'active') {
return response('Gone', 410);
}
// Get file
$file = File::where('user_id', $uploadRequest->user_id)
->where('basename', substr($filename, 3))
->where('parent_id', $uploadRequest->id)
->firstOrFail();
// Store user download size

5
src/Domain/UploadRequest/Controllers/GetFolderTreeForUploadRequestController.php
View File

@@ -1,13 +1,12 @@
<?php
namespace Domain\UploadRequest\Controllers;
use App\Http\Controllers\Controller;
use Illuminate\Http\Response;
use Domain\Folders\Models\Folder;
use App\Http\Controllers\Controller;
use Domain\UploadRequest\Models\UploadRequest;
use Illuminate\Contracts\Foundation\Application;
use Illuminate\Contracts\Routing\ResponseFactory;
use Illuminate\Http\Response;
class GetFolderTreeForUploadRequestController extends Controller
{

1
src/Domain/UploadRequest/Controllers/MoveItemInUploadRequestController.php
View File

@@ -1,5 +1,4 @@
<?php
namespace Domain\UploadRequest\Controllers;
use App\Http\Controllers\Controller;

7
tests/Domain/UploadRequest/RenameFileOrFolderController.php → src/Domain/UploadRequest/Controllers/RenameFileOrFolderController.php
View File

@@ -1,5 +1,5 @@
<?php
namespace Tests\Domain\UploadRequest;
namespace Domain\UploadRequest\Controllers;
use App\Http\Controllers\Controller;
use Domain\Files\Resources\FileResource;
@@ -19,11 +19,6 @@ class RenameFileOrFolderController extends Controller
public function __invoke(UploadRequest $uploadRequest, string $id, RenameItemRequest $request)
{
// Check if upload request is active
if ($uploadRequest->status !== 'active') {
return response('Gone', 410);
}
// Get item
$item = get_item($request->input('type'), $id);

7
src/Domain/UploadRequest/Controllers/UploadFilesForUploadRequestController.php
View File

@@ -59,13 +59,20 @@ class UploadFilesForUploadRequestController
*/
private function createFolder(UploadRequest $uploadRequest): void
{
// Format timestamp
$timestampName = format_date($uploadRequest->created_at, 'd. M. Y');
// Create folder
DB::table('folders')->insert([
'id' => $uploadRequest->id,
'parent_id' => $uploadRequest->folder_id,
'user_id' => $uploadRequest->user_id,
'name' => "Upload Request from $timestampName",
]);
// Update upload request status
$uploadRequest->update([
'status' => 'filling',
]);
}
}

5
src/Domain/UploadRequest/Middleware/ProtectUploadRequestRoutes.php
View File

@@ -11,8 +11,11 @@ class ProtectUploadRequestRoutes
*/
public function handle(Request $request, Closure $next): mixed
{
// Get upload request
$uploadRequest = $request->route()->parameter('uploadRequest');
// Check if upload request is active
if ($request->route()->parameter('uploadRequest')->status !== 'active') {
if (! in_array($uploadRequest->status, ['active', 'filling'])) {
return response('Gone', 410);
}

10
src/Domain/UploadRequest/Resources/UploadRequestResource.php
View File

@@ -13,11 +13,11 @@ class UploadRequestResource extends JsonResource
'id' => $this->id,
'type' => 'upload-request',
'attributes' => [
'folder_id' => $this->folder_id,
'status' => $this->status,
'email' => $this->email,
'notes' => $this->notes,
'url' => url("/request/$this->id/upload"),
'folder_id' => $this->folder_id,
'status' => $this->status,
'email' => $this->email,
'notes' => $this->notes,
'url' => url("/request/$this->id/upload"),
],
'relationships' => [
$this->mergeWhen($this->folder, fn () => [

2
src/Support/Scheduler/Actions/ExpireUnfilledUploadRequestAction.php
View File

@@ -8,7 +8,7 @@ class ExpireUnfilledUploadRequestAction
{
public function __invoke()
{
UploadRequest::where('status', 'active')
UploadRequest::whereIn('status', ['active', 'filling'])
->cursor()
->each(function ($uploadRequest) {
// Get timestamp of last upload if exist

11
tests/Domain/Files/FileTest.php
View File

@@ -1,5 +1,4 @@
<?php
namespace Tests\Domain\Files;
use Storage;
@@ -60,7 +59,7 @@ class FileTest extends TestCase
])
->collapse()
->each(
fn($item) => Storage::assertExists(
fn ($item) => Storage::assertExists(
"files/{$user->id}/{$item['name']}-{$file->basename}"
)
);
@@ -255,11 +254,11 @@ class FileTest extends TestCase
// Mock files
$thumbnail_sizes = collect([
config('vuefilemanager.image_sizes.later'),
config('vuefilemanager.image_sizes.immediately')
config('vuefilemanager.image_sizes.immediately'),
])->collapse();
$fakeFile = UploadedFile::fake()
->create("fake-image.jpeg", 2000, 'image/jpeg');
->create('fake-image.jpeg', 2000, 'image/jpeg');
Storage::putFileAs("files/$user->id", $fakeFile, $fakeFile->name);
@@ -288,8 +287,8 @@ class FileTest extends TestCase
Storage::assertMissing("files/$user->id/fake-image.jpeg");
// Assert thumbnail was deleted
getThumbnailFileList("fake-image.jpeg")
->each(fn($thumbnail) => Storage::assertMissing("files/$user->id/$thumbnail"));
getThumbnailFileList('fake-image.jpeg')
->each(fn ($thumbnail) => Storage::assertMissing("files/$user->id/$thumbnail"));
}
/**

112
tests/Domain/UploadRequest/UploadRequestBrowsingTest.php
View File

@@ -1,18 +1,18 @@
<?php
namespace Tests\Domain\UploadRequest;
use Tests\TestCase;
use App\Users\Models\User;
use Domain\Files\Models\File;
use Domain\Folders\Models\Folder;
use Domain\UploadRequest\Models\UploadRequest;
use Tests\TestCase;
class UploadRequestBrowsingTest extends TestCase
{
/**
* @test
*/
public function it_get_navigator_tree()
public function it_get_navigator_tree_for_upload_request_folder()
{
$user = User::factory()
->hasSettings()
@@ -26,7 +26,7 @@ class UploadRequestBrowsingTest extends TestCase
Folder::factory()
->create([
'id' => $uploadRequest->id,
'id' => $uploadRequest->id,
'name' => 'Upload request',
'user_id' => $user->id,
]);
@@ -34,8 +34,8 @@ class UploadRequestBrowsingTest extends TestCase
$folder_level_1 = Folder::factory()
->create([
'parent_id' => $uploadRequest->id,
'name' => 'level 1',
'user_id' => $user->id,
'name' => 'level 1',
'user_id' => $user->id,
]);
$folder_level_2 = Folder::factory()
@@ -77,4 +77,104 @@ class UploadRequestBrowsingTest extends TestCase
],
]);
}
/**
* @test
*/
public function it_get_folder_content_for_upload_request_folder()
{
$user = User::factory()
->hasSettings()
->create();
$uploadRequest = UploadRequest::factory()
->create([
'status' => 'active',
'user_id' => $user->id,
]);
$root = Folder::factory()
->create([
'id' => $uploadRequest->id,
'name' => 'root',
'user_id' => $user->id,
]);
$folder = Folder::factory()
->create([
'parent_id' => $root->id,
'author' => 'user',
'user_id' => $user->id,
]);
$file = File::factory()
->create([
'parent_id' => $root->id,
'user_id' => $user->id,
]);
$this
->actingAs($user)
->getJson("/api/upload-request/$uploadRequest->id/browse/$root->id")
->assertStatus(200)
->assertJsonFragment([
'id' => $root->id,
])
->assertJsonFragment([
'id' => $file->id,
])
->assertJsonFragment([
'id' => $folder->id,
]);
}
/**
* @test
*/
public function it_get_folder_content_from_not_existed_upload_request_folder()
{
$user = User::factory()
->hasSettings()
->create();
$uploadRequest = UploadRequest::factory()
->create([
'status' => 'active',
'user_id' => $user->id,
]);
$root = Folder::factory()
->create([
'id' => $uploadRequest->id,
'name' => 'root',
'user_id' => $user->id,
]);
$folder = Folder::factory()
->create([
'parent_id' => $root->id,
'author' => 'user',
'user_id' => $user->id,
]);
$file = File::factory()
->create([
'parent_id' => $root->id,
'user_id' => $user->id,
]);
$this
->actingAs($user)
->getJson("/api/upload-request/$uploadRequest->id/browse/$root->id")
->assertStatus(200)
->assertJsonFragment([
'id' => $root->id,
])
->assertJsonFragment([
'id' => $file->id,
])
->assertJsonFragment([
'id' => $folder->id,
]);
}
}

9
tests/Domain/UploadRequest/UploadRequestEditingTest.php
View File

@@ -1,5 +1,4 @@
<?php
namespace Tests\Domain\UploadRequest;
use Storage;
@@ -145,11 +144,11 @@ class UploadRequestEditingTest extends TestCase
// Mock files
$thumbnail_sizes = collect([
config('vuefilemanager.image_sizes.later'),
config('vuefilemanager.image_sizes.immediately')
config('vuefilemanager.image_sizes.immediately'),
])->collapse();
$fakeFile = UploadedFile::fake()
->create("fake-image.jpeg", 2000, 'image/jpeg');
->create('fake-image.jpeg', 2000, 'image/jpeg');
Storage::putFileAs("files/$user->id", $fakeFile, $fakeFile->name);
@@ -177,8 +176,8 @@ class UploadRequestEditingTest extends TestCase
Storage::assertMissing("files/$user->id/fake-image.jpeg");
// Assert thumbnail was deleted
getThumbnailFileList("fake-image.jpeg")
->each(fn($thumbnail) => Storage::assertMissing("files/$user->id/$thumbnail"));
getThumbnailFileList('fake-image.jpeg')
->each(fn ($thumbnail) => Storage::assertMissing("files/$user->id/$thumbnail"));
}
/**

3
tests/Domain/UploadRequest/UploadRequestTest.php
View File

@@ -128,6 +128,9 @@ class UploadRequestTest extends TestCase
])->assertStatus(201);
$this
->assertDatabaseHas('upload_requests', [
'status' => 'filling',
])
->assertDatabaseHas('folders', [
'id' => $uploadRequest->id,
'name' => 'Upload Request from 01. Jan. 2021',