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

MarBert · web-flow · commit caaa934169b1 · 2026-02-12T14:41:59.000+01:00
diff --git a/.changeset/eighty-flies-build.md b/.changeset/eighty-flies-build.md
@@ -0,0 +1,5 @@
+---
+"chatbot-index": minor
+---
+
+Add language code 'it' in the s3 paths
diff --git a/.changeset/old-days-smash.md b/.changeset/old-days-smash.md
@@ -0,0 +1,5 @@
+---
+"nextjs-website": patch
+---
+
+Add check to conditionally add webinars and solutions links and add link generation for api list page
diff --git a/.changeset/plain-apes-join.md b/.changeset/plain-apes-join.md
@@ -0,0 +1,5 @@
+---
+"chatbot": patch
+---
+
+Add language code for product list retrieve from S3 to chatbot settings
diff --git a/.changeset/ready-masks-shop.md b/.changeset/ready-masks-shop.md
@@ -0,0 +1,5 @@
+---
+"nextjs-website": patch
+---
+
+Add missin slash in login href
diff --git a/apps/chatbot-index/src/lambda_refresh_index.py b/apps/chatbot-index/src/lambda_refresh_index.py
@@ -1,5 +1,5 @@
 import json
-from typing import Tuple, List, Dict
+from typing import Tuple, List
 
 from src.modules.settings import SETTINGS
 from src.modules.logger import get_logger
@@ -8,6 +8,7 @@
     get_folders_list,
     read_file_from_s3,
     get_one_metadata_from_s3,
+    DOCS_PARENT_FOLDER,
 )
 from src.modules.vector_index import DiscoveryVectorIndex
 
@@ -87,9 +88,7 @@ def read_payload(payload: dict) -> Tuple[List[StaticMetadata], List[str], List[s
                 try:
                     folders_list = get_folders_list()
                     metadata = get_one_metadata_from_s3(
-                        object_key.split("/")[
-                            2
-                        ],  # "devportal-docs/docs/<folder_name>/.../file.md"
+                        object_key.split(DOCS_PARENT_FOLDER)[1].split("/")[0],
                         folders_list=folders_list,
                     )
                     s3_paths = [m["contentS3Path"] for m in metadata]
diff --git a/apps/chatbot-index/src/modules/add_missing_static_docs.py b/apps/chatbot-index/src/modules/add_missing_static_docs.py
@@ -26,7 +26,9 @@
     ref_doc_info = index.storage_context.docstore.get_all_ref_doc_info()
     ref_doc_ids = list(ref_doc_info.keys())
     ref_folders = [
-        doc_id.split("/")[2] for doc_id in ref_doc_ids if DOCS_PARENT_FOLDER in doc_id
+        doc_id.split(DOCS_PARENT_FOLDER)[1].split("/")[0]
+        for doc_id in ref_doc_ids
+        if DOCS_PARENT_FOLDER in doc_id  # "it/devportal-docs/docs/<folder_name>/"
     ]
     ref_folders = list(set(ref_folders))
 
diff --git a/apps/chatbot-index/src/modules/documents.py b/apps/chatbot-index/src/modules/documents.py
@@ -27,12 +27,12 @@
 LOGGER = get_logger(__name__)
 AWS_S3_CLIENT = AWS_SESSION.client("s3")
 SITEMAP_S3_FILEPATH = "sitemap.xml"
-DOCS_PARENT_FOLDER = "devportal-docs/docs/"
-GUIDES_FOLDER_FILEPATH = "main-guide-versions-dirNames.json"
-SOLUTIONS_FOLDER_FILEPATH = "solutions-dirNames.json"
-RELEASE_NOTES_FOLDER_FILEPATH = "release-notes-dirNames.json"
-PRODUCTS_S3_FILEPATH = "synced-products-response.json"
-APIS_DATA_S3_FILEPATH = "synced-apis-data-response.json"
+DOCS_PARENT_FOLDER = f"{SETTINGS.language_code}/devportal-docs/docs/"
+GUIDES_FOLDER_FILEPATH = f"{SETTINGS.language_code}/main-guide-versions-dirNames.json"
+SOLUTIONS_FOLDER_FILEPATH = f"{SETTINGS.language_code}/solutions-dirNames.json"
+RELEASE_NOTES_FOLDER_FILEPATH = f"{SETTINGS.language_code}/release-notes-dirNames.json"
+PRODUCTS_S3_FILEPATH = f"{SETTINGS.language_code}/synced-products-response.json"
+APIS_DATA_S3_FILEPATH = f"{SETTINGS.language_code}/synced-apis-data-response.json"
 
 
 class StaticMetadata(BaseModel):
diff --git a/apps/chatbot-index/src/modules/settings.py b/apps/chatbot-index/src/modules/settings.py
@@ -75,5 +75,8 @@ class ChatbotSettings(BaseSettings):
     redis_url: str = os.getenv("CHB_REDIS_URL")
     website_url: str = os.getenv("CHB_WEBSITE_URL")
 
+    # other
+    language_code: str = os.getenv("CHB_LANGUAGE_CODE_STATIC_FILES", "it")
+
 
 SETTINGS = ChatbotSettings()
diff --git a/apps/chatbot/src/modules/documents.py b/apps/chatbot/src/modules/documents.py
@@ -7,7 +7,7 @@
 
 LOGGER = get_logger(__name__)
 AWS_S3_CLIENT = AWS_SESSION.client("s3")
-PRODUCTS_S3_FILEPATH = "synced-products-response.json"
+PRODUCTS_S3_FILEPATH = f"{SETTINGS.language_code}/synced-products-response.json"
 
 
 def read_file_from_s3(
diff --git a/apps/chatbot/src/modules/settings.py b/apps/chatbot/src/modules/settings.py
@@ -131,5 +131,8 @@ class ChatbotSettings(BaseSettings):
         "CHB_AWS_SQS_QUEUE_EVALUATE_NAME", "chatbot-evaluate"
     )
 
+    # other
+    language_code: str = os.getenv("CHB_LANGUAGE_CODE_STATIC_FILES", "it")
+
 
 SETTINGS = ChatbotSettings()
diff --git a/apps/nextjs-website/src/app/sitemap.ts b/apps/nextjs-website/src/app/sitemap.ts
@@ -25,6 +25,7 @@ import {
   fetchProductApiData,
 } from '@/lib/strapi/fetches/fetchSitemapData';
 import { SUPPORTED_LOCALES } from '@/locales';
+import { compact, isEmpty } from 'lodash';
 
 export const dynamic = 'force-dynamic';
 
@@ -37,11 +38,20 @@ type SitemapProductRelation = {
   };
 };
 
+type SitemapApiDataRelation = {
+  readonly data?: {
+    readonly attributes: {
+      readonly updatedAt: string;
+    };
+  };
+};
+
 type SitemapProductRelations = {
   readonly overview?: SitemapProductRelation;
   readonly quickstart_guide?: SitemapProductRelation;
   readonly tutorial_list_page?: SitemapProductRelation;
   readonly guide_list_page?: SitemapProductRelation;
+  readonly api_data_list_page?: SitemapApiDataRelation;
 };
 
 type SitemapApiData = {
@@ -132,22 +142,6 @@ export default async function sitemap(): Promise<MetadataRoute.Sitemap> {
               return currentDate > latestDate ? current : latest;
             }).updatedAt;
 
-      // Main Section Routes (Aggregators)
-      const sectionRoutes = [
-        {
-          url: `${localizedUrlPrefix}/solutions`,
-          lastModified: new Date(getLastUpdate(solutions) || Date.now()),
-          changeFrequency: 'weekly' as const,
-          priority: 0.8,
-        },
-        {
-          url: `${localizedUrlPrefix}/webinars`,
-          lastModified: new Date(getLastUpdate(webinars) || Date.now()),
-          changeFrequency: 'weekly' as const,
-          priority: 0.8,
-        },
-      ];
-
       // --------------------------------------------------------------------------------
       // 2. Fetch S3 Metadata (Guides, Solutions, Release Notes)
       // --------------------------------------------------------------------------------
@@ -190,6 +184,21 @@ export default async function sitemap(): Promise<MetadataRoute.Sitemap> {
         solutionDirNames
       );
 
+      const sectionRoutes = compact([
+        !isEmpty(solutions) && {
+          url: `${localizedUrlPrefix}/solutions`,
+          lastModified: new Date(getLastUpdate(solutions) || Date.now()),
+          changeFrequency: 'weekly' as const,
+          priority: 0.8,
+        },
+        !isEmpty(webinars) && {
+          url: `${localizedUrlPrefix}/webinars`,
+          lastModified: new Date(getLastUpdate(webinars) || Date.now()),
+          changeFrequency: 'weekly' as const,
+          priority: 0.8,
+        },
+      ]);
+
       // Release Notes fetching with error handling
       // eslint-disable-next-line functional/no-let
       let releaseNotesMetadata: readonly JsonMetadata[] = [];
@@ -390,11 +399,26 @@ export default async function sitemap(): Promise<MetadataRoute.Sitemap> {
             : [];
         });
 
+        const apiListRoute = relations?.api_data_list_page?.data
+          ? [
+              {
+                url: `${localizedUrlPrefix}/${productSlug}/api`,
+                lastModified: new Date(
+                  relations.api_data_list_page.data.attributes.updatedAt ||
+                    Date.now()
+                ),
+                changeFrequency: 'weekly' as const,
+                priority: 0.6,
+              },
+            ]
+          : [];
+
         return [
           ...overviewRoute,
           ...quickStartRoute,
           ...tutorialListRoute,
           ...guideListRoute,
+          ...apiListRoute,
           ...tutorialRoutes,
           ...apiRoutes,
         ];
diff --git a/apps/nextjs-website/src/components/atoms/DesktopUserInfo/DesktopUserInfo.tsx b/apps/nextjs-website/src/components/atoms/DesktopUserInfo/DesktopUserInfo.tsx
@@ -69,7 +69,7 @@ const DesktopUserInfo: FC<{ locale: string }> = ({ locale }) => {
     >
       {!user && !loading && (
         <MuiLink
-          href={`/${locale}${loginHref}`}
+          href={`/${locale}/${loginHref}`}
           component={Link}
           sx={{
             display: 'flex',
diff --git a/apps/nextjs-website/src/lib/strapi/__tests__/factories/product.ts b/apps/nextjs-website/src/lib/strapi/__tests__/factories/product.ts
@@ -159,6 +159,7 @@ export function productWithAllRelations(): StrapiProduct {
         data: {
           id: 10,
           attributes: {
+            updatedAt: '2026-01-01T00:00:00.000Z',
             apiData: {
               data: [
                 {
diff --git a/apps/nextjs-website/src/lib/strapi/__tests__/factories/products.ts b/apps/nextjs-website/src/lib/strapi/__tests__/factories/products.ts
@@ -79,6 +79,7 @@ export function productWithMultipleApiData() {
             data: {
               id: 1,
               attributes: {
+                updatedAt: '2026-01-01T00:00:00.000Z',
                 apiData: {
                   data: [
                     {
@@ -121,6 +122,7 @@ export function productWithEmptyApiData() {
             data: {
               id: 1,
               attributes: {
+                updatedAt: '2026-01-01T00:00:00.000Z',
                 apiData: {
                   data: [],
                 },
diff --git a/apps/nextjs-website/src/lib/strapi/__tests__/fixtures/apiDataListPages.ts b/apps/nextjs-website/src/lib/strapi/__tests__/fixtures/apiDataListPages.ts
@@ -30,6 +30,7 @@ export const strapiApiDataListPages = {
                 data: {
                   id: 1,
                   attributes: {
+                    updatedAt: '2026-01-01T00:00:00.000Z',
                     apiData: {
                       data: [],
                     },
diff --git a/apps/nextjs-website/src/lib/strapi/__tests__/fixtures/guideListPages.ts b/apps/nextjs-website/src/lib/strapi/__tests__/fixtures/guideListPages.ts
@@ -141,6 +141,7 @@ export const strapiGuideListPagesData = {
                 data: {
                   id: 45,
                   attributes: {
+                    updatedAt: '2026-01-01T00:00:00.000Z',
                     apiData: {
                       data: [
                         {
diff --git a/apps/nextjs-website/src/lib/strapi/__tests__/fixtures/guides.ts b/apps/nextjs-website/src/lib/strapi/__tests__/fixtures/guides.ts
@@ -214,6 +214,7 @@ export const strapiGuideData = {
                 data: {
                   id: 45,
                   attributes: {
+                    updatedAt: '2026-01-01T00:00:00.000Z',
                     apiData: {
                       data: [
                         {
diff --git a/apps/nextjs-website/src/lib/strapi/__tests__/fixtures/overviews.ts b/apps/nextjs-website/src/lib/strapi/__tests__/fixtures/overviews.ts
@@ -39,6 +39,7 @@ export const strapiOverviews = {
                 data: {
                   id: 3,
                   attributes: {
+                    updatedAt: '2026-01-01T00:00:00.000Z',
                     apiData: {
                       data: [
                         {
diff --git a/apps/nextjs-website/src/lib/strapi/__tests__/fixtures/products.ts b/apps/nextjs-website/src/lib/strapi/__tests__/fixtures/products.ts
@@ -23,6 +23,7 @@ export const strapiProducts: StrapiProducts = {
           data: {
             id: 1,
             attributes: {
+              updatedAt: '2026-01-01T00:00:00.000Z',
               apiData: {
                 data: [
                   {
diff --git a/apps/nextjs-website/src/lib/strapi/types/apiDataListPages.ts b/apps/nextjs-website/src/lib/strapi/types/apiDataListPages.ts
@@ -26,6 +26,7 @@ export type StrapiApiDataListPage = {
 export type StrapiApiDataListPageWithoutProduct = {
   readonly id: number;
   readonly attributes: {
+    readonly updatedAt: string;
     readonly apiData: StrapiComponent<
       readonly {
         readonly attributes: Pick<

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"chatbot-index": minor
 +---
++
 +Add language code 'it' in the s3 paths
Original file line number	Diff line number	Diff line change
`@@ -131,5 +131,8 @@ class ChatbotSettings(BaseSettings):`
`131`	`131`	`"CHB_AWS_SQS_QUEUE_EVALUATE_NAME", "chatbot-evaluate"`
`132`	`132`	`)`
`133`	`133`
	`134`	`+ # other`
	`135`	`+ language_code: str = os.getenv("CHB_LANGUAGE_CODE_STATIC_FILES", "it")`
	`136`	`+`
`134`	`137`
`135`	`138`	`SETTINGS = ChatbotSettings()`