Merge branch 'master' into '865-graphql-error-dummyperson-needs-a-primary-key'

# Conflicts:
#   CHANGELOG.rst

CHANGELOG.rst

@@ -15,6 +15,8 @@ Fixed
 * Progress page didn't work properly.
 * About page failed to load for apps with an unknown licence.
 * Notification query failed on admin users without persons.
+* Querying for notification caused unnecessary database requests.
+* Loading bar didn't disappear on some pages after loading was finished.
 
 `3.1`_ - 2022-05-30
 -------------------

aleksis/core/frontend/components/LegacyBaseTemplate.vue

@@ -71,7 +71,9 @@ export default {
 
       // Show loader if iframe starts to change its content, even if the $route stays the same
       this.$refs.contentIFrame.contentWindow.onpagehide = () => {
-        this.$root.contentLoading = true;
+        if (this.$root.isLegacyBaseTemplate) {
+          this.$root.contentLoading = true;
+        }
       };
 
       // Write title of iframe to SPA window

aleksis/core/frontend/components/notifications/NotificationList.vue

@@ -20,7 +20,7 @@
           v-if="
             myNotifications &&
             myNotifications.person &&
-            myNotifications.person.unreadNotificationsCount > 0
+            myNotifications.person.notifications.length > 0
           "
         >
           mdi-bell-badge-outline
@@ -38,7 +38,7 @@
         v-if="
           myNotifications.person &&
           myNotifications.person.notifications &&
-          myNotifications.person.notifications.length
+          unreadNotifications.length
         "
       >
         <v-subheader>{{ $t("notifications.notifications") }}</v-subheader>
@@ -86,5 +86,10 @@ export default {
       pollInterval: 30000,
     },
   },
+  computed: {
+    unreadNotifications() {
+      return this.myNotifications.filter(n => !n.read);
+    },
+  },
 };
 </script>

aleksis/core/frontend/components/notifications/myNotifications.graphql

 {
   myNotifications: whoAmI {
     person {
-      unreadNotificationsCount
       notifications {
         id
         title