Fix some bugs

Floe-dev · Sep 30, 2023 · c203bd9 · c203bd9
1 parent c984491
commit c203bd9
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 5 deletions.
diff --git a/apps/web/src/app/[subdomain]/[datasource]/[tab]/[[...path]]/StackLayout/SideNav.tsx b/apps/web/src/app/[subdomain]/[datasource]/[tab]/[[...path]]/StackLayout/SideNav.tsx
@@ -38,6 +38,30 @@ const SideNav = ({ tree, params }: SideNavProps) => {
   );
 };
 
+function isSinglePage(
+  page:
+    | {
+        title: string;
+        page: string;
+      }
+    | {
+        title: string;
+        pages: any[];
+      }
+): page is {
+  title: string;
+  page: string;
+} {
+  return (
+    (
+      page as {
+        title: string;
+        page: string;
+      }
+    ).page !== undefined
+  );
+}
+
 const buildRecursiveTree = (
   pages: Tree,
   params: {
@@ -49,7 +73,7 @@ const buildRecursiveTree = (
   pathname: string
 ) => {
   return pages.map((page) => {
-    if (page.page) {
+    if (isSinglePage(page)) {
       const isActive =
         [params.tab, ...(params?.path ?? [])].join("/") === page.page;
 

diff --git a/apps/web/src/app/[subdomain]/[datasource]/[tab]/[[...path]]/page.tsx b/apps/web/src/app/[subdomain]/[datasource]/[tab]/[[...path]]/page.tsx
@@ -50,10 +50,7 @@ async function DocsPage({
     );
 
     if (currentSection.stack) {
-      const path = decodeURIComponent(
-        [params.tab, ...(params.path ?? [])].join("/")
-      );
-      const tree = await floeClient.tree.get(path, params.datasource);
+      const tree = await floeClient.tree.get(params.tab, params.datasource);
 
       return (
         <StackLayout tree={tree} params={params}>