Merge branch 'main' into DEV-3554-fix-vod

Author: MarBert

.changeset/clear-plants-clean.md

@@ -0,0 +1,5 @@
+---
+"nextjs-website": patch
+---
+
+Fix sitemap and metadata fetching to include locale support

.changeset/short-apples-hear.md

@@ -0,0 +1,5 @@
+---
+"chatbot-index": patch
+---
+
+Fix unconsideration of English pages as dynamics ones

apps/chatbot-index/src/modules/documents.py

@@ -258,6 +258,10 @@ def filter_urls(urls: List[str]) -> List[str]:
         if pattern.search(file) or pattern2.search(file):
             continue
 
+        # Check language code exclusion
+        if "/en/" in file:
+            continue
+
         # Check static exclusions
         if "/auth/" in file or "/profile/" in file:
             continue

apps/nextjs-website/src/app/sitemap.ts

@@ -159,6 +159,7 @@ export default async function sitemap(): Promise<MetadataRoute.Sitemap> {
         )
       );
       const guidesMetadataByDirNames = await getGuidesMetadataByDirNames(
+        localeCode,
         guidesDirNames
       );
 
@@ -181,6 +182,7 @@ export default async function sitemap(): Promise<MetadataRoute.Sitemap> {
         )
       );
       const solutionsMetadata = await getSolutionsMetadataByDirNames(
+        localeCode,
         solutionDirNames
       );
 
@@ -225,7 +227,10 @@ export default async function sitemap(): Promise<MetadataRoute.Sitemap> {
       );
 
       const releaseNotesMetadataByDirNames =
-        await getReleaseNotesMetadataByDirNames(releaseNotesDirNames);
+        await getReleaseNotesMetadataByDirNames(
+          localeCode,
+          releaseNotesDirNames
+        );
 
       // Merge legacy and new metadata to ensure no missing content
       // Prioritize distributed metadata if duplicates exist (though they shouldn't)

apps/nextjs-website/src/helpers/s3Metadata.helpers.ts

@@ -250,13 +250,13 @@ export const getGuidesMetadata = async (locale: string, dirName?: string) => {
 
 const removeTrailingSlash = (value: string) => value.replace(/\/+$/, '');
 
-const buildDirMetadataPath = (dirName: string) => {
+const buildDirMetadataPath = (locale: string, dirName: string) => {
   const docsBase = s3DocsPath
     ? removeTrailingSlash(s3DocsPath)
     : removeTrailingSlash(S3_PATH_TO_GITBOOK_DOCS);
   return docsBase
-    ? `${docsBase}/${dirName}/${S3_METADATA_JSON_PATH}`
-    : `${dirName}/${S3_METADATA_JSON_PATH}`;
+    ? `${locale}/${docsBase}/${dirName}/${S3_METADATA_JSON_PATH}`
+    : `${locale}/${dirName}/${S3_METADATA_JSON_PATH}`;
 };
 
 async function batchFetchMetadata(
@@ -291,6 +291,7 @@ async function batchFetchMetadata(
 }
 
 export const getGuidesMetadataByDirNames = async (
+  locale: string,
   dirNames: readonly string[],
   concurrencyLimit = 5
 ) => {
@@ -299,12 +300,13 @@ export const getGuidesMetadataByDirNames = async (
   }
 
   const metadataPaths = dirNames.map((dirName) =>
-    buildDirMetadataPath(dirName)
+    buildDirMetadataPath(locale, dirName)
   );
   return await batchFetchMetadata(metadataPaths, concurrencyLimit);
 };
 
 export const getSolutionsMetadataByDirNames = async (
+  locale: string,
   dirNames: readonly string[],
   concurrencyLimit = 5
 ) => {
@@ -313,7 +315,7 @@ export const getSolutionsMetadataByDirNames = async (
   }
 
   const metadataPaths = dirNames.map((dirName) =>
-    buildDirMetadataPath(dirName)
+    buildDirMetadataPath(locale, dirName)
   );
   return await batchFetchMetadata(metadataPaths, concurrencyLimit);
 };
@@ -348,6 +350,7 @@ export const getSolutionsMetadata = async (
 };
 
 export const getReleaseNotesMetadataByDirNames = async (
+  locale: string,
   dirNames: readonly string[],
   concurrencyLimit = 5
 ) => {
@@ -356,7 +359,7 @@ export const getReleaseNotesMetadataByDirNames = async (
   }
 
   const metadataPaths = dirNames.map((dirName) =>
-    buildDirMetadataPath(dirName)
+    buildDirMetadataPath(locale, dirName)
   );
   return await batchFetchMetadata(metadataPaths, concurrencyLimit);
 };

apps/nextjs-website/src/lib/cmsApi.ts

@@ -193,7 +193,7 @@ export const getGuideProps = async (
 
 export const getGuidesProps = async (locale: string) => {
   const strapiGuides = (await fetchResponseFromCDN(
-    getSyncedGuidesResponseJsonFile
+    `${locale}/${getSyncedGuidesResponseJsonFile}`
   )) as StrapiGuides | undefined;
   return strapiGuides ? makeGuidesProps(locale, strapiGuides) : [];
 };