Fix asset field type filemanager not able to navigate error

public/mix-manifest.json

@@ -1,6 +1,6 @@
 {
-    "/js/gravity.js": "/js/gravity.js?id=2b068722e2a1f6b4c4c5",
-    "/css/gravity.css": "/css/gravity.css?id=f4312103778cfc5c63f0",
+    "/js/gravity.js": "/js/gravity.js?id=fb9e1eb2d87572f121c4",
+    "/css/gravity.css": "/css/gravity.css?id=865176a63047b81aa599",
     "/img/audio-large.svg": "/img/audio-large.svg?id=fca6a67c7ef06d00ef4a",
     "/img/audio-small.svg": "/img/audio-small.svg?id=48f5a5c5ff1cfd2cb375",
     "/img/document-large.svg": "/img/document-large.svg?id=5c7cacec26ee17c609d5",

resources/js/components/Fieldtypes/Asset/Field.vue

@@ -94,6 +94,8 @@
 								</file>
 							</div>
 						</div>
+
+						<file-paginator></file-paginator>
 
             		</div>
             	</div>
@@ -115,6 +117,7 @@
 
 	import FileUploader  from '@/interfaces/FileManager/FileUploader.vue'
 	import FileSelection from '@/interfaces/FileManager/FileSelection.vue'
+ 	import FilePaginator from '@/interfaces/FileManager/FilePaginator.vue'
 
 	import BreadcrumbAction from '@/interfaces/FileManager/Actions/Breadcrumb.vue'
 	import DisplayAction    from '@/interfaces/FileManager/Actions/Display.vue'
@@ -133,6 +136,7 @@
         components: {
 			'file-uploader':  FileUploader,
 			'file-selection': FileSelection,
+			'file-paginator': FilePaginator,
 
 			'breadcrumb-action': BreadcrumbAction,
 			'display-action':    DisplayAction,
@@ -216,11 +220,14 @@
 			},
 
 			open() {
+				let directory = this.loadCurrentDirectoryFromLocalStorage(this.field.settings.disk)
+
                 this.reset()
-                this.setCurrentDirectory(this.field.settings.directory || 0)
                 this.setRootDirectory(this.field.settings.directory || 0)
                 this.fetchDisk(this.field.settings.disk)
 
+                this.setCurrentDirectory(directory || this.field.settings.directory || 0)
+
                 this.selection = [...this.model]
                 this.requestOpen = true
 			},
@@ -239,14 +246,7 @@
 			accept() {
                 this.model = [...this.selection]
 				this.close()
-			},
-
-            navigate(directory) {
-                this.reset()
-                this.setCurrentDirectory(directory.id)
-                this.setRootDirectory(this.field.settings.directory || 0)
-                this.fetchDisk(this.field.settings.disk)
-            }
+			}
 		},
 
 		created() {

resources/js/interfaces/FileManager/Modals/MoveFileModal.vue

@@ -1,10 +1,13 @@
 <template>
     <ui-modal name="move-file" title="Move file(s) to directory">
-        <ui-treeview :nodes="directories" v-model="directory">
+        <div v-if="loading">Loading ...</div>
+
+        <ui-treeview v-else :nodes="directories" v-model="directory">
             <i class="fas fa-folder-open"></i>
-            <template slot="prepend" slot-scope="{ node, open }">
-                <fa-icon v-if="open" :icon="['fas', 'folder-open']" class="mr-2" :class="{'fill-current text-info-500': node.isCurrent}"></fa-icon>
-                <fa-icon v-else :icon="['fas', 'folder']" class="mr-2" :class="{'fill-current text-info-500': node.isCurrent}"></fa-icon>
+
+            <template v-slot:prepend="{ node, open }">
+                <fa-icon v-if="open && node" :icon="['fas', 'folder-open']" class="mr-2" :class="{'fill-current text-info-500': node.isCurrent}"></fa-icon>
+                <fa-icon v-else-if="node" :icon="['fas', 'folder']" class="mr-2" :class="{'fill-current text-info-500': node.isCurrent}"></fa-icon>
             </template>
         </ui-treeview>
 
@@ -23,6 +26,7 @@
 
         data() {
             return {
+                loading: false,
                 isOpen: false,
                 directory: null,
                 directories: []
@@ -93,14 +97,18 @@
             },
 
             gatherOptions() {
+                this.loading = true
                 axios.get(`/api/directories/${this.disk.id}?recursive=true`).then(({data}) => {
+                    this.loading = false
                     this.directories = [{
                         id:        '0',
                         name:      'Root',
                         isFolder:  true,
                         isCurrent: this.currentDirectory === 0,
                         children:  this.recursiveMap(data.data)
                     }]
+                }).catch((error) => {
+                    this.loading = false
                 })
             }
         },

resources/js/mixins/filebrowser.js

@@ -48,10 +48,18 @@ export default {
 			reset:                    'filemanager/reset',
 		}),
 
+		loadCurrentDirectoryFromLocalStorage(diskId) {
+			return window.localStorage.getItem('filemanager_current_directory_' + diskId);
+		},
+		saveCurrentDirectoryToLocalStorage(directoryId) {
+			window.localStorage.setItem('filemanager_current_directory_' + this.disk.id, directoryId);
+		},
+
 		navigate(directory) {
 			this.reset()
 
 			if (directory) {
+				this.saveCurrentDirectoryToLocalStorage(directory.id)
 				this.setCurrentDirectory(directory.id)
 				this.setParentDirectory(directory.parent_id)
 			}

resources/js/store/filemanager.js

@@ -326,7 +326,6 @@ export default {
             axios.get(`/api/disks/${disk}`)
                 .then(({ data }) => {
                     commit('setDisk', data.data)
-                    dispatch('reset')
                     dispatch('fetchFilesAndDirectories')
                 })
                 .catch((errors) => console.log(errors))

src/Providers/MenuServiceProvider.php

@@ -39,7 +39,7 @@ private function getFileManagerDisks()
         $disks = Disk::all();
 
         if ($disks->count() == 1) {
-            return ['title' => 'File Manager', 'to' => "/files/{$disk->first()->handle}", 'icon' => 'images'];
+            return ['title' => 'File Manager', 'to' => "/files/{$disks->first()->handle}", 'icon' => 'images'];
         }
 
         return [