Merge remote-tracking branch 'origin/staging' into develop

frontend/src/app/main/data/comments.cljs

@@ -433,7 +433,7 @@
 (defn detach-comment-thread
   "Detach comment threads that are inside a frame when that frame is deleted"
   [ids]
-  (us/verify (s/coll-of uuid?) ids)
+  (us/assert! ::us/coll-of-uuid ids)
 
   (ptk/reify ::detach-comment-thread
     ptk/WatchEvent

frontend/src/app/main/data/dashboard.cljs

@@ -54,9 +54,6 @@
           :opt-un [::created-at
                    ::modified-at]))
 
-(s/def ::set-of-uuid
-  (s/every ::us/uuid :kind set?))
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Initialization
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -783,7 +780,7 @@
 
 (defn move-files
   [{:keys [ids project-id] :as params}]
-  (us/assert ::set-of-uuid ids)
+  (us/assert ::us/set-of-uuid ids)
   (us/assert ::us/uuid project-id)
   (ptk/reify ::move-files
     IDeref

frontend/src/app/main/data/workspace/comments.cljs

@@ -21,7 +21,6 @@
    [app.main.streams :as ms]
    [app.util.router :as rt]
    [beicon.core :as rx]
-   [cljs.spec.alpha :as s]
    [potok.core :as ptk]))
 
 (declare handle-interrupt)
@@ -141,11 +140,10 @@
               (rx/catch #(rx/throw {:type :update-comment-thread-position}))
               (rx/ignore))))))))
 
-
 ;; Move comment threads that are inside a frame when that frame is moved"
 (defmethod ptk/resolve ::move-frame-comment-threads
   [_ ids]
-  (us/assert! :spec (s/coll-of uuid?) :val  ids)
+  (us/assert! ::us/coll-of-uuid ids)
   (ptk/reify ::move-frame-comment-threads
     ptk/WatchEvent
     (watch [_ state _]

frontend/src/app/main/data/workspace/selection.cljs

@@ -33,15 +33,9 @@
    [linked.set :as lks]
    [potok.core :as ptk]))
 
-(s/def ::set-of-uuid
-  (s/every uuid? :kind set?))
-
 (s/def ::ordered-set-of-uuid
   (s/every uuid? :kind d/ordered-set?))
 
-(s/def ::set-of-string
-  (s/every string? :kind set?))
-
 (defn interrupt? [e] (= e :interrupt))
 
 ;; --- Selection Rect

frontend/src/app/main/data/workspace/shapes.cljs

@@ -130,12 +130,9 @@
           (rx/of (dch/commit-changes changes))
           (rx/empty))))))
 
-(s/def ::set-of-uuid
-  (s/every ::us/uuid :kind set?))
-
 (defn delete-shapes
   [ids]
-  (us/assert ::set-of-uuid ids)
+  (us/assert ::us/set-of-uuid ids)
   (ptk/reify ::delete-shapes
     ptk/WatchEvent
     (watch [it state _]

frontend/src/app/util/forms.cljs

@@ -162,4 +162,4 @@
 
 (s/def ::email ::us/email)
 (s/def ::not-empty-string ::us/not-empty-string)
-(s/def ::color ::us/color)
+(s/def ::color ::us/rgb-color-str)