From a610eca59d90ee6f8ee5f4578aa0725e97e33f44 Mon Sep 17 00:00:00 2001
From: Simon Brooke <simon@journeyman.cc>
Date: Mon, 16 Jul 2018 11:42:02 +0100
Subject: [PATCH] Issues flow in app now working again (now with real data)

---
 src/cljs/youyesyet/canvasser_app/core.cljs    |  3 --
 .../youyesyet/canvasser_app/handlers.cljs     | 35 +++++++++++--------
 .../youyesyet/canvasser_app/views/issue.cljs  |  5 ++-
 .../youyesyet/canvasser_app/views/issues.cljs |  3 +-
 4 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/src/cljs/youyesyet/canvasser_app/core.cljs b/src/cljs/youyesyet/canvasser_app/core.cljs
index 6e76016..e93d9ab 100644
--- a/src/cljs/youyesyet/canvasser_app/core.cljs
+++ b/src/cljs/youyesyet/canvasser_app/core.cljs
@@ -75,9 +75,6 @@
 (defn issue-page []
   (issue/panel))
 
-(defn issue-experts-page []
-  (expert/panel))
-
 (defn map-page []
   (maps/panel))
 
diff --git a/src/cljs/youyesyet/canvasser_app/handlers.cljs b/src/cljs/youyesyet/canvasser_app/handlers.cljs
index ed92dd3..939ae00 100644
--- a/src/cljs/youyesyet/canvasser_app/handlers.cljs
+++ b/src/cljs/youyesyet/canvasser_app/handlers.cljs
@@ -1,12 +1,13 @@
 (ns ^{:doc "Canvasser app event handlers."
       :author "Simon Brooke"}
   youyesyet.canvasser-app.handlers
-  (:require [cljs.reader :refer [read-string]]
+  (:require [ajax.core :refer [GET]]
+            [ajax.json :refer [json-request-format json-response-format]]
             [cemerick.url :refer (url url-encode)]
+            [cljs.reader :refer [read-string]]
+            [clojure.walk :refer [keywordize-keys]]
             [day8.re-frame.http-fx]
             [re-frame.core :refer [dispatch reg-event-db reg-event-fx subscribe]]
-            [ajax.core :refer [GET]]
-            [ajax.json :refer [json-request-format json-response-format]]
             [youyesyet.canvasser-app.gis :refer [refresh-map-pins get-current-location]]
             [youyesyet.canvasser-app.state :as db]
             ))
@@ -206,10 +207,11 @@
   :process-options
   (fn
     [db [_ response]]
-    (js/console.log "Updating options")
-    (assoc
-      (remove-from-feedback db :fetch-options)
-      :options (js->clj response))))
+    (let [options (js->clj response)]
+      (js/console.log (str "Updating options: " options))
+      (assoc
+        (remove-from-feedback db :fetch-options)
+        :options options))))
 
 
 (reg-event-db
@@ -239,10 +241,15 @@
   :process-issues
   (fn
     [db [_ response]]
-    (js/console.log "Updating issues")
-    (assoc
-      (remove-from-feedback db :fetch-issues)
-      :issues (js->clj response))))
+    (let [issues (reduce
+                   merge {}
+                   (map
+                     #(hash-map (keyword (:id %)) %)
+                     (js->clj response)))]
+      (js/console.log (str "Updating issues: " issues))
+      (assoc
+        (remove-from-feedback db :fetch-issues)
+        :issues issues))))
 
 
 (reg-event-db
@@ -380,8 +387,8 @@
 (reg-event-db
  :set-and-go-to-issue
  (fn [db [_ issue]]
-   (js/console.log (str "Setting page to :issue, issue to " issue))
-   (assoc (assoc (clear-messages db) :issue issue) :page :issue)))
+   (js/console.log (str "Setting page to :issue, issue to " issue ", issues are " (:issues db)))
+   (assoc (assoc (clear-messages db) :issue (keyword issue)) :page :issue)))
 
 
 (reg-event-db
@@ -406,7 +413,7 @@
  :set-issue
  (fn [db [_ issue]]
    (js/console.log (str "Setting issue to " issue))
-   (assoc (clear-messages db) :issue issue)))
+   (assoc (clear-messages db) :issue (keyword issue))))
 
 
 (reg-event-db
diff --git a/src/cljs/youyesyet/canvasser_app/views/issue.cljs b/src/cljs/youyesyet/canvasser_app/views/issue.cljs
index 579c249..9a75a43 100644
--- a/src/cljs/youyesyet/canvasser_app/views/issue.cljs
+++ b/src/cljs/youyesyet/canvasser_app/views/issue.cljs
@@ -38,7 +38,10 @@
 (defn panel
   "Generate the issue panel."
   []
-  (let [issue @(subscribe [:issue])]
+  (let [id @(subscribe [:issue])
+        issues @(subscribe [:issues])
+        issue (id issues)]
+    (js/console.log (str "Id: " id "; issue: " issue))
     [:div
      [:h1 (:id issue)]
      [:div.container {:id "main-container"}
diff --git a/src/cljs/youyesyet/canvasser_app/views/issues.cljs b/src/cljs/youyesyet/canvasser_app/views/issues.cljs
index 6515ab5..eb0a6fb 100644
--- a/src/cljs/youyesyet/canvasser_app/views/issues.cljs
+++ b/src/cljs/youyesyet/canvasser_app/views/issues.cljs
@@ -40,11 +40,12 @@
   "Generate the issues panel."
   []
   (let [issues @(subscribe [:issues])]
+    (js/console.log (str "Issues: " issues))
     (if issues
       [:div
        [:h1 "Issues"]
        [:div.container {:id "main-container"}
         (ui/back-link)
         [:div {:id "issue-list"}
-         (map (fn [i] (ui/big-link (:id i) :target (str "#issue/" (:id i)))) issues)]]]
+         (map (fn [i] (ui/big-link (:id i) :target (str "#issue/" (:id i)))) (vals issues))]]]
       (ui/error-panel "No issues loaded"))))