From b7bea5698eb7d0e49c1eb62312120bc093060366 Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Tue, 3 Dec 2019 07:50:37 -0800
Subject: [PATCH] web: drop old dependency on json (#1190)

---
 hledger-web/Hledger/Web/Widget/AddForm.hs | 10 ++++++----
 hledger-web/hledger-web.cabal             |  3 +--
 hledger-web/package.yaml                  |  1 -
 hledger-web/templates/add-form.hamlet     |  4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/hledger-web/Hledger/Web/Widget/AddForm.hs b/hledger-web/Hledger/Web/Widget/AddForm.hs
index bc9067ab2..69c840751 100644
--- a/hledger-web/Hledger/Web/Widget/AddForm.hs
+++ b/hledger-web/Hledger/Web/Widget/AddForm.hs
@@ -22,7 +22,6 @@ import Data.Text (Text)
 import qualified Data.Text as T
 import Data.Time (Day)
 import Text.Blaze.Internal (Markup, preEscapedString)
-import Text.JSON
 import Text.Megaparsec (bundleErrors, eof, parseErrorTextPretty, runParser)
 import Yesod
 
@@ -71,13 +70,16 @@ addForm j today = identifyForm "add" $ \extra -> do
   (amtRes, _) <- mreq listField amtFS Nothing
   let (postRes, displayRows) = validatePostings acctRes amtRes
 
+  -- bindings used in add-form.hamlet
   let descriptions = sort $ nub $ tdescription <$> jtxns j
-      escapeJSSpecialChars = regexReplaceCI "</script>" "<\\/script>" -- #236
-      listToJsonValueObjArrayStr = preEscapedString . escapeJSSpecialChars .
-        encode . JSArray . fmap (\a -> JSObject $ toJSObject [("value", showJSON a)])
       journals = fst <$> jfiles j
+      listToJsonArray :: [Text] -> Markup
+      listToJsonArray = preEscapedString . escapeJSSpecialChars . show . toJSON
+        where
+          escapeJSSpecialChars = regexReplaceCI "</script>" "<\\/script>" -- #236
 
   pure (validateTransaction dateRes descRes postRes, $(widgetFile "add-form"))
+
   where
     dateFS = FieldSettings "date" Nothing Nothing (Just "date")
       [("class", "form-control input-lg"), ("placeholder", "Date")]
diff --git a/hledger-web/hledger-web.cabal b/hledger-web/hledger-web.cabal
index 47d1e630f..b6c5a4de5 100644
--- a/hledger-web/hledger-web.cabal
+++ b/hledger-web/hledger-web.cabal
@@ -4,7 +4,7 @@ cabal-version: 1.12
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: 0678e65f66ec6915e930f6224b0bf3c0558464f3f7aafefe57a84574c60506be
+-- hash: c5289bad9f5862e797248b10b6b30083a281d125eeec3964a43284e56d197f08
 
 name:           hledger-web
 version:        1.16
@@ -174,7 +174,6 @@ library
     , http-client
     , http-conduit
     , http-types
-    , json
     , megaparsec >=7.0.0 && <8
     , mtl >=2.2.1
     , semigroups
diff --git a/hledger-web/package.yaml b/hledger-web/package.yaml
index be3fd3926..12d0cfade 100644
--- a/hledger-web/package.yaml
+++ b/hledger-web/package.yaml
@@ -118,7 +118,6 @@ library:
   - http-conduit
   - http-client
   - http-types
-  - json
   - megaparsec >=7.0.0 && <8
   - mtl >=2.2.1
   - semigroups
diff --git a/hledger-web/templates/add-form.hamlet b/hledger-web/templates/add-form.hamlet
index 0743b1805..43e221114 100644
--- a/hledger-web/templates/add-form.hamlet
+++ b/hledger-web/templates/add-form.hamlet
@@ -1,7 +1,7 @@
 <script>
   jQuery(document).ready(function() {
     descriptionsSuggester = new Bloodhound({
-      local:#{listToJsonValueObjArrayStr descriptions},
+      local:#{listToJsonArray descriptions},
       limit:100,
       datumTokenizer: function(d) { return [d.value]; },
       queryTokenizer: function(q) { return [q]; }
@@ -9,7 +9,7 @@
     descriptionsSuggester.initialize();
 
     accountsSuggester = new Bloodhound({
-      local:#{listToJsonValueObjArrayStr (journalAccountNamesDeclaredOrImplied j)},
+      local:#{listToJsonArray (journalAccountNamesDeclaredOrImplied j)},
       limit:100,
       datumTokenizer: function(d) { return [d.value]; },
       queryTokenizer: function(q) { return [q]; }