@mjhls/mjh-framework 1.0.420 → 1.0.422

package/README.md

@@ -1,5 +1,5 @@
 
-# mjh-framework v. 1.0.420
+# mjh-framework v. 1.0.422
 
 > Foundation Framework 
 

package/dist/cjs/index.js

@@ -13636,6 +13636,20 @@ var Figure = dynamic(function () {
   return Promise.resolve().then(function () { return require('./Figure-9e886c5b.js'); });
 }, { ssr: false });
 
+var ScrollToElement = function ScrollToElement(elementId) {
+  var element = document.getElementById(elementId);
+  if (element) {
+    var elDistanceToTop = window.pageYOffset + element.getBoundingClientRect().top;
+    var header = document.getElementsByTagName('header')[0];
+    if (header) {
+      var headerHeight = header.offsetHeight;
+      window.scrollTo(0, elDistanceToTop - headerHeight);
+    } else {
+      window.scrollTo(0, elDistanceToTop);
+    }
+  }
+};
+
 var checkUrlIsExternal = function checkUrlIsExternal(url) {
   if (/https?:\/\/((?:[\w\d-]+\.)+[\w\d]{2,})|(^mailto)/i.test(url)) {
     return true;
@@ -13806,10 +13820,12 @@ var getSerializers = function getSerializers() {
 
         if (href && href.charAt(0) === '#') {
           var elementId = href.slice(1);
-          var scrollId = articleId ? '#' + elementId + '-' + articleId : '#' + elementId;
+          if (articleId) elementId = elementId + '-' + articleId;
           return React__default.createElement(
             'a',
-            { href: scrollId },
+            { onClick: function onClick() {
+                return ScrollToElement(elementId);
+              } },
             children
           );
         }
@@ -14332,71 +14348,6 @@ var RelatedTopicsDropdown = function RelatedTopicsDropdown(_ref) {
   }
 };
 
-/*
-This dropdown is used inside Article body to display related content placement and document group pages
-sample usage: <ArticleDetailDropdown article={props.article} exclude={['News']} style={{ backgroundColor: 'var(--primary)', border: 0 }} />
-
-- accepts any normal html arrtibute (style, id, class)
-
-- in article query, need to add '...' to content_placement to retreive additional info needed, and document_group to retrieve group data if available
-
-'content_placement': taxonomyMapping[]-> {
-    ...,
-    'ancestor': parent->parent->identifier,
-    'parent': parent->identifier,
-    'path': identifier
-},
-'document_group': documentGroup-> {
-    name,
-    'parent': parent->identifier,
-    'path': identifier.current
-}
-*/
-
-var ArticleDetailDropdown = function ArticleDetailDropdown(props) {
-  var article = props.article,
-      _props$exclude = props.exclude,
-      exclude = _props$exclude === undefined ? [] : _props$exclude;
-
-  var _props = _extends$2._extends({}, props);
-  delete _props.article;
-  delete _props.exclude;
-  return React__default.createElement(
-    Dropdown,
-    null,
-    React__default.createElement(
-      Dropdown.Toggle,
-      _props,
-      'Related Topics'
-    ),
-    React__default.createElement(
-      Dropdown.Menu,
-      null,
-      article.document_group && React__default.createElement(
-        Dropdown.Item,
-        { href: '/' + article.document_group.parent.current + '/' + article.document_group.path },
-        article.document_group.name
-      ),
-      article.content_placement && article.content_placement.length > 0 && article.content_placement.map(function (cp, i) {
-        if (exclude.includes(cp.name)) return;
-        var href = '';
-        if (cp.ancestor) {
-          href = '/' + cp.ancestor + '/' + cp.identifier;
-        } else if (cp.parent) {
-          href = '/' + cp.parent + '/' + cp.identifier;
-        } else {
-          href = '/' + cp.identifier;
-        }
-        return React__default.createElement(
-          Dropdown.Item,
-          { key: i, href: href },
-          cp.name
-        );
-      })
-    )
-  );
-};
-
 var HighlightenVideo = function HighlightenVideo(_ref) {
   var highlightVideoOptions = _ref.highlightVideoOptions;
   var accountId = highlightVideoOptions.accountId,
@@ -21766,6 +21717,56 @@ var DocumentGroup = function DocumentGroup(_ref) {
 };
 
 var Article$1 = function Article(props) {
+  var onVote = function () {
+    var _ref = AdSlot._asyncToGenerator( /*#__PURE__*/AdSlot.regenerator.mark(function _callee(nodeKey, selectedChoice) {
+      var response, result;
+      return AdSlot.regenerator.wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              _context.next = 2;
+              return fetch('/api/polls/vote', {
+                method: 'POST',
+                headers: { 'Content-Type': 'application/json' },
+                body: AdSlot._JSON$stringify({ articleId: props.article._id, nodeKey: nodeKey, selectedChoice: selectedChoice, body: articleBody })
+              });
+
+            case 2:
+              response = _context.sent;
+
+              if (!response.ok) {
+                _context.next = 11;
+                break;
+              }
+
+              _context.next = 6;
+              return response.json();
+
+            case 6:
+              result = _context.sent;
+
+              setShowVotes(true);
+
+              console.log('Voted successfully');
+              _context.next = 12;
+              break;
+
+            case 11:
+              console.log('Unable to vote!');
+
+            case 12:
+            case 'end':
+              return _context.stop();
+          }
+        }
+      }, _callee, this);
+    }));
+
+    return function onVote(_x, _x2) {
+      return _ref.apply(this, arguments);
+    };
+  }();
+
   var article = props.article;
   var client = props.client,
       pageview = props.pageview,
@@ -21789,6 +21790,7 @@ var Article$1 = function Article(props) {
   var url = _props$article$url.current,
       issue = _props$article.issue,
       source = _props$article.source,
+      documentGroup = _props$article.documentGroup,
       regionalPages = props.regionalPages,
       nationalPage = props.nationalPage,
       ISIContent = props.ISIContent,
@@ -21841,7 +21843,7 @@ var Article$1 = function Article(props) {
   };
 
   var renderRelevantTopicsDropdown = function renderRelevantTopicsDropdown() {
-    if (content_placement && content_placement.length > 0) {
+    if (content_placement && content_placement.length > 0 || documentGroup) {
       return React__default.createElement(
         Dropdown,
         null,
@@ -21853,6 +21855,11 @@ var Article$1 = function Article(props) {
         React__default.createElement(
           Dropdown.Menu,
           null,
+          documentGroup && documentGroup.parent && React__default.createElement(
+            Dropdown.Item,
+            { href: cpModificationRequired ? '/' + documentGroup.parent.identifier.current + '/' + documentGroup.path : '/' + documentGroup.path },
+            documentGroup.name
+          ),
           content_placement.length > 0 ? content_placement.map(function (cp, index) {
             var cp_url = cpModificationRequired ? getContentPlacementUrl(cp) : cp.path;
             var href = '/' + cp_url;
@@ -21867,6 +21874,7 @@ var Article$1 = function Article(props) {
     }
     return null;
   };
+
   var form = function form() {
     return React__default.createElement(
       React__default.Fragment,
@@ -21986,7 +21994,7 @@ var Article$1 = function Article(props) {
         React__default.Fragment,
         null,
         React__default.createElement(TaxonomyCard.BlockContent, _extends$2._extends({
-          serializers: getSerializers(client, pageview, videoAccountIDs, function () {}, true, drupalLeadSettings, currentPage, false, contextualADFlag),
+          serializers: getSerializers(client, pageview, videoAccountIDs, onVote, showVotes, drupalLeadSettings, currentPage, false, contextualADFlag),
           blocks: [].concat(toConsumableArray._toConsumableArray(body.slice(0, selectedIndex))),
           imageOptions: { w: 320, h: 240, fit: 'max' }
         }, client.config())),
@@ -22003,7 +22011,7 @@ var Article$1 = function Article(props) {
           React__default.createElement(AdSlot.DFPAdSlot, _extends$2._extends({}, payload.contextualVideoAD, { refreshFlag: false, checkIsAdFound: checkIsVideoAdFound }))
         ),
         React__default.createElement(TaxonomyCard.BlockContent, _extends$2._extends({
-          serializers: getSerializers(client, pageview, videoAccountIDs, function () {}, true, drupalLeadSettings, currentPage, false),
+          serializers: getSerializers(client, pageview, videoAccountIDs, onVote, showVotes, drupalLeadSettings, currentPage, false),
           blocks: [].concat(toConsumableArray._toConsumableArray(body.slice(selectedIndex))),
           imageOptions: { w: 320, h: 240, fit: 'max' }
         }, client.config()))
@@ -22077,7 +22085,7 @@ var Article$1 = function Article(props) {
         React__default.Fragment,
         null,
         React__default.createElement(TaxonomyCard.BlockContent, _extends$2._extends({
-          serializers: getSerializers(client, pageview, videoAccountIDs, function () {}, true, drupalLeadSettings, currentPage, false, contextualADFlag),
+          serializers: getSerializers(client, pageview, videoAccountIDs, onVote, showVotes, drupalLeadSettings, currentPage, false, contextualADFlag),
           blocks: [].concat(toConsumableArray._toConsumableArray(body.slice(0, _selectedIndex2))),
           imageOptions: { w: 320, h: 240, fit: 'max' }
         }, client.config())),
@@ -22088,14 +22096,14 @@ var Article$1 = function Article(props) {
           React__default.createElement(AdSlot.DFPAdSlot, _extends$2._extends({}, payload.contextualVideoAD, { refreshFlag: false, checkIsAdFound: _checkIsAdFound2 }))
         ),
         React__default.createElement(TaxonomyCard.BlockContent, _extends$2._extends({
-          serializers: getSerializers(client, pageview, videoAccountIDs, function () {}, true, drupalLeadSettings, currentPage, false),
+          serializers: getSerializers(client, pageview, videoAccountIDs, onVote, showVotes, drupalLeadSettings, currentPage, false),
           blocks: [].concat(toConsumableArray._toConsumableArray(body.slice(_selectedIndex2))),
           imageOptions: { w: 320, h: 240, fit: 'max' }
         }, client.config()))
       );
     } else {
       return React__default.createElement(TaxonomyCard.BlockContent, _extends$2._extends({
-        serializers: getSerializers(client, pageview, videoAccountIDs, function () {}, true, drupalLeadSettings, currentPage, false),
+        serializers: getSerializers(client, pageview, videoAccountIDs, onVote, showVotes, drupalLeadSettings, currentPage, false),
         blocks: articleBody,
         imageOptions: { w: 320, h: 240, fit: 'max' }
       }, client.config()));
@@ -22211,7 +22219,7 @@ var Article$1 = function Article(props) {
                     null,
                     source && React__default.createElement(
                       'p',
-                      null,
+                      { style: { display: 'inline-block', padding: '0 .25rem', color: 'var(--franchise-primary, #484848)', borderRadius: '2px', fontWeight: 'bold', border: '2px solid var(--franchise-primary, #484848)' }, className: 'source-label' },
                       source
                     )
                   ),
@@ -22842,7 +22850,6 @@ exports.ADWelcome = ADWelcome;
 exports.AccordionPanel = AccordionPanel;
 exports.AdSlotsProvider = AdSlotsProvider;
 exports.AlphabeticList = AlphabeticList;
-exports.ArticleDetailDropdown = ArticleDetailDropdown;
 exports.ArticleQueue = ArticleQueue;
 exports.Auth = auth;
 exports.Breadcrumbs = Breadcrumbs$1;

package/dist/esm/index.js

@@ -13633,6 +13633,20 @@ var Figure = dynamic(function () {
   return import('./Figure-cc1affbe.js');
 }, { ssr: false });
 
+var ScrollToElement = function ScrollToElement(elementId) {
+  var element = document.getElementById(elementId);
+  if (element) {
+    var elDistanceToTop = window.pageYOffset + element.getBoundingClientRect().top;
+    var header = document.getElementsByTagName('header')[0];
+    if (header) {
+      var headerHeight = header.offsetHeight;
+      window.scrollTo(0, elDistanceToTop - headerHeight);
+    } else {
+      window.scrollTo(0, elDistanceToTop);
+    }
+  }
+};
+
 var checkUrlIsExternal = function checkUrlIsExternal(url) {
   if (/https?:\/\/((?:[\w\d-]+\.)+[\w\d]{2,})|(^mailto)/i.test(url)) {
     return true;
@@ -13803,10 +13817,12 @@ var getSerializers = function getSerializers() {
 
         if (href && href.charAt(0) === '#') {
           var elementId = href.slice(1);
-          var scrollId = articleId ? '#' + elementId + '-' + articleId : '#' + elementId;
+          if (articleId) elementId = elementId + '-' + articleId;
           return React__default.createElement(
             'a',
-            { href: scrollId },
+            { onClick: function onClick() {
+                return ScrollToElement(elementId);
+              } },
             children
           );
         }
@@ -14329,71 +14345,6 @@ var RelatedTopicsDropdown = function RelatedTopicsDropdown(_ref) {
   }
 };
 
-/*
-This dropdown is used inside Article body to display related content placement and document group pages
-sample usage: <ArticleDetailDropdown article={props.article} exclude={['News']} style={{ backgroundColor: 'var(--primary)', border: 0 }} />
-
-- accepts any normal html arrtibute (style, id, class)
-
-- in article query, need to add '...' to content_placement to retreive additional info needed, and document_group to retrieve group data if available
-
-'content_placement': taxonomyMapping[]-> {
-    ...,
-    'ancestor': parent->parent->identifier,
-    'parent': parent->identifier,
-    'path': identifier
-},
-'document_group': documentGroup-> {
-    name,
-    'parent': parent->identifier,
-    'path': identifier.current
-}
-*/
-
-var ArticleDetailDropdown = function ArticleDetailDropdown(props) {
-  var article = props.article,
-      _props$exclude = props.exclude,
-      exclude = _props$exclude === undefined ? [] : _props$exclude;
-
-  var _props = _extends$2({}, props);
-  delete _props.article;
-  delete _props.exclude;
-  return React__default.createElement(
-    Dropdown,
-    null,
-    React__default.createElement(
-      Dropdown.Toggle,
-      _props,
-      'Related Topics'
-    ),
-    React__default.createElement(
-      Dropdown.Menu,
-      null,
-      article.document_group && React__default.createElement(
-        Dropdown.Item,
-        { href: '/' + article.document_group.parent.current + '/' + article.document_group.path },
-        article.document_group.name
-      ),
-      article.content_placement && article.content_placement.length > 0 && article.content_placement.map(function (cp, i) {
-        if (exclude.includes(cp.name)) return;
-        var href = '';
-        if (cp.ancestor) {
-          href = '/' + cp.ancestor + '/' + cp.identifier;
-        } else if (cp.parent) {
-          href = '/' + cp.parent + '/' + cp.identifier;
-        } else {
-          href = '/' + cp.identifier;
-        }
-        return React__default.createElement(
-          Dropdown.Item,
-          { key: i, href: href },
-          cp.name
-        );
-      })
-    )
-  );
-};
-
 var HighlightenVideo = function HighlightenVideo(_ref) {
   var highlightVideoOptions = _ref.highlightVideoOptions;
   var accountId = highlightVideoOptions.accountId,
@@ -21763,6 +21714,56 @@ var DocumentGroup = function DocumentGroup(_ref) {
 };
 
 var Article$1 = function Article(props) {
+  var onVote = function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee(nodeKey, selectedChoice) {
+      var response, result;
+      return regenerator.wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              _context.next = 2;
+              return fetch('/api/polls/vote', {
+                method: 'POST',
+                headers: { 'Content-Type': 'application/json' },
+                body: _JSON$stringify({ articleId: props.article._id, nodeKey: nodeKey, selectedChoice: selectedChoice, body: articleBody })
+              });
+
+            case 2:
+              response = _context.sent;
+
+              if (!response.ok) {
+                _context.next = 11;
+                break;
+              }
+
+              _context.next = 6;
+              return response.json();
+
+            case 6:
+              result = _context.sent;
+
+              setShowVotes(true);
+
+              console.log('Voted successfully');
+              _context.next = 12;
+              break;
+
+            case 11:
+              console.log('Unable to vote!');
+
+            case 12:
+            case 'end':
+              return _context.stop();
+          }
+        }
+      }, _callee, this);
+    }));
+
+    return function onVote(_x, _x2) {
+      return _ref.apply(this, arguments);
+    };
+  }();
+
   var article = props.article;
   var client = props.client,
       pageview = props.pageview,
@@ -21786,6 +21787,7 @@ var Article$1 = function Article(props) {
   var url = _props$article$url.current,
       issue = _props$article.issue,
       source = _props$article.source,
+      documentGroup = _props$article.documentGroup,
       regionalPages = props.regionalPages,
       nationalPage = props.nationalPage,
       ISIContent = props.ISIContent,
@@ -21838,7 +21840,7 @@ var Article$1 = function Article(props) {
   };
 
   var renderRelevantTopicsDropdown = function renderRelevantTopicsDropdown() {
-    if (content_placement && content_placement.length > 0) {
+    if (content_placement && content_placement.length > 0 || documentGroup) {
       return React__default.createElement(
         Dropdown,
         null,
@@ -21850,6 +21852,11 @@ var Article$1 = function Article(props) {
         React__default.createElement(
           Dropdown.Menu,
           null,
+          documentGroup && documentGroup.parent && React__default.createElement(
+            Dropdown.Item,
+            { href: cpModificationRequired ? '/' + documentGroup.parent.identifier.current + '/' + documentGroup.path : '/' + documentGroup.path },
+            documentGroup.name
+          ),
           content_placement.length > 0 ? content_placement.map(function (cp, index) {
             var cp_url = cpModificationRequired ? getContentPlacementUrl(cp) : cp.path;
             var href = '/' + cp_url;
@@ -21864,6 +21871,7 @@ var Article$1 = function Article(props) {
     }
     return null;
   };
+
   var form = function form() {
     return React__default.createElement(
       React__default.Fragment,
@@ -21983,7 +21991,7 @@ var Article$1 = function Article(props) {
         React__default.Fragment,
         null,
         React__default.createElement(BlockContent, _extends$2({
-          serializers: getSerializers(client, pageview, videoAccountIDs, function () {}, true, drupalLeadSettings, currentPage, false, contextualADFlag),
+          serializers: getSerializers(client, pageview, videoAccountIDs, onVote, showVotes, drupalLeadSettings, currentPage, false, contextualADFlag),
           blocks: [].concat(_toConsumableArray(body.slice(0, selectedIndex))),
           imageOptions: { w: 320, h: 240, fit: 'max' }
         }, client.config())),
@@ -22000,7 +22008,7 @@ var Article$1 = function Article(props) {
           React__default.createElement(DFPAdSlot, _extends$2({}, payload.contextualVideoAD, { refreshFlag: false, checkIsAdFound: checkIsVideoAdFound }))
         ),
         React__default.createElement(BlockContent, _extends$2({
-          serializers: getSerializers(client, pageview, videoAccountIDs, function () {}, true, drupalLeadSettings, currentPage, false),
+          serializers: getSerializers(client, pageview, videoAccountIDs, onVote, showVotes, drupalLeadSettings, currentPage, false),
           blocks: [].concat(_toConsumableArray(body.slice(selectedIndex))),
           imageOptions: { w: 320, h: 240, fit: 'max' }
         }, client.config()))
@@ -22074,7 +22082,7 @@ var Article$1 = function Article(props) {
         React__default.Fragment,
         null,
         React__default.createElement(BlockContent, _extends$2({
-          serializers: getSerializers(client, pageview, videoAccountIDs, function () {}, true, drupalLeadSettings, currentPage, false, contextualADFlag),
+          serializers: getSerializers(client, pageview, videoAccountIDs, onVote, showVotes, drupalLeadSettings, currentPage, false, contextualADFlag),
           blocks: [].concat(_toConsumableArray(body.slice(0, _selectedIndex2))),
           imageOptions: { w: 320, h: 240, fit: 'max' }
         }, client.config())),
@@ -22085,14 +22093,14 @@ var Article$1 = function Article(props) {
           React__default.createElement(DFPAdSlot, _extends$2({}, payload.contextualVideoAD, { refreshFlag: false, checkIsAdFound: _checkIsAdFound2 }))
         ),
         React__default.createElement(BlockContent, _extends$2({
-          serializers: getSerializers(client, pageview, videoAccountIDs, function () {}, true, drupalLeadSettings, currentPage, false),
+          serializers: getSerializers(client, pageview, videoAccountIDs, onVote, showVotes, drupalLeadSettings, currentPage, false),
           blocks: [].concat(_toConsumableArray(body.slice(_selectedIndex2))),
           imageOptions: { w: 320, h: 240, fit: 'max' }
         }, client.config()))
       );
     } else {
       return React__default.createElement(BlockContent, _extends$2({
-        serializers: getSerializers(client, pageview, videoAccountIDs, function () {}, true, drupalLeadSettings, currentPage, false),
+        serializers: getSerializers(client, pageview, videoAccountIDs, onVote, showVotes, drupalLeadSettings, currentPage, false),
         blocks: articleBody,
         imageOptions: { w: 320, h: 240, fit: 'max' }
       }, client.config()));
@@ -22208,7 +22216,7 @@ var Article$1 = function Article(props) {
                     null,
                     source && React__default.createElement(
                       'p',
-                      null,
+                      { style: { display: 'inline-block', padding: '0 .25rem', color: 'var(--franchise-primary, #484848)', borderRadius: '2px', fontWeight: 'bold', border: '2px solid var(--franchise-primary, #484848)' }, className: 'source-label' },
                       source
                     )
                   ),
@@ -22797,4 +22805,4 @@ var getQuery = function getQuery(type) {
   }
 };
 
-export { AD300x250, AD300x250x600, ADFloatingFooter, ADFooter, ADGutter, ADWelcome, AccordionPanel, AdSlotsProvider, AlphabeticList, ArticleDetailDropdown, ArticleQueue, auth as Auth, Breadcrumbs$1 as Breadcrumbs, CMEDeck, ConferenceArticleCard, EventsDeck, Feature, fbsHero as ForbesHero, GridHero, Hero, HighlightenVideo, HorizontalHero, KMTracker, OncliveHero, OncliveLargeHero, PdfDownload, PopUpModal, PublicationLanding, RelatedContent, RelatedTopicsDropdown, SetCookie, SocialShare$1 as SocialShare, VerticalHero, View, YahooHero, getKeywords, getQuery, getSerializers, getSeriesDetail, getTargeting, urlFor$5 as urlFor };
+export { AD300x250, AD300x250x600, ADFloatingFooter, ADFooter, ADGutter, ADWelcome, AccordionPanel, AdSlotsProvider, AlphabeticList, ArticleQueue, auth as Auth, Breadcrumbs$1 as Breadcrumbs, CMEDeck, ConferenceArticleCard, EventsDeck, Feature, fbsHero as ForbesHero, GridHero, Hero, HighlightenVideo, HorizontalHero, KMTracker, OncliveHero, OncliveLargeHero, PdfDownload, PopUpModal, PublicationLanding, RelatedContent, RelatedTopicsDropdown, SetCookie, SocialShare$1 as SocialShare, VerticalHero, View, YahooHero, getKeywords, getQuery, getSerializers, getSeriesDetail, getTargeting, urlFor$5 as urlFor };

package/package.json

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