From c47fff2c357e5f157c350032838ec797f570ade7 Mon Sep 17 00:00:00 2001
From: Sergey <83376337+freak12techno@users.noreply.github.com>
Date: Mon, 11 Dec 2023 19:45:53 +0300
Subject: [PATCH] chore: refactor templates (#28)

* chore: revamped alert template

* chore: revamped silence create template

* chore: revamped silences list template
---
 templates/alert.html           |  9 +++++++--
 templates/silences_create.html | 17 +++++++++--------
 templates/silences_delete.html |  7 ++++---
 templates/silences_list.html   | 22 ++++++++++++----------
 4 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/templates/alert.html b/templates/alert.html
index df60778..03bcf96 100644
--- a/templates/alert.html
+++ b/templates/alert.html
@@ -7,7 +7,12 @@
 {{- range $alertId, $alert := .Data.Alerts }}
 
 - {{ GetEmojiByStatus $alert.State }}
+<strong>Firing for:</strong> {{ FormatDuration $alert.ActiveSince }} (since {{ FormatDate $alert.ActiveAt }})
+{{- if $alert.Value }}
+<strong>Value: </strong>{{ StrToFloat64 $alert.Value }}
+{{- end }}
+<strong>Labels: </strong>
 {{- range $key, $label := $alert.Labels }}
-{{ $key }} = {{ $label }}
+  {{ $key }} = {{ $label }}
+{{- end }}
 {{- end }}
-{{- end }}
\ No newline at end of file
diff --git a/templates/silences_create.html b/templates/silences_create.html
index 6d6a72d..7674a16 100644
--- a/templates/silences_create.html
+++ b/templates/silences_create.html
@@ -1,11 +1,12 @@
 <strong>Created silence with following params:</strong>
-ID:         <code>{{ .Data.ID }}</code>
-Starts at:  <pre>{{ .Data.StartsAt.String }}</pre>
-Ends at:    <pre>{{ .Data.EndsAt.String }}</pre>
-Created by: <pre>{{ .Data.CreatedBy }}</pre>
-Comment:    <pre>{{ .Data.Comment }}</pre>
-Status:     <pre>{{ GetEmojiBySilenceStatus .Data.Status.State }} {{ .Data.Status.State }}</pre>
-Matchers:
+
+<strong>ID:</strong> <code>{{ .Data.ID }}</code>
+<strong>Starts at:</strong> {{ FormatDate .Data.StartsAt }}
+<strong>Ends at:</strong> {{ FormatDate .Data.EndsAt }}
+<strong>Created by:</strong> {{ .Data.CreatedBy }}
+<strong>Comment:</strong> {{ .Data.Comment }}
+<strong>Status:</strong> {{ GetEmojiBySilenceStatus .Data.Status.State }} {{ .Data.Status.State }}
+<strong>Matchers:</strong>
 {{- range $matcherId, $matcher := .Data.Matchers }}
-<pre> {{ $matcher.Serialize }}</pre>
+ {{ $matcher.Serialize }}
 {{- end }}
diff --git a/templates/silences_delete.html b/templates/silences_delete.html
index 0d83789..1fafee5 100644
--- a/templates/silences_delete.html
+++ b/templates/silences_delete.html
@@ -1,6 +1,7 @@
 <strong>Deleted silence with following params:</strong>
-ID:         <code>{{ .Data.ID }}</code>
-Matchers:
+
+<strong>ID:</strong> {{ .Data.ID }}
+<strong>Matchers:</strong>
 {{- range $matcherId, $matcher := .Data.Matchers }}
-<pre> {{ $matcher.Serialize }}</pre>
+  {{ $matcher.Serialize }}
 {{- end }}
diff --git a/templates/silences_list.html b/templates/silences_list.html
index 97fa901..a5466ab 100644
--- a/templates/silences_list.html
+++ b/templates/silences_list.html
@@ -1,17 +1,19 @@
 {{- $global := . }}
-<strong>Silences</strong>
 {{- if not .Data }}
+<strong>Silences</strong>
 No silences.
-{{- end }}
+{{- else }}
+<strong>Silences ({{ len .Data }}):</strong>
+{{ end }}
 {{- range $silenceId, $silence := .Data }}
-ID:         <code>{{ $silence.ID }}</code>
-Starts at:  <pre>{{ $silence.StartsAt.String }}</pre>
-Ends at:    <pre>{{ $silence.EndsAt.String }}</pre>
-Created by: <pre>{{ $silence.CreatedBy }}</pre>
-Comment:    <pre>{{ $silence.Comment }}</pre>
-Status:     <pre>{{ GetEmojiBySilenceStatus $silence.Status.State }} {{ $silence.Status.State }}</pre>
-Matchers:
+<strong>ID:</strong> <code>{{ $silence.ID }}</code>
+<strong>Starts at:</strong> {{ FormatDate $silence.StartsAt }}
+<strong>Ends at:</strong> {{ FormatDate $silence.EndsAt }}
+<strong>Created by:</strong> {{ $silence.CreatedBy }}
+<strong>Comment:</strong> {{ $silence.Comment }}
+<strong>Status:</strong> {{ GetEmojiBySilenceStatus $silence.Status.State }} {{ $silence.Status.State }}
+<strong>Matchers:</strong>
 {{- range $matcherId, $matcher := $silence.Matchers }}
-<pre> {{ $matcher.Serialize }}</pre>
+  {{ $matcher.Serialize }}
 {{- end }}
 {{ end }}