@mjhls/mjh-framework 1.0.734-beta-0.1 → 1.0.734-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-0d9b6b99.js');
+var getTargeting = require('./getTargeting-5eef5b58.js');
 var getKeywords = require('./getKeywords.js');
 var urlFor = require('./urlFor.js');
 var styleInject_es = require('./style-inject.es-dcee06b6.js');
@@ -1524,7 +1524,7 @@ View.returnGetInitialProps = function () {
                   while (1) {
                     switch (_context.prev = _context.next) {
                       case 0:
-                        query = '*[_type == \'documentGroup\' && !(_id in path("drafts.**")) && _id == \'' + id + '\'][0]{\n      ...,\n    }';
+                        query = '*[_type == \'documentGroup\' && !(_id in path("drafts.**")) && _id == \'' + id + '\'][0]';
                         _context.next = 3;
                         return client.fetch(query);
 
@@ -1544,7 +1544,7 @@ View.returnGetInitialProps = function () {
                         break;
 
                       case 9:
-                        article.rootDocumentGroup = rootDoc;
+                        article.rootDocumentGroup = rootDoc.identifier.current;
 
                       case 10:
                       case 'end':
@@ -1562,10 +1562,27 @@ View.returnGetInitialProps = function () {
             //  Calling recursive function if parentDocumentGroup has id
 
 
-            if (article && article.parentDocumentGroup && article.parentDocumentGroup._id) {
-              getRootDoc(article.parentDocumentGroup._id);
+            if (!(article && article.parentDocumentGroup && article.parentDocumentGroup._id)) {
+              _context2.next = 11;
+              break;
+            }
+
+            if (!article.parentDocumentGroup.parent) {
+              _context2.next = 10;
+              break;
             }
 
+            _context2.next = 8;
+            return getRootDoc(article.parentDocumentGroup.parent._ref);
+
+          case 8:
+            _context2.next = 11;
+            break;
+
+          case 10:
+            article.rootDocumentGroup = article.parentDocumentGroup.identifier.current;
+
+          case 11:
             relatedArticleQuery = getQuery('related');
 
             article.seriesDetail = getSeriesDetail(article, seriesVid);
@@ -1622,27 +1639,27 @@ View.returnGetInitialProps = function () {
             }
 
             if (!article.disableRelatedContent) {
-              _context2.next = 18;
+              _context2.next = 24;
               break;
             }
 
             article.relatedArticle = null;
-            _context2.next = 22;
+            _context2.next = 28;
             break;
 
-          case 18:
+          case 24:
             if (!article) {
-              _context2.next = 22;
+              _context2.next = 28;
               break;
             }
 
-            _context2.next = 21;
+            _context2.next = 27;
             return getRelatedArticle(context, client, article, prevUrl, '0..2');
 
-          case 21:
+          case 27:
             article.relatedArticle = _context2.sent;
 
-          case 22:
+          case 28:
             return _context2.abrupt('return', {
               url: url,
               sao: sao,
@@ -1653,7 +1670,7 @@ View.returnGetInitialProps = function () {
               sponsoredFlag: sponsoredFlag
             });
 
-          case 23:
+          case 29:
           case 'end':
             return _context2.stop();
         }

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

@@ -140,9 +140,7 @@ var getTargeting = function getTargeting(props) {
   }
 
   // returning AD Targeting Group
-  if (rootDocumentGroup && rootDocumentGroup.identifier) {
-    targeting['rootDocumentGroup'] = rootDocumentGroup.identifier.current;
-  }
+  if (rootDocumentGroup) targeting['rootDocumentGroup'] = rootDocumentGroup;
   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-0d9b6b99.js');
+var getTargeting = require('./getTargeting-5eef5b58.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-0d9b6b99.js');
+var getTargeting = require('./getTargeting-5eef5b58.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-a1ebbed5.js';
+import { g as getTargeting, a as getContentPlacementUrl } from './getTargeting-9413f34a.js';
 import getKeywords from './getKeywords.js';
 import urlFor from './urlFor.js';
 import { s as styleInject } from './style-inject.es-1f59c1d0.js';
@@ -1518,7 +1518,7 @@ View.returnGetInitialProps = function () {
                   while (1) {
                     switch (_context.prev = _context.next) {
                       case 0:
-                        query = '*[_type == \'documentGroup\' && !(_id in path("drafts.**")) && _id == \'' + id + '\'][0]{\n      ...,\n    }';
+                        query = '*[_type == \'documentGroup\' && !(_id in path("drafts.**")) && _id == \'' + id + '\'][0]';
                         _context.next = 3;
                         return client.fetch(query);
 
@@ -1538,7 +1538,7 @@ View.returnGetInitialProps = function () {
                         break;
 
                       case 9:
-                        article.rootDocumentGroup = rootDoc;
+                        article.rootDocumentGroup = rootDoc.identifier.current;
 
                       case 10:
                       case 'end':
@@ -1556,10 +1556,27 @@ View.returnGetInitialProps = function () {
             //  Calling recursive function if parentDocumentGroup has id
 
 
-            if (article && article.parentDocumentGroup && article.parentDocumentGroup._id) {
-              getRootDoc(article.parentDocumentGroup._id);
+            if (!(article && article.parentDocumentGroup && article.parentDocumentGroup._id)) {
+              _context2.next = 11;
+              break;
+            }
+
+            if (!article.parentDocumentGroup.parent) {
+              _context2.next = 10;
+              break;
             }
 
+            _context2.next = 8;
+            return getRootDoc(article.parentDocumentGroup.parent._ref);
+
+          case 8:
+            _context2.next = 11;
+            break;
+
+          case 10:
+            article.rootDocumentGroup = article.parentDocumentGroup.identifier.current;
+
+          case 11:
             relatedArticleQuery = getQuery('related');
 
             article.seriesDetail = getSeriesDetail(article, seriesVid);
@@ -1616,27 +1633,27 @@ View.returnGetInitialProps = function () {
             }
 
             if (!article.disableRelatedContent) {
-              _context2.next = 18;
+              _context2.next = 24;
               break;
             }
 
             article.relatedArticle = null;
-            _context2.next = 22;
+            _context2.next = 28;
             break;
 
-          case 18:
+          case 24:
             if (!article) {
-              _context2.next = 22;
+              _context2.next = 28;
               break;
             }
 
-            _context2.next = 21;
+            _context2.next = 27;
             return getRelatedArticle(context, client, article, prevUrl, '0..2');
 
-          case 21:
+          case 27:
             article.relatedArticle = _context2.sent;
 
-          case 22:
+          case 28:
             return _context2.abrupt('return', {
               url: url,
               sao: sao,
@@ -1647,7 +1664,7 @@ View.returnGetInitialProps = function () {
               sponsoredFlag: sponsoredFlag
             });
 
-          case 23:
+          case 29:
           case 'end':
             return _context2.stop();
         }

package/dist/esm/{getTargeting-a1ebbed5.js → getTargeting-9413f34a.js}

@@ -138,9 +138,7 @@ var getTargeting = function getTargeting(props) {
   }
 
   // returning AD Targeting Group
-  if (rootDocumentGroup && rootDocumentGroup.identifier) {
-    targeting['rootDocumentGroup'] = rootDocumentGroup.identifier.current;
-  }
+  if (rootDocumentGroup) targeting['rootDocumentGroup'] = rootDocumentGroup;
   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-a1ebbed5.js';
+export { g as default } from './getTargeting-9413f34a.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-a1ebbed5.js';
+export { g as getTargeting } from './getTargeting-9413f34a.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.734-beta-0.1",
+  "version": "1.0.734-beta-0.2",
   "description": "Foundation Framework",
   "author": "mjh-framework",
   "license": "MIT",