Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion apps/site/app/[locale]/blog/[...path]/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ export const generateViewport = basePage.generateViewport;

// This generates each page's HTML Metadata
// @see https://nextjs.org/docs/app/api-reference/functions/generate-metadata
export const generateMetadata = basePage.generateMetadata;
export const generateMetadata = ({ params }: PageParams) =>
basePage.generateMetadata({ params, prefix: 'blog' });

// Generates all possible static paths based on the locales and environment configuration
// - Returns an empty array if static export is disabled (`ENABLE_STATIC_EXPORT` is false)
Expand Down
12 changes: 8 additions & 4 deletions apps/site/app/[locale]/download/archive/[version]/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import { notFound, redirect } from 'next/navigation';
import type { FC } from 'react';

import provideReleaseData from '#site/next-data/providers/releaseData';
import provideReleaseVersions from '#site/next-data/providers/releaseVersions';
import { ENABLE_STATIC_EXPORT } from '#site/next.constants.mjs';
import { ARCHIVE_DYNAMIC_ROUTES } from '#site/next.dynamic.constants.mjs';
import * as basePage from '#site/next.dynamic.page.mjs';
import { defaultLocale } from '#site/next.locales.mjs';
import type { DynamicParams } from '#site/types';
Expand All @@ -29,7 +29,9 @@ export const generateStaticParams = async () => {
return [];
}

return ARCHIVE_DYNAMIC_ROUTES.map(version => ({
const versions = await provideReleaseVersions();

return versions.map(version => ({
locale: defaultLocale.code,
version,
}));
Expand All @@ -46,15 +48,17 @@ const getPage: FC<PageParams> = async props => {
const [locale, pathname] = basePage.getLocaleAndPath(version, routeLocale);

if (version === 'current') {
const releaseData = provideReleaseData();
const releaseData = await provideReleaseData();

const release = releaseData.find(release => release.status === 'Current');

redirect(`/${locale}/download/archive/${release?.versionWithPrefix}`);
}

const versions = await provideReleaseVersions();

// Verifies if the current route is a dynamic route
const isDynamicRoute = ARCHIVE_DYNAMIC_ROUTES.some(r => r.includes(pathname));
const isDynamicRoute = versions.some(r => r.includes(pathname));

// Gets the Markdown content and context for Download Archive pages
const [content, context] = await basePage.getMarkdownContext({
Expand Down
8 changes: 4 additions & 4 deletions apps/site/app/[locale]/not-found.tsx
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
'use client';
'use server';

import { ArrowRightIcon } from '@heroicons/react/24/solid';
import { useTranslations } from 'next-intl';
import { getTranslations } from 'next-intl/server';
import type { FC } from 'react';

import Button from '#site/components/Common/Button';
import Turtle from '#site/components/Common/Turtle';
import GlowingBackdropLayout from '#site/layouts/GlowingBackdrop';

const NotFoundPage: FC = () => {
const t = useTranslations();
const NotFoundPage: FC = async () => {
const t = await getTranslations();

return (
<GlowingBackdropLayout kind="default">
Expand Down
83 changes: 0 additions & 83 deletions apps/site/components/EOL/EOLReleaseTable.tsx

This file was deleted.

68 changes: 68 additions & 0 deletions apps/site/components/EOL/EOLReleaseTable/TableBody.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
'use client';

import { useTranslations } from 'next-intl';
import type { FC } from 'react';
import { Fragment, useState } from 'react';

import FormattedTime from '#site/components/Common/FormattedTime';
import LinkWithArrow from '#site/components/Common/LinkWithArrow';
import EOLModal from '#site/components/EOL/EOLModal';
import VulnerabilityChips from '#site/components/EOL/VulnerabilityChips';
import type { NodeRelease } from '#site/types/releases.js';
import type { GroupedVulnerabilities } from '#site/types/vulnerabilities.js';

type EOLReleaseTableBodyProps = {
eolReleases: Array<NodeRelease>;
vulnerabilities: GroupedVulnerabilities;
};

const EOLReleaseTableBody: FC<EOLReleaseTableBodyProps> = ({
eolReleases,
vulnerabilities,
}) => {
const t = useTranslations();

const [currentModal, setCurrentModal] = useState<string | undefined>();

return (
<tbody>
{eolReleases.map(release => (
<Fragment key={release.major}>
<tr>
<td data-label="Version">
v{release.major} {release.codename ? `(${release.codename})` : ''}
</td>

<td data-label="Date">
<FormattedTime date={release.releaseDate} />
</td>

<td>
<VulnerabilityChips
vulnerabilities={vulnerabilities[release.major]}
/>
</td>

<td>
<LinkWithArrow
className="cursor-pointer"
onClick={() => setCurrentModal(release.version)}
>
{t('components.downloadReleasesTable.details')}
</LinkWithArrow>
</td>
</tr>

<EOLModal
release={release}
vulnerabilities={vulnerabilities[release.major]}
open={currentModal === release.version}
onOpenChange={open => open || setCurrentModal(undefined)}
/>
</Fragment>
))}
</tbody>
);
};

export default EOLReleaseTableBody;
42 changes: 42 additions & 0 deletions apps/site/components/EOL/EOLReleaseTable/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
import { getTranslations } from 'next-intl/server';
import type { FC } from 'react';

import provideReleaseData from '#site/next-data/providers/releaseData';
import provideVulnerabilities from '#site/next-data/providers/vulnerabilities';
import { EOL_VERSION_IDENTIFIER } from '#site/next.constants.mjs';

import EOLReleaseTableBody from './TableBody';

const EOLReleaseTable: FC = async () => {
const releaseData = await provideReleaseData();
const vulnerabilities = await provideVulnerabilities();

const eolReleases = releaseData.filter(
release => release.status === EOL_VERSION_IDENTIFIER
);

const t = await getTranslations();

return (
<table id="tbVulnerabilities">
<thead>
<tr>
<th>
{t('components.eolTable.version')} (
{t('components.eolTable.codename')})
</th>
<th>{t('components.eolTable.lastUpdated')}</th>
<th>{t('components.eolTable.vulnerabilities')}</th>
<th>{t('components.eolTable.details')}</th>
</tr>
</thead>

<EOLReleaseTableBody
eolReleases={eolReleases}
vulnerabilities={vulnerabilities}
/>
</table>
);
};

export default EOLReleaseTable;
98 changes: 0 additions & 98 deletions apps/site/components/Releases/PreviousReleasesTable.tsx

This file was deleted.

Loading
Loading