web: Fixes

dolthub · Oct 19, 2023 · 2b92f70 · 2b92f70
1 parent 644eaa7
commit 2b92f70
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 13 deletions.
diff --git a/packages/web/components/DatabaseNav/utils.ts b/packages/web/components/DatabaseNav/utils.ts
@@ -1,20 +1,13 @@
 import { OptionalRefParams } from "@lib/params";
-import {
-  database,
-  DatabaseUrl,
-  defaultDoc,
-  defaultDocDefaultBranch,
-  ref,
-  RefUrl,
-} from "@lib/urls";
+import { database, DatabaseUrl, defaultDoc, ref, RefUrl } from "@lib/urls";
 import { Route } from "@lib/urlUtils";
 
 function getUrlFromName(name: string): [DatabaseUrl, RefUrl?] {
   switch (name) {
     case "Database":
       return [database, ref];
     case "About":
-      return [defaultDocDefaultBranch, defaultDoc];
+      return [database, defaultDoc];
     // case "Commit Log":
     //   return [database, commitLog];
     // case "Releases":

diff --git a/packages/web/components/layouts/DatabaseLayout/index.tsx b/packages/web/components/layouts/DatabaseLayout/index.tsx
@@ -29,7 +29,7 @@ type Props = {
 };
 
 export default function DatabaseLayout(props: Props) {
-  const { q, tableName } = props.params;
+  const { q, tableName, ...refParams } = props.params;
   const forDataTable = !!(q || tableName);
   const showHeader = forDataTable || props.showSqlConsole || props.empty;
   const useFullWidth = forDataTable || !!props.wide;
@@ -40,10 +40,18 @@ export default function DatabaseLayout(props: Props) {
     <Wrapper>
       <DatabaseHeaderAndNav
         initialTabIndex={props.initialTabIndex}
-        params={props.params}
+        params={refParams}
+        // breadcrumbs={props.smallHeaderBreadcrumbs}
         title={props.title}
+        // showSmall={showSmallHeader}
+        // setShowSmall={setShowSmallHeader}
       />
-      <div className={cx(css.content, css.contentWithHeader)}>
+      <div
+        className={cx(css.content, {
+          [css.contentWithHeader]: !!showHeader,
+          // [css.contentWithSmallHeader]: showSmallHeader,
+        })}
+      >
         <DatabaseTableNav
           params={props.params}
           initiallyOpen={props.leftNavInitiallyOpen}
@@ -65,6 +73,7 @@ export default function DatabaseLayout(props: Props) {
                 [css.maxWidth]: !useFullWidth,
                 [css.noHeader]: !showHeader,
               })}
+              // onScroll={props.onScroll}
               mobileBreakpoint={1024}
             >
               {props.children}

diff --git a/packages/web/lib/urls.ts b/packages/web/lib/urls.ts
@@ -44,7 +44,7 @@ export const newBranch = (p: ps.OptionalRefParams): Route =>
   branches(p).addStatic("new").withQuery({ refName: p.refName });
 
 export const defaultDoc = (p: ps.RefParams): Route =>
-  defaultDocDefaultBranch(p).addDynamic("refName", p.refName, ENCODE);
+  database(p).addStatic("doc").addDynamic("refName", p.refName, ENCODE);
 
 export const doc = (p: ps.DocParams): Route =>
   defaultDoc(p).addDynamic("docName", p.docName, ENCODE);