@mjhls/mjh-framework 1.0.694-beta.3 → 1.0.694

package/dist/esm/View.js

@@ -14,19 +14,19 @@ import './web.dom.iterable-8956f9a5.js';
 import { _ as _typeof } from './typeof-08f2c380.js';
 import './_is-array-49698029.js';
 import React__default, { useState, useRef, useEffect } from 'react';
-import { l as lib_3 } from './index-0e45a0b2.js';
+import { l as lib_3 } from './index-93ec3c59.js';
 import 'prop-types';
 import 'react-bootstrap/Row';
 import 'react-bootstrap/Col';
-import { m as moment } from './moment-e2f9b20c.js';
+import { m as moment } from './moment-12415288.js';
 import { useRouter } from 'next/router';
 import './isSymbol-807e927e.js';
 import './debounce-1a993acf.js';
-import { I as InfiniteScroll } from './index.es-29c1cef5.js';
+import { I as InfiniteScroll } from './index.es-938a3a58.js';
 import 'react-dom';
-import './index-73819142.js';
+import './index-51a80699.js';
 import './index-5f9f807a.js';
-import { m as main_36 } from './main-5d1e4bd3.js';
+import { m as main_39 } from './main-0465b2a0.js';
 import './entities-7cc3bf45.js';
 import { _ as _JSON$stringify } from './stringify-008c8802.js';
 import { a as _getIterator, _ as _slicedToArray } from './slicedToArray-7021e5df.js';
@@ -35,15 +35,16 @@ import './_set-species-cede29f8.js';
 import './Segment.js';
 import './Beam.js';
 import DFPAdSlot from './AdSlot.js';
-import { B as BlockContent } from './BlockContent-e9b4ddcf.js';
+import { B as BlockContent } from './BlockContent-a614acdf.js';
 import './smoothscroll-4b699764.js';
 import './GroupDeck.js';
 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-c376cd8e.js';
+import { I as InscreenSensor, r as renderAuthor, g as getSerializers } from './index-74d46cc5.js';
 import './util-7700fc59.js';
 import './brightcove-react-player-loader.es-83f53e4e.js';
 import 'react-bootstrap/Pagination';
@@ -138,9 +139,9 @@ var DocumentGroup = function DocumentGroup(_ref) {
       style: { display: 'flex', flexDirection: 'column', padding: '0 1rem', justifyContent: thumbnailUrl ? 'center' : 'flex-start', alignItems: 'center' } },
     thumbnailUrl && React__default.createElement('img', { style: { maxWidth: '220px', maxHeight: '100px', marginTop: '1rem' }, src: thumbnailUrl, alt: name }),
     !thumbnailUrl && React__default.createElement('p', {
-      style: { maxWidth: '315px', margin: '0', color: 'var(--primary)', textAlign: thumbnailUrl ? 'center' : main_36 ? 'left' : 'right', marginTop: '.25rem' },
+      style: { maxWidth: '315px', margin: '0', color: 'var(--primary)', textAlign: thumbnailUrl ? 'center' : main_39 ? 'left' : 'right', marginTop: '.25rem' },
       dangerouslySetInnerHTML: { __html: name } }),
-    main_36 && !thumbnailUrl && React__default.createElement(
+    main_39 && !thumbnailUrl && React__default.createElement(
       'style',
       { jsx: 'true' },
       '\n          a.doc-group {\n            display: block !important;\n            padding: 0!important;\n          }\n        '
@@ -247,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_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 css = ".RelatedArticles-module_mediaContainer__10h9k {\r\n  display: flex;\r\n  flex-direction: row;\r\n  flex-wrap: nowrap;\r\n  margin: 0 -1rem;\r\n}\r\n.RelatedArticles-module_mediaCard__3wQbn {\r\n  margin: 0 1rem 1rem;\r\n  width: calc(33% - 1rem);\r\n  display: column;\r\n  flex-direction: row;\r\n  margin-bottom: 0.75rem;\r\n  padding-bottom: 0.75rem;\r\n  border-bottom: none;\r\n}\r\n.RelatedArticles-module_mediaCard__3wQbn:last-child {\r\n  border-bottom: none;\r\n}\r\n.RelatedArticles-module_cardTitle__3P-Ib {\r\n  font-weight: bold;\r\n  color: #252525;\r\n  margin-bottom: 0.25rem;\r\n  font-size: 15px;\r\n}\r\n.RelatedArticles-module_authorListing__1EFg4 span.RelatedArticles-module_text-muted__3b0zX {\r\n  color: #000;\r\n  font-weight: bold;\r\n}\r\n.RelatedArticles-module_cardDate__1wOR5 {\r\n  color: var(--dark);\r\n  display: block;\r\n  background: #fff !important;\r\n  margin-bottom: 0;\r\n}\r\n.RelatedArticles-module_imgWrapper__5Jx_4 {\r\n  display: block;\r\n  text-align: center;\r\n  margin-bottom: 0.5rem;\r\n}\r\n.RelatedArticles-module_imgWrapper__5Jx_4 img {\r\n  height: 135px;\r\n  width: 100%;\r\n  object-fit: cover;\r\n  object-position: center;\r\n}\r\n@media screen and (max-width: 1064px) {\r\n}\r\n@media screen and (max-width: 968px) {\r\n  .RelatedArticles-module_mediaContainer__10h9k {\r\n    flex-wrap: wrap;\r\n  }\r\n  .RelatedArticles-module_mediaCard__3wQbn {\r\n    width: 100%;\r\n  }\r\n  .RelatedArticles-module_imgWrapper__5Jx_4 img {\r\n    width: 100%;\r\n    height: auto;\r\n\r\n    max-height: 175px;\r\n    object-fit: contain;\r\n    margin-bottom: 1rem;\r\n  }\r\n}\r\n";
 var styles = { "mediaContainer": "RelatedArticles-module_mediaContainer__10h9k", "mediaCard": "RelatedArticles-module_mediaCard__3wQbn", "cardTitle": "RelatedArticles-module_cardTitle__3P-Ib", "authorListing": "RelatedArticles-module_authorListing__1EFg4", "text-muted": "RelatedArticles-module_text-muted__3b0zX", "cardDate": "RelatedArticles-module_cardDate__1wOR5", "imgWrapper": "RelatedArticles-module_imgWrapper__5Jx_4" };
 styleInject(css);
 
@@ -483,73 +484,65 @@ var Article = function Article(props) {
   };
 
   var RelevantTopics = function RelevantTopics() {
-    if (content_placement && content_placement.length > 0 || documentGroupMapping && documentGroupMapping.length > 0) {
-      var relatedLinks = [];
-      if (documentGroupMapping && documentGroupMapping.length > 0) {
-        documentGroupMapping.forEach(function (documentGroup) {
-          if (documentGroup.parent) {
-            relatedLinks = [].concat(_toConsumableArray(relatedLinks), [{ label: documentGroup.name, href: cpModificationRequired ? '/' + documentGroup.parent.identifier.current + '/' + documentGroup.path : '/' + documentGroup.path }]);
+    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) {
-        content_placement.filter(function (item) {
-          return item.path !== 'news';
-        }).forEach(function (cp) {
+
+          return React__default.createElement(
+            React__default.Fragment,
+            null,
+            React__default.createElement(
+              'span',
+              { className: '' },
+              React__default.createElement(
+                'a',
+                {
+                  className: 'related-links',
+                  style: { color: 'blue' },
+                  href: cpModificationRequired ? '/' + documentGroup.parent.identifier.current + '/' + documentGroup.path : '/' + documentGroup.path },
+                documentGroup.name
+              )
+            ),
+            content_placement && content_placement.length ? ' | ' : null
+          );
+        }),
+        content_placement && content_placement.length > 0 ? content_placement.map(function (cp, index) {
           var cp_url = cpModificationRequired ? getContentPlacementUrl(cp) : cp.path;
           var href = '/' + cp_url;
-          relatedLinks = [].concat(_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(
+          return React__default.createElement(
+            React__default.Fragment,
+            { key: index },
+            React__default.createElement(
               'span',
-              { key: index, className: 'related-link' },
+              null,
               React__default.createElement(
                 'a',
-                { className: 'related-links', style: { color: 'blue' }, href: relatedLink.href },
-                relatedLink.label
-              ),
-              React__default.createElement(
-                'style',
-                { jsx: 'true' },
-                '\n                      .related-link:not(:first-child):before {\n                        content: \' | \';\n                      }\n                    '
+                { className: 'related-links', key: index, href: href, style: { color: 'blue' } },
+                cp.name
               )
-            );
-          })
-        );
-      }
-      return null;
+            ),
+            content_placement.length > index + 1 ? ' | ' : null
+          );
+        }) : 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,
@@ -955,7 +948,7 @@ var Article = function Article(props) {
             React__default.createElement(
               'div',
               { className: 'ad-box', style: { textAlign: 'center' } },
-              main_36 && !sponsoredFlag && props.article.Ads && props.article.Ads.length > 0 && props.article.Ads.map(function (ad, index) {
+              main_39 && !sponsoredFlag && props.article.Ads && props.article.Ads.length > 0 && props.article.Ads.map(function (ad, index) {
                 if (index === 0) {
                   return React__default.createElement(
                     'div',
@@ -1008,7 +1001,20 @@ var Article = function Article(props) {
               )
             ),
             React__default.createElement('div', { className: 'clearfix', style: { minHeight: '1px' } }),
-            showRelatedArticles && !showIsi && React__default.createElement(RelatedContent, null)
+            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 })
+              )
+            )
           ),
           renderIsiContent(props.article)
         ),
@@ -1021,7 +1027,7 @@ var Article = function Article(props) {
           })
         )
       ),
-      main_36 && !sponsoredFlag && props.article.Ads && props.article.Ads.length > 0 && props.article.Ads.map(function (ad, index) {
+      main_39 && !sponsoredFlag && props.article.Ads && props.article.Ads.length > 0 && props.article.Ads.map(function (ad, index) {
         if (index > 0) {
           return React__default.createElement(
             'div',
@@ -1094,7 +1100,7 @@ var ArticleQueue = function ArticleQueue(props) {
     });
     var targeting = getTargeting({ article: activeArticle, cpModificationRequired: cpModificationRequired, position: props.position, prevUrl: prevUrl });
 
-    if (!main_36) {
+    if (!main_39) {
       lib_3.getGoogletag().then(function (googletag) {
         if (window.googletag && googletag.pubadsReady) {
           var slots = googletag.pubads().getSlots();
@@ -1112,7 +1118,7 @@ var ArticleQueue = function ArticleQueue(props) {
       });
     }
     //Refresh leaderboard ad on mobile
-    if (main_36) {
+    if (main_39) {
       var leaderboardSlotId = '';
       lib_3.getGoogletag().then(function (googletag) {
         if (window.googletag && googletag.pubadsReady) {
@@ -1173,77 +1179,50 @@ var ArticleQueue = function ArticleQueue(props) {
     }, 1000);
   }, [queueData.length]);
 
-  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;
+  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();
               }
+            }
+          }, _callee, _this);
+        }));
 
-              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);
-    };
-  }();
+        return function (_x) {
+          return _ref.apply(this, arguments);
+        };
+      }());
+    }
+  };
 
   var changeMeta = function changeMeta(meta) {
     document.title = meta.shareTitle;
@@ -1315,6 +1294,74 @@ 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) {
@@ -1493,15 +1540,7 @@ var View = function View(props) {
         props.article.seriesDetail && props.article.seriesDetail.nextUrl && React__default.createElement('link', { rel: 'next', href: props.article.seriesDetail.nextUrl })
       )
     ),
-    !needInfiniteScroll ? React__default.createElement(Article, _extends({ 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))
+    !needInfiniteScroll ? React__default.createElement(Article, _extends({ infiniteScroll: false, showRelatedArticles: showRelatedArticles }, props)) : React__default.createElement(Articles, _extends({ infiniteScroll: true, showRelatedArticles: showRelatedArticles, canonicalTag: canonicalTag }, props))
   );
 };
 

package/dist/esm/YahooHero.js

@@ -5,9 +5,9 @@ import './core.get-iterator-method-54d2e411.js';
 import './web.dom.iterable-8956f9a5.js';
 import React__default from 'react';
 import 'prop-types';
-import { m as moment } from './moment-e2f9b20c.js';
+import { m as moment } from './moment-12415288.js';
 import 'react-dom';
-import { i as imageUrlBuilder } from './index-73819142.js';
+import { i as imageUrlBuilder } from './index-51a80699.js';
 import { L as LazyLoad } from './index-5f9f807a.js';
 import { c as clean_html_1 } from './entities-7cc3bf45.js';
 import './slicedToArray-7021e5df.js';

package/dist/esm/YoutubeGroup.js

@@ -10,7 +10,7 @@ import './_is-array-49698029.js';
 import React__default, { useRef, useState, useEffect } from 'react';
 import 'prop-types';
 import 'react-dom';
-import { i as imageUrlBuilder } from './index-73819142.js';
+import { i as imageUrlBuilder } from './index-51a80699.js';
 import { L as LazyLoad } from './index-5f9f807a.js';
 import { _ as _slicedToArray } from './slicedToArray-7021e5df.js';
 import { s as smoothscroll, g as getYoutubeId } from './smoothscroll-4b699764.js';

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                ' + conditions + '\n                && !defined(body[].videos)\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                }';
+      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                }';
     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                            _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                        }';
+      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                        }';
     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':