@mjhls/mjh-framework 1.0.699 → 1.0.701

package/dist/cjs/getQuery.js

@@ -10,9 +10,9 @@ var getQuery = function getQuery(type) {
 
   switch (type) {
     case 'related':
-      return '*[\n                _type == "article"\n                && defined(title)\n                && defined(url)\n                && !(_id in path("drafts.**"))\n                && is_visible == true\n                && defined(published) \n                && dateTime(published) <= dateTime(now())\n                && passwordLock!=true\n                && taxonomyMapping[]._ref in $taxonomy\n                && taxonomyMapping[].disableAds != \'true\'\n                && contentCategory->.name != \'Poll\'\n                && contentCategory->.name != \'Slideshows\'\n                && contentCategory->.disableAds != \'true\'\n                && ExcludeFromInfiniteScroll !=true\n                && url.current != $url\n                && !defined(body[].videos)\n                ' + conditions + '\n              ]| order(published desc)[' + (articleCount ? articleCount : '$index') + ']{\n                  ' + params + '\n                  title,\n                  published,\n                  summary,\n                  thumbnail,\n                  ...,\n                  passwordLock,\n                  password,\n                  "authorDetails": authorMapping[]->{ displayName, url, profileImage, biography },\n                  body[] {\n                    ...,\n                    upload_doc {\n                      _type,\n                      asset->\n                    },\n                    uploadAudio {\n                      _type,\n                      asset->\n                    }\n                  },\n                  \'content_placement\': taxonomyMapping[]-> {\n                    \'ancestor\': parent->parent->identifier,\n                    \'parent\': parent->identifier,\n                    \'name\': name,\n                    \'path\': identifier,\n                    disableAds\n                  },\n                  documentGroup-> {\n                    name,\n                    thumbnail,\n                    parent->{...,parent->},\n                  \'path\': identifier.current\n                  },\n                  documentGroupMapping[]-> {\n                    name,\n                    thumbnail,\n                    parent->{...,parent->},\n                  \'path\': identifier.current\n                  },\n                  \'issue\' : *[_type == \'publication\' && !(_id in path("drafts.**")) && is_visible == true && _id == ^.issueGroup._ref][0] {\n                    name,\n                    \'path\': identifier.current,\n                    \'publication\' : *[_type == \'publication\' && !(_id in path("drafts.**")) && is_visible == true && _id == ^.parent._ref][0] {\n                      name,\n                      \'path\': identifier.current\n                    },\n                    \'url\' : pdf.asset-> url\n                  }\n                }';
+      return '*[\n                _type == "article"\n                && defined(title)\n                && defined(url)\n                && !(_id in path("drafts.**"))\n                && is_visible == true\n                && defined(published) \n                && dateTime(published) <= dateTime(now())\n                && passwordLock!=true\n                && taxonomyMapping[]._ref in $taxonomy\n                && taxonomyMapping[].disableAds != \'true\'\n                && contentCategory->.name != \'Poll\'\n                && contentCategory->.name != \'Slideshows\'\n                && contentCategory->.disableAds != \'true\'\n                && ExcludeFromInfiniteScroll !=true\n                && url.current != $url\n                && !defined(body[].videos)\n                ' + conditions + '\n              ]| order(published desc)[' + (articleCount ? articleCount : '$index') + ']{\n                  ' + params + '\n                  title,\n                  published,\n                  summary,\n                  thumbnail,\n                  ...,\n                  passwordLock,\n                  password,\n                  "authorDetails": authorMapping[]->{ displayName, url, profileImage, biography },\n                  body[] {\n                    ...,\n                    upload_doc {\n                      _type,\n                      asset->\n                    },\n                    uploadAudio {\n                      _type,\n                      asset->\n                    }\n                  },\n                  \'content_placement\': taxonomyMapping[]-> {\n                    _id,\n                    \'ancestor\': parent->parent->identifier,\n                    \'parent\': parent->identifier,\n                    \'name\': name,\n                    \'path\': identifier,\n                    disableAds\n                  },\n                  documentGroup-> {\n                    name,\n                    thumbnail,\n                    parent->{...,parent->},\n                  \'path\': identifier.current\n                  },\n                  documentGroupMapping[]-> {\n                    _id,\n                    name,\n                    thumbnail,\n                    parent->{...,parent->},\n                  \'path\': identifier.current\n                  },\n                  \'issue\' : *[_type == \'publication\' && !(_id in path("drafts.**")) && is_visible == true && _id == ^.issueGroup._ref][0] {\n                    name,\n                    \'path\': identifier.current,\n                    \'publication\' : *[_type == \'publication\' && !(_id in path("drafts.**")) && is_visible == true && _id == ^.parent._ref][0] {\n                      name,\n                      \'path\': identifier.current\n                    },\n                    \'url\' : pdf.asset-> url\n                  }\n                }';
     case 'article':
-      return '*[\n                        _type == "article"\n                        && !(_id in path("drafts.**"))\n                        && defined(title)\n                        && defined(url)\n                        && url.current == $url\n                        ' + conditions + '\n                      ][0]{\n                          ' + params + '\n                          title,\n                          published,\n                          summary,\n                          thumbnail,\n                          ...,\n                          passwordLock,\n                          password,\n                          "authorDetails": authorMapping[]->{ displayName, url, profileImage, biography },\n                          body[] {\n                            ...,\n                            upload_doc {\n                              _type,\n                              asset->\n                            },\n                            uploadAudio {\n                              _type,\n                              asset->\n                            },\n                            medias[]{\n                              ...,\n                              upload_doc {\n                                _type,\n                                asset-> \n                              } \n                            },\n                            articles[]{\n                              ...,\n                              "authorDetails": authorMapping[]->{ displayName, url, profileImage, biography },\n                              text[]{\n                                ...,\n                                upload_doc {\n                                  _type,\n                                  asset->\n                                },\n                                uploadAudio {\n                                  _type,\n                                  asset->\n                                },\n                              }\n                            }\n                          },\n                          \'content_placement\': taxonomyMapping[]-> {\n                            ...,\n                            \'ancestor\': parent->parent->identifier,\n                            \'parent\': parent->identifier,\n                            \'name\': name,\n                            \'path\': identifier\n                          },\n                          documentGroup-> {\n                            name,\n                            thumbnail,\n                            parent->{...,parent->},\n                          \'path\': identifier.current\n                          },\n                          documentGroupMapping[]-> {\n                            name,\n                            thumbnail,\n                            parent->{...,parent->},\n                          \'path\': identifier.current\n                          },\n                          \'category\':contentCategory->{\n                            name,\n                            disableAds\n                          },\n                          \'issue\' : *[_type == \'publication\' && !(_id in path("drafts.**")) && is_visible == true && _id == ^.issueGroup._ref][0] {\n                            name,\n                            volume,\n                            \'issueNumber\': number,\n                            \'articleSource\': source,\n                            \'path\': identifier.current,\n                            \'publication\' : *[_type == \'publication\' && !(_id in path("drafts.**")) && is_visible == true && _id == ^.parent._ref][0] {\n                              name,\n                              \'path\': identifier.current\n                            },\n                            \'url\' : pdf.asset-> url\n                          }\n\n                        }';
+      return '*[\n                        _type == "article"\n                        && !(_id in path("drafts.**"))\n                        && defined(title)\n                        && defined(url)\n                        && url.current == $url\n                        ' + conditions + '\n                      ][0]{\n                          ' + params + '\n                          title,\n                          published,\n                          summary,\n                          thumbnail,\n                          ...,\n                          passwordLock,\n                          password,\n                          issueGroup-> { _id, name, identifier, parent-> },\n                          "authorDetails": authorMapping[]->{ displayName, url, profileImage, biography },\n                          body[] {\n                            ...,\n                            upload_doc {\n                              _type,\n                              asset->\n                            },\n                            uploadAudio {\n                              _type,\n                              asset->\n                            },\n                            medias[]{\n                              ...,\n                              upload_doc {\n                                _type,\n                                asset-> \n                              } \n                            },\n                            articles[]{\n                              ...,\n                              "authorDetails": authorMapping[]->{ displayName, url, profileImage, biography },\n                              text[]{\n                                ...,\n                                upload_doc {\n                                  _type,\n                                  asset->\n                                },\n                                uploadAudio {\n                                  _type,\n                                  asset->\n                                },\n                              }\n                            }\n                          },\n                          \'content_placement\': taxonomyMapping[]-> {\n                            ...,\n                            \'ancestor\': parent->parent->identifier,\n                            \'parent\': parent->identifier,\n                            \'name\': name,\n                            \'path\': identifier\n                          },\n                          documentGroup-> {\n                            name,\n                            thumbnail,\n                            parent->{...,parent->},\n                          \'path\': identifier.current\n                          },\n                          documentGroupMapping[]-> {\n                            _id,\n                            name,\n                            thumbnail,\n                            parent->{...,parent->},\n                          \'path\': identifier.current\n                          },\n                          \'category\':contentCategory->{\n                            name,\n                            disableAds\n                          },\n                          \'issue\' : *[_type == \'publication\' && !(_id in path("drafts.**")) && is_visible == true && _id == ^.issueGroup._ref][0] {\n                            name,\n                            volume,\n                            \'issueNumber\': number,\n                            \'articleSource\': source,\n                            \'path\': identifier.current,\n                            \'publication\' : *[_type == \'publication\' && !(_id in path("drafts.**")) && is_visible == true && _id == ^.parent._ref][0] {\n                              name,\n                              \'path\': identifier.current\n                            },\n                            \'url\' : pdf.asset-> url\n                          }\n\n                        }';
     case 'publication':
       return '*[_type == \'publication\'\n        && identifier.current == $publication\n        ' + conditions + '][0] {\n          ' + params + '\n          ...,\n          \'issues\': *[_type == \'publication\'\n              && is_visible\n              && references(^._id)\n              && defined(identifier)] {\n                ...,\n                pdf{asset->}\n              } | order(year desc, month desc)\n      }';
     case 'issue':

package/dist/cjs/getRelatedArticle.js

@@ -426,28 +426,33 @@ var dist_3 = dist.parseCookies;
 var _this = undefined;
 
 var getRelatedArticle = function () {
-  var _ref2 = asyncToGenerator._asyncToGenerator( /*#__PURE__*/asyncToGenerator.regenerator.mark(function _callee() {
+  var _ref = 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 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 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;
             _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;
@@ -459,27 +464,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);
@@ -487,27 +504,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/dist/esm/ArticleCarousel.js

@@ -19,7 +19,9 @@ import YoutubeGroup from './YoutubeGroup.js';
 
 function ArticleCarousel(props) {
   //Passed in array of articles to pass into YoutubeGroup
-  var articles = props.articles;
+  var articles = props.articles,
+      vidHolderWidth = props.vidHolderWidth,
+      numOfTiles = props.numOfTiles;
 
   //Setup article.link URL
 
@@ -31,7 +33,7 @@ function ArticleCarousel(props) {
   return React__default.createElement(
     React__default.Fragment,
     null,
-    articles ? React__default.createElement(YoutubeGroup, _extends({ key: 'articleCarousel-0', dataset: data }, props)) : React__default.createElement(
+    articles ? React__default.createElement(YoutubeGroup, _extends({ key: 'articleCarousel-0', vidHolderWidth: vidHolderWidth, numOfTiles: numOfTiles, dataset: data }, props)) : React__default.createElement(
       'p',
       null,
       'No Article Found.'

package/dist/esm/BrowseVideosListing.js

@@ -16,6 +16,8 @@ import './index-5f9f807a.js';
 import './slicedToArray-7021e5df.js';
 import './smoothscroll-4b699764.js';
 import './YoutubeGroup.js';
+import './iconBase-602d52fe.js';
+import { I as IoIosArrowForward } from './index.esm-29e48d38.js';
 import ArticleCarousel from './ArticleCarousel.js';
 
 function BrowseVideosListing(_ref) {
@@ -24,7 +26,11 @@ function BrowseVideosListing(_ref) {
       _ref$client = _ref.client,
       client = _ref$client === undefined ? null : _ref$client,
       _ref$color = _ref.color,
-      color = _ref$color === undefined ? '#FFFFFF' : _ref$color;
+      color = _ref$color === undefined ? '#FFFFFF' : _ref$color,
+      _ref$numOfTiles = _ref.numOfTiles,
+      numOfTiles = _ref$numOfTiles === undefined ? [3, 2, 1] : _ref$numOfTiles,
+      _ref$vidHolderWidth = _ref.vidHolderWidth,
+      vidHolderWidth = _ref$vidHolderWidth === undefined ? '805px' : _ref$vidHolderWidth;
 
   // Look at AJMC for query setup
   // Data format = Array of Objects based on Taxonomies with videos and latest videos
@@ -36,35 +42,73 @@ function BrowseVideosListing(_ref) {
   return React__default.createElement(
     'div',
     null,
-    data && data.map(function (taxonomy, index) {
+    data.length > 0 ? data.map(function (taxonomy, index) {
       return React__default.createElement(
-        'div',
-        { key: 'articleCarousel_' + taxonomy.identifier + '_' + index, className: 'mb-5' },
+        React__default.Fragment,
+        null,
         React__default.createElement(
           'div',
-          { style: { borderBottom: '3px solid ' + color } },
+          { key: 'articleCarousel_' + taxonomy.identifier + '_' + index, className: 'mb-3 browse-videos' },
           React__default.createElement(
-            'h3',
-            { style: { color: color, marginBottom: '.25rem' } },
-            taxonomy.name
-          ),
-          taxonomy.identifier && React__default.createElement(
-            'p',
-            { style: { width: 'fit-content', marginBottom: '.25rem' } },
+            'div',
+            { className: 'browse-videos-header', style: { borderBottom: '2px solid ' + color } },
             React__default.createElement(
               'a',
               { href: '/' + taxonomy.identifier },
-              'View All >'
+              React__default.createElement(
+                'h4',
+                { className: 'article-title-banner', style: { fontWeight: 'bold', color: 'var(--primary)', padding: '.25rem 0', margin: '0' } },
+                taxonomy.name
+              )
+            ),
+            taxonomy.identifier && React__default.createElement(
+              'div',
+              { style: { width: 'fit-content', whiteSpace: 'nowrap' } },
+              React__default.createElement(
+                'a',
+                { href: '/' + taxonomy.identifier },
+                'View All ',
+                React__default.createElement(IoIosArrowForward, null)
+              )
+            )
+          ),
+          taxonomy.data.length > 0 ? React__default.createElement(
+            'div',
+            { className: 'article-carousel' },
+            React__default.createElement(ArticleCarousel, { articles: taxonomy.data, client: client, numOfTiles: numOfTiles, vidHolderWidth: vidHolderWidth })
+          ) : React__default.createElement(
+            'div',
+            null,
+            React__default.createElement(
+              'h5',
+              { className: 'mt-2' },
+              React__default.createElement(
+                'em',
+                { className: 'pl-3' },
+                'New content coming soon, please check back later.'
+              )
             )
           )
         ),
-        taxonomy.data && React__default.createElement(
-          'div',
-          null,
-          React__default.createElement(ArticleCarousel, { articles: taxonomy.data, client: client })
+        React__default.createElement(
+          'style',
+          { jsx: 'true' },
+          '\n                .article-carousel {\n                  display: flex;\n                  align-items: center;\n                  justify-content: center;\n                }\n                .browse-videos-header {\n                  display: flex;\n                  flex-wrap: no-wrap;\n                  align-items: center;\n                  justify-content: space-between;\n                }\n              '
         )
       );
-    })
+    }) : React__default.createElement(
+      'div',
+      null,
+      React__default.createElement(
+        'h5',
+        null,
+        React__default.createElement(
+          'em',
+          { className: 'pl-3' },
+          'New content coming soon, please check back later.'
+        )
+      )
+    )
   );
 }