From c708bd6c6ed2da7c1fdc56bc63953484e6147cd0 Mon Sep 17 00:00:00 2001
From: Abdel Hajou <abdelwhajou@gmail.com>
Date: Sat, 21 Oct 2023 21:29:17 +0200
Subject: [PATCH] Keep focus when editing Alerts (fixes #421)

Signed-off-by: Abdel Hajou <abdelwhajou@gmail.com>
---
 src/i18n/locales/en.json                          |  1 +
 src/views/administration/notifications/Alerts.vue | 10 ++++------
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/i18n/locales/en.json b/src/i18n/locales/en.json
index 1713486c0..39d1b0559 100644
--- a/src/i18n/locales/en.json
+++ b/src/i18n/locales/en.json
@@ -653,6 +653,7 @@
     "notification_level": "Notification level",
     "destination": "Destination",
     "delete_alert": "Delete Alert",
+    "submit": "Submit",
     "limit_to": "Limit To",
     "limit_to_projects": "Limit to projects",
     "include_children": "Include children of projects",
diff --git a/src/views/administration/notifications/Alerts.vue b/src/views/administration/notifications/Alerts.vue
index 877cc5857..9db7ffcd2 100644
--- a/src/views/administration/notifications/Alerts.vue
+++ b/src/views/administration/notifications/Alerts.vue
@@ -122,8 +122,7 @@
                 <b-row class="expanded-row">
                   <b-col sm="6">
                     <b-input-group-form-input id="input-name" :label="$t('message.name')" input-group-size="mb-3"
-                                              required="true" type="text" v-model="name" lazy="true"
-                                              v-debounce:750ms="updateNotificationRule" :debounce-events="'keyup'" />
+                                              required="true" type="text" v-model="name" lazy="true" />
                     <b-form-group>
                       <c-switch id="notificationEnabled" color="primary" v-model="enabled" label v-bind="labelIcon"/>
                       {{ $t('admin.enabled') }}
@@ -136,11 +135,9 @@
                     </b-form-group>
                     <b-input-group-form-input id="input-destination" :label="$t('admin.destination')" input-group-size="mb-3"
                                               :required="(!(this.alert.hasOwnProperty('teams') && this.alert.teams != null && this.alert.teams.length > 0)).toString()"
-                                              type="text" v-model="destination" lazy="true"
-                                              v-debounce:750ms="updateNotificationRule" :debounce-events="'keyup'" />
+                                              type="text" v-model="destination" lazy="true" />
                     <b-input-group-form-input v-if="this.publisherClass === 'org.dependencytrack.notification.publisher.JiraPublisher'" id="input-jira-ticket-type"
-                                              :label="$t('admin.jira_ticket_type')" :required="true" type="text" v-model="jiraTicketType" lazy="true"
-                                              v-debounce:750ms="updateNotificationRule" :debounce-events="'keyup'" />
+                                              :label="$t('admin.jira_ticket_type')" :required="true" type="text" v-model="jiraTicketType" lazy="true" />
                      <b-form-group v-if="this.publisherClass === 'org.dependencytrack.notification.publisher.SendMailPublisher'"
                                    id="teamDestinationList" :label="this.$t('admin.select_team_as_recipient')">
                        <div class="list group">
@@ -197,6 +194,7 @@
                                 v-permission="PERMISSIONS.VIEW_PORTFOLIO" v-on:toggle="limitToVisible = !limitToVisible"
                                 v-if="this.scope === 'PORTFOLIO'" />
                        <b-button variant="outline-danger" @click="deleteNotificationRule">{{ $t('admin.delete_alert') }}</b-button>
+                       <b-button variant="primary" @click="updateNotificationRule">{{ $t('admin.submit') }}</b-button>
                     </div>
                   </b-col>
                   <select-project-modal v-on:selection="updateProjectSelection"/>