Merge pull request #416 from Security-Onion-Solutions/jertel/uiimp

use consistent delete icon similar to case comments/events; open new …
Security-Onion-Solutions · Apr 5, 2024 · 1917b29 · 1917b29
2 parents f43a9b6 + b75f9a3
commit 1917b29
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 15 deletions.
diff --git a/html/index.html b/html/index.html
@@ -1344,17 +1344,17 @@ <h3 class="text--primary">{{ i18n.commentAddDetection }}</h3>
                           <!-- custom filter -->
                           <v-text-field id="new-override-custom-filter-edit" v-model="newOverride.customFilter" :rules="[rules.required]" persistent-hint :hint="i18n.customFilter" data-aid="detection_new_override_filter_input"></v-text-field>
                         </div>
-                        <div v-if="newOverride" class="d-flex justify-end text-body-2 mt-2">
-                          <div class="d-inline-flex">
-                            <a :href="$root.parameters.docsUrl" target="_blank" data-aid="detection_override_help">
-                              <v-icon :title="i18n.overrideDocumentationHelp" class="override-help">fa-regular fa-circle-question</v-icon>
-                            </a>
+                        <div v-if="newOverride" class="d-flex align-center align-self-end text-body-2 mt-2">
+                          <div class="d-inline-flex justify-end">
                             <v-btn id="detection-create-cancel" text small color="primary" class="align-self-end" @click="newOverride = null" data-aid="detection_new_override_cancel">
                               {{ i18n.cancel }}
                             </v-btn>
                             <v-btn v-if="newOverride.type" id="detection-create-create" text small color="primary" class="align-self-end" @click="addNewOverride()" data-aid="detection_new_override_save">
                               {{ i18n.create }}
                             </v-btn>
+                            <v-btn icon :target="$root.target('so-help')" :href="$root.parameters.docsUrl + 'detections.html'" :title="i18n.overrideDocumentationHelp" data-aid="detection_override_help_new">
+                              <v-icon>fa-regular fa-circle-question</v-icon>
+                            </v-btn>                              
                           </div>
                         </div>
                       </v-form>
@@ -1479,11 +1479,11 @@ <h3 class="text--primary">{{ i18n.commentAddDetection }}</h3>
                           </div>
                           <div class="d-flex justify-end text-body-2 mt-4">
                             <div class="d-inline-flex">
-                              <a :href="$root.parameters.docsUrl" target="_blank">
-                                <v-icon :title="i18n.overrideDocumentationHelp" class="override-help" data-aid="detection_override_help">fa-regular fa-circle-question</v-icon>
-                              </a>
-                              <v-btn id="override-edit-delete" text small color="red" @click="deleteOverride(item)" data-aid="detection_override_delete">
-                                {{ i18n.delete }}
+                              <v-btn icon :target="$root.target('so-help')" :href="$root.parameters.docsUrl + 'detections.html'" :title="i18n.overrideDocumentationHelp" data-aid="detection_override_help_suricata">
+                                <v-icon>fa-regular fa-circle-question</v-icon>
+                              </v-btn>
+                              <v-btn color="red" @click="deleteOverride(item)" icon :title="i18n.overrideDeleteHelp" data-aid="override_edit_delete_suricata">
+                                <v-icon>fa-circle-xmark</v-icon>
                               </v-btn>
                             </div>
                           </div>
@@ -1513,11 +1513,11 @@ <h3 class="text--primary">{{ i18n.commentAddDetection }}</h3>
                           </div>
                           <div class="d-flex justify-end text-body-2 mt-2">
                             <div class="d-inline-flex">
-                              <a :href="$root.parameters.docsUrl" target="_blank">
-                                <v-icon :title="i18n.overrideDocumentationHelp" class="override-help" data-aid="detection_override_help">fa-regular fa-circle-question</v-icon>
-                              </a>
-                              <v-btn id="override-edit-delete" text small color="red" @click="deleteOverride(item)" data-aid="detection_override_delete">
-                                {{ i18n.delete }}
+                              <v-btn icon :target="$root.target('so-help')" :href="$root.parameters.docsUrl + 'detections.html'" :title="i18n.overrideDocumentationHelp" data-aid="detection_override_help_elastalert">
+                                <v-icon>fa-regular fa-circle-question</v-icon>
+                              </v-btn>
+                              <v-btn color="red" @click="deleteOverride(item)" icon :title="i18n.overrideDeleteHelp" data-aid="override_edit_delete_elastalert">
+                                <v-icon>fa-circle-xmark</v-icon>
                               </v-btn>
                             </div>
                           </div>

diff --git a/html/js/i18n.js b/html/js/i18n.js
@@ -592,6 +592,7 @@ const i18n = {
       order: 'Order',
       osUptime: 'OS Uptime',
       other: 'Other',
+      overrideDeleteHelp: 'Delete this rule override',
       overrideDocumentationHelp: 'Click for more information',
       overrideExpand: 'Show all override fields',
       overview: 'Overview',