From 92fcaea4526a32ebab6340f5b2c10ceac10deeb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Mon, 23 Sep 2019 08:49:48 +0200
Subject: [PATCH] Distinguish between `totalNotifications` and
 `unreadNotifications`

---
 .../NotificationMenu/NotificationMenu.vue     | 25 +++++++++++++------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/webapp/components/notifications/NotificationMenu/NotificationMenu.vue b/webapp/components/notifications/NotificationMenu/NotificationMenu.vue
index f15550d89..fb6dd41a3 100644
--- a/webapp/components/notifications/NotificationMenu/NotificationMenu.vue
+++ b/webapp/components/notifications/NotificationMenu/NotificationMenu.vue
@@ -1,11 +1,11 @@
 <template>
   <ds-button v-if="totalNotifications <= 0" class="notifications-menu" disabled icon="bell">
-    {{ totalNotifications }}
+    {{ unreadNotifications }}
   </ds-button>
   <dropdown v-else class="notifications-menu" :placement="placement">
     <template slot="default" slot-scope="{ toggleMenu }">
       <ds-button primary icon="bell" @click.prevent="toggleMenu">
-        {{ totalNotifications }}
+        {{ unreadNotifications }}
       </ds-button>
     </template>
     <template slot="popover">
@@ -52,16 +52,16 @@ export default {
         })
         // add all the new notifications to the notifications
         if (notifications) {
-          notifications.forEach(updatedElement => {
-            const sameNotification = this.notifications.find(function(oldElement) {
+          notifications.forEach(udatedListNotification => {
+            const sameNotification = this.notifications.find(function(oldListNotification) {
               return (
-                oldElement.from.id === updatedElement.from.id &&
-                oldElement.createdAt === updatedElement.createdAt &&
-                oldElement.reason === updatedElement.reason
+                oldListNotification.from.id === udatedListNotification.from.id &&
+                oldListNotification.createdAt === udatedListNotification.createdAt &&
+                oldListNotification.reason === udatedListNotification.reason
               )
             })
             if (sameNotification === undefined) {
-              this.notifications.unshift(updatedElement)
+              this.notifications.unshift(udatedListNotification)
             }
           })
         }
@@ -91,6 +91,15 @@ export default {
     totalNotifications() {
       return (this.notifications || []).length
     },
+    unreadNotifications() {
+      let countUnread = 0
+      if (this.notifications) {
+        this.notifications.forEach(notification => {
+          if (!notification.read) countUnread++
+        })
+      }
+      return countUnread
+    },
   },
   apollo: {
     notifications: {