Merge pull request #256 from dotCMS/course-slug-fix

Fixed the URLs to allow `-` characters to be used in the course slugs…

Author: jdcmsd

app/api/sitemap/route.js

@@ -2,6 +2,9 @@ import { getSideNav } from "@/services/docs/getSideNav";
 import { Config } from "@/util/config";
 import { getBlogListing } from "@/services/blog/getBlogListing";
 import { getDevResources } from "@/services/learning/getDevResources";
+
+/** Aggregates many GraphQL calls; never freeze this into a static build artifact. */
+export const dynamic = "force-dynamic";
 const extractHrefs = (obj) => {
   const baseURL = `${Config.CDNHost}/docs/`;
   let hrefs = [];

app/docs/authoring/page.tsx

@@ -1,6 +1,9 @@
 import type { Metadata } from "next";
 import { PersonaLandingPage } from "@/components/persona-landing/PersonaLandingPage";
 
+/** CMS nav is fetched at request time so a slow or unavailable GraphQL during `next build` does not fail the deploy. */
+export const dynamic = "force-dynamic";
+
 const hostname = "https://dev.dotcms.com";
 
 export const metadata: Metadata = {

app/docs/developer/page.tsx

@@ -1,6 +1,9 @@
 import type { Metadata } from "next";
 import { PersonaLandingPage } from "@/components/persona-landing/PersonaLandingPage";
 
+/** CMS nav is fetched at request time so a slow or unavailable GraphQL during `next build` does not fail the deploy. */
+export const dynamic = "force-dynamic";
+
 const hostname = "https://dev.dotcms.com";
 
 export const metadata: Metadata = {

app/docs/devops/page.tsx

@@ -1,6 +1,9 @@
 import type { Metadata } from "next";
 import { PersonaLandingPage } from "@/components/persona-landing/PersonaLandingPage";
 
+/** CMS nav is fetched at request time so a slow or unavailable GraphQL during `next build` does not fail the deploy. */
+export const dynamic = "force-dynamic";
+
 const hostname = "https://dev.dotcms.com";
 
 export const metadata: Metadata = {

app/learn/[slug]/[chapter]/page.js

@@ -1,8 +1,32 @@
-import { getCourseDetail } from "@/services/courses/getCourse";
+import { courseTitleForMetadata, getCourseDetail } from "@/services/courses/getCourse";
 import MarkdownContent from "@/components/MarkdownContent";
 import { notFound } from "next/navigation";
 import ChapterFooter from "../ChapterFooter";
 
+export async function generateMetadata({ params }) {
+  const { slug, chapter } = await params;
+  const { course } = await getCourseDetail({ slug });
+  if (!course) {
+    return { title: "Course not found" };
+  }
+
+  const match = chapter.match(/^chapter-(\d+)$/);
+  if (!match) {
+    return { title: "Chapter not found" };
+  }
+
+  const index = parseInt(match[1], 10) - 1;
+  const chapterData = course.chapters[index];
+  if (!chapterData) {
+    return { title: "Chapter not found" };
+  }
+
+  const total = course.chapters?.length ?? 0;
+  const n = index + 1;
+  const label = courseTitleForMetadata(course);
+  return { title: `${label} · Ch. ${n}/${total} — ${chapterData.title}` };
+}
+
 export default async function ChapterPage({ params }) {
   const { slug, chapter } = await params;
   const { course } = await getCourseDetail({ slug });

app/learn/[slug]/page.js

@@ -1,8 +1,17 @@
-import { getCourseDetail } from "@/services/courses/getCourse";
+import { courseTitleForMetadata, getCourseDetail } from "@/services/courses/getCourse";
 import ChapterFooter from "./ChapterFooter";
 import CourseIntroduction from "./CourseIntroduction";
 import { notFound } from "next/navigation";
 
+export async function generateMetadata({ params }) {
+  const { slug } = await params;
+  const { course } = await getCourseDetail({ slug });
+  if (!course) {
+    return { title: "Course not found" };
+  }
+  return { title: courseTitleForMetadata(course) };
+}
+
 export default async function CoursePage({ params }) {
   const { slug } = await params;
   const { course } = await getCourseDetail({ slug });