From 9e96bbce99e8f14e8b3faa153690ff01e446eeea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jes=C3=BAs=20Espino?= <jespinog@gmail.com>
Date: Sun, 24 Apr 2016 22:03:35 +0200
Subject: [PATCH] Add duplicated shapes on the top of all shapes (#22)

---
 src/uxbox/state/shapes.cljs        | 10 +++++-----
 test/uxbox/state/shapes_tests.cljs | 30 +++++++++++++++---------------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/uxbox/state/shapes.cljs b/src/uxbox/state/shapes.cljs
index 593f91f1e..73d7fe7d2 100644
--- a/src/uxbox/state/shapes.cljs
+++ b/src/uxbox/state/shapes.cljs
@@ -25,10 +25,10 @@
                      shape (assoc shape :id id :page page :items [])
                      state (if (nil? group)
                              (as-> state $
-                               (update-in $ [:pages-by-id page :shapes] conj id)
+                               (update-in $ [:pages-by-id page :shapes] #(into [] (cons id %)))
                                (assoc-in $ [:shapes-by-id id] shape))
                              (as-> state $
-                               (update-in $ [:shapes-by-id group :items] conj id)
+                               (update-in $ [:shapes-by-id group :items] #(into [] (cons id %)))
                                (assoc-in $ [:shapes-by-id id] shape)))]
                  (->> (map #(get-in state [:shapes-by-id %]) items)
                       (reduce #(duplicate-shape %1 %2 page id) state)))
@@ -38,10 +38,10 @@
                                (merge (when group {:group group})))]
                  (if (nil? group)
                    (as-> state $
-                     (update-in $ [:pages-by-id page :shapes] conj id)
+                     (update-in $ [:pages-by-id page :shapes] #(into [] (cons id %)))
                      (assoc-in $ [:shapes-by-id id] shape))
                    (as-> state $
-                     (update-in $ [:shapes-by-id group :items] conj id)
+                     (update-in $ [:shapes-by-id group :items] #(into [] (cons id %)))
                      (assoc-in $ [:shapes-by-id id] shape))))))]
 
      (reduce #(duplicate-shape %1 %2 page group) state shapes))))
@@ -55,7 +55,7 @@
            (all-same-group? [coll]
              (let [group (:group (first coll))]
                (every? #(= group (:group %)) coll)))]
-     (let [shapes (mapv #(get-in state [:shapes-by-id %]) shapes)]
+     (let [shapes (reverse (mapv #(get-in state [:shapes-by-id %]) shapes))]
        (cond
          (all-toplevel? shapes)
          (let [page (or page (:page (first shapes)))]
diff --git a/test/uxbox/state/shapes_tests.cljs b/test/uxbox/state/shapes_tests.cljs
index 40e05a8c5..50e722cf9 100644
--- a/test/uxbox/state/shapes_tests.cljs
+++ b/test/uxbox/state/shapes_tests.cljs
@@ -22,7 +22,7 @@
                  :shapes-by-id {1 {:id 1 :page 1}}}
 
         expected (-> initial
-                     (assoc-in [:pages-by-id 1 :shapes] [1 2])
+                     (assoc-in [:pages-by-id 1 :shapes] [2 1])
                      (assoc-in [:shapes-by-id 2] {:id 2 :page 1}))]
 
     (with-redefs [uuid.core/random (constantly 2)]
@@ -34,16 +34,16 @@
 ;; duplicate shape: duplicate inside group
 (t/deftest duplicate-shapes-test2
   (let [initial {:pages-by-id {1 {:id 1 :shapes [1]}}
-                 :shapes-by-id {1 {:id 1 :page 1
+                 :shapes-by-id {1 {:id 1 :name "1" :page 1
                                    :type :group
                                    :items [2 3]}
-                                2 {:id 2 :page 1 :group 1}
-                                3 {:id 3 :page 1 :group 1}}}
+                                2 {:id 2 :name "2" :page 1 :group 1}
+                                3 {:id 3 :name "3" :page 1 :group 1}}}
 
         expected (-> initial
-                     (assoc-in [:shapes-by-id 1 :items] [2 3 4 5])
-                     (assoc-in [:shapes-by-id 4] {:id 4 :page 1 :group 1})
-                     (assoc-in [:shapes-by-id 5] {:id 5 :page 1 :group 1}))]
+                     (assoc-in [:shapes-by-id 1 :items] [5 4 2 3])
+                     (assoc-in [:shapes-by-id 4] {:id 4 :name "3" :page 1 :group 1})
+                     (assoc-in [:shapes-by-id 5] {:id 5 :name "2" :page 1 :group 1}))]
     (with-redefs [uuid.core/random (constantly-inc 4)]
       (let [result (ssh/duplicate-shapes initial [2 3])]
         ;; (pprint expected)
@@ -54,17 +54,17 @@
 ;; duplicate shape: duplicate mixed bag
 (t/deftest duplicate-shapes-test3
   (let [initial {:pages-by-id {1 {:id 1 :shapes [1 4]}}
-                 :shapes-by-id {1 {:id 1 :page 1
+                 :shapes-by-id {1 {:id 1 :name "1" :page 1
                                    :type :group
                                    :items [2 3]}
-                                2 {:id 2 :page 1 :group 1}
-                                3 {:id 3 :page 1 :group 1}
-                                4 {:id 4 :page 1}}}
+                                2 {:id 2 :name "2" :page 1 :group 1}
+                                3 {:id 3 :name "3" :page 1 :group 1}
+                                4 {:id 4 :name "4" :page 1}}}
 
         expected (-> initial
-                     (assoc-in [:pages-by-id 1 :shapes] [1 4 5 6])
-                     (assoc-in [:shapes-by-id 5] {:id 5 :page 1})
-                     (assoc-in [:shapes-by-id 6] {:id 6 :page 1}))]
+                     (assoc-in [:pages-by-id 1 :shapes] [6 5 1 4])
+                     (assoc-in [:shapes-by-id 5] {:id 5 :name "4" :page 1})
+                     (assoc-in [:shapes-by-id 6] {:id 6 :name "3" :page 1}))]
     (with-redefs [uuid.core/random (constantly-inc 5)]
       (let [result (ssh/duplicate-shapes initial [3 4])]
         ;; (pprint expected)
@@ -81,7 +81,7 @@
                                 2 {:id 3 :page 1 :group 1}}}
 
         expected (-> initial
-                     (assoc-in [:pages-by-id 1 :shapes] [1 3])
+                     (assoc-in [:pages-by-id 1 :shapes] [3 1])
                      (assoc-in [:shapes-by-id 3] {:id 3 :page 1
                                                   :type :group
                                                   :items [4]})