@mjhls/mjh-framework 1.0.939-segment-test-v12 → 1.0.940

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.
Files changed (31) hide show
  1. package/dist/cjs/ArticleProgramLandingPage.js +1 -1
  2. package/dist/cjs/ExternalResources.js +1 -1
  3. package/dist/cjs/HorizontalArticleListing.js +1 -1
  4. package/dist/cjs/IssueLanding.js +1 -1
  5. package/dist/cjs/{MediaSeriesCard-659279e0.js → MediaSeriesCard-9c11cd19.js} +1 -1
  6. package/dist/cjs/MediaSeriesLanding.js +2 -2
  7. package/dist/cjs/MediaSeriesLandingPaginated.js +2 -2
  8. package/dist/cjs/PartnerDetailListing.js +1 -1
  9. package/dist/cjs/PartnerDetailListingPaginated.js +1 -1
  10. package/dist/cjs/TaxonomyDescription.js +1 -1
  11. package/dist/cjs/VideoProgramLandingPage.js +1 -1
  12. package/dist/cjs/View.js +35 -77
  13. package/dist/cjs/getSerializers.js +1 -1
  14. package/dist/cjs/{index-c991e29a.js → index-3fb58417.js} +7 -55
  15. package/dist/cjs/index.js +1 -1
  16. package/dist/esm/ArticleProgramLandingPage.js +1 -1
  17. package/dist/esm/ExternalResources.js +1 -1
  18. package/dist/esm/HorizontalArticleListing.js +1 -1
  19. package/dist/esm/IssueLanding.js +1 -1
  20. package/dist/esm/{MediaSeriesCard-06c6251a.js → MediaSeriesCard-b864b6d2.js} +1 -1
  21. package/dist/esm/MediaSeriesLanding.js +2 -2
  22. package/dist/esm/MediaSeriesLandingPaginated.js +2 -2
  23. package/dist/esm/PartnerDetailListing.js +1 -1
  24. package/dist/esm/PartnerDetailListingPaginated.js +1 -1
  25. package/dist/esm/TaxonomyDescription.js +1 -1
  26. package/dist/esm/VideoProgramLandingPage.js +1 -1
  27. package/dist/esm/View.js +35 -77
  28. package/dist/esm/getSerializers.js +1 -1
  29. package/dist/esm/{index-6dc67bdb.js → index-70081f22.js} +7 -55
  30. package/dist/esm/index.js +1 -1
  31. package/package.json +1 -1
@@ -5,7 +5,7 @@ var slicedToArray = require('./slicedToArray-067dd3bc.js');
5
5
  var _extends = require('./extends-7c86182f.js');
6
6
  var React = require('react');
7
7
  var BlockContent = require('./BlockContent-9ebd251f.js');
8
- var getSerializers = require('./index-c991e29a.js');
8
+ var getSerializers = require('./index-3fb58417.js');
9
9
  var ArticleSeriesListing = require('./ArticleSeriesListing.js');
10
10
  require('./_commonjsHelpers-06173234.js');
11
11
  require('./core.get-iterator-method-5643aa10.js');
@@ -4,7 +4,7 @@ var _extends = require('./extends-7c86182f.js');
4
4
  var slicedToArray = require('./slicedToArray-067dd3bc.js');
5
5
  var React = require('react');
6
6
  var BlockContent = require('./BlockContent-9ebd251f.js');
7
- var getSerializers = require('./index-c991e29a.js');
7
+ var getSerializers = require('./index-3fb58417.js');
8
8
  var index = require('./index-f86bb269.js');
9
9
  var Router = require('next/router');
10
10
  var Button = require('react-bootstrap/Button');
@@ -5,7 +5,7 @@ var React = require('react');
5
5
  var ArticleCarousel = require('./ArticleCarousel.js');
6
6
  var index_esm = require('./index.esm-d81454e7.js');
7
7
  var BlockContent = require('./BlockContent-9ebd251f.js');
8
- var getSerializers = require('./index-c991e29a.js');
8
+ var getSerializers = require('./index-3fb58417.js');
9
9
  require('./_commonjsHelpers-06173234.js');
10
10
  require('./core.get-iterator-method-5643aa10.js');
11
11
  require('./_object-pie-083f2dd6.js');
@@ -5,7 +5,7 @@ var React = require('react');
5
5
  var QueueDeckExpanded = require('./QueueDeckExpanded.js');
6
6
  var Breadcrumbs = require('./Breadcrumbs.js');
7
7
  var BlockContent = require('./BlockContent-9ebd251f.js');
8
- var getSerializers = require('./index-c991e29a.js');
8
+ var getSerializers = require('./index-3fb58417.js');
9
9
  require('./_commonjsHelpers-06173234.js');
10
10
  require('./core.get-iterator-method-5643aa10.js');
11
11
  require('./_object-pie-083f2dd6.js');
@@ -11,7 +11,7 @@ var urlFor = require('./urlFor.js');
11
11
  var moment = require('./moment-aca40de1.js');
12
12
  var styleInject_es = require('./style-inject.es-dcee06b6.js');
13
13
  var BlockContent = require('./BlockContent-9ebd251f.js');
14
- var getSerializers = require('./index-c991e29a.js');
14
+ var getSerializers = require('./index-3fb58417.js');
15
15
 
16
16
  function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
17
17
 
@@ -5,13 +5,13 @@ var _typeof = require('./typeof-567e31ff.js');
5
5
  var _extends = require('./extends-7c86182f.js');
6
6
  var slicedToArray = require('./slicedToArray-067dd3bc.js');
7
7
  var React = require('react');
8
- var MediaSeriesCard = require('./MediaSeriesCard-659279e0.js');
8
+ var MediaSeriesCard = require('./MediaSeriesCard-9c11cd19.js');
9
9
  require('./index-50be6759.js');
10
10
  require('react-dom');
11
11
  var Link = require('next/link');
12
12
  var MasterDeck = require('./MasterDeck.js');
13
13
  var BlockContent = require('./BlockContent-9ebd251f.js');
14
- var getSerializers = require('./index-c991e29a.js');
14
+ var getSerializers = require('./index-3fb58417.js');
15
15
  require('./_commonjsHelpers-06173234.js');
16
16
  require('./core.get-iterator-method-5643aa10.js');
17
17
  require('./web.dom.iterable-d98303e0.js');
@@ -5,13 +5,13 @@ var _typeof = require('./typeof-567e31ff.js');
5
5
  var _extends = require('./extends-7c86182f.js');
6
6
  var slicedToArray = require('./slicedToArray-067dd3bc.js');
7
7
  var React = require('react');
8
- var MediaSeriesCard = require('./MediaSeriesCard-659279e0.js');
8
+ var MediaSeriesCard = require('./MediaSeriesCard-9c11cd19.js');
9
9
  require('./index-50be6759.js');
10
10
  require('react-dom');
11
11
  var Link = require('next/link');
12
12
  var BlockContent = require('./BlockContent-9ebd251f.js');
13
13
  var MasterDeckPaginated = require('./MasterDeckPaginated.js');
14
- var getSerializers = require('./index-c991e29a.js');
14
+ var getSerializers = require('./index-3fb58417.js');
15
15
  require('./_commonjsHelpers-06173234.js');
16
16
  require('./core.get-iterator-method-5643aa10.js');
17
17
  require('./web.dom.iterable-d98303e0.js');
@@ -13,7 +13,7 @@ var QueueDeckExpanded = require('./QueueDeckExpanded.js');
13
13
  var Breadcrumbs = require('./Breadcrumbs.js');
14
14
  var Feature = require('./Feature.js');
15
15
  var urlFor = require('./urlFor.js');
16
- var getSerializers = require('./index-c991e29a.js');
16
+ var getSerializers = require('./index-3fb58417.js');
17
17
  var BlockContent = require('./BlockContent-9ebd251f.js');
18
18
  require('./_commonjsHelpers-06173234.js');
19
19
  require('./core.get-iterator-method-5643aa10.js');
@@ -13,7 +13,7 @@ var QueueDeckExpandedPaginated = require('./QueueDeckExpandedPaginated.js');
13
13
  var Breadcrumbs = require('./Breadcrumbs.js');
14
14
  var Feature = require('./Feature.js');
15
15
  var urlFor = require('./urlFor.js');
16
- var getSerializers = require('./index-c991e29a.js');
16
+ var getSerializers = require('./index-3fb58417.js');
17
17
  var BlockContent = require('./BlockContent-9ebd251f.js');
18
18
  require('./_commonjsHelpers-06173234.js');
19
19
  require('./core.get-iterator-method-5643aa10.js');
@@ -6,7 +6,7 @@ var React = require('react');
6
6
  var Router = require('next/router');
7
7
  var Head = require('next/head');
8
8
  var BlockContent = require('./BlockContent-9ebd251f.js');
9
- var getSerializers = require('./index-c991e29a.js');
9
+ var getSerializers = require('./index-3fb58417.js');
10
10
  require('./_commonjsHelpers-06173234.js');
11
11
  require('./core.get-iterator-method-5643aa10.js');
12
12
  require('./web.dom.iterable-d98303e0.js');
@@ -7,7 +7,7 @@ var BlockContent = require('./BlockContent-9ebd251f.js');
7
7
  var Col = require('react-bootstrap/Col');
8
8
  var Form = require('react-bootstrap/Form');
9
9
  var Button = require('react-bootstrap/Button');
10
- var getSerializers = require('./index-c991e29a.js');
10
+ var getSerializers = require('./index-3fb58417.js');
11
11
  var VideoSeriesListing = require('./VideoSeriesListing.js');
12
12
  require('./_commonjsHelpers-06173234.js');
13
13
  require('./core.get-iterator-method-5643aa10.js');
package/dist/cjs/View.js CHANGED
@@ -17,7 +17,7 @@ var FormControl = require('react-bootstrap/FormControl');
17
17
  var Button = require('react-bootstrap/Button');
18
18
  var visibilitySensor = require('./visibility-sensor-eb2c5b69.js');
19
19
  var SocialShare = require('./SocialShare.js');
20
- var getSerializers = require('./index-c991e29a.js');
20
+ var getSerializers = require('./index-3fb58417.js');
21
21
  var AdSlot = require('./AdSlot.js');
22
22
  var SeriesSlider = require('./SeriesSlider-ba0c5d1a.js');
23
23
  var getTargeting = require('./getTargeting-3c5754ac.js');
@@ -473,11 +473,10 @@ var Recommended = function Recommended(props) {
473
473
  articles = _useState4[0],
474
474
  setArticles = _useState4[1];
475
475
 
476
- var _useState5 = React.useState('loading'),
476
+ var _useState5 = React.useState(false),
477
477
  _useState6 = slicedToArray._slicedToArray(_useState5, 2),
478
478
  loaded = _useState6[0],
479
- setLoaded = _useState6[1]; //loading, loaded, failed
480
-
479
+ setLoaded = _useState6[1];
481
480
 
482
481
  var starting = index * 5;
483
482
  var contentMapping = {
@@ -503,33 +502,32 @@ var Recommended = function Recommended(props) {
503
502
  categories: stringify._JSON$stringify(mainCategories)
504
503
  });
505
504
  }
506
-
505
+ var anonymousId = analytics.user().anonymousId();
507
506
  // get users traits
508
507
  var getSegmentProfile = function () {
509
508
  var _ref = asyncToGenerator._asyncToGenerator( /*#__PURE__*/asyncToGenerator.regenerator.mark(function _callee() {
510
- var anonymousId, response, data, addTaxonomyName, favoriteCategories, articlesCategory, videosCategory, podcastCategory, taxonomyCategories, taxonomies, articlesQuery, videosQuery, podcastQuery, params, _ref2, _ref3, _articles, videos, podcasts;
509
+ var response, data, addTaxonomyName, favoriteCategories, articlesQuery, videosQuery, podcastQuery, params, _ref2, _ref3, _articles, videos, podcasts;
511
510
 
512
511
  return asyncToGenerator.regenerator.wrap(function _callee$(_context) {
513
512
  while (1) {
514
513
  switch (_context.prev = _context.next) {
515
514
  case 0:
516
- anonymousId = analytics.user().anonymousId();
517
- _context.next = 3;
515
+ _context.next = 2;
518
516
  return fetch('/api/getSegmentProfile', {
519
517
  method: 'POST',
520
518
  body: stringify._JSON$stringify({ anonymousId: anonymousId })
521
519
  });
522
520
 
523
- case 3:
521
+ case 2:
524
522
  response = _context.sent;
525
- _context.next = 6;
523
+ _context.next = 5;
526
524
  return response.json();
527
525
 
528
- case 6:
526
+ case 5:
529
527
  data = _context.sent;
530
528
 
531
529
  if (!(data && data.traits && data.traits.favorite_article_category)) {
532
- _context.next = 40;
530
+ _context.next = 21;
533
531
  break;
534
532
  }
535
533
 
@@ -548,62 +546,30 @@ var Recommended = function Recommended(props) {
548
546
 
549
547
  query = query + ' )';
550
548
 
549
+ console.log(query);
550
+
551
551
  return query;
552
552
  };
553
553
 
554
554
  favoriteCategories = JSON.parse(data.traits.favorite_article_category);
555
-
556
- //grab contentCategory ID
557
-
558
- _context.next = 12;
559
- return client.fetch("*[_type == 'contentCategory' && name == 'Articles'][0]{_id}");
560
-
561
- case 12:
562
- articlesCategory = _context.sent;
563
- _context.next = 15;
564
- return client.fetch("*[_type == 'contentCategory' && name == 'Videos'][0]{_id}");
565
-
566
- case 15:
567
- videosCategory = _context.sent;
568
- _context.next = 18;
569
- return client.fetch("*[_type == 'contentCategory' && name == 'Podcasts'][0]{_id}");
570
-
571
- case 18:
572
- podcastCategory = _context.sent;
573
- _context.next = 21;
574
- return client.fetch('*[_type == \'taxonomy\' ' + addTaxonomyName(favoriteCategories) + ']');
575
-
576
- case 21:
577
- taxonomyCategories = _context.sent;
578
- taxonomies = '';
579
-
580
- taxonomyCategories.forEach(function (taxonomy, index) {
581
- if (index === 0) {
582
- taxonomies = taxonomies + (' && ( references(\'' + taxonomy._id + '\')');
583
- } else {
584
- taxonomies = taxonomies + (' || references(\'' + taxonomy._id + '\')');
585
- }
586
- });
587
- taxonomies = taxonomies + ' )';
588
-
589
555
  // grab 3 articles from sanity different from the one currently being read
590
- articlesQuery = '*[_type == \'article\'\n && !(_id in path("drafts.**"))\n && defined(title)\n && defined(url)\n && is_visible == true \n && passwordLock != true\n && references(\'' + articlesCategory._id + '\')\n ' + taxonomies + '\n && defined(published)\n && _id != $id\n && dateTime(published) <= dateTime(now())] | order(published desc) [' + starting + '...' + (starting + 5) + '] {\n ...,\n title,\n thumbnail,\n url,\n contentCategory->,\n published,\n }';
591
- videosQuery = '*[_type == \'article\'\n && !(_id in path("drafts.**"))\n && defined(title)\n && defined(url)\n && is_visible == true \n && passwordLock != true\n && references(\'' + videosCategory._id + '\')\n ' + taxonomies + '\n && defined(published)\n && _id != $id\n && dateTime(published) <= dateTime(now())] | order(published desc) [' + starting + '...' + (starting + 1) + '] {\n ...,\n title,\n thumbnail,\n url,\n contentCategory->,\n published,\n }';
592
- podcastQuery = '*[_type == \'article\'\n && !(_id in path("drafts.**"))\n && defined(title)\n && defined(url)\n && is_visible == true \n && passwordLock != true\n && references(\'' + podcastCategory._id + '\')\n ' + taxonomies + '\n && defined(published)\n && _id != $id\n && dateTime(published) <= dateTime(now())] | order(published desc) [' + starting + '...' + (starting + 2) + '] {\n ...,\n title,\n thumbnail,\n url,\n contentCategory->,\n published,\n }';
556
+
557
+ articlesQuery = '*[_type == \'article\'\n && !(_id in path("drafts.**"))\n && defined(title)\n && defined(url)\n && is_visible == true \n && passwordLock != true\n && references(*[_type == \'contentCategory\' && name == \'Articles\']._id)\n && references(*[_type == \'taxonomy\' ' + addTaxonomyName(favoriteCategories) + ']._id)\n && defined(published)\n && _id != $id\n && dateTime(published) <= dateTime(now())] | order(published desc) [' + starting + '...' + (starting + 5) + '] {\n ...,\n title,\n thumbnail,\n url,\n contentCategory->,\n published,\n }';
558
+ videosQuery = '*[_type == \'article\'\n && !(_id in path("drafts.**"))\n && defined(title)\n && defined(url)\n && is_visible == true \n && passwordLock != true\n && references(*[_type == \'contentCategory\' && name == \'Videos\']._id)\n && references(*[_type == \'taxonomy\' ' + addTaxonomyName(favoriteCategories) + ' ]._id)\n && defined(published)\n && _id != $id\n && dateTime(published) <= dateTime(now())] | order(published desc) [' + starting + '...' + (starting + 1) + '] {\n ...,\n title,\n thumbnail,\n url,\n contentCategory->,\n published,\n }';
559
+ podcastQuery = '*[_type == \'article\'\n && !(_id in path("drafts.**"))\n && defined(title)\n && defined(url)\n && is_visible == true \n && passwordLock != true\n && references(*[_type == \'contentCategory\' && name == \'Podcasts\']._id)\n && references(*[_type == \'taxonomy\' ' + addTaxonomyName(favoriteCategories) + ']._id)\n && defined(published)\n && _id != $id\n && dateTime(published) <= dateTime(now())] | order(published desc) [' + starting + '...' + (starting + 2) + '] {\n ...,\n title,\n thumbnail,\n url,\n contentCategory->,\n published,\n }';
593
560
  params = {
594
561
  id: article._id
595
562
  };
596
- _context.next = 31;
563
+ _context.next = 15;
597
564
  return asyncToGenerator._Promise.all([client.fetch(articlesQuery, params), client.fetch(videosQuery, params), client.fetch(podcastQuery, params)]);
598
565
 
599
- case 31:
566
+ case 15:
600
567
  _ref2 = _context.sent;
601
568
  _ref3 = slicedToArray._slicedToArray(_ref2, 3);
602
569
  _articles = _ref3[0];
603
570
  videos = _ref3[1];
604
571
  podcasts = _ref3[2];
605
572
 
606
- if (_articles.length === 0) setLoaded('failed');
607
573
  if (_articles) {
608
574
  if (videos[0] && _articles[2]) {
609
575
  _articles[2] = videos[0];
@@ -616,13 +582,8 @@ var Recommended = function Recommended(props) {
616
582
  }
617
583
  setArticles(_articles);
618
584
  }
619
- _context.next = 41;
620
- break;
621
-
622
- case 40:
623
- setLoaded('failed');
624
585
 
625
- case 41:
586
+ case 21:
626
587
  case 'end':
627
588
  return _context.stop();
628
589
  }
@@ -638,13 +599,12 @@ var Recommended = function Recommended(props) {
638
599
  getSegmentProfile();
639
600
  } catch (err) {
640
601
  console.log(err);
641
- setLoaded('failed');
642
602
  }
643
603
  }, [segmentLoaded]);
644
604
 
645
605
  React.useEffect(function () {
646
606
  if (articles && articles.length > 0) {
647
- setLoaded('loaded');
607
+ setLoaded(true);
648
608
  }
649
609
  }, [articles]);
650
610
 
@@ -652,19 +612,18 @@ var Recommended = function Recommended(props) {
652
612
  try {
653
613
  analytics.ready(function () {
654
614
  setSegmentLoaded(function () {
655
- return 'loaded';
615
+ return true;
656
616
  });
657
617
  });
658
618
  } catch (err) {
659
619
  console.log(err);
660
- setLoaded('failed');
661
620
  }
662
621
  }, []);
663
622
 
664
623
  return React__default['default'].createElement(
665
624
  'div',
666
625
  { id: 'recommended' },
667
- loaded === 'loaded' && React__default['default'].createElement(
626
+ loaded ? React__default['default'].createElement(
668
627
  React__default['default'].Fragment,
669
628
  null,
670
629
  React__default['default'].createElement(
@@ -685,7 +644,7 @@ var Recommended = function Recommended(props) {
685
644
  { className: styles.recommendTopImg },
686
645
  React__default['default'].createElement(
687
646
  'a',
688
- { href: '/view/' + article.url.current + '?utm_source=website&utm_medium=dynamic_content&utm_campaign=in_feed_unit' },
647
+ { href: '/view/' + article.url.current },
689
648
  React__default['default'].createElement('img', { src: urlFor({ source: article.thumbnail, client: client, imageHeight: 306, imageWidth: 544 }) })
690
649
  )
691
650
  ),
@@ -704,7 +663,7 @@ var Recommended = function Recommended(props) {
704
663
  ),
705
664
  React__default['default'].createElement(
706
665
  'a',
707
- { href: '/view/' + article.url.current + '?utm_source=website&utm_medium=dynamic_content&utm_campaign=in_feed_unit', className: styles.topLink },
666
+ { href: '/view/' + article.url.current, className: styles.topLink },
708
667
  '>> ',
709
668
  'Read Article'
710
669
  )
@@ -721,7 +680,7 @@ var Recommended = function Recommended(props) {
721
680
  ),
722
681
  React__default['default'].createElement(
723
682
  'a',
724
- { href: '/view/' + article.url.current + '?utm_source=website&utm_medium=dynamic_content&utm_campaign=in_feed_unit' },
683
+ { href: '/view/' + article.url.current },
725
684
  React__default['default'].createElement(
726
685
  'div',
727
686
  { className: styles.smImage },
@@ -737,8 +696,7 @@ var Recommended = function Recommended(props) {
737
696
  }
738
697
  })
739
698
  )
740
- ),
741
- loaded === 'failed' && React__default['default'].createElement(
699
+ ) : React__default['default'].createElement(
742
700
  'section',
743
701
  { id: 'related-content-section', className: 'my-1' },
744
702
  (article.relatedArticle || RelevantTopics({ article: article })) && React__default['default'].createElement(
@@ -1287,7 +1245,7 @@ var Article = React__default['default'].memo(React.forwardRef(function (props, r
1287
1245
  React__default['default'].Fragment,
1288
1246
  null,
1289
1247
  React__default['default'].createElement(BlockContent.BlockContent, _extends._extends({
1290
- serializers: getSerializers.getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, isMediaSeries, contextualADFlag, null, null, targeting, article, meta, authorPrefix, authorImgHeight),
1248
+ serializers: getSerializers.getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, isMediaSeries, contextualADFlag, null, article.Ads, targeting, article, meta, authorPrefix, authorImgHeight),
1291
1249
  blocks: [].concat(toConsumableArray._toConsumableArray(articleBody.slice(0, selectedIndex))),
1292
1250
  imageOptions: { w: 320, h: 240, fit: 'max' }
1293
1251
  }, client.config())),
@@ -1308,7 +1266,7 @@ var Article = React__default['default'].memo(React.forwardRef(function (props, r
1308
1266
  React__default['default'].createElement(AdSlot, _extends._extends({}, payload.contextualVideoAD, { refreshFlag: refreshFlag, checkIsAdFound: checkIsVideoAdFound }))
1309
1267
  ),
1310
1268
  React__default['default'].createElement(BlockContent.BlockContent, _extends._extends({
1311
- serializers: getSerializers.getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, isMediaSeries, null, null, null, targeting, article, meta, authorPrefix, authorImgHeight),
1269
+ serializers: getSerializers.getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, isMediaSeries, null, null, article.Ads, targeting, article, meta, authorPrefix, authorImgHeight),
1312
1270
  blocks: [].concat(toConsumableArray._toConsumableArray(articleBody.slice(selectedIndex))),
1313
1271
  imageOptions: { w: 320, h: 240, fit: 'max' }
1314
1272
  }, client.config()))
@@ -1336,7 +1294,7 @@ var Article = React__default['default'].memo(React.forwardRef(function (props, r
1336
1294
  React__default['default'].Fragment,
1337
1295
  null,
1338
1296
  React__default['default'].createElement(BlockContent.BlockContent, _extends._extends({
1339
- serializers: getSerializers.getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, isMediaSeries, contextualADFlag, null, null, targeting, article, meta, authorPrefix, authorImgHeight),
1297
+ serializers: getSerializers.getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, isMediaSeries, contextualADFlag, null, article.Ads, targeting, article, meta, authorPrefix, authorImgHeight),
1340
1298
  blocks: [].concat(toConsumableArray._toConsumableArray(articleBody.slice(0, _selectedIndex))),
1341
1299
  imageOptions: { w: 320, h: 240, fit: 'max' }
1342
1300
  }, client.config())),
@@ -1352,7 +1310,7 @@ var Article = React__default['default'].memo(React.forwardRef(function (props, r
1352
1310
  ),
1353
1311
  contextualADFlag && React__default['default'].createElement('span', { className: 'clearfix' }),
1354
1312
  React__default['default'].createElement(BlockContent.BlockContent, _extends._extends({
1355
- serializers: getSerializers.getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, isMediaSeries, null, null, null, targeting, article, meta, authorPrefix, authorImgHeight),
1313
+ serializers: getSerializers.getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, isMediaSeries, null, null, article.Ads, targeting, article, meta, authorPrefix, authorImgHeight),
1356
1314
  blocks: [].concat(toConsumableArray._toConsumableArray(articleBody.slice(_selectedIndex))),
1357
1315
  imageOptions: { w: 320, h: 240, fit: 'max' }
1358
1316
  }, client.config()))
@@ -1385,7 +1343,7 @@ var Article = React__default['default'].memo(React.forwardRef(function (props, r
1385
1343
  React__default['default'].Fragment,
1386
1344
  null,
1387
1345
  React__default['default'].createElement(BlockContent.BlockContent, _extends._extends({
1388
- serializers: getSerializers.getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, isMediaSeries, contextualADFlag, null, null, targeting, article, meta, authorPrefix, authorImgHeight),
1346
+ serializers: getSerializers.getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, isMediaSeries, contextualADFlag, null, article.Ads, targeting, article, meta, authorPrefix, authorImgHeight),
1389
1347
  blocks: [].concat(toConsumableArray._toConsumableArray(articleBody.slice(0, _selectedIndex2))),
1390
1348
  imageOptions: { w: 320, h: 240, fit: 'max' }
1391
1349
  }, client.config())),
@@ -1397,7 +1355,7 @@ var Article = React__default['default'].memo(React.forwardRef(function (props, r
1397
1355
  React__default['default'].createElement(AdSlot, _extends._extends({}, payload.contextualVideoAD, { refreshFlag: refreshFlag, checkIsAdFound: _checkIsAdFound2 }))
1398
1356
  ),
1399
1357
  React__default['default'].createElement(BlockContent.BlockContent, _extends._extends({
1400
- serializers: getSerializers.getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, isMediaSeries, null, null, null, targeting, article, meta, authorPrefix, authorImgHeight),
1358
+ serializers: getSerializers.getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, isMediaSeries, null, null, article.Ads, targeting, article, meta, authorPrefix, authorImgHeight),
1401
1359
  blocks: [].concat(toConsumableArray._toConsumableArray(articleBody.slice(_selectedIndex2))),
1402
1360
  imageOptions: { w: 320, h: 240, fit: 'max' }
1403
1361
  }, client.config()))
@@ -1412,13 +1370,13 @@ var Article = React__default['default'].memo(React.forwardRef(function (props, r
1412
1370
  'div',
1413
1371
  null,
1414
1372
  React__default['default'].createElement(BlockContent.BlockContent, _extends._extends({
1415
- serializers: getSerializers.getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, isMediaSeries, false, null, props.article.Ads, targeting, article, meta, authorPrefix, authorImgHeight),
1373
+ serializers: getSerializers.getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, isMediaSeries, false, null, article.Ads, targeting, article, meta, authorPrefix, authorImgHeight),
1416
1374
  blocks: article.documentGroup && article.documentGroup.isSeries ? [].concat(toConsumableArray._toConsumableArray(articleBody.slice(0, _selectedIndex3))) : articleBody,
1417
1375
  imageOptions: { w: 320, h: 240, fit: 'max' }
1418
1376
  }, client.config())),
1419
1377
  article.documentGroup && article.documentGroup.isSeries && sliderData && seriesInfo.hasVideo && React__default['default'].createElement(SeriesSlider.SeriesSlider, { dataset: sliderData, client: client, nowPlaying: article.title, displayEpisodeNumber: true }),
1420
1378
  article.documentGroup && article.documentGroup.isSeries && React__default['default'].createElement(BlockContent.BlockContent, _extends._extends({
1421
- serializers: getSerializers.getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, isMediaSeries, null, null, null, targeting, article, meta, authorPrefix, authorImgHeight),
1379
+ serializers: getSerializers.getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, isMediaSeries, null, null, article.Ads, targeting, article, meta, authorPrefix, authorImgHeight),
1422
1380
  blocks: [].concat(toConsumableArray._toConsumableArray(articleBody.slice(_selectedIndex3))),
1423
1381
  imageOptions: { w: 320, h: 240, fit: 'max' }
1424
1382
  }, client.config()))
@@ -1776,7 +1734,7 @@ var Article = React__default['default'].memo(React.forwardRef(function (props, r
1776
1734
  ISI,
1777
1735
  null,
1778
1736
  React__default['default'].createElement(BlockContent.BlockContent, {
1779
- serializers: getSerializers.getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, false, false, null, props.article.Ads, targeting),
1737
+ serializers: getSerializers.getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, false, false, null, article.Ads, targeting),
1780
1738
  blocks: isi
1781
1739
  })
1782
1740
  ),
@@ -2,7 +2,7 @@
2
2
 
3
3
  require('./extends-7c86182f.js');
4
4
  require('react');
5
- var getSerializers = require('./index-c991e29a.js');
5
+ var getSerializers = require('./index-3fb58417.js');
6
6
  require('./BlockContent-9ebd251f.js');
7
7
  require('./entities-df1aed86.js');
8
8
  require('./_commonjsHelpers-06173234.js');
@@ -8878,21 +8878,23 @@ var ArticleSeries = function ArticleSeries(_ref) {
8878
8878
  client = _ref.client,
8879
8879
  pageview = _ref.pageview,
8880
8880
  getSerializers = _ref.getSerializers,
8881
- accountIDs = _ref.accountIDs,
8882
- Ads = _ref.Ads,
8883
- rootArticle = _ref.rootArticle;
8881
+ accountIDs = _ref.accountIDs;
8882
+ _ref.Ads;
8883
+ var rootArticle = _ref.rootArticle;
8884
8884
 
8885
8885
  if (!nodes || !nodes.articles) {
8886
8886
  return null;
8887
8887
  }
8888
8888
  nodes.seriesTitle = !nodes.seriesTitle ? 'Learning Objectives' : nodes.seriesTitle;
8889
8889
  var today = moment.moment().utc().format();
8890
+ // console.log('ArticleSeries')
8891
+ // console.dir(Ads)
8890
8892
 
8891
8893
  var authorPrefix = 'authors';
8892
8894
  var router = Router.useRouter();
8893
8895
 
8894
8896
  var refArray = React.useRef([]);
8895
- var adRefArray = React.useRef([]);
8897
+ React.useRef([]);
8896
8898
  var articleContainerRef = React.useRef(null);
8897
8899
  var arrowRef = React.useRef(null);
8898
8900
 
@@ -8987,7 +8989,7 @@ var ArticleSeries = function ArticleSeries(_ref) {
8987
8989
  'a',
8988
8990
  { onClick: function onClick(e) {
8989
8991
  return articleCardClickHandler(e);
8990
- }, 'data-cardlabel': '' + articleLabel, 'data-articleIndex': '' + index, 'data-articleid': '' + article.param.current },
8992
+ }, 'data-cardlabel': '' + articleLabel, 'data-articleindex': '' + index, 'data-articleid': '' + article.param.current },
8991
8993
  React__default['default'].createElement(
8992
8994
  'div',
8993
8995
  { className: 'prevNext-thumbnail' },
@@ -9239,31 +9241,6 @@ var ArticleSeries = function ArticleSeries(_ref) {
9239
9241
  )
9240
9242
  ),
9241
9243
  React__default['default'].createElement('hr', { className: 'article-seperater' }),
9242
- React__default['default'].createElement(
9243
- 'div',
9244
- { className: 'ad-box', style: { textAlign: 'center' } },
9245
- main.main_43 && Ads.map(function (ad, index) {
9246
- if (index === 0) {
9247
- return React__default['default'].createElement(
9248
- 'div',
9249
- {
9250
- key: 'addid-1',
9251
- id: 'addid-1',
9252
- ref: function ref(ele) {
9253
- return adRefArray.current[0] = ele;
9254
- },
9255
- style: {
9256
- display: 'flex',
9257
- flex: '1 0 auto',
9258
- justifyContent: 'center',
9259
- alignItems: 'center',
9260
- textAlign: 'center'
9261
- } },
9262
- ad.component
9263
- );
9264
- }
9265
- })
9266
- ),
9267
9244
  React__default['default'].createElement(
9268
9245
  'div',
9269
9246
  { ref: articleContainerRef, className: 'article-container', style: { marginBottom: '2rem' } },
@@ -9360,31 +9337,6 @@ var ArticleSeries = function ArticleSeries(_ref) {
9360
9337
  ),
9361
9338
  React__default['default'].createElement('hr', { className: 'article-seperater' })
9362
9339
  )
9363
- ),
9364
- React__default['default'].createElement(
9365
- 'div',
9366
- { className: 'ad-box', style: { textAlign: 'center' } },
9367
- main.main_43 && Articles.length - 1 !== index && Ads.map(function (ad, innerIndex) {
9368
- if (innerIndex === 0) {
9369
- return React__default['default'].createElement(
9370
- 'div',
9371
- {
9372
- key: 'addid-' + (index + 2),
9373
- id: 'addid-' + (index + 2),
9374
- ref: function ref(ele) {
9375
- return adRefArray.current[index + 1] = ele;
9376
- },
9377
- style: {
9378
- display: 'flex',
9379
- flex: '1 0 auto',
9380
- justifyContent: 'center',
9381
- alignItems: 'center',
9382
- textAlign: 'center'
9383
- } },
9384
- ad.component
9385
- );
9386
- }
9387
- })
9388
9340
  )
9389
9341
  )
9390
9342
  );
package/dist/cjs/index.js CHANGED
@@ -89,7 +89,7 @@ var VerticalHero = require('./VerticalHero.js');
89
89
  var YahooHero = require('./YahooHero.js');
90
90
  var GridHero = require('./GridHero.js');
91
91
  var ConferenceArticleCard = require('./ConferenceArticleCard.js');
92
- var getSerializers = require('./index-c991e29a.js');
92
+ var getSerializers = require('./index-3fb58417.js');
93
93
  var Beam = require('./Beam.js');
94
94
  var Segment = require('./Segment.js');
95
95
  var KMTracker = require('./KMTracker.js');
@@ -3,7 +3,7 @@ import { _ as _slicedToArray } from './slicedToArray-6ebcbfea.js';
3
3
  import { _ as _extends } from './extends-6d8e3924.js';
4
4
  import React__default from 'react';
5
5
  import { B as BlockContent } from './BlockContent-1e73bd2c.js';
6
- import { g as getSerializers } from './index-6dc67bdb.js';
6
+ import { g as getSerializers } from './index-70081f22.js';
7
7
  import ArticleSeriesListing from './ArticleSeriesListing.js';
8
8
  import './_commonjsHelpers-0c4b6f40.js';
9
9
  import './core.get-iterator-method-ea258bb1.js';
@@ -2,7 +2,7 @@ import { _ as _extends } from './extends-6d8e3924.js';
2
2
  import { _ as _slicedToArray } from './slicedToArray-6ebcbfea.js';
3
3
  import React__default, { useState, useEffect } from 'react';
4
4
  import { B as BlockContent } from './BlockContent-1e73bd2c.js';
5
- import { g as getSerializers } from './index-6dc67bdb.js';
5
+ import { g as getSerializers } from './index-70081f22.js';
6
6
  import { m as momentTimezone } from './index-79cfd25c.js';
7
7
  import { useRouter } from 'next/router';
8
8
  import Button from 'react-bootstrap/Button';
@@ -3,7 +3,7 @@ import React__default from 'react';
3
3
  import ArticleCarousel from './ArticleCarousel.js';
4
4
  import { I as IoIosArrowForward } from './index.esm-eb1e8e80.js';
5
5
  import { B as BlockContent } from './BlockContent-1e73bd2c.js';
6
- import { g as getSerializers } from './index-6dc67bdb.js';
6
+ import { g as getSerializers } from './index-70081f22.js';
7
7
  import './_commonjsHelpers-0c4b6f40.js';
8
8
  import './core.get-iterator-method-ea258bb1.js';
9
9
  import './_object-pie-133f504a.js';
@@ -3,7 +3,7 @@ import React__default from 'react';
3
3
  import QueueDeckExpanded from './QueueDeckExpanded.js';
4
4
  import Breadcrumbs from './Breadcrumbs.js';
5
5
  import { B as BlockContent } from './BlockContent-1e73bd2c.js';
6
- import { g as getSerializers } from './index-6dc67bdb.js';
6
+ import { g as getSerializers } from './index-70081f22.js';
7
7
  import './_commonjsHelpers-0c4b6f40.js';
8
8
  import './core.get-iterator-method-ea258bb1.js';
9
9
  import './_object-pie-133f504a.js';
@@ -9,7 +9,7 @@ import urlFor from './urlFor.js';
9
9
  import { m as moment } from './moment-bc12cb97.js';
10
10
  import { s as styleInject } from './style-inject.es-1f59c1d0.js';
11
11
  import { B as BlockContent } from './BlockContent-1e73bd2c.js';
12
- import { g as getSerializers } from './index-6dc67bdb.js';
12
+ import { g as getSerializers } from './index-70081f22.js';
13
13
 
14
14
  /**
15
15
  * Copyright (c) 2013-present, Facebook, Inc.
@@ -3,13 +3,13 @@ import { _ as _typeof } from './typeof-e9fc0c5d.js';
3
3
  import { _ as _extends } from './extends-6d8e3924.js';
4
4
  import { _ as _slicedToArray } from './slicedToArray-6ebcbfea.js';
5
5
  import React__default, { useState, useEffect } from 'react';
6
- import { M as MediaSeriesCard, D as DropdownButton, a as Dropdown } from './MediaSeriesCard-06c6251a.js';
6
+ import { M as MediaSeriesCard, D as DropdownButton, a as Dropdown } from './MediaSeriesCard-b864b6d2.js';
7
7
  import './index-98ca9cec.js';
8
8
  import 'react-dom';
9
9
  import Link from 'next/link';
10
10
  import MasterDeck from './MasterDeck.js';
11
11
  import { B as BlockContent } from './BlockContent-1e73bd2c.js';
12
- import { g as getSerializers } from './index-6dc67bdb.js';
12
+ import { g as getSerializers } from './index-70081f22.js';
13
13
  import './_commonjsHelpers-0c4b6f40.js';
14
14
  import './core.get-iterator-method-ea258bb1.js';
15
15
  import './web.dom.iterable-ab4dea5c.js';
@@ -3,13 +3,13 @@ import { _ as _typeof } from './typeof-e9fc0c5d.js';
3
3
  import { _ as _extends } from './extends-6d8e3924.js';
4
4
  import { _ as _slicedToArray } from './slicedToArray-6ebcbfea.js';
5
5
  import React__default, { useState, useEffect } from 'react';
6
- import { M as MediaSeriesCard, D as DropdownButton, a as Dropdown } from './MediaSeriesCard-06c6251a.js';
6
+ import { M as MediaSeriesCard, D as DropdownButton, a as Dropdown } from './MediaSeriesCard-b864b6d2.js';
7
7
  import './index-98ca9cec.js';
8
8
  import 'react-dom';
9
9
  import Link from 'next/link';
10
10
  import { B as BlockContent } from './BlockContent-1e73bd2c.js';
11
11
  import MasterDeck from './MasterDeckPaginated.js';
12
- import { g as getSerializers } from './index-6dc67bdb.js';
12
+ import { g as getSerializers } from './index-70081f22.js';
13
13
  import './_commonjsHelpers-0c4b6f40.js';
14
14
  import './core.get-iterator-method-ea258bb1.js';
15
15
  import './web.dom.iterable-ab4dea5c.js';
@@ -11,7 +11,7 @@ import QueueDeckExpanded from './QueueDeckExpanded.js';
11
11
  import Breadcrumbs from './Breadcrumbs.js';
12
12
  import Feature from './Feature.js';
13
13
  import urlFor from './urlFor.js';
14
- import { g as getSerializers } from './index-6dc67bdb.js';
14
+ import { g as getSerializers } from './index-70081f22.js';
15
15
  import { B as BlockContent } from './BlockContent-1e73bd2c.js';
16
16
  import './_commonjsHelpers-0c4b6f40.js';
17
17
  import './core.get-iterator-method-ea258bb1.js';
@@ -11,7 +11,7 @@ import QueueDeckExpanded from './QueueDeckExpandedPaginated.js';
11
11
  import Breadcrumbs from './Breadcrumbs.js';
12
12
  import Feature from './Feature.js';
13
13
  import urlFor from './urlFor.js';
14
- import { g as getSerializers } from './index-6dc67bdb.js';
14
+ import { g as getSerializers } from './index-70081f22.js';
15
15
  import { B as BlockContent } from './BlockContent-1e73bd2c.js';
16
16
  import './_commonjsHelpers-0c4b6f40.js';
17
17
  import './core.get-iterator-method-ea258bb1.js';
@@ -4,7 +4,7 @@ import React__default from 'react';
4
4
  import { useRouter } from 'next/router';
5
5
  import Head from 'next/head';
6
6
  import { B as BlockContent } from './BlockContent-1e73bd2c.js';
7
- import { g as getSerializers } from './index-6dc67bdb.js';
7
+ import { g as getSerializers } from './index-70081f22.js';
8
8
  import './_commonjsHelpers-0c4b6f40.js';
9
9
  import './core.get-iterator-method-ea258bb1.js';
10
10
  import './web.dom.iterable-ab4dea5c.js';
@@ -5,7 +5,7 @@ import { B as BlockContent } from './BlockContent-1e73bd2c.js';
5
5
  import Col from 'react-bootstrap/Col';
6
6
  import Form from 'react-bootstrap/Form';
7
7
  import Button from 'react-bootstrap/Button';
8
- import { g as getSerializers } from './index-6dc67bdb.js';
8
+ import { g as getSerializers } from './index-70081f22.js';
9
9
  import VideoSeriesListing from './VideoSeriesListing.js';
10
10
  import './_commonjsHelpers-0c4b6f40.js';
11
11
  import './core.get-iterator-method-ea258bb1.js';
package/dist/esm/View.js CHANGED
@@ -15,7 +15,7 @@ import FormControl from 'react-bootstrap/FormControl';
15
15
  import Button from 'react-bootstrap/Button';
16
16
  import { V as VisibilitySensor } from './visibility-sensor-72fd8f8b.js';
17
17
  import SocialShare from './SocialShare.js';
18
- import { r as renderAuthor, g as getSerializers } from './index-6dc67bdb.js';
18
+ import { r as renderAuthor, g as getSerializers } from './index-70081f22.js';
19
19
  import DFPAdSlot from './AdSlot.js';
20
20
  import { S as SeriesSlider } from './SeriesSlider-45adb8dc.js';
21
21
  import { a as getContentPlacementUrl, g as getTargeting } from './getTargeting-42f9b439.js';
@@ -462,11 +462,10 @@ var Recommended = function Recommended(props) {
462
462
  articles = _useState4[0],
463
463
  setArticles = _useState4[1];
464
464
 
465
- var _useState5 = useState('loading'),
465
+ var _useState5 = useState(false),
466
466
  _useState6 = _slicedToArray(_useState5, 2),
467
467
  loaded = _useState6[0],
468
- setLoaded = _useState6[1]; //loading, loaded, failed
469
-
468
+ setLoaded = _useState6[1];
470
469
 
471
470
  var starting = index * 5;
472
471
  var contentMapping = {
@@ -492,33 +491,32 @@ var Recommended = function Recommended(props) {
492
491
  categories: _JSON$stringify(mainCategories)
493
492
  });
494
493
  }
495
-
494
+ var anonymousId = analytics.user().anonymousId();
496
495
  // get users traits
497
496
  var getSegmentProfile = function () {
498
497
  var _ref = _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee() {
499
- var anonymousId, response, data, addTaxonomyName, favoriteCategories, articlesCategory, videosCategory, podcastCategory, taxonomyCategories, taxonomies, articlesQuery, videosQuery, podcastQuery, params, _ref2, _ref3, _articles, videos, podcasts;
498
+ var response, data, addTaxonomyName, favoriteCategories, articlesQuery, videosQuery, podcastQuery, params, _ref2, _ref3, _articles, videos, podcasts;
500
499
 
501
500
  return regenerator.wrap(function _callee$(_context) {
502
501
  while (1) {
503
502
  switch (_context.prev = _context.next) {
504
503
  case 0:
505
- anonymousId = analytics.user().anonymousId();
506
- _context.next = 3;
504
+ _context.next = 2;
507
505
  return fetch('/api/getSegmentProfile', {
508
506
  method: 'POST',
509
507
  body: _JSON$stringify({ anonymousId: anonymousId })
510
508
  });
511
509
 
512
- case 3:
510
+ case 2:
513
511
  response = _context.sent;
514
- _context.next = 6;
512
+ _context.next = 5;
515
513
  return response.json();
516
514
 
517
- case 6:
515
+ case 5:
518
516
  data = _context.sent;
519
517
 
520
518
  if (!(data && data.traits && data.traits.favorite_article_category)) {
521
- _context.next = 40;
519
+ _context.next = 21;
522
520
  break;
523
521
  }
524
522
 
@@ -537,62 +535,30 @@ var Recommended = function Recommended(props) {
537
535
 
538
536
  query = query + ' )';
539
537
 
538
+ console.log(query);
539
+
540
540
  return query;
541
541
  };
542
542
 
543
543
  favoriteCategories = JSON.parse(data.traits.favorite_article_category);
544
-
545
- //grab contentCategory ID
546
-
547
- _context.next = 12;
548
- return client.fetch("*[_type == 'contentCategory' && name == 'Articles'][0]{_id}");
549
-
550
- case 12:
551
- articlesCategory = _context.sent;
552
- _context.next = 15;
553
- return client.fetch("*[_type == 'contentCategory' && name == 'Videos'][0]{_id}");
554
-
555
- case 15:
556
- videosCategory = _context.sent;
557
- _context.next = 18;
558
- return client.fetch("*[_type == 'contentCategory' && name == 'Podcasts'][0]{_id}");
559
-
560
- case 18:
561
- podcastCategory = _context.sent;
562
- _context.next = 21;
563
- return client.fetch('*[_type == \'taxonomy\' ' + addTaxonomyName(favoriteCategories) + ']');
564
-
565
- case 21:
566
- taxonomyCategories = _context.sent;
567
- taxonomies = '';
568
-
569
- taxonomyCategories.forEach(function (taxonomy, index) {
570
- if (index === 0) {
571
- taxonomies = taxonomies + (' && ( references(\'' + taxonomy._id + '\')');
572
- } else {
573
- taxonomies = taxonomies + (' || references(\'' + taxonomy._id + '\')');
574
- }
575
- });
576
- taxonomies = taxonomies + ' )';
577
-
578
544
  // grab 3 articles from sanity different from the one currently being read
579
- articlesQuery = '*[_type == \'article\'\n && !(_id in path("drafts.**"))\n && defined(title)\n && defined(url)\n && is_visible == true \n && passwordLock != true\n && references(\'' + articlesCategory._id + '\')\n ' + taxonomies + '\n && defined(published)\n && _id != $id\n && dateTime(published) <= dateTime(now())] | order(published desc) [' + starting + '...' + (starting + 5) + '] {\n ...,\n title,\n thumbnail,\n url,\n contentCategory->,\n published,\n }';
580
- videosQuery = '*[_type == \'article\'\n && !(_id in path("drafts.**"))\n && defined(title)\n && defined(url)\n && is_visible == true \n && passwordLock != true\n && references(\'' + videosCategory._id + '\')\n ' + taxonomies + '\n && defined(published)\n && _id != $id\n && dateTime(published) <= dateTime(now())] | order(published desc) [' + starting + '...' + (starting + 1) + '] {\n ...,\n title,\n thumbnail,\n url,\n contentCategory->,\n published,\n }';
581
- podcastQuery = '*[_type == \'article\'\n && !(_id in path("drafts.**"))\n && defined(title)\n && defined(url)\n && is_visible == true \n && passwordLock != true\n && references(\'' + podcastCategory._id + '\')\n ' + taxonomies + '\n && defined(published)\n && _id != $id\n && dateTime(published) <= dateTime(now())] | order(published desc) [' + starting + '...' + (starting + 2) + '] {\n ...,\n title,\n thumbnail,\n url,\n contentCategory->,\n published,\n }';
545
+
546
+ articlesQuery = '*[_type == \'article\'\n && !(_id in path("drafts.**"))\n && defined(title)\n && defined(url)\n && is_visible == true \n && passwordLock != true\n && references(*[_type == \'contentCategory\' && name == \'Articles\']._id)\n && references(*[_type == \'taxonomy\' ' + addTaxonomyName(favoriteCategories) + ']._id)\n && defined(published)\n && _id != $id\n && dateTime(published) <= dateTime(now())] | order(published desc) [' + starting + '...' + (starting + 5) + '] {\n ...,\n title,\n thumbnail,\n url,\n contentCategory->,\n published,\n }';
547
+ videosQuery = '*[_type == \'article\'\n && !(_id in path("drafts.**"))\n && defined(title)\n && defined(url)\n && is_visible == true \n && passwordLock != true\n && references(*[_type == \'contentCategory\' && name == \'Videos\']._id)\n && references(*[_type == \'taxonomy\' ' + addTaxonomyName(favoriteCategories) + ' ]._id)\n && defined(published)\n && _id != $id\n && dateTime(published) <= dateTime(now())] | order(published desc) [' + starting + '...' + (starting + 1) + '] {\n ...,\n title,\n thumbnail,\n url,\n contentCategory->,\n published,\n }';
548
+ podcastQuery = '*[_type == \'article\'\n && !(_id in path("drafts.**"))\n && defined(title)\n && defined(url)\n && is_visible == true \n && passwordLock != true\n && references(*[_type == \'contentCategory\' && name == \'Podcasts\']._id)\n && references(*[_type == \'taxonomy\' ' + addTaxonomyName(favoriteCategories) + ']._id)\n && defined(published)\n && _id != $id\n && dateTime(published) <= dateTime(now())] | order(published desc) [' + starting + '...' + (starting + 2) + '] {\n ...,\n title,\n thumbnail,\n url,\n contentCategory->,\n published,\n }';
582
549
  params = {
583
550
  id: article._id
584
551
  };
585
- _context.next = 31;
552
+ _context.next = 15;
586
553
  return _Promise.all([client.fetch(articlesQuery, params), client.fetch(videosQuery, params), client.fetch(podcastQuery, params)]);
587
554
 
588
- case 31:
555
+ case 15:
589
556
  _ref2 = _context.sent;
590
557
  _ref3 = _slicedToArray(_ref2, 3);
591
558
  _articles = _ref3[0];
592
559
  videos = _ref3[1];
593
560
  podcasts = _ref3[2];
594
561
 
595
- if (_articles.length === 0) setLoaded('failed');
596
562
  if (_articles) {
597
563
  if (videos[0] && _articles[2]) {
598
564
  _articles[2] = videos[0];
@@ -605,13 +571,8 @@ var Recommended = function Recommended(props) {
605
571
  }
606
572
  setArticles(_articles);
607
573
  }
608
- _context.next = 41;
609
- break;
610
-
611
- case 40:
612
- setLoaded('failed');
613
574
 
614
- case 41:
575
+ case 21:
615
576
  case 'end':
616
577
  return _context.stop();
617
578
  }
@@ -627,13 +588,12 @@ var Recommended = function Recommended(props) {
627
588
  getSegmentProfile();
628
589
  } catch (err) {
629
590
  console.log(err);
630
- setLoaded('failed');
631
591
  }
632
592
  }, [segmentLoaded]);
633
593
 
634
594
  useEffect(function () {
635
595
  if (articles && articles.length > 0) {
636
- setLoaded('loaded');
596
+ setLoaded(true);
637
597
  }
638
598
  }, [articles]);
639
599
 
@@ -641,19 +601,18 @@ var Recommended = function Recommended(props) {
641
601
  try {
642
602
  analytics.ready(function () {
643
603
  setSegmentLoaded(function () {
644
- return 'loaded';
604
+ return true;
645
605
  });
646
606
  });
647
607
  } catch (err) {
648
608
  console.log(err);
649
- setLoaded('failed');
650
609
  }
651
610
  }, []);
652
611
 
653
612
  return React__default.createElement(
654
613
  'div',
655
614
  { id: 'recommended' },
656
- loaded === 'loaded' && React__default.createElement(
615
+ loaded ? React__default.createElement(
657
616
  React__default.Fragment,
658
617
  null,
659
618
  React__default.createElement(
@@ -674,7 +633,7 @@ var Recommended = function Recommended(props) {
674
633
  { className: styles.recommendTopImg },
675
634
  React__default.createElement(
676
635
  'a',
677
- { href: '/view/' + article.url.current + '?utm_source=website&utm_medium=dynamic_content&utm_campaign=in_feed_unit' },
636
+ { href: '/view/' + article.url.current },
678
637
  React__default.createElement('img', { src: urlFor({ source: article.thumbnail, client: client, imageHeight: 306, imageWidth: 544 }) })
679
638
  )
680
639
  ),
@@ -693,7 +652,7 @@ var Recommended = function Recommended(props) {
693
652
  ),
694
653
  React__default.createElement(
695
654
  'a',
696
- { href: '/view/' + article.url.current + '?utm_source=website&utm_medium=dynamic_content&utm_campaign=in_feed_unit', className: styles.topLink },
655
+ { href: '/view/' + article.url.current, className: styles.topLink },
697
656
  '>> ',
698
657
  'Read Article'
699
658
  )
@@ -710,7 +669,7 @@ var Recommended = function Recommended(props) {
710
669
  ),
711
670
  React__default.createElement(
712
671
  'a',
713
- { href: '/view/' + article.url.current + '?utm_source=website&utm_medium=dynamic_content&utm_campaign=in_feed_unit' },
672
+ { href: '/view/' + article.url.current },
714
673
  React__default.createElement(
715
674
  'div',
716
675
  { className: styles.smImage },
@@ -726,8 +685,7 @@ var Recommended = function Recommended(props) {
726
685
  }
727
686
  })
728
687
  )
729
- ),
730
- loaded === 'failed' && React__default.createElement(
688
+ ) : React__default.createElement(
731
689
  'section',
732
690
  { id: 'related-content-section', className: 'my-1' },
733
691
  (article.relatedArticle || RelevantTopics({ article: article })) && React__default.createElement(
@@ -1276,7 +1234,7 @@ var Article = React__default.memo(forwardRef(function (props, ref) {
1276
1234
  React__default.Fragment,
1277
1235
  null,
1278
1236
  React__default.createElement(BlockContent, _extends({
1279
- serializers: getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, isMediaSeries, contextualADFlag, null, null, targeting, article, meta, authorPrefix, authorImgHeight),
1237
+ serializers: getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, isMediaSeries, contextualADFlag, null, article.Ads, targeting, article, meta, authorPrefix, authorImgHeight),
1280
1238
  blocks: [].concat(_toConsumableArray(articleBody.slice(0, selectedIndex))),
1281
1239
  imageOptions: { w: 320, h: 240, fit: 'max' }
1282
1240
  }, client.config())),
@@ -1297,7 +1255,7 @@ var Article = React__default.memo(forwardRef(function (props, ref) {
1297
1255
  React__default.createElement(DFPAdSlot, _extends({}, payload.contextualVideoAD, { refreshFlag: refreshFlag, checkIsAdFound: checkIsVideoAdFound }))
1298
1256
  ),
1299
1257
  React__default.createElement(BlockContent, _extends({
1300
- serializers: getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, isMediaSeries, null, null, null, targeting, article, meta, authorPrefix, authorImgHeight),
1258
+ serializers: getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, isMediaSeries, null, null, article.Ads, targeting, article, meta, authorPrefix, authorImgHeight),
1301
1259
  blocks: [].concat(_toConsumableArray(articleBody.slice(selectedIndex))),
1302
1260
  imageOptions: { w: 320, h: 240, fit: 'max' }
1303
1261
  }, client.config()))
@@ -1325,7 +1283,7 @@ var Article = React__default.memo(forwardRef(function (props, ref) {
1325
1283
  React__default.Fragment,
1326
1284
  null,
1327
1285
  React__default.createElement(BlockContent, _extends({
1328
- serializers: getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, isMediaSeries, contextualADFlag, null, null, targeting, article, meta, authorPrefix, authorImgHeight),
1286
+ serializers: getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, isMediaSeries, contextualADFlag, null, article.Ads, targeting, article, meta, authorPrefix, authorImgHeight),
1329
1287
  blocks: [].concat(_toConsumableArray(articleBody.slice(0, _selectedIndex))),
1330
1288
  imageOptions: { w: 320, h: 240, fit: 'max' }
1331
1289
  }, client.config())),
@@ -1341,7 +1299,7 @@ var Article = React__default.memo(forwardRef(function (props, ref) {
1341
1299
  ),
1342
1300
  contextualADFlag && React__default.createElement('span', { className: 'clearfix' }),
1343
1301
  React__default.createElement(BlockContent, _extends({
1344
- serializers: getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, isMediaSeries, null, null, null, targeting, article, meta, authorPrefix, authorImgHeight),
1302
+ serializers: getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, isMediaSeries, null, null, article.Ads, targeting, article, meta, authorPrefix, authorImgHeight),
1345
1303
  blocks: [].concat(_toConsumableArray(articleBody.slice(_selectedIndex))),
1346
1304
  imageOptions: { w: 320, h: 240, fit: 'max' }
1347
1305
  }, client.config()))
@@ -1374,7 +1332,7 @@ var Article = React__default.memo(forwardRef(function (props, ref) {
1374
1332
  React__default.Fragment,
1375
1333
  null,
1376
1334
  React__default.createElement(BlockContent, _extends({
1377
- serializers: getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, isMediaSeries, contextualADFlag, null, null, targeting, article, meta, authorPrefix, authorImgHeight),
1335
+ serializers: getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, isMediaSeries, contextualADFlag, null, article.Ads, targeting, article, meta, authorPrefix, authorImgHeight),
1378
1336
  blocks: [].concat(_toConsumableArray(articleBody.slice(0, _selectedIndex2))),
1379
1337
  imageOptions: { w: 320, h: 240, fit: 'max' }
1380
1338
  }, client.config())),
@@ -1386,7 +1344,7 @@ var Article = React__default.memo(forwardRef(function (props, ref) {
1386
1344
  React__default.createElement(DFPAdSlot, _extends({}, payload.contextualVideoAD, { refreshFlag: refreshFlag, checkIsAdFound: _checkIsAdFound2 }))
1387
1345
  ),
1388
1346
  React__default.createElement(BlockContent, _extends({
1389
- serializers: getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, isMediaSeries, null, null, null, targeting, article, meta, authorPrefix, authorImgHeight),
1347
+ serializers: getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, isMediaSeries, null, null, article.Ads, targeting, article, meta, authorPrefix, authorImgHeight),
1390
1348
  blocks: [].concat(_toConsumableArray(articleBody.slice(_selectedIndex2))),
1391
1349
  imageOptions: { w: 320, h: 240, fit: 'max' }
1392
1350
  }, client.config()))
@@ -1401,13 +1359,13 @@ var Article = React__default.memo(forwardRef(function (props, ref) {
1401
1359
  'div',
1402
1360
  null,
1403
1361
  React__default.createElement(BlockContent, _extends({
1404
- serializers: getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, isMediaSeries, false, null, props.article.Ads, targeting, article, meta, authorPrefix, authorImgHeight),
1362
+ serializers: getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, isMediaSeries, false, null, article.Ads, targeting, article, meta, authorPrefix, authorImgHeight),
1405
1363
  blocks: article.documentGroup && article.documentGroup.isSeries ? [].concat(_toConsumableArray(articleBody.slice(0, _selectedIndex3))) : articleBody,
1406
1364
  imageOptions: { w: 320, h: 240, fit: 'max' }
1407
1365
  }, client.config())),
1408
1366
  article.documentGroup && article.documentGroup.isSeries && sliderData && seriesInfo.hasVideo && React__default.createElement(SeriesSlider, { dataset: sliderData, client: client, nowPlaying: article.title, displayEpisodeNumber: true }),
1409
1367
  article.documentGroup && article.documentGroup.isSeries && React__default.createElement(BlockContent, _extends({
1410
- serializers: getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, isMediaSeries, null, null, null, targeting, article, meta, authorPrefix, authorImgHeight),
1368
+ serializers: getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, isMediaSeries, null, null, article.Ads, targeting, article, meta, authorPrefix, authorImgHeight),
1411
1369
  blocks: [].concat(_toConsumableArray(articleBody.slice(_selectedIndex3))),
1412
1370
  imageOptions: { w: 320, h: 240, fit: 'max' }
1413
1371
  }, client.config()))
@@ -1765,7 +1723,7 @@ var Article = React__default.memo(forwardRef(function (props, ref) {
1765
1723
  ISI,
1766
1724
  null,
1767
1725
  React__default.createElement(BlockContent, {
1768
- serializers: getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, false, false, null, props.article.Ads, targeting),
1726
+ serializers: getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, false, false, null, article.Ads, targeting),
1769
1727
  blocks: isi
1770
1728
  })
1771
1729
  ),
@@ -1,6 +1,6 @@
1
1
  import './extends-6d8e3924.js';
2
2
  import 'react';
3
- export { g as default } from './index-6dc67bdb.js';
3
+ export { g as default } from './index-70081f22.js';
4
4
  import './BlockContent-1e73bd2c.js';
5
5
  import './entities-6d9154b4.js';
6
6
  import './_commonjsHelpers-0c4b6f40.js';
@@ -8859,21 +8859,23 @@ var ArticleSeries = function ArticleSeries(_ref) {
8859
8859
  client = _ref.client,
8860
8860
  pageview = _ref.pageview,
8861
8861
  getSerializers = _ref.getSerializers,
8862
- accountIDs = _ref.accountIDs,
8863
- Ads = _ref.Ads,
8864
- rootArticle = _ref.rootArticle;
8862
+ accountIDs = _ref.accountIDs;
8863
+ _ref.Ads;
8864
+ var rootArticle = _ref.rootArticle;
8865
8865
 
8866
8866
  if (!nodes || !nodes.articles) {
8867
8867
  return null;
8868
8868
  }
8869
8869
  nodes.seriesTitle = !nodes.seriesTitle ? 'Learning Objectives' : nodes.seriesTitle;
8870
8870
  var today = moment().utc().format();
8871
+ // console.log('ArticleSeries')
8872
+ // console.dir(Ads)
8871
8873
 
8872
8874
  var authorPrefix = 'authors';
8873
8875
  var router = useRouter();
8874
8876
 
8875
8877
  var refArray = useRef([]);
8876
- var adRefArray = useRef([]);
8878
+ useRef([]);
8877
8879
  var articleContainerRef = useRef(null);
8878
8880
  var arrowRef = useRef(null);
8879
8881
 
@@ -8968,7 +8970,7 @@ var ArticleSeries = function ArticleSeries(_ref) {
8968
8970
  'a',
8969
8971
  { onClick: function onClick(e) {
8970
8972
  return articleCardClickHandler(e);
8971
- }, 'data-cardlabel': '' + articleLabel, 'data-articleIndex': '' + index, 'data-articleid': '' + article.param.current },
8973
+ }, 'data-cardlabel': '' + articleLabel, 'data-articleindex': '' + index, 'data-articleid': '' + article.param.current },
8972
8974
  React__default.createElement(
8973
8975
  'div',
8974
8976
  { className: 'prevNext-thumbnail' },
@@ -9220,31 +9222,6 @@ var ArticleSeries = function ArticleSeries(_ref) {
9220
9222
  )
9221
9223
  ),
9222
9224
  React__default.createElement('hr', { className: 'article-seperater' }),
9223
- React__default.createElement(
9224
- 'div',
9225
- { className: 'ad-box', style: { textAlign: 'center' } },
9226
- main_43 && Ads.map(function (ad, index) {
9227
- if (index === 0) {
9228
- return React__default.createElement(
9229
- 'div',
9230
- {
9231
- key: 'addid-1',
9232
- id: 'addid-1',
9233
- ref: function ref(ele) {
9234
- return adRefArray.current[0] = ele;
9235
- },
9236
- style: {
9237
- display: 'flex',
9238
- flex: '1 0 auto',
9239
- justifyContent: 'center',
9240
- alignItems: 'center',
9241
- textAlign: 'center'
9242
- } },
9243
- ad.component
9244
- );
9245
- }
9246
- })
9247
- ),
9248
9225
  React__default.createElement(
9249
9226
  'div',
9250
9227
  { ref: articleContainerRef, className: 'article-container', style: { marginBottom: '2rem' } },
@@ -9341,31 +9318,6 @@ var ArticleSeries = function ArticleSeries(_ref) {
9341
9318
  ),
9342
9319
  React__default.createElement('hr', { className: 'article-seperater' })
9343
9320
  )
9344
- ),
9345
- React__default.createElement(
9346
- 'div',
9347
- { className: 'ad-box', style: { textAlign: 'center' } },
9348
- main_43 && Articles.length - 1 !== index && Ads.map(function (ad, innerIndex) {
9349
- if (innerIndex === 0) {
9350
- return React__default.createElement(
9351
- 'div',
9352
- {
9353
- key: 'addid-' + (index + 2),
9354
- id: 'addid-' + (index + 2),
9355
- ref: function ref(ele) {
9356
- return adRefArray.current[index + 1] = ele;
9357
- },
9358
- style: {
9359
- display: 'flex',
9360
- flex: '1 0 auto',
9361
- justifyContent: 'center',
9362
- alignItems: 'center',
9363
- textAlign: 'center'
9364
- } },
9365
- ad.component
9366
- );
9367
- }
9368
- })
9369
9321
  )
9370
9322
  )
9371
9323
  );
package/dist/esm/index.js CHANGED
@@ -86,7 +86,7 @@ export { default as VerticalHero } from './VerticalHero.js';
86
86
  export { default as YahooHero } from './YahooHero.js';
87
87
  export { default as GridHero } from './GridHero.js';
88
88
  export { default as ConferenceArticleCard } from './ConferenceArticleCard.js';
89
- export { g as getSerializers } from './index-6dc67bdb.js';
89
+ export { g as getSerializers } from './index-70081f22.js';
90
90
  export { default as Beam } from './Beam.js';
91
91
  export { default as Segment } from './Segment.js';
92
92
  export { default as KMTracker } from './KMTracker.js';
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@mjhls/mjh-framework",
3
- "version": "1.0.939-segment-test-v12",
3
+ "version": "1.0.940",
4
4
  "description": "Foundation Framework",
5
5
  "author": "mjh-framework",
6
6
  "license": "MIT",