From 06b28aeee3fd6a7e9484525b23ee713314dc2304 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=8Carodej?= <peterpapp@makingcg.com>
Date: Wed, 23 Feb 2022 16:43:20 +0100
Subject: [PATCH] file preview optimization for upload request

---
 .../js/components/FilePreview/FilePreviewToolbar.vue  | 11 ++++++++---
 routes/upload-request.php                             |  8 ++++++--
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/resources/js/components/FilePreview/FilePreviewToolbar.vue b/resources/js/components/FilePreview/FilePreviewToolbar.vue
index fbb48280..708c1425 100644
--- a/resources/js/components/FilePreview/FilePreviewToolbar.vue
+++ b/resources/js/components/FilePreview/FilePreviewToolbar.vue
@@ -48,7 +48,7 @@
                                 @click.native="$shareFileOrFolder(currentFile)"
                                 :title="sharingTitle"
                                 icon="share"
-                                v-if="$checkPermission('master')"
+                                v-if="!$isThisRoute($route, ['Public', 'RequestUpload', 'SharedWithMe'])"
                             />
                             <Option
                                 @click.native="$deleteFileOrFolder(currentFile)"
@@ -57,7 +57,7 @@
                                 class="menu-option"
                             />
                         </OptionGroup>
-                        <OptionGroup>
+                        <OptionGroup v-if="!$isThisRoute($route, ['RequestUpload'])">
                             <Option @click.native="downloadItem" :title="$t('context_menu.download')" icon="download" />
                         </OptionGroup>
                     </PopoverItem>
@@ -78,7 +78,12 @@
             </div>
 
             <div class="ml-5">
-                <ToolbarButton @click.native="downloadItem" source="download" :action="$t('actions.download')" />
+                <ToolbarButton
+                    v-if="!$isThisRoute($route, ['RequestUpload'])"
+                    @click.native="downloadItem"
+                    source="download"
+                    :action="$t('actions.download')"
+                />
                 <ToolbarButton
                     v-if="canShareItem"
                     @click.native="$shareFileOrFolder(currentFile)"
diff --git a/routes/upload-request.php b/routes/upload-request.php
index df0a34a0..c7b8afea 100644
--- a/routes/upload-request.php
+++ b/routes/upload-request.php
@@ -10,12 +10,15 @@ use Domain\UploadRequest\Controllers\CreateUploadRequestController;
 use Domain\UploadRequest\Controllers\SetUploadRequestAsFilledController;
 use Domain\UploadRequest\Controllers\UploadFilesForUploadRequestController;
 
+Route::get('/{uploadRequest}', GetUploadRequestController::class);
+
+// Available only for active upload requests
 Route::group(['middleware' => 'upload-request'], function() {
-    Route::get('/{uploadRequest}', GetUploadRequestController::class);
+    // Detail
     Route::delete('/{uploadRequest}', SetUploadRequestAsFilledController::class);
-    Route::post('/{uploadRequest}/upload', UploadFilesForUploadRequestController::class);
 
     // Edit
+    Route::post('/{uploadRequest}/upload', UploadFilesForUploadRequestController::class);
     Route::patch('/{uploadRequest}/rename/{id}', RenameFileOrFolderController::class);
     Route::post('/{uploadRequest}/create-folder', CreateFolderController::class);
     Route::post('/{uploadRequest}/remove', DeleteFileOrFolderController::class);
@@ -25,6 +28,7 @@ Route::group(['middleware' => 'upload-request'], function() {
     Route::post('/{uploadRequest}/move', MoveItemInUploadRequestController::class);
 });
 
+// User functionality
 Route::group(['middleware' => ['auth:sanctum']], function () {
     Route::post('/', CreateUploadRequestController::class);
 });