@mjhls/mjh-framework 1.0.939-segment-test-v6 → 1.0.939-segment-test-v8

package/dist/cjs/View.js

@@ -461,9 +461,7 @@ var Recommended = function Recommended(props) {
       client = props.client,
       _props$index = props.index,
       index = _props$index === undefined ? 0 : _props$index,
-      cpModificationRequired = props.cpModificationRequired,
-      segmentData = props.segmentData,
-      setSegmentData = props.setSegmentData;
+      cpModificationRequired = props.cpModificationRequired;
 
   var _useState = React.useState(false),
       _useState2 = slicedToArray._slicedToArray(_useState, 2),
@@ -509,48 +507,29 @@ var Recommended = function Recommended(props) {
       // get users traits
       var getSegmentProfile = function () {
         var _ref = asyncToGenerator._asyncToGenerator( /*#__PURE__*/asyncToGenerator.regenerator.mark(function _callee() {
-          var data, anonymousId, response, addTaxonomyName, favoriteCategories, articlesQuery, videosQuery, podcastQuery, params, _ref2, _ref3, _articles, videos, podcasts;
+          var anonymousId, response, data, addTaxonomyName, fetchWithTimeout, favoriteCategories, articlesQuery, videosQuery, podcastQuery, params, _ref2, _ref3, _articles, videos, podcasts;
 
           return asyncToGenerator.regenerator.wrap(function _callee$(_context) {
             while (1) {
               switch (_context.prev = _context.next) {
                 case 0:
-                  data = void 0;
-
-                  if (segmentData) {
-                    _context.next = 12;
-                    break;
-                  }
-
                   anonymousId = analytics.user().anonymousId();
-                  _context.next = 5;
+                  _context.next = 3;
                   return fetch('/api/getSegmentProfile', {
                     method: 'POST',
                     body: stringify._JSON$stringify({ anonymousId: anonymousId })
                   });
 
-                case 5:
+                case 3:
                   response = _context.sent;
-                  _context.next = 8;
+                  _context.next = 6;
                   return response.json();
 
-                case 8:
+                case 6:
                   data = _context.sent;
 
-                  if (data && data.traits && data.traits.favorite_article_category) {
-                    setSegmentData(data);
-                  } else {
-                    setLoaded('failed');
-                  }
-                  _context.next = 13;
-                  break;
-
-                case 12:
-                  data = segmentData;
-
-                case 13:
                   if (!(data && data.traits && data.traits.favorite_article_category)) {
-                    _context.next = 28;
+                    _context.next = 26;
                     break;
                   }
 
@@ -572,6 +551,21 @@ var Recommended = function Recommended(props) {
                     return query;
                   };
 
+                  fetchWithTimeout = function fetchWithTimeout(timeout, fn) {
+
+                    return new asyncToGenerator._Promise(function (resolve, reject) {
+                      // start timeout
+                      var timeoutID = setTimeout(function () {
+                        return resolve([]);
+                      }, timeout);
+                      // start calculation
+                      fn().then(function (result) {
+                        clearTimeout(timeoutID);
+                        resolve(result);
+                      });
+                    });
+                  };
+
                   favoriteCategories = JSON.parse(data.traits.favorite_article_category);
                   // grab 3 articles from sanity different from the one currently being read
 
@@ -581,16 +575,23 @@ var Recommended = function Recommended(props) {
                   params = {
                     id: article._id
                   };
-                  _context.next = 22;
-                  return asyncToGenerator._Promise.all([client.fetch(articlesQuery, params), client.fetch(videosQuery, params), client.fetch(podcastQuery, params)]);
-
-                case 22:
+                  _context.next = 17;
+                  return asyncToGenerator._Promise.all([fetchWithTimeout(1000, function () {
+                    return client.fetch(articlesQuery, params);
+                  }), fetchWithTimeout(600, function () {
+                    return client.fetch(videosQuery, params);
+                  }), fetchWithTimeout(600, function () {
+                    return client.fetch(podcastQuery, params);
+                  })]);
+
+                case 17:
                   _ref2 = _context.sent;
                   _ref3 = slicedToArray._slicedToArray(_ref2, 3);
                   _articles = _ref3[0];
                   videos = _ref3[1];
                   podcasts = _ref3[2];
 
+                  if (_articles.length === 0) setLoaded('failed');
                   if (_articles) {
                     if (videos[0] && _articles[2]) {
                       _articles[2] = videos[0];
@@ -603,8 +604,13 @@ var Recommended = function Recommended(props) {
                     }
                     setArticles(_articles);
                   }
+                  _context.next = 27;
+                  break;
+
+                case 26:
+                  setLoaded('failed');
 
-                case 28:
+                case 27:
                 case 'end':
                   return _context.stop();
               }
@@ -931,11 +937,7 @@ var Article = React__default['default'].memo(React.forwardRef(function (props, r
       _props$downloadCitati = props.downloadCitation,
       downloadCitation = _props$downloadCitati === undefined ? false : _props$downloadCitati,
       _props$useSegmentReco = props.useSegmentRecommendedArticles,
-      useSegmentRecommendedArticles = _props$useSegmentReco === undefined ? false : _props$useSegmentReco,
-      _props$segmentData = props.segmentData,
-      segmentData = _props$segmentData === undefined ? null : _props$segmentData,
-      _props$setSegmentData = props.setSegmentData,
-      setSegmentData = _props$setSegmentData === undefined ? function () {} : _props$setSegmentData;
+      useSegmentRecommendedArticles = _props$useSegmentReco === undefined ? false : _props$useSegmentReco;
   var sliderData = props.sliderData;
 
 
@@ -1170,7 +1172,7 @@ var Article = React__default['default'].memo(React.forwardRef(function (props, r
     return React__default['default'].createElement(
       'div',
       null,
-      useSegmentRecommendedArticles ? React__default['default'].createElement(Recommended, { segmentData: segmentData, setSegmentData: setSegmentData, client: client, article: article, index: props.index, Settings: props.Settings, showRelatedArticleFallbackImage: props.showRelatedArticleFallbackImage, cpModificationRequired: cpModificationRequired }) : React__default['default'].createElement(
+      useSegmentRecommendedArticles ? React__default['default'].createElement(Recommended, { client: client, article: article, index: props.index, Settings: props.Settings, showRelatedArticleFallbackImage: props.showRelatedArticleFallbackImage, cpModificationRequired: cpModificationRequired }) : React__default['default'].createElement(
         'section',
         { id: 'related-content-section', className: 'my-1' },
         (article.relatedArticle || RelevantTopics()) && React__default['default'].createElement(
@@ -1869,11 +1871,6 @@ var ArticleQueue = function ArticleQueue(props) {
       active = _useState6[0],
       setActive = _useState6[1];
 
-  var _useState7 = React.useState(null),
-      _useState8 = slicedToArray._slicedToArray(_useState7, 2),
-      segmentData = _useState8[0],
-      setSegmentData = _useState8[1];
-
   var refreshAD = function refreshAD(path) {
     var activeArticle = queueData.find(function (item) {
       return item.url.current === path;
@@ -2095,9 +2092,7 @@ var ArticleQueue = function ArticleQueue(props) {
           // Passing queueData to check for single article
           , queueData: queueData,
           showRelatedArticles: showRelatedArticles,
-          index: index,
-          segmentData: segmentData,
-          setSegmentData: setSegmentData
+          index: index
         }))
       );
     })

package/dist/esm/View.js

@@ -450,9 +450,7 @@ var Recommended = function Recommended(props) {
       client = props.client,
       _props$index = props.index,
       index = _props$index === undefined ? 0 : _props$index,
-      cpModificationRequired = props.cpModificationRequired,
-      segmentData = props.segmentData,
-      setSegmentData = props.setSegmentData;
+      cpModificationRequired = props.cpModificationRequired;
 
   var _useState = useState(false),
       _useState2 = _slicedToArray(_useState, 2),
@@ -498,48 +496,29 @@ var Recommended = function Recommended(props) {
       // get users traits
       var getSegmentProfile = function () {
         var _ref = _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee() {
-          var data, anonymousId, response, addTaxonomyName, favoriteCategories, articlesQuery, videosQuery, podcastQuery, params, _ref2, _ref3, _articles, videos, podcasts;
+          var anonymousId, response, data, addTaxonomyName, fetchWithTimeout, favoriteCategories, articlesQuery, videosQuery, podcastQuery, params, _ref2, _ref3, _articles, videos, podcasts;
 
           return regenerator.wrap(function _callee$(_context) {
             while (1) {
               switch (_context.prev = _context.next) {
                 case 0:
-                  data = void 0;
-
-                  if (segmentData) {
-                    _context.next = 12;
-                    break;
-                  }
-
                   anonymousId = analytics.user().anonymousId();
-                  _context.next = 5;
+                  _context.next = 3;
                   return fetch('/api/getSegmentProfile', {
                     method: 'POST',
                     body: _JSON$stringify({ anonymousId: anonymousId })
                   });
 
-                case 5:
+                case 3:
                   response = _context.sent;
-                  _context.next = 8;
+                  _context.next = 6;
                   return response.json();
 
-                case 8:
+                case 6:
                   data = _context.sent;
 
-                  if (data && data.traits && data.traits.favorite_article_category) {
-                    setSegmentData(data);
-                  } else {
-                    setLoaded('failed');
-                  }
-                  _context.next = 13;
-                  break;
-
-                case 12:
-                  data = segmentData;
-
-                case 13:
                   if (!(data && data.traits && data.traits.favorite_article_category)) {
-                    _context.next = 28;
+                    _context.next = 26;
                     break;
                   }
 
@@ -561,6 +540,21 @@ var Recommended = function Recommended(props) {
                     return query;
                   };
 
+                  fetchWithTimeout = function fetchWithTimeout(timeout, fn) {
+
+                    return new _Promise(function (resolve, reject) {
+                      // start timeout
+                      var timeoutID = setTimeout(function () {
+                        return resolve([]);
+                      }, timeout);
+                      // start calculation
+                      fn().then(function (result) {
+                        clearTimeout(timeoutID);
+                        resolve(result);
+                      });
+                    });
+                  };
+
                   favoriteCategories = JSON.parse(data.traits.favorite_article_category);
                   // grab 3 articles from sanity different from the one currently being read
 
@@ -570,16 +564,23 @@ var Recommended = function Recommended(props) {
                   params = {
                     id: article._id
                   };
-                  _context.next = 22;
-                  return _Promise.all([client.fetch(articlesQuery, params), client.fetch(videosQuery, params), client.fetch(podcastQuery, params)]);
-
-                case 22:
+                  _context.next = 17;
+                  return _Promise.all([fetchWithTimeout(1000, function () {
+                    return client.fetch(articlesQuery, params);
+                  }), fetchWithTimeout(600, function () {
+                    return client.fetch(videosQuery, params);
+                  }), fetchWithTimeout(600, function () {
+                    return client.fetch(podcastQuery, params);
+                  })]);
+
+                case 17:
                   _ref2 = _context.sent;
                   _ref3 = _slicedToArray(_ref2, 3);
                   _articles = _ref3[0];
                   videos = _ref3[1];
                   podcasts = _ref3[2];
 
+                  if (_articles.length === 0) setLoaded('failed');
                   if (_articles) {
                     if (videos[0] && _articles[2]) {
                       _articles[2] = videos[0];
@@ -592,8 +593,13 @@ var Recommended = function Recommended(props) {
                     }
                     setArticles(_articles);
                   }
+                  _context.next = 27;
+                  break;
+
+                case 26:
+                  setLoaded('failed');
 
-                case 28:
+                case 27:
                 case 'end':
                   return _context.stop();
               }
@@ -920,11 +926,7 @@ var Article = React__default.memo(forwardRef(function (props, ref) {
       _props$downloadCitati = props.downloadCitation,
       downloadCitation = _props$downloadCitati === undefined ? false : _props$downloadCitati,
       _props$useSegmentReco = props.useSegmentRecommendedArticles,
-      useSegmentRecommendedArticles = _props$useSegmentReco === undefined ? false : _props$useSegmentReco,
-      _props$segmentData = props.segmentData,
-      segmentData = _props$segmentData === undefined ? null : _props$segmentData,
-      _props$setSegmentData = props.setSegmentData,
-      setSegmentData = _props$setSegmentData === undefined ? function () {} : _props$setSegmentData;
+      useSegmentRecommendedArticles = _props$useSegmentReco === undefined ? false : _props$useSegmentReco;
   var sliderData = props.sliderData;
 
 
@@ -1159,7 +1161,7 @@ var Article = React__default.memo(forwardRef(function (props, ref) {
     return React__default.createElement(
       'div',
       null,
-      useSegmentRecommendedArticles ? React__default.createElement(Recommended, { segmentData: segmentData, setSegmentData: setSegmentData, client: client, article: article, index: props.index, Settings: props.Settings, showRelatedArticleFallbackImage: props.showRelatedArticleFallbackImage, cpModificationRequired: cpModificationRequired }) : React__default.createElement(
+      useSegmentRecommendedArticles ? React__default.createElement(Recommended, { client: client, article: article, index: props.index, Settings: props.Settings, showRelatedArticleFallbackImage: props.showRelatedArticleFallbackImage, cpModificationRequired: cpModificationRequired }) : React__default.createElement(
         'section',
         { id: 'related-content-section', className: 'my-1' },
         (article.relatedArticle || RelevantTopics()) && React__default.createElement(
@@ -1858,11 +1860,6 @@ var ArticleQueue = function ArticleQueue(props) {
       active = _useState6[0],
       setActive = _useState6[1];
 
-  var _useState7 = useState(null),
-      _useState8 = _slicedToArray(_useState7, 2),
-      segmentData = _useState8[0],
-      setSegmentData = _useState8[1];
-
   var refreshAD = function refreshAD(path) {
     var activeArticle = queueData.find(function (item) {
       return item.url.current === path;
@@ -2084,9 +2081,7 @@ var ArticleQueue = function ArticleQueue(props) {
           // Passing queueData to check for single article
           , queueData: queueData,
           showRelatedArticles: showRelatedArticles,
-          index: index,
-          segmentData: segmentData,
-          setSegmentData: setSegmentData
+          index: index
         }))
       );
     })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mjhls/mjh-framework",
-  "version": "1.0.939-segment-test-v6",
+  "version": "1.0.939-segment-test-v8",
   "description": "Foundation Framework",
   "author": "mjh-framework",
   "license": "MIT",