Merge remote-tracking branch 'origin/feature/threads-and-more' into n…

…ew-authentication
modrinth · Jul 14, 2023 · e585edc · e585edc
2 parents c13c1f3 + 34660ad
commit e585edc
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/components/ui/NotificationItem.vue b/components/ui/NotificationItem.vue
@@ -111,7 +111,7 @@
         <div
           v-for="notif in notification.grouped_notifs
             ? [notification, ...notification.grouped_notifs]
-            : notification"
+            : [notification]"
           :key="notif.id"
           class="version-link"
         >

diff --git a/pages/dashboard/notifications.vue b/pages/dashboard/notifications.vue
@@ -22,6 +22,7 @@
       </div>
       <template v-if="notifications.length > 0">
         <Chips
+          v-if="notifTypes.length > 1"
           v-model="selectedType"
           :items="notifTypes"
           :format-label="
@@ -67,7 +68,15 @@ const notifTypes = computed(() => {
   if (allNotifs.value === null) {
     return []
   }
-  const types = [...new Set(allNotifs.value.map((notif) => notif.type))]
+  const types = [
+    ...new Set(
+      allNotifs.value
+        .filter((notification) => {
+          return history.value || !notification.read
+        })
+        .map((notif) => notif.type)
+    ),
+  ]
   return types.length > 1 ? ['all', ...types] : types
 })