@mjhls/mjh-framework 1.0.414 → 1.0.416

package/README.md

@@ -1,5 +1,5 @@
 
-# mjh-framework v. 1.0.414
+# mjh-framework v. 1.0.416
 
 > Foundation Framework
 

package/dist/cjs/index.js

@@ -22438,7 +22438,12 @@ var getTargeting = function getTargeting(props) {
         path = getContentPlacementUrl(item);
       }
 
-      if (includes_1(prevUrl, path)) {
+      var previous_url_to_check = prevUrl;
+      if (prevUrl.includes('?')) {
+        previous_url_to_check = prevUrl.split('?')[0];
+      }
+
+      if (previous_url_to_check.endsWith(path)) {
         content_placement_urls.push(path);
       }
     });
@@ -22480,6 +22485,7 @@ var getTargeting = function getTargeting(props) {
 
 var ArticleQueue$1 = function ArticleQueue(props) {
   var _props$prevUrl = props.prevUrl,
+      prevUrl = _props$prevUrl === undefined ? '/' : _props$prevUrl,
       Ads = props.Ads,
       _props$maxListLength = props.maxListLength,
       maxListLength = _props$maxListLength === undefined ? 10 : _props$maxListLength,
@@ -22510,7 +22516,7 @@ var ArticleQueue$1 = function ArticleQueue(props) {
         return item.url.current === path;
       });
 
-      var targeting = getTargeting({ article: activeArticle, position: props.position, prevUrl: props.prevUrl });
+      var targeting = getTargeting({ article: activeArticle, cpModificationRequired: cpModificationRequired, position: props.position, prevUrl: prevUrl });
 
       debounce.lib_3.getGoogletag().then(function (googletag) {
         if (window.googletag && googletag.pubadsReady) {
@@ -22572,9 +22578,11 @@ var ArticleQueue$1 = function ArticleQueue(props) {
     var params = props.params;
     if (queueData && queueData.length < maxListLength) {
       params.index = queueData.length - 1;
+      console.log('params:', params);
+      console.log('query:', query);
       props.client.fetch(query, params).then(function (article) {
         if (article && article._id) {
-          var targeting = getTargeting({ article: article });
+          var targeting = getTargeting({ article: article, cpModificationRequired: cpModificationRequired, prevUrl: prevUrl });
           article.Ads = Ads.getRightItems(targeting);
           setQueueData([].concat(toConsumableArray._toConsumableArray(queueData), [article]));
         }
@@ -22640,6 +22648,7 @@ var Articles = function Articles(props) {
 
   var videoAccountIDs = props.videoAccountIDs,
       Ads = props.Ads,
+      cpModificationRequired = props.cpModificationRequired,
       Settings = props.Settings,
       ISIContent = props.ISIContent,
       prevUrl = props.prevUrl,
@@ -22667,7 +22676,11 @@ var Articles = function Articles(props) {
     var path = _ref2.path,
         _id = _ref2._id;
 
-    if (includes_1(prevUrl, path)) taxonomy.push(_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) {
@@ -22694,7 +22707,7 @@ var Articles = function Articles(props) {
     Ads: WAds,
     regionalPages: regionalPages,
     nationalPage: nationalPage
-  }, _defineProperty$1(_extends2, 'pageview', pageview), _defineProperty$1(_extends2, 'onVote', function onVote() {}), _defineProperty$1(_extends2, 'ISIContent', ISIContent), _defineProperty$1(_extends2, 'videoAccountIDs', videoAccountIDs), _defineProperty$1(_extends2, 'sponsoredTaxonomies', []), _defineProperty$1(_extends2, 'cpModificationRequired', true), _defineProperty$1(_extends2, 'Settings', Settings), _extends2), props));
+  }, _defineProperty$1(_extends2, 'pageview', pageview), _defineProperty$1(_extends2, 'onVote', function onVote() {}), _defineProperty$1(_extends2, 'ISIContent', ISIContent), _defineProperty$1(_extends2, 'videoAccountIDs', videoAccountIDs), _defineProperty$1(_extends2, 'sponsoredTaxonomies', []), _defineProperty$1(_extends2, 'cpModificationRequired', cpModificationRequired), _defineProperty$1(_extends2, 'Settings', Settings), _extends2), props));
 };
 
 var View = function View(props) {

package/dist/esm/index.js

@@ -22435,7 +22435,12 @@ var getTargeting = function getTargeting(props) {
         path = getContentPlacementUrl(item);
       }
 
-      if (includes_1(prevUrl, path)) {
+      var previous_url_to_check = prevUrl;
+      if (prevUrl.includes('?')) {
+        previous_url_to_check = prevUrl.split('?')[0];
+      }
+
+      if (previous_url_to_check.endsWith(path)) {
         content_placement_urls.push(path);
       }
     });
@@ -22477,6 +22482,7 @@ var getTargeting = function getTargeting(props) {
 
 var ArticleQueue$1 = function ArticleQueue(props) {
   var _props$prevUrl = props.prevUrl,
+      prevUrl = _props$prevUrl === undefined ? '/' : _props$prevUrl,
       Ads = props.Ads,
       _props$maxListLength = props.maxListLength,
       maxListLength = _props$maxListLength === undefined ? 10 : _props$maxListLength,
@@ -22507,7 +22513,7 @@ var ArticleQueue$1 = function ArticleQueue(props) {
         return item.url.current === path;
       });
 
-      var targeting = getTargeting({ article: activeArticle, position: props.position, prevUrl: props.prevUrl });
+      var targeting = getTargeting({ article: activeArticle, cpModificationRequired: cpModificationRequired, position: props.position, prevUrl: prevUrl });
 
       lib_3.getGoogletag().then(function (googletag) {
         if (window.googletag && googletag.pubadsReady) {
@@ -22569,9 +22575,11 @@ var ArticleQueue$1 = function ArticleQueue(props) {
     var params = props.params;
     if (queueData && queueData.length < maxListLength) {
       params.index = queueData.length - 1;
+      console.log('params:', params);
+      console.log('query:', query);
       props.client.fetch(query, params).then(function (article) {
         if (article && article._id) {
-          var targeting = getTargeting({ article: article });
+          var targeting = getTargeting({ article: article, cpModificationRequired: cpModificationRequired, prevUrl: prevUrl });
           article.Ads = Ads.getRightItems(targeting);
           setQueueData([].concat(_toConsumableArray(queueData), [article]));
         }
@@ -22637,6 +22645,7 @@ var Articles = function Articles(props) {
 
   var videoAccountIDs = props.videoAccountIDs,
       Ads = props.Ads,
+      cpModificationRequired = props.cpModificationRequired,
       Settings = props.Settings,
       ISIContent = props.ISIContent,
       prevUrl = props.prevUrl,
@@ -22664,7 +22673,11 @@ var Articles = function Articles(props) {
     var path = _ref2.path,
         _id = _ref2._id;
 
-    if (includes_1(prevUrl, path)) taxonomy.push(_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) {
@@ -22691,7 +22704,7 @@ var Articles = function Articles(props) {
     Ads: WAds,
     regionalPages: regionalPages,
     nationalPage: nationalPage
-  }, _defineProperty$1(_extends2, 'pageview', pageview), _defineProperty$1(_extends2, 'onVote', function onVote() {}), _defineProperty$1(_extends2, 'ISIContent', ISIContent), _defineProperty$1(_extends2, 'videoAccountIDs', videoAccountIDs), _defineProperty$1(_extends2, 'sponsoredTaxonomies', []), _defineProperty$1(_extends2, 'cpModificationRequired', true), _defineProperty$1(_extends2, 'Settings', Settings), _extends2), props));
+  }, _defineProperty$1(_extends2, 'pageview', pageview), _defineProperty$1(_extends2, 'onVote', function onVote() {}), _defineProperty$1(_extends2, 'ISIContent', ISIContent), _defineProperty$1(_extends2, 'videoAccountIDs', videoAccountIDs), _defineProperty$1(_extends2, 'sponsoredTaxonomies', []), _defineProperty$1(_extends2, 'cpModificationRequired', cpModificationRequired), _defineProperty$1(_extends2, 'Settings', Settings), _extends2), props));
 };
 
 var View = function View(props) {

package/package.json

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