fix(multi-tab): Fix interactions when multiple tabs are active

nickvergessen · nickvergessen · commit 567bd62a75f0 · 2025-10-13T15:04:16.000+02:00
- Deleting a notification in a tab makes that tab the active one
- Deleting all notifications makes the tab the active one
- Clicking the bell loads the newest state from the shared storage

Signed-off-by: Joas Schilling &lt;coding@schilljs.com&gt;
diff --git a/src/NotificationsApp.vue b/src/NotificationsApp.vue
@@ -96,7 +96,10 @@ import IconClose from 'vue-material-design-icons/Close.vue'
 import IconMessageOutline from 'vue-material-design-icons/MessageOutline.vue'
 import IconNotification from './Components/IconNotification.vue'
 import NotificationItem from './Components/NotificationItem.vue'
-import { getNotificationsData } from './services/notificationsService.js'
+import {
+	getNotificationsData,
+	setCurrentTabAsActive,
+} from './services/notificationsService.js'
 import { createWebNotification } from './services/webNotificationsService.js'
 
 const sessionKeepAlive = loadState('core', 'config', { session_keepalive: true }).session_keepalive
@@ -255,6 +258,8 @@ export default {
 
 		onOpen() {
 			this.requestWebNotificationPermissions()
+			setCurrentTabAsActive(this.tabId)
+			this._fetch()
 		},
 
 		handleNetworkOffline() {
@@ -282,6 +287,8 @@ export default {
 				.delete(generateOcsUrl('apps/notifications/api/v2/notifications'))
 				.then(() => {
 					this.notifications = []
+					this.open = false
+					setCurrentTabAsActive(this.tabId)
 				})
 				.catch(() => {
 					showError(t('notifications', 'Failed to dismiss all notifications'))
@@ -290,6 +297,7 @@ export default {
 
 		onRemove(index) {
 			this.notifications.splice(index, 1)
+			setCurrentTabAsActive(this.tabId)
 		},
 
 		/**
diff --git a/src/services/notificationsService.js b/src/services/notificationsService.js
@@ -42,6 +42,19 @@ async function getNotificationsData(tabId, lastETag, forceRefresh, hasNotifyPush
 	}
 }
 
+/**
+ * @param {string|null} tabId unique id for browser tab
+ */
+async function setCurrentTabAsActive(tabId) {
+	const lastTab = BrowserStorage.getItem('tabId')
+	if (lastTab !== tabId) {
+		// Refresh the data when changing the tab
+		await getNotificationsData(tabId, '', true, false)
+		// Enforce this tab one the raise-condition if there was one
+		BrowserStorage.setItem('tabId', tabId)
+	}
+}
+
 /**
  * @param {object} notification notification object
  */
@@ -90,4 +103,5 @@ async function refreshData(lastETag) {
 
 export {
 	getNotificationsData,
+	setCurrentTabAsActive,
 }
