Fix (visually) removing first notification when executing an action

When an action is executed first its element is faded out and then the notification data is removed, which removes the component as a whole. However, the index of the notification was not provided, so the event that handles the "remove" event always removed the data of the first notification. Due to this when the action was triggered in another notification the first notification was also (visually) removed (and only until the notifications were fetched again from the server). Signed-off-by: Daniel Calviño Sánchez <[email protected]>
nextcloud · Sep 19, 2023 · 61e1d9f · 61e1d9f
1 parent 0179f6c
commit 61e1d9f
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 8 deletions.
diff --git a/js/notifications-main.js b/js/notifications-main.js
diff --git a/js/notifications-main.js.map b/js/notifications-main.js.map
diff --git a/js/notifications-node_modules_moment_locale_sync_recursive_-src_NotificationsApp_vue.js b/js/notifications-node_modules_moment_locale_sync_recursive_-src_NotificationsApp_vue.js
diff --git a/js/notifications-node_modules_moment_locale_sync_recursive_-src_NotificationsApp_vue.js.map b/js/notifications-node_modules_moment_locale_sync_recursive_-src_NotificationsApp_vue.js.map
diff --git a/src/Components/Action.vue b/src/Components/Action.vue
@@ -48,6 +48,10 @@ export default {
 			default: false,
 			required: true,
 		},
+		notificationIndex: {
+			type: Number,
+			required: true,
+		},
 	},
 
 	data() {
@@ -118,7 +122,7 @@ export default {
 
 				// emit event to current app
 				this.$parent._$el.fadeOut(OC.menuSpeed)
-				this.$parent.$emit('remove')
+				this.$parent.$emit('remove', this.notificationIndex)
 
 				emit('notifications:action:executed', event)
 

diff --git a/src/Components/Notification.vue b/src/Components/Notification.vue
@@ -56,7 +56,10 @@
 		</div>
 
 		<div v-if="actions.length" class="notification-actions">
-			<Action v-for="(a, i) in actions" :key="i" v-bind="a" />
+			<Action v-for="(a, i) in actions"
+				:key="i"
+				v-bind="a"
+				:notification-index="index" />
 		</div>
 		<div v-else-if="externalLink" class="notification-actions">
 			<NcButton type="primary"