fix(settings): missing values when moving to react

polonel · polonel · commit 24993c99e95a · 2022-07-11T17:12:39.000-04:00
diff --git a/src/client/containers/Settings/General/index.jsx b/src/client/containers/Settings/General/index.jsx
@@ -109,7 +109,7 @@ class GeneralSettings extends React.Component {
           title='Site Url'
           subtitle={
             <div>
-              Publicly accessible URL of this site. <i>ex: {this.props.viewdata.hosturl}</i>
+              Publicly accessible URL of this site. <i>ex: {this.props.viewdata.get('hosturl')}</i>
             </div>
           }
           component={SiteUrl}
@@ -186,7 +186,7 @@ GeneralSettings.propTypes = {
 }
 
 const mapStateToProps = state => ({
-  viewdata: state.common,
+  viewdata: state.common.viewdata,
   settings: state.settings.settings
 })
 
diff --git a/src/client/containers/Settings/Tickets/index.jsx b/src/client/containers/Settings/Tickets/index.jsx
@@ -242,7 +242,7 @@ class TicketsSettings extends React.Component {
           subtitle={
             <div>
               Allow the creation of tickets by users that are unregistered. (
-              <a href={viewdata.hosturl + '/newissue'}>{viewdata.hosturl + '/newissue'}</a>)
+              <a href={viewdata.get('hosturl') + '/newissue'}>{viewdata.get('hosturl') + '/newissue'}</a>)
             </div>
           }
           component={
@@ -514,7 +514,7 @@ TicketsSettings.propTypes = {
 }
 
 const mapStateToProps = state => ({
-  viewdata: state.common,
+  viewdata: state.common.viewdata,
   settings: state.settings.settings,
   tagsSettings: state.tagsSettings
 })
diff --git a/src/client/containers/Topbar/conversationsDropdown.jsx b/src/client/containers/Topbar/conversationsDropdown.jsx
@@ -44,6 +44,7 @@ class ConversationsDropdownPartial extends React.Component {
   }
 
   onUpdateConversationsNotifications (data) {
+    helpers.setupScrollers()
     if (!helpers.arrayIsEqual(this.conversations, data.conversations)) this.conversations = data.conversations
   }
 
@@ -72,8 +73,20 @@ class ConversationsDropdownPartial extends React.Component {
             Start Conversation
           </a>
         }
+        footerComponent={
+          <div className={'uk-text-center' + (this.conversations.length < 1 ? ' hide' : '')}>
+            <a
+              className={'no-ajaxy hoverUnderline'}
+              onClick={() => {
+                History.pushState(null, null, '/messages')
+              }}
+            >
+              View All Conversations
+            </a>
+          </div>
+        }
       >
-        <div className={'items close-on-click'}>
+        <div className={'items scrollable close-on-click'}>
           <ul>
             {this.conversations.map(conversation => {
               const profilePic = conversation.partner.image || 'defaultProfile.jpg'
diff --git a/src/models/user.js b/src/models/user.js
@@ -45,7 +45,6 @@ const COLLECTION = 'accounts'
  * @property {String} tOTPKey One Time Password Secret Key
  * @property {Number} tOTPPeriod One Time Password Key Length (Time) - Default 30 Seconds
  * @property {String} accessToken API Access Token
- * @property {Array} iOSDeviceTokens Array of String based device Ids for Apple iOS devices. *push notifications*
  * @property {Object} preferences Object to hold user preferences
  * @property {Boolean} preferences.autoRefreshTicketGrid Enable the auto refresh of the ticket grid.
  * @property {Boolean} deleted Account Deleted
@@ -190,38 +189,6 @@ userSchema.methods.removeL2Auth = function (callback) {
   })
 }
 
-userSchema.methods.addDeviceToken = function (token, type, callback) {
-  if (_.isUndefined(token)) return callback('Invalid token')
-  var user = this
-  // type 1 = iOS
-  // type 2 = Android
-  if (type === 1) {
-    if (hasDeviceToken(user, token, type)) return callback(null, token)
-
-    user.iOSDeviceTokens.push(token)
-    user.save(function (err) {
-      if (err) return callback(err, null)
-
-      callback(null, token)
-    })
-  }
-}
-
-userSchema.methods.removeDeviceToken = function (token, type, callback) {
-  var user = this
-  if (type === 1) {
-    if (!hasDeviceToken(user, token, type)) return callback()
-
-    winston.debug('Removing Device: ' + token)
-    user.iOSDeviceTokens.splice(_.indexOf(this.iOSDeviceTokens, token), 1)
-    user.save(function (err, u) {
-      if (err) return callback(err, null)
-
-      return callback(null, u.iOSDeviceTokens)
-    })
-  }
-}
-
 userSchema.methods.addOpenChatWindow = function (convoId, callback) {
   if (convoId === undefined) {
     if (!_.isFunction(callback)) return false
@@ -731,35 +698,4 @@ userSchema.statics.getAdmins = function (obj, callback) {
     })
 }
 
-/**
- * Checks if a user has device token already
- *
- * @memberof User
- * @instance
- * @method hasDeviceToken
- *
- * @param {User} user User to check against
- * @param {String} token token to check for in given user
- * @param {Number} type Type of Device token to check.
- * @return {Boolean}
- * @example
- * type:
- *   1: iOS
- *   2: Android
- *   3: Windows
- */
-function hasDeviceToken (user, token, type) {
-  if (type === 1) {
-    var matches = _.filter(user.iOSDeviceTokens, function (value) {
-      if (value === token) {
-        return value
-      }
-    })
-
-    return matches.length > 0
-  }
-
-  return false
-}
-
 module.exports = mongoose.model(COLLECTION, userSchema)
diff --git a/src/socketio/chatSocket.js b/src/socketio/chatSocket.js
@@ -192,15 +192,16 @@ async function updateConversationsNotifications (socket) {
     const Message = require('../models/chat/message')
     const Conversation = require('../models/chat/conversation')
 
-    Conversation.getConversationsWithLimit(user._id, 10, (err, conversation) => {
+    Conversation.getConversationsWithLimit(user._id, null, (err, conversations) => {
       if (err) {
         winston.warn(err.message)
         return false
       }
 
       const convos = []
+
       async.eachSeries(
-        conversation,
+        conversations,
         (convo, done) => {
           const c = convo.toObject()
 
@@ -239,8 +240,9 @@ async function updateConversationsNotifications (socket) {
         },
         err => {
           if (err) return false
+
           return utils.sendToSelf(socket, socketEventConst.MESSAGES_UPDATE_UI_CONVERSATION_NOTIFICATIONS, {
-            conversations: convos
+            conversations: convos.length >= 10 ? convos.slice(0, 9) : convos
           })
         }
       )
