Merge pull request #1664 from nextcloud/backport/1657/stable25-fix-vi…

…sually-removing-first-notification-when-executing-an-action [stable25] Fix (visually) removing first notification when executing an action
nextcloud · Sep 19, 2023 · a299d21 · a299d21
2 parents dce0ea7 + f58b7bc
commit a299d21
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 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/src/Components/Action.vue b/src/Components/Action.vue
@@ -46,6 +46,10 @@ export default {
 			default: false,
 			required: true,
 		},
+		notificationIndex: {
+			type: Number,
+			required: true,
+		},
 	},
 
 	data() {
@@ -79,7 +83,7 @@ export default {
 
 				// emit event to current app
 				this.$parent._$el.fadeOut(OC.menuSpeed)
-				this.$parent.$emit('remove')
+				this.$parent.$emit('remove', this.notificationIndex)
 				try {
 					$('body').trigger(new $.Event('OCA.Notification.Action', {
 						notification: this.$parent,

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"