@treely/strapi-slices 3.2.0 → 3.3.0

package/README.md

@@ -32,6 +32,16 @@ Run the tests:
 npm run test
 ```
 
+For local testing, you can link the package to your project:
+
+```bash
+npm run build
+npm pack
+
+cd ../path/to/your/project
+npm install ../path/to/strapi-slices-package.tgz
+```
+
 Commit message guideline
 
 The project uses the Angular commit message guideline. Find the documentation
@@ -62,7 +72,7 @@ import {
   IStrapiData,
   SliceRenderer,
   StrapiBlogPost,
-  StrapiCustomerStory
+  StrapiCustomerStory,
 } from '@tree-ly/strapi-slices';
 
 // Get the slices, blog posts, and customer stories from Strapi
@@ -72,7 +82,6 @@ const blogPosts: IStrapiData<StrapiBlogPost> = [];
 const projects: PortfolioProject[] = [];
 const customerStories: IStrapiData<StrapiCustomerStory> = [];
 
-
 const App = (): JSX.Element => (
   <SliceRenderer
     slices={slices}

package/dist/slices/TextWithCard/TextWithCard.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 import StrapiLink from '../../models/strapi/StrapiLink';
 import StrapiProjectCard from '../../models/strapi/StrapiProjectCard';
-import { IStrapi, IStrapiData, PortfolioProject, StrapiProject } from '../..';
+import { IStrapiData, PortfolioProject, StrapiProject } from '../..';
 interface TextWithCardSlice {
     tagline?: string;
     title: string;
@@ -12,7 +12,9 @@ interface TextWithCardSlice {
     }[];
     button?: StrapiLink;
     card?: StrapiProjectCard;
-    project?: IStrapi<IStrapiData<StrapiProject>>;
+    project?: {
+        data?: IStrapiData<StrapiProject>;
+    };
     cardPosition: 'left' | 'right';
 }
 export interface TextWithCardProps {

package/dist/strapi-slices.cjs.development.js

@@ -417,9 +417,15 @@ var DEFAULT_SHARE_ALT = 'Share Image';
 var mergeGlobalAndStrapiBlogPostData = function mergeGlobalAndStrapiBlogPostData(context, global, post, blog, projects) {
   var _post$attributes$meta, _post$attributes$meta2, _post$attributes$meta3, _global$attributes$me, _post$attributes, _post$attributes$meta4, _post$attributes$meta5, _post$attributes$meta6, _post$attributes$meta7, _ref, _post$attributes$meta8, _post$attributes$meta9, _global$attributes$me2;
   var metaShareImageUrl = (_post$attributes$meta = post.attributes.metadata) != null && _post$attributes$meta.shareImage ? strapiMediaUrl((_post$attributes$meta2 = (_post$attributes$meta3 = post.attributes.metadata) == null ? void 0 : _post$attributes$meta3.shareImage.media) != null ? _post$attributes$meta2 : (_global$attributes$me = global.attributes.metadata.shareImage) == null ? void 0 : _global$attributes$me.media, 'large') : DEFAULT_SHARE_IMAGE;
+  var returnBlog = post.attributes.slices.some(function (slice) {
+    return SECTIONS_WITH_BLOG_POSTS.includes(slice.__component);
+  });
+  var returnProjects = post.attributes.slices.some(function (slice) {
+    return SECTIONS_WITH_PROJECTS.includes(slice.__component);
+  });
   return _extends({}, post, {
     // Portfolio Projects
-    projects: projects,
+    projects: returnProjects ? projects : [],
     // StrapiBlogPost
     attributes: _extends({}, post == null ? void 0 : post.attributes, {
       metadata: (post == null || (_post$attributes = post.attributes) == null ? void 0 : _post$attributes.metadata) || global.attributes.metadata
@@ -443,7 +449,7 @@ var mergeGlobalAndStrapiBlogPostData = function mergeGlobalAndStrapiBlogPostData
       favicon: strapiMediaUrl(global.attributes.favicon, 'thumbnail')
     },
     slices: post == null ? void 0 : post.attributes.slices,
-    blogPosts: blog,
+    blogPosts: returnBlog ? blog : [],
     banner: global.attributes.banner,
     topBanner: (post == null ? void 0 : post.attributes.topBanner) || global.attributes.topBanner,
     customerStories: []
@@ -453,6 +459,9 @@ var mergeGlobalAndStrapiBlogPostData = function mergeGlobalAndStrapiBlogPostData
 var mergeGlobalAndStrapiCustomerStoryData = function mergeGlobalAndStrapiCustomerStoryData(context, global, customerStory, customerStories) {
   var _customerStory$attrib, _customerStory$attrib2, _customerStory$attrib3, _global$attributes$me, _customerStory$attrib4, _customerStory$attrib5, _customerStory$attrib6, _customerStory$attrib7, _customerStory$attrib8, _ref, _customerStory$attrib9, _customerStory$attrib10, _global$attributes$me2;
   var metaShareImageUrl = (_customerStory$attrib = customerStory.attributes.metadata) != null && _customerStory$attrib.shareImage ? strapiMediaUrl((_customerStory$attrib2 = (_customerStory$attrib3 = customerStory.attributes.metadata) == null ? void 0 : _customerStory$attrib3.shareImage.media) != null ? _customerStory$attrib2 : (_global$attributes$me = global.attributes.metadata.shareImage) == null ? void 0 : _global$attributes$me.media, 'large') : DEFAULT_SHARE_IMAGE;
+  var returnCustomerStories = customerStory.attributes.slices.some(function (slice) {
+    return SECTIONS_WITH_CUSTOMER_STORIES.includes(slice.__component);
+  });
   return _extends({}, customerStory, {
     // Portfolio Projects
     projects: [],
@@ -478,7 +487,7 @@ var mergeGlobalAndStrapiCustomerStoryData = function mergeGlobalAndStrapiCustome
       favicon: strapiMediaUrl(global.attributes.favicon, 'thumbnail')
     },
     slices: customerStory == null ? void 0 : customerStory.attributes.slices,
-    customerStories: customerStories,
+    customerStories: returnCustomerStories ? customerStories : [],
     banner: global.attributes.banner,
     topBanner: (customerStory == null ? void 0 : customerStory.attributes.topBanner) || global.attributes.topBanner,
     blogPosts: []
@@ -494,9 +503,18 @@ var SECTIONS_WITH_PROJECTS = ['sections.projects-grid', 'sections.projects-map',
 var mergeGlobalAndStrapiPageData = function mergeGlobalAndStrapiPageData(context, global, page, blogPosts, customerStories, projects) {
   var _page$attributes$meta, _page$attributes$meta2, _page$attributes$meta3, _global$attributes$me, _page$attributes$meta4, _page$attributes, _page$attributes$slic, _page$attributes$slic2, _page$attributes$meta5, _page$attributes$meta6, _page$attributes$meta7, _page$attributes$meta8, _ref, _page$attributes$meta9, _page$attributes$meta10, _global$attributes$me2;
   var metaShareImageUrl = (_page$attributes$meta = page.attributes.metadata) != null && _page$attributes$meta.shareImage ? strapiMediaUrl((_page$attributes$meta2 = (_page$attributes$meta3 = page.attributes.metadata) == null ? void 0 : _page$attributes$meta3.shareImage.media) != null ? _page$attributes$meta2 : (_global$attributes$me = global.attributes.metadata.shareImage) == null ? void 0 : _global$attributes$me.media, 'large') : DEFAULT_SHARE_IMAGE;
+  var returnBlogPosts = page.attributes.slices.some(function (slice) {
+    return SECTIONS_WITH_BLOG_POSTS.includes(slice.__component);
+  });
+  var returnCustomerStories = page.attributes.slices.some(function (slice) {
+    return SECTIONS_WITH_CUSTOMER_STORIES.includes(slice.__component);
+  });
+  var returnProjects = page.attributes.slices.some(function (slice) {
+    return SECTIONS_WITH_PROJECTS.includes(slice.__component);
+  });
   return _extends({}, page, {
     // Portfolio Projects
-    projects: projects,
+    projects: returnProjects ? projects : [],
     // StrapiPage
     attributes: _extends({}, page == null ? void 0 : page.attributes, {
       metadata: (_page$attributes$meta4 = page == null || (_page$attributes = page.attributes) == null ? void 0 : _page$attributes.metadata) != null ? _page$attributes$meta4 : global.attributes.metadata
@@ -520,19 +538,25 @@ var mergeGlobalAndStrapiPageData = function mergeGlobalAndStrapiPageData(context
       favicon: strapiMediaUrl(global.attributes.favicon, 'thumbnail')
     },
     slices: page == null ? void 0 : page.attributes.slices,
-    blogPosts: blogPosts,
+    blogPosts: returnBlogPosts ? blogPosts : [],
     banner: global.attributes.banner,
     topBanner: (page == null ? void 0 : page.attributes.topBanner) || global.attributes.topBanner,
-    customerStories: customerStories
+    customerStories: returnCustomerStories ? customerStories : []
   });
 };
 
 var mergeGlobalAndStrapiProject = function mergeGlobalAndStrapiProject(context, global, project, blogPosts, projects) {
   var _project$attributes$m, _project$attributes$m2, _project$attributes$m3, _global$attributes$me, _project$attributes, _project$attributes$s, _project$attributes$s2, _project$attributes$m4, _project$attributes$m5, _project$attributes$m6, _project$attributes$m7, _ref, _project$attributes$m8, _project$attributes$m9, _global$attributes$me2;
   var metaShareImageUrl = (_project$attributes$m = project.attributes.metadata) != null && _project$attributes$m.shareImage ? strapiMediaUrl((_project$attributes$m2 = (_project$attributes$m3 = project.attributes.metadata) == null ? void 0 : _project$attributes$m3.shareImage.media) != null ? _project$attributes$m2 : (_global$attributes$me = global.attributes.metadata.shareImage) == null ? void 0 : _global$attributes$me.media, 'large') : DEFAULT_SHARE_IMAGE;
+  var returnBlogPosts = project.attributes.slices.some(function (slice) {
+    return SECTIONS_WITH_BLOG_POSTS.includes(slice.__component);
+  });
+  var returnProjects = project.attributes.slices.some(function (slice) {
+    return SECTIONS_WITH_PROJECTS.includes(slice.__component);
+  });
   return _extends({}, project, {
     // Portfolio Projects
-    projects: projects,
+    projects: returnProjects ? projects : [],
     // StrapiProject
     attributes: _extends({}, project.attributes, {
       metadata: (project == null || (_project$attributes = project.attributes) == null ? void 0 : _project$attributes.metadata) || global.attributes.metadata
@@ -556,7 +580,7 @@ var mergeGlobalAndStrapiProject = function mergeGlobalAndStrapiProject(context,
       favicon: strapiMediaUrl(global.attributes.favicon, 'thumbnail')
     },
     slices: project.attributes.slices,
-    blogPosts: blogPosts,
+    blogPosts: returnBlogPosts ? blogPosts : [],
     banner: global.attributes.banner,
     topBanner: (project == null ? void 0 : project.attributes.topBanner) || global.attributes.topBanner,
     customerStories: []
@@ -2418,8 +2442,8 @@ var TextWithCard = function TextWithCard(_ref) {
   var slice = _ref.slice,
     projects = _ref.projects;
   var portfolioProject = projects.find(function (p) {
-    var _slice$project, _slice$project2;
-    return ((_slice$project = slice.project) == null ? void 0 : _slice$project.data.attributes.fpmProjectId) && p.id === ((_slice$project2 = slice.project) == null ? void 0 : _slice$project2.data.attributes.fpmProjectId);
+    var _slice$project;
+    return ((_slice$project = slice.project) == null || (_slice$project = _slice$project.data) == null ? void 0 : _slice$project.attributes.fpmProjectId) && p.id === slice.project.data.attributes.fpmProjectId;
   });
   var card = React__default.default.createElement(boemly.GridItem, {
     colSpan: [4, null, null, null, 2],