@treely/strapi-slices 7.11.0 → 7.13.0

package/src/utils/mergeGlobalAndStrapiBlogPostData.test.ts

@@ -219,4 +219,85 @@ describe('The mergeGlobalAndStrapiBlogPostData util', () => {
 
     expect(result.isFallbackLocale).toBeTruthy();
   });
+
+  it('handles schema markup types correctly', () => {
+    const globalDataWithSchemaMarkup = {
+      ...minimalGlobalData,
+      attributes: {
+        ...minimalGlobalData.attributes,
+        metadata: {
+          ...minimalGlobalData.attributes.metadata,
+          schemaMarkupTypes: ['Organization'],
+        },
+      },
+    };
+
+    const blogPostDataWithSchemaMarkup = {
+      ...strapiBlogPostMock,
+      attributes: {
+        ...strapiBlogPostMock.attributes,
+        metadata: {
+          ...strapiMetadataMock,
+          schemaMarkupTypes: ['Article', 'BlogPosting'],
+        },
+      },
+    };
+
+    // Test blog post-level schema markup
+    const resultWithBlogPostSchema = mergeGlobalAndStrapiBlogPostData(
+      getStaticPropsContextMock,
+      globalDataWithSchemaMarkup,
+      blogPostDataWithSchemaMarkup,
+      [],
+      []
+    );
+    expect(resultWithBlogPostSchema.metadata.schemaMarkupTypes).toEqual([
+      'Article',
+      'BlogPosting',
+    ]);
+
+    // Test global fallback
+    const blogPostDataWithoutSchema = {
+      ...strapiBlogPostMock,
+      attributes: {
+        ...strapiBlogPostMock.attributes,
+        metadata: {
+          ...strapiMetadataMock,
+          schemaMarkupTypes: undefined,
+        },
+      },
+    };
+
+    const resultWithGlobalSchema = mergeGlobalAndStrapiBlogPostData(
+      getStaticPropsContextMock,
+      globalDataWithSchemaMarkup,
+      blogPostDataWithoutSchema,
+      [],
+      []
+    );
+    expect(resultWithGlobalSchema.metadata.schemaMarkupTypes).toEqual([
+      'Organization',
+    ]);
+
+    // Test empty array fallback
+    const globalDataWithoutSchema = {
+      ...minimalGlobalData,
+      attributes: {
+        ...minimalGlobalData.attributes,
+        metadata: {
+          ...minimalGlobalData.attributes.metadata,
+          schemaMarkupTypes: undefined,
+        },
+      },
+    };
+
+    const resultWithNoSchema = mergeGlobalAndStrapiBlogPostData(
+      getStaticPropsContextMock,
+      globalDataWithoutSchema,
+      blogPostDataWithoutSchema,
+      [],
+      []
+    );
+    expect(resultWithNoSchema.metadata.schemaMarkupTypes).toEqual([]);
+  });
 });

package/src/utils/mergeGlobalAndStrapiBlogPostData.ts

@@ -28,6 +28,11 @@ const mergeGlobalAndStrapiBlogPostData = (
       )
     : DEFAULT_SHARE_IMAGE;
 
+  const schemaMarkupTypes =
+    post.attributes.metadata?.schemaMarkupTypes ??
+    global.attributes.metadata?.schemaMarkupTypes ??
+    [];
+
   const returnBlog = post.attributes.slices.some((slice) =>
     SLICES_WITH_BLOG_POSTS.includes(slice.__component)
   );
@@ -67,6 +72,7 @@ const mergeGlobalAndStrapiBlogPostData = (
       },
       metaTitleSuffix: global.attributes.metaTitleSuffix,
       favicon: strapiMediaUrl(global.attributes.favicon, 'thumbnail'),
+      schemaMarkupTypes,
     },
     slices: post?.attributes.slices,
     blogPosts: returnBlog ? blog : [],

package/src/utils/mergeGlobalAndStrapiCustomerStoryData.test.ts

@@ -187,4 +187,82 @@ describe('The mergeGlobalAndStrapiCustomerStoryData util', () => {
 
     expect(result.isFallbackLocale).toBeTruthy();
   });
+
+  it('handles schema markup types correctly', () => {
+    const globalDataWithSchemaMarkup = {
+      ...minimalGlobalData,
+      attributes: {
+        ...minimalGlobalData.attributes,
+        metadata: {
+          ...minimalGlobalData.attributes.metadata,
+          schemaMarkupTypes: ['Organization'],
+        },
+      },
+    };
+
+    const customerStoryDataWithSchemaMarkup = {
+      ...strapiCustomerStoryMock,
+      attributes: {
+        ...strapiCustomerStoryMock.attributes,
+        metadata: {
+          ...strapiMetadataMock,
+          schemaMarkupTypes: ['Article', 'BlogPosting'],
+        },
+      },
+    };
+
+    // Test customer story-level schema markup
+    const resultWithCustomerStorySchema = mergeGlobalAndStrapiCustomerStoryData(
+      getStaticPropsContextMock,
+      globalDataWithSchemaMarkup,
+      customerStoryDataWithSchemaMarkup,
+      []
+    );
+    expect(resultWithCustomerStorySchema.metadata.schemaMarkupTypes).toEqual([
+      'Article',
+      'BlogPosting',
+    ]);
+
+    // Test global fallback
+    const customerStoryDataWithoutSchema = {
+      ...strapiCustomerStoryMock,
+      attributes: {
+        ...strapiCustomerStoryMock.attributes,
+        metadata: {
+          ...strapiMetadataMock,
+          schemaMarkupTypes: undefined,
+        },
+      },
+    };
+
+    const resultWithGlobalSchema = mergeGlobalAndStrapiCustomerStoryData(
+      getStaticPropsContextMock,
+      globalDataWithSchemaMarkup,
+      customerStoryDataWithoutSchema,
+      []
+    );
+    expect(resultWithGlobalSchema.metadata.schemaMarkupTypes).toEqual([
+      'Organization',
+    ]);
+
+    // Test empty array fallback
+    const globalDataWithoutSchema = {
+      ...minimalGlobalData,
+      attributes: {
+        ...minimalGlobalData.attributes,
+        metadata: {
+          ...minimalGlobalData.attributes.metadata,
+          schemaMarkupTypes: undefined,
+        },
+      },
+    };
+
+    const resultWithNoSchema = mergeGlobalAndStrapiCustomerStoryData(
+      getStaticPropsContextMock,
+      globalDataWithoutSchema,
+      customerStoryDataWithoutSchema,
+      []
+    );
+    expect(resultWithNoSchema.metadata.schemaMarkupTypes).toEqual([]);
+  });
 });

package/src/utils/mergeGlobalAndStrapiCustomerStoryData.ts

@@ -23,6 +23,11 @@ const mergeGlobalAndStrapiCustomerStoryData = (
       )
     : DEFAULT_SHARE_IMAGE;
 
+  const schemaMarkupTypes =
+    customerStory.attributes.metadata?.schemaMarkupTypes ??
+    global.attributes.metadata?.schemaMarkupTypes ??
+    [];
+
   const returnCustomerStories = customerStory.attributes.slices.some((slice) =>
     SLICES_WITH_CUSTOMER_STORIES.includes(slice.__component)
   );
@@ -60,6 +65,7 @@ const mergeGlobalAndStrapiCustomerStoryData = (
       },
       metaTitleSuffix: global.attributes.metaTitleSuffix,
       favicon: strapiMediaUrl(global.attributes.favicon, 'thumbnail'),
+      schemaMarkupTypes,
     },
     slices: customerStory?.attributes.slices,
     customerStories: returnCustomerStories ? customerStories : [],

package/src/utils/mergeGlobalAndStrapiPageData.test.ts

@@ -339,4 +339,88 @@ describe('The mergeGlobalAndStrapiPageData util', () => {
 
     expect(result.isFallbackLocale).toBeTruthy();
   });
+
+  it('handles schema markup types correctly', () => {
+    const globalDataWithSchemaMarkup = {
+      ...minimalGlobalData,
+      attributes: {
+        ...minimalGlobalData.attributes,
+        metadata: {
+          ...minimalGlobalData.attributes.metadata,
+          schemaMarkupTypes: ['Organization'],
+        },
+      },
+    };
+
+    const pageDataWithSchemaMarkup = {
+      ...strapiPageMock,
+      attributes: {
+        ...strapiPageMock.attributes,
+        metadata: {
+          ...strapiMetadataMock,
+          schemaMarkupTypes: ['Article', 'BlogPosting'],
+        },
+      },
+    };
+
+    // Test page-level schema markup
+    const resultWithPageSchema = mergeGlobalAndStrapiPageData(
+      getStaticPropsContextMock,
+      globalDataWithSchemaMarkup,
+      pageDataWithSchemaMarkup,
+      [],
+      [],
+      []
+    );
+    expect(resultWithPageSchema.metadata.schemaMarkupTypes).toEqual([
+      'Article',
+      'BlogPosting',
+    ]);
+
+    // Test global fallback
+    const pageDataWithoutSchema = {
+      ...strapiPageMock,
+      attributes: {
+        ...strapiPageMock.attributes,
+        metadata: {
+          ...strapiMetadataMock,
+          schemaMarkupTypes: undefined,
+        },
+      },
+    };
+
+    const resultWithGlobalSchema = mergeGlobalAndStrapiPageData(
+      getStaticPropsContextMock,
+      globalDataWithSchemaMarkup,
+      pageDataWithoutSchema,
+      [],
+      [],
+      []
+    );
+    expect(resultWithGlobalSchema.metadata.schemaMarkupTypes).toEqual([
+      'Organization',
+    ]);
+
+    // Test empty array fallback
+    const globalDataWithoutSchema = {
+      ...minimalGlobalData,
+      attributes: {
+        ...minimalGlobalData.attributes,
+        metadata: {
+          ...minimalGlobalData.attributes.metadata,
+          schemaMarkupTypes: undefined,
+        },
+      },
+    };
+
+    const resultWithNoSchema = mergeGlobalAndStrapiPageData(
+      getStaticPropsContextMock,
+      globalDataWithoutSchema,
+      pageDataWithoutSchema,
+      [],
+      [],
+      []
+    );
+    expect(resultWithNoSchema.metadata.schemaMarkupTypes).toEqual([]);
+  });
 });

package/src/utils/mergeGlobalAndStrapiPageData.ts

@@ -34,6 +34,11 @@ const mergeGlobalAndStrapiPageData = (
       )
     : DEFAULT_SHARE_IMAGE;
 
+  const schemaMarkupTypes =
+    page.attributes.metadata?.schemaMarkupTypes ??
+    global.attributes.metadata?.schemaMarkupTypes ??
+    [];
+
   const returnBlogPosts = page.attributes.slices.some((slice) =>
     SLICES_WITH_BLOG_POSTS.includes(slice.__component)
   );
@@ -82,6 +87,7 @@ const mergeGlobalAndStrapiPageData = (
       },
       metaTitleSuffix: global.attributes.metaTitleSuffix,
       favicon: strapiMediaUrl(global.attributes.favicon, 'thumbnail'),
+      schemaMarkupTypes,
     },
     slices: page?.attributes.slices,
     blogPosts: returnBlogPosts ? blogPosts : [],

package/src/utils/mergeGlobalAndStrapiProjectData.test.ts

@@ -301,4 +301,85 @@ describe('The mergeGlobalAndStrapiProjectData util', () => {
 
     expect(result.isFallbackLocale).toBeTruthy();
   });
+
+  it('handles schema markup types correctly', () => {
+    const globalDataWithSchemaMarkup = {
+      ...minimalGlobalData,
+      attributes: {
+        ...minimalGlobalData.attributes,
+        metadata: {
+          ...minimalGlobalData.attributes.metadata,
+          schemaMarkupTypes: ['Organization'],
+        },
+      },
+    };
+
+    const projectDataWithSchemaMarkup = {
+      ...strapiProjectMock,
+      attributes: {
+        ...strapiProjectMock.attributes,
+        metadata: {
+          ...strapiMetadataMock,
+          schemaMarkupTypes: ['Article', 'BlogPosting'],
+        },
+      },
+    };
+
+    // Test project-level schema markup
+    const resultWithProjectSchema = mergeGlobalAndStrapiProjectData(
+      getStaticPropsContextMock,
+      globalDataWithSchemaMarkup,
+      projectDataWithSchemaMarkup,
+      [],
+      []
+    );
+    expect(resultWithProjectSchema.metadata.schemaMarkupTypes).toEqual([
+      'Article',
+      'BlogPosting',
+    ]);
+
+    // Test global fallback
+    const projectDataWithoutSchema = {
+      ...strapiProjectMock,
+      attributes: {
+        ...strapiProjectMock.attributes,
+        metadata: {
+          ...strapiMetadataMock,
+          schemaMarkupTypes: undefined,
+        },
+      },
+    };
+
+    const resultWithGlobalSchema = mergeGlobalAndStrapiProjectData(
+      getStaticPropsContextMock,
+      globalDataWithSchemaMarkup,
+      projectDataWithoutSchema,
+      [],
+      []
+    );
+    expect(resultWithGlobalSchema.metadata.schemaMarkupTypes).toEqual([
+      'Organization',
+    ]);
+
+    // Test empty array fallback
+    const globalDataWithoutSchema = {
+      ...minimalGlobalData,
+      attributes: {
+        ...minimalGlobalData.attributes,
+        metadata: {
+          ...minimalGlobalData.attributes.metadata,
+          schemaMarkupTypes: undefined,
+        },
+      },
+    };
+
+    const resultWithNoSchema = mergeGlobalAndStrapiProjectData(
+      getStaticPropsContextMock,
+      globalDataWithoutSchema,
+      projectDataWithoutSchema,
+      [],
+      []
+    );
+    expect(resultWithNoSchema.metadata.schemaMarkupTypes).toEqual([]);
+  });
 });

package/src/utils/mergeGlobalAndStrapiProjectData.ts

@@ -31,6 +31,11 @@ const mergeGlobalAndStrapiProject = (
       )
     : DEFAULT_SHARE_IMAGE;
 
+  const schemaMarkupTypes =
+    project.attributes.metadata?.schemaMarkupTypes ??
+    global.attributes.metadata?.schemaMarkupTypes ??
+    [];
+
   const returnBlogPosts = project.attributes.slices.some((slice) =>
     SLICES_WITH_BLOG_POSTS.includes(slice.__component)
   );
@@ -76,6 +81,7 @@ const mergeGlobalAndStrapiProject = (
       },
       metaTitleSuffix: global.attributes.metaTitleSuffix,
       favicon: strapiMediaUrl(global.attributes.favicon, 'thumbnail'),
+      schemaMarkupTypes,
     },
     slices: project.attributes.slices,
     blogPosts: returnBlogPosts ? blogPosts : [],

package/dist/slices/ProjectsMap/MapMarker.d.ts

@@ -1,12 +0,0 @@
-import React from 'react';
-import { CreditAvailability } from '../../models/fpm/FPMProject';
-export interface MapMarkerProps {
-    title: string;
-    isPublic?: boolean;
-    projectDeveloper?: string;
-    slug?: string;
-    portfolioHost?: string;
-    creditAvailability: CreditAvailability;
-}
-declare const MapMarker: ({ title, projectDeveloper, slug, creditAvailability, portfolioHost, isPublic, }: MapMarkerProps) => React.JSX.Element;
-export default MapMarker;

package/src/slices/ProjectsMap/MapMarker.test.tsx

@@ -1,101 +0,0 @@
-import React from 'react';
-import { fireEvent, render, screen, waitFor } from '../../test/testUtils';
-import MapMarker, { MapMarkerProps } from './MapMarker';
-import messagesEn from './messages.en';
-import { CreditAvailability } from '../../models/fpm/FPMProject';
-
-const defaultProps: MapMarkerProps = {
-  title: 'Project title',
-  portfolioHost: '',
-  isPublic: true,
-  creditAvailability: CreditAvailability.CREDITS_AVAILABLE,
-};
-
-const setup = (props: Partial<MapMarkerProps> = {}) => {
-  const combinedProps = { ...defaultProps, ...props };
-  render(<MapMarker {...combinedProps} />);
-};
-
-describe('The MapMarker component', () => {
-  it('renders successfully with minimal props', () => {
-    setup({});
-
-    expect(screen.queryByText('Project title')).not.toBeInTheDocument();
-  });
-
-  it('renders successfully with minimal props', () => {
-    setup({});
-
-    fireEvent.mouseEnter(screen.getByTestId('mapmarker-pin'));
-
-    waitFor(() => {
-      expect(screen.findByText('Project title')).toBeInTheDocument();
-      expect(screen.findByRole('button')).not.toBeInTheDocument();
-    });
-  });
-
-  it('renders a button if slug is defined', () => {
-    setup({ slug: 'slug' });
-
-    expect(screen.getByTestId('mapmarker-pin').parentElement).toHaveProperty(
-      'href',
-      'http://localhost/portfolio/slug'
-    );
-
-    fireEvent.mouseEnter(screen.getByTestId('mapmarker-pin'));
-
-    waitFor(() => {
-      const button = screen.getByText(
-        messagesEn['sections.projectsMap.link.text']
-      );
-      expect(button).toBeInTheDocument();
-      expect(button).toHaveProperty('href', '/portfolio/slug');
-    });
-  });
-
-  it('prefixes the url with the portfolio host', () => {
-    setup({ slug: 'slug', portfolioHost: 'https://example.com' });
-
-    expect(screen.getByTestId('mapmarker-pin').parentElement).toHaveProperty(
-      'href',
-      'https://example.com/portfolio/slug'
-    );
-
-    fireEvent.mouseEnter(screen.getByTestId('mapmarker-pin'));
-
-    waitFor(() => {
-      const button = screen.getByText(
-        messagesEn['sections.projectsMap.link.text']
-      );
-      expect(button).toBeInTheDocument();
-      expect(button).toHaveProperty(
-        'href',
-        'https://example.com/portfolio/slug'
-      );
-    });
-  });
-
-  it('renders the project developer if it is defined', () => {
-    setup({
-      projectDeveloper: 'Project developer',
-    });
-
-    fireEvent.mouseEnter(screen.getByTestId('mapmarker-pin'));
-
-    waitFor(() => {
-      expect(screen.getByText('Project developer')).toBeInTheDocument();
-    });
-  });
-
-  it('renders the credit availability if it is defined', () => {
-    setup({
-      creditAvailability: CreditAvailability.CREDITS_AVAILABLE,
-    });
-
-    fireEvent.mouseEnter(screen.getByTestId('mapmarker-pin'));
-
-    waitFor(() => {
-      expect(screen.getByText('CREDITS AVAILABLE')).toBeInTheDocument();
-    });
-  });
-});

package/src/slices/ProjectsMap/MapMarker.tsx

@@ -1,102 +0,0 @@
-import React, { useContext } from 'react';
-import {
-  Box,
-  Button,
-  Container,
-  Flex,
-  Heading,
-  Text,
-  useDisclosure,
-  useToken,
-} from 'boemly';
-import { MapPin } from '@phosphor-icons/react';
-import NextLink from 'next/link';
-import CreditsAvailableBadge from '../../components/CreditsAvailableBadge';
-import { IntlContext } from '../../components/ContextProvider';
-import { CreditAvailability } from '../../models/fpm/FPMProject';
-
-export interface MapMarkerProps {
-  title: string;
-  isPublic?: boolean;
-  projectDeveloper?: string;
-  slug?: string;
-  portfolioHost?: string;
-  creditAvailability: CreditAvailability;
-}
-
-const MapMarker = ({
-  title,
-  projectDeveloper,
-  slug,
-  creditAvailability,
-  portfolioHost = '',
-  isPublic = false,
-}: MapMarkerProps) => {
-  const { formatMessage } = useContext(IntlContext);
-  const { isOpen, onOpen, onClose } = useDisclosure();
-  const blue600 = useToken('colors', 'blue.600');
-
-  return (
-    <Flex
-      position="absolute"
-      gap="4"
-      onMouseEnter={onOpen}
-      onMouseLeave={onClose}
-      cursor="grab"
-    >
-      <Box
-        as={slug ? NextLink : undefined}
-        href={slug && `${portfolioHost}/portfolio/${slug}`}
-      >
-        <MapPin
-          size="40px"
-          color={blue600}
-          weight="fill"
-          data-testid="mapmarker-pin"
-          filter="drop-shadow(0px 0px 2px #FFF)"
-        />
-      </Box>
-
-      {isPublic && isOpen && (
-        <Container
-          shadow="md"
-          width="max-content"
-          minWidth="3xs"
-          maxWidth={['3xs', null, null, 'sm']}
-        >
-          <Flex direction="column">
-            <CreditsAvailableBadge
-              status={creditAvailability}
-              href={slug && `${portfolioHost}/portfolio/${slug}`}
-            />
-            <Heading mt="3" size="md">
-              {title}
-            </Heading>
-
-            {projectDeveloper && (
-              <Text size="smLowNormal" mt="1">
-                {projectDeveloper}
-              </Text>
-            )}
-
-            {slug && (
-              <Button
-                width="fit-content"
-                variant="outline"
-                size="sm"
-                as={NextLink}
-                href={`${portfolioHost}/portfolio/${slug}`}
-                mt="4"
-                whiteSpace="nowrap"
-              >
-                {formatMessage({ id: 'sections.projectsMap.link.text' })}
-              </Button>
-            )}
-          </Flex>
-        </Container>
-      )}
-    </Flex>
-  );
-};
-
-export default MapMarker;