@plusscommunities/pluss-circles-web-groups 1.5.6 → 1.5.7-beta.1

package/dist/index.cjs.js

@@ -376,6 +376,35 @@ var circleActions = {
     }
 
     return deleteMessage;
+  }(),
+  markAsRead: function () {
+    var _markAsRead = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee4(circleId, userId) {
+      return _regeneratorRuntime__default['default'].wrap(function _callee4$(_context4) {
+        while (1) {
+          switch (_context4.prev = _context4.next) {
+            case 0:
+              return _context4.abrupt("return", Session$4.authedFunction({
+                method: 'post',
+                url: Helper$3.getUrl('notifications', 'resetunread'),
+                data: {
+                  groupID: circleId,
+                  userID: userId
+                }
+              }));
+
+            case 1:
+            case "end":
+              return _context4.stop();
+          }
+        }
+      }, _callee4);
+    }));
+
+    function markAsRead(_x9, _x10) {
+      return _markAsRead.apply(this, arguments);
+    }
+
+    return markAsRead;
   }()
 };
 
@@ -418,7 +447,7 @@ var Circles = /*#__PURE__*/function (_Component) {
 
               case 3:
                 res = _context.sent;
-                console.log('getData', res.data);
+                console.log("getData", res.data);
 
                 _this.props.circlesLoaded(res.data);
 
@@ -432,7 +461,7 @@ var Circles = /*#__PURE__*/function (_Component) {
               case 9:
                 _context.prev = 9;
                 _context.t0 = _context["catch"](0);
-                console.error('getData', _context.t0);
+                console.error("getData", _context.t0);
 
                 _this.setState({
                   loadingAll: false
@@ -447,6 +476,12 @@ var Circles = /*#__PURE__*/function (_Component) {
       })));
     });
 
+    _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "selectUnreadFilter", function (showUnreadOnly) {
+      _this.setState({
+        showUnreadOnly: showUnreadOnly
+      });
+    });
+
     _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "canAddNew", function () {
       var auth = _this.props.auth;
       return Session$3.validateAccess(auth.site, values.permission, auth);
@@ -514,9 +549,15 @@ var Circles = /*#__PURE__*/function (_Component) {
       });
     });
 
+    _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "selectSort", function (sortType) {
+      _this.setState({
+        sortBy: sortType
+      });
+    });
+
     _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "onHandleChange", function (event) {
       var stateChange = {};
-      stateChange[event.target.getAttribute('id')] = event.target.value;
+      stateChange[event.target.getAttribute("id")] = event.target.value;
 
       _this.setState(stateChange);
     });
@@ -528,14 +569,14 @@ var Circles = /*#__PURE__*/function (_Component) {
         circleActions.delete(circle.Id).then(function (res) {
           _this.getData();
         }).catch(function (res) {
-          alert('Something went wrong with the request. Please try again.');
+          alert("Something went wrong with the request. Please try again.");
         });
       }
     });
 
     _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "getTypeFilterText", function (type) {
-      if (type === 'private') {
-        return 'Private Message';
+      if (type === "private") {
+        return "Private Message";
       }
 
       return ___default['default'].capitalize(values.entityName);
@@ -545,14 +586,17 @@ var Circles = /*#__PURE__*/function (_Component) {
       if (circle.IsPrivate) {
         return "PM: ".concat(circle.Audience.map(function (user) {
           return user.displayName;
-        }).join(', '));
+        }).join(", "));
       }
 
       return circle.Title;
     });
 
     _this.state = {
-      userSearch: ''
+      userSearch: "",
+      sortBy: "newest",
+      showUnreadOnly: false,
+      pollingInterval: null
     };
     return _this;
   }
@@ -560,27 +604,77 @@ var Circles = /*#__PURE__*/function (_Component) {
   _createClass__default['default'](Circles, [{
     key: "componentDidMount",
     value: function componentDidMount() {
-      this.getData();
+      var _this2 = this;
+
+      this.getData(); // Poll for updates every 10 seconds
+
+      this.pollingInterval = setInterval(function () {
+        _this2.getData();
+      }, 10000);
+    }
+  }, {
+    key: "componentWillUnmount",
+    value: function componentWillUnmount() {
+      if (this.pollingInterval) {
+        clearInterval(this.pollingInterval);
+      }
+    }
+  }, {
+    key: "isCircleUnread",
+    value: function isCircleUnread(circle) {
+      var userId = this.props.user.Id;
+
+      if (!circle.Unread || !circle.Unread[userId]) {
+        return false;
+      }
+
+      return circle.Unread[userId] > 0;
+    }
+  }, {
+    key: "getUnreadCount",
+    value: function getUnreadCount(circle) {
+      var userId = this.props.user.Id;
+
+      if (!circle.Unread || !circle.Unread[userId]) {
+        return 0;
+      }
+
+      return circle.Unread[userId];
     }
   }, {
     key: "getCircles",
     value: function getCircles() {
-      var _this2 = this;
+      var _this3 = this;
 
       var result = this.props.circles;
 
       if (this.state.selectedTypeFilter) {
         result = ___default['default'].filter(result, function (circle) {
-          return _this2.state.selectedTypeFilter === 'circle' ? !circle.IsPrivate : circle.IsPrivate;
+          return _this3.state.selectedTypeFilter === "circle" ? !circle.IsPrivate : circle.IsPrivate;
         });
       }
 
       if (this.state.selectedUserFilter) {
         result = ___default['default'].filter(result, function (circle) {
           return ___default['default'].some(circle.Audience, function (user) {
-            return user.userId === _this2.state.selectedUserFilter.userId;
+            return user.userId === _this3.state.selectedUserFilter.userId;
           });
         });
+      } // Apply sorting
+
+
+      result = ___default['default'].sortBy(result, function (circle) {
+        return moment__default['default'](circle.Changed).valueOf();
+      });
+
+      if (this.state.sortBy === "newest") {
+        result.reverse();
+
+        if (this.state.showUnreadOnly) {
+          result = ___default['default'].filter(result, function (circle) {
+            return _this3.isCircleUnread(circle);
+          });
+        }
       }
 
       return result;
@@ -588,7 +682,7 @@ var Circles = /*#__PURE__*/function (_Component) {
   }, {
     key: "getUsers",
     value: function getUsers() {
-      var _this3 = this;
+      var _this4 = this;
 
       var users = [];
       this.props.circles.forEach(function (circle) {
@@ -598,10 +692,10 @@ var Circles = /*#__PURE__*/function (_Component) {
       });
       users = ___default['default'].sortBy(___default['default'].uniqBy(users, function (user) {
         return user.userId;
-      }), 'displayName');
+      }), "displayName");
       return ___default['default'].filter(users, function (u) {
-        if (!___default['default'].isEmpty(_this3.state.userSearch)) {
-          return (u.displayName || '').toLowerCase().indexOf(_this3.state.userSearch.toLowerCase()) > -1;
+        if (!___default['default'].isEmpty(_this4.state.userSearch)) {
+          return (u.displayName || "").toLowerCase().indexOf(_this4.state.userSearch.toLowerCase()) > -1;
         }
 
         return true;
@@ -610,7 +704,7 @@ var Circles = /*#__PURE__*/function (_Component) {
   }, {
     key: "validateCircleAdmin",
     value: function validateCircleAdmin(circle, onlyCreator) {
-      var _this4 = this;
+      var _this5 = this;
 
       if (Session$3.validateAccess(this.props.auth.site, values.permission, this.props.auth)) {
         return true;
@@ -621,13 +715,13 @@ var Circles = /*#__PURE__*/function (_Component) {
       }
 
       return ___default['default'].some(circle.Audience, function (user) {
-        return user.userId === _this4.props.user.Id && user.isAdmin;
+        return user.userId === _this5.props.user.Id && user.isAdmin;
       });
     }
   }, {
     key: "renderRow",
     value: function renderRow(circle) {
-      var _this5 = this;
+      var _this6 = this;
 
       return /*#__PURE__*/React__default['default'].createElement("tr", {
         key: circle.Id
@@ -635,7 +729,7 @@ var Circles = /*#__PURE__*/function (_Component) {
         className: "table-TitleColumn"
       }, /*#__PURE__*/React__default['default'].createElement(reactRouterDom.Link, {
         to: "/".concat(values.featureKey, "/").concat(values.entityKey, "/").concat(circle.Id)
-      }, this.getTitle(circle))), /*#__PURE__*/React__default['default'].createElement("td", null, moment__default['default'](circle.Changed).local().format('D MMM YYYY')), /*#__PURE__*/React__default['default'].createElement("td", null, circle.Audience.map(function (user) {
+      }, this.getTitle(circle))), /*#__PURE__*/React__default['default'].createElement("td", null, moment__default['default'](circle.Changed).local().format("D MMM YYYY")), /*#__PURE__*/React__default['default'].createElement("td", null, circle.Audience.map(function (user) {
         return /*#__PURE__*/React__default['default'].createElement(Components$4.ProfilePic, {
           size: 30,
           image: user.profilePic,
@@ -646,8 +740,8 @@ var Circles = /*#__PURE__*/function (_Component) {
         className: "table-options"
       }, /*#__PURE__*/React__default['default'].createElement("div", {
         style: {
-          display: 'flex',
-          alignItems: 'center'
+          display: "flex",
+          alignItems: "center"
         }
       }, this.validateCircleAdmin(circle) && !circle.IsPrivate && /*#__PURE__*/React__default['default'].createElement(reactRouterDom.Link, {
         to: "/".concat(values.featureKey, "/edit/").concat(circle.Id)
@@ -656,19 +750,19 @@ var Circles = /*#__PURE__*/function (_Component) {
           fontSize: 20,
           padding: 5,
           marginLeft: 12,
-          cursor: 'pointer'
+          cursor: "pointer"
         },
         name: "pencil"
       })), this.validateCircleAdmin(circle, true) && !circle.IsPrivate && /*#__PURE__*/React__default['default'].createElement("a", {
         onClick: function onClick() {
-          _this5.removeCircle(circle);
+          _this6.removeCircle(circle);
         }
       }, /*#__PURE__*/React__default['default'].createElement(FontAwesome__default['default'], {
         style: {
           fontSize: 20,
           padding: 5,
           marginLeft: 12,
-          cursor: 'pointer'
+          cursor: "pointer"
         },
         name: "minus-circle"
       })))));
@@ -676,11 +770,21 @@ var Circles = /*#__PURE__*/function (_Component) {
   }, {
     key: "renderFilters",
     value: function renderFilters() {
+      var _this7 = this;
+
       var userFilter = /*#__PURE__*/React__default['default'].createElement(Components$4.Tag, {
         className: "marginRight-10",
         onClick: this.openUserFilter,
         text: "User"
       });
+      var unreadFilter = /*#__PURE__*/React__default['default'].createElement(Components$4.Tag, {
+        className: "marginRight-10",
+        onClick: function onClick() {
+          return _this7.selectUnreadFilter(!_this7.state.showUnreadOnly);
+        },
+        leftIcon: this.state.showUnreadOnly ? "check" : null,
+        text: "Unread Only"
+      });
       var typeFilter = /*#__PURE__*/React__default['default'].createElement(Components$4.Tag, {
         className: "marginRight-10",
         onClick: this.openTypeFilter,
@@ -715,12 +819,28 @@ var Circles = /*#__PURE__*/function (_Component) {
       }, /*#__PURE__*/React__default['default'].createElement(Components$4.Text, {
         type: "h5",
         className: "marginRight-20"
-      }, "Filter by"), userFilter, typeFilter);
+      }, "Filter by"), userFilter, unreadFilter, typeFilter, /*#__PURE__*/React__default['default'].createElement(Components$4.Text, {
+        type: "h5",
+        className: "marginRight-20 marginLeft-20"
+      }, "Sort by:"), /*#__PURE__*/React__default['default'].createElement(Components$4.Tag, {
+        className: "marginRight-10",
+        onClick: function onClick() {
+          return _this7.selectSort("newest");
+        },
+        leftIcon: this.state.sortBy === "newest" ? "check" : null,
+        text: "Newest first"
+      }), /*#__PURE__*/React__default['default'].createElement(Components$4.Tag, {
+        onClick: function onClick() {
+          return _this7.selectSort("oldest");
+        },
+        leftIcon: this.state.sortBy === "oldest" ? "check" : null,
+        text: "Oldest first"
+      }));
     }
   }, {
     key: "renderUserFilterPopup",
     value: function renderUserFilterPopup() {
-      var _this6 = this;
+      var _this8 = this;
 
       if (!this.state.userFilterOpen) {
         return null;
@@ -740,7 +860,7 @@ var Circles = /*#__PURE__*/function (_Component) {
         placeholder: "Enter name",
         value: this.state.userSearch,
         onChange: function onChange(e) {
-          return _this6.onHandleChange(e);
+          return _this8.onHandleChange(e);
         },
         alwaysShowLabel: true
       }), this.getUsers().map(function (user) {
@@ -748,7 +868,7 @@ var Circles = /*#__PURE__*/function (_Component) {
           key: user.userId,
           user: user,
           onClick: function onClick() {
-            _this6.selectUserFilter(user);
+            _this8.selectUserFilter(user);
           }
         });
       }));
@@ -756,7 +876,7 @@ var Circles = /*#__PURE__*/function (_Component) {
   }, {
     key: "renderTypeFilterPopup",
     value: function renderTypeFilterPopup() {
-      var _this7 = this;
+      var _this9 = this;
 
       if (!this.state.typeFilterOpen) {
         return null;
@@ -770,13 +890,13 @@ var Circles = /*#__PURE__*/function (_Component) {
         onClose: this.closeTypeFilter
       }, /*#__PURE__*/React__default['default'].createElement(Components$4.Tag, {
         onClick: function onClick() {
-          _this7.selectTypeFilter('circle');
+          _this9.selectTypeFilter("circle");
         },
         text: ___default['default'].capitalize(values.entityName),
         className: "marginRight-10"
       }), /*#__PURE__*/React__default['default'].createElement(Components$4.Tag, {
         onClick: function onClick() {
-          _this7.selectTypeFilter('private');
+          _this9.selectTypeFilter("private");
         },
         text: "Private Message"
       }));
@@ -784,7 +904,7 @@ var Circles = /*#__PURE__*/function (_Component) {
   }, {
     key: "render",
     value: function render() {
-      var _this8 = this;
+      var _this10 = this;
 
       return /*#__PURE__*/React__default['default'].createElement("div", null, this.renderTypeFilterPopup(), this.renderUserFilterPopup(), /*#__PURE__*/React__default['default'].createElement(Components$4.Header, null, this.canAddNew() && /*#__PURE__*/React__default['default'].createElement(Components$4.AddButton, {
         onClick: this.onAddNew,
@@ -801,14 +921,14 @@ var Circles = /*#__PURE__*/function (_Component) {
         condensed: true,
         hover: true,
         style: {
-          minWidth: '100%'
+          minWidth: "100%"
         }
       }, /*#__PURE__*/React__default['default'].createElement("thead", null, /*#__PURE__*/React__default['default'].createElement("tr", null, /*#__PURE__*/React__default['default'].createElement("th", null, "Title"), /*#__PURE__*/React__default['default'].createElement("th", null, "Last updated"), /*#__PURE__*/React__default['default'].createElement("th", null, "Members"), /*#__PURE__*/React__default['default'].createElement("th", {
         style: {
           width: 50
         }
       }))), /*#__PURE__*/React__default['default'].createElement("tbody", null, this.getCircles().map(function (circle) {
-        return _this8.renderRow(circle);
+        return _this10.renderRow(circle);
       })))));
     }
   }]);
@@ -1772,6 +1892,32 @@ var Circle = /*#__PURE__*/function (_Component) {
       });
     });
 
+    _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "markCircleAsRead", /*#__PURE__*/_asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee5() {
+      return _regeneratorRuntime__default['default'].wrap(function _callee5$(_context5) {
+        while (1) {
+          switch (_context5.prev = _context5.next) {
+            case 0:
+              _context5.prev = 0;
+              _context5.next = 3;
+              return circleActions.markAsRead(_this.state.circleId, _this.props.user.Id);
+
+            case 3:
+              _context5.next = 8;
+              break;
+
+            case 5:
+              _context5.prev = 5;
+              _context5.t0 = _context5["catch"](0);
+              console.error("Failed to mark circle as read:", _context5.t0);
+
+            case 8:
+            case "end":
+              return _context5.stop();
+          }
+        }
+      }, _callee5, null, [[0, 5]]);
+    })));
+
     _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "sendMessage", function () {
       var message = {
         _id: Helper.randomString(),
@@ -1856,6 +2002,7 @@ var Circle = /*#__PURE__*/function (_Component) {
   _createClass__default['default'](Circle, [{
     key: "componentDidMount",
     value: function componentDidMount() {
+      this.markCircleAsRead();
       this.checkGetData();
       this.connect();
       this.props.setNavData({
@@ -1992,8 +2139,8 @@ var Circle = /*#__PURE__*/function (_Component) {
           display: this.state.imageInputShowing ? "block" : "none"
         }
       }, /*#__PURE__*/React__default['default'].createElement(Components$2.ImageInput, {
-        ref: function ref(_ref5) {
-          _this5.imageInput = _ref5;
+        ref: function ref(_ref6) {
+          _this5.imageInput = _ref6;
         },
         multiple: true,
         limit: 10,
@@ -2007,8 +2154,8 @@ var Circle = /*#__PURE__*/function (_Component) {
           display: this.state.fileInputShowing ? "block" : "none"
         }
       }, /*#__PURE__*/React__default['default'].createElement(Components$2.FileInput, {
-        ref: function ref(_ref6) {
-          _this5.fileInput = _ref6;
+        ref: function ref(_ref7) {
+          _this5.fileInput = _ref7;
         },
         multiple: true,
         limit: 10,
@@ -2302,8 +2449,8 @@ var Circle = /*#__PURE__*/function (_Component) {
       }, /*#__PURE__*/React__default['default'].createElement("div", {
         className: "chat_newMessage"
       }, this.renderChatInput()), this.renderReplyTo(), /*#__PURE__*/React__default['default'].createElement("div", {
-        ref: function ref(_ref7) {
-          return _this8.chat = _ref7;
+        ref: function ref(_ref8) {
+          return _this8.chat = _ref8;
         },
         className: "chat_messages"
       }, ___default['default'].isEmpty(this.state.messages) && !___default['default'].isEmpty(this.state.messageDate) && this.renderEmptyDate(), this.state.messages.map(function (m) {