[DEV-3238] Strapi 5 Feature Branch by MarBert · Pull Request #2134 · pagopa/developer-portal

MarBert · 2026-03-10T09:17:09Z

List of Changes

Feature branch for Strapi 5 integration

Motivation and Context

How Has This Been Tested?

On localhost using Strapi 5 CMS

Screenshots (if appropriate):

Types of changes

Chore (nothing changes by a user perspective)
Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Breaking change (fix or feature that would cause existing functionality to not work as expected)

Checklist:

My change requires a change to the documentation.
I have updated the documentation accordingly.

# Conflicts: # apps/nextjs-website/src/components/atoms/WebinarHeaderBanner/WebinarHeaderBanner.tsx # apps/nextjs-website/src/lib/cmsApi.ts # apps/nextjs-website/src/lib/strapi/__tests__/factories/homepage.ts # apps/nextjs-website/src/lib/strapi/__tests__/fixtures/homepage.ts # apps/nextjs-website/src/lib/strapi/__tests__/fixtures/overviews.ts # apps/nextjs-website/src/lib/strapi/__tests__/fixtures/tutorialListPage.ts # apps/nextjs-website/src/lib/strapi/__tests__/makeApiDataListPages.test.ts # apps/nextjs-website/src/lib/strapi/fetches/fetchReleaseNotes.ts # apps/nextjs-website/src/lib/strapi/fetches/fetchSolutions.ts # apps/nextjs-website/src/lib/strapi/makeProps/makeApiDataListPages.ts # apps/nextjs-website/src/lib/strapi/makeProps/makeHomepage.ts # apps/nextjs-website/src/lib/strapi/makeProps/makeOverviews.ts # apps/nextjs-website/src/lib/strapi/makeProps/makeWebinars.ts # apps/nextjs-website/src/lib/strapi/types/homepage.ts # apps/nextjs-website/src/lib/strapi/types/tutorial.ts # apps/nextjs-website/src/lib/strapi/types/webinars.ts

# Conflicts: # apps/nextjs-website/src/lib/strapi/makeProps/makeSolutions.ts

Sebastiano-Bertolin

I see many occurrences of changed factories where part of the object construction it has been delegated to the function clients. Usually by wrapping the created object inside a data attribute or the pagination structure, this was performed by the factories before this changes but now it's done by many tests throughout the strapi tests reducing maintainability. Also I see only rare circumstances where the generated values are used only in part to generate another object, occasionally in other factories, usually the generated object are used as is, that by saying that this "simplification" does not improve on reusability.

I suggest reverting to the old factory behaviour

Sebastiano-Bertolin · 2026-03-17T08:18:04Z

apps/nextjs-website/src/lib/strapi/__tests__/factories/apiDataList.ts

-  const apiData = strapiApiDataList.data[0];
-  return {
-    ...strapiApiDataList,
-    data: [
-      {
-        ...apiData,
-        attributes: {
-          ...apiData.attributes,
-          title: 'Minimal API Data',
-          description: undefined,
-          seo: undefined,
-          bannerLinks: [],
-          product: {
-            data: {
-              ...apiData.attributes.product.data,
-              attributes: {
-                ...(apiData.attributes.product.data?.attributes as any),
-                bannerLinks: undefined,
-              },
-            },
-          },
-          apiRestDetail: {
-            slug: 'minimal-api',
-            specUrls: [
-              {
-                id: 1,
-                url: 'https://example.com/api.yaml',
-                name: undefined,
-                hideTryIt: false,
-              },
-            ],
+  const apiData = strapiApiDataList[0];
+  return [
+    {
+      ...apiData,
+      title: 'Minimal API Data',
+      description: undefined,
+      seo: undefined,
+      bannerLinks: [],
+      product: {
+        name: 'Minimal',
+        shortName: 'Min',
+        slug: 'minimal',
+        isVisible: true,
+        overview: apiData.product?.overview,
+        quickstart_guide: apiData.product?.quickstart_guide,
+        api_data_list_page: apiData.product?.api_data_list_page,
+        tutorial_list_page: apiData.product?.tutorial_list_page,
+        guide_list_page: apiData.product?.guide_list_page,
+        release_note: apiData.product?.release_note,
+        use_case_list_page: apiData.product?.use_case_list_page,
+        tags: apiData.product?.tags,
+        bannerLinks: undefined,
+      },
+      apiRestDetail: {
+        slug: 'minimal-api',
+        specUrls: [
+          {
+            id: 1,
+            url: 'https://example.com/api.yaml',
+            name: undefined,
+            hideTryIt: false,
          },
-          apiSoapDetail: undefined,
-        },
+        ],
      },
-    ],
-  } satisfies StrapiApiDataList;
+      apiSoapDetail: undefined,
+    },
+  ] as StrapiApiDataList;
 }


The purpose of this factory was to generate data of the same type returned from the fetch and to pass to the makeProp function. By returning only a partial you are forced to reconstruct its structure on the consumer side before passing it to the makeProp function.
I suggest to revert to the hold factory behaviour.

Sebastiano-Bertolin · 2026-03-17T08:42:59Z

apps/nextjs-website/src/lib/strapi/__tests__/makeApiDataList.test.ts

-    const result = await makeApiDataListProps('it', minimalApiDataList());
+    const result = await makeApiDataListProps(
+      'it',
+      _.cloneDeep({ data: minimalApiDataList() })
+    );


Continuing from this comment here you are forced to reconstruct its original structure by adding the returned value to the data attribute. Now you will have to maintain the object structure consumed by the makeProp function in two separate places.

Also, _.cloneDeep is not necessary here, the factory construct a new object every time it is called so it only redundant and adds noise.

Sebastiano-Bertolin · 2026-03-17T08:50:43Z

apps/nextjs-website/src/lib/strapi/__tests__/makeProducts.test.ts

+    const result = makeProductsProps(
+      'it',
+      _.cloneDeep({
+        data: [...minimalProduct()],
+        meta: {
+          pagination: {
+            page: 1,
+            pageSize: 25,
+            pageCount: 1,
+            total: 1,
+          },
+        },
+      })
+    );


I'd suggest to use a helper function here (you can take a look at this example) to create the paginated object to improve on maintainability. And we can remove cloneDeep from here on the basis that it's only redundant because a new valued is returned each call of the factory

Sebastiano-Bertolin · 2026-03-17T08:53:36Z

apps/nextjs-website/src/lib/strapi/__tests__/makeProducts.test.ts

+    const result = makeProductsProps('it', {
+      data: [...productsWithAnItemMissingSlug()],
+      meta: {
+        pagination: {
+          page: 1,
+          pageSize: 25,
+          pageCount: 1,
+          total: 1,
+        },
+      },


Same as this comment except the cloneDeep part.
It applies to all other instances of this file

Copilot

Pull request overview

This PR updates the Next.js website (and related Strapi query helpers) to work with Strapi 5 by reshaping Strapi response types, updating populate/query parameters, and adjusting the “makeProps” mappers and tests accordingly.

Changes:

Refactors Strapi response typings across multiple entities to Strapi 5-style shapes (flattening many former data.attributes wrappers).
Updates Strapi fetch populate/query parameters (including new list-page query strings in gitbook-docs).
Updates “makeProps” mappers and Jest fixtures/tests to match the new Strapi 5 payload shapes.

Reviewed changes

Copilot reviewed 141 out of 141 changed files in this pull request and generated 4 comments.

Show a summary per file

File	Description
packages/gitbook-docs/src/helpers/strapiQuery.ts	Adjusts populate paths/structures and adds new list-page query strings for Strapi 5.
apps/nextjs-website/src/lib/types/*	Updates frontend domain types (e.g., SEO/media wrappers) to match new Strapi payload shapes.
apps/nextjs-website/src/lib/strapi/types/*	Refactors Strapi DTO types to Strapi 5-style flattened fields and introduces `RootEntity<T>`.
apps/nextjs-website/src/lib/strapi/fetches/*	Updates Strapi populate/query params and some fetch return types to use `RootEntity<T>`.
apps/nextjs-website/src/lib/strapi/makeProps/*	Updates mapping logic to the new types, and adjusts null/optional handling in several mappers.
apps/nextjs-website/src/lib/strapi/tests/*	Updates fixtures/factories/tests to reflect new response shapes and mapper behavior.
apps/nextjs-website/src/app/sitemap.ts	Adjusts sitemap generation to new product/tutorial shapes and dedupes return logic.
.changeset/*.md	Declares major version bumps for `nextjs-website` related to Strapi 5 migration.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-03-26T11:54:42Z

apps/nextjs-website/src/lib/strapi/fetches/fetchHomepage.ts

    },
+    seo: {
+      populate: '*',
+    },


seo is being serialized at the top level of the query string (&seo[populate]=*) instead of under populate (populate[seo][populate]=*). Strapi will ignore the former, so SEO fields likely won’t be populated in the homepage response. Move the seo populate block inside the populate object.

Copilot · 2026-03-26T11:54:42Z

apps/nextjs-website/src/lib/strapi/makeProps/makeUrlReplaceMap.ts

+  return strapiUrlReplacemap.data.urlToGuide.reduce((map, obj) => {
    return {
      ...map,
-      [obj.url]: `/${locale}/${
-        obj.guide.data?.attributes.product.data.attributes.slug
-      }/guides/${obj.guide.data?.attributes.slug}${
-        obj.subPath ? `/${obj.subPath}` : ''
-      }`,
+      [obj.url]: `/${locale}/${obj.guide?.product.slug}/guides/${
+        obj.guide?.slug
+      }${obj.subPath ? `/${obj.subPath}` : ''}`,
    };


makeUrlReplaceMap builds a URL even when obj.guide is undefined, which will produce paths containing undefined (e.g. /${locale}/undefined/guides/undefined). Since guide is now optional in the type, filter out entries with missing guide, guide.product.slug, or guide.slug (and consider logging) before adding them to the map.

Copilot · 2026-03-26T11:54:43Z

apps/nextjs-website/src/lib/strapi/makeProps/makeSolutionListPage.ts

+  const strapiSolutionsListData = strapiSolutionsList.data;
  return {
    ...strapiSolutionsList,
    hero: {
-      title: attributes.title,
-      subtitle: attributes.description,
+      title: strapiSolutionsListData.title,
+      subtitle: strapiSolutionsListData.description,


This function returns props for a client component (SolutionListTemplate is use client), but it spreads the entire RootEntity (...strapiSolutionsList) into the returned object. That unnecessarily ships the full CMS payload (data, etc.) to the browser and is not part of SolutionListTemplateProps. Return only the fields required by the template (hero/solutions/features/successStories/seo) and avoid spreading the raw Strapi response wrapper.

Copilot · 2026-03-26T11:54:43Z

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

+        const relations = singlePagesData
+          .data[0] as unknown as SitemapProductRelations;


relations is now assigned from singlePagesData.data[0], but the code below still dereferences relations using the Strapi v4 shape (relations.overview.data.attributes.updatedAt, etc.). Unless the rest of the sitemap logic is updated to the new response shape, this will make those relation checks/updatedAt lookups incorrect at runtime. Either revert relations to singlePagesData.data[0]?.attributes (old shape) or update all subsequent accesses to match the Strapi 5 response structure consistently.

Suggested change

const relations = singlePagesData

.data[0] as unknown as SitemapProductRelations;

const relations = singlePagesData.data[0]

?.attributes as unknown as SitemapProductRelations;

# Conflicts: # apps/nextjs-website/src/lib/strapi/makeProps/makeTutorials.ts # apps/nextjs-website/src/lib/strapi/makeProps/makeWebinars.ts # apps/nextjs-website/src/lib/strapi/types/webinars.ts

github-actions · 2026-03-27T16:13:57Z

Jira Pull Request Link

This Pull Request refers to the following Jira issue DEV-3238

github-actions · 2026-03-27T16:14:05Z

This PR exceeds the recommended size of 800 lines. Please make sure you are NOT addressing multiple issues with one PR. Note this PR might be rejected due to its size.

MarBert and others added 30 commits November 19, 2025 16:54

update make and fetches for strapi 5 update

15fd1d3

add changeset

dce32b6

update fetch from strapi for ivs and gitbook docs

8095952

WIP refactor makes

a2b044e

remove attributes from FE

82a4db4

wip, removing references to data

c42475e

strapi 5 working without header

8be20ee

fix tests and add local fetch from cdn

9acadc9

fix compile errors

d3bbad7

fix test

06676e4

fixing tests and website with paginated

ee0143e

Wip fixing test for strapi 5 integration

166630a

fix casehistories tests

303d763

tests are passing

a59e744

remove unused imports

6260e84

fix cdn fetch

afc5a33

merge with main

6dab7e7

add changeset

213a1af

Merge branch 'main' into DEV-3238-update-makes-for-strapi-5

1ae8d11

Merge branch 'main' into DEV-3238-update-makes-for-strapi-5

a4ddedc

Merge branch 'main' into DEV-3238-update-makes-for-strapi-5

77ab3a1

Fixes found by copilot

3f6276a

fix issue in test

90d6da4

fix issue in test

28572b7

fix issue in test

1e560e6

remove unused code

68a0267

fix fetch use cases

3d4bc7f

fix issues with api_data refactor

7829e48

remove log from fetchFromStrapi.ts

82125c3

MarBert mentioned this pull request Mar 10, 2026

[DEV-3238] Update frontend in order for it to work with Strapi 5 #1902

Closed

6 tasks

Merge branch 'main' into DEV-3238-strapi-5-feature-branch

b7cfc73

MarBert temporarily deployed to uat March 10, 2026 09:23 — with GitHub Actions Inactive

MarBert temporarily deployed to dev March 10, 2026 09:23 — with GitHub Actions Inactive

MarBert temporarily deployed to prod March 10, 2026 09:23 — with GitHub Actions Inactive

Merge branch 'main' into DEV-3238-strapi-5-feature-branch

4cc5ee6

MarBert temporarily deployed to prod March 11, 2026 08:46 — with GitHub Actions Inactive

MarBert temporarily deployed to dev March 11, 2026 08:46 — with GitHub Actions Inactive

MarBert temporarily deployed to uat March 11, 2026 08:46 — with GitHub Actions Inactive

MarBert added 2 commits March 13, 2026 10:23

Merge branch 'main' into DEV-3238-strapi-5-feature-branch

d73ba86

# Conflicts: # apps/nextjs-website/src/lib/strapi/makeProps/makeSolutions.ts

fix merge conflict

f89563f

MarBert temporarily deployed to uat March 13, 2026 09:31 — with GitHub Actions Inactive

MarBert temporarily deployed to prod March 13, 2026 09:31 — with GitHub Actions Inactive

MarBert temporarily deployed to dev March 13, 2026 09:31 — with GitHub Actions Inactive

Sebastiano-Bertolin requested changes Mar 17, 2026

View reviewed changes

Merge branch 'main' into DEV-3238-strapi-5-feature-branch

cd1b735

Copilot AI review requested due to automatic review settings March 26, 2026 11:50

Copilot started reviewing on behalf of MarBert March 26, 2026 11:50 View session

MarBert temporarily deployed to prod March 26, 2026 11:52 — with GitHub Actions Inactive

MarBert temporarily deployed to dev March 26, 2026 11:52 — with GitHub Actions Inactive

MarBert temporarily deployed to uat March 26, 2026 11:52 — with GitHub Actions Inactive

mdciri mentioned this pull request Mar 26, 2026

[CAI-876] Update synced files for Strapi v5 #2199

Open

6 tasks

Copilot AI reviewed Mar 26, 2026

View reviewed changes

MarBert added 2 commits March 27, 2026 17:08

Merge branch 'main' into DEV-3238-strapi-5-feature-branch

53529af

# Conflicts: # apps/nextjs-website/src/lib/strapi/makeProps/makeTutorials.ts # apps/nextjs-website/src/lib/strapi/makeProps/makeWebinars.ts # apps/nextjs-website/src/lib/strapi/types/webinars.ts

fix issue with merge with main

4753c03

MarBert deployed to uat March 27, 2026 16:16 — with GitHub Actions Active

MarBert temporarily deployed to prod March 27, 2026 16:16 — with GitHub Actions Inactive

MarBert deployed to dev March 27, 2026 16:16 — with GitHub Actions Active

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[DEV-3238] Strapi 5 Feature Branch#2134

[DEV-3238] Strapi 5 Feature Branch#2134
MarBert wants to merge 49 commits intomainfrom
DEV-3238-strapi-5-feature-branch

MarBert commented Mar 10, 2026

Uh oh!

Sebastiano-Bertolin left a comment

Uh oh!

Sebastiano-Bertolin Mar 17, 2026

Uh oh!

Sebastiano-Bertolin Mar 17, 2026

Uh oh!

Sebastiano-Bertolin Mar 17, 2026 •

edited

Loading

Uh oh!

Sebastiano-Bertolin Mar 17, 2026 •

edited

Loading

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Mar 26, 2026

Uh oh!

Copilot AI Mar 26, 2026

Uh oh!

Copilot AI Mar 26, 2026

Uh oh!

Copilot AI Mar 26, 2026

Uh oh!

github-actions bot commented Mar 27, 2026 •

edited by atlassian bot

Loading

Uh oh!

github-actions bot commented Mar 27, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

		const relations = singlePagesData
		.data[0] as unknown as SitemapProductRelations;

Conversation

MarBert commented Mar 10, 2026

List of Changes

Motivation and Context

How Has This Been Tested?

Screenshots (if appropriate):

Types of changes

Checklist:

Uh oh!

Sebastiano-Bertolin left a comment

Choose a reason for hiding this comment

Uh oh!

Sebastiano-Bertolin Mar 17, 2026

Choose a reason for hiding this comment

Uh oh!

Sebastiano-Bertolin Mar 17, 2026

Choose a reason for hiding this comment

Uh oh!

Sebastiano-Bertolin Mar 17, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Sebastiano-Bertolin Mar 17, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Mar 26, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 26, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 26, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 26, 2026

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Mar 27, 2026 • edited by atlassian bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Jira Pull Request Link

Uh oh!

github-actions bot commented Mar 27, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Sebastiano-Bertolin Mar 17, 2026 •

edited

Loading

Sebastiano-Bertolin Mar 17, 2026 •

edited

Loading

github-actions bot commented Mar 27, 2026 •

edited by atlassian bot

Loading