Fix slug

Q42 · Jul 12, 2024 · 1aaf9b5 · 1aaf9b5
1 parent d028be0
commit 1aaf9b5
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/src/components/PageTreeViewItem.tsx b/src/components/PageTreeViewItem.tsx
@@ -110,7 +110,7 @@ export const PageTreeViewItem = ({
             onClick={onItemClick}>
             <Flex align="center" gap={3}>
               <UrlText isDisabled={isDisabled} textOverflow="ellipsis">
-                {parentPath ? page.slug?.current : getRootPageSlug(page, config)}
+                {parentPath ? page.slug?.current : getRootPageSlug(page, config) ?? '/'}
               </UrlText>
               {!isDisabled && (isHovered || hasActionOpen) && (
                 <PageTreeViewItemActions

diff --git a/src/helpers/config.ts b/src/helpers/config.ts
@@ -4,11 +4,11 @@ export const getLanguageFieldName = (config: PageTreeConfig) =>
   config.documentInternationalization?.languageFieldName ?? 'language';
 
 export const getRootPageSlug = (page: RawPageMetadata, config: PageTreeConfig) => {
-  if (!config.documentInternationalization) return '/';
+  if (!config.documentInternationalization) return;
 
   const language = page[getLanguageFieldName(config)];
   if (typeof language != 'string') {
     throw new Error(`Language field is not a string: ${language}`);
   }
-  return `${language}`;
+  return language;
 };
diff --git a/src/helpers/page-tree.test.ts b/src/helpers/page-tree.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest';
 
-import { PageTreeConfig, PageTreeItem, RawPageMetadata } from '../types';
+import { NestedPageTreeItem, PageTreeConfig, RawPageMetadata } from '../types';
 import { findPageTreeItemById, flatMapPageTree, getAllPageMetadata, mapRawPageMetadatasToPageTree } from './page-tree';
 
 const config: PageTreeConfig = {
@@ -41,7 +41,7 @@ const rawChildContentPage: RawPageMetadata = {
 
 const rawPages: RawPageMetadata[] = [rawHomePage, rawParentContentPage, rawChildContentPage];
 
-const pageTree: PageTreeItem[] = [
+const pageTree: NestedPageTreeItem[] = [
   {
     ...rawHomePage,
     isDraft: false,
@@ -59,6 +59,7 @@ const pageTree: PageTreeItem[] = [
             isDraft: false,
             isPublished: true,
             path: '/en/parent/child',
+            children: [],
           },
         ],
       },
@@ -140,6 +141,7 @@ describe('Page tree helpers', () => {
           isDraft: true,
           isPublished: true,
           path: '/en',
+          children: [],
         },
       ]);
     });
@@ -177,6 +179,7 @@ describe('Page tree helpers', () => {
         isDraft: false,
         isPublished: true,
         path: '/en/parent/child',
+        children: [],
       });
     });
 

diff --git a/src/helpers/page-tree.ts b/src/helpers/page-tree.ts
@@ -90,7 +90,7 @@ const mapPageTreeItems = (
   return getChildPages(parentId).map(page => {
     const pagePath = parentPath
       ? `${parentPath === '/' ? '' : parentPath}/${page.slug?.current}`
-      : getRootPageSlug(page, config);
+      : `/${getRootPageSlug(page, config) ?? ''}`;
     const children = orderBy(mapPageTreeItems(config, pagesWithPublishedState, page._id, pagePath), 'path');
 
     return {

diff --git a/vitest.config.ts b/vitest.config.ts
@@ -6,6 +6,7 @@ import { defineConfig, UserConfig } from 'vitest/config';
 export default defineConfig({
   plugins: [react()] as UserConfig['plugins'],
   test: {
+    include: ['src/**/*.test.ts'],
     environment: 'jsdom',
   },
   resolve: {