Skip to content

Commit ab1dafe

Browse files
committed
Fix filter hidden site spaces
1 parent 4e4ac25 commit ab1dafe

File tree

1 file changed

+10
-22
lines changed

1 file changed

+10
-22
lines changed

packages/gitbook/src/lib/context.ts

Lines changed: 10 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ export async function fetchSiteContextByIds(
259259
};
260260

261261
const sections = ids.siteSection
262-
? parseSiteSectionsAndGroups(siteStructure, ids.siteSection, ids.siteSpace)
262+
? parseSiteSectionsAndGroups(siteStructure, ids.siteSection)
263263
: null;
264264

265265
// Parse the current siteSpace and siteSpaces based on the site structure type.
@@ -274,9 +274,7 @@ export async function fetchSiteContextByIds(
274274
);
275275
}
276276

277-
const visibleSiteSpaces = filterHiddenSiteSpaces(siteSpaces, ids.siteSpace);
278-
279-
return { siteSpaces: visibleSiteSpaces, siteSpace };
277+
return { siteSpaces: filterHiddenSiteSpaces(siteSpaces), siteSpace };
280278
}
281279

282280
if (siteStructure.type === 'sections') {
@@ -432,51 +430,41 @@ export function checkIsRootSiteContext(context: GitBookSiteContext): boolean {
432430
/**
433431
* Filter out hidden site spaces from a list of site spaces.
434432
*/
435-
function filterHiddenSiteSpaces(siteSpaces: SiteSpace[], currentSiteSpaceId?: string): SiteSpace[] {
436-
return siteSpaces.filter(
437-
(siteSpace) => !siteSpace.hidden || siteSpace.id === currentSiteSpaceId
438-
);
433+
function filterHiddenSiteSpaces(siteSpaces: SiteSpace[]): SiteSpace[] {
434+
return siteSpaces.filter((siteSpace) => !siteSpace.hidden);
439435
}
440436

441437
/**
442438
* Filter out hidden site spaces from sections and groups recursively.
443439
*/
444440
function filterHiddenSiteSpacesFromSections(
445-
sections: (SiteSection | SiteSectionGroup)[],
446-
currentSiteSpaceId?: string
441+
sections: (SiteSection | SiteSectionGroup)[]
447442
): (SiteSection | SiteSectionGroup)[] {
448443
return sections.map((item) => {
449444
if (item.object === 'site-section') {
450445
return {
451446
...item,
452-
siteSpaces: filterHiddenSiteSpaces(item.siteSpaces, currentSiteSpaceId),
447+
siteSpaces: filterHiddenSiteSpaces(item.siteSpaces),
453448
};
454449
}
455450
if (item.object === 'site-section-group') {
456451
return {
457452
...item,
458-
children: filterHiddenSiteSpacesFromSections(item.children, currentSiteSpaceId),
453+
children: filterHiddenSiteSpacesFromSections(item.children),
459454
};
460455
}
461456
return item;
462457
});
463458
}
464459

465-
function parseSiteSectionsAndGroups(
466-
structure: SiteStructure,
467-
siteSectionId: string,
468-
currentSiteSpaceId?: string
469-
) {
460+
function parseSiteSectionsAndGroups(structure: SiteStructure, siteSectionId: string) {
470461
const sectionsAndGroups = getSiteStructureSections(structure, { ignoreGroups: false });
471-
const filteredSectionsAndGroups = filterHiddenSiteSpacesFromSections(
472-
sectionsAndGroups,
473-
currentSiteSpaceId
474-
);
462+
const filteredSectionsAndGroups = filterHiddenSiteSpacesFromSections(sectionsAndGroups);
475463
const section = parseCurrentSection(structure, siteSectionId);
476464
assert(section, `couldn't find section "${siteSectionId}" in site structure`);
477465
const filteredSection = {
478466
...section,
479-
siteSpaces: filterHiddenSiteSpaces(section.siteSpaces, currentSiteSpaceId),
467+
siteSpaces: filterHiddenSiteSpaces(section.siteSpaces),
480468
};
481469
return {
482470
list: filteredSectionsAndGroups,

0 commit comments

Comments
 (0)