some refactoring to sidebar; fixed unclickable welcome page; renamed …

…cloud rest api section pages to be in order (there was a gap)
grafana · Aug 17, 2020 · 584f94c · 584f94c
1 parent 0c395d8
commit 584f94c
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 28 deletions.
diff --git a/gatsby-node.js b/gatsby-node.js
@@ -93,9 +93,8 @@ async function createDocPages({ graphql, actions, reporter }) {
           slug ||
           compose(
             noTrailingSlash,
-            dedupePath,
-
             removeGuidesAndRedirectWelcome,
+            dedupePath,
             unorderify,
             slugify,
           )(path),
@@ -147,7 +146,6 @@ async function createDocPages({ graphql, actions, reporter }) {
       compose(
         noTrailingSlash,
         dedupePath,
-
         removeGuides,
         unorderify,
         slugify,

diff --git a/...PI/01 Cloud REST API/03 Authentication.md → ...PI/01 Cloud REST API/02 Authentication.md b/...PI/01 Cloud REST API/03 Authentication.md → ...PI/01 Cloud REST API/02 Authentication.md
diff --git a/...PI/01 Cloud REST API/04 Error Handling.md → ...PI/01 Cloud REST API/03 Error Handling.md b/...PI/01 Cloud REST API/04 Error Handling.md → ...PI/01 Cloud REST API/03 Error Handling.md
diff --git a/...API/01 Cloud REST API/05 Organizations.md → ...API/01 Cloud REST API/04 Organizations.md b/...API/01 Cloud REST API/05 Organizations.md → ...API/01 Cloud REST API/04 Organizations.md
diff --git a/...ud REST API/01 Cloud REST API/06 Tests.md → ...ud REST API/01 Cloud REST API/05 Tests.md b/...ud REST API/01 Cloud REST API/06 Tests.md → ...ud REST API/01 Cloud REST API/05 Tests.md
diff --git a/...EST API/01 Cloud REST API/07 Test Runs.md → ...EST API/01 Cloud REST API/06 Test Runs.md b/...EST API/01 Cloud REST API/07 Test Runs.md → ...EST API/01 Cloud REST API/06 Test Runs.md
diff --git a/...API/01 Cloud REST API/08 Test Run Data.md → ...API/01 Cloud REST API/07 Test Run Data.md b/...API/01 Cloud REST API/08 Test Run Data.md → ...API/01 Cloud REST API/07 Test Run Data.md
diff --git a/src/layouts/doc-layout/doc-layout.module.scss b/src/layouts/doc-layout/doc-layout.module.scss
@@ -111,7 +111,7 @@ h2.sidebar-section-title {
   }
 }
 
-.sidebarNodeWithChildren > a {
+.sidebar-node-with-children > a {
   &.sidebar-node-title_active {
     &:after {
       content: '';

diff --git a/src/layouts/doc-layout/doc-layout.view.js b/src/layouts/doc-layout/doc-layout.view.js
@@ -119,8 +119,6 @@ const SidebarNode = (props) => {
   const {
     node: { name, meta, children },
   } = props;
-
-  const isLink = meta?.path;
   const [isActive, setIsActive] = useState(false);
 
   useEffect(() => {
@@ -143,29 +141,43 @@ const SidebarNode = (props) => {
 
   const hasSubMenu = !_.isEmpty(children);
 
+  const nodes = {
+    externalLink: () => (
+      <a className={styles.sidebarNodeTitle} href={meta.redirect}>
+        {meta.title}
+      </a>
+    ),
+    internalLink: () => (
+      <Link
+        className={`${styles.sidebarNodeTitle} ${
+          isActive ? styles.sidebarNodeTitle_active : ''
+        }`}
+        to={meta.path}
+      >
+        {meta.title}
+      </Link>
+    ),
+    text: () => (
+      <Heading className={styles.sidebarNodeTitle} tag={'h3'} size={'sm'}>
+        {name}
+      </Heading>
+    ),
+  };
+
+  const nodeType = () => {
+    if (meta.redirect) {
+      return 'externalLink';
+    }
+    if (meta.path) {
+      return 'internalLink';
+    }
+    return 'text';
+  };
+
   return (
-    <div className={hasSubMenu ? styles.sidebarNodeWithChildren : ''}>
-      {isLink ? (
-        meta.redirect ? (
-          <a className={`${styles.sidebarNodeTitle}`} href={meta.redirect}>
-            {meta.title}
-          </a>
-        ) : (
-          <Link
-            className={`${styles.sidebarNodeTitle} ${
-              isActive ? styles.sidebarNodeTitle_active : ''
-            }`}
-            to={meta.path}
-          >
-            {meta.title}
-          </Link>
-        )
-      ) : (
-        <Heading className={styles.sidebarNodeTitle} tag={'h3'} size={'sm'}>
-          {name}
-        </Heading>
-      )}
-      {children && isActive && (
+    <div className={hasSubMenu ? styles.sidebarNodeWithChildren : undefined}>
+      {nodes[nodeType()]()}
+      {!!Object.keys(children).length && isActive && (
         <div className={styles.sidebarNodeChildren}>
           {childrenToList(children).map((node) => (
             <SidebarNode node={node} key={node.name} />