@mjhls/mjh-framework 1.0.790-filter-test → 1.0.790-scroll-change-test

package/dist/cjs/MediaSeriesLanding.js

@@ -2,7 +2,6 @@
 
 var defineProperty = require('./defineProperty-0cb76d99.js');
 var asyncToGenerator = require('./asyncToGenerator-58c289d9.js');
-var _typeof = require('./typeof-88a668c5.js');
 var _extends$1 = require('./extends-29bdbc6d.js');
 var slicedToArray = require('./slicedToArray-5d1bc3b3.js');
 var React = require('react');
@@ -10,7 +9,9 @@ var _commonjsHelpers = require('./_commonjsHelpers-06173234.js');
 var PropTypes = require('prop-types');
 var ReactDOM = require('react-dom');
 var Link = require('next/link');
+require('./iconBase-68959171.js');
 var MasterDeck = require('./MasterDeck.js');
+var _typeof = require('./typeof-88a668c5.js');
 var index$1 = require('./index-eadd5035.js');
 var index = require('./index-efca863c.js');
 var moment = require('./moment-aca40de1.js');
@@ -24,7 +25,6 @@ require('./web.dom.iterable-46657b5c.js');
 require('./_library-dd23b178.js');
 require('./core.get-iterator-method-f474eacc.js');
 require('./_iter-detect-55a5657a.js');
-require('./_is-array-6128bd56.js');
 require('./_object-pie-083f2dd6.js');
 require('./toConsumableArray-ddb70795.js');
 require('./inherits-c2065b95.js');
@@ -48,6 +48,7 @@ require('./stringify-c9ac1214.js');
 require('./Segment.js');
 require('./main-025fdc78.js');
 require('./ADInfeed-e7aecdf9.js');
+require('./_is-array-6128bd56.js');
 require('react-bootstrap');
 require('./index-187c967e.js');
 require('./util-6f784d85.js');
@@ -62,7 +63,6 @@ require('react-bootstrap/Pagination');
 require('react-bootstrap/Button');
 require('./entities-3f9d0f2f.js');
 require('./index.esm-974f47d9.js');
-require('./iconBase-68959171.js');
 require('react-bootstrap/Figure');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -9573,20 +9573,20 @@ var Filter = function Filter(_ref) {
 
   React.useEffect(function () {
     if (filterData.length < 2) {
-      setChildData({ name: null, data: filterData[0].children, _id: filterData[0]._id });
+      setChildData({ name: null, data: filterData[0].children });
     } else {
       setParentData({ name: null, data: filterData });
     }
   }, []);
 
   var handleFilterSelect = function handleFilterSelect(group, type) {
+
     if (type === 'parent') {
       setParentData(function (prevState) {
         return _extends$1._extends({}, prevState, { name: group.name ? group.name : null });
       });
       if (group && group.children && group.children.length > 0) {
-        setChildData({ data: group.children, _id: group._id });
-        setFilterTopicID(group._id);
+        setChildData({ data: group.children });
       } else {
         //handle filter
         setChildData(null);
@@ -9596,17 +9596,10 @@ var Filter = function Filter(_ref) {
     }
     if (type === 'child') {
       setChildData(function (prevState) {
-        return _extends$1._extends({}, prevState, { name: group.name ? group.name : null, _id: group._id });
+        return _extends$1._extends({}, prevState, { name: group.name ? group.name : null });
       });
       if (group && group.grandchildren && group.grandchildren.length > 0) {
-        setGrandChildData({ data: group.grandchildren, _id: group._id });
-        setFilterTopicID(group._id);
-        var topics = [];
-        topics.push(group._id);
-        group.grandchildren.forEach(function (topic) {
-          topics.push(topic._id);
-        });
-        setFilterTopicID(topics);
+        setGrandChildData({ data: group.grandchildren });
       } else {
         //handle filter
         setGrandChildData(null);
@@ -9615,19 +9608,10 @@ var Filter = function Filter(_ref) {
     }
     if (type === 'grandchild') {
       setGrandChildData(function (prevState) {
-        return _extends$1._extends({}, prevState, { name: group.name ? group.name : 'All', _id: group._id });
+        return _extends$1._extends({}, prevState, { name: group.name ? group.name : null });
       });
       //handle filter
-      if (!group._id) {
-        var _topics = [];
-        _topics.push(childData._id);
-        grandChildData.data.forEach(function (topic) {
-          _topics.push(topic._id);
-        });
-        setFilterTopicID(_topics);
-      } else {
-        setFilterTopicID([group._id, childData._id]);
-      }
+      setFilterTopicID(group._id ? group._id : 'all');
     }
   };
 
@@ -9645,7 +9629,6 @@ var Filter = function Filter(_ref) {
         'All'
       ),
       parentData.data.map(function (docGroup) {
-        if (!docGroup._id) return null;
         return React__default['default'].createElement(
           Dropdown.Item,
           { key: docGroup._id, onSelect: function onSelect() {
@@ -9658,7 +9641,7 @@ var Filter = function Filter(_ref) {
     childData && React__default['default'].createElement(
       DropdownButton,
       { drop: 'down', style: { borderRadius: '3px' }, className: 'filter-btn ml-3', title: childData.name ? childData.name : 'Filter By Topic' },
-      React__default['default'].createElement(
+      !parentData && React__default['default'].createElement(
         Dropdown.Item,
         { onSelect: function onSelect() {
             return handleFilterSelect({}, 'child');
@@ -9666,7 +9649,6 @@ var Filter = function Filter(_ref) {
         'All'
       ),
       childData.data.map(function (docGroup) {
-        if (!docGroup._id) return null;
         return React__default['default'].createElement(
           Dropdown.Item,
           { key: docGroup._id, onSelect: function onSelect() {
@@ -9679,7 +9661,7 @@ var Filter = function Filter(_ref) {
     grandChildData && React__default['default'].createElement(
       DropdownButton,
       { drop: 'down', style: { borderRadius: '3px' }, className: 'filter-btn ml-3', title: grandChildData.name ? grandChildData.name : 'Select Sub Topic' },
-      React__default['default'].createElement(
+      !childData && React__default['default'].createElement(
         Dropdown.Item,
         { onSelect: function onSelect() {
             return handleFilterSelect({}, 'grandchild');
@@ -9687,7 +9669,6 @@ var Filter = function Filter(_ref) {
         'All'
       ),
       grandChildData.data.map(function (docGroup) {
-        if (!docGroup._id) return null;
         return React__default['default'].createElement(
           Dropdown.Item,
           { key: docGroup._id, onSelect: function onSelect() {
@@ -9740,40 +9721,25 @@ var MediaSeriesLanding = function MediaSeriesLanding(props) {
 
   var fetchFilteredData = function () {
     var _ref2 = asyncToGenerator._asyncToGenerator( /*#__PURE__*/asyncToGenerator.regenerator.mark(function _callee() {
-      var newParams, filterQuery, x, seriesQuery, newData;
+      var newParams, filterQuery, seriesQuery, newData;
       return asyncToGenerator.regenerator.wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
               newParams = _extends$1._extends({}, params, { from: 0, to: 10 });
-              filterQuery = void 0;
-
-              if ((typeof filterTopicID === 'undefined' ? 'undefined' : _typeof._typeof(filterTopicID)) == 'object') {
-                filterQuery = '&& (';
-                for (x = 0; x < filterTopicID.length; x++) {
-                  filterQuery = filterQuery + (' references(\'' + filterTopicID[x] + '\') ');
-                  if (x == filterTopicID.length - 1) {
-                    filterQuery = filterQuery + ' )';
-                  } else {
-                    filterQuery = filterQuery + ' || ';
-                  }
-                }
-              } else {
-                filterQuery = filterTopicID !== 'all' ? ' && references(\'' + filterTopicID + '\')' : '';
-              }
-
+              filterQuery = filterTopicID !== 'all' ? '&& references(\'' + filterTopicID + '\')' : '';
               seriesQuery = '*[_type == \'documentGroup\' && references(\'' + docGroupID + '\') ' + filterQuery + ' && isSeries != false && isShow != false && defined(published) && dateTime(published) <= dateTime(now())] | order(published desc) [$from...$to] {\n      _id,\n      name,\n      identifier,\n      published,\n      thumbnail,\n      description,\n      topicMapping[]->,\n      \'pageNumber\': ' + currentPage + ',\n      \'parentUrl\': \'' + parentUrl + '\'\n  }';
-              _context.next = 6;
+              _context.next = 5;
               return client.fetch(seriesQuery, newParams);
 
-            case 6:
+            case 5:
               newData = _context.sent;
 
               setParams(newParams);
               setQuery(seriesQuery);
               setSeriesData(newData);
 
-            case 10:
+            case 9:
             case 'end':
               return _context.stop();
           }
@@ -9844,7 +9810,7 @@ var MediaSeriesLanding = function MediaSeriesLanding(props) {
 
 MediaSeriesLanding.getInitialData = function () {
   var _ref3 = asyncToGenerator._asyncToGenerator( /*#__PURE__*/asyncToGenerator.regenerator.mark(function _callee2(ctx, client, cache) {
-    var urlQuery, pathname, identifier, itemsPerPage, currentPage, start, statusCode, params, docGroupID, seriesQuery, seriesData, allSeries, buildUsedTopicsArray, usedTopics, taxonomyFilter;
+    var urlQuery, pathname, identifier, itemsPerPage, currentPage, start, statusCode, params, docGroupID, seriesQuery, seriesData, taxonomyFilter;
     return asyncToGenerator.regenerator.wrap(function _callee2$(_context2) {
       while (1) {
         switch (_context2.prev = _context2.next) {
@@ -9873,70 +9839,19 @@ MediaSeriesLanding.getInitialData = function () {
           case 13:
             seriesData = _context2.sent;
             _context2.next = 16;
-            return client.fetch('*[_type == \'documentGroup\' && references(\'' + docGroupID._id + '\') && isSeries != false && isShow != false && defined(published) && dateTime(published) <= dateTime(now()) ]  {\n    topicMapping[]->\n  }');
-
-          case 16:
-            allSeries = _context2.sent;
-
-            //Take all series topicMapping and put in an array
-            buildUsedTopicsArray = function buildUsedTopicsArray(seriesArray) {
-              var usedTopics = [];
-              for (var x = 0; x < seriesArray.length; x++) {
-                if (seriesArray[x].topicMapping) {
-                  seriesArray[x].topicMapping.forEach(function (topic) {
-                    if (!usedTopics.includes(topic._id)) {
-                      usedTopics.push(topic._id);
-                    }
-                  });
-                }
-              }
-              return usedTopics;
-            };
-
-            usedTopics = buildUsedTopicsArray(allSeries);
-            _context2.next = 21;
             return client.fetch('\n  *[_type == \'taxonomy\' && !defined(parent) && isMainTopic]{\n    _id,\n    identifier,\n    name,\n    "children": *[_type == \'taxonomy\' && references(^._id)]{\n        _id,\n        name,\n        identifier,\n        "grandchildren": *[_type == \'taxonomy\' && references(^._id)]\n      }\t\n    }');
 
-          case 21:
+          case 16:
             taxonomyFilter = _context2.sent;
 
 
-            taxonomyFilter.forEach(function (topic) {
-              if (topic.children) {
-                topic.children.forEach(function (child) {
-                  if (child.grandchildren) {
-                    child.grandchildren = child.grandchildren.filter(function (grandchild) {
-                      if (!usedTopics.includes(grandchild._id)) {
-                        return false;
-                      }
-                      return true;
-                    });
-                  }
-                  if (!usedTopics.includes(child._id) || !child.grandchildren) {
-                    child._id = null;
-                    child.name = null;
-                  }
-                });
-              }
-            });
-
             if (currentPage > 1 && seriesData.length === 0) {
               statusCode = 404;
             }
 
-            return _context2.abrupt('return', defineProperty._defineProperty({
-              seriesData: seriesData,
-              query: seriesQuery,
-              params: params,
-              currentPage: currentPage,
-              taxonomyFilter: taxonomyFilter,
-              identifier: identifier,
-              docGroupID: docGroupID._id,
-              parentUrl: identifier,
-              statusCode: statusCode
-            }, 'taxonomyFilter', taxonomyFilter));
-
-          case 25:
+            return _context2.abrupt('return', defineProperty._defineProperty({ seriesData: seriesData, query: seriesQuery, params: params, currentPage: currentPage, taxonomyFilter: taxonomyFilter, identifier: identifier, docGroupID: docGroupID._id, parentUrl: identifier, statusCode: statusCode }, 'taxonomyFilter', taxonomyFilter));
+
+          case 19:
           case 'end':
             return _context2.stop();
         }

package/dist/cjs/PublicationLanding.js

@@ -541,32 +541,102 @@ var PublicationLanding = function PublicationLanding(props) {
       }, _callee2, this, [[1, 9]]);
     }))();
   }, []);
+  // function for filtering by year
+  var filterByYear = function filterByYear(year) {
+    return issueData.filter(function (issue) {
+      return issue.year == year;
+    });
+  };
+
+  //function for filtering by Content-Placement
+  var filterByCP = function filterByCP(contentPlacement) {
+    var issuesWithTM = issueData.filter(function (issue) {
+      return issue.taxonomyMapping;
+    });
+    return issuesWithTM.filter(function (issue) {
+      return issue.taxonomyMapping.find(function (tm) {
+        return tm.name == contentPlacement.name;
+      });
+    });
+  };
+
+  //function takes yearsArray and then assigns the object with year key with corresponding year data values
+  var assignDatabyYear = function assignDatabyYear() {
+    var data_by_year = {};
+    for (var i = 0; i < years.length; i++) {
+      data_by_year[years[i]] = sortedData[i];
+    }
+    return data_by_year;
+  };
+  var assignDatabyCP = function assignDatabyCP() {
+    var data_by_CP = {};
+    for (var i = 0; i < contentPlacements.length; i++) {
+      data_by_CP[contentPlacements[i].name] = sorted_Content_Placement[i];
+    }
+    return data_by_CP;
+  };
+
+  var sortedYearly = function sortedYearly() {
+    var dataArray = [];
+    for (var i = 0; i < years.length; i++) {
+      dataArray[i] = filterByYear(years[i]);
+    }
+    return dataArray;
+  };
+
+  var sortedCP = function sortedCP() {
+    var dataArray = [];
+    for (var i = 0; i < contentPlacements.length; i++) {
+      dataArray[i] = filterByCP(contentPlacements[i]);
+    }
+    return dataArray;
+  };
+
+  var sortByBoth = function sortByBoth() {
+    var sortedObj = {};
+    for (var i = 0; i < years.length; i++) {
+      var dataYear = filterByYear(years[i]);
+      sortedObj[years[i]] = dataYear;
+
+      var _loop = function _loop(j) {
+        sortedObj[years[i]][contentPlacements[j].name] = dataYear.filter(function (issue) {
+          return issue.taxonomyMapping && issue.taxonomyMapping.find(function (tm) {
+            return tm.name == contentPlacements[j].name;
+          });
+        });
+      };
+
+      for (var j = 0; j < contentPlacements.length; j++) {
+        _loop(j);
+      }
+    }
+    return sortedObj;
+  };
+
+  var dataByBoth = sortByBoth();
+
+  var sortedData = sortedYearly();
+
+  var sorted_Content_Placement = sortedCP();
+
+  var dataByYear = assignDatabyYear();
+
+  var dataByCP = assignDatabyCP();
 
   React.useEffect(function () {
     if (activeYear && activeContentPlacement && activeContentPlacement.id) {
       router.push(router.pathname, '/' + (href ? href : 'publications') + '/' + publication.identifier.current + '?year=' + activeYear + '&cp=' + activeContentPlacement.id, { shallow: true });
-      var filteredResult = issueData.filter(function (issue) {
-        return issue.year === activeYear;
-      }).filter(function (issue) {
-        return issue.taxonomyMapping && issue.taxonomyMapping.find(function (tm) {
-          return tm.identifier === activeContentPlacement.id;
-        });
-      });
+      var filteredResult = dataByBoth[activeYear][activeContentPlacement.name];
       setSortedIssues(filteredResult);
     } else if (activeYear) {
       router.push(router.pathname, '/' + (href ? href : 'publications') + '/' + publication.identifier.current + '?year=' + activeYear, { shallow: true });
-      var _filteredResult = issueData.filter(function (issue) {
-        return issue.year === activeYear;
-      });
-      setSortedIssues(_filteredResult);
+
+      var filteredData = dataByYear[activeYear];
+      setSortedIssues(filteredData);
     } else if (activeContentPlacement && activeContentPlacement.id) {
       router.push(router.pathname, '/' + (href ? href : 'publications') + '/' + publication.identifier.current + '?cp=' + activeContentPlacement.id, { shallow: true });
-      var _filteredResult2 = issueData.filter(function (issue) {
-        return issue.taxonomyMapping && issue.taxonomyMapping.find(function (tm) {
-          return tm.identifier === activeContentPlacement.id;
-        });
-      });
-      setSortedIssues(_filteredResult2);
+      var filteredPlacement = dataByCP[activeContentPlacement.name];
+      setSortedIssues(filteredPlacement);
     } else {
       router.push(router.pathname, '/' + (href ? href : 'publications') + '/' + publication.identifier.current, { shallow: true });
       setSortedIssues(null);
@@ -585,7 +655,7 @@ var PublicationLanding = function PublicationLanding(props) {
     React__default['default'].createElement(
       Row__default['default'],
       null,
-      publication && publication.issues && publication.issues.length > 0 && years.length > 0 && React__default['default'].createElement(
+      issueData && issueData.length > 0 && years.length > 0 && React__default['default'].createElement(
         Col__default['default'],
         { className: 'flex-grow-0 mb-3' },
         React__default['default'].createElement(
@@ -710,7 +780,7 @@ var PublicationLanding = function PublicationLanding(props) {
           )
         )
       );
-    }) : issueData && issueData.length > 0 && issueData.map(function (issue, key) {
+    }) : !activeContentPlacement && !activeYear && issueData && issueData.length > 0 ? issueData.map(function (issue, key) {
       return React__default['default'].createElement(
         Card__default['default'],
         { key: key, className: 'issueCard' },
@@ -773,7 +843,11 @@ var PublicationLanding = function PublicationLanding(props) {
           )
         )
       );
-    }),
+    }) : React__default['default'].createElement(
+      'em',
+      null,
+      'New content coming soon, please check back later.'
+    ),
     React__default['default'].createElement(
       'style',
       { jsx: 'true' },

package/dist/cjs/View.js

@@ -975,7 +975,7 @@ var Article = React.forwardRef(function (props, ref) {
         visibilitySensor.VisibilitySensor,
         {
           partialVisibility: true,
-          offset: { bottom: triggerOffset, top: containerHeight - triggerOffset },
+          offset: { bottom: triggerOffset, top: containerHeight - 80 },
           onChange: function onChange(isVisible) {
             if (isVisible && queueData && queueData.length > 1) {
               onChangeArticle(url, meta);
@@ -1459,6 +1459,7 @@ var ArticleQueue = function ArticleQueue(props) {
   };
 
   var onChangeArticle = function onChangeArticle(path, meta) {
+    console.log('STUFF', path, prevUrl);
     var newPath = '/view/' + path;
     var activeArticle = queueData.find(function (item) {
       return item.url.current === path;

package/dist/esm/MediaSeriesLanding.js

@@ -1,6 +1,5 @@
 import { _ as _defineProperty } from './defineProperty-f5ff6f5a.js';
 import { a as _asyncToGenerator, r as regenerator } from './asyncToGenerator-7f8f9219.js';
-import { _ as _typeof } from './typeof-a286cf0c.js';
 import { _ as _extends$1 } from './extends-60e0e1c6.js';
 import { _ as _slicedToArray } from './slicedToArray-be2f7a22.js';
 import React, { useCallback, useRef, useState, useContext, useMemo, useEffect, useImperativeHandle, useReducer, forwardRef, cloneElement } from 'react';
@@ -8,7 +7,9 @@ import { c as createCommonjsModule, u as unwrapExports } from './_commonjsHelper
 import PropTypes from 'prop-types';
 import ReactDOM from 'react-dom';
 import Link from 'next/link';
+import './iconBase-602d52fe.js';
 import MasterDeck from './MasterDeck.js';
+import { _ as _typeof } from './typeof-a286cf0c.js';
 import { L as LazyLoad } from './index-35bdcc81.js';
 import { i as imageUrlBuilder } from './index-0dbff1d1.js';
 import { m as moment } from './moment-bc12cb97.js';
@@ -22,7 +23,6 @@ import './web.dom.iterable-4109ff68.js';
 import './_library-528f1934.js';
 import './core.get-iterator-method-133dfacd.js';
 import './_iter-detect-7e5e5ce2.js';
-import './_is-array-3e99e06e.js';
 import './_object-pie-133f504a.js';
 import './toConsumableArray-6d9a4616.js';
 import './inherits-a41fe93f.js';
@@ -46,6 +46,7 @@ import './stringify-59c8f690.js';
 import './Segment.js';
 import './main-b5c5aac1.js';
 import './ADInfeed-e1e18f87.js';
+import './_is-array-3e99e06e.js';
 import 'react-bootstrap';
 import './index-c7e2ac95.js';
 import './util-3ab476bf.js';
@@ -60,7 +61,6 @@ import 'react-bootstrap/Pagination';
 import 'react-bootstrap/Button';
 import './entities-932b50cf.js';
 import './index.esm-3fdda599.js';
-import './iconBase-602d52fe.js';
 import 'react-bootstrap/Figure';
 
 function _extends() {
@@ -9564,20 +9564,20 @@ var Filter = function Filter(_ref) {
 
   useEffect(function () {
     if (filterData.length < 2) {
-      setChildData({ name: null, data: filterData[0].children, _id: filterData[0]._id });
+      setChildData({ name: null, data: filterData[0].children });
     } else {
       setParentData({ name: null, data: filterData });
     }
   }, []);
 
   var handleFilterSelect = function handleFilterSelect(group, type) {
+
     if (type === 'parent') {
       setParentData(function (prevState) {
         return _extends$1({}, prevState, { name: group.name ? group.name : null });
       });
       if (group && group.children && group.children.length > 0) {
-        setChildData({ data: group.children, _id: group._id });
-        setFilterTopicID(group._id);
+        setChildData({ data: group.children });
       } else {
         //handle filter
         setChildData(null);
@@ -9587,17 +9587,10 @@ var Filter = function Filter(_ref) {
     }
     if (type === 'child') {
       setChildData(function (prevState) {
-        return _extends$1({}, prevState, { name: group.name ? group.name : null, _id: group._id });
+        return _extends$1({}, prevState, { name: group.name ? group.name : null });
       });
       if (group && group.grandchildren && group.grandchildren.length > 0) {
-        setGrandChildData({ data: group.grandchildren, _id: group._id });
-        setFilterTopicID(group._id);
-        var topics = [];
-        topics.push(group._id);
-        group.grandchildren.forEach(function (topic) {
-          topics.push(topic._id);
-        });
-        setFilterTopicID(topics);
+        setGrandChildData({ data: group.grandchildren });
       } else {
         //handle filter
         setGrandChildData(null);
@@ -9606,19 +9599,10 @@ var Filter = function Filter(_ref) {
     }
     if (type === 'grandchild') {
       setGrandChildData(function (prevState) {
-        return _extends$1({}, prevState, { name: group.name ? group.name : 'All', _id: group._id });
+        return _extends$1({}, prevState, { name: group.name ? group.name : null });
       });
       //handle filter
-      if (!group._id) {
-        var _topics = [];
-        _topics.push(childData._id);
-        grandChildData.data.forEach(function (topic) {
-          _topics.push(topic._id);
-        });
-        setFilterTopicID(_topics);
-      } else {
-        setFilterTopicID([group._id, childData._id]);
-      }
+      setFilterTopicID(group._id ? group._id : 'all');
     }
   };
 
@@ -9636,7 +9620,6 @@ var Filter = function Filter(_ref) {
         'All'
       ),
       parentData.data.map(function (docGroup) {
-        if (!docGroup._id) return null;
         return React.createElement(
           Dropdown.Item,
           { key: docGroup._id, onSelect: function onSelect() {
@@ -9649,7 +9632,7 @@ var Filter = function Filter(_ref) {
     childData && React.createElement(
       DropdownButton,
       { drop: 'down', style: { borderRadius: '3px' }, className: 'filter-btn ml-3', title: childData.name ? childData.name : 'Filter By Topic' },
-      React.createElement(
+      !parentData && React.createElement(
         Dropdown.Item,
         { onSelect: function onSelect() {
             return handleFilterSelect({}, 'child');
@@ -9657,7 +9640,6 @@ var Filter = function Filter(_ref) {
         'All'
       ),
       childData.data.map(function (docGroup) {
-        if (!docGroup._id) return null;
         return React.createElement(
           Dropdown.Item,
           { key: docGroup._id, onSelect: function onSelect() {
@@ -9670,7 +9652,7 @@ var Filter = function Filter(_ref) {
     grandChildData && React.createElement(
       DropdownButton,
       { drop: 'down', style: { borderRadius: '3px' }, className: 'filter-btn ml-3', title: grandChildData.name ? grandChildData.name : 'Select Sub Topic' },
-      React.createElement(
+      !childData && React.createElement(
         Dropdown.Item,
         { onSelect: function onSelect() {
             return handleFilterSelect({}, 'grandchild');
@@ -9678,7 +9660,6 @@ var Filter = function Filter(_ref) {
         'All'
       ),
       grandChildData.data.map(function (docGroup) {
-        if (!docGroup._id) return null;
         return React.createElement(
           Dropdown.Item,
           { key: docGroup._id, onSelect: function onSelect() {
@@ -9731,40 +9712,25 @@ var MediaSeriesLanding = function MediaSeriesLanding(props) {
 
   var fetchFilteredData = function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee() {
-      var newParams, filterQuery, x, seriesQuery, newData;
+      var newParams, filterQuery, seriesQuery, newData;
       return regenerator.wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
               newParams = _extends$1({}, params, { from: 0, to: 10 });
-              filterQuery = void 0;
-
-              if ((typeof filterTopicID === 'undefined' ? 'undefined' : _typeof(filterTopicID)) == 'object') {
-                filterQuery = '&& (';
-                for (x = 0; x < filterTopicID.length; x++) {
-                  filterQuery = filterQuery + (' references(\'' + filterTopicID[x] + '\') ');
-                  if (x == filterTopicID.length - 1) {
-                    filterQuery = filterQuery + ' )';
-                  } else {
-                    filterQuery = filterQuery + ' || ';
-                  }
-                }
-              } else {
-                filterQuery = filterTopicID !== 'all' ? ' && references(\'' + filterTopicID + '\')' : '';
-              }
-
+              filterQuery = filterTopicID !== 'all' ? '&& references(\'' + filterTopicID + '\')' : '';
               seriesQuery = '*[_type == \'documentGroup\' && references(\'' + docGroupID + '\') ' + filterQuery + ' && isSeries != false && isShow != false && defined(published) && dateTime(published) <= dateTime(now())] | order(published desc) [$from...$to] {\n      _id,\n      name,\n      identifier,\n      published,\n      thumbnail,\n      description,\n      topicMapping[]->,\n      \'pageNumber\': ' + currentPage + ',\n      \'parentUrl\': \'' + parentUrl + '\'\n  }';
-              _context.next = 6;
+              _context.next = 5;
               return client.fetch(seriesQuery, newParams);
 
-            case 6:
+            case 5:
               newData = _context.sent;
 
               setParams(newParams);
               setQuery(seriesQuery);
               setSeriesData(newData);
 
-            case 10:
+            case 9:
             case 'end':
               return _context.stop();
           }
@@ -9835,7 +9801,7 @@ var MediaSeriesLanding = function MediaSeriesLanding(props) {
 
 MediaSeriesLanding.getInitialData = function () {
   var _ref3 = _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee2(ctx, client, cache) {
-    var urlQuery, pathname, identifier, itemsPerPage, currentPage, start, statusCode, params, docGroupID, seriesQuery, seriesData, allSeries, buildUsedTopicsArray, usedTopics, taxonomyFilter;
+    var urlQuery, pathname, identifier, itemsPerPage, currentPage, start, statusCode, params, docGroupID, seriesQuery, seriesData, taxonomyFilter;
     return regenerator.wrap(function _callee2$(_context2) {
       while (1) {
         switch (_context2.prev = _context2.next) {
@@ -9864,70 +9830,19 @@ MediaSeriesLanding.getInitialData = function () {
           case 13:
             seriesData = _context2.sent;
             _context2.next = 16;
-            return client.fetch('*[_type == \'documentGroup\' && references(\'' + docGroupID._id + '\') && isSeries != false && isShow != false && defined(published) && dateTime(published) <= dateTime(now()) ]  {\n    topicMapping[]->\n  }');
-
-          case 16:
-            allSeries = _context2.sent;
-
-            //Take all series topicMapping and put in an array
-            buildUsedTopicsArray = function buildUsedTopicsArray(seriesArray) {
-              var usedTopics = [];
-              for (var x = 0; x < seriesArray.length; x++) {
-                if (seriesArray[x].topicMapping) {
-                  seriesArray[x].topicMapping.forEach(function (topic) {
-                    if (!usedTopics.includes(topic._id)) {
-                      usedTopics.push(topic._id);
-                    }
-                  });
-                }
-              }
-              return usedTopics;
-            };
-
-            usedTopics = buildUsedTopicsArray(allSeries);
-            _context2.next = 21;
             return client.fetch('\n  *[_type == \'taxonomy\' && !defined(parent) && isMainTopic]{\n    _id,\n    identifier,\n    name,\n    "children": *[_type == \'taxonomy\' && references(^._id)]{\n        _id,\n        name,\n        identifier,\n        "grandchildren": *[_type == \'taxonomy\' && references(^._id)]\n      }\t\n    }');
 
-          case 21:
+          case 16:
             taxonomyFilter = _context2.sent;
 
 
-            taxonomyFilter.forEach(function (topic) {
-              if (topic.children) {
-                topic.children.forEach(function (child) {
-                  if (child.grandchildren) {
-                    child.grandchildren = child.grandchildren.filter(function (grandchild) {
-                      if (!usedTopics.includes(grandchild._id)) {
-                        return false;
-                      }
-                      return true;
-                    });
-                  }
-                  if (!usedTopics.includes(child._id) || !child.grandchildren) {
-                    child._id = null;
-                    child.name = null;
-                  }
-                });
-              }
-            });
-
             if (currentPage > 1 && seriesData.length === 0) {
               statusCode = 404;
             }
 
-            return _context2.abrupt('return', _defineProperty({
-              seriesData: seriesData,
-              query: seriesQuery,
-              params: params,
-              currentPage: currentPage,
-              taxonomyFilter: taxonomyFilter,
-              identifier: identifier,
-              docGroupID: docGroupID._id,
-              parentUrl: identifier,
-              statusCode: statusCode
-            }, 'taxonomyFilter', taxonomyFilter));
-
-          case 25:
+            return _context2.abrupt('return', _defineProperty({ seriesData: seriesData, query: seriesQuery, params: params, currentPage: currentPage, taxonomyFilter: taxonomyFilter, identifier: identifier, docGroupID: docGroupID._id, parentUrl: identifier, statusCode: statusCode }, 'taxonomyFilter', taxonomyFilter));
+
+          case 19:
           case 'end':
             return _context2.stop();
         }

package/dist/esm/PublicationLanding.js

@@ -531,32 +531,102 @@ var PublicationLanding = function PublicationLanding(props) {
       }, _callee2, this, [[1, 9]]);
     }))();
   }, []);
+  // function for filtering by year
+  var filterByYear = function filterByYear(year) {
+    return issueData.filter(function (issue) {
+      return issue.year == year;
+    });
+  };
+
+  //function for filtering by Content-Placement
+  var filterByCP = function filterByCP(contentPlacement) {
+    var issuesWithTM = issueData.filter(function (issue) {
+      return issue.taxonomyMapping;
+    });
+    return issuesWithTM.filter(function (issue) {
+      return issue.taxonomyMapping.find(function (tm) {
+        return tm.name == contentPlacement.name;
+      });
+    });
+  };
+
+  //function takes yearsArray and then assigns the object with year key with corresponding year data values
+  var assignDatabyYear = function assignDatabyYear() {
+    var data_by_year = {};
+    for (var i = 0; i < years.length; i++) {
+      data_by_year[years[i]] = sortedData[i];
+    }
+    return data_by_year;
+  };
+  var assignDatabyCP = function assignDatabyCP() {
+    var data_by_CP = {};
+    for (var i = 0; i < contentPlacements.length; i++) {
+      data_by_CP[contentPlacements[i].name] = sorted_Content_Placement[i];
+    }
+    return data_by_CP;
+  };
+
+  var sortedYearly = function sortedYearly() {
+    var dataArray = [];
+    for (var i = 0; i < years.length; i++) {
+      dataArray[i] = filterByYear(years[i]);
+    }
+    return dataArray;
+  };
+
+  var sortedCP = function sortedCP() {
+    var dataArray = [];
+    for (var i = 0; i < contentPlacements.length; i++) {
+      dataArray[i] = filterByCP(contentPlacements[i]);
+    }
+    return dataArray;
+  };
+
+  var sortByBoth = function sortByBoth() {
+    var sortedObj = {};
+    for (var i = 0; i < years.length; i++) {
+      var dataYear = filterByYear(years[i]);
+      sortedObj[years[i]] = dataYear;
+
+      var _loop = function _loop(j) {
+        sortedObj[years[i]][contentPlacements[j].name] = dataYear.filter(function (issue) {
+          return issue.taxonomyMapping && issue.taxonomyMapping.find(function (tm) {
+            return tm.name == contentPlacements[j].name;
+          });
+        });
+      };
+
+      for (var j = 0; j < contentPlacements.length; j++) {
+        _loop(j);
+      }
+    }
+    return sortedObj;
+  };
+
+  var dataByBoth = sortByBoth();
+
+  var sortedData = sortedYearly();
+
+  var sorted_Content_Placement = sortedCP();
+
+  var dataByYear = assignDatabyYear();
+
+  var dataByCP = assignDatabyCP();
 
   useEffect(function () {
     if (activeYear && activeContentPlacement && activeContentPlacement.id) {
       router.push(router.pathname, '/' + (href ? href : 'publications') + '/' + publication.identifier.current + '?year=' + activeYear + '&cp=' + activeContentPlacement.id, { shallow: true });
-      var filteredResult = issueData.filter(function (issue) {
-        return issue.year === activeYear;
-      }).filter(function (issue) {
-        return issue.taxonomyMapping && issue.taxonomyMapping.find(function (tm) {
-          return tm.identifier === activeContentPlacement.id;
-        });
-      });
+      var filteredResult = dataByBoth[activeYear][activeContentPlacement.name];
       setSortedIssues(filteredResult);
     } else if (activeYear) {
       router.push(router.pathname, '/' + (href ? href : 'publications') + '/' + publication.identifier.current + '?year=' + activeYear, { shallow: true });
-      var _filteredResult = issueData.filter(function (issue) {
-        return issue.year === activeYear;
-      });
-      setSortedIssues(_filteredResult);
+
+      var filteredData = dataByYear[activeYear];
+      setSortedIssues(filteredData);
     } else if (activeContentPlacement && activeContentPlacement.id) {
       router.push(router.pathname, '/' + (href ? href : 'publications') + '/' + publication.identifier.current + '?cp=' + activeContentPlacement.id, { shallow: true });
-      var _filteredResult2 = issueData.filter(function (issue) {
-        return issue.taxonomyMapping && issue.taxonomyMapping.find(function (tm) {
-          return tm.identifier === activeContentPlacement.id;
-        });
-      });
-      setSortedIssues(_filteredResult2);
+      var filteredPlacement = dataByCP[activeContentPlacement.name];
+      setSortedIssues(filteredPlacement);
     } else {
       router.push(router.pathname, '/' + (href ? href : 'publications') + '/' + publication.identifier.current, { shallow: true });
       setSortedIssues(null);
@@ -575,7 +645,7 @@ var PublicationLanding = function PublicationLanding(props) {
     React.createElement(
       Row,
       null,
-      publication && publication.issues && publication.issues.length > 0 && years.length > 0 && React.createElement(
+      issueData && issueData.length > 0 && years.length > 0 && React.createElement(
         Col,
         { className: 'flex-grow-0 mb-3' },
         React.createElement(
@@ -700,7 +770,7 @@ var PublicationLanding = function PublicationLanding(props) {
           )
         )
       );
-    }) : issueData && issueData.length > 0 && issueData.map(function (issue, key) {
+    }) : !activeContentPlacement && !activeYear && issueData && issueData.length > 0 ? issueData.map(function (issue, key) {
       return React.createElement(
         Card,
         { key: key, className: 'issueCard' },
@@ -763,7 +833,11 @@ var PublicationLanding = function PublicationLanding(props) {
           )
         )
       );
-    }),
+    }) : React.createElement(
+      'em',
+      null,
+      'New content coming soon, please check back later.'
+    ),
     React.createElement(
       'style',
       { jsx: 'true' },

package/dist/esm/View.js

@@ -965,7 +965,7 @@ var Article = forwardRef(function (props, ref) {
         VisibilitySensor,
         {
           partialVisibility: true,
-          offset: { bottom: triggerOffset, top: containerHeight - triggerOffset },
+          offset: { bottom: triggerOffset, top: containerHeight - 80 },
           onChange: function onChange(isVisible) {
             if (isVisible && queueData && queueData.length > 1) {
               onChangeArticle(url, meta);
@@ -1449,6 +1449,7 @@ var ArticleQueue = function ArticleQueue(props) {
   };
 
   var onChangeArticle = function onChangeArticle(path, meta) {
+    console.log('STUFF', path, prevUrl);
     var newPath = '/view/' + path;
     var activeArticle = queueData.find(function (item) {
       return item.url.current === path;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mjhls/mjh-framework",
-  "version": "1.0.790-filter-test",
+  "version": "1.0.790-scroll-change-test",
   "description": "Foundation Framework",
   "author": "mjh-framework",
   "license": "MIT",