From 6128ec190121a882ed655d537807651ee0e771a4 Mon Sep 17 00:00:00 2001
From: Daniel Compton <desk@danielcompton.net>
Date: Thu, 23 Nov 2017 10:03:03 +1300
Subject: [PATCH] Improve appearance of subscriptions panel

---
 .../trace/components/data_browser.cljs        | 12 ++++----
 src/day8/re_frame/trace/panels/subs.cljs      | 29 ++++++++++---------
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/src/day8/re_frame/trace/components/data_browser.cljs b/src/day8/re_frame/trace/components/data_browser.cljs
index 6a8213f..fc9edbc 100644
--- a/src/day8/re_frame/trace/components/data_browser.cljs
+++ b/src/day8/re_frame/trace/components/data_browser.cljs
@@ -71,10 +71,6 @@
        [:span {:class    "toggle"
                :on-click #(rf/dispatch [:app-db/toggle-expansion path])}
         [:button.expansion-button (if @expanded? "▼" "▶")]]
-
-
-
-
        (if (and @expanded? (cljs-devtools-has-body (get-object jsonml) (get-config jsonml)))
          (jsonml->hiccup
            (cljs-devtools-body
@@ -124,7 +120,9 @@
         (cond
           (and @expanded?
                (or (string? data)
-                   (number? data))) [:div {:style {:margin "10px 0"}} data]
+                   (number? data)
+                   (boolean? data)
+                   (nil? data))) [:div {:style {:margin "10px 0"}} (prn-str data)]
           @expanded? (jsonml->hiccup (cljs-devtools-header data) (conj path 0)))]])))
 
 (defn subscription-render [data title path]
@@ -141,5 +139,7 @@
         (cond
           (and @expanded?
                (or (string? data)
-                   (number? data))) [:div {:style {:margin "10px 0"}} data]
+                   (number? data)
+                   (boolean? data)
+                   (nil? data))) [:div {:style {:margin "10px 0"}} (prn-str data)]
           @expanded? (jsonml->hiccup (cljs-devtools-header data) (conj path 0)))]])))
diff --git a/src/day8/re_frame/trace/panels/subs.cljs b/src/day8/re_frame/trace/panels/subs.cljs
index e1b5a9e..97362e1 100644
--- a/src/day8/re_frame/trace/panels/subs.cljs
+++ b/src/day8/re_frame/trace/panels/subs.cljs
@@ -21,17 +21,20 @@
    [:div.panel-content-scrollable {:style {:margin-left "10px"}}
     [:div.subtrees {:style {:margin "20px 0"}}
      (doall
-       (map (fn [me]
-              (let [[query-v dyn-v :as inputs] (key me)]
-                @re-frame.db/app-db
-                ^{:key query-v}
-                [:div.subtree-wrapper {:style {:margin "10px 0"}}
-                 [:div.subtree
-                  [data-browser/subscription-render
-                   (rc/deref-or-value-peek (val me))
-                   [:button.subtree-button {:on-click #(rf/dispatch [:app-db/remove-path (key me)])}
-                    [:span.subtree-button-string
-                     (prn-str (first (key me)))]]
-                   (into [:subs] query-v)]]]))
-            @subs/query->reaction))]]])
+       (->> @subs/query->reaction
+            (sort)
+            (map (fn [me]
+                   (let [[query-v dyn-v :as inputs] (key me)]
+                     ^{:key query-v}
+                     [:div.subtree-wrapper {:style {:margin "10px 0"}}
+                      [:div.subtree
+                       [data-browser/subscription-render
+                        (rc/deref-or-value-peek (val me))
+                        [:button.subtree-button {:on-click #(rf/dispatch [:app-db/remove-path (key me)])}
+                         [:span.subtree-button-string
+                          (prn-str (first (key me)))]]
+                        (into [:subs] query-v)]]]))
+                 )))
+     (do @re-frame.db/app-db
+         nil)]]])