@mjhls/mjh-framework 1.0.733-beta-0.1 → 1.0.733-beta-0.2

package/dist/cjs/View.js

@@ -67,7 +67,7 @@ var getSeriesDetail = require('./getSeriesDetail.js');
 require('./index-bd6c9f56.js');
 var getRelatedArticle = require('./getRelatedArticle.js');
 var getQuery = require('./getQuery.js');
-var getTargeting = require('./getTargeting-f70c4a08.js');
+var getTargeting = require('./getTargeting-0d9b6b99.js');
 var getKeywords = require('./getKeywords.js');
 var urlFor = require('./urlFor.js');
 var styleInject_es = require('./style-inject.es-dcee06b6.js');
@@ -1492,12 +1492,12 @@ var View = function View(props) {
   );
 };
 
-//This should be called in /view/[url] getInitialProps to fetch the article data and related articles.  This will also set the sponsoredFlag to true if any taxonomies have disabled ads.
+// This should be called in /view/[url] getInitialProps to fetch the article data and related articles.  This will also set the sponsoredFlag to true if any taxonomies have disabled ads.
 View.returnGetInitialProps = function () {
   var _ref = asyncToGenerator._asyncToGenerator( /*#__PURE__*/asyncToGenerator.regenerator.mark(function _callee2(url, prevUrl, seriesVid, client, sao) {
     var context = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : null;
 
-    var article, rootDocumentGroup, getRootDoc, relatedArticleQuery, statusCode, _context$query$series, seriesArticle, sponsoredFlag;
+    var article, getRootDoc, relatedArticleQuery, statusCode, _context$query$series, seriesArticle, sponsoredFlag;
 
     return asyncToGenerator.regenerator.wrap(function _callee2$(_context2) {
       while (1) {
@@ -1508,10 +1508,8 @@ View.returnGetInitialProps = function () {
 
           case 2:
             article = _context2.sent;
-            rootDocumentGroup = [];
-
-            //Recursive Function to get root document group
 
+            // Recursive Function to get root document group
             getRootDoc = function () {
               var _ref2 = asyncToGenerator._asyncToGenerator( /*#__PURE__*/asyncToGenerator.regenerator.mark(function _callee(id) {
                 var query, rootDoc;
@@ -1526,24 +1524,22 @@ View.returnGetInitialProps = function () {
                       case 3:
                         rootDoc = _context.sent;
 
-                        rootDocumentGroup.push(rootDoc);
-
                         if (!(rootDoc && rootDoc.parent)) {
-                          _context.next = 10;
+                          _context.next = 9;
                           break;
                         }
 
-                        _context.next = 8;
+                        _context.next = 7;
                         return getRootDoc(rootDoc.parent._ref);
 
-                      case 8:
-                        _context.next = 11;
+                      case 7:
+                        _context.next = 10;
                         break;
 
-                      case 10:
-                        return _context.abrupt('return', rootDocumentGroup);
+                      case 9:
+                        article.rootDocumentGroup = rootDoc;
 
-                      case 11:
+                      case 10:
                       case 'end':
                         return _context.stop();
                     }
@@ -1559,15 +1555,10 @@ View.returnGetInitialProps = function () {
             //  Calling recursive function if parentDocumentGroup has id
 
 
-            if (!(article && article.parentDocumentGroup && article.parentDocumentGroup._id)) {
-              _context2.next = 8;
-              break;
+            if (article && article.parentDocumentGroup && article.parentDocumentGroup._id) {
+              getRootDoc(article.parentDocumentGroup._id);
             }
 
-            _context2.next = 8;
-            return getRootDoc(article.parentDocumentGroup._id);
-
-          case 8:
             relatedArticleQuery = getQuery('related');
 
             article.seriesDetail = getSeriesDetail(article, seriesVid);
@@ -1624,27 +1615,27 @@ View.returnGetInitialProps = function () {
             }
 
             if (!article.disableRelatedContent) {
-              _context2.next = 21;
+              _context2.next = 18;
               break;
             }
 
             article.relatedArticle = null;
-            _context2.next = 25;
+            _context2.next = 22;
             break;
 
-          case 21:
+          case 18:
             if (!article) {
-              _context2.next = 25;
+              _context2.next = 22;
               break;
             }
 
-            _context2.next = 24;
+            _context2.next = 21;
             return getRelatedArticle(context, client, article, prevUrl, '0..2');
 
-          case 24:
+          case 21:
             article.relatedArticle = _context2.sent;
 
-          case 25:
+          case 22:
             return _context2.abrupt('return', {
               url: url,
               sao: sao,
@@ -1652,11 +1643,10 @@ View.returnGetInitialProps = function () {
               prevUrl: prevUrl,
               relatedArticleQuery: relatedArticleQuery,
               article: article,
-              sponsoredFlag: sponsoredFlag,
-              rootDocumentGroup: rootDocumentGroup
+              sponsoredFlag: sponsoredFlag
             });
 
-          case 26:
+          case 23:
           case 'end':
             return _context2.stop();
         }

package/dist/cjs/{getTargeting-f70c4a08.js → getTargeting-0d9b6b99.js}

@@ -24,8 +24,7 @@ var getTargeting = function getTargeting(props) {
       position = props.position,
       prevUrl = props.prevUrl,
       _props$cpModification = props.cpModificationRequired,
-      cpModificationRequired = _props$cpModification === undefined ? true : _props$cpModification,
-      rootDocumentGroup = props.rootDocumentGroup;
+      cpModificationRequired = _props$cpModification === undefined ? true : _props$cpModification;
 
   if (positionOverride) {
     position = positionOverride;
@@ -49,7 +48,8 @@ var getTargeting = function getTargeting(props) {
   } : _article$documentGrou;
   var document_group = _article$documentGrou.path,
       document_groups = article.document_groups,
-      content_placement = article.content_placement;
+      content_placement = article.content_placement,
+      rootDocumentGroup = article.rootDocumentGroup;
 
   var context = url;
   var localHistory = props.historyCookie ? JSON.parse(props.historyCookie) : [];
@@ -140,8 +140,8 @@ var getTargeting = function getTargeting(props) {
   }
 
   // returning AD Targeting Group
-  if (rootDocumentGroup && rootDocumentGroup.length && rootDocumentGroup[rootDocumentGroup.length - 1].identifier) {
-    targeting['rootDocumentGroup'] = rootDocumentGroup[rootDocumentGroup.length - 1].identifier.current;
+  if (rootDocumentGroup && rootDocumentGroup.identifier) {
+    targeting['rootDocumentGroup'] = rootDocumentGroup.identifier.current;
   }
   return targeting;
 };

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-f70c4a08.js');
+var getTargeting = require('./getTargeting-0d9b6b99.js');
 
 
 

package/dist/cjs/index.js

@@ -177,7 +177,7 @@ var Auth = require('./Auth.js');
 require('swr');
 require('passport-local');
 require('mysql');
-var getTargeting = require('./getTargeting-f70c4a08.js');
+var getTargeting = require('./getTargeting-0d9b6b99.js');
 var View = require('./View.js');
 var getKeywords = require('./getKeywords.js');
 var urlFor = require('./urlFor.js');

package/dist/esm/View.js

@@ -61,7 +61,7 @@ import getSeriesDetail from './getSeriesDetail.js';
 import './index-db3bb315.js';
 import getRelatedArticle from './getRelatedArticle.js';
 import getQuery from './getQuery.js';
-import { g as getTargeting, a as getContentPlacementUrl } from './getTargeting-2e5b6d44.js';
+import { g as getTargeting, a as getContentPlacementUrl } from './getTargeting-a1ebbed5.js';
 import getKeywords from './getKeywords.js';
 import urlFor from './urlFor.js';
 import { s as styleInject } from './style-inject.es-1f59c1d0.js';
@@ -1486,12 +1486,12 @@ var View = function View(props) {
   );
 };
 
-//This should be called in /view/[url] getInitialProps to fetch the article data and related articles.  This will also set the sponsoredFlag to true if any taxonomies have disabled ads.
+// This should be called in /view/[url] getInitialProps to fetch the article data and related articles.  This will also set the sponsoredFlag to true if any taxonomies have disabled ads.
 View.returnGetInitialProps = function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee2(url, prevUrl, seriesVid, client, sao) {
     var context = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : null;
 
-    var article, rootDocumentGroup, getRootDoc, relatedArticleQuery, statusCode, _context$query$series, seriesArticle, sponsoredFlag;
+    var article, getRootDoc, relatedArticleQuery, statusCode, _context$query$series, seriesArticle, sponsoredFlag;
 
     return regenerator.wrap(function _callee2$(_context2) {
       while (1) {
@@ -1502,10 +1502,8 @@ View.returnGetInitialProps = function () {
 
           case 2:
             article = _context2.sent;
-            rootDocumentGroup = [];
-
-            //Recursive Function to get root document group
 
+            // Recursive Function to get root document group
             getRootDoc = function () {
               var _ref2 = _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee(id) {
                 var query, rootDoc;
@@ -1520,24 +1518,22 @@ View.returnGetInitialProps = function () {
                       case 3:
                         rootDoc = _context.sent;
 
-                        rootDocumentGroup.push(rootDoc);
-
                         if (!(rootDoc && rootDoc.parent)) {
-                          _context.next = 10;
+                          _context.next = 9;
                           break;
                         }
 
-                        _context.next = 8;
+                        _context.next = 7;
                         return getRootDoc(rootDoc.parent._ref);
 
-                      case 8:
-                        _context.next = 11;
+                      case 7:
+                        _context.next = 10;
                         break;
 
-                      case 10:
-                        return _context.abrupt('return', rootDocumentGroup);
+                      case 9:
+                        article.rootDocumentGroup = rootDoc;
 
-                      case 11:
+                      case 10:
                       case 'end':
                         return _context.stop();
                     }
@@ -1553,15 +1549,10 @@ View.returnGetInitialProps = function () {
             //  Calling recursive function if parentDocumentGroup has id
 
 
-            if (!(article && article.parentDocumentGroup && article.parentDocumentGroup._id)) {
-              _context2.next = 8;
-              break;
+            if (article && article.parentDocumentGroup && article.parentDocumentGroup._id) {
+              getRootDoc(article.parentDocumentGroup._id);
             }
 
-            _context2.next = 8;
-            return getRootDoc(article.parentDocumentGroup._id);
-
-          case 8:
             relatedArticleQuery = getQuery('related');
 
             article.seriesDetail = getSeriesDetail(article, seriesVid);
@@ -1618,27 +1609,27 @@ View.returnGetInitialProps = function () {
             }
 
             if (!article.disableRelatedContent) {
-              _context2.next = 21;
+              _context2.next = 18;
               break;
             }
 
             article.relatedArticle = null;
-            _context2.next = 25;
+            _context2.next = 22;
             break;
 
-          case 21:
+          case 18:
             if (!article) {
-              _context2.next = 25;
+              _context2.next = 22;
               break;
             }
 
-            _context2.next = 24;
+            _context2.next = 21;
             return getRelatedArticle(context, client, article, prevUrl, '0..2');
 
-          case 24:
+          case 21:
             article.relatedArticle = _context2.sent;
 
-          case 25:
+          case 22:
             return _context2.abrupt('return', {
               url: url,
               sao: sao,
@@ -1646,11 +1637,10 @@ View.returnGetInitialProps = function () {
               prevUrl: prevUrl,
               relatedArticleQuery: relatedArticleQuery,
               article: article,
-              sponsoredFlag: sponsoredFlag,
-              rootDocumentGroup: rootDocumentGroup
+              sponsoredFlag: sponsoredFlag
             });
 
-          case 26:
+          case 23:
           case 'end':
             return _context2.stop();
         }

package/dist/esm/{getTargeting-2e5b6d44.js → getTargeting-a1ebbed5.js}

@@ -22,8 +22,7 @@ var getTargeting = function getTargeting(props) {
       position = props.position,
       prevUrl = props.prevUrl,
       _props$cpModification = props.cpModificationRequired,
-      cpModificationRequired = _props$cpModification === undefined ? true : _props$cpModification,
-      rootDocumentGroup = props.rootDocumentGroup;
+      cpModificationRequired = _props$cpModification === undefined ? true : _props$cpModification;
 
   if (positionOverride) {
     position = positionOverride;
@@ -47,7 +46,8 @@ var getTargeting = function getTargeting(props) {
   } : _article$documentGrou;
   var document_group = _article$documentGrou.path,
       document_groups = article.document_groups,
-      content_placement = article.content_placement;
+      content_placement = article.content_placement,
+      rootDocumentGroup = article.rootDocumentGroup;
 
   var context = url;
   var localHistory = props.historyCookie ? JSON.parse(props.historyCookie) : [];
@@ -138,8 +138,8 @@ var getTargeting = function getTargeting(props) {
   }
 
   // returning AD Targeting Group
-  if (rootDocumentGroup && rootDocumentGroup.length && rootDocumentGroup[rootDocumentGroup.length - 1].identifier) {
-    targeting['rootDocumentGroup'] = rootDocumentGroup[rootDocumentGroup.length - 1].identifier.current;
+  if (rootDocumentGroup && rootDocumentGroup.identifier) {
+    targeting['rootDocumentGroup'] = rootDocumentGroup.identifier.current;
   }
   return targeting;
 };

package/dist/esm/getTargeting.js

@@ -6,4 +6,4 @@ import './toConsumableArray-43aa614d.js';
 import './core.get-iterator-method-e1de7503.js';
 import './_object-pie-33c40e79.js';
 import './extends-eb69e8ac.js';
-export { g as default } from './getTargeting-2e5b6d44.js';
+export { g as default } from './getTargeting-a1ebbed5.js';

package/dist/esm/index.js

@@ -170,7 +170,7 @@ export { default as Auth } from './Auth.js';
 import 'swr';
 import 'passport-local';
 import 'mysql';
-export { g as getTargeting } from './getTargeting-2e5b6d44.js';
+export { g as getTargeting } from './getTargeting-a1ebbed5.js';
 export { default as View } from './View.js';
 export { default as getKeywords } from './getKeywords.js';
 export { default as urlFor } from './urlFor.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mjhls/mjh-framework",
-  "version": "1.0.733-beta-0.1",
+  "version": "1.0.733-beta-0.2",
   "description": "Foundation Framework",
   "author": "mjh-framework",
   "license": "MIT",