Set Jira URL for Jira notifications globally rather than in alerts

Signed-off-by: Mvld3r <[email protected]>

Author: Mvld3r

src/i18n/locales/en.json

@@ -719,10 +719,10 @@
     "task_scheduler_component_analysis_cache_clear": "Component analysis cache clear",
     "jira": "Jira",
     "jira_desc": "Jira service authentication",
+    "jira_url": "Jira base URL",
     "jira_username": "Jira user (service account). The user must be provisioned to the appropriate jira instance and permitted to create issues.",
     "jira_password": "Jira password",
     "jira_ticket_type": "Jira ticket type",
-    "jira_project_key": "Jira project key",
     "reindex_projects": "Projects",
     "reindex_components": "Components",
     "reindex_service_components": "Service components",

src/views/administration/configuration/JiraConfig.vue

@@ -4,6 +4,15 @@
       <p>
         {{ $t('admin.jira_desc') }}
       </p>
+      <b-validated-input-group-form-input
+        id="jira-url"
+        :label="$t('admin.jira_url')"
+        input-group-size="mb-3"
+        rules="required"
+        type="text"
+        v-model="jiraUrl"
+        lazy="true"
+      />
       <b-validated-input-group-form-input
         id="jira-username"
         :label="$t('admin.jira_username')"
@@ -41,13 +50,15 @@ export default {
   },
   data() {
     return {
+      jiraUrl: "",
       jiraUsername: "",
       jiraPassword: "",
     }
   },
   methods: {
     saveChanges: function() {
       this.updateConfigProperties([
+        {groupName: 'jira', propertyName: 'jira.url', propertyValue: this.jiraUrl},
         {groupName: 'jira', propertyName: 'jira.username', propertyValue: this.jiraUsername}
       ]);
       if (this.jiraPassword !== "HiddenDecryptedPropertyPlaceholder") {
@@ -61,6 +72,8 @@ export default {
       for (let i=0; i<configItems.length; i++) {
         let item = configItems[i];
         switch (item.propertyName) {
+          case "jira.url":
+            this.jiraUrl = item.propertyValue; break;
           case "jira.username":
             this.jiraUsername = item.propertyValue; break;
           case "jira.password":

src/views/administration/notifications/Alerts.vue

@@ -141,9 +141,6 @@
                     <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'" />
-                    <b-input-group-form-input v-if="this.publisherClass === 'org.dependencytrack.notification.publisher.JiraPublisher'" id="input-jira-project"
-                                              :label="$t('admin.jira_project_key')" :required="true" type="text" v-model="jiraProjectKey" lazy="true"
-                                              v-debounce:750ms="updateNotificationRule" :debounce-events="'keyup'" />
                      <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">
@@ -224,7 +221,6 @@
                   notificationLevel: row.notificationLevel,
                   destination: this.parseDestination(row),
                   jiraTicketType: this.parseJiraTicketType(row),
-                  jiraProjectKey: this.parseJiraProjectKey(row),
                   scope: row.scope,
                   notifyOn: row.notifyOn,
                   projects: row.projects,
@@ -239,7 +235,6 @@
               created() {
                 this.parseDestination(this.alert);
                 this.parseJiraTicketType(this.alert);
-                this.parseJiraProjectKey(this.alert);
               },
               watch: {
                 enabled() {
@@ -281,15 +276,6 @@
                     return null;
                   }
                 },
-                parseJiraProjectKey: function(alert) {
-                  if (alert.publisherConfig) {
-                    let value = JSON.parse(alert.publisherConfig);
-                    if (value) {
-                      return value.jiraProjectKey;
-                    }
-                    return null;
-                  }
-                },
                 updateNotificationRule: function () {
                   let url = `${this.$api.BASE_URL}/${this.$api.URL_NOTIFICATION_RULE}`;
                   this.axios.post(url, {
@@ -298,13 +284,12 @@
                     enabled: this.enabled,
                     notifyChildren: this.notifyChildren,
                     notificationLevel: this.notificationLevel,
-                    publisherConfig: JSON.stringify({ destination: this.destination, jiraTicketType: this.jiraTicketType, jiraProjectKey: this.jiraProjectKey }),
+                    publisherConfig: JSON.stringify({ destination: this.destination, jiraTicketType: this.jiraTicketType }),
                     notifyOn: this.notifyOn
                   }).then((response) => {
                     this.alert = response.data;
                     this.destination = this.parseDestination(this.alert);
                     this.jiraTicketType = this.parseJiraTicketType(this.alert);
-                    this.jiraProjectKey = this.parseJiraProjectKey(this.alert);
                     EventBus.$emit('admin:alerts:rowUpdate', index, this.alert);
                     this.$toastr.s(this.$t('message.updated'));
                   }).catch((error) => {