issue #1985 - small fixes

Author: maxceem

src/projects/detail/containers/DashboardContainer.jsx

@@ -12,6 +12,7 @@ import {
   filterReadNotifications,
   filterNotificationsByProjectId,
   filterProjectNotifications,
+  preRenderNotifications,
 } from '../../../routes/notifications/helpers/notifications'
 import { toggleNotificationRead, toggleBundledNotificationRead } from '../../../routes/notifications/actions'
 import {
@@ -111,7 +112,7 @@ class DashboardContainer extends React.Component {
     } = this.props
 
     // system notifications
-    const notReadNotifications = filterReadNotifications(notifications.notifications)
+    const notReadNotifications = filterReadNotifications(notifications)
     const unreadProjectUpdate = filterProjectNotifications(filterNotificationsByProjectId(notReadNotifications, project.id))
     const sortedUnreadProjectUpdates = _.orderBy(unreadProjectUpdate, ['date'], ['desc'])
 
@@ -205,7 +206,7 @@ class DashboardContainer extends React.Component {
 }
 
 const mapStateToProps = ({ notifications, projectState, projectTopics, templates, phasesTopics }) => ({
-  notifications,
+  notifications: preRenderNotifications(notifications.notifications),
   productTemplates: templates.productTemplates,
   isProcessing: projectState.processing,
   phases: projectState.phases,

src/projects/detail/containers/FeedContainer.js

@@ -85,6 +85,10 @@ class FeedView extends React.Component {
     window.removeEventListener('beforeunload', this.onLeave)
   }
 
+  shouldComponentUpdate(nextProps) {
+    console.warn('shouldComponentUpdate')
+  }
+
   // Notify user if they navigate away while the form is modified.
   onLeave(e = {}) {
     if (this.isChanged()) {
@@ -366,6 +370,7 @@ class FeedView extends React.Component {
   }
 
   render () {
+    console.warn('FeedContainer render')
     const {currentUser, currentMemberRole, isCreatingFeed, error, allMembers,
       toggleNotificationRead, notifications, project, isSuperUser } = this.props
     const { feeds, isNewPostMobileOpen, fullscreenFeedId } = this.state

src/routes/notifications/helpers/notifications.js

@@ -435,11 +435,18 @@ export const prepareNotifications = (rawNotifications) => {
   return notifications
 }
 
+/**
+ * Bundle notifications and renders notifications texts
+ * 
+ * @param {Array} notifications notifications list
+ * 
+ * @returns {Array} notifications list with rendered texts
+ */
 export const preRenderNotifications = (notifications) => {
   // we will only render notification which has rules
   const notificationsWithRules = _.compact(
     notifications.map((notification) => notification.rule ? {
-      notification,
+      notification: _.omit(notification, 'rule'),
       notificationRule: notification.rule,
     } : null)
   )