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

package/dist/cjs/View.js

@@ -59,7 +59,7 @@ var keys = require('./keys-a586b7a0.js');
 require('react-bootstrap/Dropdown');
 var getSeriesDetail = require('./getSeriesDetail.js');
 require('./index-bd6c9f56.js');
-var getRelatedArticle = require('./getRelatedArticle-c944847e.js');
+var getRelatedArticle = require('./getRelatedArticle.js');
 var getQuery = require('./getQuery.js');
 var getTargeting = require('./getTargeting-9af0ef69.js');
 var getKeywords = require('./getKeywords.js');
@@ -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  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\r\n@media screen and (max-width: 576px) {\r\n  .RelatedArticles-module_imgWrapper__5Jx_4 {\r\n    display: none;\r\n  }\r\n  .RelatedArticles-module_mediaCard__3wQbn {\r\n    background-color: #c0c0c0;\r\n    margin-bottom: 0.5rem;\r\n    padding: 0.5rem;\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  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 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);
 
@@ -409,72 +409,65 @@ var Article = function Article(props) {
   };
 
   var RelevantTopics = function RelevantTopics() {
-    if (content_placement && content_placement.length > 0 || documentGroupMapping) {
-      return React__default.createElement(
-        'div',
-        { style: { color: '#262626' } },
-        React__default.createElement(
-          'p',
-          { className: 'mb-0' },
-          React__default.createElement(
-            'b',
-            null,
-            'Related Content:'
-          )
-        ),
-        documentGroupMapping && documentGroupMapping.map(function (documentGroup) {
-          if (!documentGroup.parent) {
-            return null;
+    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 }]);
           }
-
-          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.filter(function (item) {
+        });
+      }
+      if (content_placement && content_placement.length > 0) {
+        content_placement.filter(function (item) {
           return item.path !== 'news';
-        }).map(function (cp, index) {
+        }).forEach(function (cp) {
           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(
+          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',
-              null,
+              { key: index, className: 'related-link' },
               React__default.createElement(
                 'a',
-                { className: 'related-links', key: index, href: href, style: { color: 'blue' } },
-                cp.name
+                { 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                    '
               )
-            ),
-            content_placement.length > index + 1 ? ' | ' : null
-          );
-        }) : null
-      );
+            );
+          })
+        );
+      }
+      return null;
     }
     return null;
   };
 
-  var renderRelatedContent = function renderRelatedContent() {
+  var renderRelatedSection = function renderRelatedSection() {
     if (showRelatedArticles) {
       return React__default.createElement(
-        'div',
-        { className: 'related-contents-container' },
+        'section',
+        { className: 'related-contents-section' },
+        React__default.createElement(
+          'p',
+          { className: 'mb-0' },
+          React__default.createElement(
+            'b',
+            null,
+            'Related Content:'
+          )
+        ),
         React__default.createElement(
           'div',
           null,
@@ -488,7 +481,7 @@ var Article = function Article(props) {
         React__default.createElement(
           'style',
           { jsx: 'true' },
-          '\n              @media only screen and (max-width: 576px) {\n                .related-contents-container {\n                  padding: 0.5rem;\n                  background-color: #dcdcdc;\n                }\n              }\n            '
+          '\n              .related-contents-section {\n                padding: 0.5rem;\n                background-color: #e6e6e6;\n                border-radius: 0.25rem;\n              }\n            '
         )
       );
     }
@@ -598,7 +591,7 @@ var Article = function Article(props) {
           { id: 'contextual-video-ad-' + payload._id, className: 'contextual-video-ad' },
           React__default.createElement(AdSlot, _extends$1._extends({}, payload.contextualVideoAD, { refreshFlag: false, checkIsAdFound: checkIsVideoAdFound }))
         ),
-        renderRelatedContent(),
+        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(selectedIndex))),
@@ -666,7 +659,7 @@ var Article = function Article(props) {
           React__default.createElement(AdSlot, _extends$1._extends({}, payload.contextualAD, { refreshFlag: false, checkIsAdFound: _checkIsAdFound }))
         ),
         contextualADFlag && React__default.createElement('span', { className: 'clearfix' }),
-        renderRelatedContent(),
+        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(_selectedIndex))),
@@ -709,7 +702,7 @@ var Article = function Article(props) {
           { id: 'contextual-video-ad-' + payload._id, className: 'contextual-video-ad' },
           React__default.createElement(AdSlot, _extends$1._extends({}, payload.contextualVideoAD, { refreshFlag: false, checkIsAdFound: _checkIsAdFound2 }))
         ),
-        renderRelatedContent(),
+        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(_selectedIndex2))),
@@ -727,7 +720,7 @@ var Article = function Article(props) {
           imageOptions: { w: 320, h: 240, fit: 'max' }
         }, client.config())),
         React__default.createElement('span', { className: 'clearfix' }),
-        renderRelatedContent(),
+        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))),
@@ -1020,13 +1013,12 @@ var _this = undefined;
 
 var getRelatedContents = function () {
   var _ref = asyncToGenerator._asyncToGenerator( /*#__PURE__*/asyncToGenerator.regenerator.mark(function _callee() {
-    var ctx = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
     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, cookies, prevSlugs, relatedContents, relatedContentQuery;
+    var _article$url, url, content_placement, documentGroupMapping, issueGroup, params, conditions, taxonomy, documentGroup, relatedContents, relatedContentQuery;
 
     return asyncToGenerator.regenerator.wrap(function _callee$(_context) {
       while (1) {
@@ -1037,13 +1029,9 @@ var getRelatedContents = function () {
               current: null
             } : _article$url;
             url = _article$url.current, content_placement = article.content_placement, documentGroupMapping = article.documentGroupMapping, issueGroup = article.issueGroup;
-            params = {
-              url: url,
-              index: articleCount
-            };
+            params = { url: url };
             conditions = '';
 
-            //404 articles were throwing server error
 
             if (content_placement && content_placement.length > 0) {
               taxonomy = [];
@@ -1061,15 +1049,20 @@ var getRelatedContents = function () {
                 }
                 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);
-              });
-              params = _extends$1._extends({}, params, { taxonomy: taxonomy });
+              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) {
@@ -1080,48 +1073,56 @@ var getRelatedContents = function () {
 
                 if (_id) documentGroup.push(_id);
               });
-              params = _extends$1._extends({}, params, { documentGroup: documentGroup });
-              conditions = conditions.concat('&& documentGroupMapping[]._ref in $documentGroup ');
-            }
-
-            if (issueGroup) {
-              params = _extends$1._extends({}, params, { issueAssociation: issueGroup._ref });
-              conditions = conditions.concat('&& issueGroup._ref == $issueAssociation ');
+              if (params.taxonomy && documentGroup.length > 0) {
+                params = _extends$1._extends({}, params, { documentGroup: documentGroup });
+                conditions = '&& (taxonomyMapping[]._ref in $taxonomy || documentGroupMapping[]._ref in $documentGroup)';
+              }
             }
 
-            if (ctx && url) {
-              cookies = getRelatedArticle.dist_3(ctx);
-              prevSlugs = cookies['prevSlugs'];
-
-              if (!!prevSlugs) {
-                getRelatedArticle.dist_2(ctx, 'prevSlugs', prevSlugs + ',"' + url + '"', {});
-                conditions = '&& !(url.current in [' + prevSlugs + '])';
-              } else getRelatedArticle.dist_2(ctx, 'prevSlugs', '"' + url + '"', {});
+            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 = 15;
+              _context.next = 21;
               break;
             }
 
-            relatedContentQuery = getQuery('related', conditions, '', articleCount);
+            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;
 
-          case 15:
+            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 16:
+          case 22:
           case 'end':
             return _context.stop();
         }
       }
-    }, _callee, _this);
+    }, _callee, _this, [[11, 18]]);
   }));
 
   return function getRelatedContents() {
@@ -1264,7 +1265,7 @@ var ArticleQueue = function ArticleQueue(props) {
                   startingIndex = queueData.length + 1;
                   endingIndex = startingIndex + 2;
                   _context.next = 5;
-                  return getRelatedArticle.getRelatedArticle(null, props.client, article, prevUrl, startingIndex + '..' + endingIndex);
+                  return getRelatedArticle(null, props.client, article, prevUrl, startingIndex + '..' + endingIndex);
 
                 case 5:
                   article.relatedArticle = _context.sent;
@@ -1649,7 +1650,7 @@ View.returnGetInitialProps = function () {
             }
 
             _context.next = 17;
-            return getRelatedArticle.getRelatedArticle(context, client, article, prevUrl, '0..2');
+            return getRelatedArticle(context, client, article, prevUrl, '0..2');
 
           case 17:
             article.relatedArticle = _context.sent;