@mjhls/mjh-framework 1.0.450 → 1.0.451

package/README.md

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

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) {

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/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) {

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.450",
+  "version": "1.0.451",
   "description": "Foundation Framework",
   "author": "mjh-framework",
   "license": "MIT",