@mjhls/mjh-framework 1.0.665-beta.4 → 1.0.665

package/dist/cjs/View.js

@@ -10,29 +10,29 @@ require('./_iter-detect-60b2f026.js');
 var toConsumableArray = require('./toConsumableArray-9a3476fe.js');
 require('./core.get-iterator-method-f62321d4.js');
 require('./_object-pie-68c5bcbc.js');
-var _extends$1 = require('./extends-60837c34.js');
+var _extends = require('./extends-60837c34.js');
 require('./_object-sap-5e74ba08.js');
 require('./inherits-513d81cd.js');
 require('./define-property-f4d12f4e.js');
 require('./web.dom.iterable-a0e279c1.js');
-var _typeof = require('./typeof-725500bc.js');
+var _typeof$1 = require('./typeof-725500bc.js');
 require('./_is-array-754e012d.js');
 var React = require('react');
 var React__default = _interopDefault(React);
-var index = require('./index-fa8ed292.js');
+var index = require('./index-2d0a4911.js');
 require('prop-types');
 require('react-bootstrap/Row');
 require('react-bootstrap/Col');
-var moment = require('./moment-575fe24c.js');
+var moment = require('./moment-66a6a284.js');
 var Router = require('next/router');
 var Router__default = _interopDefault(Router);
 require('./isSymbol-04666465.js');
 require('./debounce-eb287781.js');
-var index_es = require('./index.es-9110add6.js');
+var index_es = require('./index.es-ab3f2690.js');
 require('react-dom');
-require('./index-be0c82be.js');
+require('./index-b5eb3ff8.js');
 require('./index-da796b8c.js');
-var main = require('./main-a4cb15bb.js');
+var main = require('./main-b6c96c8d.js');
 require('./entities-310b46ee.js');
 var stringify = require('./stringify-7c5aff47.js');
 var slicedToArray = require('./slicedToArray-8f385299.js');
@@ -40,14 +40,14 @@ var asyncToGenerator = require('./asyncToGenerator-533d476a.js');
 require('./_set-species-f92c67c5.js');
 require('./beam-7217b7e7.js');
 var AdSlot = require('./AdSlot.js');
-var BlockContent = require('./BlockContent-091a991f.js');
+var BlockContent = require('./BlockContent-88f69acd.js');
 require('./smoothscroll-95231a70.js');
 require('./GroupDeck.js');
 require('react-bootstrap');
 var Button = _interopDefault(require('react-bootstrap/Button'));
 var defineProperty$1 = require('./defineProperty-55548b25.js');
 var Form = _interopDefault(require('react-bootstrap/Form'));
-var getSerializers = require('./index-bc3e2d5c.js');
+var getSerializers = require('./index-6f1ee5f0.js');
 require('./util-f2c1b65b.js');
 require('./brightcove-react-player-loader.es-156bd4d6.js');
 require('react-bootstrap/Pagination');
@@ -58,10 +58,10 @@ var FormControl = _interopDefault(require('react-bootstrap/FormControl'));
 var keys = require('./keys-a586b7a0.js');
 require('react-bootstrap/Dropdown');
 var getSeriesDetail = require('./getSeriesDetail.js');
-require('./index-bd6c9f56.js');
-var getRelatedArticle = require('./getRelatedArticle.js');
+require('nookies');
 var getQuery = require('./getQuery.js');
-var getTargeting = require('./getTargeting-9af0ef69.js');
+var getRelatedArticle = require('./getRelatedArticle.js');
+var getTargeting = require('./getTargeting-fee8c429.js');
 var getKeywords = require('./getKeywords.js');
 var urlFor = require('./urlFor.js');
 var styleInject_es = require('./style-inject.es-dcee06b6.js');
@@ -141,9 +141,9 @@ var DocumentGroup = function DocumentGroup(_ref) {
       style: { display: 'flex', flexDirection: 'column', padding: '0 1rem', justifyContent: thumbnailUrl ? 'center' : 'flex-start', alignItems: 'center' } },
     thumbnailUrl && React__default.createElement('img', { style: { maxWidth: '220px', maxHeight: '100px', marginTop: '1rem' }, src: thumbnailUrl, alt: name }),
     !thumbnailUrl && React__default.createElement('p', {
-      style: { maxWidth: '315px', margin: '0', color: 'var(--primary)', textAlign: thumbnailUrl ? 'center' : main.main_36 ? 'left' : 'right', marginTop: '.25rem' },
+      style: { maxWidth: '315px', margin: '0', color: 'var(--primary)', textAlign: thumbnailUrl ? 'center' : main.main_39 ? 'left' : 'right', marginTop: '.25rem' },
       dangerouslySetInnerHTML: { __html: name } }),
-    main.main_36 && !thumbnailUrl && React__default.createElement(
+    main.main_39 && !thumbnailUrl && React__default.createElement(
       'style',
       { jsx: 'true' },
       '\n          a.doc-group {\n            display: block !important;\n            padding: 0!important;\n          }\n        '
@@ -153,7 +153,7 @@ var DocumentGroup = function DocumentGroup(_ref) {
 
 var findIndex = function findIndex(arr) {
   var indexes = [];
-  if ((typeof arr === 'undefined' ? 'undefined' : _typeof._typeof(arr)) === 'object') {
+  if ((typeof arr === 'undefined' ? 'undefined' : _typeof$1._typeof(arr)) === 'object') {
     var _iteratorNormalCompletion = true;
     var _didIteratorError = false;
     var _iteratorError = undefined;
@@ -188,7 +188,7 @@ var findIndex = function findIndex(arr) {
   return indexes;
 };
 
-var css = ".RelatedArticles-module_mediaContainer__10h9k {\r\n  display: flex;\r\n  flex-direction: row;\r\n  flex-wrap: nowrap;\r\n  margin: 0 -1rem;\r\n}\r\n.RelatedArticles-module_mediaCard__3wQbn {\r\n  margin: 0 1rem 1rem;\r\n  width: calc(33% - 1rem);\r\n  display: column;\r\n  flex-direction: row;\r\n  margin-bottom: 0.75rem;\r\n  border-bottom: none;\r\n}\r\n.RelatedArticles-module_mediaCard__3wQbn:last-child {\r\n  border-bottom: none;\r\n}\r\n.RelatedArticles-module_cardTitle__3P-Ib {\r\n  font-weight: bold;\r\n  color: #252525;\r\n  margin-bottom: 0.25rem;\r\n  font-size: 15px;\r\n}\r\n.RelatedArticles-module_authorListing__1EFg4 span.RelatedArticles-module_text-muted__3b0zX {\r\n  color: #000;\r\n  font-weight: bold;\r\n}\r\n.RelatedArticles-module_cardDate__1wOR5 {\r\n  color: var(--dark);\r\n  display: block;\r\n  background: #fff !important;\r\n  margin-bottom: 0;\r\n}\r\n.RelatedArticles-module_imgWrapper__5Jx_4 {\r\n  display: block;\r\n  text-align: center;\r\n  margin-bottom: 0.5rem;\r\n}\r\n.RelatedArticles-module_imgWrapper__5Jx_4 img {\r\n  height: 135px;\r\n  width: 100%;\r\n  object-fit: cover;\r\n  object-position: center;\r\n}\r\n@media screen and (max-width: 1064px) {\r\n}\r\n@media screen and (max-width: 968px) {\r\n  .RelatedArticles-module_mediaContainer__10h9k {\r\n    flex-wrap: wrap;\r\n  }\r\n  .RelatedArticles-module_mediaCard__3wQbn {\r\n    width: 100%;\r\n    background-color: #cccccc;\r\n    margin-bottom: 0.5rem;\r\n    padding: 0.5rem;\r\n    border-radius: 0.25rem;\r\n  }\r\n  .RelatedArticles-module_imgWrapper__5Jx_4 {\r\n    display: none;\r\n  }\r\n}\r\n";
+var css = ".RelatedArticles-module_mediaContainer__10h9k {\r\n  display: flex;\r\n  flex-direction: row;\r\n  flex-wrap: nowrap;\r\n  margin: 0 -1rem;\r\n}\r\n.RelatedArticles-module_mediaCard__3wQbn {\r\n  margin: 0 1rem 1rem;\r\n  width: calc(33% - 1rem);\r\n  display: column;\r\n  flex-direction: row;\r\n  margin-bottom: 0.75rem;\r\n  padding-bottom: 0.75rem;\r\n  border-bottom: none;\r\n}\r\n.RelatedArticles-module_mediaCard__3wQbn:last-child {\r\n  border-bottom: none;\r\n}\r\n.RelatedArticles-module_cardTitle__3P-Ib {\r\n  font-weight: bold;\r\n  color: #252525;\r\n  margin-bottom: 0.25rem;\r\n  font-size: 15px;\r\n}\r\n.RelatedArticles-module_authorListing__1EFg4 span.RelatedArticles-module_text-muted__3b0zX {\r\n  color: #000;\r\n  font-weight: bold;\r\n}\r\n.RelatedArticles-module_cardDate__1wOR5 {\r\n  color: var(--dark);\r\n  display: block;\r\n  background: #fff !important;\r\n  margin-bottom: 0;\r\n}\r\n.RelatedArticles-module_imgWrapper__5Jx_4 {\r\n  display: block;\r\n  text-align: center;\r\n  margin-bottom: 0.5rem;\r\n}\r\n.RelatedArticles-module_imgWrapper__5Jx_4 img {\r\n  height: 135px;\r\n  width: 100%;\r\n  object-fit: cover;\r\n  object-position: center;\r\n}\r\n@media screen and (max-width: 1064px) {\r\n}\r\n@media screen and (max-width: 968px) {\r\n  .RelatedArticles-module_mediaContainer__10h9k {\r\n    flex-wrap: wrap;\r\n  }\r\n  .RelatedArticles-module_mediaCard__3wQbn {\r\n    width: 100%;\r\n  }\r\n  .RelatedArticles-module_imgWrapper__5Jx_4 img {\r\n    width: 100%;\r\n    height: auto;\r\n\r\n    max-height: 175px;\r\n    object-fit: contain;\r\n    margin-bottom: 1rem;\r\n  }\r\n}\r\n";
 var styles = { "mediaContainer": "RelatedArticles-module_mediaContainer__10h9k", "mediaCard": "RelatedArticles-module_mediaCard__3wQbn", "cardTitle": "RelatedArticles-module_cardTitle__3P-Ib", "authorListing": "RelatedArticles-module_authorListing__1EFg4", "text-muted": "RelatedArticles-module_text-muted__3b0zX", "cardDate": "RelatedArticles-module_cardDate__1wOR5", "imgWrapper": "RelatedArticles-module_imgWrapper__5Jx_4" };
 styleInject_es.styleInject(css);
 
@@ -391,7 +391,7 @@ var Article = function Article(props) {
   };
   var renderAuthorBiography = function renderAuthorBiography(biography) {
     if (biography) {
-      return React__default.createElement(BlockContent.BlockContent, _extends$1._extends({
+      return React__default.createElement(BlockContent.BlockContent, _extends._extends({
         serializers: getSerializers.getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, false, contextualADFlag),
         blocks: [biography]
       }, client.config()));
@@ -409,56 +409,10 @@ var Article = function Article(props) {
   };
 
   var RelevantTopics = function RelevantTopics() {
-    if (content_placement && content_placement.length > 0 || documentGroupMapping && documentGroupMapping.length > 0) {
-      var relatedLinks = [];
-      if (documentGroupMapping && documentGroupMapping.length > 0) {
-        documentGroupMapping.forEach(function (documentGroup) {
-          if (documentGroup.parent) {
-            relatedLinks = [].concat(toConsumableArray._toConsumableArray(relatedLinks), [{ label: documentGroup.name, href: cpModificationRequired ? '/' + documentGroup.parent.identifier.current + '/' + documentGroup.path : '/' + documentGroup.path }]);
-          }
-        });
-      }
-      if (content_placement && content_placement.length > 0) {
-        content_placement.filter(function (item) {
-          return item.path !== 'news';
-        }).forEach(function (cp) {
-          var cp_url = cpModificationRequired ? getTargeting.getContentPlacementUrl(cp) : cp.path;
-          var href = '/' + cp_url;
-          relatedLinks = [].concat(toConsumableArray._toConsumableArray(relatedLinks), [{ label: cp.name, href: href }]);
-        });
-      }
-      if (relatedLinks && relatedLinks.length > 0) {
-        return React__default.createElement(
-          'div',
-          null,
-          relatedLinks.map(function (relatedLink, index) {
-            return React__default.createElement(
-              'span',
-              { key: index, className: 'related-link' },
-              React__default.createElement(
-                'a',
-                { className: 'related-links', style: { color: 'blue' }, href: relatedLink.href },
-                relatedLink.label
-              ),
-              React__default.createElement(
-                'style',
-                { jsx: 'true' },
-                '\n                      .related-link:not(:first-child):before {\n                        content: \' | \';\n                      }\n                    '
-              )
-            );
-          })
-        );
-      }
-      return null;
-    }
-    return null;
-  };
-
-  var renderRelatedSection = function renderRelatedSection() {
-    if (showRelatedArticles) {
+    if (content_placement && content_placement.length > 0 || documentGroupMapping) {
       return React__default.createElement(
-        'section',
-        { className: 'related-contents-section' },
+        'div',
+        { style: { color: '#262626' } },
         React__default.createElement(
           'p',
           { className: 'mb-0' },
@@ -468,21 +422,47 @@ var Article = function Article(props) {
             'Related Content:'
           )
         ),
-        React__default.createElement(
-          'div',
-          null,
-          React__default.createElement(RelevantTopics, null)
-        ),
-        React__default.createElement(
-          'div',
-          { className: 'pt-2' },
-          React__default.createElement(RelatedArticle, { articles: article.relatedContents, client: client })
-        ),
-        React__default.createElement(
-          'style',
-          { jsx: 'true' },
-          '\n              .related-contents-section {\n                padding: 0.5rem;\n                background-color: #e6e6e6;\n                border-radius: 0.25rem;\n              }\n            '
-        )
+        documentGroupMapping && documentGroupMapping.map(function (documentGroup) {
+          if (!documentGroup.parent) {
+            return null;
+          }
+
+          return React__default.createElement(
+            React__default.Fragment,
+            null,
+            React__default.createElement(
+              'span',
+              { className: '' },
+              React__default.createElement(
+                'a',
+                {
+                  className: 'related-links',
+                  style: { color: 'blue' },
+                  href: cpModificationRequired ? '/' + documentGroup.parent.identifier.current + '/' + documentGroup.path : '/' + documentGroup.path },
+                documentGroup.name
+              )
+            ),
+            content_placement && content_placement.length ? ' | ' : null
+          );
+        }),
+        content_placement && content_placement.length > 0 ? content_placement.map(function (cp, index) {
+          var cp_url = cpModificationRequired ? getTargeting.getContentPlacementUrl(cp) : cp.path;
+          var href = '/' + cp_url;
+          return React__default.createElement(
+            React__default.Fragment,
+            { key: index },
+            React__default.createElement(
+              'span',
+              null,
+              React__default.createElement(
+                'a',
+                { className: 'related-links', key: index, href: href, style: { color: 'blue' } },
+                cp.name
+              )
+            ),
+            content_placement.length > index + 1 ? ' | ' : null
+          );
+        }) : null
       );
     }
     return null;
@@ -536,11 +516,11 @@ var Article = function Article(props) {
     var indexes = findIndex(body);
 
     if (indexes.length >= 2 && body.length > 3 && payload.contextualAD && payload.contextualVideoAD) {
-      payload = _extends$1._extends({}, payload, {
-        contextualAD: _extends$1._extends({}, payload.contextualAD, {
+      payload = _extends._extends({}, payload, {
+        contextualAD: _extends._extends({}, payload.contextualAD, {
           slotId: (payload.contextualAD.slotId || 'contextual_ad') + '-' + payload._id
         }),
-        contextualVideoAD: _extends$1._extends({}, payload.contextualVideoAD, {
+        contextualVideoAD: _extends._extends({}, payload.contextualVideoAD, {
           slotId: (payload.contextualVideoAD.slotId || 'in-context_video') + '-' + payload._id
         })
       });
@@ -574,7 +554,7 @@ var Article = function Article(props) {
       return React__default.createElement(
         React__default.Fragment,
         null,
-        React__default.createElement(BlockContent.BlockContent, _extends$1._extends({
+        React__default.createElement(BlockContent.BlockContent, _extends._extends({
           serializers: getSerializers.getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, false, contextualADFlag, null, null, targeting),
           blocks: [].concat(toConsumableArray._toConsumableArray(articleBody.slice(0, selectedIndex))),
           imageOptions: { w: 320, h: 240, fit: 'max' }
@@ -583,24 +563,23 @@ var Article = function Article(props) {
         React__default.createElement(
           'div',
           { id: 'contextual-native-ad-' + payload._id, className: 'contextual-native-ad' },
-          React__default.createElement(AdSlot, _extends$1._extends({}, payload.contextualAD, { refreshFlag: false, checkIsAdFound: checkIsAdFound }))
+          React__default.createElement(AdSlot, _extends._extends({}, payload.contextualAD, { refreshFlag: false, checkIsAdFound: checkIsAdFound }))
         ),
         React__default.createElement('span', { className: 'clearfix' }),
         React__default.createElement(
           'div',
           { id: 'contextual-video-ad-' + payload._id, className: 'contextual-video-ad' },
-          React__default.createElement(AdSlot, _extends$1._extends({}, payload.contextualVideoAD, { refreshFlag: false, checkIsAdFound: checkIsVideoAdFound }))
+          React__default.createElement(AdSlot, _extends._extends({}, payload.contextualVideoAD, { refreshFlag: false, checkIsAdFound: checkIsVideoAdFound }))
         ),
-        renderRelatedSection(),
-        React__default.createElement(BlockContent.BlockContent, _extends$1._extends({
+        React__default.createElement(BlockContent.BlockContent, _extends._extends({
           serializers: getSerializers.getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, false, null, null, null, targeting),
           blocks: [].concat(toConsumableArray._toConsumableArray(articleBody.slice(selectedIndex))),
           imageOptions: { w: 320, h: 240, fit: 'max' }
         }, client.config()))
       );
     } else if (indexes.length >= 2 && body.length >= 3 && payload.contextualAD && !payload.contextualVideoAD) {
-      payload = _extends$1._extends({}, payload, {
-        contextualAD: _extends$1._extends({}, payload.contextualAD, {
+      payload = _extends._extends({}, payload, {
+        contextualAD: _extends._extends({}, payload.contextualAD, {
           slotId: (payload.contextualAD.slotId || 'contextual_ad') + '-' + payload._id,
           className: 'ADFluid',
           //  Fetching new contextual targeting based on the current active article.
@@ -647,7 +626,7 @@ var Article = function Article(props) {
       return React__default.createElement(
         React__default.Fragment,
         null,
-        React__default.createElement(BlockContent.BlockContent, _extends$1._extends({
+        React__default.createElement(BlockContent.BlockContent, _extends._extends({
           serializers: getSerializers.getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, false, contextualADFlag, null, null, targeting),
           blocks: [].concat(toConsumableArray._toConsumableArray(articleBody.slice(0, _selectedIndex))),
           imageOptions: { w: 320, h: 240, fit: 'max' }
@@ -656,19 +635,18 @@ var Article = function Article(props) {
         (visibleFlag || queueData && queueData.length === 1 || !props.infiniteScroll) && React__default.createElement(
           'div',
           { id: 'contextual-native-ad-' + payload._id, className: 'contextual-native-ad' },
-          React__default.createElement(AdSlot, _extends$1._extends({}, payload.contextualAD, { refreshFlag: false, checkIsAdFound: _checkIsAdFound }))
+          React__default.createElement(AdSlot, _extends._extends({}, payload.contextualAD, { refreshFlag: false, checkIsAdFound: _checkIsAdFound }))
         ),
         contextualADFlag && React__default.createElement('span', { className: 'clearfix' }),
-        renderRelatedSection(),
-        React__default.createElement(BlockContent.BlockContent, _extends$1._extends({
+        React__default.createElement(BlockContent.BlockContent, _extends._extends({
           serializers: getSerializers.getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, false, null, null, null, targeting),
           blocks: [].concat(toConsumableArray._toConsumableArray(articleBody.slice(_selectedIndex))),
           imageOptions: { w: 320, h: 240, fit: 'max' }
         }, client.config()))
       );
     } else if (indexes.length >= 2 && body.length > 3 && payload.contextualVideoAD && !payload.contextualAD) {
-      payload = _extends$1._extends({}, payload, {
-        contextualVideoAD: _extends$1._extends({}, payload.contextualVideoAD, {
+      payload = _extends._extends({}, payload, {
+        contextualVideoAD: _extends._extends({}, payload.contextualVideoAD, {
           slotId: (payload.contextualVideoAD.slotId || 'in-context_video') + '-' + payload._id
         })
       });
@@ -691,7 +669,7 @@ var Article = function Article(props) {
       return React__default.createElement(
         React__default.Fragment,
         null,
-        React__default.createElement(BlockContent.BlockContent, _extends$1._extends({
+        React__default.createElement(BlockContent.BlockContent, _extends._extends({
           serializers: getSerializers.getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, false, contextualADFlag, null, null, targeting),
           blocks: [].concat(toConsumableArray._toConsumableArray(articleBody.slice(0, _selectedIndex2))),
           imageOptions: { w: 320, h: 240, fit: 'max' }
@@ -700,35 +678,16 @@ var Article = function Article(props) {
         React__default.createElement(
           'div',
           { id: 'contextual-video-ad-' + payload._id, className: 'contextual-video-ad' },
-          React__default.createElement(AdSlot, _extends$1._extends({}, payload.contextualVideoAD, { refreshFlag: false, checkIsAdFound: _checkIsAdFound2 }))
+          React__default.createElement(AdSlot, _extends._extends({}, payload.contextualVideoAD, { refreshFlag: false, checkIsAdFound: _checkIsAdFound2 }))
         ),
-        renderRelatedSection(),
-        React__default.createElement(BlockContent.BlockContent, _extends$1._extends({
+        React__default.createElement(BlockContent.BlockContent, _extends._extends({
           serializers: getSerializers.getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, false, null, null, null, targeting),
           blocks: [].concat(toConsumableArray._toConsumableArray(articleBody.slice(_selectedIndex2))),
           imageOptions: { w: 320, h: 240, fit: 'max' }
         }, client.config()))
       );
-    } else if (indexes.length >= 2 && body.length > 3 && showRelatedArticles) {
-      var _selectedIndex3 = indexes[1] + 1;
-      return React__default.createElement(
-        React__default.Fragment,
-        null,
-        React__default.createElement(BlockContent.BlockContent, _extends$1._extends({
-          serializers: getSerializers.getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, false, contextualADFlag, null, null, targeting),
-          blocks: [].concat(toConsumableArray._toConsumableArray(articleBody.slice(0, _selectedIndex3))),
-          imageOptions: { w: 320, h: 240, fit: 'max' }
-        }, client.config())),
-        React__default.createElement('span', { className: 'clearfix' }),
-        renderRelatedSection(),
-        React__default.createElement(BlockContent.BlockContent, _extends$1._extends({
-          serializers: getSerializers.getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, false, null, null, null, targeting),
-          blocks: [].concat(toConsumableArray._toConsumableArray(articleBody.slice(_selectedIndex3))),
-          imageOptions: { w: 320, h: 240, fit: 'max' }
-        }, client.config()))
-      );
     } else {
-      return React__default.createElement(BlockContent.BlockContent, _extends$1._extends({
+      return React__default.createElement(BlockContent.BlockContent, _extends._extends({
         serializers: getSerializers.getSerializers(client, pageview, videoAccountIDs, onVote, true, drupalLeadSettings, currentPage, false, false, null, props.article.Ads, targeting),
         blocks: articleBody,
         imageOptions: { w: 320, h: 240, fit: 'max' }
@@ -914,7 +873,7 @@ var Article = function Article(props) {
             React__default.createElement(
               'div',
               { className: 'ad-box', style: { textAlign: 'center' } },
-              main.main_36 && !sponsoredFlag && props.article.Ads && props.article.Ads.length > 0 && props.article.Ads.map(function (ad, index) {
+              main.main_39 && !sponsoredFlag && props.article.Ads && props.article.Ads.length > 0 && props.article.Ads.map(function (ad, index) {
                 if (index === 0) {
                   return React__default.createElement(
                     'div',
@@ -966,12 +925,26 @@ var Article = function Article(props) {
                 issue.name
               )
             ),
-            React__default.createElement('div', { className: 'clearfix', style: { minHeight: '1px' } })
+            React__default.createElement('div', { className: 'clearfix', style: { minHeight: '1px' } }),
+            showRelatedArticles && React__default.createElement(
+              React__default.Fragment,
+              null,
+              React__default.createElement(
+                'div',
+                null,
+                React__default.createElement(RelevantTopics, null)
+              ),
+              React__default.createElement(
+                'div',
+                { className: 'pt-2' },
+                React__default.createElement(RelatedArticle, { articles: article.relatedArticle, client: client })
+              )
+            )
           ),
           renderIsiContent(props.article)
         )
       ),
-      main.main_36 && !sponsoredFlag && props.article.Ads && props.article.Ads.length > 0 && props.article.Ads.map(function (ad, index) {
+      main.main_39 && !sponsoredFlag && props.article.Ads && props.article.Ads.length > 0 && props.article.Ads.map(function (ad, index) {
         if (index > 0) {
           return React__default.createElement(
             'div',
@@ -1011,127 +984,6 @@ var Article = function Article(props) {
 
 var _this = undefined;
 
-var getRelatedContents = function () {
-  var _ref = asyncToGenerator._asyncToGenerator( /*#__PURE__*/asyncToGenerator.regenerator.mark(function _callee() {
-    var client = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
-    var article = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-    var prevUrl = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : '/';
-    var articleCount = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 0;
-
-    var _article$url, url, content_placement, documentGroupMapping, issueGroup, params, conditions, taxonomy, documentGroup, relatedContents, relatedContentQuery;
-
-    return asyncToGenerator.regenerator.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            _article$url = article.url;
-            _article$url = _article$url === undefined ? {
-              current: null
-            } : _article$url;
-            url = _article$url.current, content_placement = article.content_placement, documentGroupMapping = article.documentGroupMapping, issueGroup = article.issueGroup;
-            params = { url: url };
-            conditions = '';
-
-
-            if (content_placement && content_placement.length > 0) {
-              taxonomy = [];
-
-              content_placement.forEach(function (_ref2) {
-                var path = _ref2.path,
-                    _id = _ref2._id;
-
-                if (!_id || typeof _id == 'undefined') {
-                  return null;
-                }
-                var prev_url_to_check = prevUrl;
-                if (prev_url_to_check.includes('?')) {
-                  prev_url_to_check = prev_url_to_check.split('?')[0];
-                }
-                if (prev_url_to_check.endsWith(path) && _id) taxonomy.push(_id);
-              });
-              if (taxonomy.length === 0) {
-                content_placement.filter(function (_ref3) {
-                  var identifier = _ref3.identifier;
-                  return identifier !== 'news';
-                }).forEach(function (_ref4) {
-                  var _id = _ref4._id;
-
-                  if (_id) taxonomy.push(_id);
-                });
-              }
-              if (taxonomy.length > 0) {
-                params = _extends$1._extends({}, params, { taxonomy: taxonomy });
-                conditions = '&& taxonomyMapping[]._ref in $taxonomy';
-              }
-            }
-
-            if (documentGroupMapping && documentGroupMapping.length > 0) {
-              documentGroup = [];
-
-              documentGroupMapping.forEach(function (_ref5) {
-                var _id = _ref5._id;
-
-                if (_id) documentGroup.push(_id);
-              });
-              if (params.taxonomy && documentGroup.length > 0) {
-                params = _extends$1._extends({}, params, { documentGroup: documentGroup });
-                conditions = '&& (taxonomyMapping[]._ref in $taxonomy || documentGroupMapping[]._ref in $documentGroup)';
-              }
-            }
-
-            if (issueGroup && issueGroup._ref) {
-              if (params.taxonomy && params.documentGroup) {
-                params = _extends$1._extends({}, params, { issueAssociation: issueGroup._ref });
-                conditions = '&& (taxonomyMapping[]._ref in $taxonomy || documentGroupMapping[]._ref in $documentGroup || issueGroup._ref == $issueAssociation )';
-              } else if (params.taxonomy) {
-                params = _extends$1._extends({}, params, { issueAssociation: issueGroup._ref });
-                conditions = '&& (taxonomyMapping[]._ref in $taxonomy || issueGroup._ref == $issueAssociation )';
-              }
-            }
-
-            relatedContents = [];
-
-            if (!(params.taxonomy && params.taxonomy.length > 0)) {
-              _context.next = 21;
-              break;
-            }
-
-            relatedContentQuery = '*[\n      _type == "article"\n      && defined(title)\n      && defined(url)\n      && !(_id in path("drafts.**"))\n      && is_visible == true\n      && passwordLock != true\n      && taxonomyMapping[].disableAds != \'true\'\n      && contentCategory.name != \'Poll\'\n      && contentCategory.name != \'Slideshows\'\n    \t&& contentCategory.disableAds != \'true\'\n      && ExcludeFromInfiniteScroll != true\n      && url.current != $url\n      && !defined(body[].videos)\n      && published <= \'' + new Date().toISOString() + '\'\n      ' + conditions + '\n    ]| order(published desc)[' + articleCount + ']\n    {\n      title,\n      url,\n      thumbnail\n    }';
-            _context.prev = 11;
-            _context.next = 14;
-            return client.fetch(relatedContentQuery, params);
-
-          case 14:
-            relatedContents = _context.sent;
-
-            debugger;
-            _context.next = 21;
-            break;
-
-          case 18:
-            _context.prev = 18;
-            _context.t0 = _context['catch'](11);
-
-            console.error(_context.t0);
-
-          case 21:
-            return _context.abrupt('return', relatedContents);
-
-          case 22:
-          case 'end':
-            return _context.stop();
-        }
-      }
-    }, _callee, _this, [[11, 18]]);
-  }));
-
-  return function getRelatedContents() {
-    return _ref.apply(this, arguments);
-  };
-}();
-
-var _this$1 = undefined;
-
 var ArticleQueue = function ArticleQueue(props) {
   var _props$prevUrl = props.prevUrl,
       prevUrl = _props$prevUrl === undefined ? '/' : _props$prevUrl,
@@ -1148,7 +1000,7 @@ var ArticleQueue = function ArticleQueue(props) {
 
 
   var firstArticle = function firstArticle() {
-    var article = _extends$1._Object$assign({}, props.article);
+    var article = _extends._Object$assign({}, props.article);
     var targeting = getTargeting.getTargeting(props);
     article.Ads = Ads.getRightItems(targeting);
     return article;
@@ -1165,7 +1017,7 @@ var ArticleQueue = function ArticleQueue(props) {
     });
     var targeting = getTargeting.getTargeting({ article: activeArticle, cpModificationRequired: cpModificationRequired, position: props.position, prevUrl: prevUrl });
 
-    if (!main.main_36) {
+    if (!main.main_39) {
       index.lib_3.getGoogletag().then(function (googletag) {
         if (window.googletag && googletag.pubadsReady) {
           var slots = googletag.pubads().getSlots();
@@ -1183,7 +1035,7 @@ var ArticleQueue = function ArticleQueue(props) {
       });
     }
     //Refresh leaderboard ad on mobile
-    if (main.main_36) {
+    if (main.main_39) {
       var leaderboardSlotId = '';
       index.lib_3.getGoogletag().then(function (googletag) {
         if (window.googletag && googletag.pubadsReady) {
@@ -1257,7 +1109,7 @@ var ArticleQueue = function ArticleQueue(props) {
               switch (_context.prev = _context.next) {
                 case 0:
                   if (!(article && article._id)) {
-                    _context.next = 12;
+                    _context.next = 9;
                     break;
                   }
 
@@ -1269,22 +1121,17 @@ var ArticleQueue = function ArticleQueue(props) {
 
                 case 5:
                   article.relatedArticle = _context.sent;
-                  _context.next = 8;
-                  return getRelatedContents(null, props.client, article, prevUrl, startingIndex + '..' + endingIndex);
-
-                case 8:
-                  article.relatedContents = _context.sent;
                   targeting = getTargeting.getTargeting({ article: article, cpModificationRequired: cpModificationRequired, prevUrl: prevUrl });
 
                   article.Ads = Ads.getRightItems(targeting);
                   setQueueData([].concat(toConsumableArray._toConsumableArray(queueData), [article]));
 
-                case 12:
+                case 9:
                 case 'end':
                   return _context.stop();
               }
             }
-          }, _callee, _this$1);
+          }, _callee, _this);
         }));
 
         return function (_x) {
@@ -1349,7 +1196,7 @@ var ArticleQueue = function ArticleQueue(props) {
     index_es.InfiniteScroll,
     { dataLength: queueData.length, next: loadmore, scrollThreshold: '60%', hasMore: true, style: { overflow: 'hidden' } },
     queueData.map(function (article, index) {
-      return React__default.createElement(Article, _extends$1._extends({
+      return React__default.createElement(Article, _extends._extends({
         key: index
       }, props, {
         onChangeArticle: onChangeArticle,
@@ -1418,7 +1265,7 @@ var Articles = function Articles(props) {
     index: 0
   };
 
-  return React__default.createElement(ArticleQueue, _extends$1._extends((_extends2 = {
+  return React__default.createElement(ArticleQueue, _extends._extends((_extends2 = {
     client: client,
     params: params,
     relatedArticleQuery: relatedArticleQuery,
@@ -1432,7 +1279,7 @@ var Articles = function Articles(props) {
   }, defineProperty$1._defineProperty(_extends2, 'pageview', pageview), defineProperty$1._defineProperty(_extends2, 'onVote', function onVote() {}), defineProperty$1._defineProperty(_extends2, 'ISIContent', ISIContent), defineProperty$1._defineProperty(_extends2, 'videoAccountIDs', videoAccountIDs), defineProperty$1._defineProperty(_extends2, 'sponsoredTaxonomies', []), defineProperty$1._defineProperty(_extends2, 'cpModificationRequired', cpModificationRequired), defineProperty$1._defineProperty(_extends2, 'Settings', Settings), defineProperty$1._defineProperty(_extends2, 'canonicalTag', canonicalTag), _extends2), props));
 };
 
-var _this$2 = undefined;
+var _this$1 = undefined;
 
 var View = function View(props) {
   var router = Router.useRouter();
@@ -1593,7 +1440,7 @@ var View = function View(props) {
         props.article.seriesDetail && props.article.seriesDetail.nextUrl && React__default.createElement('link', { rel: 'next', href: props.article.seriesDetail.nextUrl })
       )
     ),
-    !needInfiniteScroll ? React__default.createElement(Article, _extends$1._extends({ infiniteScroll: false, showRelatedArticles: showRelatedArticles }, props)) : React__default.createElement(Articles, _extends$1._extends({ infiniteScroll: true, showRelatedArticles: showRelatedArticles, canonicalTag: canonicalTag }, props))
+    !needInfiniteScroll ? React__default.createElement(Article, _extends._extends({ infiniteScroll: false, showRelatedArticles: showRelatedArticles }, props)) : React__default.createElement(Articles, _extends._extends({ infiniteScroll: true, showRelatedArticles: showRelatedArticles, canonicalTag: canonicalTag }, props))
   );
 };
 
@@ -1640,12 +1487,12 @@ View.returnGetInitialProps = function () {
             }
 
             article.relatedArticle = null;
-            _context.next = 21;
+            _context.next = 18;
             break;
 
           case 14:
             if (!article) {
-              _context.next = 21;
+              _context.next = 18;
               break;
             }
 
@@ -1654,13 +1501,8 @@ View.returnGetInitialProps = function () {
 
           case 17:
             article.relatedArticle = _context.sent;
-            _context.next = 20;
-            return getRelatedContents(context, client, article, prevUrl, '0..2');
 
-          case 20:
-            article.relatedContents = _context.sent;
-
-          case 21:
+          case 18:
             return _context.abrupt('return', {
               url: url,
               sao: sao,
@@ -1671,12 +1513,12 @@ View.returnGetInitialProps = function () {
               sponsoredFlag: sponsoredFlag
             });
 
-          case 22:
+          case 19:
           case 'end':
             return _context.stop();
         }
       }
-    }, _callee, _this$2);
+    }, _callee, _this$1);
   }));
 
   return function (_x, _x2, _x3, _x4, _x5) {