From 204a3fe68a6f60f13337b95b1205cead357912f9 Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.nz>
Date: Wed, 19 Oct 2016 18:37:58 +0200
Subject: [PATCH] Improve sorting of nav items on icons page.

---
 src/uxbox/main/data/icons.cljs         |  1 -
 src/uxbox/main/ui/dashboard/icons.cljs | 23 +++++++++++------------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/uxbox/main/data/icons.cljs b/src/uxbox/main/data/icons.cljs
index 106c9096d..b68bb4a0c 100644
--- a/src/uxbox/main/data/icons.cljs
+++ b/src/uxbox/main/data/icons.cljs
@@ -25,7 +25,6 @@
   rs/UpdateEvent
   (-apply-update [_ state]
     (let [type (or type :own)
-          id (or id (if (= type :builtin) 1 nil))
           data {:type type :id id :selected #{}}]
       (-> state
           (assoc-in [:dashboard :icons] data)
diff --git a/src/uxbox/main/ui/dashboard/icons.cljs b/src/uxbox/main/ui/dashboard/icons.cljs
index db06f55c8..030ae52e9 100644
--- a/src/uxbox/main/ui/dashboard/icons.cljs
+++ b/src/uxbox/main/ui/dashboard/icons.cljs
@@ -147,10 +147,10 @@
   [type selected colls]
   (let [own? (= type :own)
         builtin? (= type :builtin)
-        collections (cond->> (vals colls)
-                      own? (filter #(= :own (:type %)))
-                      builtin? (filter #(= :builtin (:type %)))
-                      own? (sort-by :name))]
+        colls (cond->> (vals colls)
+                own? (filter #(= :own (:type %)))
+                builtin? (filter #(= :builtin (:type %))))
+        colls (sort-by :name colls)]
     [:ul.library-elements
      (when own?
        [:li
@@ -159,7 +159,7 @@
          "+ New collection"]])
      (when own?
        (nav-item nil (nil? selected)))
-     (for [coll collections
+     (for [coll colls
            :let [selected? (= (:id coll) selected)
                  key (str (:id coll))]]
        (-> (nav-item coll selected?)
@@ -171,13 +171,12 @@
   (let [own? (= type :own)
         builtin? (= type :builtin)]
     (letfn [(select-tab [type]
-              (let [xf (comp (map second)
-                             (filter #(= type (:type %))))
-                    colls (->> (into [] xf colls)
-                               (sort-by :name))]
-                (if-let [item (first colls)]
-                  (rs/emit! (di/select-collection type (:id item)))
-                  (rs/emit! (di/select-collection type)))))]
+              (if (= type :builtin)
+                (let [colls (->> (map second colls)
+                                 (filter #(= :builtin (:type %)))
+                                 (sort-by :name))]
+                  (rs/emit! (di/select-collection type (:id (first colls)))))
+                (rs/emit! (di/select-collection type))))]
       [:div.library-bar
        [:div.library-bar-inside
         [:ul.library-tabs