refactor: create contentful entryHasContentType util

packages/portal/src/components/content/ContentSection.vue

@@ -68,7 +68,7 @@
 </template>
 
 <script>
-  import contentfulMixin from '@/mixins/contentful.js';
+  import contentfulEntryHasContentType from '@/utils/contentful/entryHasContentType.js';
 
   export default {
     name: 'ContentSection',
@@ -86,8 +86,6 @@
       StoryImageTextSlideScroller: () => import('../story/StoryImageTextSlideScroller')
     },
 
-    mixins: [contentfulMixin],
-
     props: {
       richTextIsCard: {
         type: Boolean,
@@ -101,6 +99,7 @@
     },
 
     methods: {
+      contentfulEntryHasContentType,
       attributionFields(fields) {
         return {
           name: fields?.name,

packages/portal/src/components/landing/LandingPage.vue

@@ -93,7 +93,7 @@
   import kebabCase from 'lodash/kebabCase';
   import LandingHero from './LandingHero';
   import landingPageMixin from '@/mixins/landingPage.js';
-  import contentfulMixin from '@/mixins/contentful.js';
+  import contentfulEntryHasContentType from '@/utils/contentful/entryHasContentType.js';
 
   export default {
     name: 'LandingPage',
@@ -112,7 +112,6 @@
     },
 
     mixins: [
-      contentfulMixin,
       landingPageMixin
     ],
 
@@ -156,6 +155,8 @@
     },
 
     methods: {
+      contentfulEntryHasContentType,
+
       getClasses(section) {
         const classes = [];
         if (section.profile?.background) {

packages/portal/src/components/landing/LandingSubSection.vue

@@ -53,7 +53,7 @@
 </template>
 
 <script>
-  import contentfulMixin from '@/mixins/contentful.js';
+  import contentfulEntryHasContentType from '@/utils/contentful/entryHasContentType.js';
   import parseMarkdownHtmlMixin from '@/mixins/parseMarkdownHtml';
 
   export default {
@@ -66,7 +66,7 @@
       LandingInfoCardGroup: () => import('@/components/landing/LandingInfoCardGroup')
     },
 
-    mixins: [contentfulMixin, parseMarkdownHtmlMixin],
+    mixins: [parseMarkdownHtmlMixin],
 
     props: {
       /**
@@ -105,6 +105,10 @@
       return {
         LandingInfoCardGroupClass: this.$route.params.pathMatch === 'share-your-data' ? 'logo' : null
       };
+    },
+
+    methods: {
+      contentfulEntryHasContentType
     }
   };
 </script>

packages/portal/src/utils/contentful/entryHasContentType.js

@@ -0,0 +1,3 @@
+export default (entry, contentType) => {
+  return entry && (entry['__typename'] === contentType);
+};

packages/portal/tests/unit/utils/contentful/entryHasContentType.spec.js

@@ -0,0 +1,21 @@
+import contentfulEntryHasContentType from '@/utils/contentful/entryHasContentType.js';
+
+describe('utils/contentful/entryHasContentType', () => {
+  describe('contentfulEntryHasContentType', () => {
+    it('is true when `__typename` property matches', () => {
+      const hasType = contentfulEntryHasContentType(
+        { '__typename': 'blogPosting' }, 'blogPosting'
+      );
+
+      expect(hasType).toBe(true);
+    });
+
+    it('is false when `__typename` property does not match', () => {
+      const hasType = contentfulEntryHasContentType(
+        { '__typename': 'landingPage' }, 'blogPosting'
+      );
+
+      expect(hasType).toBe(false);
+    });
+  });
+});