Skip to content
Open
Show file tree
Hide file tree
Changes from 22 commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
15fd1d3
update make and fetches for strapi 5 update
MarBert Nov 19, 2025
dce32b6
add changeset
MarBert Nov 19, 2025
8095952
update fetch from strapi for ivs and gitbook docs
MarBert Nov 19, 2025
a2b044e
WIP refactor makes
MarBert Nov 20, 2025
82a4db4
remove attributes from FE
MarBert Nov 21, 2025
c42475e
wip, removing references to data
MarBert Nov 21, 2025
8be20ee
strapi 5 working without header
MarBert Nov 27, 2025
9acadc9
fix tests and add local fetch from cdn
MarBert Nov 28, 2025
d3bbad7
fix compile errors
MarBert Dec 1, 2025
06676e4
fix test
MarBert Dec 2, 2025
ee0143e
fixing tests and website with paginated
MarBert Dec 2, 2025
166630a
Wip fixing test for strapi 5 integration
MarBert Dec 9, 2025
303d763
fix casehistories tests
MarBert Dec 9, 2025
a59e744
tests are passing
MarBert Dec 10, 2025
6260e84
remove unused imports
MarBert Dec 10, 2025
afc5a33
fix cdn fetch
MarBert Dec 10, 2025
2f40368
Merge branch 'main' into DEV-3238-update-makes-for-strapi-5
MarBert Dec 11, 2025
6dab7e7
merge with main
MarBert Dec 11, 2025
213a1af
add changeset
MarBert Dec 11, 2025
1ae8d11
Merge branch 'main' into DEV-3238-update-makes-for-strapi-5
MarBert Dec 11, 2025
a4ddedc
Merge branch 'main' into DEV-3238-update-makes-for-strapi-5
tommaso1 Dec 15, 2025
77ab3a1
Merge branch 'main' into DEV-3238-update-makes-for-strapi-5
MarBert Dec 16, 2025
3f6276a
Fixes found by copilot
MarBert Dec 23, 2025
90d6da4
fix issue in test
MarBert Dec 23, 2025
28572b7
fix issue in test
MarBert Dec 23, 2025
1e560e6
fix issue in test
MarBert Dec 23, 2025
68a0267
remove unused code
MarBert Dec 23, 2025
3d4bc7f
fix fetch use cases
MarBert Jan 14, 2026
7829e48
fix issues with api_data refactor
MarBert Jan 15, 2026
82125c3
remove log from fetchFromStrapi.ts
MarBert Jan 15, 2026
506b95c
fix linting
MarBert Jan 15, 2026
ae0f2b0
fix to queries
MarBert Jan 15, 2026
20d0edb
fix populate for case histories
MarBert Jan 21, 2026
b9f26e4
Merge branch 'main' into DEV-3238-update-makes-for-strapi-5
MarBert Jan 21, 2026
7089e1d
fix merging issue
MarBert Jan 21, 2026
b83fa63
remove unused lint line
MarBert Jan 26, 2026
77e517f
Merge branch 'main' into DEV-3238-update-makes-for-strapi-5
MarBert Feb 4, 2026
5c8583d
fix sitemap
MarBert Feb 4, 2026
dd58a54
Merge branch 'main' into DEV-3238-update-makes-for-strapi-5
MarBert Feb 5, 2026
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
5 changes: 5 additions & 0 deletions .changeset/great-tools-rescue.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"nextjs-website": major
---

Update front-end to work with Strapi 5
5 changes: 5 additions & 0 deletions .changeset/mighty-kings-obey.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"nextjs-website": major
---

Update populates and makes in order to fetch from strapi 5 (with v4 header)
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const testWebinar: Webinar = {
},
{
type: 'image',
image: mediaRasterJson.data.attributes,
image: mediaRasterJson.data,
children: [
{
type: 'text',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,7 @@ type DesktopFilterSelectorProps = {
setSelectedFilter: (selectedFilter: number) => void;
selectorFilters: readonly {
name: string;
icon: {
data: {
attributes: Media;
};
};
icon: Media;
}[];
};

Expand Down Expand Up @@ -47,7 +43,7 @@ const DesktopFilterSelector = ({
}}
isSelected={index === selectedFilter}
label={category.name}
icon={category.icon.data.attributes}
icon={category.icon}
></FilterButton>
))}
</Stack>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,7 @@ type MobileFilterSelectorProps = {
setSelectedFilter: (selectedFilter: number) => void;
selectorFilters: readonly {
name: string;
icon: {
data: {
attributes: Media;
};
};
icon: Media;
}[];
};

Expand Down Expand Up @@ -96,7 +92,7 @@ const MobileFilterSelector = ({
}}
isHeader={true}
label={selectorFilters[selectedFilter].name}
icon={selectorFilters[selectedFilter].icon.data.attributes}
icon={selectorFilters[selectedFilter].icon}
/>
)}
</AccordionSummary>
Expand All @@ -115,7 +111,7 @@ const MobileFilterSelector = ({
return;
}}
label={category.name}
icon={category.icon.data.attributes}
icon={category.icon}
isLast={index == selectorFilters.length - 1}
/>
))}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,19 +36,15 @@ export const FilteredGridLayout = ({
{
name: t('overview.all'),
icon: {
data: {
attributes: {
name: 'all.svg',
alternativeText: '',
caption: '',
width: 32,
height: 32,
size: 32,
ext: '.svg',
mime: 'image/svg',
url: '/icons/all.svg',
},
},
name: 'all.svg',
alternativeText: '',
caption: '',
width: 32,
height: 32,
size: 32,
ext: '.svg',
mime: 'image/svg',
url: '/icons/all.svg',
},
},
...tags,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import BannerLinks from '@/components/molecules/BannerLinks/BannerLinks';
import { useTranslations } from 'next-intl';
import { SEO } from '@/lib/types/seo';
import { Product } from '@/lib/types/product';
import { StrapiBaseApiDataList } from '@/lib/strapi/types/apiDataList';
import { Tag } from '@/lib/types/tag';
import { CardProps } from '@/components/molecules/CardsGrid/CardsGrid';
import { StrapiApiDataList } from '@/lib/strapi/types/apiDataList';

export type ApiDataListPageTemplateProps = {
readonly hero: {
Expand All @@ -29,7 +29,7 @@ export type ApiDataListPageTemplateProps = {
readonly updatedAt: string;
readonly bannerLinks: BannerLinkProps[];
readonly theme?: Theme;
readonly apiData: StrapiBaseApiDataList;
readonly apiData: StrapiApiDataList;
readonly seo?: SEO;
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export function generateStructuredDataScripts(props: {
name: seo?.metaTitle,
description: seo?.metaDescription,
url: seo?.canonicalURL,
media: seo?.metaImage?.data?.attributes,
media: seo?.metaImage,
};
const allThings: Thing[] = [
makeBreadcrumbList(allBreadcrumbsItems) as Thing,
Expand Down
2 changes: 1 addition & 1 deletion apps/nextjs-website/src/helpers/metadata.helpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ export const makeMetadataFromStrapi = (seo: SEO): Metadata => {
title: seo.metaTitle,
description: seo.metaDescription,
url: seo.canonicalURL,
image: seo.metaImage?.data?.attributes?.url,
image: seo.metaImage?.url,
});

const metadata: Metadata = {
Expand Down
7 changes: 2 additions & 5 deletions apps/nextjs-website/src/helpers/structuredData.helpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,7 @@ export function quickStartToStructuredDataHowTo(
name: quickStart.seo?.metaTitle,
description: quickStart.abstract?.description,
image:
quickStart.seo?.metaImage?.data?.attributes &&
mediaToImageObject(quickStart.seo.metaImage.data.attributes),
quickStart.seo?.metaImage && mediaToImageObject(quickStart.seo.metaImage),
step: steps,
});
}
Expand Down Expand Up @@ -255,9 +254,7 @@ export function convertSeoToStructuredDataArticle(
url: seo?.canonicalURL,
author: organization,
about: seo?.keywords,
image:
seo?.metaImage?.data?.attributes &&
mediaToImageObject(seo.metaImage.data.attributes),
image: seo?.metaImage && mediaToImageObject(seo.metaImage),
}),
}
);
Expand Down
9 changes: 4 additions & 5 deletions apps/nextjs-website/src/lib/cmsApi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -101,11 +101,11 @@ export const getTagsProps = async () => {
export const getTutorialsProps = async () => {
const strapiTutorials = await fetchTutorials(buildEnv);
const tutorialsWithMarkdown = strapiTutorials.data.filter((tutorial) => {
const parts = tutorial?.attributes?.parts ?? [];
const parts = tutorial?.parts ?? [];
return parts.some((part) => part?.__component === 'parts.markdown');
});
const allMarkdownParts = tutorialsWithMarkdown.flatMap((tutorial) =>
(tutorial?.attributes?.parts ?? []).filter(
(tutorial?.parts ?? []).filter(
(part) => part?.__component === 'parts.markdown'
)
);
Expand All @@ -132,8 +132,7 @@ export const getQuickStartGuidesProps = async () => {

export const getUrlReplaceMapProps = async () => {
const strapiUrlReplaceMap = await fetchUrlReplaceMap(buildEnv);
const processed = makeUrlReplaceMap(strapiUrlReplaceMap);
return processed;
return makeUrlReplaceMap(strapiUrlReplaceMap);
};

export const getApiDataListPagesProps = async () => {
Expand Down Expand Up @@ -249,7 +248,7 @@ export const getReleaseNoteProps = async (
export const getUseCasesProps = async () => {
const strapiUseCases = await fetchUseCases(buildEnv);
const allMarkdownParts = strapiUseCases.data.flatMap((useCase) =>
(useCase?.attributes?.parts ?? []).filter(isMarkDownPart)
(useCase?.parts ?? []).filter(isMarkDownPart)
);
const contentPromises = allMarkdownParts.map(async (part) => {
const { dirName, pathToFile } = part;
Expand Down
Loading
Loading