@mjhls/mjh-framework 1.0.699 → 1.0.701

package/dist/esm/getRelatedArticle.js

@@ -424,28 +424,33 @@ var dist_3 = dist.parseCookies;
 var _this = undefined;
 
 var getRelatedArticle = function () {
-  var _ref2 = _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee() {
+  var _ref = _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 articleCount = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 0;
 
-    var taxonomyMapping, _article$url, url, content_placement, taxonomy, params, conditions, cookies, prevSlugs, relatedArticleQuery, relatedArticle;
+    var _article$url, url, documentGroupMapping, issueGroup, content_placement, references, params, articles, filters, cookies, prevSlugs, query;
 
     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;
             _article$url = _article$url === undefined ? {
               current: null
             } : _article$url;
-            url = _article$url.current, content_placement = article.content_placement;
-            taxonomy = [];
-            //404 articles were throwing server error
+            url = _article$url.current, documentGroupMapping = article.documentGroupMapping, issueGroup = article.issueGroup;
+            content_placement = article.content_placement;
+            references = [];
 
-            if (content_placement) {
+
+            content_placement = content_placement && content_placement.length > 0 && content_placement.filter(function (_ref2) {
+              var identifier = _ref2.identifier;
+              return identifier !== 'news';
+            });
+            if (content_placement && content_placement.length > 0) {
               content_placement.forEach(function (_ref3) {
                 var path = _ref3.path,
                     _id = _ref3._id;
@@ -457,27 +462,39 @@ var getRelatedArticle = function () {
                 if (prev_url_to_check.includes('?')) {
                   prev_url_to_check = prev_url_to_check.split('?')[0];
                 }
-                if (prev_url_to_check.endsWith(path) && _id) taxonomy.push(_id);
+                if (prev_url_to_check.endsWith(path) && _id) references.push(_id);
               });
+              if (references.length === 0) {
+                content_placement.forEach(function (_ref4) {
+                  var _id = _ref4._id;
+
+                  if (_id) references.push(_id);
+                });
+              }
             }
 
-            //404 articles were throwing server error
-            if (taxonomy.length === 0 && taxonomyMapping) {
-              taxonomyMapping.forEach(function (_ref4) {
-                var _ref = _ref4._ref;
+            if (documentGroupMapping && documentGroupMapping.length > 0) {
+              documentGroupMapping.forEach(function (_ref5) {
+                var _id = _ref5._id;
 
-                if (_ref) {
-                  taxonomy.push(_ref);
-                }
+                if (_id) references.push(_id);
               });
             }
 
-            params = {
-              url: url,
-              taxonomy: taxonomy,
-              index: articleCount
-            };
-            conditions = '';
+            if (issueGroup && issueGroup._id) {
+              references.push(issueGroup._id);
+            }
+
+            params = { url: url, index: articleCount };
+            articles = null;
+
+            if (!(references && references.length > 0)) {
+              _context.next = 24;
+              break;
+            }
+
+            filters = '&& references("' + references.join('","') + '") ';
+
 
             if (ctx && url) {
               cookies = dist_3(ctx);
@@ -485,27 +502,39 @@ var getRelatedArticle = function () {
 
               if (!!prevSlugs) {
                 dist_2(ctx, 'prevSlugs', prevSlugs + ',"' + url + '"', {});
-                conditions = '&& !(url.current in [' + prevSlugs + '])';
+                filters = '&& !(url.current in [' + prevSlugs + '])';
               } else dist_2(ctx, 'prevSlugs', '"' + url + '"', {});
             }
-            relatedArticleQuery = getQuery('related', conditions, '', articleCount);
-            _context.next = 12;
-            return client.fetch(relatedArticleQuery, params);
 
-          case 12:
-            relatedArticle = _context.sent;
-            return _context.abrupt('return', relatedArticle);
+            query = getQuery('related', filters, '', articleCount).replace('&& taxonomyMapping[]._ref in $taxonomy', '');
+            _context.prev = 15;
+            _context.next = 18;
+            return client.fetch(query, params);
+
+          case 18:
+            articles = _context.sent;
+            _context.next = 24;
+            break;
+
+          case 21:
+            _context.prev = 21;
+            _context.t0 = _context['catch'](15);
+
+            console.error(_context.t0);
+
+          case 24:
+            return _context.abrupt('return', articles);
 
-          case 14:
+          case 25:
           case 'end':
             return _context.stop();
         }
       }
-    }, _callee, _this);
+    }, _callee, _this, [[15, 21]]);
   }));
 
   return function getRelatedArticle() {
-    return _ref2.apply(this, arguments);
+    return _ref.apply(this, arguments);
   };
 }();
 

package/package.json

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