From 089f7db00711a6bfc0b62d69ef5cf7adc3eb7bdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klemen=20Ko=C5=A1ir?= <klemen.kosir@kream.io>
Date: Wed, 12 Jan 2022 12:09:07 +0900
Subject: [PATCH] Address comments

---
 promgen/static/js/promgen.vue.js                       | 10 ++++------
 promgen/templates/promgen/host_detail.html             |  2 +-
 .../promgen/project_detail_configuration.html          |  2 +-
 .../templates/promgen/project_detail_exporters.html    |  2 +-
 promgen/templates/promgen/project_detail_hosts.html    |  2 +-
 promgen/templates/promgen/project_detail_urls.html     |  2 +-
 promgen/templates/promgen/project_row.html             |  2 +-
 promgen/templates/promgen/search.html                  |  4 ++--
 promgen/templates/promgen/service_block.html           |  2 +-
 9 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/promgen/static/js/promgen.vue.js b/promgen/static/js/promgen.vue.js
index 9bfdaa78c..ae8f6d6ef 100644
--- a/promgen/static/js/promgen.vue.js
+++ b/promgen/static/js/promgen.vue.js
@@ -56,15 +56,13 @@ const app = new Vue({
                 .then(() => location.reload());
         },
         setSilenceLabels(labels) {
-            if (labels.target) {
-                silenceStore.setLabels(labels.target.dataset);
-            } else {
-                silenceStore.setLabels(labels);
-            }
-
+            silenceStore.setLabels(labels);
             silenceStore.showForm();
             scroll(0, 0);
         },
+        setSilenceDataset(event) {
+            this.setSilenceLabels(event.target.dataset);
+        },
         addSilenceLabel(label, value) {
             silenceStore.addLabel(label, value);
             silenceStore.showForm();
diff --git a/promgen/templates/promgen/host_detail.html b/promgen/templates/promgen/host_detail.html
index f7250d1f2..72fb0b362 100644
--- a/promgen/templates/promgen/host_detail.html
+++ b/promgen/templates/promgen/host_detail.html
@@ -19,7 +19,7 @@ <h1>Host: {{ slug }}</h1>
 <div class="panel panel-primary">
   <div class="panel-body">
     <a
-    @click="setSilenceLabels"
+    @click="setSilenceDataset"
     class="btn btn-warning"
     data-instance="{{slug}}:[0-9]*"
     style="display: inline-block;"
diff --git a/promgen/templates/promgen/project_detail_configuration.html b/promgen/templates/promgen/project_detail_configuration.html
index f645acb83..89079f6e4 100644
--- a/promgen/templates/promgen/project_detail_configuration.html
+++ b/promgen/templates/promgen/project_detail_configuration.html
@@ -32,7 +32,7 @@
     </div>
 
     <a href="{% url 'project-update' project.id %}" class="btn btn-warning btn-sm">{% trans "Update Project" %}</a>
-    <a @click="setSilenceLabels" class="btn btn-warning btn-sm" data-project="{{project.name}}" data-service="{{project.service.name}}">{% trans "Silence" %}</a>
+    <a @click="setSilenceDataset" class="btn btn-warning btn-sm" data-project="{{project.name}}" data-service="{{project.service.name}}">{% trans "Silence" %}</a>
 
     <div class="btn-group btn-group-sm" role="group" aria-label="...">
       <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
diff --git a/promgen/templates/promgen/project_detail_exporters.html b/promgen/templates/promgen/project_detail_exporters.html
index be324603d..54a2be7c8 100644
--- a/promgen/templates/promgen/project_detail_exporters.html
+++ b/promgen/templates/promgen/project_detail_exporters.html
@@ -38,7 +38,7 @@
       </td>
       <td>
         <a
-          @click="setSilenceLabels"
+          @click="setSilenceDataset"
           class="btn btn-warning btn-xs"
           data-job="{{exporter.job}}"
           data-project="{{project.name}}"
diff --git a/promgen/templates/promgen/project_detail_hosts.html b/promgen/templates/promgen/project_detail_hosts.html
index b55b0801f..e1d3227c3 100644
--- a/promgen/templates/promgen/project_detail_hosts.html
+++ b/promgen/templates/promgen/project_detail_hosts.html
@@ -16,7 +16,7 @@
       <td><a href="{% url 'host-detail' host.name %}">{{ host.name }}</a></td>
       <td>
         <a
-          @click="setSilenceLabels"
+          @click="setSilenceDataset"
           class="btn btn-warning btn-xs"
           data-instance="{{host.name}}:[0-9]*"
           data-project="{{project.name}}"
diff --git a/promgen/templates/promgen/project_detail_urls.html b/promgen/templates/promgen/project_detail_urls.html
index 4ab776a1c..aeec06507 100644
--- a/promgen/templates/promgen/project_detail_urls.html
+++ b/promgen/templates/promgen/project_detail_urls.html
@@ -13,7 +13,7 @@
       <td>{{ url.url }}</td>
       <td title="{{ url.probe.description }}">{{ url.probe.module }}</td>
       <td>
-        <a @click="setSilenceLabels"
+        <a @click="setSilenceDataset"
           class="btn btn-warning btn-xs"
           data-job="{{url.probe.module}}"
           data-instance="{{url.url}}">{% trans "Silence" %}</a>
diff --git a/promgen/templates/promgen/project_row.html b/promgen/templates/promgen/project_row.html
index 6118965af..a1226c0cb 100644
--- a/promgen/templates/promgen/project_row.html
+++ b/promgen/templates/promgen/project_row.html
@@ -38,6 +38,6 @@
     </td>
 
     <td>
-        <a @click="setSilenceLabels" class="btn btn-warning btn-xs" data-project="{{project.name}}" data-service="{{service.name}}">{% trans "Silence" %}</a>
+        <a @click="setSilenceDataset" class="btn btn-warning btn-xs" data-project="{{project.name}}" data-service="{{service.name}}">{% trans "Silence" %}</a>
     </td>
 </tr>
diff --git a/promgen/templates/promgen/search.html b/promgen/templates/promgen/search.html
index 22f569db5..7768116b9 100644
--- a/promgen/templates/promgen/search.html
+++ b/promgen/templates/promgen/search.html
@@ -85,7 +85,7 @@ <h1>Hosts</h1>
           <li>
             <a href="{% url 'host-detail' host.name %}">{{ host.name }}</a>
             <a
-            @click="setSilenceLabels"
+            @click="setSilenceDataset"
             class="btn btn-warning btn-xs"
             data-instance="{{host.name}}:[0-9]*"
             style="display: inline-block;"
@@ -107,7 +107,7 @@ <h1>Hosts</h1>
       <tr>
         <td><a href="{% url 'host-detail' host.name %}">{{ host.name }}</a></td>
         <td><a
-          @click="setSilenceLabels"
+          @click="setSilenceDataset"
           class="btn btn-warning btn-xs"
           data-instance="{{host.name}}:[0-9]*"
           style="display: inline-block;"
diff --git a/promgen/templates/promgen/service_block.html b/promgen/templates/promgen/service_block.html
index 97aa51843..d2db0b41d 100644
--- a/promgen/templates/promgen/service_block.html
+++ b/promgen/templates/promgen/service_block.html
@@ -61,7 +61,7 @@
       </div>
 
       <a href="{% url 'service-update' service.id %}" class="btn btn-warning btn-sm">{% trans "Edit Service" %}</a>
-      <a @click="setSilenceLabels" data-service="{{service.name}}" class="btn btn-warning btn-sm">{% trans "Silence" %}</a>
+      <a @click="setSilenceDataset" data-service="{{service.name}}" class="btn btn-warning btn-sm">{% trans "Silence" %}</a>
 
       <div class="btn-group btn-group-sm" role="group" aria-label="...">
         <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">