From 4df575f5e985619be80a64548e0956246a5aa9f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=8Carodej?= <peterpapp@makingcg.com>
Date: Tue, 8 Feb 2022 14:25:28 +0100
Subject: [PATCH] Shared pages refactoring part 3

---
 resources/js/components/Others/TreeMenu.vue   |  3 +--
 resources/js/helpers/functionHelpers.js       |  3 ++-
 resources/js/helpers/itemHelpers.js           |  2 +-
 resources/js/store/modules/fileFunctions.js   | 16 ++++++-------
 src/App/Users/Actions/CreateNewUserAction.php |  3 ++-
 .../Controllers/Users/UserController.php      |  8 +++----
 .../VisitorUploadFileController.php           | 23 +++++++++++++++----
 src/Domain/Files/Resources/FileResource.php   | 17 +++++++-------
 .../VisitorNavigationFolderTreeController.php |  9 ++++----
 .../Folders/Resources/FolderResource.php      |  1 -
 .../Homepage/Controllers/IndexController.php  |  6 ++---
 .../RenameFileOrFolderController.php          |  3 +--
 .../SharePublicIndexController.php            |  2 --
 13 files changed, 53 insertions(+), 43 deletions(-)

diff --git a/resources/js/components/Others/TreeMenu.vue b/resources/js/components/Others/TreeMenu.vue
index e0e0a172..a088e580 100644
--- a/resources/js/components/Others/TreeMenu.vue
+++ b/resources/js/components/Others/TreeMenu.vue
@@ -24,7 +24,7 @@
             </span>
 
             <!--Item icon-->
-            <hard-drive-icon v-if="nodes.location === 'files'" size="17" class="icon vue-feather" :class="{ 'text-theme dark-text-theme': isSelectedItem }" />
+            <hard-drive-icon v-if="['public', 'files'].includes(nodes.location)" size="17" class="icon vue-feather" :class="{ 'text-theme dark-text-theme': isSelectedItem }" />
             <users-icon v-if="nodes.location === 'team-folders'" size="17" class="icon vue-feather" :class="{ 'text-theme dark-text-theme': isSelectedItem }" />
             <user-plus-icon v-if="nodes.location === 'shared-with-me'" size="17" class="icon vue-feather" :class="{ 'text-theme dark-text-theme': isSelectedItem }" />
             <folder-icon v-if="!nodes.location" size="17" class="icon vue-feather" :class="{ 'text-theme dark-text-theme': isSelectedItem }" />
@@ -45,7 +45,6 @@
 </template>
 
 <script>
-//import TreeMenu from './TreeMenu'
 import { FolderIcon, ChevronRightIcon, HardDriveIcon, UsersIcon, UserPlusIcon } from 'vue-feather-icons'
 import { events } from '../../bus'
 import { mapGetters } from 'vuex'
diff --git a/resources/js/helpers/functionHelpers.js b/resources/js/helpers/functionHelpers.js
index 45a3c14d..35079909 100644
--- a/resources/js/helpers/functionHelpers.js
+++ b/resources/js/helpers/functionHelpers.js
@@ -151,7 +151,7 @@ const FunctionHelpers = {
 
         Vue.prototype.$uploadFiles = async function (files) {
             // Show alert message when upload is disabled
-            if (!store.getters.user.data.meta.restrictions.canUpload) {
+            if (store.getters.user && !store.getters.user.data.meta.restrictions.canUpload) {
                 Vue.prototype.$temporarilyDisabledUpload()
 
                 return
@@ -325,6 +325,7 @@ const FunctionHelpers = {
 
         Vue.prototype.$getDataByLocation = function () {
             let routes = {
+                Public: ['getSharedFolder', router.currentRoute.params.id || undefined],
                 Files: ['getFolder', router.currentRoute.params.id || undefined],
                 RecentUploads: ['getRecentUploads'],
                 MySharedItems: ['getMySharedItems'],
diff --git a/resources/js/helpers/itemHelpers.js b/resources/js/helpers/itemHelpers.js
index 97ced2b9..c325a18e 100644
--- a/resources/js/helpers/itemHelpers.js
+++ b/resources/js/helpers/itemHelpers.js
@@ -25,7 +25,7 @@ const itemHelpers = {
 
         Vue.prototype.$createFolder = function () {
             // Show alert message when create folder is disabled
-            if (!store.getters.user.data.meta.restrictions.canCreateFolder) {
+            if (store.getters.user && !store.getters.user.data.meta.restrictions.canCreateFolder) {
                 Vue.prototype.$temporarilyDisabledFolderCreate()
 
                 return
diff --git a/resources/js/store/modules/fileFunctions.js b/resources/js/store/modules/fileFunctions.js
index 6a75fbba..b29a11b6 100644
--- a/resources/js/store/modules/fileFunctions.js
+++ b/resources/js/store/modules/fileFunctions.js
@@ -211,8 +211,6 @@ const actions = {
                 .catch((error) => {
                     reject(error)
 
-                    console.log(error)
-
                     let messages = {
                         423: {
                             title: i18n.t('popup_exceed_limit.title'),
@@ -227,15 +225,17 @@ const actions = {
                             message: i18n.t('popup_paylod_error.message'),
                         },
                         401: {
-                            //title: error.response.data.message,
+                            title: error.response.data.message,
                         },
                     }
 
-                    events.$emit('alert:open', {
-                        emoji: '😬😬😬',
-                        title: messages[error.response.status]['title'],
-                        message: messages[error.response.status]['message'] || null,
-                    })
+                    if (messages[error.response.status]) {
+                        events.$emit('alert:open', {
+                            emoji: '😬😬😬',
+                            title: messages[error.response.status]['title'] || null,
+                            message: messages[error.response.status]['message'] || null,
+                        })
+                    }
 
                     commit('PROCESSING_FILE', false)
                     commit('CLEAR_UPLOAD_PROGRESS')
diff --git a/src/App/Users/Actions/CreateNewUserAction.php b/src/App/Users/Actions/CreateNewUserAction.php
index 2fed4298..d52ecfae 100644
--- a/src/App/Users/Actions/CreateNewUserAction.php
+++ b/src/App/Users/Actions/CreateNewUserAction.php
@@ -10,7 +10,8 @@ class CreateNewUserAction extends Controller
 {
     public function __construct(
         protected AutoSubscribeForMeteredBillingAction $autoSubscribeForMeteredBilling,
-    ) {}
+    ) {
+    }
 
     /**
      * Validate and create a new user.
diff --git a/src/Domain/Admin/Controllers/Users/UserController.php b/src/Domain/Admin/Controllers/Users/UserController.php
index ef40118d..b2d140a5 100644
--- a/src/Domain/Admin/Controllers/Users/UserController.php
+++ b/src/Domain/Admin/Controllers/Users/UserController.php
@@ -1,21 +1,21 @@
 <?php
-
 namespace Domain\Admin\Controllers\Users;
 
-use App\Users\Actions\CreateNewUserAction;
-use App\Users\DTO\CreateUserData;
 use App\Users\Models\User;
 use Illuminate\Http\Response;
+use App\Users\DTO\CreateUserData;
 use App\Http\Controllers\Controller;
 use App\Users\Resources\UserResource;
 use App\Users\Resources\UsersCollection;
+use App\Users\Actions\CreateNewUserAction;
 use Domain\Admin\Requests\CreateUserByAdmin;
 
 class UserController extends Controller
 {
     public function __construct(
         protected CreateNewUserAction $createNewUser,
-    ) {}
+    ) {
+    }
 
     /**
      * Get all users
diff --git a/src/Domain/Files/Controllers/VisitorUploadFileController.php b/src/Domain/Files/Controllers/VisitorUploadFileController.php
index a9e1758e..a50ce038 100644
--- a/src/Domain/Files/Controllers/VisitorUploadFileController.php
+++ b/src/Domain/Files/Controllers/VisitorUploadFileController.php
@@ -5,10 +5,13 @@ use Illuminate\Http\Response;
 use Domain\Sharing\Models\Share;
 use App\Http\Controllers\Controller;
 use Domain\Files\Requests\UploadRequest;
+use Domain\Files\Resources\FileResource;
 use Domain\Files\Actions\UploadFileAction;
 use Support\Demo\Actions\FakeUploadFileAction;
+use App\Users\Exceptions\InvalidUserActionException;
 use Domain\Sharing\Actions\ProtectShareRecordAction;
 use Domain\Sharing\Actions\VerifyAccessToItemAction;
+use Illuminate\Contracts\Filesystem\FileNotFoundException;
 
 /**
  * guest user upload file into shared folder
@@ -23,6 +26,9 @@ class VisitorUploadFileController extends Controller
     ) {
     }
 
+    /**
+     * @throws FileNotFoundException
+     */
     public function __invoke(
         UploadRequest $request,
         Share $shared,
@@ -42,12 +48,19 @@ class VisitorUploadFileController extends Controller
         // Check access to requested directory
         ($this->verifyAccessToItem)($request->input('parent_id'), $shared);
 
-        // Return new uploaded file
-        $new_file = ($this->uploadFile)($request, $shared);
+        try {
+            // Return new uploaded file
+            $file = ($this->uploadFile)($request, $shared);
 
-        // Set public access url
-        $new_file->setPublicUrl($shared->token);
+            // Set public access url
+            $file->setPublicUrl($shared->token);
 
-        return response($new_file, 201);
+            return response(new FileResource($file), 201);
+        } catch (InvalidUserActionException $e) {
+            return response([
+                'type'    => 'error',
+                'message' => $e->getMessage(),
+            ], 401);
+        }
     }
 }
diff --git a/src/Domain/Files/Resources/FileResource.php b/src/Domain/Files/Resources/FileResource.php
index 9961909b..110d3c13 100644
--- a/src/Domain/Files/Resources/FileResource.php
+++ b/src/Domain/Files/Resources/FileResource.php
@@ -1,7 +1,6 @@
 <?php
 namespace Domain\Files\Resources;
 
-use Carbon\Carbon;
 use ByteUnits\Metric;
 use Domain\Sharing\Resources\ShareResource;
 use Illuminate\Http\Resources\Json\JsonResource;
@@ -25,14 +24,14 @@ class FileResource extends JsonResource
                 'id'            => $this->id,
                 'type'          => $this->type,
                 'attributes'    => [
-                    'filesize'   => $fileSize,
-                    'name'       => $this->name,
-                    'basename'   => $this->basename,
-                    'mimetype'   => $this->mimetype,
-                    'file_url'   => $this->file_url,
-                    'thumbnail'  => $this->thumbnail,
-                    'metadata'   => $this->metadata,
-                    'parent_id'  => $this->parent_id,
+                    'filesize'      => $fileSize,
+                    'name'          => $this->name,
+                    'basename'      => $this->basename,
+                    'mimetype'      => $this->mimetype,
+                    'file_url'      => $this->file_url,
+                    'thumbnail'     => $this->thumbnail,
+                    'metadata'      => $this->metadata,
+                    'parent_id'     => $this->parent_id,
                     'created_at'    => set_time_by_user_timezone($this->owner, $this->created_at),
                     'updated_at'    => set_time_by_user_timezone($this->owner, $this->updated_at),
                     'deleted_at'    => $this->deleted_at
diff --git a/src/Domain/Folders/Controllers/VisitorNavigationFolderTreeController.php b/src/Domain/Folders/Controllers/VisitorNavigationFolderTreeController.php
index 371840e0..eac960c5 100644
--- a/src/Domain/Folders/Controllers/VisitorNavigationFolderTreeController.php
+++ b/src/Domain/Folders/Controllers/VisitorNavigationFolderTreeController.php
@@ -36,10 +36,11 @@ class VisitorNavigationFolderTreeController extends Controller
 
         return [
             [
-                'id'       => $shared->item_id,
-                'name'     => __t('home'),
-                'location' => 'public',
-                'folders'  => $folders,
+                'name'      => __t('home'),
+                'location'  => 'public',
+                'folders'   => $folders,
+                'isMovable' => true,
+                'isOpen'    => true,
             ],
         ];
     }
diff --git a/src/Domain/Folders/Resources/FolderResource.php b/src/Domain/Folders/Resources/FolderResource.php
index 9019c269..b2992727 100644
--- a/src/Domain/Folders/Resources/FolderResource.php
+++ b/src/Domain/Folders/Resources/FolderResource.php
@@ -1,7 +1,6 @@
 <?php
 namespace Domain\Folders\Resources;
 
-use Carbon\Carbon;
 use Domain\Sharing\Resources\ShareResource;
 use Illuminate\Http\Resources\Json\JsonResource;
 use Domain\Teams\Resources\TeamMembersCollection;
diff --git a/src/Domain/Homepage/Controllers/IndexController.php b/src/Domain/Homepage/Controllers/IndexController.php
index db91ebc0..b789a73c 100644
--- a/src/Domain/Homepage/Controllers/IndexController.php
+++ b/src/Domain/Homepage/Controllers/IndexController.php
@@ -1,11 +1,11 @@
 <?php
 namespace Domain\Homepage\Controllers;
 
-use Illuminate\Contracts\Foundation\Application;
-use Illuminate\Contracts\View\Factory;
 use Domain\Pages\Models\Page;
-use Doctrine\DBAL\Driver\PDOException;
 use Illuminate\Contracts\View\View;
+use Doctrine\DBAL\Driver\PDOException;
+use Illuminate\Contracts\View\Factory;
+use Illuminate\Contracts\Foundation\Application;
 
 class IndexController
 {
diff --git a/src/Domain/Items/Controllers/RenameFileOrFolderController.php b/src/Domain/Items/Controllers/RenameFileOrFolderController.php
index 99e7f707..5f09df87 100644
--- a/src/Domain/Items/Controllers/RenameFileOrFolderController.php
+++ b/src/Domain/Items/Controllers/RenameFileOrFolderController.php
@@ -6,8 +6,8 @@ use Domain\Files\Resources\FileResource;
 use Domain\Folders\Resources\FolderResource;
 use Domain\Items\Requests\RenameItemRequest;
 use Domain\Items\Actions\RenameFileOrFolderAction;
-use Domain\Folders\Actions\UpdateFolderPropertyAction;
 use Illuminate\Auth\Access\AuthorizationException;
+use Domain\Folders\Actions\UpdateFolderPropertyAction;
 use Support\Demo\Actions\FakeRenameFileOrFolderAction;
 
 class RenameFileOrFolderController extends Controller
@@ -41,7 +41,6 @@ class RenameFileOrFolderController extends Controller
         $item = ($this->renameFileOrFolder)($request, $id);
 
         if ($request->input('type') === 'folder') {
-
             return new FolderResource($item);
         }
 
diff --git a/src/Domain/Sharing/Controllers/SharePublicIndexController.php b/src/Domain/Sharing/Controllers/SharePublicIndexController.php
index 24699107..960af5de 100644
--- a/src/Domain/Sharing/Controllers/SharePublicIndexController.php
+++ b/src/Domain/Sharing/Controllers/SharePublicIndexController.php
@@ -23,7 +23,6 @@ class SharePublicIndexController extends Controller
     public function __invoke(
         Share $share,
     ): View | StreamedResponse | RedirectResponse {
-
         // Check if user can see shared record
         if (! $share->user->canVisitShared()) {
             return redirect('/temporary-unavailable');
@@ -38,7 +37,6 @@ class SharePublicIndexController extends Controller
 
         // Check if shared is image file and then show it
         if ($share->type === 'file') {
-
             // Get file
             $file = File::whereUserId($share->user_id)
                 ->where('type', 'image')