@mjhls/mjh-framework 1.0.700 → 1.0.701

package/README.md

@@ -1,5 +1,5 @@
 
-# mjh-framework v. 1.0.700
+# mjh-framework v. 1.0.701
 
 > Foundation Framework 
 

package/dist/cjs/View.js

@@ -48,7 +48,6 @@ require('react-bootstrap');
 require('./iconBase-68959171.js');
 require('./index.esm-90433435.js');
 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-ec02006c.js');
 require('./util-f2c1b65b.js');
@@ -255,7 +254,7 @@ var ISI = function ISI(props) {
   );
 };
 
-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 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_imgWrapper__5Jx_4 {\r\n    display: none;\r\n  }\r\n  .RelatedArticles-module_mediaCard__3wQbn {\r\n    width: 100%;\r\n    margin-bottom: 0.5rem;\r\n    padding: 0;\r\n  }\r\n  .RelatedArticles-module_cardTitle__3P-Ib {\r\n    font-size: 0.75rem;\r\n    margin-bottom: 0;\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);
 
@@ -383,6 +382,7 @@ var Article = function Article(props) {
       issue = _props$article.issue,
       source = _props$article.source,
       documentGroupMapping = _props$article.documentGroupMapping,
+      issueGroup = _props$article.issueGroup,
       showIsi = _props$article.showIsi,
       isi = _props$article.isi,
       regionalPages = props.regionalPages,
@@ -493,65 +493,76 @@ 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.map(function (cp, index) {
+        });
+      }
+      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;
-          return React__default.createElement(
-            React__default.Fragment,
-            { key: index },
-            React__default.createElement(
+          relatedLinks = [].concat(toConsumableArray._toConsumableArray(relatedLinks), [{ label: cp.name, href: href }]);
+        });
+      }
+      if (issueGroup && issueGroup.name && issueGroup.identifier && issueGroup.identifier.current && issueGroup.parent && issueGroup.parent.identifier && issueGroup.parent.identifier.current) {
+        relatedLinks = [].concat(toConsumableArray._toConsumableArray(relatedLinks), [{ label: issueGroup.name, href: '/publications/' + issueGroup.parent.identifier.current + '/' + issueGroup.identifier.current }]);
+      }
+      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 RelatedContent = function RelatedContent() {
+    return React__default.createElement(
+      'section',
+      { id: 'related-content-section', className: 'my-1' },
+      React__default.createElement(
+        'p',
+        { className: 'mb-0' },
+        React__default.createElement(
+          'b',
+          null,
+          'Related Content:'
+        )
+      ),
+      React__default.createElement(RelevantTopics, null),
+      React__default.createElement(
+        'div',
+        { className: 'pt-2' },
+        React__default.createElement(RelatedArticle, { articles: article.relatedArticle, client: client })
+      )
+    );
+  };
+
   var form = function form() {
     return React__default.createElement(
       React__default.Fragment,
@@ -1010,20 +1021,7 @@ var Article = function Article(props) {
               )
             ),
             React__default.createElement('div', { className: 'clearfix', style: { minHeight: '1px' } }),
-            showRelatedArticles && !showIsi && 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 })
-              )
-            )
+            showRelatedArticles && !showIsi && React__default.createElement(RelatedContent, null)
           ),
           renderIsiContent(props.article)
         ),
@@ -1188,50 +1186,77 @@ var ArticleQueue = function ArticleQueue(props) {
     }, 1000);
   }, [queueData.length]);
 
-  var loadmore = function loadmore() {
-    var query = props.relatedArticleQuery;
-    var params = props.params;
-    if (queueData && queueData.length < maxListLength) {
-      params.index = queueData.length - 1;
-      props.client.fetch(query, params).then(function () {
-        var _ref = asyncToGenerator._asyncToGenerator( /*#__PURE__*/asyncToGenerator.regenerator.mark(function _callee(article) {
-          var startingIndex, endingIndex, targeting;
-          return asyncToGenerator.regenerator.wrap(function _callee$(_context) {
-            while (1) {
-              switch (_context.prev = _context.next) {
-                case 0:
-                  if (!(article && article._id)) {
-                    _context.next = 9;
-                    break;
-                  }
-
-                  //query next 4 related article without repeating previous 4 related articles
-                  startingIndex = queueData.length + 1;
-                  endingIndex = startingIndex + 2;
-                  _context.next = 5;
-                  return getRelatedArticle(null, props.client, article, prevUrl, startingIndex + '..' + endingIndex);
-
-                case 5:
-                  article.relatedArticle = _context.sent;
-                  targeting = getTargeting.getTargeting({ article: article, cpModificationRequired: cpModificationRequired, prevUrl: prevUrl });
-
-                  article.Ads = Ads.getRightItems(targeting);
-                  setQueueData([].concat(toConsumableArray._toConsumableArray(queueData), [article]));
-
-                case 9:
-                case 'end':
-                  return _context.stop();
+  var loadmore = function () {
+    var _ref = asyncToGenerator._asyncToGenerator( /*#__PURE__*/asyncToGenerator.regenerator.mark(function _callee() {
+      var index, article, startingIndex, endingIndex, targeting;
+      return asyncToGenerator.regenerator.wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              if (!(queueData && queueData.length < maxListLength)) {
+                _context.next = 27;
+                break;
               }
-            }
-          }, _callee, _this);
-        }));
 
-        return function (_x) {
-          return _ref.apply(this, arguments);
-        };
-      }());
-    }
-  };
+              index = queueData.length - 1;
+              article = null;
+              _context.prev = 3;
+              _context.next = 6;
+              return getRelatedArticle(null, props.client, props.article, prevUrl, index);
+
+            case 6:
+              article = _context.sent;
+              _context.next = 12;
+              break;
+
+            case 9:
+              _context.prev = 9;
+              _context.t0 = _context['catch'](3);
+
+              console.error(_context.t0);
+
+            case 12:
+              if (!(article && article._id)) {
+                _context.next = 27;
+                break;
+              }
+
+              //query next 4 related article without repeating previous 4 related articles
+              startingIndex = queueData.length + 1;
+              endingIndex = startingIndex + 2;
+              _context.prev = 15;
+              _context.next = 18;
+              return getRelatedArticle(null, props.client, props.article, prevUrl, startingIndex + '..' + endingIndex);
+
+            case 18:
+              article.relatedArticle = _context.sent;
+              _context.next = 24;
+              break;
+
+            case 21:
+              _context.prev = 21;
+              _context.t1 = _context['catch'](15);
+
+              console.error(_context.t1);
+
+            case 24:
+              targeting = getTargeting.getTargeting({ article: article, cpModificationRequired: cpModificationRequired, prevUrl: prevUrl });
+
+              article.Ads = Ads.getRightItems(targeting);
+              setQueueData([].concat(toConsumableArray._toConsumableArray(queueData), [article]));
+
+            case 27:
+            case 'end':
+              return _context.stop();
+          }
+        }
+      }, _callee, _this, [[3, 9], [15, 21]]);
+    }));
+
+    return function loadmore() {
+      return _ref.apply(this, arguments);
+    };
+  }();
 
   var changeMeta = function changeMeta(meta) {
     document.title = meta.shareTitle;
@@ -1303,74 +1328,6 @@ var ArticleQueue = function ArticleQueue(props) {
   );
 };
 
-var Articles = function Articles(props) {
-  var _extends2;
-
-  var videoAccountIDs = props.videoAccountIDs,
-      Ads = props.Ads,
-      cpModificationRequired = props.cpModificationRequired,
-      Settings = props.Settings,
-      ISIContent = props.ISIContent,
-      prevUrl = props.prevUrl,
-      setActiveArticle = props.setActiveArticle,
-      article = props.article,
-      client = props.client,
-      relatedArticleQuery = props.relatedArticleQuery,
-      Website = props.Website,
-      pageview = props.pageview,
-      shareOptions = props.shareOptions,
-      WAds = props.WAds,
-      regionalPages = props.regionalPages,
-      nationalPage = props.nationalPage,
-      canonicalTag = props.canonicalTag;
-  var taxonomyMapping = article.taxonomyMapping,
-      _article$url = article.url;
-  _article$url = _article$url === undefined ? {
-    current: null
-  } : _article$url;
-  var url = _article$url.current,
-      content_placement = article.content_placement;
-
-
-  var taxonomy = [];
-  content_placement.forEach(function (_ref2) {
-    var path = _ref2.path,
-        _id = _ref2._id;
-
-    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)) taxonomy.push(_id);
-  });
-
-  if (taxonomy.length === 0) {
-    taxonomy = taxonomyMapping.map(function (_ref3) {
-      var _ref = _ref3._ref;
-      return _ref;
-    });
-  }
-
-  var params = {
-    url: url,
-    taxonomy: taxonomy,
-    index: 0
-  };
-
-  return React__default.createElement(ArticleQueue, _extends._extends((_extends2 = {
-    client: client,
-    params: params,
-    relatedArticleQuery: relatedArticleQuery,
-    website: Website,
-    checkSponsered: true,
-    pageview: pageview,
-    shareOptions: shareOptions,
-    Ads: WAds,
-    regionalPages: regionalPages,
-    nationalPage: nationalPage
-  }, 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$1 = undefined;
 
 var View = function View(props) {
@@ -1549,7 +1506,15 @@ 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._extends({ infiniteScroll: false, showRelatedArticles: showRelatedArticles }, props)) : React__default.createElement(Articles, _extends._extends({ infiniteScroll: true, showRelatedArticles: showRelatedArticles, canonicalTag: canonicalTag }, props))
+    !needInfiniteScroll ? React__default.createElement(Article, _extends._extends({ infiniteScroll: false, showRelatedArticles: showRelatedArticles }, props)) : React__default.createElement(ArticleQueue, _extends._extends({
+      infiniteScroll: true,
+      showRelatedArticles: showRelatedArticles,
+      canonicalTag: canonicalTag,
+      checkSponsered: true,
+      Ads: props.WAds,
+      onVote: function onVote() {},
+      sponsoredTaxonomies: []
+    }, props))
   );
 };
 

package/dist/cjs/getQuery.js

@@ -10,9 +10,9 @@ var getQuery = function getQuery(type) {
 
   switch (type) {
     case 'related':
-      return '*[\n                _type == "article"\n                && defined(title)\n                && defined(url)\n                && !(_id in path("drafts.**"))\n                && is_visible == true\n                && defined(published) \n                && dateTime(published) <= dateTime(now())\n                && passwordLock!=true\n                && taxonomyMapping[]._ref in $taxonomy\n                && taxonomyMapping[].disableAds != \'true\'\n                && contentCategory->.name != \'Poll\'\n                && contentCategory->.name != \'Slideshows\'\n                && contentCategory->.disableAds != \'true\'\n                && ExcludeFromInfiniteScroll !=true\n                && url.current != $url\n                && !defined(body[].videos)\n                ' + conditions + '\n              ]| order(published desc)[' + (articleCount ? articleCount : '$index') + ']{\n                  ' + params + '\n                  title,\n                  published,\n                  summary,\n                  thumbnail,\n                  ...,\n                  passwordLock,\n                  password,\n                  "authorDetails": authorMapping[]->{ displayName, url, profileImage, biography },\n                  body[] {\n                    ...,\n                    upload_doc {\n                      _type,\n                      asset->\n                    },\n                    uploadAudio {\n                      _type,\n                      asset->\n                    }\n                  },\n                  \'content_placement\': taxonomyMapping[]-> {\n                    \'ancestor\': parent->parent->identifier,\n                    \'parent\': parent->identifier,\n                    \'name\': name,\n                    \'path\': identifier,\n                    disableAds\n                  },\n                  documentGroup-> {\n                    name,\n                    thumbnail,\n                    parent->{...,parent->},\n                  \'path\': identifier.current\n                  },\n                  documentGroupMapping[]-> {\n                    name,\n                    thumbnail,\n                    parent->{...,parent->},\n                  \'path\': identifier.current\n                  },\n                  \'issue\' : *[_type == \'publication\' && !(_id in path("drafts.**")) && is_visible == true && _id == ^.issueGroup._ref][0] {\n                    name,\n                    \'path\': identifier.current,\n                    \'publication\' : *[_type == \'publication\' && !(_id in path("drafts.**")) && is_visible == true && _id == ^.parent._ref][0] {\n                      name,\n                      \'path\': identifier.current\n                    },\n                    \'url\' : pdf.asset-> url\n                  }\n                }';
+      return '*[\n                _type == "article"\n                && defined(title)\n                && defined(url)\n                && !(_id in path("drafts.**"))\n                && is_visible == true\n                && defined(published) \n                && dateTime(published) <= dateTime(now())\n                && passwordLock!=true\n                && taxonomyMapping[]._ref in $taxonomy\n                && taxonomyMapping[].disableAds != \'true\'\n                && contentCategory->.name != \'Poll\'\n                && contentCategory->.name != \'Slideshows\'\n                && contentCategory->.disableAds != \'true\'\n                && ExcludeFromInfiniteScroll !=true\n                && url.current != $url\n                && !defined(body[].videos)\n                ' + conditions + '\n              ]| order(published desc)[' + (articleCount ? articleCount : '$index') + ']{\n                  ' + params + '\n                  title,\n                  published,\n                  summary,\n                  thumbnail,\n                  ...,\n                  passwordLock,\n                  password,\n                  "authorDetails": authorMapping[]->{ displayName, url, profileImage, biography },\n                  body[] {\n                    ...,\n                    upload_doc {\n                      _type,\n                      asset->\n                    },\n                    uploadAudio {\n                      _type,\n                      asset->\n                    }\n                  },\n                  \'content_placement\': taxonomyMapping[]-> {\n                    _id,\n                    \'ancestor\': parent->parent->identifier,\n                    \'parent\': parent->identifier,\n                    \'name\': name,\n                    \'path\': identifier,\n                    disableAds\n                  },\n                  documentGroup-> {\n                    name,\n                    thumbnail,\n                    parent->{...,parent->},\n                  \'path\': identifier.current\n                  },\n                  documentGroupMapping[]-> {\n                    _id,\n                    name,\n                    thumbnail,\n                    parent->{...,parent->},\n                  \'path\': identifier.current\n                  },\n                  \'issue\' : *[_type == \'publication\' && !(_id in path("drafts.**")) && is_visible == true && _id == ^.issueGroup._ref][0] {\n                    name,\n                    \'path\': identifier.current,\n                    \'publication\' : *[_type == \'publication\' && !(_id in path("drafts.**")) && is_visible == true && _id == ^.parent._ref][0] {\n                      name,\n                      \'path\': identifier.current\n                    },\n                    \'url\' : pdf.asset-> url\n                  }\n                }';
     case 'article':
-      return '*[\n                        _type == "article"\n                        && !(_id in path("drafts.**"))\n                        && defined(title)\n                        && defined(url)\n                        && url.current == $url\n                        ' + conditions + '\n                      ][0]{\n                          ' + params + '\n                          title,\n                          published,\n                          summary,\n                          thumbnail,\n                          ...,\n                          passwordLock,\n                          password,\n                          "authorDetails": authorMapping[]->{ displayName, url, profileImage, biography },\n                          body[] {\n                            ...,\n                            upload_doc {\n                              _type,\n                              asset->\n                            },\n                            uploadAudio {\n                              _type,\n                              asset->\n                            },\n                            medias[]{\n                              ...,\n                              upload_doc {\n                                _type,\n                                asset-> \n                              } \n                            },\n                            articles[]{\n                              ...,\n                              "authorDetails": authorMapping[]->{ displayName, url, profileImage, biography },\n                              text[]{\n                                ...,\n                                upload_doc {\n                                  _type,\n                                  asset->\n                                },\n                                uploadAudio {\n                                  _type,\n                                  asset->\n                                },\n                              }\n                            }\n                          },\n                          \'content_placement\': taxonomyMapping[]-> {\n                            ...,\n                            \'ancestor\': parent->parent->identifier,\n                            \'parent\': parent->identifier,\n                            \'name\': name,\n                            \'path\': identifier\n                          },\n                          documentGroup-> {\n                            name,\n                            thumbnail,\n                            parent->{...,parent->},\n                          \'path\': identifier.current\n                          },\n                          documentGroupMapping[]-> {\n                            name,\n                            thumbnail,\n                            parent->{...,parent->},\n                          \'path\': identifier.current\n                          },\n                          \'category\':contentCategory->{\n                            name,\n                            disableAds\n                          },\n                          \'issue\' : *[_type == \'publication\' && !(_id in path("drafts.**")) && is_visible == true && _id == ^.issueGroup._ref][0] {\n                            name,\n                            volume,\n                            \'issueNumber\': number,\n                            \'articleSource\': source,\n                            \'path\': identifier.current,\n                            \'publication\' : *[_type == \'publication\' && !(_id in path("drafts.**")) && is_visible == true && _id == ^.parent._ref][0] {\n                              name,\n                              \'path\': identifier.current\n                            },\n                            \'url\' : pdf.asset-> url\n                          }\n\n                        }';
+      return '*[\n                        _type == "article"\n                        && !(_id in path("drafts.**"))\n                        && defined(title)\n                        && defined(url)\n                        && url.current == $url\n                        ' + conditions + '\n                      ][0]{\n                          ' + params + '\n                          title,\n                          published,\n                          summary,\n                          thumbnail,\n                          ...,\n                          passwordLock,\n                          password,\n                          issueGroup-> { _id, name, identifier, parent-> },\n                          "authorDetails": authorMapping[]->{ displayName, url, profileImage, biography },\n                          body[] {\n                            ...,\n                            upload_doc {\n                              _type,\n                              asset->\n                            },\n                            uploadAudio {\n                              _type,\n                              asset->\n                            },\n                            medias[]{\n                              ...,\n                              upload_doc {\n                                _type,\n                                asset-> \n                              } \n                            },\n                            articles[]{\n                              ...,\n                              "authorDetails": authorMapping[]->{ displayName, url, profileImage, biography },\n                              text[]{\n                                ...,\n                                upload_doc {\n                                  _type,\n                                  asset->\n                                },\n                                uploadAudio {\n                                  _type,\n                                  asset->\n                                },\n                              }\n                            }\n                          },\n                          \'content_placement\': taxonomyMapping[]-> {\n                            ...,\n                            \'ancestor\': parent->parent->identifier,\n                            \'parent\': parent->identifier,\n                            \'name\': name,\n                            \'path\': identifier\n                          },\n                          documentGroup-> {\n                            name,\n                            thumbnail,\n                            parent->{...,parent->},\n                          \'path\': identifier.current\n                          },\n                          documentGroupMapping[]-> {\n                            _id,\n                            name,\n                            thumbnail,\n                            parent->{...,parent->},\n                          \'path\': identifier.current\n                          },\n                          \'category\':contentCategory->{\n                            name,\n                            disableAds\n                          },\n                          \'issue\' : *[_type == \'publication\' && !(_id in path("drafts.**")) && is_visible == true && _id == ^.issueGroup._ref][0] {\n                            name,\n                            volume,\n                            \'issueNumber\': number,\n                            \'articleSource\': source,\n                            \'path\': identifier.current,\n                            \'publication\' : *[_type == \'publication\' && !(_id in path("drafts.**")) && is_visible == true && _id == ^.parent._ref][0] {\n                              name,\n                              \'path\': identifier.current\n                            },\n                            \'url\' : pdf.asset-> url\n                          }\n\n                        }';
     case 'publication':
       return '*[_type == \'publication\'\n        && identifier.current == $publication\n        ' + conditions + '][0] {\n          ' + params + '\n          ...,\n          \'issues\': *[_type == \'publication\'\n              && is_visible\n              && references(^._id)\n              && defined(identifier)] {\n                ...,\n                pdf{asset->}\n              } | order(year desc, month desc)\n      }';
     case 'issue':

package/dist/cjs/getRelatedArticle.js

@@ -426,28 +426,33 @@ var dist_3 = dist.parseCookies;
 var _this = undefined;
 
 var getRelatedArticle = function () {
-  var _ref2 = asyncToGenerator._asyncToGenerator( /*#__PURE__*/asyncToGenerator.regenerator.mark(function _callee() {
+  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 taxonomyMapping, _article$url, url, content_placement, taxonomy, params, conditions, cookies, prevSlugs, relatedArticleQuery, relatedArticle;
+    var _article$url, url, documentGroupMapping, issueGroup, content_placement, references, params, articles, filters, cookies, prevSlugs, query;
 
     return asyncToGenerator.regenerator.wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
-            taxonomyMapping = article.taxonomyMapping, _article$url = article.url;
+            _article$url = article.url;
             _article$url = _article$url === undefined ? {
               current: null
             } : _article$url;
-            url = _article$url.current, content_placement = article.content_placement;
-            taxonomy = [];
-            //404 articles were throwing server error
+            url = _article$url.current, documentGroupMapping = article.documentGroupMapping, issueGroup = article.issueGroup;
+            content_placement = article.content_placement;
+            references = [];
 
-            if (content_placement) {
+
+            content_placement = content_placement && content_placement.length > 0 && content_placement.filter(function (_ref2) {
+              var identifier = _ref2.identifier;
+              return identifier !== 'news';
+            });
+            if (content_placement && content_placement.length > 0) {
               content_placement.forEach(function (_ref3) {
                 var path = _ref3.path,
                     _id = _ref3._id;
@@ -459,27 +464,39 @@ var getRelatedArticle = function () {
                 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 (prev_url_to_check.endsWith(path) && _id) references.push(_id);
               });
+              if (references.length === 0) {
+                content_placement.forEach(function (_ref4) {
+                  var _id = _ref4._id;
+
+                  if (_id) references.push(_id);
+                });
+              }
             }
 
-            //404 articles were throwing server error
-            if (taxonomy.length === 0 && taxonomyMapping) {
-              taxonomyMapping.forEach(function (_ref4) {
-                var _ref = _ref4._ref;
+            if (documentGroupMapping && documentGroupMapping.length > 0) {
+              documentGroupMapping.forEach(function (_ref5) {
+                var _id = _ref5._id;
 
-                if (_ref) {
-                  taxonomy.push(_ref);
-                }
+                if (_id) references.push(_id);
               });
             }
 
-            params = {
-              url: url,
-              taxonomy: taxonomy,
-              index: articleCount
-            };
-            conditions = '';
+            if (issueGroup && issueGroup._id) {
+              references.push(issueGroup._id);
+            }
+
+            params = { url: url, index: articleCount };
+            articles = null;
+
+            if (!(references && references.length > 0)) {
+              _context.next = 24;
+              break;
+            }
+
+            filters = '&& references("' + references.join('","') + '") ';
+
 
             if (ctx && url) {
               cookies = dist_3(ctx);
@@ -487,27 +504,39 @@ var getRelatedArticle = function () {
 
               if (!!prevSlugs) {
                 dist_2(ctx, 'prevSlugs', prevSlugs + ',"' + url + '"', {});
-                conditions = '&& !(url.current in [' + prevSlugs + '])';
+                filters = '&& !(url.current in [' + prevSlugs + '])';
               } else dist_2(ctx, 'prevSlugs', '"' + url + '"', {});
             }
-            relatedArticleQuery = getQuery('related', conditions, '', articleCount);
-            _context.next = 12;
-            return client.fetch(relatedArticleQuery, params);
 
-          case 12:
-            relatedArticle = _context.sent;
-            return _context.abrupt('return', relatedArticle);
+            query = getQuery('related', filters, '', articleCount).replace('&& taxonomyMapping[]._ref in $taxonomy', '');
+            _context.prev = 15;
+            _context.next = 18;
+            return client.fetch(query, params);
+
+          case 18:
+            articles = _context.sent;
+            _context.next = 24;
+            break;
+
+          case 21:
+            _context.prev = 21;
+            _context.t0 = _context['catch'](15);
+
+            console.error(_context.t0);
+
+          case 24:
+            return _context.abrupt('return', articles);
 
-          case 14:
+          case 25:
           case 'end':
             return _context.stop();
         }
       }
-    }, _callee, _this);
+    }, _callee, _this, [[15, 21]]);
   }));
 
   return function getRelatedArticle() {
-    return _ref2.apply(this, arguments);
+    return _ref.apply(this, arguments);
   };
 }();
 

package/dist/esm/View.js

@@ -42,7 +42,6 @@ import 'react-bootstrap';
 import './iconBase-602d52fe.js';
 import './index.esm-29e48d38.js';
 import Button from 'react-bootstrap/Button';
-import { _ as _defineProperty } from './defineProperty-b798470d.js';
 import Form from 'react-bootstrap/Form';
 import { I as InscreenSensor, r as renderAuthor, g as getSerializers } from './index-50d0fbc7.js';
 import './util-7700fc59.js';
@@ -249,7 +248,7 @@ var ISI = function ISI(props) {
   );
 };
 
-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 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_imgWrapper__5Jx_4 {\r\n    display: none;\r\n  }\r\n  .RelatedArticles-module_mediaCard__3wQbn {\r\n    width: 100%;\r\n    margin-bottom: 0.5rem;\r\n    padding: 0;\r\n  }\r\n  .RelatedArticles-module_cardTitle__3P-Ib {\r\n    font-size: 0.75rem;\r\n    margin-bottom: 0;\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(css);
 
@@ -377,6 +376,7 @@ var Article = function Article(props) {
       issue = _props$article.issue,
       source = _props$article.source,
       documentGroupMapping = _props$article.documentGroupMapping,
+      issueGroup = _props$article.issueGroup,
       showIsi = _props$article.showIsi,
       isi = _props$article.isi,
       regionalPages = props.regionalPages,
@@ -487,65 +487,76 @@ 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(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.map(function (cp, index) {
+        });
+      }
+      if (content_placement && content_placement.length > 0) {
+        content_placement.filter(function (item) {
+          return item.path !== 'news';
+        }).forEach(function (cp) {
           var cp_url = cpModificationRequired ? getContentPlacementUrl(cp) : cp.path;
           var href = '/' + cp_url;
-          return React__default.createElement(
-            React__default.Fragment,
-            { key: index },
-            React__default.createElement(
+          relatedLinks = [].concat(_toConsumableArray(relatedLinks), [{ label: cp.name, href: href }]);
+        });
+      }
+      if (issueGroup && issueGroup.name && issueGroup.identifier && issueGroup.identifier.current && issueGroup.parent && issueGroup.parent.identifier && issueGroup.parent.identifier.current) {
+        relatedLinks = [].concat(_toConsumableArray(relatedLinks), [{ label: issueGroup.name, href: '/publications/' + issueGroup.parent.identifier.current + '/' + issueGroup.identifier.current }]);
+      }
+      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 RelatedContent = function RelatedContent() {
+    return React__default.createElement(
+      'section',
+      { id: 'related-content-section', className: 'my-1' },
+      React__default.createElement(
+        'p',
+        { className: 'mb-0' },
+        React__default.createElement(
+          'b',
+          null,
+          'Related Content:'
+        )
+      ),
+      React__default.createElement(RelevantTopics, null),
+      React__default.createElement(
+        'div',
+        { className: 'pt-2' },
+        React__default.createElement(RelatedArticle, { articles: article.relatedArticle, client: client })
+      )
+    );
+  };
+
   var form = function form() {
     return React__default.createElement(
       React__default.Fragment,
@@ -1004,20 +1015,7 @@ var Article = function Article(props) {
               )
             ),
             React__default.createElement('div', { className: 'clearfix', style: { minHeight: '1px' } }),
-            showRelatedArticles && !showIsi && 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 })
-              )
-            )
+            showRelatedArticles && !showIsi && React__default.createElement(RelatedContent, null)
           ),
           renderIsiContent(props.article)
         ),
@@ -1182,50 +1180,77 @@ var ArticleQueue = function ArticleQueue(props) {
     }, 1000);
   }, [queueData.length]);
 
-  var loadmore = function loadmore() {
-    var query = props.relatedArticleQuery;
-    var params = props.params;
-    if (queueData && queueData.length < maxListLength) {
-      params.index = queueData.length - 1;
-      props.client.fetch(query, params).then(function () {
-        var _ref = _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee(article) {
-          var startingIndex, endingIndex, targeting;
-          return regenerator.wrap(function _callee$(_context) {
-            while (1) {
-              switch (_context.prev = _context.next) {
-                case 0:
-                  if (!(article && article._id)) {
-                    _context.next = 9;
-                    break;
-                  }
-
-                  //query next 4 related article without repeating previous 4 related articles
-                  startingIndex = queueData.length + 1;
-                  endingIndex = startingIndex + 2;
-                  _context.next = 5;
-                  return getRelatedArticle(null, props.client, article, prevUrl, startingIndex + '..' + endingIndex);
-
-                case 5:
-                  article.relatedArticle = _context.sent;
-                  targeting = getTargeting({ article: article, cpModificationRequired: cpModificationRequired, prevUrl: prevUrl });
-
-                  article.Ads = Ads.getRightItems(targeting);
-                  setQueueData([].concat(_toConsumableArray(queueData), [article]));
-
-                case 9:
-                case 'end':
-                  return _context.stop();
+  var loadmore = function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee() {
+      var index, article, startingIndex, endingIndex, targeting;
+      return regenerator.wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              if (!(queueData && queueData.length < maxListLength)) {
+                _context.next = 27;
+                break;
               }
-            }
-          }, _callee, _this);
-        }));
 
-        return function (_x) {
-          return _ref.apply(this, arguments);
-        };
-      }());
-    }
-  };
+              index = queueData.length - 1;
+              article = null;
+              _context.prev = 3;
+              _context.next = 6;
+              return getRelatedArticle(null, props.client, props.article, prevUrl, index);
+
+            case 6:
+              article = _context.sent;
+              _context.next = 12;
+              break;
+
+            case 9:
+              _context.prev = 9;
+              _context.t0 = _context['catch'](3);
+
+              console.error(_context.t0);
+
+            case 12:
+              if (!(article && article._id)) {
+                _context.next = 27;
+                break;
+              }
+
+              //query next 4 related article without repeating previous 4 related articles
+              startingIndex = queueData.length + 1;
+              endingIndex = startingIndex + 2;
+              _context.prev = 15;
+              _context.next = 18;
+              return getRelatedArticle(null, props.client, props.article, prevUrl, startingIndex + '..' + endingIndex);
+
+            case 18:
+              article.relatedArticle = _context.sent;
+              _context.next = 24;
+              break;
+
+            case 21:
+              _context.prev = 21;
+              _context.t1 = _context['catch'](15);
+
+              console.error(_context.t1);
+
+            case 24:
+              targeting = getTargeting({ article: article, cpModificationRequired: cpModificationRequired, prevUrl: prevUrl });
+
+              article.Ads = Ads.getRightItems(targeting);
+              setQueueData([].concat(_toConsumableArray(queueData), [article]));
+
+            case 27:
+            case 'end':
+              return _context.stop();
+          }
+        }
+      }, _callee, _this, [[3, 9], [15, 21]]);
+    }));
+
+    return function loadmore() {
+      return _ref.apply(this, arguments);
+    };
+  }();
 
   var changeMeta = function changeMeta(meta) {
     document.title = meta.shareTitle;
@@ -1297,74 +1322,6 @@ var ArticleQueue = function ArticleQueue(props) {
   );
 };
 
-var Articles = function Articles(props) {
-  var _extends2;
-
-  var videoAccountIDs = props.videoAccountIDs,
-      Ads = props.Ads,
-      cpModificationRequired = props.cpModificationRequired,
-      Settings = props.Settings,
-      ISIContent = props.ISIContent,
-      prevUrl = props.prevUrl,
-      setActiveArticle = props.setActiveArticle,
-      article = props.article,
-      client = props.client,
-      relatedArticleQuery = props.relatedArticleQuery,
-      Website = props.Website,
-      pageview = props.pageview,
-      shareOptions = props.shareOptions,
-      WAds = props.WAds,
-      regionalPages = props.regionalPages,
-      nationalPage = props.nationalPage,
-      canonicalTag = props.canonicalTag;
-  var taxonomyMapping = article.taxonomyMapping,
-      _article$url = article.url;
-  _article$url = _article$url === undefined ? {
-    current: null
-  } : _article$url;
-  var url = _article$url.current,
-      content_placement = article.content_placement;
-
-
-  var taxonomy = [];
-  content_placement.forEach(function (_ref2) {
-    var path = _ref2.path,
-        _id = _ref2._id;
-
-    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)) taxonomy.push(_id);
-  });
-
-  if (taxonomy.length === 0) {
-    taxonomy = taxonomyMapping.map(function (_ref3) {
-      var _ref = _ref3._ref;
-      return _ref;
-    });
-  }
-
-  var params = {
-    url: url,
-    taxonomy: taxonomy,
-    index: 0
-  };
-
-  return React__default.createElement(ArticleQueue, _extends((_extends2 = {
-    client: client,
-    params: params,
-    relatedArticleQuery: relatedArticleQuery,
-    website: Website,
-    checkSponsered: true,
-    pageview: pageview,
-    shareOptions: shareOptions,
-    Ads: WAds,
-    regionalPages: regionalPages,
-    nationalPage: nationalPage
-  }, _defineProperty(_extends2, 'pageview', pageview), _defineProperty(_extends2, 'onVote', function onVote() {}), _defineProperty(_extends2, 'ISIContent', ISIContent), _defineProperty(_extends2, 'videoAccountIDs', videoAccountIDs), _defineProperty(_extends2, 'sponsoredTaxonomies', []), _defineProperty(_extends2, 'cpModificationRequired', cpModificationRequired), _defineProperty(_extends2, 'Settings', Settings), _defineProperty(_extends2, 'canonicalTag', canonicalTag), _extends2), props));
-};
-
 var _this$1 = undefined;
 
 var View = function View(props) {
@@ -1543,7 +1500,15 @@ 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({ infiniteScroll: false, showRelatedArticles: showRelatedArticles }, props)) : React__default.createElement(Articles, _extends({ infiniteScroll: true, showRelatedArticles: showRelatedArticles, canonicalTag: canonicalTag }, props))
+    !needInfiniteScroll ? React__default.createElement(Article, _extends({ infiniteScroll: false, showRelatedArticles: showRelatedArticles }, props)) : React__default.createElement(ArticleQueue, _extends({
+      infiniteScroll: true,
+      showRelatedArticles: showRelatedArticles,
+      canonicalTag: canonicalTag,
+      checkSponsered: true,
+      Ads: props.WAds,
+      onVote: function onVote() {},
+      sponsoredTaxonomies: []
+    }, props))
   );
 };
 

package/dist/esm/getQuery.js

@@ -8,9 +8,9 @@ var getQuery = function getQuery(type) {
 
   switch (type) {
     case 'related':
-      return '*[\n                _type == "article"\n                && defined(title)\n                && defined(url)\n                && !(_id in path("drafts.**"))\n                && is_visible == true\n                && defined(published) \n                && dateTime(published) <= dateTime(now())\n                && passwordLock!=true\n                && taxonomyMapping[]._ref in $taxonomy\n                && taxonomyMapping[].disableAds != \'true\'\n                && contentCategory->.name != \'Poll\'\n                && contentCategory->.name != \'Slideshows\'\n                && contentCategory->.disableAds != \'true\'\n                && ExcludeFromInfiniteScroll !=true\n                && url.current != $url\n                && !defined(body[].videos)\n                ' + conditions + '\n              ]| order(published desc)[' + (articleCount ? articleCount : '$index') + ']{\n                  ' + params + '\n                  title,\n                  published,\n                  summary,\n                  thumbnail,\n                  ...,\n                  passwordLock,\n                  password,\n                  "authorDetails": authorMapping[]->{ displayName, url, profileImage, biography },\n                  body[] {\n                    ...,\n                    upload_doc {\n                      _type,\n                      asset->\n                    },\n                    uploadAudio {\n                      _type,\n                      asset->\n                    }\n                  },\n                  \'content_placement\': taxonomyMapping[]-> {\n                    \'ancestor\': parent->parent->identifier,\n                    \'parent\': parent->identifier,\n                    \'name\': name,\n                    \'path\': identifier,\n                    disableAds\n                  },\n                  documentGroup-> {\n                    name,\n                    thumbnail,\n                    parent->{...,parent->},\n                  \'path\': identifier.current\n                  },\n                  documentGroupMapping[]-> {\n                    name,\n                    thumbnail,\n                    parent->{...,parent->},\n                  \'path\': identifier.current\n                  },\n                  \'issue\' : *[_type == \'publication\' && !(_id in path("drafts.**")) && is_visible == true && _id == ^.issueGroup._ref][0] {\n                    name,\n                    \'path\': identifier.current,\n                    \'publication\' : *[_type == \'publication\' && !(_id in path("drafts.**")) && is_visible == true && _id == ^.parent._ref][0] {\n                      name,\n                      \'path\': identifier.current\n                    },\n                    \'url\' : pdf.asset-> url\n                  }\n                }';
+      return '*[\n                _type == "article"\n                && defined(title)\n                && defined(url)\n                && !(_id in path("drafts.**"))\n                && is_visible == true\n                && defined(published) \n                && dateTime(published) <= dateTime(now())\n                && passwordLock!=true\n                && taxonomyMapping[]._ref in $taxonomy\n                && taxonomyMapping[].disableAds != \'true\'\n                && contentCategory->.name != \'Poll\'\n                && contentCategory->.name != \'Slideshows\'\n                && contentCategory->.disableAds != \'true\'\n                && ExcludeFromInfiniteScroll !=true\n                && url.current != $url\n                && !defined(body[].videos)\n                ' + conditions + '\n              ]| order(published desc)[' + (articleCount ? articleCount : '$index') + ']{\n                  ' + params + '\n                  title,\n                  published,\n                  summary,\n                  thumbnail,\n                  ...,\n                  passwordLock,\n                  password,\n                  "authorDetails": authorMapping[]->{ displayName, url, profileImage, biography },\n                  body[] {\n                    ...,\n                    upload_doc {\n                      _type,\n                      asset->\n                    },\n                    uploadAudio {\n                      _type,\n                      asset->\n                    }\n                  },\n                  \'content_placement\': taxonomyMapping[]-> {\n                    _id,\n                    \'ancestor\': parent->parent->identifier,\n                    \'parent\': parent->identifier,\n                    \'name\': name,\n                    \'path\': identifier,\n                    disableAds\n                  },\n                  documentGroup-> {\n                    name,\n                    thumbnail,\n                    parent->{...,parent->},\n                  \'path\': identifier.current\n                  },\n                  documentGroupMapping[]-> {\n                    _id,\n                    name,\n                    thumbnail,\n                    parent->{...,parent->},\n                  \'path\': identifier.current\n                  },\n                  \'issue\' : *[_type == \'publication\' && !(_id in path("drafts.**")) && is_visible == true && _id == ^.issueGroup._ref][0] {\n                    name,\n                    \'path\': identifier.current,\n                    \'publication\' : *[_type == \'publication\' && !(_id in path("drafts.**")) && is_visible == true && _id == ^.parent._ref][0] {\n                      name,\n                      \'path\': identifier.current\n                    },\n                    \'url\' : pdf.asset-> url\n                  }\n                }';
     case 'article':
-      return '*[\n                        _type == "article"\n                        && !(_id in path("drafts.**"))\n                        && defined(title)\n                        && defined(url)\n                        && url.current == $url\n                        ' + conditions + '\n                      ][0]{\n                          ' + params + '\n                          title,\n                          published,\n                          summary,\n                          thumbnail,\n                          ...,\n                          passwordLock,\n                          password,\n                          "authorDetails": authorMapping[]->{ displayName, url, profileImage, biography },\n                          body[] {\n                            ...,\n                            upload_doc {\n                              _type,\n                              asset->\n                            },\n                            uploadAudio {\n                              _type,\n                              asset->\n                            },\n                            medias[]{\n                              ...,\n                              upload_doc {\n                                _type,\n                                asset-> \n                              } \n                            },\n                            articles[]{\n                              ...,\n                              "authorDetails": authorMapping[]->{ displayName, url, profileImage, biography },\n                              text[]{\n                                ...,\n                                upload_doc {\n                                  _type,\n                                  asset->\n                                },\n                                uploadAudio {\n                                  _type,\n                                  asset->\n                                },\n                              }\n                            }\n                          },\n                          \'content_placement\': taxonomyMapping[]-> {\n                            ...,\n                            \'ancestor\': parent->parent->identifier,\n                            \'parent\': parent->identifier,\n                            \'name\': name,\n                            \'path\': identifier\n                          },\n                          documentGroup-> {\n                            name,\n                            thumbnail,\n                            parent->{...,parent->},\n                          \'path\': identifier.current\n                          },\n                          documentGroupMapping[]-> {\n                            name,\n                            thumbnail,\n                            parent->{...,parent->},\n                          \'path\': identifier.current\n                          },\n                          \'category\':contentCategory->{\n                            name,\n                            disableAds\n                          },\n                          \'issue\' : *[_type == \'publication\' && !(_id in path("drafts.**")) && is_visible == true && _id == ^.issueGroup._ref][0] {\n                            name,\n                            volume,\n                            \'issueNumber\': number,\n                            \'articleSource\': source,\n                            \'path\': identifier.current,\n                            \'publication\' : *[_type == \'publication\' && !(_id in path("drafts.**")) && is_visible == true && _id == ^.parent._ref][0] {\n                              name,\n                              \'path\': identifier.current\n                            },\n                            \'url\' : pdf.asset-> url\n                          }\n\n                        }';
+      return '*[\n                        _type == "article"\n                        && !(_id in path("drafts.**"))\n                        && defined(title)\n                        && defined(url)\n                        && url.current == $url\n                        ' + conditions + '\n                      ][0]{\n                          ' + params + '\n                          title,\n                          published,\n                          summary,\n                          thumbnail,\n                          ...,\n                          passwordLock,\n                          password,\n                          issueGroup-> { _id, name, identifier, parent-> },\n                          "authorDetails": authorMapping[]->{ displayName, url, profileImage, biography },\n                          body[] {\n                            ...,\n                            upload_doc {\n                              _type,\n                              asset->\n                            },\n                            uploadAudio {\n                              _type,\n                              asset->\n                            },\n                            medias[]{\n                              ...,\n                              upload_doc {\n                                _type,\n                                asset-> \n                              } \n                            },\n                            articles[]{\n                              ...,\n                              "authorDetails": authorMapping[]->{ displayName, url, profileImage, biography },\n                              text[]{\n                                ...,\n                                upload_doc {\n                                  _type,\n                                  asset->\n                                },\n                                uploadAudio {\n                                  _type,\n                                  asset->\n                                },\n                              }\n                            }\n                          },\n                          \'content_placement\': taxonomyMapping[]-> {\n                            ...,\n                            \'ancestor\': parent->parent->identifier,\n                            \'parent\': parent->identifier,\n                            \'name\': name,\n                            \'path\': identifier\n                          },\n                          documentGroup-> {\n                            name,\n                            thumbnail,\n                            parent->{...,parent->},\n                          \'path\': identifier.current\n                          },\n                          documentGroupMapping[]-> {\n                            _id,\n                            name,\n                            thumbnail,\n                            parent->{...,parent->},\n                          \'path\': identifier.current\n                          },\n                          \'category\':contentCategory->{\n                            name,\n                            disableAds\n                          },\n                          \'issue\' : *[_type == \'publication\' && !(_id in path("drafts.**")) && is_visible == true && _id == ^.issueGroup._ref][0] {\n                            name,\n                            volume,\n                            \'issueNumber\': number,\n                            \'articleSource\': source,\n                            \'path\': identifier.current,\n                            \'publication\' : *[_type == \'publication\' && !(_id in path("drafts.**")) && is_visible == true && _id == ^.parent._ref][0] {\n                              name,\n                              \'path\': identifier.current\n                            },\n                            \'url\' : pdf.asset-> url\n                          }\n\n                        }';
     case 'publication':
       return '*[_type == \'publication\'\n        && identifier.current == $publication\n        ' + conditions + '][0] {\n          ' + params + '\n          ...,\n          \'issues\': *[_type == \'publication\'\n              && is_visible\n              && references(^._id)\n              && defined(identifier)] {\n                ...,\n                pdf{asset->}\n              } | order(year desc, month desc)\n      }';
     case 'issue':

package/dist/esm/getRelatedArticle.js

@@ -424,28 +424,33 @@ var dist_3 = dist.parseCookies;
 var _this = undefined;
 
 var getRelatedArticle = function () {
-  var _ref2 = _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee() {
+  var _ref = _asyncToGenerator( /*#__PURE__*/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 taxonomyMapping, _article$url, url, content_placement, taxonomy, params, conditions, cookies, prevSlugs, relatedArticleQuery, relatedArticle;
+    var _article$url, url, documentGroupMapping, issueGroup, content_placement, references, params, articles, filters, cookies, prevSlugs, query;
 
     return regenerator.wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
-            taxonomyMapping = article.taxonomyMapping, _article$url = article.url;
+            _article$url = article.url;
             _article$url = _article$url === undefined ? {
               current: null
             } : _article$url;
-            url = _article$url.current, content_placement = article.content_placement;
-            taxonomy = [];
-            //404 articles were throwing server error
+            url = _article$url.current, documentGroupMapping = article.documentGroupMapping, issueGroup = article.issueGroup;
+            content_placement = article.content_placement;
+            references = [];
 
-            if (content_placement) {
+
+            content_placement = content_placement && content_placement.length > 0 && content_placement.filter(function (_ref2) {
+              var identifier = _ref2.identifier;
+              return identifier !== 'news';
+            });
+            if (content_placement && content_placement.length > 0) {
               content_placement.forEach(function (_ref3) {
                 var path = _ref3.path,
                     _id = _ref3._id;
@@ -457,27 +462,39 @@ var getRelatedArticle = function () {
                 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 (prev_url_to_check.endsWith(path) && _id) references.push(_id);
               });
+              if (references.length === 0) {
+                content_placement.forEach(function (_ref4) {
+                  var _id = _ref4._id;
+
+                  if (_id) references.push(_id);
+                });
+              }
             }
 
-            //404 articles were throwing server error
-            if (taxonomy.length === 0 && taxonomyMapping) {
-              taxonomyMapping.forEach(function (_ref4) {
-                var _ref = _ref4._ref;
+            if (documentGroupMapping && documentGroupMapping.length > 0) {
+              documentGroupMapping.forEach(function (_ref5) {
+                var _id = _ref5._id;
 
-                if (_ref) {
-                  taxonomy.push(_ref);
-                }
+                if (_id) references.push(_id);
               });
             }
 
-            params = {
-              url: url,
-              taxonomy: taxonomy,
-              index: articleCount
-            };
-            conditions = '';
+            if (issueGroup && issueGroup._id) {
+              references.push(issueGroup._id);
+            }
+
+            params = { url: url, index: articleCount };
+            articles = null;
+
+            if (!(references && references.length > 0)) {
+              _context.next = 24;
+              break;
+            }
+
+            filters = '&& references("' + references.join('","') + '") ';
+
 
             if (ctx && url) {
               cookies = dist_3(ctx);
@@ -485,27 +502,39 @@ var getRelatedArticle = function () {
 
               if (!!prevSlugs) {
                 dist_2(ctx, 'prevSlugs', prevSlugs + ',"' + url + '"', {});
-                conditions = '&& !(url.current in [' + prevSlugs + '])';
+                filters = '&& !(url.current in [' + prevSlugs + '])';
               } else dist_2(ctx, 'prevSlugs', '"' + url + '"', {});
             }
-            relatedArticleQuery = getQuery('related', conditions, '', articleCount);
-            _context.next = 12;
-            return client.fetch(relatedArticleQuery, params);
 
-          case 12:
-            relatedArticle = _context.sent;
-            return _context.abrupt('return', relatedArticle);
+            query = getQuery('related', filters, '', articleCount).replace('&& taxonomyMapping[]._ref in $taxonomy', '');
+            _context.prev = 15;
+            _context.next = 18;
+            return client.fetch(query, params);
+
+          case 18:
+            articles = _context.sent;
+            _context.next = 24;
+            break;
+
+          case 21:
+            _context.prev = 21;
+            _context.t0 = _context['catch'](15);
+
+            console.error(_context.t0);
+
+          case 24:
+            return _context.abrupt('return', articles);
 
-          case 14:
+          case 25:
           case 'end':
             return _context.stop();
         }
       }
-    }, _callee, _this);
+    }, _callee, _this, [[15, 21]]);
   }));
 
   return function getRelatedArticle() {
-    return _ref2.apply(this, arguments);
+    return _ref.apply(this, arguments);
   };
 }();
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mjhls/mjh-framework",
-  "version": "1.0.700",
+  "version": "1.0.701",
   "description": "Foundation Framework",
   "author": "mjh-framework",
   "license": "MIT",