fix: correctly show the active root (#1307)

Signed-off-by: Pedro Lamas <pedrolamas@gmail.com>

src/components/widgets/filesystem/FileSystem.vue

@@ -201,9 +201,6 @@ export default class FileSystem extends Mixins(StateMixin, FilesMixin, ServicesM
   @Prop({ type: Boolean })
   readonly bulkActions?: boolean
 
-  // Ready. True once the available roots have loaded from moonraker.
-  ready = false
-
   // Maintains the path and root.
   currentRoot = ''
 
@@ -271,11 +268,19 @@ export default class FileSystem extends Mixins(StateMixin, FilesMixin, ServicesM
   }
 
   // Gets available roots.
-  get availableRoots () {
-    if (!Array.isArray(this.roots)) {
-      return [this.roots]
+  get availableRoots (): string[] {
+    const roots = !Array.isArray(this.roots)
+      ? [this.roots]
+      : this.roots
+
+    if (
+      roots.length > 0 &&
+      !roots.includes(this.currentRoot)
+    ) {
+      this.currentRoot = roots[0]
     }
-    return this.roots
+
+    return roots
   }
 
   // Properties of the current root.
@@ -448,10 +453,6 @@ export default class FileSystem extends Mixins(StateMixin, FilesMixin, ServicesM
     return this.$store.state.files.uploads
   }
 
-  get registeredRoots () {
-    return this.$store.state.server.info.registered_directories || []
-  }
-
   get fileDropRoot () {
     return this.$route.meta?.fileDropRoot
   }
@@ -470,20 +471,6 @@ export default class FileSystem extends Mixins(StateMixin, FilesMixin, ServicesM
     items.push(...thumbnails)
   }
 
-  // Set the initial root, and load the dir.
-  @Watch('registeredRoots', { immediate: true })
-  onRegisteredRoots (roots: string[]) {
-    if (roots.length > 0 && !this.ready) {
-      for (const root of this.availableRoots) {
-        if (roots.includes(root)) {
-          this.currentRoot = root
-          this.ready = true
-          break
-        }
-      }
-    }
-  }
-
   // If the root changes, reset the path and load the root path files.
   handleRootChange (root: string) {
     if (root.length) {

src/components/widgets/filesystem/FileSystemToolbar.vue

@@ -142,7 +142,7 @@
     >
       <v-tabs>
         <v-tab
-          v-for="(root, index) in registeredRoots"
+          v-for="(root, index) in roots"
           :key="index"
           @change="$emit('root-change', root)"
         >
@@ -220,11 +220,6 @@ export default class FileSystemToolbar extends Mixins(StatesMixin) {
     return this.$store.getters['files/getRootProperties'](this.root) as RootProperties
   }
 
-  // Only show roots that have been registered.
-  get registeredRoots () {
-    return this.roots?.filter(r => this.$store.state.server.info.registered_directories.includes(r))
-  }
-
   get thumbnailSize () {
     return this.$store.state.config.uiSettings.general.thumbnailSize
   }