@plusscommunities/pluss-newsletter-web-sharing 1.4.37 → 1.4.38

package/dist/index.cjs.js

@@ -12,9 +12,9 @@ var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var React = require('react');
 var reactRedux = require('react-redux');
 var _ = require('lodash');
-var moment = require('moment');
 var FontAwesome = require('react-fontawesome');
 var PlussCore = require('@plusscommunities/pluss-core-web');
+var moment = require('moment');
 var reactBootstrap = require('react-bootstrap');
 var reactRouterDom = require('react-router-dom');
 var reactRouter = require('react-router');
@@ -57,9 +57,9 @@ var _getPrototypeOf__default = /*#__PURE__*/_interopDefaultLegacy(_getPrototypeO
 var _defineProperty__default = /*#__PURE__*/_interopDefaultLegacy(_defineProperty);
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var ___default = /*#__PURE__*/_interopDefaultLegacy(_);
-var moment__default = /*#__PURE__*/_interopDefaultLegacy(moment);
 var FontAwesome__default = /*#__PURE__*/_interopDefaultLegacy(FontAwesome);
 var PlussCore__namespace = /*#__PURE__*/_interopNamespace(PlussCore);
+var moment__default = /*#__PURE__*/_interopDefaultLegacy(moment);
 var _toConsumableArray__default = /*#__PURE__*/_interopDefaultLegacy(_toConsumableArray);
 var $__default = /*#__PURE__*/_interopDefaultLegacy($);
 var _asyncToGenerator__default = /*#__PURE__*/_interopDefaultLegacy(_asyncToGenerator);
@@ -711,7 +711,7 @@ var COLOUR_BRANDING_MAIN = Colours.COLOUR_BRANDING_MAIN;
 var COLOUR_BRANDING_OFF = Colours.COLOUR_BRANDING_OFF;
 Colours.COLOUR_BRANDING_ACTION;
 var COLOUR_BRANDING_APP = Colours.COLOUR_BRANDING_APP;
-Colours.TEXT_LIGHT;
+var TEXT_LIGHT = Colours.TEXT_LIGHT;
 var hexToRGBAstring = Colours.hexToRGBAstring; // Misc
 
 var hideChat = Helper$1.hideChat;
@@ -722,6 +722,7 @@ var Text = Components$1.Text;
 function _createSuper$g(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$g(); return function _createSuperInternal() { var Super = _getPrototypeOf__default['default'](Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf__default['default'](this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn__default['default'](this, result); }; }
 
 function _isNativeReflectConstruct$g() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+var PAGE_SIZE = 100;
 
 var ListNewsletter$1 = /*#__PURE__*/function (_Component) {
   _inherits__default['default'](ListNewsletter, _Component);
@@ -741,12 +742,43 @@ var ListNewsletter$1 = /*#__PURE__*/function (_Component) {
 
     _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "state", {
       newsletterEntries: [],
-      sortColumn: 'DateUnix',
-      // column to sort by
-      sortDesc: false,
-      // if true, sort descending rather than ascending
+      // Date column sorts on the real UnixTimestamp; defaults to descending so newest posts appear first.
+      sortColumn: 'UnixTimestamp',
+      sortDesc: true,
       now: moment__default['default'].utc(),
-      onlyFuture: true
+      search: '',
+      startIndex: 0,
+      endIndex: PAGE_SIZE
+    });
+
+    _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "onSearchChange", function (e) {
+      _this.setState({
+        search: e.target.value,
+        startIndex: 0,
+        endIndex: PAGE_SIZE
+      });
+    });
+
+    _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "prevPage", function () {
+      if (_this.state.startIndex === 0) {
+        return;
+      }
+
+      _this.setState({
+        startIndex: _this.state.startIndex - PAGE_SIZE,
+        endIndex: Math.ceil(_this.state.endIndex / PAGE_SIZE) * PAGE_SIZE - PAGE_SIZE
+      });
+    });
+
+    _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "nextPage", function (filteredCount) {
+      if (_this.state.startIndex + PAGE_SIZE >= filteredCount) {
+        return;
+      }
+
+      _this.setState({
+        startIndex: _this.state.startIndex + PAGE_SIZE,
+        endIndex: Math.ceil(_this.state.endIndex / PAGE_SIZE) * PAGE_SIZE + PAGE_SIZE
+      });
     });
 
     return _this;
@@ -791,15 +823,24 @@ var ListNewsletter$1 = /*#__PURE__*/function (_Component) {
     value: function sortByCol(col) {
       if (this.state.sortColumn === col) {
         this.setState({
-          sortDesc: !this.state.sortDesc
+          sortDesc: !this.state.sortDesc,
+          startIndex: 0,
+          endIndex: PAGE_SIZE
         });
       } else {
         this.setState({
           sortColumn: col,
-          sortDesc: false
+          sortDesc: false,
+          startIndex: 0,
+          endIndex: PAGE_SIZE
         });
       }
     }
+  }, {
+    key: "getPaginationText",
+    value: function getPaginationText(filteredCount) {
+      return "".concat(Math.min(this.state.startIndex + 1, filteredCount), "-").concat(Math.min(this.state.endIndex, filteredCount), "/").concat(filteredCount);
+    }
   }, {
     key: "removeNewsletterEntry",
     value: function removeNewsletterEntry(newsletter) {
@@ -819,22 +860,6 @@ var ListNewsletter$1 = /*#__PURE__*/function (_Component) {
     value: function renderNewsletter(source) {
       var _this4 = this;
 
-      // let source = _.sortBy(this.state.newsletterEntries, this.state.sortColumn);
-      // if (this.state.sortDesc) {
-      //     source.reverse();
-      // }
-      // source = _.filter(source, (ev) => {
-      //     if (!ev) {
-      //         return false
-      //     }
-      //     return true;
-      // });
-      // if (this.props.onlyFuture) {
-      //     const nownow = moment().startOf('month');
-      //     source = _.filter(source, (ev) => {
-      //         return nownow.isSameOrBefore(moment.utc(ev.UnixTimestamp).local());
-      //     });
-      // }
       return source.map(function (ev) {
         if (ev != null) {
           return /*#__PURE__*/React__default['default'].createElement("tr", {
@@ -923,15 +948,15 @@ var ListNewsletter$1 = /*#__PURE__*/function (_Component) {
         condensed: true,
         hover: true
       }, /*#__PURE__*/React__default['default'].createElement("thead", null, /*#__PURE__*/React__default['default'].createElement("tr", null, /*#__PURE__*/React__default['default'].createElement("th", {
-        className: "".concat(this.sortIsActive('DateUnix')),
+        className: "".concat(this.sortIsActive('UnixTimestamp')),
         style: {
           cursor: 'pointer',
           width: 140
         },
         onClick: function onClick() {
-          _this5.sortByCol('DateUnix');
+          _this5.sortByCol('UnixTimestamp');
         }
-      }, "Date published", this.renderSort('DateUnix')), /*#__PURE__*/React__default['default'].createElement("th", {
+      }, "Date published", this.renderSort('UnixTimestamp')), /*#__PURE__*/React__default['default'].createElement("th", {
         className: "".concat(this.sortIsActive('Title')),
         style: {
           cursor: 'pointer'
@@ -969,9 +994,57 @@ var ListNewsletter$1 = /*#__PURE__*/function (_Component) {
         type: "h3"
       }, values.textThereAreNoNews)));
     }
+  }, {
+    key: "renderPager",
+    value: function renderPager(filteredCount) {
+      var _this6 = this;
+
+      if (filteredCount <= PAGE_SIZE) {
+        return null;
+      }
+
+      return /*#__PURE__*/React__default['default'].createElement("div", {
+        className: "paginationContainer",
+        style: {
+          margin: '8px 0'
+        }
+      }, /*#__PURE__*/React__default['default'].createElement(FontAwesome__default['default'], {
+        className: "pagination__left",
+        name: "chevron-left",
+        style: {
+          cursor: 'pointer',
+          fontSize: 20,
+          color: TEXT_LIGHT
+        },
+        onClick: this.prevPage
+      }), /*#__PURE__*/React__default['default'].createElement("p", {
+        className: "pagination__text",
+        style: {
+          display: 'inline-block',
+          margin: 0,
+          padding: '0 16px',
+          minWidth: 120,
+          textAlign: 'center',
+          color: TEXT_LIGHT
+        }
+      }, this.getPaginationText(filteredCount)), /*#__PURE__*/React__default['default'].createElement(FontAwesome__default['default'], {
+        className: "pagination__right",
+        name: "chevron-right",
+        style: {
+          cursor: 'pointer',
+          fontSize: 20,
+          color: TEXT_LIGHT
+        },
+        onClick: function onClick() {
+          return _this6.nextPage(filteredCount);
+        }
+      }));
+    }
   }, {
     key: "renderContent",
     value: function renderContent() {
+      var _this7 = this;
+
       var source = ___default['default'].sortBy(this.state.newsletterEntries, this.state.sortColumn);
 
       if (this.state.sortDesc) {
@@ -985,20 +1058,25 @@ var ListNewsletter$1 = /*#__PURE__*/function (_Component) {
 
         return true;
       });
+      var search = this.state.search;
 
-      if (this.props.onlyFuture) {
-        var nownow = moment__default['default']().startOf('month');
+      if (!___default['default'].isEmpty(search)) {
+        var lowSearch = search.toLowerCase();
         source = ___default['default'].filter(source, function (ev) {
-          return nownow.isSameOrBefore(moment__default['default'].utc(ev.UnixTimestamp).local());
-        });
-      } // source = []
+          if (!ev.Title) {
+            return false;
+          }
 
+          return ev.Title.toLowerCase().indexOf(lowSearch) > -1;
+        });
+      } // Total matching the search/sort BEFORE the page slice — drives the pager text.
 
-      if (___default['default'].isEmpty(source)) {
-        return this.renderEmpty();
-      }
 
-      return this.renderView(source);
+      var filteredCount = source.length;
+      source = ___default['default'].filter(source, function (ev, i) {
+        return i >= _this7.state.startIndex && i < _this7.state.endIndex;
+      });
+      return /*#__PURE__*/React__default['default'].createElement("div", null, ___default['default'].isEmpty(source) ? this.renderEmpty() : this.renderView(source), this.renderPager(filteredCount));
     }
   }, {
     key: "render",
@@ -1007,7 +1085,16 @@ var ListNewsletter$1 = /*#__PURE__*/function (_Component) {
         style: {
           minWidth: '100%'
         }
-      }, this.renderContent());
+      }, /*#__PURE__*/React__default['default'].createElement(reactBootstrap.FormControl, {
+        type: "text",
+        placeholder: "Search news",
+        value: this.state.search,
+        onChange: this.onSearchChange,
+        style: {
+          marginBottom: 16,
+          maxWidth: 360
+        }
+      }), this.renderContent());
     }
   }]);
 
@@ -1988,9 +2075,6 @@ var NewsHub = /*#__PURE__*/function (_Component) {
       loadingSubmissions: false,
       submissionEntries: [],
       allList: [],
-      thisMonth: [],
-      now: moment__default['default'].utc(),
-      onlyFuture: true,
       search: ''
     };
     return _this;
@@ -2015,18 +2099,8 @@ var NewsHub = /*#__PURE__*/function (_Component) {
   }, {
     key: "updateProps",
     value: function updateProps(props) {
-      var thisMonth = [];
-      var nownow = moment__default['default']().startOf('month');
-      props.news.forEach(function (rep) {
-        var isThisMonth = nownow.isSameOrBefore(moment__default['default'].utc(rep.UnixTimestamp).local());
-
-        if (isThisMonth) {
-          thisMonth.push(rep);
-        }
-      });
       this.setState({
         allList: props.news,
-        thisMonth: thisMonth,
         submissionEntries: props.submissions
       });
     }
@@ -2230,9 +2304,7 @@ var NewsHub = /*#__PURE__*/function (_Component) {
         return /*#__PURE__*/React__default['default'].createElement(AvailableNews, null);
       }
 
-      return /*#__PURE__*/React__default['default'].createElement(ListNewsletterEntries, {
-        onlyFuture: this.state.selectedSection === 'thisMonth'
-      });
+      return /*#__PURE__*/React__default['default'].createElement(ListNewsletterEntries, null);
     }
   }, {
     key: "render",

package/dist/index.esm.js

@@ -8,10 +8,10 @@ import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import React, { Component, useState, useEffect } from 'react';
 import { connect } from 'react-redux';
 import _ from 'lodash';
-import moment from 'moment';
 import FontAwesome from 'react-fontawesome';
 import * as PlussCore from '@plusscommunities/pluss-core-web';
-import { Table, FormGroup } from 'react-bootstrap';
+import moment from 'moment';
+import { Table, FormControl, FormGroup } from 'react-bootstrap';
 import { Link } from 'react-router-dom';
 import { withRouter } from 'react-router';
 import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
@@ -667,7 +667,7 @@ var COLOUR_BRANDING_MAIN = Colours.COLOUR_BRANDING_MAIN;
 var COLOUR_BRANDING_OFF = Colours.COLOUR_BRANDING_OFF;
 Colours.COLOUR_BRANDING_ACTION;
 var COLOUR_BRANDING_APP = Colours.COLOUR_BRANDING_APP;
-Colours.TEXT_LIGHT;
+var TEXT_LIGHT = Colours.TEXT_LIGHT;
 var hexToRGBAstring = Colours.hexToRGBAstring; // Misc
 
 var hideChat = Helper$1.hideChat;
@@ -678,6 +678,7 @@ var Text = Components$1.Text;
 function _createSuper$g(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$g(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 
 function _isNativeReflectConstruct$g() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+var PAGE_SIZE = 100;
 
 var ListNewsletter$1 = /*#__PURE__*/function (_Component) {
   _inherits(ListNewsletter, _Component);
@@ -697,12 +698,43 @@ var ListNewsletter$1 = /*#__PURE__*/function (_Component) {
 
     _defineProperty(_assertThisInitialized(_this), "state", {
       newsletterEntries: [],
-      sortColumn: 'DateUnix',
-      // column to sort by
-      sortDesc: false,
-      // if true, sort descending rather than ascending
+      // Date column sorts on the real UnixTimestamp; defaults to descending so newest posts appear first.
+      sortColumn: 'UnixTimestamp',
+      sortDesc: true,
       now: moment.utc(),
-      onlyFuture: true
+      search: '',
+      startIndex: 0,
+      endIndex: PAGE_SIZE
+    });
+
+    _defineProperty(_assertThisInitialized(_this), "onSearchChange", function (e) {
+      _this.setState({
+        search: e.target.value,
+        startIndex: 0,
+        endIndex: PAGE_SIZE
+      });
+    });
+
+    _defineProperty(_assertThisInitialized(_this), "prevPage", function () {
+      if (_this.state.startIndex === 0) {
+        return;
+      }
+
+      _this.setState({
+        startIndex: _this.state.startIndex - PAGE_SIZE,
+        endIndex: Math.ceil(_this.state.endIndex / PAGE_SIZE) * PAGE_SIZE - PAGE_SIZE
+      });
+    });
+
+    _defineProperty(_assertThisInitialized(_this), "nextPage", function (filteredCount) {
+      if (_this.state.startIndex + PAGE_SIZE >= filteredCount) {
+        return;
+      }
+
+      _this.setState({
+        startIndex: _this.state.startIndex + PAGE_SIZE,
+        endIndex: Math.ceil(_this.state.endIndex / PAGE_SIZE) * PAGE_SIZE + PAGE_SIZE
+      });
     });
 
     return _this;
@@ -747,15 +779,24 @@ var ListNewsletter$1 = /*#__PURE__*/function (_Component) {
     value: function sortByCol(col) {
       if (this.state.sortColumn === col) {
         this.setState({
-          sortDesc: !this.state.sortDesc
+          sortDesc: !this.state.sortDesc,
+          startIndex: 0,
+          endIndex: PAGE_SIZE
         });
       } else {
         this.setState({
           sortColumn: col,
-          sortDesc: false
+          sortDesc: false,
+          startIndex: 0,
+          endIndex: PAGE_SIZE
         });
       }
     }
+  }, {
+    key: "getPaginationText",
+    value: function getPaginationText(filteredCount) {
+      return "".concat(Math.min(this.state.startIndex + 1, filteredCount), "-").concat(Math.min(this.state.endIndex, filteredCount), "/").concat(filteredCount);
+    }
   }, {
     key: "removeNewsletterEntry",
     value: function removeNewsletterEntry(newsletter) {
@@ -775,22 +816,6 @@ var ListNewsletter$1 = /*#__PURE__*/function (_Component) {
     value: function renderNewsletter(source) {
       var _this4 = this;
 
-      // let source = _.sortBy(this.state.newsletterEntries, this.state.sortColumn);
-      // if (this.state.sortDesc) {
-      //     source.reverse();
-      // }
-      // source = _.filter(source, (ev) => {
-      //     if (!ev) {
-      //         return false
-      //     }
-      //     return true;
-      // });
-      // if (this.props.onlyFuture) {
-      //     const nownow = moment().startOf('month');
-      //     source = _.filter(source, (ev) => {
-      //         return nownow.isSameOrBefore(moment.utc(ev.UnixTimestamp).local());
-      //     });
-      // }
       return source.map(function (ev) {
         if (ev != null) {
           return /*#__PURE__*/React.createElement("tr", {
@@ -879,15 +904,15 @@ var ListNewsletter$1 = /*#__PURE__*/function (_Component) {
         condensed: true,
         hover: true
       }, /*#__PURE__*/React.createElement("thead", null, /*#__PURE__*/React.createElement("tr", null, /*#__PURE__*/React.createElement("th", {
-        className: "".concat(this.sortIsActive('DateUnix')),
+        className: "".concat(this.sortIsActive('UnixTimestamp')),
         style: {
           cursor: 'pointer',
           width: 140
         },
         onClick: function onClick() {
-          _this5.sortByCol('DateUnix');
+          _this5.sortByCol('UnixTimestamp');
         }
-      }, "Date published", this.renderSort('DateUnix')), /*#__PURE__*/React.createElement("th", {
+      }, "Date published", this.renderSort('UnixTimestamp')), /*#__PURE__*/React.createElement("th", {
         className: "".concat(this.sortIsActive('Title')),
         style: {
           cursor: 'pointer'
@@ -925,9 +950,57 @@ var ListNewsletter$1 = /*#__PURE__*/function (_Component) {
         type: "h3"
       }, values.textThereAreNoNews)));
     }
+  }, {
+    key: "renderPager",
+    value: function renderPager(filteredCount) {
+      var _this6 = this;
+
+      if (filteredCount <= PAGE_SIZE) {
+        return null;
+      }
+
+      return /*#__PURE__*/React.createElement("div", {
+        className: "paginationContainer",
+        style: {
+          margin: '8px 0'
+        }
+      }, /*#__PURE__*/React.createElement(FontAwesome, {
+        className: "pagination__left",
+        name: "chevron-left",
+        style: {
+          cursor: 'pointer',
+          fontSize: 20,
+          color: TEXT_LIGHT
+        },
+        onClick: this.prevPage
+      }), /*#__PURE__*/React.createElement("p", {
+        className: "pagination__text",
+        style: {
+          display: 'inline-block',
+          margin: 0,
+          padding: '0 16px',
+          minWidth: 120,
+          textAlign: 'center',
+          color: TEXT_LIGHT
+        }
+      }, this.getPaginationText(filteredCount)), /*#__PURE__*/React.createElement(FontAwesome, {
+        className: "pagination__right",
+        name: "chevron-right",
+        style: {
+          cursor: 'pointer',
+          fontSize: 20,
+          color: TEXT_LIGHT
+        },
+        onClick: function onClick() {
+          return _this6.nextPage(filteredCount);
+        }
+      }));
+    }
   }, {
     key: "renderContent",
     value: function renderContent() {
+      var _this7 = this;
+
       var source = _.sortBy(this.state.newsletterEntries, this.state.sortColumn);
 
       if (this.state.sortDesc) {
@@ -941,20 +1014,25 @@ var ListNewsletter$1 = /*#__PURE__*/function (_Component) {
 
         return true;
       });
+      var search = this.state.search;
 
-      if (this.props.onlyFuture) {
-        var nownow = moment().startOf('month');
+      if (!_.isEmpty(search)) {
+        var lowSearch = search.toLowerCase();
         source = _.filter(source, function (ev) {
-          return nownow.isSameOrBefore(moment.utc(ev.UnixTimestamp).local());
-        });
-      } // source = []
+          if (!ev.Title) {
+            return false;
+          }
 
+          return ev.Title.toLowerCase().indexOf(lowSearch) > -1;
+        });
+      } // Total matching the search/sort BEFORE the page slice — drives the pager text.
 
-      if (_.isEmpty(source)) {
-        return this.renderEmpty();
-      }
 
-      return this.renderView(source);
+      var filteredCount = source.length;
+      source = _.filter(source, function (ev, i) {
+        return i >= _this7.state.startIndex && i < _this7.state.endIndex;
+      });
+      return /*#__PURE__*/React.createElement("div", null, _.isEmpty(source) ? this.renderEmpty() : this.renderView(source), this.renderPager(filteredCount));
     }
   }, {
     key: "render",
@@ -963,7 +1041,16 @@ var ListNewsletter$1 = /*#__PURE__*/function (_Component) {
         style: {
           minWidth: '100%'
         }
-      }, this.renderContent());
+      }, /*#__PURE__*/React.createElement(FormControl, {
+        type: "text",
+        placeholder: "Search news",
+        value: this.state.search,
+        onChange: this.onSearchChange,
+        style: {
+          marginBottom: 16,
+          maxWidth: 360
+        }
+      }), this.renderContent());
     }
   }]);
 
@@ -1944,9 +2031,6 @@ var NewsHub = /*#__PURE__*/function (_Component) {
       loadingSubmissions: false,
       submissionEntries: [],
       allList: [],
-      thisMonth: [],
-      now: moment.utc(),
-      onlyFuture: true,
       search: ''
     };
     return _this;
@@ -1971,18 +2055,8 @@ var NewsHub = /*#__PURE__*/function (_Component) {
   }, {
     key: "updateProps",
     value: function updateProps(props) {
-      var thisMonth = [];
-      var nownow = moment().startOf('month');
-      props.news.forEach(function (rep) {
-        var isThisMonth = nownow.isSameOrBefore(moment.utc(rep.UnixTimestamp).local());
-
-        if (isThisMonth) {
-          thisMonth.push(rep);
-        }
-      });
       this.setState({
         allList: props.news,
-        thisMonth: thisMonth,
         submissionEntries: props.submissions
       });
     }
@@ -2186,9 +2260,7 @@ var NewsHub = /*#__PURE__*/function (_Component) {
         return /*#__PURE__*/React.createElement(AvailableNews, null);
       }
 
-      return /*#__PURE__*/React.createElement(ListNewsletterEntries, {
-        onlyFuture: this.state.selectedSection === 'thisMonth'
-      });
+      return /*#__PURE__*/React.createElement(ListNewsletterEntries, null);
     }
   }, {
     key: "render",

package/dist/index.umd.js

@@ -1,8 +1,8 @@
 (function (global, factory) {
-  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@babel/runtime/helpers/classCallCheck'), require('@babel/runtime/helpers/createClass'), require('@babel/runtime/helpers/assertThisInitialized'), require('@babel/runtime/helpers/inherits'), require('@babel/runtime/helpers/possibleConstructorReturn'), require('@babel/runtime/helpers/getPrototypeOf'), require('@babel/runtime/helpers/defineProperty'), require('react'), require('react-redux'), require('lodash'), require('moment'), require('react-fontawesome'), require('@plusscommunities/pluss-core-web'), require('react-bootstrap'), require('react-router-dom'), require('react-router'), require('@babel/runtime/helpers/toConsumableArray'), require('jquery'), require('uuid'), require('@babel/runtime/helpers/asyncToGenerator'), require('@babel/runtime/helpers/slicedToArray'), require('@babel/runtime/regenerator'), require('@fortawesome/free-solid-svg-icons')) :
-  typeof define === 'function' && define.amd ? define(['exports', '@babel/runtime/helpers/classCallCheck', '@babel/runtime/helpers/createClass', '@babel/runtime/helpers/assertThisInitialized', '@babel/runtime/helpers/inherits', '@babel/runtime/helpers/possibleConstructorReturn', '@babel/runtime/helpers/getPrototypeOf', '@babel/runtime/helpers/defineProperty', 'react', 'react-redux', 'lodash', 'moment', 'react-fontawesome', '@plusscommunities/pluss-core-web', 'react-bootstrap', 'react-router-dom', 'react-router', '@babel/runtime/helpers/toConsumableArray', 'jquery', 'uuid', '@babel/runtime/helpers/asyncToGenerator', '@babel/runtime/helpers/slicedToArray', '@babel/runtime/regenerator', '@fortawesome/free-solid-svg-icons'], factory) :
-  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global['@plusscommunities/pluss-newsletter-web'] = {}, global._classCallCheck, global._createClass, global._assertThisInitialized, global._inherits, global._possibleConstructorReturn, global._getPrototypeOf, global._defineProperty, global.React, global.reactRedux, global._, global.moment, global.FontAwesome, global.PlussCore, global.reactBootstrap, global.reactRouterDom, global.reactRouter, global._toConsumableArray, global.$, global.uuid, global._asyncToGenerator, global._slicedToArray, global._regeneratorRuntime, global.freeSolidSvgIcons));
-}(this, (function (exports, _classCallCheck, _createClass, _assertThisInitialized, _inherits, _possibleConstructorReturn, _getPrototypeOf, _defineProperty, React, reactRedux, _, moment, FontAwesome, PlussCore, reactBootstrap, reactRouterDom, reactRouter, _toConsumableArray, $, uuid, _asyncToGenerator, _slicedToArray, _regeneratorRuntime, freeSolidSvgIcons) { 'use strict';
+  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@babel/runtime/helpers/classCallCheck'), require('@babel/runtime/helpers/createClass'), require('@babel/runtime/helpers/assertThisInitialized'), require('@babel/runtime/helpers/inherits'), require('@babel/runtime/helpers/possibleConstructorReturn'), require('@babel/runtime/helpers/getPrototypeOf'), require('@babel/runtime/helpers/defineProperty'), require('react'), require('react-redux'), require('lodash'), require('react-fontawesome'), require('@plusscommunities/pluss-core-web'), require('moment'), require('react-bootstrap'), require('react-router-dom'), require('react-router'), require('@babel/runtime/helpers/toConsumableArray'), require('jquery'), require('uuid'), require('@babel/runtime/helpers/asyncToGenerator'), require('@babel/runtime/helpers/slicedToArray'), require('@babel/runtime/regenerator'), require('@fortawesome/free-solid-svg-icons')) :
+  typeof define === 'function' && define.amd ? define(['exports', '@babel/runtime/helpers/classCallCheck', '@babel/runtime/helpers/createClass', '@babel/runtime/helpers/assertThisInitialized', '@babel/runtime/helpers/inherits', '@babel/runtime/helpers/possibleConstructorReturn', '@babel/runtime/helpers/getPrototypeOf', '@babel/runtime/helpers/defineProperty', 'react', 'react-redux', 'lodash', 'react-fontawesome', '@plusscommunities/pluss-core-web', 'moment', 'react-bootstrap', 'react-router-dom', 'react-router', '@babel/runtime/helpers/toConsumableArray', 'jquery', 'uuid', '@babel/runtime/helpers/asyncToGenerator', '@babel/runtime/helpers/slicedToArray', '@babel/runtime/regenerator', '@fortawesome/free-solid-svg-icons'], factory) :
+  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global['@plusscommunities/pluss-newsletter-web'] = {}, global._classCallCheck, global._createClass, global._assertThisInitialized, global._inherits, global._possibleConstructorReturn, global._getPrototypeOf, global._defineProperty, global.React, global.reactRedux, global._, global.FontAwesome, global.PlussCore, global.moment, global.reactBootstrap, global.reactRouterDom, global.reactRouter, global._toConsumableArray, global.$, global.uuid, global._asyncToGenerator, global._slicedToArray, global._regeneratorRuntime, global.freeSolidSvgIcons));
+}(this, (function (exports, _classCallCheck, _createClass, _assertThisInitialized, _inherits, _possibleConstructorReturn, _getPrototypeOf, _defineProperty, React, reactRedux, _, FontAwesome, PlussCore, moment, reactBootstrap, reactRouterDom, reactRouter, _toConsumableArray, $, uuid, _asyncToGenerator, _slicedToArray, _regeneratorRuntime, freeSolidSvgIcons) { 'use strict';
 
   function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -35,9 +35,9 @@
   var _defineProperty__default = /*#__PURE__*/_interopDefaultLegacy(_defineProperty);
   var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
   var ___default = /*#__PURE__*/_interopDefaultLegacy(_);
-  var moment__default = /*#__PURE__*/_interopDefaultLegacy(moment);
   var FontAwesome__default = /*#__PURE__*/_interopDefaultLegacy(FontAwesome);
   var PlussCore__namespace = /*#__PURE__*/_interopNamespace(PlussCore);
+  var moment__default = /*#__PURE__*/_interopDefaultLegacy(moment);
   var _toConsumableArray__default = /*#__PURE__*/_interopDefaultLegacy(_toConsumableArray);
   var $__default = /*#__PURE__*/_interopDefaultLegacy($);
   var _asyncToGenerator__default = /*#__PURE__*/_interopDefaultLegacy(_asyncToGenerator);
@@ -689,7 +689,7 @@
   var COLOUR_BRANDING_OFF = Colours.COLOUR_BRANDING_OFF;
   Colours.COLOUR_BRANDING_ACTION;
   var COLOUR_BRANDING_APP = Colours.COLOUR_BRANDING_APP;
-  Colours.TEXT_LIGHT;
+  var TEXT_LIGHT = Colours.TEXT_LIGHT;
   var hexToRGBAstring = Colours.hexToRGBAstring; // Misc
 
   var hideChat = Helper$1.hideChat;
@@ -700,6 +700,7 @@
   function _createSuper$g(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$g(); return function _createSuperInternal() { var Super = _getPrototypeOf__default['default'](Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf__default['default'](this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn__default['default'](this, result); }; }
 
   function _isNativeReflectConstruct$g() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+  var PAGE_SIZE = 100;
 
   var ListNewsletter$1 = /*#__PURE__*/function (_Component) {
     _inherits__default['default'](ListNewsletter, _Component);
@@ -719,12 +720,43 @@
 
       _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "state", {
         newsletterEntries: [],
-        sortColumn: 'DateUnix',
-        // column to sort by
-        sortDesc: false,
-        // if true, sort descending rather than ascending
+        // Date column sorts on the real UnixTimestamp; defaults to descending so newest posts appear first.
+        sortColumn: 'UnixTimestamp',
+        sortDesc: true,
         now: moment__default['default'].utc(),
-        onlyFuture: true
+        search: '',
+        startIndex: 0,
+        endIndex: PAGE_SIZE
+      });
+
+      _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "onSearchChange", function (e) {
+        _this.setState({
+          search: e.target.value,
+          startIndex: 0,
+          endIndex: PAGE_SIZE
+        });
+      });
+
+      _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "prevPage", function () {
+        if (_this.state.startIndex === 0) {
+          return;
+        }
+
+        _this.setState({
+          startIndex: _this.state.startIndex - PAGE_SIZE,
+          endIndex: Math.ceil(_this.state.endIndex / PAGE_SIZE) * PAGE_SIZE - PAGE_SIZE
+        });
+      });
+
+      _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "nextPage", function (filteredCount) {
+        if (_this.state.startIndex + PAGE_SIZE >= filteredCount) {
+          return;
+        }
+
+        _this.setState({
+          startIndex: _this.state.startIndex + PAGE_SIZE,
+          endIndex: Math.ceil(_this.state.endIndex / PAGE_SIZE) * PAGE_SIZE + PAGE_SIZE
+        });
       });
 
       return _this;
@@ -769,15 +801,24 @@
       value: function sortByCol(col) {
         if (this.state.sortColumn === col) {
           this.setState({
-            sortDesc: !this.state.sortDesc
+            sortDesc: !this.state.sortDesc,
+            startIndex: 0,
+            endIndex: PAGE_SIZE
           });
         } else {
           this.setState({
             sortColumn: col,
-            sortDesc: false
+            sortDesc: false,
+            startIndex: 0,
+            endIndex: PAGE_SIZE
           });
         }
       }
+    }, {
+      key: "getPaginationText",
+      value: function getPaginationText(filteredCount) {
+        return "".concat(Math.min(this.state.startIndex + 1, filteredCount), "-").concat(Math.min(this.state.endIndex, filteredCount), "/").concat(filteredCount);
+      }
     }, {
       key: "removeNewsletterEntry",
       value: function removeNewsletterEntry(newsletter) {
@@ -797,22 +838,6 @@
       value: function renderNewsletter(source) {
         var _this4 = this;
 
-        // let source = _.sortBy(this.state.newsletterEntries, this.state.sortColumn);
-        // if (this.state.sortDesc) {
-        //     source.reverse();
-        // }
-        // source = _.filter(source, (ev) => {
-        //     if (!ev) {
-        //         return false
-        //     }
-        //     return true;
-        // });
-        // if (this.props.onlyFuture) {
-        //     const nownow = moment().startOf('month');
-        //     source = _.filter(source, (ev) => {
-        //         return nownow.isSameOrBefore(moment.utc(ev.UnixTimestamp).local());
-        //     });
-        // }
         return source.map(function (ev) {
           if (ev != null) {
             return /*#__PURE__*/React__default['default'].createElement("tr", {
@@ -901,15 +926,15 @@
           condensed: true,
           hover: true
         }, /*#__PURE__*/React__default['default'].createElement("thead", null, /*#__PURE__*/React__default['default'].createElement("tr", null, /*#__PURE__*/React__default['default'].createElement("th", {
-          className: "".concat(this.sortIsActive('DateUnix')),
+          className: "".concat(this.sortIsActive('UnixTimestamp')),
           style: {
             cursor: 'pointer',
             width: 140
           },
           onClick: function onClick() {
-            _this5.sortByCol('DateUnix');
+            _this5.sortByCol('UnixTimestamp');
           }
-        }, "Date published", this.renderSort('DateUnix')), /*#__PURE__*/React__default['default'].createElement("th", {
+        }, "Date published", this.renderSort('UnixTimestamp')), /*#__PURE__*/React__default['default'].createElement("th", {
           className: "".concat(this.sortIsActive('Title')),
           style: {
             cursor: 'pointer'
@@ -947,9 +972,57 @@
           type: "h3"
         }, values.textThereAreNoNews)));
       }
+    }, {
+      key: "renderPager",
+      value: function renderPager(filteredCount) {
+        var _this6 = this;
+
+        if (filteredCount <= PAGE_SIZE) {
+          return null;
+        }
+
+        return /*#__PURE__*/React__default['default'].createElement("div", {
+          className: "paginationContainer",
+          style: {
+            margin: '8px 0'
+          }
+        }, /*#__PURE__*/React__default['default'].createElement(FontAwesome__default['default'], {
+          className: "pagination__left",
+          name: "chevron-left",
+          style: {
+            cursor: 'pointer',
+            fontSize: 20,
+            color: TEXT_LIGHT
+          },
+          onClick: this.prevPage
+        }), /*#__PURE__*/React__default['default'].createElement("p", {
+          className: "pagination__text",
+          style: {
+            display: 'inline-block',
+            margin: 0,
+            padding: '0 16px',
+            minWidth: 120,
+            textAlign: 'center',
+            color: TEXT_LIGHT
+          }
+        }, this.getPaginationText(filteredCount)), /*#__PURE__*/React__default['default'].createElement(FontAwesome__default['default'], {
+          className: "pagination__right",
+          name: "chevron-right",
+          style: {
+            cursor: 'pointer',
+            fontSize: 20,
+            color: TEXT_LIGHT
+          },
+          onClick: function onClick() {
+            return _this6.nextPage(filteredCount);
+          }
+        }));
+      }
     }, {
       key: "renderContent",
       value: function renderContent() {
+        var _this7 = this;
+
         var source = ___default['default'].sortBy(this.state.newsletterEntries, this.state.sortColumn);
 
         if (this.state.sortDesc) {
@@ -963,20 +1036,25 @@
 
           return true;
         });
+        var search = this.state.search;
 
-        if (this.props.onlyFuture) {
-          var nownow = moment__default['default']().startOf('month');
+        if (!___default['default'].isEmpty(search)) {
+          var lowSearch = search.toLowerCase();
           source = ___default['default'].filter(source, function (ev) {
-            return nownow.isSameOrBefore(moment__default['default'].utc(ev.UnixTimestamp).local());
-          });
-        } // source = []
+            if (!ev.Title) {
+              return false;
+            }
 
+            return ev.Title.toLowerCase().indexOf(lowSearch) > -1;
+          });
+        } // Total matching the search/sort BEFORE the page slice — drives the pager text.
 
-        if (___default['default'].isEmpty(source)) {
-          return this.renderEmpty();
-        }
 
-        return this.renderView(source);
+        var filteredCount = source.length;
+        source = ___default['default'].filter(source, function (ev, i) {
+          return i >= _this7.state.startIndex && i < _this7.state.endIndex;
+        });
+        return /*#__PURE__*/React__default['default'].createElement("div", null, ___default['default'].isEmpty(source) ? this.renderEmpty() : this.renderView(source), this.renderPager(filteredCount));
       }
     }, {
       key: "render",
@@ -985,7 +1063,16 @@
           style: {
             minWidth: '100%'
           }
-        }, this.renderContent());
+        }, /*#__PURE__*/React__default['default'].createElement(reactBootstrap.FormControl, {
+          type: "text",
+          placeholder: "Search news",
+          value: this.state.search,
+          onChange: this.onSearchChange,
+          style: {
+            marginBottom: 16,
+            maxWidth: 360
+          }
+        }), this.renderContent());
       }
     }]);
 
@@ -1966,9 +2053,6 @@
         loadingSubmissions: false,
         submissionEntries: [],
         allList: [],
-        thisMonth: [],
-        now: moment__default['default'].utc(),
-        onlyFuture: true,
         search: ''
       };
       return _this;
@@ -1993,18 +2077,8 @@
     }, {
       key: "updateProps",
       value: function updateProps(props) {
-        var thisMonth = [];
-        var nownow = moment__default['default']().startOf('month');
-        props.news.forEach(function (rep) {
-          var isThisMonth = nownow.isSameOrBefore(moment__default['default'].utc(rep.UnixTimestamp).local());
-
-          if (isThisMonth) {
-            thisMonth.push(rep);
-          }
-        });
         this.setState({
           allList: props.news,
-          thisMonth: thisMonth,
           submissionEntries: props.submissions
         });
       }
@@ -2208,9 +2282,7 @@
           return /*#__PURE__*/React__default['default'].createElement(AvailableNews, null);
         }
 
-        return /*#__PURE__*/React__default['default'].createElement(ListNewsletterEntries, {
-          onlyFuture: this.state.selectedSection === 'thisMonth'
-        });
+        return /*#__PURE__*/React__default['default'].createElement(ListNewsletterEntries, null);
       }
     }, {
       key: "render",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@plusscommunities/pluss-newsletter-web-sharing",
-	"version": "1.4.37",
+	"version": "1.4.38",
 	"description": "Extension package to enable newsletter on Pluss Communities Platform",
 	"main": "dist/index.cjs.js",
 	"scripts": {

package/src/screens/Newsletter/ListNewsletterEntries.js

@@ -1,5 +1,5 @@
 import React, { Component } from 'react';
-import { Table } from 'react-bootstrap';
+import { Table, FormControl } from 'react-bootstrap';
 import { connect } from 'react-redux';
 import moment from 'moment';
 import _ from 'lodash';
@@ -9,15 +9,21 @@ import { newsLoaded, removeNews } from '../../actions';
 import { newsletterActions } from '../../webapi';
 import { checkLoggedIn, validateAccess } from '../../session';
 import { Text } from '../../components/text';
+import { TEXT_LIGHT } from '../../js';
 import { values } from '../../values.config';
 
+const PAGE_SIZE = 100;
+
 class ListNewsletter extends Component {
   state = {
     newsletterEntries: [],
-    sortColumn: 'DateUnix', // column to sort by
-    sortDesc: false, // if true, sort descending rather than ascending
+    // Date column sorts on the real UnixTimestamp; defaults to descending so newest posts appear first.
+    sortColumn: 'UnixTimestamp',
+    sortDesc: true,
     now: moment.utc(),
-    onlyFuture: true,
+    search: '',
+    startIndex: 0,
+    endIndex: PAGE_SIZE,
   };
 
   UNSAFE_componentWillMount() {
@@ -51,15 +57,51 @@ class ListNewsletter extends Component {
     if (this.state.sortColumn === col) {
       this.setState({
         sortDesc: !this.state.sortDesc,
+        startIndex: 0,
+        endIndex: PAGE_SIZE,
       });
     } else {
       this.setState({
         sortColumn: col,
         sortDesc: false,
+        startIndex: 0,
+        endIndex: PAGE_SIZE,
       });
     }
   }
 
+  onSearchChange = (e) => {
+    this.setState({
+      search: e.target.value,
+      startIndex: 0,
+      endIndex: PAGE_SIZE,
+    });
+  };
+
+  prevPage = () => {
+    if (this.state.startIndex === 0) {
+      return;
+    }
+    this.setState({
+      startIndex: this.state.startIndex - PAGE_SIZE,
+      endIndex: Math.ceil(this.state.endIndex / PAGE_SIZE) * PAGE_SIZE - PAGE_SIZE,
+    });
+  };
+
+  nextPage = (filteredCount) => {
+    if (this.state.startIndex + PAGE_SIZE >= filteredCount) {
+      return;
+    }
+    this.setState({
+      startIndex: this.state.startIndex + PAGE_SIZE,
+      endIndex: Math.ceil(this.state.endIndex / PAGE_SIZE) * PAGE_SIZE + PAGE_SIZE,
+    });
+  };
+
+  getPaginationText(filteredCount) {
+    return `${Math.min(this.state.startIndex + 1, filteredCount)}-${Math.min(this.state.endIndex, filteredCount)}/${filteredCount}`;
+  }
+
   removeNewsletterEntry(newsletter) {
     if (window.confirm(values.textAreYouSureYouWantToDelete)) {
       this.props.removeNews(newsletter.RowId);
@@ -75,24 +117,6 @@ class ListNewsletter extends Component {
   }
 
   renderNewsletter(source) {
-    // let source = _.sortBy(this.state.newsletterEntries, this.state.sortColumn);
-    // if (this.state.sortDesc) {
-    //     source.reverse();
-    // }
-    // source = _.filter(source, (ev) => {
-    //     if (!ev) {
-    //         return false
-    //     }
-    //     return true;
-    // });
-
-    // if (this.props.onlyFuture) {
-    //     const nownow = moment().startOf('month');
-    //     source = _.filter(source, (ev) => {
-    //         return nownow.isSameOrBefore(moment.utc(ev.UnixTimestamp).local());
-    //     });
-    // }
-
     return source.map((ev) => {
       if (ev != null) {
         return (
@@ -157,13 +181,13 @@ class ListNewsletter extends Component {
         <thead>
           <tr>
             <th
-              className={`${this.sortIsActive('DateUnix')}`}
+              className={`${this.sortIsActive('UnixTimestamp')}`}
               style={{ cursor: 'pointer', width: 140 }}
               onClick={() => {
-                this.sortByCol('DateUnix');
+                this.sortByCol('UnixTimestamp');
               }}
             >
-              Date published{this.renderSort('DateUnix')}
+              Date published{this.renderSort('UnixTimestamp')}
             </th>
             <th
               className={`${this.sortIsActive('Title')}`}
@@ -193,6 +217,34 @@ class ListNewsletter extends Component {
     );
   }
 
+  renderPager(filteredCount) {
+    if (filteredCount <= PAGE_SIZE) {
+      return null;
+    }
+    return (
+      <div className="paginationContainer" style={{ margin: '8px 0' }}>
+        <FontAwesome
+          className="pagination__left"
+          name="chevron-left"
+          style={{ cursor: 'pointer', fontSize: 20, color: TEXT_LIGHT }}
+          onClick={this.prevPage}
+        />
+        <p
+          className="pagination__text"
+          style={{ display: 'inline-block', margin: 0, padding: '0 16px', minWidth: 120, textAlign: 'center', color: TEXT_LIGHT }}
+        >
+          {this.getPaginationText(filteredCount)}
+        </p>
+        <FontAwesome
+          className="pagination__right"
+          name="chevron-right"
+          style={{ cursor: 'pointer', fontSize: 20, color: TEXT_LIGHT }}
+          onClick={() => this.nextPage(filteredCount)}
+        />
+      </div>
+    );
+  }
+
   renderContent() {
     let source = _.sortBy(this.state.newsletterEntries, this.state.sortColumn);
     if (this.state.sortDesc) {
@@ -205,21 +257,45 @@ class ListNewsletter extends Component {
       return true;
     });
 
-    if (this.props.onlyFuture) {
-      const nownow = moment().startOf('month');
+    const { search } = this.state;
+    if (!_.isEmpty(search)) {
+      const lowSearch = search.toLowerCase();
       source = _.filter(source, (ev) => {
-        return nownow.isSameOrBefore(moment.utc(ev.UnixTimestamp).local());
+        if (!ev.Title) {
+          return false;
+        }
+        return ev.Title.toLowerCase().indexOf(lowSearch) > -1;
       });
     }
-    // source = []
-    if (_.isEmpty(source)) {
-      return this.renderEmpty();
-    }
-    return this.renderView(source);
+
+    // Total matching the search/sort BEFORE the page slice — drives the pager text.
+    const filteredCount = source.length;
+
+    source = _.filter(source, (ev, i) => {
+      return i >= this.state.startIndex && i < this.state.endIndex;
+    });
+
+    return (
+      <div>
+        {_.isEmpty(source) ? this.renderEmpty() : this.renderView(source)}
+        {this.renderPager(filteredCount)}
+      </div>
+    );
   }
 
   render() {
-    return <div style={{ minWidth: '100%' }}>{this.renderContent()}</div>;
+    return (
+      <div style={{ minWidth: '100%' }}>
+        <FormControl
+          type="text"
+          placeholder="Search news"
+          value={this.state.search}
+          onChange={this.onSearchChange}
+          style={{ marginBottom: 16, maxWidth: 360 }}
+        />
+        {this.renderContent()}
+      </div>
+    );
   }
 }
 

package/src/screens/Newsletter/NewsHub.js

@@ -1,7 +1,6 @@
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import _ from 'lodash';
-import moment from 'moment';
 import FontAwesome from 'react-fontawesome';
 import { Header, AddButton, HubSidebar } from '../../components';
 import { isTheBest, validateAccess } from '../../session';
@@ -37,9 +36,6 @@ class NewsHub extends Component {
       submissionEntries: [],
 
       allList: [],
-      thisMonth: [],
-      now: moment.utc(),
-      onlyFuture: true,
       search: '',
     };
   }
@@ -58,19 +54,8 @@ class NewsHub extends Component {
   }
 
   updateProps(props) {
-    const thisMonth = [];
-    const nownow = moment().startOf('month');
-
-    props.news.forEach((rep) => {
-      const isThisMonth = nownow.isSameOrBefore(moment.utc(rep.UnixTimestamp).local());
-      if (isThisMonth) {
-        thisMonth.push(rep);
-      }
-    });
-
     this.setState({
       allList: props.news,
-      thisMonth,
       submissionEntries: props.submissions,
     });
   }
@@ -240,7 +225,7 @@ class NewsHub extends Component {
     if (this.state.selectedSection === 'available') {
       return <AvailableNews />;
     }
-    return <ListNewsletterEntries onlyFuture={this.state.selectedSection === 'thisMonth'} />;
+    return <ListNewsletterEntries />;
   }
 
   render() {