From a5f1e0c18f22bce670db2ce2761ca3e7f64f3cad Mon Sep 17 00:00:00 2001
From: Heiko <hkernbach@users.noreply.github.com>
Date: Fri, 24 May 2019 13:48:13 +0200
Subject: [PATCH] fixed logger view ejs templates (#9092)

* fixed logger view ejs templates

* splittet one template into two seperates

* changelog
---
 CHANGELOG                                     |  2 +
 .../js/templates/loadingTableView.ejs         |  1 -
 .../APP/frontend/js/templates/loggerView.ejs  | 68 ++++++-------------
 .../js/templates/loggerViewEntries.ejs        | 23 +++++++
 4 files changed, 45 insertions(+), 49 deletions(-)
 create mode 100644 js/apps/system/_admin/aardvark/APP/frontend/js/templates/loggerViewEntries.ejs

diff --git a/CHANGELOG b/CHANGELOG
index 7beda4c431..f7c5df261e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,8 @@
 devel
 -----
 
+* fixed internal issue #3919: The web UI is now using precompiled ejs templates.
+
 * fixed "collection not found" exception during setup of 3-way smart join queries in the
   cluster
 
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/templates/loadingTableView.ejs b/js/apps/system/_admin/aardvark/APP/frontend/js/templates/loadingTableView.ejs
index 5d57a643d2..ee2898d05e 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/js/templates/loadingTableView.ejs
+++ b/js/apps/system/_admin/aardvark/APP/frontend/js/templates/loadingTableView.ejs
@@ -12,4 +12,3 @@
     <td valign="top" class="dataTables_empty">Loading...</td>
   </tr>
 </tbody>
-</script>
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/templates/loggerView.ejs b/js/apps/system/_admin/aardvark/APP/frontend/js/templates/loggerView.ejs
index 8c6b73f1cc..64db337468 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/js/templates/loggerView.ejs
+++ b/js/apps/system/_admin/aardvark/APP/frontend/js/templates/loggerView.ejs
@@ -1,57 +1,29 @@
+<div id="loggerContent" class="logger-content-id innerContent">
 
-  <div id="loggerContent" class="logger-content-id innerContent">
-
-    <div class="arangoToolbar arangoToolbarTop">
-
-      <div class="pull-left">
-      </div>
-
-      <div class="pull-right">
-        <button id="logTopicSelection" class="button-default filterSelect">Topic <i class="fa fa-caret-down"></i></button>
-        <button id="logLevelSelection" class="button-default filterSelect">Level <i class="fa fa-caret-down"></i></button>
-        <button style="display: none" class="button-default filterSelect" id="logFilters">
-          <i class="fa fa-close"></i>Clear current <a id="filterDesc"></a> filter
-        </button>
-      </div>
+  <div class="arangoToolbar arangoToolbarTop">
 
+    <div class="pull-left">
     </div>
 
-    <div id="noLogEntries" style="display: none">
-      <span>No suitable log entries found </span>
-    </div>
-
-    <div id="logEntries">
-    </div>
-
-    <div class="actions">
-      <button id="loadMoreEntries" class="button-success">Load older entries</button>
+    <div class="pull-right">
+      <button id="logTopicSelection" class="button-default filterSelect">Topic <i class="fa fa-caret-down"></i></button>
+      <button id="logLevelSelection" class="button-default filterSelect">Level <i class="fa fa-caret-down"></i></button>
+      <button style="display: none" class="button-default filterSelect" id="logFilters">
+        <i class="fa fa-close"></i>Clear current <a id="filterDesc"></a> filter
+      </button>
     </div>
 
   </div>
 
-</script>
+  <div id="noLogEntries" style="display: none">
+    <span>No suitable log entries found </span>
+  </div>
 
-<script id="loggerViewEntries.ejs" type="text/template">
-  <% _.each(entries, function (entry) { %>
-    <div class="pure-g" level="<%=entry.status.toLowerCase()%>" topic="<%=entry.topic.toLowerCase()%>">
-      <div class="pure-u-1-24">
-        <p class="labels">
-          <% var lcolor = arangoHelper.statusColors[entry.status.toLowerCase()];%>
-          <% var tcolor = arangoHelper.alphabetColors[entry.topic.charAt(0).toLowerCase()];%>
-          <span class="tippy level" title="Level: <%=entry.status%>" style="background: <%=lcolor%>"></span>
-          <span class="tippy topic" title="Topic: <%=entry.topic%>" style="background: <%=tcolor%>"></span>
-        </p>
-      </div>
-      <div class="pure-u-19-24 desc">
-        <p class="msg"><%=entry.msg%></p>
-      </div>
-      <div class="pure-u-4-24 date">
-        <p>
-          <% var x = moment(entry.timestamp, "X").fromNow() %>
-          <i class="fa fa-clock-o" aria-hidden="true"></i>
-          <span class="tippy" title="<%=entry.date%>"><%= x %></span>
-        </p>
-      </div>
-      <div class="logBorder"></div>
-    </div>
-  <% }); %>
+  <div id="logEntries">
+  </div>
+
+  <div class="actions">
+    <button id="loadMoreEntries" class="button-success">Load older entries</button>
+  </div>
+
+</div>
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/templates/loggerViewEntries.ejs b/js/apps/system/_admin/aardvark/APP/frontend/js/templates/loggerViewEntries.ejs
new file mode 100644
index 0000000000..ef1812fca3
--- /dev/null
+++ b/js/apps/system/_admin/aardvark/APP/frontend/js/templates/loggerViewEntries.ejs
@@ -0,0 +1,23 @@
+<% _.each(entries, function (entry) { %>
+  <div class="pure-g" level="<%=entry.status.toLowerCase()%>" topic="<%=entry.topic.toLowerCase()%>">
+    <div class="pure-u-1-24">
+      <p class="labels">
+        <% var lcolor = arangoHelper.statusColors[entry.status.toLowerCase()];%>
+        <% var tcolor = arangoHelper.alphabetColors[entry.topic.charAt(0).toLowerCase()];%>
+        <span class="tippy level" title="Level: <%=entry.status%>" style="background: <%=lcolor%>"></span>
+        <span class="tippy topic" title="Topic: <%=entry.topic%>" style="background: <%=tcolor%>"></span>
+      </p>
+    </div>
+    <div class="pure-u-19-24 desc">
+      <p class="msg"><%=entry.msg%></p>
+    </div>
+    <div class="pure-u-4-24 date">
+      <p>
+        <% var x = moment(entry.timestamp, "X").fromNow() %>
+        <i class="fa fa-clock-o" aria-hidden="true"></i>
+        <span class="tippy" title="<%=entry.date%>"><%= x %></span>
+      </p>
+    </div>
+    <div class="logBorder"></div>
+  </div>
+<% }); %>