@mjhls/mjh-framework 1.0.584 → 1.0.585

package/README.md

@@ -1,5 +1,5 @@
 
-# mjh-framework v. 1.0.584
+# mjh-framework v. 1.0.585
 
 > Foundation Framework 
 

package/dist/cjs/MasterDeck.js

@@ -71,7 +71,9 @@ var MasterDeck = function (_React$Component) {
       scrolling: true,
       query: _this.query,
       currentPage: _this.props.currentPage || 1,
-      dataRemapped: false
+      dataRemapped: false,
+      lastDataSize: _this.data ? _this.data.length : 0,
+      itemsPerPage: _this.params ? _this.params.to - _this.params.from : 2
     }, _this.loadMore = debounce.debounce_1(function () {
       _this.setState(function (state) {
         var page = state.page,
@@ -131,11 +133,13 @@ var MasterDeck = function (_React$Component) {
         if (dataArr.length > 0) {
           return {
             data: [].concat(toConsumableArray._toConsumableArray(data), toConsumableArray._toConsumableArray(dataArr)),
+            lastDataSize: dataArr.length,
             scrolling: true
           };
         } else {
           return {
-            scrolling: false
+            scrolling: false,
+            lastDataSize: 0
           };
         }
       });
@@ -368,7 +372,18 @@ var MasterDeck = function (_React$Component) {
         rightItems[i].component
       );
     }, _this.renderManualPagination = function () {
-      var currentPage = _this.state.currentPage;
+      var _this$state2 = _this.state,
+          currentPage = _this$state2.currentPage,
+          itemsPerPage = _this$state2.itemsPerPage,
+          lastDataSize = _this$state2.lastDataSize;
+
+
+      console.log('lastDataSize:', lastDataSize);
+      console.log('itemsPerPage:', itemsPerPage);
+
+      if (lastDataSize < itemsPerPage) {
+        return null;
+      }
 
       return React__default['default'].createElement(
         'div',
@@ -401,7 +416,8 @@ var MasterDeck = function (_React$Component) {
           to: this.props.params ? this.props.params.to : 2,
           total_pages: null,
           scrolling: true,
-          query: this.props.query
+          query: this.props.query,
+          lastDataSize: this.props.dataRecord ? this.props.dataRecord.length : 0
         });
       }
       // set dataRemap to true as there are no infeed or BI ads or window width is less than limit

package/dist/cjs/PartnerDetailListing.js

@@ -1505,7 +1505,7 @@ PartnerDetails.returnGetInitialProps = function () {
             features = _ref4[0];
             partnerDetails = _ref4[1];
             taxonomyDetails = _ref4[2];
-            articlesQuery = '*[_type == \'article\' && !(_id in path("drafts.**")) && defined(title) && is_visible == true && defined(url) && dateTime(published) <= dateTime(\'' + today + '\') && references(\'' + taxonomyDetails.id + '\')] | order(published desc)[$from...$to]{\n          title,\n          summary,\n          thumbnail,\n      url,\n      published,\n      contentCategory->,\n      \'pageNumber\': ' + currentPage + '\n    }';
+            articlesQuery = '*[_type == \'article\' && !(_id in path("drafts.**")) && defined(title) && is_visible == true && defined(url) && dateTime(published) <= dateTime(\'' + today + '\') && passwordLocked != true && references(\'' + taxonomyDetails.id + '\')] | order(published desc)[$from...$to]{\n          title,\n          summary,\n          thumbnail,\n      url,\n      published,\n      contentCategory->,\n      \'pageNumber\': ' + currentPage + '\n    }';
             _context.next = 16;
             return client.fetch(articlesQuery, params);
 

package/dist/cjs/QueueDeckExpanded.js

@@ -60,7 +60,7 @@ var loadMore = function loadMore(values, setValues, per) {
   });
 };
 
-var loadData = function loadData(values, query, client, params, setData, setScrolling, pointer, pointerArray) {
+var loadData = function loadData(values, query, client, params, setData, setScrolling, setLastDataSize, pointer, pointerArray) {
   params = _extends._extends({}, params, {
     from: values.from,
     to: values.to
@@ -85,8 +85,10 @@ var loadData = function loadData(values, query, client, params, setData, setScro
       setData(function (prevData) {
         return [].concat(toConsumableArray._toConsumableArray(prevData), toConsumableArray._toConsumableArray(dataArr));
       });
+      setLastDataSize(dataArr.length);
       setScrolling(true);
     } else {
+      setLastDataSize(0);
       setScrolling(false);
     }
   });
@@ -1079,23 +1081,6 @@ var renderMobileAd = function renderMobileAd(index, numberOfItemsBeforeAd, right
   );
 };
 
-var renderManualPagination = function renderManualPagination(currentPage) {
-  return React__default['default'].createElement(
-    'div',
-    { className: 'd-flex justify-content-between' },
-    currentPage && currentPage > 1 && React__default['default'].createElement(
-      'a',
-      { href: '?page=' + (currentPage - 1) },
-      '<< Previous'
-    ),
-    React__default['default'].createElement(
-      'a',
-      { href: '?page=' + (currentPage + 1) },
-      'Next >>'
-    )
-  );
-};
-
 var usePrevious = function usePrevious(value) {
   var ref = React.useRef();
   React.useEffect(function () {
@@ -1167,19 +1152,47 @@ var QueueDeckExpanded = function QueueDeckExpanded(props) {
       currentPage = _useState10[0],
       setCurrentPage = _useState10[1];
 
-  var _useState11 = React.useState({
+  var _useState11 = React.useState(initialData ? initialData.length : 0),
+      _useState12 = slicedToArray._slicedToArray(_useState11, 2),
+      lastDataSize = _useState12[0],
+      setLastDataSize = _useState12[1];
+
+  var _useState13 = React.useState({
     from: params ? params.from : 0,
     to: params ? params.to : 0,
     page: 1
   }),
-      _useState12 = slicedToArray._slicedToArray(_useState11, 2),
-      values = _useState12[0],
-      setValues = _useState12[1];
+      _useState14 = slicedToArray._slicedToArray(_useState13, 2),
+      values = _useState14[0],
+      setValues = _useState14[1];
 
   var itemsPerPage = params && params.itemsPerPage ? params.itemsPerPage : 10;
 
   var prevValues = usePrevious(values);
 
+  var renderManualPagination = function renderManualPagination(currentPage) {
+    console.log('lastDataSize:', lastDataSize);
+    console.log('per:', itemsPerPage);
+    if (lastDataSize < itemsPerPage) {
+      return null;
+    }
+
+    return React__default['default'].createElement(
+      'div',
+      { className: 'd-flex justify-content-between' },
+      currentPage && currentPage > 1 && React__default['default'].createElement(
+        'a',
+        { href: '?page=' + (currentPage - 1) },
+        '<< Previous'
+      ),
+      React__default['default'].createElement(
+        'a',
+        { href: '?page=' + (currentPage + 1) },
+        'Next >>'
+      )
+    );
+  };
+
   //  check for change in filter parameters from client side and refresh the page
   React.useEffect(function () {
     if (initialData && data !== initialData && initialData.length >= 0) {
@@ -1198,11 +1211,11 @@ var QueueDeckExpanded = function QueueDeckExpanded(props) {
 
   React.useEffect(function () {
     if (prevValues) {
-      if (values.page !== prevValues.page && values.from !== prevValues.from && values.to !== prevValues.from) {
-        loadData(values, query, client, params, setData, setScrolling, pointer, pointerArray);
+      if (values.page !== prevValues.page && values.from !== prevValues.from && values.to !== prevValues.to) {
+        loadData(values, query, client, params, setData, setScrolling, setLastDataSize, pointer, pointerArray);
       }
     }
-  }, [values, prevValues, query, client, params, setData, setScrolling, pointer, pointerArray]);
+  }, [values, prevValues, query, client, params, setData, setScrolling, setLastDataSize, pointer, pointerArray]);
 
   React.useEffect(function () {
     document.addEventListener('scroll', trackScrolling);

package/dist/esm/MasterDeck.js

@@ -64,7 +64,9 @@ var MasterDeck = function (_React$Component) {
       scrolling: true,
       query: _this.query,
       currentPage: _this.props.currentPage || 1,
-      dataRemapped: false
+      dataRemapped: false,
+      lastDataSize: _this.data ? _this.data.length : 0,
+      itemsPerPage: _this.params ? _this.params.to - _this.params.from : 2
     }, _this.loadMore = debounce_1(function () {
       _this.setState(function (state) {
         var page = state.page,
@@ -124,11 +126,13 @@ var MasterDeck = function (_React$Component) {
         if (dataArr.length > 0) {
           return {
             data: [].concat(_toConsumableArray(data), _toConsumableArray(dataArr)),
+            lastDataSize: dataArr.length,
             scrolling: true
           };
         } else {
           return {
-            scrolling: false
+            scrolling: false,
+            lastDataSize: 0
           };
         }
       });
@@ -361,7 +365,18 @@ var MasterDeck = function (_React$Component) {
         rightItems[i].component
       );
     }, _this.renderManualPagination = function () {
-      var currentPage = _this.state.currentPage;
+      var _this$state2 = _this.state,
+          currentPage = _this$state2.currentPage,
+          itemsPerPage = _this$state2.itemsPerPage,
+          lastDataSize = _this$state2.lastDataSize;
+
+
+      console.log('lastDataSize:', lastDataSize);
+      console.log('itemsPerPage:', itemsPerPage);
+
+      if (lastDataSize < itemsPerPage) {
+        return null;
+      }
 
       return React.createElement(
         'div',
@@ -394,7 +409,8 @@ var MasterDeck = function (_React$Component) {
           to: this.props.params ? this.props.params.to : 2,
           total_pages: null,
           scrolling: true,
-          query: this.props.query
+          query: this.props.query,
+          lastDataSize: this.props.dataRecord ? this.props.dataRecord.length : 0
         });
       }
       // set dataRemap to true as there are no infeed or BI ads or window width is less than limit

package/dist/esm/PartnerDetailListing.js

@@ -1498,7 +1498,7 @@ PartnerDetails.returnGetInitialProps = function () {
             features = _ref4[0];
             partnerDetails = _ref4[1];
             taxonomyDetails = _ref4[2];
-            articlesQuery = '*[_type == \'article\' && !(_id in path("drafts.**")) && defined(title) && is_visible == true && defined(url) && dateTime(published) <= dateTime(\'' + today + '\') && references(\'' + taxonomyDetails.id + '\')] | order(published desc)[$from...$to]{\n          title,\n          summary,\n          thumbnail,\n      url,\n      published,\n      contentCategory->,\n      \'pageNumber\': ' + currentPage + '\n    }';
+            articlesQuery = '*[_type == \'article\' && !(_id in path("drafts.**")) && defined(title) && is_visible == true && defined(url) && dateTime(published) <= dateTime(\'' + today + '\') && passwordLocked != true && references(\'' + taxonomyDetails.id + '\')] | order(published desc)[$from...$to]{\n          title,\n          summary,\n          thumbnail,\n      url,\n      published,\n      contentCategory->,\n      \'pageNumber\': ' + currentPage + '\n    }';
             _context.next = 16;
             return client.fetch(articlesQuery, params);
 

package/dist/esm/QueueDeckExpanded.js

@@ -54,7 +54,7 @@ var loadMore = function loadMore(values, setValues, per) {
   });
 };
 
-var loadData = function loadData(values, query, client, params, setData, setScrolling, pointer, pointerArray) {
+var loadData = function loadData(values, query, client, params, setData, setScrolling, setLastDataSize, pointer, pointerArray) {
   params = _extends({}, params, {
     from: values.from,
     to: values.to
@@ -79,8 +79,10 @@ var loadData = function loadData(values, query, client, params, setData, setScro
       setData(function (prevData) {
         return [].concat(_toConsumableArray(prevData), _toConsumableArray(dataArr));
       });
+      setLastDataSize(dataArr.length);
       setScrolling(true);
     } else {
+      setLastDataSize(0);
       setScrolling(false);
     }
   });
@@ -1073,23 +1075,6 @@ var renderMobileAd = function renderMobileAd(index, numberOfItemsBeforeAd, right
   );
 };
 
-var renderManualPagination = function renderManualPagination(currentPage) {
-  return React.createElement(
-    'div',
-    { className: 'd-flex justify-content-between' },
-    currentPage && currentPage > 1 && React.createElement(
-      'a',
-      { href: '?page=' + (currentPage - 1) },
-      '<< Previous'
-    ),
-    React.createElement(
-      'a',
-      { href: '?page=' + (currentPage + 1) },
-      'Next >>'
-    )
-  );
-};
-
 var usePrevious = function usePrevious(value) {
   var ref = useRef();
   useEffect(function () {
@@ -1161,19 +1146,47 @@ var QueueDeckExpanded = function QueueDeckExpanded(props) {
       currentPage = _useState10[0],
       setCurrentPage = _useState10[1];
 
-  var _useState11 = useState({
+  var _useState11 = useState(initialData ? initialData.length : 0),
+      _useState12 = _slicedToArray(_useState11, 2),
+      lastDataSize = _useState12[0],
+      setLastDataSize = _useState12[1];
+
+  var _useState13 = useState({
     from: params ? params.from : 0,
     to: params ? params.to : 0,
     page: 1
   }),
-      _useState12 = _slicedToArray(_useState11, 2),
-      values = _useState12[0],
-      setValues = _useState12[1];
+      _useState14 = _slicedToArray(_useState13, 2),
+      values = _useState14[0],
+      setValues = _useState14[1];
 
   var itemsPerPage = params && params.itemsPerPage ? params.itemsPerPage : 10;
 
   var prevValues = usePrevious(values);
 
+  var renderManualPagination = function renderManualPagination(currentPage) {
+    console.log('lastDataSize:', lastDataSize);
+    console.log('per:', itemsPerPage);
+    if (lastDataSize < itemsPerPage) {
+      return null;
+    }
+
+    return React.createElement(
+      'div',
+      { className: 'd-flex justify-content-between' },
+      currentPage && currentPage > 1 && React.createElement(
+        'a',
+        { href: '?page=' + (currentPage - 1) },
+        '<< Previous'
+      ),
+      React.createElement(
+        'a',
+        { href: '?page=' + (currentPage + 1) },
+        'Next >>'
+      )
+    );
+  };
+
   //  check for change in filter parameters from client side and refresh the page
   useEffect(function () {
     if (initialData && data !== initialData && initialData.length >= 0) {
@@ -1192,11 +1205,11 @@ var QueueDeckExpanded = function QueueDeckExpanded(props) {
 
   useEffect(function () {
     if (prevValues) {
-      if (values.page !== prevValues.page && values.from !== prevValues.from && values.to !== prevValues.from) {
-        loadData(values, query, client, params, setData, setScrolling, pointer, pointerArray);
+      if (values.page !== prevValues.page && values.from !== prevValues.from && values.to !== prevValues.to) {
+        loadData(values, query, client, params, setData, setScrolling, setLastDataSize, pointer, pointerArray);
       }
     }
-  }, [values, prevValues, query, client, params, setData, setScrolling, pointer, pointerArray]);
+  }, [values, prevValues, query, client, params, setData, setScrolling, setLastDataSize, pointer, pointerArray]);
 
   useEffect(function () {
     document.addEventListener('scroll', trackScrolling);

package/package.json

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