@treely/strapi-slices 5.12.0 → 5.14.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@treely/strapi-slices",
-  "version": "5.12.0",
+  "version": "5.14.0",
   "license": "MIT",
   "author": "Tree.ly FlexCo",
   "description": "@treely/strapi-slices is a open source library maintained by Tree.ly.",

package/src/models/PageProps.ts

@@ -28,6 +28,7 @@ interface PageProps {
   topBanner?: StrapiTopBanner;
   customerStories: IStrapiData<StrapiCustomerStory>[];
   preview: boolean;
+  isFallbackLocale: boolean;
 }
 
 export default PageProps;

package/src/slices/TextCardGrid/TextCardGrid.tsx

@@ -74,7 +74,8 @@ type Variant = {
 const variants: { shape: Variant; image: Variant } = {
   shape: {
     padding: ['6', null, null, '8'],
-    positionIcon: (index: number) => shapePositions[index],
+    positionIcon: (index: number) =>
+      shapePositions[index % shapePositions.length],
     width: '40',
     height: '40',
     position: 'absolute',

package/src/utils/mergeGlobalAndStrapiBlogPostData.test.ts

@@ -7,7 +7,7 @@ import portfolioProjectMock from '../test/integrationMocks/portfolioProjectMock'
 
 describe('The mergeGlobalAndStrapiBlogPostData util', () => {
   it('returns the global metadata if there is no page metadata', () => {
-    const pageDataWithoutMetadata = {
+    const blogPostDataWithoutMetadata = {
       ...strapiBlogPostMock,
       attributes: {
         ...strapiBlogPostMock.attributes,
@@ -18,7 +18,7 @@ describe('The mergeGlobalAndStrapiBlogPostData util', () => {
     const result = mergeGlobalAndStrapiBlogPostData(
       getStaticPropsContextMock,
       minimalGlobalData,
-      pageDataWithoutMetadata,
+      blogPostDataWithoutMetadata,
       [],
       []
     );
@@ -32,10 +32,11 @@ describe('The mergeGlobalAndStrapiBlogPostData util', () => {
     expect(result.metadata.description).toBe(
       minimalGlobalData.attributes.metadata.description
     );
+    expect(result.isFallbackLocale).toBeFalsy();
   });
 
   it('returns the pages metadata if the page data includes metadata', () => {
-    const pageDataWithMetadata = {
+    const blogPostDataWithMetadata = {
       ...strapiBlogPostMock,
       data: {
         ...strapiBlogPostMock,
@@ -49,7 +50,7 @@ describe('The mergeGlobalAndStrapiBlogPostData util', () => {
     const result = mergeGlobalAndStrapiBlogPostData(
       getStaticPropsContextMock,
       minimalGlobalData,
-      pageDataWithMetadata,
+      blogPostDataWithMetadata,
       [],
       []
     );
@@ -198,4 +199,24 @@ describe('The mergeGlobalAndStrapiBlogPostData util', () => {
     expect(result.blogPosts).toStrictEqual([]);
     expect(result.projects).toStrictEqual([portfolioProjectMock]);
   });
+
+  it('returns isFallbackLocale=true if the blog post is in a different language', () => {
+    const blogPostDataInDe = {
+      ...strapiBlogPostMock,
+      attributes: {
+        ...strapiBlogPostMock.attributes,
+        locale: 'de',
+      },
+    };
+
+    const result = mergeGlobalAndStrapiBlogPostData(
+      getStaticPropsContextMock,
+      minimalGlobalData,
+      blogPostDataInDe,
+      [],
+      []
+    );
+
+    expect(result.isFallbackLocale).toBeTruthy();
+  });
 });

package/src/utils/mergeGlobalAndStrapiBlogPostData.ts

@@ -74,6 +74,7 @@ const mergeGlobalAndStrapiBlogPostData = (
     topBanner: post?.attributes.topBanner || global.attributes.topBanner,
     customerStories: [],
     preview: !!context.preview,
+    isFallbackLocale: context.locale !== post.attributes.locale,
   };
 };
 

package/src/utils/mergeGlobalAndStrapiCustomerStoryData.test.ts

@@ -6,7 +6,7 @@ import { strapiMetadataMock } from '../test/strapiMocks/strapiMetadata';
 
 describe('The mergeGlobalAndStrapiCustomerStoryData util', () => {
   it('returns the global metadata if there is no page metadata', () => {
-    const pageDataWithoutMetadata = {
+    const customerStoryDataWithoutMetadata = {
       ...strapiCustomerStoryMock,
       attributes: {
         ...strapiCustomerStoryMock.attributes,
@@ -17,7 +17,7 @@ describe('The mergeGlobalAndStrapiCustomerStoryData util', () => {
     const result = mergeGlobalAndStrapiCustomerStoryData(
       getStaticPropsContextMock,
       minimalGlobalData,
-      pageDataWithoutMetadata,
+      customerStoryDataWithoutMetadata,
       []
     );
 
@@ -30,10 +30,11 @@ describe('The mergeGlobalAndStrapiCustomerStoryData util', () => {
     expect(result.metadata.description).toBe(
       minimalGlobalData.attributes.metadata.description
     );
+    expect(result.isFallbackLocale).toBeFalsy();
   });
 
   it('returns the pages metadata if the page data includes metadata', () => {
-    const pageDataWithMetadata = {
+    const customerStoryDataWithMetadata = {
       ...strapiCustomerStoryMock,
       data: {
         ...strapiCustomerStoryMock,
@@ -47,7 +48,7 @@ describe('The mergeGlobalAndStrapiCustomerStoryData util', () => {
     const result = mergeGlobalAndStrapiCustomerStoryData(
       getStaticPropsContextMock,
       minimalGlobalData,
-      pageDataWithMetadata,
+      customerStoryDataWithMetadata,
       []
     );
 
@@ -167,4 +168,23 @@ describe('The mergeGlobalAndStrapiCustomerStoryData util', () => {
 
     expect(result.customerStories).toStrictEqual([strapiCustomerStoryMock]);
   });
+
+  it('returns isFallbackLocale=true if the customer story is in a different language', () => {
+    const customerStoryDataInDe = {
+      ...strapiCustomerStoryMock,
+      attributes: {
+        ...strapiCustomerStoryMock.attributes,
+        locale: 'de',
+      },
+    };
+
+    const result = mergeGlobalAndStrapiCustomerStoryData(
+      getStaticPropsContextMock,
+      minimalGlobalData,
+      customerStoryDataInDe,
+      []
+    );
+
+    expect(result.isFallbackLocale).toBeTruthy();
+  });
 });

package/src/utils/mergeGlobalAndStrapiCustomerStoryData.ts

@@ -68,6 +68,7 @@ const mergeGlobalAndStrapiCustomerStoryData = (
       customerStory?.attributes.topBanner || global.attributes.topBanner,
     blogPosts: [],
     preview: !!context.preview,
+    isFallbackLocale: context.locale !== customerStory.attributes.locale,
   };
 };
 

package/src/utils/mergeGlobalAndStrapiPageData.test.ts

@@ -35,6 +35,7 @@ describe('The mergeGlobalAndStrapiPageData util', () => {
     expect(result.metadata.description).toBe(
       minimalGlobalData.attributes.metadata.description
     );
+    expect(result.isFallbackLocale).toBeFalsy();
   });
 
   it('returns the pages metadata if the page data includes metadata', () => {
@@ -317,4 +318,25 @@ describe('The mergeGlobalAndStrapiPageData util', () => {
     expect(result.blogPosts).toStrictEqual([]);
     expect(result.customerStories).toStrictEqual([]);
   });
+
+  it('returns isFallbackLocale=true if the page is in a different language', () => {
+    const pageDataInDe = {
+      ...strapiPageMock,
+      attributes: {
+        ...strapiPageMock.attributes,
+        locale: 'de',
+      },
+    };
+
+    const result = mergeGlobalAndStrapiPageData(
+      getStaticPropsContextMock,
+      minimalGlobalData,
+      pageDataInDe,
+      [],
+      [],
+      []
+    );
+
+    expect(result.isFallbackLocale).toBeTruthy();
+  });
 });

package/src/utils/mergeGlobalAndStrapiPageData.ts

@@ -89,6 +89,7 @@ const mergeGlobalAndStrapiPageData = (
     topBanner: page?.attributes.topBanner || global.attributes.topBanner,
     customerStories: returnCustomerStories ? customerStories : [],
     preview: !!context.preview,
+    isFallbackLocale: context.locale !== page.attributes.locale,
   };
 };
 

package/src/utils/mergeGlobalAndStrapiProjectData.test.ts

@@ -8,7 +8,7 @@ import mergeGlobalAndStrapiProjectData from './mergeGlobalAndStrapiProjectData';
 
 describe('The mergeGlobalAndStrapiProjectData util', () => {
   it('returns the global metadata if there is no page metadata', () => {
-    const pageDataWithoutMetadata = {
+    const projectDataWithoutMetadata = {
       ...strapiProjectMock,
       attributes: {
         ...strapiProjectMock.attributes,
@@ -19,7 +19,7 @@ describe('The mergeGlobalAndStrapiProjectData util', () => {
     const result = mergeGlobalAndStrapiProjectData(
       getStaticPropsContextMock,
       minimalGlobalData,
-      pageDataWithoutMetadata,
+      projectDataWithoutMetadata,
       [],
       []
     );
@@ -33,10 +33,11 @@ describe('The mergeGlobalAndStrapiProjectData util', () => {
     expect(result.metadata.description).toBe(
       minimalGlobalData.attributes.metadata.description
     );
+    expect(result.isFallbackLocale).toBeFalsy();
   });
 
   it('returns the pages metadata if the page data includes metadata', () => {
-    const pageDataWithMetadata = {
+    const projectDataWithMetadata = {
       ...strapiProjectMock,
       attributes: {
         ...strapiProjectMock.attributes,
@@ -47,7 +48,7 @@ describe('The mergeGlobalAndStrapiProjectData util', () => {
     const result = mergeGlobalAndStrapiProjectData(
       getStaticPropsContextMock,
       minimalGlobalData,
-      pageDataWithMetadata,
+      projectDataWithMetadata,
       [],
       []
     );
@@ -280,4 +281,24 @@ describe('The mergeGlobalAndStrapiProjectData util', () => {
     expect(result.blogPosts).toStrictEqual([]);
     expect(result.projects).toStrictEqual([portfolioProjectMock]);
   });
+
+  it('returns isFallbackLocale=true if the project is in a different language', () => {
+    const projectDataInDe = {
+      ...strapiProjectMock,
+      attributes: {
+        ...strapiProjectMock.attributes,
+        locale: 'de',
+      },
+    };
+
+    const result = mergeGlobalAndStrapiProjectData(
+      getStaticPropsContextMock,
+      minimalGlobalData,
+      projectDataInDe,
+      [],
+      []
+    );
+
+    expect(result.isFallbackLocale).toBeTruthy();
+  });
 });

package/src/utils/mergeGlobalAndStrapiProjectData.ts

@@ -83,6 +83,7 @@ const mergeGlobalAndStrapiProject = (
     topBanner: project?.attributes.topBanner || global.attributes.topBanner,
     customerStories: [],
     preview: !!context.preview,
+    isFallbackLocale: context.locale !== project.attributes.locale,
   };
 };