@mjhls/mjh-framework 1.0.664-beta.0 → 1.0.664

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                && published <= 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                    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                && published <= 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                            }\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                            }\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':

package/dist/cjs/getRelatedArticle.js

@@ -7,12 +7,97 @@ require('./_library-dd23b178.js');
 require('./_iter-detect-60b2f026.js');
 require('./core.get-iterator-method-f62321d4.js');
 require('./web.dom.iterable-a0e279c1.js');
-require('./asyncToGenerator-533d476a.js');
+var asyncToGenerator = require('./asyncToGenerator-533d476a.js');
 require('./_set-species-f92c67c5.js');
-require('./index-bd6c9f56.js');
-var getRelatedArticle = require('./getRelatedArticle-606b1d0b.js');
-require('./getQuery.js');
+var nookies = require('nookies');
+var getQuery = require('./getQuery.js');
 
+var _this = undefined;
 
+var getRelatedArticle = function () {
+  var _ref2 = 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;
 
-module.exports = getRelatedArticle.getRelatedArticle;
+    var taxonomyMapping, _article$url, url, content_placement, taxonomy, params, conditions, cookies, prevSlugs, relatedArticleQuery, relatedArticle;
+
+    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 === undefined ? {
+              current: null
+            } : _article$url;
+            url = _article$url.current, content_placement = article.content_placement;
+            taxonomy = [];
+            //404 articles were throwing server error
+
+            if (content_placement) {
+              content_placement.forEach(function (_ref3) {
+                var path = _ref3.path,
+                    _id = _ref3._id;
+
+                if (!_id || typeof _id == 'undefined') {
+                  return null;
+                }
+                var prev_url_to_check = prevUrl;
+                if (prev_url_to_check.includes('?')) {
+                  prev_url_to_check = prev_url_to_check.split('?')[0];
+                }
+                if (prev_url_to_check.endsWith(path) && _id) taxonomy.push(_id);
+              });
+            }
+
+            //404 articles were throwing server error
+            if (taxonomy.length === 0 && taxonomyMapping) {
+              taxonomyMapping.forEach(function (_ref4) {
+                var _ref = _ref4._ref;
+
+                if (_ref) {
+                  taxonomy.push(_ref);
+                }
+              });
+            }
+
+            params = {
+              url: url,
+              taxonomy: taxonomy,
+              index: articleCount
+            };
+            conditions = '';
+
+            if (ctx && url) {
+              cookies = nookies.parseCookies(ctx);
+              prevSlugs = cookies['prevSlugs'];
+
+              if (!!prevSlugs) {
+                nookies.setCookie(ctx, 'prevSlugs', prevSlugs + ',"' + url + '"', {});
+                conditions = '&& !(url.current in [' + prevSlugs + '])';
+              } else nookies.setCookie(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);
+
+          case 14:
+          case 'end':
+            return _context.stop();
+        }
+      }
+    }, _callee, _this);
+  }));
+
+  return function getRelatedArticle() {
+    return _ref2.apply(this, arguments);
+  };
+}();
+
+module.exports = getRelatedArticle;

package/dist/cjs/getSerializers.js

@@ -16,18 +16,18 @@ require('./web.dom.iterable-a0e279c1.js');
 require('./typeof-725500bc.js');
 require('./_is-array-754e012d.js');
 require('react');
-require('./index-fa8ed292.js');
+require('./index-2d0a4911.js');
 require('prop-types');
 require('react-bootstrap/Row');
 require('react-bootstrap/Col');
-require('./moment-575fe24c.js');
+require('./moment-66a6a284.js');
 require('next/router');
 require('./isSymbol-04666465.js');
 require('./debounce-eb287781.js');
 require('react-dom');
-require('./index-be0c82be.js');
+require('./index-b5eb3ff8.js');
 require('./index-da796b8c.js');
-require('./main-a4cb15bb.js');
+require('./main-b6c96c8d.js');
 require('./entities-310b46ee.js');
 require('./stringify-7c5aff47.js');
 require('./slicedToArray-8f385299.js');
@@ -35,12 +35,12 @@ require('./asyncToGenerator-533d476a.js');
 require('./_set-species-f92c67c5.js');
 require('./beam-7217b7e7.js');
 require('./AdSlot.js');
-require('./BlockContent-091a991f.js');
+require('./BlockContent-88f69acd.js');
 require('./smoothscroll-95231a70.js');
 require('./GroupDeck.js');
 require('react-bootstrap');
 require('react-bootstrap/Button');
-var getSerializers = require('./index-bc3e2d5c.js');
+var getSerializers = require('./index-6f1ee5f0.js');
 require('./util-f2c1b65b.js');
 require('./brightcove-react-player-loader.es-156bd4d6.js');
 require('react-bootstrap/Pagination');

package/dist/cjs/{getTargeting-9af0ef69.js → getTargeting-fee8c429.js}

@@ -1,7 +1,7 @@
 'use strict';
 
 var toConsumableArray = require('./toConsumableArray-9a3476fe.js');
-var _extends$1 = require('./extends-60837c34.js');
+var _extends = require('./extends-60837c34.js');
 
 var getContentPlacementUrl = function getContentPlacementUrl(cp) {
     var cp_url = '';
@@ -133,7 +133,7 @@ var getTargeting = function getTargeting(props) {
   }
 
   if (props.cache && props.cache.hyperTargeting) {
-    targeting = _extends$1._extends({}, targeting, { campaign_id: props.cache.hyperTargeting });
+    targeting = _extends._extends({}, targeting, { campaign_id: props.cache.hyperTargeting });
   }
 
   if (position && position.length) {

package/dist/cjs/getTargeting.js

@@ -8,7 +8,7 @@ require('./toConsumableArray-9a3476fe.js');
 require('./core.get-iterator-method-f62321d4.js');
 require('./_object-pie-68c5bcbc.js');
 require('./extends-60837c34.js');
-var getTargeting = require('./getTargeting-9af0ef69.js');
+var getTargeting = require('./getTargeting-fee8c429.js');
 
 
 

package/dist/cjs/{index-fa8ed292.js → index-2d0a4911.js}

@@ -728,6 +728,8 @@ var DFPManager = Object.assign(new EventEmitter.EventEmitter().setMaxListeners(0
 
     return new Promise(function (resolve) {
       _this3.getGoogletag().then(function (googletag) {
+        _this3.configureInitialOptions(googletag);
+
         slotsToInitialize.forEach(function (currentSlotId) {
           registeredSlots[currentSlotId].loading = false;
           googletag.cmd.push(function () {
@@ -791,14 +793,25 @@ var DFPManager = Object.assign(new EventEmitter.EventEmitter().setMaxListeners(0
       });
     });
   },
-  configureOptions: function configureOptions(googletag) {
+  // configure those gpt parameters that need to be set before pubsads service
+  // initialization.
+  configureInitialOptions: function configureInitialOptions(googletag) {
     var _this4 = this;
 
+    googletag.cmd.push(function () {
+      if (_this4.disableInitialLoadIsEnabled()) {
+        googletag.pubads().disableInitialLoad();
+      }
+    });
+  },
+  configureOptions: function configureOptions(googletag) {
+    var _this5 = this;
+
     googletag.cmd.push(function () {
       var pubadsService = googletag.pubads();
-      pubadsService.setRequestNonPersonalizedAds(_this4.personalizedAdsEnabled() ? 0 : 1);
+      pubadsService.setRequestNonPersonalizedAds(_this5.personalizedAdsEnabled() ? 0 : 1);
 
-      var targetingArguments = _this4.getTargetingArguments(); // set global targetting arguments
+      var targetingArguments = _this5.getTargetingArguments(); // set global targetting arguments
 
 
       Object.keys(targetingArguments).forEach(function (varName) {
@@ -807,34 +820,28 @@ var DFPManager = Object.assign(new EventEmitter.EventEmitter().setMaxListeners(0
         }
       }); // set global adSense attributes
 
-      var adSenseAttributes = _this4.getAdSenseAttributes();
+      var adSenseAttributes = _this5.getAdSenseAttributes();
 
       Object.keys(adSenseAttributes).forEach(function (key) {
         pubadsService.set(key, adSenseAttributes[key]);
       });
 
-      if (_this4.lazyLoadIsEnabled()) {
-        var args = [];
-
-        var config = _this4.getLazyLoadConfig();
+      if (_this5.lazyLoadIsEnabled()) {
+        var config = _this5.getLazyLoadConfig();
 
-        if (config !== null) {
-          args.push(config);
+        if (config) {
+          pubadsService.enableLazyLoad(config);
+        } else {
+          pubadsService.enableLazyLoad();
         }
-
-        pubadsService.enableLazyLoad.call(args);
       }
 
-      if (_this4.singleRequestIsEnabled()) {
+      if (_this5.singleRequestIsEnabled()) {
         pubadsService.enableSingleRequest();
       }
 
-      if (_this4.disableInitialLoadIsEnabled()) {
-        pubadsService.disableInitialLoad();
-      }
-
-      if (_this4.collapseEmptyDivs === true || _this4.collapseEmptyDivs === false) {
-        pubadsService.collapseEmptyDivs(_this4.collapseEmptyDivs);
+      if (_this5.collapseEmptyDivs === true || _this5.collapseEmptyDivs === false) {
+        pubadsService.collapseEmptyDivs(_this5.collapseEmptyDivs);
       }
     });
   },
@@ -876,10 +883,10 @@ var DFPManager = Object.assign(new EventEmitter.EventEmitter().setMaxListeners(0
     }
   },
   gptRefreshAds: function gptRefreshAds(slots) {
-    var _this5 = this;
+    var _this6 = this;
 
     return this.getGoogletag().then(function (googletag) {
-      _this5.configureOptions(googletag);
+      _this6.configureOptions(googletag);
 
       googletag.cmd.push(function () {
         var pubadsService = googletag.pubads();
@@ -890,14 +897,14 @@ var DFPManager = Object.assign(new EventEmitter.EventEmitter().setMaxListeners(0
     });
   },
   reload: function reload() {
-    var _this6 = this;
+    var _this7 = this;
 
     return this.destroyGPTSlots.apply(this, arguments).then(function () {
-      return _this6.load();
+      return _this7.load();
     });
   },
   destroyGPTSlots: function destroyGPTSlots() {
-    var _this7 = this;
+    var _this8 = this;
 
     for (var _len4 = arguments.length, slotsToDestroy = new Array(_len4), _key4 = 0; _key4 < _len4; _key4++) {
       slotsToDestroy[_key4] = arguments[_key4];
@@ -917,7 +924,7 @@ var DFPManager = Object.assign(new EventEmitter.EventEmitter().setMaxListeners(0
         slots.push(slot);
       }
 
-      _this7.getGoogletag().then(function (googletag) {
+      _this8.getGoogletag().then(function (googletag) {
         googletag.cmd.push(function () {
           if (managerAlreadyInitialized === true) {
             if (slotsToDestroy.length > 0) {
@@ -940,7 +947,7 @@ var DFPManager = Object.assign(new EventEmitter.EventEmitter().setMaxListeners(0
     });
   },
   registerSlot: function registerSlot(_ref) {
-    var _this8 = this;
+    var _this9 = this;
 
     var slotId = _ref.slotId,
         dfpNetworkId = _ref.dfpNetworkId,
@@ -979,7 +986,7 @@ var DFPManager = Object.assign(new EventEmitter.EventEmitter().setMaxListeners(0
                 gptSlot = slot.gptSlot;
 
             if (loading === false && !gptSlot) {
-              _this8.load(slotId);
+              _this9.load(slotId);
             }
           }
         });

package/dist/cjs/{index-3294d3bc.js → index-5be2866f.js}

@@ -1,7 +1,7 @@
 'use strict';
 
 var _commonjsHelpers = require('./_commonjsHelpers-06173234.js');
-var moment = require('./moment-575fe24c.js');
+var moment = require('./moment-66a6a284.js');
 
 var momentTimezone = _commonjsHelpers.createCommonjsModule(function (module) {
 //! moment-timezone.js