Merge pull request #1662 from nextcloud/backport/1657/stable27-fix-vi…

…sually-removing-first-notification-when-executing-an-action [stable27] Fix (visually) removing first notification when executing an action
nextcloud · Sep 19, 2023 · 63f0e35 · 63f0e35
2 parents 598a5bd + 2f850cc
commit 63f0e35
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"