fix: move creation of browser notifications to the root App

Signed-off-by: Maksim Sukharev <[email protected]>

Author: Antreesy

src/Components/Notification.vue

@@ -93,8 +93,6 @@ import moment from '@nextcloud/moment'
 import DefaultParameter from './Parameters/DefaultParameter.vue'
 import File from './Parameters/File.vue'
 import User from './Parameters/User.vue'
-import { emit } from '@nextcloud/event-bus'
-import { createWebNotification } from '../services/webNotificationsService.js'
 
 export default {
 	name: 'Notification',
@@ -250,26 +248,6 @@ export default {
 
 	mounted() {
 		this._$el = $(this.$el)
-
-		// Parents: TransitionGroup > Transition > HeaderMenu
-		if (typeof this.$parent.$parent.$parent.showBrowserNotifications === 'undefined') {
-			console.error('Failed to read showBrowserNotifications property from App component')
-		}
-
-		if (this.$parent.$parent.$parent.backgroundFetching) {
-			// Can not rely on showBrowserNotifications because each tab should
-			// be able to utilize the data from the notification in events.
-			const event = {
-				notification: this.$props,
-			}
-
-			emit('notifications:notification:received', event)
-		}
-
-		if (this.$parent.$parent.$parent.showBrowserNotifications
-			&& this.$parent.$parent.$parent.webNotificationsThresholdId < this.notificationId) {
-			createWebNotification(this)
-		}
 	},
 
 	methods: {

src/NotificationsApp.vue

@@ -103,7 +103,7 @@ import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 import Close from 'vue-material-design-icons/Close.vue'
 import axios from '@nextcloud/axios'
 import { getCurrentUser } from '@nextcloud/auth'
-import { subscribe, unsubscribe } from '@nextcloud/event-bus'
+import { emit, subscribe, unsubscribe } from '@nextcloud/event-bus'
 import { showError } from '@nextcloud/dialogs'
 import { loadState } from '@nextcloud/initial-state'
 import {
@@ -117,6 +117,7 @@ import Message from 'vue-material-design-icons/Message.vue'
 import NcEmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent.js'
 import { getCapabilities } from '@nextcloud/capabilities'
 import NcHeaderMenu from '@nextcloud/vue/dist/Components/NcHeaderMenu.js'
+import { createWebNotification } from './services/webNotificationsService.js'
 
 export default {
 	name: 'NotificationsApp',
@@ -398,6 +399,7 @@ export default {
 				this.lastETag = response.headers.etag
 				this.lastTabId = response.tabId
 				this.notifications = response.data
+				this.processWebNotifications(response.data)
 				console.debug('Got notification data, restoring default polling interval.')
 				this._setPollingInterval(this.pollIntervalBase)
 				this._updateDocTitleOnNewNotifications(this.notifications)
@@ -514,6 +516,21 @@ export default {
 					this.webNotificationsGranted = permissions === 'granted'
 				})
 		},
+
+		processWebNotifications(notifications) {
+			notifications.forEach(notification => {
+				if (this.backgroundFetching) {
+					// Can not rely on showBrowserNotifications because each tab should
+					// be able to utilize the data from the notification in events.
+					const event = { notification }
+					emit('notifications:notification:received', event)
+				}
+
+				if (this.showBrowserNotifications && this.webNotificationsThresholdId < notification.notificationId) {
+					createWebNotification(notification)
+				}
+			})
+		},
 	},
 }
 </script>