@mjhls/mjh-framework 1.0.449 → 1.0.451

package/README.md

@@ -1,5 +1,5 @@
 
-# mjh-framework v. 1.0.449
+# mjh-framework v. 1.0.451
 
 > Foundation Framework 
 

package/dist/cjs/ArticleQueue.js

@@ -143,7 +143,7 @@ var Article = function Article(props) {
       regionalPages = props.regionalPages,
       nationalPage = props.nationalPage,
       ISIContent = props.ISIContent,
-      changeUrl = props.changeUrl,
+      onChangeArticle = props.onChangeArticle,
       shareOptions = props.shareOptions,
       cpModificationRequired = props.cpModificationRequired,
       authorPrefix = props.authorPrefix,
@@ -455,7 +455,7 @@ var Article = function Article(props) {
         id: 'article-' + title,
         onChange: function onChange(visible) {
           if (visible === 'top' || visible === 'bottom' || visible === 'small-top') {
-            changeUrl(url, visible, meta);
+            onChangeArticle(url, visible, meta);
           }
         } },
       React__default.createElement(
@@ -798,38 +798,36 @@ var ArticleQueue = function ArticleQueue(props) {
     document.querySelector('meta[name="twitter:description"]').setAttribute('content', meta.shareSummary);
   };
 
-  var changeUrl = function changeUrl(path, visibility, meta) {
+  var onChangeArticle = function onChangeArticle(path, visibility, meta) {
     var currentPath = window && window.location && window.location.pathname ? window.location.pathname.replace('/view/', '') : '';
     var newPath = '/view/' + path;
+
+    // Change URL and do other changes
+    var doChanges = function doChanges() {
+      window.history.pushState({ page: path }, meta.shareTitle, newPath);
+      changeMeta(meta);
+      if (props.setCustomDimensions) {
+        var activeArticle = queueData.find(function (item) {
+          return item.url.current === path;
+        });
+        props.setCustomDimensions(activeArticle, '200', prevUrl);
+      }
+      if (props.pageview) props.pageview(newPath);
+      refreshAD(path);
+    };
+
     if (currentPath !== path) {
       if (isScrollDown) {
         if (visibility === 'top') {
-          // router.push('/view/[url]', newPath, { shallow: true })
-          window.history.pushState({ page: path }, meta.shareTitle, newPath);
-          changeMeta(meta);
-          if (props.pageview) {
-            props.pageview(newPath);
-          }
-          refreshAD(path);
+          doChanges();
         }
       } else {
         if (visibility === 'bottom') {
-          // router.push('/view/[url]', newPath, { shallow: true })
-          window.history.pushState({ page: path }, meta.shareTitle, newPath);
-          changeMeta(meta);
-          if (props.pageview) {
-            props.pageview(newPath);
-          }
-          refreshAD(path);
+          doChanges();
         }
       }
       if (visibility === 'small-top') {
-        window.history.pushState({ page: path }, meta.shareTitle, newPath);
-        changeMeta(meta);
-        if (props.pageview) {
-          props.pageview(newPath);
-        }
-        refreshAD(path);
+        doChanges();
       }
     }
   };
@@ -847,7 +845,7 @@ var ArticleQueue = function ArticleQueue(props) {
       return React__default.createElement(Article, _extends._extends({
         key: index
       }, props, {
-        changeUrl: changeUrl,
+        onChangeArticle: onChangeArticle,
         authorPrfix: authorPrefix,
         article: article,
         cpModificationRequired: cpModificationRequired,

package/dist/cjs/View.js

@@ -57,7 +57,7 @@ var getSerializers = require('./getSerializers.js');
 require('./util-f2c1b65b.js');
 require('react-bootstrap/Pagination');
 require('next/dynamic');
-var getTargeting = require('./getTargeting-37612527.js');
+var getTargeting = require('./getTargeting-ec7dd217.js');
 var urlFor = require('./urlFor.js');
 
 var renderAuthor = function renderAuthor(authorName, authorURL, index, length) {
@@ -264,7 +264,7 @@ var Article = function Article(props) {
       shareOptions = props.shareOptions,
       cpModificationRequired = props.cpModificationRequired,
       authorPrefix = props.authorPrefix;
-  var changeUrl = props.changeUrl;
+  var onChangeArticle = props.onChangeArticle;
 
   var _useState = React.useState(null),
       _useState2 = slicedToArray._slicedToArray(_useState, 2),
@@ -600,7 +600,7 @@ var Article = function Article(props) {
       shareVia: props.Settings.title
     };
     if (!props.infiniteScroll) {
-      changeUrl = function changeUrl() {
+      onChangeArticle = function onChangeArticle() {
         return null;
       };
     }
@@ -616,7 +616,7 @@ var Article = function Article(props) {
           id: 'article-' + title,
           onChange: function onChange(visible) {
             if (visible === 'top' || visible === 'bottom' || visible === 'small-top') {
-              changeUrl(url, visible, meta);
+              onChangeArticle(url, visible, meta);
             }
           } },
         React__default.createElement(
@@ -963,38 +963,36 @@ var ArticleQueue = function ArticleQueue(props) {
     document.querySelector('meta[name="twitter:description"]').setAttribute('content', meta.shareSummary);
   };
 
-  var changeUrl = function changeUrl(path, visibility, meta) {
+  var onChangeArticle = function onChangeArticle(path, visibility, meta) {
     var currentPath = window && window.location && window.location.pathname ? window.location.pathname.replace('/view/', '') : '';
     var newPath = '/view/' + path;
+
+    // Change URL and do other changes
+    var doChanges = function doChanges() {
+      window.history.pushState({ page: path }, meta.shareTitle, newPath);
+      changeMeta(meta);
+      if (props.setCustomDimensions) {
+        var activeArticle = queueData.find(function (item) {
+          return item.url.current === path;
+        });
+        props.setCustomDimensions(activeArticle, '200', prevUrl);
+      }
+      if (props.pageview) props.pageview(newPath);
+      refreshAD(path);
+    };
+
     if (currentPath !== path) {
       if (isScrollDown) {
         if (visibility === 'top') {
-          // router.push('/view/[url]', newPath, { shallow: true })
-          window.history.pushState({ page: path }, meta.shareTitle, newPath);
-          changeMeta(meta);
-          if (props.pageview) {
-            props.pageview(newPath);
-          }
-          refreshAD(path);
+          doChanges();
         }
       } else {
         if (visibility === 'bottom') {
-          // router.push('/view/[url]', newPath, { shallow: true })
-          window.history.pushState({ page: path }, meta.shareTitle, newPath);
-          changeMeta(meta);
-          if (props.pageview) {
-            props.pageview(newPath);
-          }
-          refreshAD(path);
+          doChanges();
         }
       }
       if (visibility === 'small-top') {
-        window.history.pushState({ page: path }, meta.shareTitle, newPath);
-        changeMeta(meta);
-        if (props.pageview) {
-          props.pageview(newPath);
-        }
-        refreshAD(path);
+        doChanges();
       }
     }
   };
@@ -1009,7 +1007,7 @@ var ArticleQueue = function ArticleQueue(props) {
       if (!checkSponseredArticle(article) && Ads.getNativeContextualAD) {
         article.contextualAD = Ads.getNativeContextualAD(getTargeting.getTargeting(props));
       }
-      return React__default.createElement(Article, _extends$1._extends({ key: index }, props, { changeUrl: changeUrl, authorPrfix: authorPrefix, article: article, cpModificationRequired: cpModificationRequired }));
+      return React__default.createElement(Article, _extends$1._extends({ key: index }, props, { onChangeArticle: onChangeArticle, authorPrfix: authorPrefix, article: article, cpModificationRequired: cpModificationRequired }));
     })
   );
 };

package/dist/cjs/{getTargeting-37612527.js → getTargeting-ec7dd217.js}

@@ -52,6 +52,8 @@ var getTargeting = function getTargeting(props) {
   context = context && context.split('?')[0];
   context = context && context.split('&')[0];
   var content_placement_urls = [];
+  //  New variable to store document group
+  var document_group_urls = [];
   if (content_placement && prevUrl && prevUrl.length) {
     content_placement.forEach(function (item) {
       var path = item.path;
@@ -70,21 +72,32 @@ var getTargeting = function getTargeting(props) {
     });
   }
 
-  if (content_placement) {
-    if (content_placement_urls.length === 0) {
-      content_placement_urls = content_placement.map(function (item) {
-        return cpModificationRequired ? getContentPlacementUrl(item) : item.path;
-      });
+  //  Comparing document group with previous url to store in 'document_group_urls'.
+  if (document_group && prevUrl && prevUrl.length) {
+    var previous_url_to_check = prevUrl;
+    if (prevUrl.includes('?')) {
+      previous_url_to_check = prevUrl.split('?')[0];
     }
-  } else {
-    content_placement_urls = ['/'];
+
+    if (previous_url_to_check.endsWith(document_group)) {
+      document_group_urls.push(document_group);
+    }
+  }
+
+  //  Updating condition to set content_placement only when 'document_group_urls' and 'content_placement_urls' is empty.
+  if (content_placement && content_placement_urls.length === 0 && document_group_urls.length === 0) {
+    content_placement_urls = content_placement.map(function (item) {
+      return cpModificationRequired ? getContentPlacementUrl(item) : item.path;
+    });
   }
+
   var articleKeywords = [].concat(toConsumableArray._toConsumableArray(internalTag), toConsumableArray._toConsumableArray(userDefinedTag), toConsumableArray._toConsumableArray(SponsorshipTag), toConsumableArray._toConsumableArray(seoTag));
   var targeting = {
     tags: articleKeywords,
-    document_group: [document_group],
+    //  making sure either 'document_group' or 'content_placement' is returned in targeting.
+    document_group: content_placement_urls && content_placement_urls.length ? '' : document_group_urls,
     document_url: [url],
-    content_placement: content_placement_urls
+    content_placement: document_group_urls && document_group_urls.length ? '' : content_placement_urls
   };
 
   if (article.issue && article.issue.path) {

package/dist/cjs/getTargeting.js

@@ -8,7 +8,7 @@ require('./from-ea347372.js');
 require('./toConsumableArray-ca04303b.js');
 require('./_object-pie-68c5bcbc.js');
 require('./extends-60837c34.js');
-var getTargeting = require('./getTargeting-37612527.js');
+var getTargeting = require('./getTargeting-ec7dd217.js');
 
 
 

package/dist/cjs/index.js

@@ -157,7 +157,7 @@ require('swr');
 require('passport-local');
 require('mysql');
 var View = require('./View.js');
-var getTargeting = require('./getTargeting-37612527.js');
+var getTargeting = require('./getTargeting-ec7dd217.js');
 var urlFor = require('./urlFor.js');
 var getKeywords = require('./getKeywords.js');
 var getQuery = require('./getQuery.js');

package/dist/esm/ArticleQueue.js

@@ -138,7 +138,7 @@ var Article = function Article(props) {
       regionalPages = props.regionalPages,
       nationalPage = props.nationalPage,
       ISIContent = props.ISIContent,
-      changeUrl = props.changeUrl,
+      onChangeArticle = props.onChangeArticle,
       shareOptions = props.shareOptions,
       cpModificationRequired = props.cpModificationRequired,
       authorPrefix = props.authorPrefix,
@@ -450,7 +450,7 @@ var Article = function Article(props) {
         id: 'article-' + title,
         onChange: function onChange(visible) {
           if (visible === 'top' || visible === 'bottom' || visible === 'small-top') {
-            changeUrl(url, visible, meta);
+            onChangeArticle(url, visible, meta);
           }
         } },
       React__default.createElement(
@@ -793,38 +793,36 @@ var ArticleQueue = function ArticleQueue(props) {
     document.querySelector('meta[name="twitter:description"]').setAttribute('content', meta.shareSummary);
   };
 
-  var changeUrl = function changeUrl(path, visibility, meta) {
+  var onChangeArticle = function onChangeArticle(path, visibility, meta) {
     var currentPath = window && window.location && window.location.pathname ? window.location.pathname.replace('/view/', '') : '';
     var newPath = '/view/' + path;
+
+    // Change URL and do other changes
+    var doChanges = function doChanges() {
+      window.history.pushState({ page: path }, meta.shareTitle, newPath);
+      changeMeta(meta);
+      if (props.setCustomDimensions) {
+        var activeArticle = queueData.find(function (item) {
+          return item.url.current === path;
+        });
+        props.setCustomDimensions(activeArticle, '200', prevUrl);
+      }
+      if (props.pageview) props.pageview(newPath);
+      refreshAD(path);
+    };
+
     if (currentPath !== path) {
       if (isScrollDown) {
         if (visibility === 'top') {
-          // router.push('/view/[url]', newPath, { shallow: true })
-          window.history.pushState({ page: path }, meta.shareTitle, newPath);
-          changeMeta(meta);
-          if (props.pageview) {
-            props.pageview(newPath);
-          }
-          refreshAD(path);
+          doChanges();
         }
       } else {
         if (visibility === 'bottom') {
-          // router.push('/view/[url]', newPath, { shallow: true })
-          window.history.pushState({ page: path }, meta.shareTitle, newPath);
-          changeMeta(meta);
-          if (props.pageview) {
-            props.pageview(newPath);
-          }
-          refreshAD(path);
+          doChanges();
         }
       }
       if (visibility === 'small-top') {
-        window.history.pushState({ page: path }, meta.shareTitle, newPath);
-        changeMeta(meta);
-        if (props.pageview) {
-          props.pageview(newPath);
-        }
-        refreshAD(path);
+        doChanges();
       }
     }
   };
@@ -842,7 +840,7 @@ var ArticleQueue = function ArticleQueue(props) {
       return React__default.createElement(Article, _extends({
         key: index
       }, props, {
-        changeUrl: changeUrl,
+        onChangeArticle: onChangeArticle,
         authorPrfix: authorPrefix,
         article: article,
         cpModificationRequired: cpModificationRequired,

package/dist/esm/View.js

@@ -52,7 +52,7 @@ import getSerializers from './getSerializers.js';
 import './util-7700fc59.js';
 import 'react-bootstrap/Pagination';
 import 'next/dynamic';
-import { a as getContentPlacementUrl, g as getTargeting } from './getTargeting-8f4bd5db.js';
+import { a as getContentPlacementUrl, g as getTargeting } from './getTargeting-02118961.js';
 import urlFor from './urlFor.js';
 
 var renderAuthor = function renderAuthor(authorName, authorURL, index, length) {
@@ -259,7 +259,7 @@ var Article = function Article(props) {
       shareOptions = props.shareOptions,
       cpModificationRequired = props.cpModificationRequired,
       authorPrefix = props.authorPrefix;
-  var changeUrl = props.changeUrl;
+  var onChangeArticle = props.onChangeArticle;
 
   var _useState = useState(null),
       _useState2 = _slicedToArray(_useState, 2),
@@ -595,7 +595,7 @@ var Article = function Article(props) {
       shareVia: props.Settings.title
     };
     if (!props.infiniteScroll) {
-      changeUrl = function changeUrl() {
+      onChangeArticle = function onChangeArticle() {
         return null;
       };
     }
@@ -611,7 +611,7 @@ var Article = function Article(props) {
           id: 'article-' + title,
           onChange: function onChange(visible) {
             if (visible === 'top' || visible === 'bottom' || visible === 'small-top') {
-              changeUrl(url, visible, meta);
+              onChangeArticle(url, visible, meta);
             }
           } },
         React__default.createElement(
@@ -958,38 +958,36 @@ var ArticleQueue = function ArticleQueue(props) {
     document.querySelector('meta[name="twitter:description"]').setAttribute('content', meta.shareSummary);
   };
 
-  var changeUrl = function changeUrl(path, visibility, meta) {
+  var onChangeArticle = function onChangeArticle(path, visibility, meta) {
     var currentPath = window && window.location && window.location.pathname ? window.location.pathname.replace('/view/', '') : '';
     var newPath = '/view/' + path;
+
+    // Change URL and do other changes
+    var doChanges = function doChanges() {
+      window.history.pushState({ page: path }, meta.shareTitle, newPath);
+      changeMeta(meta);
+      if (props.setCustomDimensions) {
+        var activeArticle = queueData.find(function (item) {
+          return item.url.current === path;
+        });
+        props.setCustomDimensions(activeArticle, '200', prevUrl);
+      }
+      if (props.pageview) props.pageview(newPath);
+      refreshAD(path);
+    };
+
     if (currentPath !== path) {
       if (isScrollDown) {
         if (visibility === 'top') {
-          // router.push('/view/[url]', newPath, { shallow: true })
-          window.history.pushState({ page: path }, meta.shareTitle, newPath);
-          changeMeta(meta);
-          if (props.pageview) {
-            props.pageview(newPath);
-          }
-          refreshAD(path);
+          doChanges();
         }
       } else {
         if (visibility === 'bottom') {
-          // router.push('/view/[url]', newPath, { shallow: true })
-          window.history.pushState({ page: path }, meta.shareTitle, newPath);
-          changeMeta(meta);
-          if (props.pageview) {
-            props.pageview(newPath);
-          }
-          refreshAD(path);
+          doChanges();
         }
       }
       if (visibility === 'small-top') {
-        window.history.pushState({ page: path }, meta.shareTitle, newPath);
-        changeMeta(meta);
-        if (props.pageview) {
-          props.pageview(newPath);
-        }
-        refreshAD(path);
+        doChanges();
       }
     }
   };
@@ -1004,7 +1002,7 @@ var ArticleQueue = function ArticleQueue(props) {
       if (!checkSponseredArticle(article) && Ads.getNativeContextualAD) {
         article.contextualAD = Ads.getNativeContextualAD(getTargeting(props));
       }
-      return React__default.createElement(Article, _extends({ key: index }, props, { changeUrl: changeUrl, authorPrfix: authorPrefix, article: article, cpModificationRequired: cpModificationRequired }));
+      return React__default.createElement(Article, _extends({ key: index }, props, { onChangeArticle: onChangeArticle, authorPrfix: authorPrefix, article: article, cpModificationRequired: cpModificationRequired }));
     })
   );
 };

package/dist/esm/{getTargeting-8f4bd5db.js → getTargeting-02118961.js}

@@ -50,6 +50,8 @@ var getTargeting = function getTargeting(props) {
   context = context && context.split('?')[0];
   context = context && context.split('&')[0];
   var content_placement_urls = [];
+  //  New variable to store document group
+  var document_group_urls = [];
   if (content_placement && prevUrl && prevUrl.length) {
     content_placement.forEach(function (item) {
       var path = item.path;
@@ -68,21 +70,32 @@ var getTargeting = function getTargeting(props) {
     });
   }
 
-  if (content_placement) {
-    if (content_placement_urls.length === 0) {
-      content_placement_urls = content_placement.map(function (item) {
-        return cpModificationRequired ? getContentPlacementUrl(item) : item.path;
-      });
+  //  Comparing document group with previous url to store in 'document_group_urls'.
+  if (document_group && prevUrl && prevUrl.length) {
+    var previous_url_to_check = prevUrl;
+    if (prevUrl.includes('?')) {
+      previous_url_to_check = prevUrl.split('?')[0];
     }
-  } else {
-    content_placement_urls = ['/'];
+
+    if (previous_url_to_check.endsWith(document_group)) {
+      document_group_urls.push(document_group);
+    }
+  }
+
+  //  Updating condition to set content_placement only when 'document_group_urls' and 'content_placement_urls' is empty.
+  if (content_placement && content_placement_urls.length === 0 && document_group_urls.length === 0) {
+    content_placement_urls = content_placement.map(function (item) {
+      return cpModificationRequired ? getContentPlacementUrl(item) : item.path;
+    });
   }
+
   var articleKeywords = [].concat(_toConsumableArray(internalTag), _toConsumableArray(userDefinedTag), _toConsumableArray(SponsorshipTag), _toConsumableArray(seoTag));
   var targeting = {
     tags: articleKeywords,
-    document_group: [document_group],
+    //  making sure either 'document_group' or 'content_placement' is returned in targeting.
+    document_group: content_placement_urls && content_placement_urls.length ? '' : document_group_urls,
     document_url: [url],
-    content_placement: content_placement_urls
+    content_placement: document_group_urls && document_group_urls.length ? '' : content_placement_urls
   };
 
   if (article.issue && article.issue.path) {

package/dist/esm/getTargeting.js

@@ -6,4 +6,4 @@ import './from-2c0a5f49.js';
 import './toConsumableArray-8712d678.js';
 import './_object-pie-33c40e79.js';
 import './extends-6e00b262.js';
-export { g as default } from './getTargeting-8f4bd5db.js';
+export { g as default } from './getTargeting-02118961.js';

package/dist/esm/index.js

@@ -153,7 +153,7 @@ import 'swr';
 import 'passport-local';
 import 'mysql';
 export { default as View } from './View.js';
-export { g as getTargeting } from './getTargeting-8f4bd5db.js';
+export { g as getTargeting } from './getTargeting-02118961.js';
 export { default as urlFor } from './urlFor.js';
 export { default as getKeywords } from './getKeywords.js';
 export { default as getQuery } from './getQuery.js';

package/package.json

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