From a8dd40900c406a182504bb543116622c649cdaa6 Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.nz>
Date: Wed, 19 Oct 2016 23:58:52 +0200
Subject: [PATCH] Usability fixes on icons and images events.

---
 src/uxbox/main/data/icons.cljs  | 16 +++++++++-------
 src/uxbox/main/data/images.cljs | 16 +++++++++-------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/uxbox/main/data/icons.cljs b/src/uxbox/main/data/icons.cljs
index b68bb4a0c..f7ba2101c 100644
--- a/src/uxbox/main/data/icons.cljs
+++ b/src/uxbox/main/data/icons.cljs
@@ -88,11 +88,12 @@
 (defrecord CollectionCreated [item]
   rs/UpdateEvent
   (-apply-update [_ state]
-    (let [item (assoc item :type :own)]
-      (-> state
-          (assoc-in [:icon-colls-by-id (:id item)] item)
-          (assoc-in [:dashboard :collection-id] (:id item))
-          (assoc-in [:dashboard :collection-type] :own)))))
+    (let [{:keys [id] :as item} (assoc item :type :own)]
+      (update state :image-colls-by-id assoc id item)))
+
+  rs/WatchEvent
+  (-apply-watch [_ state stream]
+    (rx/of (select-collection :own (:id item)))))
 
 (defn collection-created
   [item]
@@ -166,8 +167,9 @@
 
   rs/WatchEvent
   (-apply-watch [_ state s]
-    (->> (rp/req :delete/icon-collection id)
-         (rx/ignore))))
+    (let [type (get-in state [:dashboard :images :type])]
+      (->> (rp/req :delete/icon-collection id)
+           (rx/map #(select-collection type))))))
 
 (defn delete-collection
   [id]
diff --git a/src/uxbox/main/data/images.cljs b/src/uxbox/main/data/images.cljs
index 09236c069..6b6096f5f 100644
--- a/src/uxbox/main/data/images.cljs
+++ b/src/uxbox/main/data/images.cljs
@@ -90,11 +90,12 @@
 (defrecord CollectionCreated [item]
   rs/UpdateEvent
   (-apply-update [_ state]
-    (let [item (assoc item :type :own)]
-      (-> state
-          (assoc-in [:image-colls-by-id (:id item)] item)
-          (assoc-in [:dashboard :images :id] (:id item))
-          (assoc-in [:dashboard :type] :own)))))
+    (let [{:keys [id] :as item} (assoc item :type :own)]
+      (update state :image-colls-by-id assoc id item)))
+
+  rs/WatchEvent
+  (-apply-watch [_ state stream]
+    (rx/of (select-collection :own (:id item)))))
 
 (defn collection-created
   [item]
@@ -168,8 +169,9 @@
 
   rs/WatchEvent
   (-apply-watch [_ state s]
-    (->> (rp/req :delete/image-collection id)
-         (rx/ignore))))
+    (let [type (get-in state [:dashboard :images :type])]
+      (->> (rp/req :delete/image-collection id)
+           (rx/map #(select-collection type))))))
 
 (defn delete-collection
   [id]