@mjhls/mjh-framework 1.0.501 → 1.0.503

package/README.md

@@ -1,5 +1,5 @@
 
-# mjh-framework v. 1.0.501
+# mjh-framework v. 1.0.503
 
 > Foundation Framework 
 

package/dist/cjs/ArticleQueue.js

@@ -616,12 +616,12 @@ var Article = function Article(props) {
     React__default.createElement(
       'noscript',
       null,
-      props.relatedArticle && props.relatedArticle.url && props.relatedArticle.url.current && React__default.createElement(
+      props.article.relatedArticle && props.article.relatedArticle.url && props.article.relatedArticle.url.current && React__default.createElement(
         'div',
         { style: { textAlign: 'center' } },
         React__default.createElement(
           'a',
-          { href: '/view/' + props.relatedArticle.url.current },
+          { href: '/view/' + props.article.relatedArticle.url.current },
           'Related Article >>>'
         )
       )

package/dist/cjs/View.js

@@ -57,9 +57,9 @@ var Dropdown = _interopDefault(require('react-bootstrap/Dropdown'));
 var InscreenSensor = require('./InscreenSensor-f9989c04.js');
 var getKeywords = require('./getKeywords.js');
 var getSeriesDetail = require('./getSeriesDetail.js');
+var getQuery = require('./getQuery.js');
 var getTargeting = require('./getTargeting-86e68d62.js');
 var urlFor = require('./urlFor.js');
-var getQuery = require('./getQuery.js');
 
 var renderAuthor = function renderAuthor(authorName, authorURL, index, length) {
   var defaultUrl = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 'authors';
@@ -837,12 +837,12 @@ var Article = function Article(props) {
       React__default.createElement(
         'noscript',
         null,
-        props.infiniteScroll && props.relatedArticle && props.relatedArticle.url && props.relatedArticle.url.current && React__default.createElement(
+        props.infiniteScroll && props.article.relatedArticle && props.article.relatedArticle.url && props.article.relatedArticle.url.current && React__default.createElement(
           'div',
           { style: { textAlign: 'center' } },
           React__default.createElement(
             'a',
-            { href: '/view/' + props.relatedArticle.url.current },
+            { href: '/view/' + props.article.relatedArticle.url.current },
             'Related Article >>>'
           )
         )

package/dist/cjs/getQuery.js

@@ -20,7 +20,7 @@ var getQuery = function getQuery(type) {
     case 'issue':
       return '*[_type == \'publication\'\n        && identifier.current == $publication\n        ' + conditions + '][0] {\n            ' + params + '\n            ...,\n            \'issue\': *[_type == \'publication\'\n                && references(^._id)\n                && identifier.current == $issue][0] {\n                    ...,\n                    \'articles\': *[_type == \'article\'\n                        && !(_id in path("drafts.**"))\n                        && defined(title)\n                        && is_visible\n                        && defined(url)\n                        && dateTime(published) <= dateTime($currentDate)\n                        && references(^._id)] {\n                          ...,\n                          authorMapping[0]->,\n                          contentCategory->,\n                          issueSection-> {\n                            name\n                          }\n                        }\n                }\n        }';
     case 'externalResources':
-      return '{\n        \'archived\': *[_type == "external" && archived && isVisible ' + conditions + '],\n        \'recent\': *[_type == "external" && !archived && isVisible ' + conditions + ']\n      }';
+      return '{\n        \'archived\': *[_type == "external" && archived && isVisible ' + conditions + '] | order(displayDate desc),\n        \'recent\': *[_type == "external" && !archived && isVisible ' + conditions + '] | order(displayDate desc)\n      }';
   }
 };
 

package/dist/cjs/getRelatedArticle.js

@@ -0,0 +1,93 @@
+'use strict';
+
+require('./_commonjsHelpers-06173234.js');
+require('./_to-object-329a650b.js');
+require('./core.get-iterator-method-41e87ec1.js');
+require('./_library-dd23b178.js');
+require('./_iter-detect-4d0352f8.js');
+require('./web.dom.iterable-43c3e277.js');
+require('./moment-3cf060f6.js');
+var asyncToGenerator = require('./asyncToGenerator-8e707718.js');
+require('./_set-species-4458e975.js');
+var nookies = require('nookies');
+var getQuery = require('./getQuery.js');
+
+var _this = undefined;
+
+var getRelatedArticle = function () {
+  var _ref2 = asyncToGenerator._asyncToGenerator( /*#__PURE__*/asyncToGenerator.regenerator.mark(function _callee() {
+    var ctx = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
+    var client = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
+    var article = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+    var prevUrl = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : '/';
+
+    var taxonomyMapping, _article$url, url, content_placement, taxonomy, params, conditions, cookies, prevSlugs, relatedArticleQuery, relatedArticle;
+
+    return asyncToGenerator.regenerator.wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            taxonomyMapping = article.taxonomyMapping, _article$url = article.url;
+            _article$url = _article$url === undefined ? {
+              current: null
+            } : _article$url;
+            url = _article$url.current, content_placement = article.content_placement;
+            taxonomy = [];
+
+            content_placement.forEach(function (_ref3) {
+              var path = _ref3.path,
+                  _id = _ref3._id;
+
+              var prev_url_to_check = prevUrl;
+              if (prev_url_to_check.includes('?')) {
+                prev_url_to_check = prev_url_to_check.split('?')[0];
+              }
+              if (prev_url_to_check.endsWith(path)) taxonomy.push(_id);
+            });
+
+            if (taxonomy.length === 0) {
+              taxonomy = taxonomyMapping.map(function (_ref4) {
+                var _ref = _ref4._ref;
+                return _ref;
+              });
+            }
+
+            params = {
+              url: url,
+              taxonomy: taxonomy,
+              index: 0
+            };
+            conditions = '';
+
+            if (ctx && url) {
+              cookies = nookies.parseCookies(ctx);
+              prevSlugs = cookies['prevSlugs'];
+
+              if (!!prevSlugs) {
+                nookies.setCookie(ctx, 'prevSlugs', prevSlugs + ',"' + url + '"');
+                conditions = '&& !(url.current in [' + prevSlugs + '])';
+              } else nookies.setCookie(ctx, 'prevSlugs', '"' + url + '"');
+            }
+
+            relatedArticleQuery = getQuery('related', conditions);
+            _context.next = 12;
+            return client.fetch(relatedArticleQuery, params);
+
+          case 12:
+            relatedArticle = _context.sent;
+            return _context.abrupt('return', relatedArticle);
+
+          case 14:
+          case 'end':
+            return _context.stop();
+        }
+      }
+    }, _callee, _this);
+  }));
+
+  return function getRelatedArticle() {
+    return _ref2.apply(this, arguments);
+  };
+}();
+
+module.exports = getRelatedArticle;

package/dist/cjs/index.js

@@ -154,6 +154,9 @@ var ConferenceArticleCard = require('./ConferenceArticleCard.js');
 var KMTracker = require('./KMTracker.js');
 var getSeriesDetail = require('./getSeriesDetail.js');
 var SetCookie = require('./SetCookie.js');
+require('nookies');
+var getQuery = require('./getQuery.js');
+var getRelatedArticle = require('./getRelatedArticle.js');
 var Auth = require('./Auth.js');
 require('swr');
 require('passport-local');
@@ -161,7 +164,6 @@ require('mysql');
 var View = require('./View.js');
 var getTargeting = require('./getTargeting-86e68d62.js');
 var urlFor = require('./urlFor.js');
-var getQuery = require('./getQuery.js');
 require('react-twitter-embed');
 var PartnerDetailListing = require('./PartnerDetailListing.js');
 
@@ -240,9 +242,10 @@ exports.ConferenceArticleCard = ConferenceArticleCard;
 exports.KMTracker = KMTracker;
 exports.getSeriesDetail = getSeriesDetail;
 exports.SetCookie = SetCookie;
+exports.getQuery = getQuery;
+exports.getRelatedArticle = getRelatedArticle;
 exports.Auth = Auth.default;
 exports.View = View;
 exports.getTargeting = getTargeting.getTargeting;
 exports.urlFor = urlFor;
-exports.getQuery = getQuery;
 exports.PartnerDetailListing = PartnerDetailListing;

package/dist/esm/ArticleQueue.js

@@ -611,12 +611,12 @@ var Article = function Article(props) {
     React__default.createElement(
       'noscript',
       null,
-      props.relatedArticle && props.relatedArticle.url && props.relatedArticle.url.current && React__default.createElement(
+      props.article.relatedArticle && props.article.relatedArticle.url && props.article.relatedArticle.url.current && React__default.createElement(
         'div',
         { style: { textAlign: 'center' } },
         React__default.createElement(
           'a',
-          { href: '/view/' + props.relatedArticle.url.current },
+          { href: '/view/' + props.article.relatedArticle.url.current },
           'Related Article >>>'
         )
       )

package/dist/esm/View.js

@@ -52,9 +52,9 @@ import Dropdown from 'react-bootstrap/Dropdown';
 import { I as InscreenSensor, i as includes_1 } from './InscreenSensor-67905ed5.js';
 import getKeywords from './getKeywords.js';
 import getSeriesDetail from './getSeriesDetail.js';
+import getQuery from './getQuery.js';
 import { a as getContentPlacementUrl, g as getTargeting } from './getTargeting-1f2c61e3.js';
 import urlFor from './urlFor.js';
-import getQuery from './getQuery.js';
 
 var renderAuthor = function renderAuthor(authorName, authorURL, index, length) {
   var defaultUrl = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 'authors';
@@ -832,12 +832,12 @@ var Article = function Article(props) {
       React__default.createElement(
         'noscript',
         null,
-        props.infiniteScroll && props.relatedArticle && props.relatedArticle.url && props.relatedArticle.url.current && React__default.createElement(
+        props.infiniteScroll && props.article.relatedArticle && props.article.relatedArticle.url && props.article.relatedArticle.url.current && React__default.createElement(
           'div',
           { style: { textAlign: 'center' } },
           React__default.createElement(
             'a',
-            { href: '/view/' + props.relatedArticle.url.current },
+            { href: '/view/' + props.article.relatedArticle.url.current },
             'Related Article >>>'
           )
         )

package/dist/esm/getQuery.js

@@ -18,7 +18,7 @@ var getQuery = function getQuery(type) {
     case 'issue':
       return '*[_type == \'publication\'\n        && identifier.current == $publication\n        ' + conditions + '][0] {\n            ' + params + '\n            ...,\n            \'issue\': *[_type == \'publication\'\n                && references(^._id)\n                && identifier.current == $issue][0] {\n                    ...,\n                    \'articles\': *[_type == \'article\'\n                        && !(_id in path("drafts.**"))\n                        && defined(title)\n                        && is_visible\n                        && defined(url)\n                        && dateTime(published) <= dateTime($currentDate)\n                        && references(^._id)] {\n                          ...,\n                          authorMapping[0]->,\n                          contentCategory->,\n                          issueSection-> {\n                            name\n                          }\n                        }\n                }\n        }';
     case 'externalResources':
-      return '{\n        \'archived\': *[_type == "external" && archived && isVisible ' + conditions + '],\n        \'recent\': *[_type == "external" && !archived && isVisible ' + conditions + ']\n      }';
+      return '{\n        \'archived\': *[_type == "external" && archived && isVisible ' + conditions + '] | order(displayDate desc),\n        \'recent\': *[_type == "external" && !archived && isVisible ' + conditions + '] | order(displayDate desc)\n      }';
   }
 };
 

package/dist/esm/getRelatedArticle.js

@@ -0,0 +1,91 @@
+import './_commonjsHelpers-0c4b6f40.js';
+import './_to-object-16fd8b46.js';
+import './core.get-iterator-method-f5c0d66a.js';
+import './_library-528f1934.js';
+import './_iter-detect-6e099a34.js';
+import './web.dom.iterable-46c95e52.js';
+import './moment-49ae13fa.js';
+import { a as _asyncToGenerator, r as regenerator } from './asyncToGenerator-0379e924.js';
+import './_set-species-6f64f1c1.js';
+import { parseCookies, setCookie } from 'nookies';
+import getQuery from './getQuery.js';
+
+var _this = undefined;
+
+var getRelatedArticle = function () {
+  var _ref2 = _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee() {
+    var ctx = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
+    var client = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
+    var article = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+    var prevUrl = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : '/';
+
+    var taxonomyMapping, _article$url, url, content_placement, taxonomy, params, conditions, cookies, prevSlugs, relatedArticleQuery, relatedArticle;
+
+    return regenerator.wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            taxonomyMapping = article.taxonomyMapping, _article$url = article.url;
+            _article$url = _article$url === undefined ? {
+              current: null
+            } : _article$url;
+            url = _article$url.current, content_placement = article.content_placement;
+            taxonomy = [];
+
+            content_placement.forEach(function (_ref3) {
+              var path = _ref3.path,
+                  _id = _ref3._id;
+
+              var prev_url_to_check = prevUrl;
+              if (prev_url_to_check.includes('?')) {
+                prev_url_to_check = prev_url_to_check.split('?')[0];
+              }
+              if (prev_url_to_check.endsWith(path)) taxonomy.push(_id);
+            });
+
+            if (taxonomy.length === 0) {
+              taxonomy = taxonomyMapping.map(function (_ref4) {
+                var _ref = _ref4._ref;
+                return _ref;
+              });
+            }
+
+            params = {
+              url: url,
+              taxonomy: taxonomy,
+              index: 0
+            };
+            conditions = '';
+
+            if (ctx && url) {
+              cookies = parseCookies(ctx);
+              prevSlugs = cookies['prevSlugs'];
+
+              if (!!prevSlugs) {
+                setCookie(ctx, 'prevSlugs', prevSlugs + ',"' + url + '"');
+                conditions = '&& !(url.current in [' + prevSlugs + '])';
+              } else setCookie(ctx, 'prevSlugs', '"' + url + '"');
+            }
+
+            relatedArticleQuery = getQuery('related', conditions);
+            _context.next = 12;
+            return client.fetch(relatedArticleQuery, params);
+
+          case 12:
+            relatedArticle = _context.sent;
+            return _context.abrupt('return', relatedArticle);
+
+          case 14:
+          case 'end':
+            return _context.stop();
+        }
+      }
+    }, _callee, _this);
+  }));
+
+  return function getRelatedArticle() {
+    return _ref2.apply(this, arguments);
+  };
+}();
+
+export default getRelatedArticle;

package/dist/esm/index.js

@@ -150,6 +150,9 @@ export { default as ConferenceArticleCard } from './ConferenceArticleCard.js';
 export { default as KMTracker } from './KMTracker.js';
 export { default as getSeriesDetail } from './getSeriesDetail.js';
 export { default as SetCookie } from './SetCookie.js';
+import 'nookies';
+export { default as getQuery } from './getQuery.js';
+export { default as getRelatedArticle } from './getRelatedArticle.js';
 export { default as Auth } from './Auth.js';
 import 'swr';
 import 'passport-local';
@@ -157,6 +160,5 @@ import 'mysql';
 export { default as View } from './View.js';
 export { g as getTargeting } from './getTargeting-1f2c61e3.js';
 export { default as urlFor } from './urlFor.js';
-export { default as getQuery } from './getQuery.js';
 import 'react-twitter-embed';
 export { default as PartnerDetailListing } from './PartnerDetailListing.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mjhls/mjh-framework",
-  "version": "1.0.501",
+  "version": "1.0.503",
   "description": "Foundation Framework",
   "author": "mjh-framework",
   "license": "MIT",
@@ -96,6 +96,7 @@
     "cookie": "^0.4.1",
     "js-cookie": "^2.2.1",
     "next-cookies": "^2.0.3",
+    "nookies": "^2.4.0",
     "react-cookies": "^0.1.1",
     "react-twitter-embed": "^3.0.3",
     "shortid": "^2.2.15",