mirror of
https://github.com/silverstripe/doc.silverstripe.org
synced 2024-10-22 17:05:50 +02:00
Allow includeFolders on CHILDREN
This commit is contained in:
Aaron Carlino
parent
8ffc3eeb5b
commit
d1d75d08bb
@ -41,13 +41,18 @@ module.exports = {
|
||||
}
|
||||
}
|
||||
},
|
||||
`gatsby-remark-copy-linked-files`,
|
||||
{
|
||||
resolve: `gatsby-remark-images`,
|
||||
options: {
|
||||
maxWidth: 850,
|
||||
},
|
||||
},
|
||||
{
|
||||
resolve: `gatsby-remark-copy-linked-files`,
|
||||
options: {
|
||||
ignoreFileExtensions: [`md`],
|
||||
},
|
||||
},
|
||||
]
|
||||
}
|
||||
},
|
||||
|
||||
@ -6,8 +6,7 @@ module.exports = [
|
||||
options: {
|
||||
name: `user--4`,
|
||||
remote: `https://github.com/silverstripe/silverstripe-userhelp-content.git`,
|
||||
//branch: `4`,
|
||||
branch: `pulls/4/new-docs`,
|
||||
branch: `4`,
|
||||
patterns: `docs/en/**`
|
||||
}
|
||||
},
|
||||
@ -17,16 +16,14 @@ module.exports = [
|
||||
options: {
|
||||
name: `user--3`,
|
||||
remote: `https://github.com/silverstripe/silverstripe-userhelp-content.git`,
|
||||
//branch: `3`,
|
||||
branch: `pulls/3/new-docs`,
|
||||
branch: `3`,
|
||||
patterns: `docs/en/**`
|
||||
}
|
||||
},
|
||||
|
||||
/******* versionedfiles ********/
|
||||
/******* [FORK] versionedfiles ********/
|
||||
// v3
|
||||
{
|
||||
// Running a fork. Switch remote back once merged.
|
||||
resolve: `gatsby-source-git`,
|
||||
options: {
|
||||
name: `user--3--optional_features/versionedfiles`,
|
||||
@ -38,7 +35,7 @@ module.exports = [
|
||||
}
|
||||
},
|
||||
|
||||
/******* advancedworkflow ********/
|
||||
/******* [FORK] advancedworkflow ********/
|
||||
|
||||
// v3
|
||||
{
|
||||
@ -75,8 +72,7 @@ module.exports = [
|
||||
options: {
|
||||
name: `user--3--optional_features/online_databases_and_registries`,
|
||||
remote: `https://github.com/silverstripe/silverstripe-registry`,
|
||||
//branch: `1.0`,
|
||||
branch: `pulls/1.0/new-docs`,
|
||||
branch: `1.0`,
|
||||
patterns: `docs/en/userguide/**`
|
||||
}
|
||||
},
|
||||
@ -87,13 +83,12 @@ module.exports = [
|
||||
options: {
|
||||
name: `user--4--optional_features/online_databases_and_registries`,
|
||||
remote: `https://github.com/silverstripe/silverstripe-registry`,
|
||||
// branch: `master`,
|
||||
branch: `pulls/master/new-docs`,
|
||||
branch: `master`,
|
||||
patterns: `docs/en/userguide/**`
|
||||
}
|
||||
},
|
||||
|
||||
/******* forum ********/
|
||||
/******* [FORK] forum ********/
|
||||
|
||||
// v3
|
||||
{
|
||||
@ -117,8 +112,7 @@ module.exports = [
|
||||
options: {
|
||||
name: `user--4--optional_features/content_review`,
|
||||
remote: `https://github.com/silverstripe/silverstripe-contentreview`,
|
||||
// branch: `master`,
|
||||
branch: `pulls/master/new-docs`,
|
||||
branch: `master`,
|
||||
patterns: `docs/en/userguide/**`
|
||||
}
|
||||
},
|
||||
@ -131,8 +125,7 @@ module.exports = [
|
||||
options: {
|
||||
name: `user--3--optional_features/blogs`,
|
||||
remote: `https://github.com/silverstripe/silverstripe-blog`,
|
||||
//branch: `2`,
|
||||
branch: `pulls/2/new-docs`,
|
||||
branch: `2`,
|
||||
patterns: `docs/en/userguide/**`
|
||||
}
|
||||
},
|
||||
@ -143,8 +136,7 @@ module.exports = [
|
||||
options: {
|
||||
name: `user--4--optional_features/blogs`,
|
||||
remote: `https://github.com/silverstripe/silverstripe-blog`,
|
||||
branch: `pulls/master/new-docs`,
|
||||
// branch: `master`,
|
||||
branch: `master`,
|
||||
patterns: `docs/en/userguide/**`
|
||||
}
|
||||
},
|
||||
@ -157,8 +149,7 @@ module.exports = [
|
||||
options: {
|
||||
name: `user--4--optional_features/forms`,
|
||||
remote: `https://github.com/silverstripe/silverstripe-userforms`,
|
||||
branch: `pulls/master/new-docs`,
|
||||
// branch: `master`,
|
||||
branch: `master`,
|
||||
patterns: `docs/en/userguide/**`
|
||||
}
|
||||
},
|
||||
@ -171,8 +162,7 @@ module.exports = [
|
||||
options: {
|
||||
name: `user--3--optional_features/working_with_translations`,
|
||||
remote: `https://github.com/silverstripe/silverstripe-translatable`,
|
||||
//branch: `2.1`,
|
||||
branch: `pulls/2.1/new-docs`,
|
||||
branch: `2.1`,
|
||||
patterns: `docs/en/userguide/**`
|
||||
}
|
||||
},
|
||||
@ -185,8 +175,7 @@ module.exports = [
|
||||
options: {
|
||||
name: `user--3--optional_features/working_with_multiple_websites`,
|
||||
remote: `https://github.com/silverstripe/silverstripe-subsites`,
|
||||
//branch: `1.1`,
|
||||
branch: `pulls/1.1/new-docs`,
|
||||
branch: `1.1`,
|
||||
patterns: `docs/en/userguide/**`
|
||||
}
|
||||
},
|
||||
@ -197,8 +186,7 @@ module.exports = [
|
||||
options: {
|
||||
name: `user--4--optional_features/working_with_multiple_websites`,
|
||||
remote: `https://github.com/silverstripe/silverstripe-subsites`,
|
||||
//branch: `1.1`,
|
||||
branch: `pulls/1.1/new-docs`,
|
||||
branch: `1.1`,
|
||||
patterns: `docs/en/userguide/**`
|
||||
}
|
||||
},
|
||||
@ -211,8 +199,7 @@ module.exports = [
|
||||
options: {
|
||||
name: `user--3--optional_features/securing_files`,
|
||||
remote: `https://github.com/silverstripe/silverstripe-secureassets`,
|
||||
branch: `pulls/master/new-docs`,
|
||||
// branch: `master`,
|
||||
branch: `master`,
|
||||
patterns: `docs/en/userguide/**`
|
||||
}
|
||||
},
|
||||
@ -225,8 +212,7 @@ module.exports = [
|
||||
options: {
|
||||
name: `user--3--optional_features/taxonomies`,
|
||||
remote: `https://github.com/silverstripe/silverstripe-taxonomy`,
|
||||
branch: `pulls/1/new-docs`,
|
||||
// branch: `1`,
|
||||
branch: `1`,
|
||||
patterns: `docs/en/userguide/**`
|
||||
}
|
||||
},
|
||||
@ -237,8 +223,7 @@ module.exports = [
|
||||
options: {
|
||||
name: `user--4--optional_features/taxonomies`,
|
||||
remote: `https://github.com/silverstripe/silverstripe-taxonomy`,
|
||||
branch: `pulls/master/new-docs`,
|
||||
// branch: `master`,
|
||||
branch: `master`,
|
||||
patterns: `docs/en/userguide/**`
|
||||
}
|
||||
},
|
||||
@ -251,8 +236,7 @@ module.exports = [
|
||||
options: {
|
||||
name: `user--3--optional_features/iframe`,
|
||||
remote: `https://github.com/silverstripe/silverstripe-iframe`,
|
||||
//branch: `1.0`,
|
||||
branch: `pulls/1.0/new-docs`,
|
||||
branch: `1.0`,
|
||||
patterns: `docs/en/userguide/**`
|
||||
}
|
||||
},
|
||||
@ -263,8 +247,7 @@ module.exports = [
|
||||
options: {
|
||||
name: `user--4--optional_features/iframe`,
|
||||
remote: `https://github.com/silverstripe/silverstripe-iframe`,
|
||||
branch: `pulls/master/new-docs`,
|
||||
// branch: `master`,
|
||||
branch: `master`,
|
||||
patterns: `docs/en/userguide/**`
|
||||
}
|
||||
},
|
||||
@ -277,8 +260,7 @@ module.exports = [
|
||||
options: {
|
||||
name: `user--3--optional_features/site_wide_rss_feeds`,
|
||||
remote: `https://github.com/silverstripe/silverstripe-versionfeed`,
|
||||
branch: `pulls/master/new-docs`,
|
||||
// branch: `master`,
|
||||
branch: `master`,
|
||||
patterns: `docs/en/userguide/**`
|
||||
}
|
||||
},
|
||||
@ -289,8 +271,7 @@ module.exports = [
|
||||
options: {
|
||||
name: `user--4--optional_features/site_wide_rss_feeds`,
|
||||
remote: `https://github.com/silverstripe/silverstripe-versionfeed`,
|
||||
branch: `pulls/master/new-docs`,
|
||||
// branch: `master`,
|
||||
branch: `master`,
|
||||
patterns: `docs/en/userguide/**`
|
||||
}
|
||||
},
|
||||
@ -303,8 +284,7 @@ module.exports = [
|
||||
options: {
|
||||
name: `user--3--optional_features/document_management_system`,
|
||||
remote: `https://github.com/silverstripe/silverstripe-dms`,
|
||||
branch: `pulls/master/new-docs`,
|
||||
// branch: `master`,
|
||||
branch: `master`,
|
||||
patterns: `docs/en/userguide/**`
|
||||
}
|
||||
},
|
||||
@ -313,22 +293,19 @@ module.exports = [
|
||||
|
||||
// v4
|
||||
{
|
||||
// Fork. Replace when PR is merged.
|
||||
resolve: `gatsby-source-git`,
|
||||
options: {
|
||||
name: `user--4--optional_features/content_blocks`,
|
||||
remote: `https://github.com/dnadesign/silverstripe-elemental`,
|
||||
branch: `pulls/master/new-docs`,
|
||||
// branch: `master`,
|
||||
branch: `master`,
|
||||
patterns: `docs/en/userguide/**`
|
||||
}
|
||||
},
|
||||
|
||||
/******* maintenance ********/
|
||||
/******* [FORK] maintenance ********/
|
||||
|
||||
// v4
|
||||
{
|
||||
// Fork. Replace when PR is merged.
|
||||
resolve: `gatsby-source-git`,
|
||||
options: {
|
||||
name: `user--4--optional_features/modules_report`,
|
||||
@ -348,8 +325,7 @@ module.exports = [
|
||||
options: {
|
||||
name: `user--4--optional_features/share_draft_content`,
|
||||
remote: `https://github.com/silverstripe/silverstripe-sharedraftcontent`,
|
||||
branch: `pulls/master/new-docs`,
|
||||
// branch: `master`,
|
||||
branch: `master`,
|
||||
patterns: `docs/en/userguide/**`
|
||||
}
|
||||
},
|
||||
@ -362,8 +338,7 @@ module.exports = [
|
||||
options: {
|
||||
name: `user--4--optional_features/document_converter`,
|
||||
remote: `https://github.com/silverstripe/silverstripe-documentconverter`,
|
||||
branch: `pulls/master/new-docs`,
|
||||
// branch: `master`,
|
||||
branch: `master`,
|
||||
patterns: `docs/en/userguide/**`
|
||||
}
|
||||
},
|
||||
@ -376,8 +351,7 @@ module.exports = [
|
||||
options: {
|
||||
name: `user--4--optional_features/ckan_registry`,
|
||||
remote: `https://github.com/silverstripe/silverstripe-ckan-registry`,
|
||||
branch: `pulls/master/new-docs`,
|
||||
// branch: `master`,
|
||||
branch: `master`,
|
||||
patterns: `docs/en/userguide/**`
|
||||
}
|
||||
},
|
||||
@ -390,8 +364,7 @@ module.exports = [
|
||||
options: {
|
||||
name: `user--4--optional_features/multi-factor_authentication`,
|
||||
remote: `https://github.com/silverstripe/silverstripe-mfa`,
|
||||
branch: `pulls/master/new-docs`,
|
||||
// branch: `master`,
|
||||
branch: `master`,
|
||||
patterns: `docs/en/userguide/**`
|
||||
}
|
||||
},
|
||||
@ -403,8 +376,7 @@ module.exports = [
|
||||
options: {
|
||||
name: `user--4--managing_your_website/reports/security_report`,
|
||||
remote: `https://github.com/silverstripe/silverstripe-securityreport`,
|
||||
branch: `pulls/master/new-docs`,
|
||||
//branch: `master`,
|
||||
branch: `master`,
|
||||
patterns: `docs/en/userguide/**`,
|
||||
}
|
||||
},
|
||||
@ -414,8 +386,7 @@ module.exports = [
|
||||
options: {
|
||||
name: `user--3--managing_your_website/reports/security_report`,
|
||||
remote: `https://github.com/silverstripe/silverstripe-securityreport`,
|
||||
branch: `pulls/master/new-docs`,
|
||||
//branch: `master`,
|
||||
branch: `master`,
|
||||
patterns: `docs/en/userguide/**`,
|
||||
}
|
||||
},
|
||||
@ -427,8 +398,7 @@ module.exports = [
|
||||
options: {
|
||||
name: `user--4--managing_your_website/reports/sitewide_content_report`,
|
||||
remote: `https://github.com/silverstripe/silverstripe-sitewidecontent-report`,
|
||||
branch: `pulls/master/new-docs`,
|
||||
//branch: `master`,
|
||||
branch: `master`,
|
||||
patterns: `docs/en/userguide/**`,
|
||||
}
|
||||
},
|
||||
@ -438,8 +408,7 @@ module.exports = [
|
||||
options: {
|
||||
name: `user--3--managing_your_website/reports/sitewide_content_report`,
|
||||
remote: `https://github.com/silverstripe/silverstripe-sitewidecontent-report`,
|
||||
branch: `pulls/2.0/new-docs`,
|
||||
//branch: `2.0`,
|
||||
branch: `2.0`,
|
||||
patterns: `docs/en/userguide/**`,
|
||||
}
|
||||
},
|
||||
|
||||
@ -46,7 +46,7 @@ const ChildrenOf: StatelessComponent<ChildrenOfProps> = ({ folderName, exclude,
|
||||
var nodes: SilverstripeDocument[] = [];
|
||||
|
||||
if (!folderName && !exclude && !only) {
|
||||
nodes = currentNode.isIndex ? getChildren(currentNode, false) : getSiblings(currentNode)
|
||||
nodes = currentNode.isIndex ? getChildren(currentNode, includeFolders) : getSiblings(currentNode)
|
||||
|
||||
} else if (folderName) {
|
||||
const targetFolder = getChildren(currentNode, true).find(
|
||||
|
||||
Loading…
Reference in New Issue
Block a user