@mjhls/mjh-framework 1.0.311 → 1.0.312

package/README.md

@@ -1,5 +1,5 @@
 
-# mjh-framework v. 1.0.311
+# mjh-framework v. 1.0.312
 
 > Foundation Framework
 

package/dist/cjs/index.js

@@ -16170,6 +16170,21 @@ var renderAuthor = function renderAuthor(authorName, authorURL, index, length) {
   }
 };
 
+var get_content_placement_url = function get_content_placement_url(cp) {
+  var cp_url = '';
+  if (cp.ancestor && typeof cp.ancestor === 'string') {
+    cp_url += (cp_url === '' ? '' : '/') + cp.ancestor;
+  }
+
+  if (!cp.ancestor && cp.parent && typeof cp.parent === 'string') {
+    console.log('cp.parent:', cp.parent);
+    cp_url += (cp_url === '' ? '' : '/') + cp.parent;
+  }
+
+  cp_url += (cp_url === '' ? '' : '/') + cp.path;
+  return cp_url;
+};
+
 var Article = function Article(props) {
   var client = props.client,
       pageview = props.pageview,
@@ -16193,7 +16208,8 @@ var Article = function Article(props) {
       nationalPage = props.nationalPage,
       ISIContent = props.ISIContent,
       changeUrl = props.changeUrl,
-      shareOptions = props.shareOptions;
+      shareOptions = props.shareOptions,
+      cpModificationRequired = props.cpModificationRequired;
 
 
   var urlFor = function urlFor(source) {
@@ -16232,6 +16248,7 @@ var Article = function Article(props) {
   var shareSummary = summary;
   var shareImage = thumbnail && thumbnail.asset ? urlFor(thumbnail.asset).url() : shareImageDefault;
   var siteName = props.website.title;
+
   return React__default.createElement(
     React__default.Fragment,
     null,
@@ -16322,7 +16339,10 @@ var Article = function Article(props) {
               Dropdown.Menu,
               null,
               content_placement.length > 0 ? content_placement.map(function (cp, index) {
-                var href = '/' + cp.path;
+                var cp_url = cpModificationRequired ? get_content_placement_url(cp) : cp.path;
+                var href = '/' + cp_url;
+                console.log('cp:', cp);
+                console.log('href:', href);
                 return React__default.createElement(
                   Dropdown.Item,
                   { key: index, href: href },
@@ -16382,7 +16402,9 @@ var ArticleQueue = function ArticleQueue(props) {
       _props$sponsoredTaxon = props.sponsoredTaxonomies,
       sponsoredTaxonomies = _props$sponsoredTaxon === undefined ? [] : _props$sponsoredTaxon,
       _props$maxListLength = props.maxListLength,
-      maxListLength = _props$maxListLength === undefined ? 10 : _props$maxListLength;
+      maxListLength = _props$maxListLength === undefined ? 10 : _props$maxListLength,
+      _props$cpModification = props.cpModificationRequired,
+      cpModificationRequired = _props$cpModification === undefined ? false : _props$cpModification;
 
   var _useState = React.useState(''),
       _useState2 = slicedToArray._slicedToArray(_useState, 2),
@@ -16462,8 +16484,13 @@ var ArticleQueue = function ArticleQueue(props) {
     var content_placement_urls = [];
     if (content_placement && prevUrl && prevUrl.length) {
       content_placement.forEach(function (item) {
-        if (includes_1(prevUrl, item.path)) {
-          content_placement_urls.push(item.path);
+        var path = item.path;
+        if (cpModificationRequired) {
+          path = get_content_placement_url(item);
+        }
+
+        if (includes_1(prevUrl, path)) {
+          content_placement_urls.push(path);
         }
       });
     }
@@ -16471,7 +16498,7 @@ var ArticleQueue = function ArticleQueue(props) {
     if (content_placement) {
       if (content_placement_urls.length === 0) {
         content_placement_urls = content_placement.map(function (item) {
-          return item.path;
+          return cpModificationRequired ? get_content_placement_url(item) : item.path;
         });
       }
     } else {
@@ -16644,7 +16671,7 @@ var ArticleQueue = function ArticleQueue(props) {
       visibilitySensor.InfiniteScroll,
       { dataLength: queueData.length, next: loadmore, scrollThreshold: 0.8, hasMore: true },
       queueData.map(function (article, index) {
-        return React__default.createElement(Article, _extends$2._extends({ key: index }, props, { changeUrl: changeUrl, article: article }));
+        return React__default.createElement(Article, _extends$2._extends({ key: index }, props, { changeUrl: changeUrl, article: article, cpModificationRequired: cpModificationRequired }));
       })
     );
   } else {

package/dist/esm/index.js

@@ -16168,6 +16168,21 @@ var renderAuthor = function renderAuthor(authorName, authorURL, index, length) {
   }
 };
 
+var get_content_placement_url = function get_content_placement_url(cp) {
+  var cp_url = '';
+  if (cp.ancestor && typeof cp.ancestor === 'string') {
+    cp_url += (cp_url === '' ? '' : '/') + cp.ancestor;
+  }
+
+  if (!cp.ancestor && cp.parent && typeof cp.parent === 'string') {
+    console.log('cp.parent:', cp.parent);
+    cp_url += (cp_url === '' ? '' : '/') + cp.parent;
+  }
+
+  cp_url += (cp_url === '' ? '' : '/') + cp.path;
+  return cp_url;
+};
+
 var Article = function Article(props) {
   var client = props.client,
       pageview = props.pageview,
@@ -16191,7 +16206,8 @@ var Article = function Article(props) {
       nationalPage = props.nationalPage,
       ISIContent = props.ISIContent,
       changeUrl = props.changeUrl,
-      shareOptions = props.shareOptions;
+      shareOptions = props.shareOptions,
+      cpModificationRequired = props.cpModificationRequired;
 
 
   var urlFor = function urlFor(source) {
@@ -16230,6 +16246,7 @@ var Article = function Article(props) {
   var shareSummary = summary;
   var shareImage = thumbnail && thumbnail.asset ? urlFor(thumbnail.asset).url() : shareImageDefault;
   var siteName = props.website.title;
+
   return React__default.createElement(
     React__default.Fragment,
     null,
@@ -16320,7 +16337,10 @@ var Article = function Article(props) {
               Dropdown.Menu,
               null,
               content_placement.length > 0 ? content_placement.map(function (cp, index) {
-                var href = '/' + cp.path;
+                var cp_url = cpModificationRequired ? get_content_placement_url(cp) : cp.path;
+                var href = '/' + cp_url;
+                console.log('cp:', cp);
+                console.log('href:', href);
                 return React__default.createElement(
                   Dropdown.Item,
                   { key: index, href: href },
@@ -16380,7 +16400,9 @@ var ArticleQueue = function ArticleQueue(props) {
       _props$sponsoredTaxon = props.sponsoredTaxonomies,
       sponsoredTaxonomies = _props$sponsoredTaxon === undefined ? [] : _props$sponsoredTaxon,
       _props$maxListLength = props.maxListLength,
-      maxListLength = _props$maxListLength === undefined ? 10 : _props$maxListLength;
+      maxListLength = _props$maxListLength === undefined ? 10 : _props$maxListLength,
+      _props$cpModification = props.cpModificationRequired,
+      cpModificationRequired = _props$cpModification === undefined ? false : _props$cpModification;
 
   var _useState = useState(''),
       _useState2 = _slicedToArray(_useState, 2),
@@ -16460,8 +16482,13 @@ var ArticleQueue = function ArticleQueue(props) {
     var content_placement_urls = [];
     if (content_placement && prevUrl && prevUrl.length) {
       content_placement.forEach(function (item) {
-        if (includes_1(prevUrl, item.path)) {
-          content_placement_urls.push(item.path);
+        var path = item.path;
+        if (cpModificationRequired) {
+          path = get_content_placement_url(item);
+        }
+
+        if (includes_1(prevUrl, path)) {
+          content_placement_urls.push(path);
         }
       });
     }
@@ -16469,7 +16496,7 @@ var ArticleQueue = function ArticleQueue(props) {
     if (content_placement) {
       if (content_placement_urls.length === 0) {
         content_placement_urls = content_placement.map(function (item) {
-          return item.path;
+          return cpModificationRequired ? get_content_placement_url(item) : item.path;
         });
       }
     } else {
@@ -16642,7 +16669,7 @@ var ArticleQueue = function ArticleQueue(props) {
       InfiniteScroll,
       { dataLength: queueData.length, next: loadmore, scrollThreshold: 0.8, hasMore: true },
       queueData.map(function (article, index) {
-        return React__default.createElement(Article, _extends$2({ key: index }, props, { changeUrl: changeUrl, article: article }));
+        return React__default.createElement(Article, _extends$2({ key: index }, props, { changeUrl: changeUrl, article: article, cpModificationRequired: cpModificationRequired }));
       })
     );
   } else {

package/package.json

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