From 4263bccbba28748395bac7a9616560d4f3e2578d Mon Sep 17 00:00:00 2001
From: Khanh Ngo <k@ndk.name>
Date: Sun, 15 Dec 2019 21:42:08 +0700
Subject: [PATCH] Format the history popup content

---
 powerdnsadmin/static/custom/js/custom.js | 22 +++++++++++++---------
 powerdnsadmin/templates/dashboard.html   |  2 +-
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/powerdnsadmin/static/custom/js/custom.js b/powerdnsadmin/static/custom/js/custom.js
index 1cf0664..81d73fb 100644
--- a/powerdnsadmin/static/custom/js/custom.js
+++ b/powerdnsadmin/static/custom/js/custom.js
@@ -241,26 +241,30 @@ function reload_domains(url) {
 
 // pretty JSON
 json_library = {
-    replacer: function(match, pIndent, pKey, pVal, pEnd) {
+    replacer: function (match, pIndent, pKey, pVal, pEnd) {
         var key = '<span class=json-key>';
         var val = '<span class=json-value>';
         var str = '<span class=json-string>';
         var r = pIndent || '';
-        if (pKey){
-            r = r + key + pKey.replace(/[": ]/g, '') + '</span>: ';
+        if (pKey) {
+            // r = r + key + pKey.replace(/[": ]/g, '') + '</span>: ';
+            // Keep the quote in the key
+            r = r + key + pKey.replace(/":/, '"') + '</span>: ';
         }
-        if (pVal){
+        if (pVal) {
             r = r + (pVal[0] == '"' ? str : val) + pVal + '</span>';
         }
         return r + (pEnd || '');
     },
-    prettyPrint: function(obj) {
+    prettyPrint: function (obj) {
         obj = obj.replace(/u'/g, "\'").replace(/'/g, "\"").replace(/(False|None)/g, "\"$1\"");
         var jsonData = JSON.parse(obj);
-        var jsonLine = /^( *)("[\w]+": )?("[^"]*"|[\w.+-]*)?([,[{])?$/mg;
-            return JSON.stringify(jsonData, null, 3)
+        // var jsonLine = /^( *)("[\w]+": )?("[^"]*"|[\w.+-]*)?([,[{])?$/mg;
+        // The new regex to handle case value is an empty list [] or dict {}
+        var jsonLine = /^( *)("[\w]+": )?("[^"]*"|[\w.+-]*)?([,[{])?/mg;
+        return JSON.stringify(jsonData, null, 3)
             .replace(/&/g, '&amp;').replace(/\\"/g, '&quot;')
             .replace(/</g, '&lt;').replace(/>/g, '&gt;')
             .replace(jsonLine, json_library.replacer);
-        }
-    };
+    }
+};
diff --git a/powerdnsadmin/templates/dashboard.html b/powerdnsadmin/templates/dashboard.html
index 733eace..295a3f2 100755
--- a/powerdnsadmin/templates/dashboard.html
+++ b/powerdnsadmin/templates/dashboard.html
@@ -107,7 +107,7 @@
                           <td>{{ history.msg }}</td>
                           <td>{{ history.created_on }}</td>
                           <td width="6%">
-                              <button type="button" class="btn btn-flat btn-primary history-info-button" value='{{ history.detail|replace("[]","None") }}'>
+                              <button type="button" class="btn btn-flat btn-primary history-info-button" value='{{ history.detail }}'>
                                   Info&nbsp;<i class="fa fa-info"></i>
                               </button>
                           </td>