Skip to content

Commit 1aaf9b5

Browse files
djohalo2tstikvoort
authored andcommitted
Fix slug
1 parent d028be0 commit 1aaf9b5

File tree

5 files changed

+10
-6
lines changed

5 files changed

+10
-6
lines changed

src/components/PageTreeViewItem.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ export const PageTreeViewItem = ({
110110
onClick={onItemClick}>
111111
<Flex align="center" gap={3}>
112112
<UrlText isDisabled={isDisabled} textOverflow="ellipsis">
113-
{parentPath ? page.slug?.current : getRootPageSlug(page, config)}
113+
{parentPath ? page.slug?.current : getRootPageSlug(page, config) ?? '/'}
114114
</UrlText>
115115
{!isDisabled && (isHovered || hasActionOpen) && (
116116
<PageTreeViewItemActions

src/helpers/config.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ export const getLanguageFieldName = (config: PageTreeConfig) =>
44
config.documentInternationalization?.languageFieldName ?? 'language';
55

66
export const getRootPageSlug = (page: RawPageMetadata, config: PageTreeConfig) => {
7-
if (!config.documentInternationalization) return '/';
7+
if (!config.documentInternationalization) return;
88

99
const language = page[getLanguageFieldName(config)];
1010
if (typeof language != 'string') {
1111
throw new Error(`Language field is not a string: ${language}`);
1212
}
13-
return `${language}`;
13+
return language;
1414
};

src/helpers/page-tree.test.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { describe, expect, it } from 'vitest';
22

3-
import { PageTreeConfig, PageTreeItem, RawPageMetadata } from '../types';
3+
import { NestedPageTreeItem, PageTreeConfig, RawPageMetadata } from '../types';
44
import { findPageTreeItemById, flatMapPageTree, getAllPageMetadata, mapRawPageMetadatasToPageTree } from './page-tree';
55

66
const config: PageTreeConfig = {
@@ -41,7 +41,7 @@ const rawChildContentPage: RawPageMetadata = {
4141

4242
const rawPages: RawPageMetadata[] = [rawHomePage, rawParentContentPage, rawChildContentPage];
4343

44-
const pageTree: PageTreeItem[] = [
44+
const pageTree: NestedPageTreeItem[] = [
4545
{
4646
...rawHomePage,
4747
isDraft: false,
@@ -59,6 +59,7 @@ const pageTree: PageTreeItem[] = [
5959
isDraft: false,
6060
isPublished: true,
6161
path: '/en/parent/child',
62+
children: [],
6263
},
6364
],
6465
},
@@ -140,6 +141,7 @@ describe('Page tree helpers', () => {
140141
isDraft: true,
141142
isPublished: true,
142143
path: '/en',
144+
children: [],
143145
},
144146
]);
145147
});
@@ -177,6 +179,7 @@ describe('Page tree helpers', () => {
177179
isDraft: false,
178180
isPublished: true,
179181
path: '/en/parent/child',
182+
children: [],
180183
});
181184
});
182185

src/helpers/page-tree.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ const mapPageTreeItems = (
9090
return getChildPages(parentId).map(page => {
9191
const pagePath = parentPath
9292
? `${parentPath === '/' ? '' : parentPath}/${page.slug?.current}`
93-
: getRootPageSlug(page, config);
93+
: `/${getRootPageSlug(page, config) ?? ''}`;
9494
const children = orderBy(mapPageTreeItems(config, pagesWithPublishedState, page._id, pagePath), 'path');
9595

9696
return {

vitest.config.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import { defineConfig, UserConfig } from 'vitest/config';
66
export default defineConfig({
77
plugins: [react()] as UserConfig['plugins'],
88
test: {
9+
include: ['src/**/*.test.ts'],
910
environment: 'jsdom',
1011
},
1112
resolve: {

0 commit comments

Comments
 (0)