From a43c799d594f7a9a76894fa6b46272b982c8e079 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=8Carodej?= <peterpapp@makingcg.com>
Date: Mon, 9 May 2022 15:06:21 +0200
Subject: [PATCH] - Fixed issue when upload doesn't start after you drag the
 file into empty view - pointer cursor over file item

---
 changelog.md                                        | 1 +
 resources/js/components/EntriesView/FileBrowser.vue | 6 ++----
 resources/js/components/UI/Entries/ItemGrid.vue     | 4 ++--
 resources/js/components/UI/Entries/ItemList.vue     | 4 ++--
 resources/js/helpers/functionHelpers.js             | 2 +-
 resources/js/views/Platform.vue                     | 7 +++++--
 resources/js/views/Shared.vue                       | 7 +++++--
 resources/js/views/UploadRequest.vue                | 7 +++++--
 8 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/changelog.md b/changelog.md
index 79bff6c3..3b2f27ab 100644
--- a/changelog.md
+++ b/changelog.md
@@ -3,6 +3,7 @@
 - Ability to manually synchronize plans in fixed subscription type
 - Improved sanitization for .env values to prevent crash your app
 - Improved reCaptcha validation error logs
+- Fixed issue when upload doesn't start after you drag the file into empty view
 
 ## Version 2.1.2
 #### Release date: 8. May 2022
diff --git a/resources/js/components/EntriesView/FileBrowser.vue b/resources/js/components/EntriesView/FileBrowser.vue
index a43dbdb6..7aea977c 100644
--- a/resources/js/components/EntriesView/FileBrowser.vue
+++ b/resources/js/components/EntriesView/FileBrowser.vue
@@ -6,7 +6,7 @@
             'grid-view-sidebar': itemViewType === 'grid' && isVisibleSidebar,
         }"
         class="px-4 lg:h-full lg:w-full lg:overflow-y-auto lg:px-0"
-        @drop.stop.prevent="uploadDroppedItems($event)"
+        @drop.prevent="dragStop($event)"
         @keydown.delete="deleteItems"
         @dragover="dragEnter"
         @dragleave="dragLeave"
@@ -62,9 +62,7 @@ export default {
                 this.$store.dispatch('deleteItem')
             }
         },
-        uploadDroppedItems(event) {
-            this.$uploadDraggedFiles(event, this.currentFolder.data.id)
-
+        dragStop() {
             this.isDragging = false
         },
         dragEnter() {
diff --git a/resources/js/components/UI/Entries/ItemGrid.vue b/resources/js/components/UI/Entries/ItemGrid.vue
index d283a0be..033db6f2 100644
--- a/resources/js/components/UI/Entries/ItemGrid.vue
+++ b/resources/js/components/UI/Entries/ItemGrid.vue
@@ -4,7 +4,7 @@
             'bg-light-background dark:bg-dark-foreground': isClicked && canHover,
             'dark:hover:bg-dark-foreground lg:hover:bg-light-background': canHover,
         }"
-        class="relative z-0 flex h-48 select-none flex-wrap items-center justify-center rounded-lg border-2 border-dashed border-transparent px-1 pt-2 text-center sm:h-56 lg:h-60"
+        class="relative z-0 flex h-48 select-none flex-wrap items-center justify-center rounded-lg border-2 border-dashed border-transparent px-1 pt-2 text-center sm:h-56 lg:h-60 cursor-pointer"
         :draggable="canDrag"
         spellcheck="false"
     >
@@ -77,7 +77,7 @@
                 <!--Item Title-->
                 <span
                     class="inline-block w-full overflow-hidden text-ellipsis whitespace-nowrap text-sm font-bold leading-3 tracking-tight md:px-6"
-                    :class="{ 'hover:underline': canEditName }"
+                    :class="{ 'hover:underline cursor-text': canEditName }"
                     ref="name"
                     @input="renameItem"
                     @keydown.delete.stop
diff --git a/resources/js/components/UI/Entries/ItemList.vue b/resources/js/components/UI/Entries/ItemList.vue
index 050983bc..01603960 100644
--- a/resources/js/components/UI/Entries/ItemList.vue
+++ b/resources/js/components/UI/Entries/ItemList.vue
@@ -4,7 +4,7 @@
             'bg-light-background dark:bg-dark-foreground': isClicked && highlight,
             'hover:bg-light-background dark:hover:bg-dark-foreground': highlight,
         }"
-        class="flex select-none items-center rounded-xl border-2 border-dashed border-transparent px-2.5 py-2"
+        class="flex select-none items-center rounded-xl border-2 border-dashed border-transparent px-2.5 py-2 cursor-pointer"
         :draggable="canDrag"
         spellcheck="false"
     >
@@ -55,7 +55,7 @@
             <!--Item Title-->
             <span
                 class="mb-0.5 block overflow-hidden text-ellipsis whitespace-nowrap text-sm font-bold"
-                :class="{ 'hover:underline': canEditName }"
+                :class="{ 'hover:underline cursor-text': canEditName }"
                 style="max-width: 240px"
                 ref="name"
                 @input="renameItem"
diff --git a/resources/js/helpers/functionHelpers.js b/resources/js/helpers/functionHelpers.js
index 2041e9c2..3c960e89 100644
--- a/resources/js/helpers/functionHelpers.js
+++ b/resources/js/helpers/functionHelpers.js
@@ -177,7 +177,7 @@ const FunctionHelpers = {
 
         Vue.prototype.$uploadDraggedFiles = async function (event, parent_id) {
             // 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
diff --git a/resources/js/views/Platform.vue b/resources/js/views/Platform.vue
index 8df23fd8..c78155ee 100644
--- a/resources/js/views/Platform.vue
+++ b/resources/js/views/Platform.vue
@@ -46,7 +46,7 @@
             <div v-if="config.allowedAdsense && config.adsenseBanner01" v-html="config.adsenseBanner01" class="mb-5 min-h-[120px]"></div>
 
             <!--File list & info sidebar-->
-            <div class="flex space-x-3 lg:overflow-hidden grow">
+            <div class="flex space-x-3 lg:overflow-hidden grow" @drop.stop.prevent="uploadDroppedItems($event)" @dragenter.prevent @dragover.prevent>
                 <router-view id="file-view" class="relative w-full" :key="$route.fullPath" />
 
                 <InfoSidebar v-if="isVisibleSidebar" />
@@ -110,7 +110,7 @@ export default {
         DragUI,
     },
     computed: {
-        ...mapGetters(['isVisibleSidebar', 'isLimitedUser', 'config']),
+        ...mapGetters(['isVisibleSidebar', 'isLimitedUser', 'config', 'currentFolder']),
     },
     data() {
         return {
@@ -118,6 +118,9 @@ export default {
         }
     },
     methods: {
+		uploadDroppedItems(event) {
+			this.$uploadDraggedFiles(event, this.currentFolder?.data.id)
+		},
         contextMenu(event, item) {
             events.$emit('context-menu:show', event, item)
         },
diff --git a/resources/js/views/Shared.vue b/resources/js/views/Shared.vue
index c6a8ee5b..e4b218af 100644
--- a/resources/js/views/Shared.vue
+++ b/resources/js/views/Shared.vue
@@ -35,7 +35,7 @@
             <div v-if="config.allowedAdsense && config.adsenseBanner01" v-html="config.adsenseBanner01" class="mb-5 min-h-[120px]"></div>
 
             <!--File list & info sidebar-->
-            <div class="flex space-x-3 lg:overflow-hidden grow">
+            <div class="flex space-x-3 lg:overflow-hidden grow" @drop.stop.prevent="uploadDroppedItems($event)" @dragenter.prevent @dragover.prevent>
                 <router-view id="file-view" class="relative w-full" :key="$route.fullPath" />
 
                 <InfoSidebar v-if="isVisibleSidebar" />
@@ -87,7 +87,7 @@ export default {
         Alert,
     },
     computed: {
-        ...mapGetters(['isVisibleSidebar', 'sharedDetail', 'config']),
+        ...mapGetters(['isVisibleSidebar', 'sharedDetail', 'config', 'currentFolder']),
     },
     data() {
         return {
@@ -95,6 +95,9 @@ export default {
         }
     },
     methods: {
+		uploadDroppedItems(event) {
+			this.$uploadDraggedFiles(event, this.currentFolder?.data.id)
+		},
         contextMenu(event, item) {
             events.$emit('context-menu:show', event, item)
         },
diff --git a/resources/js/views/UploadRequest.vue b/resources/js/views/UploadRequest.vue
index 6e493801..03ef24e3 100644
--- a/resources/js/views/UploadRequest.vue
+++ b/resources/js/views/UploadRequest.vue
@@ -30,7 +30,7 @@
             <div v-if="config.allowedAdsense && config.adsenseBanner01" v-html="config.adsenseBanner01" class="mb-5 min-h-[120px]"></div>
 
             <!--File list & info sidebar-->
-            <div class="flex space-x-3 lg:overflow-hidden grow">
+            <div class="flex space-x-3 lg:overflow-hidden grow" @drop.stop.prevent="uploadDroppedItems($event)" @dragenter.prevent @dragover.prevent>
                 <router-view id="file-view" class="relative w-full" :key="$route.fullPath" />
 
                 <InfoSidebarUploadRequest v-if="canShowUI && isVisibleSidebar" />
@@ -76,7 +76,7 @@ export default {
         DragUI,
     },
     computed: {
-        ...mapGetters(['isVisibleSidebar', 'config', 'uploadRequest', 'fileQueue']),
+        ...mapGetters(['isVisibleSidebar', 'config', 'uploadRequest', 'fileQueue', 'currentFolder']),
 		canShowUI() {
 			return (this.uploadRequest && this.uploadRequest.data.attributes.status === 'filling') || this.fileQueue.length > 0
 		}
@@ -87,6 +87,9 @@ export default {
         }
     },
     methods: {
+		uploadDroppedItems(event) {
+			this.$uploadDraggedFiles(event, this.currentFolder?.data.id)
+		},
         contextMenu(event, item) {
             events.$emit('context-menu:show', event, item)
         },