From 8fa80a944f050ac7cf3606c39d75faf4b5b8b4c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= <l.mierzwa@gmail.com>
Date: Sun, 23 Jul 2017 15:43:17 -0700
Subject: [PATCH] update templates

---
 assets/templates/alertgroup.html | 44 ++++++++++++++++----------------
 assets/templates/index.html      |  4 ---
 assets/templates/js.html         | 23 ++---------------
 assets/templates/silence.html    |  4 +--
 4 files changed, 26 insertions(+), 49 deletions(-)

diff --git a/assets/templates/alertgroup.html b/assets/templates/alertgroup.html
index 03ba684ab..4a4695f6f 100644
--- a/assets/templates/alertgroup.html
+++ b/assets/templates/alertgroup.html
@@ -1,4 +1,4 @@
-<script type="application/json" id="alert-group-title">
+f<script type="application/json" id="alert-group-title">
   <% if (Object.keys(group.labels).length > 0) { %>
     <% var filters = ['@receiver=' + group.receiver] %>
     <% _.each(group.labels, function(label_val, label_key) { filters.push(label_key + '=' + label_val) }) %>
@@ -15,9 +15,9 @@
     <% } %>
     <div class="panel-title">
       <% if (Object.keys(group.labels).length > 0) { %>
-        <% _.each(Alerts.SortMapByKey(group.labels), function(label) { %>
-          <% var attrs = Alerts.GetLabelAttrs(label.key, label.value) %>
-          <%= Templates.Render('buttonLabel', {elem: 'div', elemClass: 'label label-list', attrs: attrs, label: label}) %>
+        <% _.each(sortMapByKey(group.labels), function(label) { %>
+          <% var attrs = getLabelAttrs(label.key, label.value) %>
+          <%= renderTemplate('buttonLabel', {elem: 'div', elemClass: 'label label-list', attrs: attrs, label: label}) %>
         <% }) %>
       <% } else { %>
         <div class="label-list label"></div>
@@ -27,7 +27,7 @@
 </script>
 
 <script type="application/json" id="alert-group-annotations">
-  <% _.each(Alerts.SortMapByKey(alert.annotations), function(annotation) { %>
+  <% _.each(sortMapByKey(alert.annotations), function(annotation) { %>
     <div class="well well-sm annotation-well">
       <i class="fa fa-question-circle text-muted" title="<%= annotation.key %>" data-toggle="tooltip" data-placement="top"/>
       <% if (annotation.value) { %>
@@ -53,10 +53,10 @@
 </script>
 
 <script type="application/json" id="alert-group-labels">
-  <% _.each(Alerts.SortMapByKey(alert.labels), function(label) { %>
+  <% _.each(sortMapByKey(alert.labels), function(label) { %>
     <% if (group.labels[label.key] == undefined) { %>
-      <% var attrs = Alerts.GetLabelAttrs(label.key, label.value) %>
-      <%= Templates.Render('buttonLabel', {elem: 'span', attrs: attrs, label: label}) %>
+      <% var attrs = getLabelAttrs(label.key, label.value) %>
+      <%= renderTemplate('buttonLabel', {elem: 'span', attrs: attrs, label: label}) %>
     <% } %>
   <% }) %>
 </script>
@@ -81,12 +81,12 @@
          <%- am.name %>
       </a>
     <% }) %>
-    <% var attrs = Alerts.GetLabelAttrs("@state", alert.state) %>
-    <%= Templates.Render('buttonLabel', {elem: 'span', attrs: attrs, label: {key: '@state', value: alert.state, text: alert.state}}) %>
+    <% var attrs = getLabelAttrs("@state", alert.state) %>
+    <%= renderTemplate('buttonLabel', {elem: 'span', attrs: attrs, label: {key: '@state', value: alert.state, text: alert.state}}) %>
     <% if (alert.state != "suppressed") { %>
       <% var labels = [] %>
       <% var alertmanagers = [] %>
-      <% _.each(Alerts.SortMapByKey(alert.labels), function(label) { %>
+      <% _.each(sortMapByKey(alert.labels), function(label) { %>
         <% labels.push(label.key + '=' + label.value) %>
       <% }) %>
       <% _.each(alert.alertmanager, function(alertmanager){ %>
@@ -103,8 +103,8 @@
           <i class="fa fa-bell-slash" title="Silence this alert" data-toggle="tooltip" data-placement="top" />
       </span>
     <% } %>
-    <% var attrs = Alerts.GetLabelAttrs("@receiver", alert.receiver) %>
-    <%= Templates.Render('buttonLabel', {elem: 'span', attrs: attrs, label: {key: '@receiver', value: alert.receiver, text: alert.receiver}}) %>
+    <% var attrs = getLabelAttrs("@receiver", alert.receiver) %>
+    <%= renderTemplate('buttonLabel', {elem: 'span', attrs: attrs, label: {key: '@receiver', value: alert.receiver, text: alert.receiver}}) %>
     <a class="label label-list label-default label-age label-ts"
        data-toggle="tooltip"
        data-placement="top"
@@ -229,16 +229,16 @@
             <% return false %>
           <% } else { %>
             <% rendered++ %>
-            <% var attrs = Alerts.GetLabelAttrs(label.key, label.value) %>
+            <% var attrs = getLabelAttrs(label.key, label.value) %>
             <% if (label.hits > 1) { %>
               <div class="label-trim-group">
-                <%= Templates.Render('buttonLabel', {elem: 'span', elemClass: 'label label-trim-tag', attrs: attrs, label: label}) %>
+                <%= renderTemplate('buttonLabel', {elem: 'span', elemClass: 'label label-trim-tag', attrs: attrs, label: label}) %>
                 <span class="label label-default label-trim-count">
                   <%- label.hits %>
                 </span>
               </div>
             <% } else { %>
-              <%= Templates.Render('buttonLabel', {elem: 'span', attrs: attrs, label: label}) %>
+              <%= renderTemplate('buttonLabel', {elem: 'span', attrs: attrs, label: label}) %>
             <% } %>
           <% } %>
         <% }) %>
@@ -257,7 +257,7 @@
     <% } %>
     <div class="panel <%= cls_panel %>">
       <div class="panel-heading text-center">
-        <%= Templates.Render('alertGroupTitle', {group: group}) %>
+        <%= renderTemplate('alertGroupTitle', {group: group}) %>
       </div>
       <% var labelMap = {} %>
       <% var skipped = 0 %>
@@ -279,16 +279,16 @@
           <% if (i < group.alerts.length - 1) { cls_body = 'incident-group-separator' } %>
           <div class="panel-body <%= cls_body %>">
             <div class="incident-group">
-              <%= Templates.Render('alertGroupAnnotations', {alert: alert}) %>
-              <%= Templates.Render('alertGroupLabels', {alert: alert, group: group}) %>
-              <%= Templates.Render('alertGroupElements', {alert: alert}) %>
-              <%= Templates.Render('alertGroupSilence', {alert: alert}) %>
+              <%= renderTemplate('alertGroupAnnotations', {alert: alert}) %>
+              <%= renderTemplate('alertGroupLabels', {alert: alert, group: group}) %>
+              <%= renderTemplate('alertGroupElements', {alert: alert}) %>
+              <%= renderTemplate('alertGroupSilence', {alert: alert}) %>
             </div>
           </div>
         <% } %>
       <% }) %>
       <% if (!$.isEmptyObject(labelMap)) { %>
-        <%= Templates.Render('alertGroupLabelMap', {labelMap: labelMap, skipped: skipped}) %>
+        <%= renderTemplate('alertGroupLabelMap', {labelMap: labelMap, skipped: skipped}) %>
       <% } %>
     </div>
   </div>
diff --git a/assets/templates/index.html b/assets/templates/index.html
index dd40fa345..65f68d2f9 100644
--- a/assets/templates/index.html
+++ b/assets/templates/index.html
@@ -145,10 +145,6 @@
     <div class="flash" id="flash">
     </div>
 
-    {{ range .JSFiles }}
-    <script type="text/javascript" src="{{ $.WebPrefix }}static/managed/js/{{ . }}"></script>
-    {{- end }}
-
     {{ template "templates/js.html" .}}
 
     <div class="modal fade" id="labelModal" tabindex="-1" role="dialog">
diff --git a/assets/templates/js.html b/assets/templates/js.html
index 9881419d7..4345b1940 100644
--- a/assets/templates/js.html
+++ b/assets/templates/js.html
@@ -1,21 +1,2 @@
-<script type="text/javascript" src="{{ .WebPrefix }}static/sentry.js?_={{ .NowQ }}"></script>
-
-<script type="text/javascript" src="{{ .WebPrefix }}static/jquery.typing-0.2.0.js?_={{ .NowQ }}"></script>
-<script type="text/javascript" src="{{ .WebPrefix }}static/lru.js?_={{ .NowQ }}"></script>
-
-<script type="text/javascript" src="{{ .WebPrefix }}static/alerts.js?_={{ .NowQ }}"></script>
-<script type="text/javascript" src="{{ .WebPrefix }}static/autocomplete.js?_={{ .NowQ }}"></script>
-<script type="text/javascript" src="{{ .WebPrefix }}static/config.js?_={{ .NowQ }}"></script>
-<script type="text/javascript" src="{{ .WebPrefix }}static/colors.js?_={{ .NowQ }}"></script>
-<script type="text/javascript" src="{{ .WebPrefix }}static/counter.js?_={{ .NowQ }}"></script>
-<script type="text/javascript" src="{{ .WebPrefix }}static/filters.js?_={{ .NowQ }}"></script>
-<script type="text/javascript" src="{{ .WebPrefix }}static/grid.js?_={{ .NowQ }}"></script>
-<script type="text/javascript" src="{{ .WebPrefix }}static/progress.js?_={{ .NowQ }}"></script>
-<script type="text/javascript" src="{{ .WebPrefix }}static/silence.js?_={{ .NowQ }}"></script>
-<script type="text/javascript" src="{{ .WebPrefix }}static/summary.js?_={{ .NowQ }}"></script>
-<script type="text/javascript" src="{{ .WebPrefix }}static/templates.js?_={{ .NowQ }}"></script>
-<script type="text/javascript" src="{{ .WebPrefix }}static/watchdog.js?_={{ .NowQ }}"></script>
-<script type="text/javascript" src="{{ .WebPrefix }}static/querystring.js?_={{ .NowQ }}"></script>
-<script type="text/javascript" src="{{ .WebPrefix }}static/ui.js?_={{ .NowQ }}"></script>
-<script type="text/javascript" src="{{ .WebPrefix }}static/unsee.js?_={{ .NowQ }}"></script>
-<script type="text/javascript" src="{{ .WebPrefix }}static/unsilence.js?_={{ .NowQ }}"></script>
+<script type="text/javascript" src="{{ .WebPrefix }}static/dist/bundle.js?_={{ .NowQ }}"></script>
+<script type="text/javascript" src="{{ .WebPrefix }}static/jquery.typing-0.2.0.js"></script>
diff --git a/assets/templates/silence.html b/assets/templates/silence.html
index d7357b96f..4122da1ff 100644
--- a/assets/templates/silence.html
+++ b/assets/templates/silence.html
@@ -27,7 +27,7 @@
   <label class="control-label">Labels to match</label>
   <table class="table table-condensed silence-label-selects">
     <% if (Object.keys(labels).length > 0) { %>
-      <% _.each(Alerts.SortMapByKey(labels), function(label) { %>
+      <% _.each(sortMapByKey(labels), function(label) { %>
         <tr>
           <td align="center">
             <span class="badge select-label-badge" title="Click to select / deselect all values" data-toggle="tooltip">
@@ -48,7 +48,7 @@
                     <% if (Object.keys(label.value).length > 10) { %>data-live-search="true"<% } %>
                     <% if (Object.keys(label.value).length > 1) { %>data-actions-box="true"<% } %>
                     multiple>
-              <% _.each(Alerts.SortMapByKey(label.value), function(label_val) { %>
+              <% _.each(sortMapByKey(label.value), function(label_val) { %>
                   <option <% if (label_val.value.selected) { %>selected="selected"<% } %>
                           value="<%= label_val.key %>"
                           data-content="<span class='<%= label_val.value.attrs.class %>' style='<%= label_val.value.attrs.style %>'><%- label_val.value.attrs.text %></span>">