@treely/strapi-slices 3.2.0 → 3.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +11 -2
- package/dist/slices/TextWithCard/TextWithCard.d.ts +4 -2
- package/dist/strapi-slices.cjs.development.js +34 -10
- package/dist/strapi-slices.cjs.development.js.map +1 -1
- package/dist/strapi-slices.cjs.production.min.js +1 -1
- package/dist/strapi-slices.cjs.production.min.js.map +1 -1
- package/dist/strapi-slices.esm.js +34 -10
- package/dist/strapi-slices.esm.js.map +1 -1
- package/package.json +1 -1
- package/src/slices/TextWithCard/TextWithCard.tsx +4 -4
- package/src/utils/mergeGlobalAndStrapiBlogPostData.test.ts +47 -0
- package/src/utils/mergeGlobalAndStrapiBlogPostData.ts +11 -2
- package/src/utils/mergeGlobalAndStrapiCustomerStoryData.test.ts +21 -0
- package/src/utils/mergeGlobalAndStrapiCustomerStoryData.ts +6 -1
- package/src/utils/mergeGlobalAndStrapiPageData.test.ts +66 -0
- package/src/utils/mergeGlobalAndStrapiPageData.ts +16 -3
- package/src/utils/mergeGlobalAndStrapiProjectData.test.ts +40 -0
- package/src/utils/mergeGlobalAndStrapiProjectData.ts +11 -2
|
@@ -404,9 +404,15 @@ var DEFAULT_SHARE_ALT = 'Share Image';
|
|
|
404
404
|
var mergeGlobalAndStrapiBlogPostData = function mergeGlobalAndStrapiBlogPostData(context, global, post, blog, projects) {
|
|
405
405
|
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;
|
|
406
406
|
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;
|
|
407
|
+
var returnBlog = post.attributes.slices.some(function (slice) {
|
|
408
|
+
return SECTIONS_WITH_BLOG_POSTS.includes(slice.__component);
|
|
409
|
+
});
|
|
410
|
+
var returnProjects = post.attributes.slices.some(function (slice) {
|
|
411
|
+
return SECTIONS_WITH_PROJECTS.includes(slice.__component);
|
|
412
|
+
});
|
|
407
413
|
return _extends({}, post, {
|
|
408
414
|
// Portfolio Projects
|
|
409
|
-
projects: projects,
|
|
415
|
+
projects: returnProjects ? projects : [],
|
|
410
416
|
// StrapiBlogPost
|
|
411
417
|
attributes: _extends({}, post == null ? void 0 : post.attributes, {
|
|
412
418
|
metadata: (post == null || (_post$attributes = post.attributes) == null ? void 0 : _post$attributes.metadata) || global.attributes.metadata
|
|
@@ -430,7 +436,7 @@ var mergeGlobalAndStrapiBlogPostData = function mergeGlobalAndStrapiBlogPostData
|
|
|
430
436
|
favicon: strapiMediaUrl(global.attributes.favicon, 'thumbnail')
|
|
431
437
|
},
|
|
432
438
|
slices: post == null ? void 0 : post.attributes.slices,
|
|
433
|
-
blogPosts: blog,
|
|
439
|
+
blogPosts: returnBlog ? blog : [],
|
|
434
440
|
banner: global.attributes.banner,
|
|
435
441
|
topBanner: (post == null ? void 0 : post.attributes.topBanner) || global.attributes.topBanner,
|
|
436
442
|
customerStories: []
|
|
@@ -440,6 +446,9 @@ var mergeGlobalAndStrapiBlogPostData = function mergeGlobalAndStrapiBlogPostData
|
|
|
440
446
|
var mergeGlobalAndStrapiCustomerStoryData = function mergeGlobalAndStrapiCustomerStoryData(context, global, customerStory, customerStories) {
|
|
441
447
|
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;
|
|
442
448
|
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;
|
|
449
|
+
var returnCustomerStories = customerStory.attributes.slices.some(function (slice) {
|
|
450
|
+
return SECTIONS_WITH_CUSTOMER_STORIES.includes(slice.__component);
|
|
451
|
+
});
|
|
443
452
|
return _extends({}, customerStory, {
|
|
444
453
|
// Portfolio Projects
|
|
445
454
|
projects: [],
|
|
@@ -465,7 +474,7 @@ var mergeGlobalAndStrapiCustomerStoryData = function mergeGlobalAndStrapiCustome
|
|
|
465
474
|
favicon: strapiMediaUrl(global.attributes.favicon, 'thumbnail')
|
|
466
475
|
},
|
|
467
476
|
slices: customerStory == null ? void 0 : customerStory.attributes.slices,
|
|
468
|
-
customerStories: customerStories,
|
|
477
|
+
customerStories: returnCustomerStories ? customerStories : [],
|
|
469
478
|
banner: global.attributes.banner,
|
|
470
479
|
topBanner: (customerStory == null ? void 0 : customerStory.attributes.topBanner) || global.attributes.topBanner,
|
|
471
480
|
blogPosts: []
|
|
@@ -481,9 +490,18 @@ var SECTIONS_WITH_PROJECTS = ['sections.projects-grid', 'sections.projects-map',
|
|
|
481
490
|
var mergeGlobalAndStrapiPageData = function mergeGlobalAndStrapiPageData(context, global, page, blogPosts, customerStories, projects) {
|
|
482
491
|
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;
|
|
483
492
|
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;
|
|
493
|
+
var returnBlogPosts = page.attributes.slices.some(function (slice) {
|
|
494
|
+
return SECTIONS_WITH_BLOG_POSTS.includes(slice.__component);
|
|
495
|
+
});
|
|
496
|
+
var returnCustomerStories = page.attributes.slices.some(function (slice) {
|
|
497
|
+
return SECTIONS_WITH_CUSTOMER_STORIES.includes(slice.__component);
|
|
498
|
+
});
|
|
499
|
+
var returnProjects = page.attributes.slices.some(function (slice) {
|
|
500
|
+
return SECTIONS_WITH_PROJECTS.includes(slice.__component);
|
|
501
|
+
});
|
|
484
502
|
return _extends({}, page, {
|
|
485
503
|
// Portfolio Projects
|
|
486
|
-
projects: projects,
|
|
504
|
+
projects: returnProjects ? projects : [],
|
|
487
505
|
// StrapiPage
|
|
488
506
|
attributes: _extends({}, page == null ? void 0 : page.attributes, {
|
|
489
507
|
metadata: (_page$attributes$meta4 = page == null || (_page$attributes = page.attributes) == null ? void 0 : _page$attributes.metadata) != null ? _page$attributes$meta4 : global.attributes.metadata
|
|
@@ -507,19 +525,25 @@ var mergeGlobalAndStrapiPageData = function mergeGlobalAndStrapiPageData(context
|
|
|
507
525
|
favicon: strapiMediaUrl(global.attributes.favicon, 'thumbnail')
|
|
508
526
|
},
|
|
509
527
|
slices: page == null ? void 0 : page.attributes.slices,
|
|
510
|
-
blogPosts: blogPosts,
|
|
528
|
+
blogPosts: returnBlogPosts ? blogPosts : [],
|
|
511
529
|
banner: global.attributes.banner,
|
|
512
530
|
topBanner: (page == null ? void 0 : page.attributes.topBanner) || global.attributes.topBanner,
|
|
513
|
-
customerStories: customerStories
|
|
531
|
+
customerStories: returnCustomerStories ? customerStories : []
|
|
514
532
|
});
|
|
515
533
|
};
|
|
516
534
|
|
|
517
535
|
var mergeGlobalAndStrapiProject = function mergeGlobalAndStrapiProject(context, global, project, blogPosts, projects) {
|
|
518
536
|
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;
|
|
519
537
|
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;
|
|
538
|
+
var returnBlogPosts = project.attributes.slices.some(function (slice) {
|
|
539
|
+
return SECTIONS_WITH_BLOG_POSTS.includes(slice.__component);
|
|
540
|
+
});
|
|
541
|
+
var returnProjects = project.attributes.slices.some(function (slice) {
|
|
542
|
+
return SECTIONS_WITH_PROJECTS.includes(slice.__component);
|
|
543
|
+
});
|
|
520
544
|
return _extends({}, project, {
|
|
521
545
|
// Portfolio Projects
|
|
522
|
-
projects: projects,
|
|
546
|
+
projects: returnProjects ? projects : [],
|
|
523
547
|
// StrapiProject
|
|
524
548
|
attributes: _extends({}, project.attributes, {
|
|
525
549
|
metadata: (project == null || (_project$attributes = project.attributes) == null ? void 0 : _project$attributes.metadata) || global.attributes.metadata
|
|
@@ -543,7 +567,7 @@ var mergeGlobalAndStrapiProject = function mergeGlobalAndStrapiProject(context,
|
|
|
543
567
|
favicon: strapiMediaUrl(global.attributes.favicon, 'thumbnail')
|
|
544
568
|
},
|
|
545
569
|
slices: project.attributes.slices,
|
|
546
|
-
blogPosts: blogPosts,
|
|
570
|
+
blogPosts: returnBlogPosts ? blogPosts : [],
|
|
547
571
|
banner: global.attributes.banner,
|
|
548
572
|
topBanner: (project == null ? void 0 : project.attributes.topBanner) || global.attributes.topBanner,
|
|
549
573
|
customerStories: []
|
|
@@ -2405,8 +2429,8 @@ var TextWithCard = function TextWithCard(_ref) {
|
|
|
2405
2429
|
var slice = _ref.slice,
|
|
2406
2430
|
projects = _ref.projects;
|
|
2407
2431
|
var portfolioProject = projects.find(function (p) {
|
|
2408
|
-
var _slice$project
|
|
2409
|
-
return ((_slice$project = slice.project) == null ? void 0 : _slice$project.
|
|
2432
|
+
var _slice$project;
|
|
2433
|
+
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;
|
|
2410
2434
|
});
|
|
2411
2435
|
var card = React.createElement(GridItem, {
|
|
2412
2436
|
colSpan: [4, null, null, null, 2],
|