fix nested directory path

crabnebula-dev · Nov 16, 2023 · 124d742 · 124d742
1 parent ff92442
commit 124d742
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/web-client/src/components/sources/directory.tsx b/web-client/src/components/sources/directory.tsx
@@ -23,6 +23,7 @@ import {
 import { Loader } from "~/components/loader";
 
 type DirectoryProps = {
+  parent?: Entry["path"];
   defaultPath: Entry["path"];
   defaultSize: Entry["size"];
   defaultFileType: Entry["fileType"];
@@ -40,22 +41,23 @@ const liStyles = "hover:bg-gray-800 hover:text-white focus:bg-gray-800";
 
 export function Directory(props: DirectoryProps) {
   const { client } = useRouteData<Connection>();
-  const [entries] = awaitEntries(client.sources, props.defaultPath);
+  const path = props.parent ? `${props.parent}/${props.defaultPath}` : props.defaultPath;
+  const [entries] = awaitEntries(client.sources, path);
   const sortedEntries = () => entries()?.sort(sortByPath);
 
   return (
     <Suspense fallback={<Loader />}>
       <ul class={props.class}>
         <For each={sortedEntries()} fallback={<li>Empty</li>}>
           {(child) => {
-            const absolutePath = [props.defaultPath, child.path]
+            const absolutePath = [path, child.path]
               .filter((e) => !!e)
               .join("/");
             const [isOpen, setIsOpen] = createSignal(false);
 
             if (isDirectory(child)) {
               const defaultProps = {
-                path: props.defaultPath,
+                path,
                 size: props.defaultSize,
                 fileType: props.defaultFileType,
               };
@@ -78,6 +80,7 @@ export function Directory(props: DirectoryProps) {
                   <Collapsible.Content>
                     <div class="pl-4">
                       <Directory
+                        parent={path}
                         defaultPath={childProps.path}
                         defaultSize={childProps.size}
                         defaultFileType={childProps.fileType}