Skip to content

Commit

Permalink
feat(v2): add a banner that links to latest version of documentation (#…
Browse files Browse the repository at this point in the history
…2916)

* feat(v2): add metadata to indicate the document is old

* feat(v2): add badge that links old versions to latest version

* feat(v2): fix test related to metadata

* feat(v2): fix formatting

* feat(v2): fix formatting

* feat(v2): use Link component instead of anchor tag

* feat(v2): add pramlink to latest docs

* feat(v2): add more vibrant warning message

* feat(v2): position the banner above the article

* feat(v2): link latest version to intro page

* fix(v2): fix some test cases

* feat(v2): fix tests

* feat(v2): change banner to warning orange

* feat(v2): compute root route from sidebar

* style(v2): fix formatting

* feat(v2): use homeid if provided to compute base route

* feat(v2): rename functions and fix a corner case

* feat(v2): fix formating

* feat(v2): compute homepageurl

* style(v2): improve code quality

* style(v2): unbold fullstop for consistency

Co-authored-by: Anshul Goyal <anshulgoel151999@gmail.com>
  • Loading branch information
teikjun and Anshul Goyal authored Jun 15, 2020
1 parent d365b74 commit 0c92f5a
Show file tree
Hide file tree
Showing 5 changed files with 72 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@ describe('simple website', () => {
source: path.join('@site', pluginPath, 'hello.md'),
title: 'Hello, World !',
description: 'Hi, Endilie here :)',
latestVersionMainDocPermalink: undefined,
});

expect(docsMetadata['foo/bar']).toEqual({
Expand All @@ -176,6 +177,7 @@ describe('simple website', () => {
source: path.join('@site', pluginPath, 'foo', 'bar.md'),
title: 'Bar',
description: 'This is custom description',
latestVersionMainDocPermalink: undefined,
});

expect(docsSidebars).toMatchSnapshot();
Expand Down Expand Up @@ -335,6 +337,7 @@ describe('versioned website', () => {
title: 'bar',
permalink: '/docs/foo/bar',
},
latestVersionMainDocPermalink: undefined,
});
expect(docsMetadata['version-1.0.0/foo/baz']).toEqual({
id: 'version-1.0.0/foo/baz',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,15 @@ describe('simple site', () => {
source: path.join('@site', routeBasePath, sourceA),
title: 'Bar',
description: 'This is custom description',
latestVersionMainDocPermalink: undefined,
});
expect(dataB).toEqual({
id: 'hello',
permalink: '/docs/hello',
source: path.join('@site', routeBasePath, sourceB),
title: 'Hello, World !',
description: `Hi, Endilie here :)`,
latestVersionMainDocPermalink: undefined,
});
});

Expand Down Expand Up @@ -85,6 +87,7 @@ describe('simple site', () => {
editUrl:
'https://github.com/facebook/docusaurus/edit/master/website/docs/foo/baz.md',
description: 'Images',
latestVersionMainDocPermalink: undefined,
});
});

Expand All @@ -109,6 +112,7 @@ describe('simple site', () => {
title: 'lorem',
editUrl: 'https://github.com/customUrl/docs/lorem.md',
description: 'Lorem ipsum.',
latestVersionMainDocPermalink: undefined,
});

// unrelated frontmatter is not part of metadata
Expand Down Expand Up @@ -140,6 +144,7 @@ describe('simple site', () => {
description: 'Lorem ipsum.',
lastUpdatedAt: 1539502055,
lastUpdatedBy: 'Author',
latestVersionMainDocPermalink: undefined,
});
});

Expand Down Expand Up @@ -168,6 +173,7 @@ describe('simple site', () => {
description: 'Lorem ipsum.',
lastUpdatedAt: 1539502055,
lastUpdatedBy: 'Author',
latestVersionMainDocPermalink: undefined,
});
});

Expand Down
35 changes: 33 additions & 2 deletions packages/docusaurus-plugin-content-docs/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,22 @@ const DEFAULT_OPTIONS: PluginOptions = {
admonitions: {},
};

function getFirstDocLinkOfSidebar(
sidebarItems: DocsSidebarItem[],
): string | null {
for (let sidebarItem of sidebarItems) {
if (sidebarItem.type === 'category') {
const url = getFirstDocLinkOfSidebar(sidebarItem.items);
if (url) {
return url;
}
} else {
return sidebarItem.href;
}
}
return null;
}

export default function pluginContentDocs(
context: LoadContext,
opts: Partial<PluginOptions>,
Expand Down Expand Up @@ -320,7 +336,6 @@ Available document ids=
},
{},
);

return {
docsMetadata,
docsDir,
Expand Down Expand Up @@ -368,7 +383,6 @@ Available document ids=
const isDocsHomePage =
metadataItem.id.replace(versionsRegex, '').replace(/^\//, '') ===
options.homePageId;

if (isDocsHomePage) {
const versionDocsPathPrefix =
(metadataItem?.version === versioning.latestVersion
Expand All @@ -384,6 +398,7 @@ Available document ids=
homePageDocsRoutePath,
versionDocsPathPrefix,
]);

const docsBaseMetadataPath = await createData(
`${docuHash(metadataItem.source)}-base.json`,
JSON.stringify(docsBaseMetadata, null, 2),
Expand Down Expand Up @@ -461,6 +476,22 @@ Available document ids=
Object.values(content.docsMetadata),
'version',
);
const rootUrl =
options.homePageId && content.docsMetadata[options.homePageId]
? normalizeUrl([baseUrl, routeBasePath])
: getFirstDocLinkOfSidebar(
content.docsSidebars[
`version-${versioning.latestVersion}/docs`
],
);
if (!rootUrl) {
throw new Error('Bad sidebars file. No document linked');
}
Object.values(content.docsMetadata).forEach((docMetadata) => {
if (docMetadata.version !== versioning.latestVersion) {
docMetadata.latestVersionMainDocPermalink = rootUrl;
}
});
await Promise.all(
Object.keys(docsMetadataByVersion).map(async (version) => {
const routes: RouteConfig[] = await genRoutes(
Expand Down
1 change: 1 addition & 0 deletions packages/docusaurus-plugin-content-docs/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ export interface MetadataRaw extends LastUpdateData {
sidebar_label?: string;
editUrl?: string;
version?: string;
latestVersionMainDocPermalink?: string;
}

export interface Paginator {
Expand Down
29 changes: 29 additions & 0 deletions packages/docusaurus-theme-classic/src/theme/DocItem/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import useDocusaurusContext from '@docusaurus/useDocusaurusContext';
import useBaseUrl from '@docusaurus/useBaseUrl';
import DocPaginator from '@theme/DocPaginator';
import useTOCHighlight from '@theme/hooks/useTOCHighlight';
import Link from '@docusaurus/Link';

import clsx from 'clsx';
import styles from './styles.module.css';
Expand Down Expand Up @@ -68,6 +69,7 @@ function DocItem(props) {
lastUpdatedAt,
lastUpdatedBy,
version,
latestVersionMainDocPermalink,
} = metadata;
const {
frontMatter: {
Expand Down Expand Up @@ -108,6 +110,33 @@ function DocItem(props) {
className={clsx('col', {
[styles.docItemCol]: !hideTableOfContents,
})}>
{latestVersionMainDocPermalink && (
<div
className="alert alert--warning margin-bottom--md"
role="alert">
{version === 'next' ? (
<div>
This is unreleased documentation for {siteTitle}{' '}
<strong>{version}</strong> version.
</div>
) : (
<div>
This is archived documentation for {siteTitle}{' '}
<strong>v{version}</strong>, which is no longer actively
maintained.
</div>
)}
<div className="margin-top--md">
For up-to-date documentation, see the{' '}
<strong>
<Link to={latestVersionMainDocPermalink}>
latest version
</Link>
</strong>
.
</div>
</div>
)}
<div className={styles.docItemContainer}>
<article>
{version && (
Expand Down

0 comments on commit 0c92f5a

Please sign in to comment.